@mushi-mushi/cli 0.35.2 → 0.35.4

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2026 Kenji Sakuramoto / Kensaurus 合同会社
+Copyright (c) 2026 kensaurus LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/{chunk-DBXL4RLE.js → chunk-ED3OCCXS.js}

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

package/dist/{chunk-VNGG2M3O.js → chunk-GZYBA5IS.js}

@@ -1,5 +1,5 @@
 // src/version.ts
-var MUSHI_CLI_VERSION = true ? "0.35.2" : "0.0.0-dev";
+var MUSHI_CLI_VERSION = true ? "0.35.4" : "0.0.0-dev";
 var MUSHI_MCP_PIN_SPEC = "@mushi-mushi/mcp@0.30.2";
 
 export {

package/dist/{chunk-XUPFPVB2.js → chunk-IZAVMMI6.js}

@@ -9,10 +9,10 @@ import {
   requireUuid,
   saveConfig,
   savedSdkKeyFor
-} from "./chunk-DBXL4RLE.js";
+} from "./chunk-ED3OCCXS.js";
 import {
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-OWUJYMV6.js";
+} from "./chunk-OXHAJNVK.js";
 import {
   assertEndpoint,
   normalizeEndpoint

package/dist/{chunk-OWUJYMV6.js → chunk-OXHAJNVK.js}

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

package/dist/{chunk-VAQTC77F.js → chunk-VZIANKUF.js}

@@ -8,10 +8,10 @@ import {
   requireConfig,
   requireUuid,
   tryLoadWorkerKey
-} from "./chunk-DBXL4RLE.js";
+} from "./chunk-ED3OCCXS.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-OWUJYMV6.js";
+} from "./chunk-OXHAJNVK.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-STJJNPRM.js");
+      const { runDaemon: runDaemon2 } = await import("./daemon-EQPTR6IO.js");
       await runDaemon2({ configPath: opts.workerConfig });
       return;
     }
