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
368 Commits 15 Branches 0 Tags
0fff2880d33f4ba66c1427c2dbd07fd4a48c406d
Commit Graph

260 Commits

Author SHA1 Message Date
LofiSu
0fff2880d3 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
LofiSu
2a39947830 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
LofiSu
8168ea47b3 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
LofiSu
d265bdb245 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
LofiSu
30e1760211 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
f0423b88ac Merge branch 'hetaoBackend:experimental' into experimental 2026-02-09 11:58:56 +08:00
Henry Li
8b053a4415 feat: update workspace header to conditionally render title based on environment variable 2026-02-09 09:20:32 +08:00
Henry Li
305e8969ef feat: make it golden 2026-02-09 09:15:39 +08:00
Henry Li
ddbda4e38f feat: make the title golden in Ultra mode 2026-02-09 08:59:40 +08:00
LofiSu
2d70aaa969 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
LofiSu
d72aad8063 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
LofiSu
fe06be8258 Revert "fix(frontend): Turbopack about page + remove hover on web search/citations" 
This reverts commit 7e9e061f20fcec1f1a9c35be40d9407c05ed82be.
 2026-02-09 03:23:51 +08:00
LofiSu
842c4ecac0 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
cebf2599c9 feat: add mode in welcome 2026-02-09 00:41:25 +08:00
Henry Li
25b60e732f feat: set golden color for ultra 2026-02-09 00:30:20 +08:00
Henry Li
f146e35ee7 feat: rewording 2026-02-08 23:44:36 +08:00
Henry Li
8a2351593c feat: add special effect for Ultra mode 2026-02-08 23:22:51 +08:00
Henry Li
010aba1e28 feat: add realtime subagent status report 2026-02-08 22:43:51 +08:00
Henry Li
0355493a16 feat: rewording and add initial animation 2026-02-08 21:24:17 +08:00
Henry Li
5d4cecbb84 refactor: optimize task handling in message list 2026-02-07 18:42:24 +08:00
Henry Li
de8ff9d336 feat: add ambilight 2026-02-07 18:42:08 +08:00
Henry Li
d9a52f07e7 feat: add handling for task timeout and enhance Streamdown plugin for word animation 2026-02-07 18:06:22 +08:00
Henry Li
260953fb81 feat: adjust position 2026-02-07 18:00:24 +08:00
Henry Li
b135449c07 fix: adjust suggestion positioning and height for improved UI layout 2026-02-07 17:56:06 +08:00
Henry Li
3e2883e2a3 feat: support subtasks 2026-02-07 16:14:48 +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
91a05acdf8 feat: enhance workspace navigation menu with conditional rendering and mounted state 2026-02-07 11:10:24 +08:00
Henry Li
a122f76e36 feat: add animations 2026-02-07 10:30:35 +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
5ed15d79c9 fix: fix markdown table 2026-02-06 22:00:55 +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
9bf3a12c30 feat: send custom event 2026-02-06 17:48:15 +08:00
hetao
449ffbad75 feat: add ultra mode 2026-02-06 17:48:14 +08:00
LofiSu
5484233548 fix(citations): hide citations block in reasoning/thinking content 
The reasoning content in message-group.tsx was not being processed
through parseCitations, causing raw <citations> blocks to be visible.
Now reasoning content is parsed to remove citations blocks.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 16:12:43 +08:00
LofiSu
582bfaee39 fix(citations): only citation links in citationMap render as badges 
Revert streaming logic - only links that are actually in citationMap
should render as badges. This prevents project URLs and other regular
links from being incorrectly rendered as citation badges.

During streaming, links may initially appear as plain links until the
citations block is fully parsed, then they will update to badge style.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 16:10:29 +08:00
LofiSu
e7ea0fc551 fix(citations): render external links as badges during streaming 
During streaming when citations are still loading (isLoadingCitations=true),
all external links should be rendered as badges since we don't know yet
which links are citations. After streaming completes, only links in
citationMap are rendered as badges.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 16:09:03 +08:00
LofiSu
f1c3f908c9 fix(citations): parse citations in reasoning content 
When only reasoning content exists (no main content), the citations
block was not being parsed and removed. Now reasoning content also
goes through parseCitations to hide the raw citations block.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 16:04:49 +08:00
LofiSu
7c21d8f3a6 fix(artifacts): only render citation badges for links in citationMap 
Same fix as message-list-item: project URLs and regular links in
artifact file preview should be rendered as plain links, not badges.
Only actual citations (in citationMap) should be rendered as badges.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 15:55:53 +08:00
Henry Li
70989a949e feat: add 'about' page 2026-02-06 15:18:37 +08:00
Henry Li
bc7837ed6f docs: rewording 2026-02-06 15:18:19 +08:00
LofiSu
5d8c08d3ba fix(citations): only render citation badges for links in citationMap 
Project URLs and regular links should be rendered as plain underlined
links, not as citation badges. Only links that are actual citations
(present in citationMap) should be rendered as badges.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 15:15:45 +08:00
LofiSu
49f7cf1662 fix(citations): use markdown link text as fallback for display 
When citation data is not available, use the markdown link text
(children) as display text instead of just the domain. This ensures
that links like [OpenJudge](github.com/...) show 'OpenJudge' instead
of just 'github.com'.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 15:06:51 +08:00
Henry Li
23c082f05d docs: add CLAUDE.md 2026-02-06 14:40:52 +08:00
Henry Li
78b6164770 docs: add AGENTS.md 2026-02-06 14:32:48 +08:00
LofiSu
738b71be47 fix(messages): prevent URL autolink bleeding into adjacent text 
For human messages, disable remark-gfm autolink feature to prevent
URLs from incorrectly including adjacent text (especially Chinese
characters) as part of the link. This ensures that when users input
"https://example.com 帮我分析", only the URL becomes a link.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 14:30:57 +08:00
LofiSu
6f968242d6 fix(citations): only render CitationLink badges for AI messages 
Human messages should display links as plain underlined text,
not as citation badges. This preserves the original user input
appearance when users paste URLs in their messages.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-06 14:28:28 +08:00
Henry Li
b74cf65275 feat: update surprise-me functionality with localization support 2026-02-06 14:21:03 +08:00
Henry Li
22dea3fd43 feat: add surprise-me 2026-02-06 14:04:15 +08:00
Henry Li
f391060573 feat: adjust position 2026-02-06 09:39:20 +08:00
Henry Li
43ebce3b37 feat: remove demo 2026-02-05 09:46:05 +08:00