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
..
agent	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
app	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +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	chore: improve type checking	2025-12-18 10:09:31 +08:00
datasource	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
db	fix(db): parameterize sessionmaker with Session (#30612)	2026-01-06 15:23:50 +08:00
entities	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08: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 '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
logging	feat(refactoring): Support Structured Logging (JSON) (#30170)	2026-01-04 11:46:46 +08:00
mcp	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
memory	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
moderation	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
ops	fix(api): resolve OpenTelemetry histogram type mismatch (#32771)	2026-03-04 00:01:16 +09:00
plugin	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
prompt	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
rag	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
repositories	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
sandbox	fix: update remaining core.file imports missed in previous commit	2026-03-23 08:39:48 +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 commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +08:00
trigger	refactor: move workflow package to dify_graph (#32844)	2026-03-02 18:42:30 +08:00
virtual_environment	fix: enhance container architecture detection in DockerDaemonEnvironment	2026-03-18 15:30:18 +08:00
workflow	Merge commit '92bde350' into sandboxed-agent-rebase	2026-03-23 09:39:49 +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(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08: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(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00