ai-project-manage-cli 6.0.63 → 6.0.65

package/dist/index.js

@@ -473,17 +473,19 @@ var requestConfig = {
       method: "DELETE",
       path: "/cli/repository-project-documents"
     }),
-    updateCoordinatorDeploymentStatus: defineEndpoint({
+    updateTaskDeploymentStatus: defineEndpoint({
       method: "PUT",
-      path: "/cli/coordinator-deployments/status"
+      path: "/cli/task-deployments/status"
     }),
-    syncCoordinatorDeploymentLog: defineEndpoint({
-      method: "PUT",
-      path: "/cli/coordinator-deployments/log"
-    }),
-    completeCoordinatorDeployment: defineEndpoint({
+    syncTaskDeploymentLog: defineEndpoint(
+      {
+        method: "PUT",
+        path: "/cli/task-deployments/log"
+      }
+    ),
+    completeTaskDeployment: defineEndpoint({
       method: "PUT",
-      path: "/cli/coordinator-deployments/complete"
+      path: "/cli/task-deployments/complete"
     })
   }
 };
@@ -1744,8 +1746,12 @@ function registryBaseUrl() {
   const fromEnv = process.env.npm_config_registry?.trim() || process.env.NPM_CONFIG_REGISTRY?.trim();
   return (fromEnv || "https://registry.npmjs.org").replace(/\/+$/, "");
 }
-async function fetchLatestPublishedVersion() {
-  const url = `${registryBaseUrl()}/${CLI_PACKAGE_NAME}/latest`;
+function parseMajorVersion(version) {
+  const m = /^(\d+)/.exec(version.trim());
+  return m ? Number(m[1]) : 0;
+}
+async function fetchPublishedVersion(spec) {
+  const url = `${registryBaseUrl()}/${CLI_PACKAGE_NAME}/${spec}`;
   try {
     const res = await fetch(url);
     if (!res.ok) return null;
@@ -1755,28 +1761,73 @@ async function fetchLatestPublishedVersion() {
     return null;
   }
 }
+async function fetchLatestPublishedVersion() {
+  return fetchPublishedVersion("latest");
+}
+async function fetchLatestPublishedVersionInMajor(major) {
+  return fetchPublishedVersion(String(major));
+}
+function resolveUpdateTarget(input) {
+  const { current, allowMajorUpgrade, latestInMajor, globalLatest } = input;
+  const currentMajor = parseMajorVersion(current);
+  if (allowMajorUpgrade) {
+    if (globalLatest && globalLatest === current) {
+      return { action: "skip" };
+    }
+    return {
+      action: "install",
+      installSpec: `${CLI_PACKAGE_NAME}@latest`,
+      targetLabel: globalLatest ?? "latest",
+      expectedVersion: globalLatest,
+      majorUpgradeAvailable: null
+    };
+  }
+  if (latestInMajor && latestInMajor === current) {
+    return { action: "skip" };
+  }
+  const majorUpgradeAvailable = globalLatest && parseMajorVersion(globalLatest) > currentMajor ? globalLatest : null;
+  return {
+    action: "install",
+    installSpec: `${CLI_PACKAGE_NAME}@${currentMajor}`,
+    targetLabel: latestInMajor ?? String(currentMajor),
+    expectedVersion: latestInMajor,
+    majorUpgradeAvailable
+  };
+}
 function npmAvailable() {
   const r = runNpm(["--version"], { encoding: "utf8" });
   return !r.error && r.status === 0;
 }
-async function runUpdate() {
+async function runUpdate(options = {}) {
   const current = readCliVersion();
-  const latest = await fetchLatestPublishedVersion();
-  if (latest && current === latest) {
+  const currentMajor = parseMajorVersion(current);
+  const globalLatest = await fetchLatestPublishedVersion();
+  const latestInMajor = options.allowMajorUpgrade ? null : await fetchLatestPublishedVersionInMajor(currentMajor);
+  const resolved = resolveUpdateTarget({
+    current,
+    allowMajorUpgrade: options.allowMajorUpgrade,
+    latestInMajor,
+    globalLatest
+  });
+  if (resolved.action === "skip") {
     console.log(`[apm] \u5DF2\u662F\u6700\u65B0\u7248\u672C ${current}`);
     return { didUpdate: false };
   }
+  if (resolved.majorUpgradeAvailable) {
+    console.log(
+      `[apm] registry \u6700\u65B0\u4E3A ${resolved.majorUpgradeAvailable}\uFF08\u5927\u7248\u672C\u5347\u7EA7\uFF09\uFF0C\u672C\u6B21\u4EC5\u66F4\u65B0\u5230 ${currentMajor}.x\uFF1B\u4F7F\u7528 apm update --major \u53EF\u8DE8\u5927\u7248\u672C\u5347\u7EA7`
+    );
+  }
   if (!npmAvailable()) {
     console.error(
-      `[apm] \u672A\u627E\u5230 npm\u3002\u8BF7\u5B89\u88C5 Node.js \u540E\u6267\u884C\uFF1Anpm install -g ${CLI_PACKAGE_NAME}@latest`
+      `[apm] \u672A\u627E\u5230 npm\u3002\u8BF7\u5B89\u88C5 Node.js \u540E\u6267\u884C\uFF1Anpm install -g ${resolved.installSpec}`
     );
     process.exit(1);
   }
-  const targetLabel = latest ?? "latest";
   console.error(
-    `[apm] \u5F53\u524D\u7248\u672C ${current}\uFF0C\u6B63\u5728\u5B89\u88C5 ${CLI_PACKAGE_NAME}@${targetLabel} \u2026`
+    `[apm] \u5F53\u524D\u7248\u672C ${current}\uFF0C\u6B63\u5728\u5B89\u88C5 ${resolved.installSpec} \u2026` + (resolved.targetLabel !== current ? `\uFF08\u76EE\u6807 ${resolved.targetLabel}\uFF09` : "")
   );
-  const install = runNpm(["install", "-g", `${CLI_PACKAGE_NAME}@latest`], {
+  const install = runNpm(["install", "-g", resolved.installSpec], {
     stdio: "inherit"
   });
   if (install.error) {
@@ -1787,7 +1838,7 @@ async function runUpdate() {
     process.exit(install.status ?? 1);
   }
   const after = readCliVersion();
-  if (latest && after === latest) {
+  if (resolved.expectedVersion && after === resolved.expectedVersion) {
     console.log(`[apm] \u5DF2\u66F4\u65B0\u5230 ${after}`);
   } else {
     console.log(
@@ -2256,7 +2307,7 @@ function createDeployLogSyncer(api, deploymentRunId) {
     if (!latestLog || latestLog === lastSyncedLog) {
       return;
     }
-    await api.cli.syncCoordinatorDeploymentLog({
+    await api.cli.syncTaskDeploymentLog({
       id: deploymentRunId,
       log: latestLog
     });
@@ -2287,7 +2338,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
   const api = createApmApiClient(cfg);
   const deploymentRunId = msg.deploymentRunId;
   if (signal.aborted) return;
-  await api.cli.updateCoordinatorDeploymentStatus({
+  await api.cli.updateTaskDeploymentStatus({
     id: deploymentRunId,
     status: "DEPLOYING"
   });
@@ -2296,7 +2347,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
   if (!command) {
     const error = missingDeployCommandMessage(msg.environment);
     console.error(`[apm] ${error}`);
-    await api.cli.completeCoordinatorDeployment({
+    await api.cli.completeTaskDeployment({
       id: deploymentRunId,
       status: "FAILED",
       log: error,
@@ -2318,7 +2369,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
     latestLog = log;
     logSyncer.updateLog(log);
     await logSyncer.flush();
-    await api.cli.completeCoordinatorDeployment({
+    await api.cli.completeTaskDeployment({
       id: deploymentRunId,
       status: "SUCCESS",
       log
@@ -2329,7 +2380,7 @@ async function handleInboundDeploy(cfg, msg, signal) {
     const log = error && typeof error === "object" && "log" in error ? String(error.log ?? latestLog) : latestLog;
     logSyncer.updateLog(log);
     await logSyncer.flush();
-    await api.cli.completeCoordinatorDeployment({
+    await api.cli.completeTaskDeployment({
       id: deploymentRunId,
       status: "FAILED",
       log,
@@ -2411,6 +2462,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 +2608,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");
   }
@@ -2734,9 +2823,87 @@ function createAppendMessageCustomTools(cfg, messageId) {
   };
 }
 
+// src/commands/connect/ask-question-tool.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",
+          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 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 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 +2927,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 +2972,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 = 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 +2985,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 +3010,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 +3035,7 @@ async function runCursorAgent(cfg, ctx, options) {
           );
         }
       }
+      options?.onStreamEvent?.(event);
       eventSession.addEvent(event);
       syncRemoteLog.schedule(eventSession);
     }
@@ -2873,6 +3056,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) {
@@ -4403,14 +4612,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)',
@@ -4541,9 +4748,14 @@ function buildProgram() {
     await runInit(opts.name);
   });
   program.command("update").description(
-    `\u901A\u8FC7 npm \u5168\u5C40\u5B89\u88C5 ${CLI_PACKAGE_NAME}@latest\uFF0C\u5C06 apm \u66F4\u65B0\u5230 registry \u6700\u65B0\u7248`
-  ).action(async () => {
-    await runUpdate();
+    `\u901A\u8FC7 npm \u5168\u5C40\u5B89\u88C5 ${CLI_PACKAGE_NAME}\uFF0C\u9ED8\u8BA4\u66F4\u65B0\u5230\u5F53\u524D\u5927\u7248\u672C\uFF08${parseMajorVersion(
+      readCliVersion()
+    )}.x\uFF09\u6700\u65B0\u7248`
+  ).option(
+    "--major",
+    "\u5141\u8BB8\u8DE8\u5927\u7248\u672C\u66F4\u65B0\u5230 registry \u5168\u5C40 latest\uFF08\u9ED8\u8BA4\u4EC5\u8DDF\u968F\u5F53\u524D\u5927\u7248\u672C\uFF09"
+  ).action(async (opts) => {
+    await runUpdate({ allowMajorUpgrade: opts.major === true });
   });
   program.command("update-skills").description(
     "\u540C\u6B65 .apm/ \u4E0B\u7684\u89C4\u5219\u4E0E\u6280\u80FD\uFF1A\u57FA\u7840\u5185\u5BB9\u6765\u81EA CLI \u6A21\u677F\uFF0C\u8865\u5145\u6280\u80FD\u6765\u81EA\u5E73\u53F0"
@@ -4581,7 +4793,7 @@ function buildProgram() {
     await runUpdateMessageStatus(opts);
   });
   program.command("connect").description(
-    "\u8FDE\u63A5\u5E73\u53F0 WebSocket\uFF08/ws/agent\uFF09\uFF0C\u7EF4\u6301\u5FC3\u8DF3\u5E76\u5904\u7406\u4E0B\u884C message\uFF08TYPING \u2192 Cursor \u2192 SUCCESS/FAILED\uFF09\uFF1B\u542F\u52A8\u524D\u81EA\u52A8 apm update \u5230\u6700\u65B0\u7248"
+    "\u8FDE\u63A5\u5E73\u53F0 WebSocket\uFF08/ws/agent\uFF09\uFF0C\u7EF4\u6301\u5FC3\u8DF3\u5E76\u5904\u7406\u4E0B\u884C message\uFF08TYPING \u2192 Cursor \u2192 SUCCESS/FAILED\uFF09\uFF1B\u542F\u52A8\u524D\u81EA\u52A8 apm update \u5230\u5F53\u524D\u5927\u7248\u672C\u6700\u65B0\u7248"
   ).option("--server <url>", "API \u6839\u5730\u5740\uFF0C\u8986\u76D6 config \u4E2D\u7684 baseUrl").action(async (opts) => {
     await runConnect(opts);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.63",
+  "version": "6.0.65",
   "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": {