ai-project-manage-cli 8.1.23 → 8.1.24

package/dist/index.js

@@ -1430,9 +1430,77 @@ async function runConnect(options) {
   }
 }
 
+// src/utils/home-repository.ts
+import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
+import { join as join8, resolve as resolve3 } from "path";
+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 resolveReposManifestPath(explicit) {
+  const fromOpt = explicit?.trim() || "";
+  if (fromOpt) return fromOpt;
+  const fromEnv = process.env.APM_REPOS_MANIFEST?.trim() || "";
+  if (fromEnv) return fromEnv;
+  return null;
+}
+function resolveCliReposManifestPath(explicit) {
+  return resolveReposManifestPath(explicit) ?? DEFAULT_REPOS_MANIFEST;
+}
+function loadHomeRepositoryEntries(manifestPath2) {
+  const label = manifestPath2.trim();
+  if (!label) {
+    throw new Error("[apm] \u591A\u4ED3\u6E05\u5355\u8DEF\u5F84\u4E3A\u7A7A");
+  }
+  const path = toFsPath(label);
+  if (!existsSync6(path)) {
+    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 ${label} \u5931\u8D25: ${detail}`);
+  }
+  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    throw new Error(
+      `[apm] ${label} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
+    );
+  }
+  const entries = [];
+  for (const [rawKey, rawVal] of Object.entries(
+    parsed
+  )) {
+    const pathKey = rawKey.trim();
+    if (!isSimpleChildDirName(pathKey)) {
+      throw new Error(
+        `[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] ${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] ${label} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
+  }
+  return entries;
+}
+function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
+  const workdir = resolveWorkdirPath(workdirInput);
+  return entries.map((entry) => resolve3(join8(workdir, entry.path)));
+}
+
 // src/utils/git.ts
 import { execFile } from "child_process";
-import { dirname as dirname3, join as join8 } from "path";
+import { dirname as dirname3, join as join9 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
@@ -1516,7 +1584,7 @@ async function resolveGitRepoRoot(cwd) {
   return (await execGit(cwd, ["rev-parse", "--show-toplevel"], true)).trim();
 }
 function resolveGitScript(name) {
-  return join8(dirname3(fileURLToPath3(import.meta.url)), "scripts", name);
+  return join9(dirname3(fileURLToPath3(import.meta.url)), "scripts", name);
 }
 async function runGitScript(name, options) {
   const skipCode = options.skipCode ?? 2;
@@ -1573,69 +1641,15 @@ 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 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 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 ${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 ${label} \u5931\u8D25: ${detail}`);
-  }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-    throw new Error(
-      `[apm] ${label} \u987B\u4E3A\u5BF9\u8C61\uFF1Akey=\u4E0B\u7EA7\u76EE\u5F55\uFF0Cvalue=git \u5730\u5740`
-    );
-  }
-  const entries = [];
-  for (const [rawKey, rawVal] of Object.entries(
-    parsed
-  )) {
-    const pathKey = rawKey.trim();
-    if (!isSimpleChildDirName(pathKey)) {
-      throw new Error(
-        `[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] ${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] ${label} \u4E3A\u7A7A\uFF0C\u65E0\u4ED3\u5E93\u53EF\u786E\u8BA4`);
-  }
-  return entries;
-}
-function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
-  const workdir = resolveWorkdirPath(workdirInput);
-  return entries.map((entry) => resolve3(join9(workdir, entry.path)));
-}
-
 // 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
@@ -1644,9 +1658,96 @@ 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;
@@ -1725,11 +1826,21 @@ async function ensureTaskFeatureBranch(branch, projectId, options) {
   return branch;
 }
 function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
-  const manifestPath = resolveReposManifestPath(reposManifest);
-  const entries = loadHomeRepositoryEntries(manifestPath);
-  const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+  const manifestPath2 = resolveReposManifestPath(reposManifest);
+  if (manifestPath2) {
+    const entries = loadHomeRepositoryEntries(manifestPath2);
+    const roots2 = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+    console.log(
+      `[apm] \u8BFB\u53D6\u5916\u90E8\u591A\u4ED3\u6E05\u5355 ${manifestPath2} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+    );
+    return roots2;
+  }
+  const workspace = loadWorkspaceReposCache(workdirPath);
+  const roots = resolveWorkspaceRepoAbsolutePaths(workspace);
   console.log(
-    `[apm] \u8BFB\u53D6 ${manifestPath} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+    `[apm] \u8BFB\u53D6\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 repos=${workspace.repos.map(
+      (r) => r.remoteUrl ? `${r.path}\u2192${r.remoteUrl}` : r.path
+    ).join(", ")}`
   );
   return roots;
 }
