ai-project-manage-cli 7.1.2 → 7.1.3

package/dist/index.js

@@ -457,6 +457,14 @@ var requestConfig = {
       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"
@@ -6304,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();
@@ -6342,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;
@@ -6366,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": {
@@ -6400,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,
@@ -6474,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
@@ -6701,13 +6745,82 @@ ${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: {
+        recommendation: {
+          type: "string",
+          enum: ["write", "skip", "unknown"],
+          description: "write = suggest generating a plan; skip = plan optional/unnecessary; unknown = unsure"
+        },
+        reason: {
+          type: "string",
+          description: "Short Chinese reason for the recommendation"
+        }
+      },
+      required: ["recommendation"]
+    },
+    execute: async (args) => {
+      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);
+    }
+  };
+}
+
 // 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 {
+  const tools = {
     ...createAppendMessageCustomTools(
       cfg,
       messageId,
@@ -6718,6 +6831,17 @@ function createCursorCustomTools(cfg, messageId, options) {
       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") {
@@ -6808,7 +6932,9 @@ async function runCursorAgent(cfg, ctx, options) {
   const customTools = createCursorCustomTools(cfg, ctx.messageId, {
     onAskQuestion: options?.onAskQuestion,
     appendMessageContent: options?.appendMessageContent,
-    askQuestionExecute: options?.askQuestionExecute
+    askQuestionExecute: options?.askQuestionExecute,
+    enableWebIdePlanTools: options?.enableWebIdePlanTools,
+    taskId: options?.taskId
   });
   const prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
   console.log(
@@ -6877,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,
@@ -6913,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,

package/dist/webide-message-worker.js

@@ -88,6 +88,14 @@ var requestConfig = {
       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"
@@ -289,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();
@@ -327,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;
@@ -351,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": {
@@ -385,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,
@@ -459,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
@@ -944,13 +988,82 @@ ${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: {
+        recommendation: {
+          type: "string",
+          enum: ["write", "skip", "unknown"],
+          description: "write = suggest generating a plan; skip = plan optional/unnecessary; unknown = unsure"
+        },
+        reason: {
+          type: "string",
+          description: "Short Chinese reason for the recommendation"
+        }
+      },
+      required: ["recommendation"]
+    },
+    execute: async (args) => {
+      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);
+    }
+  };
+}
+
 // 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 {
+  const tools = {
     ...createAppendMessageCustomTools(
       cfg,
       messageId,
@@ -961,6 +1074,17 @@ function createCursorCustomTools(cfg, messageId, options) {
       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") {
@@ -1051,7 +1175,9 @@ async function runCursorAgent(cfg, ctx, options) {
   const customTools = createCursorCustomTools(cfg, ctx.messageId, {
     onAskQuestion: options?.onAskQuestion,
     appendMessageContent: options?.appendMessageContent,
-    askQuestionExecute: options?.askQuestionExecute
+    askQuestionExecute: options?.askQuestionExecute,
+    enableWebIdePlanTools: options?.enableWebIdePlanTools,
+    taskId: options?.taskId
   });
   const prompt = withPlanModeToolHint(ctx.prompt, ctx.mode);
   console.log(
@@ -1120,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,
@@ -1156,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,
@@ -1221,11 +1357,11 @@ function clearWebIdeAgentId(workdir, taskId) {
 // src/commands/connect/webide-ask-question.ts
 import { setTimeout as delay } from "node:timers/promises";
 var POLL_INTERVAL_MS = 2e3;
-function asString(value) {
+function asString2(value) {
   return typeof value === "string" ? value.trim() : "";
 }
 function parseQuestions(args) {
-  const title = asString(args.title) || void 0;
+  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");
@@ -1234,16 +1370,16 @@ function parseQuestions(args) {
   for (const item of raw) {
     if (!item || typeof item !== "object" || Array.isArray(item)) continue;
     const row = item;
-    const id = asString(row.id);
-    const prompt = asString(row.prompt);
+    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 = asString(o.id);
-      const label = asString(o.label);
+      const oid = asString2(o.id);
+      const label = asString2(o.label);
       if (oid && label) options.push({ id: oid, label });
     }
     if (options.length < 2) {
@@ -1934,6 +2070,8 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
           taskId,
           signal
         }),
+        enableWebIdePlanTools: true,
+        taskId,
         createRemoteLogSync: (agentId) => {
           saveWebIdeAgentId(workdir, taskId, agentId);
           logSyncRef.current = createThrottledWebIdeMessageLogSync(
@@ -1978,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.2",
+  "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",