ai-project-manage-cli 8.1.22 → 8.1.23

package/dist/index.js

@@ -1576,27 +1576,35 @@ async function pushCurrentBranch(cwd) {
 // src/utils/home-repository.ts
 import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
 import { join as join9, resolve as resolve3 } from "path";
-var HOME_REPOSITORY_JSON = "/home/repository.json";
+var DEFAULT_REPOS_MANIFEST = "/home/repository.json";
 function isSimpleChildDirName(name) {
   if (!name || name === "." || name === "..") return false;
   if (name.includes("/") || name.includes("\\")) return false;
   return true;
 }
-function loadHomeRepositoryEntries() {
-  const path = toFsPath(HOME_REPOSITORY_JSON);
+function resolveReposManifestPath(explicit) {
+  const fromOpt = explicit?.trim() || "";
+  if (fromOpt) return fromOpt;
+  const fromEnv = process.env.APM_REPOS_MANIFEST?.trim() || "";
+  if (fromEnv) return fromEnv;
+  return DEFAULT_REPOS_MANIFEST;
+}
+function loadHomeRepositoryEntries(manifestPath) {
+  const label = manifestPath.trim() || DEFAULT_REPOS_MANIFEST;
+  const path = toFsPath(label);
   if (!existsSync6(path)) {
-    throw new Error(`[apm] \u672A\u627E\u5230\u591A\u4ED3\u6E05\u5355 ${HOME_REPOSITORY_JSON}`);
+    throw new Error(`[apm] \u672A\u627E\u5230\u591A\u4ED3\u6E05\u5355 ${label}`);
   }
   let parsed;
   try {
     parsed = JSON.parse(readFileSync5(path, "utf8"));
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`[apm] \u89E3\u6790 ${HOME_REPOSITORY_JSON} \u5931\u8D25: ${detail}`);
+    throw new Error(`[apm] \u89E3\u6790 ${label} \u5931\u8D25: ${detail}`);
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error(
-      `[apm] ${HOME_REPOSITORY_JSON} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
+      `[apm] ${label} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
     );
   }
   const entries = [];
@@ -1606,41 +1614,28 @@ function loadHomeRepositoryEntries() {
     const pathKey = rawKey.trim();
     if (!isSimpleChildDirName(pathKey)) {
       throw new Error(
-        `[apm] ${HOME_REPOSITORY_JSON} \u975E\u6CD5\u76EE\u5F55 key: ${JSON.stringify(rawKey)}\uFF08\u987B\u4E3A\u5F53\u524D\u4E0B\u7EA7\u76EE\u5F55\u540D\uFF09`
+        `[apm] ${label} \u975E\u6CD5\u76EE\u5F55 key: ${JSON.stringify(rawKey)}\uFF08\u987B\u4E3A\u5F53\u524D\u4E0B\u7EA7\u76EE\u5F55\u540D\uFF09`
       );
     }
     if (typeof rawVal !== "string" || !rawVal.trim()) {
       throw new Error(
-        `[apm] ${HOME_REPOSITORY_JSON}[${pathKey}] \u987B\u4E3A\u975E\u7A7A git \u5730\u5740\u5B57\u7B26\u4E32`
+        `[apm] ${label}[${pathKey}] \u987B\u4E3A\u975E\u7A7A git \u5730\u5740\u5B57\u7B26\u4E32`
       );
     }
     entries.push({ path: pathKey, remoteUrl: rawVal.trim() });
   }
   entries.sort((a, b) => a.path.localeCompare(b.path));
   if (entries.length === 0) {
-    throw new Error(`[apm] ${HOME_REPOSITORY_JSON} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
+    throw new Error(`[apm] ${label} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
   }
   return entries;
 }
-function resolveHomeRepositoryAbsolutePaths(workdirInput, entries = loadHomeRepositoryEntries()) {
+function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
   const workdir = resolveWorkdirPath(workdirInput);
   return entries.map((entry) => resolve3(join9(workdir, entry.path)));
 }
-function tryLoadHomeRepositoryEntries() {
-  const path = toFsPath(HOME_REPOSITORY_JSON);
-  if (!existsSync6(path)) return null;
-  return loadHomeRepositoryEntries();
-}
 
 // src/utils/workspace-repos.ts
-import {
-  existsSync as existsSync7,
-  mkdirSync as mkdirSync5,
-  readFileSync as readFileSync6,
-  readdirSync as readdirSync3,
-  statSync as statSync3,
-  writeFileSync as writeFileSync4
-} from "fs";
 import { basename, dirname as dirname4, join as join10, relative, resolve as resolve4 } from "path";
 
 // src/utils/git-remote.ts
@@ -1649,96 +1644,9 @@ import { promisify as promisify2 } from "util";
 var execFileAsync2 = promisify2(execFile2);
 
 // src/utils/workspace-repos.ts
-var WORKSPACE_REPOS_MANIFEST = "workspace-repos.json";
-var WORKSPACE_REPOS_VERSION = 1;
-function manifestPath(workdir) {
-  return join10(workspaceApmDir(workdir), WORKSPACE_REPOS_MANIFEST);
-}
-function absoluteRepoPath(workdir, entry) {
-  return resolve4(workdir, entry.path);
-}
 function toRelativeRepoPath(workdir, repoAbs) {
   return relative(workdir, repoAbs).replace(/\\/g, "/");
 }
-function normalizeRepoEntry(raw) {
-  if (!raw || typeof raw !== "object") return null;
-  const o = raw;
-  if (typeof o.path !== "string" || !o.path.trim()) return null;
-  const path = o.path.trim().replace(/\\/g, "/");
-  if (path === "." || path.includes("/")) return null;
-  const entry = { path };
-  if (typeof o.remoteUrl === "string" && o.remoteUrl.trim()) {
-    entry.remoteUrl = o.remoteUrl.trim();
-  } else if (o.remoteUrl === null) {
-    entry.remoteUrl = null;
-  }
-  return entry;
-}
-function readManifest(workdir) {
-  const path = toFsPath(manifestPath(workdir));
-  if (!existsSync7(path)) {
-    return null;
-  }
-  try {
-    const raw = JSON.parse(
-      readFileSync6(path, "utf8")
-    );
-    if (raw?.version !== WORKSPACE_REPOS_VERSION) {
-      return null;
-    }
-    if (raw.kind !== "multi") {
-      return null;
-    }
-    if (!Array.isArray(raw.repos) || raw.repos.length === 0) {
-      return null;
-    }
-    if (typeof raw.workdir !== "string" || !raw.workdir.trim()) {
-      return null;
-    }
-    const repos = raw.repos.map((item) => normalizeRepoEntry(item)).filter((item) => item != null);
-    if (repos.length === 0) {
-      return null;
-    }
-    return {
-      version: WORKSPACE_REPOS_VERSION,
-      kind: "multi",
-      workdir: raw.workdir,
-      repos,
-      scannedAt: typeof raw.scannedAt === "string" && raw.scannedAt.trim() ? raw.scannedAt : (/* @__PURE__ */ new Date()).toISOString()
-    };
-  } catch {
-    return null;
-  }
-}
-function loadWorkspaceReposCache(workdirInput) {
-  const workdir = resolveWorkdirPath(workdirInput);
-  const cached = readManifest(workdir);
-  if (!cached) {
-    throw new Error(
-      `[apm] \u672A\u627E\u5230\u5DE5\u4F5C\u533A\u4ED3\u5E93\u7F13\u5B58 .apm/${WORKSPACE_REPOS_MANIFEST}\uFF0C\u8BF7\u5148\u6267\u884C\u4ED3\u5E93\u68C0\u6D4B`
-    );
-  }
-  if (normalizeWorkdirPath(cached.workdir) !== normalizeWorkdirPath(workdir)) {
-    throw new Error(
-      `[apm] \u5DE5\u4F5C\u533A\u4ED3\u5E93\u7F13\u5B58 workdir \u4E0D\u5339\u914D\uFF1A\u7F13\u5B58=${cached.workdir} \u5F53\u524D=${workdir}\uFF0C\u8BF7\u5F3A\u5236\u91CD\u65B0\u626B\u63CF`
-    );
-  }
-  if (!Array.isArray(cached.repos) || cached.repos.length === 0) {
-    throw new Error(`[apm] \u5DE5\u4F5C\u533A\u4ED3\u5E93\u7F13\u5B58\u65E0\u6548\uFF08repos \u4E3A\u7A7A\uFF09\uFF0C\u8BF7\u5F3A\u5236\u91CD\u65B0\u626B\u63CF`);
-  }
-  console.log(
-    `[apm] \u8BFB\u53D6\u5DE5\u4F5C\u533A\u4ED3\u5E93\u7F13\u5B58 repos=${cached.repos.map((r) => r.path).join(", ")}`
-  );
-  return {
-    ...cached,
-    workdir
-  };
-}
-function resolveWorkspaceRepoAbsolutePaths(manifest) {
-  return manifest.repos.map(
-    (entry) => absoluteRepoPath(manifest.workdir, entry)
-  );
-}
 function formatRepoLabel(workdir, repoAbs) {
   const rel = toRelativeRepoPath(resolveWorkdirPath(workdir), repoAbs);
   return rel || basename(repoAbs) || repoAbs;
@@ -1746,14 +1654,19 @@ function formatRepoLabel(workdir, repoAbs) {
 
 // src/commands/branch.ts
 var TASK_BRANCH_PREFIX = "feat/task-";
-async function syncTaskRepos(workdir, message) {
+async function syncTaskRepos(workdir, options = {}) {
+  const opts = typeof options === "string" ? { message: options } : options;
   const workdirPath = resolveWorkdirPath(workdir);
-  const repoRoots = resolveTaskBranchRepoRoots(workdirPath);
+  const repoRoots = resolveTaskBranchRepoRoots(
+    workdirPath,
+    opts.reposManifest
+  );
   let committed = 0;
   let commitSkipped = 0;
   let pushed = 0;
   let pushSkipped = 0;
   const failed = [];
+  const message = opts.message;
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdirPath, gitRoot);
     try {
@@ -1811,17 +1724,14 @@ async function ensureTaskFeatureBranch(branch, projectId, options) {
   await ensureFeatureBranch(gitRoot, branch, projectId);
   return branch;
 }
-function resolveTaskBranchRepoRoots(workdirPath) {
-  const entries = tryLoadHomeRepositoryEntries();
-  if (entries) {
-    const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
-    console.log(
-      `[apm] \u8BFB\u53D6 ${HOME_REPOSITORY_JSON} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
-    );
-    return roots;
-  }
-  const manifest = loadWorkspaceReposCache(workdirPath);
-  return resolveWorkspaceRepoAbsolutePaths(manifest);
+function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
+  const manifestPath = resolveReposManifestPath(reposManifest);
+  const entries = loadHomeRepositoryEntries(manifestPath);
+  const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+  console.log(
+    `[apm] \u8BFB\u53D6 ${manifestPath} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+  );
+  return roots;
 }
 async function runTaskBranch(taskId, projectId, options = {}) {
   const trimmedTaskId = taskId.trim();
@@ -1837,7 +1747,10 @@ async function runTaskBranch(taskId, projectId, options = {}) {
   }
   const cwd = options.cwd ?? process.cwd();
   const workdirPath = resolveWorkdirPath(cwd);
-  const repoRoots = resolveTaskBranchRepoRoots(workdirPath);
+  const repoRoots = resolveTaskBranchRepoRoots(
+    workdirPath,
+    options.reposManifest
+  );
   if (repoRoots.length === 0) {
     throw new Error("[apm] \u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355\u4E3A\u7A7A\uFF0C\u65E0\u6CD5\u786E\u8BA4\u7279\u6027\u5206\u652F");
   }
@@ -1876,19 +1789,18 @@ async function runTaskBranch(taskId, projectId, options = {}) {
 // src/commands/ensure-task-branch.ts
 async function runEnsureTaskBranchCli(options = {}) {
   const workdir = resolveWorkdirPath(options.cwd ?? process.cwd());
-  const taskId = options.taskId?.trim() || process.env.APM_TASK_ID?.trim() || "";
-  const projectId = options.projectId?.trim() || process.env.APM_PROJECT_ID?.trim() || "";
+  const taskId = options.taskId?.trim() || "";
+  const projectId = options.projectId?.trim() || "";
   if (!taskId) {
-    throw new Error(
-      "[apm] \u7F3A\u5C11 taskId\uFF1A\u8BF7\u4F20\u5165\u53C2\u6570\u6216\u8BBE\u7F6E APM_TASK_ID"
-    );
+    throw new Error("[apm] \u7F3A\u5C11 taskId\uFF1A\u8BF7\u4F20\u5165\u53C2\u6570");
   }
   if (!projectId) {
-    throw new Error(
-      "[apm] \u7F3A\u5C11 projectId\uFF1A\u8BF7\u4F20\u5165\u53C2\u6570\u6216\u8BBE\u7F6E APM_PROJECT_ID"
-    );
+    throw new Error("[apm] \u7F3A\u5C11 projectId\uFF1A\u8BF7\u4F20\u5165\u53C2\u6570");
   }
-  const result = await runTaskBranch(taskId, projectId, { cwd: workdir });
+  const result = await runTaskBranch(taskId, projectId, {
+    cwd: workdir,
+    reposManifest: options.reposManifest
+  });
   console.log(
     `[apm] \u7279\u6027\u5206\u652F\u5DF2\u5C31\u7EEA\uFF08\u5168\u90E8 ${result.repos.length} \u4E2A\u4ED3\uFF09 branch=${result.branch} projectId=${result.projectId}`
   );
@@ -1896,7 +1808,7 @@ async function runEnsureTaskBranchCli(options = {}) {
 
 // src/utils/user-prompt-cache.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
 import { join as join11 } from "path";
 import { tmpdir } from "os";
 var CACHE_ROOT = join11(tmpdir(), "apm-hooks");
@@ -1918,9 +1830,9 @@ function formatUserPromptAsCommitMessage(prompt) {
 }
 function loadUserPromptCommitMessage(workdirInput) {
   const path = toFsPath(userPromptCachePath(workdirInput));
-  if (!existsSync8(path)) return null;
+  if (!existsSync7(path)) return null;
   try {
-    const raw = readFileSync7(path, "utf8");
+    const raw = readFileSync6(path, "utf8");
     const msg = formatUserPromptAsCommitMessage(raw);
     return msg || null;
   } catch {
@@ -1959,7 +1871,10 @@ async function runCommitTaskReposCli(options = {}) {
   if (message) {
     console.log(`[apm] commit message: ${message}`);
   }
-  const result = await syncTaskRepos(workdir, message);
+  const result = await syncTaskRepos(workdir, {
+    message,
+    reposManifest: options.reposManifest
+  });
   console.log(
     `[apm] \u591A\u4ED3\u6536\u5C3E\u5B8C\u6210 committed=${result.committed} commitSkipped=${result.commitSkipped} pushed=${result.pushed} pushSkipped=${result.pushSkipped} failed=${result.failed.length} repos=${result.repos.length}`
   );
@@ -2007,30 +1922,35 @@ function buildProgram() {
     await runUpdateSkills();
   });
   program.command("ensure-task-branch").description(
-    "\u786E\u4FDD\u5DE5\u4F5C\u533A\u5404\u4ED3\u4F4D\u4E8E feat/task-<\u4EFB\u52A1ID>\uFF08\u4E0D\u5B58\u5728\u5219\u57FA\u4E8E\u9879\u76EE ID \u540C\u540D\u5206\u652F\u4ECE\u8FDC\u7A0B\u521B\u5EFA\uFF09\uFF1B\u4F9B Cursor hooks \u8C03\u7528"
-  ).argument(
-    "[taskId]",
-    "\u4EFB\u52A1 ID\uFF08\u521B\u5EFA/\u5207\u6362\u5206\u652F\uFF09\uFF1B\u7701\u7565\u65F6\u8BFB APM_TASK_ID"
-  ).argument(
-    "[projectId]",
-    "\u9879\u76EE ID\uFF08\u4EC5\u521B\u5EFA\u65F6\u7528\uFF1B\u89C4\u8303\u4E0E\u9879\u76EE\u5206\u652F\u540C\u540D\uFF09\uFF1B\u7701\u7565\u65F6\u8BFB APM_PROJECT_ID"
-  ).option("--cwd <dir>", "\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09").action(
+    "\u6309\u591A\u4ED3\u6E05\u5355\u786E\u4FDD\u5404\u4ED3\u4F4D\u4E8E feat/task-<\u4EFB\u52A1ID>\uFF08\u4E0D\u5B58\u5728\u5219\u57FA\u4E8E\u9879\u76EE\u5206\u652F\u4ECE\u8FDC\u7A0B\u521B\u5EFA\uFF09\u3002ACP \u4E0D\u4F1A\u8DD1 Cursor hooks\uFF0C\u5F00\u59CB\u4EFB\u52A1\u65F6\u7531\u670D\u52A1\u7AEF\u6216\u624B\u52A8\u8C03\u7528\u672C\u547D\u4EE4"
+  ).argument("<taskId>", "\u4EFB\u52A1 ID\uFF08\u521B\u5EFA/\u5207\u6362\u5206\u652F\uFF09").argument(
+    "<projectId>",
+    "\u9879\u76EE ID\uFF08\u4EC5\u521B\u5EFA\u65F6\u7528\uFF1B\u89C4\u8303\u4E0E\u9879\u76EE\u5206\u652F\u540C\u540D\uFF09"
+  ).option("--cwd <dir>", "\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09").option(
+    "--repos <file>",
+    "\u591A\u4ED3\u6E05\u5355 JSON\uFF08key=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740\uFF09\uFF1B\u7701\u7565\u65F6\u8BFB APM_REPOS_MANIFEST\uFF0C\u518D\u9ED8\u8BA4 /home/repository.json"
+  ).action(
     async (taskId, projectId, opts) => {
       await runEnsureTaskBranchCli({
         taskId,
         projectId,
-        cwd: opts.cwd
+        cwd: opts.cwd,
+        reposManifest: opts.repos
       });
     }
   );
   program.command("commit-task-repos").description(
-    "\u6267\u884C\u7ED3\u675F\u6536\u5C3E\uFF1A/home/repository.json \u5404\u4ED3\u6709\u53D8\u66F4\u624D commit\uFF0C\u518D push\uFF08\u65E0\u53D8\u66F4\u4E0D\u7A7A\u63D0\u4EA4\uFF09"
+    "\u6267\u884C\u7ED3\u675F\u6536\u5C3E\uFF1A\u591A\u4ED3\u6E05\u5355\u5404\u4ED3\u6709\u53D8\u66F4\u624D commit\uFF0C\u518D push\uFF08\u65E0\u53D8\u66F4\u4E0D\u7A7A\u63D0\u4EA4\uFF09"
   ).option("--cwd <dir>", "\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55\uFF08\u9ED8\u8BA4\u5F53\u524D\u76EE\u5F55\uFF09").option(
+    "--repos <file>",
+    "\u591A\u4ED3\u6E05\u5355 JSON\uFF1B\u7701\u7565\u65F6\u8BFB APM_REPOS_MANIFEST\uFF0C\u518D\u9ED8\u8BA4 /home/repository.json"
+  ).option(
     "-m, --message <msg>",
     "commit message\uFF1B\u7701\u7565\u5219\u4F18\u5148\u7528\u6237\u95EE\u9898\u7F13\u5B58\uFF0C\u5426\u5219\u6309 APM_TASK_ID / APM_PROJECT_ID \u751F\u6210"
   ).action(async (opts) => {
     await runCommitTaskReposCli({
       cwd: opts.cwd,
+      reposManifest: opts.repos,
       message: opts.message
     });
   });

package/dist/scripts/ensure_feature_branch.sh

@@ -10,16 +10,18 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 git rev-parse --git-dir >/dev/null
 
+# 有未提交改动时先 stash（含 untracked），再切/建分支，避免污染目标分支工作区
+if [[ -n "$(git status --porcelain)" ]]; then
+  git stash push -u -m "apm: ensure ${branch}"
+  echo "[apm] 已 stash 未提交改动，再确认分支 ${branch}"
+fi
+
 current="$(git rev-parse --abbrev-ref HEAD)"
 if [[ "$current" == "$branch" ]]; then
   echo "[apm] 已在分支 ${branch}"
 else
   bash "$SCRIPT_DIR/ensure_baseline.sh" "$baseline"
 
-  if [[ -n "$(git status --porcelain)" ]]; then
-    git stash push -u -m "apm: switch to ${branch}"
-  fi
-
   if git ls-remote --heads origin "$branch" | grep -q .; then
     git fetch origin "$branch"
     git checkout -B "$branch" "origin/${branch}"

package/dist/worker-script.js

@@ -518,27 +518,35 @@ async function pushCurrentBranch(cwd) {
 // src/utils/home-repository.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { join as join4, resolve as resolve3 } from "path";
-var HOME_REPOSITORY_JSON = "/home/repository.json";
+var DEFAULT_REPOS_MANIFEST = "/home/repository.json";
 function isSimpleChildDirName(name) {
   if (!name || name === "." || name === "..") return false;
   if (name.includes("/") || name.includes("\\")) return false;
   return true;
 }
-function loadHomeRepositoryEntries() {
-  const path = toFsPath(HOME_REPOSITORY_JSON);
+function resolveReposManifestPath(explicit) {
+  const fromOpt = explicit?.trim() || "";
+  if (fromOpt) return fromOpt;
+  const fromEnv = process.env.APM_REPOS_MANIFEST?.trim() || "";
+  if (fromEnv) return fromEnv;
+  return DEFAULT_REPOS_MANIFEST;
+}
+function loadHomeRepositoryEntries(manifestPath2) {
+  const label = manifestPath2.trim() || DEFAULT_REPOS_MANIFEST;
+  const path = toFsPath(label);
   if (!existsSync2(path)) {
-    throw new Error(`[apm] \u672A\u627E\u5230\u591A\u4ED3\u6E05\u5355 ${HOME_REPOSITORY_JSON}`);
+    throw new Error(`[apm] \u672A\u627E\u5230\u591A\u4ED3\u6E05\u5355 ${label}`);
   }
   let parsed;
   try {
     parsed = JSON.parse(readFileSync2(path, "utf8"));
   } catch (err) {
     const detail = err instanceof Error ? err.message : String(err);
-    throw new Error(`[apm] \u89E3\u6790 ${HOME_REPOSITORY_JSON} \u5931\u8D25: ${detail}`);
+    throw new Error(`[apm] \u89E3\u6790 ${label} \u5931\u8D25: ${detail}`);
   }
   if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
     throw new Error(
-      `[apm] ${HOME_REPOSITORY_JSON} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
+      `[apm] ${label} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
     );
   }
   const entries = [];
@@ -548,31 +556,26 @@ function loadHomeRepositoryEntries() {
     const pathKey = rawKey.trim();
     if (!isSimpleChildDirName(pathKey)) {
       throw new Error(
-        `[apm] ${HOME_REPOSITORY_JSON} \u975E\u6CD5\u76EE\u5F55 key: ${JSON.stringify(rawKey)}\uFF08\u987B\u4E3A\u5F53\u524D\u4E0B\u7EA7\u76EE\u5F55\u540D\uFF09`
+        `[apm] ${label} \u975E\u6CD5\u76EE\u5F55 key: ${JSON.stringify(rawKey)}\uFF08\u987B\u4E3A\u5F53\u524D\u4E0B\u7EA7\u76EE\u5F55\u540D\uFF09`
       );
     }
     if (typeof rawVal !== "string" || !rawVal.trim()) {
       throw new Error(
-        `[apm] ${HOME_REPOSITORY_JSON}[${pathKey}] \u987B\u4E3A\u975E\u7A7A git \u5730\u5740\u5B57\u7B26\u4E32`
+        `[apm] ${label}[${pathKey}] \u987B\u4E3A\u975E\u7A7A git \u5730\u5740\u5B57\u7B26\u4E32`
       );
     }
     entries.push({ path: pathKey, remoteUrl: rawVal.trim() });
   }
   entries.sort((a, b) => a.path.localeCompare(b.path));
   if (entries.length === 0) {
-    throw new Error(`[apm] ${HOME_REPOSITORY_JSON} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
+    throw new Error(`[apm] ${label} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
   }
   return entries;
 }
-function resolveHomeRepositoryAbsolutePaths(workdirInput, entries = loadHomeRepositoryEntries()) {
+function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
   const workdir = resolveWorkdirPath(workdirInput);
   return entries.map((entry) => resolve3(join4(workdir, entry.path)));
 }
-function tryLoadHomeRepositoryEntries() {
-  const path = toFsPath(HOME_REPOSITORY_JSON);
-  if (!existsSync2(path)) return null;
-  return loadHomeRepositoryEntries();
-}
 
 // src/utils/workspace-repos.ts
 import {
@@ -857,21 +860,26 @@ function formatRepoLabel(workdir, repoAbs) {
 
 // src/commands/branch.ts
 var TASK_BRANCH_PREFIX = "feat/task-";
-async function commitWorkspaceReposIfDirty(workdir, message) {
-  const result = await commitTaskReposIfDirty(workdir, message);
+async function commitWorkspaceReposIfDirty(workdir, message, reposManifest) {
+  const result = await commitTaskReposIfDirty(workdir, message, reposManifest);
   return result.committed;
 }
-async function commitTaskReposIfDirty(workdir, message) {
-  return syncTaskRepos(workdir, message);
+async function commitTaskReposIfDirty(workdir, message, reposManifest) {
+  return syncTaskRepos(workdir, { message, reposManifest });
 }
-async function syncTaskRepos(workdir, message) {
+async function syncTaskRepos(workdir, options = {}) {
+  const opts = typeof options === "string" ? { message: options } : options;
   const workdirPath = resolveWorkdirPath(workdir);
-  const repoRoots = resolveTaskBranchRepoRoots(workdirPath);
+  const repoRoots = resolveTaskBranchRepoRoots(
+    workdirPath,
+    opts.reposManifest
+  );
   let committed = 0;
   let commitSkipped = 0;
   let pushed = 0;
   let pushSkipped = 0;
   const failed = [];
+  const message = opts.message;
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdirPath, gitRoot);
     try {
@@ -960,17 +968,14 @@ async function resolveProjectIdForTask(taskId) {
   }
   return projectId;
 }
-function resolveTaskBranchRepoRoots(workdirPath) {
-  const entries = tryLoadHomeRepositoryEntries();
-  if (entries) {
-    const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
-    console.log(
-      `[apm] \u8BFB\u53D6 ${HOME_REPOSITORY_JSON} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
-    );
-    return roots;
-  }
-  const manifest = loadWorkspaceReposCache(workdirPath);
-  return resolveWorkspaceRepoAbsolutePaths(manifest);
+function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
+  const manifestPath2 = resolveReposManifestPath(reposManifest);
+  const entries = loadHomeRepositoryEntries(manifestPath2);
+  const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+  console.log(
+    `[apm] \u8BFB\u53D6 ${manifestPath2} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+  );
+  return roots;
 }
 async function runTaskBranch(taskId, projectId, options = {}) {
   const trimmedTaskId = taskId.trim();
@@ -986,7 +991,10 @@ async function runTaskBranch(taskId, projectId, options = {}) {
   }
   const cwd = options.cwd ?? process.cwd();
   const workdirPath = resolveWorkdirPath(cwd);
-  const repoRoots = resolveTaskBranchRepoRoots(workdirPath);
+  const repoRoots = resolveTaskBranchRepoRoots(
+    workdirPath,
+    options.reposManifest
+  );
   if (repoRoots.length === 0) {
     throw new Error("[apm] \u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355\u4E3A\u7A7A\uFF0C\u65E0\u6CD5\u786E\u8BA4\u7279\u6027\u5206\u652F");
   }

package/package.json

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

package/template/README.md

@@ -1,13 +0,0 @@
-# CLI template（新版星图 / ACP）
-
-本目录供**新版** Cursor ACP / 星图流程使用，与历史 WebIDE `apm connect` 路径**解耦**：
-
-| 内容 | 用途 |
-|------|------|
-| `mcp.json` | 远程 MCP（`x-task-id` / `x-project-id`） |
-| `hooks/` | ACP hooks：开对话切分支、结束 commit/push |
-| `skills/` | 星图等新版 skills（如 `starmap-requirement-align`） |
-
-历史 WebIDE 指南与规则仍由平台 `agent-config` 灌库，经 `apm update-skills` 写入 `.apm/`，**不读**本 template。
-
-请勿把本目录 hooks/mcp 默认拷进历史 WebIDE 工作区，以免与旧流程混用。

package/template/hooks/after-agent-commit-repos.cjs

@@ -1,112 +0,0 @@
-#!/usr/bin/env node
-/**
- * Cursor stop（每次 Agent 执行结束一次）：
- * 对 `/home/repository.json` 各仓 commit-if-dirty + push。
- * 无变更不空 commit；单仓失败继续其它仓；本 hook 始终 exit 0。
- *
- * ACP 若不触发 stop：由启动方在进程结束后调用
- *   apm commit-task-repos --cwd <workdir>
- */
-"use strict";
-
-const { spawnSync } = require("node:child_process");
-const { existsSync, readFileSync } = require("node:fs");
-const { join, resolve } = require("node:path");
-
-function respond(obj) {
-  process.stdout.write(JSON.stringify(obj ?? {}));
-}
-
-function readStdin() {
-  try {
-    return readFileSync(0, "utf8");
-  } catch {
-    return "";
-  }
-}
-
-function resolveWorkdir(payload) {
-  const cwd = typeof payload.cwd === "string" ? payload.cwd.trim() : "";
-  if (cwd) return resolve(cwd);
-  const roots = Array.isArray(payload.workspace_roots)
-    ? payload.workspace_roots
-    : [];
-  for (const root of roots) {
-    if (typeof root === "string" && root.trim()) return resolve(root.trim());
-  }
-  return process.cwd();
-}
-
-/** APM 工作区根 = ACP 启动目录，其下必须有 `.apm`（不向上查找） */
-function requireApmWorkdir(start) {
-  const workdir = resolve(start);
-  if (!existsSync(join(workdir, ".apm"))) return null;
-  return workdir;
-}
-
-function whichApm() {
-  const r = spawnSync("bash", ["-lc", "command -v apm"], {
-    encoding: "utf8",
-  });
-  if (r.status !== 0) return "";
-  return (r.stdout || "").trim();
-}
-
-function hasTaskContext() {
-  return Boolean(
-    (process.env.APM_TASK_ID || "").trim() ||
-      (process.env.APM_PROJECT_ID || "").trim()
-  );
-}
-
-function main() {
-  let input = {};
-  try {
-    const raw = readStdin();
-    if (raw.trim()) input = JSON.parse(raw);
-  } catch {
-    /* 收尾：输入坏了也尽量继续 */
-  }
-
-  const workdirHint = resolveWorkdir(input);
-  const workdir = requireApmWorkdir(workdirHint);
-  if (!workdir) {
-    process.stderr.write(
-      `[apm] ACP 启动目录下未找到 .apm，跳过收尾: ${resolve(workdirHint)}\n`
-    );
-    respond({});
-    process.exit(0);
-  }
-
-  if (!hasTaskContext() && !existsSync("/home/repository.json")) {
-    respond({});
-    process.exit(0);
-  }
-
-  const apm = whichApm();
-  if (!apm) {
-    process.stderr.write("[apm] commit-task-repos：未找到 apm，跳过收尾\n");
-    respond({});
-    process.exit(0);
-  }
-
-  const result = spawnSync(apm, ["commit-task-repos", "--cwd", workdir], {
-    encoding: "utf8",
-    env: process.env,
-  });
-
-  if (result.stdout?.trim()) process.stderr.write(result.stdout);
-  if (result.stderr?.trim()) process.stderr.write(result.stderr);
-
-  respond({});
-  process.exit(0);
-}
-
-try {
-  main();
-} catch (err) {
-  const detail = err instanceof Error ? err.message : String(err);
-  process.stderr.write(`[apm] after-agent-commit-repos 异常: ${detail}\n`);
-  respond({});
-  process.exit(0);
-}

package/template/hooks/before-prompt-prepare.cjs

@@ -1,206 +0,0 @@
-#!/usr/bin/env node
-/**
- * Cursor beforeSubmitPrompt（对话 / 本轮用户提问开始之前）：
- * 1. 缓存用户问题（供结束时 commit message）
- * 2. 确保 /home/repository.json 内各仓位于 feat/task-<APM_TASK_ID>
- *
- * 失败则 continue:false，本轮不进入 Agent。
- * ACP 若不触发本 hook：启动对话前由宿主执行
- *   apm ensure-task-branch && 写入 user-prompt 缓存文件
- */
-"use strict";
-
-const { createHash } = require("node:crypto");
-const { spawnSync } = require("node:child_process");
-const {
-  existsSync,
-  mkdirSync,
-  readFileSync,
-  writeFileSync,
-} = require("node:fs");
-const { tmpdir } = require("node:os");
-const { join, resolve } = require("node:path");
-
-function respond(obj) {
-  process.stdout.write(JSON.stringify(obj));
-}
-
-function allow() {
-  respond({ continue: true });
-  process.exit(0);
-}
-
-function deny(userMessage) {
-  respond({
-    continue: false,
-    user_message: userMessage,
-  });
-  process.exit(0);
-}
-
-function readStdin() {
-  return readFileSync(0, "utf8");
-}
-
-function resolveWorkdir(payload) {
-  const roots = Array.isArray(payload.workspace_roots)
-    ? payload.workspace_roots
-    : [];
-  for (const root of roots) {
-    if (typeof root === "string" && root.trim()) return resolve(root.trim());
-  }
-  const cwd = typeof payload.cwd === "string" ? payload.cwd.trim() : "";
-  if (cwd) return resolve(cwd);
-  return process.cwd();
-}
-
-/**
- * APM 工作区根 = Cursor ACP 启动目录，其下必须有 `.apm`（不向上查找）。
- * @returns {string | null}
- */
-function requireApmWorkdir(start) {
-  const workdir = resolve(start);
-  if (!existsSync(join(workdir, ".apm"))) return null;
-  return workdir;
-}
-
-function promptCachePath(workdir) {
-  const key = createHash("sha256").update(workdir).digest("hex").slice(0, 16);
-  return join(tmpdir(), "apm-hooks", key, "user-prompt.txt");
-}
-
-function cacheUserPrompt(workdir, prompt) {
-  const text = typeof prompt === "string" ? prompt.trim() : "";
-  if (!text) return;
-  const path = promptCachePath(workdir);
-  try {
-    mkdirSync(join(path, ".."), { recursive: true });
-    writeFileSync(path, `${text}\n`, "utf8");
-  } catch (err) {
-    const detail = err instanceof Error ? err.message : String(err);
-    process.stderr.write(`[apm] 缓存用户问题失败: ${detail}\n`);
-  }
-}
-
-function expectedBranch(taskId) {
-  return `feat/task-${taskId}`;
-}
-
-function currentBranch(repoRoot) {
-  const r = spawnSync("git", ["rev-parse", "--abbrev-ref", "HEAD"], {
-    cwd: repoRoot,
-    encoding: "utf8",
-  });
-  if (r.status !== 0) return null;
-  return (r.stdout || "").trim();
-}
-
-const HOME_REPOSITORY_JSON = "/home/repository.json";
-
-function listReposNotOnBranch(workdir, branch) {
-  if (!existsSync(HOME_REPOSITORY_JSON)) return null;
-  let map;
-  try {
-    map = JSON.parse(readFileSync(HOME_REPOSITORY_JSON, "utf8"));
-  } catch {
-    return null;
-  }
-  if (!map || typeof map !== "object" || Array.isArray(map)) return null;
-  const keys = Object.keys(map)
-    .map((k) => String(k).trim())
-    .filter((k) => k && k !== "." && !k.includes("/") && !k.includes("\\"));
-  if (keys.length === 0) return null;
-  const off = [];
-  for (const rel of keys) {
-    if (currentBranch(join(workdir, rel)) !== branch) off.push(rel);
-  }
-  return off;
-}
-
-function whichApm() {
-  const r = spawnSync("bash", ["-lc", "command -v apm"], {
-    encoding: "utf8",
-  });
-  if (r.status !== 0) return "";
-  return (r.stdout || "").trim();
-}
-
-function main() {
-  let input;
-  try {
-    input = JSON.parse(readStdin() || "{}");
-  } catch {
-    deny("[apm] beforeSubmitPrompt 输入不是合法 JSON");
-  }
-
-  const workdirHint = resolveWorkdir(input);
-  const workdir = requireApmWorkdir(workdirHint);
-  if (!workdir) {
-    deny(
-      `[apm] ACP 启动目录下未找到 .apm：${resolve(workdirHint)}（必须为启动目录/.apm，不向上查找）`
-    );
-  }
-
-  cacheUserPrompt(workdir, input.prompt);
-
-  const taskId = (process.env.APM_TASK_ID || "").trim();
-  const projectId = (process.env.APM_PROJECT_ID || "").trim();
-
-  // 非 APM 任务：只缓存问题（若有），放行
-  if (!taskId && !projectId) {
-    allow();
-  }
-
-  if (!taskId || !projectId) {
-    deny(
-      "[apm] 缺少 APM_TASK_ID 或 APM_PROJECT_ID，无法在对话开始前确认特性分支"
-    );
-  }
-
-  const branch = expectedBranch(taskId);
-  const offBranch = listReposNotOnBranch(workdir, branch);
-  if (Array.isArray(offBranch) && offBranch.length === 0) {
-    allow();
-  }
-
-  const apm = whichApm();
-  if (!apm) {
-    deny("[apm] 未找到 apm CLI，无法确认特性分支");
-  }
-
-  if (Array.isArray(offBranch) && offBranch.length > 0) {
-    process.stderr.write(
-      `[apm] 对话开始前确认分支 ${branch}，未就绪: ${offBranch.join(", ")}\n`
-    );
-  }
-
-  const result = spawnSync(
-    apm,
-    ["ensure-task-branch", taskId, projectId, "--cwd", workdir],
-    {
-      encoding: "utf8",
-      env: process.env,
-    }
-  );
-
-  if (result.stdout?.trim()) process.stderr.write(result.stdout);
-  if (result.stderr?.trim()) process.stderr.write(result.stderr);
-
-  if (result.status === 0) {
-    allow();
-  }
-
-  const detail = `${result.stdout || ""}${result.stderr || ""}`.trim();
-  deny(
-    detail
-      ? `[apm] 对话开始前确认特性分支失败\n${detail}`
-      : `[apm] 对话开始前确认特性分支失败（exit=${result.status ?? "unknown"}）`
-  );
-}
-
-try {
-  main();
-} catch (err) {
-  const detail = err instanceof Error ? err.message : String(err);
-  deny(`[apm] before-prompt-prepare 异常: ${detail}`);
-}

package/template/hooks.json

@@ -1,18 +0,0 @@
-{
-  "version": 1,
-  "hooks": {
-    "beforeSubmitPrompt": [
-      {
-        "command": "./hooks/before-prompt-prepare.cjs",
-        "timeout": 180,
-        "failClosed": true
-      }
-    ],
-    "stop": [
-      {
-        "command": "./hooks/after-agent-commit-repos.cjs",
-        "timeout": 180
-      }
-    ]
-  }
-}

package/template/mcp.json

@@ -1,18 +0,0 @@
-{
-    "mcpServers": {
-        "apm": {
-            "url": "${env:APM_SERVER}/api/v1/mcp",
-            "headers": {
-                "Authorization": "Bearer ${env:APM_API_KEY}",
-                "x-task-id": "${env:APM_TASK_ID}",
-                "x-project-id": "${env:APM_PROJECT_ID}"
-            }
-        },
-        "billion-skill": {
-            "url": "https://wdxnhqgjbvib.sealosgzg.site/api/mcp",
-            "headers": {
-                "Authorization": "Bearer sk_ImOQHJZSGncproCHg6Q7ZnE_vGmylWtdYkG6TPkH2Jg"
-            }
-        }
-    }
-}