Novice 94b01f6821 Merge commit '92bde350' into sandboxed-agent-rebase ... Made-with: Cursor # Conflicts: # api/controllers/console/app/workflow_draft_variable.py # api/core/agent/cot_agent_runner.py # api/core/agent/cot_chat_agent_runner.py # api/core/agent/cot_completion_agent_runner.py # api/core/agent/fc_agent_runner.py # api/core/app/apps/advanced_chat/app_generator.py # api/core/app/apps/advanced_chat/app_runner.py # api/core/app/apps/agent_chat/app_runner.py # api/core/app/apps/workflow/app_generator.py # api/core/app/apps/workflow/app_runner.py # api/core/app/entities/app_invoke_entities.py # api/core/app/entities/queue_entities.py # api/core/llm_generator/output_parser/structured_output.py # api/core/workflow/workflow_entry.py # api/dify_graph/context/__init__.py # api/dify_graph/entities/tool_entities.py # api/dify_graph/file/file_manager.py # api/dify_graph/graph_engine/response_coordinator/coordinator.py # api/dify_graph/graph_events/node.py # api/dify_graph/node_events/node.py # api/dify_graph/nodes/agent/agent_node.py # api/dify_graph/nodes/llm/entities.py # api/dify_graph/nodes/llm/llm_utils.py # api/dify_graph/nodes/llm/node.py # api/dify_graph/nodes/question_classifier/question_classifier_node.py # api/dify_graph/runtime/graph_runtime_state.py # api/dify_graph/variables/segments.py # api/factories/variable_factory.py # api/services/variable_truncator.py # api/tests/unit_tests/utils/structured_output_parser/test_structured_output_parser.py # api/uv.lock # web/app/components/app-sidebar/app-info.tsx # web/app/components/app-sidebar/app-sidebar-dropdown.tsx # web/app/components/app/create-app-modal/index.spec.tsx # web/app/components/apps/__tests__/list.spec.tsx # web/app/components/apps/app-card.tsx # web/app/components/apps/list.tsx # web/app/components/header/account-dropdown/compliance.tsx # web/app/components/header/account-dropdown/index.tsx # web/app/components/header/account-dropdown/support.tsx # web/app/components/workflow-app/components/workflow-onboarding-modal/index.tsx # web/app/components/workflow/panel/debug-and-preview/hooks.ts # web/contract/console/apps.ts # web/contract/router.ts # web/eslint-suppressions.json # web/next.config.ts # web/pnpm-lock.yaml		2026-03-23 09:39:49 +08:00
..
_base	Merge commit '9c339239' into sandboxed-agent-rebase	2026-03-23 09:00:45 +08:00
agent	refactor(web): align MCP availability context migration	2026-02-23 22:46:31 +08:00
answer	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
assigner	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
code	fix: ensure sub-graph modal syncs immediately when	2026-02-05 06:07:15 +08:00
command	feat: command node output variables	2026-01-07 11:15:52 +08:00
data-source	fix(workflow): eliminate infinite loop in plugin install state management	2026-01-30 01:30:57 +08:00
data-source-empty	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
document-extractor	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
end	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
file-upload	feat: add File Upload node functionality and related components	2026-02-10 20:51:31 +08:00
group	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
http	Merge commit '9c339239' into sandboxed-agent-rebase	2026-03-23 09:00:45 +08:00
human-input	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
if-else	feat: LLM node to only show generation output var when computer use is	2026-02-09 23:40:42 +08:00
iteration	Merge commit '657eeb65' into sandboxed-agent-rebase	2026-03-19 17:38:56 +08:00
iteration-start	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
knowledge-base	Merge commit '657eeb65' into sandboxed-agent-rebase	2026-03-19 17:38:56 +08:00
knowledge-retrieval	feat: LLM node to only show generation output var when computer use is	2026-02-09 23:40:42 +08:00
list-operator	Merge commit '657eeb65' into sandboxed-agent-rebase	2026-03-19 17:38:56 +08:00
llm	Merge commit '9c339239' into sandboxed-agent-rebase	2026-03-23 09:00:45 +08:00
loop	feat: LLM node to only show generation output var when computer use is	2026-02-09 23:40:42 +08:00
loop-end	chore(web): new lint setup (#30020)	2025-12-23 16:58:55 +08:00
loop-start	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
parameter-extractor	refactor(web): make Switch controlled-only and migrate call sites (#32399)	2026-02-18 23:47:07 +08:00
question-classifier	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
start	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
sub-graph-start	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
template-transform	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
tool	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
trigger-plugin	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
trigger-schedule	fix: trigger doc link (#31754)	2026-01-30 17:30:24 +08:00
trigger-webhook	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
variable-assigner	Merge commit '657eeb65' into sandboxed-agent-rebase	2026-03-19 17:38:56 +08:00
components.ts	feat: add File Upload node functionality and related components	2026-02-10 20:51:31 +08:00
constants.ts	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
index.tsx	chore(web): new lint setup (#30020)	2025-12-23 16:58:55 +08:00
utils.ts	fix: element of Array[string] and Array[number] and size attribution (#23074)	2025-07-30 15:21:50 +08:00