codeam-cli 2.60.0 → 2.60.2

package/CHANGELOG.md

@@ -4,6 +4,48 @@ 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.1] — 2026-07-08
+
+### Chore
+
+- **cli:** Remove CODEAM_BATON flag — baton unconditional for local sessions
+
+### Fixed
+
+- **cli:** Baton LOCAL_DRIVE mirror publishes turns live via the output stream
+
+## [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

package/dist/index.js

@@ -5653,7 +5653,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.0" : "0.0.0-dev",
+    cliVersion: true ? "2.60.2" : "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.0",
+  version: "2.60.2",
   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.0" ? { ideVersion: "2.60.0" } : {}
+      ..."2.60.2" ? { ideVersion: "2.60.2" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -15921,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.60.0" : null;
+  const current = true ? "2.60.2" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15938,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.60.0" : null;
+  const current = true ? "2.60.2" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15958,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.60.0" : null;
+  return true ? "2.60.2" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -29110,11 +29110,6 @@ function fetchQuotaUsage(runtime, historySvc) {
 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;
 }
-function batonEnabled(env = process.env) {
-  const v = env.CODEAM_BATON;
-  if (v === void 0 || v === "") return true;
-  return v !== "0" && v.toLowerCase() !== "false";
-}
 
 // src/baton/baton-controller.ts
 var BatonController = class {
@@ -29415,20 +29410,54 @@ var fs58 = __toESM(require("fs"));
 var TranscriptMirror = class {
   constructor(deps) {
     this.deps = deps;
+    this.pollIntervalMs = deps.pollIntervalMs ?? 750;
+    this.waitTimeoutMs = deps.waitTimeoutMs ?? 10 * 6e4;
+    this.setIntervalFn = deps.setInterval ?? ((fn, ms) => setInterval(fn, ms));
+    this.clearIntervalFn = deps.clearInterval ?? ((handle) => clearInterval(handle));
   }
   deps;
   emitted = 0;
   unwatch = null;
+  pollHandle = null;
+  attached = false;
+  pollIntervalMs;
+  waitTimeoutMs;
+  setIntervalFn;
+  clearIntervalFn;
   start() {
+    if (this.tryAttach()) return;
+    let waited = 0;
+    this.pollHandle = this.setIntervalFn(() => {
+      waited += this.pollIntervalMs;
+      if (this.tryAttach()) {
+        this.clearPoll();
+        return;
+      }
+      if (this.waitTimeoutMs > 0 && waited >= this.waitTimeoutMs) this.clearPoll();
+    }, this.pollIntervalMs);
+  }
+  stop() {
+    this.clearPoll();
+    this.unwatch?.();
+    this.unwatch = null;
+  }
+  /** Resolve the transcript file; if present, emit the current contents and
+   *  begin watching. Returns whether it attached. */
+  tryAttach() {
+    if (this.attached) return true;
     const file = this.deps.runtime.resolveHistoryFile?.(this.deps.cwd, this.deps.conversationId);
-    if (!file) return;
+    if (!file) return false;
+    this.attached = true;
     this.emit(file);
     const watch2 = this.deps.watch ?? defaultWatch;
     this.unwatch = watch2(file, () => this.emit(file));
+    return true;
   }
-  stop() {
-    this.unwatch?.();
-    this.unwatch = null;
+  clearPoll() {
+    if (this.pollHandle !== null) {
+      this.clearIntervalFn(this.pollHandle);
+      this.pollHandle = null;
+    }
   }
   emit(file) {
     let all;
@@ -29480,6 +29509,47 @@ function makeOnCommand(deps) {
     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();
+  const conversation = [];
+  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)
+    }));
+    conversation.push(...mapped);
+    void deps.publisher.pushConversation({
+      agentId: deps.agentId,
+      sessionId: deps.conversationId,
+      messages: conversation.slice()
+    });
+    if (deps.fresh || !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,
@@ -29559,26 +29629,19 @@ async function runBatonSession(opts) {
     getBeads: opts.getBeads ?? (() => null)
   });
   let mirror = null;
-  const startMirror = (conversationId) => {
+  let firstLocalDrive = true;
+  const startMirror = (conversationId, fresh) => {
     mirror?.stop();
     mirror = new TranscriptMirror({
       runtime,
       cwd: opts.cwd,
       conversationId,
-      onNewMessages: (messages) => {
-        const mapped = messages.filter((m) => m.role !== "system").map((m) => ({
-          id: m.id,
-          role: m.role === "user" ? "user" : "agent",
-          text: m.text,
-          timestamp: toEpochMs(m.timestamp)
-        }));
-        if (mapped.length === 0) return;
-        void publisher.pushConversation({
-          agentId: opts.agent,
-          sessionId: conversationId,
-          messages: mapped
-        });
-      }
+      onNewMessages: makeMirrorOnNewMessages({
+        publisher,
+        agentId: opts.agent,
+        conversationId,
+        fresh
+      })
     });
     mirror.start();
   };
@@ -29594,8 +29657,12 @@ async function runBatonSession(opts) {
         driver,
         conversationId
       });
-      if (state === "LOCAL_DRIVE" && conversationId) startMirror(conversationId);
-      else if (state !== "LOCAL_DRIVE") mirror?.stop();
+      if (state === "LOCAL_DRIVE" && conversationId) {
+        startMirror(conversationId, firstLocalDrive);
+        firstLocalDrive = false;
+      } else if (state !== "LOCAL_DRIVE") {
+        mirror?.stop();
+      }
     }
   });
   const dispatchActive = (cmd) => controller.activeSessionDriver.dispatch(cmd);
@@ -29786,7 +29853,7 @@ async function start(requestedAgent) {
       `agent-spawn gate released \u2014 beads ${beads ? "ready" : "pending"}; project deps provisioned`
     );
   }
-  if (isLocalSession() && batonEnabled() && requiresAcp(session.agent)) {
+  if (isLocalSession() && requiresAcp(session.agent)) {
     const adapter = getAcpAdapter(session.agent);
     if (adapter && session.pluginAuthToken) {
       await runBatonSession({
@@ -32549,7 +32616,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.0" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.2" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto9.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -32748,7 +32815,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.0" : "unknown";
+  const v = true ? "2.60.2" : "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.0",
+  "version": "2.60.2",
   "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",