@mutmutco/cli 2.63.0 → 2.65.0

package/dist/main.cjs

@@ -3439,7 +3439,7 @@ function resolveRulesBase(orgRulesSource, defaultBase) {
 }
 
 // src/index.ts
-var import_node_child_process10 = require("node:child_process");
+var import_node_child_process11 = require("node:child_process");
 
 // src/cli-shared.ts
 var import_promises = require("node:fs/promises");
@@ -13518,6 +13518,7 @@ function writeError(res) {
 }
 
 // src/secrets.ts
+var import_node_child_process8 = require("node:child_process");
 var OWNER2 = "mutmutco";
 var SSM_ROOT = "/mmi-future";
 var PROJECT_TIER_SEGMENT = "dev";
@@ -13568,7 +13569,8 @@ function formatVaultPointer(p) {
     ...Object.entries(p.wellKnown).map(([k, keys]) => `  ${k}: ${keys.join(", ")}`),
     ``,
     `enumerate actual keys:  mmi-cli secrets list`,
-    `read one:               mmi-cli secrets get <stage>/<KEY>   (e.g. main/GOOGLE_CLIENT_ID)`,
+    `use one keyless:        mmi-cli secrets use <stage>/<KEY> -- <cmd>   (inject, never printed; raw get is master-only, WS6 #2184)`,
+    `validate one:           mmi-cli secrets verify <KEY>`,
     `set a key:              mmi-cli secrets set <stage>/<KEY>   (value via stdin; project-admin self-serves own repo)`,
     `import Rails creds:     mmi-cli secrets import-rails-credentials --stage main --map secret_key_base=SECRET_KEY_BASE`,
     `copy provider keys:     mmi-cli secrets copy --from rc --to dev --keys RECALL_API_KEY,GEMINI_API_KEY`
@@ -13664,7 +13666,7 @@ async function fetchSecretValue(deps, key, opts) {
     const res = await deps.fetch(`${deps.apiUrl}/secrets/get`, {
       method: "POST",
       headers: await deps.headers({ "content-type": "application/json" }),
-      body: JSON.stringify({ repo, key, ...slug ? { slug } : {} }),
+      body: JSON.stringify({ repo, key, use: true, ...slug ? { slug } : {} }),
       signal: AbortSignal.timeout(TIMEOUT_MS)
     });
     if (!res.ok) return null;
@@ -13718,7 +13720,7 @@ no vault credentials visible`;
     "",
     ...lines,
     "",
-    "+ = readable/usable now. Read one value: `mmi-cli secrets get <stage>/<KEY>` (only `get` prints a value).",
+    "+ = usable now. Consume keyless: `mmi-cli secrets use <KEY> -- <cmd>` (inject, never printed); validate: `mmi-cli secrets verify <KEY>`. Raw `get` (prints the value) is master-only (WS6 #2184).",
     "  Cross-slug (org-infra): `mmi-cli secrets get --slug cloudflare GLOBAL_API_KEY` (master-gated)."
   ].join("\n");
 }
@@ -14244,21 +14246,64 @@ async function secretsCopy(deps, opts) {
   }
   return true;
 }
+function defaultSpawn(command, args, env) {
+  const r = (0, import_node_child_process8.spawnSync)(command, args, { stdio: "inherit", env });
+  if (r.error) throw r.error;
+  return r.status ?? 1;
+}
 async function secretsUse(deps, key, opts) {
-  const slug = await vaultSlug(deps, opts);
-  const tier = classifyTier(slug, key);
-  const path2 = secretParamName(slug, key);
-  deps.log(
-    [
-      `${key} \u2192 ${path2} (${tier} tier)`,
-      "",
-      "Consume it WITHOUT committing it:",
-      `  \u2022 Runtime / agents: read it keylessly at runtime via the box's OIDC role (it can read its own ${tier} tier). Never bake it into an image or commit it.`,
-      `  \u2022 CI (GitHub Actions): the workflow assumes its OIDC role and runs \`aws ssm get-parameter --with-decryption --name ${path2}\` \u2014 no GitHub secret.`,
-      "  \u2022 Local dev: pull it into a gitignored .env from the vault. To confirm access without printing in PowerShell: `$null = mmi-cli secrets get " + key + "`; in POSIX shells: `mmi-cli secrets get " + key + " >/dev/null`. Never paste it into tracked files or chat.",
-      tier === "project" ? "  \u2022 Bare keys default to dev/. Use an explicit rc/<KEY> or main/<KEY> when the stage needs its own value." : "  \u2022 For your own product repo, project-admins self-serve this stage key. Org-infra/cross-slug keys remain master-gated."
-    ].join("\n")
-  );
+  const command = opts.command ?? [];
+  if (command.length === 0) {
+    const slug2 = await vaultSlug(deps, opts);
+    const tier = classifyTier(slug2, key);
+    const path2 = secretParamName(slug2, key);
+    deps.log(
+      [
+        `${key} \u2192 ${path2} (${tier} tier)`,
+        "",
+        "Consume it WITHOUT committing it:",
+        `  \u2022 Keyless run: \`mmi-cli secrets use ${key}${opts.slug ? ` --slug ${opts.slug}` : ""} -- <command>\` injects it into the command's env (never printed). A granted non-master can USE an org secret this way.`,
+        `  \u2022 Runtime / agents: read it keylessly at runtime via the box's OIDC role. Never bake it into an image or commit it.`,
+        `  \u2022 CI (GitHub Actions): the workflow assumes its OIDC role and runs \`aws ssm get-parameter --with-decryption --name ${path2}\` \u2014 no GitHub secret.`,
+        tier === "project" ? "  \u2022 Bare keys default to dev/. Use an explicit rc/<KEY> or main/<KEY> when the stage needs its own value." : "  \u2022 For your own product repo, project-admins self-serve this stage key. Org-infra/cross-slug keys remain master-gated unless granted."
+      ].join("\n")
+    );
+    return;
+  }
+  if (!isValidSecretKey(key)) {
+    deps.err(`invalid secret key ${JSON.stringify(key)}`);
+    return false;
+  }
+  const repo = await targetRepo(deps, opts);
+  const slug = opts.slug?.toLowerCase();
+  const res = await deps.fetch(`${deps.apiUrl}/secrets/get`, {
+    method: "POST",
+    headers: await deps.headers({ "content-type": "application/json" }),
+    body: JSON.stringify({ repo, key, use: true, ...slug ? { slug } : {} }),
+    signal: AbortSignal.timeout(TIMEOUT_MS)
+  });
+  if (!res.ok) {
+    const body = await readJsonBody(res);
+    if (res.status === 404 && body.code === "secret_not_found") {
+      deps.err(`Secret ${key} was not found.`);
+      deps.err(`Approved escalation: mmi-cli secrets request ${key} --repo ${repo} --reason "<why it is needed>"`);
+      return false;
+    }
+    deps.err(
+      await upgradeMessage(res, body) ?? (res.status === 403 ? `secrets use: not authorized for ${key} (HTTP 403) \u2014 ask the master for a \`secrets grant\`${errorDetail(body)}` : `secrets use failed: HTTP ${res.status}${errorDetail(body)}`)
+    );
+    return false;
+  }
+  const { value } = await res.json();
+  if (!value) {
+    deps.err(`secrets use: no value returned for ${key}`);
+    return false;
+  }
+  const envName = (opts.name ?? secretLeafName(key)).toUpperCase().replace(/[^A-Z0-9_]/g, "_");
+  const [cmd, ...args] = command;
+  const run = deps.spawn ?? defaultSpawn;
+  const code = run(cmd, args, { ...process.env, [envName]: value });
+  return code === 0;
 }
 
 // src/secrets-commands.ts