@@ -2126,8 +2128,18 @@ function loadWorkerConfig(path = WORKER_CONFIG_PATH) {
 var HEARTBEAT_MS = 6e4;
 var IDLE_MS = 15 * 6e4;
 var BACKOFF_MS = 2 * 6e4;
+var INFRA_BACKOFF_MS = 6e4;
+var INFRA_BACKOFF_MAX_MS = 30 * 6e4;
+var AGENT_UNAVAILABLE = /ActionRequiredError|Increase limits|usage limit|out of (?:usage|credits)|Cannot use this model/i;
 var GH_CHECK_MS = 5 * 6e4;
 var CURSOR_CHECK_MS = 20 * 6e4;
+function infraBackoffMs(streak) {
+  return streak <= 1 ? 0 : Math.min(INFRA_BACKOFF_MS * 2 ** (streak - 2), INFRA_BACKOFF_MAX_MS);
+}
+function machineFailed(result, failureKind, detail) {
+  return result === "failed" && failureKind === "infra" || AGENT_UNAVAILABLE.test(detail);
+}
+var KEY_REFUSALS_TO_STOP = 3;
 function createDaemon(cfg, deps) {
   const lanes = cfg.lanes.map((local) => ({
     local,
@@ -2137,6 +2149,7 @@ function createDaemon(cfg, deps) {
     followup: false,
     nextClaimAt: 0,
     nextFollowupAt: 0,
+    infraStreak: 0,
     state: deps.notReady?.has(local.name) ? "not-ready" : "starting",
     seenState: "",
     stateAt: deps.now(),
@@ -2167,6 +2180,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();
@@ -2231,6 +2246,17 @@ function createDaemon(cfg, deps) {
       claims: lanes.flatMap((l) => [...l.running.keys()])
     };
   }
+  function afterRun(lane, failedOnMachine) {
+    if (!failedOnMachine) {
+      lane.infraStreak = 0;
+      return;
+    }
+    lane.infraStreak++;
+    const wait = infraBackoffMs(lane.infraStreak);
+    if (wait === 0) return;
+    lane.nextClaimAt = Math.max(lane.nextClaimAt, deps.now() + wait);
+    say(lane, `  the machine or the agent account failed ${lane.infraStreak} time${lane.infraStreak === 1 ? "" : "s"} in a row: next claim in ${Math.round(wait / 6e4)} min`);
+  }
   function startRun(lane, claim) {
     const ac = new AbortController();
     lane.running.set(claim.id, ac);
@@ -2266,6 +2292,7 @@ function createDaemon(cfg, deps) {
       if (out.result === "failed") lane.counters.errors++;
       lane.last = `${claim.report.id.slice(0, 8)} \u2192 ${out.outcome}`.slice(0, 160);
       say(lane, `  \u2192 ${out.outcome}${out.prUrl ? ` ${out.prUrl}` : ""}`);
+      afterRun(lane, machineFailed(out.result, out.failureKind, out.outcome));
       const done = await deps.call(`/v1/worker/claims/${claim.id}/done`, {
         method: "POST",
         body: JSON.stringify({
@@ -2312,6 +2339,7 @@ function createDaemon(cfg, deps) {
       if (out.result === "failed") lane.counters.errors++;
       lane.last = `${out.result}: ${out.detail}`.slice(0, 160);
       say(lane, `  \u2192 ${out.result}: ${out.detail}`);
+      afterRun(lane, machineFailed(out.result, out.failureKind, out.detail));
       const done = await deps.call(`/v1/worker/claims/${claimId}/done`, {
         method: "POST",
         body: JSON.stringify({
@@ -2409,7 +2437,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 +2504,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}`);
@@ -2759,6 +2800,8 @@ export {
   WORKER_KEY_PATH,
   validateWorkerConfig,
   loadWorkerConfig,
+  infraBackoffMs,
+  machineFailed,
   createDaemon,
   workerHostId,
   readWorkerKey,

package/dist/{chunk-ZA2HNXTH.js → chunk-ZQV3NBK7.js}

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

package/dist/{connect-YC6MRVZN.js → connect-Q75QLGAB.js}

@@ -6,10 +6,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   waitForIngestReady
-} from "./chunk-ZA2HNXTH.js";
+} from "./chunk-ZQV3NBK7.js";
 import {
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-VNGG2M3O.js";
+} from "./chunk-GZYBA5IS.js";
 import {
   detectFramework,
   envVarsToWrite,

package/dist/{connect-SH7D5RJP.js → connect-XJHTZIHF.js}

@@ -2,10 +2,10 @@
 import {
   resolveSdkEnvKey,
   runConnect
-} from "./chunk-XUPFPVB2.js";
+} from "./chunk-IZAVMMI6.js";
 import "./chunk-KOBEOGNF.js";
-import "./chunk-DBXL4RLE.js";
-import "./chunk-OWUJYMV6.js";
+import "./chunk-ED3OCCXS.js";
+import "./chunk-OXHAJNVK.js";
 import "./chunk-LGGE3LH7.js";
 export {
   resolveSdkEnvKey,

package/dist/{daemon-STJJNPRM.js → daemon-EQPTR6IO.js}

@@ -4,18 +4,22 @@ import {
   createDaemon,
   createHostReadings,
   cursorStateFor,
+  infraBackoffMs,
+  machineFailed,
   readWorkerKey,
   runDaemon,
   workerHostId
-} from "./chunk-VAQTC77F.js";
-import "./chunk-DBXL4RLE.js";
-import "./chunk-OWUJYMV6.js";
+} from "./chunk-VZIANKUF.js";
+import "./chunk-ED3OCCXS.js";
+import "./chunk-OXHAJNVK.js";
 import "./chunk-LGGE3LH7.js";
 export {
   assertWorkerKey,
   createDaemon,
   createHostReadings,
   cursorStateFor,
+  infraBackoffMs,
+  machineFailed,
   readWorkerKey,
   runDaemon,
   workerHostId

package/dist/index.js

@@ -22,7 +22,7 @@ import {
   sanitizeEndpoint,
   sanitizeProjectId,
   writeMcpServerEntry
-} from "./chunk-XUPFPVB2.js";
+} from "./chunk-IZAVMMI6.js";
 import {
   FRAMEWORKS,
   detectFramework,
@@ -49,7 +49,7 @@ import {
   registerUxCommands,
   registerWorkCommands,
   validateWorkerConfig
-} from "./chunk-VAQTC77F.js";
+} from "./chunk-VZIANKUF.js";
 import {
   CONFIG_PATH,
   MushiCliError,
@@ -87,11 +87,11 @@ import {
   tryDeleteWorkerKey,
   trySaveKeyToKeychain,
   trySaveWorkerKey
-} from "./chunk-DBXL4RLE.js";
+} from "./chunk-ED3OCCXS.js";
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-OWUJYMV6.js";
+} from "./chunk-OXHAJNVK.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-6ZDAJV77.js");
+  const { MUSHI_CLI_VERSION: MUSHI_CLI_VERSION2 } = await import("./version-237BBW3V.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-SH7D5RJP.js");
+    const { runConnect: runConnect2 } = await import("./connect-XJHTZIHF.js");
     const saved = loadConfig();
     const result = await runConnect2(
       {

package/dist/init.js

@@ -25,10 +25,10 @@ import {
   saveConfig,
   savedSdkKeyFor,
   trySaveKeyToKeychain
-} from "./chunk-ZA2HNXTH.js";
+} from "./chunk-ZQV3NBK7.js";
 import {
   MUSHI_CLI_VERSION
-} from "./chunk-VNGG2M3O.js";
+} from "./chunk-GZYBA5IS.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-YC6MRVZN.js");
+    const { runConnect } = await import("./connect-Q75QLGAB.js");
     const saved = loadConfig();
     const result = await runConnect(
       {

package/dist/{version-6ZDAJV77.js → version-237BBW3V.js}

@@ -2,7 +2,7 @@
 import {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC
-} from "./chunk-OWUJYMV6.js";
+} from "./chunk-OXHAJNVK.js";
 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-VNGG2M3O.js";
+} from "./chunk-GZYBA5IS.js";
 export {
   MUSHI_CLI_VERSION,
   MUSHI_MCP_PIN_SPEC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mushi-mushi/cli",
-  "version": "0.35.2",
+  "version": "0.35.4",
   "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": {