@mutmutco/codex-plugin 4.5.195 → 4.5.197

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "mmi",
-  "version": "4.5.195",
+  "version": "4.5.197",
   "mmiCompat": "4.x",
   "description": "MMI workflow skills and org gates delivery.",
   "author": {

package/cli/dist/main.cjs

@@ -6837,11 +6837,11 @@ var import_node_fs15 = require("node:fs");
 var import_node_path12 = require("node:path");
 var PLAN_ADVISORY_AGE_MS = 30 * 24 * 36e5;
 var ROOT_SCRATCH_STALE_MS = 24 * 36e5;
-function executeScratchGc(repoRoot2, opts, now = Date.now()) {
-  const snap = collectScratchSnapshot(repoRoot2);
+function executeScratchGc(repoRoot2, opts, now = Date.now(), deps = {}) {
+  const snap = collectScratchSnapshot(repoRoot2, deps);
   const plan = planScratchGc(snap, now);
   if (!opts.apply) return { plan };
-  return { plan, applied: applyScratchGc(plan, repoRoot2, now) };
+  return { plan, applied: applyScratchGc(plan, repoRoot2, now, deps) };
 }
 function buildPrMergeScratchHousekeeping(repoRoot2, deps = {}) {
   const runScratchGc = deps.runScratchGc ?? executeScratchGc;
@@ -6954,7 +6954,8 @@ function treeOlderThan(root, now, floor) {
   }
   return true;
 }
-function applyScratchGc(plan, repoRoot2, now = Date.now()) {
+function applyScratchGc(plan, repoRoot2, now = Date.now(), deps = {}) {
+  const trackedStatus = deps.trackedStatus ?? trackedPathStatus;
   const result = { pruned: [], skipped: 0, bytes: 0 };
   let repoAnchor;
   try {
@@ -6969,7 +6970,7 @@ function applyScratchGc(plan, repoRoot2, now = Date.now()) {
         result.skipped += 1;
         continue;
       }
-      if (trackedPathStatus(c, real, repoAnchor) !== false) {
+      if (trackedStatus(c, real, repoAnchor) !== false) {
         result.skipped += 1;
         continue;
       }
@@ -7017,14 +7018,27 @@ function trackedPathStatus(c, realPath, repoAnchor) {
   const rel = (0, import_node_path12.relative)(repoAnchor, realPath).replace(/\\/g, "/");
   if (!rel || rel.startsWith("../") || rel === "..") return null;
   const gitPath = c.kind === "dir" ? `${rel.replace(/\/+$/, "")}/` : rel;
+  let hasDotGit = false;
+  try {
+    (0, import_node_fs15.lstatSync)((0, import_node_path12.join)(repoAnchor, ".git"));
+    hasDotGit = true;
+  } catch {
+    hasDotGit = false;
+  }
   try {
     (0, import_node_child_process4.execFileSync)("git", ["-C", repoAnchor, "rev-parse", "--is-inside-work-tree"], {
       windowsHide: true,
-      stdio: ["ignore", "ignore", "ignore"],
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "pipe"],
       timeout: 1e4
     });
-  } catch {
-    return false;
+  } catch (e) {
+    if (hasDotGit) return null;
+    const err = e;
+    if (err.killed || err.signal || err.code === "ETIMEDOUT" || err.code === "ENOENT") return null;
+    const stderr = typeof err.stderr === "string" ? err.stderr : Buffer.isBuffer(err.stderr) ? err.stderr.toString("utf8") : "";
+    if (/not a git repository|cannot change to/i.test(stderr)) return false;
+    return null;
   }
   try {
     const out = (0, import_node_child_process4.execFileSync)("git", ["-C", repoAnchor, "ls-files", "-z", "--", gitPath], {
@@ -7065,9 +7079,19 @@ function rootScratchDirSnapshot(root, readdir2, stat4) {
     return null;
   }
 }
+function resolveRealPathOrRaw(p, realpath) {
+  try {
+    return realpath(p);
+  } catch {
+    return p;
+  }
+}
 function collectScratchSnapshot(repoRoot2, deps = {}) {
   const readdir2 = deps.readdir ?? import_node_fs15.readdirSync;
   const stat4 = deps.stat ?? import_node_fs15.statSync;
+  const realpath = deps.realpath ?? import_node_fs15.realpathSync;
+  const trackedStatus = deps.trackedStatus ?? trackedPathStatus;
+  const repoAnchor = resolveRealPathOrRaw(repoRoot2, realpath).replace(/\\/g, "/").replace(/\/+$/, "");
   const plansRoot = (0, import_node_path12.join)(repoRoot2, "plans");
   const rootScratchFiles = [];
   try {
@@ -7078,7 +7102,12 @@ function collectScratchSnapshot(repoRoot2, deps = {}) {
         continue;
       }
       const full = (0, import_node_path12.join)(repoRoot2, ent.name);
+      const kind = isDir ? "dir" : "file";
       try {
+        const realFull = resolveRealPathOrRaw(full, realpath).replace(/\\/g, "/");
+        if (trackedStatus({ kind, path: full }, realFull, repoAnchor) === true) {
+          continue;
+        }
         if (isDir) {
           const snap = rootScratchDirSnapshot(full, readdir2, stat4);
           if (snap) rootScratchFiles.push({ path: full, dir: repoRoot2, name: ent.name, mtimeMs: snap.mtimeMs, bytes: snap.bytes, kind: "dir" });
@@ -19250,10 +19279,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.5.195",
-    tag: "v4.5.195",
-    commit: "ecbc0826abbe",
-    npm: "@mutmutco/cli@4.5.195"
+    version: "4.5.197",
+    tag: "v4.5.197",
+    commit: "52a7574dc96e",
+    npm: "@mutmutco/cli@4.5.197"
   },
   exitCriterion: "fleet-n-of-n",
   hubOnlyShortcut: "forbidden",
@@ -19270,14 +19299,14 @@ var rollout_plan_default = {
           repo: "mutmutco/mmi-hub",
           role: "canary",
           schedule: "train",
-          v3Target: "v4.5.195"
+          v3Target: "v4.5.197"
         }
       ],
       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.5.195 and redeploy the Hub Lambda from tag v4.5.195 (ecbc0826abbe); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
-        v3Target: "v4.5.195 (@mutmutco/cli@4.5.195, tag commit ecbc0826abbe \u2014 last known-good release carrying the repo-index v4-only contract)"
+        mechanism: "npm dist-tag latest -> 4.5.197 and redeploy the Hub Lambda from tag v4.5.197 (52a7574dc96e); installed clients repair via `mmi-cli doctor`. No other cohort is touched.",
+        v3Target: "v4.5.197 (@mutmutco/cli@4.5.197, tag commit 52a7574dc96e \u2014 last known-good release carrying the repo-index v4-only contract)"
       }
     },
     {
@@ -42884,19 +42913,18 @@ function evaluatePrMergeHousekeeping(report, context, force = false) {
   const failed2 = scratch?.status === "failed";
   const prunable = scratch?.safeAuto ?? 0;
   const unprunable = scratch?.skipped ?? 0;
-  if (!(failed2 || prunable > 0 || unprunable > 0)) return { blocked: false };
-  if (force) return { blocked: false };
+  if (!(failed2 || prunable > 0 || unprunable > 0) || force) return {};
   const detail = failed2 ? `scratch housekeeping failed${scratch?.error ? `: ${scratch.error}` : ""}` : `${prunable} prunable + ${unprunable} un-prunable scratch item(s) remain after cleanup`;
   return {
-    blocked: true,
-    reason: `${context} housekeeping blocked merge: ${detail}. Run host-owned scratch cleanup, then retry \u2014 or re-run \`mmi-cli ${context} --force\` to acknowledge and land anyway. (Kept advisory plans/ scratch never blocks: it is gitignored and can never reach origin.)`
+    warning: `${context} housekeeping warning (not blocking): ${detail}. Run \`mmi-cli doctor --apply\` to prune aged repo-root scratch (or \`mmi-cli doctor --verbose\` to inspect what could not be removed). Local scratch never reaches origin, so the merge proceeds.`
   };
 }
-function assertPrMergeHousekeepingClean(startingPath, context, options = {}) {
+function reportPrMergeHousekeeping(startingPath, context, options = {}) {
   const build = options.buildHousekeeping ?? ((repoRoot2) => buildPrMergeScratchHousekeeping(repoRoot2));
   const housekeeping = build(startingPath || process.cwd());
   const verdict = evaluatePrMergeHousekeeping(housekeeping, context, options.force);
-  if (verdict.blocked) throw new Error(verdict.reason);
+  if (verdict.warning) process.stderr.write(`${verdict.warning}
+`);
   return housekeeping;
 }
 async function pollGhPrChecks(prNumber, repoArgs) {
@@ -48667,7 +48695,7 @@ ${list}`);
   }
   class PrHeadBehindBaseError extends Error {
   }
-  pr.command("land <numbers...>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only. Several PR numbers land together (#8322): all are enqueued, waited on together, a queue-ejected PR is updated and re-enqueued once, a queue merge is followed by worktree/branch cleanup and board Done, and one table (or --json) reports each outcome").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--enqueue-only", "return once queue membership is confirmed; without a merge queue, land normally").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--force", "acknowledge and land 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").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict").option("--timeout <minutes>", `merge-queue wait per PR (default ${PR_LAND_QUEUE_TIMEOUT_MS / 6e4} minutes, one window per ${PR_LAND_QUEUE_BATCH_SIZE} PRs \u2014 the queue's own check timeout is 60)`).option("--preserve-worktree", "after a queue merge keep the local worktree and branch (skips the post-merge cleanup)").option("--expect-head <sha>", "pin the PR head to this full 40-hex SHA (#8456): checked before landing, after checks and by GitHub at enqueue (--match-head-commit); never updates a BEHIND head and never retries an ejection \u2014 it stops with pinnedHead.refused instead. One PR only").action(async (numbers, opts) => {
+  pr.command("land <numbers...>").description("agent merge path (#1440): train probe \u2014 checks-wait \u2014 merge --auto \u2014 poll enqueued \u2014 development PRs only. Several PR numbers land together (#8322): all are enqueued, waited on together, a queue-ejected PR is updated and re-enqueued once, a queue merge is followed by worktree/branch cleanup and board Done, and one table (or --json) reports each outcome").option("--json", "machine-readable output").option("--repo <owner/repo>", "target repo (defaults to the PR repo)").option("--enqueue-only", "return once queue membership is confirmed; without a merge queue, land normally").option("--no-require-train", "skip train-authority preflight (not recommended for autonomous agents)").option("--force", "silence the leftover-scratch warning (scratch never blocks, #8785) and acknowledge a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict").option("--timeout <minutes>", `merge-queue wait per PR (default ${PR_LAND_QUEUE_TIMEOUT_MS / 6e4} minutes, one window per ${PR_LAND_QUEUE_BATCH_SIZE} PRs \u2014 the queue's own check timeout is 60)`).option("--preserve-worktree", "after a queue merge keep the local worktree and branch (skips the post-merge cleanup)").option("--expect-head <sha>", "pin the PR head to this full 40-hex SHA (#8456): checked before landing, after checks and by GitHub at enqueue (--match-head-commit); never updates a BEHIND head and never retries an ejection \u2014 it stops with pinnedHead.refused instead. One PR only").action(async (numbers, opts) => {
     const timeoutMinutes = opts.timeout === void 0 ? void 0 : Number(opts.timeout);
     if (timeoutMinutes !== void 0 && !(timeoutMinutes > 0)) return fail("pr land: --timeout must be a positive number of minutes");
     if (opts.expectHead !== void 0) {
@@ -48692,7 +48720,7 @@ ${list}`);
       }
       const repoArgs = o.repo ? ["--repo", o.repo] : [];
       const startingPath = (await execFileP("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
-      assertPrMergeHousekeepingClean(startingPath || process.cwd(), "pr land", { force: o.force });
+      reportPrMergeHousekeeping(startingPath || process.cwd(), "pr land", { force: o.force });
       const landRepoForGuard = await resolveRepo(o.repo).catch(() => void 0) ?? o.repo;
       const landClosingGuardInput = await withAlreadyClosedCommitTargets(
         await readClosingGuardInput(number, repoArgs, landRepoForGuard, "pr land"),
@@ -48921,7 +48949,7 @@ ${list}`);
     }
     if (entries.some((e) => e.outcome !== "merged" && e.outcome !== "queued")) process.exitCode = 1;
   });
-  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); on a merge-queue base use `pr land <n> [<n>...]` instead (#8322) \u2014 this verb is refused there except for train PRs").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); from a foreign checkout the remote probe/delete address this repo and local cleanup runs only in the verified sibling checkout ../<repo>, else localBranch reports skipped-foreign-cwd and the receipt carries foreignCwd: true (#6148)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").addOption(new Option("--disable-auto", "disable a queued auto-merge without merging").conflicts(["auto", "wait", "squash", "merge", "rebase", "preserveWorktree", "gc", "squashBodyFile", "force"])).option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m) \u2014 run as a background/monitor task or under a shell timeout above that budget; a short foreground timeout (e.g. 120s) kills it after checks pass and leaves the PR open (#6027)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888); also the merge settings-proof bypass when delete_branch_on_merge cannot be proven (#6210)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--squash-body-file <path>", "squash commit body (overrides GitHub COMMIT_MESSAGES); use when a pushed commit mentions close/fix/resolve + #N that must not close (#5723)").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").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict")).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); on a merge-queue base use `pr land <n> [<n>...]` instead (#8322) \u2014 this verb is refused there except for train PRs").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); from a foreign checkout the remote probe/delete address this repo and local cleanup runs only in the verified sibling checkout ../<repo>, else localBranch reports skipped-foreign-cwd and the receipt carries foreignCwd: true (#6148)").option("--auto", "enable auto-merge \u2014 merge once the base-branch policy is satisfied (use for policy-gated repos)").addOption(new Option("--disable-auto", "disable a queued auto-merge without merging").conflicts(["auto", "wait", "squash", "merge", "rebase", "preserveWorktree", "gc", "squashBodyFile", "force"])).option("--wait", `wait for checks to reach a terminal passing verdict before merging (default budget ${PR_CHECKS_TIMEOUT_MS / 6e4}m) \u2014 run as a background/monitor task or under a shell timeout above that budget; a short foreground timeout (e.g. 120s) kills it after checks pass and leaves the PR open (#6027)`).option("--preserve-worktree", "after merge, keep the local PR worktree/branch for an active batch (#1888); also the merge settings-proof bypass when delete_branch_on_merge cannot be proven (#6210)").option("--gc", "acknowledge deleting unarchived gitignored tmp/** evidence newer than the branch base (#5679)").option("--squash-body-file <path>", "squash commit body (overrides GitHub COMMIT_MESSAGES); use when a pushed commit mentions close/fix/resolve + #N that must not close (#5723)").option("--force", "silence the leftover-scratch warning (scratch never blocks, #8785) and acknowledge a negated-closing-keyword (#3718) or ambiguous-cross-repo-closing (#4279) refusal").option("--without-review <reason>", "compatibility option; shared merge helpers do not require a review verdict")).action(async (number, o) => {
     const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
     const repoArgs = o.repo ? ["--repo", o.repo] : [];
     if (o.disableAuto) {
@@ -48981,7 +49009,7 @@ ${list}`);
       assertRemoteBranchPreservedOnMerge(repoForPostCleanup, repoSettings.deleteBranchOnMerge);
     }
     const startingPath = (await execFileP("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 housekeeping = reportPrMergeHousekeeping(startingPath || process.cwd(), "pr merge", { force: o.force });
     const beforeWorktreesRead = await execFileP("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" }));
     let beforeWorktrees = beforeWorktreesRead.state === "ok" ? parseGitWorktreePorcelain(beforeWorktreesRead.stdout) : [];
     const cwdRepo = repoFromRemoteUrl(await gitOut(["remote", "get-url", "origin"]).catch(() => ""));

package/cli/package.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/codex-plugin",
-  "version": "4.5.195",
+  "version": "4.5.197",
   "description": "MMI workflow skills and org gates delivery.",
   "author": {
     "name": "MMI Future",