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
..
agent	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
app	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
app_assets	refactor: async skill compile and context sharing	2026-03-11 14:41:33 +08:00
app_bundle	feat(bundle): manifest-driven import with sandbox upload	2026-01-29 22:33:31 +08:00
base	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
callback_handler	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
datasource	refactor: use EnumText(StorageType) for UploadFile.storage_type (#33728)	2026-03-19 15:15:32 +09:00
db	fix(db): parameterize sessionmaker with Session (#30612)	2026-01-06 15:23:50 +08:00
entities	refactor: EnumText for preferred_provider_type MessageChain, Banner (#33696)	2026-03-19 03:53:04 +09:00
errors	chore: add ast-grep rule to convert Optional[T] to T | None (#25560)	2025-09-15 13:06:33 +08:00
extension	change all to httpx (#26119)	2025-10-10 23:41:16 +08:00
external_data_tool	chore: add ast-grep rule to convert Optional[T] to T | None (#25560)	2025-09-15 13:06:33 +08:00
helper	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
llm_generator	Merge commit 'fb41b215' into sandboxed-agent-rebase	2026-03-23 10:52:06 +08:00
logging	feat(refactoring): Support Structured Logging (JSON) (#30170)	2026-01-04 11:46:46 +08:00
mcp	chore: compatiable resource_metadata return without scheme (#33506)	2026-03-16 15:44:48 +08:00
memory	style: auto-format after segment 3 import migrations	2026-03-23 10:37:02 +08:00
moderation	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
ops	refactor(api): move workflow knowledge nodes and trigger nodes (#33445)	2026-03-15 15:24:59 +08:00
plugin	Merge commit 'fb41b215' into sandboxed-agent-rebase	2026-03-23 10:52:06 +08:00
prompt	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
rag	perf: tidb_on_qdrant_vector delete_by_ids use batch delete (#33846)	2026-03-22 21:09:43 +09:00
repositories	Merge commit 'fb41b215' into sandboxed-agent-rebase	2026-03-23 10:52:06 +08:00
sandbox	style: auto-format after segment 3 import migrations	2026-03-23 10:37:02 +08:00
schemas	refactor(typing): Fixup typing A2 - workflow engine & nodes (#31723)	2026-01-31 18:00:56 +09:00
session	refactor: a lot of optimization and enhancement	2026-03-12 18:23:16 +08:00
skill	fix: log storage key details when skill bundle is not found	2026-03-12 16:31:53 +08:00
tools	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
trigger	fix(api): add trigger_info to WorkflowNodeExecutionMetadataKey (#33753)	2026-03-19 17:56:49 +08:00
virtual_environment	fix: enhance container architecture detection in DockerDaemonEnvironment	2026-03-18 15:30:18 +08:00
workflow	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
zip_sandbox	refactor: a lot of optimization and enhancement	2026-03-12 18:23:16 +08:00
__init__.py	Fix basedpyright type errors (#25435)	2025-09-10 01:54:26 +08:00
hosting_configuration.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
indexing_runner.py	refactor: use EnumText for dataset and replace string literals 4 (#33606)	2026-03-18 09:18:08 +09:00
model_manager.py	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
provider_manager.py	refactor: EnumText for preferred_provider_type MessageChain, Banner (#33696)	2026-03-19 03:53:04 +09:00