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

..

__base

style: auto-format after segment 3 import migrations

2026-03-23 10:37:02 +08:00

builtin_tool

refactor: use EnumText for Conversation/Message invoke_from and from_source (#33901)

2026-03-23 16:03:35 +09:00

custom_tool

refactor: move workflow package to dify_graph (#32844)

2026-03-02 18:42:30 +08:00

entities

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

mcp_tool

refactor(api): move model_runtime into dify_graph (#32858)

2026-03-02 20:15:32 +08:00

plugin_tool

chore: use from __future__ import annotations (#30254)

2026-01-06 23:57:20 +09:00

utils

Merge branch 'main' into sandboxed-agent-rebase

2026-03-24 11:19:50 +08:00

workflow_as_tool

fix: workflow_as_tool not work with json input (#32554)

2026-03-09 13:54:54 +08:00

__init__.py

improve: generalize tool parameter converter (#4786)

2024-06-03 21:26:58 +08:00

errors.py

feat: Human Input Node (#32060)

2026-02-09 14:57:23 +08:00

signature.py

refactor: generate_url to support scenario to build url (#30598)

2026-01-06 14:53:38 +08:00

tool_engine.py

refactor: use EnumText for MessageFeedback and MessageFile columns (#33738)

2026-03-20 01:13:26 +09:00

tool_file_manager.py

test: Unit test cases for core.tools module (#32447)

2026-03-12 11:48:13 +08:00

tool_label_manager.py

refactor: use EnumText for Conversation/Message invoke_from and from_source (#33901)

2026-03-23 16:03:35 +09:00

tool_manager.py

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

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