ai-project-manage-cli 6.0.63 → 6.0.64

package/dist/index.js

@@ -484,6 +484,22 @@ var requestConfig = {
     completeCoordinatorDeployment: defineEndpoint({
       method: "PUT",
       path: "/cli/coordinator-deployments/complete"
+    }),
+    updateCoordinatorDispatchStatus: defineEndpoint({
+      method: "PUT",
+      path: "/cli/coordinator-dispatches/status"
+    }),
+    appendCoordinatorDispatchResponse: defineEndpoint({
+      method: "PUT",
+      path: "/cli/coordinator-dispatches/append-response"
+    }),
+    completeCoordinatorDispatch: defineEndpoint({
+      method: "PUT",
+      path: "/cli/coordinator-dispatches/complete"
+    }),
+    createCoordinatorDispatchQuestions: defineEndpoint({
+      method: "POST",
+      path: "/cli/coordinator-dispatches/questions"
     })
   }
 };
@@ -2152,13 +2168,113 @@ function validateDeployPush(o) {
     }
   };
 }
+function validateCoordinatorDispatchMode(mode) {
+  return mode === "plan" || mode === "agent";
+}
+function validateCoordinatorDispatchPush(o) {
+  if (o.type !== "coordinator_dispatch") {
+    return { ok: false, reason: "\u671F\u671B coordinator_dispatch" };
+  }
+  if (!nonEmptyString(o.dispatchId)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 dispatchId" };
+  }
+  if (!nonEmptyString(o.dispatchSessionId)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 dispatchSessionId" };
+  }
+  if (!validateCoordinatorDispatchMode(o.mode)) {
+    return { ok: false, reason: "coordinator_dispatch.mode \u65E0\u6548" };
+  }
+  if (!nonEmptyString(o.content)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 content" };
+  }
+  if (!nonEmptyString(o.model)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 model" };
+  }
+  if (!nonEmptyString(o.apiKey)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 apiKey" };
+  }
+  if (!nonEmptyString(o.workdir)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 workdir" };
+  }
+  if (!nonEmptyString(o.user)) {
+    return { ok: false, reason: "coordinator_dispatch \u7F3A\u5C11 user" };
+  }
+  const data = {
+    type: "coordinator_dispatch",
+    dispatchId: o.dispatchId.trim(),
+    dispatchSessionId: o.dispatchSessionId.trim(),
+    mode: o.mode,
+    content: o.content,
+    model: o.model.trim(),
+    apiKey: o.apiKey.trim(),
+    workdir: o.workdir.trim(),
+    user: o.user.trim()
+  };
+  if (nonEmptyString(o.resumeAgentId)) {
+    data.resumeAgentId = o.resumeAgentId.trim();
+  }
+  return { ok: true, data };
+}
+function validateCoordinatorDispatchResumePush(o) {
+  if (o.type !== "coordinator_dispatch_resume") {
+    return { ok: false, reason: "\u671F\u671B coordinator_dispatch_resume" };
+  }
+  if (!nonEmptyString(o.dispatchId)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 dispatchId" };
+  }
+  if (!nonEmptyString(o.dispatchSessionId)) {
+    return {
+      ok: false,
+      reason: "coordinator_dispatch_resume \u7F3A\u5C11 dispatchSessionId"
+    };
+  }
+  if (!validateCoordinatorDispatchMode(o.mode)) {
+    return { ok: false, reason: "coordinator_dispatch_resume.mode \u65E0\u6548" };
+  }
+  if (!nonEmptyString(o.content)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 content" };
+  }
+  if (!nonEmptyString(o.resumeAgentId)) {
+    return {
+      ok: false,
+      reason: "coordinator_dispatch_resume \u7F3A\u5C11 resumeAgentId"
+    };
+  }
+  if (!nonEmptyString(o.model)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 model" };
+  }
+  if (!nonEmptyString(o.apiKey)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 apiKey" };
+  }
+  if (!nonEmptyString(o.workdir)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 workdir" };
+  }
+  if (!nonEmptyString(o.user)) {
+    return { ok: false, reason: "coordinator_dispatch_resume \u7F3A\u5C11 user" };
+  }
+  return {
+    ok: true,
+    data: {
+      type: "coordinator_dispatch_resume",
+      dispatchId: o.dispatchId.trim(),
+      dispatchSessionId: o.dispatchSessionId.trim(),
+      mode: o.mode,
+      content: o.content,
+      resumeAgentId: o.resumeAgentId.trim(),
+      model: o.model.trim(),
+      apiKey: o.apiKey.trim(),
+      workdir: o.workdir.trim(),
+      user: o.user.trim()
+    }
+  };
+}
 function validateAgentWsMessage(value, kind) {
   if (typeof value !== "object" || value === null) {
     return { ok: false, reason: "\u6D88\u606F\u4F53\u4E0D\u662F JSON \u5BF9\u8C61" };
   }
   const o = value;
   const type = o.type;
-  if (type !== "heartbeat" && type !== "message" && type !== "cancel" && type !== "deploy") {
+  if (type !== "heartbeat" && type !== "message" && type !== "cancel" && type !== "deploy" && type !== "coordinator_dispatch" && type !== "coordinator_dispatch_resume") {
     return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
   }
   if (kind === "heartbeat" || type === "heartbeat") {
@@ -2170,6 +2286,12 @@ function validateAgentWsMessage(value, kind) {
   if (type === "deploy") {
     return validateDeployPush(o);
   }
+  if (type === "coordinator_dispatch") {
+    return validateCoordinatorDispatchPush(o);
+  }
+  if (type === "coordinator_dispatch_resume") {
+    return validateCoordinatorDispatchResumePush(o);
+  }
   return validateMessagePush(o);
 }
 
@@ -2341,69 +2463,6 @@ async function handleInboundDeploy(cfg, msg, signal) {
   }
 }
 
-// src/commands/connect/abort-signal-debug.ts
-import {
-  getEventListeners,
-  getMaxListeners,
-  setMaxListeners
-} from "node:events";
-function isAbortSignalDebugEnabled() {
-  const v = process.env.APM_DEBUG_ABORT_SIGNAL?.trim().toLowerCase();
-  return v === "1" || v === "true" || v === "yes";
-}
-function formatAbortSignalStats(signal, label) {
-  if (!signal) {
-    return `[apm:abort-debug] ${label}: (no signal)`;
-  }
-  const listeners = getEventListeners(signal, "abort");
-  const max = getMaxListeners(signal);
-  return `[apm:abort-debug] ${label}: abortListeners=${listeners.length} maxListeners=${max} aborted=${signal.aborted}`;
-}
-function logAbortSignalStats(signal, label) {
-  if (!isAbortSignalDebugEnabled()) return;
-  console.log(formatAbortSignalStats(signal, label));
-}
-var installed = false;
-function installAbortSignalDebug() {
-  if (!isAbortSignalDebugEnabled() || installed) return;
-  installed = true;
-  const maxFromEnv = Number.parseInt(
-    process.env.APM_ABORT_SIGNAL_MAX_LISTENERS ?? "",
-    10
-  );
-  if (Number.isFinite(maxFromEnv) && maxFromEnv > 0) {
-    setMaxListeners(maxFromEnv);
-    console.log(
-      `[apm:abort-debug] setMaxListeners(${maxFromEnv}) via APM_ABORT_SIGNAL_MAX_LISTENERS`
-    );
-  }
-  process.on("warning", (warning) => {
-    if (warning.name !== "MaxListenersExceededWarning") return;
-    console.warn(`[apm:abort-debug] ${warning.name}: ${warning.message}`);
-    if (warning.stack) {
-      console.warn(warning.stack);
-    }
-  });
-  const proto = AbortSignal.prototype;
-  const original = proto.addEventListener;
-  proto.addEventListener = function(type, listener, options) {
-    if (type === "abort") {
-      const sig = this;
-      const before = getEventListeners(sig, "abort").length;
-      const max = getMaxListeners(sig);
-      const stack = new Error("[apm:abort-debug] addEventListener stack").stack?.split("\n").slice(2, 8).join("\n") ?? "";
-      console.log(
-        `[apm:abort-debug] addEventListener("abort") before=${before} max=${max}
-${stack}`
-      );
-    }
-    return original.call(this, type, listener, options);
-  };
-  console.log(
-    "[apm:abort-debug] \u5DF2\u542F\u7528 AbortSignal \u8C03\u8BD5\uFF08APM_DEBUG_ABORT_SIGNAL\uFF09"
-  );
-}
-
 // src/commands/connect/cursor-agent.ts
 import {
   Agent,
@@ -2411,6 +2470,27 @@ import {
 } from "@cursor/sdk";
 import { setMaxListeners as setMaxListeners2 } from "node:events";
 
+// src/plan-format.ts
+function formatPlanMarkdown(raw) {
+  let text = raw.trim();
+  if (!text) {
+    return text;
+  }
+  if (text.startsWith("{") && text.endsWith("}")) {
+    try {
+      const parsed = JSON.parse(text);
+      if (typeof parsed.plan === "string") {
+        return formatPlanMarkdown(parsed.plan);
+      }
+    } catch {
+    }
+  }
+  if (!text.includes("\n") && text.includes("\\n")) {
+    text = text.replace(/\\n/g, "\n").replace(/\\t/g, "	").replace(/\\"/g, '"').replace(/\\\\/g, "\\");
+  }
+  return text.replace(/\r\n/g, "\n").trimEnd() + "\n";
+}
+
 // src/session-utils.ts
 var EventSession = class {
   events = [];
@@ -2536,6 +2616,23 @@ var EventSession = class {
   getAssistantText() {
     return this.events.filter((e) => e.type === "assistant").map((e) => String(e.content ?? "")).join("\n").trim();
   }
+  /** plan 模式下 createPlan 工具 completed 时的 plan 字段（取最后一次） */
+  getCreatePlanContent() {
+    for (let i = this.events.length - 1; i >= 0; i--) {
+      const event = this.events[i];
+      if (event.type !== "tool_call") {
+        continue;
+      }
+      if (event.name !== "createPlan" || event.status !== "completed") {
+        continue;
+      }
+      const plan = event.args?.plan;
+      if (typeof plan === "string" && plan.trim()) {
+        return formatPlanMarkdown(plan);
+      }
+    }
+    return void 0;
+  }
   resolveLogContent() {
     return this.events.map((event) => formatLogEvent(event.type, event)).join("\n");
   }
@@ -2695,6 +2792,97 @@ async function syncCursorMessageLog(cfg, ctx, events) {
   });
 }
 
+// src/commands/connect/abort-signal-debug.ts
+import {
+  getEventListeners,
+  getMaxListeners,
+  setMaxListeners
+} from "node:events";
+function isAbortSignalDebugEnabled() {
+  const v = process.env.APM_DEBUG_ABORT_SIGNAL?.trim().toLowerCase();
+  return v === "1" || v === "true" || v === "yes";
+}
+function formatAbortSignalStats(signal, label) {
+  if (!signal) {
+    return `[apm:abort-debug] ${label}: (no signal)`;
+  }
+  const listeners = getEventListeners(signal, "abort");
+  const max = getMaxListeners(signal);
+  return `[apm:abort-debug] ${label}: abortListeners=${listeners.length} maxListeners=${max} aborted=${signal.aborted}`;
+}
+function logAbortSignalStats(signal, label) {
+  if (!isAbortSignalDebugEnabled()) return;
+  console.log(formatAbortSignalStats(signal, label));
+}
+var installed = false;
+function installAbortSignalDebug() {
+  if (!isAbortSignalDebugEnabled() || installed) return;
+  installed = true;
+  const maxFromEnv = Number.parseInt(
+    process.env.APM_ABORT_SIGNAL_MAX_LISTENERS ?? "",
+    10
+  );
+  if (Number.isFinite(maxFromEnv) && maxFromEnv > 0) {
+    setMaxListeners(maxFromEnv);
+    console.log(
+      `[apm:abort-debug] setMaxListeners(${maxFromEnv}) via APM_ABORT_SIGNAL_MAX_LISTENERS`
+    );
+  }
+  process.on("warning", (warning) => {
+    if (warning.name !== "MaxListenersExceededWarning") return;
+    console.warn(`[apm:abort-debug] ${warning.name}: ${warning.message}`);
+    if (warning.stack) {
+      console.warn(warning.stack);
+    }
+  });
+  const proto = AbortSignal.prototype;
+  const original = proto.addEventListener;
+  proto.addEventListener = function(type, listener, options) {
+    if (type === "abort") {
+      const sig = this;
+      const before = getEventListeners(sig, "abort").length;
+      const max = getMaxListeners(sig);
+      const stack = new Error("[apm:abort-debug] addEventListener stack").stack?.split("\n").slice(2, 8).join("\n") ?? "";
+      console.log(
+        `[apm:abort-debug] addEventListener("abort") before=${before} max=${max}
+${stack}`
+      );
+    }
+    return original.call(this, type, listener, options);
+  };
+  console.log(
+    "[apm:abort-debug] \u5DF2\u542F\u7528 AbortSignal \u8C03\u8BD5\uFF08APM_DEBUG_ABORT_SIGNAL\uFF09"
+  );
+}
+
+// src/commands/connect/append-dispatch-response-tool.ts
+function createAppendDispatchResponseTools(cfg, dispatchId) {
+  return {
+    append_dispatch_response: {
+      description: "Append content to the coordinator member dispatch response for the coordinator Agent to read.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          content: { type: "string", description: "Response text to append" }
+        },
+        required: ["content"]
+      },
+      execute: async (args) => {
+        const content = String(args.content ?? "").trim();
+        if (!content) {
+          return "content \u4E0D\u80FD\u4E3A\u7A7A";
+        }
+        const api = createApmApiClient(cfg);
+        await api.cli.appendCoordinatorDispatchResponse({
+          id: dispatchId,
+          content
+        });
+        return `\u5DF2\u8FFD\u52A0\u6D3E\u53D1\u54CD\u5E94\uFF08${content.length} \u5B57\u7B26\uFF09`;
+      }
+    }
+  };
+}
+
 // src/commands/connect/append-message-tool.ts
 function createAppendMessageCustomTools(cfg, messageId) {
   return {
@@ -2734,9 +2922,153 @@ function createAppendMessageCustomTools(cfg, messageId) {
   };
 }
 
+// src/commands/connect/ask-question-tool.ts
+import { randomUUID } from "crypto";
+function createAskQuestionTool(options) {
+  return {
+    description: "Collect structured multiple-choice answers from the user. Use when blocked on a decision that is genuinely the user's to make.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        title: {
+          type: "string",
+          description: "Optional title for the questions form"
+        },
+        questions: {
+          type: "array",
+          minItems: 1,
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "string" },
+              prompt: { type: "string" },
+              allow_multiple: { type: "boolean" },
+              options: {
+                type: "array",
+                minItems: 2,
+                items: {
+                  type: "object",
+                  properties: {
+                    id: { type: "string" },
+                    label: { type: "string" }
+                  },
+                  required: ["id", "label"]
+                }
+              }
+            },
+            required: ["id", "prompt", "options"]
+          }
+        }
+      },
+      required: ["questions"]
+    },
+    execute: async (args) => {
+      const record = args;
+      const questions = record.questions;
+      if (!Array.isArray(questions) || questions.length === 0) {
+        return "questions \u4E0D\u80FD\u4E3A\u7A7A";
+      }
+      const api = createApmApiClient(options.cfg);
+      await api.cli.createCoordinatorDispatchQuestions({
+        dispatchId: options.dispatchId,
+        batchId: randomUUID(),
+        title: typeof record.title === "string" ? record.title : void 0,
+        questions
+      });
+      options.onSubmitted?.();
+      return "\u5DF2\u5411\u7528\u6237\u63D0\u4EA4\u95EE\u9898\uFF0C\u8BF7\u7ED3\u675F\u672C\u8F6E run\uFF0C\u7B49\u5F85\u7528\u6237\u5728\u534F\u8C03\u4F1A\u8BDD\u9875\u56DE\u7B54\u540E\u7EE7\u7EED\u3002";
+    }
+  };
+}
+
+// src/commands/connect/ask-question-tool.mock.ts
+function createAskQuestionMockTool(options) {
+  return {
+    description: "Collect structured multiple-choice answers from the user. Use when blocked on a decision that is genuinely the user's to make.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        title: { type: "string" },
+        questions: {
+          type: "array",
+          minItems: 1,
+          items: {
+            type: "object",
+            properties: {
+              id: { type: "string" },
+              prompt: { type: "string" },
+              allow_multiple: { type: "boolean" },
+              options: {
+                type: "array",
+                minItems: 2,
+                items: {
+                  type: "object",
+                  properties: {
+                    id: { type: "string" },
+                    label: { type: "string" }
+                  },
+                  required: ["id", "label"]
+                }
+              }
+            },
+            required: ["id", "prompt", "options"]
+          }
+        }
+      },
+      required: ["questions"]
+    },
+    execute: async (args) => {
+      const payload = JSON.stringify(args, null, 2);
+      console.log(`[apm] AskQuestion mock \u8C03\u7528:
+${payload}`);
+      options?.onInvoke?.(args);
+      return `[mock] AskQuestion \u5DF2\u8BB0\u5F55\uFF08\u672A\u521B\u5EFA\u4EFB\u52A1\u95EE\u9898\u3001\u672A\u7B49\u5F85\u7528\u6237\u56DE\u7B54\uFF09\u3002\u53C2\u6570:
+${payload}`;
+    }
+  };
+}
+
+// src/commands/connect/cursor-custom-tools.ts
+var PLAN_MODE_ASK_QUESTION_HINT = `[SDK \u73AF\u5883\u8BF4\u660E]
+AskQuestion \u5DF2\u901A\u8FC7 MCP \u670D\u52A1\u5668 custom-user-tools \u6CE8\u518C\uFF0C\u5DE5\u5177\u540D\u4E3A AskQuestion\u3002
+\u9700\u8981\u5411\u7528\u6237\u786E\u8BA4\u65F6\uFF0C\u8BF7\u8C03\u7528 AskQuestion\uFF08\u7ECF CallMcpTool / custom-user-tools\uFF09\uFF0C\u4E0D\u8981\u5047\u8BBE IDE \u5185\u7F6E AskQuestion \u4E0D\u53EF\u7528\u3002
+\u975E\u5FC5\u987B\u7684\u95EE\u9898\u53EF\u8DF3\u8FC7\uFF0C\u76F4\u63A5\u5B8C\u6210 createPlan\u3002`;
+function createCursorCustomTools(cfg, messageId, options) {
+  return {
+    ...createAppendMessageCustomTools(cfg, messageId),
+    AskQuestion: createAskQuestionMockTool({
+      onInvoke: options?.onAskQuestion
+    })
+  };
+}
+function createCursorDispatchCustomTools(cfg, options) {
+  return {
+    ...createAppendDispatchResponseTools(cfg, options.dispatchId),
+    AskQuestion: createAskQuestionTool({
+      cfg,
+      dispatchId: options.dispatchId,
+      onSubmitted: options.onAskQuestionSubmitted
+    })
+  };
+}
+function withPlanModeToolHint(prompt, mode) {
+  if (mode !== "plan") {
+    return prompt;
+  }
+  return `${prompt.trim()}
+
+${PLAN_MODE_ASK_QUESTION_HINT}`;
+}
+
 // src/commands/connect/cursor-agent.ts
 setMaxListeners2(50);
 installAbortSignalDebug();
