@4pm/cli 1.14.0 → 1.17.0

package/dist/index.js

@@ -37098,9 +37098,24 @@ var taskApproveRequestSchema = external_exports.object({
   taskId: external_exports.string().min(1).max(64),
   approved: external_exports.boolean()
 });
+var taskApproveEntrySchema = external_exports.object({
+  taskId: external_exports.string().min(1).max(64),
+  tags: external_exports.array(external_exports.string().min(1).max(64)).max(16).default([])
+});
+var taskApproveBatchRequestSchema = external_exports.object({
+  approvals: external_exports.array(taskApproveEntrySchema).max(500).default([]),
+  unapprovals: external_exports.array(external_exports.string().min(1).max(64)).max(500).default([])
+});
 var autonomousWriteRequestSchema = external_exports.discriminatedUnion("kind", [
   external_exports.object({ kind: external_exports.literal("settings"), settings: external_exports.string().max(64 * 1024) }),
   external_exports.object({ kind: external_exports.literal("approvals"), taskId: external_exports.string().min(1).max(64), approved: external_exports.boolean() }),
+  // Batched approvals (ADR-0311): commit many approve/unapprove ids in ONE approvals-file write, so a
+  // Save's coupled batch lands atomically. Constructed by the server after its tag actions succeed.
+  external_exports.object({
+    kind: external_exports.literal("approvalsBatch"),
+    approve: external_exports.array(external_exports.string().min(1).max(64)).max(500),
+    unapprove: external_exports.array(external_exports.string().min(1).max(64)).max(500)
+  }),
   external_exports.object({ kind: external_exports.literal("userTodo"), content: external_exports.string().min(1).max(16 * 1024) }),
   external_exports.object({ kind: external_exports.literal("cron"), action: external_exports.enum(["install", "uninstall"]) })
 ]);
@@ -37288,11 +37303,14 @@ var repoSpecSchema = external_exports.object({
   role: external_exports.string().max(60).optional().default(""),
   /** Free-form description of what this repo holds (optional). */
   desc: external_exports.string().max(500).optional().default(""),
-  /** Exactly one repo of the project is the primary. */
+  /** Exactly one repo of the project is the primary (the root); the rest are submodules. */
   primary: external_exports.boolean().optional().default(false),
   /** Clone url — `https` or `ssh` (required; ADR-0172). */
   url: external_exports.string().max(500).regex(GIT_URL_RE, "must be an https or ssh git url"),
-  /** Sub-repo subfolder under the target root (empty ⇒ derived from role/name). */
+  /**
+   * Folder under the root: **empty for the primary** (the root itself), **non-empty and unique for a
+   * submodule** — the path `git submodule add` attaches it at (ADR-0316).
+   */
   subdir: external_exports.string().max(120).optional().default(""),
   /**
    * Primary branch to clone / check out (ADR-0292). Empty ⇒ the repo's default branch. The
@@ -37301,9 +37319,38 @@ var repoSpecSchema = external_exports.object({
    */
   branch: external_exports.string().max(200).optional().default("")
 });
