ai-project-manage-cli 7.1.24 → 7.1.26

package/dist/index.js

@@ -8448,6 +8448,7 @@ async function runCursorAgent(cfg, ctx, options) {
       result: result.result,
       durationMs: result.durationMs,
       usage: result.usage,
+      modelId: result.model?.id?.trim() || ctx.model?.trim() || void 0,
       assistantText: eventSession.getAssistantText(),
       createPlan: eventSession.getCreatePlanContent(),
       artifacts,

package/dist/webide-message-worker.js

@@ -2457,6 +2457,7 @@ async function runCursorAgent(cfg, ctx, options) {
       result: result.result,
       durationMs: result.durationMs,
       usage: result.usage,
+      modelId: result.model?.id?.trim() || ctx.model?.trim() || void 0,
       assistantText: eventSession.getAssistantText(),
       createPlan: eventSession.getCreatePlanContent(),
       artifacts,
@@ -2751,12 +2752,13 @@ function createThrottledWebIdeMessageLogSync(cfg, ctx, onError) {
     syncChain = syncChain.then(() => drainDirtyEvents(session));
   };
   return {
-    async markRun(runId, runStatus, lastError) {
+    async markRun(runId, runStatus, lastError, tokenUsage) {
       try {
         await upsertLogHeader(cfg, ctx, {
           runId,
           runStatus,
-          lastError: lastError ?? null
+          lastError: lastError ?? null,
+          ...tokenUsage ? { tokenUsage } : {}
         });
       } catch (err) {
         onError(err);
@@ -3284,9 +3286,33 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
       ]
     };
   }
+  let projectBaseBranch = "";
+  try {
+    const baseline = await api.cli.projectBaseBranch({ taskId });
+    projectBaseBranch = baseline.baseBranch?.trim() ?? "";
+  } catch (err) {
+    const tip = `\u8BFB\u53D6\u9879\u76EE\u57FA\u7EBF\u5206\u652F\u5931\u8D25: ${err instanceof Error ? err.message : err}`;
+    console.warn(`[apm] WebIDE PR\uFF1A${tip}`);
+    return {
+      ...empty(),
+      failed: 1,
+      tips: [tip],
+      items: [{ label: "\u5DE5\u4F5C\u533A", outcome: "failed", detail: tip }]
+    };
+  }
+  if (!projectBaseBranch) {
+    const tip = "\u9879\u76EE\u672A\u914D\u7F6E\u57FA\u7840\u5206\u652F\uFF0C\u65E0\u6CD5\u6309\u57FA\u7EBF\u5339\u914D\u5E73\u53F0\u4ED3\u5E93";
+    console.warn(`[apm] WebIDE PR\uFF1A${tip}`);
+    return {
+      ...empty(),
+      failed: 1,
+      tips: [tip],
+      items: [{ label: "\u5DE5\u4F5C\u533A", outcome: "failed", detail: tip }]
+    };
+  }
   const expectedHead = `feat/task-${taskId}`;
   console.log(
-    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u68C0\u67E5 ${repoRoots.length} \u4E2A\u4ED3\u5E93\uFF08\u671F\u671B\u7279\u6027\u5206\u652F ${expectedHead}\uFF09`
+    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u68C0\u67E5 ${repoRoots.length} \u4E2A\u4ED3\u5E93\uFF08\u671F\u671B\u7279\u6027\u5206\u652F ${expectedHead}\uFF0C\u9879\u76EE\u57FA\u7EBF ${projectBaseBranch}\uFF09`
   );
   let ensured = 0;
   let skipped = 0;
@@ -3339,10 +3365,13 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
         });
         continue;
       }
-      const matched = await api.cli.matchRepository({ url: originUrl });
+      const matched = await api.cli.matchRepository({
+        url: originUrl,
+        baseBranch: projectBaseBranch
+      });
       const repositoryId = matched.repositoryId?.trim();
       if (!repositoryId) {
-        const tip = `${label}\uFF1A\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}`;
+        const tip = `${label}\uFF1A\u5E73\u53F0\u672A\u627E\u5230\u4ED3\u5E93\uFF08remote=${originUrl}\uFF0C\u57FA\u7EBF=${projectBaseBranch}\uFF09`;
         console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${tip}`);
         tips.push(tip);
         skipped += 1;
@@ -3350,6 +3379,7 @@ async function ensureWebIdePullRequests(cfg, taskId, workdir) {
           label,
           outcome: "skipped",
           headBranch,
+          baseBranch: projectBaseBranch,
           detail: tip
         });
         continue;
@@ -3876,16 +3906,35 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
       }
     );
     saveWebIdeAgentId(workdir, taskId, outcome.agentId);
+    const tokenUsage = outcome.usage != null ? {
+      modelId: outcome.modelId ?? (msg.model?.trim() || void 0),
+      inputTokens: outcome.usage.inputTokens,
+      outputTokens: outcome.usage.outputTokens,
+      cacheReadTokens: outcome.usage.cacheReadTokens,
+      cacheWriteTokens: outcome.usage.cacheWriteTokens,
+      totalTokens: outcome.usage.totalTokens,
+      ...outcome.usage.reasoningTokens != null ? { reasoningTokens: outcome.usage.reasoningTokens } : {}
+    } : void 0;
     if (outcome.status === "error") {
       const detail = formatCursorRunFailure(outcome.runId, {
         resultText: outcome.result
       });
-      await logSyncRef.current?.markRun(outcome.runId, "error", detail);
+      await logSyncRef.current?.markRun(
+        outcome.runId,
+        "error",
+        detail,
+        tokenUsage
+      );
       await setError(cfg, messageId, detail);
       return;
     }
     if (outcome.status === "cancelled" || signal.aborted) {
-      await logSyncRef.current?.markRun(outcome.runId, "cancelled", "\u5DF2\u53D6\u6D88");
+      await logSyncRef.current?.markRun(
+        outcome.runId,
+        "cancelled",
+        "\u5DF2\u53D6\u6D88",
+        tokenUsage
+      );
       await updateStatus(cfg, messageId, "CANCELLED");
       return;
     }
@@ -3979,7 +4028,12 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
         );
       }
     }
-    await logSyncRef.current?.markRun(outcome.runId, "finished");
+    await logSyncRef.current?.markRun(
+      outcome.runId,
+      "finished",
+      null,
+      tokenUsage
+    );
     await updateStatus(cfg, messageId, "SUCCESS");
     console.log(
       `[apm] webide-message \u5B8C\u6210 action=${msg.action} messageId=${messageId} agentId=${outcome.agentId}`

package/package.json

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