Novice 8775003732 Merge branch 'main' into sandboxed-agent-rebase ... Made-with: Cursor # Conflicts: # api/tests/unit_tests/controllers/console/app/test_message.py # api/tests/unit_tests/controllers/console/app/test_statistic.py # api/tests/unit_tests/controllers/console/app/test_workflow_draft_variable.py # api/tests/unit_tests/controllers/console/auth/test_data_source_bearer_auth.py # api/tests/unit_tests/controllers/console/auth/test_data_source_oauth.py # api/tests/unit_tests/controllers/console/auth/test_oauth_server.py # web/app/components/header/account-setting/data-source-page/data-source-notion/operate/index.tsx # web/app/components/header/account-setting/data-source-page/data-source-website/config-firecrawl-modal.tsx # web/app/components/header/account-setting/data-source-page/data-source-website/config-jina-reader-modal.tsx # web/app/components/header/account-setting/data-source-page/data-source-website/config-watercrawl-modal.tsx # web/app/components/header/account-setting/data-source-page/panel/config-item.tsx # web/app/components/header/account-setting/data-source-page/panel/index.tsx # web/app/components/workflow/nodes/knowledge-retrieval/node.tsx # web/package.json # web/pnpm-lock.yaml		2026-03-24 11:19:50 +08:00
..
app_config/features/file_upload	refactor(api): move model_runtime into dify_graph (#32858)	2026-03-02 20:15:32 +08:00
apps	Merge main HEAD (segment 5) into sandboxed-agent-rebase	2026-03-23 14:20:06 +08:00
entities	Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox	2026-02-09 17:00:56 +08:00
features/rate_limiting	test(api): add autospec to MagicMock-based patch usage (#32752)	2026-03-01 04:30:45 +08:00
layers	refactor(api): move workflow knowledge nodes and trigger nodes (#33445)	2026-03-15 15:24:59 +08:00
task_pipeline	refactor: use EnumText for TidbAuthBinding.status and MessageFile.type (#33975)	2026-03-24 05:38:29 +09:00
workflow/layers	fix: resolve test failures and lint errors after segment 5 merge	2026-03-23 15:23:33 +08:00