ai-project-manage-cli 6.0.33 → 6.0.35

package/dist/index.js

@@ -1012,9 +1012,11 @@ async function runAppendMessage(options) {
 // src/commands/update-message-status.ts
 var VALID_STATUSES = [
   "CREATED",
+  "QUEUED",
   "TYPING",
   "SUCCESS",
-  "FAILED"
+  "FAILED",
+  "CANCELLED"
 ];
 async function runUpdateMessageStatus(options) {
   const messageId = options.id?.trim();
@@ -1052,25 +1054,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" };
-  }
-  const o = value;
-  const type = o.type;
-  if (type !== "heartbeat" && type !== "message") {
-    return { ok: false, reason: `\u672A\u77E5 type: ${String(type)}` };
+function validateHeartbeat(o) {
+  if (o.type !== "heartbeat") {
+    return { ok: false, reason: "\u671F\u671B heartbeat" };
   }
-  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 (!nonEmptyString(o.userId)) {
+    return { ok: false, reason: "heartbeat \u7F3A\u5C11 userId" };
   }
-  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 +1102,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 {
@@ -1496,6 +1519,54 @@ 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 markBranchDone(sessionId) {
+  lastBranchSessionId = sessionId;
+}
+function shouldRunPull(sessionId) {
+  const last = lastPullAtBySession.get(sessionId);
+  if (last == null) {
+    return true;
+  }
+  return Date.now() - last >= PULL_TTL_MS;
+}
+function markPullDone(sessionId) {
+  lastPullAtBySession.set(sessionId, Date.now());
+}
+
+// src/commands/connect/run-slot-pool.ts
+var DEFAULT_MAX_CONCURRENT = 2;
+function createRunSlotPool(maxConcurrent = DEFAULT_MAX_CONCURRENT) {
+  let active = 0;
+  const waiters = [];
+  const acquire = () => {
+    if (active < maxConcurrent) {
+      active += 1;
+      return Promise.resolve();
+    }
+    return new Promise((resolve5) => {
+      waiters.push(() => {
+        active += 1;
+        resolve5();
+      });
+    });
+  };
+  const release = () => {
+    active = Math.max(0, active - 1);
+    const next = waiters.shift();
+    if (next) {
+      next();
+    }
+  };
+  return { acquire, release };
+}
+
 // src/commands/connect.ts
 var HEARTBEAT_MS = 3e4;
 async function updateMessageStatus(cfg, messageId, status) {
@@ -1509,55 +1580,62 @@ 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) => {
+    const startedAt = Date.now();
     try {
-      return await fn();
+      const result = await fn();
+      console.log(`[apm] step=${step} elapsed=${Date.now() - startedAt}ms`);
+      return result;
     } catch (err) {
       const detail = err instanceof Error ? err.message : String(err);
       throw new Error(`[${step}] ${detail}`);
     }
   };
   try {
-    if (signal.aborted) return;
-    await runStep(
-      "branch",
-      () => runBranch(msg.sessionId, { cwd: msg.workdir })
-    );
-    if (signal.aborted) return;
-    await runStep(
-      "pull",
-      () => runPull(msg.sessionId, workspaceApmDir(msg.workdir))
-    );
-    if (signal.aborted) return;
-    await runStep(
-      "commit-pull",
-      () => commitWorkingTreeIfDirty(msg.workdir, "fix: apm pull")
-    );
     if (signal.aborted) return;
     await runStep(
       "status-typing",
       () => updateMessageStatus(cfg, messageId, "TYPING")
     );
+    if (shouldRunBranch(msg.sessionId)) {
+      if (signal.aborted) return;
+      await runStep(
+        "branch",
+        () => runBranch(msg.sessionId, { cwd: msg.workdir })
+      );
+      markBranchDone(msg.sessionId);
+    } else {
+      console.log(`[apm] step=branch skipped sessionId=${msg.sessionId}`);
+    }
+    let pullRan = false;
+    if (shouldRunPull(msg.sessionId)) {
+      if (signal.aborted) return;
+      await runStep(
+        "pull",
+        () => runPull(msg.sessionId, workspaceApmDir(msg.workdir))
+      );
+      markPullDone(msg.sessionId);
+      pullRan = true;
+    } else {
+      console.log(`[apm] step=pull skipped sessionId=${msg.sessionId}`);
+    }
+    if (pullRan) {
+      if (signal.aborted) return;
+      await runStep(
+        "commit-pull",
+        () => commitWorkingTreeIfDirty(msg.workdir, "fix: apm pull")
+      );
+    } else {
+      console.log(`[apm] step=commit-pull skipped sessionId=${msg.sessionId}`);
+    }
+    if (signal.aborted) return;
     await runStep(
       "cursor-agent",
       () => runCursorAgent(
@@ -1589,9 +1667,13 @@ 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
+      err instanceof Error ? err.message : String(err)
     );
     if (err instanceof Error && err.stack) {
       console.error(err.stack);
@@ -1643,7 +1725,10 @@ async function runConnect(options) {
     let stopHeartbeat;
     let shuttingDown = false;
     const shutdownAbort = new AbortController();
-    let inboundQueue = Promise.resolve();
+    const runSlots = createRunSlotPool();
+    const activeTasks = /* @__PURE__ */ new Set();
+    const activeRuns = /* @__PURE__ */ new Map();
+    const pendingCancels = /* @__PURE__ */ new Set();
     const shutdown = async (code = 0) => {
       if (shuttingDown) return;
       shuttingDown = true;
@@ -1659,7 +1744,7 @@ async function runConnect(options) {
       }
       try {
         await Promise.race([
-          inboundQueue,
+          Promise.all(activeTasks),
           new Promise((r) => setTimeout(r, SHUTDOWN_DRAIN_MS))
         ]);
       } catch {
@@ -1674,9 +1759,58 @@ 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
+      };
+      const task = (async () => {
+        await runSlots.acquire();
+        try {
+          await handleInboundMessage(cfg, msg, signal, ctx);
+        } finally {
+          runSlots.release();
+          activeRuns.delete(msg.messageId);
+          pendingCancels.delete(msg.messageId);
+        }
+      })();
+      activeTasks.add(task);
+      void task.finally(() => {
+        activeTasks.delete(task);
+      });
     });
     ws.on("close", (code, reason) => {
       console.log(
@@ -2891,7 +3025,10 @@ function buildProgram() {
   program.command("append-message").description("\u5411\u5E73\u53F0\u4F1A\u8BDD\u6D88\u606F\u8FFD\u52A0\u5185\u5BB9\uFF08PUT /api/v1/cli/messages/content\uFF09").requiredOption("--id <messageId>", "\u6D88\u606F ID").requiredOption("--content <content>", "\u8981\u8FFD\u52A0\u7684\u6D88\u606F\u5185\u5BB9").action(async (opts) => {
     await runAppendMessage(opts);
   });
-  program.command("update-message-status").description("\u66F4\u65B0\u5E73\u53F0\u4F1A\u8BDD\u6D88\u606F\u72B6\u6001").requiredOption("--id <messageId>", "\u6D88\u606F ID").requiredOption("--status <status>", "CREATED | TYPING | SUCCESS | FAILED").action(async (opts) => {
+  program.command("update-message-status").description("\u66F4\u65B0\u5E73\u53F0\u4F1A\u8BDD\u6D88\u606F\u72B6\u6001").requiredOption("--id <messageId>", "\u6D88\u606F ID").requiredOption(
+    "--status <status>",
+    "CREATED | QUEUED | TYPING | SUCCESS | FAILED | CANCELLED"
+  ).action(async (opts) => {
     await runUpdateMessageStatus(opts);
   });
   program.command("connect").description(

package/package.json

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

package/template/AGENTS.md

@@ -2,11 +2,24 @@
 
 ### 工作流程
 
-1. 读取 `.apm/sessions/<会话ID>/session.yaml`，必要时读取`messages.xml` 了解当前会话状态与历史消息
+按任务轻重选择路径：
+
+#### 轻量回复（被 @ 询问、确认、同步进展）
+
+1. 读取 `.apm/sessions/<会话ID>/session.yaml`
+2. 读取 `.apm/rules/reply.md`
+3. **立即**用 `apm append-message` 回复（可先简短确认，再补充）
+4. 按需阅读 `docs/` 下的文档，有进展继续 append-message
+
+#### 重任务（开发、写方案、评审、部署）
+
+1. 读取 `.apm/sessions/<会话ID>/session.yaml`，必要时读取 `messages.xml` 了解历史
 2. 根据你的名字从 `session.yaml` 的 `members` 中找到你对应的 **description**（智能体描述，非人设提示词）
 3. 根据角色描述完成用户指定的任务
-4. 任务有阶段行进展或者任务完成后必须回复消息(具体见规则 `reply.md`)
-5. 写工作日志(具体见规则 `write_doc.md`)
+4. 任务有阶段性进展或者任务完成后必须回复消息（具体见规则 `reply.md`）
+5. 写工作日志（具体见规则 `write_doc.md`）
+
+**禁止**在未回复前先读完所有 docs。有进展就先 append-message。
 
 ### 目录指引
 
@@ -23,5 +36,5 @@
   - 附件列表: `attachments/*`，当有文档中提及附件时，从这里查找
   - 协作规则: `RULE.md`，在这里可以看到不同成员的协作规则，从而找其他成员协助你一起解决问题，按需阅读
   - 协作 TODO: `TODO.md`，跨轮次任务清单（待办与已完成项），按需阅读
-  - 历史消息记录: `message.xml`，历史消息列表，数据量很大，按需阅读
+  - 历史消息记录: `messages.xml`，历史消息列表，数据量很大，按需阅读
   - 初始目标: `TASK.md`，最初的目标，不一定具体，团队成员会有人负责让这个任务变得具体，仅供参考。如果你是相关的角色，则你需要先读取这个目标，然后规划接下来的动作。

package/template/rules/reply.md

@@ -2,14 +2,14 @@
 
 1. 如果回复的内容包含文档地址，不要把前缀也写出来，直接用文档名称即可。例如: 我已经把待处理的内容更新到了 `PRD.md` 中，请查阅。
 2. 回复的内容并非对你工作的总结，要尽可能简洁，不要长篇大论，如果同步的内容确实较多，你可以先写文档，然后指引用户去阅读你写的文档。
-3. 只要你有任何进展都想都可以调用下面的命令进行回复，你可以一直补充内容。
+3. 只要你有任何进展都可以调用下面的命令进行回复，你可以一直补充内容。**被 @ 提及时，收到后必须先回复一句简短确认（不超过 50 字），再开始读文档或执行任务。**
 4. 如果有需要指定相关人，必须在消息内容中@指定出来
 
 ## 执行回复的方法
 
 命令: `apm append-message --id=<消息ID> --content=<你要回复的消息内容>`
 
-示例: apm append-message --id=xxxxx --content="我已经把待处理的内容更新到了 `PRD.md`，请查阅"
+示例: apm append-message --id=xxxxx --content="收到，正在分析后端改动范围。"
 
 ## 写文档的方法