wanwu/deer-flow
1
0
Fork 0
mirror of https://gitee.com/wanwujie/deer-flow synced 2026-04-03 06:12:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
468 Commits 15 Branches 0 Tags
58e10b0bcac840b5932090a4774180c587e64502
Commit Graph

468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruitanglin
58e10b0bca Merge upstream/experimental and resolve conflicts; citations + path_utils + mode-hover 
## 冲突解决 (Resolve conflicts)
- input-box.tsx: 保留 ModeHoverGuide 包裹的模式选择器（PR #26 的 mode-hover-guide）
- message-group.tsx: 保留 getCleanContent / hasCitationsBlock / useParsedCitations
- message-list-item.tsx: 保留 useParsedCitations，移除重复的 MessageLink（使用 CitationAwareLink）
- artifact-file-detail.tsx: 保留 CitationAwareLink、useParsedCitations、contentWithoutCitationsFromParsed
- artifacts.py: 保留 path_utils 与 _extract_citation_urls + remove_citations_block 精简实现
- citations/index.ts: 保留并补充 contentWithoutCitationsFromParsed 导出
- en-US.ts: 保留 Ultra 模式描述 "Reasoning, planning and execution with subagents..."
- zh-CN.ts: 保留「超级」标签，描述保留「思考、计划并执行，可调用子代理分工协作...」

## PR #26 代码改动汇总

### 1. Citations（引用）
- lead_agent prompt: 增加 Web search 与子代理合成时的 citation 提示
- general_purpose: 子代理 system prompt 增加 <citations_format> 说明
- frontend utils: 新增 contentWithoutCitationsFromParsed，removeAllCitations 基于单次解析
- frontend artifact: 使用 contentWithoutCitationsFromParsed(parsed) 避免对同一内容解析两次
- backend artifacts: _extract_citation_urls + remove_citations_block，json 提到顶部

### 2. path_utils（路径解析）
- 新增 backend/src/gateway/path_utils.py：resolve_thread_virtual_path，防 path traversal
- artifacts.py / skills.py：删除内联路径解析，统一使用 path_utils

### 3. Mode hover guide
- input-box: 模式选择器外包 ModeHoverGuide，悬停展示模式说明

### 4. i18n
- en: ultraModeDescription 与 zh: ultraMode / ultraModeDescription 与上游对齐并保留 PR 文案

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 13:01:01 +08:00
ruitanglin
eb5782b93b feat: citations prompts, path_utils, and citation code cleanup 
- Prompt: add citation reminders for web_search and subagent synthesis (lead_agent, general_purpose)
- Gateway: add path_utils for shared thread virtual path resolution; refactor artifacts and skills to use it
- Citations: simplify removeAllCitations (single parse); backend _extract_citation_urls and remove_citations_block cleanup

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 12:55:12 +08:00
ruitanglin
2b10b97bb9 chore(frontend): remove unused Citation UI components from inline-citation 
- Remove InlineCitation, InlineCitationText, InlineCitationCardTrigger
- Remove InlineCitationCarousel and all Carousel subcomponents (Content, Item, Header, Index, Prev, Next)
- Remove InlineCitationQuote
- Drop Carousel/carousel and ArrowLeft/ArrowRight icon imports; keep only CitationLink, CitationAwareLink, CitationsLoadingIndicator and their dependencies

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 12:49:31 +08:00
ruitanglin
5e000f1a99 feat(frontend): add mode hover guide and adjust mode i18n 
## 中文

### 代码改动
- **新增** `frontend/src/components/workspace/mode-hover-guide.tsx`
  - 新增 ModeHoverGuide 组件：接收 mode (flash/thinking/pro/ultra) 与 children，用 Tooltip 包裹
  - hover 时展示该模式名称与简介，支持 showTitle 控制是否显示模式名
  - 文案通过 useI18n 从 inputBox 的 *Mode / *ModeDescription 读取，中英文已支持
