Novice fd124e6d32 Merge main HEAD (segment 5) into sandboxed-agent-rebase ...

Resolve 83 conflicts: 10 backend, 62 frontend, 11 config/lock files.
Preserve sandbox/agent/collaboration features while adopting main's
UI refactorings (Dialog/AlertDialog/Popover), model provider updates,
and enterprise features.

Made-with: Cursor

2026-03-23 14:20:06 +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 'fb41b215' into sandboxed-agent-rebase

2026-03-23 10:52:06 +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

chore: use selectinload instead of joinedload in conversation query (#33014)

2026-03-22 07:35:32 +09: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

fix: sync workflow description and name to MCP server on update (#33637)

2026-03-18 19:04:45 +08:00

message.py

Merge main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +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 main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +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 main HEAD (segment 5) into sandboxed-agent-rebase

2026-03-23 14:20:06 +08:00

wraps.py

feat: app trial (#26281)

2026-01-22 15:42:54 +08:00