@mutmutco/hub 4.6.3 → 4.6.5

package/dist/index.cjs

@@ -26,6 +26,7 @@ __export(index_exports, {
   buildWatcherCommand: () => buildWatcherCommand,
   checkAtomicity: () => checkAtomicity,
   claudeArm: () => claudeArm,
+  claudeCatalogMmiVersion: () => claudeCatalogMmiVersion,
   clearLaunchTarget: () => clearLaunchTarget,
   clearPending: () => clearPending,
   codexArm: () => codexArm,
@@ -79,6 +80,7 @@ __export(index_exports, {
   sharedDocLockTimeoutReceipt: () => sharedDocLockTimeoutReceipt,
   shippedTargetFrom: () => shippedTargetFrom,
   shouldHandOff: () => shouldHandOff,
+  stagingPrunePreview: () => stagingPrunePreview,
   statusScreen: () => statusScreen,
   surfaceArmPlan: () => surfaceArmPlan,
   systemdServiceUnit: () => systemdServiceUnit,
@@ -2510,6 +2512,9 @@ function claudeHomeDir(env) {
 function claudeMarketplacesPath(env) {
   return env.MMI_UPDATER_CLAUDE_MARKETPLACES || (0, import_node_path10.join)(claudeHomeDir(env), "plugins", "known_marketplaces.json");
 }
+function claudeLaunchTargetPath(env) {
+  return (0, import_node_path10.join)(claudeHomeDir(env), "plugins", "staging", "launch-target.json");
+}
 function ensureClaudeMarketplace(env) {
   const path = claudeMarketplacesPath(env);
   let body;
@@ -2555,7 +2560,30 @@ function claudeNpmEnv(env) {
   return { ...env, npm_config_allow_remote: "all" };
 }
 function probeClaudeLaunchStaging(env = process.env) {
-  return probeLaunchTargetVersion((0, import_node_path10.join)(claudePluginsRoot(env), "staging", "launch-target.json"), claudeMarkerVersion);
+  return probeLaunchTargetVersion(claudeLaunchTargetPath(env), claudeMarkerVersion);
+}
+function catalogVersionAt(path, pick) {
+  try {
+    const version = pick(JSON.parse((0, import_node_fs14.readFileSync)(path, "utf8")));
+    return typeof version === "string" && parseSemver(version) ? version : null;
+  } catch {
+    return null;
+  }
+}
+function claudeCatalogMmiVersion(env) {
+  let clone = null;
+  try {
+    const location = JSON.parse((0, import_node_fs14.readFileSync)(claudeMarketplacesPath(env), "utf8"))?.mutmutco?.installLocation;
+    clone = typeof location === "string" && location.trim() ? location : null;
+  } catch {
+    clone = null;
+  }
+  const root = clone ?? (0, import_node_path10.join)(claudeHomeDir(env), "plugins", "marketplaces", "mutmutco");
+  const fromCatalog = catalogVersionAt(
+    (0, import_node_path10.join)(root, ".claude-plugin", "marketplace.json"),
+    (body) => Array.isArray(body?.plugins) ? body.plugins.find((row) => row?.name === "mmi")?.version : null
+  );
+  return fromCatalog ?? catalogVersionAt((0, import_node_path10.join)(root, ".claude-plugin", "plugin.json"), (body) => body?.version);
 }
 function claudeArm(options) {
   const env = options.env ?? process.env;
@@ -2588,7 +2616,7 @@ function claudeArm(options) {
   }
   if (!marketplaceTrust.ok) return result(from, target, "defer", marketplaceTrust.detail ?? "cannot trust the mutmutco marketplace registration");
   const pluginsRoot = claudePluginsRoot(env);
-  const launchTargetPath = (0, import_node_path10.join)(pluginsRoot, "staging", "launch-target.json");
+  const launchTargetPath = claudeLaunchTargetPath(env);
   if (options.dryRun) {
     return result(from, target, "ok", `dry-run: would refresh mutmutco, stage ${target} on the Claude volume, and converge mmi@mutmutco ${from ?? "absent"} -> ${target}`);
   }
@@ -2602,6 +2630,10 @@ function claudeArm(options) {
     clearLaunchTarget(launchTargetPath);
     return result(from, target, "ok", `catalog refreshed; installed+enabled at target ${target}`);
   }
+  const catalogVersion = claudeCatalogMmiVersion(env);
+  if (catalogVersion && compareSemver(catalogVersion, target) < 0) {
+    return result(from, target, "defer", `catalog not yet at target (catalog ${catalogVersion} < target ${target}; release-align pending)`);
+  }
   const incomingRoot = (0, import_node_path10.join)(pluginsRoot, "staging", "incoming");
   const incoming = (0, import_node_path10.join)(incomingRoot, target);
   const priorLaunch = readLaunchTarget(launchTargetPath);
@@ -2687,12 +2719,13 @@ function codexArm(options) {
   if (options.dryRun) {
     return { surface: "codex", from, to: options.target, verdict: "ok", detail: `dry-run: would upgrade mutmutco and converge mmi@mutmutco ${from ?? "absent"} -> ${options.target}` };
   }
-  const upgrade = runner("codex", ["plugin", "marketplace", "upgrade", "mutmutco", "--json"], env);
+  const npmEnv = claudeNpmEnv(env);
+  const upgrade = runner("codex", ["plugin", "marketplace", "upgrade", "mutmutco", "--json"], npmEnv);
   let upgradeJson = parseJson(upgrade);
   if ((upgrade.status !== 0 || !upgradeJson || (upgradeJson.errors?.length ?? 0) > 0) && NOT_CONFIGURED.test(failure(upgrade))) {
-    const add = runner("codex", ["plugin", "marketplace", "add", repoUrl], env);
+    const add = runner("codex", ["plugin", "marketplace", "add", repoUrl], npmEnv);
     if (add.status !== 0) return { surface: "codex", from, to: options.target, verdict: "defer", detail: `mutmutco marketplace was not configured and marketplace add failed: ${failure(add)}` };
-    const retry = runner("codex", ["plugin", "marketplace", "upgrade", "mutmutco", "--json"], env);
+    const retry = runner("codex", ["plugin", "marketplace", "upgrade", "mutmutco", "--json"], npmEnv);
     upgradeJson = parseJson(retry);
     if (retry.status !== 0 || !upgradeJson || (upgradeJson.errors?.length ?? 0) > 0) {
       return { surface: "codex", from, to: options.target, verdict: "defer", detail: `marketplace upgrade failed after registration: ${failure(retry)}` };
@@ -2702,8 +2735,8 @@ function codexArm(options) {
   }
   let observed = codexMmi(runner, env);
   if (observed.error) return { surface: "codex", from, to: options.target, verdict: "defer", detail: observed.error };
-  if (!observed.row || observed.row.installed !== true || observed.row.enabled !== true) {
-    const install = runner("codex", ["plugin", "add", "mmi@mutmutco", "--json"], env);
+  if (!observed.row || !convergedAtOrAbove(observed.row.version, options.target, observed.row.installed === true && observed.row.enabled === true)) {
+    const install = runner("codex", ["plugin", "add", "mmi@mutmutco", "--json"], npmEnv);
     if (install.status !== 0) {
       return { surface: "codex", from, to: options.target, verdict: "defer", detail: `plugin add failed: ${failure(install)}` };
     }
@@ -3323,28 +3356,65 @@ function generationSets(root) {
   if (children.some((name) => parseSemver(name))) return [root];
   return children.map((name) => (0, import_node_path14.join)(root, name)).filter((path) => listDirs(path).some((name) => parseSemver(name)));
 }
-function pruneGenerations(root, category, dryRun) {
-  let reaped = 0;
+function pruneGenerations(root, category, dryRun, options = {}) {
+  const protectedPaths = options.protectedPaths ?? /* @__PURE__ */ new Set();
+  const isProtected = (path) => {
+    const dir = path.replaceAll("\\", "/");
+    for (const ref of protectedPaths) {
+      if (ref === dir || ref.startsWith(`${dir}/`)) return true;
+    }
+    return false;
+  };
+  const prunablePaths = (set, versions, incoming) => {
+    const tree = incoming && parseSemver(incoming) && !versions.includes(incoming) ? [...versions, incoming] : versions;
+    return [...tree].sort((a, b) => compareSemver(b, a)).slice(KEEP_GENERATIONS).map((version) => (0, import_node_path14.join)(set, version)).filter((path) => !isProtected(path));
+  };
+  const relName = (path) => (0, import_node_path14.relative)(root, path).replaceAll("\\", "/");
+  const collect = (incoming) => {
+    const candidates = [];
+    for (const set of generationSets(root)) {
+      candidates.push(...prunablePaths(set, listDirs(set).filter((name) => parseSemver(name)), incoming));
+    }
+    return candidates;
+  };
   const failures = [];
-  for (const set of generationSets(root)) {
-    const versions = listDirs(set).filter((name) => parseSemver(name)).sort((a, b) => compareSemver(b, a));
-    for (const version of versions.slice(KEEP_GENERATIONS)) {
-      if (dryRun) {
-        reaped += 1;
-        continue;
-      }
+  const removed = [];
+  if (!dryRun) {
+    for (const path of collect()) {
       try {
-        (0, import_node_fs20.rmSync)((0, import_node_path14.join)(set, version), { recursive: true, force: true });
-        reaped += 1;
+        (0, import_node_fs20.rmSync)(path, { recursive: true, force: true });
+        removed.push(path);
       } catch (error) {
-        failures.push(`${version}: ${error?.code ?? error?.message ?? error}`);
+        failures.push(`${(0, import_node_path14.basename)(path)}: ${error?.code ?? error?.message ?? error}`);
       }
     }
   }
-  if (!reaped && !failures.length) return { category, reaped: 0, verdict: "skip", detail: `${root}: within keep-${KEEP_GENERATIONS}` };
+  const pruned = dryRun ? collect() : removed;
+  const preview = dryRun && options.incomingTarget ? collect(options.incomingTarget) : [];
+  if (!pruned.length && !failures.length && !preview.length) return { category, reaped: 0, verdict: "skip", detail: `${root}: within keep-${KEEP_GENERATIONS}` };
   const verb = dryRun ? "dry-run: would prune" : "pruned";
   const stuck = failures.length ? `; ${failures.length} locked (${failures.join(", ")})` : "";
-  return { category, reaped, verdict: failures.length ? "defer" : "ok", detail: `${verb} ${reaped} generation(s) below keep-${KEEP_GENERATIONS} under ${root}${stuck}` };
+  const segments = [`${verb} ${pruned.length} generation(s) below keep-${KEEP_GENERATIONS} under ${root}${pruned.length ? `: ${pruned.map(relName).join(", ")}` : ""}`];
+  if (preview.length) segments.push(`after staging ${options.incomingTarget}: would prune ${preview.length} generation(s) below keep-${KEEP_GENERATIONS} under ${root}: ${preview.map(relName).join(", ")}`);
+  return { category, reaped: pruned.length, verdict: failures.length ? "defer" : "ok", detail: `${segments.join("; ")}${stuck}` };
+}
+function liveGenerationRefs(env, paths) {
+  const refs = /* @__PURE__ */ new Set();
+  const launch = readLaunchTarget(claudeLaunchTargetPath(env));
+  if (launch?.incoming) refs.add(launch.incoming.replaceAll("\\", "/"));
+  for (const pending of readPending(paths)) {
+    for (const dir of pending.dirs) refs.add(dir.replaceAll("\\", "/"));
+  }
+  return refs;
+}
+function stagingPrunePreview(options) {
+  const env = options.env ?? process.env;
+  const startedAt = import_node_perf_hooks.performance.now();
+  try {
+    return { ...pruneGenerations(options.paths.staging, "staging-prune-preview", true, { incomingTarget: options.incomingTarget, protectedPaths: liveGenerationRefs(env, options.paths) }), durationMs: elapsedMs(startedAt) };
+  } catch (error) {
+    return { category: "staging-prune-preview", reaped: 0, verdict: "fail", detail: `reap failed: ${error?.message ?? error}`, durationMs: elapsedMs(startedAt) };
+  }
 }
 var LEASE_STEAL_SCRATCH = /^lease\.lock\.stale-\d+$/;
 function atomicWriteScratch(path) {
@@ -3413,8 +3483,9 @@ function reap(options) {
     }
   };
   const atomicWritePaths = [claudeMarketplacesPath(env)];
+  const protectedPaths = liveGenerationRefs(env, paths);
   return [
-    guarded("staging-prune", () => pruneGenerations(paths.staging, "staging-prune", dryRun)),
+    guarded("staging-prune", () => pruneGenerations(paths.staging, "staging-prune", dryRun, { protectedPaths })),
     guarded("scratch", () => reapScratch({ root: paths.root, atomicWritePaths }, dryRun)),
     guarded("cursor-retire", () => retireCursor({ paths, dryRun, env }))
   ];
@@ -3533,6 +3604,11 @@ async function reconcile(options) {
       say(`target v${summary.target} (${summary.gate})`);
       phase("resolve", "ok");
       options.onTargetResolved?.(summary.target, summary.gate);
+      if (options.dryRun && summary.target) {
+        const preview = stagingPrunePreview({ paths, env, incomingTarget: summary.target });
+        summary.reap.push(preview);
+        journal({ kind: "reap", surface: preview.category, verdict: preview.verdict, count: preview.reaped, detail: preview.detail, durationMs: preview.durationMs });
+      }
       phase("check", "running");
       say("updater: self-bootstrap");
       const selfStartedAt = import_node_perf_hooks2.performance.now();
@@ -4457,6 +4533,7 @@ if (typeof require !== "undefined" && require.main === module) {
   buildWatcherCommand,
   checkAtomicity,
   claudeArm,
+  claudeCatalogMmiVersion,
   clearLaunchTarget,
   clearPending,
   codexArm,
@@ -4510,6 +4587,7 @@ if (typeof require !== "undefined" && require.main === module) {
   sharedDocLockTimeoutReceipt,
   shippedTargetFrom,
   shouldHandOff,
+  stagingPrunePreview,
   statusScreen,
   surfaceArmPlan,
   systemdServiceUnit,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/hub",
-  "version": "4.6.3",
+  "version": "4.6.5",
   "description": "Install and maintain the MMI CLI and every present host surface from one release-gated Hub command.",
   "type": "module",
   "license": "UNLICENSED",