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
..
(commonLayout)	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
(humanInputLayout)/form/[token]	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
(shareLayout)	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
account	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
activate	Revert "refactor!: replace Zustand global store with TanStack Query for systemFeatures"	2026-02-01 19:06:45 +08:00
components	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
education-apply	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
forgot-password	refactor: type safe env, update to zod v4 (#32035)	2026-02-10 17:55:11 +08:00
init	refactor(i18n): use JSON with flattened key and namespace (#30114)	2025-12-29 14:52:32 +08:00
install	refactor: type safe env, update to zod v4 (#32035)	2026-02-10 17:55:11 +08:00
oauth-callback
repos/[owner]/[repo]/releases	chore(web): new lint setup (#30020)	2025-12-23 16:58:55 +08:00
reset-password	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
signin	Merge commit '9c339239' into sandboxed-agent-rebase	2026-03-23 09:00:45 +08:00
signup	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
styles	refactor(web): migrate Button to Base UI with focus-visible (#32941)	2026-03-04 13:55:13 +08:00
layout.tsx	chore: drop pwa with serwist (#32838)	2026-03-04 17:35:35 +08:00
page.spec.tsx	refactor(web): preserve all OAuth query params and remove legacy storage fallback	2026-02-10 14:39:05 +08:00
page.tsx	refactor(web): migrate OAuth redirect storage to utility and preserve query params	2026-02-10 14:23:47 +08:00
routePrefixHandle.tsx	chore(web): new lint setup (#30020)	2025-12-23 16:58:55 +08:00