From 31abad86d5f013bb20427e41b3155dc5fe0a7d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E9=91=AB=E5=8D=87?= <xsji@kland.com.cn>
Date: Wed, 13 May 2026 20:04:06 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=99=BA=E8=83=BD=E4=BD=93=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workspace/agents/agent-card.tsx           |  80 +-
 .../workspace/messages/message-list.tsx       | 512 +++++----
 frontend-web/src/core/messages/utils.ts       |  56 +-
 frontend-web/src/pages/NewAgentPage.tsx       | 994 +++++++++---------
 .../backend/app/gateway/routers/agents.py     |  41 +-
 .../deerflow/agents/lead_agent/agent.py       |  11 +-
 .../setup_agent_approval_middleware.py        |  90 ++
 .../deerflow/persistence/agents/base.py       |   9 +
 .../deerflow/persistence/agents/memory.py     |  10 +
 .../deerflow/persistence/agents/sql.py        |  13 +
 .../tools/builtins/setup_agent_tool.py        |   6 +-
 .../backend/tests/test_agents_backend.py      |  57 +
 12 files changed, 1127 insertions(+), 752 deletions(-)
 create mode 100644 offline-backend-20260512/backend/packages/harness/deerflow/agents/middlewares/setup_agent_approval_middleware.py

diff --git a/frontend-web/src/components/workspace/agents/agent-card.tsx b/frontend-web/src/components/workspace/agents/agent-card.tsx
index 6927b216..cc136d61 100644
--- a/frontend-web/src/components/workspace/agents/agent-card.tsx
+++ b/frontend-web/src/components/workspace/agents/agent-card.tsx
@@ -59,11 +59,17 @@ export function AgentCard({ agent }: AgentCardProps) {
     agent.skills ?? [],
   );
 
-  const currentUserId = useMemo(() => getStoredAuth()?.user_id ?? null, []);
+  const storedAuth = useMemo(() => getStoredAuth(), []);
+  const currentUserId = storedAuth?.user_id ?? null;
+  const isAdmin = storedAuth?.system_role === "admin";
   const isBuiltin = agent.builtin;
   const isOwned =
     !isBuiltin && agent.user_id !== null && agent.user_id === currentUserId;
   const isFromOthers = !isBuiltin && !isOwned;
