ai-project-manage-cli 8.1.26 → 8.1.28

package/dist/index.js

@@ -1436,7 +1436,7 @@ function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
 }
 
 // src/utils/git.ts
-import { execFile } from "child_process";
+import { execFile, spawn } from "child_process";
 import { dirname as dirname3, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify } from "util";
@@ -1505,7 +1505,9 @@ async function execGit(cwd, args, quietOrOptions = false) {
     const e = err;
     if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
       throw new Error(
-        `[apm] git ${args.join(" ")} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
+        `[apm] git ${args.join(
+          " "
+        )} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
       );
     }
     const detail = (e.stderr ?? e.message ?? String(err)).trim();
@@ -1528,33 +1530,67 @@ async function runGitScript(name, options) {
   const timeoutMs = options.timeoutMs ?? GIT_NETWORK_TIMEOUT_MS;
   const script = resolveGitScript(name);
   const args = [script, ...options.args ?? []];
-  try {
-    const { stdout, stderr } = await execFileAsync("bash", args, {
+  return new Promise((resolve5, reject) => {
+    const child = spawn("bash", args, {
       cwd: options.cwd,
       env: gitExecEnv(),
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024,
-      timeout: timeoutMs,
-      killSignal: "SIGTERM"
+      stdio: ["ignore", "pipe", "pipe"]
     });
-    if (stdout.trim()) process.stdout.write(stdout);
-    if (stderr.trim()) process.stderr.write(stderr);
-    return true;
-  } catch (err) {
-    const e = err;
-    if (e.stdout?.trim()) process.stdout.write(e.stdout);
-    if (e.stderr?.trim()) process.stderr.write(e.stderr);
-    if (e.code === skipCode) {
-      return false;
-    }
-    if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
-      throw new Error(
-        `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
-      );
-    }
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(`[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : ""}`);
-  }
+    let stderrBuf = "";
+    let settled = false;
+    let timedOut = false;
+    const timer = timeoutMs > 0 ? setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      const forceKill = setTimeout(() => {
+        child.kill("SIGKILL");
+      }, 2e3);
+      forceKill.unref();
+    }, timeoutMs) : null;
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      fn();
+    };
+    child.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      stderrBuf += text;
+      process.stderr.write(chunk);
+    });
+    child.on("error", (err) => {
+      finish(() => reject(new Error(`[apm] ${name} \u542F\u52A8\u5931\u8D25: ${err.message}`)));
+    });
+    child.on("close", (code, signal) => {
+      finish(() => {
+        if (timedOut || signal === "SIGTERM" || signal === "SIGKILL") {
+          reject(
+            new Error(
+              `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u770B\u4E0A\u65B9\u6700\u540E\u4E00\u6B65\u65E5\u5FD7\u5B9A\u4F4D\u5361\u70B9\uFF08\u591A\u4E3A ls-remote/fetch/push\uFF09\uFF1B\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH \u540E\u53EF\u7A0D\u540E\u91CD\u8BD5`
+            )
+          );
+          return;
+        }
+        if (code === skipCode) {
+          resolve5(false);
+          return;
+        }
+        if (code === 0) {
+          resolve5(true);
+          return;
+        }
+        const detail = stderrBuf.trim();
+        reject(
+          new Error(
+            `[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : code != null ? ` (exit ${code})` : ""}`
+          )
+        );
+      });
+    });
+  });
 }
 async function commitWorkingTreeIfDirty(cwd, message) {
   await ensureGitRepo(cwd);

package/dist/scripts/ensure_baseline.sh

@@ -6,8 +6,11 @@ set -euo pipefail
 
 baseline="${1:?用法: ensure_baseline.sh <baseline-branch>}"
 
+echo "[apm] ensure_baseline: fetch origin ${baseline} …"
 git fetch origin "$baseline"
+echo "[apm] ensure_baseline: ls-remote origin ${baseline} …"
 if git ls-remote --heads origin "$baseline" | grep -q .; then
+  echo "[apm] ensure_baseline: origin/${baseline} 已确认"
   exit 0
 fi
 

package/dist/scripts/ensure_feature_branch.sh

@@ -9,9 +9,12 @@ baseline="${2:?用法: ensure_feature_branch.sh <branch> <baseline-branch>}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 git rev-parse --git-dir >/dev/null
+origin_url="$(git config --get remote.origin.url 2>/dev/null || true)"
+echo "[apm] ensure_feature_branch: branch=${branch} baseline=${baseline}${origin_url:+ origin=${origin_url}}"
 
 # 有未提交改动时先 stash（含 untracked），再切/建分支，避免污染目标分支工作区
 if [[ -n "$(git status --porcelain)" ]]; then
+  echo "[apm] ensure_feature_branch: stash 未提交改动 …"
   git stash push -u -m "apm: ensure ${branch}"
   echo "[apm] 已 stash 未提交改动，再确认分支 ${branch}"
 fi
@@ -20,16 +23,26 @@ current="$(git rev-parse --abbrev-ref HEAD)"
 if [[ "$current" == "$branch" ]]; then
   echo "[apm] 已在分支 ${branch}"
 else
+  echo "[apm] ensure_feature_branch: 当前 ${current} → 准备 ${branch}"
   bash "$SCRIPT_DIR/ensure_baseline.sh" "$baseline"
 
+  echo "[apm] ensure_feature_branch: ls-remote origin ${branch} …"
   if git ls-remote --heads origin "$branch" | grep -q .; then
+    echo "[apm] ensure_feature_branch: 远程已有 ${branch}，fetch + checkout …"
     git fetch origin "$branch"
     git checkout -B "$branch" "origin/${branch}"
   elif git show-ref --verify --quiet "refs/heads/${branch}"; then
+    echo "[apm] ensure_feature_branch: 本地已有 ${branch}，checkout …"
     git checkout "$branch"
     echo "[apm] 分支 ${branch} 已存在，跳过创建"
   else
+    # 先切到远程基线（便于 post-checkout 等 hook 装依赖），再基于 origin/<baseline> 建特性分支（不基于本地基线）
+    echo "[apm] ensure_feature_branch: 本地/远程均无 ${branch}，先切基线 origin/${baseline} …"
+    echo "[apm] ensure_feature_branch: fetch origin ${baseline} …"
     git fetch origin "$baseline"
+    echo "[apm] ensure_feature_branch: checkout -B ${baseline} origin/${baseline} …"
+    git checkout -B "$baseline" "origin/${baseline}"
+    echo "[apm] ensure_feature_branch: 基于 origin/${baseline} 创建 ${branch} …"
     set +e
     git checkout --no-track -b "$branch" "origin/${baseline}"
     create_status=$?
@@ -44,14 +57,19 @@ else
       else
         exit "$create_status"
       fi
+    else
+      echo "[apm] ensure_feature_branch: 已创建本地分支 ${branch}"
     fi
   fi
 fi
 
 # 本地已在目标分支时也要补推：上次 push 挂死/超时后常见「本地有、远端无」
+echo "[apm] ensure_feature_branch: 再次 ls-remote 确认远程是否已有 ${branch} …"
 if ! git ls-remote --heads origin "$branch" | grep -q .; then
   echo "[apm] 远程尚无 ${branch}，正在 push …"
   bash "$SCRIPT_DIR/push_code.sh" "$branch"
+else
+  echo "[apm] ensure_feature_branch: 远程已有 ${branch}，跳过 push"
 fi
 
 echo "[apm] 已就绪分支 ${branch}"

package/dist/scripts/push_code.sh

@@ -17,5 +17,8 @@ if ! git config --get remote.origin.url >/dev/null 2>&1; then
   exit 2
 fi
 
+origin_url="$(git config --get remote.origin.url)"
+echo "[apm] push: git push -u origin ${branch}（${origin_url}）…"
 # 显式 origin + -u：避免裸 git push 因 upstream 与当前分支名不一致失败
 git push -u origin "$branch"
+echo "[apm] push: 完成 ${branch}"

package/dist/worker-script.js

@@ -359,7 +359,7 @@ async function ensureWorkspaceApmDirForInit(cwd = resolveWorkdirPath()) {
 }
 
 // src/utils/git.ts
-import { execFile } from "child_process";
+import { execFile, spawn } from "child_process";
 import { dirname, join as join3 } from "path";
 import { fileURLToPath } from "url";
 import { promisify } from "util";
@@ -428,7 +428,9 @@ async function execGit(cwd, args, quietOrOptions = false) {
     const e = err;
     if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
       throw new Error(
-        `[apm] git ${args.join(" ")} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
+        `[apm] git ${args.join(
+          " "
+        )} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
       );
     }
     const detail = (e.stderr ?? e.message ?? String(err)).trim();
@@ -458,33 +460,67 @@ async function runGitScript(name, options) {
   const timeoutMs = options.timeoutMs ?? GIT_NETWORK_TIMEOUT_MS;
   const script = resolveGitScript(name);
   const args = [script, ...options.args ?? []];
-  try {
-    const { stdout, stderr } = await execFileAsync("bash", args, {
+  return new Promise((resolve7, reject) => {
+    const child = spawn("bash", args, {
       cwd: options.cwd,
       env: gitExecEnv(),
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024,
-      timeout: timeoutMs,
-      killSignal: "SIGTERM"
+      stdio: ["ignore", "pipe", "pipe"]
     });
-    if (stdout.trim()) process.stdout.write(stdout);
-    if (stderr.trim()) process.stderr.write(stderr);
-    return true;
-  } catch (err) {
-    const e = err;
-    if (e.stdout?.trim()) process.stdout.write(e.stdout);
-    if (e.stderr?.trim()) process.stderr.write(e.stderr);
-    if (e.code === skipCode) {
-      return false;
-    }
-    if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
-      throw new Error(
-        `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
-      );
-    }
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(`[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : ""}`);
-  }
+    let stderrBuf = "";
+    let settled = false;
+    let timedOut = false;
+    const timer = timeoutMs > 0 ? setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      const forceKill = setTimeout(() => {
+        child.kill("SIGKILL");
+      }, 2e3);
+      forceKill.unref();
+    }, timeoutMs) : null;
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      fn();
+    };
+    child.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      stderrBuf += text;
+      process.stderr.write(chunk);
+    });
+    child.on("error", (err) => {
+      finish(() => reject(new Error(`[apm] ${name} \u542F\u52A8\u5931\u8D25: ${err.message}`)));
+    });
+    child.on("close", (code, signal) => {
+      finish(() => {
+        if (timedOut || signal === "SIGTERM" || signal === "SIGKILL") {
+          reject(
+            new Error(
+              `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u770B\u4E0A\u65B9\u6700\u540E\u4E00\u6B65\u65E5\u5FD7\u5B9A\u4F4D\u5361\u70B9\uFF08\u591A\u4E3A ls-remote/fetch/push\uFF09\uFF1B\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH \u540E\u53EF\u7A0D\u540E\u91CD\u8BD5`
+            )
+          );
+          return;
+        }
+        if (code === skipCode) {
+          resolve7(false);
+          return;
+        }
+        if (code === 0) {
+          resolve7(true);
+          return;
+        }
+        const detail = stderrBuf.trim();
+        reject(
+          new Error(
+            `[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : code != null ? ` (exit ${code})` : ""}`
+          )
+        );
+      });
+    });
+  });
 }
 async function branchHasChangesAgainstBase(cwd, baseBranch, headBranch) {
   return runGitScript("branch_has_changes.sh", {
@@ -2401,6 +2437,17 @@ async function createApmCursorAgentStore(cfg2, workspaceRef) {
     runEvents: mirrorRunEventsForVisualization(cfg2, sqlite.runEvents)
   });
 }
+async function purgeLocalSqliteAgentData(input) {
+  const agentId = input.agentId.trim();
+  const workspaceRef = input.workspaceRef.trim();
+  if (!agentId || !workspaceRef) return;
+  const sqlite = await openSqliteLocalAgentStore(workspaceRef);
+  const runIds = [...input.runIds ?? []];
+  if (runIds.length > 0) {
+    await sqlite.runEvents.delete({ filter: { runIds } });
+  }
+  await sqlite.checkpoints.delete({ filter: { agentIds: [agentId] } });
+}
 
 // src/commands/connect/core/worker/run-steer.ts
 var impl = null;
@@ -2427,6 +2474,10 @@ function deliverRunSteer(text) {
 }
 
 // src/commands/connect/cursor-agent.ts
+function isCorruptLocalAgentCheckpointError(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  return /Corrupt local agent checkpoint/i.test(message) || /missing root blob/i.test(message);
+}
 var noopRemoteLogSync = {
   schedule(_session) {
   },
@@ -2475,6 +2526,19 @@ async function obtainAgent(ctx) {
         err instanceof Error ? err.message : err
       );
       ctx.onInvalidatePersistedAgentId?.();
+      if (isCorruptLocalAgentCheckpointError(err)) {
+        try {
+          await purgeLocalSqliteAgentData({
+            workspaceRef: ctx.cwd,
+            agentId: savedAgentId
+          });
+        } catch (purgeErr) {
+          console.warn(
+            `[apm] \u6E05\u7406\u635F\u574F checkpoint \u5931\u8D25 agentId=${savedAgentId}:`,
+            purgeErr instanceof Error ? purgeErr.message : purgeErr
+          );
+        }
+      }
     }
   }
   try {
@@ -2489,6 +2553,9 @@ async function obtainAgent(ctx) {
   }
 }
 async function runCursorAgent(cfg2, ctx, options) {
+  return runCursorAgentAttempt(cfg2, ctx, options, { allowCorruptRetry: true });
+}
+async function runCursorAgentAttempt(cfg2, ctx, options, attempt) {
   const signal = options.signal;
   if (signal?.aborted) {
     throw new Error("\u8FDE\u63A5\u5DF2\u5173\u95ED\uFF0C\u4EFB\u52A1\u4E2D\u65AD");
@@ -2535,6 +2602,8 @@ async function runCursorAgent(cfg2, ctx, options) {
   const eventSession = options.eventSession ?? new EventSession(prompt);
   const syncRemoteLog = options.createRemoteLogSync ? options.createRemoteLogSync(agent.agentId) : noopRemoteLogSync;
   let activeRun;
+  let retryCorruptWithNewAgent = false;
+  const corruptAgentId = agent.agentId?.trim() || ctx.resumeAgentId?.trim();
   const abortRun = () => {
     if (!activeRun?.supports("cancel")) return;
     void activeRun.cancel().catch(() => void 0);
@@ -2603,58 +2672,94 @@ async function runCursorAgent(cfg2, ctx, options) {
         resultText: result.result
       });
       console.error(`[apm] ${failureMessage}`);
-      if (resumed) {
+      if (attempt.allowCorruptRetry && resumed && isCorruptLocalAgentCheckpointError(failureMessage)) {
+        retryCorruptWithNewAgent = true;
         invalidateAgentMapping();
+      } else {
+        if (resumed) {
+          invalidateAgentMapping();
+        }
+        throw new Error(failureMessage);
       }
-      throw new Error(failureMessage);
-    }
-    if (result.status === "cancelled") {
+    } else if (result.status === "cancelled") {
       throw new Error(`Cursor run \u5DF2\u53D6\u6D88: ${result.id}`);
-    }
-    console.log(`[apm] Cursor Agent \u5B8C\u6210 messageId=${ctx.messageId}`);
-    const artifacts = await agent.listArtifacts().catch(() => []);
-    const artifactDocuments = [];
-    for (const artifact of artifacts) {
-      try {
-        const content = (await agent.downloadArtifact(artifact.path)).toString(
-          "utf8"
-        );
-        artifactDocuments.push({ path: artifact.path, content });
-      } catch (err) {
-        console.warn(
-          `[apm] \u8BFB\u53D6\u4EA7\u7269\u5931\u8D25 path=${artifact.path}:`,
-          err instanceof Error ? err.message : err
-        );
+    } else {
+      console.log(`[apm] Cursor Agent \u5B8C\u6210 messageId=${ctx.messageId}`);
+      const artifacts = await agent.listArtifacts().catch(() => []);
+      const artifactDocuments = [];
+      for (const artifact of artifacts) {
+        try {
+          const content = (await agent.downloadArtifact(artifact.path)).toString("utf8");
+          artifactDocuments.push({ path: artifact.path, content });
+        } catch (err) {
+          console.warn(
+            `[apm] \u8BFB\u53D6\u4EA7\u7269\u5931\u8D25 path=${artifact.path}:`,
+            err instanceof Error ? err.message : err
+          );
+        }
       }
+      return {
+        runId: result.id,
+        agentId: agent.agentId,
+        status: result.status,
+        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,
+        artifactDocuments
+      };
     }
-    return {
-      runId: result.id,
-      agentId: agent.agentId,
-      status: result.status,
-      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,
-      artifactDocuments
-    };
   } catch (err) {
-    if (err instanceof CursorAgentError) {
+    if (retryCorruptWithNewAgent) {
+    } else if (attempt.allowCorruptRetry && resumed && isCorruptLocalAgentCheckpointError(err)) {
+      console.warn(
+        `[apm] checkpoint \u635F\u574F\uFF08agentId=${corruptAgentId ?? "?"}\uFF09\uFF0C\u672C\u8F6E\u6539\u7528\u65B0 Agent`
+      );
+      retryCorruptWithNewAgent = true;
+      invalidateAgentMapping();
+    } else if (err instanceof CursorAgentError) {
       if (resumed) {
         invalidateAgentMapping();
       }
       throw new Error(
         `Cursor \u542F\u52A8\u5931\u8D25: ${err.message}${err.isRetryable ? "\uFF08\u53EF\u91CD\u8BD5\uFF09" : ""}`
       );
+    } else {
+      throw err;
     }
-    throw err;
   } finally {
     clearRunSteer();
     signal?.removeEventListener("abort", abortRun);
     await agent[Symbol.asyncDispose]();
   }
+  if (retryCorruptWithNewAgent) {
+    if (corruptAgentId) {
+      try {
+        await purgeLocalSqliteAgentData({
+          workspaceRef: workdir,
+          agentId: corruptAgentId
+        });
+      } catch (purgeErr) {
+        console.warn(
+          `[apm] \u6E05\u7406\u635F\u574F checkpoint \u5931\u8D25 agentId=${corruptAgentId}:`,
+          purgeErr instanceof Error ? purgeErr.message : purgeErr
+        );
+      }
+    }
+    console.warn(
+      `[apm] \u4E22\u5F03\u635F\u574F Agent${corruptAgentId ? ` agentId=${corruptAgentId}` : ""}\uFF0C\u65B0\u5EFA\u540E\u91CD\u8BD5 messageId=${ctx.messageId}`
+    );
+    return runCursorAgentAttempt(
+      cfg2,
+      { ...ctx, resumeAgentId: void 0 },
+      options,
+      { allowCorruptRetry: false }
+    );
+  }
+  throw new Error("Cursor Agent \u672A\u8FD4\u56DE\u7ED3\u679C");
 }
 
 // src/commands/connect/webide-agent-registry.ts
@@ -4304,8 +4409,9 @@ ${assumptionAnswersText}` : msg2.content,
     if (startAction) {
       await webIdeDiscardTransitionPrepDraft(cfg2, taskId, startAction);
     }
-    if (detail.includes("\u590D\u7528 Agent") || detail.includes("resume")) {
+    if (detail.includes("\u590D\u7528 Agent") || detail.includes("resume") || /Corrupt local agent checkpoint/i.test(detail) || /missing root blob/i.test(detail)) {
       clearWebIdeAgentId(workdir, taskId);
+      clearWebIdeDesignAgentId(workdir, taskId);
     }
     try {
       await setError(cfg2, messageId, detail);

package/package.json

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