+var noopRemoteLogSync = {
+  schedule(_session) {
+  },
+  async flush(_session) {
+  }
+};
 var logCtx = (ctx, agentId) => ({
   sessionId: ctx.sessionId,
   messageId: ctx.messageId,
@@ -2760,24 +3092,32 @@ async function obtainAgent(ctx) {
     apiKey: ctx.apiKey,
     model: { id: ctx.model || "default" },
     local: {
-      cwd: ctx.cwd
-    }
+      cwd: ctx.cwd,
+      ...ctx.customTools ? { customTools: ctx.customTools } : {}
+    },
+    ...ctx.mode ? { mode: ctx.mode } : {}
     // mcpServers: createPlaywrightMcpServers(),
   };
-  const savedAgentId = ctx.user ? loadSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user) : void 0;
+  const explicitAgentId = ctx.resumeAgentId?.trim();
+  const savedAgentId = explicitAgentId || (ctx.user ? loadSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user) : void 0);
   if (savedAgentId) {
     try {
       const agent2 = await Agent.resume(savedAgentId, agentOptions);
       console.log(
-        `[apm] \u590D\u7528\u4F1A\u8BDD Agent user=${ctx.user} agentId=${savedAgentId}`
+        `[apm] \u590D\u7528 Agent user=${ctx.user} agentId=${savedAgentId}${explicitAgentId ? "\uFF08\u53C2\u6570\u6307\u5B9A\uFF09" : ""}`
       );
+      if (ctx.user) {
+        saveSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user, agent2.agentId);
+      }
       return { agent: agent2, resumed: true };
     } catch (err) {
       console.warn(
         `[apm] \u590D\u7528 Agent \u5931\u8D25\uFF08agentId=${savedAgentId}\uFF09\uFF0C\u56DE\u9000\u4E3A\u65B0\u5EFA:`,
         err instanceof Error ? err.message : err
       );
-      clearSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user);
+      if (!explicitAgentId && ctx.user) {
+        clearSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user);
+      }
     }
   }
   const agent = await Agent.create(agentOptions);
