ai-project-manage-cli 6.0.104 → 6.0.106

package/dist/index.js

@@ -535,26 +535,194 @@ async function tryReadGitOriginUrl(cwd) {
   }
 }
 
+// src/git-utils.ts
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
+var execFileAsync2 = promisify2(execFile2);
+async function execGit(cwd, args, quiet = false) {
+  try {
+    const { stdout, stderr } = await execFileAsync2("git", args, {
+      cwd,
+      encoding: "utf8",
+      maxBuffer: 10 * 1024 * 1024
+    });
+    if (!quiet && stderr.trim()) {
+      process.stderr.write(stderr);
+    }
+    return stdout;
+  } catch (err) {
+    const e = err;
+    const detail = (e.stderr ?? e.message ?? String(err)).trim();
+    throw new Error(
+      `[apm] git ${args.join(" ")} \u5931\u8D25${detail ? `: ${detail}` : ""}`
+    );
+  }
+}
+async function isGitRepo(cwd) {
+  try {
+    await execGit(cwd, ["rev-parse", "--git-dir"], true);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function ensureGitRepo(cwd) {
+  await execGit(cwd, ["rev-parse", "--git-dir"], true);
+}
+async function getCurrentBranch(cwd) {
+  return (await execGit(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
+}
+async function isWorkingTreeDirty(cwd) {
+  const out = await execGit(cwd, ["status", "--porcelain"], true);
+  return out.trim().length > 0;
+}
+async function remoteBranchExists(cwd, branch) {
+  const out = await execGit(
+    cwd,
+    ["ls-remote", "--heads", "origin", branch],
+    true
+  );
+  return out.trim().length > 0;
+}
+async function resolveGitRepoRoot(cwd) {
+  return (await execGit(cwd, ["rev-parse", "--show-toplevel"], true)).trim();
+}
+async function ensureRemoteBaselineBranch(cwd, baselineBranch) {
+  await execGit(cwd, ["fetch", "origin", baselineBranch], true);
+  if (await remoteBranchExists(cwd, baselineBranch)) {
+    return;
+  }
+  throw new Error(
+    `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F origin/${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
+  );
+}
+async function hasUpstream(cwd) {
+  try {
+    await execGit(cwd, ["rev-parse", "--abbrev-ref", "@{upstream}"], true);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var GITIGNORE_COMMIT_MESSAGE = "chore(apm): ignore .apm directory";
+async function commitAndPushGitignore(workdir) {
+  if (!await isGitRepo(workdir)) {
+    console.log("[apm] \u5F53\u524D\u76EE\u5F55\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u8BF7\u624B\u52A8\u63D0\u4EA4 .gitignore");
+    return;
+  }
+  await execGit(workdir, ["add", "--", ".gitignore"]);
+  await execGit(workdir, ["commit", "-m", GITIGNORE_COMMIT_MESSAGE]);
+  console.log(`[apm] \u5DF2\u63D0\u4EA4 .gitignore: ${GITIGNORE_COMMIT_MESSAGE}`);
+  const originUrl = await tryReadGitOriginUrl(workdir);
+  if (!originUrl) {
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
+    return;
+  }
+  if (await hasUpstream(workdir)) {
+    await execGit(workdir, ["push"]);
+  } else {
+    await execGit(workdir, ["push", "-u", "origin", "HEAD"]);
+  }
+  console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
+}
+
+// src/baseline-resolve.ts
+function formatBaselineDiagnostic(workdirPath, baselineWorkdirPath, diagnostic) {
+  return diagnostic?.message ?? `\u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}\uFF08\u89C4\u8303\u5316\uFF1A${baselineWorkdirPath}\uFF09
+\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`;
+}
+async function matchRepositoryByGitRemote(api, workdirPath) {
+  const gitRoot = await resolveGitRepoRoot(workdirPath);
+  const gitUrl = await tryReadGitOriginUrl(gitRoot);
+  if (!gitUrl) {
+    return null;
+  }
+  const matched = await api.cli.matchRepository({ url: gitUrl });
+  const repositoryId = matched.repositoryId?.trim();
+  const defaultBranch = matched.defaultBranch?.trim();
+  if (!repositoryId || !defaultBranch) {
+    return null;
+  }
+  console.log(
+    `[apm] \u5DE5\u4F5C\u7A7A\u95F4\u8DEF\u5F84\u672A\u5339\u914D\uFF0C\u5DF2\u901A\u8FC7 git remote \u5173\u8054\u4ED3\u5E93: ${gitUrl}`
+  );
+  return { repositoryId, defaultBranch };
+}
+async function resolveWorkspaceBaseline(api, workdirPath) {
+  const baseline = await api.cli.workspaceBaseline({ workdirPath });
+  const repositoryId = baseline.repositoryId?.trim();
+  const defaultBranch = baseline.defaultBranch?.trim();
+  if (repositoryId && defaultBranch) {
+    return {
+      repositoryId,
+      defaultBranch,
+      workdirPath: baseline.workdirPath,
+      matchedViaGitRemote: false
+    };
+  }
+  const viaGit = await matchRepositoryByGitRemote(api, workdirPath);
+  if (viaGit) {
+    return {
+      ...viaGit,
+      workdirPath: baseline.workdirPath,
+      matchedViaGitRemote: true
+    };
+  }
+  throw new Error(
+    `[apm] ${formatBaselineDiagnostic(
+      workdirPath,
+      baseline.workdirPath,
+      baseline.diagnostic
+    )}`
+  );
+}
+async function resolveBranchBaseline(api, sessionId, workdirPath) {
+  const baseline = await api.cli.branchBaseline({ sessionId, workdirPath });
+  const repositoryId = baseline.repositoryId?.trim();
+  const defaultBranch = baseline.defaultBranch?.trim();
+  if (repositoryId && defaultBranch) {
+    return {
+      sessionId: baseline.sessionId,
+      taskId: baseline.taskId,
+      repositoryId,
+      defaultBranch,
+      workdirPath: baseline.workdirPath,
+      matchedViaGitRemote: false
+    };
+  }
+  const viaGit = await matchRepositoryByGitRemote(api, workdirPath);
+  if (viaGit) {
+    return {
+      sessionId: baseline.sessionId,
+      taskId: baseline.taskId,
+      ...viaGit,
+      workdirPath: baseline.workdirPath,
+      matchedViaGitRemote: true
+    };
+  }
+  throw new Error(
+    `[apm] ${formatBaselineDiagnostic(
+      workdirPath,
+      baseline.workdirPath,
+      baseline.diagnostic
+    )}`
+  );
+}
+
 // src/deployment-config-sync.ts
 var TEMPLATE_HINT = "\u4FDD\u7559\u6A21\u677F .apm/apm.config.json";
 var SYNC_HINT = "\u767B\u8BB0\u5DE5\u4F5C\u7A7A\u95F4\u8DEF\u5F84\u3001\u7ED1\u5B9A\u4ED3\u5E93\u540E\uFF0C\u53EF\u6267\u884C: apm sync-deploy-config";
 async function resolveRepositoryIdForSync(api, workdirPath) {
-  const baseline = await api.cli.workspaceBaseline({ workdirPath });
-  if (baseline.repositoryId) {
+  try {
+    const baseline = await resolveWorkspaceBaseline(api, workdirPath);
     return { repositoryId: baseline.repositoryId, diagnostic: null };
+  } catch (err) {
+    const detail = err instanceof Error ? err.message : String(err);
+    return {
+      repositoryId: null,
+      diagnostic: detail.replace(/^\[apm\]\s*/, "")
+    };
   }
-  const gitUrl = await tryReadGitOriginUrl(workdirPath);
-  if (gitUrl) {
-    const matched = await api.cli.matchRepository({ url: gitUrl });
-    if (matched.repositoryId) {
-      console.log(
-        `[apm] \u5DE5\u4F5C\u7A7A\u95F4\u8DEF\u5F84\u672A\u5339\u914D\uFF0C\u5DF2\u901A\u8FC7 git remote \u5173\u8054\u4ED3\u5E93: ${gitUrl}`
-      );
-      return { repositoryId: matched.repositoryId, diagnostic: null };
-    }
-  }
-  const detail = baseline.diagnostic?.message ?? `\u5F53\u524D\u8DEF\u5F84\uFF08\u89C4\u8303\u5316\uFF1A${baseline.workdirPath}\uFF09\u672A\u5339\u914D\u5230\u5DF2\u7ED1\u5B9A\u4ED3\u5E93\u7684\u5DE5\u4F5C\u7A7A\u95F4\u3002`;
-  return { repositoryId: null, diagnostic: detail };
 }
 async function syncRemoteDeploymentConfig(workdirPath, apmDir) {
   const cfg = await tryReadApmConfig();
@@ -816,85 +984,6 @@ async function syncRepositoryProjectDocumentsPush(cfg, workdirPath, apmRoot) {
   return synced;
 }
 
-// src/git-utils.ts
-import { execFile as execFile2 } from "child_process";
-import { promisify as promisify2 } from "util";
-var execFileAsync2 = promisify2(execFile2);
-async function execGit(cwd, args, quiet = false) {
-  try {
-    const { stdout, stderr } = await execFileAsync2("git", args, {
-      cwd,
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024
-    });
-    if (!quiet && stderr.trim()) {
-      process.stderr.write(stderr);
-    }
-    return stdout;
-  } catch (err) {
-    const e = err;
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(
-      `[apm] git ${args.join(" ")} \u5931\u8D25${detail ? `: ${detail}` : ""}`
-    );
-  }
-}
-async function isGitRepo(cwd) {
-  try {
-    await execGit(cwd, ["rev-parse", "--git-dir"], true);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function ensureGitRepo(cwd) {
-  await execGit(cwd, ["rev-parse", "--git-dir"], true);
-}
-async function getCurrentBranch(cwd) {
-  return (await execGit(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
-}
-async function isWorkingTreeDirty(cwd) {
-  const out = await execGit(cwd, ["status", "--porcelain"], true);
-  return out.trim().length > 0;
-}
-async function remoteBranchExists(cwd, branch) {
-  const out = await execGit(
-    cwd,
-    ["ls-remote", "--heads", "origin", branch],
-    true
-  );
-  return out.trim().length > 0;
-}
-async function hasUpstream(cwd) {
-  try {
-    await execGit(cwd, ["rev-parse", "--abbrev-ref", "@{upstream}"], true);
-    return true;
-  } catch {
-    return false;
-  }
-}
-var GITIGNORE_COMMIT_MESSAGE = "chore(apm): ignore .apm directory";
-async function commitAndPushGitignore(workdir) {
-  if (!await isGitRepo(workdir)) {
-    console.log("[apm] \u5F53\u524D\u76EE\u5F55\u4E0D\u662F git \u4ED3\u5E93\uFF0C\u8BF7\u624B\u52A8\u63D0\u4EA4 .gitignore");
-    return;
-  }
-  await execGit(workdir, ["add", "--", ".gitignore"]);
-  await execGit(workdir, ["commit", "-m", GITIGNORE_COMMIT_MESSAGE]);
-  console.log(`[apm] \u5DF2\u63D0\u4EA4 .gitignore: ${GITIGNORE_COMMIT_MESSAGE}`);
-  const originUrl = await tryReadGitOriginUrl(workdir);
-  if (!originUrl) {
-    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
-    return;
-  }
-  if (await hasUpstream(workdir)) {
-    await execGit(workdir, ["push"]);
-  } else {
-    await execGit(workdir, ["push", "-u", "origin", "HEAD"]);
-  }
-  console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
-}
-
 // src/commands/init.ts
 async function ensureWorkspaceInitialized(workdir, options) {
   if (isWorkspaceApmInitialized(workdir)) {
@@ -1010,9 +1099,6 @@ async function runLogin(opts) {
 }
 
 // src/commands/branch.ts
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify3 } from "util";
-var execFileAsync3 = promisify3(execFile3);
 var SESSION_BRANCH_PREFIX = "feat/session-";
 function branchNameForSession(sessionId) {
   const id = sessionId.trim();
@@ -1034,47 +1120,9 @@ function sessionIdFromBranchName(branch) {
   const sessionId = name.slice(SESSION_BRANCH_PREFIX.length).trim();
   return sessionId || null;
 }
-async function execGit2(cwd, args, quiet) {
-  try {
-    const { stdout, stderr } = await execFileAsync3("git", args, {
-      cwd,
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024
-    });
-    if (!quiet && stderr.trim()) {
-      process.stderr.write(stderr);
-    }
-    return stdout;
-  } catch (err) {
-    const e = err;
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(
-      `[apm] git ${args.join(" ")} \u5931\u8D25${detail ? `: ${detail}` : ""}`
-    );
-  }
-}
-async function ensureGitRepo2(cwd) {
-  await execGit2(cwd, ["rev-parse", "--git-dir"], true);
-}
-async function getCurrentBranch2(cwd) {
-  const name = (await execGit2(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
-  return name;
-}
-async function isWorkingTreeDirty2(cwd) {
-  const out = await execGit2(cwd, ["status", "--porcelain"], true);
-  return out.trim().length > 0;
-}
-async function remoteHeadBranchExists(cwd, branch) {
-  const out = await execGit2(
-    cwd,
-    ["ls-remote", "--heads", "origin", branch],
-    true
-  );
-  return out.trim().length > 0;
-}
 async function localBranchExists(cwd, branch) {
   try {
-    await execGit2(
+    await execGit(
       cwd,
       ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`],
       true
@@ -1085,32 +1133,29 @@ async function localBranchExists(cwd, branch) {
   }
 }
 async function commitWorkingTreeIfDirty(cwd, message) {
-  await ensureGitRepo2(cwd);
-  if (!await isWorkingTreeDirty2(cwd)) {
+  await ensureGitRepo(cwd);
+  if (!await isWorkingTreeDirty(cwd)) {
     return false;
   }
-  const commitMessage = message?.trim() || `chore(apm): \u540C\u6B65\u5DE5\u4F5C\u533A (${await getCurrentBranch2(cwd)})`;
-  await execGit2(cwd, ["add", "-A"]);
-  await execGit2(cwd, ["commit", "-m", commitMessage]);
+  const commitMessage = message?.trim() || `chore(apm): \u540C\u6B65\u5DE5\u4F5C\u533A (${await getCurrentBranch(cwd)})`;
+  await execGit(cwd, ["add", "-A"]);
+  await execGit(cwd, ["commit", "-m", commitMessage]);
   console.log(`[apm] \u5DF2\u63D0\u4EA4\u5DE5\u4F5C\u533A\u53D8\u66F4: ${commitMessage}`);
   return true;
 }
 async function ensureFeatureBranch(branch, baselineBranch, options) {
   const cwd = options.cwd ?? process.cwd();
+  const gitRoot = await resolveGitRepoRoot(cwd);
   const commitMessage = options.message?.trim() || `chore(apm): \u540C\u6B65\u5DE5\u4F5C\u533A (${branch})`;
-  await ensureGitRepo2(cwd);
-  if (!await remoteHeadBranchExists(cwd, baselineBranch)) {
-    throw new Error(
-      `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F ${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
-    );
-  }
-  const current = await getCurrentBranch2(cwd);
-  const dirty = await isWorkingTreeDirty2(cwd);
+  await ensureGitRepo(gitRoot);
+  await ensureRemoteBaselineBranch(gitRoot, baselineBranch);
+  const current = await getCurrentBranch(gitRoot);
+  const dirty = await isWorkingTreeDirty(gitRoot);
   if (dirty) {
     if (current === branch) {
-      await commitWorkingTreeIfDirty(cwd, commitMessage);
+      await commitWorkingTreeIfDirty(gitRoot, commitMessage);
     } else {
-      await execGit2(cwd, [
+      await execGit(gitRoot, [
         "stash",
         "push",
         "-u",
@@ -1119,34 +1164,34 @@ async function ensureFeatureBranch(branch, baselineBranch, options) {
       ]);
     }
   }
-  const onTargetBranch = await getCurrentBranch2(cwd) === branch;
+  const onTargetBranch = await getCurrentBranch(gitRoot) === branch;
   if (onTargetBranch) {
-    await execGit2(cwd, ["fetch", "origin", baselineBranch]);
-    await execGit2(cwd, ["merge", `origin/${baselineBranch}`, "--no-edit"]);
+    await execGit(gitRoot, ["fetch", "origin", baselineBranch]);
+    await execGit(gitRoot, ["merge", `origin/${baselineBranch}`, "--no-edit"]);
   } else {
-    const remoteExists = await remoteHeadBranchExists(cwd, branch);
+    const remoteExists = await remoteBranchExists(gitRoot, branch);
     if (remoteExists) {
-      await execGit2(cwd, ["fetch", "origin", branch]);
-      await execGit2(cwd, ["checkout", "-B", branch, `origin/${branch}`]);
-    } else if (await localBranchExists(cwd, branch)) {
-      if (await getCurrentBranch2(cwd) !== branch) {
-        await execGit2(cwd, ["checkout", branch]);
+      await execGit(gitRoot, ["fetch", "origin", branch]);
+      await execGit(gitRoot, ["checkout", "-B", branch, `origin/${branch}`]);
+    } else if (await localBranchExists(gitRoot, branch)) {
+      if (await getCurrentBranch(gitRoot) !== branch) {
+        await execGit(gitRoot, ["checkout", branch]);
       }
       console.log(`[apm] \u5206\u652F ${branch} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u521B\u5EFA`);
     } else {
-      await execGit2(cwd, ["fetch", "origin", baselineBranch]);
+      await execGit(gitRoot, ["fetch", "origin", baselineBranch]);
       try {
-        await execGit2(cwd, [
+        await execGit(gitRoot, [
           "checkout",
           "-b",
           branch,
           `origin/${baselineBranch}`
         ]);
-        await execGit2(cwd, ["push", "-u", "origin", branch]);
+        await execGit(gitRoot, ["push", "-u", "origin", branch]);
       } catch (err) {
-        if (await localBranchExists(cwd, branch)) {
-          if (await getCurrentBranch2(cwd) !== branch) {
-            await execGit2(cwd, ["checkout", branch]);
+        if (await localBranchExists(gitRoot, branch)) {
+          if (await getCurrentBranch(gitRoot) !== branch) {
+            await execGit(gitRoot, ["checkout", branch]);
           }
           console.log(`[apm] \u5206\u652F ${branch} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u521B\u5EFA`);
         } else {
@@ -1168,115 +1213,164 @@ async function runBranch(sessionId, options = {}) {
   const api = createApmApiClient(cfg);
   const cwd = options.cwd ?? process.cwd();
   const workdirPath = resolveWorkdirPath(cwd);
-  const baseline = await api.cli.branchBaseline({
-    sessionId: trimmedSessionId,
+  const baseline = await resolveBranchBaseline(
+    api,
+    trimmedSessionId,
     workdirPath
-  });
-  if (!baseline.repositoryId) {
-    const detail = baseline.diagnostic?.message ?? `\u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}\uFF08\u89C4\u8303\u5316\uFF1A${baseline.workdirPath}\uFF09
-\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`;
-    throw new Error(`[apm] ${detail}`);
-  }
-  const baselineBranch = (baseline.defaultBranch ?? "").trim();
-  if (!baselineBranch) {
-    throw new Error("[apm] \u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
-  }
+  );
   const branch = branchNameForSession(trimmedSessionId);
-  return ensureFeatureBranch(branch, baselineBranch, options);
+  return ensureFeatureBranch(branch, baseline.defaultBranch, options);
 }
 
-// src/commands/clean-branches.ts
-import { execFile as execFile4 } from "child_process";
-import { promisify as promisify4 } from "util";
-var execFileAsync4 = promisify4(execFile4);
-async function execGit3(cwd, args, quiet) {
-  try {
-    const { stdout, stderr } = await execFileAsync4("git", args, {
-      cwd,
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024
-    });
-    if (!quiet && stderr.trim()) {
-      process.stderr.write(stderr);
-    }
-    return stdout;
-  } catch (err) {
-    const e = err;
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(
-      `[apm] git ${args.join(" ")} \u5931\u8D25${detail ? `: ${detail}` : ""}`
-    );
+// src/commands/session-branch-prune.ts
+var TASK_STATUS_LABEL = {
+  OPEN: "\u5F85\u5F00\u59CB",
+  IN_PROGRESS: "\u8FDB\u884C\u4E2D",
+  COMPLETED: "\u5DF2\u5B8C\u6210",
+  FAILED: "\u5DF2\u5931\u8D25",
+  SUSPENDED: "\u5DF2\u6682\u505C"
+};
+function taskStatusLabel(status) {
+  if (status === null) {
+    return "\u5E73\u53F0\u65E0\u4EFB\u52A1";
   }
+  return TASK_STATUS_LABEL[status] ?? status;
 }
-async function ensureGitRepo3(cwd) {
-  await execGit3(cwd, ["rev-parse", "--git-dir"], true);
+function syncTagForBranch(hasLocal, hasRemote) {
+  if (hasLocal && hasRemote) {
+    return "\u53CC\u7AEF";
+  }
+  if (hasLocal) {
+    return "\u4EC5\u672C\u5730";
+  }
+  return "\u4EC5\u8FDC\u7A0B";
 }
-async function getCurrentBranch3(cwd) {
-  return (await execGit3(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
+function shouldDeleteMode1(input) {
+  if (input.merged) {
+    return { delete: true, reason: "\u5DF2\u5408\u5E76" };
+  }
+  if (input.taskStatus === null) {
+    return { delete: true, reason: "\u5E73\u53F0\u65E0\u4EFB\u52A1" };
+  }
+  return { delete: false, reason: "" };
 }
-async function resolveBaselineBranch(cwd, api) {
-  const workdirPath = resolveWorkdirPath(cwd);
-  const baseline = await api.cli.workspaceBaseline({ workdirPath });
-  if (!baseline.repositoryId) {
-    const detail = baseline.diagnostic?.message ?? `\u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}\uFF08\u89C4\u8303\u5316\uFF1A${baseline.workdirPath}\uFF09
-\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`;
-    throw new Error(`[apm] ${detail}`);
+function shouldDeleteMode2(input) {
+  const mode1 = shouldDeleteMode1(input);
+  if (mode1.delete) {
+    return mode1;
   }
-  const baselineBranch = (baseline.defaultBranch ?? "").trim();
-  if (!baselineBranch) {
-    throw new Error("[apm] \u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
+  if (input.taskStatus === "COMPLETED") {
+    return { delete: true, reason: "\u4EFB\u52A1\u5DF2\u5B8C\u6210" };
   }
-  await execGit3(cwd, ["fetch", "origin", baselineBranch], true);
-  if (!await remoteBranchExists2(cwd, baselineBranch)) {
-    throw new Error(
-      `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F origin/${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
-    );
+  if (input.taskStatus === "FAILED") {
+    return { delete: true, reason: "\u4EFB\u52A1\u5DF2\u5931\u8D25" };
   }
-  return baselineBranch;
+  return { delete: false, reason: "" };
 }
-async function isBranchBasedOnBaseline(cwd, branch, baselineBranch) {
-  const ref = await localBranchExists2(cwd, branch) ? branch : `origin/${branch}`;
-  try {
-    await execGit3(
-      cwd,
-      ["merge-base", "--is-ancestor", `origin/${baselineBranch}`, ref],
-      true
-    );
-    return true;
-  } catch {
-    return false;
-  }
+function buildSessionBranchRow(input) {
+  const mode1 = shouldDeleteMode1(input);
+  const mode2 = shouldDeleteMode2(input);
+  return {
+    branch: input.branch,
+    sessionId: input.sessionId,
+    hasLocal: input.hasLocal,
+    hasRemote: input.hasRemote,
+    syncTag: syncTagForBranch(input.hasLocal, input.hasRemote),
+    merged: input.merged,
+    taskStatus: input.taskStatus,
+    taskLabel: taskStatusLabel(input.taskStatus),
+    deleteMode1: mode1.delete,
+    deleteMode2: mode2.delete,
+    deleteReasonMode1: mode1.reason,
+    deleteReasonMode2: mode2.reason
+  };
 }
-async function listCandidateSessionBranches(cwd, includeRemote) {
-  const names = new Set(await listLocalSessionBranches(cwd));
-  if (includeRemote) {
-    for (const branch of await listRemoteSessionBranches(cwd)) {
-      names.add(branch);
-    }
+function rowsForDeleteMode(rows, mode) {
+  return rows.filter((row) => mode === 1 ? row.deleteMode1 : row.deleteMode2);
+}
+function yn(value) {
+  return value ? "\u662F" : "\u2014";
+}
+function pad(value, width) {
+  const chars = [...value];
+  const len = chars.length;
+  if (len >= width) {
+    return value;
   }
-  return [...names].sort((a, b) => a.localeCompare(b));
+  return value + " ".repeat(width - len);
+}
+function formatSessionBranchTable(meta, rows) {
+  const lines = [
+    `[apm] \u5DE5\u4F5C\u76EE\u5F55: ${meta.workdirPath}`,
+    `[apm] Git \u6839\u76EE\u5F55: ${meta.gitRoot}`,
+    `[apm] \u4ED3\u5E93 ID: ${meta.repositoryId}`,
+    `[apm] \u57FA\u7EBF\u5206\u652F: ${meta.baselineBranch}`,
+    ""
+  ];
+  if (rows.length === 0) {
+    lines.push(
+      `[apm] \u672A\u53D1\u73B0\u4ECE ${meta.baselineBranch} \u884D\u751F\u7684 feat/session-* \u5206\u652F\uFF08\u672C\u5730\u4E0E\u8FDC\u7A0B\uFF09`
+    );
+    return lines.join("\n");
+  }
+  const headers = [
+    "\u5206\u652F",
+    "\u672C\u5730",
+    "\u8FDC\u7A0B",
+    "\u540C\u6B65",
+    "\u5DF2\u5408\u5E76",
+    "\u4EFB\u52A1\u72B6\u6001",
+    "\u6A21\u5F0F1",
+    "\u6A21\u5F0F2"
+  ];
+  const widths = [36, 4, 4, 6, 6, 10, 6, 6];
+  lines.push(headers.map((h, i) => pad(h, widths[i])).join("  "));
+  lines.push(widths.map((w) => "-".repeat(w)).join("  "));
+  for (const row of rows) {
+    const cells = [
+      row.branch,
+      yn(row.hasLocal),
+      yn(row.hasRemote),
+      row.syncTag,
+      yn(row.merged),
+      row.taskLabel,
+      row.deleteMode1 ? row.deleteReasonMode1 || "\u662F" : "\u2014",
+      row.deleteMode2 ? row.deleteReasonMode2 || "\u662F" : "\u2014"
+    ];
+    lines.push(cells.map((c, i) => pad(c, widths[i])).join("  "));
+  }
+  const mode1Count = rows.filter((r) => r.deleteMode1).length;
+  const mode2Count = rows.filter((r) => r.deleteMode2).length;
+  lines.push("");
+  lines.push(
+    `[apm] \u5171 ${rows.length} \u4E2A\u5206\u652F\uFF1B\u6A21\u5F0F 1 \u53EF\u6E05\u7406 ${mode1Count} \u4E2A\uFF0C\u6A21\u5F0F 2 \u53EF\u6E05\u7406 ${mode2Count} \u4E2A`
+  );
+  lines.push("[apm] \u6A21\u5F0F 1\uFF1A\u5DF2\u5408\u5E76\u8FDB\u57FA\u7EBF\uFF0C\u6216\u5E73\u53F0\u5DF2\u65E0\u8BE5\u6C9F\u901A\u7FA4\u4EFB\u52A1");
+  lines.push("[apm] \u6A21\u5F0F 2\uFF1A\u5728\u6A21\u5F0F 1 \u57FA\u7840\u4E0A\uFF0C\u53E6\u542B\u4EFB\u52A1\u5DF2\u5B8C\u6210\u6216\u5DF2\u5931\u8D25\u7684\u5206\u652F");
+  lines.push("[apm] \u6267\u884C\u6E05\u7406: apm branch prune --mode 1|2 [--dry-run]");
+  return lines.join("\n");
 }
 async function listLocalSessionBranches(cwd) {
-  const out = await execGit3(
+  const out = await execGit(
     cwd,
     [
       "for-each-ref",
       "--format=%(refname:short)",
       "refs/heads/",
-      SESSION_BRANCH_PREFIX + "*"
+      `${SESSION_BRANCH_PREFIX}*`
     ],
     true
   );
   return out.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
 }
 async function listRemoteSessionBranches(cwd) {
-  const out = await execGit3(
+  const out = await execGit(
     cwd,
     [
       "for-each-ref",
       "--format=%(refname:short)",
       "refs/remotes/origin/",
-      SESSION_BRANCH_PREFIX + "*"
+      `${SESSION_BRANCH_PREFIX}*`
     ],
     true
   );
@@ -1284,7 +1378,7 @@ async function listRemoteSessionBranches(cwd) {
 }
 async function localBranchExists2(cwd, branch) {
   try {
-    await execGit3(
+    await execGit(
       cwd,
       ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`],
       true
@@ -1294,29 +1388,25 @@ async function localBranchExists2(cwd, branch) {
     return false;
   }
 }
-async function remoteBranchExists2(cwd, branch) {
-  const out = await execGit3(
-    cwd,
-    ["ls-remote", "--heads", "origin", branch],
-    true
-  );
-  return out.trim().length > 0;
-}
-function reasonForCleanup(sessionId, sessionStatusById) {
-  if (!sessionStatusById.has(sessionId)) {
-    return "\u6C9F\u901A\u7FA4\u4E0D\u5728\u4EFB\u52A1\u5217\u8868\u4E2D";
-  }
-  if (sessionStatusById.get(sessionId) === "COMPLETED") {
-    return "\u5173\u8054\u4EFB\u52A1\u5DF2\u5B8C\u6210";
+async function isBranchBasedOnBaseline(cwd, branch, baselineBranch) {
+  const ref = await localBranchExists2(cwd, branch) ? branch : `origin/${branch}`;
+  try {
+    await execGit(
+      cwd,
+      ["merge-base", "--is-ancestor", `origin/${baselineBranch}`, ref],
+      true
+    );
+    return true;
+  } catch {
+    return false;
   }
-  return "\u4FDD\u7559";
 }
-async function isBranchMergedIntoDefault(cwd, branch, defaultBranch) {
+async function isBranchMergedIntoBaseline(cwd, branch, baselineBranch) {
   const ref = await localBranchExists2(cwd, branch) ? branch : `origin/${branch}`;
   try {
-    await execGit3(
+    await execGit(
       cwd,
-      ["merge-base", "--is-ancestor", ref, `origin/${defaultBranch}`],
+      ["merge-base", "--is-ancestor", ref, `origin/${baselineBranch}`],
       true
     );
     return true;
@@ -1324,79 +1414,129 @@ async function isBranchMergedIntoDefault(cwd, branch, defaultBranch) {
     return false;
   }
 }
+async function resolveSessionBranchScanMeta(cwd, api) {
+  const workdirPath = resolveWorkdirPath(cwd);
+  const baseline = await resolveWorkspaceBaseline(api, workdirPath);
+  const gitRoot = await resolveGitRepoRoot(cwd);
+  await ensureGitRepo(gitRoot);
+  await execGit(gitRoot, ["fetch", "--prune", "origin"], true);
+  await ensureRemoteBaselineBranch(gitRoot, baseline.defaultBranch);
+  return {
+    workdirPath,
+    gitRoot,
+    baselineBranch: baseline.defaultBranch,
+    repositoryId: baseline.repositoryId
+  };
+}
+async function scanSessionBranches(meta, sessionStatusById) {
+  const { gitRoot, baselineBranch } = meta;
+  const names = /* @__PURE__ */ new Set();
+  for (const branch of await listLocalSessionBranches(gitRoot)) {
+    names.add(branch);
+  }
+  for (const branch of await listRemoteSessionBranches(gitRoot)) {
+    names.add(branch);
+  }
+  const rows = [];
+  for (const branch of [...names].sort((a, b) => a.localeCompare(b))) {
+    if (!await isBranchBasedOnBaseline(gitRoot, branch, baselineBranch)) {
+      continue;
+    }
+    const sessionId = sessionIdFromBranchName(branch);
+    if (!sessionId) {
+      continue;
+    }
+    const hasLocal = await localBranchExists2(gitRoot, branch);
+    const hasRemote = await remoteBranchExists(gitRoot, branch);
+    const merged = await isBranchMergedIntoBaseline(
+      gitRoot,
+      branch,
+      baselineBranch
+    );
+    const rawStatus = sessionStatusById.get(sessionId);
+    const taskStatus = rawStatus ? rawStatus : null;
+    rows.push(
+      buildSessionBranchRow({
+        branch,
+        sessionId,
+        hasLocal,
+        hasRemote,
+        merged,
+        taskStatus
+      })
+    );
+  }
+  return rows;
+}
+async function deleteSessionBranch(gitRoot, baselineBranch, branch, currentBranchRef) {
+  if (currentBranchRef.value === branch) {
+    await execGit(gitRoot, ["checkout", baselineBranch], true);
+    currentBranchRef.value = baselineBranch;
+  }
+  if (await localBranchExists2(gitRoot, branch)) {
+    await execGit(gitRoot, ["branch", "-D", branch], true);
+    console.log(`[apm] \u5DF2\u5220\u9664\u672C\u5730\u5206\u652F ${branch}`);
+  }
+  if (await remoteBranchExists(gitRoot, branch)) {
+    await execGit(gitRoot, ["push", "origin", "--delete", branch], true);
+    console.log(`[apm] \u5DF2\u5220\u9664\u8FDC\u7A0B\u5206\u652F origin/${branch}`);
+  }
+}
+async function loadSessionStatusMap(api) {
+  const { sessions } = await api.cli.listSessionsForBranchCleanup({});
+  return new Map(sessions.map((item) => [item.sessionId, item.taskStatus]));
+}
+async function getGitCurrentBranch(gitRoot) {
+  return getCurrentBranch(gitRoot);
+}
+
+// src/commands/clean-branches.ts
 async function runCleanBranches(options = {}) {
   const cwd = options.cwd ?? process.cwd();
-  const dryRun = options.dryRun ?? false;
-  const includeRemote = options.includeRemote ?? false;
-  await ensureGitRepo3(cwd);
-  await execGit3(cwd, ["fetch", "--prune", "origin"], true);
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
-  const baselineBranch = await resolveBaselineBranch(cwd, api);
-  const { sessions } = await api.cli.listSessionsForBranchCleanup({});
-  const sessionStatusById = new Map(
-    sessions.map((item) => [item.sessionId, item.taskStatus])
-  );
-  const candidates = await listCandidateSessionBranches(cwd, includeRemote);
-  const branchNames = [];
-  for (const branch of candidates) {
-    if (await isBranchBasedOnBaseline(cwd, branch, baselineBranch)) {
-      branchNames.push(branch);
-    }
-  }
-  if (branchNames.length === 0) {
-    console.log(
-      `[apm] \u672A\u53D1\u73B0\u4ECE ${baselineBranch} \u884D\u751F\u7684\u672C\u5730 feat/session-* \u5206\u652F${includeRemote ? "\uFF08\u542B\u8FDC\u7A0B\uFF09" : ""}`
-    );
+  const meta = await resolveSessionBranchScanMeta(cwd, api);
+  const sessionStatusById = await loadSessionStatusMap(api);
+  const rows = await scanSessionBranches(meta, sessionStatusById);
+  console.log(formatSessionBranchTable(meta, rows));
+  if (!options.mode) {
     return;
   }
-  const toDelete = [...branchNames].map((branch) => {
-    const sessionId = sessionIdFromBranchName(branch);
-    if (!sessionId) {
-      return null;
-    }
-    const reason = reasonForCleanup(sessionId, sessionStatusById);
-    if (reason === "\u4FDD\u7559") {
-      return null;
-    }
-    return { branch, sessionId, reason };
-  }).filter((item) => item != null).sort((a, b) => a.branch.localeCompare(b.branch));
+  const toDelete = rowsForDeleteMode(rows, options.mode);
   if (toDelete.length === 0) {
-    console.log("[apm] \u6CA1\u6709\u9700\u8981\u6E05\u7406\u7684 feat/session-* \u5206\u652F");
+    console.log(`[apm] \u6A21\u5F0F ${options.mode} \u4E0B\u6CA1\u6709\u9700\u8981\u6E05\u7406\u7684\u5206\u652F`);
     return;
   }
-  let currentBranch = await getCurrentBranch3(cwd);
-  for (const item of toDelete) {
-    const { branch, sessionId, reason } = item;
-    const label = `${branch} (${sessionId}: ${reason})`;
-    if (dryRun) {
-      const merged = await isBranchMergedIntoDefault(
-        cwd,
-        branch,
-        baselineBranch
+  if (options.dryRun) {
+    for (const row of toDelete) {
+      const reason = options.mode === 1 ? row.deleteReasonMode1 : row.deleteReasonMode2;
+      const parts = [
+        row.hasLocal ? "\u672C\u5730" : null,
+        row.hasRemote ? "\u8FDC\u7A0B" : null
+      ].filter(Boolean).join("+");
+      console.log(
+        `[apm] [dry-run] \u6A21\u5F0F ${options.mode} \u5C06\u5220\u9664 ${row.branch}\uFF08${parts || "\u65E0"}\uFF1B${reason}\uFF09`
       );
-      const mergeTag = merged ? "\u5DF2\u5408\u5E76" : "\u672A\u5408\u5E76";
-      console.log(`[apm] [dry-run] \u5C06\u5220\u9664 ${label} [${mergeTag}]`);
-      continue;
-    }
-    if (currentBranch === branch) {
-      await execGit3(cwd, ["checkout", baselineBranch], true);
-      currentBranch = baselineBranch;
-    }
-    if (await localBranchExists2(cwd, branch)) {
-      await execGit3(cwd, ["branch", "-D", branch], true);
-      console.log(`[apm] \u5DF2\u5220\u9664\u672C\u5730\u5206\u652F ${branch}`);
-    }
-    if (await remoteBranchExists2(cwd, branch)) {
-      await execGit3(cwd, ["push", "origin", "--delete", branch], true);
-      console.log(`[apm] \u5DF2\u5220\u9664\u8FDC\u7A0B\u5206\u652F origin/${branch}`);
     }
+    console.log(
+      `[apm] [dry-run] \u6A21\u5F0F ${options.mode} \u5171 ${toDelete.length} \u4E2A\u5206\u652F\u5F85\u6E05\u7406`
+    );
+    return;
   }
-  if (dryRun) {
-    console.log(`[apm] [dry-run] \u5171 ${toDelete.length} \u4E2A\u5206\u652F\u5F85\u6E05\u7406`);
-  } else {
-    console.log(`[apm] \u5DF2\u6E05\u7406 ${toDelete.length} \u4E2A feat/session-* \u5206\u652F`);
+  const currentBranchRef = {
+    value: await getGitCurrentBranch(meta.gitRoot)
+  };
+  for (const row of toDelete) {
+    await deleteSessionBranch(
+      meta.gitRoot,
+      meta.baselineBranch,
+      row.branch,
+      currentBranchRef
+    );
   }
+  console.log(
+    `[apm] \u6A21\u5F0F ${options.mode} \u5DF2\u6E05\u7406 ${toDelete.length} \u4E2A feat/session-* \u5206\u652F`
+  );
 }
 
 // src/commands/pull.ts
@@ -1649,7 +1789,7 @@ function isRuleUpToDate(entry, rule, dest) {
 }
 async function syncPlatformRules(cfg, sessionId, workdirPath, apmRoot) {
   const api = createApmApiClient(cfg);
-  const baseline = await api.cli.branchBaseline({ sessionId, workdirPath });
+  const baseline = await resolveBranchBaseline(api, sessionId, workdirPath);
   const repositoryId = baseline.repositoryId;
   const rulesDir = join8(apmRoot ?? workspaceApmDir(workdirPath), "rules");
   await ensureDirExists(rulesDir);
@@ -2035,6 +2175,9 @@ import { basename as basename3 } from "path";
 // src/assumptions/local-validate.ts
 var NO_ASSUMPTIONS_RE = /无[，,]?\s*口径均有依据/;
 var BLOCK_HEADER_RE = /^####\s+(A\d+)\s*$/im;
+function formatAssumptionQuestionId(source, code) {
+  return `${source}:${code}`;
+}
 var DEV_PATTERNS = [
   { pattern: /status\s*=/i, message: "\u5305\u542B status= \u7B49\u6280\u672F\u679A\u4E3E" },
   { pattern: /\.(java|vue|ts|tsx|jsx|sql)\b/i, message: "\u5305\u542B\u6587\u4EF6\u8DEF\u5F84" },
@@ -2064,7 +2207,7 @@ function parseField(block, label) {
   const value = match?.[1]?.trim();
   return value || void 0;
 }
-function parseStructuredBlock(code, block) {
+function parseStructuredBlock(code, block, source) {
   const pmQuestion = parseField(block, "\u95EE") ?? parseField(block, "prompt");
   if (!pmQuestion) return null;
   const optionsSection = block.match(
@@ -2073,7 +2216,7 @@ function parseStructuredBlock(code, block) {
   const options = optionsSection ? parseOptionsBlock(optionsSection[1]) : [];
   return {
     code,
-    questionId: code,
+    questionId: formatAssumptionQuestionId(source, code),
     pmQuestion,
     context: parseField(block, "\u573A\u666F"),
     options,
@@ -2104,7 +2247,7 @@ function parseAssumptionsDocument(markdown, _source) {
   for (const block of blocks) {
     const headerMatch = block.match(BLOCK_HEADER_RE);
     if (!headerMatch) continue;
-    const parsed = parseStructuredBlock(headerMatch[1], block);
+    const parsed = parseStructuredBlock(headerMatch[1], block, _source);
     if (parsed) results.push(parsed);
   }
   return results;
@@ -3051,8 +3194,8 @@ var MinioClient = class {
 // src/commands/deploy/internal/deploy-artifact-minio.ts
 var APM_DEPLOYMENT_RUN_ID_ENV = "APM_DEPLOYMENT_RUN_ID";
 function formatDeployArtifactTimestamp(date = /* @__PURE__ */ new Date()) {
-  const pad = (n) => String(n).padStart(2, "0");
-  return `${date.getFullYear()}${pad(date.getMonth() + 1)}${pad(date.getDate())}${pad(date.getHours())}${pad(date.getMinutes())}${pad(date.getSeconds())}`;
+  const pad2 = (n) => String(n).padStart(2, "0");
+  return `${date.getFullYear()}${pad2(date.getMonth() + 1)}${pad2(date.getDate())}${pad2(date.getHours())}${pad2(date.getMinutes())}${pad2(date.getSeconds())}`;
 }
 function sanitizeDeployProjectName(name) {
   const trimmed = name.trim().replace(/\\/g, "/");
@@ -5251,19 +5394,10 @@ var LOG_PREFIX2 = "[apm] \u90E8\u7F72\u524D\u57FA\u7EBF\u540C\u6B65:";
 function formatGitError(error) {
   return error instanceof Error ? error.message : String(error);
 }
-async function resolveBaselineBranch2(cwd, api) {
+async function resolveBaselineBranch(cwd, api) {
   const workdirPath = resolveWorkdirPath(cwd);
-  const baseline = await api.cli.workspaceBaseline({ workdirPath });
-  if (!baseline.repositoryId) {
-    const detail = baseline.diagnostic?.message ?? `\u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}\uFF08\u89C4\u8303\u5316\uFF1A${baseline.workdirPath}\uFF09
-\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`;
-    throw new Error(detail);
-  }
-  const baselineBranch = (baseline.defaultBranch ?? "").trim();
-  if (!baselineBranch) {
-    throw new Error("\u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
-  }
-  return baselineBranch;
+  const baseline = await resolveWorkspaceBaseline(api, workdirPath);
+  return baseline.defaultBranch;
 }
 async function isMergeInProgress(cwd) {
   try {
@@ -5343,21 +5477,17 @@ async function syncDeployBaselineBeforeDeploy(cwd) {
   }
   await ensureGitRepo(cwd);
   const api = createApmApiClient(cfg);
-  const baselineBranch = await resolveBaselineBranch2(cwd, api);
+  const baselineBranch = await resolveBaselineBranch(cwd, api);
+  const gitRoot = await resolveGitRepoRoot(cwd);
   note(`${LOG_PREFIX2} \u57FA\u7EBF\u5206\u652F ${baselineBranch}`);
   note(`${LOG_PREFIX2} \u6B63\u5728 fetch origin ${baselineBranch}`);
-  await execGit(cwd, ["fetch", "origin", baselineBranch], true);
-  if (!await remoteBranchExists(cwd, baselineBranch)) {
-    throw new Error(
-      `\u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F origin/${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
-    );
-  }
+  await ensureRemoteBaselineBranch(gitRoot, baselineBranch);
   note(`${LOG_PREFIX2} fetch \u5B8C\u6210`);
-  const currentBranch = await getCurrentBranch(cwd);
+  const currentBranch = await getCurrentBranch(gitRoot);
   let stashed = false;
-  if (await isWorkingTreeDirty(cwd)) {
+  if (await isWorkingTreeDirty(gitRoot)) {
     note(`${LOG_PREFIX2} \u68C0\u6D4B\u5230\u672A\u63D0\u4EA4\u6539\u52A8\uFF0C\u5148 stash`);
-    await execGit(cwd, [
+    await execGit(gitRoot, [
       "stash",
       "push",
       "-u",
@@ -5368,12 +5498,12 @@ async function syncDeployBaselineBeforeDeploy(cwd) {
     note(`${LOG_PREFIX2} \u5DF2 stash \u672A\u63D0\u4EA4\u6539\u52A8`);
   }
   const { merged, conflictRollback } = await mergeBaselineBranch(
-    cwd,
+    gitRoot,
     baselineBranch,
     currentBranch,
     note
   );
-  const stashConflict = await restoreStashIfNeeded(cwd, stashed, note);
+  const stashConflict = await restoreStashIfNeeded(gitRoot, stashed, note);
   if (conflictRollback || stashConflict) {
     note(`${LOG_PREFIX2} \u57FA\u7EBF\u540C\u6B65\u672A\u5B8C\u6210\uFF08\u5B58\u5728\u51B2\u7A81\u5E76\u5DF2\u56DE\u9000\uFF09\uFF0C\u7EE7\u7EED\u6267\u884C\u90E8\u7F72`);
   } else if (merged) {
@@ -8255,14 +8385,23 @@ function buildProgram() {
   });
   const branch = program.command("branch").description("\u4F1A\u8BDD\u5206\u652F feat/session-<sessionId>");
   branch.command("prune").description(
-    "\u6E05\u7406\u672C\u5730\u4E0E\u8FDC\u7A0B feat/session-* \u5206\u652F\uFF08\u7C7B\u4F3C git fetch --prune\uFF09\uFF1A\u6C9F\u901A\u7FA4\u4E0D\u5728\u4EFB\u52A1\u5217\u8868\u4E2D\uFF0C\u6216\u5173\u8054\u4EFB\u52A1\u5DF2\u5B8C\u6210\u65F6\u5220\u9664"
-  ).option("--dry-run", "\u4EC5\u5217\u51FA\u5C06\u88AB\u5220\u9664\u7684\u5206\u652F\uFF0C\u4E0D\u5B9E\u9645\u6267\u884C").option(
-    "-A, --all",
-    "\u5305\u542B\u4EC5\u5B58\u5728\u4E8E\u8FDC\u7A0B\u3001\u672C\u5730\u672A checkout \u7684 feat/session-* \u5206\u652F\uFF08\u9ED8\u8BA4\u4EC5\u5904\u7406\u672C\u5730\u5206\u652F\uFF09"
-  ).action(async (opts) => {
+    "\u626B\u63CF feat/session-* \u5206\u652F\u5E76\u8F93\u51FA\u72B6\u6001\u8868\uFF1B\u52A0 --mode \u6309\u89C4\u5219\u6E05\u7406\u672C\u5730\u4E0E\u8FDC\u7A0B\u5206\u652F"
+  ).option(
+    "--mode <n>",
+    "\u6E05\u7406\u6A21\u5F0F\uFF1A1=\u5DF2\u5408\u5E76\u6216\u5E73\u53F0\u65E0\u4EFB\u52A1\uFF1B2=\u6A21\u5F0F1+\u4EFB\u52A1\u5DF2\u5B8C\u6210/\u5DF2\u5931\u8D25"
+  ).option("--dry-run", "\u914D\u5408 --mode \u4EC5\u9884\u89C8\u5C06\u88AB\u5220\u9664\u7684\u5206\u652F\uFF0C\u4E0D\u5B9E\u9645\u6267\u884C").action(async (opts) => {
+    const modeRaw = opts.mode?.trim();
+    let mode;
+    if (modeRaw) {
+      if (modeRaw !== "1" && modeRaw !== "2") {
+        console.error("[apm] --mode \u4EC5\u652F\u6301 1 \u6216 2");
+        process.exit(1);
+      }
+      mode = Number(modeRaw);
+    }
     await runCleanBranches({
       dryRun: opts.dryRun,
-      includeRemote: opts.all
+      mode
     });
   });
   branch.description("\u5207\u6362\u6216\u521B\u5EFA\u4F1A\u8BDD\u5206\u652F feat/session-<sessionId>").argument("<sessionId>", "\u6C9F\u901A\u7FA4 ID").option(

package/package.json

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