@@ -14378,7 +14423,7 @@ function registerSecretsCommands(program3) {
     const ok = await secretsPreflight(d, { repo: o.repo, stage: o.stage, required });
     if (!ok) process.exitCode = 1;
   });
-  secrets.command("get <key>").description("print one secret value over TLS (prints once, raw \u2014 do not log/paste it)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--slug <slug>", "vault slug override for org-infra namespaces (cloudflare, shared, \u2026) \u2014 master-gated").action((key, o) => withSecrets(async (d) => {
+  secrets.command("get <key>").description("print one secret value, RAW \u2014 MASTER-ONLY (WS6 #2184); non-master: `secrets use` to consume keyless or `secrets verify` to validate").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--slug <slug>", "vault slug override for org-infra namespaces (cloudflare, shared, \u2026) \u2014 master-gated").action((key, o) => withSecrets(async (d) => {
     const ok = await secretsGet(d, key, o);
     if (!ok) process.exitCode = 1;
   }));
@@ -14439,7 +14484,10 @@ function registerSecretsCommands(program3) {
     if (!ok) process.exitCode = 1;
   }));
   secrets.command("rm <key>").description("remove a secret (project tier self-serve; org tier needs a grant)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").action((key, o) => withSecrets((d) => secretsRemove(d, key, o)));