- **修改** `frontend/src/components/workspace/input-box.tsx`
  - 在模式选择器触发按钮外包一层 ModeHoverGuide，悬停当前模式时显示说明
- **修改** `frontend/src/core/i18n/locales/zh-CN.ts`
  - ultraModeDescription：改为完整描述「思考、计划并执行，可调用子代理分工协作，适合复杂多步骤任务，能力最强」（不再仅写「专业模式加子代理」）
  - proMode / ultraMode：中文环境下保留英文原文 "Pro"、"Ultra"，不再翻译为「专业」「超级」
- **修改** `frontend/src/core/i18n/locales/en-US.ts`
  - ultraModeDescription：改为 "Reasoning, planning and execution with subagents to divide work; best for complex multi-step tasks"

### 说明
为 Flash / 思考 / Pro / Ultra 四种模式增加 hover 说明，并统一超级模式文案与 Pro/Ultra 在中文下的展示。

Co-authored-by: Cursor <cursoragent@cursor.com>

---

## English

### Code changes
- **Add** `frontend/src/components/workspace/mode-hover-guide.tsx`
  - New ModeHoverGuide component: takes mode (flash/thinking/pro/ultra) and children, wraps in Tooltip
  - On hover shows mode name and short description; showTitle toggles mode name in tooltip
  - Copy from useI18n (inputBox *Mode / *ModeDescription), i18n in zh-CN and en-US
- **Update** `frontend/src/components/workspace/input-box.tsx`
  - Wrap mode selector trigger with ModeHoverGuide so hovering shows current mode description
- **Update** `frontend/src/core/i18n/locales/zh-CN.ts`
  - ultraModeDescription: full description (reasoning, planning, execution, subagents, complex tasks); no longer "Pro + subagents" only
  - proMode / ultraMode: keep English "Pro" and "Ultra" in zh locale instead of "专业" / "超级"
- **Update** `frontend/src/core/i18n/locales/en-US.ts`
  - ultraModeDescription: "Reasoning, planning and execution with subagents to divide work; best for complex multi-step tasks"

### Summary
Hover guide for all four modes (Flash / Reasoning / Pro / Ultra); clearer Ultra copy and Pro/Ultra labels in Chinese.
 2026-02-09 12:33:16 +08:00
ruitanglin
175c1d2e3b refactor(frontend): simplify and deduplicate Citation-related code 
- Extract removeCitationsBlocks in utils, reuse in parseCitations and removeAllCitations
- Add hasCitationsBlock; isCitationsBlockIncomplete now uses it
- Add useParsedCitations hook (parseCitations + buildCitationMap) for message/artifact
- Add CitationAwareLink to unify link rendering (message-list-item + artifact-file-detail)
- Add getCleanContent helper; message-group uses it and useParsedCitations
- ArtifactFileDetail: single useParsedCitations, pass cleanContent/citationMap to Preview
- Stop exporting buildCitationMap and removeCitationsBlocks from citations index
- Remove duplicate MessageLink and inline link logic in artifact preview

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 12:13:06 +08:00
LofiSu
302211696e Merge branch 'hetaoBackend:experimental' into experimental 2026-02-09 11:58:56 +08:00
Henry Li
3ad2cd936f feat: update workspace header to conditionally render title based on environment variable 2026-02-09 09:20:32 +08:00
Henry Li
e6261469ef feat: make it golden 2026-02-09 09:15:39 +08:00
Henry Li
76cdb0e16e feat: make the title golden in Ultra mode 2026-02-09 08:59:40 +08:00
ruitanglin
509ea874f7 fix(frontend): citations display + refactor link/citation utils 
- Citations: no underline while streaming (message links); artifact markdown external links as citation cards
- Refactor: add isExternalUrl, syntheticCitationFromLink in core/citations; shared externalLinkClass in lib/utils; simplify message-list-item and artifact-file-detail link rendering