+  // System admins are allowed to edit built-in agents in place. Delete and
+  // publish-toggle stay owner-only — built-ins shouldn't be removable, and
+  // they are inherently visible to everyone so toggling published is moot.
+  const canEdit = isOwned || (isBuiltin && isAdmin);
 
   useEffect(() => {
     if (!editOpen) {
@@ -235,40 +241,46 @@ export function AgentCard({ agent }: AgentCardProps) {
             <MessageSquareIcon className="mr-1.5 h-3.5 w-3.5" />
             {t.agents.chat}
           </Button>
-          {isOwned && (
+          {(canEdit || isOwned) && (
             <div className="flex gap-1">
-              <Button
-                size="icon"
-                variant="ghost"
-                className="h-8 w-8 shrink-0"
-                onClick={() => void handleTogglePublished()}
-                disabled={updateAgent.isPending}
-                title={agent.published ? "取消发布" : "发布"}
-              >
-                {agent.published ? (
-                  <EyeOffIcon className="h-3.5 w-3.5" />
-                ) : (
-                  <EyeIcon className="h-3.5 w-3.5" />
-                )}
-              </Button>
-              <Button
-                size="icon"
-                variant="ghost"
-                className="h-8 w-8 shrink-0"
-                onClick={() => setEditOpen(true)}
-                title="编辑智能体"
-              >
-                <SquarePenIcon className="h-3.5 w-3.5" />
-              </Button>
-              <Button
-                size="icon"
-                variant="ghost"
-                className="text-destructive hover:text-destructive h-8 w-8 shrink-0"
-                onClick={() => setDeleteOpen(true)}
-                title={t.agents.delete}
-              >
-                <Trash2Icon className="h-3.5 w-3.5" />
-              </Button>
+              {isOwned && (
+                <Button
+                  size="icon"
+                  variant="ghost"
+                  className="h-8 w-8 shrink-0"
+                  onClick={() => void handleTogglePublished()}
+                  disabled={updateAgent.isPending}
+                  title={agent.published ? "取消发布" : "发布"}
+                >
+                  {agent.published ? (
+                    <EyeOffIcon className="h-3.5 w-3.5" />
+                  ) : (
+                    <EyeIcon className="h-3.5 w-3.5" />
+                  )}
+                </Button>
+              )}
+              {canEdit && (
+                <Button
+                  size="icon"
+                  variant="ghost"
+                  className="h-8 w-8 shrink-0"
+                  onClick={() => setEditOpen(true)}
+                  title="编辑智能体"
+                >
+                  <SquarePenIcon className="h-3.5 w-3.5" />
+                </Button>
+              )}
+              {isOwned && (
+                <Button
+                  size="icon"
+                  variant="ghost"
+                  className="text-destructive hover:text-destructive h-8 w-8 shrink-0"
+                  onClick={() => setDeleteOpen(true)}
+                  title={t.agents.delete}
+                >
+                  <Trash2Icon className="h-3.5 w-3.5" />
+                </Button>
+              )}
             </div>
           )}
         </CardFooter>
diff --git a/frontend-web/src/components/workspace/messages/message-list.tsx b/frontend-web/src/components/workspace/messages/message-list.tsx
index b7f2d582..4a37f957 100644
--- a/frontend-web/src/components/workspace/messages/message-list.tsx
+++ b/frontend-web/src/components/workspace/messages/message-list.tsx
@@ -1,14 +1,14 @@
-import type { BaseStream } from "@langchain/langgraph-sdk/react";
-import { SendIcon } from "lucide-react";
-import { useMemo, useState } from "react";
-
-import {
-  Conversation,
-  ConversationContent,
-} from "@/components/ai-elements/conversation";
-import { Button } from "@/components/ui/button";
-import { Textarea } from "@/components/ui/textarea";
-import { useI18n } from "@/core/i18n/hooks";
+import type { BaseStream } from "@langchain/langgraph-sdk/react";
+import { CheckIcon, SendIcon, XIcon } from "lucide-react";
+import { useMemo, useState } from "react";
+
+import {
+  Conversation,
+  ConversationContent,
+} from "@/components/ai-elements/conversation";
+import { Button } from "@/components/ui/button";
+import { Textarea } from "@/components/ui/textarea";
+import { useI18n } from "@/core/i18n/hooks";
 import {
   extractContentFromMessage,
   extractPresentFilesFromMessage,
@@ -42,17 +42,21 @@ export function MessageList({
   className,
   threadId,
   thread,
-  paddingBottom = MESSAGE_LIST_DEFAULT_PADDING_BOTTOM,
-  tokenUsageEnabled = false,
-  onClarificationSubmit,
-}: {
-  className?: string;
-  threadId: string;
-  thread: BaseStream<AgentThreadState>;
-  paddingBottom?: number;
-  tokenUsageEnabled?: boolean;
-  onClarificationSubmit?: (answer: string) => void | Promise<void>;
-}) {
+  paddingBottom = MESSAGE_LIST_DEFAULT_PADDING_BOTTOM,
+  tokenUsageEnabled = false,
+  onClarificationSubmit,
+  onSetupAgentApprove,
+  onSetupAgentReject,
+}: {
+  className?: string;
+  threadId: string;
+  thread: BaseStream<AgentThreadState>;
+  paddingBottom?: number;
+  tokenUsageEnabled?: boolean;
+  onClarificationSubmit?: (answer: string) => void | Promise<void>;
+  onSetupAgentApprove?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
+  onSetupAgentReject?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
+}) {
   const { t } = useI18n();
   const rehypePlugins = useRehypeSplitWordsIntoSpans(thread.isLoading);
   const updateSubtask = useUpdateSubtask();
@@ -83,13 +87,13 @@ export function MessageList({
             if (message && hasContent(message)) {
               return (
                 <div key={group.id} className="w-full">
-                  <ClarificationCard
-                    fallbackContent={extractContentFromMessage(message)}
-                    isLoading={thread.isLoading}
-                    message={message}
-                    onSubmit={onClarificationSubmit}
-                    rehypePlugins={rehypePlugins}
-                  />
+                  <ClarificationCard
+                    fallbackContent={extractContentFromMessage(message)}
+                    isLoading={thread.isLoading}
+                    message={message}
+                    onSubmit={onClarificationSubmit}
+                    rehypePlugins={rehypePlugins}
+                  />
                   <MessageTokenUsageList
                     enabled={tokenUsageEnabled}
                     isLoading={thread.isLoading}
@@ -99,6 +103,23 @@ export function MessageList({
               );
             }
             return null;
+          } else if (group.type === "assistant:setup-agent-approval") {
+            const message = group.messages[0];
+            return message ? (
+              <div key={group.id} className="w-full">
+                <SetupAgentApprovalCard
+                  disabled={thread.isLoading}
+                  message={message}
+                  onApprove={onSetupAgentApprove}
+                  onReject={onSetupAgentReject}
+                />
+                <MessageTokenUsageList
+                  enabled={tokenUsageEnabled}
+                  isLoading={thread.isLoading}
+                  messages={group.messages}
+                />
+              </div>
+            ) : null;
           } else if (group.type === "assistant:present-files") {
             const files: string[] = [];
             for (const message of group.messages) {
@@ -246,150 +267,289 @@ export function MessageList({
         <div style={{ height: `${paddingBottom}px` }} />
       </ConversationContent>
     </Conversation>
-  );
-}
-
-type ClarificationOption = {
-  id: string;
-  label: string;
-  description?: string;
-};
-
-type ClarificationPayload = {
-  question?: string;
-  context?: string | null;
-  clarification_type?: string;
-  options?: ClarificationOption[];
-  allow_custom?: boolean;
-};
-
-function getClarificationPayload(message: unknown): ClarificationPayload | null {
-  if (typeof message !== "object" || message === null) {
-    return null;
-  }
-  const additionalKwargs = Reflect.get(message, "additional_kwargs");
-  if (typeof additionalKwargs !== "object" || additionalKwargs === null) {
-    return null;
-  }
-  const clarification = Reflect.get(additionalKwargs, "clarification");
-  if (typeof clarification !== "object" || clarification === null) {
-    return null;
-  }
-  return clarification as ClarificationPayload;
-}
-
-function ClarificationCard({
-  fallbackContent,
-  isLoading,
-  message,
-  onSubmit,
-  rehypePlugins,
-}: {
-  fallbackContent: string;
-  isLoading: boolean;
-  message: unknown;
-  onSubmit?: (answer: string) => void | Promise<void>;
-  rehypePlugins: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
-}) {
-  const payload = getClarificationPayload(message);
-  const [customAnswer, setCustomAnswer] = useState("");
-  const [submitting, setSubmitting] = useState(false);
-
-  const options = useMemo(
-    () =>
-      (payload?.options ?? []).filter(
-        (option) => typeof option.label === "string" && option.label.trim(),
-      ),
-    [payload?.options],
-  );
-
-  if (!payload) {
-    return (
-      <MarkdownContent
-        content={fallbackContent}
-        isLoading={isLoading}
-        rehypePlugins={rehypePlugins}
-      />
-    );
-  }
-
-  const disabled = isLoading || submitting || !onSubmit;
-
-  async function submitAnswer(answer: string) {
-    const trimmed = answer.trim();
-    if (!trimmed || disabled) {
-      return;
-    }
-    setSubmitting(true);
-    try {
-      await onSubmit?.(trimmed);
-    } finally {
-      setSubmitting(false);
-    }
-  }
-
-  return (
-    <div className="border-border bg-card text-card-foreground w-full rounded-lg border p-4 shadow-sm">
-      <div className="space-y-2">
-        <div className="text-muted-foreground text-xs font-medium">
-          需要你的确认
-        </div>
-        {payload.context ? (
-          <p className="text-muted-foreground text-sm leading-6">
-            {payload.context}
-          </p>
-        ) : null}
-        <div className="text-sm leading-6 font-medium">
-          {payload.question || fallbackContent}
-        </div>
-      </div>
-
-      {options.length > 0 ? (
-        <div className="mt-4 grid gap-2">
-          {options.map((option) => (
-            <Button
-              key={option.id || option.label}
-              type="button"
-              variant="outline"
-              className="h-auto justify-start whitespace-normal px-3 py-2 text-left"
-              disabled={disabled}
-              onClick={() => void submitAnswer(`我选择：${option.label}`)}
-            >
-              <span className="flex min-w-0 flex-col items-start gap-1">
-                <span>{option.label}</span>
-                {option.description ? (
-                  <span className="text-muted-foreground text-xs font-normal leading-5">
-                    {option.description}
-                  </span>
-                ) : null}
-              </span>
-            </Button>
-          ))}
-        </div>
-      ) : null}
-
-      {payload.allow_custom !== false ? (
-        <div className="mt-4 flex flex-col gap-2">
-          <Textarea
-            value={customAnswer}
-            onChange={(event) => setCustomAnswer(event.currentTarget.value)}
-            placeholder="如果以上选项都不合适，可以在这里输入你的回答"
-            disabled={disabled}
-            className="min-h-20 resize-none"
-          />
-          <div className="flex justify-end">
-            <Button
-              type="button"
-              size="sm"
-              disabled={disabled || !customAnswer.trim()}
-              onClick={() => void submitAnswer(customAnswer)}
-            >
-              <SendIcon className="h-4 w-4" />
-              发送回答
-            </Button>
-          </div>
-        </div>
-      ) : null}
-    </div>
-  );
-}
+  );
+}
+
+type ClarificationOption = {
+  id: string;
+  label: string;
+  description?: string;
+};
+
+type ClarificationPayload = {
+  question?: string;
+  context?: string | null;
+  clarification_type?: string;
+  options?: ClarificationOption[];
+  allow_custom?: boolean;
+};
+
+export type SetupAgentApprovalPayload = {
+  name?: string;
+  description?: string;
+  soul?: string;
+  skills?: string[];
+};
+
+function getSetupAgentApprovalPayload(
+  message: unknown,
+): SetupAgentApprovalPayload | null {
+  if (typeof message !== "object" || message === null) {
+    return null;
+  }
+  const additionalKwargs = Reflect.get(message, "additional_kwargs");
+  if (typeof additionalKwargs !== "object" || additionalKwargs === null) {
+    return null;
+  }
+  const approval = Reflect.get(additionalKwargs, "setup_agent_approval");
+  if (typeof approval !== "object" || approval === null) {
+    return null;
+  }
+  return approval as SetupAgentApprovalPayload;
+}
+
+function SetupAgentApprovalCard({
+  disabled,
+  message,
+  onApprove,
+  onReject,
+}: {
+  disabled: boolean;
+  message: unknown;
+  onApprove?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
+  onReject?: (payload: SetupAgentApprovalPayload) => void | Promise<void>;
+}) {
+  const payload = getSetupAgentApprovalPayload(message);
+  const [submitting, setSubmitting] = useState<"approve" | "reject" | null>(
+    null,
+  );
+
+  if (!payload) {
+    return null;
+  }
+
+  const approvalPayload = payload;
+  const busy = disabled || submitting !== null;
+  const skills = approvalPayload.skills ?? [];
+
+  async function run(action: "approve" | "reject") {
+    if (busy) {
+      return;
+    }
+    setSubmitting(action);
+    try {
+      if (action === "approve") {
+        await onApprove?.(approvalPayload);
+      } else {
+        await onReject?.(approvalPayload);
+      }
+    } finally {
+      setSubmitting(null);
+    }
+  }
+
+  return (
+    <div className="border-border bg-card text-card-foreground w-full rounded-lg border p-4 shadow-sm">
+      <div className="space-y-3">
+        <div>
+          <div className="text-muted-foreground text-xs font-medium">
+            创建专家审批
+          </div>
+          <div className="text-sm font-medium">请确认是否写入这个专家配置。</div>
+        </div>
+
+        {approvalPayload.name ? (
+          <div className="space-y-1">
+            <div className="text-muted-foreground text-xs">名称</div>
+            <p className="text-sm font-medium">{approvalPayload.name}</p>
+          </div>
+        ) : null}
+
+        {approvalPayload.description ? (
+          <div className="space-y-1">
+            <div className="text-muted-foreground text-xs">描述</div>
+            <p className="text-sm leading-6">{approvalPayload.description}</p>
+          </div>
+        ) : null}
+
+        {skills.length > 0 ? (
+          <div className="space-y-1">
+            <div className="text-muted-foreground text-xs">技能</div>
+            <div className="flex flex-wrap gap-1.5">
+              {skills.map((skill) => (
+                <span
+                  key={skill}
+                  className="bg-secondary text-secondary-foreground rounded-md px-2 py-1 text-xs"
+                >
+                  {skill}
+                </span>
+              ))}
+            </div>
+          </div>
+        ) : null}
+
+        {approvalPayload.soul ? (
+          <div className="space-y-1">
+            <div className="text-muted-foreground text-xs">SOUL.md</div>
+            <pre className="bg-muted max-h-52 overflow-auto rounded-md p-3 text-xs whitespace-pre-wrap">
+              {approvalPayload.soul}
+            </pre>
+          </div>
+        ) : null}
+      </div>
+
+      <div className="mt-4 flex justify-end gap-2">
+        <Button
+          type="button"
+          variant="outline"
+          size="sm"
+          disabled={busy || !onReject}
+          onClick={() => void run("reject")}
+        >
+          <XIcon className="h-4 w-4" />
+          拒绝
+        </Button>
+        <Button
+          type="button"
+          size="sm"
+          disabled={busy || !onApprove}
+          onClick={() => void run("approve")}
+        >
+          <CheckIcon className="h-4 w-4" />
+          批准创建
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+function getClarificationPayload(message: unknown): ClarificationPayload | null {
+  if (typeof message !== "object" || message === null) {
+    return null;
+  }
+  const additionalKwargs = Reflect.get(message, "additional_kwargs");
+  if (typeof additionalKwargs !== "object" || additionalKwargs === null) {
+    return null;
+  }
+  const clarification = Reflect.get(additionalKwargs, "clarification");
+  if (typeof clarification !== "object" || clarification === null) {
+    return null;
+  }
+  return clarification as ClarificationPayload;
+}
+
+function ClarificationCard({
+  fallbackContent,
+  isLoading,
+  message,
+  onSubmit,
+  rehypePlugins,
+}: {
+  fallbackContent: string;
+  isLoading: boolean;
+  message: unknown;
+  onSubmit?: (answer: string) => void | Promise<void>;
+  rehypePlugins: ReturnType<typeof useRehypeSplitWordsIntoSpans>;
+}) {
+  const payload = getClarificationPayload(message);
+  const [customAnswer, setCustomAnswer] = useState("");
+  const [submitting, setSubmitting] = useState(false);
+
+  const options = useMemo(
+    () =>
+      (payload?.options ?? []).filter(
+        (option) => typeof option.label === "string" && option.label.trim(),
+      ),
+    [payload?.options],
+  );
+
+  if (!payload) {
+    return (
+      <MarkdownContent
+        content={fallbackContent}
+        isLoading={isLoading}
+        rehypePlugins={rehypePlugins}
+      />
+    );
+  }
+
+  const disabled = isLoading || submitting || !onSubmit;
+
+  async function submitAnswer(answer: string) {
+    const trimmed = answer.trim();
+    if (!trimmed || disabled) {
+      return;
+    }
+    setSubmitting(true);
+    try {
+      await onSubmit?.(trimmed);
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  return (
+    <div className="border-border bg-card text-card-foreground w-full rounded-lg border p-4 shadow-sm">
+      <div className="space-y-2">
+        <div className="text-muted-foreground text-xs font-medium">
+          需要你的确认
+        </div>
+        {payload.context ? (
+          <p className="text-muted-foreground text-sm leading-6">
+            {payload.context}
+          </p>
+        ) : null}
+        <div className="text-sm leading-6 font-medium">
+          {payload.question || fallbackContent}
+        </div>
+      </div>
+
+      {options.length > 0 ? (
+        <div className="mt-4 grid gap-2">
+          {options.map((option) => (
+            <Button
+              key={option.id || option.label}
+              type="button"
+              variant="outline"
+              className="h-auto justify-start whitespace-normal px-3 py-2 text-left"
+              disabled={disabled}
+              onClick={() => void submitAnswer(`我选择：${option.label}`)}
+            >
+              <span className="flex min-w-0 flex-col items-start gap-1">
+                <span>{option.label}</span>
+                {option.description ? (
+                  <span className="text-muted-foreground text-xs font-normal leading-5">
+                    {option.description}
+                  </span>
+                ) : null}
+              </span>
+            </Button>
+          ))}
+        </div>
+      ) : null}
+
+      {payload.allow_custom !== false ? (
+        <div className="mt-4 flex flex-col gap-2">
+          <Textarea
+            value={customAnswer}
+            onChange={(event) => setCustomAnswer(event.currentTarget.value)}
+            placeholder="如果以上选项都不合适，可以在这里输入你的回答"
+            disabled={disabled}
+            className="min-h-20 resize-none"
+          />
+          <div className="flex justify-end">
+            <Button
+              type="button"
+              size="sm"
+              disabled={disabled || !customAnswer.trim()}
+              onClick={() => void submitAnswer(customAnswer)}
+            >
+              <SendIcon className="h-4 w-4" />
+              发送回答
+            </Button>
+          </div>
+        </div>
+      ) : null}
+    </div>
+  );
+}
diff --git a/frontend-web/src/core/messages/utils.ts b/frontend-web/src/core/messages/utils.ts
index a2930687..e1c1a478 100644
--- a/frontend-web/src/core/messages/utils.ts
+++ b/frontend-web/src/core/messages/utils.ts
@@ -14,17 +14,20 @@ interface AssistantMessageGroup extends GenericMessageGroup<"assistant"> {}
 
 interface AssistantPresentFilesGroup extends GenericMessageGroup<"assistant:present-files"> {}
 
-interface AssistantClarificationGroup extends GenericMessageGroup<"assistant:clarification"> {}
-
-interface AssistantSubagentGroup extends GenericMessageGroup<"assistant:subagent"> {}
+interface AssistantClarificationGroup extends GenericMessageGroup<"assistant:clarification"> {}
+
+interface AssistantSetupAgentApprovalGroup extends GenericMessageGroup<"assistant:setup-agent-approval"> {}
+
+interface AssistantSubagentGroup extends GenericMessageGroup<"assistant:subagent"> {}
 
 type MessageGroup =
   | HumanMessageGroup
   | AssistantProcessingGroup
   | AssistantMessageGroup
-  | AssistantPresentFilesGroup
-  | AssistantClarificationGroup
-  | AssistantSubagentGroup;
+  | AssistantPresentFilesGroup
+  | AssistantClarificationGroup
+  | AssistantSetupAgentApprovalGroup
+  | AssistantSubagentGroup;
 
 export function groupMessages<T>(
   messages: Message[],
@@ -41,10 +44,11 @@ export function groupMessages<T>(
   function lastOpenGroup() {
     const last = groups[groups.length - 1];
     if (
-      last &&
-      last.type !== "human" &&
-      last.type !== "assistant" &&
-      last.type !== "assistant:clarification"
+      last &&
+      last.type !== "human" &&
+      last.type !== "assistant" &&
+      last.type !== "assistant:clarification" &&
+      last.type !== "assistant:setup-agent-approval"
     ) {
       return last;
     }
@@ -66,16 +70,23 @@ export function groupMessages<T>(
     }
 
     if (message.type === "tool") {
-      if (isClarificationToolMessage(message)) {
+      if (isClarificationToolMessage(message)) {
         // Add to the preceding processing group to preserve tool-call association,
         // then also open a standalone clarification group for prominent display.
         lastOpenGroup()?.messages.push(message);
         groups.push({
           id: message.id,
           type: "assistant:clarification",
-          messages: [message],
-        });
-      } else {
+          messages: [message],
+        });
+      } else if (isSetupAgentApprovalToolMessage(message)) {
+        lastOpenGroup()?.messages.push(message);
+        groups.push({
+          id: message.id,
+          type: "assistant:setup-agent-approval",
+          messages: [message],
+        });
+      } else {
         const open = lastOpenGroup();
         if (open) {
           open.messages.push(message);
@@ -286,10 +297,19 @@ export function hasPresentFiles(message: Message) {
   );
 }
 
-export function isClarificationToolMessage(message: Message) {
-  return message.type === "tool" && message.name === "ask_clarification";
-}
-
+export function isClarificationToolMessage(message: Message) {
+  return message.type === "tool" && message.name === "ask_clarification";
+}
+
+export function isSetupAgentApprovalToolMessage(message: Message) {
+  return (
+    message.type === "tool" &&
+    message.name === "setup_agent" &&
+    typeof message.additional_kwargs?.setup_agent_approval === "object" &&
+    message.additional_kwargs.setup_agent_approval !== null
+  );
+}
+
 export function extractPresentFilesFromMessage(message: Message) {
   if (message.type !== "ai" || !hasPresentFiles(message)) {
     return [];
diff --git a/frontend-web/src/pages/NewAgentPage.tsx b/frontend-web/src/pages/NewAgentPage.tsx
index 83ff8fc6..23adff1f 100644
--- a/frontend-web/src/pages/NewAgentPage.tsx
+++ b/frontend-web/src/pages/NewAgentPage.tsx
@@ -1,517 +1,477 @@
-"use client";
-
-import {
-  ArrowLeftIcon,
-  BotIcon,
-  CheckCircleIcon,
-  InfoIcon,
-  MoreHorizontalIcon,
-  SaveIcon,
-} from "lucide-react";
-import { useRouter } from "next/navigation";
-import { useCallback, useEffect, useMemo, useState } from "react";
-import { toast } from "sonner";
-
-import {
-  PromptInput,
-  PromptInputFooter,
-  PromptInputSubmit,
-  PromptInputTextarea,
-} from "@/components/ai-elements/prompt-input";
-import { Alert, AlertDescription } from "@/components/ui/alert";
-import { Button } from "@/components/ui/button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-import { Input } from "@/components/ui/input";
-import { ArtifactsProvider } from "@/components/workspace/artifacts";
-import { MessageList } from "@/components/workspace/messages";
-import { ThreadContext } from "@/components/workspace/messages/context";
-import { getAPIClient } from "@/core/api";
-import type { Agent } from "@/core/agents";
-import {
-  AgentNameCheckError,
-  checkAgentName,
-  createAgent,
-  getAgent,
-} from "@/core/agents/api";
-import { useI18n } from "@/core/i18n/hooks";
-import { useSkills } from "@/core/skills/hooks";
-import type { Skill } from "@/core/skills";
-import { useThreadStream } from "@/core/threads/hooks";
-import { uuid } from "@/core/utils/uuid";
-import { isIMEComposing } from "@/lib/ime";
-import { cn } from "@/lib/utils";
-
-type Step = "name" | "chat";
-type SetupAgentStatus = "idle" | "requested" | "completed";
-
-const SAVE_HINT_STORAGE_KEY = "deerflow.agent-create.save-hint-seen";
-const AGENT_READ_RETRY_DELAYS_MS = [200, 500, 1_000, 2_000];
-const DEFAULT_SELECTED_SKILL_COUNT = 3;
-
-function wait(ms: number) {
-  return new Promise((resolve) => window.setTimeout(resolve, ms));
-}
-
-async function getAgentWithRetry(agentId: string) {
-  for (const delay of [0, ...AGENT_READ_RETRY_DELAYS_MS]) {
-    if (delay > 0) {
-      await wait(delay);
-    }
-
-    try {
-      return await getAgent(agentId);
-    } catch {
-      // Retry until the write settles or the attempts are exhausted.
-    }
-  }
-
-  return null;
-}
-
-function getCreateAgentErrorMessage(
-  error: unknown,
-  networkErrorMessage: string,
-  fallbackMessage: string,
-) {
-  if (error instanceof TypeError && error.message === "Failed to fetch") {
-    return networkErrorMessage;
-  }
-  if (error instanceof Error && error.message) {
-    return error.message;
-  }
-  return fallbackMessage;
-}
-
-export default function NewAgentPage() {
-  const { t } = useI18n();
-  const router = useRouter();
-
-  const [step, setStep] = useState<Step>("name");
-  const [nameInput, setNameInput] = useState("");
-  const [nameError, setNameError] = useState("");
-  const [isCheckingName, setIsCheckingName] = useState(false);
-  const [isCreatingAgent, setIsCreatingAgent] = useState(false);
-  const [agentId, setAgentId] = useState("");
-  const [agent, setAgent] = useState<Agent | null>(null);
-  const [showSaveHint, setShowSaveHint] = useState(false);
-  const [setupAgentStatus, setSetupAgentStatus] =
-    useState<SetupAgentStatus>("idle");
-  const [selectedSkills, setSelectedSkills] = useState<string[]>([]);
-  const [isSkillSelectionTouched, setIsSkillSelectionTouched] = useState(false);
-  const [threadPrepared, setThreadPrepared] = useState(false);
-  const { skills, isLoading: isSkillsLoading } = useSkills();
-  const enabledSkills = useMemo(
-    () => skills.filter((skill) => skill.enabled),
-    [skills],
-  );
-
-  const threadId = useMemo(() => uuid(), []);
-
-  useEffect(() => {
-    if (isSkillSelectionTouched) {
-      return;
-    }
-    const defaults = enabledSkills
-      .slice(0, DEFAULT_SELECTED_SKILL_COUNT)
-      .map((skill) => skill.name);
-    setSelectedSkills(defaults);
-  }, [enabledSkills, isSkillSelectionTouched]);
-
-  const [thread, sendMessage] = useThreadStream({
-    threadId: step === "chat" ? threadId : undefined,
-    assistantId: agentId || undefined,
-    context: {
-      mode: "flash",
-      is_bootstrap: true,
-    },
-    onFinish() {
-      if (!agent && setupAgentStatus === "requested") {
-        setSetupAgentStatus("idle");
-      }
-    },
-    onToolEnd({ name }) {
-      if (name !== "setup_agent" || !agentId) return;
-      setSetupAgentStatus("completed");
-      void getAgentWithRetry(agentId).then((fetched) => {
-        if (fetched) {
-          setAgent(fetched);
-          return;
-        }
-
-        toast.error(t.agents.agentCreatedPendingRefresh);
-      });
-    },
-  });
-
-  const ensureThreadExists = useCallback(async () => {
-    if (threadPrepared) {
-      return;
-    }
-    await getAPIClient().threads.create({
-      threadId,
-    });
-    setThreadPrepared(true);
-  }, [threadPrepared, threadId]);
-
-  useEffect(() => {
-    if (typeof window === "undefined" || step !== "chat") {
-      return;
-    }
-    if (window.localStorage.getItem(SAVE_HINT_STORAGE_KEY) === "1") {
-      return;
-    }
-    setShowSaveHint(true);
-    window.localStorage.setItem(SAVE_HINT_STORAGE_KEY, "1");
-  }, [step]);
-
-  const handleConfirmName = useCallback(async () => {
-    const trimmed = nameInput.trim();
-    if (!trimmed) {
-      setNameError(t.agents.nameStepInvalidError);
-      return;
-    }
-
-    if (enabledSkills.length > 0 && selectedSkills.length === 0) {
-      setNameError("请至少选择一个技能");
-      return;
-    }
-
-    setNameError("");
-    setIsCheckingName(true);
-    try {
-      await checkAgentName(trimmed);
-    } catch (err) {
-      if (
-        err instanceof AgentNameCheckError &&
-        err.reason === "backend_unreachable"
-      ) {
-        setNameError(t.agents.nameStepNetworkError);
-      } else {
-        setNameError(t.agents.nameStepCheckError);
-      }
-      return;
-    } finally {
-      setIsCheckingName(false);
-    }
-
-    let createdId: string;
-    let createdName: string;
-    setIsCreatingAgent(true);
-    try {
-      const created = await createAgent({
-        name: trimmed,
-        description: "",
-        skills: selectedSkills,
-        soul: "",
-      });
-      createdId = created.id;
-      createdName = created.name;
-    } catch (err) {
-      setNameError(
-        getCreateAgentErrorMessage(
-          err,
-          t.agents.nameStepNetworkError,
-          t.agents.nameStepCheckError,
-        ),
-      );
-      return;
-    } finally {
-      setIsCreatingAgent(false);
-    }
-
-    setAgentId(createdId);
-    setStep("chat");
-    await ensureThreadExists();
-    await sendMessage(threadId, {
-      text: t.agents.nameStepBootstrapMessage.replace("{name}", createdName),
-      files: [],
-    });
-  }, [
-    nameInput,
-    sendMessage,
-    t.agents.nameStepNetworkError,
-    t.agents.nameStepBootstrapMessage,
-    t.agents.nameStepCheckError,
-    t.agents.nameStepInvalidError,
-    threadId,
-    enabledSkills.length,
-    selectedSkills,
-    ensureThreadExists,
-  ]);
-
-  const toggleSkill = useCallback((skill: Skill) => {
-    setIsSkillSelectionTouched(true);
-    setNameError("");
-    setSelectedSkills((prev) => {
-      if (prev.includes(skill.name)) {
-        return prev.filter((name) => name !== skill.name);
-      }
-      return [...prev, skill.name];
-    });
-  }, []);
-
-  const handleNameKeyDown = (e: React.KeyboardEvent<HTMLInputElement>) => {
-    if (e.key === "Enter" && !isIMEComposing(e)) {
-      e.preventDefault();
-      void handleConfirmName();
-    }
-  };
-
-  const handleChatSubmit = useCallback(
-    async (text: string) => {
-      const trimmed = text.trim();
-      if (!trimmed || thread.isLoading) return;
-      await ensureThreadExists();
-      await sendMessage(
-        threadId,
-        { text: trimmed, files: [] },
-        { agent_id: agentId },
-      );
-    },
-    [agentId, sendMessage, thread.isLoading, threadId, ensureThreadExists],
-  );
-
-  const handleSaveAgent = useCallback(async () => {
-    if (
-      !agentId ||
-      agent ||
-      thread.isLoading ||
-      setupAgentStatus !== "idle"
-    ) {
-      return;
-    }
-
-    setSetupAgentStatus("requested");
-    setShowSaveHint(false);
-    try {
-      await sendMessage(
-        threadId,
-        { text: t.agents.saveCommandMessage, files: [] },
-        { agent_id: agentId },
-        { additionalKwargs: { hide_from_ui: true } },
-      );
-      toast.success(t.agents.saveRequested);
-    } catch (error) {
-      setSetupAgentStatus("idle");
-      toast.error(error instanceof Error ? error.message : String(error));
-    }
-  }, [
-    agent,
-    agentId,
-    sendMessage,
-    setupAgentStatus,
-    t.agents.saveCommandMessage,
-    t.agents.saveRequested,
-    thread.isLoading,
-    threadId,
-  ]);
-
-  const header = (
-    <header className="flex shrink-0 items-center justify-between gap-3 border-b px-4 py-3">
-      <div className="flex items-center gap-3">
-        <Button
-          variant="ghost"
-          size="icon-sm"
-          onClick={() => router.push("/workspace/agents")}
-        >
-          <ArrowLeftIcon className="h-4 w-4" />
-        </Button>
-        <h1 className="text-sm font-semibold">{t.agents.createPageTitle}</h1>
-      </div>
-
-      {step === "chat" ? (
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <Button variant="ghost" size="icon-sm" aria-label={t.agents.more}>
-              <MoreHorizontalIcon className="h-4 w-4" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="end">
-            <DropdownMenuItem
-              onSelect={() => void handleSaveAgent()}
-              disabled={
-                !!agent || thread.isLoading || setupAgentStatus !== "idle"
-              }
-            >
-              <SaveIcon className="h-4 w-4" />
-              {setupAgentStatus === "requested"
-                ? t.agents.saving
-                : t.agents.save}
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      ) : null}
-    </header>
-  );
-
-  if (step === "name") {
-    return (
-      <div className="flex size-full flex-col">
-        {header}
-        <main className="flex flex-1 flex-col items-center justify-center px-4">
-          <div className="w-full max-w-sm space-y-8">
-            <div className="space-y-3 text-center">
-              <div className="bg-primary/10 mx-auto flex h-14 w-14 items-center justify-center rounded-full">
-                <BotIcon className="text-primary h-7 w-7" />
-              </div>
-              <div className="space-y-1">
-                <h2 className="text-xl font-semibold">
-                  {t.agents.nameStepTitle}
-                </h2>
-                <p className="text-muted-foreground text-sm">
-                  {t.agents.nameStepHint}
-                </p>
-              </div>
-            </div>
-
-            <div className="space-y-3">
-              <Input
-                autoFocus
-                placeholder={t.agents.nameStepPlaceholder}
-                value={nameInput}
-                onChange={(e) => {
-                  setNameInput(e.target.value);
-                  setNameError("");
-                }}
-                onKeyDown={handleNameKeyDown}
-                className={cn(nameError && "border-destructive")}
-              />
-              {nameError ? (
-                <p className="text-destructive text-sm">{nameError}</p>
-              ) : null}
-              <div className="space-y-2">
-                <div className="flex items-center justify-between">
-                  <p className="text-sm font-medium">默认技能（可自定义）</p>
-                  <p className="text-muted-foreground text-xs">
-                    已选 {selectedSkills.length} 个
-                  </p>
-                </div>
-                <div className="rounded-md border p-2">
-                  {isSkillsLoading ? (
-                    <p className="text-muted-foreground text-sm">技能加载中...</p>
-                  ) : enabledSkills.length === 0 ? (
-                    <p className="text-muted-foreground text-sm">
-                      当前没有可用技能，将创建为无技能智能体。
-                    </p>
-                  ) : (
-                    <div className="flex flex-wrap gap-2">
-                      {enabledSkills.map((skill) => {
-                        const checked = selectedSkills.includes(skill.name);
-                        return (
-                          <Button
-                            key={skill.name}
-                            type="button"
-                            size="sm"
-                            variant={checked ? "default" : "outline"}
-                            onClick={() => toggleSkill(skill)}
-                            className={cn(
-                              "h-8",
-                              checked ? "" : "text-muted-foreground",
-                            )}
-                            title={skill.description}
-                          >
-                            {skill.name}
-                          </Button>
-                        );
-                      })}
-                    </div>
-                  )}
-                </div>
-              </div>
-              <Button
-                className="w-full"
-                onClick={() => void handleConfirmName()}
-                disabled={
-                  !nameInput.trim() ||
-                  isCheckingName ||
-                  isCreatingAgent ||
-                  isSkillsLoading
-                }
-              >
-                {t.agents.nameStepContinue}
-              </Button>
-            </div>
-          </div>
-        </main>
-      </div>
-    );
-  }
-
-  return (
-    <ThreadContext.Provider value={{ thread }}>
-      <ArtifactsProvider>
-        <div className="flex size-full flex-col">
-          {header}
-
-          <main className="flex min-h-0 flex-1 flex-col">
-            {showSaveHint ? (
-              <div className="px-4 pt-4">
-                <div className="mx-auto w-full max-w-(--container-width-md)">
-                  <Alert>
-                    <InfoIcon className="h-4 w-4" />
-                    <AlertDescription>{t.agents.saveHint}</AlertDescription>
-                  </Alert>
-                </div>
-              </div>
-            ) : null}
-
-            <div className="flex min-h-0 flex-1 justify-center">
-              <MessageList
-                className={cn("size-full", showSaveHint ? "pt-4" : "pt-10")}
-                threadId={threadId}
-                thread={thread}
-                onClarificationSubmit={handleChatSubmit}
-              />
-            </div>
-
-            <div className="bg-background flex shrink-0 justify-center border-t px-4 py-4">
-              <div className="w-full max-w-(--container-width-md)">
-                {agent ? (
-                  <div className="flex flex-col items-center gap-4 rounded-2xl border py-8 text-center">
-                    <CheckCircleIcon className="text-primary h-10 w-10" />
-                    <p className="font-semibold">{t.agents.agentCreated}</p>
-                    <div className="flex gap-2">
-                      <Button
-                        onClick={() =>
-                          router.push(
-                            `/workspace/agents/${agentId}/chats/new`,
-                          )
-                        }
-                      >
-                        {t.agents.startChatting}
-                      </Button>
-                      <Button
-                        variant="outline"
-                        onClick={() => router.push("/workspace/agents")}
-                      >
-                        {t.agents.backToGallery}
-                      </Button>
-                    </div>
-                  </div>
-                ) : (
-                  <PromptInput
-                    onSubmit={({ text }) => void handleChatSubmit(text)}
-                  >
-                    <PromptInputTextarea
-                      autoFocus
-                      placeholder={t.agents.createPageSubtitle}
-                      disabled={thread.isLoading}
-                    />
-                    <PromptInputFooter className="justify-end">
-                      <PromptInputSubmit disabled={thread.isLoading} />
-                    </PromptInputFooter>
-                  </PromptInput>
-                )}
-              </div>
-            </div>
-          </main>
-        </div>
-      </ArtifactsProvider>
-    </ThreadContext.Provider>
-  );
-}
+"use client";
+
+import {
+  ArrowLeftIcon,
+  CheckCircleIcon,
+  SaveIcon,
+} from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useCallback, useEffect, useMemo, useState } from "react";
+import { toast } from "sonner";
+
+import {
+  PromptInput,
+  PromptInputFooter,
+  PromptInputSubmit,
+  PromptInputTextarea,
+} from "@/components/ai-elements/prompt-input";
+import { Button } from "@/components/ui/button";
+import { Input } from "@/components/ui/input";
+import { Textarea } from "@/components/ui/textarea";
+import { ArtifactsProvider } from "@/components/workspace/artifacts";
+import {
+  MessageList,
+  type SetupAgentApprovalPayload,
+} from "@/components/workspace/messages";
+import { ThreadContext } from "@/components/workspace/messages/context";
+import { getAPIClient } from "@/core/api";
+import type { Agent } from "@/core/agents";
+import {
+  AgentNameCheckError,
+  checkAgentName,
+  createAgent,
+  getAgent,
+  updateAgent,
+} from "@/core/agents/api";
+import { useI18n } from "@/core/i18n/hooks";
+import type { Skill } from "@/core/skills";
+import { useSkills } from "@/core/skills/hooks";
+import { useThreadStream } from "@/core/threads/hooks";
+import { uuid } from "@/core/utils/uuid";
+import { cn } from "@/lib/utils";
+
+const AGENT_READ_RETRY_DELAYS_MS = [200, 500, 1_000, 2_000];
+const DEFAULT_SELECTED_SKILL_COUNT = 3;
+
+function wait(ms: number) {
+  return new Promise((resolve) => window.setTimeout(resolve, ms));
+}
+
+async function getAgentWithRetry(agentId: string) {
+  for (const delay of [0, ...AGENT_READ_RETRY_DELAYS_MS]) {
+    if (delay > 0) {
+      await wait(delay);
+    }
+    try {
+      return await getAgent(agentId);
+    } catch {
+      // Retry until the file/database write settles.
+    }
+  }
+  return null;
+}
+
+function getCreateAgentErrorMessage(
+  error: unknown,
+  networkErrorMessage: string,
+  fallbackMessage: string,
+) {
+  if (error instanceof TypeError && error.message === "Failed to fetch") {
+    return networkErrorMessage;
+  }
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  return fallbackMessage;
+}
+
+export default function NewAgentPage() {
+  const { t } = useI18n();
+  const router = useRouter();
+  const threadId = useMemo(() => uuid(), []);
+
+  const [nameInput, setNameInput] = useState("");
+  const [descriptionInput, setDescriptionInput] = useState("");
+  const [soulInput, setSoulInput] = useState("");
+  const [formError, setFormError] = useState("");
+  const [agentId, setAgentId] = useState("");
+  const [agent, setAgent] = useState<Agent | null>(null);
+  const [isCreatingAgent, setIsCreatingAgent] = useState(false);
+  const [isSavingDraft, setIsSavingDraft] = useState(false);
+  const [selectedSkills, setSelectedSkills] = useState<string[]>([]);
+  const [isSkillSelectionTouched, setIsSkillSelectionTouched] = useState(false);
+  const [threadPrepared, setThreadPrepared] = useState(false);
+  const { skills, isLoading: isSkillsLoading } = useSkills();
+
+  const enabledSkills = useMemo(
+    () => skills.filter((skill) => skill.enabled),
+    [skills],
+  );
+
+  useEffect(() => {
+    if (isSkillSelectionTouched) {
+      return;
+    }
+    setSelectedSkills(
+      enabledSkills
+        .slice(0, DEFAULT_SELECTED_SKILL_COUNT)
+        .map((skill) => skill.name),
+    );
+  }, [enabledSkills, isSkillSelectionTouched]);
+
+  const [thread, sendMessage] = useThreadStream({
+    threadId,
+    assistantId: agentId || undefined,
+    context: {
+      mode: "flash",
+      is_bootstrap: true,
+    },
+    onToolEnd({ name }) {
+      if (name !== "setup_agent" || !agentId) {
+        return;
+      }
+      void getAgentWithRetry(agentId).then((fetched) => {
+        if (fetched) {
+          setAgent(fetched);
+          setDescriptionInput(fetched.description ?? "");
+          setSoulInput(fetched.soul ?? "");
+          setSelectedSkills(fetched.skills ?? []);
+          toast.success("专家配置已创建");
+        }
+      });
+    },
+  });
+
+  const ensureThreadExists = useCallback(async () => {
+    if (threadPrepared) {
+      return;
+    }
+    await getAPIClient().threads.create({ threadId });
+    setThreadPrepared(true);
+  }, [threadId, threadPrepared]);
+
+  const validateForm = useCallback(() => {
+    // Name is intentionally NOT required here so the user can start chatting
+    // immediately. If they leave it blank, ensureAgent() generates a placeholder
+    // and writes it back into the input so they can rename it later.
+    if (enabledSkills.length > 0 && selectedSkills.length === 0) {
+      setFormError("请至少选择一个技能");
+      return null;
+    }
+    setFormError("");
+    return nameInput.trim();
+  }, [enabledSkills.length, nameInput, selectedSkills.length]);
+
+  const ensureAgent = useCallback(async () => {
+    const provided = validateForm();
+    if (provided === null) {
+      return null;
+    }
+    let name = provided;
+    if (!name) {
+      // Names are display-only and may collide, so a timestamped placeholder is
+      // safe. Reflect it in the form so the user sees what got created.
+      name = `未命名专家-${Date.now().toString(36)}`;
+      setNameInput(name);
+    }
+
+    if (agentId) {
+      setIsSavingDraft(true);
+      try {
+        const updated = await updateAgent(agentId, {
+          name,
+          description: descriptionInput,
+          soul: soulInput,
+          skills: selectedSkills,
+        });
+        setAgent(updated);
+        return updated;
+      } catch (error) {
+        toast.error(error instanceof Error ? error.message : String(error));
+        return null;
+      } finally {
+        setIsSavingDraft(false);
+      }
+    }
+
+    setIsCreatingAgent(true);
+    try {
+      await checkAgentName(name);
+      const created = await createAgent({
+        name,
+        description: descriptionInput,
+        soul: soulInput,
+        skills: selectedSkills,
+      });
+      setAgentId(created.id);
+      setAgent(created);
+      return created;
+    } catch (error) {
+      if (
+        error instanceof AgentNameCheckError &&
+        error.reason === "backend_unreachable"
+      ) {
+        setFormError(t.agents.nameStepNetworkError);
+      } else {
+        setFormError(
+          getCreateAgentErrorMessage(
+            error,
+            t.agents.nameStepNetworkError,
+            t.agents.nameStepCheckError,
+          ),
+        );
+      }
+      return null;
+    } finally {
+      setIsCreatingAgent(false);
+    }
+  }, [
+    agentId,
+    descriptionInput,
+    selectedSkills,
+    soulInput,
+    t.agents.nameStepCheckError,
+    t.agents.nameStepNetworkError,
+    validateForm,
+  ]);
+
+  const handleSaveAgent = useCallback(async () => {
+    const saved = await ensureAgent();
+    if (!saved) {
+      return;
+    }
+    toast.success(`专家「${saved.name}」已保存`);
+  }, [ensureAgent]);
+
+  const handleChatSubmit = useCallback(
+    async (text: string) => {
+      const trimmed = text.trim();
+      if (!trimmed || thread.isLoading) {
+        return;
+      }
+      // Lazily create the agent on first message so the user can just start
+      // typing — ensureAgent generates a placeholder name when none is provided.
+      let activeAgentId = agentId;
+      if (!activeAgentId) {
+        const created = await ensureAgent();
+        if (!created) {
+          return;
+        }
+        activeAgentId = created.id;
+      }
+      await ensureThreadExists();
+      await sendMessage(
+        threadId,
+        { text: trimmed, files: [] },
+        { agent_id: activeAgentId },
+      );
+    },
+    [agentId, ensureAgent, ensureThreadExists, sendMessage, thread.isLoading, threadId],
+  );
+
+  const handleApproveSetupAgent = useCallback(
+    async (payload: SetupAgentApprovalPayload) => {
+      if (!agentId) {
+        return;
+      }
+      // Approval persists directly to the backend — no LLM round-trip. The
+      // backend's PUT /api/agents/{id} writes both the DB record and SOUL.md /
+      // config.yaml on disk, which is exactly what setup_agent_tool would have
+      // done if we'd let the model re-invoke it.
+      const proposedName = payload.name?.trim() ?? "";
+      const newDescription = payload.description ?? "";
+      const newSoul = payload.soul ?? "";
+      const newSkills = payload.skills ?? [];
+
+      // Prefer the model's proposed name when present; fall back to whatever
+      // the user already typed, or the existing agent record.
+      const resolvedName = proposedName || nameInput.trim() || agent?.name || agentId;
+      setNameInput(resolvedName);
+      setDescriptionInput(newDescription);
+      setSoulInput(newSoul);
+      setSelectedSkills(newSkills);
+      setIsSkillSelectionTouched(true);
+
+      try {
+        const updated = await updateAgent(agentId, {
+          name: resolvedName,
+          description: newDescription,
+          soul: newSoul,
+          skills: newSkills,
+        });
+        setAgent(updated);
+        toast.success("专家配置已保存");
+      } catch (error) {
+        toast.error(error instanceof Error ? error.message : "保存失败");
+      }
+    },
+    [agent, agentId, nameInput],
+  );
+
+  const handleRejectSetupAgent = useCallback(
+    async () => {
+      await handleChatSubmit("我暂时不批准创建这个专家配置，请继续帮我调整。");
+    },
+    [handleChatSubmit],
+  );
+
+  const toggleSkill = useCallback((skill: Skill) => {
+    setIsSkillSelectionTouched(true);
+    setFormError("");
+    setSelectedSkills((prev) =>
+      prev.includes(skill.name)
+        ? prev.filter((name) => name !== skill.name)
+        : [...prev, skill.name],
+    );
+  }, []);
+
+  const busy = isCreatingAgent || isSavingDraft || thread.isLoading;
+
+  return (
+    <ThreadContext.Provider value={{ thread }}>
+      <ArtifactsProvider>
+        <div className="flex size-full flex-col">
+          <header className="flex shrink-0 items-center justify-between gap-3 border-b px-4 py-3">
+            <div className="flex items-center gap-3">
+              <Button
+                variant="ghost"
+                size="icon-sm"
+                onClick={() => router.push("/workspace/agents")}
+              >
+                <ArrowLeftIcon className="h-4 w-4" />
+              </Button>
+              <h1 className="text-sm font-semibold">创建专家</h1>
+            </div>
+            {agent ? (
+              <Button
+                variant="outline"
+                size="sm"
+                onClick={() => router.push(`/workspace/agents/${agent.id}/chats/new`)}
+              >
+                <CheckCircleIcon className="h-4 w-4" />
+                开始对话
+              </Button>
+            ) : null}
+          </header>
+
+          <main className="grid min-h-0 flex-1 grid-cols-1 md:grid-cols-[minmax(0,1fr)_420px]">
+            <section className="flex min-h-0 flex-col border-r">
+              <div className="min-h-0 flex-1">
+                <MessageList
+                  className="size-full"
+                  threadId={threadId}
+                  thread={thread}
+                  onClarificationSubmit={handleChatSubmit}
+                  onSetupAgentApprove={handleApproveSetupAgent}
+                  onSetupAgentReject={handleRejectSetupAgent}
+                />
+              </div>
+              <div className="bg-background shrink-0 border-t px-4 py-4">
+                <PromptInput
+                  onSubmit={({ text }) => void handleChatSubmit(text)}
+                >
+                  <PromptInputTextarea
+                    placeholder="直接告诉模型你想要什么样的专家，或回答模型的问题"
+                    disabled={thread.isLoading}
+                  />
+                  <PromptInputFooter className="justify-end">
+                    <PromptInputSubmit disabled={thread.isLoading} />
+                  </PromptInputFooter>
+                </PromptInput>
+              </div>
+            </section>
+
+            <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>
+                  <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="例如：合同审查专家"
+                    value={nameInput}
+                    onChange={(event) => {
+                      setNameInput(event.currentTarget.value);
+                      setFormError("");
+                    }}
+                    className={cn(formError && "border-destructive")}
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">描述</label>
+                  <Textarea
+                    placeholder="简要说明这个专家擅长什么"
+                    value={descriptionInput}
+                    onChange={(event) =>
+                      setDescriptionInput(event.currentTarget.value)
+                    }
+                    className="min-h-24 resize-none"
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <label className="text-sm font-medium">SOUL.md</label>
+                  <Textarea
+                    placeholder="写下专家的人设、边界、工作方式和输出要求"
+                    value={soulInput}
+                    onChange={(event) => setSoulInput(event.currentTarget.value)}
+                    className="min-h-48 resize-y font-mono text-xs"
+                  />
+                </div>
+
+                <div className="space-y-2">
+                  <div className="flex items-center justify-between">
+                    <label className="text-sm font-medium">技能</label>
+                    <span className="text-muted-foreground text-xs">
+                      已选 {selectedSkills.length} 个
+                    </span>
+                  </div>
+                  <div className="rounded-md border p-2">
+                    {isSkillsLoading ? (
+                      <p className="text-muted-foreground text-sm">技能加载中...</p>
+                    ) : enabledSkills.length === 0 ? (
+                      <p className="text-muted-foreground text-sm">
+                        当前没有可用技能。
+                      </p>
+                    ) : (
+                      <div className="flex flex-wrap gap-2">
+                        {enabledSkills.map((skill) => {
+                          const checked = selectedSkills.includes(skill.name);
+                          return (
+                            <Button
+                              key={skill.name}
+                              type="button"
+                              size="sm"
+                              variant={checked ? "default" : "outline"}
+                              onClick={() => toggleSkill(skill)}
+                              title={skill.description}
+                              className={cn(
+                                "h-8 max-w-full",
+                                !checked && "text-muted-foreground",
+                              )}
+                            >
+                              <span className="truncate">{skill.name}</span>
+                            </Button>
+                          );
+                        })}
+                      </div>
+                    )}
+                  </div>
+                </div>
+
+                {formError ? (
+                  <p className="text-destructive text-sm">{formError}</p>
+                ) : null}
+
+                <Button
+                  className="w-full"
+                  onClick={() => void handleSaveAgent()}
+                  disabled={busy || isSkillsLoading}
+                >
+                  <SaveIcon className="h-4 w-4" />
+                  {agentId ? "保存专家" : "创建专家"}
+                </Button>
+              </div>
+            </aside>
+          </main>
+        </div>
+      </ArtifactsProvider>
+    </ThreadContext.Provider>
+  );
+}
diff --git a/offline-backend-20260512/backend/app/gateway/routers/agents.py b/offline-backend-20260512/backend/app/gateway/routers/agents.py
index e40cd29c..11527961 100644
--- a/offline-backend-20260512/backend/app/gateway/routers/agents.py
+++ b/offline-backend-20260512/backend/app/gateway/routers/agents.py
@@ -89,6 +89,12 @@ def _current_user_id(request: Request) -> str:
     return get_effective_user_id()
 
 
+def _is_admin_user(request: Request) -> bool:
+    """Return True when the request is authenticated as a system admin."""
+    user = getattr(request.state, "user", None)
+    return getattr(user, "system_role", None) == "admin"
+
+
 def _validate_display_name(name: str) -> str:
     normalized = name.strip()
     if not normalized:
@@ -203,6 +209,29 @@ async def _get_owned_or_raise(store: AgentStore, agent_id: str, user_id: str) ->
     raise HTTPException(status_code=403, detail="You can only modify agents that you created")
 
 
+async def _get_editable_or_raise(
+    store: AgentStore,
+    agent_id: str,
+    user_id: str,
+    *,
+    is_admin: bool,
+) -> tuple[dict[str, Any], str]:
+    """Return (record, edit_mode) where edit_mode is 'owner' or 'admin'.
+
+    'admin' is granted only when the agent is built-in (user_id IS NULL) and the
+    caller is a system admin. Custom agents owned by other users still 403.
+    """
+    owned = await store.get_owned(agent_id, user_id)
+    if owned is not None:
+        return owned, "owner"
+    visible = await store.get_visible(agent_id, user_id)
+    if visible is None:
+        raise HTTPException(status_code=404, detail=f"Agent '{agent_id}' not found")
+    if is_admin and visible.get("user_id") is None:
+        return visible, "admin"
+    raise HTTPException(status_code=403, detail="You can only modify agents that you created")
+
+
 @router.get(
     "/agents",
     response_model=AgentsListResponse,
@@ -322,7 +351,10 @@ async def update_agent(agent_id: str, request: AgentUpdateRequest, http_request:
     try:
         store = get_agent_store(http_request)
         user_id = _current_user_id(http_request)
-        current = await _get_owned_or_raise(store, agent_id, user_id)
+        is_admin = _is_admin_user(http_request)
+        current, edit_mode = await _get_editable_or_raise(
+            store, agent_id, user_id, is_admin=is_admin
+        )
 
         fields_set = request.model_fields_set
         update_data: dict[str, Any] = {}
@@ -354,7 +386,12 @@ async def update_agent(agent_id: str, request: AgentUpdateRequest, http_request:
         if request.soul is not None:
             _write_agent_soul(agent_id, request.soul)
 
-        record = await store.update(agent_id, user_id, update_data) if update_data else current
+        if not update_data:
+            record = current
+        elif edit_mode == "admin":
+            record = await store.update_builtin(agent_id, update_data)
+        else:
+            record = await store.update(agent_id, user_id, update_data)
         if record is None:
             raise HTTPException(status_code=404, detail=f"Agent '{agent_id}' not found")
 
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/agent.py b/offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/agent.py
index c1794647..481f1f7e 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/agent.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/agents/lead_agent/agent.py
@@ -8,8 +8,9 @@ from deerflow.agents.lead_agent.prompt import apply_prompt_template
 from deerflow.agents.memory.summarization_hook import memory_flush_hook
 from deerflow.agents.middlewares.clarification_middleware import ClarificationMiddleware
 from deerflow.agents.middlewares.loop_detection_middleware import LoopDetectionMiddleware
-from deerflow.agents.middlewares.memory_middleware import MemoryMiddleware
-from deerflow.agents.middlewares.subagent_limit_middleware import SubagentLimitMiddleware
+from deerflow.agents.middlewares.memory_middleware import MemoryMiddleware
+from deerflow.agents.middlewares.setup_agent_approval_middleware import SetupAgentApprovalMiddleware
+from deerflow.agents.middlewares.subagent_limit_middleware import SubagentLimitMiddleware
 from deerflow.agents.middlewares.summarization_middleware import BeforeSummarizationHook, DeerFlowSummarizationMiddleware
 from deerflow.agents.middlewares.title_middleware import TitleMiddleware
 from deerflow.agents.middlewares.todo_middleware import TodoMiddleware
@@ -303,8 +304,10 @@ def _build_middlewares(
     if custom_middlewares:
         middlewares.extend(custom_middlewares)
 
-    # ClarificationMiddleware should always be last
-    middlewares.append(ClarificationMiddleware())
+    middlewares.append(SetupAgentApprovalMiddleware())
+
+    # ClarificationMiddleware should always be last
+    middlewares.append(ClarificationMiddleware())
     return middlewares
 
 
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/agents/middlewares/setup_agent_approval_middleware.py b/offline-backend-20260512/backend/packages/harness/deerflow/agents/middlewares/setup_agent_approval_middleware.py
new file mode 100644
index 00000000..51a90017
--- /dev/null
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/agents/middlewares/setup_agent_approval_middleware.py
@@ -0,0 +1,90 @@
+"""Approval middleware for the custom-agent setup tool."""
+
+from __future__ import annotations
+
+import logging
+from collections.abc import Callable
+from hashlib import sha256
+from typing import Any, override
+
+from langchain.agents import AgentState
+from langchain.agents.middleware import AgentMiddleware
+from langchain_core.messages import ToolMessage
+from langgraph.graph import END
+from langgraph.prebuilt.tool_node import ToolCallRequest
+from langgraph.types import Command
+
+logger = logging.getLogger(__name__)
+
+
+class SetupAgentApprovalMiddlewareState(AgentState):
+    """Compatible with the DeerFlow thread state schema."""
+
+    pass
+
+
+class SetupAgentApprovalMiddleware(AgentMiddleware[SetupAgentApprovalMiddlewareState]):
+    """Stop before ``setup_agent`` writes files and ask the user to approve.
+
+    The first ``setup_agent`` call is converted into a structured tool message
+    and the run ends. A subsequent request can set ``setup_agent_approved`` in
+    runtime context to allow the tool to execute.
+    """
+
+    state_schema = SetupAgentApprovalMiddlewareState
+
+    def _is_approved(self, request: ToolCallRequest) -> bool:
+        context = getattr(request.runtime, "context", None) or {}
+        if not isinstance(context, dict):
+            return False
+        return context.get("setup_agent_approved") is True
+
+    def _stable_message_id(self, tool_call_id: str, args: dict[str, Any]) -> str:
+        if tool_call_id:
+            return f"setup-agent-approval:{tool_call_id}"
+        digest = sha256(repr(sorted(args.items())).encode("utf-8")).hexdigest()[:16]
+        return f"setup-agent-approval:{digest}"
+
+    def _build_payload(self, args: dict[str, Any]) -> dict[str, Any]:
+        skills = args.get("skills")
+        return {
+            "name": str(args.get("name") or "").strip(),
+            "description": str(args.get("description") or "").strip(),
+            "soul": str(args.get("soul") or "").strip(),
+            "skills": skills if isinstance(skills, list) else [],
+        }
+
+    def _handle_setup_agent(self, request: ToolCallRequest) -> Command:
+        args = request.tool_call.get("args", {}) or {}
+        tool_call_id = request.tool_call.get("id", "")
+        payload = self._build_payload(args)
+        logger.info("Setup agent approval requested before writing agent files")
+
+        message = ToolMessage(
+            id=self._stable_message_id(tool_call_id, args),
+            content="请确认是否创建/更新这个专家配置。",
+            tool_call_id=tool_call_id,
+            name="setup_agent",
+            additional_kwargs={"setup_agent_approval": payload},
+        )
+        return Command(update={"messages": [message]}, goto=END)
+
+    @override
+    def wrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], ToolMessage | Command],
+    ) -> ToolMessage | Command:
+        if request.tool_call.get("name") != "setup_agent" or self._is_approved(request):
+            return handler(request)
+        return self._handle_setup_agent(request)
+
+    @override
+    async def awrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], ToolMessage | Command],
+    ) -> ToolMessage | Command:
+        if request.tool_call.get("name") != "setup_agent" or self._is_approved(request):
+            return await handler(request)
+        return self._handle_setup_agent(request)
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/base.py b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/base.py
index f5bf22fe..dce4a983 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/base.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/base.py
@@ -35,6 +35,15 @@ class AgentStore(ABC):
     async def update(self, agent_id: str, user_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
         raise NotImplementedError
 
+    @abstractmethod
+    async def update_builtin(self, agent_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
+        """Update a built-in agent (user_id IS NULL).
+
+        Caller is responsible for authorization — this method does NOT check
+        any user identity and returns ``None`` if the target is not a built-in.
+        """
+        raise NotImplementedError
+
     @abstractmethod
     async def delete(self, agent_id: str, user_id: str) -> bool:
         raise NotImplementedError
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/memory.py b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/memory.py
index e17b3c40..3220b330 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/memory.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/memory.py
@@ -91,6 +91,16 @@ class MemoryAgentStore(AgentStore):
         row["updated_at"] = _now()
         return _copy(row)
 
+    async def update_builtin(self, agent_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
+        row = self._agents.get(agent_id)
+        if row is None or row.get("user_id") is not None:
+            return None
+        for key in ("name", "description", "published"):
+            if key in data:
+                row[key] = data[key]
+        row["updated_at"] = _now()
+        return _copy(row)
+
     async def delete(self, agent_id: str, user_id: str) -> bool:
         row = self._agents.get(agent_id)
         if row is None or row.get("user_id") != user_id:
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/sql.py b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/sql.py
index 28db88a2..97b33ece 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/sql.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/persistence/agents/sql.py
@@ -107,6 +107,19 @@ class AgentRepository(AgentStore):
             await session.refresh(row)
             return _row_to_dict(row)
 
+    async def update_builtin(self, agent_id: str, data: dict[str, Any]) -> dict[str, Any] | None:
+        async with self._sf() as session:
+            row = await session.get(AgentRow, agent_id)
+            if row is None or row.user_id is not None:
+                return None
+            for key in ("name", "description", "published"):
+                if key in data:
+                    setattr(row, key, data[key])
+            row.updated_at = datetime.now(UTC)
+            await session.commit()
+            await session.refresh(row)
+            return _row_to_dict(row)
+
     async def delete(self, agent_id: str, user_id: str) -> bool:
         async with self._sf() as session:
             row = await session.get(AgentRow, agent_id)
diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py b/offline-backend-20260512/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
index 0b7f2b2b..aeb6a537 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/tools/builtins/setup_agent_tool.py
@@ -17,6 +17,7 @@ def setup_agent(
     soul: str,
     description: str,
     runtime: ToolRuntime,
+    name: str | None = None,
     skills: list[str] | None = None,
 ) -> Command:
     """Setup the custom DeerFlow agent.
@@ -24,6 +25,8 @@ def setup_agent(
     Args:
         soul: Full SOUL.md content defining the agent's personality and behavior.
         description: One-line description of what the agent does.
+        name: Optional human-readable display name for the agent. If omitted,
+            the agent's stable id is used as the display name.
         skills: Optional list of skill names this agent should use. None or empty means no skills.
     """
 
@@ -40,7 +43,8 @@ def setup_agent(
 
         if agent_name:
             # If agent_name is provided, we are creating a custom agent in the agents/ directory
-            config_data: dict = {"id": agent_name, "name": agent_name}
+            display_name = (name or "").strip() or agent_name
+            config_data: dict = {"id": agent_name, "name": display_name}
             if description:
                 config_data["description"] = description
             if skills is not None:
diff --git a/offline-backend-20260512/backend/tests/test_agents_backend.py b/offline-backend-20260512/backend/tests/test_agents_backend.py
index b0459d3b..070be227 100644
--- a/offline-backend-20260512/backend/tests/test_agents_backend.py
+++ b/offline-backend-20260512/backend/tests/test_agents_backend.py
@@ -52,6 +52,63 @@ async def test_agent_store_only_owner_can_update_or_delete() -> None:
     assert await store.delete("private-a", "user-a") is True
 
 
+@pytest.mark.asyncio
+async def test_update_builtin_only_targets_builtins() -> None:
+    store = MemoryAgentStore()
+
+    await store.ensure_builtin({"id": "builtin-agent", "name": "Built in"})
+    await store.create({"id": "owned-agent", "name": "Owned", "user_id": "user-a"})
+
+    # update_builtin succeeds on a built-in agent
+    updated = await store.update_builtin("builtin-agent", {"name": "Renamed by admin"})
+    assert updated is not None
+    assert updated["name"] == "Renamed by admin"
+
+    # update_builtin refuses to touch a user-owned agent (returns None)
+    assert await store.update_builtin("owned-agent", {"name": "Hijacked"}) is None
+
+    # And on a missing agent
+    assert await store.update_builtin("does-not-exist", {"name": "Ghost"}) is None
+
+
+@pytest.mark.asyncio
+async def test_get_editable_or_raise_admin_can_edit_builtin() -> None:
+    """Route helper: admin gets edit access to built-ins; non-admin still 403."""
+    from fastapi import HTTPException
+
+    from app.gateway.routers.agents import _get_editable_or_raise
+
+    store = MemoryAgentStore()
+    await store.ensure_builtin({"id": "builtin-agent", "name": "Built in"})
+    await store.create({"id": "owned-agent", "name": "Owned", "user_id": "user-a"})
+
+    # Owner edits their own agent → returns ('owner', record)
+    record, mode = await _get_editable_or_raise(
+        store, "owned-agent", "user-a", is_admin=False
+    )
+    assert mode == "owner" and record["id"] == "owned-agent"
+
+    # Admin edits a built-in agent → returns ('admin', record)
+    record, mode = await _get_editable_or_raise(
+        store, "builtin-agent", "user-a", is_admin=True
+    )
+    assert mode == "admin" and record["id"] == "builtin-agent"
+
+    # Non-admin tries to edit a built-in → 403
+    with pytest.raises(HTTPException) as exc:
+        await _get_editable_or_raise(store, "builtin-agent", "user-a", is_admin=False)
+    assert exc.value.status_code == 403
+
+    # Admin tries to edit someone else's PUBLISHED custom agent → still 403
+    # (admin override only applies to built-ins, not to others' custom agents).
+    await store.create(
+        {"id": "published-other", "name": "Pub", "user_id": "user-x", "published": True}
+    )
+    with pytest.raises(HTTPException) as exc:
+        await _get_editable_or_raise(store, "published-other", "user-a", is_admin=True)
+    assert exc.value.status_code == 403
+
+
 def test_build_run_config_injects_custom_assistant_as_agent_id() -> None:
     config = build_run_config("thread-1", None, None, assistant_id="agent-123")
 

From e6591abfbcd4254096a71379538d1f3f6ed4fa6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E9=91=AB=E5=8D=87?= <xsji@kland.com.cn>
Date: Wed, 13 May 2026 20:14:00 +0800
Subject: [PATCH 2/4] chore: stop tracking .claude/settings.local.json

This file holds per-user Claude Code permission allowlists and should not
be shared across the team. Adding it to .gitignore and removing from the
index; existing working copies are preserved.
---
 .gitignore | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index ed4d3dea..043f2941 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,20 @@
-# Workspace/editor
-.vscode/
-frontend-web/.vscode/
-
-# Local runtime logs and pid files
-.runtime/
+# Workspace/editor
+.vscode/
+frontend-web/.vscode/
+
+# Claude Code local-only settings (per-user permissions, not shared)
+.claude/settings.local.json
+
+# Local runtime logs and pid files
+.runtime/
 
 # Frontend local/runtime artifacts
-frontend-web/.env
-frontend-web/node_modules/
-frontend-web/.pnpm-store/
-frontend-web/tsconfig.tsbuildinfo
-frontend-web/vite-dev.log
-frontend-web/vite-dev.err.log
+frontend-web/.env
+frontend-web/node_modules/
+frontend-web/.pnpm-store/
+frontend-web/tsconfig.tsbuildinfo
+frontend-web/vite-dev.log
+frontend-web/vite-dev.err.log
 
 # Frontend local packages/archives/docs (non-source)
 frontend-web/pnpm-lock.yaml
@@ -52,11 +55,11 @@ offline-backend-20260512/config.yaml
 offline-backend-20260512/config.yaml.example
 offline-backend-20260512/data/
 offline-backend-20260512/deerflow-backend-offline-image-20260505.tar
-offline-backend-20260512/extensions_config.json
-offline-backend-20260512/skills/
-offline-backend-20260512/wheelhouse/
-offline-backend-20260512/backend/.deer-flow/data/*.db
-offline-backend-20260512/backend/.deer-flow/data/*.db-*
-offline-backend-20260512/start_backend.sh
-offline-backend-20260512/stop_backend.sh
-offline-backend-20260512/check_backend.sh
+offline-backend-20260512/extensions_config.json
+offline-backend-20260512/skills/
+offline-backend-20260512/wheelhouse/
+offline-backend-20260512/backend/.deer-flow/data/*.db
+offline-backend-20260512/backend/.deer-flow/data/*.db-*
+offline-backend-20260512/start_backend.sh
+offline-backend-20260512/stop_backend.sh
+offline-backend-20260512/check_backend.sh

From a2f7157bc336c14e4e5ed3ade8e607bd60f7b3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E9=91=AB=E5=8D=87?= <xsji@kland.com.cn>
Date: Wed, 13 May 2026 20:14:37 +0800
Subject: [PATCH 3/4] chore: remove .claude/settings.local.json from tracking

Followup to previous commit which only landed the .gitignore rule but
left the file still tracked in the index.
---
 .claude/settings.local.json | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 .claude/settings.local.json

diff --git a/.claude/settings.local.json b/.claude/settings.local.json
deleted file mode 100644
index bdd36c0f..00000000
--- a/.claude/settings.local.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(grep \"\\\\.tsx$\")",
-      "Bash(awk '{print $NF}')",
-      "Bash(xargs -I {} basename {})"
-    ]
-  }
-}

From 29f74afbf602bb22b62fda6efacfc727cb49ceee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=89=E9=91=AB=E5=8D=87?= <xsji@kland.com.cn>
Date: Wed, 13 May 2026 20:58:23 +0800
Subject: [PATCH 4/4] fix(scheduler): give every scheduled run its own
 throwaway thread

All scheduled tasks for a user shared one scheduler thread, so each run
appended its messages to the same LangGraph checkpoint. Over time the
history blew past the model's input window and every task on that
account started failing with context-too-long.

_execute_task now mints a fresh thread_id per run and threads it through
ensure_thread_meta / snapshot / start_run / extract_*. The per-task
scheduler_thread_id column is left in place for backwards compatibility
but no longer drives the LLM call.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../deerflow/runtime/scheduler/service.py     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/service.py b/offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/service.py
index 1c200f34..7f011ce3 100644
--- a/offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/service.py
+++ b/offline-backend-20260512/backend/packages/harness/deerflow/runtime/scheduler/service.py
@@ -459,12 +459,17 @@ class ScheduledTaskService:
             self._running_task_ids.discard(task["task_id"])
 
     async def _execute_task(self, task: dict[str, Any], *, scheduled_for: datetime, manual: bool) -> None:
+        # Each run uses its own throwaway thread so message history cannot accumulate
+        # across runs and blow past the model's input window. The per-user
+        # task["scheduler_thread_id"] is no longer used to drive the LLM call —
+        # we keep it on the task row only for backwards compatibility.
+        runtime_thread_id = str(uuid.uuid4())
         run_row = await self.store.create_run_once(
             {
                 "id": str(uuid.uuid4()),
                 "task_id": task["task_id"],
                 "user_id": task["user_id"],
-                "scheduler_thread_id": task["scheduler_thread_id"],
+                "scheduler_thread_id": runtime_thread_id,
                 "scheduled_for": scheduled_for,
                 "status": "running",
                 "started_at": datetime.now(UTC),
@@ -478,16 +483,16 @@ class ScheduledTaskService:
             await self.store.update_task(task["task_id"], task["user_id"], {"next_run_at": next_run_at, "last_status": "running"})
 
         try:
-            await self._ensure_thread_meta(task["user_id"], task["scheduler_thread_id"])
+            await self._ensure_thread_meta(task["user_id"], runtime_thread_id)
             async with self._agent_run_lock:
-                output_snapshot = self._snapshot_result_files(task["scheduler_thread_id"], task["user_id"])
-                record = await self._start_agent_run(task, scheduled_for=scheduled_for)
+                output_snapshot = self._snapshot_result_files(runtime_thread_id, task["user_id"])
+                record = await self._start_agent_run(task, scheduled_for=scheduled_for, runtime_thread_id=runtime_thread_id)
                 await self.store.update_run(run_row["id"], {"agent_run_id": record.run_id})
                 if record.task is not None:
                     await record.task
-                result_text = await self._extract_latest_ai_text(task["scheduler_thread_id"])
+                result_text = await self._extract_latest_ai_text(runtime_thread_id)
                 result_files = await self._extract_result_files(
-                    task["scheduler_thread_id"],
+                    runtime_thread_id,
                     task["user_id"],
                     run_id=run_row["id"],
                     output_snapshot=output_snapshot,
@@ -542,7 +547,7 @@ class ScheduledTaskService:
         finally:
             reset_current_user(token)
 
-    async def _start_agent_run(self, task: dict[str, Any], *, scheduled_for: datetime):
+    async def _start_agent_run(self, task: dict[str, Any], *, scheduled_for: datetime, runtime_thread_id: str):
         from app.gateway.routers.thread_runs import RunCreateRequest
         from app.gateway.services import start_run
 
@@ -555,7 +560,7 @@ class ScheduledTaskService:
             execution_context.update(
                 {
                     "is_scheduled_run": True,
-                    "thread_id": task["scheduler_thread_id"],
+                    "thread_id": runtime_thread_id,
                     "thinking_enabled": execution_context.get("thinking_enabled", True),
                     "is_plan_mode": execution_context.get("is_plan_mode", True),
                 }
@@ -572,7 +577,7 @@ class ScheduledTaskService:
                 context=execution_context,
                 multitask_strategy="enqueue" if False else "reject",
             )
-            return await start_run(body, task["scheduler_thread_id"], request)  # type: ignore[arg-type]
+            return await start_run(body, runtime_thread_id, request)  # type: ignore[arg-type]
         finally:
             reset_current_user(token)