-  secrets.command("use <key>").description("print guidance on consuming a secret without committing it (no value)").option("--repo <owner/repo>", "target repo (defaults to the current repo)").action((key, o) => withSecrets((d) => secretsUse(d, key, o)));
+  secrets.command("use <key> [command...]").description("consume a secret KEYLESS: `use <key> -- <cmd>` injects it into the command env (never printed); a granted non-master can use an org secret. No command prints guidance only.").option("--repo <owner/repo>", "target repo (defaults to the current repo)").option("--slug <slug>", "org-infra namespace (e.g. _org) for a granted org secret").option("--name <ENVVAR>", "env var name to inject under (default: the key leaf, UPPER_SNAKE)").action((key, command, o) => withSecrets(async (d) => {
+    const ok = await secretsUse(d, key, { ...o, command });
+    if (ok === false) process.exitCode = 1;
+  }));
   secrets.command("grant <repo> <login> <key>").description("MASTER-ONLY: grant a project-admin standing access to a specific org-tier secret").action((repo, login, key) => withSecrets((d) => secretsGrant(d, repo, login, key, {})));
   secrets.command("revoke <repo> <login> <key>").description("MASTER-ONLY: withdraw a previously granted org-tier secret access").action((repo, login, key) => withSecrets((d) => secretsRevoke(d, repo, login, key, {})));
 }
@@ -14510,7 +14558,7 @@ function registerEdgeCommands(program3) {
 
 // src/doctor-run.ts
 var import_node_fs16 = require("node:fs");
-var import_node_child_process9 = require("node:child_process");
+var import_node_child_process10 = require("node:child_process");
 var import_promises3 = require("node:fs/promises");
 var import_node_path16 = require("node:path");
 var import_node_os5 = require("node:os");
@@ -14533,7 +14581,7 @@ function buildGuardSessionStartLine(state, opts = {}) {
 }
 
 // src/cursor-plugin-seed.ts
-var import_node_child_process8 = require("node:child_process");
+var import_node_child_process9 = require("node:child_process");
 var import_node_fs13 = require("node:fs");
 var import_node_os4 = require("node:os");
 var import_node_path14 = require("node:path");
@@ -14544,7 +14592,7 @@ function isSemverVersion(v) {
 var MMI_HUB_REPO = "mutmutco/MMI-Hub";
 var CURSOR_THIRD_PARTY_STATE_KEY = "cursor/thirdPartyExtensibilityEnabled";
 var PLUGIN_JSON_REL = ".cursor-plugin/plugin.json";
-var execFileBuffer = (0, import_node_util7.promisify)(import_node_child_process8.execFile);
+var execFileBuffer = (0, import_node_util7.promisify)(import_node_child_process9.execFile);
 function gitFetchReleaseTagArgs(hubCheckout, tag) {
   return ["-C", hubCheckout, "fetch", "origin", "tag", tag, "--quiet"];
 }
@@ -15398,7 +15446,7 @@ function buildOpencodeDesktopBootstrapCheck(input) {
   return { ...base, ok: false, fix: `${OPENCODE_DESKTOP_BOOTSTRAP_FIX} (stale: ${dirs})`, issues: [...input.issues] };
 }
 var OPENCODE_LEGACY_CONFIG_LABEL = "OpenCode legacy ~/.opencode config (stale plugin entries)";
-var OPENCODE_LEGACY_CONFIG_FIX = 'remove or rename ~/.opencode/opencode.json (legacy path); configure OpenCode at ~/.config/opencode/opencode.jsonc with "plugin": ["@mutmutco/opencode-mmi"] \u2014 see docs/Guides/opencode-saga.md';
+var OPENCODE_LEGACY_CONFIG_FIX = 'remove or rename ~/.opencode/opencode.json (legacy path); configure OpenCode at ~/.config/opencode/opencode.jsonc with "plugin": ["@mutmutco/opencode-mmi"]';
 function parseOpencodeLegacyConfigPlugins(content) {
   try {
     const parsed = JSON.parse(content);
@@ -16019,7 +16067,7 @@ function reexecMmiCli(args) {
       }
     };
     const env = { ...process.env, [DOCTOR_POST_SELF_UPDATE_ENV]: "1" };
-    const child = isWin ? (0, import_node_child_process9.spawn)("cmd.exe", ["/c", "mmi-cli", ...args], { stdio: "inherit", env }) : (0, import_node_child_process9.spawn)("mmi-cli", args, { stdio: "inherit", env });
+    const child = isWin ? (0, import_node_child_process10.spawn)("cmd.exe", ["/c", "mmi-cli", ...args], { stdio: "inherit", env }) : (0, import_node_child_process10.spawn)("mmi-cli", args, { stdio: "inherit", env });
     child.on("error", () => done(-1));
     child.on("exit", (code) => done(code ?? 0));
   });
@@ -16503,7 +16551,7 @@ function writeGitignore(content) {
     return false;
   }
 }
