ai-project-manage-cli 6.0.42 → 6.0.43

package/dist/index.js

@@ -127,6 +127,13 @@ function resolveWorkdirPath(cwd = process.cwd()) {
     return normalizeWorkdirPath(absolute);
   }
 }
+function requireRemoteWorkdir(workdir) {
+  const trimmed = typeof workdir === "string" ? workdir.trim() : "";
+  if (!trimmed) {
+    throw new Error("[apm] \u8FDC\u7A0B\u6D88\u606F\u7F3A\u5C11\u5DE5\u4F5C\u76EE\u5F55 workdir");
+  }
+  return resolveWorkdirPath(trimmed);
+}
 
 // src/command-utils.ts
 var __dirname = dirname(fileURLToPath(import.meta.url));
@@ -611,7 +618,7 @@ async function runBranch(sessionId, options = {}) {
 
 // src/commands/pull.ts
 import { writeFileSync as writeFileSync6 } from "fs";
-import { dirname as dirname2, join as join7 } from "path";
+import { join as join7 } from "path";
 import { stringify as yamlStringify } from "yaml";
 
 // src/session-messages-xml.ts
@@ -908,13 +915,7 @@ async function syncPlatformRules(cfg, sessionId, workdirPath, apmRoot) {
 }
 
 // src/commands/pull.ts
-function resolvePullWorkdir(apmRoot) {
-  if (apmRoot) {
-    return resolveWorkdirPath(dirname2(apmRoot));
-  }
-  return resolveWorkdirPath();
-}
-async function runPull(sessionId, apmRoot) {
+async function runPull(sessionId, remoteWorkdir) {
   const trimmedId = sessionId.trim();
   if (!trimmedId) {
     console.error("[apm] sessionId \u4E0D\u80FD\u4E3A\u7A7A");
@@ -922,6 +923,8 @@ async function runPull(sessionId, apmRoot) {
   }
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
+  const workdir = remoteWorkdir === void 0 ? resolveWorkdirPath() : requireRemoteWorkdir(remoteWorkdir);
+  const apmRoot = workspaceApmDir(workdir);
   const [detail, members, documents, attachments, messages] = await Promise.all(
     [
       api.cli.sessionDetail({ sessionId: trimmedId }),
@@ -976,8 +979,7 @@ async function runPull(sessionId, apmRoot) {
     "utf8"
   );
   await syncSessionAttachments(cfg, trimmedId, attachments, apmRoot);
-  const workdirPath = resolvePullWorkdir(apmRoot);
-  await syncPlatformRules(cfg, trimmedId, workdirPath, apmRoot);
+  await syncPlatformRules(cfg, trimmedId, workdir, apmRoot);
   console.log(`[apm] \u5DF2\u540C\u6B65\u4F1A\u8BDD\u5DE5\u4F5C\u533A: ${dir}`);
   return dir;
 }
@@ -987,12 +989,12 @@ import { spawnSync } from "child_process";
 
 // src/version.ts
 import { readFileSync as readFileSync5 } from "fs";
-import { dirname as dirname3, join as join8 } from "path";
+import { dirname as dirname2, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var CLI_PACKAGE_NAME = "ai-project-manage-cli";
 function readCliVersion() {
   try {
-    const dir = dirname3(fileURLToPath2(import.meta.url));
+    const dir = dirname2(fileURLToPath2(import.meta.url));
     const pkgPath = join8(dir, "..", "package.json");
     const pkg = JSON.parse(readFileSync5(pkgPath, "utf8"));
     return pkg.version ?? "0.0.0";
@@ -1430,7 +1432,6 @@ import {
   CursorAgentError
 } from "@cursor/sdk";
 import { setMaxListeners as setMaxListeners2 } from "node:events";
-import { resolve as resolve4 } from "path";
 
 // src/session-utils.ts
 var EventSession = class {
@@ -1592,7 +1593,7 @@ ${JSON.stringify(event, null, 2)}
 
 // src/commands/connect/agent-session-registry.ts
 import { existsSync as existsSync8, mkdirSync as mkdirSync5, readFileSync as readFileSync7, writeFileSync as writeFileSync7 } from "node:fs";
-import { dirname as dirname4, resolve as resolve3 } from "node:path";
+import { dirname as dirname3, resolve as resolve3 } from "node:path";
 function registryPath(workdir, sessionId) {
   return resolve3(workdir, ".apm", "sessions", sessionId, "cursor-agents.json");
 }
@@ -1618,7 +1619,7 @@ function readRegistry(path10) {
   return {};
 }
 function writeRegistry(path10, registry) {
-  mkdirSync5(dirname4(path10), { recursive: true });
+  mkdirSync5(dirname3(path10), { recursive: true });
   writeFileSync7(path10, `${JSON.stringify(registry, null, 2)}
 `, "utf8");
 }
@@ -1816,16 +1817,16 @@ async function runCursorAgent(cfg, ctx, options) {
   if (!apiKey) {
     throw new Error("\u7F3A\u5C11 apiKey\uFF0C\u65E0\u6CD5\u8C03\u7528 Cursor SDK");
   }
-  const cwd = resolve4(ctx.workdir);
+  const workdir = resolveWorkdirPath(ctx.workdir);
   const prompt = ctx.prompt;
   console.log(
-    `[apm] Cursor Agent \u5F00\u59CB messageId=${ctx.messageId} sessionId=${ctx.sessionId} cwd=${cwd}`
+    `[apm] Cursor Agent \u5F00\u59CB messageId=${ctx.messageId} sessionId=${ctx.sessionId} cwd=${workdir}`
   );
   const { agent, resumed } = await obtainAgent({
     apiKey,
     model: ctx.model,
-    cwd,
-    workdir: ctx.workdir,
+    cwd: workdir,
+    workdir,
     sessionId: ctx.sessionId,
     user: ctx.user
   });
@@ -1884,7 +1885,7 @@ async function runCursorAgent(cfg, ctx, options) {
       });
       console.error(`[apm] ${failureMessage}`);
       if (resumed) {
-        clearSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user);
+        clearSessionAgentId(workdir, ctx.sessionId, ctx.user);
       }
       throw new Error(failureMessage);
     }
@@ -1895,7 +1896,7 @@ async function runCursorAgent(cfg, ctx, options) {
   } catch (err) {
     if (err instanceof CursorAgentError) {
       if (resumed) {
-        clearSessionAgentId(ctx.workdir, ctx.sessionId, ctx.user);
+        clearSessionAgentId(workdir, ctx.sessionId, ctx.user);
       }
       throw new Error(
         `Cursor \u542F\u52A8\u5931\u8D25: ${err.message}${err.isRetryable ? "\uFF08\u53EF\u91CD\u8BD5\uFF09" : ""}`
@@ -1912,23 +1913,27 @@ async function runCursorAgent(cfg, ctx, options) {
 
 // src/commands/connect/pre-step-cache.ts
 var PULL_TTL_MS = 3e4;
-var lastBranchSessionId = null;
-var lastPullAtBySession = /* @__PURE__ */ new Map();
-function shouldRunBranch(sessionId) {
-  return lastBranchSessionId !== sessionId;
+function sessionWorkdirKey(sessionId, workdir) {
+  return `${sessionId}\0${workdir}`;
 }
-function markBranchDone(sessionId) {
-  lastBranchSessionId = sessionId;
+var lastBranchKey = null;
+var lastPullAtByKey = /* @__PURE__ */ new Map();
+function shouldRunBranch(sessionId, workdir) {
+  return lastBranchKey !== sessionWorkdirKey(sessionId, workdir);
 }
-function shouldRunPull(sessionId) {
-  const last = lastPullAtBySession.get(sessionId);
+function markBranchDone(sessionId, workdir) {
+  lastBranchKey = sessionWorkdirKey(sessionId, workdir);
+}
+function shouldRunPull(sessionId, workdir) {
+  const key = sessionWorkdirKey(sessionId, workdir);
+  const last = lastPullAtByKey.get(key);
   if (last == null) {
     return true;
   }
   return Date.now() - last >= PULL_TTL_MS;
 }
-function markPullDone(sessionId) {
-  lastPullAtBySession.set(sessionId, Date.now());
+function markPullDone(sessionId, workdir) {
+  lastPullAtByKey.set(sessionWorkdirKey(sessionId, workdir), Date.now());
 }
 
 // src/commands/connect/run-slot-pool.ts
@@ -1941,10 +1946,10 @@ function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT) {
       active += 1;
       return Promise.resolve();
     }
-    return new Promise((resolve6) => {
+    return new Promise((resolve5) => {
       waiters.push(() => {
         active += 1;
-        resolve6();
+        resolve5();
       });
     });
   };
@@ -1978,6 +1983,8 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
   if (isUserCancelled(ctx)) return;
   if (signal.aborted) return;
   const messageId = msg.messageId;
+  const workdir = requireRemoteWorkdir(msg.workdir);
+  const apmRoot = workspaceApmDir(workdir);
   const runStep = async (step, fn) => {
     const startedAt = Date.now();
     try {
@@ -1995,24 +2002,18 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
       "status-typing",
       () => updateMessageStatus(cfg, messageId, "TYPING")
     );
-    if (shouldRunBranch(msg.sessionId)) {
+    if (shouldRunBranch(msg.sessionId, workdir)) {
       if (signal.aborted) return;
-      await runStep(
-        "branch",
-        () => runBranch(msg.sessionId, { cwd: msg.workdir })
-      );
-      markBranchDone(msg.sessionId);
+      await runStep("branch", () => runBranch(msg.sessionId, { cwd: workdir }));
+      markBranchDone(msg.sessionId, workdir);
     } else {
       console.log(`[apm] step=branch skipped sessionId=${msg.sessionId}`);
     }
     let pullRan = false;
-    if (shouldRunPull(msg.sessionId)) {
+    if (shouldRunPull(msg.sessionId, workdir)) {
       if (signal.aborted) return;
-      await runStep(
-        "pull",
-        () => runPull(msg.sessionId, workspaceApmDir(msg.workdir))
-      );
-      markPullDone(msg.sessionId);
+      await runStep("pull", () => runPull(msg.sessionId, workdir));
+      markPullDone(msg.sessionId, workdir);
       pullRan = true;
     } else {
       console.log(`[apm] step=pull skipped sessionId=${msg.sessionId}`);
@@ -2021,7 +2022,7 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
       if (signal.aborted) return;
       await runStep(
         "commit-pull",
-        () => commitWorkingTreeIfDirty(msg.workdir, "fix: apm pull")
+        () => commitWorkingTreeIfDirty(workdir, "fix: apm pull")
       );
     } else {
       console.log(`[apm] step=commit-pull skipped sessionId=${msg.sessionId}`);
@@ -2037,7 +2038,7 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
           prompt: msg.content,
           model: msg.model,
           apiKey: msg.apiKey,
-          workdir: msg.workdir,
+          workdir,
           user: msg.user
         },
         { signal }
@@ -2045,11 +2046,11 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
     );
     await runStep(
       "sync-documents",
-      () => syncSessionDocuments(cfg, msg.sessionId, workspaceApmDir(msg.workdir))
+      () => syncSessionDocuments(cfg, msg.sessionId, apmRoot)
     );
     await runStep(
       "commit-files",
-      () => commitWorkingTreeIfDirty(msg.workdir, "chore(apm): commit working tree")
+      () => commitWorkingTreeIfDirty(workdir, "chore(apm): commit working tree")
     );
     await runStep(
       "status-success",
@@ -2109,7 +2110,7 @@ async function runConnect(options) {
   }
   const url = buildAgentWsUrl(cfg.baseUrl, resolveApiKey(cfg));
   console.log(`[apm] \u8FDE\u63A5 ${cfg.baseUrl} \u2026`);
-  await new Promise((resolve6, reject) => {
+  await new Promise((resolve5, reject) => {
     const ws = new WebSocket(url);
     let stopHeartbeat;
     let shuttingDown = false;
@@ -2138,7 +2139,7 @@ async function runConnect(options) {
         ]);
       } catch {
       }
-      resolve6();
+      resolve5();
       process.exit(code);
     };
     ws.on("open", () => {
@@ -2226,11 +2227,11 @@ import path5 from "node:path";
 
 // src/commands/deploy/internal/apm-config.ts
 import { existsSync as existsSync9, readFileSync as readFileSync8 } from "node:fs";
-import { resolve as resolve5 } from "node:path";
+import { resolve as resolve4 } from "node:path";
 function loadApmConfig(options) {
-  const p = resolve5(
+  const p = resolve4(
     process.cwd(),
-    options?.configPath ?? resolve5(workspaceApmDir(), "apm.config.json")
+    options?.configPath ?? resolve4(workspaceApmDir(), "apm.config.json")
   );
   if (!existsSync9(p)) {
     console.error(`\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6\uFF1A${p}`);
@@ -2497,17 +2498,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((resolve5, 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);
+        resolve5(output);
       });
     });
-    await new Promise((resolve6, reject) => {
+    await new Promise((resolve5, reject) => {
       this.client.modem.followProgress(
         stream,
         (err) => {
@@ -2515,7 +2516,7 @@ var DockerodeClient = class {
             reject(err);
             return;
           }
-          resolve6();
+          resolve5();
         },
         () => void 0
       );
@@ -3006,14 +3007,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((resolve5, reject) => {
       objectsStream.on("data", (obj) => {
         if (obj.name) {
           keys.push(obj.name);
         }
       });
       objectsStream.on("error", reject);
-      objectsStream.on("end", resolve6);
+      objectsStream.on("end", resolve5);
     });
     const chunkSize = 500;
     for (let i = 0; i < keys.length; i += chunkSize) {
@@ -3251,7 +3252,7 @@ async function ensureRemoteDir(sftp, dir) {
   }
 }
 function execCommand(client, command) {
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve5, reject) => {
     client.exec(command, (err, stream) => {
       if (err) return reject(err);
       let stdout = "";
@@ -3261,7 +3262,7 @@ function execCommand(client, command) {
           reject(new Error(`\u8FDC\u7A0B\u547D\u4EE4\u5931\u8D25 (${code}): ${stderr || stdout}`));
           return;
         }
-        resolve6(stdout);
+        resolve5(stdout);
       }).on("data", (data) => {
         stdout += data.toString();
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "6.0.42",
+  "version": "6.0.43",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,