ai-project-manage-cli 7.0.7 → 7.0.9

package/dist/index.js

@@ -451,6 +451,18 @@ var requestConfig = {
       method: "PUT",
       path: "/cli/cursor-agent/questions"
     }),
+    listPendingCursorAgentResumes: defineEndpoint({
+      method: "GET",
+      path: "/cli/cursor-agent/resumes/pending"
+    }),
+    claimCursorAgentResume: defineEndpoint({
+      method: "PUT",
+      path: "/cli/cursor-agent/resumes/claim"
+    }),
+    completeCursorAgentResume: defineEndpoint({
+      method: "PUT",
+      path: "/cli/cursor-agent/resumes/complete"
+    }),
     upsertCursorLog: defineEndpoint({
       method: "PUT",
       path: "/cli/cursor-logs"
@@ -2276,8 +2288,19 @@ function createAskQuestionTool(handlers) {
         batchId: randomUUID(),
         ...validated.input
       };
+      try {
+        await handlers.onAskQuestion(batch);
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(
+          `[apm] AskQuestion \u63D0\u4EA4\u5931\u8D25 batchId=${batch.batchId}: ${message}`
+        );
+        return {
+          content: [{ type: "text", text: `\u63D0\u4EA4\u95EE\u9898\u5931\u8D25: ${message}` }],
+          isError: true
+        };
+      }
       batches.push(batch);
-      await handlers.onAskQuestion(batch);
       console.log(
         `[apm] AskQuestion \u5DF2\u63D0\u4EA4 batchId=${batch.batchId} questions=${batch.questions.length}`
       );
@@ -3022,14 +3045,33 @@ async function runMailboxCursorAgentResume(push, options) {
     return;
   }
   const api = createApmApiClient(options.cfg);
+  let activePush = push;
+  try {
+    const claimed = await api.cli.claimCursorAgentResume({
+      anchorId: push.anchorId
+    });
+    if (claimed) {
+      activePush = claimed;
+    }
+  } catch (err) {
+    console.error(
+      `[apm] \u8BA4\u9886\u7EED\u804A\u5931\u8D25 mailId=${push.anchorId}:`,
+      err instanceof Error ? err.message : err
+    );
+    return;
+  }
   let detail;
   try {
-    detail = await api.cli.getMailboxMessageDetail({ id: push.anchorId });
+    detail = await api.cli.getMailboxMessageDetail({ id: activePush.anchorId });
   } catch (err) {
     console.error(
-      `[apm] \u7EED\u804A\u83B7\u53D6\u4FE1\u4EF6\u8BE6\u60C5\u5931\u8D25 id=${push.anchorId}:`,
+      `[apm] \u7EED\u804A\u83B7\u53D6\u4FE1\u4EF6\u8BE6\u60C5\u5931\u8D25 id=${activePush.anchorId}:`,
       err instanceof Error ? err.message : err
     );
+    await api.cli.completeCursorAgentResume({
+      anchorId: activePush.anchorId,
+      status: "FAILED"
+    });
     return;
   }
   const {
@@ -3039,22 +3081,22 @@ async function runMailboxCursorAgentResume(push, options) {
   } = createMailReplyDraft({
     appendDraft: async (content) => {
       await api.cli.appendMailboxDraft({
-        id: push.draftReplyId,
+        id: activePush.draftReplyId,
         content
       });
     }
   });
-  const cursorMode = push.mode;
+  const cursorMode = activePush.mode;
   const submitQuestions = async (batch, ctx) => {
     await api.cli.createCursorAgentQuestions({
       anchorType: "mailbox",
-      anchorId: push.anchorId,
-      taskId: push.taskId,
+      anchorId: activePush.anchorId,
+      taskId: activePush.taskId,
       cursorAgentId: ctx.agentId,
-      draftReplyId: push.draftReplyId,
-      workdir: push.workdir,
-      model: push.model,
-      memberDisplayName: push.memberDisplayName,
+      draftReplyId: activePush.draftReplyId,
+      workdir: activePush.workdir,
+      model: activePush.model,
+      memberDisplayName: activePush.memberDisplayName,
       mode: cursorMode,
       batch
     });
@@ -3063,13 +3105,13 @@ async function runMailboxCursorAgentResume(push, options) {
     const result = await runCursorAgent(
       options.cfg,
       {
-        mailId: push.anchorId,
-        taskId: push.taskId,
-        prompt: push.prompt,
-        model: push.model,
+        mailId: activePush.anchorId,
+        taskId: activePush.taskId,
+        prompt: activePush.prompt,
+        model: activePush.model,
         apiKey: cursorApiKey,
-        workdir: push.workdir,
-        user: push.memberDisplayName,
+        workdir: activePush.workdir,
+        user: activePush.memberDisplayName,
         mode: cursorMode
       },
       {
@@ -3081,8 +3123,12 @@ async function runMailboxCursorAgentResume(push, options) {
     );
     if (result.hasPendingQuestions) {
       console.log(
-        `[apm] \u7EED\u804A\u540E\u4ECD\u6709\u5F85\u7B54 AskQuestion mailId=${push.anchorId}\uFF0C\u7B49\u5F85\u7528\u6237\u7B54\u9898`
+        `[apm] \u7EED\u804A\u540E\u4ECD\u6709\u5F85\u7B54 AskQuestion mailId=${activePush.anchorId}\uFF0C\u7B49\u5F85\u7528\u6237\u7B54\u9898`
       );
+      await api.cli.completeCursorAgentResume({
+        anchorId: activePush.anchorId,
+        status: "FAILED"
+      });
       return;
     }
     const replyContent = (hasReplyContent() ? getReplyContent() : result.assistantText).trim();
@@ -3091,69 +3137,133 @@ async function runMailboxCursorAgentResume(push, options) {
     }
     if (cursorMode === "plan" && result.createPlanContent) {
       saveMemberPlanDocument({
-        workdir: push.workdir,
-        taskId: push.taskId,
-        memberDisplayName: push.memberDisplayName,
+        workdir: activePush.workdir,
+        taskId: activePush.taskId,
+        memberDisplayName: activePush.memberDisplayName,
         content: result.createPlanContent
       });
     }
     await api.cli.completeMailboxMessage({
-      id: push.draftReplyId,
+      id: activePush.draftReplyId,
       status: "SUCCEEDED",
       replyContent
     });
-    markMailReplied(push.anchorId);
-    await syncTaskDocuments(options.cfg, push.taskId, push.workdir, {
-      api,
-      remoteDocuments: detail.documents
+    await api.cli.completeCursorAgentResume({
+      anchorId: activePush.anchorId,
+      status: "SUCCEEDED"
     });
-    console.log(`[apm] Cursor Agent \u7EED\u804A\u5B8C\u6210 mailId=${push.anchorId}`);
+    markMailReplied(activePush.anchorId);
+    await syncTaskDocuments(
+      options.cfg,
+      activePush.taskId,
+      activePush.workdir,
+      {
+        api,
+        remoteDocuments: detail.documents
+      }
+    );
+    console.log(`[apm] Cursor Agent \u7EED\u804A\u5B8C\u6210 mailId=${activePush.anchorId}`);
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     console.error(
-      `[apm] Cursor Agent \u7EED\u804A\u5931\u8D25 mailId=${push.anchorId}: ${message}`
+      `[apm] Cursor Agent \u7EED\u804A\u5931\u8D25 mailId=${activePush.anchorId}: ${message}`
     );
     try {
+      await api.cli.completeCursorAgentResume({
+        anchorId: activePush.anchorId,
+        status: "FAILED"
+      });
       await api.cli.completeMailboxMessage({
-        id: push.draftReplyId,
+        id: activePush.draftReplyId,
         status: "FAILED",
         error: message
       });
     } catch (completeErr) {
       console.error(
-        `[apm] \u6807\u8BB0\u7EED\u804A\u5931\u8D25\u72B6\u6001\u65F6\u51FA\u9519 mailId=${push.anchorId}:`,
+        `[apm] \u6807\u8BB0\u7EED\u804A\u5931\u8D25\u72B6\u6001\u65F6\u51FA\u9519 mailId=${activePush.anchorId}:`,
         completeErr instanceof Error ? completeErr.message : completeErr
       );
     }
-    markMailReplied(push.anchorId);
+    markMailReplied(activePush.anchorId);
   }
 }
 function createCursorAgentResumeHandler(options) {
   let running = false;
+  const queue = [];
+  const pump = () => {
+    if (running || options.signal.aborted || queue.length === 0) {
+      return;
+    }
+    const push = queue.shift();
+    running = true;
+    void runMailboxCursorAgentResume(push, options).catch((err) => {
+      console.error(
+        `[apm] Cursor Agent \u7EED\u804A\u5F02\u5E38 mailId=${push.anchorId}:`,
+        err instanceof Error ? err.message : err
+      );
+    }).finally(() => {
+      running = false;
+      pump();
+    });
+  };
   return {
-    receive(push) {
-      if (options.signal.aborted) {
+    syncPendingResumes(pushes) {
+      if (pushes.length === 0) {
         return;
       }
-      if (running) {
-        console.warn(
-          `[apm] \u5DF2\u6709 Cursor Agent \u7EED\u804A\u4EFB\u52A1\u8FDB\u884C\u4E2D\uFF0C\u5FFD\u7565 mailId=${push.anchorId}`
-        );
+      console.log(`[apm] \u540C\u6B65\u5F85\u7EED\u804A Cursor Agent ${pushes.length} \u4E2A`);
+      queue.push(...pushes);
+      pump();
+    },
+    receive(push) {
+      if (options.signal.aborted) {
         return;
       }
-      running = true;
-      void runMailboxCursorAgentResume(push, options).catch((err) => {
-        console.error(
-          `[apm] Cursor Agent \u7EED\u804A\u5F02\u5E38 mailId=${push.anchorId}:`,
-          err instanceof Error ? err.message : err
-        );
-      }).finally(() => {
-        running = false;
-      });
+      queue.push(push);
+      pump();
     }
   };
 }
 
+// src/commands/connect/cursor-agent-resume-sync.ts
+function parsePendingResume(value) {
+  if (typeof value !== "object" || value === null) {
+    return null;
+  }
+  const row = value;
+  if (row.type !== "cursor_agent_resume" || row.anchorType !== "mailbox" || typeof row.anchorId !== "string" || typeof row.taskId !== "string" || typeof row.cursorAgentId !== "string" || typeof row.draftReplyId !== "string" || typeof row.workdir !== "string" || typeof row.model !== "string" || typeof row.memberDisplayName !== "string" || typeof row.prompt !== "string") {
+    return null;
+  }
+  const mode = row.mode;
+  if (mode !== "plan" && mode !== "agent") {
+    return null;
+  }
+  return {
+    type: "cursor_agent_resume",
+    anchorType: "mailbox",
+    anchorId: row.anchorId,
+    taskId: row.taskId,
+    cursorAgentId: row.cursorAgentId,
+    draftReplyId: row.draftReplyId,
+    workdir: row.workdir,
+    model: row.model,
+    memberDisplayName: row.memberDisplayName,
+    mode,
+    prompt: row.prompt
+  };
+}
+async function fetchPendingCursorAgentResumes(cfg) {
+  const api = createApmApiClient(cfg);
+  const list = await api.cli.listPendingCursorAgentResumes({});
+  if (!Array.isArray(list)) {
+    return [];
+  }
+  return list.flatMap((item) => {
+    const resume = parsePendingResume(item);
+    return resume ? [resume] : [];
+  });
+}
+
 // src/commands/connect/mail-sync.ts
 function parsePendingMail(value) {
   if (typeof value !== "object" || value === null) {
@@ -3288,6 +3398,8 @@ async function runConnect(options) {
           }
           const mails = await fetchPendingMails(cfg);
           mailProcessor.syncPendingMails(mails);
+          const pendingResumes = await fetchPendingCursorAgentResumes(cfg);
+          cursorAgentResumeHandler.syncPendingResumes(pendingResumes);
         } catch (err) {
           console.error(
             "[apm] \u8FDE\u63A5\u540E\u521D\u59CB\u5316\u5931\u8D25:",

package/package.json

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