-async function runDoctor(opts, io = consoleIo) {
+async function runDoctor(opts, io = consoleIo, readOrigin) {
   if (opts.guide) {
     if (opts.json) io.log(JSON.stringify({ resources: [MMI_AGENTIC_ONBOARDING_GUIDE] }, null, 2));
     else io.log(MMI_AGENTIC_ONBOARDING_GUIDE.url);
@@ -16516,14 +16564,17 @@ async function runDoctor(opts, io = consoleIo) {
   const checks = [];
   const REWRITE_KEY = "url.https://github.com/.insteadOf";
   const CLONE_FIX = 'run: git config --global url."https://github.com/".insteadOf "git@github.com:"';
-  const [login, pathProbe, releasedVersion, cfg, callerArn, cloneProbe] = await Promise.all([
+  const [login, pathProbe, releasedVersion, cfg, callerArn, cloneProbe, isOrgRepo] = await Promise.all([
     githubLogin(),
     execFileP2(isWin ? "where" : "which", ["mmi-cli"]).then(() => true).catch(() => false),
     fetchReleasedVersion(),
     loadConfig(),
     awsCallerArn(),
-    execFileP2("git", ["config", "--global", "--get-all", REWRITE_KEY]).then(({ stdout }) => stdout.split("\n").some((l) => l.trim() === "git@github.com:")).catch(() => false)
+    execFileP2("git", ["config", "--global", "--get-all", REWRITE_KEY]).then(({ stdout }) => stdout.split("\n").some((l) => l.trim() === "git@github.com:")).catch(() => false),
     // unset → repair below
+    // hub-v3 step-back: org-membership gates the repo-local checks/repairs by the git `origin` remote,
+    // not the now-always-defaulted `cfg.sagaApiUrl`. Independent git read — resolved concurrently here.
+    readOrigin ? isOrgRepoRoot(readOrigin) : isOrgRepoRoot()
   ]);
   const surface = detectSurface(process.env);
   const versionReportProbe = buildVersionLagReport({
@@ -16538,18 +16589,18 @@ async function runDoctor(opts, io = consoleIo) {
   const opencodeAdapterStale = isBehind(opencodeInstalledVersionForDoctor(), releasedVersion);
   const cursorCacheStale = (0, import_node_fs16.existsSync)(cursorPluginCacheRoot()) && (cursorPluginCachePinSnapshots() ?? []).some((p) => isBehind(p.version, releasedVersion));
   const healPlan = doctorHealPlan({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     surface,
     versionReport: versionReportProbe,
     hasPluginRoot: Boolean(process.env.CLAUDE_PLUGIN_ROOT),
     installedVersionCheck: buildInstalledPluginVersionCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       sources: sourcesForHealPlan,
       releasedVersion,
       surface
     }),
     legacyPluginCheck: buildLegacyPluginInstallCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       sources: sourcesForHealPlan
     }),
     opencodeAdapterStale,
@@ -16608,7 +16659,7 @@ async function runDoctor(opts, io = consoleIo) {
   const installedVersion = resolveClientVersion();
   checks.push(
     buildHubCompatCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       versionInfo: hubVersionInfo,
       installedVersion
     })
@@ -16616,7 +16667,7 @@ async function runDoctor(opts, io = consoleIo) {
   if (runExtended) {
     checks.push(
       buildHubDeployFreshnessCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         deployedHubVersion: hubVersionInfo?.hubVersion,
         installedVersion,
         releasedVersion
@@ -16639,7 +16690,7 @@ async function runDoctor(opts, io = consoleIo) {
   const installed = readInstalledPlugins();
   const claudeSettings = readClaudeSettings();
   let pluginCheck = buildPluginInstallRecordCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     settings: claudeSettings,
     installed,
     projectPath: process.cwd(),
@@ -16654,7 +16705,7 @@ async function runDoctor(opts, io = consoleIo) {
   }
   checks.push(pluginCheck);
   let legacyPluginCheck = buildLegacyPluginInstallCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     sources: installedPluginSources(),
     surface
   });
@@ -16663,7 +16714,7 @@ async function runDoctor(opts, io = consoleIo) {
     const codexLegacy = legacyPluginCheck.staleSurfaces?.includes("codex") ?? false;
     if (claudeLegacy && await applyPluginHeal("claude", surface, (m) => io.err(m), { force: true })) {
       legacyPluginCheck = buildLegacyPluginInstallCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         sources: installedPluginSources(),
         surface
       });
@@ -16673,7 +16724,7 @@ async function runDoctor(opts, io = consoleIo) {
     }
     if (!legacyPluginCheck.ok && codexLegacy && await applyPluginHeal("codex", surface, (m) => io.err(m), { force: true })) {
       legacyPluginCheck = buildLegacyPluginInstallCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         sources: installedPluginSources(),
         surface
       });
@@ -16683,7 +16734,7 @@ async function runDoctor(opts, io = consoleIo) {
     }
   }
   checks.push(legacyPluginCheck);
-  let gitignoreCheck = buildGitignoreManagedBlockCheck({ isOrgRepo: Boolean(cfg.sagaApiUrl), content: readGitignore() });
+  let gitignoreCheck = buildGitignoreManagedBlockCheck({ isOrgRepo, content: readGitignore() });
   const gitignoreDecision = decideGitignoreRepair(gitignoreCheck, { repoWritesAllowed, repairFull });
   gitignoreCheck = gitignoreDecision.check;
   if (gitignoreDecision.action === "suppress") {
@@ -16701,7 +16752,7 @@ async function runDoctor(opts, io = consoleIo) {
     }
   }
   checks.push(gitignoreCheck);
-  let driftCheck = buildPluginConfigDriftCheck({ isOrgRepo: Boolean(cfg.sagaApiUrl), installed, surface });
+  let driftCheck = buildPluginConfigDriftCheck({ isOrgRepo, installed, surface });
   if (!driftCheck.ok && driftCheck.recordsToWrite && repairLocal) {
     if (backupAndWriteInstalledPlugins(driftCheck.recordsToWrite, driftCheck.pluginId)) {
       driftCheck = { ...driftCheck, ok: true };
@@ -16711,18 +16762,18 @@ async function runDoctor(opts, io = consoleIo) {
   checks.push(driftCheck);
   checks.push(
     buildPluginResolvabilityCheck({
-      ...snapshotPluginGuardInput(surface, Boolean(cfg.sagaApiUrl)),
+      ...snapshotPluginGuardInput(surface, isOrgRepo),
       surface
     })
   );
-  if (repairFull && Boolean(cfg.sagaApiUrl) && (surfaceToken(surface) === "claude" || surfaceToken(surface) === "codex")) {
+  if (repairFull && isOrgRepo && (surfaceToken(surface) === "claude" || surfaceToken(surface) === "codex")) {
     const guardResult = ensureUserScopeGuardHook();
     if (guardResult === "written") {
       io.err(`  \u21BB installed user-scope MMI guard hook (${surface === "codex" ? "~/.codex" : "~/.claude"}/settings.json) \u2014 survives a plugin prune`);
     }
   }
   let installedVersionCheck = buildInstalledPluginVersionCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     sources: installedPluginSources(),
     releasedVersion,
     surface
@@ -16730,7 +16781,7 @@ async function runDoctor(opts, io = consoleIo) {
   if (!installedVersionCheck.ok && (repairFull || repairLocal)) {
     const crossSurfaceRepair = Boolean(opts.apply) || !opts.json && !opts.banner && !opts.preflight;
     const canDriveSurface = async (token) => surfaceToken(surface) === token || crossSurfaceRepair && await hostBinAvailable(token);
-    const rereadInstalled = () => buildInstalledPluginVersionCheck({ isOrgRepo: Boolean(cfg.sagaApiUrl), sources: installedPluginSources(), releasedVersion, surface });
+    const rereadInstalled = () => buildInstalledPluginVersionCheck({ isOrgRepo, sources: installedPluginSources(), releasedVersion, surface });
     const claudeStale = installedVersionCheck.staleSurfaces?.some((s) => s.surface === "claude") ?? false;
     if (claudeStale && await canDriveSurface("claude") && await applyPluginHeal("claude", surface, (m) => io.err(m), { force: true })) {
       const healed = rereadInstalled();
@@ -16755,7 +16806,7 @@ async function runDoctor(opts, io = consoleIo) {
   const inspectOpenCode = surface === "opencode" || openCodeConfigSnapshot.hasConfig || runExtended;
   if (inspectOpenCode) {
     let opencodeConfigCheck = buildOpencodeConfigPluginCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       configPath: openCodeConfigSnapshot.path,
       hasConfig: openCodeConfigSnapshot.hasConfig,
       hasPluginField: openCodeConfigSnapshot.hasPluginField,
@@ -16766,7 +16817,7 @@ async function runDoctor(opts, io = consoleIo) {
       if (writeOpencodeConfigPlugin(openCodeConfigSnapshot)) {
         openCodeConfigSnapshot = opencodeConfigSnapshot();
         opencodeConfigCheck = buildOpencodeConfigPluginCheck({
-          isOrgRepo: Boolean(cfg.sagaApiUrl),
+          isOrgRepo,
           configPath: openCodeConfigSnapshot.path,
           hasConfig: openCodeConfigSnapshot.hasConfig,
           hasPluginField: openCodeConfigSnapshot.hasPluginField,
@@ -16782,7 +16833,7 @@ async function runDoctor(opts, io = consoleIo) {
     checks.push(opencodeConfigCheck);
     let opencodeInstalledVersion = opencodeInstalledVersionForDoctor();
     let opencodeVersionCheck = buildOpencodeVersionCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       installedVersion: opencodeInstalledVersion,
       releasedVersion
     });
@@ -16790,7 +16841,7 @@ async function runDoctor(opts, io = consoleIo) {
       if (await forceInstallOpencodeMmiPlugins(openCodeConfigSnapshot, (m) => io.err(m))) {
         opencodeInstalledVersion = readOpencodeAdapterDiskVersion() ?? opencodeInstalledVersion;
         opencodeVersionCheck = buildOpencodeVersionCheck({
-          isOrgRepo: Boolean(cfg.sagaApiUrl),
+          isOrgRepo,
           installedVersion: opencodeInstalledVersion,
           releasedVersion
         });
@@ -16802,7 +16853,7 @@ async function runDoctor(opts, io = consoleIo) {
     }
     checks.push(opencodeVersionCheck);
     let surfaceAssetsCheck = buildOpencodeSurfaceAssetsCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       configPath: openCodeConfigSnapshot.path,
       commandsDir: opencodeCommandsDir(),
       existingCommands: opencodeExistingCommands(),
@@ -16815,7 +16866,7 @@ async function runDoctor(opts, io = consoleIo) {
       if (wroteCommands || wroteSkills) {
         openCodeConfigSnapshot = opencodeConfigSnapshot();
         surfaceAssetsCheck = buildOpencodeSurfaceAssetsCheck({
-          isOrgRepo: Boolean(cfg.sagaApiUrl),
+          isOrgRepo,
           configPath: openCodeConfigSnapshot.path,
           commandsDir: opencodeCommandsDir(),
           existingCommands: opencodeExistingCommands(),
@@ -16830,13 +16881,13 @@ async function runDoctor(opts, io = consoleIo) {
     }
     checks.push(surfaceAssetsCheck);
     checks.push(buildOpencodeDesktopBootstrapCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       surface,
       issues: opencodeDesktopBootstrapSnapshot()
     }));
   }
   const legacyOpenCodeConfig = opencodeLegacyConfigSnapshot();
-  if (Boolean(cfg.sagaApiUrl) && legacyOpenCodeConfig.stalePlugins?.length) {
+  if (isOrgRepo && legacyOpenCodeConfig.stalePlugins?.length) {
     let legacyOpenCodeCheck = buildOpencodeLegacyConfigCheck({
       isOrgRepo: true,
       legacyPath: legacyOpenCodeConfig.legacyPath,
@@ -16856,7 +16907,7 @@ async function runDoctor(opts, io = consoleIo) {
   };
   const codexCacheVersions = () => mmiPluginCacheRootSnapshots().filter((r) => r.surface === "codex").flatMap((r) => r.entries.filter((e) => e.isDirectory).map((e) => e.name));
   let cacheCleanupCheck = buildMmiPluginCacheCleanupCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     roots: mmiPluginCacheRootSnapshots(),
     activeVersion: resolveClientVersion(),
     releasedVersion,
@@ -16873,7 +16924,7 @@ async function runDoctor(opts, io = consoleIo) {
     }
     cacheCleanupCheck = {
       ...buildMmiPluginCacheCleanupCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         roots: mmiPluginCacheRootSnapshots(),
         activeVersion: resolveClientVersion(),
         releasedVersion,
@@ -16887,7 +16938,7 @@ async function runDoctor(opts, io = consoleIo) {
   }
   checks.push(cacheCleanupCheck);
   let codexActiveCacheCheck = buildCodexActiveCacheCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     releasedVersion,
     codexCacheVersions: codexCacheVersions(),
     codexRecordVersion: codexRecordVersion()
@@ -16898,7 +16949,7 @@ async function runDoctor(opts, io = consoleIo) {
       markPluginReloadRequired();
       io.err(`  \u21BB restored Codex MMI plugin cache \u2192 ${releasedVersion ?? "latest"} via codex plugin \u2014 ${reloadAction("codex")} to load the new commands`);
       codexActiveCacheCheck = buildCodexActiveCacheCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         releasedVersion,
         codexCacheVersions: codexCacheVersions(),
         codexRecordVersion: codexRecordVersion()
@@ -16907,7 +16958,7 @@ async function runDoctor(opts, io = consoleIo) {
   }
   checks.push(codexActiveCacheCheck);
   let nestedPluginTreeCheck = buildNestedPluginTreeCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     isWindows: isWin,
     entries: nestedPluginTreeSnapshot()
   });
@@ -16915,7 +16966,7 @@ async function runDoctor(opts, io = consoleIo) {
     const nestedPaths = nestedPluginTreeCheck.nested.map((n) => n.path);
     if (await applyNestedPluginTreeCleanup(nestedPaths, (m) => io.err(m))) {
       nestedPluginTreeCheck = buildNestedPluginTreeCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         isWindows: isWin,
         entries: nestedPluginTreeSnapshot()
       });
@@ -16926,7 +16977,7 @@ async function runDoctor(opts, io = consoleIo) {
         markPluginReloadRequired();
         io.err(`  \u21BB reinstalled MMI plugin after nested-cache cleanup \u2014 ${reloadAction(surface)} to load MMI commands`);
         nestedPluginTreeCheck = buildNestedPluginTreeCheck({
-          isOrgRepo: Boolean(cfg.sagaApiUrl),
+          isOrgRepo,
           isWindows: isWin,
           entries: nestedPluginTreeSnapshot()
         });
@@ -16937,7 +16988,7 @@ async function runDoctor(opts, io = consoleIo) {
   const cursorCacheRoot = cursorPluginCacheRoot();
   let cursorPins = cursorPluginCachePinSnapshots() ?? [];
   let cursorPluginCheck = buildCursorPluginInstallCheck({
-    isOrgRepo: Boolean(cfg.sagaApiUrl),
+    isOrgRepo,
     surface,
     cacheRoot: cursorCacheRoot,
     cacheRootExists: (0, import_node_fs16.existsSync)(cursorCacheRoot),
@@ -16957,7 +17008,7 @@ async function runDoctor(opts, io = consoleIo) {
     if (seeded) {
       cursorPins = cursorPluginCachePinSnapshots() ?? [];
       cursorPluginCheck = buildCursorPluginInstallCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         surface,
         cacheRoot: cursorCacheRoot,
         cacheRootExists: (0, import_node_fs16.existsSync)(cursorCacheRoot),
@@ -16974,14 +17025,14 @@ async function runDoctor(opts, io = consoleIo) {
   const cursorThirdPartyEnabled = await readCursorThirdPartyExtensibilityEnabled(execFileP2);
   checks.push(
     buildCursorThirdPartyExtensibilityCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       surface,
       enabled: cursorThirdPartyEnabled
     })
   );
   checks.push(
     buildCursorHookCliCheck({
-      isOrgRepo: Boolean(cfg.sagaApiUrl),
+      isOrgRepo,
       surface,
       pins: cursorPins,
       mmiCliOnPath: onPath
@@ -16991,19 +17042,19 @@ async function runDoctor(opts, io = consoleIo) {
     const playwrightMcpConfigs = playwrightMcpConfigSnapshots();
     checks.push(
       buildPlaywrightMcpVisionCapCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         configs: playwrightMcpConfigs
       })
     );
     checks.push(
       buildPlaywrightMcpOutputDirCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         configs: playwrightMcpConfigs
       })
     );
     checks.push(
       buildBrowserArtifactsCheck({
-        isOrgRepo: Boolean(cfg.sagaApiUrl),
+        isOrgRepo,
         strayPaths: strayBrowserArtifactPaths()
       })
     );
@@ -17122,12 +17173,12 @@ function ensureUserScopeGuardHook(opts = {}) {
     return "failed";
   }
 }
-async function runGuard(opts = {}) {
+async function runGuard(opts = {}, readOrigin) {
   void opts;
   try {
     const surface = detectSurface(process.env);
-    const cfg = await loadConfig();
-    const input = snapshotPluginGuardInput(surface, Boolean(cfg.sagaApiUrl));
+    const isOrgRepo = readOrigin ? await isOrgRepoRoot(readOrigin) : await isOrgRepoRoot();
+    const input = snapshotPluginGuardInput(surface, isOrgRepo);
     const { state } = buildPluginGuardDecision(input);
     const { line, exitCode } = buildGuardSessionStartLine(state);
     if (line) console.error(line);
@@ -17551,7 +17602,7 @@ function runWorktreeInstall(command, cwd, quiet) {
   const file = isWin2 ? "cmd.exe" : bin;
   const spawnArgs = isWin2 ? ["/c", bin, ...args] : args;
   return new Promise((resolve5, reject) => {
-    const child = (0, import_node_child_process10.spawn)(file, spawnArgs, { cwd, stdio: quiet ? "ignore" : "inherit", windowsHide: true });
+    const child = (0, import_node_child_process11.spawn)(file, spawnArgs, { cwd, stdio: quiet ? "ignore" : "inherit", windowsHide: true });
     const timer = setTimeout(() => {
       try {
         child.kill();
@@ -17746,7 +17797,7 @@ function scheduleRelatedDiscovery(o) {
   try {
     const args = ["issue", "discover-related", "--number", String(o.number), "--title", o.title, "--body", o.body];
     if (o.repo) args.push("--repo", o.repo);
-    (0, import_node_child_process10.spawn)(process.execPath, [process.argv[1], ...args], {
+    (0, import_node_child_process11.spawn)(process.execPath, [process.argv[1], ...args], {
       detached: true,
       stdio: "ignore",
       windowsHide: true,
@@ -18800,7 +18851,7 @@ async function remoteBranchExists2(branch, options = {}) {
 }
 var COMPOSE_TIMEOUT_MS = 12e4;
 function spawnDeferredGcSweep() {
-  spawnDetachedSelf(["gc", "sweep-deferred", "--quiet"], { spawn: import_node_child_process10.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
+  spawnDetachedSelf(["gc", "sweep-deferred", "--quiet"], { spawn: import_node_child_process11.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
 }
 async function createDeferredWorktreeStore() {
   try {
@@ -19963,7 +20014,7 @@ program2.command("session-start").description("run the SessionStart verbs (whoam
     return;
   }
   if (!await isOrgRepoRoot()) return;
-  spawnDetachedSelf(["docs", "sync", "--quiet"], { spawn: import_node_child_process10.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
+  spawnDetachedSelf(["docs", "sync", "--quiet"], { spawn: import_node_child_process11.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
   spawnDeferredGcSweep();
   const { parallel, sequential } = buildSessionStartPlan({
     // whoami (#879): surface the resolved human so agents act --for them without asking. Silent
@@ -19981,7 +20032,7 @@ program2.command("session-start").description("run the SessionStart verbs (whoam
       readBoard,
       // #1813: warm the slice cache out-of-band (detached, like docs sync) so the ~20s live read
       // never costs banner time and next session's glance renders instantly within budget.
-      scheduleRefresh: () => spawnDetachedSelf(["board", "slice-refresh", "--quiet"], { spawn: import_node_child_process10.spawn, execPath: process.execPath, scriptPath: process.argv[1] })
+      scheduleRefresh: () => spawnDetachedSelf(["board", "slice-refresh", "--quiet"], { spawn: import_node_child_process11.spawn, execPath: process.execPath, scriptPath: process.argv[1] })
     }),
     doctor: (io) => runDoctor({ banner: true }, io)
   });
@@ -19989,7 +20040,7 @@ program2.command("session-start").description("run the SessionStart verbs (whoam
   for (const line of scratchGcLines(process.cwd())) consoleIo.log(line);
   const worktreeBanner = worktreeAutoProvisionBanner(process.cwd());
   if (worktreeBanner) {
-    spawnDetachedSelf(["worktree", "setup", "--quiet"], { spawn: import_node_child_process10.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
+    spawnDetachedSelf(["worktree", "setup", "--quiet"], { spawn: import_node_child_process11.spawn, execPath: process.execPath, scriptPath: process.argv[1] });
     consoleIo.log(worktreeBanner);
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "2.63.0",
+  "version": "2.65.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",