修复引用展示并抽离链接/引用工具
- 引用：流式输出时链接不这下划线；Artifact 内 Markdown 外链以引用卡片展示
- 重构：core/citations 新增 isExternalUrl、syntheticCitationFromLink；lib/utils 共享 externalLinkClass；精简消息与 Artifact 中的链接渲染逻辑

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 04:03:15 +08:00
ruitanglin
8cb14ad4fb fix(frontend): build + remove hover tooltips in step links 
- Fix Turbopack build: replace raw-loader .md import with inlined about-content.ts; drop raw-loader from next.config and package.json
- Remove all hover tooltips on step-area links (web_fetch, read_file, ls, bash, write_file, web_search) so hidden steps no longer show popups

修复：构建错误与步骤链接悬停提示
- 修复 Turbopack 构建：用内联 about-content.ts 替代 raw-loader 导入 about.md，并移除 next.config 与 package.json 中的 raw-loader
- 移除步骤区域内所有链接的悬停提示（查看网页、读文件、列目录、bash、写文件、网页搜索），隐藏步骤悬停不再弹出内容

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 03:42:16 +08:00
ruitanglin
f577ff115b Revert "fix(frontend): Turbopack about page + remove hover on web search/citations" 
This reverts commit 7e9e061f20fcec1f1a9c35be40d9407c05ed82be.
 2026-02-09 03:23:51 +08:00
ruitanglin
77859d01b8 fix(frontend): Turbopack about page + remove hover on web search/citations 
- About: use aboutMarkdown from about-content.ts instead of raw-loader for
  about.md (fixes Turbopack 'Cannot find module raw-loader')
- Web search: remove Tooltip from web_search and web_fetch result links
- Citations: remove HoverCard from CitationLink so no hover popup on badges

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-09 03:23:02 +08:00
Henry Li
d197ee8f28 feat: add mode in welcome 2026-02-09 00:41:25 +08:00
Henry Li
d9b60778a9 feat: set golden color for ultra 2026-02-09 00:30:20 +08:00
Henry Li
eb9af00d1d feat: rewording 2026-02-08 23:44:36 +08:00
hetaoBackend
54f2f1bd3a feat: disallow present_files tool in subagents and add market-analysis skill 
Add "present_files" to disallowed_tools for bash and general-purpose
subagents to prevent them from presenting files directly. Also add the
new market-analysis skill for generating consulting-grade reports.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-08 23:38:55 +08:00
Henry Li
0d55230016 feat: add special effect for Ultra mode 2026-02-08 23:22:51 +08:00
hetaoBackend
d891a8a37c docs: revise backend README and CLAUDE.md to reflect full architecture 
Updated documentation to accurately cover all backend subsystems including
subagents, memory, middleware chain, sandbox, MCP, skills, and gateway API.
Fixed broken MCP_SETUP.md link in root README.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-08 22:50:42 +08:00
Henry Li
7d4b5eb3ca feat: add realtime subagent status report 2026-02-08 22:43:51 +08:00
hetaoBackend
faa327b3cd feat: limit concurrent subagents to 3 per turn 
Prevent resource exhaustion by capping the number of parallel subagents.
Adds runtime enforcement in task_tool and updates prompts/examples accordingly.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
 2026-02-08 22:12:21 +08:00
hetaoBackend
54772947cb feat: add real-time streaming of subagent AI messages 
Enable task tool to capture and stream AI messages as they are generated by subagents. This replaces simple polling status updates with detailed message-level progress updates.

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2026-02-08 21:29:45 +08:00
Henry Li
ff7437f830 feat: rewording and add initial animation 2026-02-08 21:24:17 +08:00
hetaoBackend
f01c470e64 fix: fix sub agent timeout 2026-02-08 21:09:18 +08:00
Henry Li
542b04588a refactor: optimize task handling in message list 2026-02-07 18:42:24 +08:00
Henry Li
a4e89cc96b feat: add ambilight 2026-02-07 18:42:08 +08:00
Henry Li
0810917b69 feat: add handling for task timeout and enhance Streamdown plugin for word animation 2026-02-07 18:06:22 +08:00
Henry Li
4dc3cdac48 feat: adjust position 2026-02-07 18:00:24 +08:00
Henry Li
17b2630b73 fix: adjust suggestion positioning and height for improved UI layout 2026-02-07 17:56:06 +08:00
hetaoBackend
a6db74baba refactor: optimize task tool parameter order and improve task tracking 
- Reorder task tool parameters to prioritize description first for better usability
- Add tool_call_id injection for better task traceability
- Use tool_call_id as task_id in executor for consistent tracking
- Simplify event messages by removing redundant task_type field
- Update task examples in prompt to reflect new parameter order

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
 2026-02-07 16:56:13 +08:00
