@mutmutco/cli 3.105.7 → 3.105.9

package/dist/main.cjs

@@ -8291,7 +8291,105 @@ function appendHookActivity(cwd, entry) {
 
 // src/worktree.ts
 var import_node_fs12 = require("node:fs");
+var import_node_path12 = require("node:path");
+
+// src/file-lock.ts
+var import_promises2 = require("node:fs/promises");
 var import_node_path11 = require("node:path");
+var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
+var IMMEDIATE_RETRY_BUDGET = 3;
+var FileLockBusyError = class extends Error {
+  lockPath;
+  constructor(label, lockPath, maxWaitMs) {
+    super(`${label} busy: ${lockPath} held longer than ${maxWaitMs}ms`);
+    this.name = "FileLockBusyError";
+    this.lockPath = lockPath;
+  }
+};
+function resolveFileLockOpts(opts = {}) {
+  return {
+    staleMs: opts.staleMs ?? 3e4,
+    retryMs: opts.retryMs ?? 50,
+    maxWaitMs: opts.maxWaitMs ?? 5e3,
+    label: opts.label ?? "file lock"
+  };
+}
+async function acquireFileLock(lockPath, opts, deadline) {
+  let immediateRetries = 0;
+  for (; ; ) {
+    let handle;
+    try {
+      handle = await (0, import_promises2.open)(lockPath, "wx");
+    } catch (e) {
+      const code = e.code;
+      if (code !== "EEXIST" && code !== "EPERM" && code !== "EBUSY" && code !== "EACCES") throw e;
+      const retryNow = async () => {
+        if (Date.now() >= deadline) throw new FileLockBusyError(opts.label, lockPath, opts.maxWaitMs);
+        if (++immediateRetries > IMMEDIATE_RETRY_BUDGET) await sleep(opts.retryMs);
+      };
+      try {
+        const age = Date.now() - (await (0, import_promises2.stat)(lockPath)).mtimeMs;
+        if (age > opts.staleMs) {
+          try {
+            await (0, import_promises2.unlink)(lockPath);
+            await retryNow();
+            continue;
+          } catch (unlinkError) {
+            if (unlinkError instanceof FileLockBusyError) throw unlinkError;
+            const unlinkCode = unlinkError.code;
+            if (unlinkCode === "ENOENT") {
+              await retryNow();
+              continue;
+            }
+          }
+        }
+      } catch (statError) {
+        if (statError instanceof FileLockBusyError) throw statError;
+        if (statError.code !== "ENOENT") throw statError;
+        await retryNow();
+        continue;
+      }
+      if (Date.now() >= deadline) {
+        throw new FileLockBusyError(opts.label, lockPath, opts.maxWaitMs);
+      }
+      await sleep(opts.retryMs);
+      continue;
+    }
+    const token = `${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
+    try {
+      await handle.writeFile(token);
+    } catch (e) {
+      await handle.close().catch(() => void 0);
+      throw e;
+    }
+    return { token, handle };
+  }
+}
+async function fileLockHeldBy(lockPath, token) {
+  try {
+    return await (0, import_promises2.readFile)(lockPath, "utf8") === token;
+  } catch {
+    return false;
+  }
+}
+async function releaseFileLock(lockPath, guard) {
+  await guard.handle.close().catch(() => void 0);
+  if (await fileLockHeldBy(lockPath, guard.token)) {
+    await (0, import_promises2.unlink)(lockPath).catch(() => void 0);
+  }
+}
+async function withFileLock(lockPath, opts, fn) {
+  const resolved = resolveFileLockOpts(opts);
+  await (0, import_promises2.mkdir)((0, import_node_path11.dirname)(lockPath), { recursive: true }).catch(() => void 0);
+  const guard = await acquireFileLock(lockPath, resolved, Date.now() + resolved.maxWaitMs);
+  try {
+    return await fn();
+  } finally {
+    await releaseFileLock(lockPath, guard);
+  }
+}
+
+// src/worktree.ts
 var LOCAL_ONLY_FILES = [".claude/settings.local.json"];
 var PKG = "package.json";
 var LOCKFILE = "package-lock.json";
@@ -8337,7 +8435,7 @@ var realFsProbe = {
   }
 };
 function declaredProvision(fs2, abs) {
-  const raw = fs2.readFile?.((0, import_node_path11.join)(abs, PKG));
+  const raw = fs2.readFile?.((0, import_node_path12.join)(abs, PKG));
   if (raw === void 0) return void 0;
   try {
     const scripts = JSON.parse(raw).scripts;
@@ -8349,13 +8447,13 @@ function declaredProvision(fs2, abs) {
 }
 function scanInstallDirs(root, fs2 = realFsProbe) {
   const factsFor = (dir) => {
-    const abs = dir ? (0, import_node_path11.join)(root, dir) : root;
-    const match = LOCKFILE_INSTALLS.find((c) => fs2.isFile((0, import_node_path11.join)(abs, c.lockfile)));
-    const hasPackageJson = fs2.isFile((0, import_node_path11.join)(abs, PKG));
+    const abs = dir ? (0, import_node_path12.join)(root, dir) : root;
+    const match = LOCKFILE_INSTALLS.find((c) => fs2.isFile((0, import_node_path12.join)(abs, c.lockfile)));
+    const hasPackageJson = fs2.isFile((0, import_node_path12.join)(abs, PKG));
     return {
       dir,
       hasPackageJson,
-      hasNodeModules: fs2.isDir((0, import_node_path11.join)(abs, NODE_MODULES)),
+      hasNodeModules: fs2.isDir((0, import_node_path12.join)(abs, NODE_MODULES)),
       install: match?.command,
       provision: hasPackageJson ? declaredProvision(fs2, abs) : void 0
     };
@@ -8371,7 +8469,7 @@ function npmInstallTargets(dirs) {
   }));
 }
 function isLinkedWorktree(root, fs2 = realFsProbe) {
-  return fs2.isFile((0, import_node_path11.join)(root, ".git"));
+  return fs2.isFile((0, import_node_path12.join)(root, ".git"));
 }
 function worktreeAutoProvisionBanner(root, fs2 = realFsProbe) {
   if (!isLinkedWorktree(root, fs2)) return null;
@@ -8381,7 +8479,7 @@ function worktreeAutoProvisionBanner(root, fs2 = realFsProbe) {
   return `[worktree] provisioning tooling in the background (deps in ${where} + local config) \u2014 \`mmi-cli worktree setup\` to redo`;
 }
 function defaultCopyFile(from, to) {
-  (0, import_node_fs12.mkdirSync)((0, import_node_path11.dirname)(to), { recursive: true });
+  (0, import_node_fs12.mkdirSync)((0, import_node_path12.dirname)(to), { recursive: true });
   (0, import_node_fs12.copyFileSync)(from, to);
 }
 async function runDeclaredProvision(target, cwd, runInstall) {
@@ -8412,7 +8510,7 @@ async function provisionWorktree(worktreeRoot, deps) {
   const targets = npmInstallTargets(allDirs);
   if (deps.validateInstall) {
     for (const dir of allDirs.filter((d) => d.hasPackageJson && (d.provision ?? d.install) && d.hasNodeModules)) {
-      const cwd = dir.dir ? (0, import_node_path11.join)(worktreeRoot, dir.dir) : worktreeRoot;
+      const cwd = dir.dir ? (0, import_node_path12.join)(worktreeRoot, dir.dir) : worktreeRoot;
       if (!await deps.validateInstall(cwd)) {
         targets.push({
           dir: dir.dir,
@@ -8426,7 +8524,7 @@ async function provisionWorktree(worktreeRoot, deps) {
   const skippedInstall = allDirs.filter((d) => d.hasPackageJson && d.hasNodeModules && !targetDirs.has(d.dir)).map((d) => d.dir);
   const installed = [];
   for (const target of targets) {
-    const cwd = target.dir ? (0, import_node_path11.join)(worktreeRoot, target.dir) : worktreeRoot;
+    const cwd = target.dir ? (0, import_node_path12.join)(worktreeRoot, target.dir) : worktreeRoot;
     log(`installing deps: ${target.command} in ${target.dir || "."}`);
     if (target.declared) await runDeclaredProvision(target, cwd, deps.runInstall);
     else await deps.runInstall(target.command, cwd);
@@ -8436,7 +8534,7 @@ async function provisionWorktree(worktreeRoot, deps) {
   const copySkipped = [];
   const primary = await deps.primaryCheckout();
   for (const rel of LOCAL_ONLY_FILES) {
-    const dest = (0, import_node_path11.join)(worktreeRoot, rel);
+    const dest = (0, import_node_path12.join)(worktreeRoot, rel);
     if (fs2.isFile(dest)) {
       copySkipped.push({ file: rel, reason: "already-present" });
       continue;
@@ -8445,11 +8543,11 @@ async function provisionWorktree(worktreeRoot, deps) {
       copySkipped.push({ file: rel, reason: "no-primary" });
       continue;
     }
-    if (!fs2.isFile((0, import_node_path11.join)(primary, rel))) {
+    if (!fs2.isFile((0, import_node_path12.join)(primary, rel))) {
       copySkipped.push({ file: rel, reason: "absent-in-primary" });
       continue;
     }
-    copyFile((0, import_node_path11.join)(primary, rel), dest);
+    copyFile((0, import_node_path12.join)(primary, rel), dest);
     copied.push(rel);
     log(`copied local config: ${rel}`);
   }
@@ -8463,12 +8561,12 @@ function capWorktreeDirName(name, max = 40) {
 }
 function defaultWorktreePath(repoRoot2, branch) {
   const safe = capWorktreeDirName(branch.replace(/[/\\]+/g, "-"));
-  return (0, import_node_path11.join)((0, import_node_path11.dirname)(repoRoot2), "mmi-worktrees", (0, import_node_path11.basename)(repoRoot2), safe);
+  return (0, import_node_path12.join)((0, import_node_path12.dirname)(repoRoot2), "mmi-worktrees", (0, import_node_path12.basename)(repoRoot2), safe);
 }
 async function primaryCheckoutRootOf(git2) {
   try {
     const out = (await git2(["rev-parse", "--path-format=absolute", "--git-common-dir"])).trim();
-    return out ? (0, import_node_path11.dirname)(out) : void 0;
+    return out ? (0, import_node_path12.dirname)(out) : void 0;
   } catch {
     return void 0;
   }
@@ -8480,10 +8578,26 @@ function resolveWorktreeBase(from, remote) {
   if (SHA_LIKE_RE.test(from)) return { base: from };
   return { base: from, fetchBranch: from, preferRemote: `${remotePrefix}${from}` };
 }
-var GIT_CONFIG_LOCK_RE = /could not lock config file|unable to write upstream branch configuration/i;
+var GIT_CONFIG_LOCK_RE = /could not lock config file|unable to write upstream branch configuration|unable to access ['"]?\.git\/config['"]?: Permission denied|unknown error occurred while reading the configuration files/i;
 function isGitConfigLockError(error) {
   return GIT_CONFIG_LOCK_RE.test(error instanceof Error ? error.message : String(error));
 }
+function worktreeAddLockPath(repoRoot2) {
+  return repoRuntimeStatePath(repoRoot2, "worktree-add.lock");
+}
+var WORKTREE_ADD_LOCK_STALE_MS = 6e4;
+var WORKTREE_ADD_LOCK_MAX_WAIT_MS = 12e4;
+async function withWorktreeAddLock(repoRoot2, fn) {
+  return withFileLock(
+    worktreeAddLockPath(repoRoot2),
+    {
+      staleMs: WORKTREE_ADD_LOCK_STALE_MS,
+      maxWaitMs: WORKTREE_ADD_LOCK_MAX_WAIT_MS,
+      label: "worktree-add lock"
+    },
+    fn
+  );
+}
 var ADD_WORKTREE_BACKOFF_MS = [100, 250, 500, 750, 1e3];
 var ADD_WORKTREE_MAX_ATTEMPTS = 6;
 async function cleanupOrphanBranch(branch, base, preExistingOid, deps) {
@@ -9251,12 +9365,12 @@ function planManagedGitignore(current) {
 
 // src/docs-index-command.ts
 var import_node_fs14 = require("node:fs");
-var import_node_path13 = require("node:path");
+var import_node_path14 = require("node:path");
 
 // src/doc-refs-core.ts
 var import_node_child_process5 = require("node:child_process");
 var import_node_fs13 = require("node:fs");
-var import_node_path12 = require("node:path");
+var import_node_path13 = require("node:path");
 var PIN_RE = /<!--\s*pinned by\s+([^:]+?)\s*:\s*"([^"]+)"[^"]*-->/;
 var PIN_MENTION_RE = /<!--\s*pinned by\b/;
 var FWD_RE = /<!--\s*forward-ref:\s*(\S+?)\s*-->/;
@@ -9315,7 +9429,7 @@ function checkPins(root, readFile9, docs2) {
         findings.push({ kind: "malformed-pin", doc, line: pin.line, detail: pin.text });
         continue;
       }
-      const source = readFile9((0, import_node_path12.join)(root, pin.file));
+      const source = readFile9((0, import_node_path13.join)(root, pin.file));
       if (source == null) {
         findings.push({ kind: "missing-test", doc, line: pin.line, detail: pin.file });
         continue;
@@ -9377,11 +9491,11 @@ function checkRefs(root, deps, docs2) {
     for (const { ref } of extractRefs(markdown)) allFirstSegments.add(refFirstSegment(ref));
   }
   const tracked = allFirstSegments.size ? deps.trackedFirstSegments?.([...allFirstSegments]) ?? null : null;
-  const firstVerifiable = (first) => tracked ? tracked.has(first) : exists((0, import_node_path12.join)(root, first));
+  const firstVerifiable = (first) => tracked ? tracked.has(first) : exists((0, import_node_path13.join)(root, first));
   const candidates = [];
   const direct = [];
   for (const [doc, markdown] of Object.entries(docs2)) {
-    const docDir = import_node_path12.posix.dirname(doc);
+    const docDir = import_node_path13.posix.dirname(doc);
     const base = docDir === "." ? "" : docDir;
     const covered = /* @__PURE__ */ new Set();
     const markers = [];
@@ -9390,21 +9504,21 @@ function checkRefs(root, deps, docs2) {
         direct.push({ kind: "malformed-forward-ref", doc, line: fwd.line, detail: fwd.text });
         continue;
       }
-      const docRel = import_node_path12.posix.normalize(import_node_path12.posix.join(base, fwd.target));
-      const rootRel = import_node_path12.posix.normalize(fwd.target.replace(/^\/+/, ""));
+      const docRel = import_node_path13.posix.normalize(import_node_path13.posix.join(base, fwd.target));
+      const rootRel = import_node_path13.posix.normalize(fwd.target.replace(/^\/+/, ""));
       markers.push({ target: fwd.target, line: fwd.line, docRel, rootRel });
       covered.add(docRel);
       covered.add(rootRel);
     }
     const links = extractLinks(markdown).map(({ target, line }) => {
-      const resolved = import_node_path12.posix.normalize(import_node_path12.posix.join(base, target));
-      return { target, line, resolved, missing: !exists((0, import_node_path12.join)(root, resolved)) };
+      const resolved = import_node_path13.posix.normalize(import_node_path13.posix.join(base, target));
+      return { target, line, resolved, missing: !exists((0, import_node_path13.join)(root, resolved)) };
     });
     for (const marker of markers) {
       const coversMissing = links.some(
         (l) => l.missing && (l.resolved === marker.docRel || l.resolved === marker.rootRel)
       );
-      if (!coversMissing && (exists((0, import_node_path12.join)(root, marker.docRel)) || exists((0, import_node_path12.join)(root, marker.rootRel)))) {
+      if (!coversMissing && (exists((0, import_node_path13.join)(root, marker.docRel)) || exists((0, import_node_path13.join)(root, marker.rootRel)))) {
         direct.push({
           kind: "stale-forward-ref",
           doc,
@@ -9415,7 +9529,7 @@ function checkRefs(root, deps, docs2) {
     }
     for (const { ref, line } of extractRefs(markdown)) {
       if (!firstVerifiable(refFirstSegment(ref))) continue;
-      if (!exists((0, import_node_path12.join)(root, ref))) candidates.push({ kind: "missing-path", doc, line, detail: ref });
+      if (!exists((0, import_node_path13.join)(root, ref))) candidates.push({ kind: "missing-path", doc, line, detail: ref });
     }
     for (const { target, line, resolved, missing } of links) {
       if (resolved.startsWith("..")) {
@@ -9467,18 +9581,18 @@ function readFileOrNull(path2) {
 }
 function walk(dir, root, out) {
   for (const entry of (0, import_node_fs13.readdirSync)(dir)) {
-    const full = (0, import_node_path12.join)(dir, entry);
+    const full = (0, import_node_path13.join)(dir, entry);
     if ((0, import_node_fs13.statSync)(full).isDirectory()) walk(full, root, out);
     else if (entry.endsWith(".md")) out.push(full.slice(root.length + 1).replaceAll("\\", "/"));
   }
   return out;
 }
 function defaultListDocs(root) {
-  const docsDir = (0, import_node_path12.join)(root, "docs");
+  const docsDir = (0, import_node_path13.join)(root, "docs");
   const docs2 = ((0, import_node_fs13.existsSync)(docsDir) ? walk(docsDir, root, []) : []).filter(
     (rel) => !SKIP_WALK.some((skip) => rel.startsWith(skip))
   );
-  return [...ROOT_DOCS.filter((rel) => (0, import_node_fs13.existsSync)((0, import_node_path12.join)(root, rel))), ...docs2];
+  return [...ROOT_DOCS.filter((rel) => (0, import_node_fs13.existsSync)((0, import_node_path13.join)(root, rel))), ...docs2];
 }
 var CHECK_IGNORE_MAX_BUFFER = 32 * 1024 * 1024;
 function defaultIsIgnored(root, relPaths, exec = import_node_child_process5.execFileSync) {
@@ -9538,7 +9652,7 @@ function runDocRefs(root, deps = {}) {
   const walked = listDocs(root);
   const ignoredDocs = walked.length ? isIgnored(walked) : /* @__PURE__ */ new Set();
   const docs2 = Object.fromEntries(
-    walked.filter((rel) => !ignoredDocs.has(rel)).map((rel) => [rel, readFile9((0, import_node_path12.join)(root, rel))]).filter(([, body]) => body != null)
+    walked.filter((rel) => !ignoredDocs.has(rel)).map((rel) => [rel, readFile9((0, import_node_path13.join)(root, rel))]).filter(([, body]) => body != null)
   );
   const refResult = checkRefs(root, { exists, isIgnored, trackedFirstSegments }, docs2);
   const findings = [
@@ -9646,19 +9760,19 @@ function walkMarkdown(dir) {
   while (stack.length) {
     const current = stack.pop();
     for (const entry of (0, import_node_fs14.readdirSync)(current, { withFileTypes: true })) {
-      const full = (0, import_node_path13.join)(current, entry.name);
+      const full = (0, import_node_path14.join)(current, entry.name);
       if (entry.isDirectory()) {
         stack.push(full);
       } else if (entry.isFile() && entry.name.endsWith(".md")) {
-        out.push((0, import_node_path13.relative)(dir, full).split(import_node_path13.sep).join("/"));
+        out.push((0, import_node_path14.relative)(dir, full).split(import_node_path14.sep).join("/"));
       }
     }
   }
   return out;
 }
 function createDocsIndexDeps(repoRoot2) {
-  const docsDir = (0, import_node_path13.join)(repoRoot2, "docs");
-  const indexPath = (0, import_node_path13.join)(repoRoot2, DOCS_INDEX_PATH);
+  const docsDir = (0, import_node_path14.join)(repoRoot2, "docs");
+  const indexPath = (0, import_node_path14.join)(repoRoot2, DOCS_INDEX_PATH);
   return {
     listDocs: () => {
       if (!(0, import_node_fs14.existsSync)(docsDir)) return [];
@@ -9667,7 +9781,7 @@ function createDocsIndexDeps(repoRoot2) {
       const ignored = defaultIsIgnored(repoRoot2, walked.map((rel) => `docs/${rel}`));
       return walked.filter((rel) => !ignored.has(`docs/${rel}`)).sort();
     },
-    readDoc: (relPath) => (0, import_node_fs14.readFileSync)((0, import_node_path13.join)(docsDir, relPath), "utf8"),
+    readDoc: (relPath) => (0, import_node_fs14.readFileSync)((0, import_node_path14.join)(docsDir, relPath), "utf8"),
     readIndex: () => (0, import_node_fs14.existsSync)(indexPath) ? (0, import_node_fs14.readFileSync)(indexPath, "utf8") : null,
     writeIndex: (content) => (0, import_node_fs14.writeFileSync)(indexPath, content, "utf8")
   };
@@ -10317,13 +10431,13 @@ function parseVerifyBroker(stdout) {
 
 // src/train-apply.ts
 var import_node_fs16 = require("node:fs");
-var import_promises2 = require("node:fs/promises");
-var import_node_path15 = require("node:path");
+var import_promises3 = require("node:fs/promises");
+var import_node_path16 = require("node:path");
 
 // src/plugin-guard-io.ts
 var import_node_fs15 = require("node:fs");
 var import_node_child_process6 = require("node:child_process");
-var import_node_path14 = require("node:path");
+var import_node_path15 = require("node:path");
 var import_node_os4 = require("node:os");
 var import_proper_lockfile = __toESM(require_proper_lockfile(), 1);
 
@@ -10614,15 +10728,15 @@ function runHostBin(bin, args, opts) {
   return step ? execFileHard(file, argv, { ...shared, step }) : execFileP2(file, argv, shared);
 }
 function surfaceConfigRoot(surface, env = process.env, home = (0, import_node_os4.homedir)()) {
-  if (surface === "codex") return env.CODEX_HOME?.trim() || (0, import_node_path14.join)(home, ".codex");
-  if (surface === "kimi") return env.KIMI_CODE_HOME?.trim() || (0, import_node_path14.join)(home, ".kimi-code");
-  if (surface === "kilo") return env.KILO_CONFIG_DIR?.trim() || (0, import_node_path14.join)(home, ".config", "kilo");
-  if (surface === "cursor") return (0, import_node_path14.join)(home, ".cursor");
-  if (surface === "jervcode") return env.PI_CODING_AGENT_DIR?.trim() || (0, import_node_path14.join)(home, ".pi", "agent");
-  return (0, import_node_path14.join)(home, ".claude");
+  if (surface === "codex") return env.CODEX_HOME?.trim() || (0, import_node_path15.join)(home, ".codex");
+  if (surface === "kimi") return env.KIMI_CODE_HOME?.trim() || (0, import_node_path15.join)(home, ".kimi-code");
+  if (surface === "kilo") return env.KILO_CONFIG_DIR?.trim() || (0, import_node_path15.join)(home, ".config", "kilo");
+  if (surface === "cursor") return (0, import_node_path15.join)(home, ".cursor");
+  if (surface === "jervcode") return env.PI_CODING_AGENT_DIR?.trim() || (0, import_node_path15.join)(home, ".pi", "agent");
+  return (0, import_node_path15.join)(home, ".claude");
 }
 var installedPluginsPath = (surface = detectSurface(process.env)) => {
-  return (0, import_node_path14.join)(surfaceConfigRoot(surface), "plugins", "installed_plugins.json");
+  return (0, import_node_path15.join)(surfaceConfigRoot(surface), "plugins", "installed_plugins.json");
 };
 function readInstalledPlugins(surface = detectSurface(process.env)) {
   try {
@@ -10635,15 +10749,15 @@ function marketplaceCloneCandidates(surface, home, env = process.env) {
   if (surface === "codex") {
     const root = surfaceConfigRoot(surface, env, home);
     return [
-      (0, import_node_path14.join)(root, ".tmp", "marketplaces", CODEX_MARKETPLACE),
-      (0, import_node_path14.join)(root, "plugins", "marketplaces", CODEX_MARKETPLACE)
+      (0, import_node_path15.join)(root, ".tmp", "marketplaces", CODEX_MARKETPLACE),
+      (0, import_node_path15.join)(root, "plugins", "marketplaces", CODEX_MARKETPLACE)
     ];
   }
   if (surface === "kimi") return [];
   if (surface === "kilo") return [];
   if (surface === "cursor") return [];
   if (surface === "jervcode") return [];
-  return [(0, import_node_path14.join)(home, ".claude", "plugins", "marketplaces", "mutmutco")];
+  return [(0, import_node_path15.join)(home, ".claude", "plugins", "marketplaces", "mutmutco")];
 }
 function marketplaceClonePresent(surface, home, exists = import_node_fs15.existsSync, env = process.env) {
   return marketplaceCloneCandidates(surface, home, env).some(exists);
@@ -10694,11 +10808,11 @@ function codexHookTrustState(status = codexPluginStatus()) {
     return { applicable: false, trusted: false, trustedCount: 0, requiredCount: 0 };
   }
   const root = surfaceConfigRoot("codex");
-  const hooksPath = (0, import_node_path14.join)(root, "plugins", "cache", CODEX_MARKETPLACE, "mmi", status.version, "hooks", "codex-hooks.json");
+  const hooksPath = (0, import_node_path15.join)(root, "plugins", "cache", CODEX_MARKETPLACE, "mmi", status.version, "hooks", "codex-hooks.json");
   const requiredCount = countCodexHookCommands(hooksPath);
   let config = "";
   try {
-    config = (0, import_node_fs15.readFileSync)((0, import_node_path14.join)(root, "config.toml"), "utf8");
+    config = (0, import_node_fs15.readFileSync)((0, import_node_path15.join)(root, "config.toml"), "utf8");
   } catch {
     return { applicable: true, trusted: false, trustedCount: 0, requiredCount };
   }
@@ -10734,9 +10848,9 @@ async function npmSelfUpdateCli(target, onStep) {
 }
 function kiloConfigListsPlugin(configRoot, home = (0, import_node_os4.homedir)(), read = (p) => (0, import_node_fs15.readFileSync)(p, "utf8"), exists = import_node_fs15.existsSync) {
   const candidates = ["kilo.json", "kilo.jsonc", "opencode.json", "opencode.jsonc", "config.json"];
-  for (const dir of [configRoot, (0, import_node_path14.join)(home, ".kilo")]) {
+  for (const dir of [configRoot, (0, import_node_path15.join)(home, ".kilo")]) {
     for (const file of candidates) {
-      const path2 = (0, import_node_path14.join)(dir, file);
+      const path2 = (0, import_node_path15.join)(dir, file);
       if (!exists(path2)) continue;
       try {
         const stripped = read(path2).replace(/\/\*[\s\S]*?\*\//g, "").replace(/\/\/.*$/gm, "");
@@ -10753,7 +10867,7 @@ function kiloConfigListsPlugin(configRoot, home = (0, import_node_os4.homedir)()
   return false;
 }
 function cursorLocalPluginRoot(env = process.env, home = (0, import_node_os4.homedir)()) {
-  return (0, import_node_path14.join)(surfaceConfigRoot("cursor", env, home), "plugins", "local", "mmi");
+  return (0, import_node_path15.join)(surfaceConfigRoot("cursor", env, home), "plugins", "local", "mmi");
 }
 function cursorPluginTreeHealthy(root, exists = import_node_fs15.existsSync) {
   return [
@@ -10762,14 +10876,14 @@ function cursorPluginTreeHealthy(root, exists = import_node_fs15.existsSync) {
     "hooks/cursor-hooks.json",
     "scripts/hook-run.mjs",
     "scripts/hook-policy.mjs"
-  ].every((path2) => exists((0, import_node_path14.join)(root, ...path2.split("/"))));
+  ].every((path2) => exists((0, import_node_path15.join)(root, ...path2.split("/"))));
 }
 function kimiPluginTreeHealthy(root, exists = import_node_fs15.existsSync) {
   return [
     ".kimi-plugin/plugin.json",
     "skills/mmi/SKILL.md",
     "scripts/hook-run.mjs"
-  ].every((path2) => exists((0, import_node_path14.join)(root, ...path2.split("/"))));
+  ].every((path2) => exists((0, import_node_path15.join)(root, ...path2.split("/"))));
 }
 var JERVCODE_WRAPPER_DIR = ".pi-plugin";
 function normalizePiEntry(value) {
@@ -10792,7 +10906,7 @@ function jervcodePackageFamily(entry) {
 function isMmiOwnedPiEntry(entry) {
   if (typeof entry !== "string") return false;
   try {
-    const pkg = JSON.parse((0, import_node_fs15.readFileSync)((0, import_node_path14.join)(piEntryFsPath(entry), "package.json"), "utf8"));
+    const pkg = JSON.parse((0, import_node_fs15.readFileSync)((0, import_node_path15.join)(piEntryFsPath(entry), "package.json"), "utf8"));
     return pkg.name === "mmi";
   } catch {
     return false;
@@ -10824,7 +10938,7 @@ function readPiSettings(path2) {
   }
 }
 function mmiPiWrapperEntry(env = process.env, home = (0, import_node_os4.homedir)()) {
-  const settings = readPiSettings((0, import_node_path14.join)(surfaceConfigRoot("jervcode", env, home), "settings.json"));
+  const settings = readPiSettings((0, import_node_path15.join)(surfaceConfigRoot("jervcode", env, home), "settings.json"));
   const entries = Array.isArray(settings?.packages) ? settings.packages : [];
   for (const entry of entries) {
     if (typeof entry !== "string") continue;
@@ -10837,17 +10951,17 @@ function mmiPiWrapperEntry(env = process.env, home = (0, import_node_os4.homedir
 function mmiPiWrapperHealthy(entry) {
   if (!entry) return false;
   const wrapper = piEntryFsPath(entry);
-  return isMmiOwnedPiEntry(entry) && (0, import_node_fs15.existsSync)((0, import_node_path14.join)((0, import_node_path14.dirname)(wrapper), "skills", "mmi", "SKILL.md"));
+  return isMmiOwnedPiEntry(entry) && (0, import_node_fs15.existsSync)((0, import_node_path15.join)((0, import_node_path15.dirname)(wrapper), "skills", "mmi", "SKILL.md"));
 }
 function findMmiPiSourceClone(home = (0, import_node_os4.homedir)()) {
-  const cacheRoot = (0, import_node_path14.join)(home, ".claude", "plugins", "cache", "mutmutco", "mmi");
+  const cacheRoot = (0, import_node_path15.join)(home, ".claude", "plugins", "cache", "mutmutco", "mmi");
   let best = null;
   try {
     for (const entry of (0, import_node_fs15.readdirSync)(cacheRoot, { withFileTypes: true })) {
       if (!entry.isDirectory() || !/^\d+\.\d+\.\d+$/.test(entry.name)) continue;
-      if (!(0, import_node_fs15.existsSync)((0, import_node_path14.join)(cacheRoot, entry.name, JERVCODE_WRAPPER_DIR, "package.json"))) continue;
+      if (!(0, import_node_fs15.existsSync)((0, import_node_path15.join)(cacheRoot, entry.name, JERVCODE_WRAPPER_DIR, "package.json"))) continue;
       if (!best || compareVersions(entry.name, best.version) > 0) {
-        best = { path: (0, import_node_path14.join)(cacheRoot, entry.name), version: entry.name };
+        best = { path: (0, import_node_path15.join)(cacheRoot, entry.name), version: entry.name };
       }
     }
   } catch {
@@ -10885,7 +10999,7 @@ function healJervCodePackageRegistration(opts = {}) {
     return { available: true, ok: true, changed: false, version: null, detail: "skipped \u2014 no installed MMI clone carries the pi wrapper (install the Claude plugin first)" };
   }
   const packagePath = `${clone.path.replace(/\\/g, "/").replace(/\/+$/, "")}/${JERVCODE_WRAPPER_DIR}`;
-  const settingsPath2 = (0, import_node_path14.join)(agentDir, "settings.json");
+  const settingsPath2 = (0, import_node_path15.join)(agentDir, "settings.json");
   const release = (0, import_node_fs15.existsSync)(settingsPath2) ? acquirePiSettingsLock(settingsPath2) : void 0;
   if ((0, import_node_fs15.existsSync)(settingsPath2) && !release) {
     return {
@@ -10915,7 +11029,7 @@ function healJervCodePackageRegistration(opts = {}) {
     }
     current.packages = merged.next;
     try {
-      (0, import_node_fs15.mkdirSync)((0, import_node_path14.dirname)(settingsPath2), { recursive: true });
+      (0, import_node_fs15.mkdirSync)((0, import_node_path15.dirname)(settingsPath2), { recursive: true });
       const tmp = `${settingsPath2}.tmp-${process.pid}`;
       (0, import_node_fs15.writeFileSync)(tmp, `${JSON.stringify(current, null, 2)}
 `, "utf8");
@@ -10948,7 +11062,7 @@ function snapshotPluginGuardInput(surface = detectSurface(process.env), isOrgRep
   return {
     isOrgRepo,
     installRecordPresent: hasUserInstallRecord(installed, MMI_PLUGIN_ID) || hasProjectInstallRecord(installed, MMI_PLUGIN_ID, process.cwd()) || // Kimi's managed plugin directory is its native install record; it has no Claude-style ledger.
-    surface === "kimi" && (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "managed", "mmi")) || // kilo-p1: the install record is the config file itself.
+    surface === "kimi" && (0, import_node_fs15.existsSync)((0, import_node_path15.join)(root, "plugins", "managed", "mmi")) || // kilo-p1: the install record is the config file itself.
     surface === "kilo" && kiloConfigListsPlugin(root) || // #4188: jervcode's install record is the settings-file packages[] entry itself.
     surface === "jervcode" && piEntry !== null || surface === "cursor" && (0, import_node_fs15.existsSync)(cursorLocalPluginRoot()),
     // Kilo has no marketplace to clone — the config file IS the install record, so this dimension of
@@ -10957,9 +11071,9 @@ function snapshotPluginGuardInput(surface = detectSurface(process.env), isOrgRep
     // Kimi keeps no plugin cache dir — installs are copied to plugins/managed/<id> and run from there.
     // Kilo (kilo-p1) keeps no cache dir either: the plugin's server() provisions ~/.kilo behind the
     // version stamp, so the stamp's presence is the cache signal.
-    pluginCachePresent: surface === "jervcode" ? mmiPiWrapperHealthy(piEntry) : surface === "kilo" ? (0, import_node_fs15.existsSync)((0, import_node_path14.join)((0, import_node_os4.homedir)(), ".kilo", ".mmi-kilo-version")) : surface === "kimi" ? kimiPluginTreeHealthy((0, import_node_path14.join)(root, "plugins", "managed", "mmi")) : surface === "cursor" ? cursorPluginTreeHealthy(cursorLocalPluginRoot()) : surface === "codex" ? Boolean(
-      codexStatus?.installed && codexStatus.enabled && codexStatus.version && (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "cache", CODEX_MARKETPLACE, "mmi", codexStatus.version))
-    ) : (0, import_node_fs15.existsSync)((0, import_node_path14.join)(root, "plugins", "cache", "mutmutco", "mmi"))
+    pluginCachePresent: surface === "jervcode" ? mmiPiWrapperHealthy(piEntry) : surface === "kilo" ? (0, import_node_fs15.existsSync)((0, import_node_path15.join)((0, import_node_os4.homedir)(), ".kilo", ".mmi-kilo-version")) : surface === "kimi" ? kimiPluginTreeHealthy((0, import_node_path15.join)(root, "plugins", "managed", "mmi")) : surface === "cursor" ? cursorPluginTreeHealthy(cursorLocalPluginRoot()) : surface === "codex" ? Boolean(
+      codexStatus?.installed && codexStatus.enabled && codexStatus.version && (0, import_node_fs15.existsSync)((0, import_node_path15.join)(root, "plugins", "cache", CODEX_MARKETPLACE, "mmi", codexStatus.version))
+    ) : (0, import_node_fs15.existsSync)((0, import_node_path15.join)(root, "plugins", "cache", "mutmutco", "mmi"))
   };
 }
 async function runHostBinLogged(bin, args, opts) {
@@ -10979,9 +11093,9 @@ async function runPluginCli(bin, args, log) {
 function captureCodexHookLauncher() {
   const status = codexPluginStatus();
   if (!status.installed || !status.enabled || !status.version) return void 0;
-  const root = (0, import_node_path14.join)(surfaceConfigRoot("codex"), "plugins", "cache", CODEX_MARKETPLACE, "mmi", status.version);
+  const root = (0, import_node_path15.join)(surfaceConfigRoot("codex"), "plugins", "cache", CODEX_MARKETPLACE, "mmi", status.version);
   const files = ["mmi-hook", "mmi-hook.exe"].flatMap((name) => {
-    const path2 = (0, import_node_path14.join)(root, "bin", name);
+    const path2 = (0, import_node_path15.join)(root, "bin", name);
     try {
       return [{ name, content: (0, import_node_fs15.readFileSync)(path2) }];
     } catch {
@@ -10991,11 +11105,11 @@ function captureCodexHookLauncher() {
   return files.length === 2 ? { root, files } : void 0;
 }
 function restoreCodexHookLauncher(snapshot) {
-  if (!snapshot || (0, import_node_fs15.existsSync)((0, import_node_path14.join)(snapshot.root, "scripts", "hook-run.mjs"))) return false;
-  const bin = (0, import_node_path14.join)(snapshot.root, "bin");
+  if (!snapshot || (0, import_node_fs15.existsSync)((0, import_node_path15.join)(snapshot.root, "scripts", "hook-run.mjs"))) return false;
+  const bin = (0, import_node_path15.join)(snapshot.root, "bin");
   (0, import_node_fs15.mkdirSync)(bin, { recursive: true });
   for (const file of snapshot.files) {
-    const path2 = (0, import_node_path14.join)(bin, file.name);
+    const path2 = (0, import_node_path15.join)(bin, file.name);
     (0, import_node_fs15.writeFileSync)(path2, file.content);
     if (file.name === "mmi-hook") (0, import_node_fs15.chmodSync)(path2, 493);
   }
@@ -11006,8 +11120,8 @@ function canonicalCursorRemote(remote) {
 }
 async function installCursorPluginCheckout(env = process.env) {
   const configRoot = surfaceConfigRoot("cursor", env);
-  const pluginsRoot = (0, import_node_path14.join)(configRoot, "plugins");
-  const target = (0, import_node_path14.join)(pluginsRoot, "local", "mmi");
+  const pluginsRoot = (0, import_node_path15.join)(configRoot, "plugins");
+  const target = (0, import_node_path15.join)(pluginsRoot, "local", "mmi");
   const source = env.MMI_CURSOR_PLUGIN_SOURCE?.trim();
   if ((0, import_node_fs15.existsSync)(target) && !source) {
     try {
@@ -11019,12 +11133,12 @@ async function installCursorPluginCheckout(env = process.env) {
       return { ok: false, detail: `refused to replace unmanaged Cursor plugin directory at ${target}` };
     }
   }
-  (0, import_node_fs15.mkdirSync)((0, import_node_path14.join)(pluginsRoot, "local"), { recursive: true });
-  (0, import_node_fs15.mkdirSync)((0, import_node_path14.join)(pluginsRoot, "staging"), { recursive: true });
-  (0, import_node_fs15.mkdirSync)((0, import_node_path14.join)(pluginsRoot, "quarantine"), { recursive: true });
+  (0, import_node_fs15.mkdirSync)((0, import_node_path15.join)(pluginsRoot, "local"), { recursive: true });
+  (0, import_node_fs15.mkdirSync)((0, import_node_path15.join)(pluginsRoot, "staging"), { recursive: true });
+  (0, import_node_fs15.mkdirSync)((0, import_node_path15.join)(pluginsRoot, "quarantine"), { recursive: true });
   const suffix = `${Date.now()}-${process.pid}`;
-  const staged = (0, import_node_path14.join)(pluginsRoot, "staging", `mmi-${suffix}`);
-  const quarantined = (0, import_node_path14.join)(pluginsRoot, "quarantine", `mmi-${suffix}`);
+  const staged = (0, import_node_path15.join)(pluginsRoot, "staging", `mmi-${suffix}`);
+  const quarantined = (0, import_node_path15.join)(pluginsRoot, "quarantine", `mmi-${suffix}`);
   try {
     if (source) {
       (0, import_node_fs15.cpSync)(source, staged, {
@@ -11107,7 +11221,7 @@ async function applyPluginHeal(surface, log, opts) {
   const refSupported = await marketplaceAddRefSupported(bin);
   const { steps } = adaptHealStepsForRefSupport(tableSteps, refSupported);
   log(healBannerLine(bin, token, refSupported));
-  const pinsPath = (0, import_node_path14.join)((0, import_node_os4.homedir)(), ...KNOWN_MARKETPLACES_RELATIVE);
+  const pinsPath = (0, import_node_path15.join)((0, import_node_os4.homedir)(), ...KNOWN_MARKETPLACES_RELATIVE);
   const pins = token === "claude" ? captureMarketplacePins(readKnownMarketplacesFile(pinsPath), [MMI_MARKETPLACE_NAME, JERV_MARKETPLACE_NAME]) : /* @__PURE__ */ new Map();
   try {
     for (const step of steps) {
@@ -11224,7 +11338,7 @@ function restoreMarketplacePinsOnDisk(path2, pins, hostIsRunning = claudeCodeIsR
   return writeMarketplacePinsOnDisk(
     path2,
     pins,
-    (restored) => hostIsRunning() ? `${restoredPinsLine(restored)}, but Claude Code is running and can rewrite this file from its own copy \u2014 restart it, then \`mmi-cli doctor --apply\` if the pins did not survive` : restoredPinsLine(restored),
+    (restored) => hostIsRunning() ? `${restoredPinsLine(restored)}, but Claude Code is running and can rewrite this file from its own copy \u2014 restart it, then \`mmi-cli doctor\` if the pins did not survive` : restoredPinsLine(restored),
     "restore"
   );
 }
@@ -11238,13 +11352,13 @@ function applyOrgMarketplacePins(path2, names, hostIsRunning = claudeCodeIsRunni
       return `pinned ${[...pins.keys()].join(", ")} to ${ORG_MARKETPLACE_PINS.ref} with auto-update on`;
     },
     "pin",
-    () => hostIsRunning() ? "not pinned \u2014 Claude Code is running and rewrites this registration from its own copy; quit it, then run `mmi-cli doctor --apply`" : void 0
+    () => hostIsRunning() ? "not pinned \u2014 Claude Code is running and rewrites this registration from its own copy; quit it, then run `mmi-cli doctor`" : void 0
   );
   return detail === void 0 ? void 0 : { detail, wrote: landed };
 }
 function writeMarketplacePinPending(path2, names, now = Date.now()) {
   try {
-    (0, import_node_fs15.mkdirSync)((0, import_node_path14.dirname)(path2), { recursive: true });
+    (0, import_node_fs15.mkdirSync)((0, import_node_path15.dirname)(path2), { recursive: true });
     (0, import_node_fs15.writeFileSync)(path2, `${JSON.stringify({ v: 1, names: [...names], at: new Date(now).toISOString() })}
 `, "utf8");
   } catch {
@@ -11388,18 +11502,46 @@ async function resolveFoldPaths(deps, model) {
   }
   return ["package.json", "package-lock.json"];
 }
+async function alignExistingHotfixReleaseMarker(deps, version) {
+  const script = [
+    "const fs = require('fs');",
+    "const p = 'package.json';",
+    "if (!fs.existsSync(p)) { process.stdout.write('absent'); process.exit(0); }",
+    "const j = JSON.parse(fs.readFileSync(p, 'utf8'));",
+    "const marker = j.jervaiseRelease;",
+    "const hasHotfixMarker = !!(marker && typeof marker === 'object' && marker.kind === 'hotfix');",
+    "const requiresMarker = fs.existsSync('scripts/check-release-kind.mjs');",
+    "if (!hasHotfixMarker && !requiresMarker) {",
+    "  process.stdout.write('skip');",
+    "  process.exit(0);",
+    "}",
+    `const version = ${JSON.stringify(version)};`,
+    "if (hasHotfixMarker && marker.version === version) { process.stdout.write('ok'); process.exit(0); }",
+    "j.jervaiseRelease = { kind: 'hotfix', version };",
+    "fs.writeFileSync(p, JSON.stringify(j, null, 2) + '\\n');",
+    "process.stdout.write(hasHotfixMarker ? 'updated' : 'stamped');"
+  ].join("");
+  const out = (await deps.run("node", ["-e", script])).trim();
+  if (out === "updated") return `jervaiseRelease hotfix marker aligned to ${version}`;
+  if (out === "stamped") return `jervaiseRelease hotfix marker stamped for ${version}`;
+  return null;
+}
 async function installAppFoldDeps(deps) {
   const hasLock = await deps.run("git", ["cat-file", "-e", "HEAD:package-lock.json"]).then(() => true).catch(() => false);
   await deps.run("npm", hasLock ? ["ci"] : ["install"]);
 }
-async function foldReleaseVersion(deps, model, tag, foldPaths) {
+async function foldReleaseVersion(deps, model, tag, foldPaths, sourceCommit = "HEAD") {
   if (foldPaths.length === 0) return "no version manifest to fold \u2014 the tag is the version";
   const version = tag.replace(/^v/, "");
   if (model === "hub-serverless") {
-    await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", "HEAD"]);
+    await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", sourceCommit]);
   } else {
     await installAppFoldDeps(deps);
     await deps.run("npm", ["version", version, "--no-git-tag-version", "--allow-same-version"]);
+    const patch = Number(version.split(".")[2] ?? "0");
+    if (model === "registry-publish" && Number.isFinite(patch) && patch > 0) {
+      await alignExistingHotfixReleaseMarker(deps, version);
+    }
   }
   for (const path2 of foldPaths) {
     await deps.run("git", ["add", "--", path2]).catch(() => void 0);
@@ -12356,7 +12498,7 @@ async function dispatchDeploy(deps, ctx, stage, ref, model, watch, autoRunSince,
   return { note: `no manual dispatch: ${model} repo deploys via its own push-triggered workflow`, deployStatus: "pending" };
 }
 function readLocalGateWorkflows() {
-  const dir = (0, import_node_path15.join)(".github", "workflows");
+  const dir = (0, import_node_path16.join)(".github", "workflows");
   let names;
   try {
     names = (0, import_node_fs16.readdirSync)(dir);
@@ -12366,7 +12508,7 @@ function readLocalGateWorkflows() {
   const files = [];
   for (const name of names.filter(isGateWorkflowPath)) {
     try {
-      files.push({ path: `${dir}/${name}`.replace(/\\/g, "/"), body: (0, import_node_fs16.readFileSync)((0, import_node_path15.join)(dir, name), "utf8") });
+      files.push({ path: `${dir}/${name}`.replace(/\\/g, "/"), body: (0, import_node_fs16.readFileSync)((0, import_node_path16.join)(dir, name), "utf8") });
     } catch {
     }
   }
@@ -12491,7 +12633,7 @@ async function waitForFoldIndexLock(deps, startBranch, resumeCommand) {
   const deadline = now() + GIT_INDEX_LOCK_WAIT_MS;
   for (; ; ) {
     try {
-      await (0, import_promises2.stat)(lockPath);
+      await (0, import_promises3.stat)(lockPath);
     } catch (e) {
       if (e.code === "ENOENT") return;
       throw foldFailureGuidance(
@@ -14473,7 +14615,7 @@ var import_node_fs18 = require("node:fs");
 // src/stage-runner.ts
 var import_node_child_process7 = require("node:child_process");
 var import_node_fs17 = require("node:fs");
-var import_node_path16 = require("node:path");
+var import_node_path17 = require("node:path");
 var import_node_net = require("node:net");
 var import_node_util5 = require("node:util");
 
@@ -14612,11 +14754,11 @@ function appendForceRecreate(up) {
   return `${up.trimEnd()} --force-recreate`;
 }
 function stageStatePath(cwd = process.cwd()) {
-  return (0, import_node_path16.join)(cwd, "tmp", "stage", "state.json");
+  return (0, import_node_path17.join)(cwd, "tmp", "stage", "state.json");
 }
 function stageGlobalStatePath(cwd = process.cwd(), gitCommonDir = ".git") {
-  const dir = (0, import_node_path16.isAbsolute)(gitCommonDir) ? gitCommonDir : (0, import_node_path16.resolve)(cwd, gitCommonDir);
-  return (0, import_node_path16.join)(dir, "mmi", "stage", "state.json");
+  const dir = (0, import_node_path17.isAbsolute)(gitCommonDir) ? gitCommonDir : (0, import_node_path17.resolve)(cwd, gitCommonDir);
+  return (0, import_node_path17.join)(dir, "mmi", "stage", "state.json");
 }
 function normPath2(path2) {
   return path2.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
@@ -14840,8 +14982,8 @@ function stageProcessEnv(stagePort, extraEnv) {
 }
 async function ensureStageRuntimeEnv(config, opts, cwd) {
   if (!config.ensureEnv) return;
-  const target = (0, import_node_path16.join)(cwd, config.ensureEnv.target);
-  const example = (0, import_node_path16.join)(cwd, config.ensureEnv.example);
+  const target = (0, import_node_path17.join)(cwd, config.ensureEnv.target);
+  const example = (0, import_node_path17.join)(cwd, config.ensureEnv.example);
   if (!(0, import_node_fs17.existsSync)(target) && (0, import_node_fs17.existsSync)(example)) {
     (0, import_node_fs17.copyFileSync)(example, target);
   } else if ((0, import_node_fs17.existsSync)(target) && (0, import_node_fs17.existsSync)(example)) {
@@ -15212,7 +15354,7 @@ var import_node_os17 = require("node:os");
 var import_node_child_process9 = require("node:child_process");
 var import_node_fs21 = require("node:fs");
 var import_node_os7 = require("node:os");
-var import_node_path19 = require("node:path");
+var import_node_path20 = require("node:path");
 var import_node_util6 = require("node:util");
 
 // src/board-priority.ts
@@ -15567,7 +15709,7 @@ function boardConfigFromProject(meta, floor = {}) {
 
 // src/cli-doctor-shared.ts
 var import_node_fs19 = require("node:fs");
-var import_node_path18 = require("node:path");
+var import_node_path19 = require("node:path");
 var import_node_fs20 = require("node:fs");
 
 // src/readiness-audit.ts
@@ -15688,9 +15830,9 @@ var import_node_child_process8 = require("node:child_process");
 var import_node_os6 = require("node:os");
 
 // src/gh-create.ts
-var import_promises3 = require("node:fs/promises");
+var import_promises4 = require("node:fs/promises");
 var import_node_os5 = require("node:os");
-var import_node_path17 = require("node:path");
+var import_node_path18 = require("node:path");
 var import_node_crypto3 = require("node:crypto");
 var ISSUE_TYPES = ["bug", "feature", "task"];
 var GH_MUTATION_TIMEOUT_MS = 12e4;
@@ -15740,12 +15882,12 @@ async function bodyArgsViaFile(args, deps = {}) {
   const i = args.indexOf("--body");
   if (i === -1 || i + 1 >= args.length) return { args, cleanup: async () => {
   } };
-  const write = deps.write ?? import_promises3.writeFile;
-  const remove2 = deps.remove ?? import_promises3.unlink;
-  const ensureDir = deps.ensureDir ?? import_promises3.mkdir;
+  const write = deps.write ?? import_promises4.writeFile;
+  const remove2 = deps.remove ?? import_promises4.unlink;
+  const ensureDir = deps.ensureDir ?? import_promises4.mkdir;
   const dir = deps.dir ?? (0, import_node_os5.tmpdir)();
-  const file = (0, import_node_path17.join)(dir, `mmi-gh-body-${process.pid}-${(0, import_node_crypto3.randomBytes)(4).toString("hex")}.md`);
-  await ensureDir((0, import_node_path17.dirname)(file), { recursive: true }).catch(() => {
+  const file = (0, import_node_path18.join)(dir, `mmi-gh-body-${process.pid}-${(0, import_node_crypto3.randomBytes)(4).toString("hex")}.md`);
+  await ensureDir((0, import_node_path18.dirname)(file), { recursive: true }).catch(() => {
   });
   await write(file, args[i + 1], "utf8");
   return {
@@ -17269,7 +17411,7 @@ async function localBranchHeads() {
 }
 async function currentRepoWorktreeGitRoot(repoRoot2) {
   const gitCommonDir = (await execFileP2("git", ["rev-parse", "--git-common-dir"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-  return gitCommonDir ? (0, import_node_path18.resolve)(repoRoot2, gitCommonDir, "worktrees") : "";
+  return gitCommonDir ? (0, import_node_path19.resolve)(repoRoot2, gitCommonDir, "worktrees") : "";
 }
 async function worktreeBranches() {
   const { stdout } = await execFileP2("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS });
@@ -17289,7 +17431,7 @@ function resolveGitdirForWorktreeFile(worktreePath, content) {
   const match = /^gitdir:\s*(.+)\s*$/im.exec(content);
   if (!match?.[1]) return void 0;
   const raw = match[1].trim();
-  return (0, import_node_path18.isAbsolute)(raw) ? raw : (0, import_node_path18.resolve)(worktreePath, raw);
+  return (0, import_node_path19.isAbsolute)(raw) ? raw : (0, import_node_path19.resolve)(worktreePath, raw);
 }
 function metadataOwnsMissingWorktreeDir(worktreePath, worktreeGitRoot) {
   if (!worktreeGitRoot) return false;
@@ -17298,9 +17440,9 @@ function metadataOwnsMissingWorktreeDir(worktreePath, worktreeGitRoot) {
     for (const ent of entries) {
       if (!ent.isDirectory()) continue;
       try {
-        const gitdirPath = (0, import_node_fs19.readFileSync)((0, import_node_path18.join)(worktreeGitRoot, ent.name, "gitdir"), "utf8").trim();
-        const resolvedGitdir = (0, import_node_path18.isAbsolute)(gitdirPath) ? gitdirPath : (0, import_node_path18.resolve)(worktreeGitRoot, ent.name, gitdirPath);
-        if (sameWorktreeMetadataPath((0, import_node_path18.dirname)(resolvedGitdir), worktreePath)) return true;
+        const gitdirPath = (0, import_node_fs19.readFileSync)((0, import_node_path19.join)(worktreeGitRoot, ent.name, "gitdir"), "utf8").trim();
+        const resolvedGitdir = (0, import_node_path19.isAbsolute)(gitdirPath) ? gitdirPath : (0, import_node_path19.resolve)(worktreeGitRoot, ent.name, gitdirPath);
+        if (sameWorktreeMetadataPath((0, import_node_path19.dirname)(resolvedGitdir), worktreePath)) return true;
       } catch {
       }
     }
@@ -17319,7 +17461,7 @@ function pathExistsKnown(path2) {
   }
 }
 function inspectSiblingWorktreeDir(path2, worktreeGitRoot) {
-  const gitPath = (0, import_node_path18.join)(path2, ".git");
+  const gitPath = (0, import_node_path19.join)(path2, ".git");
   let st;
   try {
     st = (0, import_node_fs20.lstatSync)(gitPath);
@@ -17373,7 +17515,7 @@ async function preservedBranches() {
 async function siblingWorktreeDirs(explicitRoot) {
   const repoRoot2 = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim() || process.cwd();
   const worktreeGitRoot = await currentRepoWorktreeGitRoot(repoRoot2);
-  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path18.dirname)((0, import_node_path18.dirname)(worktreeGitRoot)) : repoRoot2;
+  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path19.dirname)((0, import_node_path19.dirname)(worktreeGitRoot)) : repoRoot2;
   try {
     const dirs = explicitRoot ? listDirsIn(resolveExplicitScanRoot(explicitRoot, primaryRepoRoot)) : worktreeScanDirs(siblingMmiWorktreesRoot(primaryRepoRoot), primaryRepoRoot, listDirsIn, isRepoCheckoutDir);
     return dirs.map((dir) => inspectSiblingWorktreeDir(dir, worktreeGitRoot)).filter((entry) => Boolean(entry));
@@ -17383,13 +17525,13 @@ async function siblingWorktreeDirs(explicitRoot) {
 }
 function listDirsIn(dir) {
   try {
-    return (0, import_node_fs20.readdirSync)(dir, { withFileTypes: true }).filter((ent) => ent.isDirectory()).map((ent) => (0, import_node_path18.join)(dir, ent.name));
+    return (0, import_node_fs20.readdirSync)(dir, { withFileTypes: true }).filter((ent) => ent.isDirectory()).map((ent) => (0, import_node_path19.join)(dir, ent.name));
   } catch {
     return [];
   }
 }
 function isRepoCheckoutDir(dir) {
-  return (0, import_node_fs20.existsSync)((0, import_node_path18.join)(dir, ".git"));
+  return (0, import_node_fs20.existsSync)((0, import_node_path19.join)(dir, ".git"));
 }
 function resolveExplicitScanRoot(explicitRoot, repoRoot2) {
   let rootDirs;
@@ -18751,14 +18893,14 @@ function probeLocalClaimSession(marker, now = Date.now()) {
     claimSessionProbeCache.set(cacheKey, { checkedAt: now, state });
     return state;
   };
-  const root = (0, import_node_path19.join)((0, import_node_os7.homedir)(), ".claude", "projects");
+  const root = (0, import_node_path20.join)((0, import_node_os7.homedir)(), ".claude", "projects");
   try {
     const wanted = `${marker.session}.jsonl`.toLowerCase();
     const pending = [root];
     while (pending.length) {
       const dir = pending.pop();
       for (const entry of (0, import_node_fs21.readdirSync)(dir, { withFileTypes: true })) {
-        const path2 = (0, import_node_path19.join)(dir, entry.name);
+        const path2 = (0, import_node_path20.join)(dir, entry.name);
         if (entry.isDirectory()) pending.push(path2);
         else if (entry.isFile() && entry.name.toLowerCase() === wanted) {
           return remember(now - (0, import_node_fs21.statSync)(path2).mtimeMs <= CLAIM_SESSION_ACTIVITY_MS ? "live" : "dead");
@@ -19578,7 +19720,7 @@ function consolidateCommandNamespaces(program3) {
 
 // src/pi-plugin-registration.ts
 var import_node_fs22 = require("node:fs");
-var import_node_path20 = require("node:path");
+var import_node_path21 = require("node:path");
 
 // src/plugin-cache-prune.ts
 var PLUGIN_CACHE_KEEP = 2;
@@ -19837,26 +19979,26 @@ function newestExistingPiPlugin(home) {
     return void 0;
   }
   for (const version of names.filter(isVersionDirName).sort((a, b) => compareVersions(b, a))) {
-    const candidate = (0, import_node_path20.join)(cacheRoot, version, ".pi-plugin");
+    const candidate = (0, import_node_path21.join)(cacheRoot, version, ".pi-plugin");
     if ((0, import_node_fs22.existsSync)(candidate)) return candidate;
   }
   return void 0;
 }
 function expectedPiPluginPath(home, env, installedVersion) {
   const root = env.CLAUDE_PLUGIN_ROOT?.trim();
-  if (root && /[\\/]mutmutco[\\/]mmi[\\/]/.test(root)) return (0, import_node_path20.join)(root, ".pi-plugin");
+  if (root && /[\\/]mutmutco[\\/]mmi[\\/]/.test(root)) return (0, import_node_path21.join)(root, ".pi-plugin");
   const version = installedVersion ?? runningPluginVersion(env);
   if (version) {
-    const pinned = (0, import_node_path20.join)(home, ".claude", "plugins", "cache", "mutmutco", "mmi", version, ".pi-plugin");
+    const pinned = (0, import_node_path21.join)(home, ".claude", "plugins", "cache", "mutmutco", "mmi", version, ".pi-plugin");
     if ((0, import_node_fs22.existsSync)(pinned)) return pinned;
   }
   return newestExistingPiPlugin(home);
 }
 function settingsPath(home) {
-  return (0, import_node_path20.join)(home, ".pi", "agent", "settings.json");
+  return (0, import_node_path21.join)(home, ".pi", "agent", "settings.json");
 }
 function readPiPluginState(home, env, installedVersion) {
-  if (!(0, import_node_fs22.existsSync)((0, import_node_path20.join)(home, ".pi", "agent"))) return void 0;
+  if (!(0, import_node_fs22.existsSync)((0, import_node_path21.join)(home, ".pi", "agent"))) return void 0;
   const expectedPath = expectedPiPluginPath(home, env, installedVersion);
   if (!expectedPath) return void 0;
   const file = settingsPath(home);
@@ -20516,7 +20658,14 @@ async function runHotfixStart(deps, options) {
       notes.push(`deleted stale origin/${branch} left by the incomplete train`);
     }
   }
-  const { sha, label } = await resolveHotfixSource(deps, ctx, options.from);
+  const specs = splitCarrySpecs([options.from]);
+  if (specs.length === 0) throw new Error("hotfix start: --from named no PR or SHA");
+  const sources = [];
+  for (const spec of specs) {
+    const resolved = await resolveHotfixSource(deps, ctx, spec);
+    if (!sources.some((s) => s.sha === resolved.sha)) sources.push(resolved);
+  }
+  const label = sources.map((s) => s.label).join(", ");
   const foldPaths = deployModel === "hub-serverless" || deployModel === "registry-publish" ? await resolveFoldPaths(deps, deployModel) : [];
   const pickTolerated = deployModel === "hub-serverless" ? [...foldPaths, ...HOTFIX_SKILL_TOLERATED_ROOTS] : foldPaths;
   if (deployModel === "hub-serverless") {
@@ -20532,9 +20681,11 @@ async function runHotfixStart(deps, options) {
     const preexistingLocal = clean3(await deps.run("git", ["branch", "--list", branch]));
     await deps.run("git", ["checkout", "-B", branch, "origin/main"]);
     try {
-      const autoResolved = await cherryPickWithToleratedPaths(deps, sha, pickTolerated);
-      if (autoResolved.length > 0) {
-        notes.push(`auto-resolved regenerable cherry-pick conflict(s): ${autoResolved.join(", ")} (regenerated in bump step)`);
+      for (const source of sources) {
+        const autoResolved = await cherryPickWithToleratedPaths(deps, source.sha, pickTolerated);
+        if (autoResolved.length > 0) {
+          notes.push(`auto-resolved regenerable cherry-pick conflict(s) for ${source.label}: ${autoResolved.join(", ")} (regenerated in bump step)`);
+        }
       }
     } catch (e) {
       const recovery = await restoreAfterFailedPort(deps, { startBranch, branch, created: !preexistingLocal });
@@ -20575,10 +20726,12 @@ async function runHotfixStart(deps, options) {
     branch,
     "--title",
     `[hotfix] ${tag}`,
+    // Every picked sha goes in the marker (#4411) — `hotfix release` reads it when --carries is omitted,
+    // so a multi-fix cycle proves ALL of its targets present before tagging, not just the first.
     "--body",
     `Hotfix ${tag}: cherry-pick of ${label} onto origin/main${bumpNote}.
 
-<!-- mmi-hotfix-carries: ${sha} -->
+<!-- mmi-hotfix-carries: ${sources.map((s) => s.sha).join(",")} -->
 
 Merge this PR (human-initiated), then run \`mmi-cli hotfix release ${tag}\`.`
   ]));
@@ -20621,6 +20774,61 @@ async function watchReleaseRun(deps, ctx, workflow, sha) {
   }
   return { workflow, conclusion: "not-found" };
 }
+function devFoldBranch(tag) {
+  return `hotfix-fold/${tag}`;
+}
+async function portFoldToDevelopment(deps, ctx, deployModel, tag) {
+  const foldPaths = deployModel === "hub-serverless" || deployModel === "registry-publish" ? await resolveFoldPaths(deps, deployModel) : [];
+  if (foldPaths.length === 0) return `fold port skipped (deployModel=${deployModel} folds no version manifest)`;
+  const branch = devFoldBranch(tag);
+  const listed = await deps.run("gh", [
+    "pr",
+    "list",
+    "--repo",
+    ctx.repo,
+    "--head",
+    branch,
+    "--base",
+    "development",
+    "--state",
+    "all",
+    "--limit",
+    "10",
+    "--json",
+    "number,state,url"
+  ]);
+  const existing = JSON.parse(listed || "[]").filter((r) => r.state === "OPEN" || r.state === "MERGED").sort((a, b) => (b.number ?? 0) - (a.number ?? 0))[0];
+  if (existing) return `development fold PR #${existing.number} for ${tag} is ${existing.state} \u2014 reused`;
+  const previousRef = clean3(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
+  try {
+    await deps.run("git", ["fetch", "origin", "development"]);
+    await deps.run("git", ["checkout", "-B", branch, "origin/development"]);
+    const durableSource = clean3(await deps.run("git", ["merge-base", "HEAD", "origin/development"]));
+    const foldNote = await foldReleaseVersion(deps, deployModel, tag, foldPaths, durableSource);
+    const committed = clean3(await deps.run("git", ["rev-list", "--count", "origin/development..HEAD"]));
+    if (committed === "0") return `development already carries ${tag} \u2014 no fold PR needed (${foldNote})`;
+    await deps.run("git", ["push", "-u", "origin", branch]);
+    const prUrl = clean3(await deps.run("gh", [
+      "pr",
+      "create",
+      "--repo",
+      ctx.repo,
+      "--base",
+      "development",
+      "--head",
+      branch,
+      "--title",
+      `chore(release): port the ${tag} version fold to development`,
+      "--body",
+      `Regenerated version fold for ${tag} (#4410). \`main\` carries the released version; without this development declares the previous one and every PR into it fails catalog-lockstep.
+
+Generated by \`mmi-cli hotfix release\` \u2014 no main-parented commit is merged in, so the squash parents stay clean (#4365/#4371).`
+    ]));
+    return `opened development fold PR ${prUrl} (${foldNote})`;
+  } finally {
+    if (previousRef && previousRef !== "HEAD") await deps.run("git", ["checkout", previousRef]).catch(() => void 0);
+  }
+}
 async function runHotfixRelease(deps, versionInput, options = {}) {
   const ctx = await buildTrainApplyContext(deps);
   const deployModel = await resolveHotfixDeployModel(deps, ctx);
@@ -20746,6 +20954,12 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
   } else {
     verifyNote = `distribution verify skipped (deployModel=${deployModel}, Hub-only step)`;
   }
+  let foldNote;
+  try {
+    foldNote = await portFoldToDevelopment(deps, ctx, deployModel, tag);
+  } catch (e) {
+    foldNote = `development fold port FAILED: ${e.message ?? e} \u2014 the release stands; port it by hand: git checkout -B ${devFoldBranch(tag)} origin/development && node scripts/release-distribution.mjs prepare ${version}, then open a development-base PR`;
+  }
   return {
     ...ctx,
     command: "hotfix-release",
@@ -20758,6 +20972,7 @@ async function runHotfixRelease(deps, versionInput, options = {}) {
     runs,
     deployNote,
     verifyNote,
+    foldNote,
     announceNote
   };
 }
@@ -21408,7 +21623,7 @@ function renderAccessReport(report) {
 var import_node_crypto4 = require("node:crypto");
 var import_node_child_process12 = require("node:child_process");
 var import_node_fs23 = require("node:fs");
-var import_node_path21 = require("node:path");
+var import_node_path22 = require("node:path");
 var REPO_INDEX_SCHEMA = 1;
 var HARD_DENY = [
   /(^|\/)\.env(\.|$)/i,
@@ -21533,7 +21748,7 @@ function loadReadmeHints(cwd, candidatePaths) {
   }
   for (const rel of readmes) {
     if (isHardDeniedPath(rel)) continue;
-    const abs = (0, import_node_path21.join)(cwd, ...rel.split("/"));
+    const abs = (0, import_node_path22.join)(cwd, ...rel.split("/"));
     if (!(0, import_node_fs23.existsSync)(abs)) continue;
     let text;
     try {
@@ -21550,7 +21765,7 @@ function loadReadmeHints(cwd, candidatePaths) {
   return hints;
 }
 function toPosix(p) {
-  return p.split(import_node_path21.sep).join("/");
+  return p.split(import_node_path22.sep).join("/");
 }
 function listCandidatePaths(cwd, exec = import_node_child_process12.execFileSync) {
   try {
@@ -21572,7 +21787,7 @@ function rebuildRepoIndex(cwd, repoSlug2) {
   for (const rel of candidates) {
     if (ignored.has(rel)) continue;
     if (isHardDeniedPath(rel)) continue;
-    const abs = (0, import_node_path21.join)(cwd, ...rel.split("/"));
+    const abs = (0, import_node_path22.join)(cwd, ...rel.split("/"));
     if (!(0, import_node_fs23.existsSync)(abs)) continue;
     let text;
     try {
@@ -21601,7 +21816,7 @@ function rebuildRepoIndex(cwd, repoSlug2) {
     entries
   };
   const store = repoIndexStorePath(cwd);
-  (0, import_node_fs23.mkdirSync)((0, import_node_path21.dirname)(store), { recursive: true });
+  (0, import_node_fs23.mkdirSync)((0, import_node_path22.dirname)(store), { recursive: true });
   (0, import_node_fs23.writeFileSync)(store, `${JSON.stringify(projection, null, 2)}
 `, "utf8");
   return projection;
@@ -21682,7 +21897,7 @@ function inferRepoSlug(cwd, exec = import_node_child_process12.execFileSync) {
     if (m?.[1]) return m[1].toLowerCase();
   } catch {
   }
-  return ((0, import_node_path21.basename)(cwd) || "local").toLowerCase();
+  return ((0, import_node_path22.basename)(cwd) || "local").toLowerCase();
 }
 
 // src/repo-index-cloud-client.ts
@@ -21824,7 +22039,7 @@ async function gcRepoIndexCloud(deps) {
 // src/repo-index-sync.ts
 var import_node_fs24 = require("node:fs");
 var import_node_os9 = require("node:os");
-var import_node_path22 = require("node:path");
+var import_node_path23 = require("node:path");
 var import_node_child_process13 = require("node:child_process");
 var MAX_EMBED_BACKFILL_ROUNDS = 40;
 function normalizeRepo(raw) {
@@ -21868,7 +22083,7 @@ async function syncEstateRepoIndex(opts) {
   const failed = [];
   const skipped = [];
   for (const repo of repos) {
-    const dir = (0, import_node_fs24.mkdtempSync)((0, import_node_path22.join)((0, import_node_os9.tmpdir)(), "mmi-repo-index-"));
+    const dir = (0, import_node_fs24.mkdtempSync)((0, import_node_path23.join)((0, import_node_os9.tmpdir)(), "mmi-repo-index-"));
     try {
       shallowClone(repo, dir, opts.githubToken);
       const built = rebuildRepoIndex(dir, repo);
@@ -22114,7 +22329,7 @@ async function runRepoIndexHealth(opts) {
 // src/spawn-policy-core.ts
 var import_node_child_process14 = require("node:child_process");
 var import_node_fs26 = require("node:fs");
-var import_node_path23 = require("node:path");
+var import_node_path24 = require("node:path");
 var SPAWNERS = ["spawn", "spawnSync", "exec", "execSync", "execFile", "execFileSync"];
 var CALL_SOURCE = String.raw`(^|[^.\w$])(${SPAWNERS.join("|")})\s*\(`;
 var SOURCE_EXT = /\.(ts|mts|cts|js|mjs|cjs)$/;
@@ -22200,7 +22415,7 @@ function runSpawnPolicy(root) {
   for (const file of files) {
     let raw;
     try {
-      raw = (0, import_node_fs26.readFileSync)((0, import_node_path23.join)(root, file), "utf8");
+      raw = (0, import_node_fs26.readFileSync)((0, import_node_path24.join)(root, file), "utf8");
     } catch {
       continue;
     }
@@ -22219,7 +22434,7 @@ function runSpawnPolicy(root) {
 // src/test-policy-core.ts
 var import_node_child_process15 = require("node:child_process");
 var import_node_fs27 = require("node:fs");
-var import_node_path24 = require("node:path");
+var import_node_path25 = require("node:path");
 var POLICY_FILE = "test-policy.json";
 var TEST_RE = /\.(?:test|spec)\.[cm]?[jt]sx?$/;
 var PY_TEST_RE = /(?:^|\/)test_[^/]*\.py$|_test\.py$/;
@@ -22272,7 +22487,7 @@ function isTestPath(path2) {
   return TEST_RE.test(path2) || PY_TEST_RE.test(path2);
 }
 function loadPolicy(root, readFile9 = readFileOrNull2) {
-  const raw = readFile9((0, import_node_path24.join)(root, POLICY_FILE));
+  const raw = readFile9((0, import_node_path25.join)(root, POLICY_FILE));
   if (raw == null) return { mandatory: [], declared: false };
   try {
     return { ...JSON.parse(raw), declared: true };
@@ -22310,11 +22525,11 @@ function classify(changed, policy, present = () => false) {
   return { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected };
 }
 function unresolvedProtectedEntries(policy, root, exists = (path2) => (0, import_node_fs27.existsSync)(path2)) {
-  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path24.join)(root, p)));
+  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path25.join)(root, p)));
 }
 function unresolvedSatisfiers(policy, root, exists = (path2) => (0, import_node_fs27.existsSync)(path2)) {
   const declared = (policy.mandatory ?? []).flatMap((m) => m.satisfiedBy ?? []);
-  return [...new Set(declared)].filter((p) => !exists((0, import_node_path24.join)(root, p)));
+  return [...new Set(declared)].filter((p) => !exists((0, import_node_path25.join)(root, p)));
 }
 function evaluate(changed, policy, present = () => false) {
   const { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected } = classify(changed, policy, present);
@@ -22502,7 +22717,7 @@ function runTestPolicy(root, deps = {}) {
   const refusal = deps.changed ? null : untrustworthyRange(root, base);
   const changed = deps.changed ?? (refusal ? [] : changedFilesSince(base, root));
   const lookup = deps.override !== void 0 ? { override: deps.override, refusals: [] } : !deps.changed && !refusal ? readOverride(base, root) : { override: null, refusals: [] };
-  const present = (path2) => exists((0, import_node_path24.join)(root, path2));
+  const present = (path2) => exists((0, import_node_path25.join)(root, path2));
   const removedByThisDiff = removedPaths(changed);
   const staleFindings = [];
   const unresolved = unresolvedProtectedEntries(policy, root, exists).filter((p) => !removedByThisDiff.has(p));
@@ -22541,7 +22756,7 @@ function runTestPolicy(root, deps = {}) {
 
 // src/project-info-sync.ts
 var import_node_fs28 = require("node:fs");
-var import_node_path25 = require("node:path");
+var import_node_path26 = require("node:path");
 var UPDATE_PROJECT_INFO = `mutation($projectId: ID!, $shortDescription: String!, $readme: String!) {
   updateProjectV2(input: { projectId: $projectId, shortDescription: $shortDescription, readme: $readme }) {
     projectV2 { id }
@@ -22586,7 +22801,7 @@ function sharedName(entries, fallback) {
 }
 function buildProjectInfoSyncPlan(targetRepo2, project2, projects, repoRoot2) {
   if (!project2.projectId) throw new Error(`org project sync-info: ${targetRepo2} registry META has no projectId`);
-  const readmePath = (0, import_node_path25.join)(repoRoot2, "README.md");
+  const readmePath = (0, import_node_path26.join)(repoRoot2, "README.md");
   if (!(0, import_node_fs28.existsSync)(readmePath)) throw new Error(`org project sync-info: ${targetRepo2} has no README.md`);
   const entries = entriesFor(project2, projects);
   const memberRepos = [...new Set(entries.flatMap((entry) => entry.repos ?? []))].filter((repo) => /^[^/]+\/[^/]+$/.test(repo)).sort((a, b) => a.localeCompare(b));
@@ -22612,8 +22827,8 @@ function buildProjectInfoSyncPlan(targetRepo2, project2, projects, repoRoot2) {
   const targetBase = `https://github.com/${targetRepo2}`;
   const targetBranch = branchFor(targetRepo2, projects);
   const orgDocs = [
-    (0, import_node_fs28.existsSync)((0, import_node_path25.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
-    (0, import_node_fs28.existsSync)((0, import_node_path25.join)(repoRoot2, "docs", "org-architecture.md")) ? `- [Org architecture](${targetBase}/blob/${targetBranch}/docs/org-architecture.md)` : ""
+    (0, import_node_fs28.existsSync)((0, import_node_path26.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
+    (0, import_node_fs28.existsSync)((0, import_node_path26.join)(repoRoot2, "docs", "org-architecture.md")) ? `- [Org architecture](${targetBase}/blob/${targetBranch}/docs/org-architecture.md)` : ""
   ].filter(Boolean);
   if (orgDocs.length) lines.push("", "## Organisation docs", "", ...orgDocs);
   return { projectId: project2.projectId, projectName, targetRepo: targetRepo2, memberRepos, shortDescription, readme: `${lines.join("\n")}
@@ -23491,7 +23706,7 @@ function writeError(res) {
 
 // src/secrets-commands.ts
 var import_node_fs29 = require("node:fs");
-var import_node_path26 = require("node:path");
+var import_node_path27 = require("node:path");
 var import_node_os10 = require("node:os");
 
 // src/project-runtime.ts
@@ -23615,11 +23830,11 @@ function collectMap(value, previous = []) {
   return [...previous, value];
 }
 async function decryptRailsCredentials(input) {
-  const appDir = (0, import_node_path26.resolve)(input.appDir ?? process.cwd());
+  const appDir = (0, import_node_path27.resolve)(input.appDir ?? process.cwd());
   const credentialsFile = input.credentialsFile ?? DEFAULT_RAILS_CREDENTIALS_FILE;
   const masterKeyFile = input.masterKeyFile ?? DEFAULT_RAILS_MASTER_KEY_FILE;
-  const credentialsPath = (0, import_node_path26.resolve)(appDir, credentialsFile);
-  const masterKeyPath = (0, import_node_path26.resolve)(appDir, masterKeyFile);
+  const credentialsPath = (0, import_node_path27.resolve)(appDir, credentialsFile);
+  const masterKeyPath = (0, import_node_path27.resolve)(appDir, masterKeyFile);
   const env = {
     ...process.env,
     MMI_RAILS_CREDENTIALS_FILE: credentialsPath,
@@ -23636,8 +23851,8 @@ async function decryptRailsCredentials(input) {
     'config = ActiveSupport::EncryptedConfiguration.new(config_path: config_path, key_path: key_path, env_key: "RAILS_MASTER_KEY", raise_if_missing_key: true)',
     "puts JSON.generate(config.config)"
   ].join("\n");
-  const scriptDir = (0, import_node_fs29.mkdtempSync)((0, import_node_path26.join)((0, import_node_os10.tmpdir)(), "mmi-rails-decrypt-"));
-  const scriptPath = (0, import_node_path26.join)(scriptDir, "decrypt.rb");
+  const scriptDir = (0, import_node_fs29.mkdtempSync)((0, import_node_path27.join)((0, import_node_os10.tmpdir)(), "mmi-rails-decrypt-"));
+  const scriptPath = (0, import_node_path27.join)(scriptDir, "decrypt.rb");
   (0, import_node_fs29.writeFileSync)(scriptPath, script, "utf8");
   try {
     const args = ["exec", "ruby", scriptPath];
@@ -23740,7 +23955,7 @@ function registerSecretsCommands(program3) {
     let body;
     if (o.file) {
       try {
-        body = (0, import_node_fs29.readFileSync)((0, import_node_path26.resolve)(o.file), "utf8");
+        body = (0, import_node_fs29.readFileSync)((0, import_node_path27.resolve)(o.file), "utf8");
       } catch (e) {
         return fail(`secrets org-catalog: cannot read --file ${o.file}: ${e.message}`);
       }
@@ -23845,7 +24060,7 @@ function registerSecretsCommands(program3) {
       {
         ...d,
         decryptRailsCredentials,
-        removeFile: (path2) => (0, import_node_fs29.unlinkSync)((0, import_node_path26.resolve)(o.appDir ?? process.cwd(), path2))
+        removeFile: (path2) => (0, import_node_fs29.unlinkSync)((0, import_node_path27.resolve)(o.appDir ?? process.cwd(), path2))
       },
       {
         repo: o.repo,
@@ -24226,7 +24441,7 @@ ${SSH_RECIPE_AGENT_NOTE}`);
 }
 
 // src/schedules-commands.ts
-var import_promises4 = require("node:fs/promises");
+var import_promises5 = require("node:fs/promises");
 var import_node_child_process16 = require("node:child_process");
 var import_node_util7 = require("node:util");
 
@@ -24891,9 +25106,9 @@ function registerSchedulesCommands(program3) {
           await failGraceful("org schedules --doc: refusing to regenerate the doc from an incomplete read (see warnings above).");
           return;
         }
-        const docText = await (0, import_promises4.readFile)(o.doc, "utf8");
+        const docText = await (0, import_promises5.readFile)(o.doc, "utf8");
         const spliced = spliceDoc(docText, renderDocSection(entries, (/* @__PURE__ */ new Date()).toISOString()));
-        await (0, import_promises4.writeFile)(o.doc, spliced, "utf8");
+        await (0, import_promises5.writeFile)(o.doc, spliced, "utf8");
         reportDrift(drift);
         console.log(`org schedules: wrote ${entries.length} entries into ${o.doc}`);
         return;
@@ -24976,102 +25191,6 @@ function registerSchedulesCommands(program3) {
   });
 }
 
-// src/file-lock.ts
-var import_promises5 = require("node:fs/promises");
-var import_node_path27 = require("node:path");
-var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
-var IMMEDIATE_RETRY_BUDGET = 3;
-var FileLockBusyError = class extends Error {
-  lockPath;
-  constructor(label, lockPath, maxWaitMs) {
-    super(`${label} busy: ${lockPath} held longer than ${maxWaitMs}ms`);
-    this.name = "FileLockBusyError";
-    this.lockPath = lockPath;
-  }
-};
-function resolveFileLockOpts(opts = {}) {
-  return {
-    staleMs: opts.staleMs ?? 3e4,
-    retryMs: opts.retryMs ?? 50,
-    maxWaitMs: opts.maxWaitMs ?? 5e3,
-    label: opts.label ?? "file lock"
-  };
-}
-async function acquireFileLock(lockPath, opts, deadline) {
-  let immediateRetries = 0;
-  for (; ; ) {
-    let handle;
-    try {
-      handle = await (0, import_promises5.open)(lockPath, "wx");
-    } catch (e) {
-      const code = e.code;
-      if (code !== "EEXIST" && code !== "EPERM" && code !== "EBUSY" && code !== "EACCES") throw e;
-      const retryNow = async () => {
-        if (Date.now() >= deadline) throw new FileLockBusyError(opts.label, lockPath, opts.maxWaitMs);
-        if (++immediateRetries > IMMEDIATE_RETRY_BUDGET) await sleep(opts.retryMs);
-      };
-      try {
-        const age = Date.now() - (await (0, import_promises5.stat)(lockPath)).mtimeMs;
-        if (age > opts.staleMs) {
-          try {
-            await (0, import_promises5.unlink)(lockPath);
-            await retryNow();
-            continue;
-          } catch (unlinkError) {
-            if (unlinkError instanceof FileLockBusyError) throw unlinkError;
-            const unlinkCode = unlinkError.code;
-            if (unlinkCode === "ENOENT") {
-              await retryNow();
-              continue;
-            }
-          }
-        }
-      } catch (statError) {
-        if (statError instanceof FileLockBusyError) throw statError;
-        if (statError.code !== "ENOENT") throw statError;
-        await retryNow();
-        continue;
-      }
-      if (Date.now() >= deadline) {
-        throw new FileLockBusyError(opts.label, lockPath, opts.maxWaitMs);
-      }
-      await sleep(opts.retryMs);
-      continue;
-    }
-    const token = `${process.pid}-${Date.now()}-${Math.random().toString(36).slice(2)}`;
-    try {
-      await handle.writeFile(token);
-    } catch (e) {
-      await handle.close().catch(() => void 0);
-      throw e;
-    }
-    return { token, handle };
-  }
-}
-async function fileLockHeldBy(lockPath, token) {
-  try {
-    return await (0, import_promises5.readFile)(lockPath, "utf8") === token;
-  } catch {
-    return false;
-  }
-}
-async function releaseFileLock(lockPath, guard) {
-  await guard.handle.close().catch(() => void 0);
-  if (await fileLockHeldBy(lockPath, guard.token)) {
-    await (0, import_promises5.unlink)(lockPath).catch(() => void 0);
-  }
-}
-async function withFileLock(lockPath, opts, fn) {
-  const resolved = resolveFileLockOpts(opts);
-  await (0, import_promises5.mkdir)((0, import_node_path27.dirname)(lockPath), { recursive: true }).catch(() => void 0);
-  const guard = await acquireFileLock(lockPath, resolved, Date.now() + resolved.maxWaitMs);
-  try {
-    return await fn();
-  } finally {
-    await releaseFileLock(lockPath, guard);
-  }
-}
-
 // src/schedules-lift-command.ts
 var import_promises6 = require("node:fs/promises");
 var import_node_path28 = require("node:path");
@@ -31099,8 +31218,8 @@ var LOOP_PLAYBOOKS = {
       { label: "Read the next board item", command: "mmi-cli board read" },
       { label: "Claim it and create an isolated worktree", command: "mmi-cli worktree create <issue-number> --claim --from origin/development" },
       { label: "Build and test in the touched package", command: "npm test && npm run build" },
-      { label: "Publish the branch", command: "git push -u origin HEAD" },
-      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file PR_BODY.md --base development' },
+      { label: "Publish the branch", command: "git push origin <branch>:<branch>" },
+      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file .jerv/PR_BODY.md --base development' },
       { label: "Wait for checks and land to development", command: "mmi-cli pr checks-wait <PR-number> && mmi-cli pr land <PR-number>" },
       { label: "Release only after the gated train is authorized", command: "mmi-cli release --apply" }
     ]
@@ -31117,8 +31236,8 @@ var LOOP_PLAYBOOKS = {
   "ship-pr": {
     title: "Ship PR",
     steps: [
-      { label: "Publish the branch", command: "git push -u origin HEAD" },
-      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file PR_BODY.md --base development' },
+      { label: "Publish the branch", command: "git push origin <branch>:<branch>" },
+      { label: "Open the development-base PR", command: 'mmi-cli pr create --title "<title>" --body-file .jerv/PR_BODY.md --base development' },
       { label: "Wait for CI checks", command: "mmi-cli pr checks-wait <PR-number>" },
       { label: "Land the PR (merge to development)", command: "mmi-cli pr land <PR-number>" }
     ]
@@ -31126,9 +31245,9 @@ var LOOP_PLAYBOOKS = {
   "hotfix": {
     title: "Hotfix",
     steps: [
-      { label: "Create the main-base hotfix PR from an already-merged fix", command: "mmi-cli hotfix start --from <pr#|sha>" },
+      { label: "Create the main-base hotfix PR from every already-merged fix this cycle carries", command: "mmi-cli hotfix start --from <pr#|sha>[,<pr#|sha>...]" },
       { label: "Wait for the hotfix PR checks", command: "mmi-cli pr checks-wait <PR-number>" },
-      { label: "After the PR is merged, run the gated release", command: "mmi-cli hotfix release <vX.Y.Z> --carries <pr#|sha>" }
+      { label: "After the PR is merged, run the gated release", command: "mmi-cli hotfix release <vX.Y.Z> --carries <pr#|sha>[,<pr#|sha>...]" }
     ]
   }
 };
@@ -35257,7 +35376,7 @@ withExamples(mutating(
     }
     if (!resumed) {
       step = `git worktree add ${wtPath}`;
-      await addWorktreeRobust(wtPath, branch, base, {
+      await withWorktreeAddLock(repoRoot2, () => addWorktreeRobust(wtPath, branch, base, {
         git: async (args) => (await execFileP2("git", args, { timeout: GH_MUTATION_TIMEOUT_MS })).stdout,
         revParse: async (ref) => {
           try {
@@ -35271,7 +35390,7 @@ withExamples(mutating(
         log: (m) => {
           if (!o.json) console.error(`  ${m}`);
         }
-      });
+      }));
     }
     step = "install deps + copy local-only config";
     const report = await provisionWorktree(wtPath, makeProvisionDeps(wtPath, Boolean(o.json), (m) => {
@@ -36747,10 +36866,11 @@ withExamples(pr.command("create").description("create a PR and print {number,url
   console.log(JSON.stringify(created));
 }), [
   'mmi-cli pr create --title "Add the schema" --body "Closes #2680"',
-  'mmi-cli pr create --title "Add the schema" --body-file PR_BODY.md --draft'
+  'mmi-cli pr create --title "Add the schema" --body-file .jerv/PR_BODY.md --draft'
 ], [
   "--head and --base default to the current branch and the repo default; only pass them to override.",
-  "Use --body-file for multiline PR bodies instead of shell-escaped inline markdown."
+  "Use --body-file for multiline PR bodies instead of shell-escaped inline markdown.",
+  "Write that file under .jerv/ inside a worktree (#4405): any other untracked path makes `worktree land` refuse cleanup as untracked-files."
 ]);
 pr.command("view <number>").description("read a PR as structured JSON (merged state, head/base, URL, merge commit) ? the mmi-cli read path (#2347). --comments folds in every comment; --context also adds linkedIssues (the issues it closes/references, #2894)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--json [fields...]", 'gh --json field list (overrides the default field set). Accepts commas, spaces, or repeated --json flags ? in PowerShell an unquoted comma list is an array literal, so QUOTE it: --json "state,baseRefName,mergeCommit"').option("--comments", "include every comment (body + comments in one call) ? read the whole PR before landing it (#2894)").option("--context", "full working context in one call: implies --comments and also adds linkedIssues (the issues the PR closes/references) (#2894)").action(async (number, o) => {
   const n = Number(number);
@@ -37515,7 +37635,8 @@ function renderHotfixRelease(r) {
     ...r.runs.map((run) => `  - ${run.workflow}: ${run.conclusion}${run.url ? ` (${run.url})` : ""}`),
     `  - ${r.verifyNote}`,
     ...r.announceNote ? [`  - announce: ${r.announceNote}`] : [],
-    `  - next: mmi-cli hotfix status ${r.tag} (no back-merge ? development already has the fix; the next /release back-merge aligns the version manifests)`
+    `  - fold: ${r.foldNote}`,
+    `  - next: mmi-cli hotfix status ${r.tag} (no back-merge of the FIX ? development already has it; the version fold above is ported for you, #4410)`
   ].join("\n");
 }
 function renderHotfixStatus(r) {
@@ -37547,7 +37668,7 @@ var hotfixCmd = program2.command("hotfix").description("stepwise hotfix orchestr
   const steps = trainPlan("hotfix");
   console.log(o.json ? JSON.stringify({ command: "hotfix", steps }, null, 2) : renderSteps("mmi-cli hotfix: dry-run plan", steps));
 });
-hotfixCmd.command("start").description("cherry-pick a merged development PR (or SHA) onto hotfix/vX.Y.Z from origin/main, bump the distribution, open the main-base PR").requiredOption("--from <pr#|sha>", "merged development PR number or commit SHA to cherry-pick").option("--json", "machine-readable output").action(async (o) => runHotfixSub("start", () => runHotfixStart(trainApplyDeps(), { from: o.from }), o.json, renderHotfixStart));
+hotfixCmd.command("start").description("cherry-pick one or more merged development PRs (or SHAs) onto hotfix/vX.Y.Z from origin/main, bump the distribution, open the main-base PR").requiredOption("--from <pr#|sha[,pr#|sha...]>", "merged development PR number(s) or commit SHA(s) to cherry-pick, in pick order \u2014 one hotfix cycle carries as many fixes as you name (#4411)").option("--json", "machine-readable output").action(async (o) => runHotfixSub("start", () => runHotfixStart(trainApplyDeps(), { from: o.from }), o.json, renderHotfixStart));
 hotfixCmd.command("release <version>").description("after the hotfix PR is merged + checks green: tag, GitHub Release, watch deploy/publish, verify distribution (idempotent)").option("--json", "machine-readable output").option("--announce-summary-file <path>", "agent-curated summary lines for the Hub Slack announcement (#883)").option("--carries <pr#|sha[,pr#|sha...]>", "declared fix target(s) this hotfix must carry; each must be proven present before tagging (#3056)").action(async (version, o) => runHotfixSub("release", () => runHotfixRelease(trainApplyDeps(), version, { announceSummaryFile: o.announceSummaryFile, carries: o.carries ? [o.carries] : [] }), o.json, renderHotfixRelease));
 hotfixCmd.command("status [version]").description("derive the full hotfix pipeline state from live git/gh reads and name the exact next subcommand").option("--json", "machine-readable output").action(async (version, o) => runHotfixSub("status", () => runHotfixStatus(trainApplyDeps(), version), o.json, renderHotfixStatus));
 var ci = program2.command("ci").description("org CI + merge-readiness audit and reconcile");