@@ -1799,7 +1910,7 @@ async function runEnsureTaskBranchCli(options = {}) {
   }
   const result = await runTaskBranch(taskId, projectId, {
     cwd: workdir,
-    reposManifest: options.reposManifest
+    reposManifest: resolveCliReposManifestPath(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}`
@@ -1808,7 +1919,7 @@ async function runEnsureTaskBranchCli(options = {}) {
 
 // src/utils/user-prompt-cache.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync7, writeFileSync as writeFileSync5 } from "fs";
 import { join as join11 } from "path";
 import { tmpdir } from "os";
 var CACHE_ROOT = join11(tmpdir(), "apm-hooks");
@@ -1830,9 +1941,9 @@ function formatUserPromptAsCommitMessage(prompt) {
 }
 function loadUserPromptCommitMessage(workdirInput) {
   const path = toFsPath(userPromptCachePath(workdirInput));
-  if (!existsSync7(path)) return null;
+  if (!existsSync8(path)) return null;
   try {
-    const raw = readFileSync6(path, "utf8");
+    const raw = readFileSync7(path, "utf8");
     const msg = formatUserPromptAsCommitMessage(raw);
     return msg || null;
   } catch {
@@ -1873,7 +1984,7 @@ async function runCommitTaskReposCli(options = {}) {
   }
   const result = await syncTaskRepos(workdir, {
     message,
-    reposManifest: options.reposManifest
+    reposManifest: resolveCliReposManifestPath(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}`

package/dist/worker-script.js

@@ -518,7 +518,6 @@ 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 DEFAULT_REPOS_MANIFEST = "/home/repository.json";
 function isSimpleChildDirName(name) {
   if (!name || name === "." || name === "..") return false;
   if (name.includes("/") || name.includes("\\")) return false;
@@ -529,10 +528,13 @@ function resolveReposManifestPath(explicit) {
   if (fromOpt) return fromOpt;
   const fromEnv = process.env.APM_REPOS_MANIFEST?.trim() || "";
   if (fromEnv) return fromEnv;
-  return DEFAULT_REPOS_MANIFEST;
+  return null;
 }
 function loadHomeRepositoryEntries(manifestPath2) {
-  const label = manifestPath2.trim() || DEFAULT_REPOS_MANIFEST;
+  const label = manifestPath2.trim();
+  if (!label) {
+    throw new Error("[apm] \u591A\u4ED3\u6E05\u5355\u8DEF\u5F84\u4E3A\u7A7A");
+  }
   const path = toFsPath(label);
   if (!existsSync2(path)) {
     throw new Error(`[apm] \u672A\u627E\u5230\u591A\u4ED3\u6E05\u5355 ${label}`);
@@ -970,10 +972,20 @@ async function resolveProjectIdForTask(taskId) {
 }
 function resolveTaskBranchRepoRoots(workdirPath, reposManifest) {
   const manifestPath2 = resolveReposManifestPath(reposManifest);
-  const entries = loadHomeRepositoryEntries(manifestPath2);
-  const roots = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+  if (manifestPath2) {
+    const entries = loadHomeRepositoryEntries(manifestPath2);
+    const roots2 = resolveHomeRepositoryAbsolutePaths(workdirPath, entries);
+    console.log(
+      `[apm] \u8BFB\u53D6\u5916\u90E8\u591A\u4ED3\u6E05\u5355 ${manifestPath2} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+    );
+    return roots2;
+  }
+  const workspace = loadWorkspaceReposCache(workdirPath);
+  const roots = resolveWorkspaceRepoAbsolutePaths(workspace);
   console.log(
-    `[apm] \u8BFB\u53D6 ${manifestPath2} repos=${entries.map((e) => `${e.path}\u2192${e.remoteUrl}`).join(", ")}`
+    `[apm] \u8BFB\u53D6\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355 repos=${workspace.repos.map(
+      (r) => r.remoteUrl ? `${r.path}\u2192${r.remoteUrl}` : r.path
+    ).join(", ")}`
   );
   return roots;
 }

package/package.json

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