ai-project-manage-cli 6.0.80 → 6.0.82

package/README.md

@@ -31,6 +31,7 @@ apm sync-project-documents
 apm sync-project-documents --push
 apm update-skills
 apm branch <sessionId>
+apm branch prune [--dry-run] [-A|--all]
 ```
 
 ## 常驻连接（后台守护）

package/dist/index.js

@@ -1180,22 +1180,47 @@ async function ensureGitRepo2(cwd) {
 async function getCurrentBranch2(cwd) {
   return (await execGit3(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
 }
-async function resolveDefaultBranch(cwd) {
+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}`);
+  }
+  const baselineBranch = (baseline.defaultBranch ?? "").trim();
+  if (!baselineBranch) {
+    throw new Error("[apm] \u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
+  }
+  await execGit3(cwd, ["fetch", "origin", baselineBranch], true);
+  if (!await remoteBranchExists(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`
+    );
+  }
+  return baselineBranch;
+}
+async function isBranchBasedOnBaseline(cwd, branch, baselineBranch) {
+  const ref = await localBranchExists2(cwd, branch) ? branch : `origin/${branch}`;
   try {
-    const ref = (await execGit3(cwd, ["symbolic-ref", "refs/remotes/origin/HEAD"], true)).trim();
-    const match = ref.match(/^refs\/remotes\/origin\/(.+)$/);
-    if (match?.[1]) {
-      return match[1];
-    }
+    await execGit3(
+      cwd,
+      ["merge-base", "--is-ancestor", `origin/${baselineBranch}`, ref],
+      true
+    );
+    return true;
   } catch {
+    return false;
   }
-  const out = await execGit3(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;
+}
+async function listCandidateSessionBranches(cwd, includeRemote) {
+  const names = new Set(await listLocalSessionBranches(cwd));
+  if (includeRemote) {
+    for (const branch of await listRemoteSessionBranches(cwd)) {
+      names.add(branch);
+    }
   }
-  throw new Error("[apm] \u65E0\u6CD5\u89E3\u6790 origin \u9ED8\u8BA4\u5206\u652F\uFF0C\u8BF7\u5148\u6267\u884C git fetch origin");
+  return [...names].sort((a, b) => a.localeCompare(b));
 }
 async function listLocalSessionBranches(cwd) {
   const out = await execGit3(
@@ -1268,20 +1293,27 @@ async function isBranchMergedIntoDefault(cwd, branch, defaultBranch) {
 async function runCleanBranches(options = {}) {
   const cwd = options.cwd ?? process.cwd();
   const dryRun = options.dryRun ?? false;
+  const includeRemote = options.includeRemote ?? false;
   await ensureGitRepo2(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 branchNames = /* @__PURE__ */ new Set([
-    ...await listLocalSessionBranches(cwd),
-    ...await listRemoteSessionBranches(cwd)
-  ]);
-  if (branchNames.size === 0) {
-    console.log("[apm] \u672A\u53D1\u73B0 feat/session-* \u5206\u652F");
+  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" : ""}`
+    );
     return;
   }
   const toDelete = [...branchNames].map((branch) => {
@@ -1300,10 +1332,6 @@ async function runCleanBranches(options = {}) {
     return;
   }
   let currentBranch = await getCurrentBranch2(cwd);
-  let defaultBranch = null;
-  if (dryRun) {
-    defaultBranch = await resolveDefaultBranch(cwd);
-  }
   for (const item of toDelete) {
     const { branch, sessionId, reason } = item;
     const label = `${branch} (${sessionId}: ${reason})`;
@@ -1311,16 +1339,15 @@ async function runCleanBranches(options = {}) {
       const merged = await isBranchMergedIntoDefault(
         cwd,
         branch,
-        defaultBranch
+        baselineBranch
       );
       const mergeTag = merged ? "\u5DF2\u5408\u5E76" : "\u672A\u5408\u5E76";
       console.log(`[apm] [dry-run] \u5C06\u5220\u9664 ${label} [${mergeTag}]`);
       continue;
     }
     if (currentBranch === branch) {
-      defaultBranch ??= await resolveDefaultBranch(cwd);
-      await execGit3(cwd, ["checkout", defaultBranch], true);
-      currentBranch = defaultBranch;
+      await execGit3(cwd, ["checkout", baselineBranch], true);
+      currentBranch = baselineBranch;
     }
     if (await localBranchExists2(cwd, branch)) {
       await execGit3(cwd, ["branch", "-D", branch], true);
@@ -4238,6 +4265,42 @@ function posixBasename(p) {
   return idx >= 0 ? normalized.slice(idx + 1) : normalized;
 }
 
+// src/commands/deploy/internal/deploy-hints.ts
+function formatDeployNotConfiguredLines(env, deployCommands) {
+  const configuredEnvs = Object.keys(deployCommands).filter(
+    (key) => deployCommands[key]?.trim()
+  );
+  if (configuredEnvs.length > 0) {
+    return [
+      `[apm] \u65E0\u6CD5\u6267\u884C\u90E8\u7F72\uFF1Aapm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}`,
+      `[apm] \u5F53\u524D\u5DF2\u914D\u7F6E\u7684\u73AF\u5883: ${configuredEnvs.join(", ")}`
+    ];
+  }
+  return [
+    "[apm] \u65E0\u6CD5\u6267\u884C\u90E8\u7F72\uFF1A\u5F53\u524D\u9879\u76EE\u672A\u914D\u7F6E\u81EA\u52A8\u5316\u90E8\u7F72\uFF08apm.config.json \u4E2D\u65E0 deploy \u6BB5\uFF09",
+    "[apm] \u90E8\u5206\u9879\u76EE\u4E0D\u652F\u6301\u6216\u672A\u542F\u7528\u81EA\u52A8\u5316\u90E8\u7F72\uFF0C\u5C5E\u6B63\u5E38\u60C5\u51B5\uFF0C\u53EF\u8DF3\u8FC7\u90E8\u7F72"
+  ];
+}
+function formatWisdomFrontendDeployNotConfiguredLines(env, packageJsonPath) {
+  return [
+    `[apm] \u65E0\u6CD5\u6267\u884C\u90E8\u7F72\uFF1A${packageJsonPath} \u4E2D\u672A\u627E\u5230 deploy:${env} \u811A\u672C`,
+    "[apm] \u82E5\u672C\u9879\u76EE\u4E0D\u652F\u6301\u81EA\u52A8\u5316\u90E8\u7F72\uFF0C\u5C5E\u6B63\u5E38\u60C5\u51B5\uFF0C\u53EF\u8DF3\u8FC7\u90E8\u7F72"
+  ];
+}
+function printDeployNotConfiguredHint(env, deployCommands) {
+  for (const line of formatDeployNotConfiguredLines(env, deployCommands)) {
+    console.error(line);
+  }
+}
+function printWisdomFrontendDeployNotConfiguredHint(env, packageJsonPath) {
+  for (const line of formatWisdomFrontendDeployNotConfiguredLines(
+    env,
+    packageJsonPath
+  )) {
+    console.error(line);
+  }
+}
+
 // src/commands/deploy/internal/wisdom-auto-deploy.ts
 import { existsSync as existsSync17, readFileSync as readFileSync14 } from "node:fs";
 import path3 from "node:path";
@@ -5062,8 +5125,9 @@ async function runWisdomAutoDeploy(options) {
   if (projectType === "frontend") {
     const deployCmd = resolveFrontendDeployCommand(options.env, cwd);
     if (!deployCmd) {
-      console.error(
-        `\u524D\u7AEF\u9879\u76EE ${path3.join(cwd, "package.json")} \u4E2D\u672A\u627E\u5230 deploy:${options.env} \u811A\u672C`
+      printWisdomFrontendDeployNotConfiguredHint(
+        options.env,
+        path3.join(cwd, "package.json")
       );
       process.exit(1);
     }
@@ -5115,12 +5179,7 @@ function registerDeployMainCommand(program) {
     const deployCommands = cfg.deploy ?? {};
     const command = deployCommands[env]?.trim();
     if (!command) {
-      const keys = Object.keys(deployCommands);
-      console.error(
-        keys.length > 0 ? `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy.${env}\uFF0C\u53EF\u7528\u73AF\u5883: ${keys.join(
-          ", "
-        )}` : `apm.config.json \u4E2D\u672A\u914D\u7F6E deploy \u6BB5`
-      );
+      printDeployNotConfiguredHint(env, deployCommands);
       process.exit(1);
     }
     runShellCommand3(command, cwd);
@@ -6147,17 +6206,24 @@ function buildProgram() {
       lines: Number.isFinite(lines) && lines > 0 ? lines : 100
     });
   });
-  program.command("branch").description("\u5207\u6362\u6216\u521B\u5EFA\u4F1A\u8BDD\u5206\u652F feat/session-<sessionId>").argument("<sessionId>", "\u6C9F\u901A\u7FA4 ID").option(
+  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) => {
+    await runCleanBranches({
+      dryRun: opts.dryRun,
+      includeRemote: opts.all
+    });
+  });
+  branch.description("\u5207\u6362\u6216\u521B\u5EFA\u4F1A\u8BDD\u5206\u652F feat/session-<sessionId>").argument("<sessionId>", "\u6C9F\u901A\u7FA4 ID").option(
     "-m, --message <text>",
     "\u5DF2\u5728\u76EE\u6807\u5206\u652F\u4E14\u9700\u63D0\u4EA4\u672C\u5730\u6539\u52A8\u65F6\u4F7F\u7528\u7684\u63D0\u4EA4\u8BF4\u660E"
   ).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.80",
+  "version": "6.0.82",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,

package/template/skills/apm-deploy/SKILL.md

@@ -1,8 +1,14 @@
+# apm-deploy：自动化部署
+
 ## 工作流程
 
-在项目根目录执行 `apm deploy <环境名称>`
+在项目根目录执行 `apm deploy <环境名称>`，**以命令执行结果为准**：
+
+- **成功**：部署完成，在回信中说明测试环境地址或部署结果。
+- **失败且输出含「未配置自动化部署」或「可跳过部署」**：本项目不支持自动化部署，属正常情况；放弃部署，在回信说明已跳过即可，无需修复配置或重试。
+- **其他失败**：按输出排查并修复后重试。
 
 ## 示例
 
 1. 部署测试环境：`apm deploy test`
-2. 部署正式环境: `apm deploy online`
+2. 部署正式环境：`apm deploy online`

package/template/skills/apm-dev/SKILL.md

@@ -86,7 +86,7 @@ ALTER TABLE inspection_class ADD COLUMN is_project_add VARCHAR(1) DEFAULT '0';
 开发完成的定义是以下三项**全部满足**，缺一不可：
 
 1. **构建通过**：执行本仓库的构建/检查命令（见 AGENTS.md 或部署文档），失败必须修复后重试。
-2. **发布测试环境**：**Read** `.apm/skills/apm-deploy/SKILL.md` 并按其流程部署；**后端**涉及 SQL 变更时，须在回复中引用 `docs/SQL.md`，并写明待执行的 SQL 文件名或执行顺序。
+2. **发布测试环境**：**Read** `.apm/skills/apm-deploy/SKILL.md` 并按其流程执行 `apm deploy`（以命令结果判断是否跳过）；**后端**涉及 SQL 变更时，须在回复中引用 `docs/SQL.md`，并写明待执行的 SQL 文件名或执行顺序。
 3. **白名单对账**：在回复中逐文件列出本次改动与计划白名单的对应关系。
 
 **注意：不做联调。** 前后端各自按 `API.md` 交付，接口对不上属于契约或实现问题，由 diff 评审与人工验收暴露后打回修复；禁止自行发起「联调」「接口实测」类的开放式动作。