weacpx 0.4.4 → 0.4.5

package/dist/cli.js

@@ -2611,6 +2611,82 @@ var init_ensure_config = __esm(() => {
   };
 });
 
+// src/config/agent-templates.ts
+function getAgentTemplate(name) {
+  const template = TEMPLATES[name];
+  if (!template) {
+    return null;
+  }
+  return {
+    ...template
+  };
+}
+function listAgentTemplates() {
+  return Object.keys(TEMPLATES);
+}
+function sameAgentConfig(left, right) {
+  return left.driver === right.driver && (left.command ?? "") === (right.command ?? "");
+}
+var TEMPLATES;
+var init_agent_templates = __esm(() => {
+  TEMPLATES = {
+    codex: {
+      driver: "codex"
+    },
+    claude: {
+      driver: "claude"
+    },
+    pi: {
+      driver: "pi"
+    },
+    openclaw: {
+      driver: "openclaw"
+    },
+    gemini: {
+      driver: "gemini"
+    },
+    cursor: {
+      driver: "cursor"
+    },
+    copilot: {
+      driver: "copilot"
+    },
+    droid: {
+      driver: "droid"
+    },
+    "factory-droid": {
+      driver: "factory-droid"
+    },
+    factorydroid: {
+      driver: "factorydroid"
+    },
+    iflow: {
+      driver: "iflow"
+    },
+    kilocode: {
+      driver: "kilocode"
+    },
+    kimi: {
+      driver: "kimi"
+    },
+    kiro: {
+      driver: "kiro"
+    },
+    opencode: {
+      driver: "opencode"
+    },
+    qoder: {
+      driver: "qoder"
+    },
+    qwen: {
+      driver: "qwen"
+    },
+    trae: {
+      driver: "trae"
+    }
+  };
+});
+
 // src/daemon/daemon-status.ts
 import { mkdir as mkdir2, readFile as readFile3, rm, writeFile as writeFile2 } from "node:fs/promises";
 import { dirname as dirname2 } from "node:path";
@@ -9542,10 +9618,11 @@ var PACKAGE_NAME = "weacpx";
 var init_version = () => {};
 
 // src/orchestration/task-wait-timeouts.ts
-var DEFAULT_TASK_WAIT_TIMEOUT_MS, MAX_TASK_WAIT_TIMEOUT_MS, DEFAULT_TASK_WAIT_POLL_INTERVAL_MS = 1000, MAX_TASK_WAIT_POLL_INTERVAL_MS = 1e4, TASK_WAIT_RPC_TIMEOUT_PADDING_MS = 5000;
+var DEFAULT_TASK_WAIT_TIMEOUT_MS, MAX_TASK_WAIT_TIMEOUT_MS, DEFAULT_TASK_WAIT_POLL_INTERVAL_MS = 1000, MAX_TASK_WAIT_POLL_INTERVAL_MS = 1e4, TASK_WAIT_RPC_TIMEOUT_PADDING_MS = 5000, DEFAULT_TASK_WATCH_TIMEOUT_MS = 60000, MAX_TASK_WATCH_TIMEOUT_MS, DEFAULT_TASK_WATCH_POLL_INTERVAL_MS = 1000, MAX_TASK_WATCH_POLL_INTERVAL_MS = 1e4, TASK_WATCH_RPC_TIMEOUT_PADDING_MS = 5000;
 var init_task_wait_timeouts = __esm(() => {
   DEFAULT_TASK_WAIT_TIMEOUT_MS = 5 * 60000;
   MAX_TASK_WAIT_TIMEOUT_MS = 20 * 60000;
+  MAX_TASK_WATCH_TIMEOUT_MS = 20 * 60000;
 });
 
 // src/weixin/messaging/quota-errors.ts
