@mutmutco/cli 2.5.0 → 2.6.0

package/dist/index.cjs

@@ -3309,6 +3309,9 @@ function buildHealth(i) {
   if (!i.sagaApiUrl) problems.push("sagaApiUrl not configured in .mmi/config.json");
   if (!i.identity) problems.push("no GitHub identity (gh auth token / GH_TOKEN)");
   if (!i.reachable) problems.push("saga backend unreachable");
+  if (i.reachable && i.livenessStatus === 403 && i.livenessMessage === "Forbidden") {
+    problems.push("saga API route-level 403 from GitHubAuthorizer cache/policy");
+  }
   if (i.reachable && i.authorized === false) problems.push("saga backend rejected authenticated state access");
   if (!i.key.sessionId || i.key.sessionId === "-") problems.push("unsafe session id");
   const safeToWrite = problems.length === 0;
@@ -3317,6 +3320,8 @@ function buildHealth(i) {
     safeToWrite,
     identity: i.identity,
     reachable: i.reachable,
+    livenessStatus: i.livenessStatus,
+    livenessMessage: i.livenessMessage,
     authorized: i.authorized,
     sagaApiUrl: i.sagaApiUrl,
     key: i.key,
@@ -3598,6 +3603,36 @@ query($owner: String!, $number: Int!, $after: String) {
     }
   }
 }`;
+var ISSUE_PROJECT_ITEM_QUERY = `
+query($repoOwner: String!, $repoName: String!, $number: Int!) {
+  repository(owner: $repoOwner, name: $repoName) {
+    issue(number: $number) {
+      id
+      number
+      title
+      url
+      state
+      repository { nameWithOwner }
+      labels(first: 10) { nodes { name } }
+      assignees(first: 10) { nodes { login } }
+      projectItems(first: 20) {
+        nodes {
+          id
+          project { id title }
+          fieldValues(first: 8) {
+            nodes {
+              ... on ProjectV2ItemFieldSingleSelectValue {
+                name
+                optionId
+                field { ... on ProjectV2SingleSelectField { name } }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}`;
 function resolveBoardConfig(cfg) {
   const missing = [];
   if (!cfg.projectOwner) missing.push("projectOwner");
@@ -3871,6 +3906,14 @@ async function claimBoardIssue(options, deps = {}) {
   const cfg = resolveBoardConfig(options.config);
   const gh = deps.gh ?? defaultGh;
   const collected = await collectBoardItems(cfg, { repo: options.repo, allowPartial: options.allowPartial }, deps);
+  const selector = parseIssueSelector(options.selector, collected.repo);
+  try {
+    findBoardItem(collected.items, selector);
+  } catch (e) {
+    const fallback = await fetchIssueProjectItem(gh, cfg, selector);
+    if (!fallback) throw e;
+    collected.items.push(fallback);
+  }
   const writable = await resolveWritableReposForClaimables(collected.items, gh, options.allowPartial ?? false);
   collected.warnings.push(...writable.warnings);
   collected.partial = collected.partial || writable.partial;
@@ -3882,7 +3925,6 @@ async function claimBoardIssue(options, deps = {}) {
     warnings: collected.warnings,
     partial: collected.partial
   };
-  const selector = parseIssueSelector(options.selector, collected.repo);
   const flatItem = findBoardItem(collected.items, selector);
   if (flatItem.status === "Todo" && flatItem.assignees.length === 0 && !writable.repos.has(flatItem.repository.toLowerCase())) {
     throw new Error(`${flatItem.ref} is not claimable: viewer does not have write access to ${flatItem.repository}`);
@@ -4039,6 +4081,42 @@ async function fetchProjectPage(gh, cfg, after) {
   if (!parsed.data) throw new Error("gh GraphQL response did not include data");
   return parsed.data;
 }
+async function fetchIssueProjectItem(gh, cfg, selector) {
+  const [repoOwner, repoName] = selector.repo.split("/");
+  if (!repoOwner || !repoName) return void 0;
+  const { stdout } = await gh([
+    "api",
+    "graphql",
+    "-f",
+    `query=${ISSUE_PROJECT_ITEM_QUERY}`,
+    "-f",
+    `repoOwner=${repoOwner}`,
+    "-f",
+    `repoName=${repoName}`,
+    "-F",
+    `number=${selector.number}`
+  ]);
+  const parsed = JSON.parse(stdout);
+  const issue2 = parsed.data?.repository?.issue;
+  if (!issue2) return void 0;
+  const projectItem = (issue2.projectItems?.nodes ?? []).find((item) => item.project?.id === cfg.projectId);
+  if (!projectItem) return void 0;
+  return nodeToItem({
+    id: projectItem.id,
+    fieldValues: projectItem.fieldValues,
+    content: {
+      __typename: "Issue",
+      id: issue2.id,
+      number: issue2.number,
+      title: issue2.title,
+      url: issue2.url,
+      state: issue2.state,
+      repository: issue2.repository,
+      labels: issue2.labels,
+      assignees: issue2.assignees
+    }
+  });
+}
 function nodesToItems(nodes, warnings) {
   const items = [];
   for (const node of nodes) {
@@ -4255,6 +4333,26 @@ function parseWorktreePorcelain(stdout) {
   }
   return out;
 }
+function samePath(a, b) {
+  return a.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase() === b.replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+}
+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) {
+  if (!targetPath) return void 0;
+  return worktrees.find((w) => !samePath(w.path, targetPath))?.path;
+}
+function branchMissingFromList(branch, stdout) {
+  const names = stdout.split(/\r?\n/).map((line) => line.replace(/^\*\s*/, "").trim()).filter(Boolean);
+  return !names.includes(branch);
+}
 function formatGcPlan(plan2, apply) {
   const lines = [`mmi-cli gc: ${apply ? "apply" : "dry-run"}`];
   if (!plan2.branches.length && !plan2.trackingRefs.length) lines.push("nothing to clean");
@@ -4485,8 +4583,13 @@ var PLUGIN_DRIFT_LABEL = "plugin config drift (mmi@mmi duplicate rows / stale gi
 function recordFreshness(r) {
   return r.lastUpdated ?? r.installedAt ?? "";
 }
-function freshestRecord(records) {
-  return records.reduce((best, r) => recordFreshness(r) > recordFreshness(best) ? r : best);
+function bestRecord(records) {
+  return records.reduce((best, r) => {
+    const byVersion = compareVersions(r.version ?? "0", best.version ?? "0");
+    if (byVersion > 0) return r;
+    if (byVersion < 0) return best;
+    return recordFreshness(r) > recordFreshness(best) ? r : best;
+  });
 }
 function pluginConfigDriftFix(pluginId) {
   return `\`${pluginId}\` registered as N duplicate project rows / a stale gitCommitSha in ~/.claude/plugins/installed_plugins.json \u2014 run \`mmi-cli doctor\` to collapse them to one \`scope: user\` entry at the highest version (a .bak backup is written first), or in \`/plugin\` uninstall the extra rows and reinstall once at user scope`;
@@ -4503,19 +4606,21 @@ function buildPluginConfigDriftCheck(input) {
   const records = input.installed?.plugins?.[pluginId];
   if (!Array.isArray(records) || records.length === 0) return base;
   const projectRows = records.filter((r) => r.scope === "project");
-  const freshest = freshestRecord(records);
-  const freshSha = freshest.gitCommitSha;
-  const staleShaRows = freshSha ? records.filter((r) => r.gitCommitSha !== void 0 && r.gitCommitSha !== freshSha).length : 0;
+  const best = bestRecord(records);
+  const bestSha = best.gitCommitSha;
+  const staleShaRows = bestSha ? records.filter((r) => r.gitCommitSha !== void 0 && r.gitCommitSha !== bestSha).length : 0;
+  const duplicateRows = records.length > 1 ? records.length : 0;
   const duplicateProjectRows = projectRows.length > 1 ? projectRows.length : 0;
-  if (duplicateProjectRows === 0 && staleShaRows === 0) {
-    return { ...base, duplicateProjectRows: 0, staleShaRows: 0 };
+  if (duplicateRows === 0 && staleShaRows === 0) {
+    return { ...base, duplicateRows: 0, duplicateProjectRows: 0, staleShaRows: 0 };
   }
-  const { projectPath: _drop, ...rest } = freshest;
+  const { projectPath: _drop, ...rest } = best;
   const collapsed = { ...rest, scope: "user" };
   return {
     ...base,
     ok: false,
     recordsToWrite: [collapsed],
+    duplicateRows,
     duplicateProjectRows,
     staleShaRows
   };
@@ -4529,6 +4634,58 @@ function buildGitignoreManagedBlockCheck(input) {
   if (!changed) return base;
   return { ...base, ok: false, contentToWrite: content };
 }
+function detectSurface(env) {
+  const has = (k) => Boolean(env[k]?.trim());
+  if (env.MMI_AGENT_SURFACE === "codex" || has("CODEX_HOME") || (env.CLAUDE_PLUGIN_ROOT ?? "").includes(".codex")) {
+    return "codex";
+  }
+  const isClaude = has("CLAUDECODE") || has("CLAUDE_CODE_ENTRYPOINT") || has("CLAUDE_PLUGIN_ROOT") || env.MMI_AGENT_SURFACE === "claude";
+  const isVscode = env.TERM_PROGRAM === "vscode" || has("VSCODE_PID") || has("VSCODE_GIT_ASKPASS_NODE");
+  if (isClaude && isVscode) return "claude-vscode";
+  if (isClaude) return "claude-cli";
+  return "shell";
+}
+function pluginRecoveryFix(surface) {
+  const claude = "claude plugin marketplace update mmi && claude plugin update mmi@mmi && claude plugin enable mmi@mmi";
+  switch (surface) {
+    case "claude-vscode":
+      return `${claude}   # then reopen the VS Code workspace to reload MMI commands`;
+    case "claude-cli":
+      return `${claude}   # then restart Claude Code, or run /reload-plugins`;
+    case "codex":
+      return "codex plugin marketplace upgrade mmi && codex plugin add mmi@mmi   # then restart Codex";
+    case "shell":
+    default:
+      return "npm install -g @mutmutco/cli@latest";
+  }
+}
+var INSTALLED_PLUGIN_VERSION_LABEL = "installed MMI plugin version (vs latest release)";
+function isSemverVersion(v) {
+  return typeof v === "string" && /^v?\d+\.\d+\.\d+/.test(v.trim());
+}
+function buildInstalledPluginVersionCheck(input) {
+  const pluginId = input.pluginId ?? MMI_PLUGIN_ID;
+  const base = {
+    ok: true,
+    label: INSTALLED_PLUGIN_VERSION_LABEL,
+    fix: pluginRecoveryFix(input.surface),
+    pluginId
+  };
+  if (!input.isOrgRepo) return base;
+  const records = input.installed?.plugins?.[pluginId];
+  if (!Array.isArray(records) || records.length === 0) return base;
+  const installedVersion = bestRecord(records).version;
+  if (!isSemverVersion(installedVersion) || !isSemverVersion(input.releasedVersion)) return base;
+  if (compareVersions(installedVersion, input.releasedVersion) >= 0) {
+    return { ...base, installedVersion, releasedVersion: input.releasedVersion };
+  }
+  return {
+    ...base,
+    ok: false,
+    installedVersion,
+    releasedVersion: input.releasedVersion
+  };
+}
 
 // src/stage-runner.ts
 var import_node_child_process3 = require("node:child_process");
@@ -6312,24 +6469,31 @@ async function applyGcPlan(plan2, remote) {
     await execFileP3("git", ["worktree", "prune"], { timeout: GIT_TIMEOUT_MS });
   }
 }
-async function cleanupLocalBranch(branch) {
+async function cleanupLocalBranch(branch, before = {}) {
   const result = { branchDeleted: false };
   if (!branch) return result;
   const { stdout } = await execFileP3("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS });
-  const wt = parseWorktreePorcelain(stdout).find((w) => w.branch === branch);
-  if (wt) {
-    await execFileP3("git", ["worktree", "remove", "--force", wt.path], { timeout: GIT_TIMEOUT_MS }).catch(() => {
+  const afterWorktrees = parseWorktreePorcelain(stdout);
+  const wtPath = selectPrMergeCleanupWorktree(branch, before.worktrees ?? [], afterWorktrees, before.startingPath);
+  const safeCwd = selectSafeWorktreeCwd([...afterWorktrees, ...before.worktrees ?? []], wtPath);
+  const git = (args) => safeCwd ? execFileP3("git", ["-C", safeCwd, ...args], { timeout: GIT_TIMEOUT_MS }) : execFileP3("git", args, { timeout: GIT_TIMEOUT_MS });
+  if (wtPath) {
+    await git(["worktree", "remove", "--force", wtPath]).catch(() => {
     });
-    result.worktreeRemoved = wt.path;
+    result.worktreeRemoved = wtPath;
   }
-  const current = await gitOut(["rev-parse", "--abbrev-ref", "HEAD"]) || "";
+  const current = safeCwd ? ((await git(["rev-parse", "--abbrev-ref", "HEAD"]).catch(() => ({ stdout: "" }))).stdout || "").trim() : await gitOut(["rev-parse", "--abbrev-ref", "HEAD"]) || "";
   if (branch !== current) {
-    await execFileP3("git", ["branch", "-D", branch], { timeout: GIT_TIMEOUT_MS }).then(() => {
+    await git(["branch", "-D", branch]).then(() => {
       result.branchDeleted = true;
     }).catch(() => {
     });
+    if (!result.branchDeleted) {
+      const remaining = await git(["branch", "--list", branch]).catch(() => ({ stdout: "" }));
+      result.branchDeleted = branchMissingFromList(branch, remaining.stdout || "");
+    }
   }
-  if (wt) await execFileP3("git", ["worktree", "prune"], { timeout: GIT_TIMEOUT_MS }).catch(() => {
+  if (wtPath) await git(["worktree", "prune"]).catch(() => {
   });
   return result;
 }
@@ -6386,6 +6550,33 @@ async function applyVersionAutoUpdate(report, log) {
     return report;
   }
 }
+var CLAUDE_PLUGIN_TIMEOUT_MS = 6e4;
+async function runClaudePlugin(args) {
+  const candidates = isWin ? ["claude.cmd", "claude.exe", "claude"] : ["claude"];
+  for (const bin of candidates) {
+    try {
+      await execFileP3(bin, args, { timeout: CLAUDE_PLUGIN_TIMEOUT_MS });
+      return true;
+    } catch (err) {
+      if (err.code === "ENOENT") continue;
+      return false;
+    }
+  }
+  return false;
+}
+async function applyClaudePluginHeal(surface, log) {
+  if (surface !== "claude-cli" && surface !== "claude-vscode") return false;
+  log("  \u21BB updating the MMI plugin via `claude plugin` (marketplace \u2192 update \u2192 enable)\u2026");
+  const steps = [
+    ["plugin", "marketplace", "update", "mmi"],
+    ["plugin", "update", "mmi@mmi"],
+    ["plugin", "enable", "mmi@mmi"]
+  ];
+  for (const step of steps) {
+    if (!await runClaudePlugin(step)) return false;
+  }
+  return true;
+}
 var program2 = new Command();
 program2.name("mmi-cli").description("MMI Future CLI \u2014 org rules delivery, saga, KB. The engine the plugin SessionStart hook drives.").version(resolveVersion());
 var rules = program2.command("rules").description("org rules delivery");
@@ -6527,9 +6718,15 @@ saga.command("key").option("--json", "machine-readable output").description("pri
 async function probeBackend(url) {
   try {
     const res = await fetch(`${url}/saga/head`, { headers: await sagaHeaders(), signal: AbortSignal.timeout(8e3) });
-    return res.ok;
+    let message = "";
+    try {
+      const body = await res.clone().json();
+      message = typeof body.message === "string" ? body.message : "";
+    } catch {
+    }
+    return { reachable: res.ok || res.status === 403, status: res.status, message };
   } catch {
-    return false;
+    return { reachable: false };
   }
 }
 async function probeSagaAccess(url, key) {
@@ -6547,9 +6744,18 @@ saga.command("health").option("--json", "machine-readable output").option("--ban
   const key = await sagaKey(cfg, session);
   const source = session.source;
   const identity = await githubLogin();
-  const reachable = cfg.sagaApiUrl ? await probeBackend(cfg.sagaApiUrl) : false;
-  const authorized = cfg.sagaApiUrl && reachable ? await probeSagaAccess(cfg.sagaApiUrl, key) : void 0;
-  const report = buildHealth({ key, source, identity, reachable, authorized, sagaApiUrl: cfg.sagaApiUrl });
+  const liveness = cfg.sagaApiUrl ? await probeBackend(cfg.sagaApiUrl) : { reachable: false };
+  const authorized = cfg.sagaApiUrl && liveness.reachable ? await probeSagaAccess(cfg.sagaApiUrl, key) : void 0;
+  const report = buildHealth({
+    key,
+    source,
+    identity,
+    reachable: liveness.reachable,
+    livenessStatus: liveness.status,
+    livenessMessage: liveness.message,
+    authorized,
+    sagaApiUrl: cfg.sagaApiUrl
+  });
   if (o.json) return console.log(JSON.stringify(report));
   if (o.banner) {
     const banner = healthBanner(report);
@@ -7015,10 +7221,14 @@ pr.command("merge <number>").description("merge a PR (squash by default) and cle
   const method = o.rebase ? "--rebase" : o.merge ? "--merge" : "--squash";
   const repoArgs = o.repo ? ["--repo", o.repo] : [];
   const headRef = (await execFileP3("gh", ["pr", "view", number, ...repoArgs, "--json", "headRefName", "--jq", ".headRefName"], { timeout: GC_GH_TIMEOUT_MS })).stdout.trim();
+  const startingPath = (await execFileP3("git", ["rev-parse", "--show-toplevel"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout.trim();
+  const beforeWorktrees = parseWorktreePorcelain(
+    (await execFileP3("git", ["worktree", "list", "--porcelain"], { timeout: GIT_TIMEOUT_MS }).catch(() => ({ stdout: "" }))).stdout
+  );
   await execFileP3("gh", ["pr", "merge", number, ...repoArgs, method, "--delete-branch"], { timeout: GC_GH_TIMEOUT_MS }).catch((e) => {
     if (!/used by worktree|cannot delete branch|already been merged/i.test(String(e.message || ""))) throw e;
   });
-  const cleaned = repoArgs.length ? { branchDeleted: false } : await cleanupLocalBranch(headRef);
+  const cleaned = repoArgs.length ? { branchDeleted: false } : await cleanupLocalBranch(headRef, { worktrees: beforeWorktrees, startingPath });
   console.log(JSON.stringify({ merged: number, branch: headRef, method: method.slice(2), ...cleaned }));
 });
 async function runBoardRead(o) {
@@ -7458,7 +7668,7 @@ function writeGitignore(content) {
     return false;
   }
 }
-program2.command("doctor").description("check onboarding gates (GitHub auth, mmi-cli on PATH, repo config, plugin git clone, plugin install record, .gitignore managed block, plugin config drift) and print fixes").option("--banner", "one-line resume summary; silent when all gates pass").option("--guide", "print the MMI Agentic Onboarding guide URL").option("--json", "machine-readable output").action(async (opts) => {
+program2.command("doctor").description("check onboarding gates (GitHub auth, mmi-cli on PATH, repo config, plugin git clone, plugin install record, .gitignore managed block, plugin config drift, installed plugin version) and print fixes").option("--banner", "one-line resume summary; silent when all gates pass").option("--guide", "print the MMI Agentic Onboarding guide URL").option("--json", "machine-readable output").action(async (opts) => {
   if (opts.guide) {
     if (opts.json) console.log(JSON.stringify({ resources: [MMI_AGENTIC_ONBOARDING_GUIDE] }, null, 2));
     else console.log(MMI_AGENTIC_ONBOARDING_GUIDE.url);
@@ -7486,12 +7696,15 @@ program2.command("doctor").description("check onboarding gates (GitHub auth, mmi
     if (root && (0, import_node_fs4.existsSync)(`${root}/bin/mmi-cli${isWin ? ".cmd" : ""}`)) onPath = true;
   }
   checks.push({ ok: onPath, label: "mmi-cli on PATH", fix: "auto-provisioned at session start \u2014 reopen the session, or install the MMI plugin" });
+  const surface = detectSurface(process.env);
+  const releasedVersion = await fetchReleasedVersion();
   let versionReport = buildVersionLagReport({
     currentVersion: resolveVersion(),
     repoVersion: readRepoVersion(),
-    releasedVersion: await fetchReleasedVersion()
+    releasedVersion
   });
   if (!opts.json) versionReport = await applyVersionAutoUpdate(versionReport, (m) => console.error(m));
+  if (!versionReport.ok) versionReport = { ...versionReport, fix: pluginRecoveryFix(surface) };
   checks.push(versionReport);
   const cfg = await loadConfig();
   checks.push({ ok: Boolean(cfg.sagaApiUrl), label: "repo config (.mmi/config.json)", fix: "ask a master-admin to run /bootstrap on this repo" });
@@ -7543,7 +7756,30 @@ program2.command("doctor").description("check onboarding gates (GitHub auth, mmi
       if (!opts.banner) console.error("  \u21BB repaired: collapsed mmi@mmi to one user-scope entry (backup at installed_plugins.json.bak) \u2014 run /reload-plugins");
     }
   }
+  if (!driftCheck.ok) driftCheck = { ...driftCheck, fix: pluginRecoveryFix(surface) };
   checks.push(driftCheck);
+  let installedVersionCheck = buildInstalledPluginVersionCheck({
+    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    installed,
+    releasedVersion,
+    surface
+  });
+  if (!installedVersionCheck.ok && !opts.json) {
+    if (await applyClaudePluginHeal(surface, (m) => console.error(m))) {
+      const healed = buildInstalledPluginVersionCheck({
+        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        installed: readInstalledPlugins(),
+        releasedVersion,
+        surface
+      });
+      installedVersionCheck = healed;
+      if (healed.ok && !opts.banner) {
+        const reload = surface === "claude-vscode" ? "reopen the VS Code workspace" : "restart Claude Code (or run /reload-plugins)";
+        console.error(`  \u21BB updated MMI plugin \u2192 ${releasedVersion ?? "latest"} via claude plugin \u2014 ${reload} to load the new commands`);
+      }
+    }
+  }
+  checks.push(installedVersionCheck);
   const gaps = checks.filter((c) => !c.ok);
   const resources = doctorResourcesForGaps(gaps);
   if (opts.json) {

package/package.json

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