|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
70a68f0a86
|
refactor: simplify the scroll area API for sidebar layouts (#33761)
|
2026-03-19 19:54:16 +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 |
|
|
|
79e5253410
|
refactor(web): sidebar app list to scroll area component (#33733)
|
2026-03-19 14:33: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 |
|
|
|
4822d550b6
|
chore: remove next img (#33517)
|
2026-03-16 16:48:22 +08:00 |
|
|
|
1a90c4d81b
|
refactor(web): migrate document list query state to nuqs (#32339)
|
2026-03-03 18:29:23 +08:00 |
|
|
|
ea0e1b52a8
|
refactor(web): make Switch controlled-only and migrate call sites (#32399)
|
2026-02-18 23:47:07 +08:00 |
|
|
|
ba12960975
|
refactor(web): centralize role-based route guards and fix anti-patterns (#32302)
|
2026-02-14 17:31:37 +08:00 |
|
|
|
1f74a251f7
|
fix: remove explore context and migrate query to orpc contract (#32320)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
2026-02-14 16:18:26 +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 |
|
|
|
a4e03d6284
|
test: add integration tests for app card operations, list browsing, and create app flows (#32298)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
|
2026-02-13 13:21:09 +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 |
|
|
|
3fd1eea4d7
|
feat(tests): add integration tests for explore app list, installed apps, and sidebar lifecycle flows (#32248)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
|
2026-02-12 10:29:03 +08:00 |
|
|
|
db0c527ce8
|
Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox
|
2026-02-09 18:43:04 +08:00 |
|
|
|
bc9ca4e0dd
|
style: update banner item styles and enhance dark/light theme variables (#32111)
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
|
2026-02-09 15:34:31 +08:00 |
|
|
|
e4ab6e0919
|
style: update banner item styles and enhance dark/light theme variables (#32111)
Co-authored-by: Crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
|
2026-02-09 15:32:40 +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 |
|
|
|
8c31b69c8e
|
chore: sticky the applist header in explore page (#31967)
|
2026-02-05 14:44:51 +08:00 |
|
|
|
476946f122
|
test: fix test (#31869)
|
2026-02-03 17:43:27 +08:00 |
|
|
|
62a698a883
|
fix: create app from template not support review (#31866)
|
2026-02-03 16:40:35 +08:00 |
|
|
|
aa7fe42615
|
test: enhance CommandSelector and GotoAnythingProvider tests (#31743)
Co-authored-by: CodingOnStar <hanxujiang@dify.com>
|
2026-02-03 13:47:30 +08:00 |
|
|
|
4346f61b0c
|
chore: hide disable try tab when not support (#31759)
|
2026-01-30 18:10:25 +08:00 |
|
|
|
b7e752078c
|
fix: trigger doc link (#31754)
|
2026-01-30 17:30:24 +08:00 |
|
|
|
c27df88417
|
feat: try app support review (#31716)
|
2026-01-29 19:40:47 +08:00 |
|
|
|
7d1ad7e03a
|
refactor: unified shortcut keys display using component (#31713)
|
2026-01-29 17:57:46 +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 |
|
|
|
b9f718005c
|
feat: frontend part of support try apps (#31287)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2026-01-22 18:16:37 +08:00 |
|
|
|
2aaaa4bd34
|
feat(web): migrate from es-toolkit/compat to native es-toolkit (#30244) (#30246)
|
2025-12-31 11:13:22 +08:00 |
|
|
|
1873b5a766
|
chore: remove useless __esModule (#30366)
|
2025-12-30 15:37:16 +08:00 |
|
|
|
6d0e36479b
|
refactor(i18n): use JSON with flattened key and namespace (#30114)
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2025-12-29 14:52:32 +08:00 |
|
|
|
3ae7788933
|
refactor(query-state): migrate query param state management to nuqs (#30184)
Co-authored-by: Stephen Zhou <38493346+hyoban@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
2025-12-29 11:24:54 +08:00 |
|
|
|
3cbbb06dc4
|
chore(web): migrate lodash-es to es-toolkit compat (#30126)
|
2025-12-25 09:44:57 +08:00 |
|
|
|
64a14dcdbc
|
fix(web): remove incorrect placeholderData usage in useExploreAppList (#30102)
|
2025-12-24 18:20:36 +08:00 |
|
|
|
18d69775ef
|
refactor(web): migrate explore app lists from useSWR to TanStack Query (#30076)
|
2025-12-24 17:03:43 +08:00 |
|
|
|
1e3823e605
|
chore: fix type check for i18n (#30058)
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
|
2025-12-24 16:31:16 +08:00 |
|
|
|
dcde854c5e
|
chore: some tests (#30078)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
|
2025-12-24 14:45:33 +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 |
|
|
|
079620714e
|
refactor: migrate common service toward TanStack Query (#29009)
|
2025-12-19 17:34:14 +08:00 |
|
|
|
d7b8db2afc
|
feat(tests): add comprehensive tests for Processing and EmbeddingProcess components (#29873)
Co-authored-by: CodingOnStar <hanxujiang@dify.ai>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
|
2025-12-19 15:21:21 +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 |
|
|
|
c12f0d16bb
|
chore(web): enhance frontend tests (#29869)
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
|
2025-12-18 17:47:13 +08:00 |
|
|
|
4ea2d31a79
|
chore(web): add some tests (#29772)
|
2025-12-18 10:06:02 +08:00 |
|
|
|
9812dc2cb2
|
chore: add some jest tests (#29800)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
|
2025-12-18 10:00:11 +08:00 |
|
|
|
eeb5129a17
|
refactor: create shared react-i18next mock to reduce duplication (#29711)
|
2025-12-16 12:45:17 +08:00 |
|