@@ -9607,6 +9684,15 @@ function isTaskStatus(value) {
 function isSourceKind(value) {
   return value === "human" || value === "coordinator" || value === "worker";
 }
+function isOptionalNumber(value) {
+  return value === undefined || typeof value === "number";
+}
+function isTaskEventRecord(value) {
+  if (!isRecord2(value)) {
+    return false;
+  }
+  return typeof value.seq === "number" && isString(value.at) && (value.type === "created" || value.type === "progress" || value.type === "status_changed" || value.type === "attention_required" || value.type === "cancel_requested") && (value.status === undefined || isTaskStatus(value.status)) && isOptionalString(value.summary) && isOptionalString(value.message);
+}
 function isOpenQuestionRecord(value) {
   if (!isRecord2(value)) {
     return false;
@@ -9629,7 +9715,7 @@ function isTaskRecord(value) {
   if (!isRecord2(value)) {
     return false;
   }
-  return isString(value.taskId) && isString(value.sourceHandle) && isSourceKind(value.sourceKind) && isString(value.coordinatorSession) && isOptionalString(value.workerSession) && isString(value.workspace) && isOptionalString(value.cwd) && isString(value.targetAgent) && isOptionalString(value.role) && isString(value.task) && isTaskStatus(value.status) && isString(value.summary) && isString(value.resultText) && isString(value.createdAt) && isString(value.updatedAt) && isOptionalString(value.chatKey) && isOptionalString(value.replyContextToken) && isOptionalString(value.accountId) && isOptionalString(value.deliveryAccountId) && isOptionalString(value.coordinatorInjectedAt) && isOptionalString(value.cancelRequestedAt) && isOptionalString(value.cancelCompletedAt) && isOptionalString(value.lastCancelError) && isOptionalBoolean(value.noticePending) && isOptionalString(value.noticeSentAt) && isOptionalString(value.lastNoticeError) && isOptionalBoolean(value.injectionPending) && isOptionalString(value.injectionAppliedAt) && isOptionalString(value.lastInjectionError) && isOptionalString(value.lastProgressAt) && isOptionalString(value.groupId) && (value.openQuestion === undefined || isOpenQuestionRecord(value.openQuestion)) && (value.reviewPending === undefined || isReviewPendingRecord(value.reviewPending)) && (value.correctionPending === undefined || isCorrectionPendingRecord(value.correctionPending));
+  return isString(value.taskId) && isString(value.sourceHandle) && isSourceKind(value.sourceKind) && isString(value.coordinatorSession) && isOptionalString(value.workerSession) && isString(value.workspace) && isOptionalString(value.cwd) && isString(value.targetAgent) && isOptionalString(value.role) && isString(value.task) && isTaskStatus(value.status) && isString(value.summary) && isString(value.resultText) && isString(value.createdAt) && isString(value.updatedAt) && isOptionalString(value.chatKey) && isOptionalString(value.replyContextToken) && isOptionalString(value.accountId) && isOptionalString(value.deliveryAccountId) && isOptionalString(value.coordinatorInjectedAt) && isOptionalString(value.cancelRequestedAt) && isOptionalString(value.cancelCompletedAt) && isOptionalString(value.lastCancelError) && isOptionalBoolean(value.noticePending) && isOptionalString(value.noticeSentAt) && isOptionalString(value.lastNoticeError) && isOptionalBoolean(value.injectionPending) && isOptionalString(value.injectionAppliedAt) && isOptionalString(value.lastInjectionError) && isOptionalString(value.lastProgressAt) && isOptionalString(value.lastProgressSummary) && isOptionalString(value.groupId) && (value.openQuestion === undefined || isOpenQuestionRecord(value.openQuestion)) && (value.reviewPending === undefined || isReviewPendingRecord(value.reviewPending)) && (value.correctionPending === undefined || isCorrectionPendingRecord(value.correctionPending)) && isOptionalNumber(value.eventSeq) && (value.events === undefined || Array.isArray(value.events) && value.events.every(isTaskEventRecord));
 }
 function isExternalCoordinatorRecord(value) {
   if (!isRecord2(value)) {
@@ -9893,37 +9979,6 @@ var init_state_store = __esm(() => {
   init_types();
 });
 
-// src/config/agent-templates.ts
-function getAgentTemplate(name) {
-  const template = TEMPLATES[name];
-  if (!template) {
-    return null;
-  }
-  return {
-    ...template
-  };
-}
-function listAgentTemplates() {
-  return Object.keys(TEMPLATES);
-}
-var TEMPLATES;
-var init_agent_templates = __esm(() => {
-  TEMPLATES = {
-    codex: {
-      driver: "codex"
-    },
-    claude: {
-      driver: "claude"
-    },
-    opencode: {
-      driver: "opencode"
-    },
-    gemini: {
-      driver: "gemini"
-    }
-  };
-});
-
 // src/plugins/plugin-home.ts
 import { mkdir as mkdir6, writeFile as writeFile5 } from "node:fs/promises";
 import { homedir as homedir3 } from "node:os";
@@ -15447,38 +15502,24 @@ function extractPromptFailureMessage(result) {
 function extractPromptOutput(output) {
   const lines = output.split(`
 `).map((line) => line.trim()).filter((line) => line.length > 0);
-  const messageSegments = [];
-  let currentSegment = "";
+  let text = "";
   let hasAgentMessage = false;
   for (const line of lines) {
+    let event;
     try {
-      const event = JSON.parse(line);
-      const isMessageChunk = event.method === "session/update" && event.params?.update?.sessionUpdate === "agent_message_chunk" && event.params.update.content?.type === "text" && typeof event.params.update.content.text === "string";
-      if (isMessageChunk) {
-        hasAgentMessage = true;
-        const chunk = event.params.update.content.text ?? "";
-        if (chunk.length > 0) {
-          currentSegment += chunk;
-        }
-        continue;
-      }
-      if (currentSegment.trim().length > 0) {
-        messageSegments.push(currentSegment.trim());
-      }
-      currentSegment = "";
+      event = JSON.parse(line);
     } catch {
-      if (currentSegment.trim().length > 0) {
-        messageSegments.push(currentSegment.trim());
-        currentSegment = "";
-      }
+      continue;
+    }
+    const isMessageChunk = event.method === "session/update" && event.params?.update?.sessionUpdate === "agent_message_chunk" && event.params.update.content?.type === "text" && typeof event.params.update.content.text === "string";
+    if (isMessageChunk) {
+      hasAgentMessage = true;
+      text += event.params.update.content.text ?? "";
     }
   }
-  if (currentSegment.trim().length > 0) {
-    messageSegments.push(currentSegment.trim());
-  }
-  if (messageSegments.length > 0) {
+  if (hasAgentMessage && text.trim().length > 0) {
     return {
-      text: messageSegments[messageSegments.length - 1],
+      text: text.trim(),
       hasAgentMessage
     };
   }
@@ -17278,6 +17319,8 @@ function renderTaskSummary2(task) {
   header.push(`- 任务：${task.task}`);
   if (task.summary.trim().length > 0)
     header.push(`- 摘要：${task.summary}`);
+  if (task.lastProgressSummary)
+    header.push(`- 最新进展：${task.lastProgressSummary}`);
   if (task.resultText.trim().length > 0)
     header.push(`- 结果：${task.resultText}`);
   const events = [];
@@ -17721,6 +17764,13 @@ async function handleAgentAdd(context, templateName) {
   if (!template) {
     return { text: `暂不支持这个 Agent 模板。当前可用：${listAgentTemplates().join("、")}` };
   }
+  const existing = context.config.agents[templateName];
+  if (existing) {
+    if (sameAgentConfig(existing, template)) {
+      return { text: `Agent「${templateName}」已存在` };
+    }
+    return { text: `Agent「${templateName}」已存在且配置不同。请先执行 /agent rm ${templateName}` };
+  }
   const updated = await context.configStore.upsertAgent(templateName, template);
   context.replaceConfig(updated);
   return { text: `Agent「${templateName}」已保存` };
@@ -17745,7 +17795,7 @@ var init_agent_handler = __esm(() => {
     summary: "管理已注册的 Agent。",
     commands: [
       { usage: "/agents", description: "查看当前已注册的 Agent" },
-      { usage: "/agent add <codex|claude|opencode|gemini>", description: "添加内置 Agent 模板" },
+      { usage: `/agent add <${listAgentTemplates().join("|")}>`, description: "添加内置 Agent 模板" },
       { usage: "/agent rm <name>", description: "删除一个 Agent" }
     ],
     examples: ["/agent add claude", "/agent rm codex"]
@@ -19261,6 +19311,8 @@ class OrchestrationServer {
         return await this.handlers.listTasks(this.parseTaskListFilter(params));
       case "task.wait":
         return await this.handlers.waitTask(this.parseWaitTaskInput(params));
+      case "task.watch":
+        return await this.handlers.watchTask(this.parseWatchTaskInput(params));
       case "task.approve":
         requireOnlyKeys(params, ["taskId", "coordinatorSession"], "params");
         return await this.handlers.approveTask({
@@ -19447,6 +19499,23 @@ class OrchestrationServer {
       ...pollIntervalMs !== undefined ? { pollIntervalMs } : {}
     };
   }
+  parseWatchTaskInput(params) {
+    requireOnlyKeys(params, ["coordinatorSession", "taskId", "afterSeq", "mode", "includeProgress", "timeoutMs", "pollIntervalMs"], "params");
+    const afterSeq = requireOptionalIntegerInRange(params, "afterSeq", 0, Number.MAX_SAFE_INTEGER);
+    const mode = requireOptionalEnum(params, "mode", ["next_event", "until_attention_or_terminal"]);
+    const includeProgress = requireOptionalBoolean(params, "includeProgress");
+    const timeoutMs = requireOptionalIntegerInRange(params, "timeoutMs", 0, MAX_TASK_WATCH_TIMEOUT_MS);
+    const pollIntervalMs = requireOptionalIntegerInRange(params, "pollIntervalMs", 1, MAX_TASK_WATCH_POLL_INTERVAL_MS);
+    return {
+      coordinatorSession: requireString(params, "coordinatorSession"),
+      taskId: requireString(params, "taskId"),
+      ...afterSeq !== undefined ? { afterSeq } : {},
+      ...mode !== undefined ? { mode } : {},
+      ...includeProgress !== undefined ? { includeProgress } : {},
+      ...timeoutMs !== undefined ? { timeoutMs } : {},
+      ...pollIntervalMs !== undefined ? { pollIntervalMs } : {}
+    };
+  }
   parseWorkerRaiseQuestionInput(params) {
     requireOnlyKeys(params, ["taskId", "sourceHandle", "question", "whyBlocked", "whatIsNeeded"], "params");
     return {
@@ -19690,6 +19759,7 @@ var init_orchestration_server = __esm(() => {
     "task.get",
     "task.list",
     "task.wait",
+    "task.watch",
     "task.approve",
     "task.reject",
     "task.cancel",
@@ -19709,30 +19779,92 @@ var init_orchestration_server = __esm(() => {
 
 // src/orchestration/progress-line-parser.ts
 class ProgressLineBuffer {
-  feed(segment) {
+  pending = "";
+  feed(segment, options = {}) {
+    const hadPending = this.pending.length > 0;
+    this.pending += segment;
     const summaries = [];
-    for (const line of segment.split(`
-`)) {
-      if (line.startsWith(PROGRESS_PREFIX)) {
-        const summary = line.slice(PROGRESS_PREFIX.length).trim();
-        if (summary.length > 0) {
-          summaries.push(summary);
-        }
-      }
+    let newlineIndex = this.pending.indexOf(`
+`);
+    while (newlineIndex !== -1) {
+      const line = this.pending.slice(0, newlineIndex).replace(/\r$/, "");
+      this.pending = this.pending.slice(newlineIndex + 1);
+      this.extractLine(line, summaries);
+      newlineIndex = this.pending.indexOf(`
+`);
+    }
+    if (options.segmentComplete === true && !hadPending && this.pending.startsWith(PROGRESS_PREFIX)) {
+      this.extractLine(this.pending.replace(/\r$/, ""), summaries);
+      this.pending = "";
+      return summaries;
+    }
+    this.trimPendingIfHopeless();
+    return summaries;
+  }
+  flush() {
+    const summaries = [];
+    if (this.pending.length > 0) {
+      this.extractLine(this.pending.replace(/\r$/, ""), summaries);
+      this.pending = "";
     }
     return summaries;
   }
+  extractLine(line, summaries) {
+    if (line.startsWith(PROGRESS_PREFIX)) {
+      const summary = sanitizeProgressSummary(line.slice(PROGRESS_PREFIX.length));
+      if (summary.length > 0) {
+        summaries.push(summary);
+      }
+    }
+  }
+  trimPendingIfHopeless() {
+    if (this.pending.length === 0)
+      return;
+    if (PROGRESS_PREFIX.startsWith(this.pending) || this.pending.startsWith(PROGRESS_PREFIX)) {
+      if (this.pending.length > MAX_PENDING_LINE_LENGTH) {
+        this.pending = "";
+      }
+      return;
+    }
+    this.pending = "";
+  }
+}
+function sanitizeProgressSummary(summary) {
+  const cleaned = summary.replace(/[\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]/g, "").trim();
+  if (cleaned.length <= MAX_PROGRESS_SUMMARY_LENGTH) {
+    return cleaned;
+  }
+  return `${cleaned.slice(0, MAX_PROGRESS_SUMMARY_LENGTH - 3)}...`;
 }
 function stripProgressLines(text) {
-  return text.split(`
-`).filter((line) => !line.startsWith(PROGRESS_PREFIX)).join(`
+  return text.split(/\r\n|\n|\r/).filter((line) => {
+    const normalized = normalizeProgressLinePrefix(line);
+    return !normalized.startsWith(PROGRESS_PREFIX) && !(line.length > 0 && normalized.length === 0);
+  }).join(`
 `).trim();
 }
-var PROGRESS_PREFIX = "[PROGRESS]";
+function normalizeProgressLinePrefix(line) {
+  return line.replace(/^(?:\r+|\u001B\[[0-?]*[ -/]*[@-~])+/, "");
+}
+var PROGRESS_PREFIX = "[PROGRESS]", MAX_PROGRESS_SUMMARY_LENGTH = 500, MAX_PENDING_LINE_LENGTH = 4096;
 
 // src/orchestration/orchestration-service.ts
 import { createHash as createHash2 } from "node:crypto";
 import { basename as basename2, isAbsolute as isAbsolute2, normalize } from "node:path";
+function clampWatchTimeout(value) {
+  if (value === undefined)
+    return DEFAULT_TASK_WATCH_TIMEOUT_MS;
+  if (!Number.isFinite(value) || value < 0)
+    return 0;
+  return Math.min(Math.floor(value), MAX_TASK_WATCH_TIMEOUT_MS);
+}
+function clampWatchPollInterval(value) {
+  if (value === undefined)
+    return DEFAULT_TASK_WATCH_POLL_INTERVAL_MS;
+  if (!Number.isFinite(value) || value < 1)
+    return DEFAULT_TASK_WATCH_POLL_INTERVAL_MS;
+  return Math.min(value, MAX_TASK_WATCH_POLL_INTERVAL_MS);
+}
 
 class OrchestrationService {
   deps;
@@ -19949,6 +20081,8 @@ class OrchestrationService {
           resultText: "",
           createdAt: now,
           updatedAt: now,
+          eventSeq: 1,
+          events: [{ seq: 1, at: now, type: "created", status: "running", message: "Task created" }],
           ...input.chatKey ? { chatKey: input.chatKey } : {},
           ...input.replyContextToken ? { replyContextToken: input.replyContextToken } : {},
           ...input.accountId ? { accountId: input.accountId } : {}
@@ -20072,7 +20206,9 @@ class OrchestrationService {
           summary: "",
           resultText: "",
           createdAt: now,
-          updatedAt: now
+          updatedAt: now,
+          eventSeq: 1,
+          events: [{ seq: 1, at: now, type: "created", status, message: "Task created" }]
         };
         if (preflight.normalizedGroupId) {
           const group = this.ensureGroups(state)[preflight.normalizedGroupId];
@@ -20243,6 +20379,11 @@ class OrchestrationService {
           current.summary = message;
           current.resultText = "";
           current.updatedAt = now;
+          this.appendTaskEvent(current, now, "status_changed", {
+            status: "failed",
+            summary: message,
+            message: "Task failed during startup"
+          });
           restoreOrDeleteBinding();
           await this.deps.saveState(state);
           return true;
@@ -20335,6 +20476,11 @@ class OrchestrationService {
       task2.status = input.status ?? "completed";
       task2.summary = input.summary ?? "";
       task2.resultText = stripProgressLines(input.resultText ?? "");
+      this.appendTaskEvent(task2, updatedAt, "status_changed", {
+        status: task2.status,
+        summary: task2.summary,
+        message: task2.status === "completed" ? "Task completed" : task2.status === "failed" ? "Task failed" : "Task cancelled"
+      });
       if (task2.status === "completed" || task2.status === "failed") {
         if (!this.isExternalCoordinatorSession(state, task2.coordinatorSession)) {
           task2.injectionPending = true;
@@ -20363,6 +20509,10 @@ class OrchestrationService {
           resultId: this.deps.createId(),
           resultText: task2.resultText
         };
+        this.appendTaskEvent(task2, updatedAt, "attention_required", {
+          status: task2.status,
+          message: "Task result requires contested review"
+        });
         task2.correctionPending = undefined;
         task2.cancelRequestedAt = undefined;
         task2.cancelCompletedAt = undefined;
@@ -20471,6 +20621,64 @@ class OrchestrationService {
       await sleep2(Math.min(pollIntervalMs, remainingMs));
     }
   }
+  async watchTask(input) {
+    const timeoutMs = clampWatchTimeout(input.timeoutMs);
+    const pollIntervalMs = clampWatchPollInterval(input.pollIntervalMs);
+    const afterSeq = Math.max(0, Math.floor(input.afterSeq ?? 0));
+    const mode = input.mode ?? "until_attention_or_terminal";
+    const includeProgress = input.includeProgress ?? true;
+    const deadline = Date.now() + timeoutMs;
+    while (true) {
+      const state = await this.deps.loadState();
+      const task = state.orchestration.tasks[input.taskId];
+      if (!task || task.coordinatorSession !== input.coordinatorSession) {
+        return { status: "not_found", task: null, events: [], nextAfterSeq: afterSeq };
+      }
+      const snapshot = { ...task };
+      const allEvents = task.events ?? [];
+      const filteredEvents = allEvents.filter((event) => event.seq > afterSeq).filter((event) => includeProgress || event.type !== "progress");
+      const nextAfterSeq = task.eventSeq ?? allEvents.at(-1)?.seq ?? afterSeq;
+      const historyTruncated = allEvents.length > 0 && afterSeq < allEvents[0].seq - 1;
+      if (isTerminalTaskStatus2(task.status) && task.reviewPending === undefined) {
+        return {
+          status: "terminal",
+          task: snapshot,
+          events: filteredEvents.map((event) => ({ ...event })),
+          nextAfterSeq,
+          ...historyTruncated ? { historyTruncated } : {}
+        };
+      }
+      if (isAttentionRequiredTask(task)) {
+        return {
+          status: "attention_required",
+          task: snapshot,
+          events: filteredEvents.map((event) => ({ ...event })),
+          nextAfterSeq,
+          ...historyTruncated ? { historyTruncated } : {}
+        };
+      }
+      if (filteredEvents.length > 0 && mode === "next_event") {
+        return {
+          status: "event",
+          task: snapshot,
+          events: filteredEvents.map((event) => ({ ...event })),
+          nextAfterSeq,
+          ...historyTruncated ? { historyTruncated } : {}
+        };
+      }
+      const remainingMs = deadline - Date.now();
+      if (remainingMs <= 0) {
+        return {
+          status: "timeout",
+          task: snapshot,
+          events: filteredEvents.map((event) => ({ ...event })),
+          nextAfterSeq,
+          ...historyTruncated ? { historyTruncated } : {}
+        };
+      }
+      await sleep2(Math.min(pollIntervalMs, remainingMs));
+    }
+  }
   async recordCoordinatorRouteContext(input) {
     if (input.coordinatorSession.trim().length === 0) {
       throw new Error("coordinatorSession must be a non-empty string");
@@ -20550,6 +20758,10 @@ class OrchestrationService {
         status: "open"
       };
       task.updatedAt = now;
+      this.appendTaskEvent(task, now, "attention_required", {
+        status: "blocked",
+        message: input.question.trim()
+      });
       this.bumpGroupUpdated(state, task.groupId, now);
       await this.deps.saveState(state);
       return {
@@ -20607,6 +20819,10 @@ class OrchestrationService {
         lastResumeError: undefined
       };
       task.updatedAt = now;
+      this.appendTaskEvent(task, now, "status_changed", {
+        status: "running",
+        message: "Blocker question answered"
+      });
       this.bumpGroupUpdated(state, task.groupId, now);
       await this.deps.saveState(state);
       return {
@@ -20661,6 +20877,10 @@ class OrchestrationService {
         };
         task.cancelRequestedAt = task.cancelRequestedAt ?? now;
         task.updatedAt = now;
+        this.appendTaskEvent(task, now, "cancel_requested", {
+          status: task.status,
+          message: "Correction requested for misrouted answer"
+        });
         this.bumpGroupUpdated(state, task.groupId, now);
         await this.deps.saveState(state);
         return {
@@ -20679,6 +20899,10 @@ class OrchestrationService {
         task.noticePending = false;
         task.lastNoticeError = undefined;
         task.updatedAt = now;
+        this.appendTaskEvent(task, now, "attention_required", {
+          status: task.status,
+          message: "Task result requires contested review"
+        });
         this.bumpGroupUpdated(state, task.groupId, now);
         await this.deps.saveState(state);
         return {
@@ -20785,6 +21009,10 @@ class OrchestrationService {
           packageId
         };
         task.updatedAt = now;
+        this.appendTaskEvent(task, now, "attention_required", {
+          status: "waiting_for_human",
+          message: task.openQuestion.question
+        });
         this.bumpGroupUpdated(state, task.groupId, now);
       }
       this.ensureHumanQuestionPackages(state)[packageId] = packageRecord;
@@ -20872,6 +21100,10 @@ class OrchestrationService {
           packageId: input.packageId
         };
         task.updatedAt = now;
+        this.appendTaskEvent(task, now, "attention_required", {
+          status: "waiting_for_human",
+          message: task.openQuestion.question
+        });
         this.bumpGroupUpdated(state, task.groupId, now);
       }
       await this.deps.saveState(state);
@@ -21055,11 +21287,21 @@ class OrchestrationService {
         task.summary = "";
         task.resultText = "";
         task.openQuestion = this.buildReplacementOpenQuestion(task, replacementQuestionId, now, packageId);
+        this.appendTaskEvent(task, now, "attention_required", {
+          status: task.status,
+          message: task.openQuestion.question
+        });
       } else if ((task.status === "completed" || task.status === "failed") && task.chatKey && task.replyContextToken && task.noticeSentAt === undefined) {
         task.noticePending = true;
         task.lastNoticeError = undefined;
       }
       task.updatedAt = now;
+      if (input.decision === "accept") {
+        this.appendTaskEvent(task, now, "status_changed", {
+          status: task.status,
+          message: "Contested result accepted"
+        });
+      }
       this.bumpGroupUpdated(state, task.groupId, now);
       await this.deps.saveState(state);
       return {
@@ -21437,7 +21679,7 @@ class OrchestrationService {
       });
     }
   }
-  async recordTaskProgress(taskId) {
+  async recordTaskProgress(taskId, summary) {
     return await this.mutate(async () => {
       const state = await this.deps.loadState();
       const task = state.orchestration.tasks[taskId];
@@ -21445,6 +21687,21 @@ class OrchestrationService {
         throw new Error(`task "${taskId}" does not exist`);
       }
       task.lastProgressAt = this.deps.now().toISOString();
+      if (summary !== undefined) {
+        const cleaned = sanitizeProgressSummary(summary);
+        if (cleaned.length > 0) {
+          task.lastProgressSummary = cleaned;
+          this.appendTaskEvent(task, task.lastProgressAt, "progress", {
+            status: task.status,
+            summary: cleaned
+          });
+        }
+      } else {
+        this.appendTaskEvent(task, task.lastProgressAt, "progress", {
+          status: task.status,
+          message: "heartbeat"
+        });
+      }
       task.updatedAt = task.lastProgressAt;
       await this.deps.saveState(state);
       return { ...task };
@@ -21492,6 +21749,12 @@ class OrchestrationService {
         const shouldPropagate = task.cancelRequestedAt === undefined;
         task.cancelRequestedAt = task.cancelRequestedAt ?? now;
         task.updatedAt = now;
+        if (shouldPropagate) {
+          this.appendTaskEvent(task, now, "cancel_requested", {
+            status: task.status,
+            message: "Cancellation requested"
+          });
+        }
         this.bumpGroupUpdated(state, task.groupId, now);
         await this.deps.saveState(state);
         return { task: { ...task }, shouldPropagate, closedPackageId: undefined };
@@ -21503,6 +21766,10 @@ class OrchestrationService {
       task.cancelCompletedAt = now;
       task.lastCancelError = undefined;
       task.updatedAt = now;
+      this.appendTaskEvent(task, now, "status_changed", {
+        status: "cancelled",
+        message: "Task cancelled"
+      });
       this.bumpGroupUpdated(state, task.groupId, now);
       await this.deps.saveState(state);
       return { task: { ...task }, shouldPropagate: false, closedPackageId };
@@ -21537,10 +21804,18 @@ class OrchestrationService {
         task.cancelRequestedAt = undefined;
         task.cancelCompletedAt = undefined;
         task.lastCancelError = undefined;
+        this.appendTaskEvent(task, now, "attention_required", {
+          status: task.status,
+          message: task.openQuestion.question
+        });
       } else {
         task.status = "cancelled";
         task.cancelCompletedAt = now;
         task.lastCancelError = undefined;
+        this.appendTaskEvent(task, now, "status_changed", {
+          status: "cancelled",
+          message: "Task cancelled"
+        });
       }
       task.updatedAt = now;
       this.bumpGroupUpdated(state, task.groupId, now);
@@ -21582,6 +21857,10 @@ class OrchestrationService {
       }
       task2.lastCancelError = errorMessage;
       task2.updatedAt = this.deps.now().toISOString();
+      this.appendTaskEvent(task2, task2.updatedAt, "progress", {
+        status: task2.status,
+        message: `Cancellation failed: ${errorMessage}`
+      });
       await this.deps.saveState(state);
       return { ...task2 };
     });
@@ -21639,6 +21918,10 @@ class OrchestrationService {
         task.workerSession = ensuredWorkerSession;
         task.status = "running";
         task.updatedAt = this.deps.now().toISOString();
+        this.appendTaskEvent(task, task.updatedAt, "status_changed", {
+          status: "running",
+          message: "Task approved"
+        });
         state.orchestration.workerBindings[ensuredWorkerSession] = {
           sourceHandle: ensuredWorkerSession,
           coordinatorSession: task.coordinatorSession,
@@ -21709,6 +21992,11 @@ class OrchestrationService {
       task2.status = "cancelled";
       task2.summary = "rejected";
       task2.updatedAt = this.deps.now().toISOString();
+      this.appendTaskEvent(task2, task2.updatedAt, "status_changed", {
+        status: "cancelled",
+        summary: "rejected",
+        message: "Task rejected"
+      });
       await this.deps.saveState(state);
       return { ...task2 };
     });
@@ -22637,6 +22925,20 @@ class OrchestrationService {
       }
     })();
   }
+  appendTaskEvent(task, at, type, details = {}) {
+    const nextSeq = (task.eventSeq ?? 0) + 1;
+    task.eventSeq = nextSeq;
+    const events = task.events ?? [];
+    events.push({
+      seq: nextSeq,
+      at,
+      type,
+      ...details.status ? { status: details.status } : {},
+      ...details.summary ? { summary: details.summary } : {},
+      ...details.message ? { message: details.message } : {}
+    });
+    task.events = events.slice(-MAX_TASK_EVENTS_PER_TASK);
+  }
 }
 function isTerminalTaskStatus2(status) {
   return status === "completed" || status === "failed" || status === "cancelled";
@@ -22668,6 +22970,7 @@ async function sleep2(ms) {
 function isRequestDelegateInput(input) {
   return "sourceKind" in input;
 }
+var MAX_TASK_EVENTS_PER_TASK = 200;
 var init_orchestration_service = __esm(() => {
   init_quota_errors();
   init_task_wait_timeouts();
@@ -25070,6 +25373,11 @@ async function buildApp(paths, deps = {}) {
   const config2 = await loadConfig(paths.configPath, {
     defaultLoggingLevel: deps.defaultLoggingLevel
   });
+  const reloadRuntimeConfig = async () => {
+    const updated = await configStore.load();
+    replaceRuntimeConfig(config2, updated);
+    return config2;
+  };
   const logger2 = createAppLogger({
     filePath: resolveAppLogPath(paths.configPath),
     level: config2.logging.level,
@@ -25268,32 +25576,39 @@ async function buildApp(paths, deps = {}) {
     };
   };
   const launchWorkerTurn = (input) => {
-    const session = resolveWorkerRuntimeSession(input);
-    session.mcpCoordinatorSession = input.coordinatorSession;
-    session.mcpSourceHandle = input.workerSession;
     const workerDispatch = (async () => {
       let taskRecord;
       try {
+        await reloadRuntimeConfig();
+        const session = resolveWorkerRuntimeSession(input);
+        session.mcpCoordinatorSession = input.coordinatorSession;
+        session.mcpSourceHandle = input.workerSession;
         const progressBuffer = new ProgressLineBuffer;
+        const recordProgress = async (summary) => {
+          try {
+            await orchestration.recordTaskProgress(input.taskId, summary);
+            const taskState = await orchestration.getTask(input.taskId);
+            if (taskState?.chatKey && taskState.replyContextToken && deps.channel) {
+              await deps.channel.notifyTaskProgress(taskState, renderTaskProgress(taskState, summary));
+            }
+          } catch (error2) {
+            await logger2.error("orchestration.progress.send_failed", "failed to send task progress", {
+              taskId: input.taskId,
+              message: error2 instanceof Error ? error2.message : String(error2)
+            });
+          }
+        };
         const result = await transport.prompt(session, input.promptText, undefined, undefined, {
           onSegment: async (chunk) => {
-            const summaries = progressBuffer.feed(chunk);
+            const summaries = progressBuffer.feed(chunk, { segmentComplete: true });
             for (const summary of summaries) {
-              try {
-                await orchestration.recordTaskProgress(input.taskId);
-                const taskState = await orchestration.getTask(input.taskId);
-                if (taskState?.chatKey && taskState.replyContextToken && deps.channel) {
-                  await deps.channel.notifyTaskProgress(taskState, renderTaskProgress(taskState, summary));
-                }
-              } catch (error2) {
-                await logger2.error("orchestration.progress.send_failed", "failed to send task progress", {
-                  taskId: input.taskId,
-                  message: error2 instanceof Error ? error2.message : String(error2)
-                });
-              }
+              await recordProgress(summary);
             }
           }
         });
+        for (const summary of progressBuffer.flush()) {
+          await recordProgress(summary);
+        }
         taskRecord = await finalizeWorkerTurn({
           taskId: input.taskId,
           workerSession: input.workerSession,
@@ -25357,6 +25672,7 @@ async function buildApp(paths, deps = {}) {
     },
     stateMutex,
     ensureWorkerSession: async ({ workerSession, targetAgent, workspace, cwd, coordinatorSession }) => {
+      await reloadRuntimeConfig();
       const session = resolveWorkerRuntimeSession({ workerSession, targetAgent, workspace, ...cwd ? { cwd } : {} });
       session.mcpCoordinatorSession = coordinatorSession;
       session.mcpSourceHandle = workerSession;
@@ -25479,6 +25795,9 @@ function replaceRuntimeState(target, source) {
   target.chat_contexts = source.chat_contexts;
   target.orchestration = source.orchestration;
 }
+function replaceRuntimeConfig(target, source) {
+  Object.assign(target, source);
+}
 async function main() {
   const paths = resolveRuntimePaths();
   try {
@@ -26628,6 +26947,7 @@ var init_doctor2 = __esm(async () => {
 init_config_store();
 init_load_config();
 init_ensure_config();
+init_agent_templates();
 init_create_daemon_controller();
 init_daemon_files();
 import { randomUUID as randomUUID4 } from "node:crypto";
@@ -39082,6 +39402,7 @@ var taskStatusSchema = exports_external.enum([
 var sortSchema = exports_external.enum(["updatedAt", "createdAt"]);
 var orderSchema = exports_external.enum(["asc", "desc"]);
 var contestedDecisionSchema = exports_external.enum(["accept", "discard"]);
+var taskWatchModeSchema = exports_external.enum(["next_event", "until_attention_or_terminal"]);
 var taskQuestionSchema = exports_external.object({
   taskId: exports_external.string().min(1),
   questionId: exports_external.string().min(1)
@@ -39091,7 +39412,8 @@ function buildWeacpxMcpToolRegistry(input) {
   const tools = [
     {
       name: "delegate_request",
-      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker. After this returns status=running, call task_wait with the returned taskId to wait for completion before reporting back to the user; if status=needs_confirmation, wait for the user to approve (task_approve / task_reject) and do not call task_wait yet.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
+      description: `Delegate a subtask to another agent under the current coordinator. Pass an absolute workingDirectory for the worker. Supports MCP Tasks when the client requests task execution: the tool can return a native task handle immediately, then clients can use tasks/get, tasks/result, tasks/list, and tasks/cancel. For legacy clients, after this returns status=running, keep the returned taskId and use task_get/task_list for non-blocking progress snapshots; call task_wait only when the user explicitly wants you to wait/block until completion or attention is required. If status=needs_confirmation, wait for the user to approve (task_approve / task_reject) and do not call task_wait yet.${availableAgents && availableAgents.length > 0 ? ` Available agents: ${availableAgents.join(", ")}.` : ""}`,
+      execution: { taskSupport: "optional" },
       inputSchema: exports_external.object({
         targetAgent: exports_external.string().min(1),
         task: exports_external.string().min(1),
@@ -39174,7 +39496,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_get",
-      description: "Fetch a single task under the current coordinator, including the worker's final result and any pending question. Use after task_wait returns to read the actual output before summarizing it for the user, or to inspect a task that requires attention.",
+      description: "Fetch a single task under the current coordinator, including the worker's final result and any pending question. Use to inspect a task snapshot non-blockingly, read the actual output after completion, or inspect a task that requires attention.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -39209,7 +39531,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_approve",
-      description: "Approve a pending task under the current coordinator. Use when delegate_request returned status=needs_confirmation and the user has authorized it; after approval, call task_wait.",
+      description: "Approve a pending task under the current coordinator. Use when delegate_request returned status=needs_confirmation and the user has authorized it; after approval, use task_get/task_list for snapshots or task_wait only if intentionally blocking.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1)
       }).strict(),
@@ -39251,7 +39573,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "task_wait",
-      description: `Wait for a task to finish or require attention. Call this immediately after delegate_request (when status=running) unless you intend a fire-and-forget. Returns status=terminal (done; call task_get for the result), status=attention_required (call task_get first to read the task's current status, then branch: needs_confirmation -> task_approve or task_reject; blocked or waiting_for_human -> coordinator_answer_question; reviewPending set -> coordinator_review_contested_result; after resolving, call task_wait again), or status=timeout (still running; call task_wait again or task_get for a snapshot). Defaults: timeout ${DEFAULT_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WAIT_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WAIT_POLL_INTERVAL_MS} ms.`,
+      description: `Wait for a task to finish or require attention. This is a blocking legacy compatibility tool; do not call it automatically after delegate_request when the user only asked to start/delegate work. Use task_get/task_list for non-blocking progress snapshots; call task_wait when the user explicitly asks to wait, or when your next step truly depends on completion. Returns status=terminal (done; call task_get for the result), status=attention_required (call task_get first to read the task's current status, then branch: needs_confirmation -> task_approve or task_reject; blocked or waiting_for_human -> coordinator_answer_question; reviewPending set -> coordinator_review_contested_result; after resolving, use task_get/task_list snapshots or task_wait only if intentionally blocking), or status=timeout (still running; use task_get for a snapshot, or task_wait only if intentionally blocking). Defaults: timeout ${DEFAULT_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WAIT_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WAIT_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WAIT_POLL_INTERVAL_MS} ms.`,
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         timeoutMs: exports_external.number().int().min(0).max(MAX_TASK_WAIT_TIMEOUT_MS).optional(),
@@ -39265,9 +39587,29 @@ function buildWeacpxMcpToolRegistry(input) {
         return createSuccessResult(renderTaskWaitResult(result), result);
       })
     },
+    {
+      name: "task_watch",
+      description: `Long-poll a task for the next event, attention-required state, or terminal state. This is the recommended legacy way to watch a delegated task without repeatedly calling task_wait. For MCP-task-capable clients, request task execution for this tool to create a background watcher: the call returns a native task handle immediately, and tasks/result returns when the watch condition is met. The native watcher is single-shot: it runs one watch cycle then terminates, so to keep watching start another task_watch with afterSeq set to the returned nextAfterSeq. Defaults: timeout ${DEFAULT_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${DEFAULT_TASK_WATCH_POLL_INTERVAL_MS} ms. Maximums: timeout ${MAX_TASK_WATCH_TIMEOUT_MS} ms, poll interval ${MAX_TASK_WATCH_POLL_INTERVAL_MS} ms.`,
+      execution: { taskSupport: "optional" },
+      inputSchema: exports_external.object({
+        taskId: exports_external.string().min(1),
+        afterSeq: exports_external.number().int().min(0).optional(),
+        mode: taskWatchModeSchema.optional(),
+        includeProgress: exports_external.boolean().optional(),
+        timeoutMs: exports_external.number().int().min(0).max(MAX_TASK_WATCH_TIMEOUT_MS).optional(),
+        pollIntervalMs: exports_external.number().int().min(1).max(MAX_TASK_WATCH_POLL_INTERVAL_MS).optional()
+      }).strict(),
+      handler: async (args) => await asToolResult(async () => {
+        const result = await transport.watchTask({
+          coordinatorSession,
+          ...args
+        });
+        return createSuccessResult(renderTaskWatchResult(result), result);
+      })
+    },
     {
       name: "worker_raise_question",
-      description: "Raise a blocker question for the current bound worker session. Worker-side only: call this from inside a delegated task when you are blocked and need the coordinator's input. Coordinators waiting on a delegation should not call this; use task_wait instead.",
+      description: "Raise a blocker question for the current bound worker session. Worker-side only: call this from inside a delegated task when you are blocked and need the coordinator's input. Coordinators waiting on a delegation should not call this; use task_get/task_list for snapshots, or task_wait only if intentionally blocking.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         question: exports_external.string().min(1),
@@ -39287,7 +39629,7 @@ function buildWeacpxMcpToolRegistry(input) {
     },
     {
       name: "coordinator_answer_question",
-      description: "Answer a blocked worker question under the current coordinator. Use after task_wait returns status=attention_required and task_get shows a pending question; after answering, call task_wait again to keep waiting for the worker to finish.",
+      description: "Answer a blocked worker question under the current coordinator. Use when task_get shows a pending question; after answering, use task_get/task_list for snapshots or task_wait only if intentionally blocking for the worker to finish.",
       inputSchema: exports_external.object({
         taskId: exports_external.string().min(1),
         questionId: exports_external.string().min(1),
@@ -39391,7 +39733,7 @@ function renderTaskWaitResult(result) {
   if (result.status === "timeout") {
     return [
       `Task ${result.task.taskId} wait timed out; current state is ${result.task.status}.`,
-      `Next: call task_wait again with this taskId to keep waiting, or task_get for a snapshot.`
+      `Next: call task_get for a snapshot, or call task_wait again only if you intentionally want to keep blocking.`
     ].join(`
 `);
   }
@@ -39402,7 +39744,7 @@ function renderTaskWaitResult(result) {
       `  - status=needs_confirmation -> task_approve or task_reject`,
       `  - status=blocked or waiting_for_human -> coordinator_answer_question`,
       `  - reviewPending set -> coordinator_review_contested_result`,
-      `After resolving, call task_wait again to keep waiting for the worker to finish.`
+      `After resolving, use task_get/task_list for snapshots, or call task_wait again only if you intentionally want to keep blocking.`
     ].join(`
 `);
   }
@@ -39412,6 +39754,26 @@ function renderTaskWaitResult(result) {
   ].join(`
 `);
 }
+function renderTaskWatchResult(result) {
+  if (result.status === "not_found" || !result.task) {
+    return "Task not found.";
+  }
+  const header = [
+    `Task ${result.task.taskId} watch ${result.status.replace("_", " ")}; current state is ${result.task.status}.`,
+    `- nextAfterSeq: ${result.nextAfterSeq}`,
+    result.historyTruncated ? "- historyTruncated: true" : ""
+  ].filter((line) => line.length > 0);
+  const events = result.events.length > 0 ? [
+    "- Events:",
+    ...result.events.map((event) => {
+      const detail = event.summary ?? event.message ?? event.status ?? "";
+      return `  - #${event.seq} ${event.type} at ${event.at}${detail ? `: ${detail}` : ""}`;
+    })
+  ] : ["- Events: none"];
+  const next = result.status === "terminal" ? "Next: call task_get to read the final result." : result.status === "attention_required" ? "Next: call task_get to inspect openQuestion / reviewPending, then resolve it with the recommended action tool." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching, preferably as an MCP task if your client supports background task execution.`;
+  return [...header, ...events, next].join(`
+`);
+}
 function createSuccessResult(text, structuredContent) {
   return {
     content: [{ type: "text", text }],
@@ -39425,7 +39787,7 @@ function createErrorResult(message) {
   };
 }
 function renderDelegateSuccess(result) {
-  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval; do not call task_wait yet. Tell the user, then call task_approve or task_reject based on their response.` : `Next: call task_wait with taskId="${result.taskId}" to wait for the worker to finish, then task_get to read the result before reporting back.`;
+  const next = result.status === "needs_confirmation" ? `Next: this delegation requires user approval; do not call task_wait yet. Tell the user, then call task_approve or task_reject based on their response.` : `Next: task "${result.taskId}" is running. Return this taskId to the user, or call task_get/task_list for non-blocking progress snapshots (or task_watch to long-poll for the next event). Call task_wait only if the user explicitly asks you to wait/block until completion.`;
   return [`Delegation task "${result.taskId}" created.`, `- Status: ${result.status}`, next].join(`
 `);
 }
@@ -39530,6 +39892,8 @@ function renderTaskSummary(task) {
   header.push(`- Task: ${task.task}`);
   if (task.summary.trim().length > 0)
     header.push(`- Summary: ${task.summary}`);
+  if (task.lastProgressSummary)
+    header.push(`- Latest progress: ${task.lastProgressSummary}`);
   if (task.resultText.trim().length > 0)
     header.push(`- Result: ${task.resultText}`);
   const events = [];
@@ -39574,7 +39938,7 @@ function renderTaskApprovalSuccess(task) {
   return [
     `Task "${task.taskId}" approved.`,
     `- Current status: ${task.status}`,
-    `Next: call task_wait with taskId="${task.taskId}" to wait for the worker to finish, then task_get to read the result before reporting back.`
+    `Next: use task_get/task_list for non-blocking progress snapshots, or call task_wait only if you intentionally want to block until the worker finishes; then task_get to read the final result.`
   ].join(`
 `);
 }
@@ -39644,6 +40008,9 @@ class OrchestrationClient {
   async waitTask(input) {
     return await this.request("task.wait", input, getWaitRequestTimeoutMs(input.timeoutMs, this.timeoutMs));
   }
+  async watchTask(input) {
+    return await this.request("task.watch", input, getWatchRequestTimeoutMs(input.timeoutMs, this.timeoutMs));
+  }
   async approveTask(input) {
     return await this.request("task.approve", input);
   }
@@ -39760,6 +40127,11 @@ function getWaitRequestTimeoutMs(waitTimeoutMs, defaultTimeoutMs) {
   const boundedWaitTimeoutMs = Math.min(Math.max(Math.floor(requestedWaitTimeoutMs ?? DEFAULT_TASK_WAIT_TIMEOUT_MS), 0), MAX_TASK_WAIT_TIMEOUT_MS);
   return Math.max(defaultTimeoutMs, boundedWaitTimeoutMs + TASK_WAIT_RPC_TIMEOUT_PADDING_MS);
 }
+function getWatchRequestTimeoutMs(watchTimeoutMs, defaultTimeoutMs) {
+  const requestedWatchTimeoutMs = watchTimeoutMs === undefined ? undefined : Number.isFinite(watchTimeoutMs) ? watchTimeoutMs : 0;
+  const boundedWatchTimeoutMs = Math.min(Math.max(Math.floor(requestedWatchTimeoutMs ?? DEFAULT_TASK_WATCH_TIMEOUT_MS), 0), MAX_TASK_WATCH_TIMEOUT_MS);
+  return Math.max(defaultTimeoutMs, boundedWatchTimeoutMs + TASK_WATCH_RPC_TIMEOUT_PADDING_MS);
+}
 
 // src/mcp/weacpx-mcp-transport.ts
 function createOrchestrationTransport(endpoint, deps = {}) {
@@ -39789,6 +40161,7 @@ function createOrchestrationTransport(endpoint, deps = {}) {
     rejectTask: async (input) => await client.rejectTask(input),
     cancelTask: async (input) => await client.cancelTaskForCoordinator(input),
     waitTask: async (input) => await client.waitTask(input),
+    watchTask: async (input) => await client.watchTask(input),
     workerRaiseQuestion: async (input) => {
       const sourceHandle = input.sourceHandle.trim();
       if (sourceHandle.length === 0) {
@@ -39810,21 +40183,31 @@ function createOrchestrationTransport(endpoint, deps = {}) {
 }
 
 // src/mcp/weacpx-mcp-server.ts
+var TASK_OPTIONS_CACHE_LIMIT = 1000;
+var TASKS_LIST_PAGE_SIZE = 100;
+var WATCH_TASKS_CACHE_LIMIT = 256;
 var WEACPX_MCP_SERVER_INSTRUCTIONS = [
   "Use these tools to orchestrate work across other agents under your coordinator session.",
   "",
   "Typical lifecycle for a single delegation:",
+  "Preferred MCP Tasks lifecycle (for clients that support task-augmented tools/call):",
+  "1. Call delegate_request with task execution requested. It returns a native MCP task handle immediately.",
+  "2. Use task_watch with MCP task execution to start a background watcher, or use tasks/get / tasks/list to poll status. Use tasks/result after terminal status, or on input_required to receive an actionable next-step package; use tasks/cancel to cancel.",
+  "   - When tasks/result returns input_required, that result stream is complete. Call the recommended tool, then resume polling with tasks/get / tasks/result.",
+  "3. Status mapping: working = running, input_required = needs_confirmation / blocked / waiting_for_human / contested review, completed / failed / cancelled are terminal.",
+  "",
+  "Legacy tool lifecycle for clients without MCP Tasks support:",
   "1. delegate_request → returns { taskId, status }.",
-  "   - status=running: the worker has started; go to step 2.",
-  "   - status=needs_confirmation: tell the user, then call task_approve or task_reject based on their response. After task_approve, return to step 2 to wait for the worker. Do not call task_wait before approval.",
-  "2. task_wait(taskId) → blocks until the task is done, needs attention, or times out.",
+  "   - status=running: the worker has started. Return the taskId to the user, use task_get / task_list for non-blocking snapshots, or task_watch to long-poll for the next event; only go to step 2 when you intentionally want to block waiting.",
+  "   - status=needs_confirmation: tell the user, then call task_approve or task_reject based on their response. After task_approve, use task_get/task_list for snapshots or step 2 only if intentionally blocking. Do not call task_wait before approval.",
+  "2. Optional blocking wait: task_wait(taskId) → blocks until the task is done, needs attention, or times out. Do not call it automatically when the user asked to delegate and continue.",
   "   - status=terminal: go to step 3.",
   "   - status=attention_required: the task is in needs_confirmation / blocked / waiting_for_human, or has reviewPending set. Call task_get(taskId) to read the actual status and any openQuestion / reviewPending fields, then branch:",
-  "       * needs_confirmation -> task_approve or task_reject (after approval, go back to step 2)",
+  "       * needs_confirmation -> task_approve or task_reject (after approval, use snapshots or optional blocking wait only if needed)",
   "       * blocked or waiting_for_human -> coordinator_answer_question (the answer can come from you or be relayed from a human you consulted)",
   "       * reviewPending set -> coordinator_review_contested_result with accept or discard",
-  "     After resolving, call task_wait again to keep waiting.",
-  "   - status=timeout: the task is still running. Call task_wait again to keep waiting, or task_get for a snapshot.",
+  "     After resolving, use task_get / task_list for snapshots, or step 2 only if intentionally blocking.",
+  "   - status=timeout: the task is still running. Use task_get for a snapshot, or call task_wait again only if you still intentionally want to block.",
   "3. The task is terminal. Call task_get(taskId) to read the worker's final result, then summarize it for the user. Do not invent results that did not come from task_get.",
   "",
   "Batching: use group_new before a wave of delegate_request calls and pass groupId on each, then group_get / group_list / group_cancel to manage the batch.",
@@ -39835,18 +40218,27 @@ var WEACPX_MCP_SERVER_INSTRUCTIONS = [
 ].join(`
 `);
 function createWeacpxMcpServer(options) {
+  let getToolState;
+  const taskOptionsById = new Map;
+  const watchTasksById = new Map;
   const server = new Server({
     name: "weacpx-orchestration",
     version: readVersion()
   }, {
     capabilities: {
-      tools: {}
+      tools: {},
+      tasks: {
+        list: {},
+        cancel: {},
+        requests: { tools: { call: {} } }
+      }
     },
-    instructions: WEACPX_MCP_SERVER_INSTRUCTIONS
+    instructions: WEACPX_MCP_SERVER_INSTRUCTIONS,
+    taskStore: createWeacpxTaskStore(async () => await getToolState(), taskOptionsById, watchTasksById)
   });
   let toolState = null;
   let toolStatePromise = null;
-  async function getToolState() {
+  getToolState = async function getToolState2() {
     if (toolState) {
       return toolState;
     }
@@ -39869,14 +40261,15 @@ function createWeacpxMcpServer(options) {
       toolStatePromise = null;
     });
     return await toolStatePromise;
-  }
+  };
   server.setRequestHandler(ListToolsRequestSchema, async () => {
     const tools = (await getToolState()).tools;
     return {
       tools: tools.map((tool) => ({
         name: tool.name,
         description: tool.description,
-        inputSchema: normalizeInputSchemaJson(zodToJsonSchema(tool.inputSchema))
+        inputSchema: normalizeInputSchemaJson(zodToJsonSchema(tool.inputSchema)),
+        ...tool.execution ? { execution: tool.execution } : {}
       }))
     };
   });
@@ -39890,15 +40283,399 @@ function createWeacpxMcpServer(options) {
     if (!parsed.success) {
       throw new McpError(ErrorCode.InvalidParams, formatZodError(parsed.error));
     }
+    if (request.params.task) {
+      if (tool.name !== "delegate_request" && tool.name !== "task_watch") {
+        throw new McpError(ErrorCode.InvalidParams, `Tool ${tool.name} does not support MCP task execution`);
+      }
+      if (tool.name === "delegate_request") {
+        return await createDelegationMcpTask({
+          state: await getToolState(),
+          args: parsed.data,
+          taskParams: request.params.task,
+          taskOptionsById
+        });
+      }
+      return await createWatchMcpTask({
+        state: await getToolState(),
+        args: parsed.data,
+        taskParams: request.params.task,
+        taskOptionsById,
+        watchTasksById
+      });
+    }
     return await tool.handler(parsed.data);
   });
+  server.setRequestHandler(GetTaskPayloadRequestSchema, async (request) => {
+    const watchTask = watchTasksById.get(request.params.taskId);
+    if (watchTask) {
+      if (!watchTask.result) {
+        throw new McpError(ErrorCode.InvalidRequest, `Task ${request.params.taskId} is still ${watchTask.task.status}`);
+      }
+      watchTasksById.delete(request.params.taskId);
+      return watchTask.result;
+    }
+    const state = await getToolState();
+    const task = await state.transport.getTask({
+      coordinatorSession: state.coordinatorSession,
+      taskId: request.params.taskId
+    });
+    if (!task) {
+      throw new McpError(ErrorCode.InvalidParams, `Task not found: ${request.params.taskId}`);
+    }
+    return withRelatedTaskMeta(renderNativeTaskPayloadResult(task), task.taskId);
+  });
   return server;
 }
 function buildToolState(options) {
   const tools = buildWeacpxMcpToolRegistry(options);
   return {
     tools,
-    toolMap: new Map(tools.map((tool) => [tool.name, tool]))
+    toolMap: new Map(tools.map((tool) => [tool.name, tool])),
+    transport: options.transport,
+    coordinatorSession: options.coordinatorSession,
+    sourceHandle: options.sourceHandle
+  };
+}
+async function createDelegationMcpTask(input) {
+  const delegateTool = input.state.toolMap.get("delegate_request");
+  if (!delegateTool) {
+    throw new McpError(ErrorCode.MethodNotFound, "delegate_request is not registered");
+  }
+  const result = await delegateTool.handler(input.args);
+  if (result.isError) {
+    throw new McpError(ErrorCode.InvalidRequest, result.content.map((item) => item.type === "text" ? item.text : "").filter(Boolean).join(`
+`) || "Delegation failed");
+  }
+  const structured = result.structuredContent;
+  const taskId = typeof structured?.taskId === "string" ? structured.taskId : undefined;
+  if (!taskId) {
+    throw new McpError(ErrorCode.InternalError, "delegate_request did not return a taskId");
+  }
+  rememberTaskOptions(input.taskOptionsById, taskId, input.taskParams);
+  const task = await input.state.transport.getTask({
+    coordinatorSession: input.state.coordinatorSession,
+    taskId
+  });
+  if (!task) {
+    throw new McpError(ErrorCode.InternalError, `delegate_request created task "${taskId}" but it was not readable from orchestration state`);
+  }
+  return {
+    task: toMcpTask(task, input.taskParams)
+  };
+}
+async function createWatchMcpTask(input) {
+  const taskId = input.args.taskId;
+  if (typeof taskId !== "string" || taskId.length === 0) {
+    throw new McpError(ErrorCode.InvalidParams, "task_watch requires taskId");
+  }
+  const baseTask = await input.state.transport.getTask({
+    coordinatorSession: input.state.coordinatorSession,
+    taskId
+  });
+  if (!baseTask) {
+    throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
+  }
+  const now = new Date().toISOString();
+  const watchTaskId = `watch:${taskId}:${Date.now()}:${Math.random().toString(36).slice(2, 10)}`;
+  rememberTaskOptions(input.taskOptionsById, watchTaskId, input.taskParams);
+  const watchTask = toMcpTask({
+    taskId: watchTaskId,
+    status: "running",
+    summary: `Watching task ${taskId}`,
+    createdAt: now,
+    updatedAt: now
+  }, input.taskParams);
+  registerWatchTask(input.watchTasksById, watchTaskId, { task: watchTask });
+  runWatchMcpTask({
+    state: input.state,
+    args: input.args,
+    watchTaskId,
+    taskOptions: input.taskParams,
+    watchTasksById: input.watchTasksById
+  });
+  return {
+    task: watchTask
+  };
+}
+async function runWatchMcpTask(input) {
+  const args = input.args;
+  try {
+    const result = await input.state.transport.watchTask({
+      coordinatorSession: input.state.coordinatorSession,
+      ...args
+    });
+    if (!input.watchTasksById.has(input.watchTaskId))
+      return;
+    const now = new Date().toISOString();
+    const mcpStatus = result.status === "attention_required" ? "input_required" : result.status === "not_found" ? "failed" : "completed";
+    input.watchTasksById.set(input.watchTaskId, {
+      task: {
+        taskId: input.watchTaskId,
+        status: mcpStatus,
+        ttl: input.taskOptions.ttl ?? null,
+        createdAt: input.watchTasksById.get(input.watchTaskId)?.task.createdAt ?? now,
+        lastUpdatedAt: now,
+        ...input.taskOptions.pollInterval !== undefined ? { pollInterval: input.taskOptions.pollInterval } : {},
+        statusMessage: renderWatchTaskStatusMessage(result)
+      },
+      result: withRelatedTaskMeta(renderWatchMcpTaskResult(result, input.watchTaskId), result.task?.taskId ?? input.watchTaskId)
+    });
+  } catch (error2) {
+    if (!input.watchTasksById.has(input.watchTaskId))
+      return;
+    const now = new Date().toISOString();
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    input.watchTasksById.set(input.watchTaskId, {
+      task: {
+        taskId: input.watchTaskId,
+        status: "failed",
+        ttl: input.taskOptions.ttl ?? null,
+        createdAt: input.watchTasksById.get(input.watchTaskId)?.task.createdAt ?? now,
+        lastUpdatedAt: now,
+        statusMessage: message
+      },
+      result: {
+        content: [{ type: "text", text: `Task watch "${input.watchTaskId}" failed: ${message}` }],
+        structuredContent: { watchTaskId: input.watchTaskId, error: message },
+        isError: true
+      }
+    });
+  }
+}
+function renderWatchTaskStatusMessage(result) {
+  if (!result.task)
+    return `Watch finished: ${result.status}`;
+  return `Watch finished for ${result.task.taskId}: ${result.status}; task status ${result.task.status}; events ${result.events?.length ?? 0}`;
+}
+function renderWatchMcpTaskResult(result, watchTaskId) {
+  if (result.status === "not_found" || !result.task) {
+    return {
+      content: [{ type: "text", text: `Task watch "${watchTaskId}" finished: watched task not found.` }],
+      structuredContent: { watchTaskId, ...result },
+      isError: true
+    };
+  }
+  const header = [
+    `Task watch "${watchTaskId}" finished with ${result.status.replace("_", " ")}.`,
+    `Watched task ${result.task.taskId} is ${result.task.status}.`,
+    `nextAfterSeq: ${result.nextAfterSeq}`,
+    result.historyTruncated ? "historyTruncated: true" : ""
+  ].filter((line) => line.length > 0);
+  const events = result.events.length > 0 ? [
+    "Events:",
+    ...result.events.map((event) => {
+      const detail = event.summary ?? event.message ?? event.status ?? "";
+      return `- #${event.seq} ${event.type} at ${event.at}${detail ? `: ${detail}` : ""}`;
+    })
+  ] : ["Events: none"];
+  const next = result.status === "terminal" ? "Next: call task_get on the watched task to read the final result." : result.status === "attention_required" ? "Next: call task_get on the watched task, then resolve openQuestion / reviewPending with the recommended action tool." : `Next: call task_watch again with afterSeq=${result.nextAfterSeq} to keep watching.`;
+  return {
+    content: [{ type: "text", text: [...header, ...events, next].join(`
+`) }],
+    structuredContent: { watchTaskId, ...result }
+  };
+}
+function createWeacpxTaskStore(resolveState, taskOptionsById, watchTasksById) {
+  return {
+    createTask: async () => {
+      throw new Error("weacpx native MCP tasks are created by delegate_request");
+    },
+    getTask: async (taskId) => {
+      const watchTask = watchTasksById.get(taskId);
+      if (watchTask)
+        return watchTask.task;
+      const state = await resolveState();
+      const task = await state.transport.getTask({ coordinatorSession: state.coordinatorSession, taskId });
+      return task ? toMcpTask(task, taskOptionsById.get(taskId)) : null;
+    },
+    storeTaskResult: async () => {
+      throw new Error("weacpx native MCP task results are stored by orchestration");
+    },
+    getTaskResult: async (taskId) => {
+      const watchTask = watchTasksById.get(taskId);
+      if (watchTask) {
+        if (!watchTask.result) {
+          throw new Error(`Task ${taskId} is still ${watchTask.task.status}`);
+        }
+        watchTasksById.delete(taskId);
+        return watchTask.result;
+      }
+      const state = await resolveState();
+      const task = await state.transport.getTask({ coordinatorSession: state.coordinatorSession, taskId });
+      if (!task) {
+        throw new Error(`Task not found: ${taskId}`);
+      }
+      return renderNativeTaskPayloadResult(task);
+    },
+    updateTaskStatus: async (taskId, status, statusMessage) => {
+      const state = await resolveState();
+      if (status === "cancelled") {
+        await state.transport.cancelTask({ coordinatorSession: state.coordinatorSession, taskId });
+        return;
+      }
+      throw new Error(`weacpx MCP task status is read-only (${status}${statusMessage ? `: ${statusMessage}` : ""})`);
+    },
+    listTasks: async (cursor) => {
+      const state = await resolveState();
+      const tasks = await state.transport.listTasks({
+        coordinatorSession: state.coordinatorSession,
+        sort: "updatedAt",
+        order: "desc"
+      });
+      const watchTasks = Array.from(watchTasksById.values()).map((record3) => record3.task);
+      pruneTaskOptions(taskOptionsById, new Set([...tasks.map((task) => task.taskId), ...watchTasks.map((task) => task.taskId)]));
+      const offset = parseTaskListCursor(cursor);
+      const allTasks = [
+        ...watchTasks,
+        ...tasks.map((task) => toMcpTask(task, taskOptionsById.get(task.taskId)))
+      ].sort((a, b) => b.lastUpdatedAt.localeCompare(a.lastUpdatedAt));
+      const page = allTasks.slice(offset, offset + TASKS_LIST_PAGE_SIZE);
+      const nextOffset = offset + page.length;
+      return {
+        tasks: page,
+        ...nextOffset < allTasks.length ? { nextCursor: String(nextOffset) } : {}
+      };
+    }
+  };
+}
+function rememberTaskOptions(taskOptionsById, taskId, options) {
+  taskOptionsById.set(taskId, normalizeCreateTaskOptions(options));
+  while (taskOptionsById.size > TASK_OPTIONS_CACHE_LIMIT) {
+    const oldestKey = taskOptionsById.keys().next().value;
+    if (oldestKey === undefined)
+      break;
+    taskOptionsById.delete(oldestKey);
+  }
+}
+function registerWatchTask(watchTasksById, watchTaskId, record3) {
+  watchTasksById.set(watchTaskId, record3);
+  while (watchTasksById.size > WATCH_TASKS_CACHE_LIMIT) {
+    const oldestKey = watchTasksById.keys().next().value;
+    if (oldestKey === undefined || oldestKey === watchTaskId)
+      break;
+    watchTasksById.delete(oldestKey);
+  }
+}
+function pruneTaskOptions(taskOptionsById, taskIds) {
+  for (const taskId of taskOptionsById.keys()) {
+    if (!taskIds.has(taskId)) {
+      taskOptionsById.delete(taskId);
+    }
+  }
+}
+function parseTaskListCursor(cursor) {
+  if (!cursor)
+    return 0;
+  const offset = Number(cursor);
+  if (!Number.isInteger(offset) || offset < 0) {
+    throw new McpError(ErrorCode.InvalidParams, `Invalid tasks/list cursor: ${cursor}`);
+  }
+  return offset;
+}
+function renderNativeTaskPayloadResult(task) {
+  if (toMcpTaskStatus(task) === "input_required") {
+    return renderInputRequiredTaskResult(task);
+  }
+  if (task.status === "completed" || task.status === "failed" || task.status === "cancelled") {
+    return renderNativeTaskResult(task);
+  }
+  throw new McpError(ErrorCode.InvalidRequest, `Task ${task.taskId} is still ${task.status}; use tasks/get until it is terminal or input_required`);
+}
+function withRelatedTaskMeta(result, taskId) {
+  return {
+    ...result,
+    _meta: {
+      ...result._meta,
+      [RELATED_TASK_META_KEY]: { taskId }
+    }
+  };
+}
+function renderNativeTaskResult(task) {
+  const isError = task.status === "failed" || task.status === "cancelled";
+  const text = [
+    `Task "${task.taskId}" finished with status ${task.status}.`,
+    task.resultText.trim().length > 0 ? task.resultText : task.summary
+  ].filter((line) => line.trim().length > 0).join(`
+`);
+  return {
+    content: [{ type: "text", text }],
+    structuredContent: { task },
+    ...isError ? { isError: true } : {}
+  };
+}
+function renderInputRequiredTaskResult(task) {
+  const actions = inputRequiredActions(task);
+  const text = [
+    `Task "${task.taskId}" requires input before it can continue.`,
+    task.summary.trim().length > 0 ? task.summary : "",
+    task.openQuestion ? `Open question: ${task.openQuestion.question}` : "",
+    `Next: call task_get("${task.taskId}") to inspect details, then ${actions.join(" or ")}.`
+  ].filter((line) => line.trim().length > 0).join(`
+`);
+  return {
+    content: [{ type: "text", text }],
+    structuredContent: {
+      task,
+      nextAction: {
+        kind: "input_required",
+        taskId: task.taskId,
+        recommendedTools: actions
+      }
+    }
+  };
+}
+function inputRequiredActions(task) {
+  const actions = [];
+  if (task.status === "needs_confirmation") {
+    actions.push("task_approve", "task_reject");
+  }
+  if (task.status === "blocked" || task.status === "waiting_for_human" || task.openQuestion) {
+    actions.push("coordinator_answer_question");
+  }
+  if (task.reviewPending) {
+    actions.push("coordinator_review_contested_result");
+  }
+  return actions.length > 0 ? actions : ["task_get"];
+}
+function toMcpTask(task, options = {}) {
+  const statusMessage = mcpTaskStatusMessage(task);
+  return {
+    taskId: task.taskId,
+    status: toMcpTaskStatus(task),
+    ttl: options.ttl ?? null,
+    createdAt: task.createdAt,
+    lastUpdatedAt: task.updatedAt,
+    ...options.pollInterval !== undefined ? { pollInterval: options.pollInterval } : {},
+    ...statusMessage ? { statusMessage } : {}
+  };
+}
+function mcpTaskStatusMessage(task) {
+  const lines = [
+    task.summary.trim().length > 0 ? task.summary : "",
+    task.lastProgressSummary ? `Latest progress: ${task.lastProgressSummary}` : "",
+    task.lastProgressAt ? `Last progress at: ${task.lastProgressAt}` : ""
+  ].filter((line) => line.trim().length > 0);
+  return lines.length > 0 ? lines.join(`
+`) : undefined;
+}
+function toMcpTaskStatus(task) {
+  if (task.reviewPending !== undefined)
+    return "input_required";
+  if (task.status === "completed")
+    return "completed";
+  if (task.status === "failed")
+    return "failed";
+  if (task.status === "cancelled")
+    return "cancelled";
+  if (task.status === "needs_confirmation" || task.status === "blocked" || task.status === "waiting_for_human") {
+    return "input_required";
+  }
+  return "working";
+}
+function normalizeCreateTaskOptions(options) {
+  return {
+    ttl: options.ttl ?? null,
+    ...options.pollInterval !== undefined ? { pollInterval: options.pollInterval } : {}
   };
 }
 async function resolveMcpIdentity(server, options) {
@@ -41834,6 +42611,7 @@ var HELP_LINES = [
   "weacpx plugin list|add|update|remove|enable|disable|doctor|known - 管理插件",
   "weacpx doctor - 运行诊断",
   "weacpx version - 查看版本",
+  "weacpx agent|agents list|add|rm|templates - 管理本机 Agent",
   "weacpx workspace list|add|rm - 管理本机工作区（别名：ws）",
   "weacpx mcp-stdio [--coordinator-session <session>] [--source-handle <handle>] [--workspace <name>] - 启动 MCP stdio 服务"
 ];
@@ -41911,6 +42689,17 @@ async function runCli(args, deps = {}) {
       }
       return result;
     }
+    case "agent":
+    case "agents": {
+      const result = await handleAgentCli(args.slice(1), { print });
+      if (result === null) {
+        for (const line of HELP_LINES) {
+          print(line);
+        }
+        return 1;
+      }
+      return result;
+    }
     case "plugin": {
       const result = await handlePluginCli(args.slice(1), await createPluginCliDeps({
         print,
@@ -42152,6 +42941,93 @@ async function workspaceRemove(rawName, print) {
   print(`工作区「${name}」已删除`);
   return 0;
 }
+async function handleAgentCli(args, deps) {
+  const subcommand = args[0];
+  switch (subcommand) {
+    case "list":
+      if (args.length !== 1)
+        return null;
+      return await agentList(deps.print);
+    case "templates":
+      if (args.length !== 1)
+        return null;
+      return agentTemplates(deps.print);
+    case "add":
+      if (args.length !== 2 || !args[1])
+        return null;
+      return await agentAdd(args[1], deps.print);
+    case "rm":
+      if (args.length !== 2 || !args[1])
+        return null;
+      return await agentRemove(args[1], deps.print);
+    default:
+      return null;
+  }
+}
+async function agentList(print) {
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  const entries = Object.entries(config2.agents);
+  if (entries.length === 0) {
+    print("还没有 Agent。");
+    return 0;
+  }
+  print("Agent 列表：");
+  for (const [name, agent] of entries) {
+    const command = agent.command ? ` command=${agent.command}` : "";
+    print(`- ${name}: driver=${agent.driver}${command}`);
+  }
+  return 0;
+}
+function agentTemplates(print) {
+  print("可用 Agent 模板：");
+  for (const name of listAgentTemplates()) {
+    print(`- ${name}`);
+  }
+  return 0;
+}
+async function agentAdd(rawName, print) {
+  const name = rawName.trim();
+  if (name.length === 0) {
+    print("Agent 名称不能为空。");
+    return 1;
+  }
+  const template = getAgentTemplate(name);
+  if (!template) {
+    print(`暂不支持这个 Agent 模板。当前可用：${listAgentTemplates().join("、")}`);
+    return 1;
+  }
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  const existing = config2.agents[name];
+  if (existing) {
+    if (sameAgentConfig(existing, template)) {
+      print(`Agent「${name}」已存在`);
+      return 0;
+    }
+    print(`Agent「${name}」已存在且配置不同。请先执行：weacpx agent rm ${name}`);
+    return 1;
+  }
+  await store.upsertAgent(name, template);
+  print(`Agent「${name}」已保存`);
+  return 0;
+}
+async function agentRemove(rawName, print) {
+  const name = rawName.trim();
+  if (name.length === 0) {
+    print("Agent 名称不能为空。");
+    return 1;
+  }
+  const store = await createCliConfigStore();
+  const config2 = await store.load();
+  if (!config2.agents[name]) {
+    print(`没有找到 Agent「${name}」。`);
+    return 1;
+  }
+  await store.removeAgent(name);
+  print(`Agent「${name}」已删除`);
+  return 0;
+}
 async function createCliConfigStore() {
   const configPath = process.env.WEACPX_CONFIG ?? `${requireHome2()}/.weacpx/config.json`;
   await ensureConfigExists(configPath);