@mutmutco/cli 3.82.0 → 3.84.0

package/dist/main.cjs

@@ -3416,7 +3416,7 @@ var program = new Command();
 
 // src/index.ts
 var import_promises10 = require("node:fs/promises");
-var import_node_fs35 = require("node:fs");
+var import_node_fs36 = require("node:fs");
 var import_node_child_process16 = require("node:child_process");
 
 // src/cli-shared.ts
@@ -6431,7 +6431,14 @@ async function provisionWorktree(worktreeRoot, deps) {
   });
   const allDirs = scanInstallDirs(worktreeRoot, fs2);
   const targets = npmInstallTargets(allDirs);
-  const skippedInstall = allDirs.filter((d) => d.hasPackageJson && d.hasNodeModules).map((d) => d.dir);
+  if (deps.validateInstall) {
+    for (const dir of allDirs.filter((d) => d.hasPackageJson && d.hasLockfile && d.hasNodeModules)) {
+      const cwd = dir.dir ? (0, import_node_path10.join)(worktreeRoot, dir.dir) : worktreeRoot;
+      if (!await deps.validateInstall(cwd)) targets.push({ dir: dir.dir, command: "npm ci" });
+    }
+  }
+  const targetDirs = new Set(targets.map((target) => target.dir));
+  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_path10.join)(worktreeRoot, target.dir) : worktreeRoot;
@@ -6595,7 +6602,7 @@ function commandLadderHint() {
 }
 
 // src/index.ts
-var import_node_path34 = require("node:path");
+var import_node_path35 = require("node:path");
 
 // src/merge-ci-policy.ts
 function resolveMergeCiPolicy(input) {
@@ -8027,7 +8034,7 @@ async function foldReleaseVersion(deps, model, tag, foldPaths) {
   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]);
+    await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", "HEAD"]);
   } else {
     await installAppFoldDeps(deps);
     await deps.run("npm", ["version", version, "--no-git-tag-version", "--allow-same-version"]);
@@ -8617,16 +8624,33 @@ function partialTrainRecoveryError(cause, input) {
   const resumeCommand = input.stage === "rc" ? "mmi-cli rcand --resume" : "mmi-cli release --resume";
   const tenant2 = input.deployModel === "tenant-container";
   const deployLine = tenant2 ? `  - deploy: dispatched by the train after the branch push; recover with \`mmi-cli runtime tenant redeploy ${input.repo} ${input.stage} --watch\` once the branch and release exist.` : `  - deploy: this repo is \`${input.deployModel ?? "not tenant-container"}\` \u2014 it has NO tenant runtime. Its own release/main-push workflows publish and deploy once the branch and Release exist. Do NOT run the tenant redeployer.`;
-  return new Error(
-    `${causeMessage}
-
-partial train state for ${input.tag}:
+  const stateBlock = `partial train state for ${input.tag}:
   - tag ${input.tag}: PUSHED to origin
   - origin/${branch}: NOT pushed
   - ${releaseState}
-` + deployLine + `
+` + deployLine;
+  const failedHubMainGate = input.stage === "main" && input.repo.toLowerCase() === HUB_REPO.toLowerCase() && /^required train check failed:/i.test(causeMessage);
+  if (failedHubMainGate) {
+    return new Error(
+      `${causeMessage}
+
+` + stateBlock + `
+
+The tag is public and immutable, but it FAILED a required gate. Do not resume it unchanged: \`${resumeCommand}\` cannot alter tagged code or make the failed check pass.
 
-The tag is public and correct \u2014 do not delete or force-move it.
+Diagnose the failed check, then choose the proven recovery:
+  - transient workflow failure: rerun the failed tag workflow; only after it passes, use \`${resumeCommand}\`.
+  - tagged-code defect: obtain fresh destructive approval to remove ${input.tag}, run \`mmi-cli release --abort --apply\`, repair development, and cut the release again through the guarded train.
+
+Do not push main or create the GitHub Release by hand.`
+    );
+  }
+  return new Error(
+    `${causeMessage}
+
+` + stateBlock + `
+
+The tag is public and immutable \u2014 do not delete or force-move it.
 
 Resume it:  ${resumeCommand}
 
@@ -11683,10 +11707,13 @@ async function executeWaveLand(plan, deps, opts = { preserveWorktree: true }) {
 }
 
 // src/index.ts
-var import_node_os13 = require("node:os");
+var import_node_os14 = require("node:os");
 
 // src/board.ts
 var import_node_child_process8 = require("node:child_process");
+var import_node_fs20 = require("node:fs");
+var import_node_os7 = require("node:os");
+var import_node_path18 = require("node:path");
 var import_node_util6 = require("node:util");
 
 // src/board-priority.ts
@@ -14841,6 +14868,25 @@ function applyOrgMarketplacePins(path2, names) {
     "pin"
   );
 }
+function writeMarketplacePinPending(path2, names, now = Date.now()) {
+  try {
+    (0, import_node_fs18.mkdirSync)((0, import_node_path16.dirname)(path2), { recursive: true });
+    (0, import_node_fs18.writeFileSync)(path2, `${JSON.stringify({ v: 1, names: [...names], at: new Date(now).toISOString() })}
+`, "utf8");
+  } catch {
+  }
+}
+function readMarketplacePinPending(path2, name, now = Date.now()) {
+  try {
+    const parsed = JSON.parse((0, import_node_fs18.readFileSync)(path2, "utf8"));
+    const at = typeof parsed.at === "string" ? Date.parse(parsed.at) : Number.NaN;
+    if (parsed.v !== 1 || !Array.isArray(parsed.names) || !parsed.names.includes(name) || !Number.isFinite(at)) return void 0;
+    if (now - at < 0 || now - at > 12 * 60 * 6e4) return void 0;
+    return { v: 1, names: parsed.names.filter((n) => typeof n === "string"), at: parsed.at };
+  } catch {
+    return void 0;
+  }
+}
 function restoredPinsLine(pins) {
   const named = [...pins].map(([name, want]) => {
     const fields = [
@@ -16129,6 +16175,38 @@ async function postClaimMarkerComment(client, item) {
 `);
   }
 }
