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
..
__tests__	refactor(web): migrate document list query state to nuqs (#32339)	2026-03-03 18:29:23 +08:00
description	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-13 15:17:52 +08:00
empty	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-13 15:17:52 +08:00
list	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-13 15:17:52 +08:00
search-box	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-13 15:17:52 +08:00
sort-dropdown	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-13 15:17:52 +08:00
atoms.ts	refactor: always preserve marketplace search state in URL (#31069)	2026-01-16 08:52:53 +09:00
constants.ts	refactor: marketplace state management (#30702)	2026-01-09 14:31:24 +08:00
hooks.ts	refactor: init orpc contract (#30885)	2026-01-13 23:38:28 +09:00
hydration-server.tsx	refactor(web): migrate document list query state to nuqs (#32339)	2026-03-03 18:29:23 +08:00
index.tsx	refactor: always preserve marketplace search state in URL (#31069)	2026-01-16 08:52:53 +09:00
plugin-type-switch.tsx	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 18:43:04 +08:00
query.ts	refactor: init orpc contract (#30885)	2026-01-13 23:38:28 +09:00
search-params.ts	refactor(web): migrate document list query state to nuqs (#32339)	2026-03-03 18:29:23 +08:00
state.ts	feat(web): add loading indicators for infinite scroll pagination (#31110)	2026-01-17 17:36:07 +08:00
sticky-search-and-switch-wrapper.tsx	refactor: marketplace state management (#30702)	2026-01-09 14:31:24 +08:00
types.ts	refactor: init orpc contract (#30885)	2026-01-13 23:38:28 +09:00
utils.ts	refactor: init orpc contract (#30885)	2026-01-13 23:38:28 +09:00