@mutmutco/cli 2.67.0 → 2.68.0

package/dist/main.cjs

@@ -5882,7 +5882,7 @@ async function waitForPrChecks(deps) {
   let lastDetail = "pending";
   while (now() < deadline) {
     const state = await deps.pollChecks();
-    if (state === "success") return { policy, status: "success", detail: lastDetail };
+    if (state === "success") return { policy, status: "success", detail: "checks-success" };
     if (state === "failure") return { policy, status: "failure", detail: lastDetail };
     if (state === "no-checks-reported") {
       lastDetail = "no-checks-reported (waiting for workflow to queue)";
@@ -7696,8 +7696,8 @@ async function fastForwardCurrentBranch(git) {
     return { status: "failed", error: errorMessage(e) };
   }
 }
-async function returnCheckoutToBase(git, base, mergedBranch, currentBranch) {
-  if (currentBranch === mergedBranch) {
+async function returnCheckoutToBase(git, base, mergedBranch, currentBranch2) {
+  if (currentBranch2 === mergedBranch) {
     const dirty = (await git(["status", "--porcelain"]).catch(() => "dirty") || "").trim().length > 0;
     if (dirty) {
       return { report: { branch: base, switched: false, sync: "skipped", reason: "dirty-worktree" }, canDeleteBranch: false };
@@ -7713,7 +7713,7 @@ async function returnCheckoutToBase(git, base, mergedBranch, currentBranch) {
     const ff2 = await fastForwardCurrentBranch(git);
     return { report: { branch: base, switched: true, sync: ff2.status, ...ff2.error ? { error: ff2.error } : {} }, canDeleteBranch: true };
   }
-  if (currentBranch !== base) {
+  if (currentBranch2 !== base) {
     return { report: { branch: base, switched: false, sync: "skipped", reason: "not-on-base" }, canDeleteBranch: true };
   }
   const ff = await fastForwardCurrentBranch(git);
@@ -9809,6 +9809,55 @@ async function requireBranch(deps, branch) {
   const current = clean(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"]));
   if (current !== branch) throw new Error(`must run from ${branch}, currently on ${current || "(unknown)"}`);
 }
+async function currentBranch(deps) {
+  return clean(await deps.run("git", ["rev-parse", "--abbrev-ref", "HEAD"])) || "(unknown)";
+}
+async function restoreCheckoutAfterRelease(deps, startBranch) {
+  const status = await deps.run("git", ["status", "--porcelain"]);
+  if (porcelainHasBlockingChanges(status)) {
+    return {
+      startBranch,
+      finalBranch: await currentBranch(deps),
+      status: "skipped",
+      reason: "dirty-worktree",
+      note: `checkout restoration skipped: working tree changed after release; inspect it before leaving ${startBranch}`
+    };
+  }
+  try {
+    await deps.run("git", ["checkout", startBranch]);
+  } catch (e) {
+    return {
+      startBranch,
+      finalBranch: await currentBranch(deps),
+      status: "skipped",
+      reason: "checkout-failed",
+      note: `checkout restoration failed while returning to ${startBranch}: ${e instanceof Error ? e.message : String(e)}`
+    };
+  }
+  try {
+    await ffOnlyPull(deps, startBranch);
+    return {
+      startBranch,
+      finalBranch: startBranch,
+      status: "returned",
+      note: `checkout returned to ${startBranch} and fast-forwarded from origin/${startBranch}`
+    };
+  } catch (e) {
+    return {
+      startBranch,
+      finalBranch: startBranch,
+      status: "skipped",
+      reason: "pull-failed",
+      note: `checkout returned to ${startBranch}, but origin/${startBranch} fast-forward failed: ${e instanceof Error ? e.message : String(e)}`
+    };
+  }
+}
+async function withCheckoutRestoredAfterRelease(deps, result, startBranch) {
+  return {
+    ...result,
+    checkout: await restoreCheckoutAfterRelease(deps, startBranch)
+  };
+}
 function normGitPath(p) {
   return p.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
 }
@@ -10554,12 +10603,24 @@ async function runTrainApply(command, deps, options = {}) {
     return runTrainApplyPipeline("rcand", pipelineInput);
   }
   if (directTrack) {
-    return runTrainApplyPipeline("release-dev", { ...pipelineInput, directTrack: true });
+    return withCheckoutRestoredAfterRelease(
+      deps,
+      await runTrainApplyPipeline("release-dev", { ...pipelineInput, directTrack: true }),
+      "development"
+    );
   }
   if (command === "release" && options.dev) {
-    return runTrainApplyPipeline("release-dev", pipelineInput);
+    return withCheckoutRestoredAfterRelease(
+      deps,
+      await runTrainApplyPipeline("release-dev", pipelineInput),
+      "development"
+    );
   }
-  return runTrainApplyPipeline("release-full", pipelineInput);
+  return withCheckoutRestoredAfterRelease(
+    deps,
+    await runTrainApplyPipeline("release-full", pipelineInput),
+    "rc"
+  );
 }
 async function buildEnvironments(deps, ctx, model, deployStatus, retirement) {
   if (model !== "tenant-container") return void 0;
@@ -15316,6 +15377,13 @@ function buildOpencodeVersionCheck(input) {
   }
   return { ...base, ok: false, installedVersion: input.installedVersion, releasedVersion: input.releasedVersion };
 }
+var OPENCODE_HOOK_ACTIVE_LABEL = "OpenCode MMI adapter hooks active (shell.env stamp)";
+function buildOpencodeHookActiveCheck(input) {
+  const base = { ok: true, label: OPENCODE_HOOK_ACTIVE_LABEL, fix: OPENCODE_RECOVERY };
+  if (!input.isOrgRepo || input.surface !== "opencode") return base;
+  if (input.hookSurfaceStamp === "opencode") return { ...base, surfaceStamp: input.hookSurfaceStamp };
+  return { ...base, ok: false, surfaceStamp: input.hookSurfaceStamp };
+}
 var OPENCODE_CONFIG_PLUGIN_LABEL = "OpenCode MMI adapter config wiring";
 var OPENCODE_SURFACE_ASSETS_LABEL = "OpenCode MMI commands and skills";
 function opencodePluginEntryMatches(entry) {
@@ -16852,6 +16920,16 @@ async function runDoctor(opts, io = consoleIo, readOrigin) {
       }
     }
     checks.push(opencodeVersionCheck);
+    const hookSurfaceStamp = process.env.MMI_AGENT_SURFACE;
+    const hookActiveCheck = buildOpencodeHookActiveCheck({
+      isOrgRepo,
+      surface,
+      hookSurfaceStamp
+    });
+    if (!hookActiveCheck.ok && repairLocal) {
+      io.err(`  \u21BB MMI adapter config wired but hooks not active this session \u2014 ${reloadAction("opencode")} to load MMI plugin hooks`);
+    }
+    checks.push(hookActiveCheck);
     let surfaceAssetsCheck = buildOpencodeSurfaceAssetsCheck({
       isOrgRepo,
       configPath: openCodeConfigSnapshot.path,
@@ -19527,6 +19605,9 @@ function renderTrainApply(commandName, r) {
     const f = r.devRollForward;
     base = f.status === "pr-pending" ? `${base}; dev roll-forward: ALIGNMENT PR PENDING \u2014 land it with \`gh pr merge ${f.prNumber ?? "<number>"} --merge\`${f.prUrl ? ` (${f.prUrl})` : ""}` : `${base}; dev roll-forward: ${f.note}`;
   }
+  if (r.checkout) {
+    base = `${base}; checkout: ${r.checkout.note}`;
+  }
   return r.announceNote ? `${base}; announce: ${r.announceNote}` : base;
 }
 function renderTenantRedeploy(r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.67.0",
+  "version": "2.68.0",
   "description": "MMI Future CLI — delivers the org rules (whole-file), Jervaise-only continuity, and KB access. The cross-IDE engine the plugin's SessionStart hook drives.",
   "type": "module",
   "license": "UNLICENSED",