ai-project-manage-cli 6.0.55 → 6.0.57

package/dist/index.js

@@ -999,6 +999,19 @@ function reasonForCleanup(sessionId, sessionStatusById) {
   }
   return "\u4FDD\u7559";
 }
+async function isBranchMergedIntoDefault(cwd, branch, defaultBranch) {
+  const ref = await localBranchExists2(cwd, branch) ? branch : `origin/${branch}`;
+  try {
+    await execGit3(
+      cwd,
+      ["merge-base", "--is-ancestor", ref, `origin/${defaultBranch}`],
+      true
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function runCleanBranches(options = {}) {
   const cwd = options.cwd ?? process.cwd();
   const dryRun = options.dryRun ?? false;
@@ -1035,11 +1048,20 @@ async function runCleanBranches(options = {}) {
   }
   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})`;
     if (dryRun) {
-      console.log(`[apm] [dry-run] \u5C06\u5220\u9664 ${label}`);
+      const merged = await isBranchMergedIntoDefault(
+        cwd,
+        branch,
+        defaultBranch
+      );
+      const mergeTag = merged ? "\u5DF2\u5408\u5E76" : "\u672A\u5408\u5E76";
+      console.log(`[apm] [dry-run] \u5C06\u5220\u9664 ${label} [${mergeTag}]`);
       continue;
     }
     if (currentBranch === branch) {
@@ -1518,17 +1540,16 @@ async function runUpdate() {
 // src/commands/update-skills.ts
 import { existsSync as existsSync6, mkdirSync as mkdirSync4, statSync as statSync3 } from "fs";
 import { join as join10 } from "path";
-async function runUpdateSkills() {
-  const apmDir = workspaceApmDir();
-  if (!existsSync6(apmDir)) {
-    console.error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
-    process.exit(1);
+async function syncWorkspaceSkills(cfg, workdir) {
+  const apmDir = workspaceApmDir(workdir);
+  const fsApmDir = toFsPath(apmDir);
+  if (!existsSync6(fsApmDir)) {
+    throw new Error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
   }
-  const apmStat = statSync3(apmDir);
+  const apmStat = statSync3(fsApmDir);
   if (!apmStat.isDirectory()) {
     throw new Error(`[apm] \u8DEF\u5F84\u5DF2\u5B58\u5728\u4F46\u4E0D\u662F\u76EE\u5F55: ${apmDir}`);
   }
-  const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
   const { list } = await api.cli.listSkills({});
   if (syncAgentsGuide(apmDir)) {
@@ -1540,7 +1561,7 @@ async function runUpdateSkills() {
     console.log(`[apm] \u5DF2\u540C\u6B65\u57FA\u7840\u89C4\u5219: rules/${name}`);
   }
   const skillsDir = join10(apmDir, "skills");
-  mkdirSync4(skillsDir, { recursive: true });
+  mkdirSync4(toFsPath(skillsDir), { recursive: true });
   const baseNames = syncBaseSkills(skillsDir);
   for (const name of baseNames) {
     console.log(`[apm] \u5DF2\u540C\u6B65\u57FA\u7840\u6280\u80FD: skills/${name}/`);
@@ -1564,6 +1585,19 @@ async function runUpdateSkills() {
     `[apm] \u540C\u6B65\u5B8C\u6210\uFF1A${ruleNames.length} \u4E2A\u57FA\u7840\u89C4\u5219\uFF0C${baseNames.length} \u4E2A\u57FA\u7840\u6280\u80FD\uFF0C${written.length} \u4E2A\u8865\u5145\u6280\u80FD`
   );
 }
+async function runUpdateSkills() {
+  const apmDir = workspaceApmDir();
+  if (!existsSync6(apmDir)) {
+    console.error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
+    process.exit(1);
+  }
+  const apmStat = statSync3(apmDir);
+  if (!apmStat.isDirectory()) {
+    throw new Error(`[apm] \u8DEF\u5F84\u5DF2\u5B58\u5728\u4F46\u4E0D\u662F\u76EE\u5F55: ${apmDir}`);
+  }
+  const cfg = await ensureLoggedConfig();
+  await syncWorkspaceSkills(cfg, resolveWorkdirPath());
+}
 
 // src/commands/sync-deploy-config.ts
 import { existsSync as existsSync7, statSync as statSync4 } from "fs";
@@ -2397,6 +2431,56 @@ async function runCursorAgent(cfg, ctx, options) {
   }
 }
 
+// src/commands/connect/cli-version-sync.ts
+import { existsSync as existsSync11, readFileSync as readFileSync9, writeFileSync as writeFileSync10 } from "fs";
+import { join as join12 } from "path";
+var CLI_VERSION_FILE = ".cli-version.json";
+function manifestPath(apmDir) {
+  return join12(apmDir, CLI_VERSION_FILE);
+}
+function loadManifest3(apmDir) {
+  const path10 = toFsPath(manifestPath(apmDir));
+  if (!existsSync11(path10)) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(
+      readFileSync9(path10, "utf8")
+    );
+    if (parsed?.version === 1 && typeof parsed.cliVersion === "string" && parsed.cliVersion.trim()) {
+      return parsed;
+    }
+  } catch {
+  }
+  return null;
+}
+function saveManifest3(apmDir, cliVersion) {
+  const manifest = { version: 1, cliVersion };
+  writeFileSync10(
+    toFsPath(manifestPath(apmDir)),
+    `${JSON.stringify(manifest, null, 2)}
+`,
+    "utf8"
+  );
+}
+var syncedInSession = /* @__PURE__ */ new Map();
+function shouldSyncSkillsForCliVersion(workdir, currentVersion) {
+  const cached = syncedInSession.get(workdir);
+  if (cached === currentVersion) {
+    return false;
+  }
+  const stored = loadManifest3(workspaceApmDir(workdir));
+  if (stored?.cliVersion === currentVersion) {
+    syncedInSession.set(workdir, currentVersion);
+    return false;
+  }
+  return true;
+}
+function markSkillsSyncedForCliVersion(workdir, cliVersion) {
+  saveManifest3(workspaceApmDir(workdir), cliVersion);
+  syncedInSession.set(workdir, cliVersion);
+}
+
 // src/commands/connect/pre-step-cache.ts
 var PULL_TTL_MS = 3e4;
 function sessionWorkdirKey(sessionId, workdir) {
@@ -2515,6 +2599,19 @@ async function handleInboundMessage(cfg, msg, signal, ctx) {
     } else {
       console.log(`[apm] step=commit-pull skipped sessionId=${msg.sessionId}`);
     }
+    const cliVersion = readCliVersion();
+    if (shouldSyncSkillsForCliVersion(workdir, cliVersion)) {
+      if (signal.aborted) return;
+      console.log(
+        `[apm] CLI \u7248\u672C ${cliVersion} \u4E0E\u5DE5\u4F5C\u533A\u8BB0\u5F55\u4E0D\u4E00\u81F4\uFF0C\u6267\u884C update-skills`
+      );
+      await runStep("update-skills", async () => {
+        await syncWorkspaceSkills(cfg, workdir);
+        markSkillsSyncedForCliVersion(workdir, cliVersion);
+      });
+    } else {
+      console.log(`[apm] step=update-skills skipped workdir=${workdir}`);
+    }
     if (signal.aborted) return;
     await runStep(
       "cursor-agent",
@@ -2755,19 +2852,19 @@ async function runCreatePr(options) {
 import path5 from "node:path";
 
 // src/commands/deploy/internal/apm-config.ts
-import { existsSync as existsSync11, readFileSync as readFileSync9 } from "node:fs";
+import { existsSync as existsSync12, readFileSync as readFileSync10 } from "node:fs";
 import { resolve as resolve4 } from "node:path";
 function loadApmConfig(options) {
   const p = resolve4(
     process.cwd(),
     options?.configPath ?? resolve4(workspaceApmDir(), "apm.config.json")
   );
-  if (!existsSync11(p)) {
+  if (!existsSync12(p)) {
     console.error(`\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6\uFF1A${p}`);
     process.exit(1);
   }
   try {
-    const raw = readFileSync9(p, "utf8");
+    const raw = readFileSync10(p, "utf8");
     return JSON.parse(raw);
   } catch (e) {
     console.error(`\u65E0\u6CD5\u89E3\u6790 apm.config.json\uFF1A${p}`, e);
@@ -2889,7 +2986,7 @@ import path4 from "node:path";
 import Docker from "dockerode";
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/connection-options.ts
-import { existsSync as existsSync12, readFileSync as readFileSync10 } from "node:fs";
+import { existsSync as existsSync13, readFileSync as readFileSync11 } from "node:fs";
 import path from "node:path";
 function asOptionalTlsBuffer(value) {
   if (typeof value !== "string") {
@@ -2901,8 +2998,8 @@ function asOptionalTlsBuffer(value) {
   if (normalized === "") {
     return void 0;
   }
-  if (existsSync12(normalized)) {
-    return readFileSync10(normalized);
+  if (existsSync13(normalized)) {
+    return readFileSync11(normalized);
   }
   const looksLikePath = /[\\/]/.test(normalized) || normalized.endsWith(".pem");
   if (looksLikePath) {
@@ -3112,7 +3209,7 @@ var DockerodeClient = class {
 var createDockerodeClient = (config) => new DockerodeClient(config);
 
 // src/commands/deploy/internal/backend-deploy/dockerode-client/env.ts
-import { existsSync as existsSync13, readFileSync as readFileSync11, statSync as statSync5 } from "node:fs";
+import { existsSync as existsSync14, readFileSync as readFileSync12, statSync as statSync5 } from "node:fs";
 import path2 from "node:path";
 function stripSurroundingQuotes(value) {
   const t = value.trim();
@@ -3129,10 +3226,10 @@ function loadEnvFromFile(envFilePath) {
     return {};
   }
   const targetPath = path2.resolve(envFilePath);
-  if (!existsSync13(targetPath) || !statSync5(targetPath).isFile()) {
+  if (!existsSync14(targetPath) || !statSync5(targetPath).isFile()) {
     return {};
   }
-  const raw = readFileSync11(targetPath, "utf-8");
+  const raw = readFileSync12(targetPath, "utf-8");
   const result = {};
   for (const line of raw.split(/\r?\n/)) {
     const normalized = line.trim();
@@ -3303,12 +3400,12 @@ function dockerPushImage(params, cwd) {
 }
 
 // src/commands/deploy/internal/backend-deploy/resolve-dockerfile.ts
-import { existsSync as existsSync14 } from "node:fs";
+import { existsSync as existsSync15 } from "node:fs";
 import path3 from "node:path";
 function resolveDockerBuildPaths(cwd) {
   const dockerfilePath = path3.join(cwd, "Dockerfile");
   Logger.info(`\u67E5\u627EDockerfile\u6587\u4EF6\uFF0C\u8DEF\u5F84: ${dockerfilePath}`);
-  if (!existsSync14(dockerfilePath)) {
+  if (!existsSync15(dockerfilePath)) {
     throw new Error(`Dockerfile \u4E0D\u5B58\u5728\uFF1A${dockerfilePath}`);
   }
   Logger.info("\u2713 Dockerfile \u5B58\u5728");

package/package.json

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

package/template/rules/write_doc.md

@@ -25,6 +25,7 @@
 
 - 须标注**目标数据库**（库名/实例名、类型如 MySQL；同一变更涉及多库时分别标注）
 - 待执行的 SQL 语句须放在 ` ```sql ` 代码块中，按执行顺序逐条列出
+- SQL 须写完整、可直接复制执行，**禁止**用 `...` 或「省略」占位代替表名、字段名、条件等任何片段
 
 ## 文档同步
 

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

@@ -52,9 +52,9 @@
 
 - **目标数据库**（库名/实例名、类型如 MySQL；同一变更涉及多库时分别标注）
 - 变更摘要（改了什么表/数据、为什么）
-- 完整 SQL 语句（按执行顺序排列；**每条须放在 ` ```sql ` 代码块中**，便于复制执行）
+- 完整 SQL 语句（按执行顺序排列；**每条须放在 ` ```sql ` 代码块中**，便于复制执行；**禁止**用 `...` 或「省略」占位代替任何片段）
 - 执行环境说明（测试/生产是否一致、是否需人工执行）
-- 回滚方案（如适用；回滚 SQL 同样用 ` ```sql ` 代码块）
+- 回滚方案（如适用；回滚 SQL 同样用 ` ```sql ` 代码块，须完整可执行，禁止省略）
 
 示例：
 

package/template/skills/apm-diff-review/SKILL.md

@@ -18,12 +18,12 @@
 
 ### 步骤 2：四项检查
 
-| 检查项         | 判定                                                                                                                                          |
-| -------------- | --------------------------------------------------------------------------------------------------------------------------------------------- |
-| **白名单对账** | diff 中出现白名单之外的文件，且计划未更新说明 → **不通过**                                                                                    |
-| **需求相关性** | 存在与本需求无关的改动（顺手重构、改格式、动了无关逻辑）→ **不通过**                                                                          |
-| **计划落实**   | 计划「实现步骤」中的关键点在 diff 中找不到对应实现 → **不通过**                                                                               |
-| **SQL 文档**   | **仅后端**：diff 涉及 SQL 改动（DDL/DML、表结构、Mapper/XML 中 SQL 等），但 `docs/SQL.md` 缺失、未标注目标数据库、或与改动不一致 → **不通过** |
+| 检查项         | 判定                                                                                                                                                                            |
+| -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **白名单对账** | diff 中出现白名单之外的文件，且计划未更新说明 → **不通过**                                                                                                                      |
+| **需求相关性** | 存在与本需求无关的改动（顺手重构、改格式、动了无关逻辑）→ **不通过**                                                                                                            |
+| **计划落实**   | 计划「实现步骤」中的关键点在 diff 中找不到对应实现 → **不通过**                                                                                                                 |
+| **SQL 文档**   | **仅后端**：diff 涉及 SQL 改动（DDL/DML、表结构、Mapper/XML 中 SQL 等），但 `docs/SQL.md` 缺失、未标注目标数据库、与改动不一致、或 SQL 代码块含 `...`/「省略」占位 → **不通过** |
 
 注意事项：