ai-project-manage-cli 6.0.51 → 6.0.52

package/dist/index.js

@@ -407,6 +407,10 @@ var requestConfig = {
       method: "GET",
       path: "/cli/tasks/branch-baseline"
     }),
+    listSessionsForBranchCleanup: defineEndpoint({
+      method: "GET",
+      path: "/cli/sessions/branch-cleanup"
+    }),
     workspaceBaseline: defineEndpoint({
       method: "GET",
       path: "/cli/workspaces/baseline"
@@ -634,6 +638,7 @@ async function runLogin(opts) {
 import { execFile as execFile2 } from "child_process";
 import { promisify as promisify2 } from "util";
 var execFileAsync2 = promisify2(execFile2);
+var SESSION_BRANCH_PREFIX = "feat/session-";
 function branchNameForSession(sessionId) {
   const id = sessionId.trim();
   if (!id) {
@@ -644,7 +649,15 @@ function branchNameForSession(sessionId) {
       "[apm] \u4F1A\u8BDD ID \u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u6216\u8DEF\u5F84\u5206\u9694\u7B26\uFF0C\u8BF7\u4F7F\u7528\u5B57\u6BCD\u3001\u6570\u5B57\u3001._- \u7B49"
     );
   }
-  return `feat/session-${id}`;
+  return `${SESSION_BRANCH_PREFIX}${id}`;
+}
+function sessionIdFromBranchName(branch) {
+  const name = branch.trim().replace(/^origin\//, "");
+  if (!name.startsWith(SESSION_BRANCH_PREFIX)) {
+    return null;
+  }
+  const sessionId = name.slice(SESSION_BRANCH_PREFIX.length).trim();
+  return sessionId || null;
 }
 async function execGit(cwd, args, quiet) {
   try {
@@ -797,6 +810,171 @@ async function runBranch(sessionId, options = {}) {
   return ensureFeatureBranch(branch, baselineBranch, options);
 }
 
+// src/commands/clean-branches.ts
+import { execFile as execFile3 } from "child_process";
+import { promisify as promisify3 } from "util";
+var execFileAsync3 = promisify3(execFile3);
+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) {
+  return (await execGit2(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
+}
+async function resolveDefaultBranch(cwd) {
+  try {
+    const ref = (await execGit2(cwd, ["symbolic-ref", "refs/remotes/origin/HEAD"], true)).trim();
+    const match = ref.match(/^refs\/remotes\/origin\/(.+)$/);
+    if (match?.[1]) {
+      return match[1];
+    }
+  } catch {
+  }
+  const out = await execGit2(cwd, ["remote", "show", "origin"], true);
+  const headLine = out.split(/\r?\n/).find((line) => line.includes("HEAD branch"));
+  const branch = headLine?.split(":").pop()?.trim();
+  if (branch) {
+    return branch;
+  }
+  throw new Error("[apm] \u65E0\u6CD5\u89E3\u6790 origin \u9ED8\u8BA4\u5206\u652F\uFF0C\u8BF7\u5148\u6267\u884C git fetch origin");
+}
+async function listLocalSessionBranches(cwd) {
+  const out = await execGit2(
+    cwd,
+    [
+      "for-each-ref",
+      "--format=%(refname:short)",
+      "refs/heads/",
+      SESSION_BRANCH_PREFIX + "*"
+    ],
+    true
+  );
+  return out.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+}
+async function listRemoteSessionBranches(cwd) {
+  const out = await execGit2(
+    cwd,
+    [
+      "for-each-ref",
+      "--format=%(refname:short)",
+      "refs/remotes/origin/",
+      SESSION_BRANCH_PREFIX + "*"
+    ],
+    true
+  );
+  return out.split(/\r?\n/).map((line) => line.trim().replace(/^origin\//, "")).filter(Boolean);
+}
+async function localBranchExists2(cwd, branch) {
+  try {
+    await execGit2(
+      cwd,
+      ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`],
+      true
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function remoteBranchExists(cwd, branch) {
+  const out = await execGit2(
+    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";
+  }
+  return "\u4FDD\u7559";
+}
+async function runCleanBranches(options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const dryRun = options.dryRun ?? false;
+  await ensureGitRepo2(cwd);
+  await execGit2(cwd, ["fetch", "--prune", "origin"], true);
+  const cfg = await ensureLoggedConfig();
+  const api = createApmApiClient(cfg);
+  const { sessions } = await api.cli.listSessionsForBranchCleanup({});
+  const sessionStatusById = new Map(
+    sessions.map((item) => [item.sessionId, item.taskStatus])
+  );
+  const branchNames = /* @__PURE__ */ new Set([
+    ...await listLocalSessionBranches(cwd),
+    ...await listRemoteSessionBranches(cwd)
+  ]);
+  if (branchNames.size === 0) {
+    console.log("[apm] \u672A\u53D1\u73B0 feat/session-* \u5206\u652F");
+    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));
+  if (toDelete.length === 0) {
+    console.log("[apm] \u6CA1\u6709\u9700\u8981\u6E05\u7406\u7684 feat/session-* \u5206\u652F");
+    return;
+  }
+  let currentBranch = await getCurrentBranch2(cwd);
+  let defaultBranch = null;
+  for (const item of toDelete) {
+    const { branch, sessionId, reason } = item;
+    const label = `${branch} (${sessionId}: ${reason})`;
+    if (dryRun) {
+      console.log(`[apm] [dry-run] \u5C06\u5220\u9664 ${label}`);
+      continue;
+    }
+    if (currentBranch === branch) {
+      defaultBranch ??= await resolveDefaultBranch(cwd);
+      await execGit2(cwd, ["checkout", defaultBranch], true);
+      currentBranch = defaultBranch;
+    }
+    if (await localBranchExists2(cwd, branch)) {
+      await execGit2(cwd, ["branch", "-D", branch], true);
+      console.log(`[apm] \u5DF2\u5220\u9664\u672C\u5730\u5206\u652F ${branch}`);
+    }
+    if (await remoteBranchExists(cwd, branch)) {
+      await execGit2(cwd, ["push", "origin", "--delete", branch], true);
+      console.log(`[apm] \u5DF2\u5220\u9664\u8FDC\u7A0B\u5206\u652F origin/${branch}`);
+    }
+  }
+  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`);
+  }
+}
+
 // src/commands/pull.ts
 import { writeFileSync as writeFileSync7 } from "fs";
 import { join as join8 } from "path";
@@ -3683,6 +3861,11 @@ function buildProgram() {
   ).action(async (sessionId, opts) => {
     await runBranch(sessionId, { message: opts.message });
   });
+  program.command("clean-branches").description(
+    "\u6E05\u7406\u672C\u5730\u4E0E\u8FDC\u7A0B feat/session-* \u5206\u652F\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").action(async (opts) => {
+    await runCleanBranches({ dryRun: opts.dryRun });
+  });
   program.command("create-pr").description(
     "\u4E3A\u5F53\u524D\u5DE5\u4F5C\u76EE\u5F55\u7684\u4F1A\u8BDD\u7279\u6027\u5206\u652F\u521B\u5EFA PR\uFF08\u6807\u9898\u81EA\u52A8\u52A0 [AI] \u6807\u8BC6\uFF1B\u8FDC\u7A0B\u521B\u5EFA\u5931\u8D25\u65F6\u5E73\u53F0\u6570\u636E\u56DE\u6EDA\uFF09"
   ).requiredOption("--session <sessionId>", "\u6C9F\u901A\u7FA4 ID").requiredOption("--title <title>", "PR \u6807\u9898").option("--content <content>", "PR \u6B63\u6587\uFF08Markdown\uFF09", "").action(

package/package.json

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