ai-project-manage-cli 6.0.27 → 6.0.29

package/dist/index.js

@@ -885,7 +885,73 @@ async function runUpdateSkills() {
 }
 
 // src/commands/sync-document.ts
-import { existsSync as existsSync5, readFileSync as readFileSync5 } from "fs";
+import { existsSync as existsSync6 } from "fs";
+import { basename as basename2 } from "path";
+
+// src/commands/sync-session-documents.ts
+import { existsSync as existsSync5, readdirSync as readdirSync3, readFileSync as readFileSync5 } from "fs";
+import { join as join9 } from "path";
+function listLocalMarkdownFiles(docsDir) {
+  if (!existsSync5(docsDir)) {
+    return [];
+  }
+  return readdirSync3(docsDir).filter(
+    (name) => name.toLowerCase().endsWith(".md")
+  );
+}
+function remoteDocumentByLocalName(remoteDocuments, localFileName) {
+  const platformName = documentPlatformName(localFileName);
+  return remoteDocuments.find((doc) => {
+    const remoteLocalName = documentLocalFileName(doc.name);
+    return remoteLocalName === localFileName || documentPlatformName(doc.name) === platformName;
+  });
+}
+async function upsertLocalDocumentFile(api, sessionId, docsDir, fileName) {
+  const absPath = join9(docsDir, fileName);
+  const content = readFileSync5(absPath, "utf8");
+  const name = documentPlatformName(absPath);
+  return api.cli.upsertDocument({
+    sessionId,
+    name,
+    content
+  });
+}
+async function syncSessionDocuments(cfg, sessionId, apmRoot, options) {
+  const trimmedSessionId = sessionId.trim();
+  if (!trimmedSessionId) {
+    return 0;
+  }
+  const docsDir = sessionDocsDir(trimmedSessionId, apmRoot);
+  const localFiles = listLocalMarkdownFiles(docsDir);
+  if (localFiles.length === 0) {
+    return 0;
+  }
+  const api = options?.api ?? createApmApiClient(cfg);
+  const remoteDocuments = options?.remoteDocuments ?? await api.cli.listDocuments({ sessionId: trimmedSessionId });
+  let synced = 0;
+  for (const fileName of localFiles) {
+    const absPath = join9(docsDir, fileName);
+    const content = readFileSync5(absPath, "utf8");
+    const remote = remoteDocumentByLocalName(remoteDocuments, fileName);
+    if (remote && remote.content === content) {
+      continue;
+    }
+    const doc = await upsertLocalDocumentFile(
+      api,
+      trimmedSessionId,
+      docsDir,
+      fileName
+    );
+    synced += 1;
+    console.log(`[apm] \u5DF2\u540C\u6B65\u6587\u6863: ${doc.name} (id=${doc.id})`);
+  }
+  if (synced === 0) {
+    console.log("[apm] \u4F1A\u8BDD\u6587\u6863\u65E0\u53D8\u5316\uFF0C\u8DF3\u8FC7\u63A8\u9001");
+  }
+  return synced;
+}
+
+// src/commands/sync-document.ts
 async function runSyncDocument(sessionId, options) {
   const trimmedSessionId = sessionId.trim();
   if (!trimmedSessionId) {
@@ -898,24 +964,24 @@ async function runSyncDocument(sessionId, options) {
     process.exit(1);
   }
   const absPath = resolveSessionDocumentPath(trimmedSessionId, fileArg);
-  if (!existsSync5(absPath)) {
-    const docsDir = sessionDocsDir(trimmedSessionId);
+  if (!existsSync6(absPath)) {
+    const docsDir2 = sessionDocsDir(trimmedSessionId);
     console.error(
       `[apm] \u6587\u6863\u4E0D\u5B58\u5728: ${absPath}
-[apm] \u8BF7\u786E\u8BA4\u5DF2 pull\uFF0C\u4E14 ${docsDir} \u4E0B\u5B58\u5728\u5BF9\u5E94\u6587\u4EF6`
+[apm] \u8BF7\u786E\u8BA4\u5DF2 pull\uFF0C\u4E14 ${docsDir2} \u4E0B\u5B58\u5728\u5BF9\u5E94\u6587\u4EF6`
     );
     process.exit(1);
   }
-  const content = readFileSync5(absPath, "utf8");
-  const name = documentPlatformName(absPath);
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
-  const doc = await api.cli.upsertDocument({
-    sessionId: trimmedSessionId,
-    name,
-    content
-  });
-  console.log(`[apm] \u5DF2\u540C\u6B65\u6587\u6863: ${name} (id=${doc.id})`);
+  const docsDir = sessionDocsDir(trimmedSessionId);
+  const doc = await upsertLocalDocumentFile(
+    api,
+    trimmedSessionId,
+    docsDir,
+    basename2(absPath)
+  );
+  console.log(`[apm] \u5DF2\u540C\u6B65\u6587\u6863: ${doc.name} (id=${doc.id})`);
 }
 
 // src/commands/append-message.ts
@@ -1038,6 +1104,7 @@ function validateAgentWsMessage(value, kind) {
 
 // src/commands/connect/cursor-agent.ts
 import { Agent, CursorAgentError } from "@cursor/sdk";
+import { setMaxListeners } from "node:events";
 import { resolve as resolve3 } from "path";
 
 // src/session-utils.ts
@@ -1199,18 +1266,6 @@ ${JSON.stringify(event, null, 2)}
 }
 
 // src/commands/connect/cursor-message-log.ts
-function assistantStreamChunk(event) {
-  if (event.type !== "assistant") {
-    return "";
-  }
-  let text = "";
-  for (const block of event.message.content) {
-    if (block.type === "text" && block.text) {
-      text += block.text;
-    }
-  }
-  return text;
-}
 var CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS = 2e3;
 function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
   let lastRunAt = 0;
@@ -1285,12 +1340,17 @@ async function syncCursorMessageLog(cfg, ctx, events) {
 }
 
 // src/commands/connect/cursor-agent.ts
+setMaxListeners(50);
 var logCtx = (ctx, agentId) => ({
   sessionId: ctx.sessionId,
   messageId: ctx.messageId,
   agentId
 });
-async function runCursorAgent(cfg, ctx) {
+async function runCursorAgent(cfg, ctx, options) {
+  const signal = options?.signal;
+  if (signal?.aborted) {
+    throw new Error("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u4EFB\u52A1\u4E2D\u65AD");
+  }
   const apiKey = ctx.apiKey.trim();
   if (!apiKey) {
     throw new Error("\u7F3A\u5C11 apiKey\uFF0C\u65E0\u6CD5\u8C03\u7528 Cursor SDK");
@@ -1320,12 +1380,22 @@ async function runCursorAgent(cfg, ctx) {
       );
     }
   );
+  let activeRun;
+  const abortRun = () => {
+    if (!activeRun?.supports("cancel")) return;
+    void activeRun.cancel().catch(() => void 0);
+  };
+  signal?.addEventListener("abort", abortRun, { once: true });
   try {
     const run = await agent.send(prompt);
+    activeRun = run;
     console.log(`[apm] Cursor run id=${run.id} agentId=${agent.agentId}`);
     for await (const event of run.stream()) {
+      if (signal?.aborted) {
+        abortRun();
+        throw new Error("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u4EFB\u52A1\u4E2D\u65AD");
+      }
       eventSession.addEvent(event);
-      const chunk = assistantStreamChunk(event);
       syncRemoteLog.schedule(eventSession);
     }
     await syncRemoteLog.flush(eventSession);
@@ -1345,6 +1415,7 @@ async function runCursorAgent(cfg, ctx) {
     }
     throw err;
   } finally {
+    signal?.removeEventListener("abort", abortRun);
     await agent[Symbol.asyncDispose]();
   }
 }
@@ -1361,7 +1432,9 @@ async function appendMessageContent(cfg, messageId, content) {
   await api.cli.appendMessageContent({ id: messageId, content });
   console.log(`[apm] \u5DF2\u8FFD\u52A0\u6D88\u606F\u5185\u5BB9: ${messageId}`);
 }
-async function handleInboundMessage(cfg, raw) {
+var SHUTDOWN_DRAIN_MS = 3e3;
+async function handleInboundMessage(cfg, raw, signal) {
+  if (signal.aborted) return;
   const parsed = parseAgentWsMessage(raw);
   if (parsed === null) {
     console.error("[apm] \u6536\u5230\u65E0\u6548 JSON");
@@ -1381,18 +1454,35 @@ async function handleInboundMessage(cfg, raw) {
   const msg = validated.data;
   const messageId = msg.messageId;
   try {
+    if (signal.aborted) return;
     await runBranch(msg.sessionId, { cwd: msg.workdir });
+    if (signal.aborted) return;
     await runPull(msg.sessionId, workspaceApmDir(msg.workdir));
+    if (signal.aborted) return;
     await commitWorkingTreeIfDirty(msg.workdir, "fix: apm pull");
+    if (signal.aborted) return;
     await updateMessageStatus(cfg, messageId, "TYPING");
-    await runCursorAgent(cfg, {
-      messageId: msg.messageId,
-      sessionId: msg.sessionId,
-      prompt: msg.content,
-      model: msg.model,
-      apiKey: msg.apiKey,
-      workdir: msg.workdir
-    });
+    await runCursorAgent(
+      cfg,
+      {
+        messageId: msg.messageId,
+        sessionId: msg.sessionId,
+        prompt: msg.content,
+        model: msg.model,
+        apiKey: msg.apiKey,
+        workdir: msg.workdir
+      },
+      { signal }
+    );
+    await syncSessionDocuments(
+      cfg,
+      msg.sessionId,
+      workspaceApmDir(msg.workdir)
+    );
+    await commitWorkingTreeIfDirty(
+      msg.workdir,
+      "chore(apm): sync session documents"
+    );
     await updateMessageStatus(cfg, messageId, "SUCCESS");
   } catch (err) {
     console.error(
@@ -1446,32 +1536,42 @@ async function runConnect(options) {
     const ws = new WebSocket(url);
     let stopHeartbeat;
     let shuttingDown = false;
+    const shutdownAbort = new AbortController();
     let inboundQueue = Promise.resolve();
-    const shutdown = (code = 0) => {
+    const shutdown = async (code = 0) => {
       if (shuttingDown) return;
       shuttingDown = true;
+      shutdownAbort.abort();
       stopHeartbeat?.();
       if (ws.readyState === WebSocket.OPEN || ws.readyState === WebSocket.CONNECTING) {
-        ws.close();
+        ws.terminate();
       }
-      resolve5();
-      if (code !== 0) {
-        process.exit(code);
+      try {
+        await Promise.race([
+          inboundQueue,
+          new Promise((r) => setTimeout(r, SHUTDOWN_DRAIN_MS))
+        ]);
+      } catch {
       }
+      resolve5();
+      process.exit(code);
     };
     ws.on("open", () => {
       console.log("[apm] WebSocket \u5DF2\u8FDE\u63A5");
       stopHeartbeat = startHeartbeat(ws, clientMachineId);
     });
     ws.on("message", (data) => {
+      if (shuttingDown) return;
       const text = Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
-      inboundQueue = inboundQueue.then(() => handleInboundMessage(cfg, text));
+      inboundQueue = inboundQueue.then(
+        () => handleInboundMessage(cfg, text, shutdownAbort.signal)
+      );
     });
     ws.on("close", (code, reason) => {
       console.log(
         `[apm] \u8FDE\u63A5\u5DF2\u65AD\u5F00 code=${code}${reason ? ` reason=${reason.toString()}` : ""}`
       );
-      shutdown();
+      void shutdown();
     });
     ws.on("error", (err) => {
       console.error("[apm] WebSocket \u9519\u8BEF:", err.message);
@@ -1479,9 +1579,11 @@ async function runConnect(options) {
     });
     process.on("SIGINT", () => {
       console.log("[apm] \u6B63\u5728\u5173\u95ED\u2026");
-      shutdown();
+      void shutdown();
+    });
+    process.on("SIGTERM", () => {
+      void shutdown();
     });
-    process.on("SIGTERM", () => shutdown());
   });
 }
 
@@ -1489,14 +1591,14 @@ async function runConnect(options) {
 import path5 from "node:path";
 
 // src/commands/deploy/internal/apm-config.ts
-import { existsSync as existsSync6, readFileSync as readFileSync6 } from "node:fs";
+import { existsSync as existsSync7, readFileSync as readFileSync6 } from "node:fs";
 import { resolve as resolve4 } from "node:path";
 function loadApmConfig(options) {
   const p = resolve4(
     process.cwd(),
     options?.configPath ?? resolve4(workspaceApmDir(), "apm.config.json")
   );
-  if (!existsSync6(p)) {
+  if (!existsSync7(p)) {
     console.error(`\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6\uFF1A${p}`);
     process.exit(1);
   }
@@ -1623,7 +1725,7 @@ import path4 from "node:path";
 import Docker from "dockerode";
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/connection-options.ts
-import { existsSync as existsSync7, readFileSync as readFileSync7 } from "node:fs";
+import { existsSync as existsSync8, readFileSync as readFileSync7 } from "node:fs";
 import path from "node:path";
 function asOptionalTlsBuffer(value) {
   if (typeof value !== "string") {
@@ -1635,7 +1737,7 @@ function asOptionalTlsBuffer(value) {
   if (normalized === "") {
     return void 0;
   }
-  if (existsSync7(normalized)) {
+  if (existsSync8(normalized)) {
     return readFileSync7(normalized);
   }
   const looksLikePath = /[\\/]/.test(normalized) || normalized.endsWith(".pem");
@@ -1846,7 +1948,7 @@ var DockerodeClient = class {
 var createDockerodeClient = (config) => new DockerodeClient(config);
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/env.ts
-import { existsSync as existsSync8, readFileSync as readFileSync8, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync9, readFileSync as readFileSync8, statSync as statSync4 } from "node:fs";
 import path2 from "node:path";
 function stripSurroundingQuotes(value) {
   const t = value.trim();
@@ -1863,7 +1965,7 @@ function loadEnvFromFile(envFilePath) {
     return {};
   }
   const targetPath = path2.resolve(envFilePath);
-  if (!existsSync8(targetPath) || !statSync4(targetPath).isFile()) {
+  if (!existsSync9(targetPath) || !statSync4(targetPath).isFile()) {
     return {};
   }
   const raw = readFileSync8(targetPath, "utf-8");
@@ -2037,12 +2139,12 @@ function dockerPushImage(params, cwd) {
 }
 
 // src/commands/deploy/internal/backend-deploy/resolve-dockerfile.ts
-import { existsSync as existsSync9 } from "node:fs";
+import { existsSync as existsSync10 } from "node:fs";
 import path3 from "node:path";
 function resolveDockerBuildPaths(cwd) {
   const dockerfilePath = path3.join(cwd, "Dockerfile");
   Logger.info(`\u67E5\u627EDockerfile\u6587\u4EF6\uFF0C\u8DEF\u5F84: ${dockerfilePath}`);
-  if (!existsSync9(dockerfilePath)) {
+  if (!existsSync10(dockerfilePath)) {
     throw new Error(`Dockerfile \u4E0D\u5B58\u5728\uFF1A${dockerfilePath}`);
   }
   Logger.info("\u2713 Dockerfile \u5B58\u5728");

package/package.json

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

package/template/rules/write_doc.md

@@ -18,9 +18,11 @@
 
 ## 在保存完成之后需要同步到远程
 
-同步命令: `apm sync-document <会话 ID> --file=<文档名称>
+通过 `apm connect` 连接平台时，每轮 Agent 结束后会自动推送 `docs/` 下变更的 Markdown，一般无需手动同步。
 
-示例: `apm sync-document <会话ID> --file=张三.md`
+手动同步命令: `apm sync-document <会话 ID> --file=<文档名称>`
+
+示例: `apm sync-document <会话ID> --file=张三-工作日志.md`
 
 ## 注意事项