ai-project-manage-cli 6.0.33 → 6.0.34

package/dist/index.js

@@ -1014,7 +1014,8 @@ var VALID_STATUSES = [
   "CREATED",
   "TYPING",
   "SUCCESS",
-  "FAILED"
+  "FAILED",
+  "CANCELLED"
 ];
 async function runUpdateMessageStatus(options) {
   const messageId = options.id?.trim();
@@ -1052,25 +1053,17 @@ function parseAgentWsMessage(raw) {
 function serializeAgentWsMessage(msg) {
   return JSON.stringify(msg);
 }
-function validateAgentWsMessage(value, kind) {
-  if (typeof value !== "object" || value === null) {
-    return { ok: false, reason: "\u6D88\u606F\u4F53\u4E0D\u662F JSON \u5BF9\u8C61" };
+function validateHeartbeat(o) {
+  if (o.type !== "heartbeat") {
+    return { ok: false, reason: "\u671F\u671B heartbeat" };
   }
-  const o = value;
-  const type = o.type;
-  if (type !== "heartbeat" && type !== "message") {
-    return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
+  if (!nonEmptyString(o.userId)) {
+    return { ok: false, reason: "heartbeat \u7F3A\u5C11 userId" };
   }
-  if (kind === "heartbeat" || type === "heartbeat") {
-    if (type !== "heartbeat") {
-      return { ok: false, reason: "\u671F\u671B heartbeat" };
-    }
-    if (!nonEmptyString(o.userId)) {
-      return { ok: false, reason: "heartbeat \u7F3A\u5C11 userId" };
-    }
-    return { ok: true, data: { type: "heartbeat", userId: o.userId.trim() } };
-  }
-  if (type !== "message") {
+  return { ok: true, data: { type: "heartbeat", userId: o.userId.trim() } };
+}
+function validateMessagePush(o) {
+  if (o.type !== "message") {
     return { ok: false, reason: "\u671F\u671B message" };
   }
   if (!nonEmptyString(o.messageId)) {
@@ -1108,6 +1101,35 @@ function validateAgentWsMessage(value, kind) {
     }
   };
 }
+function validateCancel(o) {
+  if (o.type !== "cancel") {
+    return { ok: false, reason: "\u671F\u671B cancel" };
+  }
+  if (!nonEmptyString(o.messageId)) {
+    return { ok: false, reason: "cancel \u7F3A\u5C11 messageId" };
+  }
+  return {
+    ok: true,
+    data: { type: "cancel", messageId: o.messageId.trim() }
+  };
+}
+function validateAgentWsMessage(value, kind) {
+  if (typeof value !== "object" || value === null) {
+    return { ok: false, reason: "\u6D88\u606F\u4F53\u4E0D\u662F JSON \u5BF9\u8C61" };
+  }
+  const o = value;
+  const type = o.type;
+  if (type !== "heartbeat" && type !== "message" && type !== "cancel") {
+    return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
+  }
+  if (kind === "heartbeat" || type === "heartbeat") {
+    return validateHeartbeat(o);
+  }
+  if (type === "cancel") {
+    return validateCancel(o);
+  }
+  return validateMessagePush(o);
+}
 
 // src/commands/connect/abort-signal-debug.ts
 import {
@@ -1509,25 +1531,12 @@ async function setMessageError(cfg, messageId, error) {
   console.log(`[apm] \u5DF2\u8BBE\u7F6E\u6D88\u606F\u9519\u8BEF: ${messageId}`);
 }
 var SHUTDOWN_DRAIN_MS = 3e3;
-async function handleInboundMessage(cfg, raw, signal) {
+function isUserCancelled(ctx) {
+  return ctx.perMessageSignal.aborted && !ctx.shutdownSignal.aborted;
+}
+async function handleInboundMessage(cfg, msg, signal, ctx) {
+  if (isUserCancelled(ctx)) return;
   if (signal.aborted) return;
-  const parsed = parseAgentWsMessage(raw);
-  if (parsed === null) {
-    console.error("[apm] \u6536\u5230\u65E0\u6548 JSON");
-    return;
-  }
-  if (typeof parsed === "object" && parsed !== null && parsed.type === "heartbeat") {
-    return;
-  }
-  const validated = validateAgentWsMessage(parsed, "outbound");
-  if (!validated.ok) {
-    console.error(`[apm] \u6536\u5230\u65E0\u6548 message: ${validated.reason}`);
-    return;
-  }
-  if (validated.data.type !== "message") {
-    return;
-  }
-  const msg = validated.data;
   const messageId = msg.messageId;
   const runStep = async (step, fn) => {
     try {
@@ -1589,6 +1598,10 @@ async function handleInboundMessage(cfg, raw, signal) {
       () => updateMessageStatus(cfg, messageId, "SUCCESS")
     );
   } catch (err) {
+    if (isUserCancelled(ctx)) {
+      console.log(`[apm] \u6D88\u606F\u5DF2\u7EC8\u6B62 messageId=${messageId}`);
+      return;
+    }
     console.error(
       "[apm] \u5904\u7406\u6D88\u606F\u5931\u8D25:",
       err instanceof Error ? err.message : err
@@ -1644,6 +1657,8 @@ async function runConnect(options) {
     let shuttingDown = false;
     const shutdownAbort = new AbortController();
     let inboundQueue = Promise.resolve();
+    const activeRuns = /* @__PURE__ */ new Map();
+    const pendingCancels = /* @__PURE__ */ new Set();
     const shutdown = async (code = 0) => {
       if (shuttingDown) return;
       shuttingDown = true;
@@ -1674,9 +1689,48 @@ async function runConnect(options) {
     ws.on("message", (data) => {
       if (shuttingDown) return;
       const text = Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
-      inboundQueue = inboundQueue.then(
-        () => handleInboundMessage(cfg, text, shutdownAbort.signal)
-      );
+      const parsed = parseAgentWsMessage(text);
+      if (parsed === null) {
+        console.error("[apm] \u6536\u5230\u65E0\u6548 JSON");
+        return;
+      }
+      if (typeof parsed === "object" && parsed !== null && parsed.type === "heartbeat") {
+        return;
+      }
+      const validated = validateAgentWsMessage(parsed, "outbound");
+      if (!validated.ok) {
+        console.error(`[apm] \u6536\u5230\u65E0\u6548 WS \u5305: ${validated.reason}`);
+        return;
+      }
+      if (validated.data.type === "cancel") {
+        const { messageId } = validated.data;
+        pendingCancels.add(messageId);
+        activeRuns.get(messageId)?.abort();
+        return;
+      }
+      if (validated.data.type !== "message") {
+        return;
+      }
+      const msg = validated.data;
+      const perMessageController = new AbortController();
+      activeRuns.set(msg.messageId, perMessageController);
+      if (pendingCancels.has(msg.messageId)) {
+        activeRuns.delete(msg.messageId);
+        pendingCancels.delete(msg.messageId);
+        return;
+      }
+      const signal = AbortSignal.any([
+        shutdownAbort.signal,
+        perMessageController.signal
+      ]);
+      const ctx = {
+        shutdownSignal: shutdownAbort.signal,
+        perMessageSignal: perMessageController.signal
+      };
+      inboundQueue = inboundQueue.then(() => handleInboundMessage(cfg, msg, signal, ctx)).finally(() => {
+        activeRuns.delete(msg.messageId);
+        pendingCancels.delete(msg.messageId);
+      });
     });
     ws.on("close", (code, reason) => {
       console.log(

package/package.json

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