ai-project-manage-cli 7.1.1 → 7.1.3

package/dist/index.js

@@ -449,6 +449,22 @@ var requestConfig = {
       method: "PUT",
       path: "/cli/webide/message-logs"
     }),
+    webideReplaceAssumptions: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/assumptions"
+    }),
+    webideListAssumptions: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/assumptions"
+    }),
+    webideRecommendPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan-recommendation"
+    }),
+    webideUpsertPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan"
+    }),
     branchBaseline: defineEndpoint({
       method: "GET",
       path: "/cli/tasks/branch-baseline"
@@ -2719,13 +2735,32 @@ function validateSessionCacheCleanupPush(o) {
     }
   };
 }
+function validateWebIdeCacheCleanupPush(o) {
+  if (o.type !== "webide-cache-cleanup") {
+    return { ok: false, reason: "\u671F\u671B webide-cache-cleanup" };
+  }
+  if (!nonEmptyString(o.taskId)) {
+    return { ok: false, reason: "webide-cache-cleanup \u7F3A\u5C11 taskId" };
+  }
+  if (!nonEmptyString(o.workdir)) {
+    return { ok: false, reason: "webide-cache-cleanup \u7F3A\u5C11 workdir" };
+  }
+  return {
+    ok: true,
+    data: {
+      type: "webide-cache-cleanup",
+      taskId: o.taskId.trim(),
+      workdir: o.workdir.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 !== "webide-message" && type !== "cancel" && type !== "deploy" && type !== "session-cache-cleanup") {
+  if (type !== "heartbeat" && type !== "message" && type !== "webide-message" && type !== "cancel" && type !== "deploy" && type !== "session-cache-cleanup" && type !== "webide-cache-cleanup") {
     return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
   }
   if (kind === "heartbeat" || type === "heartbeat") {
@@ -2740,6 +2775,9 @@ function validateAgentWsMessage(value, kind) {
   if (type === "session-cache-cleanup") {
     return validateSessionCacheCleanupPush(o);
   }
+  if (type === "webide-cache-cleanup") {
+    return validateWebIdeCacheCleanupPush(o);
+  }
   if (type === "webide-message") {
     return validateWebIdeMessagePush(o);
   }
@@ -3194,14 +3232,14 @@ var MinioClient = class {
   async deleteObjectsByPrefix(bucket, prefix) {
     const objectsStream = this.inner.listObjectsV2(bucket, prefix, true);
     const keys = [];
-    await new Promise((resolve6, reject) => {
+    await new Promise((resolve7, reject) => {
       objectsStream.on("data", (obj) => {
         if (obj.name) {
           keys.push(obj.name);
         }
       });
       objectsStream.on("error", reject);
-      objectsStream.on("end", resolve6);
+      objectsStream.on("end", resolve7);
     });
     const chunkSize = 500;
     for (let i = 0; i < keys.length; i += chunkSize) {
@@ -4661,7 +4699,7 @@ function buildSftpConnectOptions(settings) {
   };
 }
 async function sleep(ms) {
-  await new Promise((resolve6) => setTimeout(resolve6, ms));
+  await new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 async function uploadZipWithRetry(settings, localZip, remoteZipPath) {
   let lastError;
@@ -4705,7 +4743,7 @@ async function ensureRemoteDir(sftp, dir) {
   }
 }
 function execCommand(client, command) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     client.exec(command, (err, stream) => {
       if (err) return reject(err);
       let stdout = "";
@@ -4715,7 +4753,7 @@ function execCommand(client, command) {
           reject(new Error(`\u8FDC\u7A0B\u547D\u4EE4\u5931\u8D25 (${code}): ${stderr || stdout}`));
           return;
         }
-        resolve6(stdout);
+        resolve7(stdout);
       }).on("data", (data) => {
         stdout += data.toString();
       });
@@ -5190,8 +5228,8 @@ function springbootOutputIndicatesSuccess(action, combined) {
 async function connectSsh(config) {
   const client = new Client2();
   log(`\u8FDE\u63A5\u670D\u52A1\u5668 ${config.username}@${config.host}:${config.port}`);
-  await new Promise((resolve6, reject) => {
-    client.on("ready", () => resolve6()).on("error", (err) => reject(err)).connect({
+  await new Promise((resolve7, reject) => {
+    client.on("ready", () => resolve7()).on("error", (err) => reject(err)).connect({
       host: config.host,
       port: config.port,
       username: config.username,
@@ -5259,7 +5297,7 @@ async function runRemoteCommand(client, command, options) {
   const check = options?.check ?? true;
   const stream = options?.stream ?? false;
   const label = options?.label ?? "\u8FDC\u7A0B\u547D\u4EE4";
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     client.exec(command, (err, execStream) => {
       if (err) {
         reject(err);
@@ -5289,7 +5327,7 @@ ${errText}`.trim();
 \u8F93\u51FA: ${combined}` : "")
           );
         }
-        resolve6({ exitCode: code, out: out.trim(), err: errText.trim() });
+        resolve7({ exitCode: code, out: out.trim(), err: errText.trim() });
       });
     });
   });
@@ -6164,6 +6202,24 @@ function cleanSessionWorkspaceCache(sessionId, workdir) {
   clearPreStepCacheForSession(trimmedSessionId, trimmedWorkdir);
 }
 
+// src/commands/clean-webide-cache.ts
+import { existsSync as existsSync22, rmSync as rmSync5 } from "node:fs";
+import { resolve as resolve5 } from "node:path";
+function cleanWebIdeWorkspaceCache(taskId, workdir) {
+  const trimmedTaskId = taskId.trim();
+  const trimmedWorkdir = workdir.trim();
+  if (!trimmedTaskId || !trimmedWorkdir) {
+    return;
+  }
+  const dir = resolve5(trimmedWorkdir, ".apm", "webide", trimmedTaskId);
+  if (existsSync22(dir)) {
+    rmSync5(dir, { recursive: true, force: true });
+    console.log(`[apm] \u5DF2\u6E05\u7406 WebIDE \u7F13\u5B58 ${dir}`);
+  } else {
+    console.log(`[apm] WebIDE \u7F13\u5B58\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7 ${dir}`);
+  }
+}
+
 // src/commands/connect/abort-signal-debug.ts
 import {
   getEventListeners,
@@ -6256,6 +6312,16 @@ function formatPlanMarkdown(raw) {
 }
 
 // src/session-utils.ts
+function serializeTokenUsage(usage) {
+  return {
+    inputTokens: usage.inputTokens,
+    outputTokens: usage.outputTokens,
+    cacheReadTokens: usage.cacheReadTokens,
+    cacheWriteTokens: usage.cacheWriteTokens,
+    totalTokens: usage.totalTokens,
+    ...usage.reasoningTokens != null ? { reasoningTokens: usage.reasoningTokens } : {}
+  };
+}
 var EventSession = class {
   events = [];
   dirtyIndices = /* @__PURE__ */ new Set();
@@ -6294,7 +6360,7 @@ var EventSession = class {
     if (formatedEvent.type === "status") {
       return;
     }
-    if (formatedEvent.type === "request") {
+    if (formatedEvent.type === "request" || formatedEvent.type === "usage") {
       this.events.push(formatedEvent);
       this.markDirty(this.events.length - 1);
       return;
@@ -6318,6 +6384,16 @@ var EventSession = class {
     this.events.push(formatedEvent);
     this.markDirty(this.events.length - 1);
   }
+  /** 写入 run.wait() 返回的累计 TokenUsage（整次 run 汇总） */
+  addRunUsage(usage, options) {
+    this.events.push({
+      type: "usage",
+      scope: "run",
+      usage: serializeTokenUsage(usage),
+      ...options?.durationMs != null ? { durationMs: options.durationMs } : {}
+    });
+    this.markDirty(this.events.length - 1);
+  }
   formatEvent(event) {
     switch (event.type) {
       case "assistant": {
@@ -6352,6 +6428,12 @@ var EventSession = class {
           status: event.status,
           text: event.text
         };
+      case "usage":
+        return {
+          type: "usage",
+          scope: "turn",
+          usage: serializeTokenUsage(event.usage)
+        };
       case "request":
         return {
           ...event,
@@ -6426,6 +6508,16 @@ ${String(event.content ?? "")}
   if (type === "tool_call") {
     return "````toolcall\n" + JSON.stringify(event, null, 2) + "\n````\n";
   }
+  if (type === "usage") {
+    const usage = event.usage;
+    const scope = event.scope === "run" ? "\u7D2F\u8BA1" : "\u672C\u8F6E";
+    return `## Token \u4F7F\u7528\u91CF\uFF08${scope}\uFF09
+
+\`\`\`json
+${JSON.stringify(usage ?? event, null, 2)}
+\`\`\`
+`;
+  }
   return `## \u672A\u77E5\u4E8B\u4EF6\uFF1A${type}
 
 \`\`\`json
@@ -6434,13 +6526,13 @@ ${JSON.stringify(event, null, 2)}
 }
 
 // src/commands/connect/agent-session-registry.ts
-import { existsSync as existsSync22, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
-import { dirname as dirname6, resolve as resolve5 } from "node:path";
+import { existsSync as existsSync23, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync14 } from "node:fs";
+import { dirname as dirname6, resolve as resolve6 } from "node:path";
 function registryPath(workdir, sessionId) {
-  return resolve5(workdir, ".apm", "sessions", sessionId, "cursor-agents.json");
+  return resolve6(workdir, ".apm", "sessions", sessionId, "cursor-agents.json");
 }
 function readRegistry(path19) {
-  if (!existsSync22(path19)) {
+  if (!existsSync23(path19)) {
     return {};
   }
   try {
@@ -6600,51 +6692,124 @@ function createAppendMessageCustomTools(cfg, messageId, appendContent) {
 }
 
 // src/commands/connect/ask-question-tool.ts
-function createAskQuestionMockTool(options) {
+var INPUT_SCHEMA = {
+  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"]
+};
+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: INPUT_SCHEMA,
+    execute: async (args) => {
+      options?.onInvoke?.(args);
+      if (options?.execute) {
+        return options.execute(args);
+      }
+      const payload = JSON.stringify(args, null, 2);
+      console.log(`[apm] AskQuestion\uFF08\u672C\u5730\u5360\u4F4D\uFF0C\u672A\u7B49\u5F85\u7528\u6237\uFF09:
+${payload}`);
+      return `[local] 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/webide-plan-tools.ts
+function asString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function createRecommendPlanTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Recommend whether the human should write an implementation plan or skip it. Does not change workflow phase; the human decides in the WebIDE UI.",
     inputSchema: {
       type: "object",
       properties: {
-        title: {
+        recommendation: {
           type: "string",
-          description: "Optional title for the questions form"
+          enum: ["write", "skip", "unknown"],
+          description: "write = suggest generating a plan; skip = plan optional/unnecessary; unknown = unsure"
         },
-        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"]
-          }
+        reason: {
+          type: "string",
+          description: "Short Chinese reason for the recommendation"
         }
       },
-      required: ["questions"]
+      required: ["recommendation"]
     },
     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}`;
+      const raw = asString(args.recommendation);
+      const recommendation = raw === "write" || raw === "skip" || raw === "unknown" ? raw : "unknown";
+      const reason = asString(args.reason) || void 0;
+      const api = createApmApiClient(cfg);
+      await api.cli.webideRecommendPlan({
+        taskId,
+        recommendation,
+        reason
+      });
+      console.log(
+        `[apm] RecommendPlan taskId=${taskId} recommendation=${recommendation}`
+      );
+      return JSON.stringify({ ok: true, recommendation, reason }, null, 2);
+    }
+  };
+}
+function createUpsertWebIdePlanTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Persist the implementation plan markdown for this WebIDE task and mark the plan as ready for human confirmation. Call once with the full plan document.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        content: {
+          type: "string",
+          description: "Full implementation plan in Markdown (Chinese)"
+        }
+      },
+      required: ["content"]
+    },
+    execute: async (args) => {
+      const content = asString(args.content);
+      if (!content) {
+        throw new Error("UpsertWebIdePlan \u7F3A\u5C11 content");
+      }
+      const api = createApmApiClient(cfg);
+      await api.cli.webideUpsertPlan({ taskId, content });
+      console.log(
+        `[apm] UpsertWebIdePlan taskId=${taskId} chars=${content.length}`
+      );
+      return JSON.stringify({ ok: true, chars: content.length }, null, 2);
     }
   };
 }
@@ -6655,16 +6820,28 @@ AskQuestion \u5DF2\u901A\u8FC7 MCP \u670D\u52A1\u5668 custom-user-tools \u6CE8\u
 \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 {
+  const tools = {
     ...createAppendMessageCustomTools(
       cfg,
       messageId,
       options?.appendMessageContent
     ),
-    AskQuestion: createAskQuestionMockTool({
-      onInvoke: options?.onAskQuestion
+    AskQuestion: createAskQuestionTool({
+      onInvoke: options?.onAskQuestion,
+      execute: options?.askQuestionExecute
     })
   };
+  if (options?.enableWebIdePlanTools && options.taskId) {
+    tools.RecommendPlan = createRecommendPlanTool({
+      cfg,
+      taskId: options.taskId
+    });
+    tools.UpsertWebIdePlan = createUpsertWebIdePlanTool({
+      cfg,
+      taskId: options.taskId
+    });
+  }
+  return tools;
 }
 function withPlanModeToolHint(prompt, mode) {
   if (mode !== "plan") {
@@ -6676,7 +6853,7 @@ ${PLAN_MODE_ASK_QUESTION_HINT}`;
 }
 
 // src/commands/connect/cursor-agent.ts
-setMaxListeners2(50);
+setMaxListeners2(100);
 installAbortSignalDebug();
 var noopRemoteLogSync = {
   schedule(_session) {
@@ -6754,7 +6931,10 @@ async function runCursorAgent(cfg, ctx, options) {
   const workdir = resolveWorkdirPath(ctx.workdir);
   const customTools = createCursorCustomTools(cfg, ctx.messageId, {
     onAskQuestion: options?.onAskQuestion,
-    appendMessageContent: options?.appendMessageContent
+    appendMessageContent: options?.appendMessageContent,
+    askQuestionExecute: options?.askQuestionExecute,
+    enableWebIdePlanTools: options?.enableWebIdePlanTools,
+    taskId: options?.taskId
   });
   const prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
   console.log(
@@ -6823,6 +7003,15 @@ async function runCursorAgent(cfg, ctx, options) {
     }
     await syncRemoteLog.flush(eventSession);
     const result = await run.wait();
+    if (result.usage) {
+      eventSession.addRunUsage(result.usage, {
+        durationMs: result.durationMs
+      });
+      await syncRemoteLog.flush(eventSession);
+      console.log(
+        `[apm] Cursor usage total=${result.usage.totalTokens} in=${result.usage.inputTokens} out=${result.usage.outputTokens} cache=${result.usage.cacheReadTokens}/${result.usage.cacheWriteTokens}`
+      );
+    }
     if (result.status === "error") {
       const failureMessage = formatCursorRunFailure(result.id, {
         statusError: lastRunErrorStatus,
@@ -6859,6 +7048,7 @@ async function runCursorAgent(cfg, ctx, options) {
       status: result.status,
       result: result.result,
       durationMs: result.durationMs,
+      usage: result.usage,
       assistantText: eventSession.getAssistantText(),
       createPlan: eventSession.getCreatePlanContent(),
       artifacts,
@@ -6919,7 +7109,7 @@ async function ensureMessageHasReply(cfg, sessionId, messageId, fallback) {
 }
 
 // src/commands/connect/cli-version-sync.ts
-import { existsSync as existsSync23, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
+import { existsSync as existsSync24, readFileSync as readFileSync17, writeFileSync as writeFileSync15 } from "fs";
 import { join as join18 } from "path";
 var CLI_VERSION_FILE = ".cli-version.json";
 function manifestPath(apmDir) {
@@ -6927,7 +7117,7 @@ function manifestPath(apmDir) {
 }
 function loadManifest4(apmDir) {
   const path19 = toFsPath(manifestPath(apmDir));
-  if (!existsSync23(path19)) {
+  if (!existsSync24(path19)) {
     return null;
   }
   try {
@@ -6997,7 +7187,7 @@ function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT, options = {})
       );
     }
     const queuedAt = Date.now();
-    return new Promise((resolve6) => {
+    return new Promise((resolve7) => {
       waiters.push(() => {
         active += 1;
         const waitedMs = Date.now() - queuedAt;
@@ -7008,7 +7198,7 @@ function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT, options = {})
             )}s\uFF0C\u5F53\u524D\u5360\u7528 ${active}/${maxConcurrent}`
           );
         }
-        resolve6();
+        resolve7();
       });
     });
   };
@@ -7038,19 +7228,22 @@ function spawnWebIdeMessageWorker(cfg, msg) {
     workerData: { cfg, msg }
   });
   let resolveDone;
-  const done = new Promise((resolve6) => {
-    resolveDone = resolve6;
+  const done = new Promise((resolve7) => {
+    resolveDone = resolve7;
   });
-  worker.on("message", (m) => {
-    if (m?.type === "done" || m?.type === "error") {
-      if (m.type === "error") {
-        console.error(
-          `[apm] webide worker error messageId=${m.messageId}: ${m.error}`
-        );
+  worker.on(
+    "message",
+    (m) => {
+      if (m?.type === "done" || m?.type === "error") {
+        if (m.type === "error") {
+          console.error(
+            `[apm] webide worker error messageId=${m.messageId}: ${m.error}`
+          );
+        }
+        void worker.terminate().finally(() => resolveDone());
       }
-      void worker.terminate().finally(() => resolveDone());
     }
-  });
+  );
   worker.on("error", (err) => {
     console.error("[apm] webide worker crashed:", err);
     resolveDone();
@@ -7061,7 +7254,6 @@ function spawnWebIdeMessageWorker(cfg, msg) {
     }
     resolveDone();
   });
-  worker.postMessage({ type: "run", cfg, msg });
   return {
     cancel(messageId) {
       worker.postMessage({ type: "cancel", messageId });
@@ -7228,11 +7420,11 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
 }
 function interruptibleSleep(ms, signal) {
   if (signal.aborted) return Promise.resolve();
-  return new Promise((resolve6) => {
-    const timer = setTimeout(resolve6, ms);
+  return new Promise((resolve7) => {
+    const timer = setTimeout(resolve7, ms);
     const onAbort = () => {
       clearTimeout(timer);
-      resolve6();
+      resolve7();
     };
     signal.addEventListener("abort", onAbort, { once: true });
   });
@@ -7324,6 +7516,18 @@ function attachWsHandlers(ws, ctx, onOpen) {
       });
       return;
     }
+    if (validated.data.type === "webide-cache-cleanup") {
+      const msg2 = validated.data;
+      const task2 = (async () => {
+        const workdir = requireRemoteWorkdir(msg2.workdir);
+        cleanWebIdeWorkspaceCache(msg2.taskId, workdir);
+      })();
+      activeTasks.add(task2);
+      void task2.finally(() => {
+        activeTasks.delete(task2);
+      });
+      return;
+    }
     if (validated.data.type === "webide-message") {
       const msg2 = validated.data;
       const perMessageController2 = new AbortController();
@@ -7412,7 +7616,7 @@ function attachWsHandlers(ws, ctx, onOpen) {
   });
 }
 function connectOnce(url, ctx, connectionAbort, onConnected) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve7, reject) => {
     const ws = new WebSocket(url);
     let stopHeartbeat;
     let settled = false;
@@ -7441,7 +7645,7 @@ function connectOnce(url, ctx, connectionAbort, onConnected) {
         finish(() => reject(new Error("shutdown")));
         return;
       }
-      finish(resolve6);
+      finish(resolve7);
     });
     ws.on("error", (err) => {
       console.error("[apm] WebSocket \u9519\u8BEF:", err.message);
@@ -7838,7 +8042,7 @@ import path15 from "node:path";
 import Docker from "dockerode";
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/connection-options.ts
-import { existsSync as existsSync24, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync25, readFileSync as readFileSync18 } from "node:fs";
 import path12 from "node:path";
 function asOptionalTlsBuffer(value) {
   if (typeof value !== "string") {
@@ -7850,7 +8054,7 @@ function asOptionalTlsBuffer(value) {
   if (normalized === "") {
     return void 0;
   }
-  if (existsSync24(normalized)) {
+  if (existsSync25(normalized)) {
     return readFileSync18(normalized);
   }
   const looksLikePath = /[\\/]/.test(normalized) || normalized.endsWith(".pem");
@@ -7976,17 +8180,17 @@ var DockerodeClient = class {
     await this.client.getImage(image).remove({ force: true });
   }
   async pullImage(image, auth) {
-    const stream = await new Promise((resolve6, reject) => {
+    const stream = await new Promise((resolve7, reject) => {
       const pullOptions = auth ? { authconfig: auth } : void 0;
       this.client.pull(image, pullOptions, (err, output) => {
         if (err || !output) {
           reject(err ?? new Error("docker pull \u8FD4\u56DE\u7A7A\u8F93\u51FA"));
           return;
         }
-        resolve6(output);
+        resolve7(output);
       });
     });
-    await new Promise((resolve6, reject) => {
+    await new Promise((resolve7, reject) => {
       this.client.modem.followProgress(
         stream,
         (err) => {
@@ -7994,7 +8198,7 @@ var DockerodeClient = class {
             reject(err);
             return;
           }
-          resolve6();
+          resolve7();
         },
         () => void 0
       );
@@ -8061,7 +8265,7 @@ var DockerodeClient = class {
 var createDockerodeClient = (config) => new DockerodeClient(config);
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/env.ts
-import { existsSync as existsSync25, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
+import { existsSync as existsSync26, readFileSync as readFileSync19, statSync as statSync10 } from "node:fs";
 import path13 from "node:path";
 function stripSurroundingQuotes(value) {
   const t = value.trim();
@@ -8078,7 +8282,7 @@ function loadEnvFromFile(envFilePath) {
     return {};
   }
   const targetPath = path13.resolve(envFilePath);
-  if (!existsSync25(targetPath) || !statSync10(targetPath).isFile()) {
+  if (!existsSync26(targetPath) || !statSync10(targetPath).isFile()) {
     return {};
   }
   const raw = readFileSync19(targetPath, "utf-8");
@@ -8252,12 +8456,12 @@ function dockerPushImage(params, cwd) {
 }
 
 // src/commands/deploy/internal/backend-deploy/resolve-dockerfile.ts
-import { existsSync as existsSync26 } from "node:fs";
+import { existsSync as existsSync27 } from "node:fs";
 import path14 from "node:path";
 function resolveDockerBuildPaths(cwd) {
   const dockerfilePath = path14.join(cwd, "Dockerfile");
   Logger.info(`\u67E5\u627EDockerfile\u6587\u4EF6\uFF0C\u8DEF\u5F84: ${dockerfilePath}`);
-  if (!existsSync26(dockerfilePath)) {
+  if (!existsSync27(dockerfilePath)) {
     throw new Error(`Dockerfile \u4E0D\u5B58\u5728\uFF1A${dockerfilePath}`);
   }
   Logger.info("\u2713 Dockerfile \u5B58\u5728");

package/dist/webide-message-worker.js

@@ -80,6 +80,22 @@ var requestConfig = {
       method: "PUT",
       path: "/cli/webide/message-logs"
     }),
+    webideReplaceAssumptions: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/assumptions"
+    }),
+    webideListAssumptions: defineEndpoint({
+      method: "GET",
+      path: "/cli/webide/assumptions"
+    }),
+    webideRecommendPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan-recommendation"
+    }),
+    webideUpsertPlan: defineEndpoint({
+      method: "PUT",
+      path: "/cli/webide/plan"
+    }),
     branchBaseline: defineEndpoint({
       method: "GET",
       path: "/cli/tasks/branch-baseline"
@@ -281,6 +297,16 @@ function formatPlanMarkdown(raw) {
 }
 
 // src/session-utils.ts
+function serializeTokenUsage(usage) {
+  return {
+    inputTokens: usage.inputTokens,
+    outputTokens: usage.outputTokens,
+    cacheReadTokens: usage.cacheReadTokens,
+    cacheWriteTokens: usage.cacheWriteTokens,
+    totalTokens: usage.totalTokens,
+    ...usage.reasoningTokens != null ? { reasoningTokens: usage.reasoningTokens } : {}
+  };
+}
 var EventSession = class {
   events = [];
   dirtyIndices = /* @__PURE__ */ new Set();
@@ -319,7 +345,7 @@ var EventSession = class {
     if (formatedEvent.type === "status") {
       return;
     }
-    if (formatedEvent.type === "request") {
+    if (formatedEvent.type === "request" || formatedEvent.type === "usage") {
       this.events.push(formatedEvent);
       this.markDirty(this.events.length - 1);
       return;
@@ -343,6 +369,16 @@ var EventSession = class {
     this.events.push(formatedEvent);
     this.markDirty(this.events.length - 1);
   }
+  /** 写入 run.wait() 返回的累计 TokenUsage（整次 run 汇总） */
+  addRunUsage(usage, options) {
+    this.events.push({
+      type: "usage",
+      scope: "run",
+      usage: serializeTokenUsage(usage),
+      ...options?.durationMs != null ? { durationMs: options.durationMs } : {}
+    });
+    this.markDirty(this.events.length - 1);
+  }
   formatEvent(event) {
     switch (event.type) {
       case "assistant": {
@@ -377,6 +413,12 @@ var EventSession = class {
           status: event.status,
           text: event.text
         };
+      case "usage":
+        return {
+          type: "usage",
+          scope: "turn",
+          usage: serializeTokenUsage(event.usage)
+        };
       case "request":
         return {
           ...event,
@@ -451,6 +493,16 @@ ${String(event.content ?? "")}
   if (type === "tool_call") {
     return "````toolcall\n" + JSON.stringify(event, null, 2) + "\n````\n";
   }
+  if (type === "usage") {
+    const usage = event.usage;
+    const scope = event.scope === "run" ? "\u7D2F\u8BA1" : "\u672C\u8F6E";
+    return `## Token \u4F7F\u7528\u91CF\uFF08${scope}\uFF09
+
+\`\`\`json
+${JSON.stringify(usage ?? event, null, 2)}
+\`\`\`
+`;
+  }
   return `## \u672A\u77E5\u4E8B\u4EF6\uFF1A${type}
 
 \`\`\`json
@@ -883,51 +935,124 @@ function createAppendMessageCustomTools(cfg, messageId, appendContent2) {
 }
 
 // src/commands/connect/ask-question-tool.ts
-function createAskQuestionMockTool(options) {
+var INPUT_SCHEMA = {
+  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"]
+};
+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: INPUT_SCHEMA,
+    execute: async (args) => {
+      options?.onInvoke?.(args);
+      if (options?.execute) {
+        return options.execute(args);
+      }
+      const payload = JSON.stringify(args, null, 2);
+      console.log(`[apm] AskQuestion\uFF08\u672C\u5730\u5360\u4F4D\uFF0C\u672A\u7B49\u5F85\u7528\u6237\uFF09:
+${payload}`);
+      return `[local] 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/webide-plan-tools.ts
+function asString(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function createRecommendPlanTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Recommend whether the human should write an implementation plan or skip it. Does not change workflow phase; the human decides in the WebIDE UI.",
     inputSchema: {
       type: "object",
       properties: {
-        title: {
+        recommendation: {
           type: "string",
-          description: "Optional title for the questions form"
+          enum: ["write", "skip", "unknown"],
+          description: "write = suggest generating a plan; skip = plan optional/unnecessary; unknown = unsure"
         },
-        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"]
-          }
+        reason: {
+          type: "string",
+          description: "Short Chinese reason for the recommendation"
         }
       },
-      required: ["questions"]
+      required: ["recommendation"]
     },
     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}`;
+      const raw = asString(args.recommendation);
+      const recommendation = raw === "write" || raw === "skip" || raw === "unknown" ? raw : "unknown";
+      const reason = asString(args.reason) || void 0;
+      const api = createApmApiClient(cfg);
+      await api.cli.webideRecommendPlan({
+        taskId,
+        recommendation,
+        reason
+      });
+      console.log(
+        `[apm] RecommendPlan taskId=${taskId} recommendation=${recommendation}`
+      );
+      return JSON.stringify({ ok: true, recommendation, reason }, null, 2);
+    }
+  };
+}
+function createUpsertWebIdePlanTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Persist the implementation plan markdown for this WebIDE task and mark the plan as ready for human confirmation. Call once with the full plan document.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        content: {
+          type: "string",
+          description: "Full implementation plan in Markdown (Chinese)"
+        }
+      },
+      required: ["content"]
+    },
+    execute: async (args) => {
+      const content = asString(args.content);
+      if (!content) {
+        throw new Error("UpsertWebIdePlan \u7F3A\u5C11 content");
+      }
+      const api = createApmApiClient(cfg);
+      await api.cli.webideUpsertPlan({ taskId, content });
+      console.log(
+        `[apm] UpsertWebIdePlan taskId=${taskId} chars=${content.length}`
+      );
+      return JSON.stringify({ ok: true, chars: content.length }, null, 2);
     }
   };
 }
@@ -938,16 +1063,28 @@ AskQuestion \u5DF2\u901A\u8FC7 MCP \u670D\u52A1\u5668 custom-user-tools \u6CE8\u
 \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 {
+  const tools = {
     ...createAppendMessageCustomTools(
       cfg,
       messageId,
       options?.appendMessageContent
     ),
-    AskQuestion: createAskQuestionMockTool({
-      onInvoke: options?.onAskQuestion
+    AskQuestion: createAskQuestionTool({
+      onInvoke: options?.onAskQuestion,
+      execute: options?.askQuestionExecute
     })
   };
+  if (options?.enableWebIdePlanTools && options.taskId) {
+    tools.RecommendPlan = createRecommendPlanTool({
+      cfg,
+      taskId: options.taskId
+    });
+    tools.UpsertWebIdePlan = createUpsertWebIdePlanTool({
+      cfg,
+      taskId: options.taskId
+    });
+  }
+  return tools;
 }
 function withPlanModeToolHint(prompt, mode) {
   if (mode !== "plan") {
@@ -959,7 +1096,7 @@ ${PLAN_MODE_ASK_QUESTION_HINT}`;
 }
 
 // src/commands/connect/cursor-agent.ts
-setMaxListeners2(50);
+setMaxListeners2(100);
 installAbortSignalDebug();
 var noopRemoteLogSync = {
   schedule(_session) {
@@ -1037,7 +1174,10 @@ async function runCursorAgent(cfg, ctx, options) {
   const workdir = resolveWorkdirPath(ctx.workdir);
   const customTools = createCursorCustomTools(cfg, ctx.messageId, {
     onAskQuestion: options?.onAskQuestion,
-    appendMessageContent: options?.appendMessageContent
+    appendMessageContent: options?.appendMessageContent,
+    askQuestionExecute: options?.askQuestionExecute,
+    enableWebIdePlanTools: options?.enableWebIdePlanTools,
+    taskId: options?.taskId
   });
   const prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
   console.log(
@@ -1106,6 +1246,15 @@ async function runCursorAgent(cfg, ctx, options) {
     }
     await syncRemoteLog.flush(eventSession);
     const result = await run.wait();
+    if (result.usage) {
+      eventSession.addRunUsage(result.usage, {
+        durationMs: result.durationMs
+      });
+      await syncRemoteLog.flush(eventSession);
+      console.log(
+        `[apm] Cursor usage total=${result.usage.totalTokens} in=${result.usage.inputTokens} out=${result.usage.outputTokens} cache=${result.usage.cacheReadTokens}/${result.usage.cacheWriteTokens}`
+      );
+    }
     if (result.status === "error") {
       const failureMessage = formatCursorRunFailure(result.id, {
         statusError: lastRunErrorStatus,
@@ -1142,6 +1291,7 @@ async function runCursorAgent(cfg, ctx, options) {
       status: result.status,
       result: result.result,
       durationMs: result.durationMs,
+      usage: result.usage,
       assistantText: eventSession.getAssistantText(),
       createPlan: eventSession.getCreatePlanContent(),
       artifacts,
@@ -1204,6 +1354,97 @@ function clearWebIdeAgentId(workdir, taskId) {
   writeRegistry2(path, {});
 }
 
+// src/commands/connect/webide-ask-question.ts
+import { setTimeout as delay } from "node:timers/promises";
+var POLL_INTERVAL_MS = 2e3;
+function asString2(value) {
+  return typeof value === "string" ? value.trim() : "";
+}
+function parseQuestions(args) {
+  const title = asString2(args.title) || void 0;
+  const raw = args.questions;
+  if (!Array.isArray(raw) || raw.length === 0) {
+    throw new Error("AskQuestion \u7F3A\u5C11 questions");
+  }
+  const questions = [];
+  for (const item of raw) {
+    if (!item || typeof item !== "object" || Array.isArray(item)) continue;
+    const row = item;
+    const id = asString2(row.id);
+    const prompt = asString2(row.prompt);
+    const optionsRaw = row.options;
+    if (!id || !prompt || !Array.isArray(optionsRaw)) continue;
+    const options = [];
+    for (const opt of optionsRaw) {
+      if (!opt || typeof opt !== "object" || Array.isArray(opt)) continue;
+      const o = opt;
+      const oid = asString2(o.id);
+      const label = asString2(o.label);
+      if (oid && label) options.push({ id: oid, label });
+    }
+    if (options.length < 2) {
+      throw new Error(`AskQuestion \u95EE\u9898 ${id} \u81F3\u5C11\u9700\u8981 2 \u4E2A\u9009\u9879`);
+    }
+    questions.push({ id, prompt, options });
+  }
+  if (questions.length === 0) {
+    throw new Error("AskQuestion \u65E0\u6709\u6548\u95EE\u9898");
+  }
+  return { title, questions };
+}
+function createWebIdeAskQuestionExecute(options) {
+  const { cfg, taskId, signal } = options;
+  return async (args) => {
+    const parsed = parseQuestions(args);
+    const api = createApmApiClient(cfg);
+    console.log(
+      `[apm] AskQuestion \u521B\u5EFA\u5F85\u786E\u8BA4\u9879 taskId=${taskId} count=${parsed.questions.length}`
+    );
+    await api.cli.webideReplaceAssumptions({
+      taskId,
+      title: parsed.title,
+      questions: parsed.questions
+    });
+    while (true) {
+      if (signal?.aborted) {
+        throw new Error("AskQuestion \u5DF2\u53D6\u6D88");
+      }
+      const list = await api.cli.webideListAssumptions({ taskId });
+      const byId = new Map(
+        list.assumptions.map((a) => [a.questionId, a])
+      );
+      const pending = parsed.questions.filter((q) => {
+        const row = byId.get(q.id);
+        return !row || row.status !== "RESOLVED";
+      });
+      if (pending.length === 0) {
+        const answers = parsed.questions.map((q) => {
+          const row = byId.get(q.id);
+          return {
+            questionId: q.id,
+            prompt: q.prompt,
+            selectedOptionId: row.selectedOptionId,
+            customAnswer: row.customAnswer,
+            resolution: row.resolution
+          };
+        });
+        console.log(
+          `[apm] AskQuestion \u7528\u6237\u5DF2\u786E\u8BA4 taskId=${taskId} count=${answers.length}`
+        );
+        return JSON.stringify(
+          {
+            title: parsed.title,
+            answers
+          },
+          null,
+          2
+        );
+      }
+      await delay(POLL_INTERVAL_MS);
+    }
+  };
+}
+
 // src/commands/deploy/internal/minio.ts
 import * as Minio from "minio";
 var MinioClient = class {
@@ -1824,6 +2065,13 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       {
         signal,
         appendMessageContent: (content) => appendContent(cfg, messageId, content),
+        askQuestionExecute: createWebIdeAskQuestionExecute({
+          cfg,
+          taskId,
+          signal
+        }),
+        enableWebIdePlanTools: true,
+        taskId,
         createRemoteLogSync: (agentId) => {
           saveWebIdeAgentId(workdir, taskId, agentId);
           logSyncRef.current = createThrottledWebIdeMessageLogSync(
@@ -1868,6 +2116,19 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       id: messageId,
       content: fallback
     });
+    if (msg.action === "write-plan" && outcome.createPlan && outcome.createPlan.trim()) {
+      try {
+        await api.cli.webideUpsertPlan({
+          taskId,
+          content: outcome.createPlan.trim()
+        });
+      } catch (err) {
+        console.warn(
+          "[apm] write-plan \u8865\u5199\u8BA1\u5212\u5931\u8D25:",
+          err instanceof Error ? err.message : err
+        );
+      }
+    }
     await logSyncRef.current?.markRun(outcome.runId, "finished");
     await updateStatus(cfg, messageId, "SUCCESS");
     console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,
@@ -35,7 +35,7 @@
     "@bufbuild/protobuf": "1.10.0",
     "@connectrpc/connect": "~1.7.0",
     "@connectrpc/connect-node": "~1.7.0",
-    "@cursor/sdk": "~1.0.18",
+    "@cursor/sdk": "^1.0.22",
     "ws": "~8.18.0",
     "listpage-http": "~0.0.318",
     "commander": "~14.0.3",