@mushi-mushi/cli 0.35.1 → 0.35.3

package/dist/{chunk-R3S4SF4A.js → chunk-AWAWVAQN.js}

@@ -8,10 +8,10 @@ import {
   requireConfig,
   requireUuid,
   tryLoadWorkerKey
-} from "./chunk-VI5A6EDG.js";
+} from "./chunk-WLX3HRNB.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-Z2AFR5AI.js";
+} from "./chunk-QLR6ZPEQ.js";
 
 // src/worker/daemon.ts
 import { existsSync as existsSync6, readFileSync as readFileSync5 } from "fs";
@@ -608,9 +608,11 @@ function runProc(cmd, args, opts = {}) {
   });
 }
 async function clearWorktree(repoDir, wt) {
-  if (!existsSync(wt)) return;
-  await runProc("git", ["worktree", "remove", "--force", wt], { cwd: repoDir });
-  if (existsSync(wt)) rmSync(wt, { recursive: true, force: true });
+  if (existsSync(wt)) {
+    await runProc("git", ["worktree", "remove", "--force", wt], { cwd: repoDir });
+    if (existsSync(wt)) rmSync(wt, { recursive: true, force: true });
+  }
+  await runProc("git", ["worktree", "unlock", wt], { cwd: repoDir });
   await runProc("git", ["worktree", "prune"], { cwd: repoDir });
 }
 var GIT_TIMEOUT_MS = 10 * 6e4;
@@ -983,7 +985,7 @@ function registerWorkCommands(program) {
       if (opts.repoDir || opts.report || opts.followups) {
         throw new MushiCliError("E_INVALID_INPUT", "--daemon takes its lanes and clones from the worker config, not from --repo-dir, --report or --followups.", "mushi worker install");
       }
-      const { runDaemon: runDaemon2 } = await import("./daemon-5XONC35D.js");
+      const { runDaemon: runDaemon2 } = await import("./daemon-LZWDEQ6D.js");
       await runDaemon2({ configPath: opts.workerConfig });
       return;
     }
@@ -2128,6 +2130,7 @@ var IDLE_MS = 15 * 6e4;
 var BACKOFF_MS = 2 * 6e4;
 var GH_CHECK_MS = 5 * 6e4;
 var CURSOR_CHECK_MS = 20 * 6e4;
