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
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
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
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
f50e44b24a
test: improve coverage for some test files ( #32916 )
...
Signed-off-by: edvatar <88481784+toroleapinc@users.noreply.github.com >
Signed-off-by: -LAN- <laipz8200@outlook.com >
Signed-off-by: dependabot[bot] <support@github.com >
Signed-off-by: majiayu000 <1835304752@qq.com >
Co-authored-by: Poojan <poojan@infocusp.com >
Co-authored-by: sahil-infocusp <73810410+sahil-infocusp@users.noreply.github.com >
Co-authored-by: 非法操作 <hjlarry@163.com >
Co-authored-by: Pandaaaa906 <ye.pandaaaa906@gmail.com >
Co-authored-by: Asuka Minato <i@asukaminato.eu.org >
Co-authored-by: heyszt <270985384@qq.com >
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Ijas <ijas.ahmd.ap@gmail.com >
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: 木之本澪 <kinomotomiovo@gmail.com >
Co-authored-by: KinomotoMio <200703522+KinomotoMio@users.noreply.github.com >
Co-authored-by: 不做了睡大觉 <64798754+stakeswky@users.noreply.github.com >
Co-authored-by: User <user@example.com >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
Co-authored-by: edvatar <88481784+toroleapinc@users.noreply.github.com >
Co-authored-by: -LAN- <laipz8200@outlook.com >
Co-authored-by: Leilei <138381132+Inlei@users.noreply.github.com >
Co-authored-by: HaKu <104669497+haku-ink@users.noreply.github.com >
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: wangxiaolei <fatelei@gmail.com >
Co-authored-by: Varun Chawla <34209028+veeceey@users.noreply.github.com >
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com >
Co-authored-by: yyh <yuanyouhuilyz@gmail.com >
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com >
Co-authored-by: tda <95275462+tda1017@users.noreply.github.com >
Co-authored-by: root <root@DESKTOP-KQLO90N>
Co-authored-by: Sisyphus <clio-agent@sisyphuslabs.ai >
Co-authored-by: Niels Kaspers <153818647+nielskaspers@users.noreply.github.com >
Co-authored-by: hj24 <mambahj24@gmail.com >
Co-authored-by: Tyson Cung <45380903+tysoncung@users.noreply.github.com >
Co-authored-by: Stephen Zhou <hi@hyoban.cc >
Co-authored-by: FFXN <31929997+FFXN@users.noreply.github.com >
Co-authored-by: slegarraga <64795732+slegarraga@users.noreply.github.com >
Co-authored-by: 99 <wh2099@pm.me >
Co-authored-by: Br1an <932039080@qq.com >
Co-authored-by: L1nSn0w <l1nsn0w@qq.com >
Co-authored-by: Yunlu Wen <yunlu.wen@dify.ai >
Co-authored-by: akkoaya <151345394+akkoaya@users.noreply.github.com >
Co-authored-by: 盐粒 Yanli <yanli@dify.ai >
Co-authored-by: lif <1835304752@qq.com >
Co-authored-by: weiguang li <codingpunk@gmail.com >
Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com >
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com >
Co-authored-by: HanWenbo <124024253+hwb96@users.noreply.github.com >
Co-authored-by: Coding On Star <447357187@qq.com >
Co-authored-by: CodingOnStar <hanxujiang@dify.com >
Co-authored-by: Stable Genius <stablegenius043@gmail.com >
Co-authored-by: Stable Genius <259448942+stablegenius49@users.noreply.github.com >
Co-authored-by: ふるい <46769295+Echo0ff@users.noreply.github.com >
Co-authored-by: Xiyuan Chen <52963600+GareArc@users.noreply.github.com >
2026-03-06 18:59:16 +08:00
335b500aea
test: add unit tests for base components ( #32818 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.com >
2026-03-02 11:40:43 +08:00
a71d13523d
feat: Add Command and FileUpload workflow icons, fix SSH provider icon
2026-02-11 21:16:57 +08:00
ca243d7efc
chore(web): pre-align HITL frontend from build/feat/hitl
2026-02-09 15:34:15 +08:00
a1fc280102
feat: Human Input Node ( #32060 )
...
The frontend and backend implementation for the human input node.
Co-authored-by: twwu <twwu@dify.ai >
Co-authored-by: JzoNg <jzongcode@gmail.com >
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com >
Co-authored-by: zhsama <torvalds@linux.do >
2026-02-09 14:57:23 +08:00
e9bff0b7b7
feat(sandbox): use official brand assets for provider icons
...
Replace placeholder sandbox provider icons with official brand assets:
- Docker: white whale SVG on brand blue (#1D63ED) background
- E2B: official PNG logo via CSS module
- Local: Dify-branded SVG icon (SandboxLocal)
2026-02-08 02:04:20 +08:00
23f7f188bd
chore(web): add FileAdd and FolderAdd icons
2026-02-05 16:56:27 +08:00
7dcb0897c4
chore(web): add UploadCloud02 icon
2026-02-05 16:56:27 +08:00
90fe9abab7
revert: revert human input relevant code ( #31766 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-01-30 19:18:49 +08:00
d2a60b3b94
Revert "fix(icons): normalize SVG fill/stroke colors to black for CSS Icons pipeline"
...
This reverts commit a886bfef8a
2026-01-30 12:42:20 +08:00
fedd097f63
feat: Human Input node (Frontend Part) ( #31631 )
...
Co-authored-by: JzoNg <jzongcode@gmail.com >
Co-authored-by: Joel <iamjoel007@gmail.com >
Co-authored-by: yessenia <yessenia.contact@gmail.com >
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com >
2026-01-30 10:16:46 +08:00
a886bfef8a
fix(icons): normalize SVG fill/stroke colors to black for CSS Icons pipeline
...
Hardcoded colors (#354052 , #676F83, #98A2B3, #155EEF, white) prevent
the Iconify parseColors callback from converting them to currentColor,
causing the icons to render as background-image instead of mask-image
and making text-* color utilities ineffective.
2026-01-29 21:56:52 +08:00
27639600f9
feat(web): add FileDownload01 icon and use it in artifacts tab
...
Replace RiDownloadLine with a file-specific download icon for the
artifacts file list and remove the unused copy-path button.
2026-01-28 14:11:18 +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
54fce5e903
feat: Add @agent icon and implement agent alias variables in workflow
...
inspector
2026-01-27 02:42:37 +08:00
87d033e186
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
2026-01-26 23:12:44 +08:00
f561656a89
chore: follow-up fixes for storybook vite migration ( #31545 )
2026-01-26 20:20:14 +08:00
5ac70633a2
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
...
# Conflicts:
# web/pnpm-lock.yaml
2026-01-26 17:09:36 +08:00
47d0e400ae
chore: update to story book nextjs-vite ( #31536 )
2026-01-26 17:07:20 +08:00
4c596aaac2
Merge branch 'feat/collaboration2' into feat/support-agent-sandbox
2026-01-25 00:00:03 +08:00
88887ea58e
feat(icons): add custom FileImageFill icon for image file type
...
Replace RiFileImageFill with a custom FileImageFill icon to provide
a more distinctive visual representation for image files in the file tree.
2026-01-23 17:09:40 +08:00
84b4fed3df
chore: add table cells icon to db selector
2026-01-22 16:13:09 +08:00
bddb41cd47
feat: add db types in file tree icon
2026-01-22 16:13:09 +08:00
c5fc3cc08e
revert icons
2026-01-20 14:00:46 +08:00
8154d0af53
feat: add FolderSpark icon for workflow
2026-01-20 13:51:49 +08:00
13d6923c11
Merge branch 'feat/llm-support-tools' into feat/support-agent-sandbox
2026-01-20 10:27:42 +08:00
f44305af0d
feat: add AssembleVariablesAlt icon and integrate into sub-graph
...
components.
2026-01-19 22:31:04 +08:00
434f7f3bcb
fix web style
2026-01-17 22:10:10 +08:00
fc291e4ca2
Merge remote-tracking branch 'myori/main' into feat/collaboration2
2026-01-17 10:22:41 +08:00
0c62c39a1d
Merge branch 'zhsama/assemble-var-input' into feat/pull-a-variable
2026-01-16 18:54:53 +08:00
8d643e4b85
feat: add assemble variables icon
2026-01-16 18:45:28 +08:00
4d3d8b35d9
Merge branch 'main' into feat/llm-node-support-tools
2026-01-08 14:28:13 +08:00
cd1af04dee
feat: model total credits ( #30727 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.ai >
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com >
2026-01-08 14:11:44 +08:00
70149ea05e
Merge branch 'main' into feat/llm-node-support-tools
2026-01-07 16:29:47 +08:00
1d93f41fcf
feat: llm node support tools
2026-01-07 16:28:41 +08:00
c29cfd18f3
feat: revert model total credits ( #30518 )
2026-01-04 18:29:19 +08:00
84cbf0526d
feat: model total credits ( #26942 )
...
Co-authored-by: CodingOnStar <hanxujiang@dify.ai >
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com >
2026-01-04 15:26:37 +08:00
8f2aabf7bd
chore: Standardized the OpenAI icon ( #30471 )
2026-01-03 02:34:17 +09:00
e856287b65
chore: update knip config and include in CI ( #30410 )
2025-12-31 15:38:07 +08:00
3cbbb06dc4
chore(web): migrate lodash-es to es-toolkit compat ( #30126 )
2025-12-25 09:44:57 +08:00
403adefc07
chore: lint require and how to import react ( #30041 )
2025-12-23 18:02:10 +08:00
f2842da397
chore(web): new lint setup ( #30020 )
...
Co-authored-by: yyh <yuanyouhuilyz@gmail.com >
2025-12-23 16:58:55 +08:00
eabdc5f0eb
refactor(web): migrate to Vitest and esm ( #29974 )
...
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com >
Co-authored-by: yyh <yuanyouhuilyz@gmail.com >
2025-12-22 16:35:22 +08:00
a26881cb24
refactor: unified cn utils ( #29916 )
...
Co-authored-by: yyh <yuanyouhuilyz@gmail.com >
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com >
2025-12-19 12:08:34 +08:00
91e5db3e83
chore: Advance the timing of the dataset payment prompt ( #29497 )
...
Co-authored-by: yyh <yuanyouhuilyz@gmail.com >
Co-authored-by: twwu <twwu@dify.ai >
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com >
2025-12-11 15:49:42 +08:00
