codeam-cli 2.60.5 → 2.60.7

package/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.60.6] — 2026-07-08
+
+### Fixed
+
+- **cli:** Serialize ACP prompts so a 2nd in-flight turn can't clobber the watchdog
+
+## [2.60.5] — 2026-07-08
+
+### Added
+
+- **cli:** Baton support for cursor + gate to agents with a resumable transcript
+
+### Documentation
+
+- **cli:** Document the Session Baton (native TUI <-> mobile ACP) architecture + hand-off invariants
+
+### Fixed
+
+- **cli:** Serialize baton state POSTs so handback never sticks on "Switching…"
+
 ## [2.60.4] — 2026-07-08
 
 ### Fixed

package/dist/index.js

@@ -5653,7 +5653,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.5" : "0.0.0-dev",
+    cliVersion: true ? "2.60.7" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5834,7 +5834,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.60.5",
+  version: "2.60.7",
   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",
@@ -6905,7 +6905,7 @@ var CommandRelayService = class {
       // 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.60.5" ? { ideVersion: "2.60.5" } : {}
+      ..."2.60.7" ? { ideVersion: "2.60.7" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -15986,7 +15986,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 current = true ? "2.60.5" : null;
+  const current = true ? "2.60.7" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16003,7 +16003,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current = true ? "2.60.5" : null;
+  const current = true ? "2.60.7" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16023,7 +16023,7 @@ var SELF_UPDATE_INTERVAL_MS = 60 * 60 * 1e3;
 var SELF_UPDATE_VIEW_TIMEOUT_MS = 3e4;
 var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 function currentCliVersion() {
-  return true ? "2.60.5" : null;
+  return true ? "2.60.7" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -24850,6 +24850,11 @@ function createIdleTimeout(idleMs, makeError) {
 }
 
 // src/agents/acp/client.ts
+var TRANSIENT_ADAPTER_SPAWN_RE = /ETXTBSY|ENOENT/;
+var MAX_START_ATTEMPTS = 5;
+var _acpStartSeam = {
+  sleep: (ms) => new Promise((r) => setTimeout(r, ms))
+};
 var PROTOCOL_VERSION2 = 1;
 var FATAL_STARTUP_RE = /IneligibleTierError|UNSUPPORTED_CLIENT|no longer supported for Gemini Code Assist|not eligible for Gemini Code Assist|Error authenticating|ProjectIdRequiredError/i;
 var NEWSESSION_TIMEOUT_MS = 12e4;
@@ -24880,6 +24885,12 @@ var AcpClient = class {
    *  (the agent is demonstrably working, just blocked on the tool), and
    *  re-arm only once the last one finishes. Reset per prompt. */
   pendingToolCalls = /* @__PURE__ */ new Set();
+  /** Serializes {@link prompt}: each turn waits for the previous to fully
+   *  settle before arming its own watchdog. `promptIdle`/`pendingToolCalls`
+   *  are single-instance fields, so a 2nd concurrent prompt() would overwrite
+   *  them mid-turn and break turn A's idle watchdog (mobile "send-while-active"
+   *  can fire two prompts back-to-back). See {@link prompt}. */
+  promptChain = Promise.resolve();
   /** Last few adapter stderr lines — so a startup failure surfaces the REAL
    *  cause (e.g. gemini's `IneligibleTierError`) instead of a bare timeout. */
   recentStderr = [];
@@ -24889,15 +24900,57 @@ var AcpClient = class {
    *  so without this the session hangs forever ("loading… / offline"). */
   startupFailureReject = null;
   /**
-   * Spawn the adapter + perform the initial handshake (initialize
-   * → newSession). Returns the ACP-assigned sessionId so the caller
-   * can route subsequent prompts, plus optional model + tier that
-   * some adapters (codex-acp today) surface on the newSession
-   * response — used by the runner to enrich the welcome card
-   * subtitle without an extra round-trip.
+   * Spawn the adapter + handshake, retrying a TRANSIENT in-adapter spawn race.
+   *
+   * The adapter itself execs the real agent binary (claude-agent-acp spawns the
+   * ~250MB SDK-bundled `claude` during newSession). On a fresh/waking codespace
+   * that binary is momentarily open-for-write → the adapter rejects newSession
+   * with `-32603 … spawn ETXTBSY` (or ENOENT before it lands). Both clear within
+   * ms, so we respawn the adapter + re-handshake up to {@link MAX_START_ATTEMPTS}
+   * times. `startOnce` fully cleans up on failure (see cleanupAfterFailedStart),
+   * so each retry starts from a clean slate. Non-transient failures throw on the
+   * first attempt — no masking of real auth/outage errors.
    */
   async start() {
+    let lastErr;
+    for (let attempt = 1; attempt <= MAX_START_ATTEMPTS; attempt += 1) {
+      try {
+        return await this.startOnce();
+      } catch (err) {
+        lastErr = err;
+        if (attempt < MAX_START_ATTEMPTS && this.isTransientAdapterSpawn(err)) {
+          log.info(
+            "acpClient",
+            `adapter hit a transient spawn race (binary busy) \u2014 retrying start ${attempt + 1}/${MAX_START_ATTEMPTS}`
+          );
+          await _acpStartSeam.sleep(400 * attempt);
+          continue;
+        }
+        throw err;
+      }
+    }
+    throw lastErr;
+  }
+  /** True when a failed {@link startOnce} was caused by the adapter's OWN
+   *  transient spawn of the agent binary (ETXTBSY/ENOENT). Checks the thrown
+   *  error's message/data AND the adapter stderr ring — the adapter logs the
+   *  real cause to stderr while returning a generic `-32603 Internal error`. */
+  isTransientAdapterSpawn(err) {
+    const parts = [...this.recentStderr];
+    if (err instanceof Error) parts.push(err.message);
+    if (err && typeof err === "object") {
+      const e = err;
+      try {
+        parts.push(JSON.stringify(e.data));
+      } catch {
+      }
+      if (typeof e.details === "string") parts.push(e.details);
+    }
+    return TRANSIENT_ADAPTER_SPAWN_RE.test(parts.join(" "));
+  }
+  async startOnce() {
     if (this.child) throw new Error("AcpClient already started");
+    this.recentStderr.length = 0;
     const { adapter, cwd } = this.opts;
     const augmentedPath = expandPathForAgentBinaries(process.env.PATH ?? "");
     log.info(
@@ -25034,6 +25087,14 @@ var AcpClient = class {
    * shows a permanent "Thinking…" spinner with no way to recover.
    */
   async prompt(input) {
+    const run = this.promptChain.then(() => this.runPrompt(input));
+    this.promptChain = run.then(
+      () => void 0,
+      () => void 0
+    );
+    return run;
+  }
+  async runPrompt(input) {
     if (!this.connection || !this.sessionId) {
       throw new Error("AcpClient.prompt called before start()");
     }
@@ -32741,7 +32802,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.5" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.7" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto9.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -32940,7 +33001,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.5" : "unknown";
+  const v = true ? "2.60.7" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.60.5",
+  "version": "2.60.7",
   "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 — async. The terminal companion for CodeAgent Mobile.",
   "type": "commonjs",
   "main": "dist/index.js",