Commit Graph
19 Commits
Author SHA1 Message Date
Novice 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
Novice 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
yyhandGitHub 69d1ccb7a7 refactor: route next/link through compat re-export (#33632) 2026-03-18 12:14:59 +08:00
335b500aea test: add unit tests for base components (#32818)
Co-authored-by: CodingOnStar <[email protected]>
2026-03-02 11:40:43 +08:00
yyh 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
Saumya TalwaniandGitHub 98466e2d29 test: add tests for some base components (#32265) 2026-02-13 14:29:04 +08:00
yyh db0c527ce8 Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox 2026-02-09 18:43:04 +08:00
yyh 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
Stephen ZhouandGitHub 47d0e400ae chore: update to story book nextjs-vite (#31536) 2026-01-26 17:07:20 +08:00
Stephen ZhouandGitHub 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 <[email protected]>
2025-12-23 16:58:55 +08:00
a26881cb24 refactor: unified cn utils (#29916)
Co-authored-by: yyh <[email protected]>
Co-authored-by: yyh <[email protected]>
2025-12-19 12:08:34 +08:00
+4
YeuolyGitHubStreamlyzno1zhsamaHarrylyzno1yesseniahjlarrygemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>WTW0313Copilot
b76e17b25d feat: introduce trigger functionality (#27644)
Signed-off-by: lyzno1 <[email protected]>
Co-authored-by: Stream <[email protected]>
Co-authored-by: lyzno1 <[email protected]>
Co-authored-by: zhsama <[email protected]>
Co-authored-by: Harry <[email protected]>
Co-authored-by: lyzno1 <[email protected]>
Co-authored-by: yessenia <[email protected]>
Co-authored-by: hjlarry <[email protected]>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: WTW0313 <[email protected]>
Co-authored-by: Copilot <[email protected]>
2025-11-12 17:59:37 +08:00
非法操作GitHubautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
f092bc1912 chore: add more stories (#27403)
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-10-29 14:33:43 +08:00
+10
-LAN-GitHubtwwucrazywoolajyongWu TianweiQuantumGhostlyzno1quicksandJyonglyzno1zxhlyhYongtao Huangautofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>JoelCopilotnite-kniteHanqing Zhaogemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>Harry
85cda47c70 feat: knowledge pipeline (#25360)
Signed-off-by: -LAN- <[email protected]>
Co-authored-by: twwu <[email protected]>
Co-authored-by: crazywoola <[email protected]>
Co-authored-by: jyong <[email protected]>
Co-authored-by: Wu Tianwei <[email protected]>
Co-authored-by: QuantumGhost <[email protected]>
Co-authored-by: lyzno1 <[email protected]>
Co-authored-by: quicksand <[email protected]>
Co-authored-by: Jyong <[email protected]>
Co-authored-by: lyzno1 <[email protected]>
Co-authored-by: zxhlyh <[email protected]>
Co-authored-by: Yongtao Huang <[email protected]>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <[email protected]>
Co-authored-by: Copilot <[email protected]>
Co-authored-by: nite-knite <[email protected]>
Co-authored-by: Hanqing Zhao <[email protected]>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <[email protected]>
2025-09-18 12:49:10 +08:00
7709d9df20 Chore: frontend infrastructure upgrade (#16420)
Co-authored-by: NFish <[email protected]>
Co-authored-by: zxhlyh <[email protected]>
Co-authored-by: twwu <[email protected]>
Co-authored-by: jZonG <[email protected]>
2025-03-21 17:41:03 +08:00
49feff082f feat: parent child retrieval (#12106)
Signed-off-by: -LAN- <[email protected]>
Co-authored-by: -LAN- <[email protected]>
2024-12-26 12:01:51 +08:00
-LAN-andGitHub db2aa83a7c Revert "Feat/parent child retrieval" (#12095) 2024-12-25 20:55:44 +08:00
+56 2b2263a349 Feat/parent child retrieval (#12086)
Signed-off-by: yihong0618 <[email protected]>
Signed-off-by: -LAN- <[email protected]>
Co-authored-by: AkaraChen <[email protected]>
Co-authored-by: nite-knite <[email protected]>
Co-authored-by: Joel <[email protected]>
Co-authored-by: Warren Chen <[email protected]>
Co-authored-by: crazywoola <[email protected]>
Co-authored-by: Yi Xiao <[email protected]>
Co-authored-by: yihong <[email protected]>
Co-authored-by: -LAN- <[email protected]>
Co-authored-by: KVOJJJin <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: JzoNgKVO <[email protected]>
Co-authored-by: Charlie.Wei <[email protected]>
Co-authored-by: crazywoola <[email protected]>
Co-authored-by: huayaoyue6 <[email protected]>
Co-authored-by: kurokobo <[email protected]>
Co-authored-by: Matsuda <[email protected]>
Co-authored-by: shirochan <[email protected]>
Co-authored-by: Jyong <[email protected]>
Co-authored-by: Huỳnh Gia Bôi <[email protected]>
Co-authored-by: Julian Huynh <[email protected]>
Co-authored-by: Hash Brown <[email protected]>
Co-authored-by: 非法操作 <[email protected]>
Co-authored-by: Kazuki Takamatsu <[email protected]>
Co-authored-by: Trey Dong <[email protected]>
Co-authored-by: VoidIsVoid <[email protected]>
Co-authored-by: Gimling <[email protected]>
Co-authored-by: xiandan-erizo <[email protected]>
Co-authored-by: Muneyuki Noguchi <[email protected]>
Co-authored-by: zhaobingshuang <[email protected]>
Co-authored-by: zhaobs <[email protected]>
Co-authored-by: suzuki.sh <[email protected]>
Co-authored-by: Yingchun Lai <[email protected]>
Co-authored-by: huanshare <[email protected]>
Co-authored-by: huanshare <[email protected]>
Co-authored-by: orangeclk <[email protected]>
Co-authored-by: 문정현 <[email protected]>
Co-authored-by: barabicu <[email protected]>
Co-authored-by: Wei Mingzhi <[email protected]>
Co-authored-by: Paul van Oorschot <[email protected]>
Co-authored-by: zkyTech <[email protected]>
Co-authored-by: zhangkunyuan <[email protected]>
Co-authored-by: Tommy <[email protected]>
Co-authored-by: zxhlyh <[email protected]>
Co-authored-by: Novice <[email protected]>
Co-authored-by: Novice Lee <[email protected]>
Co-authored-by: Novice Lee <[email protected]>
Co-authored-by: zxhlyh <[email protected]>
Co-authored-by: liuzhenghua <[email protected]>
Co-authored-by: Jiang <[email protected]>
Co-authored-by: jiangzhijie <[email protected]>
Co-authored-by: Joe <[email protected]>
Co-authored-by: Alok Shrivastwa <[email protected]>
Co-authored-by: Alok Shrivastwa <[email protected]>
Co-authored-by: JasonVV <[email protected]>
Co-authored-by: Hiroshi Fujita <[email protected]>
Co-authored-by: Kevin9703 <[email protected]>
Co-authored-by: NFish <[email protected]>
Co-authored-by: Junyan Qin <[email protected]>
Co-authored-by: IWAI, Masaharu <[email protected]>
Co-authored-by: IWAI, Masaharu <[email protected]>
Co-authored-by: Bowen Liang <[email protected]>
Co-authored-by: luckylhb90 <[email protected]>
Co-authored-by: hobo.l <[email protected]>
Co-authored-by: douxc <[email protected]>
2024-12-25 18:17:15 +08:00