ai-project-manage-cli 7.1.26 → 7.1.28

package/dist/index.js

@@ -314,6 +314,10 @@ var init_request_config = __esm({
 });
 
 // src/api/client.ts
+var client_exports = {};
+__export(client_exports, {
+  createApmApiClient: () => createApmApiClient
+});
 import { createApiClient } from "listpage-http";
 function createApmApiClient(cfg) {
   const baseURL = `${cfg.baseUrl.trim().replace(/\/+$/, "")}/api/v1`;
@@ -7424,6 +7428,17 @@ var EventSession = class {
     });
     this.markDirty(this.events.length - 1);
   }
+  /** CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看 */
+  addCliStep(step, text, status = "ok") {
+    this.events.push({
+      type: "cli_step",
+      step,
+      status,
+      text,
+      at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    this.markDirty(this.events.length - 1);
+  }
   formatEvent(event) {
     switch (event.type) {
       case "assistant": {
@@ -8351,7 +8366,7 @@ async function runCursorAgent(cfg, ctx, options) {
     customTools,
     enableSandbox
   });
-  const eventSession = new EventSession(prompt);
+  const eventSession = options?.eventSession ?? new EventSession(prompt);
   const syncRemoteLog = options?.createRemoteLogSync ? options.createRemoteLogSync(agent.agentId) : options?.skipRemoteLogSync ? noopRemoteLogSync : createThrottledCursorMessageLogSync(
     cfg,
     logCtx(ctx, agent.agentId),
@@ -8630,10 +8645,27 @@ function spawnWebIdeMessageWorker(cfg, msg) {
     workerData: { cfg, msg }
   });
   const registry = getWebIdeTerminalRegistry(cfg);
+  let settled = false;
   let resolveDone;
   const done = new Promise((resolve8) => {
     resolveDone = resolve8;
   });
+  const failIfStillQueued = async (reason) => {
+    if (settled) return;
+    try {
+      const { createApmApiClient: createApmApiClient2 } = await Promise.resolve().then(() => (init_client(), client_exports));
+      const api = createApmApiClient2(cfg);
+      await api.cli.webideSetMessageError({
+        id: msg.messageId,
+        error: reason
+      });
+    } catch (err) {
+      console.error(
+        `[apm] webide worker \u5931\u8D25\u5199\u7EC8\u6001\u5931\u8D25 messageId=${msg.messageId}:`,
+        err instanceof Error ? err.message : err
+      );
+    }
+  };
   worker.on("message", (m) => {
     if (m?.type === "terminal-rpc") {
       const rpc = m;
@@ -8693,6 +8725,7 @@ function spawnWebIdeMessageWorker(cfg, msg) {
       return;
     }
     if (m?.type === "done" || m?.type === "error") {
+      settled = true;
       if (m.type === "error") {
         console.error(
           `[apm] webide worker error messageId=${m.messageId}: ${m.error}`
@@ -8703,9 +8736,18 @@ function spawnWebIdeMessageWorker(cfg, msg) {
   });
   worker.on("error", (err) => {
     console.error("[apm] webide worker crashed:", err);
-    resolveDone();
+    void failIfStillQueued(
+      `WebIDE worker \u5D29\u6E83: ${err instanceof Error ? err.message : String(err)}`
+    ).finally(() => resolveDone());
   });
   worker.on("exit", (code) => {
+    if (!settled && code !== 0) {
+      console.error(`[apm] webide worker exit code=${code}`);
+      void failIfStillQueued(`WebIDE worker \u5F02\u5E38\u9000\u51FA code=${code}`).finally(
+        () => resolveDone()
+      );
+      return;
+    }
     if (code !== 0) {
       console.error(`[apm] webide worker exit code=${code}`);
     }
@@ -9012,6 +9054,24 @@ function attachWsHandlers(ws, ctx, onOpen) {
       if (pendingCancels.has(msg2.messageId)) {
         activeRuns.delete(msg2.messageId);
         pendingCancels.delete(msg2.messageId);
+        const cancelTask = (async () => {
+          try {
+            const api = createApmApiClient(cfg);
+            await api.cli.webideUpdateMessageStatus({
+              id: msg2.messageId,
+              status: "CANCELLED"
+            });
+          } catch (err) {
+            console.error(
+              `[apm] webide-message \u9884\u53D6\u6D88\u5199\u7EC8\u6001\u5931\u8D25 messageId=${msg2.messageId}:`,
+              err instanceof Error ? err.message : err
+            );
+          }
+        })();
+        activeTasks.add(cancelTask);
+        void cancelTask.finally(() => {
+          activeTasks.delete(cancelTask);
+        });
         return;
       }
       const task2 = (async () => {

package/dist/webide-message-worker.js

@@ -1362,6 +1362,17 @@ var EventSession = class {
     });
     this.markDirty(this.events.length - 1);
   }
+  /** CLI 本地准备步骤（工作区/分支/文档等），写入日志供 WebIDE 查看 */
+  addCliStep(step, text, status = "ok") {
+    this.events.push({
+      type: "cli_step",
+      step,
+      status,
+      text,
+      at: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    this.markDirty(this.events.length - 1);
+  }
   formatEvent(event) {
     switch (event.type) {
       case "assistant": {
@@ -2360,7 +2371,7 @@ async function runCursorAgent(cfg, ctx, options) {
     customTools,
     enableSandbox
   });
-  const eventSession = new EventSession(prompt);
+  const eventSession = options?.eventSession ?? new EventSession(prompt);
   const syncRemoteLog = options?.createRemoteLogSync ? options.createRemoteLogSync(agent.agentId) : options?.skipRemoteLogSync ? noopRemoteLogSync : createThrottledCursorMessageLogSync(
     cfg,
     logCtx(ctx, agent.agentId),
@@ -2707,13 +2718,14 @@ async function upsertLogHeader(cfg, ctx, patch) {
     ...patch
   });
 }
-function createThrottledWebIdeMessageLogSync(cfg, ctx, onError) {
+function createThrottledWebIdeMessageLogSync(cfg, ctx, onError, options) {
   let lastRunAt = 0;
   let timer;
   let latestSession;
   let syncChain = Promise.resolve();
   let minio;
   let bucket = "";
+  let firstLogNotified = false;
   const ensureMinio = async () => {
     if (minio) return;
     const storage = await fetchDeployArtifactStorage(createApmApiClient(cfg));
@@ -2727,6 +2739,16 @@ function createThrottledWebIdeMessageLogSync(cfg, ctx, onError) {
     bucket = storage.bucket;
     await minio.ensureBucket(bucket);
   };
+  const notifyFirstLog = async () => {
+    if (firstLogNotified) return;
+    firstLogNotified = true;
+    try {
+      await options?.onFirstLogSynced?.();
+    } catch (err) {
+      firstLogNotified = false;
+      onError(err);
+    }
+  };
   const syncDirtyEventsOnce = async (session) => {
     const events = session.getDirtyEvents();
     if (events.length === 0) return;
@@ -2739,6 +2761,7 @@ function createThrottledWebIdeMessageLogSync(cfg, ctx, onError) {
         eventCount: session.getEventCount()
       });
       session.clearDirtyIfUnchanged(events);
+      await notifyFirstLog();
     } catch (err) {
       onError(err);
     }
@@ -3768,98 +3791,189 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
     `[apm] webide-message action=${msg.action} taskId=${taskId} messageId=${messageId}`
   );
   await updateStatus(cfg, messageId, "TYPING");
+  const eventSession = new EventSession(msg.content);
+  const prepAgentId = loadWebIdeAgentId(workdir, taskId) ?? "webide-cli-prep";
+  const logSyncRef = {
+    current: createThrottledWebIdeMessageLogSync(
+      cfg,
+      { taskId, messageId, agentId: prepAgentId },
+      (err) => {
+        console.warn(
+          "[apm] WebIDE \u65E5\u5FD7\u540C\u6B65\u5931\u8D25:",
+          err instanceof Error ? err.message : err
+        );
+      }
+    )
+  };
+  const syncPrepLog = async () => {
+    const sync = logSyncRef.current;
+    if (!sync) return;
+    sync.schedule(eventSession);
+    await sync.flush(eventSession);
+  };
+  const runPrepStep = async (step, work, formatOk) => {
+    eventSession.addCliStep(step, "\u8FDB\u884C\u4E2D\u2026", "running");
+    await syncPrepLog();
+    try {
+      const result = await work();
+      eventSession.addCliStep(step, formatOk(result), "ok");
+      await syncPrepLog();
+      return result;
+    } catch (err) {
+      const detail = err instanceof Error ? err.message : String(err);
+      eventSession.addCliStep(step, detail, "error");
+      await syncPrepLog();
+      throw err;
+    }
+  };
   try {
     if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-    const { didInit } = await ensureWorkspaceInitialized(workdir);
-    if (!didInit) {
-      assertApmGitignoredInRepo(workdir);
-    }
+    await runPrepStep(
+      "\u521D\u59CB\u5316\u5DE5\u4F5C\u533A",
+      async () => {
+        const { didInit } = await ensureWorkspaceInitialized(workdir);
+        if (!didInit) {
+          assertApmGitignoredInRepo(workdir);
+        }
+        return didInit;
+      },
+      (didInit) => didInit ? "\u5DF2\u521D\u59CB\u5316\u5DE5\u4F5C\u533A" : "\u5DE5\u4F5C\u533A\u5DF2\u5C31\u7EEA"
+    );
     const cliVersion = readCliVersion();
     if (shouldSyncSkillsForCliVersion(workdir, cliVersion)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      console.log(
-        `[apm] CLI \u7248\u672C ${cliVersion} \u4E0E\u5DE5\u4F5C\u533A\u8BB0\u5F55\u4E0D\u4E00\u81F4\uFF0C\u6267\u884C update-skills`
+      await runPrepStep(
+        "\u540C\u6B65 Skills",
+        async () => {
+          await syncWorkspaceSkills(cfg, workdir);
+          markSkillsSyncedForCliVersion(workdir, cliVersion);
+          return cliVersion;
+        },
+        (version) => `\u5DF2\u540C\u6B65\u81F3 CLI ${version}`
       );
-      await syncWorkspaceSkills(cfg, workdir);
-      markSkillsSyncedForCliVersion(workdir, cliVersion);
-    }
-    const workspaceRepos = resolveWorkspaceRepos(workdir);
-    try {
-      await enrichWorkspaceReposRemoteUrls(workspaceRepos);
-    } catch (err) {
-      console.warn(
-        "[apm] \u8865\u9F50 workspace-repos remoteUrl \u5931\u8D25:",
-        err instanceof Error ? err.message : err
+    } else {
+      eventSession.addCliStep(
+        "\u540C\u6B65 Skills",
+        `\u7248\u672C\u4E00\u81F4\uFF08${cliVersion}\uFF09\uFF0C\u8DF3\u8FC7`,
+        "skip"
       );
+      await syncPrepLog();
     }
+    await runPrepStep(
+      "\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355",
+      async () => {
+        const workspaceRepos = resolveWorkspaceRepos(workdir);
+        try {
+          await enrichWorkspaceReposRemoteUrls(workspaceRepos);
+        } catch (err) {
+          console.warn(
+            "[apm] \u8865\u9F50 workspace-repos remoteUrl \u5931\u8D25:",
+            err instanceof Error ? err.message : err
+          );
+        }
+        return workspaceRepos;
+      },
+      (repos) => `kind=${repos.kind} repos=${repos.repos.length}`
+    );
     if (shouldRunBranch(branchCacheKey, workdir)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      const branchResult = await runTaskBranch(taskId, { cwd: workdir });
-      markBranchDone(branchCacheKey, workdir);
-      console.log(
-        `[apm] webide branch ready kind=${branchResult.kind} branch=${branchResult.branch} repos=${branchResult.repos.length}`
+      await runPrepStep(
+        "\u51C6\u5907\u7279\u6027\u5206\u652F",
+        async () => runTaskBranch(taskId, { cwd: workdir }),
+        (branchResult) => {
+          markBranchDone(branchCacheKey, workdir);
+          return `kind=${branchResult.kind} branch=${branchResult.branch} repos=${branchResult.repos.length}`;
+        }
       );
     } else {
-      console.log(
-        `[apm] step=branch skipped taskId=${taskId} workdir=${workdir}`
-      );
+      eventSession.addCliStep("\u51C6\u5907\u7279\u6027\u5206\u652F", "\u5DF2\u7F13\u5B58\uFF0C\u8DF3\u8FC7", "skip");
+      await syncPrepLog();
     }
     if (shouldEnsureWebIdePullRequests(msg.action)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      const pushed = await pushWorkspaceRepos(workdir);
-      console.log(
-        `[apm] webide \u6D4B\u8BD5\u524D push action=${msg.action} repos=${pushed}`
+      await runPrepStep(
+        "\u6D4B\u8BD5\u524D\u63A8\u9001",
+        async () => pushWorkspaceRepos(workdir),
+        (pushed) => `\u5DF2 push ${pushed} \u4E2A\u4ED3\u5E93`
       );
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      await ensureWebIdePullRequests(cfg, taskId, workdir);
+      await runPrepStep(
+        "\u786E\u4FDD PR",
+        async () => {
+          await ensureWebIdePullRequests(cfg, taskId, workdir);
+          return true;
+        },
+        () => "PR \u68C0\u67E5\u5B8C\u6210"
+      );
     }
     if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
     const api = createApmApiClient(cfg);
     let projectId = null;
-    try {
-      const baseline = await api.cli.projectBaseBranch({ taskId });
-      projectId = baseline.projectId?.trim() || null;
-      if (projectId) {
-        const docs = await syncProjectDocumentsPull(workdir, void 0, {
-          projectId
-        });
-        if (docs.synced) {
-          console.log(
-            `[apm] webide \u9879\u76EE\u6587\u6863\u5DF2\u5C31\u7EEA projectId=${projectId} downloaded=${docs.downloaded} deleted=${docs.deleted}`
+    await runPrepStep(
+      "\u540C\u6B65\u9879\u76EE\u6587\u6863",
+      async () => {
+        try {
+          const baseline = await api.cli.projectBaseBranch({ taskId });
+          projectId = baseline.projectId?.trim() || null;
+          if (!projectId) {
+            return { synced: false, reason: "\u65E0 projectId" };
+          }
+          const docs = await syncProjectDocumentsPull(workdir, void 0, {
+            projectId
+          });
+          return {
+            synced: docs.synced,
+            downloaded: docs.downloaded,
+            deleted: docs.deleted
+          };
+        } catch (err) {
+          console.warn(
+            "[apm] WebIDE \u9879\u76EE\u6587\u6863\u540C\u6B65\u5931\u8D25:",
+            err instanceof Error ? err.message : err
           );
+          return {
+            synced: false,
+            reason: err instanceof Error ? err.message : String(err)
+          };
         }
-      } else {
-        console.warn(
-          `[apm] WebIDE \u65E0\u6CD5\u89E3\u6790\u4EFB\u52A1\u6240\u5C5E\u9879\u76EE\uFF0C\u8DF3\u8FC7\u9879\u76EE\u6587\u6863\u540C\u6B65 taskId=${taskId}`
-        );
-      }
-    } catch (err) {
-      console.warn(
-        "[apm] WebIDE \u9879\u76EE\u6587\u6863\u540C\u6B65\u5931\u8D25:",
-        err instanceof Error ? err.message : err
-      );
-    }
-    try {
-      const attachments = await api.cli.webideListAttachments({ taskId });
-      const names = await syncWebIdeAttachments(
-        cfg,
-        taskId,
-        workdir,
-        attachments ?? []
-      );
-      if (names.length > 0) {
-        console.log(
-          `[apm] webide \u9644\u4EF6\u5DF2\u5C31\u7EEA count=${names.length} dir=.apm/webide/${taskId}/attachments`
-        );
+      },
+      (result) => {
+        if ("reason" in result && result.reason) {
+          return `\u8DF3\u8FC7\uFF1A${result.reason}`;
+        }
+        if (!result.synced) return "\u65E0\u9700\u540C\u6B65";
+        return `downloaded=${result.downloaded ?? 0} deleted=${result.deleted ?? 0}`;
       }
-    } catch (err) {
-      console.warn(
-        "[apm] WebIDE \u9644\u4EF6\u540C\u6B65\u5931\u8D25:",
-        err instanceof Error ? err.message : err
-      );
-    }
+    );
+    await runPrepStep(
+      "\u540C\u6B65\u4EFB\u52A1\u9644\u4EF6",
+      async () => {
+        try {
+          const attachments = await api.cli.webideListAttachments({ taskId });
+          const names = await syncWebIdeAttachments(
+            cfg,
+            taskId,
+            workdir,
+            attachments ?? []
+          );
+          return names;
+        } catch (err) {
+          console.warn(
+            "[apm] WebIDE \u9644\u4EF6\u540C\u6B65\u5931\u8D25:",
+            err instanceof Error ? err.message : err
+          );
+          return [];
+        }
+      },
+      (names) => names.length > 0 ? `\u5DF2\u540C\u6B65 ${names.length} \u4E2A\u9644\u4EF6` : "\u65E0\u9644\u4EF6\u6216\u540C\u6B65\u8DF3\u8FC7"
+    );
+    eventSession.addCliStep(
+      "\u542F\u52A8 Cursor Agent",
+      "\u51C6\u5907 resume/create\u2026",
+      "running"
+    );
+    await syncPrepLog();
     const savedAgentId = loadWebIdeAgentId(workdir, taskId);
-    const logSyncRef = { current: null };
     const outcome = await runCursorAgent(
       cfg,
       {
@@ -3874,6 +3988,8 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
       },
       {
         signal,
+        forceSend: true,
+        eventSession,
         appendMessageContent: (content) => appendContent(cfg, messageId, content),
         askQuestionExecute: createWebIdeAskQuestionExecute({
           cfg,
@@ -3881,7 +3997,6 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
           signal
         }),
         enableWebIdePlanTools: true,
-        // 本地 SDK sandbox 会拦截 custom-user-tools MCP，WebIDE 先关闭
         enableSandbox: false,
         taskId,
         terminalRpc: options?.terminalRpc,
@@ -3901,7 +4016,14 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
         },
         onRunStarted: async ({ agentId, runId }) => {
           saveWebIdeAgentId(workdir, taskId, agentId);
+          eventSession.addCliStep(
+            "\u542F\u52A8 Cursor Agent",
+            `agentId=${agentId} runId=${runId}`,
+            "ok"
+          );
+          logSyncRef.current?.schedule(eventSession);
           await logSyncRef.current?.markRun(runId, "running");
+          await logSyncRef.current?.flush(eventSession);
         }
       }
     );

package/package.json

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