@@ -2797,7 +3137,10 @@ async function runCursorAgent(cfg, ctx, options) {
     throw new Error("\u7F3A\u5C11 apiKey\uFF0C\u65E0\u6CD5\u8C03\u7528 Cursor SDK");
   }
   const workdir = resolveWorkdirPath(ctx.workdir);
-  const prompt = ctx.prompt;
+  const customTools = options?.customTools ?? createCursorCustomTools(cfg, ctx.messageId, {
+    onAskQuestion: options?.onAskQuestion
+  });
+  const prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
   console.log(
     `[apm] Cursor Agent \u5F00\u59CB messageId=${ctx.messageId} sessionId=${ctx.sessionId} cwd=${workdir}`
   );
@@ -2807,13 +3150,15 @@ async function runCursorAgent(cfg, ctx, options) {
     cwd: workdir,
     workdir,
     sessionId: ctx.sessionId,
-    user: ctx.user
+    user: ctx.user,
+    mode: ctx.mode,
+    resumeAgentId: ctx.resumeAgentId,
+    customTools
   });
   const eventSession = new EventSession(prompt);
-  const remoteLogCtx = logCtx(ctx, agent.agentId);
-  const syncRemoteLog = createThrottledCursorMessageLogSync(
+  const syncRemoteLog = options?.skipRemoteLogSync ? noopRemoteLogSync : createThrottledCursorMessageLogSync(
     cfg,
-    remoteLogCtx,
+    logCtx(ctx, agent.agentId),
     (err) => {
       console.warn(
         "[apm] \u540C\u6B65 Cursor \u6D88\u606F\u65E5\u5FD7\u5931\u8D25:",
@@ -2830,9 +3175,11 @@ async function runCursorAgent(cfg, ctx, options) {
   logAbortSignalStats(signal, "runCursorAgent:after-addListener");
   try {
     const run = await agent.send(prompt, {
+      ...ctx.mode ? { mode: ctx.mode } : {},
       // mcpServers: createPlaywrightMcpServers(),
       local: {
-        customTools: createAppendMessageCustomTools(cfg, ctx.messageId)
+        ...options?.forceSend ? { force: true } : {},
+        customTools
       }
     });
     activeRun = run;
@@ -2853,6 +3200,7 @@ async function runCursorAgent(cfg, ctx, options) {
           );
         }
       }
+      options?.onStreamEvent?.(event);
       eventSession.addEvent(event);
       syncRemoteLog.schedule(eventSession);
     }
@@ -2873,6 +3221,32 @@ async function runCursorAgent(cfg, ctx, options) {
       throw new Error(`Cursor run \u5DF2\u53D6\u6D88: ${result.id}`);
     }
     console.log(`[apm] Cursor Agent \u5B8C\u6210 messageId=${ctx.messageId}`);
+    const artifacts = await agent.listArtifacts().catch(() => []);
+    const artifactDocuments = [];
+    for (const artifact of artifacts) {
+      try {
+        const content = (await agent.downloadArtifact(artifact.path)).toString(
+          "utf8"
+        );
+        artifactDocuments.push({ path: artifact.path, content });
+      } catch (err) {
+        console.warn(
+          `[apm] \u8BFB\u53D6\u4EA7\u7269\u5931\u8D25 path=${artifact.path}:`,
+          err instanceof Error ? err.message : err
+        );
+      }
+    }
+    return {
+      runId: result.id,
+      agentId: agent.agentId,
+      status: result.status,
+      result: result.result,
+      durationMs: result.durationMs,
+      assistantText: eventSession.getAssistantText(),
+      createPlan: eventSession.getCreatePlanContent(),
+      artifacts,
+      artifactDocuments
+    };
   } catch (err) {
     if (err instanceof CursorAgentError) {
       if (resumed) {
@@ -2891,6 +3265,79 @@ async function runCursorAgent(cfg, ctx, options) {
   }
 }
 
+// src/commands/connect/coordinator-dispatch-handler.ts
+async function handleInboundCoordinatorDispatch(cfg, msg, signal) {
+  const workdir = requireRemoteWorkdir(msg.workdir);
+  assertApmGitignoredInRepo(workdir);
+  await ensureWorkspaceInitialized(workdir);
+  const api = createApmApiClient(cfg);
+  let askQuestionSubmitted = false;
+  try {
+    await api.cli.updateCoordinatorDispatchStatus({
+      id: msg.dispatchId,
+      status: "DISPATCHING"
+    });
+    const result = await runCursorAgent(
+      cfg,
+      {
+        messageId: msg.dispatchId,
+        sessionId: msg.dispatchSessionId,
+        prompt: msg.content,
+        model: msg.model,
+        apiKey: msg.apiKey,
+        workdir: msg.workdir,
+        user: msg.user,
+        mode: msg.mode,
+        resumeAgentId: msg.type === "coordinator_dispatch_resume" ? msg.resumeAgentId : msg.resumeAgentId
+      },
+      {
+        signal,
+        forceSend: true,
+        skipRemoteLogSync: true,
+        customTools: createCursorDispatchCustomTools(cfg, {
+          dispatchId: msg.dispatchId,
+          onAskQuestionSubmitted: () => {
+            askQuestionSubmitted = true;
+          }
+        })
+      }
+    );
+    if (askQuestionSubmitted) {
+      if (result.agentId) {
+        await api.cli.completeCoordinatorDispatch({
+          id: msg.dispatchId,
+          agentId: result.agentId
+        });
+      }
+      console.log(
+        `[apm] \u534F\u8C03\u6D3E\u53D1 ${msg.dispatchId} \u5DF2\u63D0\u4EA4 AskQuestion\uFF0C\u7B49\u5F85\u7528\u6237\u7B54\u9898`
+      );
+      return;
+    }
+    await api.cli.completeCoordinatorDispatch({
+      id: msg.dispatchId,
+      agentId: result.agentId,
+      createPlan: result.createPlan,
+      artifacts: result.artifactDocuments.map((doc) => ({
+        name: doc.path.split("/").pop() ?? doc.path,
+        content: doc.content
+      })),
+      status: "SUCCESS"
+    });
+    console.log(`[apm] \u534F\u8C03\u6D3E\u53D1\u5B8C\u6210 dispatchId=${msg.dispatchId}`);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    console.error(`[apm] \u534F\u8C03\u6D3E\u53D1\u5931\u8D25 dispatchId=${msg.dispatchId}:`, message);
+    if (!askQuestionSubmitted) {
+      await api.cli.completeCoordinatorDispatch({
+        id: msg.dispatchId,
+        status: "FAILED",
+        error: message
+      });
+    }
+  }
+}
+
 // src/commands/connect/cli-version-sync.ts
 import { existsSync as existsSync12, readFileSync as readFileSync11, writeFileSync as writeFileSync11 } from "fs";
 import { join as join14 } from "path";
@@ -3266,6 +3713,27 @@ async function runConnect(options) {
         });
         return;
       }
+      if (validated.data.type === "coordinator_dispatch" || validated.data.type === "coordinator_dispatch_resume") {
+        const msg2 = validated.data;
+        const perDispatchController = new AbortController();
+        const signal2 = AbortSignal.any([
+          shutdownAbort.signal,
+          perDispatchController.signal
+        ]);
+        const task2 = (async () => {
+          await runSlots.acquire();
+          try {
+            await handleInboundCoordinatorDispatch(cfg, msg2, signal2);
+          } finally {
+            runSlots.release();
+          }
+        })();
+        activeTasks.add(task2);
+        void task2.finally(() => {
+          activeTasks.delete(task2);
+        });
+        return;
+      }
       if (validated.data.type !== "message") {
         return;
       }
@@ -4403,14 +4871,12 @@ function buildClearRemoteDirExceptZipCommand(target) {
   const script = [
     `T=${quotedTarget}`,
     "S=$(mktemp -d)",
-    'while IFS= read -r -d "" z; do',
-    'r="${z#${T}/}"',
+    'while IFS= read -r -d "" z; do r="${z#${T}/}"',
     'mkdir -p "${S}/$(dirname "$r")"',
     'mv "$z" "${S}/${r}"',
     'done < <(find "$T" -mindepth 1 -type f -iname "*.zip" -print0)',
     'rm -rf "${T}"/*',
-    'while IFS= read -r -d "" r; do',
-    'r="${r#./}"',
+    'while IFS= read -r -d "" r; do r="${r#./}"',
     'mkdir -p "${T}/$(dirname "$r")"',
     'mv "${S}/${r}" "${T}/${r}"',
     'done < <(cd "$S" 2>/dev/null && find . -type f -print0)',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.63",
+  "version": "6.0.64",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,
@@ -15,6 +15,7 @@
   ],
   "scripts": {
     "build": "rm -rf dist && esbuild src/index.ts --bundle --platform=node --format=esm --packages=external --outfile=dist/index.js && tsc --noEmit -p tsconfig.json",
+    "test:plan-cursor": "esbuild scripts/test-plan-cursor.ts --bundle --platform=node --format=esm --packages=external --outfile=dist/test-plan-cursor.mjs && node dist/test-plan-cursor.mjs",
     "prepublishOnly": "npm run build"
   },
   "devDependencies": {