yyh 30b9295156 Merge remote-tracking branch 'origin/build/feat/hitl' into wip/hitl-merge-web-conflicts-20260206-175434 ... # Conflicts: # api/.env.example # api/core/app/apps/advanced_chat/app_generator.py # api/core/app/apps/advanced_chat/app_runner.py # api/core/app/apps/advanced_chat/generate_task_pipeline.py # api/core/app/apps/workflow/app_generator.py # api/core/app/apps/workflow/app_runner.py # api/core/app/entities/queue_entities.py # api/core/workflow/node_events/__init__.py # api/core/workflow/runtime/graph_runtime_state.py # api/fields/message_fields.py # api/services/workflow_service.py # web/app/components/app/app-publisher/index.tsx # web/app/components/base/chat/chat/answer/index.tsx # web/app/components/base/chat/chat/hooks.ts # web/app/components/base/chat/chat/type.ts # web/app/components/base/prompt-editor/index.tsx # web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts # web/app/components/share/text-generation/result/header.tsx # web/app/components/workflow-app/components/workflow-header/features-trigger.tsx # web/app/components/workflow-app/hooks/use-workflow-run.ts # web/app/components/workflow/hooks/use-checklist.ts # web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts # web/app/components/workflow/hooks/use-workflow.ts # web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx # web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx # web/app/components/workflow/nodes/_base/node.tsx # web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/components/placeholder.tsx # web/app/components/workflow/panel/debug-and-preview/hooks.ts # web/app/components/workflow/panel/workflow-preview.tsx # web/app/components/workflow/store/workflow/workflow-slice.ts # web/eslint-suppressions.json # web/i18n/en-US/common.json # web/i18n/zh-Hans/common.json # web/i18n/zh-Hant/common.json # web/service/workflow.ts		2026-02-06 19:13:51 +08:00
..
annotation-full	test: add comprehensive tests (#31649)	2026-01-29 11:16:26 +08:00
apps-full-in-dialog	feat: model total credits (#30727)	2026-01-08 14:11:44 +08:00
billing-page	test: add comprehensive tests (#31649)	2026-01-29 11:16:26 +08:00
header-billing-btn	chore: remove useless __esModule (#30366)	2025-12-30 15:37:16 +08:00
partner-stack	Revert "refactor!: migrate commonLayout to SSR prefetch with TanStack Query hydration"	2026-02-01 19:06:45 +08:00
plan	Revert "revert: revert human input relevant code (#31766)"	2026-02-01 16:21:14 +08:00
plan-upgrade-modal	feat: handle upgrade confirm and icon	2026-01-29 15:00:04 +08:00
pricing	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-06 14:40:44 +08:00
priority-label	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
progress-bar	feat: enhance ProgressBar and UsageInfo for storage mode (#31273)	2026-01-21 14:04:33 +08:00
trigger-events-limit-modal	chore: remove useless __esModule (#30366)	2025-12-30 15:37:16 +08:00
upgrade-btn	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
usage-info	feat: enhance ProgressBar and UsageInfo for storage mode (#31273)	2026-01-21 14:04:33 +08:00
utils	Revert "revert: revert human input relevant code (#31766)"	2026-02-01 16:21:14 +08:00
vector-space-full	feat: enhance ProgressBar and UsageInfo for storage mode (#31273)	2026-01-21 14:04:33 +08:00
config.ts	chore(web): new lint setup (#30020)	2025-12-23 16:58:55 +08:00
type.ts	Revert "revert: revert human input relevant code (#31766)"	2026-02-01 16:21:14 +08:00