codeam-cli 2.59.0 → 2.60.1

package/CHANGELOG.md

@@ -4,6 +4,52 @@ 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.0] — 2026-07-08
+
+### Added
+
+- **cli:** Baton local-session gate + feature flag
+- **cli:** BatonController turn-safe single-driver state machine
+- **cli:** TranscriptMirror emits JSONL deltas for the read-only view
+- **cli:** NativeTuiDriver over AgentService with idle turn-boundary
+- **cli:** AcpDriver over AcpClient (spawn + loadSession resume)
+- **cli:** PostBatonEvent publisher driver-state
+- **cli:** Take_control/handback relay handlers
+- **cli:** Wire local baton branch before the ACP fork (flag-gated)
+- **cli:** Make the session baton drivable after a hand-off
+- **cli:** Enable the session baton by default for local sessions (CODEAM_BATON=0 kill switch)
+- **shared:** Add baton_state to USER_EVENTS (session baton wire type)
+
+### Changed
+
+- **cli:** Extract shared ACP command-context assembler + proxy-relaunch helper
+
+### Fixed
+
+- **cli:** Mark SessionDriver.kind readonly (contract)
+- **cli:** Baton switch-failure recovery + ack-on-failure; test cleanups
+- **cli:** EncodeCwd underscore-collapse + ClaudeRuntimeStrategy.resolveHistoryFile (baton mirror)
+- **cli:** AcpClient.start cleans up on handshake failure (baton take-control recovery)
+
+### Tests
+
+- **cli:** Prove noteOutput resets the idle window + cover throw/undefined branches
+- **cli:** Gated cross-mode-resume integration test (real claude)
+
+## [2.59.0] — 2026-07-08
+
+### Added
+
+- **vsc-plugin:** Route stop_task through AgentStrategyRegistry, alias escape_key
+- **vsc-plugin:** CopilotLmStrategy.stop() cancels the active LM stream
+- **jetbrains-plugin:** Alias escape_key to stop_task
+- **jetbrains-plugin:** Best-effort surface-interrupt helper for GUI agents
+- **jetbrains-plugin:** Concrete strategies interrupt their surface on stop()
+
+### Tests
+
+- **cli:** Regression-guard stopTaskH cancels ACP turn and acks once
+
 ## [2.58.1] — 2026-07-08
 
 ### CI

package/dist/index.js

@@ -559,7 +559,8 @@ var USER_EVENTS = {
   AGENT_INSTALL_PROGRESS: "agent_install_progress",
   AGENT_INSTALL_FAILED: "agent_install_failed",
   CLI_UPDATE_PROGRESS: "cli_update_progress",
-  CLI_UPDATE_FAILED: "cli_update_failed"
+  CLI_UPDATE_FAILED: "cli_update_failed",
+  BATON_STATE: "baton_state"
 };
 
 // ../../packages/shared/src/preview-prompts.ts
@@ -5652,7 +5653,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.59.0" : "0.0.0-dev",
+    cliVersion: true ? "2.60.1" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5833,7 +5834,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.59.0",
+  version: "2.60.1",
   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",
@@ -6114,6 +6115,29 @@ async function postPreviewEvent(input) {
     };
   }
 }