+var CLAIM_SESSION_ACTIVITY_MS = 30 * 6e4;
+var CLAIM_SESSION_PROBE_CACHE_MS = 6e4;
+var claimSessionProbeCache = /* @__PURE__ */ new Map();
+function probeLocalClaimSession(marker, now = Date.now()) {
+  if (!marker.session || !marker.host || marker.host.toLowerCase() !== (0, import_node_os7.hostname)().toLowerCase()) return void 0;
+  if (!marker.surface?.toLowerCase().startsWith("claude")) return void 0;
+  const cacheKey = `${marker.host.toLowerCase()}/${marker.session}`;
+  const cached = claimSessionProbeCache.get(cacheKey);
+  if (cached && now - cached.checkedAt <= CLAIM_SESSION_PROBE_CACHE_MS) return cached.state;
+  const remember = (state) => {
+    claimSessionProbeCache.set(cacheKey, { checkedAt: now, state });
+    return state;
+  };
+  const root = (0, import_node_path18.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_fs20.readdirSync)(dir, { withFileTypes: true })) {
+        const path2 = (0, import_node_path18.join)(dir, entry.name);
+        if (entry.isDirectory()) pending.push(path2);
+        else if (entry.isFile() && entry.name.toLowerCase() === wanted) {
+          return remember(now - (0, import_node_fs20.statSync)(path2).mtimeMs <= CLAIM_SESSION_ACTIVITY_MS ? "live" : "dead");
+        }
+      }
+    }
+    return remember("dead");
+  } catch {
+    return remember("unverifiable");
+  }
+}
 function openPullsFetcher(client) {
   const byRepo = /* @__PURE__ */ new Map();
   return (repo) => {
@@ -16146,6 +16224,11 @@ async function gatherClaimLiveness(client, repo, number, fetchOpenPulls) {
     const comments = await client.restPaginate(`repos/${repo}/issues/${number}/comments`);
     out.marker = latestClaimMarker(comments.map((comment) => ({ body: comment.body ?? "" })));
     out.markerAgeMs = out.marker ? Date.now() - Date.parse(out.marker.ts) : void 0;
+    if (out.marker) {
+      const state = probeLocalClaimSession(out.marker);
+      if (state === "live" || state === "dead") out.sessionState = state;
+      else if (state === "unverifiable") out.failed.push("session");
+    }
   } catch {
     out.failed.push("comments");
   }
@@ -16177,8 +16260,10 @@ async function gatherClaimLiveness(client, repo, number, fetchOpenPulls) {
 }
 function liveEvidenceLines(evidence, repo) {
   const live = [];
-  if (evidence.marker && evidence.markerAgeMs !== void 0 && evidence.markerAgeMs < CLAIM_MARKER_LIVE_MS) {
-    live.push(`claim marker from ${describeClaimMarker(evidence.marker)} is only ${formatClaimAge(evidence.markerAgeMs)} old`);
+  if (evidence.marker && evidence.sessionState === "live") {
+    live.push(`claim session ${describeClaimMarker(evidence.marker)} has recent local transcript activity`);
+  } else if (evidence.marker && evidence.sessionState !== "dead" && evidence.markerAgeMs !== void 0 && evidence.markerAgeMs < CLAIM_MARKER_LIVE_MS) {
+    live.push(`claim marker from ${describeClaimMarker(evidence.marker)} is only ${formatClaimAge(evidence.markerAgeMs)} old (session not locally probeable)`);
   }
   if (evidence.openPr) live.push(evidence.openPr);
   if (evidence.branch) live.push(`live branch ${evidence.branch} on ${repo}`);
@@ -16274,9 +16359,9 @@ async function boardDoctor(options, deps = {}) {
       while (next < claimedItems.length) {
         const item = claimedItems[next++];
         const evidence = await gatherClaimLiveness(client, item.repository, item.number, fetchOpenPulls);
-        const freshMarker = evidence.markerAgeMs !== void 0 && evidence.markerAgeMs < CLAIM_MARKER_LIVE_MS;
+        const freshMarker = evidence.sessionState === "live" || evidence.sessionState !== "dead" && evidence.markerAgeMs !== void 0 && evidence.markerAgeMs < CLAIM_MARKER_LIVE_MS;
         const bits = [
-          evidence.marker ? `claim marker ${describeClaimMarker(evidence.marker)} ${formatClaimAge(evidence.markerAgeMs)} old` : evidence.failed.includes("comments") ? "claim marker unreadable" : "no claim marker",
+          evidence.marker ? `claim marker ${describeClaimMarker(evidence.marker)} ${formatClaimAge(evidence.markerAgeMs)} old` + (evidence.sessionState ? `; local session ${evidence.sessionState}` : "") : evidence.failed.includes("comments") ? "claim marker unreadable" : "no claim marker",
           evidence.openPr,
           evidence.branch ? `branch ${evidence.branch}` : void 0
         ].filter((bit) => Boolean(bit)).join("; ");
@@ -16380,7 +16465,7 @@ async function resolveAutoAddBoardAttach(client, cfg, selector, priority, warn =
 }
 
 // src/issue-body.ts
-var import_node_os7 = require("node:os");
+var import_node_os8 = require("node:os");
 var TextArgError = class extends Error {
   constructor(message, code, offendingFlag) {
     super(message);
@@ -16392,7 +16477,7 @@ var TextArgError = class extends Error {
   offendingFlag;
 };
 function emptyStdinMessage(fileFlag) {
-  if ((0, import_node_os7.platform)() === "win32") {
+  if ((0, import_node_os8.platform)() === "win32") {
     return `${fileFlag} - read empty stdin (on Windows, ${fileFlag} - is unreliable through the npm .cmd shim \u2014 use ${fileFlag} <path>, or pipe to \`node cli/dist/index.cjs\` directly)`;
   }
   return `${fileFlag} - read empty stdin (nothing piped \u2014 pass a heredoc/pipe, or ${fileFlag} <path>)`;
@@ -17717,7 +17802,7 @@ async function runHotfixStart(deps, options) {
     }
     notes.push(`cherry-picked ${label} onto ${branch} (from origin/main, -x trailer recorded)`);
     if (deployModel === "hub-serverless") {
-      await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version]);
+      await deps.run("node", ["scripts/release-distribution.mjs", "prepare", version, "--source-commit", "HEAD"]);
       const changedFiles = (await deps.run("node", ["scripts/release-distribution.mjs", "changed-files"])).split("\n").map((s) => s.trim()).filter(Boolean);
       await deps.run("git", ["add", "-f", "--", ...changedFiles]);
       const staged = await deps.run("git", ["diff", "--cached", "--name-only"]);
@@ -18575,8 +18660,8 @@ function renderAccessReport(report) {
 
 // src/doc-refs-core.ts
 var import_node_child_process10 = require("node:child_process");
-var import_node_fs20 = require("node:fs");
-var import_node_path18 = require("node:path");
+var import_node_fs21 = require("node:fs");
+var import_node_path19 = 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*-->/;
@@ -18632,7 +18717,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_path18.join)(root, pin.file));
+      const source = readFile9((0, import_node_path19.join)(root, pin.file));
       if (source == null) {
         findings.push({ kind: "missing-test", doc, line: pin.line, detail: pin.file });
         continue;
@@ -18692,7 +18777,7 @@ function checkRefs(root, deps, docs2) {
   const candidates = [];
   const direct = [];
   for (const [doc, markdown] of Object.entries(docs2)) {
-    const docDir = import_node_path18.posix.dirname(doc);
+    const docDir = import_node_path19.posix.dirname(doc);
     const base = docDir === "." ? "" : docDir;
     const covered = /* @__PURE__ */ new Set();
     const markers = [];
@@ -18701,21 +18786,21 @@ function checkRefs(root, deps, docs2) {
         direct.push({ kind: "malformed-forward-ref", doc, line: fwd.line, detail: fwd.text });
         continue;
       }
-      const docRel = import_node_path18.posix.normalize(import_node_path18.posix.join(base, fwd.target));
-      const rootRel = import_node_path18.posix.normalize(fwd.target.replace(/^\/+/, ""));
+      const docRel = import_node_path19.posix.normalize(import_node_path19.posix.join(base, fwd.target));
+      const rootRel = import_node_path19.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_path18.posix.normalize(import_node_path18.posix.join(base, target));
-      return { target, line, resolved, missing: !exists((0, import_node_path18.join)(root, resolved)) };
+      const resolved = import_node_path19.posix.normalize(import_node_path19.posix.join(base, target));
+      return { target, line, resolved, missing: !exists((0, import_node_path19.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_path18.join)(root, marker.docRel)) || exists((0, import_node_path18.join)(root, marker.rootRel)))) {
+      if (!coversMissing && (exists((0, import_node_path19.join)(root, marker.docRel)) || exists((0, import_node_path19.join)(root, marker.rootRel)))) {
         direct.push({
           kind: "stale-forward-ref",
           doc,
@@ -18726,8 +18811,8 @@ function checkRefs(root, deps, docs2) {
     }
     for (const { ref, line } of extractRefs(markdown)) {
       const first = ref.split("/")[0];
-      if (!exists((0, import_node_path18.join)(root, first))) continue;
-      if (!exists((0, import_node_path18.join)(root, ref))) candidates.push({ kind: "missing-path", doc, line, detail: ref });
+      if (!exists((0, import_node_path19.join)(root, first))) continue;
+      if (!exists((0, import_node_path19.join)(root, ref))) candidates.push({ kind: "missing-path", doc, line, detail: ref });
     }
     for (const { target, line, resolved, missing } of links) {
       if (resolved.startsWith("..")) {
@@ -18775,22 +18860,22 @@ function checkCommands(docs2, commandPaths) {
   return { ok: findings.length === 0, findings, warnings: [] };
 }
 function readFileOrNull(path2) {
-  return (0, import_node_fs20.existsSync)(path2) ? (0, import_node_fs20.readFileSync)(path2, "utf8") : null;
+  return (0, import_node_fs21.existsSync)(path2) ? (0, import_node_fs21.readFileSync)(path2, "utf8") : null;
 }
 function walk(dir, root, out) {
-  for (const entry of (0, import_node_fs20.readdirSync)(dir)) {
-    const full = (0, import_node_path18.join)(dir, entry);
-    if ((0, import_node_fs20.statSync)(full).isDirectory()) walk(full, root, out);
+  for (const entry of (0, import_node_fs21.readdirSync)(dir)) {
+    const full = (0, import_node_path19.join)(dir, entry);
+    if ((0, import_node_fs21.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_path18.join)(root, "docs");
-  const docs2 = ((0, import_node_fs20.existsSync)(docsDir) ? walk(docsDir, root, []) : []).filter(
+  const docsDir = (0, import_node_path19.join)(root, "docs");
+  const docs2 = ((0, import_node_fs21.existsSync)(docsDir) ? walk(docsDir, root, []) : []).filter(
     (rel) => !SKIP_WALK.some((skip) => rel.startsWith(skip))
   );
-  return [...ROOT_DOCS.filter((rel) => (0, import_node_fs20.existsSync)((0, import_node_path18.join)(root, rel))), ...docs2];
+  return [...ROOT_DOCS.filter((rel) => (0, import_node_fs21.existsSync)((0, import_node_path19.join)(root, rel))), ...docs2];
 }
 function defaultIsIgnored(root, relPaths, exec = import_node_child_process10.execFileSync) {
   const inRepo = relPaths.filter((p) => !p.startsWith(".."));
@@ -18810,14 +18895,14 @@ function defaultIsIgnored(root, relPaths, exec = import_node_child_process10.exe
 }
 function runDocRefs(root, deps = {}) {
   const readFile9 = deps.readFile ?? readFileOrNull;
-  const exists = deps.exists ?? import_node_fs20.existsSync;
+  const exists = deps.exists ?? import_node_fs21.existsSync;
   const listDocs = deps.listDocs ?? defaultListDocs;
   const isIgnored = deps.isIgnored ?? ((paths) => defaultIsIgnored(root, paths));
   const commandPaths = deps.commandPaths ?? null;
   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_path18.join)(root, rel))]).filter(([, body]) => body != null)
+    walked.filter((rel) => !ignoredDocs.has(rel)).map((rel) => [rel, readFile9((0, import_node_path19.join)(root, rel))]).filter(([, body]) => body != null)
   );
   const refResult = checkRefs(root, { exists, isIgnored }, docs2);
   const findings = [
@@ -18844,8 +18929,8 @@ function runDocRefs(root, deps = {}) {
 
 // src/spawn-policy-core.ts
 var import_node_child_process11 = require("node:child_process");
-var import_node_fs21 = require("node:fs");
-var import_node_path19 = require("node:path");
+var import_node_fs22 = require("node:fs");
+var import_node_path20 = 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)$/;
@@ -18931,7 +19016,7 @@ function runSpawnPolicy(root) {
   for (const file of files) {
     let raw;
     try {
-      raw = (0, import_node_fs21.readFileSync)((0, import_node_path19.join)(root, file), "utf8");
+      raw = (0, import_node_fs22.readFileSync)((0, import_node_path20.join)(root, file), "utf8");
     } catch {
       continue;
     }
@@ -18949,8 +19034,8 @@ function runSpawnPolicy(root) {
 
 // src/test-policy-core.ts
 var import_node_child_process12 = require("node:child_process");
-var import_node_fs22 = require("node:fs");
-var import_node_path20 = require("node:path");
+var import_node_fs23 = require("node:fs");
+var import_node_path21 = 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$/;
@@ -19003,7 +19088,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_path20.join)(root, POLICY_FILE));
+  const raw = readFile9((0, import_node_path21.join)(root, POLICY_FILE));
   if (raw == null) return { mandatory: [], declared: false };
   try {
     return { ...JSON.parse(raw), declared: true };
@@ -19013,7 +19098,7 @@ function loadPolicy(root, readFile9 = readFileOrNull2) {
 }
 function readFileOrNull2(path2) {
   try {
-    return (0, import_node_fs22.readFileSync)(path2, "utf8");
+    return (0, import_node_fs23.readFileSync)(path2, "utf8");
   } catch {
     return null;
   }
@@ -19040,12 +19125,12 @@ function classify(changed, policy, present = () => false) {
   const removedProtected = [...removed].filter((p) => protectedBy.has(p)).map((p) => ({ path: p, why: protectedBy.get(p) ?? "" }));
   return { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected };
 }
-function unresolvedProtectedEntries(policy, root, exists = (path2) => (0, import_node_fs22.existsSync)(path2)) {
-  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path20.join)(root, p)));
+function unresolvedProtectedEntries(policy, root, exists = (path2) => (0, import_node_fs23.existsSync)(path2)) {
+  return (policy.protected ?? []).map((p) => p.path).filter((p) => !exists((0, import_node_path21.join)(root, p)));
 }
-function unresolvedSatisfiers(policy, root, exists = (path2) => (0, import_node_fs22.existsSync)(path2)) {
+function unresolvedSatisfiers(policy, root, exists = (path2) => (0, import_node_fs23.existsSync)(path2)) {
   const declared = (policy.mandatory ?? []).flatMap((m) => m.satisfiedBy ?? []);
-  return [...new Set(declared)].filter((p) => !exists((0, import_node_path20.join)(root, p)));
+  return [...new Set(declared)].filter((p) => !exists((0, import_node_path21.join)(root, p)));
 }
 function evaluate(changed, policy, present = () => false) {
   const { mandatoryHits, untestedHits, testChanges, addedTests, removedProtected } = classify(changed, policy, present);
@@ -19227,13 +19312,13 @@ function changedFilesSince(base, cwd) {
 }
 function runTestPolicy(root, deps = {}) {
   const policy = deps.policy ?? loadPolicy(root);
-  const exists = deps.exists ?? ((path2) => (0, import_node_fs22.existsSync)(path2));
+  const exists = deps.exists ?? ((path2) => (0, import_node_fs23.existsSync)(path2));
   const counts = { mandatoryCount: (policy.mandatory ?? []).length, protectedCount: (policy.protected ?? []).length };
   const base = deps.changed ? "(injected)" : resolveBase(root, deps.base);
   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_path20.join)(root, path2));
+  const present = (path2) => exists((0, import_node_path21.join)(root, path2));
   const removedByThisDiff = removedPaths(changed);
   const staleFindings = [];
   const unresolved = unresolvedProtectedEntries(policy, root, exists).filter((p) => !removedByThisDiff.has(p));
@@ -19389,8 +19474,8 @@ function docsAuditStatus(fetch2, opts) {
 }
 
 // src/project-info-sync.ts
-var import_node_fs23 = require("node:fs");
-var import_node_path21 = require("node:path");
+var import_node_fs24 = require("node:fs");
+var import_node_path22 = require("node:path");
 var UPDATE_PROJECT_INFO = `mutation($projectId: ID!, $shortDescription: String!, $readme: String!) {
   updateProjectV2(input: { projectId: $projectId, shortDescription: $shortDescription, readme: $readme }) {
     projectV2 { id }
@@ -19435,14 +19520,14 @@ 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_path21.join)(repoRoot2, "README.md");
-  if (!(0, import_node_fs23.existsSync)(readmePath)) throw new Error(`org project sync-info: ${targetRepo2} has no README.md`);
+  const readmePath = (0, import_node_path22.join)(repoRoot2, "README.md");
+  if (!(0, import_node_fs24.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));
   const projectName = sharedName(entries, project2.name?.trim() || targetRepo2.split("/").pop() || targetRepo2);
   if (!memberRepos.length) throw new Error(`org project sync-info: project ${projectName} has no registered member repos`);
   const entryNames = entries.map((entry) => entry.name?.trim()).filter((name) => Boolean(name));
-  const shortDescription = memberRepos.length === 1 ? shortDescriptionFromReadme((0, import_node_fs23.readFileSync)(readmePath, "utf8")) : `Shared work across ${new Intl.ListFormat("en", { type: "conjunction" }).format(entryNames)}.`;
+  const shortDescription = memberRepos.length === 1 ? shortDescriptionFromReadme((0, import_node_fs24.readFileSync)(readmePath, "utf8")) : `Shared work across ${new Intl.ListFormat("en", { type: "conjunction" }).format(entryNames)}.`;
   const lines = [
     `# ${projectName}`,
     "",
@@ -19461,8 +19546,8 @@ function buildProjectInfoSyncPlan(targetRepo2, project2, projects, repoRoot2) {
   const targetBase = `https://github.com/${targetRepo2}`;
   const targetBranch = branchFor(targetRepo2, projects);
   const orgDocs = [
-    (0, import_node_fs23.existsSync)((0, import_node_path21.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
-    (0, import_node_fs23.existsSync)((0, import_node_path21.join)(repoRoot2, "docs", "org-architecture.md")) ? `- [Org architecture](${targetBase}/blob/${targetBranch}/docs/org-architecture.md)` : ""
+    (0, import_node_fs24.existsSync)((0, import_node_path22.join)(repoRoot2, "docs", "org-readme.md")) ? `- [Org identity](${targetBase}/blob/${targetBranch}/docs/org-readme.md)` : "",
+    (0, import_node_fs24.existsSync)((0, import_node_path22.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")}
@@ -20321,9 +20406,9 @@ function writeError(res) {
 }
 
 // src/secrets-commands.ts
-var import_node_fs24 = require("node:fs");
-var import_node_path22 = require("node:path");
-var import_node_os8 = require("node:os");
+var import_node_fs25 = require("node:fs");
+var import_node_path23 = require("node:path");
+var import_node_os9 = require("node:os");
 
 // src/project-runtime.ts
 function hasRuntimeSecretContract(contract) {
@@ -20446,18 +20531,18 @@ function collectMap(value, previous = []) {
   return [...previous, value];
 }
 async function decryptRailsCredentials(input) {
-  const appDir = (0, import_node_path22.resolve)(input.appDir ?? process.cwd());
+  const appDir = (0, import_node_path23.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_path22.resolve)(appDir, credentialsFile);
-  const masterKeyPath = (0, import_node_path22.resolve)(appDir, masterKeyFile);
+  const credentialsPath = (0, import_node_path23.resolve)(appDir, credentialsFile);
+  const masterKeyPath = (0, import_node_path23.resolve)(appDir, masterKeyFile);
   const env = {
     ...process.env,
     MMI_RAILS_CREDENTIALS_FILE: credentialsPath,
     MMI_RAILS_MASTER_KEY_FILE: masterKeyPath
   };
-  if ((0, import_node_fs24.existsSync)(masterKeyPath)) {
-    env.RAILS_MASTER_KEY = (0, import_node_fs24.readFileSync)(masterKeyPath, "utf8").trim();
+  if ((0, import_node_fs25.existsSync)(masterKeyPath)) {
+    env.RAILS_MASTER_KEY = (0, import_node_fs25.readFileSync)(masterKeyPath, "utf8").trim();
   }
   const script = [
     'require "json"',
@@ -20467,9 +20552,9 @@ 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_fs24.mkdtempSync)((0, import_node_path22.join)((0, import_node_os8.tmpdir)(), "mmi-rails-decrypt-"));
-  const scriptPath = (0, import_node_path22.join)(scriptDir, "decrypt.rb");
-  (0, import_node_fs24.writeFileSync)(scriptPath, script, "utf8");
+  const scriptDir = (0, import_node_fs25.mkdtempSync)((0, import_node_path23.join)((0, import_node_os9.tmpdir)(), "mmi-rails-decrypt-"));
+  const scriptPath = (0, import_node_path23.join)(scriptDir, "decrypt.rb");
+  (0, import_node_fs25.writeFileSync)(scriptPath, script, "utf8");
   try {
     const args = ["exec", "ruby", scriptPath];
     const cmd = process.platform === "win32" ? "cmd.exe" : "bundle";
@@ -20481,7 +20566,7 @@ async function decryptRailsCredentials(input) {
     });
     return JSON.parse(stdout);
   } finally {
-    (0, import_node_fs24.rmSync)(scriptDir, { recursive: true, force: true });
+    (0, import_node_fs25.rmSync)(scriptDir, { recursive: true, force: true });
   }
 }
 async function readSecretStdin() {
@@ -20571,7 +20656,7 @@ function registerSecretsCommands(program3) {
     let body;
     if (o.file) {
       try {
-        body = (0, import_node_fs24.readFileSync)((0, import_node_path22.resolve)(o.file), "utf8");
+        body = (0, import_node_fs25.readFileSync)((0, import_node_path23.resolve)(o.file), "utf8");
       } catch (e) {
         return fail(`secrets org-catalog: cannot read --file ${o.file}: ${e.message}`);
       }
@@ -20676,7 +20761,7 @@ function registerSecretsCommands(program3) {
       {
         ...d,
         decryptRailsCredentials,
-        removeFile: (path2) => (0, import_node_fs24.unlinkSync)((0, import_node_path22.resolve)(o.appDir ?? process.cwd(), path2))
+        removeFile: (path2) => (0, import_node_fs25.unlinkSync)((0, import_node_path23.resolve)(o.appDir ?? process.cwd(), path2))
       },
       {
         repo: o.repo,
@@ -20840,7 +20925,7 @@ async function activateAppActor(commandPath3, env, mint) {
 }
 
 // src/box-commands.ts
-var import_node_fs25 = require("node:fs");
+var import_node_fs26 = require("node:fs");
 
 // src/box.ts
 var BOX_KEYS = {
@@ -21043,7 +21128,7 @@ function registerBoxCommands(program3) {
       }
       if (o.json) console.log(JSON.stringify({ box: found, incomplete }, null, 2));
       else if (o.ssh && o.script) {
-        (0, import_node_fs25.writeFileSync)(o.script, sshRecipeScript(found), "utf8");
+        (0, import_node_fs26.writeFileSync)(o.script, sshRecipeScript(found), "utf8");
         console.log(`wrote ${o.script} \u2014 run: bash "${o.script}"`);
       } else if (o.ssh) console.log(`${formatSshRecipe(found)}
 ${SSH_RECIPE_AGENT_NOTE}`);
@@ -21729,7 +21814,7 @@ function registerSchedulesCommands(program3) {
 
 // src/file-lock.ts
 var import_promises4 = require("node:fs/promises");
-var import_node_path23 = require("node:path");
+var import_node_path24 = require("node:path");
 var sleep = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 var IMMEDIATE_RETRY_BUDGET = 3;
 var FileLockBusyError = class extends Error {
@@ -21814,7 +21899,7 @@ async function releaseFileLock(lockPath, guard) {
 }
 async function withFileLock(lockPath, opts, fn) {
   const resolved = resolveFileLockOpts(opts);
-  await (0, import_promises4.mkdir)((0, import_node_path23.dirname)(lockPath), { recursive: true }).catch(() => void 0);
+  await (0, import_promises4.mkdir)((0, import_node_path24.dirname)(lockPath), { recursive: true }).catch(() => void 0);
   const guard = await acquireFileLock(lockPath, resolved, Date.now() + resolved.maxWaitMs);
   try {
     return await fn();
@@ -21825,7 +21910,7 @@ async function withFileLock(lockPath, opts, fn) {
 
 // src/schedules-lift-command.ts
 var import_promises5 = require("node:fs/promises");
-var import_node_path24 = require("node:path");
+var import_node_path25 = require("node:path");
 
 // src/schedules-lift.ts
 var SCHEDULE_HEADER_FIELDS = ["schedule", "what", "owner", "cadence", "executor", "llm", "output", "breaks", "kill"];
@@ -21931,7 +22016,7 @@ async function readWorkflowFiles(dir) {
   const files = [];
   for (const name of names.sort()) {
     if (!/\.ya?ml$/.test(name)) continue;
-    files.push({ path: `.github/workflows/${name}`, text: await (0, import_promises5.readFile)((0, import_node_path24.join)(dir, name), "utf8") });
+    files.push({ path: `.github/workflows/${name}`, text: await (0, import_promises5.readFile)((0, import_node_path25.join)(dir, name), "utf8") });
   }
   return files;
 }
@@ -22015,13 +22100,13 @@ function registerSchedulesLiftCommand(program3, deps = {}) {
 // src/edge-tunnel.ts
 var HOSTNAME_RE = /^(?=.{1,253}$)([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)(\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)+$/;
 var UPSTREAM_RE = /^https?:\/\/[^/\s]+(?::\d+)?(?:\/.*)?$/;
-function tunnelNameFromHostname(hostname2) {
-  return hostname2.replace(/\./g, "-").slice(0, 63);
+function tunnelNameFromHostname(hostname3) {
+  return hostname3.replace(/\./g, "-").slice(0, 63);
 }
-function planInfraTunnel(hostname2, upstream) {
-  const host = hostname2.trim().toLowerCase();
+function planInfraTunnel(hostname3, upstream) {
+  const host = hostname3.trim().toLowerCase();
   const origin = upstream.trim();
-  if (!HOSTNAME_RE.test(host)) throw new Error(`invalid hostname ${JSON.stringify(hostname2)}`);
+  if (!HOSTNAME_RE.test(host)) throw new Error(`invalid hostname ${JSON.stringify(hostname3)}`);
   if (!UPSTREAM_RE.test(origin)) throw new Error(`invalid upstream ${JSON.stringify(upstream)} \u2014 expected http(s)://host:port`);
   const tunnelName = tunnelNameFromHostname(host);
   const configYaml = [
@@ -22473,9 +22558,9 @@ function registerQueryCommands(program3) {
 }
 
 // src/bootstrap-commands.ts
-var import_node_fs26 = require("node:fs");
-var import_node_os9 = require("node:os");
-var import_node_path25 = require("node:path");
+var import_node_fs27 = require("node:fs");
+var import_node_os10 = require("node:os");
+var import_node_path26 = require("node:path");
 
 // src/bootstrap-drift.ts
 function byteComparableSeeds(manifest, cls) {
@@ -22981,7 +23066,7 @@ function renderBootstrapVerifyReport(report) {
 // src/bootstrap-org-ruleset.ts
 var ORG_NO_AGENT_FILES_RULESET_NAME = "mmi-no-agent-files-org";
 var ORG_LOGIN = "mutmutco";
-var ORG_NO_AGENT_FILES_EXCLUDED_REPOS = ["Jerv-PowerTools"];
+var ORG_NO_AGENT_FILES_EXCLUDED_REPOS = ["Jerv-PowerTools", "Jerv-JervCode"];
 var NO_AGENT_FILES_GLOBS = [
   "AGENTS.md",
   "**/AGENTS.md",
@@ -23058,8 +23143,8 @@ OK \u2014 live ruleset matches the codified IaC (${NO_AGENT_FILES_GLOBS.length}
     `${head}`,
     verb,
     ...plan.drift.map((d) => `  - ${d}`),
-    "This command is read-only; it never mutates the live ruleset. Recreate/repair via the GitHub UI or a",
-    "deliberate POST/PUT of orgNoAgentFilesRulesetDesired() \u2014 see cli/src/bootstrap-org-ruleset.ts."
+    "Read-only preview \u2014 a master-admin may reconcile this exact desired state with",
+    "`mmi-cli bootstrap org-ruleset --apply`."
   ].join("\n");
 }
 async function fetchOrgNoAgentFilesRuleset(client, org = ORG_LOGIN) {
@@ -23068,6 +23153,27 @@ async function fetchOrgNoAgentFilesRuleset(client, org = ORG_LOGIN) {
   if (summary?.id == null) return null;
   return await client.rest("GET", `orgs/${org}/rulesets/${summary.id}`, { timeoutMs: 2e4 }) ?? null;
 }
+async function reconcileOrgNoAgentFilesRuleset(plan, client, org = ORG_LOGIN) {
+  if (plan.action === "noop") {
+    return { action: "noop", id: plan.id, verified: true, desired: plan.desired };
+  }
+  if (plan.action === "create") {
+    await client.rest("POST", `orgs/${org}/rulesets`, { body: plan.desired, timeoutMs: 2e4 });
+  } else {
+    if (plan.id == null) throw new Error(`cannot update '${plan.desired.name}': live ruleset id is missing`);
+    await client.rest("PUT", `orgs/${org}/rulesets/${plan.id}`, { body: plan.desired, timeoutMs: 2e4 });
+  }
+  const verified = planOrgNoAgentFilesRuleset(await fetchOrgNoAgentFilesRuleset(client, org));
+  if (verified.action !== "noop") {
+    throw new Error(`org ruleset reconcile did not settle: ${verified.drift.join("; ")}`);
+  }
+  return {
+    action: plan.action === "create" ? "created" : "updated",
+    id: verified.id,
+    verified: true,
+    desired: verified.desired
+  };
+}
 
 // src/bootstrap-commands.ts
 function registerBootstrapCommands(program3) {
@@ -23089,13 +23195,13 @@ function registerBootstrapCommands(program3) {
       client: defaultGitHubClient(),
       projectMeta: meta,
       deployModel: typeof meta?.deployModel === "string" ? meta.deployModel : void 0,
-      readLocalFile: (path2) => path2 === "projects.json" && apiProjects != null ? apiProjects : (0, import_node_fs26.existsSync)(path2) ? (0, import_node_fs26.readFileSync)(path2, "utf8") : null,
+      readLocalFile: (path2) => path2 === "projects.json" && apiProjects != null ? apiProjects : (0, import_node_fs27.existsSync)(path2) ? (0, import_node_fs27.readFileSync)(path2, "utf8") : null,
       // requiredGcpApis is stored as an array by a JSON write, but `org project set --var KEY=VALUE` stores a raw
       // comma-string — accept either so the seeded value verifies regardless of how it was written.
       // #3689: the same committed map the org access audit reads (#3664), so a sanctioned admin is not a
       // permanent bootstrap failure on one surface and an intended state on the other. Absent file → no
       // sanction, which is the pre-#3664 behaviour.
-      sanctionedAdmins: (0, import_node_fs26.existsSync)("access-matrix.json") ? entriesValueByCanonicalRepo(loadSanctionedAdmins((0, import_node_fs26.readFileSync)("access-matrix.json", "utf8")), repo) : void 0,
+      sanctionedAdmins: (0, import_node_fs27.existsSync)("access-matrix.json") ? entriesValueByCanonicalRepo(loadSanctionedAdmins((0, import_node_fs27.readFileSync)("access-matrix.json", "utf8")), repo) : void 0,
       requiredGcpApis: (() => {
         const v = meta?.requiredGcpApis;
         if (Array.isArray(v)) return v;
@@ -23122,23 +23228,38 @@ function registerBootstrapCommands(program3) {
     console.log(o.json ? JSON.stringify(report, null, 2) : renderBootstrapVerifyReport(report));
     if (!report.ok) process.exitCode = 1;
   });
-  bootstrap.command("org-ruleset").description("drift-check the codified org no-agent-files push ruleset (mmi-no-agent-files-org) against live; read-only, never mutates (#2196)").option("--json", "machine-readable output").action(async () => {
+  bootstrap.command("org-ruleset").description("drift-check the codified org no-agent-files push ruleset; optionally reconcile it under master authority (#2196/#4001)").option("--json", "machine-readable output").option("--apply", "create or update the one named org ruleset to exact desired state (master-admin required)").action(async () => {
     const json = rawFlag("--json");
-    const live = await fetchOrgNoAgentFilesRuleset(defaultGitHubClient());
+    const apply = rawFlag("--apply");
+    const client = defaultGitHubClient();
+    const live = await fetchOrgNoAgentFilesRuleset(client);
     const plan = planOrgNoAgentFilesRuleset(live);
-    if (json) console.log(JSON.stringify({ action: plan.action, id: plan.id, drift: plan.drift, desired: plan.desired }, null, 2));
-    else console.log(renderOrgRulesetDriftReport(plan));
-    if (plan.action !== "noop") process.exitCode = 1;
+    if (!apply) {
+      if (json) console.log(JSON.stringify({ action: plan.action, id: plan.id, drift: plan.drift, desired: plan.desired }, null, 2));
+      else console.log(renderOrgRulesetDriftReport(plan));
+      if (plan.action !== "noop") process.exitCode = 1;
+      return;
+    }
+    const verdict = await fetchTrainAuthority("mutmutco/MMI-Hub", registryClientDeps(await loadConfig()));
+    if (!verdict.ok || verdict.authority.role !== "master") {
+      return fail("bootstrap org-ruleset --apply: master-admin required");
+    }
+    const result = await reconcileOrgNoAgentFilesRuleset(plan, client);
+    if (json) console.log(JSON.stringify(result, null, 2));
+    else {
+      console.log(`mmi-cli bootstrap org-ruleset --apply: ${result.action}`);
+      console.log(renderOrgRulesetDriftReport(planOrgNoAgentFilesRuleset(await fetchOrgNoAgentFilesRuleset(client))));
+    }
   });
   bootstrap.command("drift").description("#3818: compare every org-owned whole-file seed against MMI-Hub's copy across the registry roster; read-only").option("--repo <owner/repo>", "audit one repo instead of the roster (never a fleet verdict)").option("--json", "machine-readable output").action(async () => {
     const o = { repo: rawValue("--repo", ""), json: rawFlag("--json") };
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
-    if (!(0, import_node_fs26.existsSync)(manifestPath)) return fail(`bootstrap drift: ${manifestPath} not found; run from the MMI-Hub repo root \u2014 the Hub's copies ARE the reference this compares against`);
-    const manifest = loadBootstrapSeeds((0, import_node_fs26.readFileSync)(manifestPath, "utf8"));
+    if (!(0, import_node_fs27.existsSync)(manifestPath)) return fail(`bootstrap drift: ${manifestPath} not found; run from the MMI-Hub repo root \u2014 the Hub's copies ARE the reference this compares against`);
+    const manifest = loadBootstrapSeeds((0, import_node_fs27.readFileSync)(manifestPath, "utf8"));
     const hubContents = /* @__PURE__ */ new Map();
     for (const s of manifest.seeds) {
       if (s.ownership !== "org" || s.source !== "self") continue;
-      hubContents.set(s.target, (0, import_node_fs26.existsSync)(s.target) ? (0, import_node_fs26.readFileSync)(s.target, "utf8") : null);
+      hubContents.set(s.target, (0, import_node_fs27.existsSync)(s.target) ? (0, import_node_fs27.readFileSync)(s.target, "utf8") : null);
     }
     let targets;
     let classOf = (_repo) => "deployable";
@@ -23215,8 +23336,8 @@ function registerBootstrapCommands(program3) {
       return fail(`bootstrap apply: ${e.message}`);
     }
     const manifestPath = "skills/bootstrap/seeds/manifest.json";
-    if (!(0, import_node_fs26.existsSync)(manifestPath)) return fail(`bootstrap apply: ${manifestPath} not found; bootstrap runs from the MMI-Hub repo root by design \u2014 it stamps org-level resources (Project, Ruleset, secrets, access) through the GitHub App, which is only authorized from the Hub checkout`);
-    const manifest = loadBootstrapSeeds((0, import_node_fs26.readFileSync)(manifestPath, "utf8"));
+    if (!(0, import_node_fs27.existsSync)(manifestPath)) return fail(`bootstrap apply: ${manifestPath} not found; bootstrap runs from the MMI-Hub repo root by design \u2014 it stamps org-level resources (Project, Ruleset, secrets, access) through the GitHub App, which is only authorized from the Hub checkout`);
+    const manifest = loadBootstrapSeeds((0, import_node_fs27.readFileSync)(manifestPath, "utf8"));
     const baseBranch = o.class === "content" ? "main" : "development";
     const slug = parsedRepo.slug;
     const onlyTarget = o.only.trim();
@@ -23227,16 +23348,16 @@ function registerBootstrapCommands(program3) {
   ${known}`);
     }
     const gh = async (args) => execFileP2("gh", args, { timeout: 2e4 });
-    const readFile9 = (p) => (0, import_node_fs26.existsSync)(p) ? (0, import_node_fs26.readFileSync)(p, "utf8") : null;
+    const readFile9 = (p) => (0, import_node_fs27.existsSync)(p) ? (0, import_node_fs27.readFileSync)(p, "utf8") : null;
     const enc = (p) => p.split("/").map(encodeURIComponent).join("/");
     const putSeed = async (target, content, ref, sha) => {
-      const tmp = (0, import_node_path25.join)((0, import_node_os9.tmpdir)(), `mmi-seed-${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}.json`);
-      (0, import_node_fs26.writeFileSync)(tmp, JSON.stringify(contentPutBody(target, content, ref, sha)), "utf8");
+      const tmp = (0, import_node_path26.join)((0, import_node_os10.tmpdir)(), `mmi-seed-${process.pid}-${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}.json`);
+      (0, import_node_fs27.writeFileSync)(tmp, JSON.stringify(contentPutBody(target, content, ref, sha)), "utf8");
       try {
         await gh(contentPutInputArgs(repo, target, tmp));
       } finally {
         try {
-          (0, import_node_fs26.unlinkSync)(tmp);
+          (0, import_node_fs27.unlinkSync)(tmp);
         } catch {
         }
       }
@@ -23488,12 +23609,12 @@ LIVE apply to ${repo}:
 }
 
 // src/stage-commands.ts
-var import_node_fs28 = require("node:fs");
-var import_node_path27 = require("node:path");
+var import_node_fs29 = require("node:fs");
+var import_node_path28 = require("node:path");
 
 // src/port-registry.ts
-var import_node_fs27 = require("node:fs");
-var import_node_path26 = require("node:path");
+var import_node_fs28 = require("node:fs");
+var import_node_path27 = require("node:path");
 
 // ../infra/port-geometry.mjs
 var PORT_BLOCK = 100;
@@ -23507,8 +23628,8 @@ function nextPortBlock(registry2) {
   return [base, base + PORT_SPAN];
 }
 function loadPortRegistry(path2) {
-  if (!(0, import_node_fs27.existsSync)(path2)) return {};
-  const raw = JSON.parse((0, import_node_fs27.readFileSync)(path2, "utf8"));
+  if (!(0, import_node_fs28.existsSync)(path2)) return {};
+  const raw = JSON.parse((0, import_node_fs28.readFileSync)(path2, "utf8"));
   const out = {};
   for (const [key, value] of Object.entries(raw)) {
     if (Array.isArray(value) && value.length === 2 && value.every((n) => typeof n === "number")) {
@@ -23522,9 +23643,9 @@ function ensurePortRange(repo, path2) {
   const existing = registry2[repo];
   if (existing) return existing;
   const range = nextPortBlock(registry2);
-  const raw = (0, import_node_fs27.existsSync)(path2) ? JSON.parse((0, import_node_fs27.readFileSync)(path2, "utf8")) : {};
+  const raw = (0, import_node_fs28.existsSync)(path2) ? JSON.parse((0, import_node_fs28.readFileSync)(path2, "utf8")) : {};
   raw[repo] = range;
-  (0, import_node_fs27.writeFileSync)(path2, JSON.stringify(raw, null, 2) + "\n", "utf8");
+  (0, import_node_fs28.writeFileSync)(path2, JSON.stringify(raw, null, 2) + "\n", "utf8");
   return range;
 }
 function portCursorSeed(registry2) {
@@ -23546,22 +23667,22 @@ function existingPortRange(repo, registry2) {
   return registry2[repo] ?? null;
 }
 function portRangeInfraAt(root, source) {
-  const registryPath = (0, import_node_path26.join)(root, "infra", "port-ranges.json");
-  const ddbScriptPath = (0, import_node_path26.join)(root, "infra", "port-ddb.mjs");
-  if (!(0, import_node_fs27.existsSync)(registryPath) || !(0, import_node_fs27.existsSync)(ddbScriptPath)) return null;
+  const registryPath = (0, import_node_path27.join)(root, "infra", "port-ranges.json");
+  const ddbScriptPath = (0, import_node_path27.join)(root, "infra", "port-ddb.mjs");
+  if (!(0, import_node_fs28.existsSync)(registryPath) || !(0, import_node_fs28.existsSync)(ddbScriptPath)) return null;
   return { root, source, registryPath, ddbScriptPath };
 }
 function resolvePortRangeInfra(cwd, packageDir) {
   const direct = portRangeInfraAt(cwd, "cwd");
   if (direct) return direct;
-  for (let dir = cwd; ; dir = (0, import_node_path26.dirname)(dir)) {
-    const sibling = portRangeInfraAt((0, import_node_path26.join)(dir, "MMI-Hub"), "sibling-hub");
+  for (let dir = cwd; ; dir = (0, import_node_path27.dirname)(dir)) {
+    const sibling = portRangeInfraAt((0, import_node_path27.join)(dir, "MMI-Hub"), "sibling-hub");
     if (sibling) return sibling;
-    const parent = (0, import_node_path26.dirname)(dir);
+    const parent = (0, import_node_path27.dirname)(dir);
     if (parent === dir) break;
   }
   if (packageDir) {
-    const pkgRoot = (0, import_node_path26.join)(packageDir, "..", "..");
+    const pkgRoot = (0, import_node_path27.join)(packageDir, "..", "..");
     const pkgFrom = portRangeInfraAt(pkgRoot, "pkg-root");
     if (pkgFrom) return pkgFrom;
   }
@@ -23737,8 +23858,8 @@ function registerStageCommands(program3) {
     const portRange = portRangeMeta && typeof portRangeMeta.start === "number" && typeof portRangeMeta.end === "number" ? [portRangeMeta.start, portRangeMeta.end] : void 0;
     return decideStage({
       registry: { deployModel: project2?.deployModel, portRange, error: read.ok ? void 0 : read.error },
-      hasCompose: (0, import_node_fs28.existsSync)((0, import_node_path27.join)(process.cwd(), "docker-compose.yml")),
-      hasEnvExample: (0, import_node_fs28.existsSync)((0, import_node_path27.join)(process.cwd(), ".env.example"))
+      hasCompose: (0, import_node_fs29.existsSync)((0, import_node_path28.join)(process.cwd(), "docker-compose.yml")),
+      hasEnvExample: (0, import_node_fs29.existsSync)((0, import_node_path28.join)(process.cwd(), ".env.example"))
     });
   }
   async function fetchStageVaultEnvMerge() {
@@ -24176,10 +24297,10 @@ function registerBoardCommands(program3) {
 }
 
 // src/merge-cleanup.ts
-var import_node_fs29 = require("node:fs");
+var import_node_fs30 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
-var import_node_path29 = require("node:path");
-var import_node_os10 = require("node:os");
+var import_node_path30 = require("node:path");
+var import_node_os11 = require("node:os");
 var import_node_child_process14 = require("node:child_process");
 
 // src/board-advance.ts
@@ -24266,7 +24387,7 @@ function boardAdvanceFailureMessage(result) {
 
 // src/deferred-registry-store.ts
 var import_promises6 = require("node:fs/promises");
-var import_node_path28 = require("node:path");
+var import_node_path29 = require("node:path");
 var sleep2 = (ms) => new Promise((resolve5) => setTimeout(resolve5, ms));
 async function atomicWrite(target, contents) {
   const tmp = `${target}.tmp-${process.pid}-${Math.random().toString(36).slice(2)}`;
@@ -24317,12 +24438,12 @@ function makeDeferredWorktreeStore(registryPath, lockOpts = {}) {
     },
     // Standalone atomic write — THROWS on failure (no best-effort swallow, #2846).
     write: async (entries) => {
-      await (0, import_promises6.mkdir)((0, import_node_path28.dirname)(registryPath), { recursive: true });
+      await (0, import_promises6.mkdir)((0, import_node_path29.dirname)(registryPath), { recursive: true });
       await atomicWrite(registryPath, serializeDeferredWorktrees(entries));
     },
     // Serialized read-modify-write under the repo-wide lock (#2846).
     update: async (mutate) => {
-      await (0, import_promises6.mkdir)((0, import_node_path28.dirname)(registryPath), { recursive: true });
+      await (0, import_promises6.mkdir)((0, import_node_path29.dirname)(registryPath), { recursive: true });
       const deadline = Date.now() + opts.maxWaitMs;
       for (; ; ) {
         const guard = await acquireLock(lockPath, opts, deadline);
@@ -24483,7 +24604,7 @@ async function applyGcPlan(plan, remote, opts = {}) {
   );
   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_path29.dirname)((0, import_node_path29.dirname)(worktreeGitRoot)) : repoRoot2;
+  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path30.dirname)((0, import_node_path30.dirname)(worktreeGitRoot)) : repoRoot2;
   const gcActor = describeActor({ env: process.env, surface: detectSurface(process.env), cwd: process.cwd() });
   const owners = readWorktreeOwners(primaryRepoRoot);
   const removalNow = Date.now();
@@ -24514,7 +24635,7 @@ async function applyGcPlan(plan, remote, opts = {}) {
       const cleanup = await cleanupPrMergeLocalBranch(branch.branch, {
         beforeWorktrees,
         startingPath: branch.worktreePath,
-        pathExists: (p) => (0, import_node_fs29.existsSync)(p),
+        pathExists: (p) => (0, import_node_fs30.existsSync)(p),
         execGit: async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout,
         teardownWorktreeStage,
         deferredStore,
@@ -24542,7 +24663,7 @@ async function applyGcPlan(plan, remote, opts = {}) {
   for (const wt of worktreeDirsToRemove) {
     try {
       const cleanupTarget = resolveSafeSiblingWorktreeCleanupTarget(wt.path, siblingRoot, {
-        realpath: (path2) => (0, import_node_fs29.realpathSync)(path2)
+        realpath: (path2) => (0, import_node_fs30.realpathSync)(path2)
       });
       if (!cleanupTarget.ok) {
         result.failed.push(`${wt.path}: ${cleanupTarget.reason}`);
@@ -24607,13 +24728,13 @@ async function composeOverrideBodyFile(prNumber, repoArgs, gh) {
     const commits = JSON.parse(raw).commits ?? [];
     const body = squashBodyWithOverride(commits.map((c) => ({ headline: c.messageHeadline ?? "", body: c.messageBody ?? "" })), process.cwd());
     if (!body) return void 0;
-    const dir = (0, import_node_fs29.mkdtempSync)((0, import_node_path29.join)((0, import_node_os10.tmpdir)(), "mmi-squash-body-"));
-    const path2 = (0, import_node_path29.join)(dir, "body.txt");
-    (0, import_node_fs29.writeFileSync)(path2, `${body}
+    const dir = (0, import_node_fs30.mkdtempSync)((0, import_node_path30.join)((0, import_node_os11.tmpdir)(), "mmi-squash-body-"));
+    const path2 = (0, import_node_path30.join)(dir, "body.txt");
+    (0, import_node_fs30.writeFileSync)(path2, `${body}
 `, "utf8");
     return { path: path2, cleanup: () => {
       try {
-        (0, import_node_fs29.rmSync)(dir, { recursive: true, force: true });
+        (0, import_node_fs30.rmSync)(dir, { recursive: true, force: true });
       } catch {
       }
     } };
@@ -24735,13 +24856,13 @@ var realWorktreeDirRemover = {
   probe: (p) => {
     let st;
     try {
-      st = (0, import_node_fs29.lstatSync)(p);
+      st = (0, import_node_fs30.lstatSync)(p);
     } catch {
       return null;
     }
     if (st.isSymbolicLink()) return "link";
     try {
-      (0, import_node_fs29.readlinkSync)(p);
+      (0, import_node_fs30.readlinkSync)(p);
       return "link";
     } catch {
     }
@@ -24749,7 +24870,7 @@ var realWorktreeDirRemover = {
   },
   readdir: (p) => {
     try {
-      return (0, import_node_fs29.readdirSync)(p);
+      return (0, import_node_fs30.readdirSync)(p);
     } catch {
       return [];
     }
@@ -24758,9 +24879,9 @@ var realWorktreeDirRemover = {
   // leaving the target); a file symlink with unlink. rmdir first, fall back to unlink.
   detachLink: (p) => {
     try {
-      (0, import_node_fs29.rmdirSync)(p);
+      (0, import_node_fs30.rmdirSync)(p);
     } catch {
-      (0, import_node_fs29.unlinkSync)(p);
+      (0, import_node_fs30.unlinkSync)(p);
     }
   },
   removeTree: (p) => (0, import_promises7.rm)(p, { recursive: true, force: true, maxRetries: 5, retryDelay: 200 })
@@ -24793,9 +24914,9 @@ async function worktreeHasStageState(worktreePath) {
   }
 }
 function stageStateFileBelongsToWorktree(statePath, worktreePath) {
-  if (!(0, import_node_fs29.existsSync)(statePath)) return false;
+  if (!(0, import_node_fs30.existsSync)(statePath)) return false;
   try {
-    const state = JSON.parse((0, import_node_fs29.readFileSync)(statePath, "utf8"));
+    const state = JSON.parse((0, import_node_fs30.readFileSync)(statePath, "utf8"));
     const recordedCwd = typeof state.identity?.cwd === "string" ? state.identity.cwd : typeof state.cwd === "string" ? state.cwd : "";
     return Boolean(recordedCwd && isPathUnderDirectory(recordedCwd, worktreePath));
   } catch {
@@ -25019,9 +25140,9 @@ async function fetchRestCorePool(gh = defaultGhApi) {
 }
 
 // src/worktree-lifecycle-commands.ts
-var import_node_fs30 = require("node:fs");
+var import_node_fs31 = require("node:fs");
 var import_promises8 = require("node:fs/promises");
-var import_node_path30 = require("node:path");
+var import_node_path31 = require("node:path");
 var GH_TIMEOUT_MS = 2e4;
 var DEFAULT_BASE = "origin/development";
 var DEFAULT_REMOTE = "origin";
@@ -25093,6 +25214,16 @@ function orphanLandSteps(lostBranch, hasStage) {
   steps.push("prune worktree metadata");
   return steps;
 }
+function detachedLandSteps(hasStage) {
+  const steps = [];
+  if (hasStage) steps.push("stop spawned dev stage");
+  steps.push("remove worktree (detached HEAD)");
+  steps.push("prune worktree metadata");
+  return steps;
+}
+function shouldContinueLandCleanup(removeStatus) {
+  return removeStatus === "removed";
+}
 function classifyStaleLeaks(input) {
   const protectedBranches = input.protectedBranches ?? PROTECTED_BRANCHES2;
   const leaks = [];
@@ -25157,7 +25288,7 @@ function classifyStaleLeaks(input) {
 var defaultOrphanDirScanDeps = {
   listDirs: (root) => {
     try {
-      return (0, import_node_fs30.readdirSync)(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => (0, import_node_path30.join)(root, e.name));
+      return (0, import_node_fs31.readdirSync)(root, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => (0, import_node_path31.join)(root, e.name));
     } catch {
       return [];
     }
@@ -25302,15 +25433,21 @@ function registerWorktreeCommands(program3) {
     try {
       const wtPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS })).stdout.trim();
       const headBorn = await execFileP2("git", ["-C", wtPath || ".", "rev-parse", "--verify", "--quiet", "HEAD"], { timeout: GIT_TIMEOUT_MS }).then(() => true).catch(() => false);
-      const branch = headBorn ? (await execFileP2("git", ["rev-parse", "--abbrev-ref", "HEAD"], { timeout: GIT_TIMEOUT_MS })).stdout.trim() : (await execFileP2("git", ["symbolic-ref", "--quiet", "--short", "HEAD"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
+      const symbolicBranch = (await execFileP2(
+        "git",
+        ["-C", wtPath || ".", "symbolic-ref", "--quiet", "--short", "HEAD"],
+        { timeout: GIT_TIMEOUT_MS }
+      ).catch(() => ({ stdout: "" }))).stdout.trim();
+      const detached = headBorn && !symbolicBranch;
+      const branch = symbolicBranch || (detached ? "HEAD" : "");
       if (!wtPath || !branch) return fail("worktree land: not inside a git worktree");
-      const gitFile = (0, import_node_path30.join)(wtPath, ".git");
-      const isLinked = (0, import_node_fs30.existsSync)(gitFile) && (0, import_node_fs30.statSync)(gitFile).isFile();
+      const gitFile = (0, import_node_path31.join)(wtPath, ".git");
+      const isLinked = (0, import_node_fs31.existsSync)(gitFile) && (0, import_node_fs31.statSync)(gitFile).isFile();
       if (apply && !isLinked) {
         return fail("worktree land: run from inside the linked worktree you want to land (this is the primary checkout)");
       }
       const commonDir = (await execFileP2("git", ["rev-parse", "--git-common-dir"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-      const primaryCheckout = commonDir ? (0, import_node_path30.dirname)(commonDir) : wtPath;
+      const primaryCheckout = commonDir ? (0, import_node_path31.dirname)(commonDir) : wtPath;
       const localBranchNames = await execFileP2("git", ["-C", primaryCheckout, "for-each-ref", "--format=%(refname:short)", "refs/heads"], { timeout: GIT_TIMEOUT_MS }).then(({ stdout }) => new Set((stdout || "").split("\n").map((l) => l.trim()).filter(Boolean))).catch(() => void 0);
       const orphan = classifyOrphanedWorktree({
         branch,
@@ -25323,7 +25460,7 @@ function registerWorktreeCommands(program3) {
       }
       const stageSummary = readStageSummary(wtPath);
       const hasStage = stageSummary != null;
-      const steps = orphan.orphan ? orphanLandSteps(orphan.lostBranch, hasStage) : landSteps(branch, true, hasStage);
+      const steps = detached ? detachedLandSteps(hasStage) : orphan.orphan ? orphanLandSteps(orphan.lostBranch, hasStage) : landSteps(branch, true, hasStage);
       const plan = {
         command: "worktree land",
         branch,
@@ -25332,13 +25469,15 @@ function registerWorktreeCommands(program3) {
         remote: o.remote,
         hasStage,
         steps,
-        ...orphan.orphan ? { orphan: { kind: orphan.kind, lostBranch: orphan.lostBranch, reason: orphan.reason } } : {}
+        ...orphan.orphan ? { orphan: { kind: orphan.kind, lostBranch: orphan.lostBranch, reason: orphan.reason } } : {},
+        ...detached ? { detached: true } : {}
       };
       if (!apply) {
         const preview = { dryRun: true, ...plan, ...o.keepRemote ? { keepRemote: true } : {} };
         if (o.json) return console.log(JSON.stringify(preview, null, 2));
         const lines = [`worktree land: dry-run (pass --apply to execute)`, `  branch: ${branch}`, `  worktree: ${wtPath}`];
-        if (orphan.orphan) lines.push(`  orphaned: ${orphan.reason} \u2014 no branch refs will be deleted`);
+        if (detached) lines.push("  detached HEAD: no branch refs will be deleted");
+        else if (orphan.orphan) lines.push(`  orphaned: ${orphan.reason} \u2014 no branch refs will be deleted`);
         if (hasStage) lines.push(`  stage: port ${stageSummary.port} (will be stopped)`);
         if (o.keepRemote && !orphan.orphan) lines.push(`  remote branch: kept (--keep-remote)`);
         for (const s of steps) lines.push(`  - ${s}`);
@@ -25360,15 +25499,16 @@ function registerWorktreeCommands(program3) {
         unreferenced: await isCommitUnreferenced(orphanTip, async (args) => (await execFileP2("git", ["-C", primaryCheckout, ...args], { timeout: GIT_TIMEOUT_MS })).stdout),
         recoverCommand: `git -C "${primaryCheckout}" branch <name> ${orphanTip}`
       } : void 0;
-      const landPrs = orphan.orphan ? void 0 : await fetchLandBranchPrs(branch);
+      const treeOnly = orphan.orphan || detached;
+      const landPrs = treeOnly ? void 0 : await fetchLandBranchPrs(branch);
       const mergeVerdict = classifyLandBranchMergeState(landPrs);
-      const landRefs = orphan.orphan ? { action: "proceed" } : decideWorktreeLandRefCleanup({ branch, prs: landPrs, keepRemote: Boolean(o.keepRemote) });
+      const landRefs = treeOnly ? { action: "proceed" } : decideWorktreeLandRefCleanup({ branch, prs: landPrs, keepRemote: Boolean(o.keepRemote) });
       if (landRefs.action === "refuse") {
         return fail(`worktree land: ${landRefs.message}`, { code: ERROR_CODES.ERR_BAD_ENUM });
       }
       const keepRemoteBranch = Boolean(o.keepRemote) || landRefs.action === "keep-remote";
       if (landRefs.action === "keep-remote") console.warn(`worktree land: ${landRefs.message}.`);
-      const reportedMergeState = orphan.orphan ? "not-checked" : mergeVerdict.state;
+      const reportedMergeState = treeOnly ? "not-checked" : mergeVerdict.state;
       const landOwner = lookupWorktreeOwner(primaryCheckout, wtPath);
       const report = [];
       if (hasStage) {
@@ -25388,6 +25528,24 @@ function registerWorktreeCommands(program3) {
         step: "remove worktree",
         status: removeOutcome.status === "removed" ? removeOutcome.recovery ? `done (${removeOutcome.recovery})` : "done" : `failed: ${removeOutcome.error ?? "lock held"} \u2014 run: git -C "${primaryCheckout}" worktree remove --force "${wtPath}"`
       });
+      if (!shouldContinueLandCleanup(removeOutcome.status)) {
+        const result2 = {
+          dryRun: false,
+          ...plan,
+          ...o.keepRemote ? { keepRemote: true } : {},
+          mergeState: reportedMergeState,
+          prNumbers: mergeVerdict.numbers,
+          cleanupState: "partial",
+          report
+        };
+        if (o.json) console.log(JSON.stringify(result2, null, 2));
+        else {
+          console.error(`worktree land: cleanup stopped after the worktree removal failed; branch refs and metadata were left untouched`);
+          for (const row of report) console.log(`  ${row.step}: ${row.status}`);
+        }
+        process.exitCode = 1;
+        return;
+      }
       const landActor = describeActor({ env: process.env, surface: detectSurface(process.env), cwd: wtPath });
       appendWorktreeEvent(primaryCheckout, {
         action: removeOutcome.status === "removed" ? "removed" : "failed",
@@ -25402,8 +25560,11 @@ function registerWorktreeCommands(program3) {
         reason: orphan.orphan ? `orphaned worktree \u2014 ${orphan.reason}${lastCommit ? `; last commit ${lastCommit.oid}${lastCommit.unreferenced ? " (on no ref)" : ""}` : ""}` : describeLandMergeState(mergeVerdict)
       });
       if (removeOutcome.status === "removed") dropWorktreeOwner(primaryCheckout, wtPath);
-      if (orphan.orphan) {
-        report.push({ step: "delete branch refs", status: `skipped: orphaned worktree \u2014 ${orphan.reason}` });
+      if (treeOnly) {
+        report.push({
+          step: "delete branch refs",
+          status: detached ? "skipped: detached HEAD has no branch refs" : `skipped: orphaned worktree \u2014 ${orphan.reason}`
+        });
         if (lastCommit) {
           report.push({
             step: "last commit",
@@ -25431,12 +25592,12 @@ function registerWorktreeCommands(program3) {
         report
       };
       if (o.json) return console.log(JSON.stringify(result, null, 2));
-      console.log(orphan.orphan ? `worktree land: removed orphaned worktree ${wtPath} (${orphan.reason}); no branch refs touched` : `worktree land: cleaned up branch ${branch} (${describeLandMergeState(mergeVerdict)})`);
+      console.log(treeOnly ? `worktree land: removed ${detached ? "detached" : "orphaned"} worktree ${wtPath}${detached ? "" : ` (${orphan.reason})`}; no branch refs touched` : `worktree land: cleaned up branch ${branch} (${describeLandMergeState(mergeVerdict)})`);
       for (const r of report) console.log(`  ${r.step}: ${r.status}`);
       if (lastCommit?.unreferenced) {
         console.warn(`worktree land: commit ${lastCommit.oid} was on no ref but this worktree's reflog \u2014 normal after a squash merge, but if that work was NOT merged, recover it now: ${lastCommit.recoverCommand}`);
       }
-      if (!orphan.orphan && mergeVerdict.state !== "merged") {
+      if (!treeOnly && mergeVerdict.state !== "merged") {
         console.warn(`worktree land: '${branch}' was cleaned up but NOT merged \u2014 ${describeLandMergeState(mergeVerdict)}. Do not report this work as shipped.`);
       }
       if (report.some((r) => r.status.startsWith("failed"))) process.exitCode = 1;
@@ -25497,10 +25658,10 @@ async function gatherWorktreeContext() {
     if (s) stages.push({ path: wt.path, port: s.port });
   }
   const worktreeGitRoot = await currentRepoWorktreeGitRoot(repoRoot2);
-  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path30.dirname)((0, import_node_path30.dirname)(worktreeGitRoot)) : repoRoot2;
+  const primaryRepoRoot = worktreeGitRoot ? (0, import_node_path31.dirname)((0, import_node_path31.dirname)(worktreeGitRoot)) : repoRoot2;
   const wtRoot = siblingMmiWorktreesRoot(primaryRepoRoot);
   let orphanDirs = [];
-  if ((0, import_node_fs30.existsSync)(wtRoot)) {
+  if ((0, import_node_fs31.existsSync)(wtRoot)) {
     orphanDirs = scanOrphanDirs(wtRoot, worktreeGitRoot, {
       ...defaultOrphanDirScanDeps,
       listDirs: (root) => worktreeScanDirs(root, primaryRepoRoot, defaultOrphanDirScanDeps.listDirs, isRepoCheckoutDir)
@@ -25514,16 +25675,19 @@ async function bestEffortGit(args, cwd, step, timeoutMs = GIT_TIMEOUT_MS) {
     await execFileP2("git", fullArgs, { timeout: timeoutMs });
     return { step, status: "done" };
   } catch (e) {
-    const msg = e.message.split("\n")[0];
-    if (/not found|already|no such|does not exist|not a valid|couldn't|unable to resolve/i.test(msg)) {
+    const err = e;
+    const detail = `${err.message}
+${err.stderr ?? ""}`;
+    if (/not found|already|no such|does not exist|not a valid|couldn't|unable to resolve/i.test(detail)) {
       return { step, status: "already gone" };
     }
+    const msg = (err.stderr?.trim() || err.message).split("\n")[0];
     return { step, status: `failed: ${msg}` };
   }
 }
 
 // src/issue-commands.ts
-var import_node_fs31 = require("node:fs");
+var import_node_fs32 = require("node:fs");
 var import_node_crypto5 = require("node:crypto");
 var ghRunner = async (args, timeoutMs) => (await execFileP2("gh", args, { timeout: timeoutMs })).stdout;
 var ReparentConflictError = class extends Error {
@@ -25541,7 +25705,7 @@ async function editIssue(client, options, deps = {}) {
   const url = `https://github.com/${repo}/issues/${parsed.number}`;
   const patch = {};
   let bodyChanged = false;
-  const textDeps = () => deps.textDeps ?? { readFile: (p, e) => Promise.resolve((0, import_node_fs31.readFileSync)(p, e)), readStdin: () => Promise.resolve("") };
+  const textDeps = () => deps.textDeps ?? { readFile: (p, e) => Promise.resolve((0, import_node_fs32.readFileSync)(p, e)), readStdin: () => Promise.resolve("") };
   if (options.titleFile !== void 0) {
     patch.title = await resolveIssueTitle({ title: options.title, titleFile: options.titleFile }, textDeps());
   } else if (options.title !== void 0) {
@@ -26104,7 +26268,7 @@ function extendCreateCommand(issue2, batchAttach) {
     if (opts.batch) {
       let specs;
       try {
-        const raw = (0, import_node_fs31.readFileSync)(opts.batch, "utf8");
+        const raw = (0, import_node_fs32.readFileSync)(opts.batch, "utf8");
         specs = JSON.parse(raw);
         if (!Array.isArray(specs)) throw new Error("batch file must contain a JSON array");
       } catch (e) {
@@ -26178,8 +26342,8 @@ ${lines}`, {
 }
 
 // src/train-commands.ts
-var import_node_fs32 = require("node:fs");
-var import_node_path31 = require("node:path");
+var import_node_fs33 = require("node:fs");
+var import_node_path32 = require("node:path");
 
 // src/train-status.ts
 function buildTrainStatusReport(input) {
@@ -26219,7 +26383,7 @@ function formatTrainStatus(r) {
 // src/train-commands.ts
 function readRepoVersion() {
   try {
-    return JSON.parse((0, import_node_fs32.readFileSync)((0, import_node_path31.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
+    return JSON.parse((0, import_node_fs33.readFileSync)((0, import_node_path32.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
   } catch {
     return void 0;
   }
@@ -26365,11 +26529,12 @@ function registerDeployCommands(program3) {
 }
 
 // src/discovery-commands.ts
-var import_node_fs33 = require("node:fs");
-var import_node_os11 = require("node:os");
-var import_node_path32 = require("node:path");
+var import_node_fs34 = require("node:fs");
+var import_node_os12 = require("node:os");
+var import_node_path33 = require("node:path");
 var GC_GH_TIMEOUT_MS3 = 2e4;
 async function collectStatus() {
+  const repo = await resolveRepo();
   let branch = "";
   try {
     branch = (await execFileP2("git", ["rev-parse", "--abbrev-ref", "HEAD"], { timeout: GIT_TIMEOUT_MS })).stdout.trim();
@@ -26398,7 +26563,7 @@ async function collectStatus() {
   }
   let claimedItems = [];
   try {
-    const cfg = await loadConfig();
+    const cfg = await loadConfigOrDiscover();
     if (cfg.sagaApiUrl) {
       const report = await readBoard({ config: cfg });
       claimedItems = report.primary.userOwned.map((item) => ({
@@ -26421,7 +26586,7 @@ async function collectStatus() {
   } catch {
     stage = { running: false };
   }
-  return { branch, worktrees, myOpenPrs, claimedItems, stage };
+  return { repo, branch, worktrees, myOpenPrs, claimedItems, stage };
 }
 var PRIORITY_RANK = {
   Urgent: 0,
@@ -26429,14 +26594,14 @@ var PRIORITY_RANK = {
   Medium: 2,
   Low: 3
 };
-async function recommendNext(deps) {
-  const load = deps?.loadConfig ?? loadConfig;
+async function recommendNext(repo, deps) {
+  const load = deps?.loadConfig ?? loadConfigForRepo;
   const reader = deps?.readBoard ?? readBoard;
-  const cfg = await load();
+  const cfg = await load(repo);
   if (!cfg.sagaApiUrl) throw new Error("Hub API URL not configured \u2014 the board was NOT read (run `mmi-cli doctor`)");
   let report;
   try {
-    report = await reader({ config: cfg });
+    report = await reader({ config: cfg, repo });
   } catch (e) {
     throw new Error(
       `board unreachable \u2014 ${e.message}. This is NOT an empty board: confirm the ACTIVE gh account can see this repo (\`gh auth status\`, \`gh repo view <owner/repo>\`; \`gh auth switch --user <other>\` when more than one account is present).`
@@ -26542,10 +26707,10 @@ async function collectOnboardStatus() {
     else if (top) nextCommand = `mmi-cli board claim ${top.number}  # ${top.title}`;
     else nextCommand = "mmi-cli board read \u2014 no claimable items found";
   }
-  const home = (0, import_node_os11.homedir)();
+  const home = (0, import_node_os12.homedir)();
   const plugin = onboardPluginGate({
-    readKnown: () => readFileSyncSafe((0, import_node_path32.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs33.readFileSync),
-    readSettings: () => readFileSyncSafe((0, import_node_path32.join)(home, ".claude", "settings.json"), import_node_fs33.readFileSync)
+    readKnown: () => readFileSyncSafe((0, import_node_path33.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs34.readFileSync),
+    readSettings: () => readFileSyncSafe((0, import_node_path33.join)(home, ".claude", "settings.json"), import_node_fs34.readFileSync)
   });
   return { track, board, registry: registry2, secrets, plugin, nextCommand };
 }
@@ -26556,6 +26721,7 @@ function registerDiscoveryCommands(program3) {
       if (o.json) {
         console.log(JSON.stringify(report, null, 2));
       } else {
+        console.log(`repo: ${report.repo ?? "unknown"}`);
         console.log(`branch: ${report.branch}`);
         console.log(`worktrees: ${report.worktrees.length} linked`);
         console.log(`my open PRs: ${report.myOpenPrs.length}`);
@@ -26566,9 +26732,9 @@ function registerDiscoveryCommands(program3) {
       fail(`status: ${e.message}`);
     }
   });
-  program3.command("next").description("recommend the next actionable board item (claimable, unblocked, priority-ranked)").action(async () => {
+  program3.command("next").description("recommend the next actionable board item (claimable, unblocked, priority-ranked)").option("--repo <owner/repo>", "current repo (defaults to git origin)").action(async (o) => {
     try {
-      const item = await recommendNext();
+      const item = await recommendNext(o.repo);
       if (!item) {
         console.log("No claimable board items found (board read OK).");
         return;
@@ -28688,17 +28854,17 @@ function parseOriginRepo(remoteUrl) {
 }
 function ghHostsConfigPath(env, platform2) {
   const sep2 = platform2 === "win32" ? "\\" : "/";
-  const join29 = (...parts) => parts.join(sep2);
+  const join30 = (...parts) => parts.join(sep2);
   const explicit = env.GH_CONFIG_DIR?.trim();
-  if (explicit) return join29(explicit, "hosts.yml");
+  if (explicit) return join30(explicit, "hosts.yml");
   if (platform2 === "win32") {
     const appData = (env.AppData ?? env.APPDATA)?.trim();
-    return appData ? join29(appData, "GitHub CLI", "hosts.yml") : void 0;
+    return appData ? join30(appData, "GitHub CLI", "hosts.yml") : void 0;
   }
   const xdg = env.XDG_CONFIG_HOME?.trim();
-  if (xdg) return join29(xdg, "gh", "hosts.yml");
+  if (xdg) return join30(xdg, "gh", "hosts.yml");
   const home = env.HOME?.trim();
-  return home ? join29(home, ".config", "gh", "hosts.yml") : void 0;
+  return home ? join30(home, ".config", "gh", "hosts.yml") : void 0;
 }
 function parseGhHostsAccounts(yaml, host = "github.com") {
   let hostIndent = null;
@@ -28748,9 +28914,9 @@ function ghAccountCaveat(announcedLogin, accounts) {
 }
 
 // src/doctor-io.ts
-var import_node_fs34 = require("node:fs");
-var import_node_os12 = require("node:os");
-var import_node_path33 = require("node:path");
+var import_node_fs35 = require("node:fs");
+var import_node_os13 = require("node:os");
+var import_node_path34 = require("node:path");
 var import_node_child_process15 = require("node:child_process");
 var import_node_util8 = require("node:util");
 var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process15.execFile);
@@ -28758,7 +28924,7 @@ var MMI_PLUGIN_ID2 = "mmi@mutmutco";
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
-      (0, import_node_fs34.readFileSync)((0, import_node_path33.join)((0, import_node_os12.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
+      (0, import_node_fs35.readFileSync)((0, import_node_path34.join)((0, import_node_os13.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
     );
     const versions = (file.plugins?.[MMI_PLUGIN_ID2] ?? []).map((r) => r.version).filter((v) => Boolean(v));
     if (versions.length === 0) return void 0;
@@ -28769,7 +28935,7 @@ function installedClaudePluginVersion() {
 }
 function manifestVersion(path2) {
   try {
-    const manifest = JSON.parse((0, import_node_fs34.readFileSync)(path2, "utf8"));
+    const manifest = JSON.parse((0, import_node_fs35.readFileSync)(path2, "utf8"));
     return typeof manifest.version === "string" && manifest.version.trim() ? manifest.version.trim() : void 0;
   } catch {
     return void 0;
@@ -28779,17 +28945,17 @@ function installedSurfacePluginVersion(surface) {
   const token = surfaceToken(surface);
   if (token === "kilo") {
     try {
-      const stamp = (0, import_node_fs34.readFileSync)((0, import_node_path33.join)((0, import_node_os12.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
+      const stamp = (0, import_node_fs35.readFileSync)((0, import_node_path34.join)((0, import_node_os13.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
       return stamp || void 0;
     } catch {
       return void 0;
     }
   }
   if (token === "cursor") {
-    return manifestVersion((0, import_node_path33.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path34.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
   }
   if (token === "kimi") {
-    return manifestVersion((0, import_node_path33.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path34.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
   }
   if (token === "claude") return installedClaudePluginVersion();
   if (token !== "codex") return void 0;
@@ -28827,13 +28993,13 @@ function worktreeRootSync() {
 }
 var gitignorePath = () => {
   const root = worktreeRootSync();
-  return root === null ? null : (0, import_node_path33.join)(root, ".gitignore");
+  return root === null ? null : (0, import_node_path34.join)(root, ".gitignore");
 };
 function readGitignore() {
   const path2 = gitignorePath();
   if (path2 === null) return null;
   try {
-    return (0, import_node_fs34.readFileSync)(path2, "utf8");
+    return (0, import_node_fs35.readFileSync)(path2, "utf8");
   } catch {
     return null;
   }
@@ -28842,7 +29008,7 @@ function writeGitignore(content) {
   const path2 = gitignorePath();
   if (path2 === null) return false;
   try {
-    (0, import_node_fs34.writeFileSync)(path2, content, "utf8");
+    (0, import_node_fs35.writeFileSync)(path2, content, "utf8");
     return true;
   } catch {
     return false;
@@ -28866,7 +29032,7 @@ async function repoRoot() {
 }
 function hasRepoLocalWorktrees() {
   const root = worktreeRootSync();
-  return root !== null && (0, import_node_fs34.existsSync)((0, import_node_path33.join)(root, ".worktrees"));
+  return root !== null && (0, import_node_fs35.existsSync)((0, import_node_path34.join)(root, ".worktrees"));
 }
 
 // src/index.ts
@@ -28902,8 +29068,8 @@ ${r.stderr ?? ""}`).catch(() => "");
 function ghMultiAccountCaveat(announcedLogin) {
   try {
     const hostsPath = ghHostsConfigPath(process.env, process.platform);
-    if (!hostsPath || !(0, import_node_fs35.existsSync)(hostsPath)) return void 0;
-    return ghAccountCaveat(announcedLogin, parseGhHostsAccounts((0, import_node_fs35.readFileSync)(hostsPath, "utf8")));
+    if (!hostsPath || !(0, import_node_fs36.existsSync)(hostsPath)) return void 0;
+    return ghAccountCaveat(announcedLogin, parseGhHostsAccounts((0, import_node_fs36.readFileSync)(hostsPath, "utf8")));
   } catch {
     return void 0;
   }
@@ -28911,12 +29077,12 @@ function ghMultiAccountCaveat(announcedLogin) {
 var ENV_HEAL_LOCK_STALE_MS = 10 * 6e4;
 var ENV_HEAL_LOCK_MAX_WAIT_MS = 2 * 6e4;
 function envHealLockPath(home) {
-  return (0, import_node_path34.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
+  return (0, import_node_path35.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
 }
 async function withEnvHealLock(what, run) {
   try {
     return await withFileLock(
-      envHealLockPath((0, import_node_os13.homedir)()),
+      envHealLockPath((0, import_node_os14.homedir)()),
       { staleMs: ENV_HEAL_LOCK_STALE_MS, maxWaitMs: ENV_HEAL_LOCK_MAX_WAIT_MS, label: "mmi env-heal lock" },
       run
     );
@@ -29013,7 +29179,7 @@ function mmiDoctorDeps(opts = {}) {
       const configRoot = surfaceConfigRoot(surface);
       const running = surface === "codex" ? installedActivePluginVersion(surface) : runningPluginVersion(process.env, resolveClientVersion());
       const plan = buildPluginCachePlan(
-        (0, import_node_os13.homedir)(),
+        (0, import_node_os14.homedir)(),
         running,
         pluginCacheFsDeps(configRoot, () => 0),
         { configRoot, includeStaging: surface !== "codex" }
@@ -29034,15 +29200,31 @@ function mmiDoctorDeps(opts = {}) {
     marketplaceRows: () => {
       try {
         if (detectSurface(process.env) === "codex") return [];
-        const home = (0, import_node_os13.homedir)();
-        return marketplaceRows(
+        const home = (0, import_node_os14.homedir)();
+        const rows = marketplaceRows(
           MMI_MARKETPLACE_NAME,
-          readFileSyncSafe((0, import_node_path34.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs35.readFileSync),
-          readFileSyncSafe((0, import_node_path34.join)(home, ".claude", "settings.json"), import_node_fs35.readFileSync),
+          readFileSyncSafe((0, import_node_path35.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs36.readFileSync),
+          readFileSyncSafe((0, import_node_path35.join)(home, ".claude", "settings.json"), import_node_fs36.readFileSync),
           // #3974: this CLI heals these rows, so report mode names the doctor run rather than the hand
           // edit. Unconditional — it is a fact about mmi-cli, not about the lane this run is on.
           true
         );
+        const pending = readMarketplacePinPending(
+          (0, import_node_path35.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"),
+          MMI_MARKETPLACE_NAME
+        );
+        if (!pending) return rows;
+        return rows.map((row) => {
+          if (row.id !== "marketplace-catalog-ref" || row.ok) return row;
+          const { fix: _fix, reportOnly: _reportOnly, ...rest } = row;
+          return {
+            ...rest,
+            ok: true,
+            warn: true,
+            detail: `pending restart \u2014 doctor pinned main at ${pending.at}; restart Claude Code to load it`,
+            verbose: [...row.verbose ?? [], "known_marketplaces.json was rewritten by the running Claude host after the verified doctor write"]
+          };
+        });
       } catch {
         return [];
       }
@@ -29052,7 +29234,13 @@ function mmiDoctorDeps(opts = {}) {
     healMarketplacePins: () => {
       try {
         if (detectSurface(process.env) === "codex") return void 0;
-        return applyOrgMarketplacePins((0, import_node_path34.join)((0, import_node_os13.homedir)(), ...KNOWN_MARKETPLACES_RELATIVE), [MMI_MARKETPLACE_NAME]);
+        const home = (0, import_node_os14.homedir)();
+        const names = [MMI_MARKETPLACE_NAME];
+        const result = applyOrgMarketplacePins((0, import_node_path35.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), names);
+        if (result?.startsWith("pinned ")) {
+          writeMarketplacePinPending((0, import_node_path35.join)(home, ".claude", "plugins", ".mmi-marketplace-pin-pending.json"), names);
+        }
+        return result;
       } catch {
         return void 0;
       }
@@ -29258,19 +29446,19 @@ program2.hook("preAction", async (_thisCommand, actionCommand) => {
 });
 var rules = program2.command("rules").description("org-managed .gitignore delivery");
 rules.command("gitignore").option("--write", "upsert the managed block into .gitignore (default: check only, non-zero exit on drift)").option("--json", "machine-readable output").description("verify (or --write) this repo's org-managed .gitignore block matches the SSOT").action((opts) => {
-  const path2 = (0, import_node_path34.join)(process.cwd(), ".gitignore");
-  const current = (0, import_node_fs35.existsSync)(path2) ? (0, import_node_fs35.readFileSync)(path2, "utf8") : null;
+  const path2 = (0, import_node_path35.join)(process.cwd(), ".gitignore");
+  const current = (0, import_node_fs36.existsSync)(path2) ? (0, import_node_fs36.readFileSync)(path2, "utf8") : null;
   const plan = planManagedGitignore(current);
   const drift = [...plan.added.map((l) => `+${l}`), ...plan.removed.map((l) => `-${l}`)].join(", ") || "block normalize";
   if (opts.json) {
-    if (opts.write && plan.changed) (0, import_node_fs35.writeFileSync)(path2, plan.content, "utf8");
+    if (opts.write && plan.changed) (0, import_node_fs36.writeFileSync)(path2, plan.content, "utf8");
     console.log(JSON.stringify(plan, null, 2));
     if (!opts.write && plan.changed) process.exitCode = 1;
     return;
   }
   if (opts.write) {
     if (plan.changed) {
-      (0, import_node_fs35.writeFileSync)(path2, plan.content, "utf8");
+      (0, import_node_fs36.writeFileSync)(path2, plan.content, "utf8");
       console.log(`mmi-cli org rules gitignore: updated .gitignore (${drift})`);
     } else {
       console.log("mmi-cli org rules gitignore: up to date");
@@ -29425,8 +29613,8 @@ gcCmd.option("--dry-run", "show what would be deleted (default)").option("--appl
   if (!Number.isFinite(limit) || limit < 1) return fail("worktree gc: --limit must be a positive integer");
   let root;
   if (o.root !== void 0) {
-    root = (0, import_node_path34.resolve)(o.root);
-    if (!(0, import_node_fs35.existsSync)(root) || !(0, import_node_fs35.statSync)(root).isDirectory()) return fail(`worktree gc: --root ${o.root} is not a directory`);
+    root = (0, import_node_path35.resolve)(o.root);
+    if (!(0, import_node_fs36.existsSync)(root) || !(0, import_node_fs36.statSync)(root).isDirectory()) return fail(`worktree gc: --root ${o.root} is not a directory`);
     const gcRepoRoot = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim() || process.cwd();
     if (isPathUnderDirectory(gcRepoRoot, root)) {
       return fail(`worktree gc: --root ${root} contains this checkout \u2014 name a worktrees root, not the repo or an ancestor of it`);
@@ -29491,7 +29679,7 @@ async function primaryCheckoutRoot(from) {
   return primaryCheckoutRootOf(async (args) => (await execFileP2("git", ["-C", from, ...args], { timeout: GIT_TIMEOUT_MS })).stdout);
 }
 async function unprovenWorktreeReason(wtPath, repoRoot2) {
-  if (!(0, import_node_fs35.existsSync)(wtPath)) return `${wtPath} does not exist on disk`;
+  if (!(0, import_node_fs36.existsSync)(wtPath)) return `${wtPath} does not exist on disk`;
   const porcelain = (await execFileP2("git", ["-C", repoRoot2, "worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout;
   const registered = parseWorktreePorcelainEntries(porcelain);
   if (!registered.length) {
@@ -29505,6 +29693,7 @@ async function unprovenWorktreeReason(wtPath, repoRoot2) {
 function makeProvisionDeps(worktreeRoot, quiet, log) {
   return {
     runInstall: (command, cwd) => runWorktreeInstall(command, cwd, quiet),
+    validateInstall: (cwd) => runWorktreeInstall("npm ls --depth=0 --json", cwd, true).then(() => true).catch(() => false),
     primaryCheckout: () => primaryCheckoutRoot(worktreeRoot),
     log
   };
@@ -29512,26 +29701,26 @@ function makeProvisionDeps(worktreeRoot, quiet, log) {
 function acquireWorktreeSetupLock(worktreeRoot) {
   const lockPath = repoRuntimeStatePath(worktreeRoot, "worktree-setup.lock");
   const take = () => {
-    const fd = (0, import_node_fs35.openSync)(lockPath, "wx");
+    const fd = (0, import_node_fs36.openSync)(lockPath, "wx");
     try {
-      (0, import_node_fs35.writeSync)(fd, String(Date.now()));
+      (0, import_node_fs36.writeSync)(fd, String(Date.now()));
     } finally {
-      (0, import_node_fs35.closeSync)(fd);
+      (0, import_node_fs36.closeSync)(fd);
     }
     return () => {
       try {
-        (0, import_node_fs35.rmSync)(lockPath, { force: true });
+        (0, import_node_fs36.rmSync)(lockPath, { force: true });
       } catch {
       }
     };
   };
   try {
-    (0, import_node_fs35.mkdirSync)((0, import_node_path34.dirname)(lockPath), { recursive: true });
+    (0, import_node_fs36.mkdirSync)((0, import_node_path35.dirname)(lockPath), { recursive: true });
     return take();
   } catch {
     try {
-      if (Date.now() - (0, import_node_fs35.statSync)(lockPath).mtimeMs > WORKTREE_SETUP_LOCK_TTL_MS) {
-        (0, import_node_fs35.rmSync)(lockPath, { force: true });
+      if (Date.now() - (0, import_node_fs36.statSync)(lockPath).mtimeMs > WORKTREE_SETUP_LOCK_TTL_MS) {
+        (0, import_node_fs36.rmSync)(lockPath, { force: true });
         return take();
       }
     } catch {
@@ -29587,22 +29776,52 @@ withExamples(mutating(
       const localOnly = preferRemote && base !== preferRemote ? ` (no ${preferRemote} \u2014 local ref)` : "";
       console.error(`  base ${base} ${baseSha}${localOnly}`);
     }
-    step = `git worktree add ${wtPath}`;
-    await addWorktreeRobust(wtPath, branch, base, {
-      git: async (args) => (await execFileP2("git", args, { timeout: GH_MUTATION_TIMEOUT_MS })).stdout,
-      revParse: async (ref) => {
-        try {
-          return (await execFileP2("git", ["rev-parse", "--verify", ref], { timeout: GIT_TIMEOUT_MS })).stdout.trim() || void 0;
-        } catch {
-          return void 0;
+    const registered = parseWorktreePorcelainEntries((await execFileP2(
+      "git",
+      ["-C", repoRoot2, "worktree", "list", "--porcelain"],
+      { timeout: GIT_TIMEOUT_MS }
+    )).stdout);
+    const exact = registered.find((entry) => samePath(entry.path, wtPath));
+    let resumed = false;
+    if (exact) {
+      step = `resume existing worktree ${wtPath}`;
+      if (exact.branch !== branch) {
+        return fail(`worktree create: ${wtPath} is already registered for '${exact.branch ?? "detached HEAD"}', not '${branch}'`);
+      }
+      const status = (await execFileP2("git", ["-C", wtPath, "status", "--porcelain"], { timeout: GIT_TIMEOUT_MS })).stdout.trim();
+      if (status) return fail(`worktree create: refusing to resume ${wtPath} \u2014 it has uncommitted changes`);
+      const head = await revParseRef(`refs/heads/${branch}`);
+      const baseOid = await revParseRef(base);
+      if (!head || !baseOid) return fail(`worktree create: could not prove '${branch}' and '${base}' before resume`);
+      const canFastForward = await execFileP2(
+        "git",
+        ["-C", repoRoot2, "merge-base", "--is-ancestor", head, baseOid],
+        { timeout: GIT_TIMEOUT_MS }
+      ).then(() => true).catch(() => false);
+      if (!canFastForward) {
+        return fail(`worktree create: refusing to resume '${branch}' \u2014 it has local commits or diverges from ${base}`);
+      }
+      await execFileP2("git", ["-C", wtPath, "merge", "--ff-only", base], { timeout: GIT_TIMEOUT_MS });
+      resumed = true;
+    }
+    if (!resumed) {
+      step = `git worktree add ${wtPath}`;
+      await addWorktreeRobust(wtPath, branch, base, {
+        git: async (args) => (await execFileP2("git", args, { timeout: GH_MUTATION_TIMEOUT_MS })).stdout,
+        revParse: async (ref) => {
+          try {
+            return (await execFileP2("git", ["rev-parse", "--verify", ref], { timeout: GIT_TIMEOUT_MS })).stdout.trim() || void 0;
+          } catch {
+            return void 0;
+          }
+        },
+        deleteBranch: (b) => execFileP2("git", ["branch", "-D", b], { timeout: GIT_TIMEOUT_MS }).then(() => void 0),
+        sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
+        log: (m) => {
+          if (!o.json) console.error(`  ${m}`);
         }
-      },
-      deleteBranch: (b) => execFileP2("git", ["branch", "-D", b], { timeout: GIT_TIMEOUT_MS }).then(() => void 0),
-      sleep: (ms) => new Promise((resolve5) => setTimeout(resolve5, ms)),
-      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) => {
       if (!o.json) console.error(`  ${m}`);
@@ -29642,12 +29861,13 @@ withExamples(mutating(
         branch,
         path: wtPath,
         base,
+        resumed,
         ...report,
         ...issueForm && selector ? { issue: `${selector.repo}#${selector.number}` } : {},
         ...issueForm && o.claim ? { claim: claimError ? { ok: false, error: claimError } : claim } : {}
       }, null, 2));
     }
-    console.log(`worktree ready: ${wtPath} (branch ${branch} from ${base})`);
+    console.log(`worktree ready: ${wtPath} (branch ${branch} ${resumed ? "resumed at" : "from"} ${base})`);
     console.log(`  installed: ${report.installed.map((i) => i.dir || ".").join(", ") || "none"}`);
     console.log(`  copied: ${report.copied.join(", ") || "none"}`);
     if (issueForm && o.claim && selector) {
@@ -30133,7 +30353,7 @@ project.command("set [owner/repo]").description("upsert project META (idempotent
   if (dupe) return fail(`org project set: KEY "${dupe}" was passed to both --var and --set; --set is an alias of --var, so pass each KEY once`);
   if (o.secretsFile) {
     try {
-      vars.push(`secrets=${(0, import_node_fs35.readFileSync)(o.secretsFile, "utf8")}`);
+      vars.push(`secrets=${(0, import_node_fs36.readFileSync)(o.secretsFile, "utf8")}`);
     } catch (e) {
       return fail(`org project set: cannot read --secrets-file ${o.secretsFile}: ${e.message}`);
     }
@@ -30881,11 +31101,11 @@ pr.command("view <number>").description("read a PR as structured JSON (merged st
   }
 });
 async function listCiWorkflowPaths(cwd = process.cwd()) {
-  const wfDir = (0, import_node_path34.join)(cwd, ".github", "workflows");
-  if (!(0, import_node_fs35.existsSync)(wfDir)) return [];
-  return (0, import_node_fs35.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
+  const wfDir = (0, import_node_path35.join)(cwd, ".github", "workflows");
+  if (!(0, import_node_fs36.existsSync)(wfDir)) return [];
+  return (0, import_node_fs36.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
     try {
-      return workflowReportsPrChecks((0, import_node_fs35.readFileSync)((0, import_node_path34.join)(wfDir, name), "utf8"));
+      return workflowReportsPrChecks((0, import_node_fs36.readFileSync)((0, import_node_path35.join)(wfDir, name), "utf8"));
     } catch {
       return true;
     }
@@ -30917,16 +31137,16 @@ function ciAuditDeps() {
     // gate re-seed step is skipped gracefully rather than failing mid-run.
     readSeedFile: (path2) => {
       if (!root) return null;
-      const fullPath = (0, import_node_path34.join)(root, path2);
-      return (0, import_node_fs35.existsSync)(fullPath) ? (0, import_node_fs35.readFileSync)(fullPath, "utf8") : null;
+      const fullPath = (0, import_node_path35.join)(root, path2);
+      return (0, import_node_fs36.existsSync)(fullPath) ? (0, import_node_fs36.readFileSync)(fullPath, "utf8") : null;
     }
   };
 }
 function hubRoot() {
-  const fromPkg = (0, import_node_path34.join)(__dirname, "..", "..");
+  const fromPkg = (0, import_node_path35.join)(__dirname, "..", "..");
   const marker = "skills/bootstrap/seeds/manifest.json";
-  if ((0, import_node_fs35.existsSync)((0, import_node_path34.join)(fromPkg, marker))) return fromPkg;
-  if ((0, import_node_fs35.existsSync)((0, import_node_path34.join)(process.cwd(), marker))) return process.cwd();
+  if ((0, import_node_fs36.existsSync)((0, import_node_path35.join)(fromPkg, marker))) return fromPkg;
+  if ((0, import_node_fs36.existsSync)((0, import_node_path35.join)(process.cwd(), marker))) return process.cwd();
   return null;
 }
 pr.command("ci-policy").description("report merge CI policy: wait-for-checks vs no-ci (for grind/build agents)").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the current checkout)").action(async (o) => {
@@ -31055,6 +31275,10 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
       return false;
     }
   });
+  if (result.status !== "failed") {
+    const repoFlag = result.repo ? ` --repo ${result.repo}` : "";
+    console.warn(`pr land: merge confirmed; cleanup pending \u2014 if this process is interrupted, resume with: mmi-cli pr merge ${number}${repoFlag} --squash`);
+  }
   if (result.status !== "failed") {
     try {
       const { stdout } = await execFileP2(process.execPath, [
@@ -31229,7 +31453,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     localCleanup = await cleanupPrMergeLocalBranch(headRef, {
       beforeWorktrees,
       startingPath,
-      pathExists: (p) => (0, import_node_fs35.existsSync)(p),
+      pathExists: (p) => (0, import_node_fs36.existsSync)(p),
       execGit: async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout,
       teardownWorktreeStage,
       deferredStore,
@@ -31704,12 +31928,12 @@ access.command("audit").description("audit collaborator roles + train-branch pus
     targets = resolution.targets;
   }
   const derivedMatrix = registryProjects ? accessMatrixFromProjects(registryProjects) : {};
-  const fileMatrix = (0, import_node_fs35.existsSync)("access-matrix.json") ? loadAccessMatrix((0, import_node_fs35.readFileSync)("access-matrix.json", "utf8")) : {};
+  const fileMatrix = (0, import_node_fs36.existsSync)("access-matrix.json") ? loadAccessMatrix((0, import_node_fs36.readFileSync)("access-matrix.json", "utf8")) : {};
   const matrix = mergeAccessMatrix(fileMatrix, derivedMatrix);
   const derivedContracts = registryProjects ? dataAccessContractsFromProjects(registryProjects) : { consumers: {} };
-  const fileContracts = (0, import_node_fs35.existsSync)("data-access-contracts.json") ? loadDataAccessContracts((0, import_node_fs35.readFileSync)("data-access-contracts.json", "utf8")) : { consumers: {} };
+  const fileContracts = (0, import_node_fs36.existsSync)("data-access-contracts.json") ? loadDataAccessContracts((0, import_node_fs36.readFileSync)("data-access-contracts.json", "utf8")) : { consumers: {} };
   const dataAccess = mergeDataAccessContracts(fileContracts, derivedContracts);
-  const sanctioned = (0, import_node_fs35.existsSync)("access-matrix.json") ? loadSanctionedAdmins((0, import_node_fs35.readFileSync)("access-matrix.json", "utf8")) : {};
+  const sanctioned = (0, import_node_fs36.existsSync)("access-matrix.json") ? loadSanctionedAdmins((0, import_node_fs36.readFileSync)("access-matrix.json", "utf8")) : {};
   const report = await auditOrgAccess(targets, deps, matrix, dataAccess, sanctioned);
   console.log(o.json ? JSON.stringify(report, null, 2) : renderAccessReport(report));
   if (!report.ok) process.exitCode = 1;
@@ -31741,16 +31965,16 @@ function directoryBytes(path2) {
   let total = 0;
   let entries;
   try {
-    entries = (0, import_node_fs35.readdirSync)(path2, { withFileTypes: true });
+    entries = (0, import_node_fs36.readdirSync)(path2, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const child2 = (0, import_node_path34.join)(path2, entry.name);
+    const child2 = (0, import_node_path35.join)(path2, entry.name);
     if (entry.isDirectory()) total += directoryBytes(child2);
     else {
       try {
-        total += (0, import_node_fs35.statSync)(child2).size;
+        total += (0, import_node_fs36.statSync)(child2).size;
       } catch {
       }
     }
@@ -31758,25 +31982,25 @@ function directoryBytes(path2) {
   return total;
 }
 function listDirEntries(dir) {
-  return (0, import_node_fs35.readdirSync)(dir, { withFileTypes: true }).map((d) => ({ name: d.name, isDirectory: d.isDirectory() }));
+  return (0, import_node_fs36.readdirSync)(dir, { withFileTypes: true }).map((d) => ({ name: d.name, isDirectory: d.isDirectory() }));
 }
 function readInstalledPluginRefs(configRoot) {
   const p = installedPluginsPathForConfig(configRoot);
-  if (!(0, import_node_fs35.existsSync)(p)) return [];
+  if (!(0, import_node_fs36.existsSync)(p)) return [];
   try {
-    return installedPluginPaths((0, import_node_fs35.readFileSync)(p, "utf8"));
+    return installedPluginPaths((0, import_node_fs36.readFileSync)(p, "utf8"));
   } catch {
     return null;
   }
 }
 function pluginCacheFsDeps(configRoot, dirBytes) {
   return {
-    exists: (p) => (0, import_node_fs35.existsSync)(p),
-    listVersionDirs: (root) => (0, import_node_fs35.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name),
+    exists: (p) => (0, import_node_fs36.existsSync)(p),
+    listVersionDirs: (root) => (0, import_node_fs36.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name),
     dirBytes,
-    listStagingDirs: (root) => (0, import_node_fs35.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
+    listStagingDirs: (root) => (0, import_node_fs36.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
       try {
-        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path34.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs35.statSync)(p).mtimeMs) };
+        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path35.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs36.statSync)(p).mtimeMs) };
       } catch {
         return { name: d.name, mtimeMs: Date.now() };
       }
@@ -31790,10 +32014,10 @@ function stagingApplyFsGuard(configRoot) {
   return {
     referencedPaths: () => readInstalledPluginRefs(configRoot),
     mtimeMs: (name) => {
-      const p = (0, import_node_path34.join)(stagingRoot, name);
-      if (!(0, import_node_fs35.existsSync)(p)) return null;
+      const p = (0, import_node_path35.join)(stagingRoot, name);
+      if (!(0, import_node_fs36.existsSync)(p)) return null;
       try {
-        return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs35.statSync)(q).mtimeMs);
+        return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs36.statSync)(q).mtimeMs);
       } catch {
         return null;
       }
@@ -31813,13 +32037,13 @@ program2.command("plugin-prune").description(`prune stale cached MMI plugin vers
     return;
   }
   const plan = buildPluginCachePlan(
-    (0, import_node_os13.homedir)(),
+    (0, import_node_os14.homedir)(),
     running,
     pluginCacheFsDeps(configRoot, directoryBytes),
     { withBytes: true, configRoot, includeStaging: surface !== "codex" }
   );
   const anythingToDelete = plan.prune.length > 0 || plan.staging.length > 0;
-  const result = o.apply && anythingToDelete ? applyPluginCachePlan(plan, (p) => (0, import_node_fs35.rmSync)(p, { recursive: true, force: true }), stagingApplyFsGuard(configRoot)) : void 0;
+  const result = o.apply && anythingToDelete ? applyPluginCachePlan(plan, (p) => (0, import_node_fs36.rmSync)(p, { recursive: true, force: true }), stagingApplyFsGuard(configRoot)) : void 0;
   const warnings = plan.prune.length > 0 ? [CONCURRENT_SESSION_WARNING] : [];
   if (o.json) console.log(JSON.stringify({ ...plan, warnings, applied: result ?? null }));
   else console.log(renderPluginCachePlan(plan, result));