-function repoName(url) {
-  const last = (url || "").trim().replace(/\/+$/, "").split(/[/:]/).pop() ?? "";
-  return last.replace(/\.git$/i, "");
+function validateProjectRepos(repos, ctx, path = ["repos"]) {
+  const list = repos ?? [];
+  const issue = (message) => ctx.addIssue({ code: external_exports.ZodIssueCode.custom, path, message });
+  if (list.length < 1) {
+    issue("a project must declare at least one repo");
+    return;
+  }
+  const primaries = list.filter((r) => r.primary);
+  if (primaries.length !== 1) {
+    issue("exactly one repo must be primary");
+  }
+  for (const r of list) {
+    if (r.primary) {
+      if ((r.subdir ?? "").trim() !== "") issue("the primary repo must be at the root (no subfolder)");
+    } else if ((r.subdir ?? "").trim() === "") {
+      issue("each submodule needs a folder path");
+    }
+  }
+  const seenDir = /* @__PURE__ */ new Set();
+  for (const r of list) {
+    const dir2 = (r.subdir ?? "").trim().toLowerCase();
+    if (!dir2) continue;
+    if (seenDir.has(dir2)) issue("submodule folder paths must be unique");
+    seenDir.add(dir2);
+  }
+  const seenUrl = /* @__PURE__ */ new Set();
+  for (const r of list) {
+    const url = (r.url ?? "").trim().toLowerCase();
+    if (!url) continue;
+    if (seenUrl.has(url)) issue("repo URLs must be unique");
+    seenUrl.add(url);
+  }
 }
 var specFieldEnvelopeSchema = external_exports.object({
   id: external_exports.string().min(1),
@@ -37335,16 +37382,7 @@ var projectSpecSchema = external_exports.object({
       });
     }
   }
-  if (v2.repos && v2.repos.length > 0) {
-    const primaries = v2.repos.filter((r) => r.primary).length;
-    if (primaries !== 1) {
-      ctx.addIssue({
-        code: external_exports.ZodIssueCode.custom,
-        path: ["repos"],
-        message: "exactly one primary repo is required"
-      });
-    }
-  }
+  validateProjectRepos(v2.repos, ctx);
 });
 var createFromSpecRequestSchema = external_exports.object({
   projectId: external_exports.string().uuid(),
@@ -37354,14 +37392,7 @@ var addRepoRequestSchema = external_exports.object({
   projectId: external_exports.string().uuid(),
   repos: external_exports.array(repoSpecSchema).min(1)
 }).superRefine((v2, ctx) => {
-  const primaries = v2.repos.filter((r) => r.primary).length;
-  if (primaries !== 1) {
-    ctx.addIssue({
-      code: external_exports.ZodIssueCode.custom,
-      path: ["repos"],
-      message: "Exactly one repo must be primary"
-    });
-  }
+  validateProjectRepos(v2.repos, ctx);
 });
 var addProjectRepoRequestSchema = external_exports.object({
   /** Clone url — `https` or `ssh` (required; ADR-0172). */
@@ -37439,7 +37470,7 @@ var activityHeartbeatSchema = external_exports.object({
 });
 
 // src/core/scaffold.ts
-import { cp, mkdir, readdir, rename, rm, writeFile } from "fs/promises";
+import { cp, mkdir, rm, writeFile } from "fs/promises";
 import { existsSync as existsSync4 } from "fs";
 import { execFile as execFile2 } from "child_process";
 import { dirname as dirname3, join as join6, resolve } from "path";
@@ -37524,89 +37555,111 @@ function reposOf(spec) {
   const repos = spec?.repos;
   return Array.isArray(repos) ? repos : [];
 }
-function folderName(repo) {
-  const raw = (repo.subdir || repo.role || repoName(repo.url ?? "") || "repo").trim();
-  return raw.replace(/[^\w.-]+/g, "-").replace(/^-+|-+$/g, "") || "repo";
-}
-function repoFolders(repos) {
-  const used = /* @__PURE__ */ new Set();
-  return repos.map((r) => {
-    const base = folderName(r);
-    let name = base;
-    let n = 2;
-    while (used.has(name)) name = `${base}-${n++}`;
-    used.add(name);
-    return name;
-  });
+function singleRepo(repos) {
+  return repos.find((r) => r.primary) ?? repos[0] ?? null;
+}
+function submodulesOf(repos) {
+  const primary = singleRepo(repos);
+  return repos.filter((r) => r !== primary && !!r.url && !!(r.subdir ?? "").trim());
+}
+async function attachSubmodules(root, submodules, emit) {
+  if (submodules.length === 0) return;
+  if (!existsSync4(join6(root, ".git"))) return;
+  let added = 0;
+  for (const sub of submodules) {
+    const dir2 = (sub.subdir ?? "").trim();
+    if (!dir2 || !sub.url) continue;
+    if (existsSync4(join6(root, dir2, ".git")) || existsSync4(join6(root, ".git", "modules", dir2))) {
+      emit("submodule", `Submodule ${dir2} already present \u2014 updating\u2026`);
+      try {
+        await run2("git", ["submodule", "update", "--init", "--", dir2], { cwd: root, timeout: 12e4 });
+      } catch {
+      }
+      continue;
+    }
+    emit("submodule", `Adding submodule ${sub.url} \u2192 ${dir2}\u2026`);
+    const b2 = (sub.branch ?? "").trim();
+    try {
+      await run2("git", ["submodule", "add", ...b2 ? ["-b", b2] : [], sub.url, dir2], { cwd: root, timeout: 12e4 });
+      added++;
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      if (/already exists|already registered|in the index/i.test(msg)) {
+        try {
+          await run2("git", ["submodule", "update", "--init", "--", dir2], { cwd: root, timeout: 12e4 });
+          added++;
+        } catch {
+        }
+      } else {
+        throw new Error(`git submodule add ${dir2} failed: ${msg}`);
+      }
+    }
+  }
+  if (added > 0) await commitAndPushSubmodules(root, submodules, emit);
+}
+async function commitAndPushSubmodules(root, submodules, emit) {
+  const dirs = submodules.map((s3) => (s3.subdir ?? "").trim()).filter(Boolean);
+  emit("submodule", "Committing .gitmodules\u2026");
+  await run2("git", ["add", ".gitmodules", ...dirs], { cwd: root, timeout: 6e4 });
+  const staged = (await run2("git", ["diff", "--cached", "--name-only"], { cwd: root, timeout: 3e4 })).stdout.trim();
+  if (!staged) return;
+  const commitArgs = ["commit", "-m", "chore: add git submodules (4PM)"];
+  try {
+    await run2("git", commitArgs, { cwd: root, timeout: 6e4 });
+  } catch {
+    await run2("git", ["-c", "user.name=4PM", "-c", "user.email=noreply@4pm.app", ...commitArgs], { cwd: root, timeout: 6e4 });
+  }
+  emit("submodule", "Pushing .gitmodules to the primary remote\u2026");
+  try {
+    await run2("git", ["push"], { cwd: root, timeout: 12e4 });
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    emit("submodule-push-failed", `Submodules committed locally but the push failed: ${msg}`);
+  }
 }
 function cloneArgs(url, dest, branch) {
   const b2 = (branch ?? "").trim();
   return b2 ? ["clone", "-b", b2, url, dest] : ["clone", url, dest];
 }
-async function updateRepo(dir2, label, branch, emit) {
+async function updateRepo(dir2, branch, emit) {
   const b2 = (branch ?? "").trim();
-  emit("git", `Updating ${label} (fetch + ${b2 ? `checkout ${b2} + ` : ""}fast-forward pull)\u2026`);
+  emit("git", `Updating repository (fetch + ${b2 ? `checkout ${b2} + ` : ""}fast-forward pull)\u2026`);
   await run2("git", ["fetch", "origin", "--prune"], { cwd: dir2, timeout: 12e4 });
   if (b2) await run2("git", ["checkout", b2], { cwd: dir2, timeout: 6e4 });
   await run2("git", ["pull", "--ff-only"], { cwd: dir2, timeout: 12e4 });
 }
-function repoDir(target, repo, folder, legacyRoot) {
-  if (repo.primary && legacyRoot) return target;
-  return join6(target, folder);
-}
-async function provisionRepos(target, repos, emit, opts = {}) {
+async function provisionRepo(target, repo, emit, opts = {}) {
   const mode = opts.mode ?? "clone";
-  const legacyRoot = existsSync4(join6(target, ".git"));
-  const folders = repoFolders(repos);
-  const foldersToKeep = new Set(
-    repos.map((r, i) => r.primary && legacyRoot ? null : folders[i]).filter((f2) => !!f2)
-  );
-  for (const [i, repo] of repos.entries()) {
-    const folder = folders[i];
-    const atRoot = !!repo.primary && legacyRoot;
-    const dir2 = repoDir(target, repo, folder, legacyRoot);
-    const label = repo.primary ? "primary repo" : `repo ${folder}`;
-    if (!repo.url) {
-      if (!existsSync4(join6(dir2, ".git"))) {
-        emit("git", `Initializing ${label}\u2026`);
-        await mkdir(dir2, { recursive: true });
-        await run2("git", ["init"], { cwd: dir2, timeout: 2e4 });
-      }
-      continue;
+  if (!repo.url) {
+    if (!existsSync4(join6(target, ".git"))) {
+      emit("git", "Initializing repository\u2026");
+      await mkdir(target, { recursive: true });
+      await run2("git", ["init"], { cwd: target, timeout: 2e4 });
     }
-    if (existsSync4(join6(dir2, ".git"))) {
-      if (mode === "sync") {
-        await updateRepo(dir2, label, repo.branch, emit);
-      } else if (mode === "force" && atRoot) {
-        emit("git", `Re-cloning ${repo.url} (force)\u2026`);
-        const tmp = `${target}.4pm-reclone`;
-        await rm(tmp, { recursive: true, force: true });
-        await run2("git", cloneArgs(repo.url, tmp, repo.branch), { timeout: 12e4 });
-        for (const entry of await readdir(target)) {
-          if (foldersToKeep.has(entry)) continue;
-          await rm(join6(target, entry), { recursive: true, force: true });
-        }
-        for (const entry of await readdir(tmp)) {
-          if (foldersToKeep.has(entry)) continue;
-          await rename(join6(tmp, entry), join6(target, entry));
-        }
-        await rm(tmp, { recursive: true, force: true });
-      } else if (mode === "force") {
-        emit("git", `Re-cloning ${repo.url} (force)\u2026`);
-        await rm(dir2, { recursive: true, force: true });
-        await run2("git", cloneArgs(repo.url, dir2, repo.branch), { timeout: 12e4 });
-      } else {
-        emit("git", `${label} already present \u2014 skipping clone.`);
-      }
-      continue;
+    return;
+  }
+  if (existsSync4(join6(target, ".git"))) {
+    if (mode === "sync") {
+      await updateRepo(target, repo.branch, emit);
+    } else if (mode === "force") {
+      emit("git", `Re-cloning ${repo.url} (force)\u2026`);
+      await rm(target, { recursive: true, force: true });
+      await run2("git", cloneArgs(repo.url, target, repo.branch), { timeout: 12e4 });
+    } else {
+      emit("git", "Repository already present \u2014 skipping clone.");
     }
-    emit("git", `Cloning ${repo.url}\u2026`);
-    await run2("git", cloneArgs(repo.url, dir2, repo.branch), { timeout: 12e4 });
+    return;
   }
+  emit("git", `Cloning ${repo.url}\u2026`);
+  await run2("git", cloneArgs(repo.url, target, repo.branch), { timeout: 12e4 });
 }
 async function ensureReposCloned(physicRoot, repos, emit) {
-  if (repos.length === 0) return;
-  await provisionRepos(physicRoot, repos, emit ?? (() => void 0));
+  const list = repos;
+  const repo = singleRepo(list);
+  if (!repo) return;
+  const step = emit ?? (() => void 0);
+  await provisionRepo(physicRoot, repo, step);
+  await attachSubmodules(physicRoot, submodulesOf(list), step);
 }
 function sampleDir() {
   if (process.env.SCAFFOLD_SAMPLE_DIR) return process.env.SCAFFOLD_SAMPLE_DIR;
@@ -37627,17 +37680,12 @@ async function scaffoldProject(payload, profileDir2, onProgress) {
     const root = process.env.SCAFFOLD_ROOT ? resolve(process.env.SCAFFOLD_ROOT) : resolve(profileDir2);
     const target = join6(root, payload.projectName);
     await mkdir(target, { recursive: true });
-    const repos = reposOf(payload.spec);
-    if (repos.length > 0) {
-      emit("git", "Cloning repositories\u2026");
-      await provisionRepos(target, repos, emit);
-      const folders = repoFolders(repos);
-      for (let i = 0; i < repos.length; i++) {
-        await scaffoldRepo(join6(target, folders[i]), folders[i], payload.spec, emit);
-      }
-    } else {
-      await scaffoldRepo(target, payload.projectName, payload.spec, emit);
-    }
+    const repo = singleRepo(reposOf(payload.spec));
+    if (!repo) throw new Error("A project must declare one repo (ADR-0314).");
+    emit("git", "Cloning repository\u2026");
+    await provisionRepo(target, repo, emit);
+    await scaffoldRepo(target, payload.projectName, payload.spec, emit);
+    await attachSubmodules(target, submodulesOf(reposOf(payload.spec)), emit);
     emit("version", "Writing .4pm/.4pm.json\u2026");
     await writeTemplateMarker(target);
     onProgress?.({ projectId: payload.projectId, step: "done", message: "Scaffold complete.", done: true });
@@ -37723,12 +37771,13 @@ async function addProject(payload, profileDir2, onProgress) {
     const root = process.env.SCAFFOLD_ROOT ? resolve(process.env.SCAFFOLD_ROOT) : resolve(profileDir2);
     const target = join6(root, payload.projectName);
     await mkdir(target, { recursive: true });
-    const repos = payload.repos ?? [];
+    const repo = singleRepo(payload.repos ?? []);
     const mode = payload.mode ?? "clone";
-    if (repos.length > 0) await provisionRepos(target, repos, emit, { mode });
-    for (const sub of payload.scaffoldRepos ?? []) {
-      await scaffoldRepo(join6(target, sub), sub, payload.spec, emit);
+    if (repo) await provisionRepo(target, repo, emit, { mode });
+    if (payload.scaffoldRepos && payload.scaffoldRepos.length > 0) {
+      await scaffoldRepo(target, payload.projectName, payload.spec, emit);
     }
+    await attachSubmodules(target, submodulesOf(payload.repos ?? []), emit);
     onProgress?.({ projectId: payload.projectId, step: "done", message: "Project added.", done: true });
     return { ok: true, path: target };
   } catch (err) {
@@ -38227,7 +38276,7 @@ function decryptPayload(key, payloadBase64, nonceBase64) {
 import { spawn as spawn2 } from "child_process";
 
 // src/common/logger/logger.ts
-import { appendFile, mkdir as mkdir2, readdir as readdir2, unlink } from "fs/promises";
+import { appendFile, mkdir as mkdir2, readdir, unlink } from "fs/promises";
 import { readdirSync as readdirSync2, readFileSync as readFileSync6, statSync } from "fs";
 import { join as join7 } from "path";
 var LEVEL_ORDER = { error: 0, warn: 1, info: 2, debug: 3 };
@@ -38287,7 +38336,7 @@ var CliLogger = class {
   async cleanupOldLogs() {
     const dir2 = this.dir;
     if (!dir2) return;
-    const files = await readdir2(dir2).catch(() => []);
+    const files = await readdir(dir2).catch(() => []);
     const cutoff = Date.now() - this.retentionDays * DAY_MS;
     for (const file of files) {
       const match = /^cli-(\d{4}-\d{2}-\d{2})\.jsonl$/.exec(file);
@@ -38823,7 +38872,6 @@ var ONE_SHOT_DISALLOWED_CLAUDE_TOOLS = [
   "WebSearch",
   "WebFetch",
   "Skill",
-  "SlashCommand",
   "ToolSearch",
   "TaskCreate",
   "TaskGet",
@@ -39564,7 +39612,7 @@ var DOC_EXTENSIONS = [".md", ".mdx", ".txt"];
 function kbRoot(profileDir2) {
   return join14(profileDir2, "support-kb");
 }
-function repoDir2(profileDir2, url, branch) {
+function repoDir(profileDir2, url, branch) {
   const key = createHash3("sha1").update(`${url}#${branch}`).digest("hex").slice(0, 16);
   return join14(kbRoot(profileDir2), key);
 }
@@ -39574,7 +39622,7 @@ function authedUrl(url, token) {
   return url;
 }
 async function ensureRepo(profileDir2, repo) {
-  const dir2 = repoDir2(profileDir2, repo.url, repo.branch);
+  const dir2 = repoDir(profileDir2, repo.url, repo.branch);
   if (existsSync10(join14(dir2, ".git"))) return dir2;
   const url = authedUrl(repo.url, repo.token);
   const gitEnv = { ...process.env, GIT_TERMINAL_PROMPT: "0" };
@@ -39954,6 +40002,14 @@ async function writeAutonomous(root, req, by) {
         await writeFile2(join15(root, APPROVALS_REL), JSON.stringify(map, null, 2) + "\n", "utf8");
         break;
       }
+      case "approvalsBatch": {
+        const map = parseJson(await readText(join15(root, APPROVALS_REL), "{}")) ?? {};
+        const at2 = (/* @__PURE__ */ new Date()).toISOString();
+        for (const taskId of req.approve) map[taskId] = { approved: true, by, at: at2 };
+        for (const taskId of req.unapprove) delete map[taskId];
+        await writeFile2(join15(root, APPROVALS_REL), JSON.stringify(map, null, 2) + "\n", "utf8");
+        break;
+      }
       case "userTodo": {
         const cur = await readText(join15(root, BOOK_FILES.userTodo));
         const trace = `posted by ${tableCell(by)} at ${(/* @__PURE__ */ new Date()).toISOString()}`;
@@ -40828,8 +40884,10 @@ function handleCommandChannels(ctx, message, payload) {
     text: `$ ${dispatch.cmd} ${dispatch.args.join(" ")}`.trimEnd()
   });
   ctx.bus.startBusy(dispatch.cmd);
+  const cwd2 = dispatch.path ?? ctx.physicRoot ?? readProfileConfig(ctx.profileDir).physicPath ?? process.cwd();
+  const dispatchInRoot = { ...dispatch, path: cwd2 };
   const cmdStartMs = Date.now();
-  void runCommand(dispatch, (out) => {
+  void runCommand(dispatchInRoot, (out) => {
     if (out.chunk) {
       ctx.bus.push({ source: "server", kind: "out", text: out.chunk });
       appendCommandOutput(out.commandId, out.chunk);
@@ -41294,7 +41352,7 @@ function rejectByReview(ctx, commandId, origin, prompt, reasons) {
 }
 
 // src/core/fs-browse.ts
-import { readdir as readdir3 } from "fs/promises";
+import { readdir as readdir2 } from "fs/promises";
 import { resolve as resolve2, sep as sep2 } from "path";
 async function listDir(path, root) {
   if (!root) return { path: "", entries: [] };
@@ -41302,7 +41360,7 @@ async function listDir(path, root) {
   const requested = resolve2(base, path && path.trim() ? path : ".");
   const target = requested === base || requested.startsWith(base + sep2) ? requested : base;
   try {
-    const dirents = await readdir3(target, { withFileTypes: true });
+    const dirents = await readdir2(target, { withFileTypes: true });
     const entries2 = dirents.map((d) => ({
       name: d.name,
       type: d.isDirectory() ? "dir" : "file"
@@ -41370,7 +41428,7 @@ async function writeWorkerFile(root, relPath, content) {
 }
 
 // src/core/fs-mutate.ts
-import { mkdir as mkdir4, writeFile as writeFile4, rename as rename2, rm as rm2, stat } from "fs/promises";
+import { mkdir as mkdir4, writeFile as writeFile4, rename, rm as rm2, stat } from "fs/promises";
 import { basename as basename3, dirname as dirname5, resolve as resolve5, sep as sep5 } from "path";
 var MAX_BYTES3 = 2 * 1024 * 1024;
 function resolveInRoot3(root, rel) {
@@ -41425,7 +41483,7 @@ async function mutateFs(root, req) {
         if (to2 !== resolve5(root) && !to2.startsWith(resolve5(root) + sep5)) return escaped(req.to ?? "");
         if (await exists(to2)) return { ok: false, path: to2, error: "destination already exists" };
         await mkdir4(dirname5(to2), { recursive: true });
-        await rename2(from, to2);
+        await rename(from, to2);
         return { ok: true, path: to2 };
       }
       case "delete": {
@@ -41724,7 +41782,6 @@ async function manageSshKey(op, profileDir2) {
 }
 
 // src/core/git-history.ts
-import { readdir as readdir4 } from "fs/promises";
 import { execFile as execFile9 } from "child_process";
 import { resolve as resolve8, sep as sep8 } from "path";
 import { promisify as promisify9 } from "util";
@@ -41752,36 +41809,21 @@ async function git(cwd2, args) {
 async function gitRepos(root) {
   if (!root) return { repos: [] };
   const base = resolve8(root);
-  const found = /* @__PURE__ */ new Set();
+  const top = (await git(base, ["rev-parse", "--show-toplevel"])).trim();
+  if (!top || !(top === base || top.startsWith(base + sep8))) return { repos: [] };
   const repos = [];
-  const add = async (dir2) => {
-    const inside = await git(dir2, ["rev-parse", "--show-toplevel"]);
-    const top = inside.trim();
-    if (!top || found.has(top) || !(top === base || top.startsWith(base + sep8))) return;
-    found.add(top);
-    const subdir = top === base ? "" : top.slice(base.length + 1);
-    const remote = (await git(top, ["remote", "get-url", "origin"])).trim();
-    repos.push({ subdir, name: subdir || "", remote: remote || null });
-  };
-  await add(base);
-  try {
-    const lvl1 = await readdir4(base, { withFileTypes: true });
-    for (const d of lvl1) {
-      if (!d.isDirectory() || d.name === ".git" || d.name === "node_modules") continue;
-      const p1 = resolve8(base, d.name);
-      await add(p1);
-      try {
-        const lvl2 = await readdir4(p1, { withFileTypes: true });
-        for (const d2 of lvl2) {
-          if (!d2.isDirectory() || d2.name === ".git" || d2.name === "node_modules") continue;
-          await add(resolve8(p1, d2.name));
-        }
-      } catch {
-      }
-    }
-  } catch {
+  const rootRemote = (await git(base, ["remote", "get-url", "origin"])).trim();
+  repos.push({ subdir: "", name: "", remote: rootRemote || null });
+  const subOut = await git(base, ["submodule", "status"]);
+  for (const line of subOut.split("\n")) {
+    const m2 = line.trim().match(/^[-+U ]?[0-9a-f]{7,40}\s+(\S+)/);
+    const subPath = m2?.[1];
+    if (!subPath) continue;
+    const abs = resolve8(base, subPath);
+    if (!(abs === base || abs.startsWith(base + sep8))) continue;
+    const remote = (await git(abs, ["remote", "get-url", "origin"])).trim();
+    repos.push({ subdir: subPath, name: subPath, remote: remote || null });
   }
-  repos.sort((a, b2) => a.subdir.localeCompare(b2.subdir));
   return { repos };
 }
 async function gitLog(root, repo, skip, limit) {
@@ -42304,7 +42346,7 @@ function handleToolsChannels(ctx, message, payload) {
 }
 
 // src/core/agents.ts
-import { readFile as readFile7, writeFile as writeFile6, mkdir as mkdir7, readdir as readdir5, rm as rm4 } from "fs/promises";
+import { readFile as readFile7, writeFile as writeFile6, mkdir as mkdir7, readdir as readdir3, rm as rm4 } from "fs/promises";
 import { join as join21 } from "path";
 var AGENTS_REL = ".claude/agents";
 var SKILLS_REL = ".claude/skills";
@@ -42329,7 +42371,7 @@ async function listAgents(root) {
   const subagents = [];
   const skills = [];
   try {
-    for (const e of await readdir5(join21(root, AGENTS_REL), { withFileTypes: true })) {
+    for (const e of await readdir3(join21(root, AGENTS_REL), { withFileTypes: true })) {
       if (!e.isFile() || !e.name.endsWith(".md") || MEMORY_DIRS.has(e.name)) continue;
       const fm = frontmatter(await readText2(join21(root, AGENTS_REL, e.name)));
       subagents.push({ name: e.name.replace(/\.md$/, ""), description: fm.description });
@@ -42337,7 +42379,7 @@ async function listAgents(root) {
   } catch {
   }
   try {
-    for (const e of await readdir5(join21(root, SKILLS_REL), { withFileTypes: true })) {
+    for (const e of await readdir3(join21(root, SKILLS_REL), { withFileTypes: true })) {
       if (!e.isDirectory()) continue;
       const fm = frontmatter(await readText2(join21(root, SKILLS_REL, e.name, "SKILL.md")));
       skills.push({ name: e.name, description: fm.description });
@@ -42489,7 +42531,7 @@ async function writeAgentTools(root, scope, permissions) {
 
 // src/core/packages.ts
 import { createHash as createHash4 } from "crypto";
-import { readFile as readFile10, writeFile as writeFile9, mkdir as mkdir9, readdir as readdir6, rm as rm5, stat as stat3 } from "fs/promises";
+import { readFile as readFile10, writeFile as writeFile9, mkdir as mkdir9, readdir as readdir4, rm as rm5, stat as stat3 } from "fs/promises";
 import { dirname as dirname9, join as join24, relative } from "path";
 var AGENTS_REL2 = ".claude/agents";
 var SKILLS_REL2 = ".claude/skills";
@@ -42509,7 +42551,7 @@ async function listFilesRel(dir2) {
   async function walk2(d) {
     let entries2;
     try {
-      entries2 = await readdir6(d, { withFileTypes: true });
+      entries2 = await readdir4(d, { withFileTypes: true });
     } catch {
       return;
     }
@@ -42677,7 +42719,7 @@ async function removePackage(root, slug) {
 }
 
 // src/core/graph.ts
-import { readFile as readFile11, readdir as readdir7 } from "fs/promises";
+import { readFile as readFile11, readdir as readdir5 } from "fs/promises";
 import { join as join25, relative as relative2, dirname as dirname10, resolve as resolve9, extname as extname2, basename as basename6 } from "path";
 var MAX_FILES = 2e3;
 var MAX_NODES = 3e3;
@@ -42690,7 +42732,7 @@ async function walk(root, accept) {
     const dir2 = stack.pop();
     let entries2;
     try {
-      entries2 = await readdir7(dir2, { withFileTypes: true });
+      entries2 = await readdir5(dir2, { withFileTypes: true });
     } catch {
       continue;
     }

package/dist/project-sample/.claude/templates/AI_TODO.empty.md

@@ -3,12 +3,14 @@
 > Tasks are generated from `USER_TODO.md`. ID format `TSK-{groupid:0000}-{taskid:0000}`
 > (group = one request/batch, task = a small sub-task doable in ~1 cycle).
 > **Priority** = High / Medium / Low.
-> **Approved**: the source of truth is `.claude/.autonomous.approvals.json` (the user ticks it in the
-> web VERIFY tab — ADR-0152); the Approved column here is display-only, not where the decision is made.
+> **Tag** = optional catalog tag(s) (e.g. `UpdateSpecFromDB`) whose action runs from the server down to
+> the project when the task is approved (approval is committed on Save — ADR-0311).
+> **Approval** is NOT a table column — it lives in `.claude/.autonomous.approvals.json` (ADR-0152), set
+> from the web AI Todo grid; `/auto-cycle` reads that file, never the table.
 > **Depends** = the `TSK-…` ids that must be DONE (present in `AI_DONE.md`) first.
 > `/auto-cycle` only takes tasks that are approved AND have their dependencies met → moves them to
 > `AI_PROGRESS.md`; runs group by group, within a group High → Medium → Low.
 
-| ID | Priority | Approved | Depends | Group | Task description | Notes |
-|----|----------|----------|---------|-------|------------------|-------|
+| ID | Priority | Tag | Depends | Group | Task description | Notes |
+|----|----------|-----|---------|-------|------------------|-------|
 | | | | | | | |

package/dist/project-sample/.claude/templates/AI_TODO.sample.md

@@ -1,10 +1,13 @@
 # AI_TODO — Task queue (generated by the AI)
 
 > Tasks are generated from `USER_TODO.md`. ID format `TSK-{groupid:0000}-{taskid:0000}`.
-> **Priority** = High / Medium / Low. **Approved** source of truth = `.claude/.autonomous.approvals.json`
-> (web VERIFY tab). **Depends** = `TSK-…` ids that must be in `AI_DONE.md` first.
+> **Priority** = High / Medium / Low. **Tag** = optional catalog tag(s) (e.g. `UpdateSpecFromDB`) whose
+> action runs from the server down to the project on approve (committed on Save — ADR-0311).
+> **Approval** lives in `.claude/.autonomous.approvals.json` (ADR-0152), not the table. **Depends** =
+> `TSK-…` ids that must be in `AI_DONE.md` first.
 
-| ID | Priority | Approved | Depends | Group | Task description | Notes |
-|----|----------|----------|---------|-------|------------------|-------|
-| TSK-0001-0001 | High | ✓ | | Auth | Add login-form validation per docs/auth.md | |
-| TSK-0001-0002 | Medium |  | TSK-0001-0001 | Auth | Wire the login API call + error handling | After 0001 |
+| ID | Priority | Tag | Depends | Group | Task description | Notes |
+|----|----------|-----|---------|-------|------------------|-------|
+| TSK-0001-0001 | High | | | Auth | Add login-form validation per docs/auth.md | |
+| TSK-0001-0002 | Medium | | TSK-0001-0001 | Auth | Wire the login API call + error handling | After 0001 |
+| TSK-0001-0003 | Low | UpdateSpecFromDB | | Spec | Sync the project spec into project.spec.json on approve | Server action |

package/dist/project-sample/AI_TODO.md

@@ -3,12 +3,14 @@
 > Tasks are generated from `USER_TODO.md`. ID format `TSK-{groupid:0000}-{taskid:0000}`
 > (group = one request/batch, task = a small sub-task doable in ~1 cycle).
 > **Priority** = High / Medium / Low.
-> **Approved**: the source of truth is `.claude/.autonomous.approvals.json` (the user ticks it in the
-> web VERIFY tab — ADR-0152); the Approved column here is display-only, not where the decision is made.
+> **Tag** = optional catalog tag(s) (e.g. `UpdateSpecFromDB`) whose action runs from the server down to
+> the project when the task is approved (approval is committed on Save — ADR-0311).
+> **Approval** is NOT a table column — it lives in `.claude/.autonomous.approvals.json` (ADR-0152), set
+> from the web AI Todo grid; `/auto-cycle` reads that file, never the table.
 > **Depends** = the `TSK-…` ids that must be DONE (present in `AI_DONE.md`) first.
 > `/auto-cycle` only takes tasks that are approved AND have their dependencies met → moves them to
 > `AI_PROGRESS.md`; runs group by group, within a group High → Medium → Low.
 
-| ID | Priority | Approved | Depends | Group | Task description | Notes |
-|----|----------|----------|---------|-------|------------------|-------|
+| ID | Priority | Tag | Depends | Group | Task description | Notes |
+|----|----------|-----|---------|-------|------------------|-------|
 | | | | | | | |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@4pm/cli",
-  "version": "1.14.0",
+  "version": "1.17.0",
   "private": false,
   "description": "4PM CLI — drives Claude/Codex CLIs on AI worker machines (Node + TypeScript)",
   "license": "LicenseRef-4PM-Source-Available",