+var KEY_REFUSALS_TO_STOP = 3;
 function createDaemon(cfg, deps) {
   const lanes = cfg.lanes.map((local) => ({
     local,
@@ -2167,6 +2170,8 @@ function createDaemon(cfg, deps) {
     return r.data;
   };
   const refusedByKey = (r) => !r.ok && (r.httpStatus === 401 || r.httpStatus === 403 && /REVOKED|INVALID_API_KEY|WORKER_KEY_REQUIRED|INSUFFICIENT_SCOPE/.test(r.error.code));
+  const revokedForSure = (r) => !r.ok && r.httpStatus === 403 && /REVOKED|WORKER_KEY_REQUIRED|INSUFFICIENT_SCOPE/.test(r.error.code);
+  let keyRefusals = 0;
   function stopAll(why) {
     stopped = why;
     for (const l of lanes) for (const ac of l.running.values()) ac.abort();
@@ -2409,7 +2414,12 @@ function createDaemon(cfg, deps) {
     while (!stopped && lane.running.size < c.concurrency && agents() < g.max_agents && now >= lane.nextClaimAt) {
       const r = await deps.call("/v1/worker/claim", { method: "POST", body: JSON.stringify({ laneId: lane.serverId }) });
       if (refusedByKey(r)) {
-        stopAll(`the server refused this worker's key (${r.error.code}); it was revoked or lost access`);
+        if (revokedForSure(r)) stopAll(`the server refused this worker's key (${r.error.code}); it was revoked or lost access`);
+        else {
+          lane.nextClaimAt = now + BACKOFF_MS;
+          lane.state = "backoff";
+          say(lane, `claim refused (${r.error.code}); the next heartbeat checks the key again`);
+        }
         return;
       }
       if (!r.ok) {
@@ -2471,9 +2481,17 @@ function createDaemon(cfg, deps) {
     if (stopped) return;
     const hb = await deps.call("/v1/worker/heartbeat", { method: "POST", body: JSON.stringify(heartbeatBody()) });
     if (refusedByKey(hb)) {
-      stopAll(`the server refused this worker's key (${hb.error.code}); it was revoked or lost access`);
+      const code = hb.error.code;
+      keyRefusals++;
+      if (revokedForSure(hb) || keyRefusals >= KEY_REFUSALS_TO_STOP) {
+        stopAll(`the server refused this worker's key (${code}) ${keyRefusals > 1 ? `${keyRefusals} times in a row` : ""}; it was revoked or lost access`.replace(/\s+;/, ";"));
+        return;
+      }
+      hostState = "backoff";
+      say(null, `the server refused this worker's key (${code}); checking again before stopping (${keyRefusals} of ${KEY_REFUSALS_TO_STOP})`);
       return;
     }
+    if (hb.ok) keyRefusals = 0;
     if (!hb.ok) {
       hostState = "backoff";
       say(null, `heartbeat failed: ${hb.error.code} ${hb.error.message}`);

package/dist/{chunk-2RCG7AHP.js → chunk-JHCDXD3S.js}

@@ -9,10 +9,10 @@ import {
   requireUuid,
   saveConfig,
   savedSdkKeyFor
-} from "./chunk-VI5A6EDG.js";
+} from "./chunk-WLX3HRNB.js";
 import {
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-Z2AFR5AI.js";
+} from "./chunk-QLR6ZPEQ.js";
 import {
   assertEndpoint,
   normalizeEndpoint

package/dist/chunk-PCZRZE4Y.js

@@ -0,0 +1,8 @@
+// src/version.ts
+var MUSHI_CLI_VERSION = true ? "0.35.3" : "0.0.0-dev";
+var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.2";
+
+export {
+  MUSHI_CLI_VERSION,
+  MUSHI_MCP_PIN_SPEC
+};

package/dist/chunk-QLR6ZPEQ.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+
+// src/version.ts
+var MUSHI_CLI_VERSION = true ? "0.35.3" : "0.0.0-dev";
+var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.2";
+
+export {
+  MUSHI_CLI_VERSION,
+  MUSHI_MCP_PIN_SPEC
+};

package/dist/{chunk-VI5A6EDG.js → chunk-WLX3HRNB.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-Z2AFR5AI.js";
+} from "./chunk-QLR6ZPEQ.js";
 import {
   CLOUD_API_ENDPOINT,
   normalizeEndpoint

package/dist/{chunk-FBCX3OBT.js → chunk-ZT67ZX2O.js}

@@ -1,6 +1,6 @@
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-Q4TOO3HX.js";
+} from "./chunk-PCZRZE4Y.js";
 import {
   assertEndpoint,
   normalizeEndpoint

package/dist/{connect-45YP7OGH.js → connect-5UJIK6E4.js}

@@ -6,10 +6,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   waitForIngestReady
-} from "./chunk-FBCX3OBT.js";
+} from "./chunk-ZT67ZX2O.js";
 import {
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-Q4TOO3HX.js";
+} from "./chunk-PCZRZE4Y.js";
 import {
   detectFramework,
   envVarsToWrite,

package/dist/{connect-VTUZZHQB.js → connect-XQCE4JKF.js}

@@ -2,10 +2,10 @@
 import {
   resolveSdkEnvKey,
   runConnect
-} from "./chunk-2RCG7AHP.js";
+} from "./chunk-JHCDXD3S.js";
 import "./chunk-KOBEOGNF.js";
-import "./chunk-VI5A6EDG.js";
-import "./chunk-Z2AFR5AI.js";
+import "./chunk-WLX3HRNB.js";
+import "./chunk-QLR6ZPEQ.js";
 import "./chunk-LGGE3LH7.js";
 export {
   resolveSdkEnvKey,

package/dist/{daemon-5XONC35D.js → daemon-LZWDEQ6D.js}

@@ -7,9 +7,9 @@ import {
   readWorkerKey,
   runDaemon,
   workerHostId
-} from "./chunk-R3S4SF4A.js";
-import "./chunk-VI5A6EDG.js";
-import "./chunk-Z2AFR5AI.js";
+} from "./chunk-AWAWVAQN.js";
+import "./chunk-WLX3HRNB.js";
+import "./chunk-QLR6ZPEQ.js";
 import "./chunk-LGGE3LH7.js";
 export {
   assertWorkerKey,

package/dist/index.js

@@ -22,7 +22,7 @@ import {
   sanitizeEndpoint,
   sanitizeProjectId,
   writeMcpServerEntry
-} from "./chunk-2RCG7AHP.js";
+} from "./chunk-JHCDXD3S.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -49,7 +49,7 @@ import {
   registerUxCommands,
   registerWorkCommands,
   validateWorkerConfig
-} from "./chunk-R3S4SF4A.js";
+} from "./chunk-AWAWVAQN.js";
 import {
   CONFIG_PATH,
   MushiCliError,
@@ -87,11 +87,11 @@ import {
   tryDeleteWorkerKey,
   trySaveKeyToKeychain,
   trySaveWorkerKey
-} from "./chunk-VI5A6EDG.js";
+} from "./chunk-WLX3HRNB.js";
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-Z2AFR5AI.js";
+} from "./chunk-QLR6ZPEQ.js";
 import {
   CLOUD_API_ENDPOINT,
   CLOUD_MCP_OAUTH_URL,
@@ -1594,7 +1594,7 @@ async function checkOnboardingStatus(config, _consoleBase, cwd, doFetch = global
 }
 async function checkVersionDrift(cwd, doFetch) {
   const checks = [];
-  const { MUSHI_CLI_VERSION: MUSHI_CLI_VERSION2 } = await import("./version-ABB4VJEJ.js");
+  const { MUSHI_CLI_VERSION: MUSHI_CLI_VERSION2 } = await import("./version-M4YSUKSX.js");
   if (MUSHI_CLI_VERSION2 === "0.0.0-dev") return checks;
   const parse2 = (v) => {
     const m = v.replace(/^[~^]/, "").match(/^(\d+)\.(\d+)\.(\d+)/);
@@ -2567,7 +2567,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect: runConnect2 } = await import("./connect-VTUZZHQB.js");
+    const { runConnect: runConnect2 } = await import("./connect-XQCE4JKF.js");
     const saved = loadConfig();
     const result = await runConnect2(
       {
@@ -12816,12 +12816,23 @@ Uploaded ${p5.rows} day \xD7 repo \xD7 SKU rows for ${p5.month}. The console's C
   });
   const placement = runner.command("placement").description("Where each repo's CI runs, and changing it through one runner variable with approval (ADR 0037)");
   const placementBody = (opts, config) => {
-    if (!opts.remove && !opts.value) throw new MushiCliError("E_INVALID_INPUT", "Pass --value <runner label>, or --remove to delete the variable.");
+    if (!opts.remove && !opts.value) throw new MushiCliError("E_INVALID_INPUT", "Pass --value <runner label | economy | thorough>, or --remove to delete the variable.");
     if (opts.remove && opts.value) throw new MushiCliError("E_INVALID_INPUT", "Pass either --value or --remove, not both.");
     if (!/^[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/.test(opts.repo)) throw new MushiCliError("E_INVALID_INPUT", "--repo must be owner/repo.");
     const raw = opts.projectId ?? opts.project ?? config.projectId;
     if (!raw) throw new MushiCliError("E_INVALID_INPUT", "Pass --project-id (or configure a project).");
-    return { projectId: requireUuid(raw, "project id"), repo: opts.repo, variable: opts.variable, value: opts.remove ? null : opts.value };
+    let revertAfterHours;
+    if (opts.revertAfter !== void 0) {
+      revertAfterHours = Number(opts.revertAfter);
+      if (!Number.isInteger(revertAfterHours) || revertAfterHours < 1 || revertAfterHours > 168) throw new MushiCliError("E_INVALID_INPUT", "--revert-after is a whole number of hours from 1 to 168.");
+    }
+    return {
+      projectId: requireUuid(raw, "project id"),
+      repo: opts.repo,
+      variable: opts.variable,
+      value: opts.remove ? null : opts.value,
+      ...revertAfterHours !== void 0 ? { revertAfterHours } : {}
+    };
   };
   placement.command("show").description("Each repo: the runner variables its workflows read and their values, the CI agreement, runner labels, pending requests").option("--project-id <id>", "Project ID (defaults to the configured project)").option("--project <id>", "Same as --project-id").option("--json", "Machine-readable JSON output").action(async (opts) => {
     const config = requireConfig();
@@ -12854,7 +12865,7 @@ Uploaded ${p5.rows} day \xD7 repo \xD7 SKU rows for ${p5.month}. The console's C
     console.log(`
 Requested ${r.id} (${r.status}). ${r.next ?? "An owner or admin approves and runs it in the console."}`);
   };
-  const changeOptions = (cmd) => cmd.requiredOption("--repo <owner/repo>", "Repository connected to the project").option("--variable <name>", "LINUX_RUNNER or RUNNER_<WORKFLOW>", "LINUX_RUNNER").option("--value <label>", "The runner label jobs should ask for").option("--remove", "Remove the variable (jobs use the workflow's fallback, usually GitHub-hosted)").option("--project-id <id>", "Project ID (defaults to the configured project)").option("--project <id>", "Same as --project-id").option("--json", "Machine-readable JSON output");
+  const changeOptions = (cmd) => cmd.requiredOption("--repo <owner/repo>", "Repository connected to the project").option("--variable <name>", "LINUX_RUNNER, RUNNER_<WORKFLOW>, or CI_PROFILE (where a workflow reads it)", "LINUX_RUNNER").option("--value <label>", "The runner label jobs should ask for (CI_PROFILE: economy or thorough)").option("--revert-after <hours>", "A move to GitHub-hosted runners switches back after this many hours (1-168)").option("--remove", "Remove the variable (jobs use the workflow's fallback, usually GitHub-hosted)").option("--project-id <id>", "Project ID (defaults to the configured project)").option("--project <id>", "Same as --project-id").option("--json", "Machine-readable JSON output");
   changeOptions(
     placement.command("preview").description("Dry run: what would move, what stays and why, the target runners, cost, the CI agreement's verdict. Changes nothing")
   ).action(placementAction("preview"));

package/dist/init.js

@@ -25,10 +25,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   trySaveKeyToKeychain
-} from "./chunk-FBCX3OBT.js";
+} from "./chunk-ZT67ZX2O.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-Q4TOO3HX.js";
+} from "./chunk-PCZRZE4Y.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -2127,7 +2127,7 @@ async function maybeOfferConnect(credentials, options, _consoleBase) {
   if (p.isCancel(answer) || !answer) return;
   const endpoint = resolveCloudEndpoint(options.endpoint);
   try {
-    const { runConnect } = await import("./connect-45YP7OGH.js");
+    const { runConnect } = await import("./connect-5UJIK6E4.js");
     const saved = loadConfig();
     const result = await runConnect(
       {

package/dist/{version-ABB4VJEJ.js → version-M4YSUKSX.js}

@@ -2,7 +2,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-Z2AFR5AI.js";
+} from "./chunk-QLR6ZPEQ.js";
 export {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC

package/dist/version.d.ts

@@ -14,6 +14,6 @@ declare const MUSHI_CLI_VERSION: string;
  * setup refreshes the pin. Synced to packages/mcp/package.json by
  * `scripts/sync-mcp-pin.mjs` — never hand-edit the version.
  */
-declare const MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.1";
+declare const MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.2";
 
 export { MUSHI_CLI_VERSION, MUSHI_MCP_PIN_SPEC };

package/dist/version.js

@@ -1,7 +1,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-Q4TOO3HX.js";
+} from "./chunk-PCZRZE4Y.js";
 export {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.35.1",
+  "version": "0.35.3",
   "license": "MIT",
   "description": "Mushi CLI: SDK setup, MCP wiring, bug triage. The bug mediator for AI-built apps: plain-English diagnosis + a ready fix, in your editor.",
   "bin": {

package/dist/chunk-Q4TOO3HX.js

@@ -1,8 +0,0 @@
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.35.1" : "0.0.0-dev";
-var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.1";
-
-export {
-  MUSHI_CLI_VERSION,
-  MUSHI_MCP_PIN_SPEC
-};

package/dist/chunk-Z2AFR5AI.js

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-// src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.35.1" : "0.0.0-dev";
-var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.1";
-
-export {
-  MUSHI_CLI_VERSION,
-  MUSHI_MCP_PIN_SPEC
-};