From e4983be9d78d787c6c87c6ee8f04e8364ff85b12 Mon Sep 17 00:00:00 2001 From: xuhd Date: Mon, 1 Jun 2026 14:22:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20merge=20=E5=86=B2?= =?UTF-8?q?=E7=AA=81=EF=BC=8C=E6=81=A2=E5=A4=8D=E7=AC=94=E8=AE=B0=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并 master 时冲突导致 notebook_search_space_id / notebook_source_ids 被覆盖，现补回；同时兼容 master 新增的 material_source / model_name 字段。 Co-Authored-By: Claude Sonnet 4.6 --- frontend-web/src/open-canvas/types/ai-writing.ts | 4 ++++ .../packages/harness/deerflow/agents/ai_writing/state.py | 3 +++ 2 files changed, 7 insertions(+) diff --git a/frontend-web/src/open-canvas/types/ai-writing.ts b/frontend-web/src/open-canvas/types/ai-writing.ts index b3777de5..a8ccc9fb 100644 --- a/frontend-web/src/open-canvas/types/ai-writing.ts +++ b/frontend-web/src/open-canvas/types/ai-writing.ts @@ -230,6 +230,10 @@ export interface AIWritingRequest { writingMode: 'strict' | 'loose'; /** 素材来源：knowledge_base=知识库（默认检索）/ skill=技能检索（默认 knowledge_base） */ materialSource: 'knowledge_base' | 'skill'; + /** 笔记来源（可选）：笔记本 search_space_id */ + noteSearchSpaceId?: number; + /** 笔记来源（可选）：笔记本内指定文档的 document_id 列表，空数组表示检索整个笔记本 */ + noteSourceIds?: number[]; } // ── 流式审核条目 ────────────────────────────────────────────────────────────── diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/agents/ai_writing/state.py b/offline-backend-20260512/backend/packages/harness/deerflow/agents/ai_writing/state.py index f8bfec66..1c277f5f 100644 --- a/offline-backend-20260512/backend/packages/harness/deerflow/agents/ai_writing/state.py +++ b/offline-backend-20260512/backend/packages/harness/deerflow/agents/ai_writing/state.py @@ -140,6 +140,9 @@ class AIWritingState(TypedDict): # 经 checkpoint 持久化 —— interrupt/resume 是新 invocation、其 config 不带原 # model_name，存进 state 才能让 resume 后才运行的节点拿到用户模型。 model_name: str + # 笔记来源（可选）：传入后 researcher 阶段会额外从笔记检索素材 + notebook_search_space_id: Optional[int] + notebook_source_ids: Optional[List[int]] # Agent A 输出 material_package: Optional[MaterialPackage]