Henry Li
46798c0931 feat: support subtasks 2026-02-07 16:14:48 +08:00
Henry Li
e04e70c7a8 Merge remote-tracking branch 'refs/remotes/origin/experimental' into experimental 2026-02-07 16:13:48 +08:00
LofiSu
9f8d9e4da2 Merge pull request #25 from LofiSu/feat/citations 
feat(citations): add shared citation components and optimize code
 2026-02-07 12:13:32 +08:00
LofiSu
e4eb4a65cf Merge pull request #25 from LofiSu/feat/citations 
feat(citations): add shared citation components and optimize code
 2026-02-07 12:13:32 +08:00
Henry Li
e7cd5287f1 feat: enhance workspace navigation menu with conditional rendering and mounted state 2026-02-07 11:10:24 +08:00
Henry Li
91a05acdf8 feat: enhance workspace navigation menu with conditional rendering and mounted state 2026-02-07 11:10:24 +08:00
Henry Li
85767c8470 docs: update description for surprise-me skill to enhance clarity 2026-02-07 10:51:43 +08:00
Henry Li
60be7ee20d docs: update description for surprise-me skill to enhance clarity 2026-02-07 10:51:43 +08:00
Henry Li
1d3ed9f43b styles: format 2026-02-07 10:50:08 +08:00
Henry Li
c758a28a3e styles: format 2026-02-07 10:50:08 +08:00
Henry Li
fc543a9b30 feat: add animations 2026-02-07 10:30:35 +08:00
Henry Li
a122f76e36 feat: add animations 2026-02-07 10:30:35 +08:00
ruitanglin
ea543ce1f4 Merge upstream/experimental into feat/citations 
Resolved conflicts:
- backend/src/gateway/routers/artifacts.py: Keep citations block removal for markdown downloads
- frontend/src/components/workspace/messages/message-list-item.tsx: Keep improved citation handling with rehypePlugins, humanMessagePlugins, and CitationsLoadingIndicator

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-07 00:53:16 +08:00
LofiSu
f0075e0d64 Merge upstream/experimental into feat/citations 
Resolved conflicts:
- backend/src/gateway/routers/artifacts.py: Keep citations block removal for markdown downloads
- frontend/src/components/workspace/messages/message-list-item.tsx: Keep improved citation handling with rehypePlugins, humanMessagePlugins, and CitationsLoadingIndicator

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-07 00:53:16 +08:00
Henry Li
c3f9089e95 fix: fix markdown table 2026-02-06 22:00:55 +08:00
Henry Li
5ed15d79c9 fix: fix markdown table 2026-02-06 22:00:55 +08:00
Henry Li
5016a5f7d9 Merge pull request #24 from LofiSu/fix/upload-files-alignment 
fix: 修复用户消息中上传文件的右对齐显示
 2026-02-06 21:53:01 +08:00
Henry Li
6b56e68ff2 Merge pull request #24 from LofiSu/fix/upload-files-alignment 
fix: 修复用户消息中上传文件的右对齐显示
 2026-02-06 21:53:01 +08:00
hetao
d1d275bb81 fix: fix subagent prompt 2026-02-06 20:32:15 +08:00
hetao
9e4f2512f3 fix: fix subagent prompt 2026-02-06 20:32:15 +08:00