yyh
30b9295156
Merge remote-tracking branch 'origin/build/feat/hitl' into wip/hitl-merge-web-conflicts-20260206-175434
...
# Conflicts:
# api/.env.example
# api/core/app/apps/advanced_chat/app_generator.py
# api/core/app/apps/advanced_chat/app_runner.py
# api/core/app/apps/advanced_chat/generate_task_pipeline.py
# api/core/app/apps/workflow/app_generator.py
# api/core/app/apps/workflow/app_runner.py
# api/core/app/entities/queue_entities.py
# api/core/workflow/node_events/__init__.py
# api/core/workflow/runtime/graph_runtime_state.py
# api/fields/message_fields.py
# api/services/workflow_service.py
# web/app/components/app/app-publisher/index.tsx
# web/app/components/base/chat/chat/answer/index.tsx
# web/app/components/base/chat/chat/hooks.ts
# web/app/components/base/chat/chat/type.ts
# web/app/components/base/prompt-editor/index.tsx
# web/app/components/rag-pipeline/hooks/use-available-nodes-meta-data.ts
# web/app/components/share/text-generation/result/header.tsx
# web/app/components/workflow-app/components/workflow-header/features-trigger.tsx
# web/app/components/workflow-app/hooks/use-workflow-run.ts
# web/app/components/workflow/hooks/use-checklist.ts
# web/app/components/workflow/hooks/use-fetch-workflow-inspect-vars.ts
# web/app/components/workflow/hooks/use-workflow.ts
# web/app/components/workflow/nodes/_base/components/variable/var-reference-picker.tsx
# web/app/components/workflow/nodes/_base/components/variable/var-reference-vars.tsx
# web/app/components/workflow/nodes/_base/node.tsx
# web/app/components/workflow/nodes/tool/components/mixed-variable-text-input/components/placeholder.tsx
# web/app/components/workflow/panel/debug-and-preview/hooks.ts
# web/app/components/workflow/panel/workflow-preview.tsx
# web/app/components/workflow/store/workflow/workflow-slice.ts
# web/eslint-suppressions.json
# web/i18n/en-US/common.json
# web/i18n/zh-Hans/common.json
# web/i18n/zh-Hant/common.json
# web/service/workflow.ts
2026-02-06 19:13:51 +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
zhsama
7446779198
perf: Update agent extraction UI styling and labels
2026-02-05 16:57:20 +08:00
zhsama
23f98652e1
perf: Add null check for onAssembleVariables callback
2026-02-04 17:52:13 +08:00
QuantumGhost
8ca020e179
Revert "revert: revert human input relevant code ( #31766 )"
...
This reverts commit 90fe9abab7 .
2026-02-01 16:21:14 +08:00
zhsama
b6465327c1
fix: Fix race condition in prompt editor reference sync
2026-01-31 22:10:38 +08:00
QuantumGhost
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
hjlarry
ed9efba039
fix: variable of sync display in prompt editor
2026-01-30 15:13:32 +08:00
Wu Tianwei
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
zhsama
206d56358d
feat(prompt-editor): add external search and keyboard navigation to
...
variable picker
2026-01-30 02:54:50 +08:00
Joel
1fcff5f8d1
fix: click files close
2026-01-21 17:15:43 +08:00
zhsama
68d36ff3ed
refactor: Refactor agent context insertion in prompt editor
2026-01-20 20:25:09 +08:00
Joel
331c65fd1d
fix: click file tab caused popup hide
2026-01-20 15:35:08 +08:00
Stephen Zhou
d4ed398e4f
fix lint
2026-01-20 14:26:01 +08:00
Joel
2650ceb0a6
feat: support picker vars files ui in editor
2026-01-20 14:01:30 +08:00
zhsama
c44aaf1883
fix: Fix prompt editor trigger match to use current selection
2026-01-20 00:42:19 +08:00
zhsama
6f74a66c8a
feat: enable typeahead filtering and keyboard navigation
2026-01-19 23:12:08 +08:00
zhsama
06f6ded20f
fix: Fix assemble variables insertion in prompt editor
2026-01-19 14:59:08 +08:00
zhsama
77401e6f5c
feat: optimize variable picker styling and optimize agent nodes
2026-01-16 18:21:43 +08:00
zhsama
1bc1c04be5
feat: add assemble variables entry
2026-01-16 17:03:22 +08:00
zhsama
f43fde5797
feat: Enhance context variable handling for Agent and LLM nodes
2026-01-15 23:26:19 +08:00
zhsama
ddbbddbd14
refactor: Update variable syntax to support agent context markers
...
Extend variable pattern matching to support both `#` and `@` markers,
with `@` specifically used for agent context variables. Update regex
patterns, text processing logic, and add sub-graph persistence for agent
variable handling.
2026-01-13 17:13:45 +08:00
zhsama
b25b069917
fix: refine agent variable logic
2026-01-12 18:12:06 +08:00
zhsama
8b0bc6937d
feat: enhance component picker and workflow variable block functionality
2026-01-08 18:17:09 +08:00
zhsama
1aed585a19
feat: enhance agent integration in prompt editor and mixed-variable text input
2026-01-08 17:02:35 +08:00
yyh
2aaaa4bd34
feat(web): migrate from es-toolkit/compat to native es-toolkit ( #30244 ) ( #30246 )
2025-12-31 11:13:22 +08:00
Stephen Zhou
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
yyh
3cbbb06dc4
chore(web): migrate lodash-es to es-toolkit compat ( #30126 )
2025-12-25 09:44:57 +08:00
Stephen Zhou
f2842da397
chore(web): new lint setup ( #30020 )
...
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
2025-12-23 16:58:55 +08:00
Stephen Zhou
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
Yeuoly
b76e17b25d
feat: introduce trigger functionality ( #27644 )
...
Signed-off-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zhsama <torvalds@linux.do>
Co-authored-by: Harry <xh001x@hotmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: yessenia <yessenia.contact@gmail.com>
Co-authored-by: hjlarry <hjlarry@163.com>
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 <twwu@dify.ai>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-11-12 17:59:37 +08:00
GuanMu
43bcf40f80
refactor: update installed app component to handle missing params and improve type safety ( #27331 )
2025-10-27 14:38:58 +08:00
-LAN-
85cda47c70
feat: knowledge pipeline ( #25360 )
...
Signed-off-by: -LAN- <laipz8200@outlook.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>
Co-authored-by: jyong <718720800@qq.com>
Co-authored-by: Wu Tianwei <30284043+WTW0313@users.noreply.github.com>
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
Co-authored-by: lyzno1 <yuanyouhuilyz@gmail.com>
Co-authored-by: quicksand <quicksandzn@gmail.com>
Co-authored-by: Jyong <76649700+JohnJyong@users.noreply.github.com>
Co-authored-by: lyzno1 <92089059+lyzno1@users.noreply.github.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: Yongtao Huang <yongtaoh2022@gmail.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: Harry <xh001x@hotmail.com>
2025-09-18 12:49:10 +08:00
Yongtao Huang
208ce4e774
CI: add TS indentation check via esLint ( #24810 )
2025-09-01 15:31:59 +08:00
Joel
dac72b078d
feat: support bool type variable frontend ( #24437 )
...
Co-authored-by: QuantumGhost <obelisk.reg+git@gmail.com>
2025-08-26 18:16:05 +08:00
Joel
de9c5f10b3
feat: enchance prompt and code ( #23633 )
...
Co-authored-by: stream <stream@dify.ai>
Co-authored-by: Stream <1542763342@qq.com>
Co-authored-by: Stream <Stream_2@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2025-08-18 12:29:12 +08:00
zxhlyh
f78b903a49
Chore/variable label ( #23270 )
2025-08-01 15:43:36 +08:00
Minamiyama
7e666dc3b1
fix(prompt-editor): show error warning for destructive env and conv var ( #21802 )
2025-07-15 14:10:50 +08:00
Joel
5375d9bb27
feat: the frontend part of mcp ( #22131 )
...
Co-authored-by: jZonG <jzongcode@gmail.com>
Co-authored-by: Novice <novice12185727@gmail.com>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: Hanqing Zhao <sherry9277@gmail.com>
2025-07-10 14:14:02 +08:00
zxhlyh
45dc0a43d3
fix: prompt editor insert context ( #21526 )
2025-06-26 09:58:58 +08:00
zxhlyh
819c02f1f5
fix: prompt editor click to insert variable ( #21470 )
2025-06-25 11:34:58 +08:00
kurokobo
df6451076b
fix: prevent nodes from being unintentionally deleted by pressing the backspace key. ( #21023 )
2025-06-17 16:11:30 +08:00
wellCh4n
276c02f341
feat: Variable click jumps to source node ( #13623 )
2025-05-19 23:17:18 +08:00
allenZhang
5a6f20d575
Optimize the event handling and rendering logic of the component picker ( #19232 )
2025-05-06 09:48:53 +08:00
Joel
759584f8c5
fix: not render conversation var in prompt editor ( #18728 )
2025-04-25 09:06:07 +08:00
allenZhang
94e22ba0fd
feat: add search input field ( #18409 )
2025-04-22 11:07:18 +08:00
Joel
775dc47abe
feat: llm support struct output ( #17994 )
...
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
2025-04-18 16:53:43 +08:00
yusheng chen
4c99e9dc73
refactor: type improvements that doesn't modify functionality ( #17970 )
2025-04-14 16:06:10 +08:00
yusheng chen
c05e03fc09
refactor & perf: import { noop } from 'lodash-es' across web ( #17439 )
2025-04-06 17:56:08 +08:00
Joel
7709d9df20
Chore: frontend infrastructure upgrade ( #16420 )
...
Co-authored-by: NFish <douxc512@gmail.com>
Co-authored-by: zxhlyh <jasonapring2015@outlook.com>
Co-authored-by: twwu <twwu@dify.ai>
Co-authored-by: jZonG <jzongcode@gmail.com>
2025-03-21 17:41:03 +08:00