ai-project-manage-cli 6.0.28 → 6.0.29

package/dist/index.js

@@ -1266,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;
@@ -1358,7 +1346,11 @@ var logCtx = (ctx, agentId) => ({
   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");
@@ -1388,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);
@@ -1413,6 +1415,7 @@ async function runCursorAgent(cfg, ctx) {
     }
     throw err;
   } finally {
+    signal?.removeEventListener("abort", abortRun);
     await agent[Symbol.asyncDispose]();
   }
 }
@@ -1429,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");
@@ -1449,18 +1454,26 @@ 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,
@@ -1523,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);
@@ -1556,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());
   });
 }
 

package/package.json

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