|
|
6756745062
|
Merge branch 'main' into feat/support-agent-sandbox
|
2026-03-24 17:12:13 +08:00 |
|
|
|
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 |
|
|
|
fbd558762d
|
fix: fix chunk not display in indexed document (#33942)
|
2026-03-24 10:36:48 +08:00 |
|
|
|
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 |
|
|
|
0478023900
|
refactor(web): migrate dataset-related toast callsites to base/ui/toast and update tests (#33892)
|
2026-03-23 13:13:52 +08:00 |
|
|
|
5041d96bb1
|
Merge commit 'fb41b215' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# .devcontainer/post_create_command.sh
# api/commands.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/workflow_app_runner.py
# api/core/app/entities/queue_entities.py
# api/core/app/entities/task_entities.py
# api/core/workflow/workflow_entry.py
# api/dify_graph/enums.py
# api/dify_graph/graph/graph.py
# api/dify_graph/graph_events/node.py
# api/dify_graph/model_runtime/entities/message_entities.py
# api/dify_graph/node_events/node.py
# api/dify_graph/nodes/agent/agent_node.py
# api/dify_graph/nodes/base/__init__.py
# api/dify_graph/nodes/base/entities.py
# api/dify_graph/nodes/base/node.py
# api/dify_graph/nodes/llm/entities.py
# api/dify_graph/nodes/llm/node.py
# api/dify_graph/nodes/tool/tool_node.py
# api/pyproject.toml
# api/uv.lock
# web/app/components/base/avatar/__tests__/index.spec.tsx
# web/app/components/base/avatar/index.tsx
# web/app/components/base/date-and-time-picker/time-picker/__tests__/index.spec.tsx
# web/app/components/base/file-uploader/file-from-link-or-local/index.tsx
# web/app/components/base/prompt-editor/index.tsx
# web/app/components/datasets/metadata/edit-metadata-batch/modal.tsx
# web/app/components/header/account-dropdown/index.spec.tsx
# web/app/components/share/text-generation/index.tsx
# web/app/components/workflow/block-selector/tool/action-item.tsx
# web/app/components/workflow/block-selector/trigger-plugin/action-item.tsx
# web/app/components/workflow/hooks/use-edges-interactions.ts
# web/app/components/workflow/hooks/use-nodes-interactions.ts
# web/app/components/workflow/index.tsx
# web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
# web/app/components/workflow/nodes/http/components/key-value/key-value-edit/index.tsx
# web/app/components/workflow/nodes/human-input/components/delivery-method/recipient/email-item.tsx
# web/app/components/workflow/nodes/loop/use-interactions.ts
# web/contract/router.ts
# web/env.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-23 10:52:06 +08:00 |
|
|
|
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 |
|
|
|
cccff6768a
|
Merge commit '9c339239' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# api/README.md
# api/controllers/console/app/workflow_draft_variable.py
# api/core/agent/cot_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/plugin/backwards_invocation/model.py
# api/core/prompt/advanced_prompt_transform.py
# api/core/workflow/nodes/base/node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/llm/node.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/nodes/question_classifier/question_classifier_node.py
# api/core/workflow/runtime/graph_runtime_state.py
# api/extensions/storage/base_storage.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/account/oauth/authorize/page.tsx
# web/app/components/app/configuration/config-var/config-modal/field.tsx
# web/app/components/base/alert.tsx
# web/app/components/base/chat/chat/answer/human-input-content/executed-action.tsx
# web/app/components/base/chat/chat/answer/more.tsx
# web/app/components/base/chat/chat/answer/operation.tsx
# web/app/components/base/chat/chat/answer/workflow-process.tsx
# web/app/components/base/chat/chat/citation/index.tsx
# web/app/components/base/chat/chat/citation/popup.tsx
# web/app/components/base/chat/chat/citation/progress-tooltip.tsx
# web/app/components/base/chat/chat/citation/tooltip.tsx
# web/app/components/base/chat/chat/question.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/index.tsx
# web/app/components/base/chat/embedded-chatbot/inputs-form/view-form-dropdown.tsx
# web/app/components/base/markdown-blocks/form.tsx
# web/app/components/base/prompt-editor/plugins/hitl-input-block/component-ui.tsx
# web/app/components/base/tag-management/panel.tsx
# web/app/components/base/tag-management/trigger.tsx
# web/app/components/header/account-setting/index.tsx
# web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx
# web/app/components/header/account-setting/model-provider-page/provider-added-card/index.tsx
# web/app/signin/utils/post-login-redirect.ts
# web/eslint-suppressions.json
# web/package.json
# web/pnpm-lock.yaml
|
2026-03-23 09:00:45 +08:00 |
|
|
|
27ed40225d
|
refactor(web): update frontend toast call sites to use the new shortcut API (#33808)
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-20 16:02:22 +08:00 |
|
|
|
978ebbf9ea
|
refactor: migrate high-risk overlay follow-up selectors (#33795)
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-20 14:12:35 +08:00 |
|
|
|
aa71784627
|
refactor(toast): migrate dataset-pipeline to new ui toast API and extract i18n (#33794)
|
2026-03-20 12:17:27 +08:00 |
|
|
|
89b76d6c33
|
Merge commit '657eeb65' into sandboxed-agent-rebase
Made-with: Cursor
# Conflicts:
# api/core/agent/cot_chat_agent_runner.py
# api/core/agent/fc_agent_runner.py
# api/core/memory/token_buffer_memory.py
# api/core/variables/segments.py
# api/core/workflow/file/file_manager.py
# api/core/workflow/nodes/agent/agent_node.py
# api/core/workflow/nodes/llm/llm_utils.py
# api/core/workflow/nodes/parameter_extractor/parameter_extractor_node.py
# api/core/workflow/workflow_entry.py
# api/factories/variable_factory.py
# api/pyproject.toml
# api/services/variable_truncator.py
# api/uv.lock
# web/app/components/app/app-publisher/index.tsx
# web/app/components/app/overview/settings/index.tsx
# web/app/components/apps/app-card.tsx
# web/app/components/apps/index.tsx
# web/app/components/apps/list.tsx
# web/app/components/base/chat/chat-with-history/header-in-mobile.tsx
# web/app/components/base/features/new-feature-panel/conversation-opener/modal.tsx
# web/app/components/base/features/new-feature-panel/file-upload/setting-content.tsx
# web/app/components/base/features/new-feature-panel/moderation/moderation-setting-modal.tsx
# web/app/components/base/features/new-feature-panel/text-to-speech/param-config-content.tsx
# web/app/components/base/message-log-modal/index.tsx
# web/app/components/base/switch/index.tsx
# web/app/components/base/tab-slider-plain/index.tsx
# web/app/components/explore/try-app/app-info/index.tsx
# web/app/components/plugins/plugin-detail-panel/tool-selector/components/reasoning-config-form.tsx
# web/app/components/workflow/nodes/llm/components/json-schema-config-modal/visual-editor/edit-card/required-switch.tsx
# web/app/components/workflow/nodes/llm/panel.tsx
# web/contract/router.ts
# web/eslint-suppressions.json
# web/i18n/fa-IR/workflow.json
|
2026-03-19 17:38:56 +08:00 |
|
|
|
93f9546353
|
refactor(web): migrate core toast call sites to base ui toast (#33643)
|
2026-03-18 16:53:55 +08:00 |
|
|
|
296b7044af
|
refactor: route next/navigation through compat re-export (#33636)
|
2026-03-18 12:57:03 +08:00 |
|
|
|
69d1ccb7a7
|
refactor: route next/link through compat re-export (#33632)
|
2026-03-18 12:14:59 +08:00 |
|
|
|
d7f70f3c0f
|
refactor: route low-cost next modules through compat re-exports (#33622)
|
2026-03-18 10:37:29 +08:00 |
|
|
|
bbe975c6bc
|
feat: enhance model plugin workflow checks and model provider management UX (#33289)
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Coding On Star <447357187@qq.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: statxc <tyleradams93226@gmail.com>
|
2026-03-18 10:16:15 +08:00 |
|
|
|
4822d550b6
|
chore: remove next img (#33517)
|
2026-03-16 16:48:22 +08:00 |
|
|
|
ed5511ce28
|
test: improve coverage for some files (#33218)
|
2026-03-12 15:09:10 +08:00 |
|
|
|
c43307dae1
|
refactor(switch): Base UI migration with loading/skeleton variants (#33345)
Signed-off-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-12 14:40:43 +08:00 |
|
|
|
65637fc6b7
|
chore(deps): bump the npm-dependencies group across 1 directory with 55 updates (#33170)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2026-03-09 23:24:36 +08:00 |
|
|
|
f487b680f5
|
refactor: spilt context for better hmr (#33033)
|
2026-03-05 15:54:56 +08:00 |
|
|
|
1a90c4d81b
|
refactor(web): migrate document list query state to nuqs (#32339)
|
2026-03-03 18:29:23 +08:00 |
|
|
|
f73be8d69e
|
feat(web): add hover clear button for provider search (#32707)
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-02-27 20:42:30 +08:00 |
|
|
|
ea0e1b52a8
|
refactor(web): make Switch controlled-only and migrate call sites (#32399)
|
2026-02-18 23:47:07 +08:00 |
|
|
|
e730124740
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/uv.lock
# web/app/components/apps/__tests__/app-card.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/datasets/create/__tests__/index.spec.tsx
# web/app/components/datasets/metadata/metadata-dataset/__tests__/dataset-metadata-drawer.spec.tsx
# web/app/components/plugins/readme-panel/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/__tests__/index.spec.tsx
# web/app/components/rag-pipeline/hooks/__tests__/index.spec.ts
# web/eslint-suppressions.json
|
2026-02-13 15:17:52 +08:00 |
|
|
|
b6d506828b
|
test(web): add and enhance frontend automated tests across multiple modules (#32268)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
|
2026-02-13 10:27:48 +08:00 |
|
|
|
10f85074e8
|
test: add comprehensive unit and integration tests for dataset module (#32187)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
|
2026-02-12 10:00:32 +08:00 |
|
|
|
2ab0b334a8
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# web/app/components/rag-pipeline/components/update-dsl-modal.tsx
# web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts
# web/app/components/workflow/variable-inspect/utils.tsx
# web/app/layout.tsx
# web/context/event-emitter.tsx
# web/eslint-suppressions.json
# web/next.config.ts
# web/package.json
# web/pnpm-lock.yaml
# web/types/feature.ts
|
2026-02-10 18:12:41 +08:00 |
|
|
|
f355c8d595
|
refactor: type safe env, update to zod v4 (#32035)
|
2026-02-10 17:55:11 +08:00 |
|
|
|
4058e9ae23
|
refactor: extract sub-components and custom hooks from UpdateDSLModal and Metadata components (#32045)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
|
2026-02-10 17:26:08 +08:00 |
|
|
|
db0c527ce8
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
|
2026-02-09 18:43:04 +08:00 |
|
|
|
871ec3b0ca
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/controllers/console/app/app.py
# web/eslint-suppressions.json
# web/eslint.config.mjs
|
2026-02-06 14:40:44 +08:00 |
|
|
|
7202a24bcf
|
chore: migrate to eslint-better-tailwind (#31969)
|
2026-02-05 18:36:08 +09:00 |
|
|
|
25065a4f2f
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# web/app/components/workflow-app/hooks/use-nodes-sync-draft.ts
# web/contract/router.ts
|
2026-02-04 21:12:53 +08:00 |
|
|
|
1e344f773b
|
refactor(web): extract complex components into modular structure with comprehensive tests (#31729)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-04 18:35:31 +08:00 |
|
|
|
8a9e0e3b31
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# web/eslint-suppressions.json
|
2026-02-04 18:15:32 +08:00 |
|
|
|
297dd832aa
|
refactor(datasets): extract hooks and components with comprehensive tests (#31707)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-02-04 18:12:17 +08:00 |
|
|
|
cc5705cb71
|
fix: auto summary env (#31930)
|
2026-02-04 17:47:38 +08:00 |
|
|
|
6ee9078349
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/.env.example
# api/uv.lock
# web/app/components/app/create-app-modal/index.tsx
# web/app/components/app/create-from-dsl-modal/index.tsx
# web/app/components/apps/app-card.tsx
# web/pnpm-lock.yaml
|
2026-01-29 21:25:28 +08:00 |
|
|
|
7d1ad7e03a
|
refactor: unified shortcut keys display using component (#31713)
|
2026-01-29 17:57:46 +08:00 |
|
|
|
8a96f9f8df
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
|
2026-01-29 11:44:01 +08:00 |
|
|
|
8f414af34e
|
test: add comprehensive tests (#31649)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
|
2026-01-29 11:16:26 +08:00 |
|
|
|
a38b8987b4
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/core/app/apps/workflow/app_runner.py
|
2026-01-28 11:41:58 +08:00 |
|
|
|
6fff46bc29
|
feat: summary index (#31523)
|
2026-01-28 11:09:34 +08:00 |
|
|
|
5d41f67fe1
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# api/core/workflow/graph_events/__init__.py
|
2026-01-27 16:22:02 +08:00 |
|
|
|
c8abe1c306
|
test: add tests for dataset document detail (#31274)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
|
2026-01-27 15:43:27 +08:00 |
|
|
|
2e954388f5
|
merge
|
2026-01-26 16:57:45 +08:00 |
|
|
|
a43d2ec4f0
|
refactor: restructure Completed component (#31435)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
|
2026-01-26 14:03:51 +08:00 |
|
|
|
b87e303c00
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
# Conflicts:
# web/eslint-suppressions.json
# web/service/debug.ts
|
2026-01-22 22:40:32 +08:00 |
|
