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
..
__init__.py	FEAT: NEW WORKFLOW ENGINE (#3160)	2024-04-08 18:51:46 +08:00
advanced_prompt_template.py	refactor: port reqparse to Pydantic model (#28913)	2025-11-30 16:09:42 +09:00
agent.py	refactor: port reqparse to Pydantic model (#28949)	2025-12-05 13:05:53 +09:00
annotation.py	refactor: port api/controllers/console/app/annotation.py api/controllers/console/explore/trial.py api/controllers/console/workspace/account.py api/controllers/console/workspace/members.py api/controllers/service_api/app/annotation.py to basemodel (#31833)	2026-02-03 09:59:00 +08:00
app_asset.py	refactor(app_asset): remove file upload resource and related methods	2026-01-23 14:56:39 +08:00
app_import.py	feat(bundle): manifest-driven import with sandbox upload	2026-01-29 22:33:31 +08:00
app.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
audio.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
completion.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
conversation_variables.py	refactor: port reqparse to Pydantic model (#28913)	2025-11-30 16:09:42 +09:00
conversation.py	fix(console): keep conversation updated_at unchanged when marking read (#32133)	2026-02-10 17:56:38 +08:00
error.py	Merge branch 'feat/collaboration2' into feat/support-agent-sandbox	2026-01-25 00:00:03 +08:00
generator.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
mcp_server.py	refactor: port reqparse to Pydantic model (#28949)	2025-12-05 13:05:53 +09:00
message.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
model_config.py	api -> console_ns (#28246)	2025-11-24 10:04:11 +08:00
ops_trace.py	refactor: port reqparse to Pydantic model (#28949)	2025-12-05 13:05:53 +09:00
site.py	refactor: port reqparse to Pydantic model (#28949)	2025-12-05 13:05:53 +09:00
skills.py	feat: update LLM node skills API to extract tool dependencies and change endpoint to POST	2026-03-11 14:41:33 +08:00
statistic.py	refactor: port reqparse to Pydantic model (#28913)	2025-11-30 16:09:42 +09:00
workflow_app_log.py	refactor: move workflow package to dify_graph (#32844)	2026-03-02 18:42:30 +08:00
workflow_comment.py	chore: use AccountWithRole instead of account_with_role_fields	2026-02-04 14:11:32 +08:00
workflow_draft_variable.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
workflow_run.py	refactor: move workflow package to dify_graph (#32844)	2026-03-02 18:42:30 +08:00
workflow_statistic.py	refactor: port reqparse to Pydantic model (#28913)	2025-11-30 16:09:42 +09:00
workflow_trigger.py	fix: doc not gen bug (#31547)	2026-01-27 20:19:39 +09:00
workflow.py	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
wraps.py	feat: app trial (#26281)	2026-01-22 15:42:54 +08:00