codeam-cli 2.76.14 → 2.76.16

package/dist/index.js

@@ -128,11 +128,11 @@ var init_stdio_proxy = __esm({
         rl.on("close", () => this.child?.stdin?.end());
         const timer = setInterval(() => this.checkRestart(stdout), RESTART_CHECK_INTERVAL_MS);
         timer.unref();
-        return new Promise((resolve14) => {
+        return new Promise((resolve13) => {
           this.ended = (code) => {
             clearInterval(timer);
             process.exitCode = code;
-            resolve14();
+            resolve13();
           };
         });
       }
@@ -313,14 +313,14 @@ function deploymentNameFromKey(key) {
   return null;
 }
 function defaultSpawn(timeoutMs) {
-  return (cmd, args2, opts) => new Promise((resolve14) => {
+  return (cmd, args2, opts) => new Promise((resolve13) => {
     let out2 = "";
     let err = "";
     let done = false;
     const finish = (code) => {
       if (done) return;
       done = true;
-      resolve14({ code, stdout: out2, stderr: err });
+      resolve13({ code, stdout: out2, stderr: err });
     };
     let child;
     try {
@@ -656,7 +656,7 @@ async function runHttpRelay(delivery, client3, id) {
     requestInit: { headers: buildHttpHeaders(delivery.httpHeaders, token) }
   });
   const stdioTransport = new StdioServerTransport();
-  await new Promise((resolve14, reject) => {
+  await new Promise((resolve13, reject) => {
     let done = false;
     const watchdog = createToolCallWatchdog({
       timeoutMs: TOOL_CALL_TIMEOUT_MS,
@@ -670,7 +670,7 @@ async function runHttpRelay(delivery, client3, id) {
       void httpTransport.close().catch(() => void 0);
       void stdioTransport.close().catch(() => void 0);
       if (err) reject(err);
-      else resolve14();
+      else resolve13();
     };
     stdioTransport.onmessage = (msg) => {
       watchdog.onClientMessage(msg);
@@ -4726,11 +4726,11 @@ async function raceWithTimeout(promise, timeoutMs, onTimeout) {
   try {
     return await Promise.race([
       promise,
-      new Promise((resolve14, reject) => {
+      new Promise((resolve13, reject) => {
         timeoutHandle = safeSetTimeout(() => {
           try {
             onTimeout?.();
-            resolve14();
+            resolve13();
           } catch (error) {
             reject(error);
           }
@@ -7804,13 +7804,13 @@ async function getContextLinesFromFile(path114, ranges, output, cacheKey, openSo
   const fileHandle = await openRegularSourceFile(path114, openSourceFile, logger);
   if (void 0 === fileHandle) return void LRU_FILE_CONTENTS_FS_READ_FAILED.set(cacheKey, 1);
   const openedFileHandle = fileHandle;
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let finished = false;
     function destroyStreamAndResolve(stream2) {
       if (finished) return;
       finished = true;
       stream2?.destroy();
-      openedFileHandle.close().then(resolve14, resolve14);
+      openedFileHandle.close().then(resolve13, resolve13);
     }
     let stream;
     try {
@@ -8999,7 +8999,7 @@ var V1CaptureSender = class {
     this.fetchFn = hooks.fetch;
     this.onError = hooks.onError;
     this.now = hooks.now ?? Date.now;
-    this.sleep = hooks.sleep ?? ((ms) => new Promise((resolve14) => safeSetTimeout(resolve14, ms)));
+    this.sleep = hooks.sleep ?? ((ms) => new Promise((resolve13) => safeSetTimeout(resolve13, ms)));
     this.generateRequestId = hooks.generateRequestId ?? uuidv7;
     this.compress = hooks.compress ?? gzipCompress;
   }
@@ -9363,9 +9363,9 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     if (!waitUntil) return;
     if (this.disabled || this.optedOut) return;
     if (!this._waitUntilCycle) {
-      let resolve14;
+      let resolve13;
       const promise = new Promise((r) => {
-        resolve14 = r;
+        resolve13 = r;
       });
       try {
         waitUntil(promise);
@@ -9373,7 +9373,7 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
         return;
       }
       this._waitUntilCycle = {
-        resolve: resolve14,
+        resolve: resolve13,
         startedAt: Date.now(),
         timer: void 0
       };
@@ -9397,12 +9397,12 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     return cycle?.resolve;
   }
   async resolveWaitUntilFlush() {
-    const resolve14 = this._consumeWaitUntilCycle();
+    const resolve13 = this._consumeWaitUntilCycle();
     try {
       await this.flushWithPendingPromises();
     } catch {
     } finally {
-      resolve14?.();
+      resolve13?.();
     }
   }
   getPersistedProperty(key) {
@@ -9660,15 +9660,15 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
   async waitForLocalEvaluationReady(timeoutMs = THIRTY_SECONDS) {
     if (this.isLocalEvaluationReady()) return true;
     if (void 0 === this.featureFlagsPoller) return false;
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const timeout = setTimeout(() => {
         cleanup();
-        resolve14(false);
+        resolve13(false);
       }, timeoutMs);
       const cleanup = this._events.on("localEvaluationFlagsLoaded", (count) => {
         clearTimeout(timeout);
         cleanup();
-        resolve14(count > 0);
+        resolve13(count > 0);
       });
     });
   }
@@ -10172,7 +10172,7 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
   }
   async _shutdown(shutdownTimeoutMs) {
     const shutdownDeadlineMs = Date.now() + (shutdownTimeoutMs ?? 3e4);
-    const resolve14 = this._consumeWaitUntilCycle();
+    const resolve13 = this._consumeWaitUntilCycle();
     await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
     this.errorTracking.shutdown();
     if (this._metrics) {
@@ -10184,7 +10184,7 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
       return await super._shutdown(Math.max(0, shutdownDeadlineMs - Date.now()));
     } finally {
       this.distinctIdHasSentFlagCalls = {};
-      resolve14?.();
+      resolve13?.();
     }
   }
   async _requestRemoteConfigPayload(flagKey) {
@@ -10579,7 +10579,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.76.14" : "0.0.0-dev",
+    cliVersion: true ? "2.76.16" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -10726,10 +10726,10 @@ var _execSeam = {
   }
 };
 var _execSeamAsync = {
-  exec: (file, args2, opts) => new Promise((resolve14, reject) => {
+  exec: (file, args2, opts) => new Promise((resolve13, reject) => {
     (0, import_child_process.execFile)(file, args2, opts, (err, stdout) => {
       if (err) reject(err);
-      else resolve14(typeof stdout === "string" ? stdout : stdout.toString("utf8"));
+      else resolve13(typeof stdout === "string" ? stdout : stdout.toString("utf8"));
     });
   })
 };
@@ -10753,6 +10753,10 @@ var os4 = __toESM(require("os"));
 var path4 = __toESM(require("path"));
 var import_child_process2 = require("child_process");
 var WRAPPER_REPO_NAME = "codeam-codespace";
+function isWrapperCheckout(dir) {
+  const resolved = path4.posix.normalize(dir.replace(/\\/g, "/")).replace(/\/+$/, "");
+  return resolved === `/workspaces/${WRAPPER_REPO_NAME}`;
+}
 function resolveSessionHostname(cwd = process.cwd()) {
   if (process.env.CODESPACES !== "true") {
     const label = process.env.CODEAM_HOST_LABEL?.trim();
@@ -10824,7 +10828,7 @@ var http = __toESM(require("http"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.76.14",
+  version: "2.76.16",
   description: "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device \u2014 async. The terminal companion for CodeAgent Mobile.",
   type: "commonjs",
   main: "dist/index.js",
@@ -10958,8 +10962,8 @@ async function requestCode(pluginId, pluginSecretHash) {
     });
     let timer;
     const timeoutSentinel = /* @__PURE__ */ Symbol("request-code-timeout");
-    const timeoutPromise = new Promise((resolve14) => {
-      timer = setTimeout(() => resolve14(timeoutSentinel), REQUEST_CODE_TIMEOUT_MS);
+    const timeoutPromise = new Promise((resolve13) => {
+      timer = setTimeout(() => resolve13(timeoutSentinel), REQUEST_CODE_TIMEOUT_MS);
     });
     const result = await Promise.race([post3, timeoutPromise]);
     clearTimeout(timer);
@@ -11413,7 +11417,7 @@ async function postBeadsProvisioning(input) {
   }
 }
 async function _postJsonAuthed(url2, body, pluginAuthToken) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const data = JSON.stringify(body);
     const u2 = new URL(url2);
     const transport = u2.protocol === "https:" ? https : http;
@@ -11443,9 +11447,9 @@ async function _postJsonAuthed(url2, body, pluginAuthToken) {
             return;
           }
           try {
-            resolve14(JSON.parse(responseBody));
+            resolve13(JSON.parse(responseBody));
           } catch {
-            resolve14(null);
+            resolve13(null);
           }
         });
       }
@@ -11471,7 +11475,7 @@ function makeHttpError(statusCode, retryAfterHeader, responseBody) {
   return err;
 }
 async function _postJson(url2, body, extraHeaders) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const data = JSON.stringify(body);
     const u2 = new URL(url2);
     const transport = u2.protocol === "https:" ? https : http;
@@ -11501,9 +11505,9 @@ async function _postJson(url2, body, extraHeaders) {
             return;
           }
           try {
-            resolve14(JSON.parse(body2));
+            resolve13(JSON.parse(body2));
           } catch {
-            resolve14(null);
+            resolve13(null);
           }
         });
       }
@@ -11518,7 +11522,7 @@ async function _postJson(url2, body, extraHeaders) {
   });
 }
 async function _getJson(url2, extraHeaders) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const u2 = new URL(url2);
     const transport = u2.protocol === "https:" ? https : http;
     const req = transport.request(
@@ -11542,9 +11546,9 @@ async function _getJson(url2, extraHeaders) {
             return;
           }
           try {
-            resolve14(JSON.parse(body));
+            resolve13(JSON.parse(body));
           } catch {
-            resolve14(null);
+            resolve13(null);
           }
         });
       }
@@ -12160,7 +12164,7 @@ var CommandRelayService = class _CommandRelayService {
       // fresh + clear the "CLI update available" banner after a self-update
       // (a codespace that reinstalls @latest reconnects via heartbeat, not
       // pair/reconnect). Older backends ignore the extra field.
-      ..."2.76.14" ? { ideVersion: "2.76.14" } : {}
+      ..."2.76.16" ? { ideVersion: "2.76.16" } : {}
     };
     try {
       const res = await _postJson(`${API_BASE2}/api/plugin/heartbeat`, body);
@@ -12305,8 +12309,8 @@ async function stopRelayWithGoodbye(relay, timeoutMs = RELAY_GOODBYE_TIMEOUT_MS)
   try {
     await Promise.race([
       relay.stopAndFlush(),
-      new Promise((resolve14) => {
-        timer = setTimeout(resolve14, timeoutMs);
+      new Promise((resolve13) => {
+        timer = setTimeout(resolve13, timeoutMs);
       })
     ]);
   } catch {
@@ -12415,7 +12419,7 @@ var _transport2 = {
   post: _post
 };
 function _post(url2, headers, payload) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     let settled = false;
     const u2 = new URL(url2);
     const lib = u2.protocol === "https:" ? https3 : http3;
@@ -12440,7 +12444,7 @@ function _post(url2, headers, payload) {
         res.on("end", () => {
           if (settled) return;
           settled = true;
-          resolve14({ statusCode: res.statusCode ?? 0, body });
+          resolve13({ statusCode: res.statusCode ?? 0, body });
         });
       }
     );
@@ -13139,12 +13143,12 @@ var _gitSeam = {
   run: _runGitImpl
 };
 async function _runGitImpl(cwd, args2, opts = {}) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let proc;
     try {
       proc = (0, import_child_process3.spawn)("git", args2, { cwd, env: process.env });
     } catch {
-      resolve14(null);
+      resolve13(null);
       return;
     }
     let stdout = "";
@@ -13155,13 +13159,13 @@ async function _runGitImpl(cwd, args2, opts = {}) {
     proc.stderr?.on("data", (c2) => {
       stderr += c2.toString();
     });
-    proc.on("error", () => resolve14(null));
+    proc.on("error", () => resolve13(null));
     proc.on("close", (code) => {
       if (code === 0 || opts.allowNonZeroExit) {
-        resolve14(stdout);
+        resolve13(stdout);
       } else {
         log.trace("fileWatcher", `git ${args2.join(" ")} exited ${code} stderr=${stderr.slice(0, 200)}`);
-        resolve14(null);
+        resolve13(null);
       }
     });
   });
@@ -13247,7 +13251,7 @@ var ChunkEmitter = class {
     if (this.pairingInvalid) {
       return Promise.resolve({ dead: true });
     }
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       let refreshedOnce = false;
       const attempt = (attemptsLeft) => {
         _transport3.post(this.url, this.headers, payload).then(({ statusCode, body: resBody }) => {
@@ -13255,13 +13259,13 @@ var ChunkEmitter = class {
           if (statusCode === 410 || statusCode === 404 && /SESSION_NOT_FOUND|SESSION_GONE/.test(resBody)) {
             process.stderr.write("[codeam] session was deleted/disconnected \u2014 stopping output stream.\n");
             log.info("chunkEmitter", `dead status=${statusCode} took=${tookMs}ms`);
-            resolve14({ dead: true });
+            resolve13({ dead: true });
             return;
           }
           if (statusCode === 401 || statusCode === 403) {
             if (refreshedOnce) {
               this.markPairingInvalid(statusCode, tookMs);
-              resolve14({ dead: true });
+              resolve13({ dead: true });
               return;
             }
             log.warn("chunkEmitter", `auth ${statusCode} took=${tookMs}ms \u2014 attempting silent refresh`);
@@ -13277,10 +13281,10 @@ var ChunkEmitter = class {
               }
               if (refresh.kind === "gone") {
                 this.markPairingInvalid(statusCode, tookMs);
-                resolve14({ dead: true });
+                resolve13({ dead: true });
                 return;
               }
-              resolve14({ dead: false });
+              resolve13({ dead: false });
             })();
             return;
           }
@@ -13291,7 +13295,7 @@ var ChunkEmitter = class {
           } else {
             log.info("chunkEmitter", `ok status=${statusCode} took=${tookMs}ms`);
           }
-          resolve14({ dead: false });
+          resolve13({ dead: false });
         }).catch((err) => {
           log.warn(
             "chunkEmitter",
@@ -13302,7 +13306,7 @@ var ChunkEmitter = class {
             const delay = 200 * (maxRetries - attemptsLeft + 1);
             setTimeout(() => attempt(attemptsLeft - 1), delay);
           } else {
-            resolve14({ dead: false });
+            resolve13({ dead: false });
           }
         });
       };
@@ -13325,7 +13329,7 @@ var _transport3 = {
   post: _post2
 };
 function _post2(url2, headers, payload) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     let settled = false;
     const u2 = new URL(url2);
     const transport = u2.protocol === "https:" ? https4 : http4;
@@ -13349,7 +13353,7 @@ function _post2(url2, headers, payload) {
         res.on("end", () => {
           if (settled) return;
           settled = true;
-          resolve14({ statusCode: res.statusCode ?? 0, body: resData });
+          resolve13({ statusCode: res.statusCode ?? 0, body: resData });
         });
       }
     );
@@ -14443,12 +14447,12 @@ async function applyFileReview(workingDir, filePath, action) {
   return { ok: true, action, filePath, repoRoot };
 }
 function runGit2(cwd, args2) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let proc;
     try {
       proc = (0, import_child_process6.spawn)("git", args2, { cwd, env: process.env });
     } catch (err) {
-      resolve14({ ok: false, code: -1, stdout: "", stderr: err.message });
+      resolve13({ ok: false, code: -1, stdout: "", stderr: err.message });
       return;
     }
     let stdout = "";
@@ -14461,11 +14465,11 @@ function runGit2(cwd, args2) {
     });
     proc.on(
       "error",
-      (err) => resolve14({ ok: false, code: -1, stdout, stderr: stderr + err.message })
+      (err) => resolve13({ ok: false, code: -1, stdout, stderr: stderr + err.message })
     );
     proc.on(
       "close",
-      (code) => resolve14({ ok: code === 0, code: code ?? -1, stdout, stderr })
+      (code) => resolve13({ ok: code === 0, code: code ?? -1, stdout, stderr })
     );
   });
 }
@@ -16804,13 +16808,13 @@ var UnixPtyStrategy = class {
     this.proc = null;
     if (proc) {
       proc.removeAllListeners("exit");
-      const exited = new Promise((resolve14) => {
-        if (proc.exitCode !== null || proc.signalCode !== null) return resolve14();
-        proc.once("exit", () => resolve14());
+      const exited = new Promise((resolve13) => {
+        if (proc.exitCode !== null || proc.signalCode !== null) return resolve13();
+        proc.once("exit", () => resolve13());
       });
       proc.kill("SIGTERM");
-      const timer = new Promise((resolve14) => {
-        const t2 = setTimeout(() => resolve14("timeout"), timeoutMs);
+      const timer = new Promise((resolve13) => {
+        const t2 = setTimeout(() => resolve13("timeout"), timeoutMs);
         void exited.then(() => clearTimeout(t2));
       });
       if (await Promise.race([exited, timer]) === "timeout") {
@@ -17284,15 +17288,15 @@ function runInstaller() {
     "-Command",
     "irm https://claude.ai/install.ps1 | iex"
   ] : ["-c", "curl -fsSL https://claude.ai/install.sh | bash"];
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const proc = (0, import_child_process9.spawn)(cmd, args2, { stdio: "inherit" });
     proc.on("error", (err) => {
       console.error(`
   \u2717 Installer failed to launch: ${err.message}`);
-      resolve14(false);
+      resolve13(false);
     });
     proc.on("exit", (code) => {
-      resolve14(code === 0);
+      resolve13(code === 0);
     });
   });
 }
@@ -17427,7 +17431,7 @@ function extractSetupTokenFromOutput(output) {
   return m ? m[0] : null;
 }
 function captureClaudeSetupToken() {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const child = (0, import_node_child_process2.spawn)("claude", ["setup-token"], {
       stdio: ["inherit", "pipe", "inherit"]
     });
@@ -17441,7 +17445,7 @@ function captureClaudeSetupToken() {
     child.on("exit", (code) => {
       const token = extractSetupTokenFromOutput(out2);
       if (token) {
-        resolve14({ method: "setup_token", credential: token, source: "setup-token" });
+        resolve13({ method: "setup_token", credential: token, source: "setup-token" });
         return;
       }
       reject(
@@ -17527,17 +17531,17 @@ function parseUsageOutput(raw) {
   return { percent, resetAt };
 }
 async function fetchClaudeQuota() {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const claudeCmd = findInPath("claude") ? "claude" : "claude-code";
     if (!claudeCmd) {
-      resolve14(null);
+      resolve13(null);
       return;
     }
     const helperPath = path17.join(os11.tmpdir(), "codeam-quota-helper.py");
     fs13.writeFileSync(helperPath, HELPER_SCRIPT, { mode: 420 });
     const python = findInPath("python3") ?? findInPath("python");
     if (!python) {
-      resolve14(null);
+      resolve13(null);
       return;
     }
     const proc = (0, import_child_process10.spawn)(python, [helperPath, claudeCmd, "--tools", ""], {
@@ -17564,13 +17568,13 @@ async function fetchClaudeQuota() {
           fs13.unlinkSync(helperPath);
         } catch {
         }
-        resolve14(result);
+        resolve13(result);
       }, 5e3);
     }, 8e3);
     setTimeout(() => {
       if (!resolved) {
         resolved = true;
-        resolve14(null);
+        resolve13(null);
       }
       try {
         proc.kill();
@@ -17609,12 +17613,12 @@ function killActiveSpawnAndCaptureChildren() {
 }
 async function spawnAndCapture(cmd, args2, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 6e4;
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let settled = false;
     const settle = (value) => {
       if (settled) return;
       settled = true;
-      resolve14(value);
+      resolve13(value);
     };
     let child;
     try {
@@ -19065,7 +19069,7 @@ function newestRolloutIdSince(sessionsRoot, resolvedCwd, floorMs) {
   return bestId;
 }
 function sleep2(ms) {
-  return new Promise((resolve14) => setTimeout(resolve14, ms));
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
 }
 function getCurrentUsage2(historyDir) {
   if (!import_node_fs4.default.existsSync(historyDir)) return null;
@@ -19176,7 +19180,13 @@ function codexLoginLauncher() {
   };
 }
 
+// src/agents/codex/state-runtime-race.ts
+var CODEX_STATE_RUNTIME_RACE_RE = /failed to initialize (sqlite )?state runtime/i;
+
 // src/agents/codex/runtime.ts
+var _codexOneShotSeam = {
+  sleep: (ms) => new Promise((r) => setTimeout(r, ms))
+};
 var CODEX_CONTEXT_WINDOW = 272e3;
 var CODEX_MODELS = [
   { id: "gpt-5.5", label: "GPT-5.5", contextWindow: CODEX_CONTEXT_WINDOW },
@@ -19295,24 +19305,34 @@ var CodexRuntimeStrategy = class {
     const binary = this.os.findInPath("codex");
     if (!binary) return null;
     const launch = this.os.buildLaunch(binary, ["exec", prompt]);
-    return spawnAndCapture(launch.cmd, launch.args, {
-      onStderr: opts?.onStderr,
-      onFailedOutput: opts?.onFailedOutput,
-      cwd: opts?.cwd,
-      timeoutMs: opts?.timeoutMs
-    });
+    const runOnce = () => {
+      let stderr = "";
+      return spawnAndCapture(launch.cmd, launch.args, {
+        onStderr: (chunk) => {
+          stderr += chunk;
+          opts?.onStderr?.(chunk);
+        },
+        onFailedOutput: opts?.onFailedOutput,
+        cwd: opts?.cwd,
+        timeoutMs: opts?.timeoutMs
+      }).then((text) => ({ text, stderr }));
+    };
+    const first = await runOnce();
+    if (first.text !== null || !CODEX_STATE_RUNTIME_RACE_RE.test(first.stderr)) return first.text;
+    await _codexOneShotSeam.sleep(1e3);
+    return (await runOnce()).text;
   }
 };
 function resolveNpm(os74) {
   return os74.id === "win32" ? "npm.cmd" : "npm";
 }
 async function installCodexViaNpm(os74) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const proc = (0, import_node_child_process4.spawn)(resolveNpm(os74), ["install", "-g", "@openai/codex"], {
       stdio: "inherit"
     });
     proc.on("close", (code) => {
-      if (code === 0) resolve14();
+      if (code === 0) resolve13();
       else reject(new Error(`npm install -g @openai/codex exited ${code}`));
     });
     proc.on("error", (err) => {
@@ -19432,7 +19452,7 @@ var defaultOsRunner = {
     }
   },
   run(cmd, args2, opts = {}) {
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const spawnEnv = opts.env ?? process.env;
       const child = (0, import_node_child_process5.spawn)(cmd, args2, { stdio: ["ignore", "pipe", "pipe"], env: spawnEnv });
       let stderrBuf = "";
@@ -19441,7 +19461,7 @@ var defaultOsRunner = {
       const done = (code) => {
         if (settled) return;
         settled = true;
-        resolve14({ code, stderr: stderrBuf, stdout: stdoutBuf });
+        resolve13({ code, stderr: stderrBuf, stdout: stdoutBuf });
       };
       child.stdout?.on("data", (b) => {
         const chunk = b.toString();
@@ -19590,7 +19610,7 @@ async function ensureInstallPrerequisites(os74, deps = {}) {
   };
 }
 function defaultRunInstallScript(env) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const proc = (0, import_node_child_process6.spawn)(
       "sh",
       ["-c", `curl -fsSL --connect-timeout 15 --max-time 120 ${INSTALL_URL} | sh`],
@@ -19602,7 +19622,7 @@ function defaultRunInstallScript(env) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve14({ code, output });
+      resolve13({ code, output });
     };
     const onData = (b) => {
       const chunk = b.toString();
@@ -19976,7 +19996,7 @@ var CoderabbitRuntimeStrategy = class {
   }
   async runOneShot(input) {
     const launch = await this.prepareInvocation(input);
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const stdoutBuf = [];
       const stderrBuf = [];
       const proc = (0, import_node_child_process8.spawn)(launch.cmd, launch.args, {
@@ -19988,7 +20008,7 @@ var CoderabbitRuntimeStrategy = class {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        resolve14(out2);
+        resolve13(out2);
       };
       const timer = setTimeout(() => {
         if (settled) return;
@@ -20608,7 +20628,7 @@ function resolveClaudeNativeBinary(deps = {}) {
   const candidate = import_path4.default.join(scopeDir, `claude-agent-sdk-${platformKey}`, binName);
   return existsSync35(candidate) ? candidate : null;
 }
-var realSleep = (ms) => new Promise((resolve14) => setTimeout(resolve14, ms));
+var realSleep = (ms) => new Promise((resolve13) => setTimeout(resolve13, ms));
 async function waitForClaudeNativeBinary(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
@@ -20729,7 +20749,7 @@ var PERMANENT_ADAPTER_STARTUP_RE = /IneligibleTierError|UNSUPPORTED_CLIENT|no lo
 function probeAdapterModuleGraph(command2, args2, opts = {}) {
   const livenessMs = opts.livenessMs ?? 400;
   const spawnFn = opts.spawnFn ?? import_child_process13.spawn;
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let settled = false;
     let stderr = "";
     let timer;
@@ -20742,12 +20762,12 @@ function probeAdapterModuleGraph(command2, args2, opts = {}) {
         child?.kill("SIGKILL");
       } catch {
       }
-      resolve14(r);
+      resolve13(r);
     };
     try {
       child = spawnFn(command2, [...args2], { stdio: ["pipe", "ignore", "pipe"] });
     } catch {
-      resolve14("ok");
+      resolve13("ok");
       return;
     }
     child.stderr?.on("data", (d3) => {
@@ -21336,7 +21356,7 @@ function newestSessionSince(bucket, floorMs) {
   return bestId;
 }
 function sleep3(ms) {
-  return new Promise((resolve14) => setTimeout(resolve14, ms));
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
 }
 function joinTextParts(parts) {
   if (!Array.isArray(parts)) return "";
@@ -21787,7 +21807,7 @@ async function link(args2 = []) {
   waitSpin.start(waitMsg());
   const countdown = setInterval(() => waitSpin.message(waitMsg()), 1e3);
   countdown.unref?.();
-  const paired = await new Promise((resolve14, reject) => {
+  const paired = await new Promise((resolve13, reject) => {
     let stopPoll = null;
     const sigint = () => {
       clearInterval(countdown);
@@ -21800,7 +21820,7 @@ async function link(args2 = []) {
         process.removeListener("SIGINT", sigint);
         clearInterval(countdown);
         waitSpin.stop("Paired");
-        resolve14(info);
+        resolve13(info);
       },
       () => {
         clearInterval(countdown);
@@ -21958,14 +21978,14 @@ async function captureFreshCredentials(ctx) {
     }
   };
   try {
-    const token = await new Promise((resolve14, reject) => {
+    const token = await new Promise((resolve13, reject) => {
       let settled = false;
       const tryExtract = async () => {
         if (settled) return;
         const t2 = await ctx.locator.extract();
         if (t2 && !settled) {
           settled = true;
-          resolve14(t2);
+          resolve13(t2);
         }
       };
       watcher.on("add", () => void tryExtract());
@@ -22209,7 +22229,7 @@ function deliverPendingCoderabbitCallback(callbackUrl) {
 function runCoderabbitOAuthLogin(deps) {
   const timeoutMs = deps.timeoutMs ?? 18e4;
   const spawnProc = deps.spawn ?? spawnCoderabbitLoginProc;
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let settled = false;
     let stdout = "";
     let last = null;
@@ -22222,13 +22242,13 @@ function runCoderabbitOAuthLogin(deps) {
         child.kill("SIGKILL");
       } catch {
       }
-      resolve14(r);
+      resolve13(r);
     };
     let child;
     try {
       child = spawnProc("coderabbit", ["auth", "login", "--agent"]);
     } catch (err) {
-      resolve14({ ok: false, error: err instanceof Error ? err.message : "spawn failed" });
+      resolve13({ ok: false, error: err instanceof Error ? err.message : "spawn failed" });
       return;
     }
     const timer = setTimeout(
@@ -22701,23 +22721,23 @@ async function reviewPullRequest(params, deps) {
   return report;
 }
 function defaultRunGh(args2) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const stdout = [];
     const stderr = [];
     let proc;
     try {
       proc = (0, import_node_child_process17.spawn)("gh", args2, { stdio: ["ignore", "pipe", "pipe"] });
     } catch (err) {
-      resolve14({ code: -1, stdout: "", stderr: err instanceof Error ? err.message : String(err) });
+      resolve13({ code: -1, stdout: "", stderr: err instanceof Error ? err.message : String(err) });
       return;
     }
     proc.stdout?.on("data", (b) => stdout.push(b));
     proc.stderr?.on("data", (b) => stderr.push(b));
     proc.on("error", (err) => {
-      resolve14({ code: -1, stdout: "", stderr: err.message });
+      resolve13({ code: -1, stdout: "", stderr: err.message });
     });
     proc.on("close", (code) => {
-      resolve14({
+      resolve13({
         code: code ?? 0,
         stdout: Buffer.concat(stdout).toString("utf8"),
         stderr: Buffer.concat(stderr).toString("utf8")
@@ -23037,7 +23057,7 @@ var import_node_fs11 = __toESM(require("fs"));
 var import_node_path9 = __toESM(require("path"));
 var import_yazl = require("yazl");
 function buildZip(cwd, list, outFile) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const zip = new import_yazl.ZipFile();
     for (const f of list.files) {
       const abs = import_node_path9.default.join(cwd, f.rel);
@@ -23047,7 +23067,7 @@ function buildZip(cwd, list, outFile) {
     if (list.envExample) zip.addBuffer(Buffer.from(list.envExample), ".env.example");
     const out2 = import_node_fs11.default.createWriteStream(outFile, { mode: 384 });
     zip.outputStream.pipe(out2);
-    out2.on("close", () => resolve14(import_node_fs11.default.statSync(outFile).size));
+    out2.on("close", () => resolve13(import_node_fs11.default.statSync(outFile).size));
     out2.on("error", reject);
     zip.outputStream.on("error", reject);
     zip.end();
@@ -23239,12 +23259,12 @@ async function isExecutableBinary(p2) {
   }
 }
 function extractTgz(tgzPath, destDir) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     const child = (0, import_child_process14.spawn)("tar", ["-xzf", tgzPath, "-C", destDir], { stdio: "ignore" });
     child.on("error", (err) => reject(err));
     child.on(
       "exit",
-      (code) => code === 0 ? resolve14() : reject(new Error(`tar exited with code ${code} while extracting cloudflared`))
+      (code) => code === 0 ? resolve13() : reject(new Error(`tar exited with code ${code} while extracting cloudflared`))
     );
   });
 }
@@ -23825,17 +23845,17 @@ function expoGoDeepLink(publicUrl) {
   return `exps://${new URL(publicUrl).host}`;
 }
 function isExpoManifestServed(port, host2 = "127.0.0.1") {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const req = http6.get(
       { host: host2, port, path: "/", headers: { "expo-platform": "ios" }, timeout: 1500 },
       (res) => {
         const ok = res.statusCode !== void 0 && res.statusCode >= 200 && res.statusCode < 300;
         res.resume();
-        resolve14(ok);
+        resolve13(ok);
       }
     );
     req.once("timeout", () => req.destroy());
-    req.once("error", () => resolve14(false));
+    req.once("error", () => resolve13(false));
   });
 }
 async function waitForExpoManifest(port, opts) {
@@ -23983,12 +24003,12 @@ function describeDetectionFailure(raw) {
 // src/services/preview/port-ready.ts
 var net = __toESM(require("net"));
 function isPortListening(port, host2 = "127.0.0.1") {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const socket = new net.Socket();
     const done = (result) => {
       socket.removeAllListeners();
       socket.destroy();
-      resolve14(result);
+      resolve13(result);
     };
     socket.setTimeout(1e3);
     socket.once("connect", () => done(true));
@@ -24026,14 +24046,14 @@ const { PGLiteSocketServer } = require('@electric-sql/pglite-socket');
 })().catch((e) => { console.error(String(e && e.message)); process.exit(1); });
 `;
 function isListening(port) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const s = net2.connect({ host: "127.0.0.1", port }, () => {
       s.destroy();
-      resolve14(true);
-    }).on("error", () => resolve14(false));
+      resolve13(true);
+    }).on("error", () => resolve13(false));
     s.setTimeout(1e3, () => {
       s.destroy();
-      resolve14(false);
+      resolve13(false);
     });
   });
 }
@@ -24081,7 +24101,7 @@ function stopChild(child) {
 // src/services/preview/run-setup.ts
 var import_child_process18 = require("child_process");
 function runSetupCommand(cmd, args2, cwd, env, opts) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const child = (0, import_child_process18.spawn)(cmd, args2, {
       cwd,
       env: { ...process.env, ...env ?? {} },
@@ -24101,20 +24121,20 @@ function runSetupCommand(cmd, args2, cwd, env, opts) {
       settled = true;
       log.info("preview", `${tag}: timed out after ${opts.timeoutMs}ms \u2014 killing`);
       killQuiet(child);
-      resolve14({ status: "timeout", code: null });
+      resolve13({ status: "timeout", code: null });
     }, opts.timeoutMs);
     child.once("exit", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      if (code === 0) resolve14({ status: "ok", code: 0 });
-      else resolve14({ status: "failed", code });
+      if (code === 0) resolve13({ status: "ok", code: 0 });
+      else resolve13({ status: "failed", code });
     });
     child.once("error", () => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve14({ status: "failed", code: null });
+      resolve13({ status: "failed", code: null });
     });
   });
 }
@@ -24570,23 +24590,23 @@ async function awaitTunnelRegistered(candidate, hostname3, deadlineMs) {
     ac.signal.addEventListener("abort", detach, { once: true });
   };
   try {
-    return await new Promise((resolve14) => {
+    return await new Promise((resolve13) => {
       const onChunk = (chunk) => {
         const s = chunk.toString();
         if (!url2) url2 = parseCloudflaredUrl(s);
         if (TUNNEL_REGISTERED_RE.test(s)) registered = true;
         const trimmed = s.replace(/\n+$/g, "");
         if (trimmed.length > 0) log.info("preview", `cloudflared: ${trimmed}`);
-        if (url2 && registered) resolve14({ kind: "registered", url: url2 });
+        if (url2 && registered) resolve13({ kind: "registered", url: url2 });
       };
       const onExit = (code) => {
-        resolve14({ kind: "exited", sawUrl: url2 != null, code });
+        resolve13({ kind: "exited", sawUrl: url2 != null, code });
       };
       const { stdout, stderr } = candidate;
       if (stdout) scoped(() => stdout.on("data", onChunk), () => stdout.off("data", onChunk));
       if (stderr) scoped(() => stderr.on("data", onChunk), () => stderr.off("data", onChunk));
       scoped(() => candidate.on("exit", onExit), () => candidate.off("exit", onExit));
-      timer = setTimeout(() => resolve14({ kind: "timeout", sawUrl: url2 != null }), deadlineMs);
+      timer = setTimeout(() => resolve13({ kind: "timeout", sawUrl: url2 != null }), deadlineMs);
     });
   } finally {
     ac.abort();
@@ -24609,7 +24629,7 @@ function verdictFor(res) {
   }
   return { adopt: true };
 }
-var probePort = (port) => new Promise((resolve14) => {
+var probePort = (port) => new Promise((resolve13) => {
   const req = http7.get(
     { host: "127.0.0.1", port, path: "/", timeout: PROBE_TIMEOUT_MS },
     (res) => {
@@ -24620,16 +24640,16 @@ var probePort = (port) => new Promise((resolve14) => {
       });
       res.on(
         "end",
-        () => resolve14({ contentType: res.headers["content-type"], bodyStart: body })
+        () => resolve13({ contentType: res.headers["content-type"], bodyStart: body })
       );
-      res.on("error", () => resolve14(null));
+      res.on("error", () => resolve13(null));
     }
   );
   req.on("timeout", () => {
     req.destroy();
-    resolve14(null);
+    resolve13(null);
   });
-  req.on("error", () => resolve14(null));
+  req.on("error", () => resolve13(null));
 });
 async function canAdoptPort(port, probe = probePort) {
   try {
@@ -26044,18 +26064,18 @@ async function startInspectorProxy(opts) {
     clientSocket.on("error", drop2);
     clientSocket.on("close", drop2);
   });
-  await new Promise((resolve14, reject) => {
+  await new Promise((resolve13, reject) => {
     server.once("error", reject);
-    server.listen(0, "127.0.0.1", () => resolve14());
+    server.listen(0, "127.0.0.1", () => resolve13());
   });
   const port = server.address().port;
   return {
     port,
-    close: () => new Promise((resolve14) => {
+    close: () => new Promise((resolve13) => {
       for (const socket of upgraded) socket.destroy();
       upgraded.clear();
       server.closeAllConnections?.();
-      server.close(() => resolve14());
+      server.close(() => resolve13());
     })
   };
 }
@@ -27139,12 +27159,12 @@ var _spawnSeam = {
   run: _defaultSpawn
 };
 function _defaultSpawn(binaryPath, args2, opts) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let proc;
     try {
       proc = (0, import_child_process21.spawn)(binaryPath, args2, { cwd: opts.cwd, env: opts.env });
     } catch (err) {
-      resolve14({ code: -1, stdout: "", stderr: err.message });
+      resolve13({ code: -1, stdout: "", stderr: err.message });
       return;
     }
     let stdout = "";
@@ -27155,8 +27175,8 @@ function _defaultSpawn(binaryPath, args2, opts) {
     proc.stderr?.on("data", (c2) => {
       stderr += c2.toString();
     });
-    proc.on("error", (err) => resolve14({ code: -1, stdout, stderr: err.message }));
-    proc.on("close", (code) => resolve14({ code: code ?? -1, stdout, stderr }));
+    proc.on("error", (err) => resolve13({ code: -1, stdout, stderr: err.message }));
+    proc.on("close", (code) => resolve13({ code: code ?? -1, stdout, stderr }));
   });
 }
 var _adapterSeam = {
@@ -27200,7 +27220,7 @@ var BdAdapter = class {
    * exit codes — note bd exits 0 even for some error states (e.g. "no beads
    * database found"), so JSON-parsing callers must also inspect the payload.
    */
-  async run(args2) {
+  async run(args2, runOpts = {}) {
     const binary = this.resolveBinary();
     if (!binary) {
       return { code: -1, stdout: "", stderr: "bd binary not resolved" };
@@ -27215,16 +27235,14 @@ var BdAdapter = class {
     }
     env.BEADS_DOLT_SHARED_SERVER = "1";
     delete env.BEADS_DIR;
-    log.trace(
-      "beads",
-      `bd ${args2.join(" ")} (cwd=${this.opts.cwd ?? process.cwd()}, shared-server)`
-    );
-    let res = await _spawnSeam.run(binary, args2, { cwd: this.opts.cwd, env });
+    const cwd = runOpts.cwd ?? this.opts.cwd;
+    log.trace("beads", `bd ${args2.join(" ")} (cwd=${cwd ?? process.cwd()}, shared-server)`);
+    let res = await _spawnSeam.run(binary, args2, { cwd, env });
     const TRANSIENT_SPAWN = /ENOENT|ETXTBSY/;
     for (let attempt = 1; attempt <= 5 && res.code === -1 && TRANSIENT_SPAWN.test(res.stderr); attempt++) {
       log.info("beads", `bd ${args2[0]} transient spawn failure (binary busy) \u2014 retry ${attempt}/5`);
       await _adapterSeam.sleep(750 * attempt);
-      res = await _spawnSeam.run(binary, args2, { cwd: this.opts.cwd, env });
+      res = await _spawnSeam.run(binary, args2, { cwd, env });
     }
     return res;
   }
@@ -27333,22 +27351,22 @@ var _installSpawnSeam = {
   run: _defaultInstallSpawn
 };
 function _defaultInstallSpawn(strategy) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let proc;
     try {
       proc = (0, import_child_process22.spawn)(strategy.command, strategy.args, { env: process.env });
     } catch (err) {
-      resolve14({ ok: false, code: -1, stderr: err.message });
+      resolve13({ ok: false, code: -1, stderr: err.message });
       return;
     }
     let stderr = "";
     proc.stderr?.on("data", (c2) => {
       stderr += c2.toString();
     });
-    proc.on("error", (err) => resolve14({ ok: false, code: -1, stderr: err.message }));
+    proc.on("error", (err) => resolve13({ ok: false, code: -1, stderr: err.message }));
     proc.on(
       "close",
-      (code) => resolve14({ ok: code === 0, code: code ?? -1, stderr })
+      (code) => resolve13({ ok: code === 0, code: code ?? -1, stderr })
     );
   });
 }
@@ -27517,14 +27535,14 @@ var _doltInstallSpawnSeam = {
 };
 var DOLT_INSTALL_TIMEOUT_MS = 12e4;
 function _defaultDoltInstallSpawn(strategy) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let settled = false;
     let timer;
     const finish = (r) => {
       if (settled) return;
       settled = true;
       if (timer) clearTimeout(timer);
-      resolve14(r);
+      resolve13(r);
     };
     let proc;
     try {
@@ -27667,7 +27685,15 @@ var _provisionSeam = {
   /** Silence bd's `beads.role not configured` warning. */
   setGitBeadsRole,
   /** Does the project's git remote carry Dolt data (`refs/dolt/data`)? */
-  remoteHasDoltData
+  remoteHasDoltData,
+  /** Throwaway cwd for a user-level-only `bd setup` (see GLOBAL_ONLY_RECIPES). */
+  makeSetupCwd: () => fs59.mkdtempSync(path67.join(os41.tmpdir(), "codeam-bd-setup-")),
+  removeSetupCwd: (dir) => {
+    try {
+      fs59.rmSync(dir, { recursive: true, force: true });
+    } catch {
+    }
+  }
 };
 function remoteHasDoltData(cwd) {
   try {
@@ -27944,15 +27970,17 @@ async function projectDbReachable(bd) {
 async function setupAgents(bd, agents) {
   const wired = [];
   for (const recipe of dedupeRecipes(agents)) {
+    const scratchCwd = GLOBAL_ONLY_RECIPES.has(recipe) ? _provisionSeam.makeSetupCwd() : null;
+    const runOpts = scratchCwd ? { cwd: scratchCwd } : {};
     try {
-      const check = await bd.run(["setup", recipe, "--global", "--check"]);
+      const check = await bd.run(["setup", recipe, "--global", "--check"], runOpts);
       if (check.code === 0) {
         log.trace("beads", `bd setup ${recipe} --global already installed \u2014 skipping`);
         wired.push(recipe);
         continue;
       }
       log.info("beads", `wiring agent natively: bd setup ${recipe} --global`);
-      const setup = await bd.run(["setup", recipe, "--global"]);
+      const setup = await bd.run(["setup", recipe, "--global"], runOpts);
       if (setup.code === 0) {
         wired.push(recipe);
       } else {
@@ -27963,10 +27991,13 @@ async function setupAgents(bd, agents) {
       }
     } catch (err) {
       log.warn("beads", `bd setup ${recipe} --global threw (non-fatal)`, err);
+    } finally {
+      if (scratchCwd) _provisionSeam.removeSetupCwd(scratchCwd);
     }
   }
   return wired;
 }
+var GLOBAL_ONLY_RECIPES = /* @__PURE__ */ new Set(["claude", "codex", "gemini"]);
 function dedupeRecipes(agents) {
   const seen2 = /* @__PURE__ */ new Set();
   for (const agent of agents) {
@@ -29372,7 +29403,7 @@ function sweepStaleCliStagingDirs(nodeModulesDir, now = Date.now(), deps) {
   if (!nodeModulesDir) return 0;
   const readdirSync18 = deps?.readdirSync ?? fs65.readdirSync;
   const statSync17 = deps?.statSync ?? fs65.statSync;
-  const rmSync14 = deps?.rmSync ?? fs65.rmSync;
+  const rmSync15 = deps?.rmSync ?? fs65.rmSync;
   let removed = 0;
   let entries2;
   try {
@@ -29386,7 +29417,7 @@ function sweepStaleCliStagingDirs(nodeModulesDir, now = Date.now(), deps) {
     try {
       const st3 = statSync17(full);
       if (now - st3.mtimeMs < STALE_STAGING_AGE_MS) continue;
-      rmSync14(full, { recursive: true, force: true });
+      rmSync15(full, { recursive: true, force: true });
       removed++;
     } catch {
     }
@@ -29407,16 +29438,16 @@ async function runNpmInstallLatest() {
     const invocation = buildNpmInstallInvocation({ sudo: useSudo });
     const useShell = process.platform === "win32";
     const command2 = useShell && invocation.command.includes(" ") ? `"${invocation.command}"` : invocation.command;
-    const result = await new Promise((resolve14) => {
+    const result = await new Promise((resolve13) => {
       (0, import_child_process25.execFile)(
         command2,
         invocation.args,
         { timeout: CLI_UPDATE_INSTALL_TIMEOUT_MS, shell: useShell },
         (err, _stdout, stderr) => {
           if (!err) {
-            resolve14({ ok: true });
+            resolve13({ ok: true });
           } else {
-            resolve14({ ok: false, error: (stderr || err.message).slice(0, 300) });
+            resolve13({ ok: false, error: (stderr || err.message).slice(0, 300) });
           }
         }
       );
@@ -29769,8 +29800,8 @@ async function runDetectOneShot(generate, timeoutMs = PREVIEW_DETECT_TIMEOUT_MS)
   };
   const onFailedOutput = (stdout) => onStderr(`
 ${stdout}`);
-  const deadline = new Promise((resolve14) => {
-    timer = setTimeout(() => resolve14({ raw: null, timedOut: true, stderr }), timeoutMs);
+  const deadline = new Promise((resolve13) => {
+    timer = setTimeout(() => resolve13({ raw: null, timedOut: true, stderr }), timeoutMs);
     timer.unref?.();
   });
   const oneShot = generate(PREVIEW_DETECT_PROMPT, { timeoutMs, onStderr, onFailedOutput }).then(
@@ -30238,7 +30269,7 @@ function buildKeepAlive(ctx) {
   let timer = null;
   async function setIdleTimeout(minutes) {
     if (!ctx.inCodespace || !ctx.codespaceName) return;
-    await new Promise((resolve14) => {
+    await new Promise((resolve13) => {
       const proc = (0, import_child_process26.spawn)(
         "gh",
         [
@@ -30252,8 +30283,8 @@ function buildKeepAlive(ctx) {
         { stdio: "ignore", detached: true }
       );
       proc.unref();
-      proc.on("exit", () => resolve14());
-      proc.on("error", () => resolve14());
+      proc.on("exit", () => resolve13());
+      proc.on("error", () => resolve13());
     });
   }
   return {
@@ -31210,10 +31241,10 @@ function augmentKimiPath() {
 }
 var augmentPath2 = augmentKimiPath;
 async function runInstaller2() {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const proc = (0, import_node_child_process25.spawn)("sh", ["-c", `curl -fsSL ${INSTALL_URL2} | bash`], { stdio: "inherit" });
-    proc.on("close", (code) => resolve14(code === 0));
-    proc.on("error", () => resolve14(false));
+    proc.on("close", (code) => resolve13(code === 0));
+    proc.on("error", () => resolve13(false));
   });
 }
 async function ensureKimiInstalled() {
@@ -31263,10 +31294,10 @@ function augmentOpencodePath() {
 }
 var augmentPath3 = augmentOpencodePath;
 async function runInstaller3() {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const proc = (0, import_node_child_process26.spawn)("sh", ["-c", `curl -fsSL ${INSTALL_URL3} | bash`], { stdio: "inherit" });
-    proc.on("close", (code) => resolve14(code === 0));
-    proc.on("error", () => resolve14(false));
+    proc.on("close", (code) => resolve13(code === 0));
+    proc.on("error", () => resolve13(false));
   });
 }
 async function ensureOpencodeInstalled() {
@@ -31474,11 +31505,11 @@ async function resolveAcpAdapterWithRetry(agent, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_ADAPTER_RETRY_TIMEOUT_MS;
   const pollMs = opts.pollMs ?? DEFAULT_ADAPTER_RETRY_POLL_MS;
   const now = opts.now ?? Date.now;
-  const sleep5 = opts.sleep ?? ((ms) => new Promise((resolve15) => setTimeout(resolve15, ms)));
-  const resolve14 = opts.resolve ?? getAcpAdapter;
+  const sleep5 = opts.sleep ?? ((ms) => new Promise((resolve14) => setTimeout(resolve14, ms)));
+  const resolve13 = opts.resolve ?? getAcpAdapter;
   const attempt = () => {
     try {
-      return resolve14(agent);
+      return resolve13(agent);
     } catch {
       return null;
     }
@@ -31709,7 +31740,7 @@ function parseJsonl(filePath) {
   return messages;
 }
 function postWithStatus(endpoint, body, pluginAuthToken) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const payload = JSON.stringify(body);
     const u2 = new URL(`${API_BASE7}${endpoint}`);
     const transport = u2.protocol === "https:" ? https6 : http10;
@@ -31740,17 +31771,17 @@ function postWithStatus(endpoint, body, pluginAuthToken) {
           const ra = Number(res.headers["retry-after"]);
           retryAfterMs = Number.isFinite(ra) && ra > 0 ? ra * 1e3 : 2e4;
         }
-        resolve14({ ok, status: status2, retryAfterMs });
+        resolve13({ ok, status: status2, retryAfterMs });
       }
     );
     req.on("error", (err) => {
       log.warn("history:post", `${endpoint} network error`, err);
-      resolve14({ ok: false, status: null, retryAfterMs: null });
+      resolve13({ ok: false, status: null, retryAfterMs: null });
     });
     req.on("timeout", () => {
       log.warn("history:post", `${endpoint} timeout after 15s`);
       req.destroy();
-      resolve14({ ok: false, status: null, retryAfterMs: null });
+      resolve13({ ok: false, status: null, retryAfterMs: null });
     });
     req.write(payload);
     req.end();
@@ -34324,12 +34355,12 @@ var Connection = class {
     const id = this.nextRequestId++;
     let cancel = () => {
     };
-    const responsePromise = new Promise((resolve14, reject) => {
+    const responsePromise = new Promise((resolve13, reject) => {
       const pendingResponse = {
         resolve: (response) => {
           try {
             const value = mapResponse ? mapResponse(response) : response;
-            resolve14(value);
+            resolve13(value);
           } catch (error) {
             reject(error);
           }
@@ -34407,8 +34438,8 @@ var Connection = class {
   initialize(stream, handlers2) {
     this.stream = stream;
     this.staticHandlers = handlers2;
-    this.closedPromise = new Promise((resolve14) => {
-      this.abortController.signal.addEventListener("abort", () => resolve14());
+    this.closedPromise = new Promise((resolve13) => {
+      this.abortController.signal.addEventListener("abort", () => resolve13());
     });
     void this.receive();
   }
@@ -35196,8 +35227,8 @@ var AsyncQueue = class {
     if (this.failed) {
       return Promise.reject(this.failure);
     }
-    return new Promise((resolve14, reject) => {
-      this.waiters.push({ resolve: resolve14, reject });
+    return new Promise((resolve13, reject) => {
+      this.waiters.push({ resolve: resolve13, reject });
     });
   }
 };
@@ -36637,7 +36668,10 @@ var AcpClient = class {
     const joined = parts.join(" ");
     return TRANSIENT_ADAPTER_SPAWN_RE.test(joined) || ADAPTER_MODULE_LOAD_ERROR_RE.test(joined) || // The transport dying mid-handshake = the adapter crashed starting up,
     // even when the child-exit handler lost the race (see the RE's doc).
-    TRANSPORT_DOWN_DURING_START_RE.test(joined);
+    TRANSPORT_DOWN_DURING_START_RE.test(joined) || // codex-acp stays up but its `codex app-server` child lost the first-run
+    // ~/.codex SQLite migration race to another codex process; a respawn
+    // opens the DBs the winner migrated (see state-runtime-race.ts).
+    CODEX_STATE_RUNTIME_RACE_RE.test(joined);
   }
   async startOnce() {
     if (this.child) throw new Error("AcpClient already started");
@@ -36889,7 +36923,7 @@ var AcpClient = class {
     this.pendingToolCalls.clear();
     try {
       const result = await Promise.race([send, idle.promise]);
-      await new Promise((resolve14) => setImmediate(resolve14));
+      await new Promise((resolve13) => setImmediate(resolve13));
       log.info(
         "acpClient",
         `prompt \u2190 ok stopReason=${result.stopReason ?? "?"} elapsedMs=${Date.now() - t0}`
@@ -37105,8 +37139,8 @@ var AcpClient = class {
     if (!this.connection || !this.sessionId) return "deferred";
     this.mcpReprovisionPending = servers;
     if (this.mcpDebounceTimer) clearTimeout(this.mcpDebounceTimer);
-    const settled = new Promise((resolve14) => {
-      this.mcpDebounceWaiters.push(resolve14);
+    const settled = new Promise((resolve13) => {
+      this.mcpDebounceWaiters.push(resolve13);
     });
     this.mcpDebounceTimer = setTimeout(() => {
       this.mcpDebounceTimer = null;
@@ -37350,15 +37384,15 @@ var AcpClient = class {
       } else {
         child.kill("SIGTERM");
       }
-      const grace = new Promise((resolve14) => {
+      const grace = new Promise((resolve13) => {
         const t2 = setTimeout(() => {
           if (process.platform !== "win32" && pid) killQuiet(-pid, "SIGKILL");
           else killQuiet(child, "SIGKILL");
-          resolve14();
+          resolve13();
         }, 2e3);
         child.once("exit", () => {
           clearTimeout(t2);
-          resolve14();
+          resolve13();
         });
       });
       await grace;
@@ -37587,7 +37621,7 @@ var os52 = __toESM(require("os"));
 function runAgentInstallScript(script, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const scope = opts.logScope ?? "agent-install";
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const home = process.env.HOME || os52.homedir();
     const child = (0, import_child_process27.spawn)("sh", ["-c", script], {
       env: { ...process.env, HOME: home },
@@ -37603,7 +37637,7 @@ function runAgentInstallScript(script, opts = {}) {
     const done = (result) => {
       if (settled) return;
       settled = true;
-      resolve14(result);
+      resolve13(result);
     };
     const timer = setTimeout(() => {
       log.warn(scope, `agent install timed out (${Math.round(timeoutMs / 1e3)}s)`);
@@ -38216,7 +38250,7 @@ var _transport4 = {
   get: _get
 };
 function _post3(url2, headers, payload) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     let settled = false;
     const u2 = new URL(url2);
     const lib = u2.protocol === "https:" ? https7 : http11;
@@ -38241,7 +38275,7 @@ function _post3(url2, headers, payload) {
         res.on("end", () => {
           if (settled) return;
           settled = true;
-          resolve14({ statusCode: res.statusCode ?? 0, body });
+          resolve13({ statusCode: res.statusCode ?? 0, body });
         });
       }
     );
@@ -38258,7 +38292,7 @@ function _post3(url2, headers, payload) {
   });
 }
 function _get(url2, headers) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     let settled = false;
     const u2 = new URL(url2);
     const lib = u2.protocol === "https:" ? https7 : http11;
@@ -38282,7 +38316,7 @@ function _get(url2, headers) {
         res.on("end", () => {
           if (settled) return;
           settled = true;
-          resolve14({ statusCode: res.statusCode ?? 0, body });
+          resolve13({ statusCode: res.statusCode ?? 0, body });
         });
       }
     );
@@ -39513,12 +39547,12 @@ function runGit3(cwd, args2) {
   return _runGitImpl2.run(cwd, args2);
 }
 function defaultRunGit(cwd, args2) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let proc;
     try {
       proc = (0, import_child_process29.spawn)("git", args2, { cwd, env: process.env });
     } catch {
-      resolve14(null);
+      resolve13(null);
       return;
     }
     let stdout = "";
@@ -39529,16 +39563,16 @@ function defaultRunGit(cwd, args2) {
     proc.stderr?.on("data", (c2) => {
       stderr += c2.toString();
     });
-    proc.on("error", () => resolve14(null));
+    proc.on("error", () => resolve13(null));
     proc.on("close", (code) => {
       if (code === 0) {
-        resolve14(stdout);
+        resolve13(stdout);
       } else {
         log.trace(
           "turnFiles",
           `git ${args2.join(" ")} exited ${code} stderr=${stderr.slice(0, 200)}`
         );
-        resolve14(null);
+        resolve13(null);
       }
     });
   });
@@ -39955,25 +39989,25 @@ function baselineKey(entry) {
 
 // src/agents/acp/withTimeout.ts
 function withTimeout(p2, ms) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     let settled = false;
     const timer = setTimeout(() => {
       if (settled) return;
       settled = true;
-      resolve14(void 0);
+      resolve13(void 0);
     }, ms);
     p2.then(
       (v) => {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        resolve14(v);
+        resolve13(v);
       },
       () => {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        resolve14(void 0);
+        resolve13(void 0);
       }
     );
   });
@@ -40142,7 +40176,7 @@ function isProcessMidTurn(pid, home) {
 var import_node_child_process28 = require("child_process");
 var fs80 = __toESM(require("fs"));
 var path90 = __toESM(require("path"));
-var defaultCommandRunner = (file, args2, cwd, timeoutMs, env) => new Promise((resolve14) => {
+var defaultCommandRunner = (file, args2, cwd, timeoutMs, env) => new Promise((resolve13) => {
   (0, import_node_child_process28.execFile)(
     file,
     args2,
@@ -40158,7 +40192,7 @@ var defaultCommandRunner = (file, args2, cwd, timeoutMs, env) => new Promise((re
         const rawCode = err.code;
         code = typeof rawCode === "number" ? rawCode : 1;
       }
-      resolve14({ code, stdout: stdout ?? "", stderr: stderr ?? "" });
+      resolve13({ code, stdout: stdout ?? "", stderr: stderr ?? "" });
     }
   );
 });
@@ -41800,24 +41834,24 @@ var AgentPreviewBridge = class {
    *  preview tools are then simply absent, never a failed session. */
   listen() {
     if (this.listening) return this.listening;
-    this.listening = new Promise((resolve14) => {
+    this.listening = new Promise((resolve13) => {
       const server = http12.createServer((req, res) => {
         void this.handle(req, res);
       });
       server.on("error", (err) => {
         log.warn("agent-preview", `bridge failed to listen: ${String(err)}`);
-        resolve14(null);
+        resolve13(null);
       });
       server.listen(0, "127.0.0.1", () => {
         const addr = server.address();
         if (!addr || typeof addr === "string") {
-          resolve14(null);
+          resolve13(null);
           return;
         }
         server.unref();
         this.server = server;
         this.bound = { url: `http://127.0.0.1:${addr.port}`, token: this.token };
-        resolve14(this.bound);
+        resolve13(this.bound);
       });
     });
     return this.listening;
@@ -41854,9 +41888,9 @@ var AgentPreviewBridge = class {
     }
     const inflight = this.inflight;
     let timer;
-    const pending2 = new Promise((resolve14) => {
+    const pending2 = new Promise((resolve13) => {
       timer = setTimeout(
-        () => resolve14({
+        () => resolve13({
           status: "starting",
           message: "The preview is still coming up (dependencies or a slow dev server). It keeps going in the background \u2014 call preview_status in a minute."
         }),
@@ -42059,7 +42093,7 @@ function authorized(header, token) {
   return presented.length === expected.length && (0, import_node_crypto14.timingSafeEqual)(presented, expected);
 }
 function readJson(req) {
-  return new Promise((resolve14, reject) => {
+  return new Promise((resolve13, reject) => {
     let raw = "";
     req.setEncoding("utf8");
     req.on("data", (chunk) => {
@@ -42070,10 +42104,10 @@ function readJson(req) {
       }
     });
     req.on("end", () => {
-      if (!raw) return resolve14({});
+      if (!raw) return resolve13({});
       try {
         const parsed = JSON.parse(raw);
-        resolve14(parsed && typeof parsed === "object" ? parsed : {});
+        resolve13(parsed && typeof parsed === "object" ? parsed : {});
       } catch {
         reject(new Error("invalid JSON"));
       }
@@ -42270,6 +42304,28 @@ function buildAcpPromptBlocks(payload) {
   return blocks;
 }
 
+// src/agents/acp/reply-language.ts
+var hinted = /* @__PURE__ */ new Set();
+function replyLanguageName(locale) {
+  if (typeof locale !== "string" || locale.trim().length === 0) return null;
+  try {
+    const language = new Intl.Locale(locale.trim().replace(/_/g, "-")).language;
+    if (!language || language === "en" || language === "und") return null;
+    const name = new Intl.DisplayNames(["en"], { type: "language" }).of(language);
+    return name && name.toLowerCase() !== language ? name : null;
+  } catch {
+    return null;
+  }
+}
+function replyLanguageContextOnce(locale, sessionId, agent) {
+  const language = replyLanguageName(locale);
+  if (!language) return null;
+  const key = `${sessionId}:${agent}`;
+  if (hinted.has(key)) return null;
+  hinted.add(key);
+  return `The user's device language is ${language}. Reply in ${language} unless the user writes in another language.`;
+}
+
 // src/agents/acp/promptEcho.ts
 var MAX_PROMPT_CHARS = 200;
 var MAX_AGENT_REPLY_CHARS = 280;
@@ -42300,7 +42356,20 @@ function formatAgentReplyLine(text) {
 function assembleAcpCommandContext(session, cmd) {
   return { ...session, cmd };
 }
-var ACP_QUICK_REPLIES = ["Continue", "Yes, go ahead", "Explain"];
+function quickRepliesForTurn(replyText, stopReason) {
+  if (stopReason === "max_tokens" || stopReason === "max_turn_requests") return ["Continue"];
+  return endsWithYesNoQuestion(replyText) ? ["Yes, go ahead", "No"] : [];
+}
+var YES_NO_LEAD_RE = /^(?:so|ok(?:ay)?|great|alright|then|now)?[,\s]*(?:shall|should|do|does|did|would|will|can|could|may|is|are|was|want|ready|sound|sounds|ok(?:ay)?|proceed|go ahead)\b/i;
+function endsWithYesNoQuestion(replyText) {
+  const text = replyText.replace(/[*_`]/g, "").trimEnd();
+  if (!text.endsWith("?")) return false;
+  const body = text.slice(0, -1);
+  const start2 = Math.max(body.lastIndexOf("\n"), body.lastIndexOf(". "), body.lastIndexOf("! "), body.lastIndexOf("? "));
+  const question = body.slice(start2 + 1).trim();
+  if (/\bor\b/i.test(question)) return false;
+  return YES_NO_LEAD_RE.test(question);
+}
 async function recoverFromFailedTurn(client3, streaming) {
   await cancelStuckTurn(client3);
   await streaming.closeAll();
@@ -42600,6 +42669,8 @@ async function startTaskH(ctx) {
   ctx.history.appendUserPrompt(promptText);
   maybePrefaceAgentStandard(blocks, opts.agent, opts.sessionId);
   const squadContext = collectSquadContext(ctx);
+  const languageContext = replyLanguageContextOnce(payload?.locale, opts.sessionId, opts.agent);
+  if (languageContext) squadContext.push(languageContext);
   applySquadContext(blocks, squadContext, squadContextMode(ctx));
   ctx.squad?.resetHops();
   let turnBlocks = blocks;
@@ -42728,7 +42799,7 @@ async function startTaskH(ctx) {
         }
         void publisher.publishOutput({
           type: "input_suggestion",
-          content: ACP_QUICK_REPLIES,
+          content: quickRepliesForTurn(cleanText, reply.stopReason),
           done: true
         });
         log.info(
@@ -43200,15 +43271,15 @@ async function prewarmNewMcpEntries(manifest, previousIds) {
   );
   await Promise.all(
     fresh.map(
-      (e) => new Promise((resolve14) => {
+      (e) => new Promise((resolve13) => {
         const mcp = e.delivery.mcp;
         const child = (0, import_node_child_process29.execFile)(
           mcp.command,
           [...mcp.args, "--help"],
           { timeout: 9e4 },
-          () => resolve14()
+          () => resolve13()
         );
-        child.on("error", () => resolve14());
+        child.on("error", () => resolve13());
       })
     )
   );
@@ -43475,7 +43546,7 @@ var StreamingState = class {
    * protested "J'ai rien refusé". The line is the user's evidence.
    */
   registerPermission(args2) {
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const timeoutTimer = setTimeout(() => {
         if (this.pending?.kind === "permission" && this.pending.questionId === args2.questionId) {
           log.warn(
@@ -43488,14 +43559,14 @@ var StreamingState = class {
             content: permissionExpiredNotice(),
             done: true
           });
-          resolve14({ outcome: { outcome: "cancelled" } });
+          resolve13({ outcome: { outcome: "cancelled" } });
         }
       }, PERMISSION_TIMEOUT_MS);
       this.setPending({
         kind: "permission",
         questionId: args2.questionId,
         options: args2.options,
-        resolve: resolve14,
+        resolve: resolve13,
         timeoutTimer
       });
     });
@@ -43532,14 +43603,14 @@ var StreamingState = class {
       const byId = optionId ? this.pending.options.find((o) => o.optionId === optionId) : void 0;
       const picked = byId ?? this.pending.options[index];
       clearTimeout(this.pending.timeoutTimer);
-      const resolve14 = this.pending.resolve;
+      const resolve13 = this.pending.resolve;
       this.setPending(null);
       if (!picked) {
         log.warn("acpRunner", `select_option index=${index} out of bounds \u2014 cancel`);
-        resolve14({ outcome: { outcome: "cancelled" } });
+        resolve13({ outcome: { outcome: "cancelled" } });
         return { kind: "resolved", optionId: null };
       }
-      resolve14({ outcome: { outcome: "selected", optionId: picked.optionId } });
+      resolve13({ outcome: { outcome: "selected", optionId: picked.optionId } });
       return { kind: "resolved", optionId: picked.optionId };
     }
     const text = this.pending.options[index];
@@ -46140,10 +46211,10 @@ var NativeTuiDriver = class _NativeTuiDriver {
     this.lastOutput = this.now();
   }
   whenSafeToYield() {
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const tick = () => {
         const quietFor = this.now() - this.lastOutput;
-        if (quietFor >= this.idleMs) resolve14();
+        if (quietFor >= this.idleMs) resolve13();
         else setTimeout(tick, this.idleMs - quietFor);
       };
       tick();
@@ -46206,10 +46277,10 @@ var AcpDriver = class {
    * one ever is, assume resumable so behaviour is unchanged.
    */
   hasTranscript(conversationId) {
-    const resolve14 = this.deps.runtime.resolveHistoryFile;
-    if (typeof resolve14 !== "function") return true;
+    const resolve13 = this.deps.runtime.resolveHistoryFile;
+    if (typeof resolve13 !== "function") return true;
     try {
-      return resolve14.call(this.deps.runtime, this.deps.opts.cwd, conversationId) !== null;
+      return resolve13.call(this.deps.runtime, this.deps.opts.cwd, conversationId) !== null;
     } catch {
       return true;
     }
@@ -46273,11 +46344,11 @@ var AcpDriver = class {
     this.turnActive = false;
     const waiters = this.waiters;
     this.waiters = [];
-    waiters.forEach((resolve14) => resolve14());
+    waiters.forEach((resolve13) => resolve13());
   }
   whenSafeToYield() {
     if (!this.turnActive) return Promise.resolve();
-    return new Promise((resolve14) => this.waiters.push(resolve14));
+    return new Promise((resolve13) => this.waiters.push(resolve13));
   }
 };
 
@@ -46870,8 +46941,8 @@ async function start(requestedAgent, presetSession) {
   const releaseStartupMark = markAgentStarting();
   process.once("exit", releaseStartupMark);
   let settleOwnHandshake = () => void 0;
-  const ownHandshakeSettled = new Promise((resolve14) => {
-    settleOwnHandshake = resolve14;
+  const ownHandshakeSettled = new Promise((resolve13) => {
+    settleOwnHandshake = resolve13;
   });
   const releaseBeads = () => {
     releaseStartupMark();
@@ -46881,7 +46952,7 @@ async function start(requestedAgent, presetSession) {
     ownHandshakeSettled.then(
       () => waitForNoAgentStarting({ timeoutMs: BEADS_AFTER_HANDSHAKE_CAP_MS })
     ),
-    new Promise((resolve14) => setTimeout(resolve14, BEADS_AFTER_HANDSHAKE_CAP_MS).unref())
+    new Promise((resolve13) => setTimeout(resolve13, BEADS_AFTER_HANDSHAKE_CAP_MS).unref())
   ]);
   const beadsReady = provisionBeadsForStart({
     sessionId: session.id,
@@ -46953,8 +47024,8 @@ async function start(requestedAgent, presetSession) {
     let gateTimer;
     await Promise.race([
       Promise.all([depsReady, agentBinaryReady]),
-      new Promise((resolve14) => {
-        gateTimer = setTimeout(resolve14, GATE_TIMEOUT_MS);
+      new Promise((resolve13) => {
+        gateTimer = setTimeout(resolve13, GATE_TIMEOUT_MS);
       })
     ]);
     if (gateTimer) clearTimeout(gateTimer);
@@ -47338,7 +47409,7 @@ async function pair(args2 = []) {
     waitSpin.message(waitMessage());
   }, 1e3);
   countdownInterval.unref?.();
-  await new Promise((resolve14) => {
+  await new Promise((resolve13) => {
     let stopPolling = null;
     function sigintHandler() {
       clearInterval(countdownInterval);
@@ -47389,7 +47460,7 @@ async function pair(args2 = []) {
             pluginAuthToken: info.pluginAuthToken
           });
         }
-        resolve14();
+        resolve13();
       },
       () => {
         clearInterval(countdownInterval);
@@ -47618,12 +47689,12 @@ var GitHubCodespacesProvider = class {
     }
     if (!isAuthed) {
       resetStdinForChild();
-      await new Promise((resolve14, reject) => {
+      await new Promise((resolve13, reject) => {
         const proc = (0, import_child_process30.spawn)("gh", ["auth", "login", "-s", "codespace,repo,read:user"], {
           stdio: "inherit"
         });
         proc.on("exit", (code) => {
-          if (code === 0) resolve14();
+          if (code === 0) resolve13();
           else reject(new Error("gh auth login failed."));
         });
         proc.on("error", reject);
@@ -47652,13 +47723,13 @@ var GitHubCodespacesProvider = class {
       }
       wt(noteLines.join("\n"), "One more permission needed");
       resetStdinForChild();
-      const refreshCode = await new Promise((resolve14, reject) => {
+      const refreshCode = await new Promise((resolve13, reject) => {
         const proc = (0, import_child_process30.spawn)(
           "gh",
           ["auth", "refresh", "-h", "github.com", "-s", "codespace"],
           { stdio: "inherit" }
         );
-        proc.on("exit", (code) => resolve14(code ?? 1));
+        proc.on("exit", (code) => resolve13(code ?? 1));
         proc.on("error", reject);
       });
       if (refreshCode !== 0) {
@@ -47802,10 +47873,10 @@ var GitHubCodespacesProvider = class {
     if (q(proceed) || !proceed) return;
     O2.step(`Installing gh via ${installCmd.describe}\u2026`);
     resetStdinForChild();
-    const ok = await new Promise((resolve14) => {
+    const ok = await new Promise((resolve13) => {
       const proc = (0, import_child_process30.spawn)(installCmd.exe, installCmd.args, { stdio: "inherit" });
-      proc.on("exit", (code) => resolve14(code === 0));
-      proc.on("error", () => resolve14(false));
+      proc.on("exit", (code) => resolve13(code === 0));
+      proc.on("error", () => resolve13(false));
     });
     if (ok) O2.success("gh installed");
     else O2.error("gh install failed");
@@ -47829,14 +47900,14 @@ var GitHubCodespacesProvider = class {
       "Expanding GitHub scopes"
     );
     resetStdinForChild();
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process30.spawn)(
         "gh",
         ["auth", "refresh", "-h", "github.com", "-s", "repo,read:org"],
         { stdio: "inherit" }
       );
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(
           "gh auth refresh failed. Re-run `gh auth refresh -h github.com -s repo,read:org` manually."
         ));
@@ -48007,13 +48078,13 @@ var GitHubCodespacesProvider = class {
   }
   async streamCommand(workspaceId, command2) {
     resetStdinForChild();
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const proc = (0, import_child_process30.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
       );
-      proc.on("exit", (code) => resolve14({ code: code ?? 0 }));
+      proc.on("exit", (code) => resolve13({ code: code ?? 0 }));
       proc.on("error", reject);
     });
   }
@@ -48034,7 +48105,7 @@ var GitHubCodespacesProvider = class {
       "--",
       `mkdir -p ${shellQuote(remoteDir)} && tar -xzf - -C ${shellQuote(remoteDir)}`
     ];
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const tar = (0, import_child_process30.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
@@ -48054,7 +48125,7 @@ var GitHubCodespacesProvider = class {
       ssh.on("error", reject);
       ssh.on("exit", (code) => {
         if (code === 0) {
-          resolve14();
+          resolve13();
         } else {
           const reason = (sshErr || tarErr || `exit ${code}`).trim().slice(0, 500);
           reject(new Error(`Remote tar failed: ${reason}`));
@@ -48072,7 +48143,7 @@ var GitHubCodespacesProvider = class {
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote(remotePath)}`);
     }
     const cmd = parts.join(" && ");
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process30.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", cmd],
@@ -48084,7 +48155,7 @@ var GitHubCodespacesProvider = class {
       });
       proc.on("error", reject);
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote write failed: ${(stderr || `exit ${code}`).trim().slice(0, 500)}`));
       });
       proc.stdin?.write(contents);
@@ -48174,10 +48245,10 @@ var GitpodProvider = class {
       "Authenticating Gitpod"
     );
     resetStdinForChild2();
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process31.spawn)("gitpod", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error("gitpod login failed."));
       });
       proc.on("error", reject);
@@ -48326,13 +48397,13 @@ var GitpodProvider = class {
   }
   async streamCommand(workspaceId, command2) {
     resetStdinForChild2();
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const proc = (0, import_child_process31.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
       );
-      proc.on("exit", (code) => resolve14({ code: code ?? 0 }));
+      proc.on("exit", (code) => resolve13({ code: code ?? 0 }));
       proc.on("error", reject);
     });
   }
@@ -48346,7 +48417,7 @@ var GitpodProvider = class {
     tarArgs.push(".");
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote2(remoteDir)} && tar -xzf - -C ${shellQuote2(remoteDir)}`;
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const tar = (0, import_child_process31.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
@@ -48367,7 +48438,7 @@ var GitpodProvider = class {
       tar.on("error", reject);
       ssh.on("error", reject);
       ssh.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote tar failed: ${(sshErr || tarErr || `exit ${code}`).trim().slice(0, 500)}`));
       });
     });
@@ -48382,7 +48453,7 @@ var GitpodProvider = class {
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote2(remotePath)}`);
     }
     const cmd = parts.join(" && ");
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process31.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", cmd],
@@ -48394,7 +48465,7 @@ var GitpodProvider = class {
       });
       proc.on("error", reject);
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote write failed: ${(stderr || `exit ${code}`).trim().slice(0, 500)}`));
       });
       proc.stdin?.write(contents);
@@ -48451,14 +48522,14 @@ var GitLabWorkspacesProvider = class {
       "Authenticating GitLab"
     );
     resetStdinForChild3();
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process32.spawn)(
         "glab",
         ["auth", "login", "--scopes", "api,read_user,read_repository"],
         { stdio: "inherit" }
       );
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error("glab auth login failed."));
       });
       proc.on("error", reject);
@@ -48623,13 +48694,13 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
   async streamCommand(workspaceId, command2) {
     const sshHost = process.env.CODEAM_GITLAB_SSH_HOST ?? "workspaces.gitlab.com";
     resetStdinForChild3();
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const proc = (0, import_child_process32.spawn)(
         "ssh",
         ["-tt", "-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, command2],
         { stdio: "inherit" }
       );
-      proc.on("exit", (code) => resolve14({ code: code ?? 0 }));
+      proc.on("exit", (code) => resolve13({ code: code ?? 0 }));
       proc.on("error", reject);
     });
   }
@@ -48644,7 +48715,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
     tarArgs.push(".");
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote3(remoteDir)} && tar -xzf - -C ${shellQuote3(remoteDir)}`;
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const tar = (0, import_child_process32.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
       const ssh = (0, import_child_process32.spawn)(
         "ssh",
@@ -48662,7 +48733,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
       tar.on("error", reject);
       ssh.on("error", reject);
       ssh.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote tar failed: ${(sshErr || tarErr || `exit ${code}`).trim().slice(0, 500)}`));
       });
     });
@@ -48675,7 +48746,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote3(remotePath)}`);
     }
     const cmd = parts.join(" && ");
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process32.spawn)(
         "ssh",
         ["-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, cmd],
@@ -48687,7 +48758,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
       });
       proc.on("error", reject);
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote write failed: ${(stderr || `exit ${code}`).trim().slice(0, 500)}`));
       });
       proc.stdin?.write(contents);
@@ -48778,10 +48849,10 @@ var RailwayProvider = class {
       "Authenticating Railway"
     );
     resetStdinForChild4();
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process33.spawn)("railway", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error("railway login failed."));
       });
       proc.on("error", reject);
@@ -48921,13 +48992,13 @@ var RailwayProvider = class {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
     resetStdinForChild4();
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve13, reject) => {
       const proc = (0, import_child_process33.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", command2],
         { stdio: "inherit" }
       );
-      proc.on("exit", (code) => resolve14({ code: code ?? 0 }));
+      proc.on("exit", (code) => resolve13({ code: code ?? 0 }));
       proc.on("error", reject);
     });
   }
@@ -48945,7 +49016,7 @@ var RailwayProvider = class {
     tarArgs.push(".");
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote4(remoteDir)} && tar -xzf - -C ${shellQuote4(remoteDir)}`;
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const tar = (0, import_child_process33.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
       const sh = (0, import_child_process33.spawn)(
         "railway",
@@ -48963,7 +49034,7 @@ var RailwayProvider = class {
       tar.on("error", reject);
       sh.on("error", reject);
       sh.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote tar failed: ${(shErr || tarErr || `exit ${code}`).trim().slice(0, 500)}`));
       });
     });
@@ -48979,7 +49050,7 @@ var RailwayProvider = class {
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote4(remotePath)}`);
     }
     const cmd = parts.join(" && ");
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve13, reject) => {
       const proc = (0, import_child_process33.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", cmd],
@@ -48991,7 +49062,7 @@ var RailwayProvider = class {
       });
       proc.on("error", reject);
       proc.on("exit", (code) => {
-        if (code === 0) resolve14();
+        if (code === 0) resolve13();
         else reject(new Error(`Remote write failed: ${(stderr || `exit ${code}`).trim().slice(0, 500)}`));
       });
       proc.stdin?.write(contents);
@@ -50190,7 +50261,7 @@ var defaultGitToolingRunner = {
     }
   },
   run(cmd, args2, opts = {}) {
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const child = (0, import_node_child_process31.spawn)(cmd, args2, {
         stdio: [opts.input !== void 0 ? "pipe" : "ignore", "ignore", "pipe"]
       });
@@ -50199,7 +50270,7 @@ var defaultGitToolingRunner = {
       const done = (code) => {
         if (settled) return;
         settled = true;
-        resolve14({ code, stderr });
+        resolve13({ code, stderr });
       };
       child.stderr?.on("data", (b) => {
         stderr += b.toString();
@@ -50280,14 +50351,14 @@ function compareSemver(a, b) {
   return 0;
 }
 function fetchLatest() {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const req = https8.get(
       REGISTRY_URL,
       { headers: { Accept: "application/json" }, timeout: REQUEST_TIMEOUT_MS },
       (res) => {
         if (res.statusCode !== 200) {
           res.resume();
-          resolve14(null);
+          resolve13(null);
           return;
         }
         let buf = "";
@@ -50299,21 +50370,21 @@ function fetchLatest() {
           try {
             const json = JSON.parse(buf);
             if (typeof json.version === "string") {
-              resolve14(json.version);
+              resolve13(json.version);
             } else {
-              resolve14(null);
+              resolve13(null);
             }
           } catch {
-            resolve14(null);
+            resolve13(null);
           }
         });
       }
     );
     req.on("timeout", () => {
       req.destroy();
-      resolve14(null);
+      resolve13(null);
     });
-    req.on("error", () => resolve14(null));
+    req.on("error", () => resolve13(null));
   });
 }
 function notifyIfStale(currentVersion, latest) {
@@ -50389,7 +50460,7 @@ async function autoUpgradeBeforeCriticalCommand() {
   if (process.env.NODE_ENV === "test") return;
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
-  const current2 = true ? "2.76.14" : null;
+  const current2 = true ? "2.76.16" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -50406,7 +50477,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current2 = true ? "2.76.14" : null;
+  const current2 = true ? "2.76.16" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -50514,18 +50585,29 @@ function pointerTarget(root, name) {
   }
 }
 function atomicPoint(root, name, targetDir) {
-  const tmp = path107.join(root, `.${name}.tmp-${process.pid}-${Date.now()}`);
-  fs94.symlinkSync(path107.relative(root, targetDir), tmp, "dir");
+  const realRoot = fs94.realpathSync(root);
+  const tmp = path107.join(realRoot, `.${name}.tmp-${process.pid}-${Date.now()}`);
+  fs94.symlinkSync(path107.relative(realRoot, fs94.realpathSync(targetDir)), tmp, "dir");
   try {
-    fs94.renameSync(tmp, path107.join(root, name));
+    fs94.renameSync(tmp, path107.join(realRoot, name));
   } catch (err) {
     fs94.rmSync(tmp, { force: true });
     throw err;
   }
 }
+function samePath(a, b) {
+  const canon = (p2) => {
+    try {
+      return fs94.realpathSync(p2);
+    } catch {
+      return path107.resolve(p2);
+    }
+  };
+  return canon(a) === canon(b);
+}
 function switchCurrent(root, versionDir) {
   const old = pointerTarget(root, "current");
-  if (old && path107.resolve(old) !== path107.resolve(versionDir)) atomicPoint(root, "previous", old);
+  if (old && !samePath(old, versionDir)) atomicPoint(root, "previous", old);
   atomicPoint(root, "current", versionDir);
 }
 function validCurrent(root) {
@@ -50539,7 +50621,7 @@ function rollbackCurrent(root) {
   const prev = pointerTarget(root, "previous");
   if (!prev || isBad(prev) || !entryOf(prev)) return null;
   const cur = pointerTarget(root, "current");
-  if (cur && path107.resolve(cur) !== path107.resolve(prev)) atomicPoint(root, "previous", cur);
+  if (cur && !samePath(cur, prev)) atomicPoint(root, "previous", cur);
   atomicPoint(root, "current", prev);
   return versionOf(prev);
 }
@@ -50677,7 +50759,7 @@ var SELF_UPDATE_VIEW_TIMEOUT_MS = 3e4;
 var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 var SELF_UPDATE_LS_TIMEOUT_MS = 15e3;
 function currentCliVersion() {
-  return true ? "2.76.14" : null;
+  return true ? "2.76.16" : null;
 }
 async function installedVersion(deps) {
   const ls = await deps.run(
@@ -50693,10 +50775,10 @@ async function installedVersion(deps) {
   }
 }
 function runCmd(cmd, args2, timeoutMs) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     (0, import_node_child_process33.execFile)(cmd, args2, { timeout: timeoutMs }, (err, stdout, stderr) => {
       const code = err && typeof err.code === "number" ? err.code : err ? null : 0;
-      resolve14({ code, stdout: stdout ?? "", stderr: stderr ?? "" });
+      resolve13({ code, stdout: stdout ?? "", stderr: stderr ?? "" });
     });
   });
 }
@@ -50720,14 +50802,22 @@ async function runSelfUpdateWith(deps) {
     }
     const root = deps.versionsRoot ?? cliVersionsRoot();
     const versioned = versionedModeSupported(deps.platform) ? validCurrent(root) : null;
-    if (versioned && compareSemver(versioned.version, current2) > 0) {
+    const runningDir = versioned ? versionDirContaining(root, deps.runningEntry) : null;
+    const runningIsCurrent = versioned !== null && runningDir !== null && samePath(runningDir, versioned.dir);
+    if (runningIsCurrent && versioned && versioned.version !== current2) {
+      log.warn(
+        "host-agent",
+        `self-update: running ${current2} from ${versioned.dir}, whose package.json says ${versioned.version} \u2014 not restarting onto it (it is this same code)`
+      );
+    }
+    if (versioned && !runningIsCurrent && compareSemver(versioned.version, current2) > 0) {
       log.info(
         "host-agent",
         `self-update: ${versioned.version} already current in ${root} (running ${current2}) \u2014 restarting onto it`
       );
       return { status: "updated", version: versioned.version };
     }
-    const onDisk = await installedVersion(deps);
+    const onDisk = runningIsCurrent ? null : await installedVersion(deps);
     if (onDisk && compareSemver(onDisk, current2) > 0) {
       log.info(
         "host-agent",
@@ -50741,15 +50831,19 @@ async function runSelfUpdateWith(deps) {
       SELF_UPDATE_VIEW_TIMEOUT_MS
     );
     if (view.code !== 0) {
-      log.trace("host-agent", `self-update: npm view exited ${String(view.code)} \u2014 skipping`);
+      log.warn(
+        "host-agent",
+        `self-update: npm view ${SELF_UPDATE_PKG} exited ${String(view.code)} \u2014 cannot check, staying on ${current2}: ` + view.stderr.trim().slice(-300)
+      );
       return { status: "skipped" };
     }
     const latest = view.stdout.trim();
     if (!latest) {
-      log.trace("host-agent", "self-update: empty npm view output \u2014 skipping");
+      log.warn("host-agent", `self-update: npm view returned nothing \u2014 cannot check, staying on ${current2}`);
       return { status: "skipped" };
     }
     if (compareSemver(latest, current2) <= 0) {
+      log.info("host-agent", `self-update: running ${current2}, npm latest ${latest} \u2014 up to date`);
       return { status: "current" };
     }
     if (!versionedModeSupported(deps.platform)) {
@@ -50786,11 +50880,15 @@ async function installVersioned(deps, root, latest, running2) {
   }
   try {
     const runningDir = versionDirContaining(root, deps.runningEntry);
+    if (runningDir && samePath(runningDir, target)) {
+      log.warn(
+        "host-agent",
+        `self-update: already running from ${target} (reports ${running2}) \u2014 leaving it alone`
+      );
+      return { status: "skipped" };
+    }
     const reusable = entryOf(target) && versionOf(target) === latest;
     if (!reusable) {
-      if (runningDir && path108.resolve(runningDir) === path108.resolve(target)) {
-        return { status: "skipped" };
-      }
       fs95.rmSync(target, { recursive: true, force: true });
       const install = await deps.run(
         "npm",
@@ -50872,7 +50970,7 @@ function signalHostReady(send = process.send?.bind(process)) {
 }
 function defaultDeps() {
   return {
-    ownVersion: true ? "2.76.14" : null,
+    ownVersion: true ? "2.76.16" : null,
     root: cliVersionsRoot(),
     args: process.argv.slice(3),
     execPath: process.execPath,
@@ -50921,9 +51019,9 @@ async function superviseCurrent(over = {}) {
     };
     if (deps.stdinIsTty) process.on("SIGINT", ignoreSigint);
     const { code, signal } = await new Promise(
-      (resolve14) => {
-        child.once("exit", (c2, s) => resolve14({ code: c2, signal: s }));
-        child.once("error", () => resolve14({ code: 1, signal: null }));
+      (resolve13) => {
+        child.once("exit", (c2, s) => resolve13({ code: c2, signal: s }));
+        child.once("error", () => resolve13({ code: 1, signal: null }));
       }
     );
     for (const [sig, h] of handlers2) process.off(sig, h);
@@ -51190,6 +51288,12 @@ function fleetUserIdFromContainerName(containerName) {
 function isMissingContainerError(stderr) {
   return /no such container/i.test(stderr);
 }
+function fleetLaneKey(cmd) {
+  if (!cmd.type.startsWith("fleet_")) return null;
+  if (cmd.type === "fleet_prune_host") return "host";
+  const payload = cmd.payload;
+  return typeof payload?.containerName === "string" ? payload.containerName : cmd.type;
+}
 function isFleetPruneHostPayload(v) {
   if (typeof v !== "object" || v === null) return false;
   const p2 = v;
@@ -51265,7 +51369,7 @@ var DOCKER_RUN_WITH_PULL_TIMEOUT_MS = 6e5;
 var DOCKER_PRUNE_TIMEOUT_MS = 6e5;
 var defaultDockerRunner = {
   run(args2, opts = {}) {
-    return new Promise((resolve14) => {
+    return new Promise((resolve13) => {
       const child = (0, import_node_child_process36.spawn)("docker", args2, {
         stdio: ["ignore", "pipe", "pipe"],
         env: { ...process.env, ...opts.env }
@@ -51284,7 +51388,7 @@ var defaultDockerRunner = {
         if (settled) return;
         settled = true;
         clearTimeout(timer);
-        resolve14({ code, stderr: stderrBuf, stdout: stdoutBuf });
+        resolve13({ code, stderr: stderrBuf, stdout: stdoutBuf });
       };
       child.stdout?.on("data", (b) => {
         stdoutBuf += b.toString();
@@ -51462,7 +51566,7 @@ var HostAgentSupervisor = class {
     const make = this.deps.makeRelay ?? ((pluginId, onCommand, meta, pollSecret) => new CommandRelayService(pluginId, onCommand, meta, void 0, pollSecret));
     this.relay = make(
       this.identity.controlPluginId,
-      (cmd) => this.handleCommand(cmd),
+      (cmd) => this.dispatchRelayCommand(cmd),
       CONTROL_AGENT_META,
       this.identity.controlPollSecret
     );
@@ -51624,19 +51728,20 @@ var HostAgentSupervisor = class {
    */
   maybeRestartForUpdate(version3) {
     const midTurn = [...this.children.values()].some((c2) => this.isChildMidTurn(c2.proc.pid));
-    if (midTurn) {
+    const fleetBusy = this.fleetLanes.size > 0;
+    if (midTurn || fleetBusy) {
       const since = this.pendingRestartSince ?? this.now();
       const waited = this.now() - since;
       if (waited < SELF_UPDATE_DEFER_MAX_MS) {
         log.info(
           "host-agent",
-          `self-update: ${version3} installed but a session is mid-turn \u2014 deferring restart`
+          `self-update: ${version3} installed but ${fleetBusy ? `${this.fleetLanes.size} fleet op(s) are in flight` : "a session is mid-turn"} \u2014 deferring restart`
         );
         return false;
       }
       log.warn(
         "host-agent",
-        `self-update: ${version3} has been owed for ${Math.round(waited / 36e5)}h with a session still mid-turn \u2014 restarting anyway rather than staying on old code`
+        `self-update: ${version3} has been owed for ${Math.round(waited / 36e5)}h with ${fleetBusy ? "fleet ops still in flight" : "a session still mid-turn"} \u2014 restarting anyway rather than staying on old code`
       );
     }
     this.onUpdated(version3);
@@ -51668,6 +51773,58 @@ var HostAgentSupervisor = class {
    * arbitrary command surface).
    */
   async handleCommand(cmd) {
+    const lane = fleetLaneKey(cmd);
+    if (lane !== null) return this.runInFleetLane(lane, () => this.handleFleetCommand(cmd));
+    await this.handleNonFleetCommand(cmd);
+  }
+  /**
+   * The relay's entry point. A fleet command is NOT awaited here.
+   *
+   * The relay acks a batch the moment it arrives, then awaits each command of
+   * the batch in order. Awaiting a fleet op there let one slow op hold every
+   * command queued behind it: on 2026-10-02 the hourly sweep's
+   * `fleet_migrate_box_image` commands were each pulling the freshly released
+   * 7.7 GB image (up to 10 min apiece), a new user's scratch `fleet_create_box`
+   * sat behind three of them in the same batch (received 18:04:07, never
+   * started), the 18:06 self-update restart dropped it, and since it was already
+   * acked nothing ever redelivered it — the box failed at the 18:30
+   * provisioning sweep. Per-container lanes keep each box's ops in order; ops on
+   * different boxes no longer wait for each other.
+   */
+  dispatchRelayCommand(cmd) {
+    const work = this.handleCommand(cmd);
+    if (fleetLaneKey(cmd) === null) return work;
+    void work;
+    return Promise.resolve();
+  }
+  /** Fleet ops queued or running, keyed by container (or the host for a prune). */
+  fleetLanes = /* @__PURE__ */ new Map();
+  /** Number of fleet lanes with work queued or running — for tests + the restart gate. */
+  fleetOpsInFlight() {
+    return this.fleetLanes.size;
+  }
+  /**
+   * Run `op` after every earlier op on the same lane. Never rejects: a failed op
+   * is logged and the lane moves on. When the last lane drains and a self-update
+   * restart is owed, take it now instead of waiting for the next hourly tick.
+   */
+  runInFleetLane(key, op) {
+    const prev = this.fleetLanes.get(key) ?? Promise.resolve();
+    const next = prev.then(op).catch((err) => {
+      log.warn(
+        "host-agent",
+        `fleet op on ${key} failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+    this.fleetLanes.set(key, next);
+    return next.then(() => {
+      if (this.fleetLanes.get(key) === next) this.fleetLanes.delete(key);
+      if (this.fleetLanes.size === 0 && this.pendingRestartVersion !== null) {
+        this.maybeRestartForUpdate(this.pendingRestartVersion);
+      }
+    });
+  }
+  async handleFleetCommand(cmd) {
     if (cmd.type === "fleet_create_box") {
       if (!isFleetCreateBoxPayload(cmd.payload)) {
         log.warn("host-agent", `ignoring malformed fleet_create_box id=${cmd.id}`);
@@ -51716,6 +51873,8 @@ var HostAgentSupervisor = class {
       await this.fleetPruneHost(cmd.payload);
       return;
     }
+  }
+  async handleNonFleetCommand(cmd) {
     if (cmd.type === "self_hosted_deploy") {
       if (!isDeployPayload(cmd.payload)) {
         log.warn("host-agent", `ignoring malformed self_hosted_deploy id=${cmd.id}`);
@@ -52504,6 +52663,13 @@ var HostAgentSupervisor = class {
       );
       return null;
     }
+    if (isWrapperCheckout(cwd)) {
+      log.warn(
+        "host-agent",
+        `resume: skipping session ${session.id.slice(0, 8)} \u2014 it has no saved workspace and the fallback is the codespace wrapper checkout (${cwd}), not the user's repo`
+      );
+      return null;
+    }
     const deployId = deployIdFromWorkspace(session.cwd) ?? session.id;
     return { deployId, cwd, session };
   }
@@ -52631,6 +52797,17 @@ var HostAgentSupervisor = class {
     const st3 = this.resumeStateFor(target);
     try {
       const cwd = fs97.existsSync(target.cwd) ? target.cwd : process.cwd();
+      if (isWrapperCheckout(cwd)) {
+        log.warn(
+          "host-agent",
+          `resume: skipping session ${session.id.slice(0, 8)} deploy=${deployId.slice(0, 8)} \u2014 resolved cwd ${cwd} is the codespace wrapper checkout, not the user's repo`
+        );
+        return;
+      }
+      log.info(
+        "host-agent",
+        `resume: session ${session.id.slice(0, 8)} deploy=${deployId.slice(0, 8)} cwd=${cwd}`
+      );
       const proc = this.resumeSpawner(
         { ...readHouseProxyChildEnv(deployId), CODEAM_RESUME_SESSION_ID: session.id },
         cwd
@@ -53190,7 +53367,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.76.14" : "0.0.0-dev";
+  const cliVersion = true ? "2.76.16" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto17.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -53634,7 +53811,7 @@ var WARM_PACKAGE_TIMEOUT_MS = 12e4;
 var WARM_TOTAL_BUDGET_MS = 10 * 6e4;
 var WARM_CONCURRENCY = 4;
 function runCapturing(command2, args2, timeoutMs) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve13) => {
     const child = (0, import_node_child_process40.spawn)(command2, args2, {
       env: { ...process.env, ...LAUNCHER_ENV },
       stdio: ["ignore", "ignore", "pipe"],
@@ -53649,15 +53826,15 @@ function runCapturing(command2, args2, timeoutMs) {
     child.stderr?.on("data", (c2) => stderr += c2);
     const timer = setTimeout(() => {
       child.kill("SIGKILL");
-      resolve14({ status: null, stderr, error: new Error(`spawn ${command2} ETIMEDOUT`) });
+      resolve13({ status: null, stderr, error: new Error(`spawn ${command2} ETIMEDOUT`) });
     }, timeoutMs);
     child.on("error", (error) => {
       clearTimeout(timer);
-      resolve14({ status: null, stderr, error });
+      resolve13({ status: null, stderr, error });
     });
     child.on("close", (status2) => {
       clearTimeout(timer);
-      resolve14({ status: status2, stderr });
+      resolve13({ status: status2, stderr });
     });
   });
 }
@@ -53714,7 +53891,7 @@ async function mcpWarm(argv = [], opts = {}) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.76.14" : "unknown";
+  const v = true ? "2.76.16" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }