@mutmutco/cli 4.1.9 → 4.1.10

package/dist/main.cjs

@@ -5860,7 +5860,7 @@ var program = new Command();
 
 // src/index.ts
 var import_promises8 = require("node:fs/promises");
-var import_node_fs46 = require("node:fs");
+var import_node_fs48 = require("node:fs");
 var import_node_child_process21 = require("node:child_process");
 init_cli_shared();
 
@@ -6902,7 +6902,7 @@ function commandLadderHint() {
 }
 
 // src/index.ts
-var import_node_path42 = require("node:path");
+var import_node_path43 = require("node:path");
 
 // src/merge-ci-policy.ts
 function resolveMergeCiPolicy(input) {
@@ -13152,10 +13152,10 @@ var rollout_plan_default = {
     note: "The v4.0.0 stamp happens at cut time (D6e #4463); until then the candidate is the origin/development head artifacts (built cli/dist + npm pack), identity proven by dist content hash (D6a)."
   },
   baseline: {
-    version: "4.1.9",
-    tag: "v4.1.9",
-    commit: "4edf781e31f0",
-    npm: "@mutmutco/cli@4.1.9"
+    version: "4.1.10",
+    tag: "v4.1.10",
+    commit: "2a913c6e917e",
+    npm: "@mutmutco/cli@4.1.10"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -13172,14 +13172,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.1.9"
+          v3Target: "v4.1.10"
         }
       ],
       rollbackTrigger: "Any red inside the post-contract soak window: `devops train gate` FAIL attributable to the v4 doors, Hub endpoint health probe failure, a pre-v4 client admitted instead of receiving actionable HTTP 426, or npm consumer install/doctor failure on the v4-only dist.",
       rollback: {
         independent: true,
-        mechanism: "npm dist-tag latest -> 4.1.9 and redeploy the Hub Lambda from tag v4.1.9 (4edf781e31f0); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.1.9 (@mutmutco/cli@4.1.9, tag commit 4edf781e31f0 \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.1.10 and redeploy the Hub Lambda from tag v4.1.10 (2a913c6e917e); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.1.10 (@mutmutco/cli@4.1.10, tag commit 2a913c6e917e \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -16909,6 +16909,7 @@ async function preflight(deps, ctx, stage, meta) {
     throw new Error(`${ctx.repo} is not Hub-deployed (deployModel=none) \u2014 the release train does not apply; use the project's own release path`);
   }
   await deps.runSelf(["secrets", "preflight", "--stage", stage, "--repo", ctx.repo]);
+  await assertNpmMajorPreflightFromWorkflows(deps, ctx.repo);
   await assertActionsJobsCanStart(deps, ctx.repo);
   enforceGateBudget(deps, ctx.repo);
   if (model === "hub-serverless") {
@@ -17161,10 +17162,49 @@ function resolveGreenGateNpmFromGateWorkflows(files) {
   const pin = preferGateNodePin(files.flatMap((file) => parseGateNodeVersionPins(file.body)));
   return pin ? bundledNpmForNodePin(pin) : void 0;
 }
+function parsePublishWorkflowNpmPin(workflowBody) {
+  const match = /(?:^|[^\w])npm@(\d+\.\d+\.\d+)/m.exec(workflowBody);
+  return match?.[1];
+}
+function resolveExpectedCiNpmFromWorkflows(gateFiles, allFiles) {
+  const fromGate = resolveGreenGateNpmFromGateWorkflows(gateFiles);
+  if (fromGate) return fromGate;
+  const files = allFiles ?? gateFiles;
+  if (!files?.length) return void 0;
+  const publish = files.find((f) => /(?:^|\/)publish\.ya?ml$/i.test(f.path));
+  return publish ? parsePublishWorkflowNpmPin(publish.body) : void 0;
+}
 function npmMajor(version) {
   const match = /^(\d+)/.exec(version.trim());
   return match ? Number(match[1]) : void 0;
 }
+function assertNpmMajorPreflight(opts) {
+  const expectedNpm = opts.expectedNpm?.trim();
+  if (!expectedNpm) return;
+  const localNpm = opts.localNpm.trim();
+  const localMajor = npmMajor(localNpm);
+  const expectedMajor = npmMajor(expectedNpm);
+  if (localMajor === void 0 || expectedMajor === void 0) return;
+  if (localMajor === expectedMajor) return;
+  throw new Error(
+    `${opts.repo}: Step 0a npm-major preflight failed \u2014 local npm ${localNpm} (major ${localMajor}) \u2260 CI npm ${expectedNpm} (major ${expectedMajor}). Align local npm before --apply: \`npm install -g npm@${expectedNpm}\`. This is an npm-major mismatch (#5666/#5616/#4578), not a lockfile or publish-surface problem. When gate.yml has no bundled npm pin, read the publish workflow npm pin; otherwise compare \`npm -v\` with the green gate log's toolchain-preflight line (#3446).`
+  );
+}
+async function assertNpmMajorPreflightFromWorkflows(deps, repo) {
+  const gateFiles = (deps.readGateWorkflows ?? readLocalGateWorkflows)();
+  const allFiles = (deps.readWorkflows ?? readLocalWorkflows)();
+  let localNpm;
+  try {
+    localNpm = clean2(await deps.run("npm", ["-v"]));
+  } catch {
+    return;
+  }
+  assertNpmMajorPreflight({
+    repo,
+    localNpm,
+    expectedNpm: resolveExpectedCiNpmFromWorkflows(gateFiles, allFiles)
+  });
+}
 function subprocessFailureDetail(e) {
   if (!(e instanceof Error)) return String(e);
   const err = e;
@@ -17211,7 +17251,10 @@ async function verifyPublishDryRun(deps, ctx, meta, deployModel) {
       localNpm = clean2(await deps.run("npm", ["-v"]));
     } catch {
     }
-    const gateNpm = resolveGreenGateNpmFromGateWorkflows((deps.readGateWorkflows ?? readLocalGateWorkflows)());
+    const gateNpm = resolveExpectedCiNpmFromWorkflows(
+      (deps.readGateWorkflows ?? readLocalGateWorkflows)(),
+      (deps.readWorkflows ?? readLocalWorkflows)()
+    );
     throw classifyPublishDryRunFailure({
       repo: ctx.repo,
       publishDir,
@@ -33415,6 +33458,396 @@ async function remoteBranchExists2(branch, options = {}) {
   }
 }
 
+// src/worktree-merge-cleanup.ts
+var import_node_fs42 = require("node:fs");
+init_cli_shared();
+
+// src/worktree-evidence-archive.ts
+var import_node_fs41 = require("node:fs");
+var import_node_path38 = require("node:path");
+var JERV_ARTIFACT_RUN_SCOPE_ENV_VARS = ["JERV_RUN_ID", ...SESSION_ID_ENV_VARS];
+function sanitizeArchiveSegment(value, max = 80) {
+  const scrubbed = value.replace(/[^A-Za-z0-9._@+-]+/g, "-").replace(/^-+|-+$/g, "");
+  return (scrubbed || "unknown").slice(0, max);
+}
+function resolveArtifactRunScope(env = process.env) {
+  for (const key of JERV_ARTIFACT_RUN_SCOPE_ENV_VARS) {
+    const value = env[key]?.trim();
+    if (value) return sanitizeArchiveSegment(value);
+  }
+  return "no-run";
+}
+function defaultIsDirectory(path2) {
+  try {
+    return (0, import_node_fs41.lstatSync)(path2).isDirectory();
+  } catch {
+    return false;
+  }
+}
+function archiveWorktreeJervArtifacts(args, deps = {}) {
+  const exists = deps.exists ?? import_node_fs41.existsSync;
+  const isDirectory = deps.isDirectory ?? defaultIsDirectory;
+  const copyDir = deps.copyDir ?? ((from, to) => (0, import_node_fs41.cpSync)(from, to, { recursive: true, force: true }));
+  const mkdirp = deps.mkdirp ?? ((path2) => {
+    (0, import_node_fs41.mkdirSync)(path2, { recursive: true });
+  });
+  const env = deps.env ?? process.env;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  const resolveRoot = deps.resolveArchiveRoot ?? repoRuntimeStatePath;
+  if (!args.primaryRoot?.trim()) return { status: "skipped", reason: "missing-primary-root" };
+  if (!args.worktreePath?.trim()) return { status: "skipped", reason: "missing-worktree-path" };
+  const source = (0, import_node_path38.join)(args.worktreePath, ".jerv");
+  if (!exists(source)) return { status: "absent" };
+  if (!isDirectory(source)) return { status: "skipped", reason: "jerv-not-a-directory" };
+  const runScope = resolveArtifactRunScope(env);
+  const branchSlug = sanitizeArchiveSegment(args.branch.replace(/[/\\]+/g, "-"), 40);
+  const stamp = now().toISOString().replace(/[:.]/g, "-");
+  const dest = resolveRoot(args.primaryRoot, "jerv-artifacts", runScope, branchSlug, stamp, ".jerv");
+  try {
+    mkdirp((0, import_node_path38.dirname)(dest));
+    copyDir(source, dest);
+    if (!exists(dest)) return { status: "failed", error: `archive write left no directory at ${dest}` };
+    return { status: "archived", path: dest, runScope };
+  } catch (e) {
+    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
+  }
+}
+function defaultStat(path2) {
+  const st = (0, import_node_fs41.statSync)(path2);
+  return { mtimeMs: st.mtimeMs, size: st.size, isDirectory: () => st.isDirectory() };
+}
+function scanWorktreeTmpEvidence(worktreePath, newerThanMs, deps = {}) {
+  const exists = deps.exists ?? import_node_fs41.existsSync;
+  const stat4 = deps.stat ?? defaultStat;
+  const readdir2 = deps.readdir ?? import_node_fs41.readdirSync;
+  const tmpRoot = (0, import_node_path38.join)(worktreePath, "tmp");
+  if (!exists(tmpRoot)) return [];
+  const entries = [];
+  const walk2 = (dir) => {
+    let names;
+    try {
+      names = readdir2(dir);
+    } catch {
+      return;
+    }
+    for (const name of names) {
+      const full = (0, import_node_path38.join)(dir, name);
+      let st;
+      try {
+        st = stat4(full);
+      } catch {
+        continue;
+      }
+      const relPath = (0, import_node_path38.relative)(worktreePath, full).replace(/\\/g, "/");
+      if (st.isDirectory()) {
+        if (st.mtimeMs > newerThanMs) entries.push({ relPath, bytes: 0, mtimeMs: st.mtimeMs });
+        walk2(full);
+        continue;
+      }
+      if (st.mtimeMs > newerThanMs) entries.push({ relPath, bytes: st.size, mtimeMs: st.mtimeMs });
+    }
+  };
+  walk2(tmpRoot);
+  entries.sort((a, b) => a.relPath.localeCompare(b.relPath));
+  return entries;
+}
+function archiveWorktreeTmpArtifacts(args, deps = {}) {
+  const exists = deps.exists ?? import_node_fs41.existsSync;
+  const copyDir = deps.copyDir ?? ((from, to) => (0, import_node_fs41.cpSync)(from, to, { recursive: true, force: true }));
+  const mkdirp = deps.mkdirp ?? ((path2) => {
+    (0, import_node_fs41.mkdirSync)(path2, { recursive: true });
+  });
+  const env = deps.env ?? process.env;
+  const now = deps.now ?? (() => /* @__PURE__ */ new Date());
+  const resolveRoot = deps.resolveArchiveRoot ?? repoRuntimeStatePath;
+  if (!args.primaryRoot?.trim()) return { status: "skipped", reason: "missing-primary-root" };
+  if (!args.worktreePath?.trim()) return { status: "skipped", reason: "missing-worktree-path" };
+  const scanned = scanWorktreeTmpEvidence(args.worktreePath, args.newerThanMs, deps);
+  const source = (0, import_node_path38.join)(args.worktreePath, "tmp");
+  if (!scanned.length) return { status: "absent" };
+  if (!exists(source)) return { status: "absent" };
+  const runScope = resolveArtifactRunScope(env);
+  const branchSlug = sanitizeArchiveSegment(args.branch.replace(/[/\\]+/g, "-"), 40);
+  const stamp = now().toISOString().replace(/[:.]/g, "-");
+  const dest = resolveRoot(args.primaryRoot, "worktree-artifacts", runScope, branchSlug, stamp, "tmp");
+  try {
+    mkdirp((0, import_node_path38.dirname)(dest));
+    copyDir(source, dest);
+    if (!exists(dest)) return { status: "failed", error: `archive write left no directory at ${dest}` };
+    const bytes = scanned.reduce((sum, e) => sum + e.bytes, 0);
+    return { status: "archived", path: dest, runScope, entries: scanned.length, bytes };
+  } catch (e) {
+    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
+  }
+}
+function archiveWorktreeArtifacts(args, deps = {}) {
+  return {
+    jerv: archiveWorktreeJervArtifacts(args, deps),
+    tmp: archiveWorktreeTmpArtifacts(args, deps)
+  };
+}
+function evaluateTmpEvidenceRemovalGuard(input) {
+  if (!input.tmpEvidence.length) return { blocked: false };
+  if (input.tmpArchive.status === "archived") return { blocked: false };
+  if (input.tmpArchive.status === "failed") {
+    return {
+      blocked: true,
+      reason: `tmp evidence archive failed \u2014 ${input.tmpArchive.error}`,
+      wouldDelete: input.tmpEvidence.map((e) => e.relPath)
+    };
+  }
+  if (input.gcAcknowledged) return { blocked: false, wouldDelete: input.tmpEvidence.map((e) => e.relPath) };
+  const sample = input.tmpEvidence.slice(0, 8).map((e) => e.relPath);
+  const more = input.tmpEvidence.length > sample.length ? ` (+${input.tmpEvidence.length - sample.length} more)` : "";
+  return {
+    blocked: true,
+    reason: `worktree tmp evidence would be destroyed (${input.tmpEvidence.length} path(s) newer than the branch base) \u2014 re-run with --gc to acknowledge deletion, or copy tmp/ out first`,
+    wouldDelete: sample.concat(more ? [`${input.tmpEvidence.length} total under tmp/`] : [])
+  };
+}
+function parseCommitTimestampSec(stdout) {
+  const trimmed = stdout.trim();
+  if (!/^\d+$/.test(trimmed)) return void 0;
+  const sec = Number(trimmed);
+  return Number.isFinite(sec) && sec > 0 ? sec : void 0;
+}
+function formatArtifactsArchiveReceipt(archive) {
+  const jervArchived = archive.jerv.status === "archived";
+  const tmpArchived = archive.tmp.status === "archived";
+  if (jervArchived || tmpArchived) {
+    const path2 = archive.tmp.status === "archived" ? archive.tmp.path : archive.jerv.status === "archived" ? archive.jerv.path : void 0;
+    return {
+      status: "archived",
+      jerv: archive.jerv,
+      tmp: archive.tmp,
+      path: path2
+    };
+  }
+  if (archive.jerv.status === "absent" && archive.tmp.status === "absent") {
+    return { status: "absent", jerv: archive.jerv, tmp: archive.tmp };
+  }
+  if (archive.tmp.status === "failed") {
+    return { status: "blocked", jerv: archive.jerv, tmp: archive.tmp, error: archive.tmp.error };
+  }
+  if (archive.jerv.status === "failed") {
+    return { status: "blocked", jerv: archive.jerv, tmp: archive.tmp, error: archive.jerv.error };
+  }
+  return { status: "partial", jerv: archive.jerv, tmp: archive.tmp };
+}
+
+// src/worktree-merge-cleanup.ts
+function normPath2(p) {
+  return p.replace(/\\/g, "/").replace(/\/+$/, "");
+}
+function samePath(a, b) {
+  const na = normPath2(a);
+  const nb = normPath2(b);
+  return process.platform === "win32" ? na.toLowerCase() === nb.toLowerCase() : na === nb;
+}
+function selectPrMergeCleanupWorktree(branch, before, after, startingPath) {
+  if (!branch) return void 0;
+  const current = after.find((w) => w.branch === branch)?.path;
+  if (current) return current;
+  const previous = before.find((w) => w.branch === branch)?.path;
+  if (previous) return previous;
+  if (startingPath && before.some((w) => w.branch === branch && samePath(w.path, startingPath))) return startingPath;
+  return void 0;
+}
+function selectSafeWorktreeCwd(worktrees, targetPath, options) {
+  if (!targetPath) return void 0;
+  const exists = options?.pathExists ?? (() => true);
+  return worktrees.find((w) => !samePath(w.path, targetPath) && exists(w.path))?.path;
+}
+async function resolveMergeBaseTimestampMs(git3, baseRef, branch) {
+  try {
+    const mergeBase = (await git3(["merge-base", baseRef, branch])).trim();
+    if (!mergeBase) return 0;
+    const sec = parseCommitTimestampSec(await git3(["show", "-s", "--format=%ct", mergeBase]));
+    return sec ? sec * 1e3 : 0;
+  } catch {
+    return 0;
+  }
+}
+async function verifyBranchHead(git3, branch, expectedHeadOid) {
+  if (!expectedHeadOid) return { ok: false, reason: "branch-head-unverified" };
+  const currentHead = (await git3(["rev-parse", `refs/heads/${branch}`]).catch(() => "") || "").trim();
+  if (!currentHead) return { ok: false, reason: "branch-head-unverified" };
+  if (currentHead !== expectedHeadOid) {
+    return { ok: false, reason: "unpushed-branch", error: `${currentHead} != ${expectedHeadOid}` };
+  }
+  return { ok: true };
+}
+async function teardownWorktreeStage(worktreePath) {
+  try {
+    const result = await stopStage({ cwd: worktreePath, requiredIdentityCwd: worktreePath, globalStatePath: false });
+    return { status: result.ok ? "stopped" : "failed", ...result.ok ? {} : { error: result.message } };
+  } catch (e) {
+    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
+  }
+}
+async function removeWorktree(wtPath, git3) {
+  try {
+    await git3(["worktree", "remove", "--force", wtPath]);
+    await git3(["worktree", "prune"]).catch(() => "");
+    return { status: "removed" };
+  } catch (e) {
+    return { status: "failed", error: e instanceof Error ? e.message : String(e) };
+  }
+}
+async function cleanupPrMergeLocalBranch(branch, options) {
+  const report = { branch };
+  if (!branch) {
+    report.localBranch = { name: branch, status: "not-attempted", reason: "missing-branch" };
+    return report;
+  }
+  if (isProtectedBranch(branch)) {
+    report.localBranch = { name: branch, status: "not-attempted", reason: "protected-branch" };
+    return report;
+  }
+  const execGit = options.execGit ?? (async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout);
+  const pathExists = options.pathExists ?? import_node_fs42.existsSync;
+  let afterWorktrees = [];
+  try {
+    afterWorktrees = parseGitWorktreePorcelain(await execGit(["worktree", "list", "--porcelain"]));
+  } catch (e) {
+    report.localBranch = {
+      name: branch,
+      status: "not-attempted",
+      reason: "worktree-list-failed",
+      error: e instanceof Error ? e.message : String(e)
+    };
+    return report;
+  }
+  const beforeWorktrees = options.beforeWorktrees ?? [];
+  const wtPath = selectPrMergeCleanupWorktree(branch, beforeWorktrees, afterWorktrees, options.startingPath);
+  if (options.preserveWorktree) {
+    if (wtPath) report.worktree = { path: wtPath, status: "preserved", reason: "preserve-worktree" };
+    report.localBranch = { name: branch, status: "not-attempted", reason: "preserve-worktree" };
+    return report;
+  }
+  const mainWorktreePath = beforeWorktrees[0]?.path ?? afterWorktrees[0]?.path;
+  const mainWorktreeTarget = Boolean(wtPath && mainWorktreePath && samePath(wtPath, mainWorktreePath));
+  if (!wtPath || mainWorktreeTarget) {
+    if (wtPath && mainWorktreeTarget) {
+      report.worktree = { path: wtPath, status: "not-attempted", reason: "main-worktree" };
+    }
+    report.localBranch = { name: branch, status: "not-attempted", reason: wtPath ? "main-worktree" : "no-worktree" };
+    return report;
+  }
+  const safeCwd = selectSafeWorktreeCwd([...afterWorktrees, ...beforeWorktrees], wtPath, { pathExists });
+  const git3 = (args) => safeCwd ? execGit(["-C", safeCwd, ...args]) : execGit(args);
+  const headCheck = await verifyBranchHead(git3, branch, options.expectedHeadOid);
+  if (!headCheck.ok) {
+    report.localBranch = {
+      name: branch,
+      status: "not-attempted",
+      reason: headCheck.reason,
+      ...headCheck.error ? { error: headCheck.error } : {}
+    };
+    return report;
+  }
+  const porcelain = await execGit(["-C", wtPath, "status", "--porcelain"]).catch(() => void 0);
+  if (porcelain?.trim()) {
+    report.worktree = { path: wtPath, status: "refused", reason: "dirty-worktree" };
+    report.localBranch = { name: branch, status: "not-attempted", reason: "dirty-worktree" };
+    return report;
+  }
+  const newerThanMs = await resolveMergeBaseTimestampMs(
+    (args) => execGit(["-C", wtPath, ...args]),
+    options.baseRef,
+    branch
+  );
+  const tmpEvidence = scanWorktreeTmpEvidence(wtPath, newerThanMs, { exists: pathExists });
+  const stageTeardown = await teardownWorktreeStage(wtPath);
+  const artifactsArchiveRaw = archiveWorktreeArtifacts({
+    worktreePath: wtPath,
+    primaryRoot: options.primaryRoot,
+    branch,
+    newerThanMs
+  });
+  const artifactsArchive = formatArtifactsArchiveReceipt(artifactsArchiveRaw);
+  const tmpGuard = evaluateTmpEvidenceRemovalGuard({
+    tmpEvidence,
+    tmpArchive: artifactsArchiveRaw.tmp,
+    gcAcknowledged: Boolean(options.gcAcknowledged)
+  });
+  if (tmpGuard.blocked) {
+    report.worktree = {
+      path: wtPath,
+      status: "refused",
+      reason: "tmp-evidence",
+      error: tmpGuard.reason,
+      artifactsArchive,
+      stageTeardown,
+      tmpEvidenceCount: tmpEvidence.length
+    };
+    report.localBranch = { name: branch, status: "not-attempted", reason: "tmp-evidence" };
+    return report;
+  }
+  if (artifactsArchive.status === "blocked") {
+    report.worktree = {
+      path: wtPath,
+      status: "refused",
+      reason: "archive-failed",
+      error: artifactsArchive.error,
+      artifactsArchive,
+      stageTeardown,
+      tmpEvidenceCount: tmpEvidence.length
+    };
+    report.localBranch = { name: branch, status: "not-attempted", reason: "archive-failed" };
+    return report;
+  }
+  const removal = await removeWorktree(wtPath, git3);
+  if (removal.status === "failed") {
+    report.worktree = {
+      path: wtPath,
+      status: "failed",
+      error: removal.error,
+      artifactsArchive,
+      stageTeardown,
+      tmpEvidenceCount: tmpEvidence.length
+    };
+    report.localBranch = { name: branch, status: "not-attempted", reason: "worktree-removal-failed" };
+    return report;
+  }
+  report.worktree = {
+    path: wtPath,
+    status: "removed",
+    artifactsArchive,
+    stageTeardown,
+    tmpEvidenceCount: tmpEvidence.length
+  };
+  try {
+    await git3(["branch", "-D", branch]);
+    report.localBranch = { name: branch, status: "deleted" };
+  } catch (e) {
+    const remaining = await git3(["branch", "--list", branch]).catch(() => "");
+    report.localBranch = remaining.trim() ? { name: branch, status: "failed", error: e instanceof Error ? e.message : String(e) } : { name: branch, status: "already-gone" };
+  }
+  return report;
+}
+function renderPrMergeCleanupLines(cleanup) {
+  const wt = cleanup?.worktree;
+  if (!wt?.path) return [];
+  const lines = [];
+  if (wt.status === "removed") {
+    lines.push(`pr merge: removed worktree ${wt.path} \u2014 that directory is gone; cd elsewhere before your next command`);
+  } else if (wt.status === "refused") {
+    lines.push(`pr merge: worktree ${wt.path} kept \u2014 ${wt.reason ?? "refused"}${wt.error ? `: ${wt.error}` : ""}`);
+    if (wt.tmpEvidenceCount) lines.push(`pr merge: ${wt.tmpEvidenceCount} tmp path(s) newer than branch base would have been destroyed`);
+  } else if (wt.status === "failed") {
+    lines.push(`pr merge: worktree ${wt.path} removal failed${wt.error ? ` \u2014 ${wt.error}` : ""}`);
+  } else if (wt.status === "preserved") {
+    lines.push(`pr merge: preserved worktree ${wt.path} (--preserve-worktree)`);
+  }
+  if (wt.artifactsArchive?.status === "archived" && wt.artifactsArchive.path) {
+    lines.push(`pr merge: archived worktree evidence to ${wt.artifactsArchive.path}`);
+  } else if (wt.artifactsArchive?.status === "blocked" && wt.artifactsArchive.error) {
+    lines.push(`pr merge: evidence archive failed \u2014 ${wt.artifactsArchive.error}`);
+  }
+  return lines;
+}
+
 // src/board-commands.ts
 init_cli_shared();
 init_clean_exit();
@@ -34119,7 +34552,7 @@ async function checkDocsIndexAtHead(opts, deps) {
 }
 
 // src/issue-commands.ts
-var import_node_fs41 = require("node:fs");
+var import_node_fs43 = require("node:fs");
 var import_node_crypto16 = require("node:crypto");
 init_cli_shared();
 init_clean_exit();
@@ -34312,7 +34745,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_fs41.readFileSync)(p, e)), readStdin: () => Promise.resolve("") };
+  const textDeps = () => deps.textDeps ?? { readFile: (p, e) => Promise.resolve((0, import_node_fs43.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) {
@@ -34929,7 +35362,7 @@ function extendCreateCommand(issue2, batchAttach) {
     if (opts.batch) {
       let specs;
       try {
-        const raw = (0, import_node_fs41.readFileSync)(opts.batch, "utf8");
+        const raw = (0, import_node_fs43.readFileSync)(opts.batch, "utf8");
         specs = JSON.parse(raw);
         if (!Array.isArray(specs)) throw new Error("batch file must contain a JSON array");
       } catch (e) {
@@ -35004,8 +35437,8 @@ ${lines}`, {
 }
 
 // src/train-commands.ts
-var import_node_fs42 = require("node:fs");
-var import_node_path38 = require("node:path");
+var import_node_fs44 = require("node:fs");
+var import_node_path39 = require("node:path");
 init_cli_shared();
 init_clean_exit();
 init_client_version();
@@ -35020,7 +35453,7 @@ function resolveReleaseBumpIntent(raw) {
 }
 function readRepoVersion() {
   try {
-    return JSON.parse((0, import_node_fs42.readFileSync)((0, import_node_path38.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
+    return JSON.parse((0, import_node_fs44.readFileSync)((0, import_node_path39.join)(process.cwd(), ".claude-plugin", "plugin.json"), "utf8")).version || void 0;
   } catch {
     return void 0;
   }
@@ -35184,9 +35617,9 @@ function registerDeployCommands(program3) {
 init_cli_shared();
 init_github_client();
 init_cli_shared();
-var import_node_fs43 = require("node:fs");
+var import_node_fs45 = require("node:fs");
 var import_node_os19 = require("node:os");
-var import_node_path39 = require("node:path");
+var import_node_path40 = require("node:path");
 init_marketplace_autoupdate();
 var GC_GH_TIMEOUT_MS2 = 2e4;
 async function collectStatus() {
@@ -35389,8 +35822,8 @@ async function collectOnboardStatus(opts = {}) {
   }
   const home = (0, import_node_os19.homedir)();
   const plugin = onboardPluginGate({
-    readKnown: () => readFileSyncSafe((0, import_node_path39.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs43.readFileSync),
-    readSettings: () => readFileSyncSafe((0, import_node_path39.join)(home, ".claude", "settings.json"), import_node_fs43.readFileSync)
+    readKnown: () => readFileSyncSafe((0, import_node_path40.join)(home, ...KNOWN_MARKETPLACES_RELATIVE), import_node_fs45.readFileSync),
+    readSettings: () => readFileSyncSafe((0, import_node_path40.join)(home, ".claude", "settings.json"), import_node_fs45.readFileSync)
   });
   return { track, board, registry: registry2, secrets, plugin, estateCli, doors: opts.doors ?? [], nextCommand };
 }
@@ -36153,8 +36586,8 @@ function registerPrLifecycleCommands(program3) {
 }
 
 // src/post-merge-recon.ts
-var import_node_fs44 = require("node:fs");
-var import_node_path40 = require("node:path");
+var import_node_fs46 = require("node:fs");
+var import_node_path41 = require("node:path");
 
 // src/cross-repo-filing-issue.ts
 init_github_client();
@@ -36321,16 +36754,16 @@ function buildPostMergeReconRecovery(input) {
 }
 function writePostMergeReconRecovery(cwd, recovery) {
   const path2 = postMergeReconStatePath(cwd, recovery.repo, recovery.pr);
-  (0, import_node_fs44.mkdirSync)((0, import_node_path40.dirname)(path2), { recursive: true });
-  (0, import_node_fs44.writeFileSync)(path2, `${JSON.stringify(recovery, null, 2)}
+  (0, import_node_fs46.mkdirSync)((0, import_node_path41.dirname)(path2), { recursive: true });
+  (0, import_node_fs46.writeFileSync)(path2, `${JSON.stringify(recovery, null, 2)}
 `, "utf8");
   return path2;
 }
 function clearPostMergeReconRecovery(cwd, repo, pr2) {
   const path2 = postMergeReconStatePath(cwd, repo, pr2);
-  if (!(0, import_node_fs44.existsSync)(path2)) return;
+  if (!(0, import_node_fs46.existsSync)(path2)) return;
   try {
-    (0, import_node_fs44.unlinkSync)(path2);
+    (0, import_node_fs46.unlinkSync)(path2);
   } catch {
   }
 }
@@ -39457,17 +39890,17 @@ function parseOriginRepo(remoteUrl) {
 }
 function ghHostsConfigPath(env, platform2) {
   const sep4 = platform2 === "win32" ? "\\" : "/";
-  const join36 = (...parts) => parts.join(sep4);
+  const join37 = (...parts) => parts.join(sep4);
   const explicit = env.GH_CONFIG_DIR?.trim();
-  if (explicit) return join36(explicit, "hosts.yml");
+  if (explicit) return join37(explicit, "hosts.yml");
   if (platform2 === "win32") {
     const appData = (env.AppData ?? env.APPDATA)?.trim();
-    return appData ? join36(appData, "GitHub CLI", "hosts.yml") : void 0;
+    return appData ? join37(appData, "GitHub CLI", "hosts.yml") : void 0;
   }
   const xdg = env.XDG_CONFIG_HOME?.trim();
-  if (xdg) return join36(xdg, "gh", "hosts.yml");
+  if (xdg) return join37(xdg, "gh", "hosts.yml");
   const home = env.HOME?.trim();
-  return home ? join36(home, ".config", "gh", "hosts.yml") : void 0;
+  return home ? join37(home, ".config", "gh", "hosts.yml") : void 0;
 }
 function parseGhHostsAccounts(yaml, host = "github.com") {
   let hostIndent = null;
@@ -39517,9 +39950,9 @@ function ghAccountCaveat(announcedLogin, accounts) {
 }
 
 // src/doctor-io.ts
-var import_node_fs45 = require("node:fs");
+var import_node_fs47 = require("node:fs");
 var import_node_os20 = require("node:os");
-var import_node_path41 = require("node:path");
+var import_node_path42 = require("node:path");
 var import_node_child_process20 = require("node:child_process");
 var import_node_util8 = require("node:util");
 init_version_lag();
@@ -39534,8 +39967,8 @@ function nodeDiscardSinkPath(platform2 = process.platform) {
 var execFileP6 = (0, import_node_util8.promisify)(import_node_child_process20.execFile);
 function execFileCapture(file, args, opts = {}) {
   const sink = nodeDiscardSinkPath();
-  const inFd = (0, import_node_fs45.openSync)(sink, "r");
-  const errFd = (0, import_node_fs45.openSync)(sink, "w");
+  const inFd = (0, import_node_fs47.openSync)(sink, "r");
+  const errFd = (0, import_node_fs47.openSync)(sink, "w");
   try {
     return (0, import_node_child_process20.execFileSync)(file, args, {
       ...opts,
@@ -39543,15 +39976,15 @@ function execFileCapture(file, args, opts = {}) {
       stdio: [inFd, "pipe", errFd]
     });
   } finally {
-    (0, import_node_fs45.closeSync)(inFd);
-    (0, import_node_fs45.closeSync)(errFd);
+    (0, import_node_fs47.closeSync)(inFd);
+    (0, import_node_fs47.closeSync)(errFd);
   }
 }
 var MMI_PLUGIN_ID2 = "mmi@mutmutco";
 function installedClaudePluginVersion() {
   try {
     const file = JSON.parse(
-      (0, import_node_fs45.readFileSync)((0, import_node_path41.join)((0, import_node_os20.homedir)(), ".claude", "plugins", "installed_plugins.json"), "utf8")
+      (0, import_node_fs47.readFileSync)((0, import_node_path42.join)((0, import_node_os20.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;
@@ -39562,7 +39995,7 @@ function installedClaudePluginVersion() {
 }
 function manifestVersion(path2) {
   try {
-    const manifest = JSON.parse((0, import_node_fs45.readFileSync)(path2, "utf8"));
+    const manifest = JSON.parse((0, import_node_fs47.readFileSync)(path2, "utf8"));
     return typeof manifest.version === "string" && manifest.version.trim() ? manifest.version.trim() : void 0;
   } catch {
     return void 0;
@@ -39571,12 +40004,12 @@ function manifestVersion(path2) {
 function readHermesPluginEvidence(env = process.env) {
   const host = hermesConfigRoot(env);
   const root = hermesPluginRoot(env);
-  const installRecordPresent = (0, import_node_fs45.existsSync)(root);
-  const manifestPath = (0, import_node_path41.join)(root, "plugin.yaml");
+  const installRecordPresent = (0, import_node_fs47.existsSync)(root);
+  const manifestPath = (0, import_node_path42.join)(root, "plugin.yaml");
   let installedVersion;
   let manifest = "missing";
   try {
-    const text = (0, import_node_fs45.readFileSync)(manifestPath, "utf8");
+    const text = (0, import_node_fs47.readFileSync)(manifestPath, "utf8");
     let version;
     try {
       const parsed = JSON.parse(text).version;
@@ -39590,20 +40023,20 @@ function readHermesPluginEvidence(env = process.env) {
     if (version) {
       installedVersion = version;
       manifest = "valid";
-    } else if ((0, import_node_fs45.existsSync)(manifestPath)) manifest = "invalid";
+    } else if ((0, import_node_fs47.existsSync)(manifestPath)) manifest = "invalid";
   } catch {
-    if ((0, import_node_fs45.existsSync)(manifestPath)) manifest = "invalid";
+    if ((0, import_node_fs47.existsSync)(manifestPath)) manifest = "invalid";
   }
   let skills = false;
   try {
-    skills = (0, import_node_fs45.existsSync)((0, import_node_path41.join)(root, "skills")) && (0, import_node_fs45.statSync)((0, import_node_path41.join)(root, "skills")).isDirectory();
+    skills = (0, import_node_fs47.existsSync)((0, import_node_path42.join)(root, "skills")) && (0, import_node_fs47.statSync)((0, import_node_path42.join)(root, "skills")).isDirectory();
   } catch {
   }
   return {
-    hostPresent: (0, import_node_fs45.existsSync)(host),
+    hostPresent: (0, import_node_fs47.existsSync)(host),
     installRecordPresent,
     manifest,
-    payloadPresent: (0, import_node_fs45.existsSync)((0, import_node_path41.join)(root, "__init__.py")) && skills && manifest === "valid",
+    payloadPresent: (0, import_node_fs47.existsSync)((0, import_node_path42.join)(root, "__init__.py")) && skills && manifest === "valid",
     ...installedVersion ? { installedVersion } : {}
   };
 }
@@ -39611,7 +40044,7 @@ function installedSurfacePluginVersion(surface) {
   const token = surfaceToken(surface);
   if (token === "kilo") {
     try {
-      const stamp = (0, import_node_fs45.readFileSync)((0, import_node_path41.join)((0, import_node_os20.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
+      const stamp = (0, import_node_fs47.readFileSync)((0, import_node_path42.join)((0, import_node_os20.homedir)(), ".kilo", ".mmi-kilo-version"), "utf8").trim();
       return stamp || void 0;
     } catch {
       return void 0;
@@ -39619,13 +40052,13 @@ function installedSurfacePluginVersion(surface) {
   }
   if (token === "hermes") return readHermesPluginEvidence().installedVersion;
   if (token === "cursor") {
-    return manifestVersion((0, import_node_path41.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path42.join)(cursorLocalPluginRoot(), ".cursor-plugin", "plugin.json"));
   }
   if (token === "jervcode") {
     return installedJervCodePackageVersion();
   }
   if (token === "kimi") {
-    return manifestVersion((0, import_node_path41.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
+    return manifestVersion((0, import_node_path42.join)(surfaceConfigRoot(surface), "plugins", "managed", "mmi", ".kimi-plugin", "plugin.json"));
   }
   if (token === "claude") return installedClaudePluginVersion();
   if (token !== "codex") return void 0;
@@ -39659,13 +40092,13 @@ function worktreeRootSync() {
 }
 var gitignorePath = () => {
   const root = worktreeRootSync();
-  return root === null ? null : (0, import_node_path41.join)(root, ".gitignore");
+  return root === null ? null : (0, import_node_path42.join)(root, ".gitignore");
 };
 function readGitignore() {
   const path2 = gitignorePath();
   if (path2 === null) return null;
   try {
-    return (0, import_node_fs45.readFileSync)(path2, "utf8");
+    return (0, import_node_fs47.readFileSync)(path2, "utf8");
   } catch {
     return null;
   }
@@ -39674,14 +40107,14 @@ function writeGitignore(content) {
   const path2 = gitignorePath();
   if (path2 === null) return false;
   try {
-    (0, import_node_fs45.writeFileSync)(path2, content, "utf8");
+    (0, import_node_fs47.writeFileSync)(path2, content, "utf8");
     return true;
   } catch {
     return false;
   }
 }
 function lineEndingState(root) {
-  const attributesPresent = (0, import_node_fs45.existsSync)((0, import_node_path41.join)(root, ".gitattributes"));
+  const attributesPresent = (0, import_node_fs47.existsSync)((0, import_node_path42.join)(root, ".gitattributes"));
   try {
     const output = execFileCapture("git", ["-C", root, "ls-files", "--eol", "--", ":(glob)**/*.sh"], {
       windowsHide: true
@@ -39748,8 +40181,8 @@ ${r.stderr ?? ""}`).catch(() => "");
 function ghMultiAccountCaveat(announcedLogin) {
   try {
     const hostsPath = ghHostsConfigPath(process.env, process.platform);
-    if (!hostsPath || !(0, import_node_fs46.existsSync)(hostsPath)) return void 0;
-    return ghAccountCaveat(announcedLogin, parseGhHostsAccounts((0, import_node_fs46.readFileSync)(hostsPath, "utf8")));
+    if (!hostsPath || !(0, import_node_fs48.existsSync)(hostsPath)) return void 0;
+    return ghAccountCaveat(announcedLogin, parseGhHostsAccounts((0, import_node_fs48.readFileSync)(hostsPath, "utf8")));
   } catch {
     return void 0;
   }
@@ -39757,7 +40190,7 @@ 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_path42.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
+  return (0, import_node_path43.join)(home, ".claude", "plugins", ".mmi-env-heal.lock");
 }
 async function withEnvHealLock(what, run) {
   try {
@@ -39894,7 +40327,7 @@ function mmiDoctorDeps(opts = {}) {
       );
       const result = applyPluginCachePlan(
         plan,
-        (p) => (0, import_node_fs46.rmSync)(p, { recursive: true }),
+        (p) => (0, import_node_fs48.rmSync)(p, { recursive: true }),
         stagingApplyFsGuard(configRoot)
       );
       return {
@@ -39932,7 +40365,7 @@ function mmiDoctorDeps(opts = {}) {
     // adopted the generated routing index (MMG-Unlive: `docs/Archive/**` only, no index, no gate.yml) would
     // get a permanent — demanding an artifact it never asked for.
     docsIndexState: (root) => {
-      if (!(0, import_node_fs46.existsSync)((0, import_node_path42.join)(root, DOCS_INDEX_PATH))) return void 0;
+      if (!(0, import_node_fs48.existsSync)((0, import_node_path43.join)(root, DOCS_INDEX_PATH))) return void 0;
       const real = createDocsIndexDeps(root);
       let docs2;
       const listDocs = () => docs2 ??= real.listDocs();
@@ -39941,7 +40374,7 @@ function mmiDoctorDeps(opts = {}) {
     },
     // #4168: working-tree heal — write if drifted, then re-check. Commit remains the operator's step.
     healDocsIndex: (root) => {
-      if (!(0, import_node_fs46.existsSync)((0, import_node_path42.join)(root, DOCS_INDEX_PATH))) return { drift: false, docCount: 0 };
+      if (!(0, import_node_fs48.existsSync)((0, import_node_path43.join)(root, DOCS_INDEX_PATH))) return { drift: false, docCount: 0 };
       const real = createDocsIndexDeps(root);
       let docs2;
       const listDocs = () => docs2 ??= real.listDocs();
@@ -40033,7 +40466,7 @@ function mmiDoctorDeps(opts = {}) {
     repoIndexCloudState: async (root) => {
       let localV4 = { state: "absent" };
       try {
-        const parsed = JSON.parse((0, import_node_fs46.readFileSync)(repoIndexV4StorePath(root), "utf8"));
+        const parsed = JSON.parse((0, import_node_fs48.readFileSync)(repoIndexV4StorePath(root), "utf8"));
         const state = parsed.status?.state;
         if (parsed.schemaVersion === 4 && (state === "ready" || state === "degraded")) {
           const chunks = parsed.manifest?.chunks?.length ?? 0;
@@ -40326,19 +40759,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_path42.join)(process.cwd(), ".gitignore");
-  const current = (0, import_node_fs46.existsSync)(path2) ? (0, import_node_fs46.readFileSync)(path2, "utf8") : null;
+  const path2 = (0, import_node_path43.join)(process.cwd(), ".gitignore");
+  const current = (0, import_node_fs48.existsSync)(path2) ? (0, import_node_fs48.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_fs46.writeFileSync)(path2, plan.content, "utf8");
+    if (opts.write && plan.changed) (0, import_node_fs48.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_fs46.writeFileSync)(path2, plan.content, "utf8");
+      (0, import_node_fs48.writeFileSync)(path2, plan.content, "utf8");
       console.log(`mmi-cli devops org rules gitignore: updated .gitignore (${drift})`);
     } else {
       console.log("mmi-cli devops org rules gitignore: up to date");
@@ -41217,7 +41650,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_fs46.readFileSync)(o.secretsFile, "utf8")}`);
+      vars.push(`secrets=${(0, import_node_fs48.readFileSync)(o.secretsFile, "utf8")}`);
     } catch (e) {
       return fail(`org project set: cannot read --secrets-file ${o.secretsFile}: ${e.message}`);
     }
@@ -42042,11 +42475,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_path42.join)(cwd, ".github", "workflows");
-  if (!(0, import_node_fs46.existsSync)(wfDir)) return [];
-  return (0, import_node_fs46.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
+  const wfDir = (0, import_node_path43.join)(cwd, ".github", "workflows");
+  if (!(0, import_node_fs48.existsSync)(wfDir)) return [];
+  return (0, import_node_fs48.readdirSync)(wfDir).filter((name) => /\.(ya?ml)$/i.test(name)).filter((name) => {
     try {
-      return workflowReportsPrChecks((0, import_node_fs46.readFileSync)((0, import_node_path42.join)(wfDir, name), "utf8"));
+      return workflowReportsPrChecks((0, import_node_fs48.readFileSync)((0, import_node_path43.join)(wfDir, name), "utf8"));
     } catch {
       return true;
     }
@@ -42098,16 +42531,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_path42.join)(root, path2);
-      return (0, import_node_fs46.existsSync)(fullPath) ? (0, import_node_fs46.readFileSync)(fullPath, "utf8") : null;
+      const fullPath = (0, import_node_path43.join)(root, path2);
+      return (0, import_node_fs48.existsSync)(fullPath) ? (0, import_node_fs48.readFileSync)(fullPath, "utf8") : null;
     }
   };
 }
 function hubRoot() {
-  const fromPkg = (0, import_node_path42.join)(__dirname, "..", "..");
+  const fromPkg = (0, import_node_path43.join)(__dirname, "..", "..");
   const marker = "skills/bootstrap/seeds/manifest.json";
-  if ((0, import_node_fs46.existsSync)((0, import_node_path42.join)(fromPkg, marker))) return fromPkg;
-  if ((0, import_node_fs46.existsSync)((0, import_node_path42.join)(process.cwd(), marker))) return process.cwd();
+  if ((0, import_node_fs48.existsSync)((0, import_node_path43.join)(fromPkg, marker))) return fromPkg;
+  if ((0, import_node_fs48.existsSync)((0, import_node_path43.join)(process.cwd(), marker))) return process.cwd();
   return null;
 }
 async function waitLoopCorePool(label) {
@@ -42370,18 +42803,19 @@ pr.command("land <number>").description("agent merge path (#1440): train probe \
   else printLine(`pr land: ${result.status}${result.error ? ` \u2014 ${result.error}` : ""}`);
   if (result.status === "failed") process.exitCode = 1;
 });
-jsonParity(pr.command("merge <number>").description("merge a PR (squash by default); the host owns local workspace lifecycle; on no-ci repos run pr ci-policy / checks-wait first (#1432)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m)`).option("--force", "acknowledge and merge past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal")).action(async (number, o) => {
+jsonParity(pr.command("merge <number>").description("merge a PR (squash by default); archives gitignored tmp/** before worktree teardown; on no-ci repos run pr ci-policy / checks-wait first (#1432, #5679)").option("--squash", "squash merge (default)").option("--merge", "create a merge commit").option("--rebase", "rebase merge").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--force", "acknowledge and merge past a remaining prunable/severe scratch housekeeping block (advisory kept plans/ never blocks, #3012) or a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal")).action(async (number, o) => {
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const repoForPostCleanup = await resolveRepo(o.repo) ?? o.repo;
-  const prMeta = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName,baseRefName", "--jq", "{head: .headRefName, base: .baseRefName}"], { timeout: GC_GH_TIMEOUT_MS }).then((r) => JSON.parse(r.stdout)).catch(async (e) => {
+  const prMeta = await execFileP2("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName,baseRefName,headRefOid", "--jq", "{head: .headRefName, base: .baseRefName, oid: .headRefOid}"], { timeout: GC_GH_TIMEOUT_MS }).then((r) => JSON.parse(r.stdout)).catch(async (e) => {
     if (!isGitHubRateLimitError(e) || !repoForPostCleanup) throw e;
     console.warn(`pr merge: gh GraphQL rate-limited \u2014 reading PR #${number} via REST instead (#4588).`);
     const snapshot = await fetchRestPrSnapshot(number, repoForPostCleanup);
-    return { head: snapshot.headRef, base: snapshot.baseRef };
+    return { head: snapshot.headRef, base: snapshot.baseRef, oid: snapshot.headSha };
   });
   const headRef = prMeta.head;
   const baseRef = prMeta.base;
+  const headRefOid = (prMeta.oid ?? "").trim() || void 0;
   const devDeployDeps = repoForPostCleanup ? registryClientDeps(await loadConfig()) : void 0;
   const devDeployPlan = repoForPostCleanup && devDeployDeps ? await planDevDeployOnDevelopmentMerge(repoForPostCleanup, baseRef, devDeployDeps).catch(() => ({ applicable: false, reason: "unreadable" })) : { applicable: false, reason: "unreadable" };
   const closingGuardInput = await withAlreadyClosedCommitTargets(
@@ -42401,6 +42835,8 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
   if (closingGuardVerdict.message) console.warn(closingGuardVerdict.message);
   const startingPath = (await execFileP2("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
   const housekeeping = assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr merge", { force: o.force });
+  const beforeWorktreesRead = await execFileP2("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).then((r) => ({ state: "ok", stdout: r.stdout })).catch((e) => ({ state: "failed", error: e.message || "git worktree list failed" }));
+  const beforeWorktrees = beforeWorktreesRead.state === "ok" ? parseGitWorktreePorcelain(beforeWorktreesRead.stdout) : [];
   const ciHeadRef = repoForPostCleanup ? await prHeadRefForCiProbe(number, repoForPostCleanup) : void 0;
   const ciPolicy = await resolveMergeCiPolicyForCheckout(o.repo, ciHeadRef);
   if (o.wait) {
@@ -42462,7 +42898,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
         }
         if (!repoForPostCleanup) throw e;
         console.warn(`pr merge: gh GraphQL rate-limited \u2014 merging PR #${number} via REST PUT instead (#4588).`);
-        const commitMessage = bodyFile ? (0, import_node_fs46.readFileSync)(bodyFile, "utf8") : void 0;
+        const commitMessage = bodyFile ? (0, import_node_fs48.readFileSync)(bodyFile, "utf8") : void 0;
         await defaultGitHubClient().rest("PUT", `repos/${repoForPostCleanup}/pulls/${number}/merge`, {
           body: { merge_method: method.slice(2), ...commitMessage ? { commit_message: commitMessage } : {} },
           timeoutMs: GH_MUTATION_TIMEOUT_MS
@@ -42540,6 +42976,30 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     return;
   }
   const remoteBranch = { branch: headRef, existedBefore: remoteBefore, attempted: false, reason: remoteNotAttemptedReason };
+  const primaryRoot = beforeWorktrees[0]?.path ?? (startingPath || process.cwd());
+  let localCleanup;
+  try {
+    localCleanup = await cleanupPrMergeLocalBranch(headRef, {
+      beforeWorktrees,
+      startingPath,
+      baseRef,
+      primaryRoot,
+      preserveWorktree: o.preserveWorktree,
+      gcAcknowledged: o.gc,
+      expectedHeadOid: headRefOid,
+      pathExists: (p) => (0, import_node_fs48.existsSync)(p),
+      execGit: async (args) => (await execFileP2("git", args, { timeout: GIT_TIMEOUT_MS })).stdout
+    });
+  } catch (e) {
+    localCleanup = {
+      branch: headRef,
+      localBranch: {
+        name: headRef,
+        status: "failed",
+        error: e instanceof Error ? e.message : String(e)
+      }
+    };
+  }
   const boardAdvance = await advanceClosedIssuesToDone2(number, repoForPostCleanup);
   const crossRepoFilingIssue = repoForPostCleanup ? await reconcileCrossRepoFilingIssue(defaultGitHubClient(), repoForPostCleanup, Number(number)) : { status: "failed", error: "could not resolve the PR repo for cross-repo filing-issue reconciliation" };
   const recovery = repoForPostCleanup ? buildPostMergeReconRecovery({
@@ -42583,6 +43043,8 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     ...methodField ? { method: methodField } : {},
     remoteBranch,
     housekeeping,
+    ...localCleanup?.worktree ? { worktree: localCleanup.worktree } : {},
+    ...localCleanup?.localBranch ? { localBranch: localCleanup.localBranch } : {},
     // `boardAdvance` keeps its published array shape; `boardAdvanceStatus` is the field a caller reads to
     // tell "merged clean" from "merged, but the board did not follow" without guessing from the exit code.
     ...boardAdvance.entries.length ? { boardAdvance: boardAdvance.entries } : {},
@@ -42591,6 +43053,7 @@ jsonParity(pr.command("merge <number>").description("merge a PR (squash by defau
     ...recovery ? { postMergeReconRecovery: recovery } : {},
     ...devDeploy ? { devDeploy: devDeploy.ok ? { dispatched: true } : { dispatched: false, manual: devDeployManual } } : {}
   }));
+  for (const line of renderPrMergeCleanupLines(localCleanup)) console.warn(line);
   if (devDeploy && !devDeploy.ok) {
     console.error(`pr merge: ${devDeployManual} (${devDeploy.detail})`);
   }
@@ -43158,12 +43621,12 @@ access.command("audit").description("audit collaborator roles + train-branch pus
     targets = resolution.targets;
   }
   const derivedMatrix = registryProjects ? accessMatrixFromProjects(registryProjects) : {};
-  const fileMatrix = (0, import_node_fs46.existsSync)("access-matrix.json") ? loadAccessMatrix((0, import_node_fs46.readFileSync)("access-matrix.json", "utf8")) : {};
+  const fileMatrix = (0, import_node_fs48.existsSync)("access-matrix.json") ? loadAccessMatrix((0, import_node_fs48.readFileSync)("access-matrix.json", "utf8")) : {};
   const matrix = mergeAccessMatrix(fileMatrix, derivedMatrix);
   const derivedContracts = registryProjects ? dataAccessContractsFromProjects(registryProjects) : { consumers: {} };
-  const fileContracts = (0, import_node_fs46.existsSync)("data-access-contracts.json") ? loadDataAccessContracts((0, import_node_fs46.readFileSync)("data-access-contracts.json", "utf8")) : { consumers: {} };
+  const fileContracts = (0, import_node_fs48.existsSync)("data-access-contracts.json") ? loadDataAccessContracts((0, import_node_fs48.readFileSync)("data-access-contracts.json", "utf8")) : { consumers: {} };
   const dataAccess = mergeDataAccessContracts(fileContracts, derivedContracts);
-  const sanctioned = (0, import_node_fs46.existsSync)("access-matrix.json") ? loadSanctionedAdmins((0, import_node_fs46.readFileSync)("access-matrix.json", "utf8")) : {};
+  const sanctioned = (0, import_node_fs48.existsSync)("access-matrix.json") ? loadSanctionedAdmins((0, import_node_fs48.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;
@@ -43195,16 +43658,16 @@ function directoryBytes(path2) {
   let total = 0;
   let entries;
   try {
-    entries = (0, import_node_fs46.readdirSync)(path2, { withFileTypes: true });
+    entries = (0, import_node_fs48.readdirSync)(path2, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const entry of entries) {
-    const child2 = (0, import_node_path42.join)(path2, entry.name);
+    const child2 = (0, import_node_path43.join)(path2, entry.name);
     if (entry.isDirectory()) total += directoryBytes(child2);
     else {
       try {
-        total += (0, import_node_fs46.statSync)(child2).size;
+        total += (0, import_node_fs48.statSync)(child2).size;
       } catch {
       }
     }
@@ -43212,25 +43675,25 @@ function directoryBytes(path2) {
   return total;
 }
 function listDirEntries(dir) {
-  return (0, import_node_fs46.readdirSync)(dir, { withFileTypes: true }).map((d) => ({ name: d.name, isDirectory: d.isDirectory() }));
+  return (0, import_node_fs48.readdirSync)(dir, { withFileTypes: true }).map((d) => ({ name: d.name, isDirectory: d.isDirectory() }));
 }
 function readInstalledPluginRefs(configRoot) {
   const p = installedPluginsPathForConfig(configRoot);
-  if (!(0, import_node_fs46.existsSync)(p)) return [];
+  if (!(0, import_node_fs48.existsSync)(p)) return [];
   try {
-    return installedPluginPaths((0, import_node_fs46.readFileSync)(p, "utf8"));
+    return installedPluginPaths((0, import_node_fs48.readFileSync)(p, "utf8"));
   } catch {
     return null;
   }
 }
 function pluginCacheFsDeps(configRoot, dirBytes) {
   return {
-    exists: (p) => (0, import_node_fs46.existsSync)(p),
-    listVersionDirs: (root) => (0, import_node_fs46.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name),
+    exists: (p) => (0, import_node_fs48.existsSync)(p),
+    listVersionDirs: (root) => (0, import_node_fs48.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => d.name),
     dirBytes,
-    listStagingDirs: (root) => (0, import_node_fs46.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
+    listStagingDirs: (root) => (0, import_node_fs48.readdirSync)(root, { withFileTypes: true }).filter((d) => d.isDirectory()).map((d) => {
       try {
-        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path42.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs46.statSync)(p).mtimeMs) };
+        return { name: d.name, mtimeMs: newestMtimeMs((0, import_node_path43.join)(root, d.name), listDirEntries, (p) => (0, import_node_fs48.statSync)(p).mtimeMs) };
       } catch {
         return { name: d.name, mtimeMs: Date.now() };
       }
@@ -43244,10 +43707,10 @@ function stagingApplyFsGuard(configRoot) {
   return {
     referencedPaths: () => readInstalledPluginRefs(configRoot),
     mtimeMs: (name) => {
-      const p = (0, import_node_path42.join)(stagingRoot, name);
-      if (!(0, import_node_fs46.existsSync)(p)) return null;
+      const p = (0, import_node_path43.join)(stagingRoot, name);
+      if (!(0, import_node_fs48.existsSync)(p)) return null;
       try {
-        return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs46.statSync)(q).mtimeMs);
+        return newestMtimeMs(p, listDirEntries, (q) => (0, import_node_fs48.statSync)(q).mtimeMs);
       } catch {
         return null;
       }
@@ -43273,7 +43736,7 @@ program2.command("plugin-prune").description(`prune stale cached MMI plugin vers
     { 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_fs46.rmSync)(p, { recursive: true, force: true }), stagingApplyFsGuard(configRoot)) : void 0;
+  const result = o.apply && anythingToDelete ? applyPluginCachePlan(plan, (p) => (0, import_node_fs48.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));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "4.1.9",
+  "version": "4.1.10",
   "description": "MMI Future CLI — the org dev toolbox and shared cross-IDE engine for every registry-declared MMI coding surface.",
   "type": "module",
   "license": "UNLICENSED",