Merge branch 'dhk-1' of http://192.168.0.200/knowledge-base-bj/deerflow-server into dhk-1

frontend-web/src/open-canvas/components/ai-writing/AIWritingForm.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 import { PenLine } from 'lucide-react';
 
 import { Button } from '@/components/ui/button';
@@ -11,6 +11,7 @@ import {
   SelectValue,
 } from '@/components/ui/select';
 import { useModels } from '@/core/models/hooks';
+import { useStudioNotebooks, useNotebookSources } from '@/core/studio/hooks';
 
 import type { AIWritingRequest } from '../../types/ai-writing';
 import { useArticleTypes } from '../../hooks/useArticleTypes';
@@ -32,12 +33,13 @@ const INPUT_CLASS =
 
 const DEFAULT_KEYWORD_COUNT = 1;
 const DEFAULT_AUDIENCE = '普通读者';
+type MaterialSource = 'knowledge_base' | 'skill' | 'notebook';
 const MAX_INTENT_LENGTH = 500;
 
-// 素材来源选项：知识库=素材专家默认 web/intranet 检索；技能检索=用技能编排去检索
-const MATERIAL_SOURCE_OPTIONS: Array<{ value: 'knowledge_base' | 'skill'; label: string }> = [
-  { value: 'knowledge_base', label: '知识库' },
-  { value: 'skill', label: '技能检索' },
+const MATERIAL_SOURCE_OPTIONS: Array<{ value: MaterialSource; label: string; desc: string }> = [
+  { value: 'knowledge_base', label: '知识库', desc: '默认 web/intranet 检索' },
+  { value: 'skill', label: '技能检索', desc: '用已启用的技能编排检索' },
+  { value: 'notebook', label: '我的笔记', desc: '从笔记本中检索素材' },
 ];
 
 const FIELD_LABEL_CLASS = 'text-[16px] font-semibold leading-none text-[#222]';
@@ -60,7 +62,13 @@ export function AIWritingForm({
     materialSource, setMaterialSource,
     modelName, setModelName,
   } = useWritingForm();
+  // 笔记来源：选中的 search_space_id 和多个 document_id（master 引入，useWritingForm 未含）
+  const [selectedNotebookId, setSelectedNotebookId] = useState<number | null>(null);
+  const [selectedDocumentIds, setSelectedDocumentIds] = useState<number[]>([]);
+
   const { models, isLoading: modelsLoading } = useModels();
+  const { notebooks, isLoading: notebooksLoading } = useStudioNotebooks();
+  const { sources, isLoading: sourcesLoading } = useNotebookSources(selectedNotebookId);
 
   const { articleTypes, loading: typesLoading, refresh: refreshTypes } = useArticleTypes();
 
@@ -112,6 +120,25 @@ export function AIWritingForm({
     }
   }
 
+  function handleNotebookChange(val: string) {
+    setSelectedNotebookId(val ? Number(val) : null);
+    setSelectedDocumentIds([]);
+  }
+
+  function handleMaterialSourceChange(val: MaterialSource) {
+    setMaterialSource(val);
+    if (val !== 'notebook') {
+      setSelectedNotebookId(null);
+      setSelectedDocumentIds([]);
+    }
+  }
+
+  function toggleDocument(docId: number) {
+    setSelectedDocumentIds((prev) =>
+      prev.includes(docId) ? prev.filter((id) => id !== docId) : [...prev, docId],
+    );
+  }
+
   function handleSubmit(e: React.FormEvent) {
     e.preventDefault();
     if (!intent.trim()) return;
@@ -128,6 +155,9 @@ export function AIWritingForm({
       writingMode: hideAdvancedFields ? 'loose' : strictMode ? 'strict' : 'loose',
       materialSource,
       modelName: selectedModel?.name || modelName || undefined,
+      // 只有选了"我的笔记"才传笔记参数
+      noteSearchSpaceId: materialSource === 'notebook' ? (selectedNotebookId ?? undefined) : undefined,
+      noteSourceIds: materialSource === 'notebook' && selectedNotebookId != null ? selectedDocumentIds : undefined,
     });
   }
 
@@ -237,7 +267,7 @@ export function AIWritingForm({
           <label className={FIELD_LABEL_CLASS}>素材来源</label>
           <Select
             value={materialSource}
-            onValueChange={(v) => setMaterialSource(v as 'knowledge_base' | 'skill')}
+            onValueChange={(v) => handleMaterialSourceChange(v as MaterialSource)}
             disabled={disabled}
           >
             <SelectTrigger className={FIELD_TRIGGER_CLASS}>
@@ -247,13 +277,64 @@ export function AIWritingForm({
               {MATERIAL_SOURCE_OPTIONS.map((opt) => (
                 <SelectItem key={opt.value} value={opt.value} className="text-sm">
                   {opt.label}
+                  <span className="ml-1 text-xs text-muted-foreground">— {opt.desc}</span>
                 </SelectItem>
               ))}
             </SelectContent>
           </Select>
-          <p className="text-xs leading-relaxed text-muted-foreground/80">
-            知识库：素材专家默认检索方式；技能检索：用已启用的技能去编排检索。
-          </p>
+
+          {/* 选了"我的笔记"才展示笔记本 / 文档选择器 */}
+          {materialSource === 'notebook' && (
+            <div className="mt-2 space-y-2">
+              <Select
+                value={selectedNotebookId !== null ? String(selectedNotebookId) : ''}
+                onValueChange={handleNotebookChange}
+                disabled={disabled || notebooksLoading}
+              >
+                <SelectTrigger className={FIELD_TRIGGER_CLASS}>
+                  <SelectValue placeholder={notebooksLoading ? '加载中…' : '选择笔记本'} />
+                </SelectTrigger>
+                <SelectContent>
+                  {notebooks.map((nb) => (
+                    <SelectItem key={nb.id} value={String(nb.id)} className="text-sm">
+                      {nb.name}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+
+              {selectedNotebookId !== null && (
+                <div className="space-y-1">
+                  <p className="text-xs text-muted-foreground">
+                    {sourcesLoading
+                      ? '文档加载中…'
+                      : `选择文档（可多选；不选则搜整个笔记本${selectedDocumentIds.length > 0 ? `，已选 ${selectedDocumentIds.length} 篇` : ''}）`}
+                  </p>
+                  {!sourcesLoading && (
+                    <div className="max-h-36 overflow-y-auto rounded-lg border border-[#e8dedd] bg-white divide-y divide-[#f0e8e7]">
+                      {sources.filter((s) => s.document?.id != null).map((s) => {
+                        const docId = s.document!.id;
+                        return (
+                          <label key={s.id} className="flex items-center gap-2 px-3 py-2 cursor-pointer hover:bg-[#f9f5f5] select-none">
+                            <input
+                              type="checkbox"
+                              checked={selectedDocumentIds.includes(docId)}
+                              onChange={() => toggleDocument(docId)}
+                              disabled={disabled}
+                              className="size-3.5 shrink-0 accent-primary"
+                            />
+                            <span className="text-xs text-foreground truncate">
+                              {s.document?.title ?? `文档 ${docId}`}
+                            </span>
+                          </label>
+                        );
+                      })}
+                    </div>
+                  )}
+                </div>
+              )}
+            </div>
+          )}
         </div>
 
         <div className="mt-4 space-y-2">

frontend-web/src/open-canvas/contexts/WritingFormContext.tsx

@@ -31,8 +31,8 @@ export interface WritingFormValue {
   setAudience: (v: string) => void;
   strictMode: boolean;
   setStrictMode: (v: boolean) => void;
-  materialSource: 'knowledge_base' | 'skill';
-  setMaterialSource: (v: 'knowledge_base' | 'skill') => void;
+  materialSource: 'knowledge_base' | 'skill' | 'notebook';
+  setMaterialSource: (v: 'knowledge_base' | 'skill' | 'notebook') => void;
   modelName: string;
   setModelName: (v: string) => void;
   /** 把模型建议（setup_writing 审批 payload）回填到表单各字段。 */
@@ -61,7 +61,7 @@ export function WritingFormProvider({ children }: { children: ReactNode }) {
   const [wordCountInput, setWordCountInput] = useState('800');
   const [audience, setAudience] = useState('普通读者');
   const [strictMode, setStrictMode] = useState(false);
-  const [materialSource, setMaterialSource] = useState<'knowledge_base' | 'skill'>('knowledge_base');
+  const [materialSource, setMaterialSource] = useState<'knowledge_base' | 'skill' | 'notebook'>('knowledge_base');
   const [modelName, setModelName] = useState('');
 
   const applyProposal = useCallback((payload: SetupWritingApprovalPayload) => {

frontend-web/src/open-canvas/types/ai-writing.ts

@@ -7,7 +7,7 @@ export interface AIMaterial {
   source: string;
   publishedAt: string;
   relevanceScore: number;
-  sourceType: 'internet' | 'intranet' | 'skill';
+  sourceType: 'internet' | 'intranet' | 'skill' | 'notebook';
   url?: string;
   recUuid?: string;
   // skill 类素材的元信息（skill_name / container_path / category / skill_full_content 等）
@@ -230,8 +230,12 @@ export interface AIWritingRequest {
   keywordCount: number;
   /** 写作模式：strict=严格依据素材 / loose=可结合通用知识（默认 loose） */
   writingMode: 'strict' | 'loose';
-  /** 素材来源：knowledge_base=知识库（默认检索）/ skill=技能检索（默认 knowledge_base） */
-  materialSource: 'knowledge_base' | 'skill';
+  /** 素材来源：knowledge_base=知识库 / skill=技能检索 / notebook=我的笔记 */
+  materialSource: 'knowledge_base' | 'skill' | 'notebook';
+  /** 笔记来源（可选）：笔记本 search_space_id */
+  noteSearchSpaceId?: number;
+  /** 笔记来源（可选）：笔记本内指定文档的 document_id 列表，空数组表示检索整个笔记本 */
+  noteSourceIds?: number[];
 }
 
 // ── 流式审核条目 ──────────────────────────────────────────────────────────────