ai-project-manage-cli 5.0.19 → 5.0.21

package/dist/index.js

@@ -483,10 +483,9 @@ async function runBranch(sessionId, options = {}) {
     workdirPath
   });
   if (!baseline.repositoryId) {
-    throw new Error(
-      `[apm] \u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}
-\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`
-    );
+    const detail = baseline.diagnostic?.message ?? `\u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}\uFF08\u89C4\u8303\u5316\uFF1A${baseline.workdirPath}\uFF09
+\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`;
+    throw new Error(`[apm] ${detail}`);
   }
   const baselineBranch = (baseline.defaultBranch ?? "").trim();
   if (!baselineBranch) {
@@ -1050,13 +1049,19 @@ import { Agent, CursorAgentError } from "@cursor/sdk";
 import { resolve as resolve3 } from "path";
 
 // src/session-utils.ts
+import { formatCursorMessageLogEvent } from "@opc/shared";
 var EventSession = class {
   events = [];
+  dirtyIndices = /* @__PURE__ */ new Set();
   constructor(prompt) {
     this.events.push({
       type: "input",
       content: prompt
     });
+    this.markDirty(0);
+  }
+  markDirty(index) {
+    this.dirtyIndices.add(index);
   }
   addEvent(event) {
     const latestEvent = this.events[this.events.length - 1];
@@ -1065,16 +1070,19 @@ var EventSession = class {
       return;
     }
     if (formatedEvent.type === "tool_call") {
-      const existingToolCall = this.events.find(
+      const existingIndex = this.events.findIndex(
         (e) => e.type === "tool_call" && e.call_id === formatedEvent.call_id
       );
-      if (existingToolCall) {
+      if (existingIndex >= 0) {
+        const existingToolCall = this.events[existingIndex];
         existingToolCall.args = formatedEvent.args;
         existingToolCall.result = formatedEvent.result;
         existingToolCall.status = formatedEvent.status;
+        this.markDirty(existingIndex);
         return;
       }
       this.events.push(formatedEvent);
+      this.markDirty(this.events.length - 1);
       return;
     }
     if (formatedEvent.type === "status") {
@@ -1082,6 +1090,7 @@ var EventSession = class {
     }
     if (formatedEvent.type === "request") {
       this.events.push(formatedEvent);
+      this.markDirty(this.events.length - 1);
       return;
     }
     if (latestEvent?.type === formatedEvent.type) {
@@ -1097,9 +1106,11 @@ var EventSession = class {
           latestEvent.text = formatedEvent.text;
           break;
       }
+      this.markDirty(this.events.length - 1);
       return;
     }
     this.events.push(formatedEvent);
+    this.markDirty(this.events.length - 1);
   }
   formatEvent(event) {
     switch (event.type) {
@@ -1144,43 +1155,29 @@ var EventSession = class {
         return { type: "status", status: event.status, message: event.message };
     }
   }
+  getDirtyEvents() {
+    return [...this.dirtyIndices].sort((a, b) => a - b).map((index) => {
+      const event = this.events[index];
+      return {
+        index,
+        type: event.type,
+        data: JSON.stringify(event)
+      };
+    });
+  }
+  clearDirty(indices) {
+    for (const index of indices) {
+      this.dirtyIndices.delete(index);
+    }
+  }
   /** 合并所有 assistant 片段，供剧场成员回传等场景使用 */
   getAssistantText() {
     return this.events.filter((e) => e.type === "assistant").map((e) => String(e.content ?? "")).join("\n").trim();
   }
   resolveLogContent() {
-    return this.events.map((event) => {
-      const type = event.type;
-      const content = (function(type2) {
-        if (type2 === "input") {
-          return `## \u7528\u6237\u8F93\u5165
-
-${event.content}
-`;
-        }
-        if (type2 === "assistant") {
-          return `## \u6A21\u578B\u8F93\u51FA
-
-${event.content}
-`;
-        }
-        if (type2 === "thinking") {
-          return `## \u6A21\u578B\u601D\u8003
-
-${event.content}
-`;
-        }
-        if (type2 === "tool_call") {
-          return "````toolcall\n" + JSON.stringify(event, null, 2) + "\n````\n";
-        }
-        return `## \u672A\u77E5\u4E8B\u4EF6\uFF1A${type2}
-
-\`\`\`json
-${JSON.stringify(event, null, 2)}
-\`\`\``;
-      })(type);
-      return content;
-    }).join("\n");
+    return this.events.map(
+      (event) => formatCursorMessageLogEvent(event.type, JSON.stringify(event))
+    ).join("\n");
   }
 };
 
@@ -1202,14 +1199,15 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
   let lastRunAt = 0;
   let timer;
   let latestSession;
-  const execute = async () => {
-    const session = latestSession;
-    if (!session) {
+  const syncDirtyEvents = async (session) => {
+    const events = session.getDirtyEvents();
+    if (events.length === 0) {
       return;
     }
     lastRunAt = Date.now();
     try {
-      await syncCursorMessageLog(cfg, ctx, session);
+      await syncCursorMessageLog(cfg, ctx, events);
+      session.clearDirty(events.map((event) => event.index));
     } catch (err) {
       onError(err);
     }
@@ -1224,7 +1222,7 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
           clearTimeout(timer);
           timer = void 0;
         }
-        void execute();
+        void syncDirtyEvents(session);
         return;
       }
       if (timer) {
@@ -1232,7 +1230,7 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
       }
       timer = setTimeout(() => {
         timer = void 0;
-        void execute();
+        void syncDirtyEvents(latestSession);
       }, CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS - elapsed);
     },
     async flush(session) {
@@ -1241,14 +1239,13 @@ function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
         clearTimeout(timer);
         timer = void 0;
       }
-      await execute();
+      await syncDirtyEvents(session);
     }
   };
 }
-async function syncCursorMessageLog(cfg, ctx, session) {
+async function syncCursorMessageLog(cfg, ctx, events) {
   const agentId = ctx.agentId.trim();
-  const data = session.resolveLogContent().trim();
-  if (!agentId || !data) {
+  if (!agentId || events.length === 0) {
     return;
   }
   const api = createApmApiClient(cfg);
@@ -1256,7 +1253,7 @@ async function syncCursorMessageLog(cfg, ctx, session) {
     sessionId: ctx.sessionId,
     messageId: ctx.messageId,
     agentId,
-    data
+    events
   });
 }
 
@@ -1302,9 +1299,6 @@ async function runCursorAgent(cfg, ctx) {
     for await (const event of run.stream()) {
       eventSession.addEvent(event);
       const chunk = assistantStreamChunk(event);
-      if (chunk) {
-        process.stdout.write(chunk);
-      }
       syncRemoteLog.schedule(eventSession);
     }
     await syncRemoteLog.flush(eventSession);
@@ -1425,6 +1419,7 @@ async function runConnect(options) {
     const ws = new WebSocket(url);
     let stopHeartbeat;
     let shuttingDown = false;
+    let inboundQueue = Promise.resolve();
     const shutdown = (code = 0) => {
       if (shuttingDown) return;
       shuttingDown = true;
@@ -1443,7 +1438,7 @@ async function runConnect(options) {
     });
     ws.on("message", (data) => {
       const text = Buffer.isBuffer(data) ? data.toString("utf8") : String(data);
-      void handleInboundMessage(cfg, text);
+      inboundQueue = inboundQueue.then(() => handleInboundMessage(cfg, text));
     });
     ws.on("close", (code, reason) => {
       console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "5.0.19",
+  "version": "5.0.21",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,
@@ -29,7 +29,8 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@cursor/sdk": "~1.0.17",
+    "@cursor/sdk": "~1.0.18",
+    "@opc/shared": "workspace:*",
     "ws": "~8.18.0",
     "listpage-http": "~0.0.318",
     "commander": "~14.0.3",
@@ -37,4 +38,4 @@
     "minio": "~8.0.7",
     "dockerode": "~5.0.0"
   }
-}
+}

package/template/rules/reply.md

@@ -3,6 +3,7 @@
 1. 如果回复的内容包含文档地址，不要把前缀也写出来，直接用文档名称即可。例如: 我已经把待处理的内容更新到了 `PRD.md` 中，请查阅。
 2. 回复的内容并非对你工作的总结，要尽可能简洁，不要长篇大论，如果同步的内容确实较多，你可以先写文档，然后指引用户去阅读你写的文档。
 3. 只要你有任何进展都想都可以调用下面的命令进行回复，你可以一直补充内容。
+4. 如果有需要指定相关人，必须在消息内容中@指定出来
 
 ## 执行回复的方法