Merge branch 'master' of http://192.168.0.200/knowledge-base-bj/deerflow-server into xuhd

frontend-web/src/pages/ChatPage.tsx

@@ -4,7 +4,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { type PromptInputMessage } from "@/components/ai-elements/prompt-input";
 import { usePromptPrefixSettings } from "@/core/system-settings/hooks";
-import { ArtifactTrigger } from "@/components/workspace/artifacts";
+import { ArtifactTrigger, useArtifacts } from "@/components/workspace/artifacts";
 import {
   ChatBox,
   useSpecificChatMode,
@@ -44,6 +44,7 @@ export default function ChatPage() {
   const { tokenUsageEnabled } = useModels();
   const { data: promptPrefixSettings } = usePromptPrefixSettings();
   const [promptPrefixOn, setPromptPrefixOn] = useState(false);
+  const { selectedArtifact } = useArtifacts();
   useSpecificChatMode();
 
   useEffect(() => {
@@ -91,9 +92,22 @@ export default function ChatPage() {
     },
   });
 
+  const writingArtifactPath = useMemo(() => {
+    const isMarkdown = (path: string | null | undefined) =>
+      !!path && /\.(md|markdown)(?:$|[?#])/i.test(path);
+    if (isMarkdown(selectedArtifact)) {
+      return selectedArtifact ?? undefined;
+    }
+    return [...(thread.values.artifacts ?? [])]
+      .reverse()
+      .find((path) => isMarkdown(path));
+  }, [selectedArtifact, thread.values.artifacts]);
+
   const handleSubmit = useCallback(
     (message: PromptInputMessage) => {
+      // Only the opening turn of a brand-new thread may carry the prefix.
       const shouldApplyPrefix =
+        isNewThread &&
         !hasStartedConversation &&
         promptPrefixOn &&
         promptPrefixSettings?.enabled === true;
@@ -101,19 +115,34 @@ export default function ChatPage() {
       window.dispatchEvent(
         new CustomEvent("workspace:sandbox-resume-autoscroll"),
       );
-      const messageToSend = shouldApplyPrefix
-        ? {
-            ...message,
-            text: `${promptPrefixSettings?.prompt_prefix ?? ""}\n\n${message.text}`,
-          }
-        : message;
+      // The prefix is intentionally NOT concatenated into the message text:
+      // doing so would make the user see it. We only flag the request via
+      // context; the backend tags the message and PromptPrefixMiddleware
+      // injects the prefix into the LLM request only. Writing mode adds the
+      // active markdown artifact path so the agent keeps editing the canvas.
+      const extraContext: Record<string, unknown> = {};
+      if (shouldApplyPrefix) {
+        extraContext.prompt_prefix_enabled = true;
+      }
+      if (settings.context.writing_mode && writingArtifactPath) {
+        extraContext.writing_artifact_path = writingArtifactPath;
+      }
       void sendMessage(
         threadId,
-        messageToSend,
-        shouldApplyPrefix ? { prompt_prefix_enabled: true } : undefined,
+        message,
+        Object.keys(extraContext).length > 0 ? extraContext : undefined,
       );
     },
-    [sendMessage, threadId, hasStartedConversation, promptPrefixOn, promptPrefixSettings],
+    [
+      sendMessage,
+      threadId,
+      isNewThread,
+      hasStartedConversation,
+      promptPrefixOn,
+      promptPrefixSettings,
+      settings.context.writing_mode,
+      writingArtifactPath,
+    ],
   );
 
   const handleClarificationSubmit = useCallback(
@@ -129,13 +158,14 @@ export default function ChatPage() {
 
   const promptPrefixProp = useMemo(() => {
     if (!promptPrefixSettings?.enabled) return undefined;
-    if (hasStartedConversation) return undefined;
+    // The prefix toggle is offered only on the opening turn of a new thread.
+    if (!isNewThread || hasStartedConversation) return undefined;
     return {
       label: promptPrefixSettings.switch_label || "前缀",
       on: promptPrefixOn,
       onToggle: () => setPromptPrefixOn((v) => !v),
     };
-  }, [promptPrefixSettings, hasStartedConversation, promptPrefixOn]);
+  }, [promptPrefixSettings, isNewThread, hasStartedConversation, promptPrefixOn]);
 
   const messageListPaddingBottom = showFollowups
     ? MESSAGE_LIST_DEFAULT_PADDING_BOTTOM +

frontend-web/src/pages/LoginPage.tsx

@@ -54,7 +54,7 @@ export default function LoginPage() {
   return (
     <div className="flex min-h-screen items-center justify-center bg-background px-6">
       <div className="w-full max-w-lg rounded-xl border bg-card p-6 shadow-sm">
-        <h1 className="text-xl font-semibold">正在进入专家模式</h1>
+        <h1 className="text-xl font-semibold">正在进入智能体模式</h1>
         {status === "error" && (
           <p className="mt-4 text-sm text-red-600">
             登录失败：{errorMessage || "未知错误"}

frontend-web/src/pages/NewAgentPage.tsx

@@ -153,7 +153,7 @@ export default function NewAgentPage() {
       // the user wants the name box to stay blank while they chat, and we
       // refill it later (with the model's proposed name) on setup_agent
       // approval.
-      name = `未命名专家-${Date.now().toString(36)}`;
+      name = `未命名智能体-${Date.now().toString(36)}`;
     }
 
     const modelOverride = modelInput.trim() || null;
@@ -226,7 +226,7 @@ export default function NewAgentPage() {
     if (!saved) {
       return;
     }
-    toast.success(`专家「${saved.name}」已保存`);
+    toast.success(`智能体「${saved.name}」已保存`);
   }, [ensureAgent]);
 
   const handleChatSubmit = useCallback(
@@ -270,7 +270,7 @@ export default function NewAgentPage() {
 
   const handleRejectSetupAgent = useCallback(
     async () => {
-      await handleChatSubmit("我暂时不批准创建这个专家配置，请继续帮我调整。");
+      await handleChatSubmit("我暂时不批准创建这个智能体配置，请继续帮我调整。");
     },
     [handleChatSubmit],
   );
@@ -300,7 +300,7 @@ export default function NewAgentPage() {
               >
                 <ArrowLeftIcon className="h-4 w-4" />
               </Button>
-              <h1 className="text-sm font-semibold">创建专家</h1>
+              <h1 className="text-sm font-semibold">创建智能体</h1>
             </div>
             {agent ? (
               <Button
@@ -353,7 +353,7 @@ export default function NewAgentPage() {
                   onSubmit={({ text }) => void handleChatSubmit(text)}
                 >
                   <PromptInputTextarea
-                    placeholder="直接告诉模型你想要什么样的专家，或回答模型的问题"
+                    placeholder="直接告诉模型你想要什么样的智能体，或回答模型的问题"
                     disabled={thread.isLoading}
                   />
                   <PromptInputFooter className="justify-end">
@@ -366,16 +366,16 @@ export default function NewAgentPage() {
             <aside className="bg-background min-h-0 overflow-y-auto">
               <div className="space-y-5 p-4">
                 <div>
-                  <h2 className="text-sm font-semibold">专家配置</h2>
+                  <h2 className="text-sm font-semibold">智能体配置</h2>
                   <p className="text-muted-foreground mt-1 text-xs">
-                    这些内容会作为创建专家时的初始配置。
+                    这些内容会作为创建智能体时的初始配置。
                   </p>
                 </div>
 
                 <div className="space-y-2">
                   <label className="text-sm font-medium">名称</label>
                   <Input
-                    placeholder="例如：合同审查专家"
+                    placeholder="例如：合同审查智能体"
                     value={nameInput}
                     onChange={(event) => {
                       setNameInput(event.currentTarget.value);
@@ -388,7 +388,7 @@ export default function NewAgentPage() {
                 <div className="space-y-2">
                   <label className="text-sm font-medium">描述</label>
                   <Textarea
-                    placeholder="简要说明这个专家擅长什么"
+                    placeholder="简要说明这个智能体擅长什么"
                     value={descriptionInput}
                     onChange={(event) =>
                       setDescriptionInput(event.currentTarget.value)
@@ -415,14 +415,14 @@ export default function NewAgentPage() {
                     ))}
                   </select>
                   <p className="text-muted-foreground text-xs">
-                    该专家被使用时调用的模型。
+                    该智能体被使用时调用的模型。
                   </p>
                 </div>
 
                 <div className="space-y-2">
                   <label className="text-sm font-medium">SOUL.md</label>
                   <Textarea
-                    placeholder="写下专家的人设、边界、工作方式和输出要求"
+                    placeholder="写下智能体的人设、边界、工作方式和输出要求"
                     value={soulInput}
                     onChange={(event) => setSoulInput(event.currentTarget.value)}
                     className="min-h-48 max-h-[400px] resize-y overflow-y-auto font-mono text-xs"
@@ -479,7 +479,7 @@ export default function NewAgentPage() {
                   disabled={busy || isSkillsLoading}
                 >
                   <SaveIcon className="h-4 w-4" />
-                  {agentId ? "保存专家" : "创建专家"}
+                  {agentId ? "保存智能体" : "创建智能体"}
                 </Button>
               </div>
             </aside>

frontend-web/src/pages/PageRoutes.tsx

@@ -6,6 +6,7 @@ import { PageSidebar } from "@/components/page-sidebar";
 import WorkspaceRoutes from "./WorkspaceRoutes";
 import StrategyRoutes from "./StrategyRoutes";
 import Header from "@/strategy-components/Header";
+import OpenCanvasRoutes from "@/open-canvas/routes/OpenCanvasRoutes";
 
 // 设为 true 时隐藏侧边栏（开发中，暂未完成）
 const SIDEBAR_ENABLED = false;
@@ -41,6 +42,7 @@ function PageLayout() {
               }
             />
             <Route path="strategy/*" element={<StrategyRoutes />} />
+            <Route path="canvas/*" element={<OpenCanvasRoutes />} />
           </Routes>
         </main>
       </div>

frontend-web/src/pages/ScheduledTasksPage.tsx

@@ -15,6 +15,7 @@ import {
   Play,
   Plus,
   RefreshCw,
+  TagsIcon,
   Trash2,
 } from "lucide-react";
 import { useRouteNavigate as useNavigate } from "@/core/route-base";
@@ -35,7 +36,11 @@ import {
   WorkspaceContainer,
   WorkspaceHeader,
 } from "@/components/workspace/workspace-container";
+import { TagChipList } from "@/components/workspace/tags/tag-chip";
+import { TagPickerDialog } from "@/components/workspace/tags/tag-picker-dialog";
+import { TagSearchBar } from "@/components/workspace/tags/tag-search-bar";
 import { useAgents } from "@/core/agents";
+import { getStoredAuth } from "@/core/auth";
 import {
   downloadScheduledTaskRun,
   type PublishedScheduledTask,
@@ -283,7 +288,10 @@ const emptyForm = {
 
 export default function ScheduledTasksPage() {
   const navigate = useNavigate();
-  const { data: tasks = [], isLoading } = useScheduledTasks();
+  const [search, setSearch] = useState("");
+  const [tagId, setTagId] = useState<string | null>(null);
+  // Name + tag filtering is resolved server-side via the /api/scheduled-tasks query.
+  const { data: tasks = [], isLoading } = useScheduledTasks({ search, tagId });
   const { data: deliveryProfile } = useScheduledTaskDeliveryProfile();
   const { agents } = useAgents();
   const actions = useScheduledTaskActions();
@@ -299,6 +307,8 @@ export default function ScheduledTasksPage() {
   const [runsTimeFilter, setRunsTimeFilter] = useState<"all" | "today" | "7d" | "30d">("all");
   const [subscribeTarget, setSubscribeTarget] = useState<PublishedScheduledTask | null>(null);
   const [subscribeNotify, setSubscribeNotify] = useState(false);
+  const [tagPickerTask, setTagPickerTask] = useState<ScheduledTask | null>(null);
+  const isAdmin = useMemo(() => getStoredAuth()?.system_role === "admin", []);
 
   const sortedTasks = useMemo(
     () =>
@@ -466,6 +476,14 @@ export default function ScheduledTasksPage() {
                   <TabsTrigger value="plaza" className="flex-1">广场</TabsTrigger>
                 </TabsList>
               </Tabs>
+              {activeTab === "mine" && (
+                <TagSearchBar
+                  targetType="scheduled_task"
+                  onSearchChange={setSearch}
+                  tagId={tagId}
+                  onTagIdChange={setTagId}
+                />
+              )}
             </CardHeader>
             <CardContent className="min-h-0 flex-1 p-0">
               <ScrollArea className="size-full">
@@ -527,7 +545,23 @@ export default function ScheduledTasksPage() {
                               </div>
                             )}
                           </div>
+                          {(task.tags?.length ?? 0) > 0 && (
+                            <TagChipList tags={task.tags!} className="mt-3" />
+                          )}
                           <div className="mt-3 flex flex-wrap gap-2">
+                            {isAdmin && (
+                              <Button
+                                size="icon"
+                                variant="outline"
+                                title="编辑标签"
+                                onClick={(event) => {
+                                  event.stopPropagation();
+                                  setTagPickerTask(task);
+                                }}
+                              >
+                                <TagsIcon className="size-4" />
+                              </Button>
+                            )}
                             {isOwner ? (
                               <>
                                 <Button
@@ -934,6 +968,16 @@ export default function ScheduledTasksPage() {
           </DialogFooter>
         </DialogContent>
       </Dialog>
+
+      {isAdmin && tagPickerTask && (
+        <TagPickerDialog
+          open={!!tagPickerTask}
+          onOpenChange={(open) => !open && setTagPickerTask(null)}
+          targetType="scheduled_task"
+          targetId={tagPickerTask.task_id}
+          currentTags={tagPickerTask.tags ?? []}
+        />
+      )}
     </WorkspaceContainer>
   );
 }

frontend-web/src/pages/TagsPage.tsx

@@ -0,0 +1,5 @@
+import { TagManagementPage } from "@/components/workspace/admin/tag-management-page";
+
+export default function TagsPage() {
+  return <TagManagementPage />;
+}

frontend-web/src/pages/WorkspaceRoutes.tsx

@@ -26,6 +26,7 @@ import PromptPrefixSettingsPage from "./PromptPrefixSettingsPage";
 import SkillEvolutionPage from "./SkillEvolutionPage";
 import SkillsPage from "./SkillsPage";
 import UsersPage from "./UsersPage";
+import TagsPage from "./TagsPage";
 import RecommendedQuestionsPage from "./RecommendedQuestionsPage";
 
 export function WorkspaceLayout({
@@ -192,6 +193,18 @@ export default function WorkspaceRoutes({
           </WorkspaceLayout>
         }
       />
+      <Route
+        path="admin/tags"
+        element={
+          getStoredAuth()?.system_role === "admin" ? (
+            <WorkspaceLayout {...layoutProps}>
+              <TagsPage />
+            </WorkspaceLayout>
+          ) : (
+            <Navigate to="/page/workspace/chats/new" replace />
+          )
+        }
+      />
       <Route
         path="settings/recommended-questions"
         element={