+async function postBatonEvent(input) {
+  try {
+    await _transport.postJsonAuthed(
+      `${API_BASE}/api/baton/events`,
+      {
+        sessionId: input.sessionId,
+        pluginId: input.pluginId,
+        state: input.state,
+        driver: input.driver,
+        conversationId: input.conversationId
+      },
+      input.pluginAuthToken
+    );
+    return { ok: true };
+  } catch (err) {
+    const e = err;
+    return {
+      ok: false,
+      status: typeof e.statusCode === "number" ? e.statusCode : 0,
+      message: e.message || "unknown"
+    };
+  }
+}
 async function postHeadroomEvent(input) {
   try {
     await _transport.postJsonAuthed(
@@ -6881,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.59.0" ? { ideVersion: "2.59.0" } : {}
+      ..."2.60.1" ? { ideVersion: "2.60.1" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -12097,7 +12121,7 @@ var fs16 = __toESM(require("fs"));
 var path19 = __toESM(require("path"));
 var os14 = __toESM(require("os"));
 function encodeCwd(cwd) {
-  return cwd.replace(/[\\/:]/g, "-");
+  return cwd.replace(/[\\/:_]/g, "-");
 }
 function resolveHistoryDir(cwd, projectsRoot) {
   const root = projectsRoot ?? path19.join(os14.homedir(), ".claude", "projects");
@@ -12117,6 +12141,12 @@ function resolveHistoryDir(cwd, projectsRoot) {
   }
   return null;
 }
+function resolveHistoryFile(cwd, sessionId, projectsRoot) {
+  const dir = resolveHistoryDir(cwd, projectsRoot);
+  if (!dir) return null;
+  const filePath = path19.join(dir, `${sessionId}.jsonl`);
+  return fs16.existsSync(filePath) ? filePath : null;
+}
 function getCurrentUsage(historyDir, bootTimeMs = 0) {
   const GRACE_MS = 5e3;
   const cutoff = bootTimeMs > 0 ? bootTimeMs - GRACE_MS : 0;
@@ -12350,6 +12380,9 @@ var ClaudeRuntimeStrategy = class {
   resolveHistoryDir(cwd) {
     return resolveHistoryDir(cwd);
   }
+  resolveHistoryFile(cwd, sessionId) {
+    return resolveHistoryFile(cwd, sessionId);
+  }
   parseHistoryFile(filePath) {
     return parseHistoryFile(filePath);
   }
@@ -12794,7 +12827,7 @@ function listResumableSessions2(cwd, homeOverride) {
   out2.sort((a, b) => b.timestamp - a.timestamp);
   return out2;
 }
-function resolveHistoryFile(cwd, sessionId, homeOverride) {
+function resolveHistoryFile2(cwd, sessionId, homeOverride) {
   const home = homeOverride ?? import_node_os.default.homedir();
   const sessionsRoot = import_node_path2.default.join(home, ".codex", "sessions");
   if (!import_node_fs3.default.existsSync(sessionsRoot)) return null;
@@ -13017,7 +13050,7 @@ var CodexRuntimeStrategy = class {
     return parseHistoryFile2(filePath);
   }
   resolveHistoryFile(cwd, sessionId) {
-    return resolveHistoryFile(cwd, sessionId);
+    return resolveHistoryFile2(cwd, sessionId);
   }
   getCurrentUsage(historyDir) {
     return getCurrentUsage2(historyDir);
@@ -15888,7 +15921,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.59.0" : null;
+  const current = true ? "2.60.1" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15905,7 +15938,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.59.0" : null;
+  const current = true ? "2.60.1" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15925,7 +15958,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.59.0" : null;
+  return true ? "2.60.1" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -19663,6 +19696,32 @@ var envWriteH = async (ctx, cmd, parsed) => {
     await ctx.relay.sendResult(cmd.id, "failed", { error: err.message });
   }
 };
+var takeControlH = async (ctx, cmd) => {
+  if (!ctx.baton) {
+    await ctx.relay.sendResult(cmd.id, "failed", { code: "NO_BATON" });
+    return;
+  }
+  try {
+    await ctx.baton.takeControl();
+  } catch {
+    await ctx.relay.sendResult(cmd.id, "failed", { code: "BATON_SWITCH_FAILED" });
+    return;
+  }
+  await ctx.relay.sendResult(cmd.id, "completed", { state: ctx.baton.state });
+};
+var handbackH = async (ctx, cmd) => {
+  if (!ctx.baton) {
+    await ctx.relay.sendResult(cmd.id, "failed", { code: "NO_BATON" });
+    return;
+  }
+  try {
+    await ctx.baton.handback();
+  } catch {
+    await ctx.relay.sendResult(cmd.id, "failed", { code: "BATON_SWITCH_FAILED" });
+    return;
+  }
+  await ctx.relay.sendResult(cmd.id, "completed", { state: ctx.baton.state });
+};
 var _activeReporter = null;
 var _headroomEmitChain = Promise.resolve();
 var headroomConfigureH = async (ctx, cmd, parsed) => {
@@ -20503,6 +20562,8 @@ var handlers = {
   save_preview_config: savePreviewConfigH,
   env_read: envReadH,
   env_write: envWriteH,
+  take_control: takeControlH,
+  handback: handbackH,
   headroom_configure: headroomConfigureH,
   headroom_budget: headroomBudgetH,
   beads_configure: beadsConfigureH,
@@ -24816,62 +24877,85 @@ var AcpClient = class {
       this.opts.onStderr?.(`Failed to launch ${adapter.command}: ${code}${hint}`);
       this.opts.onUnexpectedExit?.(null, null);
     });
-    if (!child.stdin || !child.stdout) {
-      throw new Error("Spawned ACP adapter is missing stdio handles");
-    }
-    const input = import_node_stream.Readable.toWeb(child.stdout);
-    const output = import_node_stream.Writable.toWeb(child.stdin);
-    const stream = ndJsonStream(output, input);
-    this.connection = new ClientSideConnection(
-      (_agent) => this.buildClient(),
-      stream
-    );
-    log.info("acpClient", "initialize \u2192 sending");
-    const initialize = await this.connection.initialize({
-      protocolVersion: PROTOCOL_VERSION2,
-      clientCapabilities: CLIENT_CAPABILITIES
-    });
-    log.info(
-      "acpClient",
-      `initialize \u2190 ok protocolVersion=${initialize.protocolVersion} agentCaps=${JSON.stringify(initialize.agentCapabilities ?? {}).slice(0, 200)}`
-    );
-    log.info("acpClient", "newSession \u2192 sending");
-    let startupTimer;
-    const startupFailure = new Promise((_2, reject) => {
-      this.startupFailureReject = reject;
-      startupTimer = setTimeout(() => {
-        const tail = this.recentStderr.slice(-4).join(" | ");
-        reject(
-          new Error(
-            `AGENT_STARTUP_TIMEOUT: ${this.opts.adapter.requiresAgentBinary} did not create a session within ${Math.round(
-              NEWSESSION_TIMEOUT_MS / 1e3
-            )}s${tail ? ` \u2014 last output: ${tail}` : ""}`
-          )
-        );
-      }, NEWSESSION_TIMEOUT_MS);
-    });
-    let newSession;
     try {
-      newSession = await Promise.race([
-        this.connection.newSession({ cwd, mcpServers: [] }),
-        startupFailure
-      ]);
-    } finally {
-      if (startupTimer) clearTimeout(startupTimer);
-      this.startupFailureReject = null;
+      if (!child.stdin || !child.stdout) {
+        throw new Error("Spawned ACP adapter is missing stdio handles");
+      }
+      const input = import_node_stream.Readable.toWeb(child.stdout);
+      const output = import_node_stream.Writable.toWeb(child.stdin);
+      const stream = ndJsonStream(output, input);
+      this.connection = new ClientSideConnection(
+        (_agent) => this.buildClient(),
+        stream
+      );
+      log.info("acpClient", "initialize \u2192 sending");
+      const initialize = await this.connection.initialize({
+        protocolVersion: PROTOCOL_VERSION2,
+        clientCapabilities: CLIENT_CAPABILITIES
+      });
+      log.info(
+        "acpClient",
+        `initialize \u2190 ok protocolVersion=${initialize.protocolVersion} agentCaps=${JSON.stringify(initialize.agentCapabilities ?? {}).slice(0, 200)}`
+      );
+      log.info("acpClient", "newSession \u2192 sending");
+      let startupTimer;
+      const startupFailure = new Promise((_2, reject) => {
+        this.startupFailureReject = reject;
+        startupTimer = setTimeout(() => {
+          const tail = this.recentStderr.slice(-4).join(" | ");
+          reject(
+            new Error(
+              `AGENT_STARTUP_TIMEOUT: ${this.opts.adapter.requiresAgentBinary} did not create a session within ${Math.round(
+                NEWSESSION_TIMEOUT_MS / 1e3
+              )}s${tail ? ` \u2014 last output: ${tail}` : ""}`
+            )
+          );
+        }, NEWSESSION_TIMEOUT_MS);
+      });
+      let newSession;
+      try {
+        newSession = await Promise.race([
+          this.connection.newSession({ cwd, mcpServers: [] }),
+          startupFailure
+        ]);
+      } finally {
+        if (startupTimer) clearTimeout(startupTimer);
+        this.startupFailureReject = null;
+      }
+      this.sessionId = newSession.sessionId;
+      const newSessionMeta = newSession;
+      log.info(
+        "acpClient",
+        `newSession \u2190 ok sessionId=${newSession.sessionId.slice(0, 8)} model=${newSessionMeta.currentModelId ?? "?"} tier=${newSessionMeta.currentServiceTier ?? "?"}`
+      );
+      return {
+        sessionId: newSession.sessionId,
+        initialize,
+        model: newSessionMeta.currentModelId,
+        tier: newSessionMeta.currentServiceTier
+      };
+    } catch (err) {
+      this.cleanupAfterFailedStart(child);
+      throw err;
     }
-    this.sessionId = newSession.sessionId;
-    const newSessionMeta = newSession;
-    log.info(
-      "acpClient",
-      `newSession \u2190 ok sessionId=${newSession.sessionId.slice(0, 8)} model=${newSessionMeta.currentModelId ?? "?"} tier=${newSessionMeta.currentServiceTier ?? "?"}`
-    );
-    return {
-      sessionId: newSession.sessionId,
-      initialize,
-      model: newSessionMeta.currentModelId,
-      tier: newSessionMeta.currentServiceTier
-    };
+  }
+  /**
+   * Undo the partial state `start()` set before its handshake threw, so a
+   * fresh `start()` call is retryable instead of permanently hard-throwing
+   * 'AcpClient already started'. Removes OUR `exit`/`error` listeners first
+   * so killing the half-started child doesn't also fire
+   * `onUnexpectedExit` — the baton's `onUnexpectedExit` calls
+   * `process.exit`, which must never fire for a failure the caller already
+   * received as a thrown error from `start()`.
+   */
+  cleanupAfterFailedStart(child) {
+    child.removeAllListeners("exit");
+    child.removeAllListeners("error");
+    killQuiet(child, "SIGKILL");
+    this.child = null;
+    this.connection = null;
+    this.sessionId = null;
+    this.startupFailureReject = null;
   }
   /**
    * Send a user prompt to the active session. Returns the
@@ -25177,6 +25261,38 @@ function expandPathForAgentBinaries(existingPath) {
   return [...additions, existingPath].filter((p2) => p2.length > 0).join(path58.delimiter);
 }
 
+// src/agents/acp/headroom-budget-proxy.ts
+function buildRelaunchProxyEnv(baseEnv) {
+  const env = { ...baseEnv, HEADROOM_KOMPRESS_BACKEND: "onnx_cpu" };
+  delete env["HEADROOM_BUDGET"];
+  delete env["HEADROOM_BUDGET_PERIOD"];
+  return env;
+}
+var relaunchProxyWithoutBudget = async () => {
+  const { spawn: spawn38 } = await import("child_process");
+  killHeadroomProxy();
+  await new Promise((r) => setTimeout(r, 500));
+  const proxyEnv = buildRelaunchProxyEnv(process.env);
+  try {
+    const proxy = spawn38(
+      "headroom",
+      ["proxy", "--port", "8787"],
+      { stdio: "ignore", detached: true, env: proxyEnv }
+    );
+    proxy.once("error", (e) => {
+      log.warn("acpRunner", `budget recovery proxy relaunch error (best-effort): ${e.message}`);
+    });
+    proxy.unref();
+    writeHeadroomProxyPidfile(proxy.pid);
+  } catch (e) {
+    log.warn(
+      "acpRunner",
+      `budget recovery proxy relaunch failed (best-effort): ${e instanceof Error ? e.message : String(e)}`
+    );
+  }
+  await new Promise((r) => setTimeout(r, 3e3));
+};
+
 // src/services/streaming/transport.ts
 var http7 = __toESM(require("http"));
 var https8 = __toESM(require("https"));
@@ -26063,7 +26179,7 @@ function defaultRunGit(cwd, args2) {
   });
 }
 async function discoverRepos(workingDir, maxDepth = 4) {
-  const fs60 = await import("fs/promises");
+  const fs61 = await import("fs/promises");
   const out2 = [];
   await walk(workingDir, 0);
   return out2;
@@ -26071,7 +26187,7 @@ async function discoverRepos(workingDir, maxDepth = 4) {
     if (depth > maxDepth) return;
     let entries = [];
     try {
-      const dirents = await fs60.readdir(dir, { withFileTypes: true });
+      const dirents = await fs61.readdir(dir, { withFileTypes: true });
       entries = dirents.filter((d3) => !d3.name.startsWith(".") || d3.name === ".git").map((d3) => ({ name: d3.name, isDirectory: d3.isDirectory() }));
     } catch {
       return;
@@ -26710,6 +26826,9 @@ function formatAgentReplyLine(text) {
 }
 
 // src/agents/acp/command-handlers.ts
+function assembleAcpCommandContext(session, cmd) {
+  return { ...session, cmd };
+}
 var ACP_QUICK_REPLIES = ["Continue", "Yes, go ahead", "Explain"];
 async function recoverFromFailedTurn(client2, streaming) {
   await cancelStuckTurn(client2);
@@ -27680,12 +27799,6 @@ async function surfaceStartupFailure(opts) {
   );
   errRelay.start();
 }
-function buildRelaunchProxyEnv(baseEnv) {
-  const env = { ...baseEnv, HEADROOM_KOMPRESS_BACKEND: "onnx_cpu" };
-  delete env["HEADROOM_BUDGET"];
-  delete env["HEADROOM_BUDGET_PERIOD"];
-  return env;
-}
 function computeAdapterExtraEnv(params) {
   const env = {};
   if (params.disable1mContext) env.CLAUDE_CODE_DISABLE_1M_CONTEXT = "1";
@@ -27802,30 +27915,6 @@ async function runAcpSession(opts) {
   };
   const client2 = new AcpClient(clientOptions);
   let _budgetReachedPosted = false;
-  const relaunchProxyWithoutBudget = async () => {
-    const { spawn: spawn38 } = await import("child_process");
-    killHeadroomProxy();
-    await new Promise((r) => setTimeout(r, 500));
-    const proxyEnv = buildRelaunchProxyEnv(process.env);
-    try {
-      const proxy = spawn38(
-        "headroom",
-        ["proxy", "--port", "8787"],
-        { stdio: "ignore", detached: true, env: proxyEnv }
-      );
-      proxy.once("error", (e) => {
-        log.warn("acpRunner", `budget recovery proxy relaunch error (best-effort): ${e.message}`);
-      });
-      proxy.unref();
-      writeHeadroomProxyPidfile(proxy.pid);
-    } catch (e) {
-      log.warn(
-        "acpRunner",
-        `budget recovery proxy relaunch failed (best-effort): ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-    await new Promise((r) => setTimeout(r, 3e3));
-  };
   const budgetRecovery = createBudgetRecovery({
     publishText: (text) => publisher.publishOutput({ type: "text", content: text, done: true }),
     publishSelectPrompt: (question, options) => publisher.publishOutput({
@@ -27993,8 +28082,7 @@ async function runAcpSession(opts) {
   });
 }
 async function handleCommand(cmd, client2, relay, acpSessionId, models, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, budgetRecovery, budgetReachedFlag) {
-  await dispatchAcpCommand({
-    cmd,
+  const session = {
     client: client2,
     relay,
     acpSessionId,
@@ -28010,7 +28098,8 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
     recentStderr,
     budgetRecovery,
     budgetReachedFlag
-  });
+  };
+  await dispatchAcpCommand(assembleAcpCommandContext(session, cmd));
 }
 function buildBannerSubtitle(agentId, acpSessionId, model, tier) {
   const meta = AGENT_REGISTRY[agentId];
@@ -29017,8 +29106,568 @@ function fetchQuotaUsage(runtime, historySvc) {
   });
 }
 
-// src/agents/claude/onboarding.ts
+// src/baton/gate.ts
+function isLocalSession(env = process.env) {
+  return env.CODESPACES !== "true" && env.CODEAM_AUTO_APPROVE !== "1" && env.HEADROOM_ENABLED !== "1" && !env.CODEAM_AUTO_TOKEN && !env.CODEAM_ENROLL_TOKEN;
+}
+
+// src/baton/baton-controller.ts
+var BatonController = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  deps;
+  _state = "LOCAL_DRIVE";
+  _active = "local_tui";
+  _conversationId = null;
+  get state() {
+    return this._state;
+  }
+  get activeDriver() {
+    return this._active;
+  }
+  /** The driver object currently holding the baton. The baton router forwards
+   *  non-baton commands to `activeSessionDriver.dispatch(cmd)`, so whichever side
+   *  holds the baton is the one that actually runs the command. Reads `_active`
+   *  live, so mid-turn commands during a `SWITCHING` window still target the
+   *  pre-switch driver (the switch waits for the turn boundary before flipping). */
+  get activeSessionDriver() {
+    return this._active === "local_tui" ? this.deps.local : this.deps.mobile;
+  }
+  get conversationId() {
+    return this._conversationId;
+  }
+  async begin() {
+    this._conversationId = await this.deps.local.start(void 0);
+    this._active = "local_tui";
+    this.setState("LOCAL_DRIVE");
+  }
+  async takeControl() {
+    await this.switchDriver(
+      "LOCAL_DRIVE",
+      this.deps.local,
+      this.deps.mobile,
+      "MOBILE_DRIVE",
+      "mobile_acp"
+    );
+  }
+  async handback() {
+    await this.switchDriver(
+      "MOBILE_DRIVE",
+      this.deps.mobile,
+      this.deps.local,
+      "LOCAL_DRIVE",
+      "local_tui"
+    );
+  }
+  async shutdown() {
+    await Promise.allSettled([this.deps.local.stop(), this.deps.mobile.stop()]);
+  }
+  async switchDriver(from, current, next, to, nextKind) {
+    if (this._state !== from) return;
+    this.setState("SWITCHING");
+    const priorActive = this._active;
+    const priorConversationId = this._conversationId;
+    try {
+      await current.whenSafeToYield();
+      await current.stop();
+      this._conversationId = await next.start(this._conversationId ?? void 0);
+      this._active = nextKind;
+      this.setState(to);
+    } catch (err) {
+      this._active = priorActive;
+      this._conversationId = priorConversationId;
+      this.setState(from);
+      throw err;
+    }
+  }
+  setState(state) {
+    this._state = state;
+    this.deps.publishState(state, this._active, this._conversationId);
+  }
+};
+
+// src/baton/native-tui-driver.ts
+var NativeTuiDriver = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.agent = deps.agent;
+    this.idleMs = deps.idleMs ?? 750;
+    this.now = deps.now ?? Date.now;
+    this.lastOutput = this.now();
+    this.historySvc = new HistoryService(deps.runtime, deps.opts.pluginId, deps.opts.cwd, {
+      pluginAuthToken: deps.opts.pluginAuthToken
+    });
+    this.outputSvc = new OutputService(
+      deps.opts.sessionId,
+      deps.opts.pluginId,
+      (conversationId) => this.historySvc.setCurrentConversationId(conversationId),
+      (reset) => this.historySvc.setRateLimitReset(reset),
+      void 0,
+      void 0,
+      deps.opts.pluginAuthToken,
+      deps.runtime
+    );
+    this.keepAliveCtx = { inCodespace: false, codespaceName: void 0 };
+    this.setKeepAlive = buildKeepAlive(this.keepAliveCtx).apply;
+  }
+  deps;
+  kind = "local_tui";
+  agent;
+  idleMs;
+  now;
+  lastOutput;
+  outputSvc;
+  historySvc;
+  setKeepAlive;
+  keepAliveCtx;
+  async start(resumeId) {
+    if (resumeId !== void 0) {
+      await this.agent.restart(resumeId, false);
+      return resumeId;
+    }
+    await this.agent.spawn();
+    const id = this.agent.spawnedSessionId;
+    if (!id) throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
+    return id;
+  }
+  async stop() {
+    this.agent.kill();
+  }
+  async dispatch(cmd) {
+    const ctx = {
+      outputSvc: this.outputSvc,
+      agent: this.agent,
+      historySvc: this.historySvc,
+      runtime: this.deps.runtime,
+      relay: this.deps.getRelay(),
+      setKeepAlive: this.setKeepAlive,
+      keepAliveCtx: this.keepAliveCtx,
+      pluginId: this.deps.opts.pluginId,
+      sessionId: this.deps.opts.sessionId,
+      agentId: this.deps.opts.agentId,
+      pluginAuthToken: this.deps.opts.pluginAuthToken,
+      beads: this.deps.getBeads()
+    };
+    await dispatchCommand(ctx, cmd);
+  }
+  /** Call on every PTY data chunk: reset the idle timer AND feed the output
+   *  pipe so a mobile-routed turn's reply streams back to the app. */
+  handlePtyData(raw) {
+    this.noteOutput();
+    this.outputSvc.push(raw);
+  }
+  /** Reset the idle timer only. Retained for callers that just need the boundary
+   *  clock nudged without routing bytes through the output pipe. */
+  noteOutput() {
+    this.lastOutput = this.now();
+  }
+  whenSafeToYield() {
+    return new Promise((resolve7) => {
+      const tick = () => {
+        const quietFor = this.now() - this.lastOutput;
+        if (quietFor >= this.idleMs) resolve7();
+        else setTimeout(tick, this.idleMs - quietFor);
+      };
+      tick();
+    });
+  }
+};
+
+// src/baton/acp-driver.ts
+var import_node_crypto8 = require("crypto");
+var AcpDriver = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  deps;
+  kind = "mobile_acp";
+  turnActive = false;
+  waiters = [];
+  /** Set once the adapter has handshaked (in {@link start}); the shared
+   *  conversation id (resumed id, or the freshly minted one). */
+  acpSessionId = null;
+  agentCaps;
+  /** Lazily-built, memoised per {@link start} — cleared when the conversation
+   *  changes so history/models rebind to the current conversation. */
+  session = null;
+  budgetReachedPosted = false;
+  async start(resumeId) {
+    let started;
+    try {
+      started = await this.deps.client.start();
+      if (resumeId !== void 0) {
+        await this.deps.client.loadSession(resumeId);
+      }
+    } catch (err) {
+      await this.deps.client.stop().catch(() => void 0);
+      throw err;
+    }
+    const conversationId = resumeId !== void 0 ? resumeId : started.sessionId;
+    this.acpSessionId = conversationId;
+    this.agentCaps = started.initialize.agentCapabilities;
+    this.session = null;
+    this.budgetReachedPosted = false;
+    return conversationId;
+  }
+  async stop() {
+    await this.deps.client.stop();
+    this.acpSessionId = null;
+    this.session = null;
+  }
+  async dispatch(cmd) {
+    const relay = this.deps.getRelay();
+    const acpSessionId = this.acpSessionId;
+    if (acpSessionId === null) {
+      await relay.sendResult(cmd.id, "failed", { code: "BATON_MOBILE_NOT_STARTED" });
+      return;
+    }
+    const session = await this.ensureSession(relay, acpSessionId, this.agentCaps);
+    this.beginTurn();
+    try {
+      await dispatchAcpCommand(assembleAcpCommandContext(session, cmd));
+    } finally {
+      this.endTurn();
+    }
+  }
+  /** Build (once per conversation) the session-scoped ACP context — the same
+   *  shape `runAcpSession` assembles. Memoised on {@link session}. */
+  async ensureSession(relay, acpSessionId, agentCaps) {
+    if (this.session) return this.session;
+    const { opts, publisher, streaming, runtime, recentStderr } = this.deps;
+    const models = await runtime.listModels();
+    const jsonlHistory = new HistoryService(runtime, opts.pluginId, opts.cwd, {
+      pluginAuthToken: opts.pluginAuthToken
+    });
+    const history = new AcpHistory(publisher, { agent: opts.agent, acpSessionId });
+    const turnFiles = new TurnFileAggregator({
+      workingDir: opts.cwd,
+      sessionId: opts.sessionId,
+      pluginId: opts.pluginId,
+      pluginAuthToken: opts.pluginAuthToken,
+      agentId: opts.agent
+    });
+    const budgetReachedFlag = {
+      get: () => this.budgetReachedPosted,
+      set: (v) => {
+        this.budgetReachedPosted = v;
+      }
+    };
+    const budgetRecovery = createBudgetRecovery({
+      publishText: (text) => publisher.publishOutput({ type: "text", content: text, done: true }),
+      publishSelectPrompt: (question, options) => publisher.publishOutput({
+        type: "select_prompt",
+        content: question,
+        options,
+        optionDescriptions: options.map(() => ""),
+        currentIndex: 0,
+        done: true
+      }),
+      publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto8.randomUUID)(), prompt, options }),
+      publishRawChunk: (chunk) => publisher.publishOutput(chunk),
+      sendResult: (commandId, status2, result) => relay.sendResult(commandId, status2, result),
+      appendAgentReply: (text) => history.appendAgentReply(text),
+      flushHistory: () => void history.flush(),
+      relaunchProxyWithoutBudget,
+      agentId: opts.agent
+    });
+    this.session = {
+      client: this.deps.client,
+      relay,
+      acpSessionId,
+      models,
+      streaming,
+      opts,
+      history,
+      jsonlHistory,
+      agentCaps,
+      turnFiles,
+      getBeads: opts.getBeads ?? (() => null),
+      publisher,
+      recentStderr,
+      budgetRecovery,
+      budgetReachedFlag
+    };
+    return this.session;
+  }
+  beginTurn() {
+    this.turnActive = true;
+  }
+  endTurn() {
+    this.turnActive = false;
+    const waiters = this.waiters;
+    this.waiters = [];
+    waiters.forEach((resolve7) => resolve7());
+  }
+  whenSafeToYield() {
+    if (!this.turnActive) return Promise.resolve();
+    return new Promise((resolve7) => this.waiters.push(resolve7));
+  }
+};
+
+// src/baton/transcript-mirror.ts
 var fs58 = __toESM(require("fs"));
+var TranscriptMirror = class {
+  constructor(deps) {
+    this.deps = deps;
+  }
+  deps;
+  emitted = 0;
+  unwatch = null;
+  start() {
+    const file = this.deps.runtime.resolveHistoryFile?.(this.deps.cwd, this.deps.conversationId);
+    if (!file) return;
+    this.emit(file);
+    const watch2 = this.deps.watch ?? defaultWatch;
+    this.unwatch = watch2(file, () => this.emit(file));
+  }
+  stop() {
+    this.unwatch?.();
+    this.unwatch = null;
+  }
+  emit(file) {
+    let all;
+    try {
+      all = this.deps.runtime.parseHistoryFile(file);
+    } catch {
+      return;
+    }
+    if (all.length <= this.emitted) return;
+    const delta = all.slice(this.emitted);
+    this.emitted = all.length;
+    this.deps.onNewMessages(delta);
+  }
+};
+function defaultWatch(file, onChange) {
+  const w3 = fs58.watch(file, { persistent: false }, () => onChange());
+  return () => w3.close();
+}
+
+// src/baton/wire-baton.ts
+function makeOnCommand(deps) {
+  return async function onCommand(cmd) {
+    if (cmd.type === "take_control") {
+      try {
+        await deps.controller.takeControl();
+      } catch (err) {
+        await deps.ack(cmd.id, "failed", {
+          code: "BATON_SWITCH_FAILED",
+          message: err instanceof Error ? err.message : String(err)
+        });
+        return;
+      }
+      await deps.ack(cmd.id, "completed", { state: deps.controller.state });
+      return;
+    }
+    if (cmd.type === "handback") {
+      try {
+        await deps.controller.handback();
+      } catch (err) {
+        await deps.ack(cmd.id, "failed", {
+          code: "BATON_SWITCH_FAILED",
+          message: err instanceof Error ? err.message : String(err)
+        });
+        return;
+      }
+      await deps.ack(cmd.id, "completed", { state: deps.controller.state });
+      return;
+    }
+    await deps.dispatchActive(cmd);
+  };
+}
+async function publishMirroredTurnsLive(publisher, messages) {
+  for (const m of messages) {
+    if (m.role === "user") {
+      await publisher.publishOutput({ type: "clear" });
+      await publisher.publishOutput({ type: "user_message", content: m.text, done: true });
+      await publisher.publishOutput({ type: "new_turn", done: false });
+    } else {
+      await publisher.publishOutput({ type: "text", content: m.text, done: true });
+    }
+  }
+}
+function makeMirrorOnNewMessages(deps) {
+  let isFirstEmit = true;
+  let publishChain = Promise.resolve();
+  return (messages) => {
+    const relevant = messages.filter((m) => m.role !== "system");
+    if (relevant.length === 0) return;
+    const mapped = relevant.map((m) => ({
+      id: m.id,
+      role: m.role === "user" ? "user" : "agent",
+      text: m.text,
+      timestamp: toEpochMs(m.timestamp)
+    }));
+    void deps.publisher.pushConversation({
+      agentId: deps.agentId,
+      sessionId: deps.conversationId,
+      messages: mapped
+    });
+    if (!isFirstEmit) {
+      publishChain = publishChain.then(() => publishMirroredTurnsLive(deps.publisher, relevant)).catch((err) => {
+        log.warn(
+          "wireBaton",
+          `mirror live-publish failed: ${err instanceof Error ? err.message : String(err)}`
+        );
+      });
+    }
+    isFirstEmit = false;
+  };
+}
+async function runBatonSession(opts) {
+  const publisher = new AcpPublisher({
+    sessionId: opts.sessionId,
+    pluginId: opts.pluginId,
+    pluginAuthToken: opts.pluginAuthToken,
+    refreshAuthToken: () => fetchCurrentPluginAuthToken(opts.sessionId, opts.pluginId, opts.pollSecret)
+  });
+  const runtime = createRuntimeStrategy(opts.agent);
+  const streaming = new StreamingState(publisher);
+  const recentStderr = [];
+  const client2 = new AcpClient({
+    adapter: opts.adapter,
+    cwd: opts.cwd,
+    onSessionUpdate: (notification) => {
+      for (const delta of mapSessionUpdate(notification)) streaming.append(delta);
+    },
+    onRequestPermission: async (request) => {
+      const { event, optionIdByLabel } = mapPermissionRequest(request);
+      await publisher.publishAwaitingAnswer(event);
+      return streaming.registerPermission({
+        questionId: event.questionId,
+        labels: event.options ?? [],
+        optionIdByLabel
+      });
+    },
+    onStderr: (line) => {
+      recentStderr.push(line);
+      if (recentStderr.length > 40) recentStderr.shift();
+    },
+    onUnexpectedExit: (code, signal) => {
+      log.warn("baton", `ACP adapter exited code=${code} signal=${signal}; flushing`);
+      void streaming.closeAll().finally(() => process.exit(code ?? 1));
+    }
+  });
+  let relay;
+  const acpOpts = {
+    agent: opts.agent,
+    sessionId: opts.sessionId,
+    pluginId: opts.pluginId,
+    pluginAuthToken: opts.pluginAuthToken,
+    adapter: opts.adapter,
+    cwd: opts.cwd,
+    getBeads: opts.getBeads,
+    pollSecret: opts.pollSecret
+  };
+  const mobileDriver = new AcpDriver({
+    client: client2,
+    publisher,
+    streaming,
+    runtime,
+    recentStderr,
+    opts: acpOpts,
+    getRelay: () => relay
+  });
+  let nativeDriver;
+  const agent = new AgentService(runtime, {
+    cwd: opts.cwd,
+    onData(raw) {
+      nativeDriver.handlePtyData(raw);
+    },
+    onExit(code) {
+      teardown();
+      process.exit(code);
+    }
+  });
+  nativeDriver = new NativeTuiDriver({
+    agent,
+    runtime,
+    opts: {
+      sessionId: opts.sessionId,
+      pluginId: opts.pluginId,
+      agentId: opts.agent,
+      pluginAuthToken: opts.pluginAuthToken,
+      cwd: opts.cwd
+    },
+    getRelay: () => relay,
+    getBeads: opts.getBeads ?? (() => null)
+  });
+  let mirror = null;
+  const startMirror = (conversationId) => {
+    mirror?.stop();
+    mirror = new TranscriptMirror({
+      runtime,
+      cwd: opts.cwd,
+      conversationId,
+      onNewMessages: makeMirrorOnNewMessages({
+        publisher,
+        agentId: opts.agent,
+        conversationId
+      })
+    });
+    mirror.start();
+  };
+  const controller = new BatonController({
+    local: nativeDriver,
+    mobile: mobileDriver,
+    publishState: (state, driver, conversationId) => {
+      void postBatonEvent({
+        sessionId: opts.sessionId,
+        pluginId: opts.pluginId,
+        pluginAuthToken: opts.pluginAuthToken,
+        state,
+        driver,
+        conversationId
+      });
+      if (state === "LOCAL_DRIVE" && conversationId) startMirror(conversationId);
+      else if (state !== "LOCAL_DRIVE") mirror?.stop();
+    }
+  });
+  const dispatchActive = (cmd) => controller.activeSessionDriver.dispatch(cmd);
+  relay = new CommandRelayService(
+    opts.pluginId,
+    makeOnCommand({
+      controller,
+      dispatchActive,
+      ack: (id, status2, result) => relay.sendResult(id, status2, result)
+    }),
+    runtime.meta
+  );
+  let torn = false;
+  function teardown() {
+    if (torn) return;
+    torn = true;
+    process.removeListener("SIGINT", onSignal);
+    process.removeListener("SIGTERM", onSignal);
+    process.removeListener("SIGHUP", onSignal);
+    mirror?.stop();
+    relay.stop();
+    void controller.shutdown();
+  }
+  const onSignal = () => {
+    teardown();
+    process.exit(0);
+  };
+  process.once("SIGINT", onSignal);
+  process.once("SIGTERM", onSignal);
+  process.once("SIGHUP", onSignal);
+  showInfo(`Starting ${opts.agent} baton (local) \u2014 native TUI + mobile take-control\u2026`);
+  await controller.begin();
+  relay.start();
+  showSuccess(`${opts.agent} baton online \u2014 you're driving locally; mobile can take control.`);
+  showRelayNotice();
+  await new Promise(() => {
+  });
+}
+function toEpochMs(ts) {
+  const asNum = Number(ts);
+  if (Number.isFinite(asNum) && asNum > 0) return asNum;
+  const parsed = Date.parse(ts);
+  return Number.isFinite(parsed) ? parsed : Date.now();
+}
+
+// src/agents/claude/onboarding.ts
+var fs59 = __toESM(require("fs"));
 var os45 = __toESM(require("os"));
 var path62 = __toESM(require("path"));
 function ensureClaudeOnboarded() {
@@ -29026,7 +29675,7 @@ function ensureClaudeOnboarded() {
     const file = path62.join(os45.homedir(), ".claude.json");
     let config = {};
     try {
-      config = JSON.parse(fs58.readFileSync(file, "utf8"));
+      config = JSON.parse(fs59.readFileSync(file, "utf8"));
     } catch {
     }
     if (config.hasCompletedOnboarding === true && typeof config.theme === "string") {
@@ -29037,8 +29686,8 @@ function ensureClaudeOnboarded() {
     if (typeof config.lastOnboardingVersion !== "string") {
       config.lastOnboardingVersion = "2.1.177";
     }
-    fs58.mkdirSync(path62.dirname(file), { recursive: true });
-    fs58.writeFileSync(file, JSON.stringify(config, null, 2));
+    fs59.mkdirSync(path62.dirname(file), { recursive: true });
+    fs59.writeFileSync(file, JSON.stringify(config, null, 2));
     log.info("claude", "pre-completed Claude onboarding (skip first-run theme picker)");
   } catch (err) {
     log.warn("claude", `ensureClaudeOnboarded failed (non-fatal): ${err.message}`);
@@ -29162,6 +29811,22 @@ async function start(requestedAgent) {
       `agent-spawn gate released \u2014 beads ${beads ? "ready" : "pending"}; project deps provisioned`
     );
   }
+  if (isLocalSession() && requiresAcp(session.agent)) {
+    const adapter = getAcpAdapter(session.agent);
+    if (adapter && session.pluginAuthToken) {
+      await runBatonSession({
+        agent: session.agent,
+        sessionId: session.id,
+        pluginId,
+        pluginAuthToken: session.pluginAuthToken,
+        pollSecret: session.pollSecret,
+        cwd,
+        adapter,
+        getBeads
+      });
+      return;
+    }
+  }
   if (requiresAcp(session.agent)) {
     const adapter = getAcpAdapter(session.agent);
     if (!adapter || !session.pluginAuthToken) {
@@ -31739,8 +32404,8 @@ async function invite() {
 // src/commands/doctor.ts
 var import_node_dns = require("dns");
 var import_node_util5 = require("util");
-var import_node_crypto8 = require("crypto");
-var fs59 = __toESM(require("fs"));
+var import_node_crypto9 = require("crypto");
+var fs60 = __toESM(require("fs"));
 var path67 = __toESM(require("path"));
 var import_picocolors14 = __toESM(require("picocolors"));
 var dnsResolveP = (0, import_node_util5.promisify)(import_node_dns.resolve);
@@ -31799,11 +32464,11 @@ async function checkHealth(apiBase2) {
 function checkConfigDir() {
   const dir = path67.join(require("os").homedir(), ".codeam");
   try {
-    fs59.mkdirSync(dir, { recursive: true, mode: 448 });
+    fs60.mkdirSync(dir, { recursive: true, mode: 448 });
     const probe = path67.join(dir, ".doctor-probe");
-    fs59.writeFileSync(probe, "ok", { mode: 384 });
-    const read2 = fs59.readFileSync(probe, "utf8");
-    fs59.unlinkSync(probe);
+    fs60.writeFileSync(probe, "ok", { mode: 384 });
+    const read2 = fs60.readFileSync(probe, "utf8");
+    fs60.unlinkSync(probe);
     if (read2 !== "ok") throw new Error("write/read round-trip mismatch");
     return {
       id: "config-dir",
@@ -31909,9 +32574,9 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.59.0" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.1" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
-  const diagnosticId = (0, import_node_crypto8.randomUUID)();
+  const diagnosticId = (0, import_node_crypto9.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
   const [dns, health] = await Promise.all([
     checkDns(apiBase2),
@@ -32108,7 +32773,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.59.0" : "unknown";
+  const v = true ? "2.60.1" : "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.59.0",
+  "version": "2.60.1",
   "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",