ai-project-manage-cli 5.0.17 → 5.0.19

package/dist/index.js

@@ -231,10 +231,12 @@ var requestConfig = {
       method: "GET",
       path: "/cli/documents"
     }),
-    listAttachments: defineEndpoint({
-      method: "GET",
-      path: "/cli/attachments"
-    }),
+    listAttachments: defineEndpoint(
+      {
+        method: "GET",
+        path: "/cli/attachments"
+      }
+    ),
     upsertDocument: defineEndpoint({
       method: "PUT",
       path: "/cli/documents/upsert"
@@ -243,6 +245,10 @@ var requestConfig = {
       method: "PUT",
       path: "/cli/messages/content"
     }),
+    upsertCursorMessageLog: defineEndpoint({
+      method: "PUT",
+      path: "/cli/cursor-message-logs"
+    }),
     updateMessageStatus: defineEndpoint({
       method: "PUT",
       path: "/cli/messages/status"
@@ -1040,66 +1046,268 @@ function validateAgentWsMessage(value, kind) {
 }
 
 // src/commands/connect/cursor-agent.ts
-import { resolve as resolve3 } from "path";
 import { Agent, CursorAgentError } from "@cursor/sdk";
-var DEFAULT_CURSOR_MODEL = "default";
-function resolveModelId(model) {
-  const id = model.trim();
-  return id || DEFAULT_CURSOR_MODEL;
-}
-function buildPrompt(ctx) {
-  const lines = [
-    `\u4F60\u662F${ctx.user}`,
-    `\u4F1A\u8BDDID: ${ctx.sessionId}`,
-    `\u6D88\u606FID: ${ctx.messageId}`,
-    `\u4EFB\u52A1: ${ctx.content}`,
-    `\u8BF7\u5148\u9605\u8BFBAPM\u6307\u5357\uFF1A [AGENTS.md](.apm/AGENTS.md)\uFF0C\u4E25\u683C\u6309\u7167\u6307\u5357\u7684\u5DE5\u4F5C\u6D41\u7A0B\u5B8C\u6210\u4EFB\u52A1`
-  ];
-  return lines.join("\n");
-}
-function extractAssistantTextFromStream(event) {
-  if (event.type !== "assistant") {
-    return "";
+import { resolve as resolve3 } from "path";
+
+// src/session-utils.ts
+var EventSession = class {
+  events = [];
+  constructor(prompt) {
+    this.events.push({
+      type: "input",
+      content: prompt
+    });
+  }
+  addEvent(event) {
+    const latestEvent = this.events[this.events.length - 1];
+    const formatedEvent = this.formatEvent(event);
+    if (!formatedEvent) {
+      return;
+    }
+    if (formatedEvent.type === "tool_call") {
+      const existingToolCall = this.events.find(
+        (e) => e.type === "tool_call" && e.call_id === formatedEvent.call_id
+      );
+      if (existingToolCall) {
+        existingToolCall.args = formatedEvent.args;
+        existingToolCall.result = formatedEvent.result;
+        existingToolCall.status = formatedEvent.status;
+        return;
+      }
+      this.events.push(formatedEvent);
+      return;
+    }
+    if (formatedEvent.type === "status") {
+      return;
+    }
+    if (formatedEvent.type === "request") {
+      this.events.push(formatedEvent);
+      return;
+    }
+    if (latestEvent?.type === formatedEvent.type) {
+      switch (formatedEvent.type) {
+        case "assistant":
+          latestEvent.content += formatedEvent.content;
+          break;
+        case "thinking":
+          latestEvent.content += formatedEvent.content;
+          break;
+        case "task":
+          latestEvent.status = formatedEvent.status;
+          latestEvent.text = formatedEvent.text;
+          break;
+      }
+      return;
+    }
+    this.events.push(formatedEvent);
+  }
+  formatEvent(event) {
+    switch (event.type) {
+      case "assistant": {
+        let content = "";
+        for (const block of event.message.content) {
+          if (block.type === "text" && block.text) {
+            content += block.text;
+          }
+        }
+        return {
+          type: "assistant",
+          content: content || event.content || ""
+        };
+      }
+      case "thinking":
+        return {
+          type: "thinking",
+          content: event.text || event.content || ""
+        };
+      case "tool_call":
+        return {
+          type: "tool_call",
+          args: event.args,
+          result: event.result,
+          status: event.status,
+          call_id: event.call_id,
+          name: event.name
+        };
+      case "task":
+        return {
+          type: "task",
+          status: event.status,
+          text: event.text
+        };
+      case "request":
+        return {
+          ...event,
+          type: "request"
+        };
+      case "status":
+        return { type: "status", status: event.status, message: event.message };
+    }
+  }
+  /** 合并所有 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");
   }
-  const msg = event.message;
-  if (!msg?.content) {
+};
+
+// src/commands/connect/cursor-message-log.ts
+function assistantStreamChunk(event) {
+  if (event.type !== "assistant") {
     return "";
   }
   let text = "";
-  for (const block of msg.content) {
+  for (const block of event.message.content) {
     if (block.type === "text" && block.text) {
       text += block.text;
     }
   }
   return text;
 }
-async function runCursorAgent(_cfg, ctx) {
+var CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS = 2e3;
+function createThrottledCursorMessageLogSync(cfg, ctx, onError) {
+  let lastRunAt = 0;
+  let timer;
+  let latestSession;
+  const execute = async () => {
+    const session = latestSession;
+    if (!session) {
+      return;
+    }
+    lastRunAt = Date.now();
+    try {
+      await syncCursorMessageLog(cfg, ctx, session);
+    } catch (err) {
+      onError(err);
+    }
+  };
+  return {
+    schedule(session) {
+      latestSession = session;
+      const now = Date.now();
+      const elapsed = now - lastRunAt;
+      if (elapsed >= CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS) {
+        if (timer) {
+          clearTimeout(timer);
+          timer = void 0;
+        }
+        void execute();
+        return;
+      }
+      if (timer) {
+        return;
+      }
+      timer = setTimeout(() => {
+        timer = void 0;
+        void execute();
+      }, CURSOR_MESSAGE_LOG_SYNC_INTERVAL_MS - elapsed);
+    },
+    async flush(session) {
+      latestSession = session;
+      if (timer) {
+        clearTimeout(timer);
+        timer = void 0;
+      }
+      await execute();
+    }
+  };
+}
+async function syncCursorMessageLog(cfg, ctx, session) {
+  const agentId = ctx.agentId.trim();
+  const data = session.resolveLogContent().trim();
+  if (!agentId || !data) {
+    return;
+  }
+  const api = createApmApiClient(cfg);
+  await api.cli.upsertCursorMessageLog({
+    sessionId: ctx.sessionId,
+    messageId: ctx.messageId,
+    agentId,
+    data
+  });
+}
+
+// src/commands/connect/cursor-agent.ts
+var logCtx = (ctx, agentId) => ({
+  sessionId: ctx.sessionId,
+  messageId: ctx.messageId,
+  agentId
+});
+async function runCursorAgent(cfg, ctx) {
   const apiKey = ctx.apiKey.trim();
   if (!apiKey) {
     throw new Error("\u7F3A\u5C11 apiKey\uFF0C\u65E0\u6CD5\u8C03\u7528 Cursor SDK");
   }
   const cwd = resolve3(ctx.workdir);
-  const prompt = buildPrompt(ctx);
+  const prompt = ctx.prompt;
   console.log(
     `[apm] Cursor Agent \u5F00\u59CB messageId=${ctx.messageId} sessionId=${ctx.sessionId} cwd=${cwd}`
   );
   const agent = await Agent.create({
     apiKey,
-    model: { id: resolveModelId(ctx.model) },
+    model: { id: ctx.model || "default" },
     local: {
       cwd,
       settingSources: []
     }
   });
+  const eventSession = new EventSession(prompt);
+  const remoteLogCtx = logCtx(ctx, agent.agentId);
+  const syncRemoteLog = createThrottledCursorMessageLogSync(
+    cfg,
+    remoteLogCtx,
+    (err) => {
+      console.warn(
+        "[apm] \u540C\u6B65 Cursor \u6D88\u606F\u65E5\u5FD7\u5931\u8D25:",
+        err instanceof Error ? err.message : err
+      );
+    }
+  );
   try {
     const run = await agent.send(prompt);
     console.log(`[apm] Cursor run id=${run.id} agentId=${agent.agentId}`);
     for await (const event of run.stream()) {
-      const chunk = extractAssistantTextFromStream(event);
+      eventSession.addEvent(event);
+      const chunk = assistantStreamChunk(event);
       if (chunk) {
         process.stdout.write(chunk);
       }
+      syncRemoteLog.schedule(eventSession);
     }
+    await syncRemoteLog.flush(eventSession);
     const result = await run.wait();
     if (result.status === "error") {
       throw new Error(`Cursor run \u5931\u8D25: ${result.id}`);
@@ -1159,11 +1367,10 @@ async function handleInboundMessage(cfg, raw) {
     await runCursorAgent(cfg, {
       messageId: msg.messageId,
       sessionId: msg.sessionId,
-      content: msg.content,
+      prompt: msg.content,
       model: msg.model,
       apiKey: msg.apiKey,
-      workdir: msg.workdir,
-      user: msg.user
+      workdir: msg.workdir
     });
     await updateMessageStatus(cfg, messageId, "SUCCESS");
   } catch (err) {

package/package.json

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