codeam-cli 2.60.21 → 2.60.22

package/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.21] — 2026-07-09
+
+### Fixed
+
+- **cli:** Baton — discover Codex's self-minted session id (first-turn aware)
+
 ## [2.60.20] — 2026-07-09
 
 ### Fixed

package/dist/index.js

@@ -5680,7 +5680,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.21" : "0.0.0-dev",
+    cliVersion: true ? "2.60.22" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5861,7 +5861,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.60.21",
+  version: "2.60.22",
   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",
@@ -6932,7 +6932,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.21" ? { ideVersion: "2.60.21" } : {}
+      ..."2.60.22" ? { ideVersion: "2.60.22" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -16733,7 +16733,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.21" : null;
+  const current = true ? "2.60.22" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16750,7 +16750,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.21" : null;
+  const current = true ? "2.60.22" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16770,7 +16770,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.21" : null;
+  return true ? "2.60.22" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -30118,6 +30118,20 @@ var BatonController = class {
     this._active = "local_tui";
     this.setState("LOCAL_DRIVE");
   }
+  /**
+   * Late-bind the conversation id for an agent (Codex) that minted it only on the
+   * user's first turn, so `begin()` returned null. Fires from the native driver's
+   * background discovery. Idempotent + guarded: only binds while we're still in
+   * the INITIAL, id-less LOCAL_DRIVE — if the user already took control (which
+   * started its own session) or an id is already set, it's a no-op, so a stray
+   * native id can never clobber the live conversation. Re-publishes LOCAL_DRIVE so
+   * the read-only mirror arms on the now-known id.
+   */
+  rebindConversation(conversationId) {
+    if (this._conversationId !== null || this._state !== "LOCAL_DRIVE") return;
+    this._conversationId = conversationId;
+    this.setState("LOCAL_DRIVE");
+  }
   async takeControl() {
     await this.switchDriver(
       "LOCAL_DRIVE",
@@ -30179,7 +30193,7 @@ function parkTerminalForReadonly(term = {}) {
 }
 
 // src/baton/native-tui-driver.ts
-var NativeTuiDriver = class {
+var NativeTuiDriver = class _NativeTuiDriver {
   constructor(deps) {
     this.deps = deps;
     this.agent = deps.agent;
@@ -30208,6 +30222,9 @@ var NativeTuiDriver = class {
   idleMs;
   now;
   lastOutput;
+  /** How long `start()` waits for a boot-time session store (Kimi) before
+   *  falling back to background/late-bind discovery (Codex, first-turn store). */
+  static QUICK_DISCOVER_MS = 8e3;
   outputSvc;
   historySvc;
   setKeepAlive;
@@ -30222,11 +30239,20 @@ var NativeTuiDriver = class {
     await this.agent.spawn();
     const preMinted = this.agent.spawnedSessionId;
     if (preMinted) return preMinted;
-    const discovered = await this.deps.runtime.discoverSessionId?.(this.deps.opts.cwd, {
-      sinceMs: spawnedAt
+    const discover = this.deps.runtime.discoverSessionId;
+    if (!discover) {
+      throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
+    }
+    const quick = await discover(this.deps.opts.cwd, {
+      sinceMs: spawnedAt,
+      timeoutMs: _NativeTuiDriver.QUICK_DISCOVER_MS
+    });
+    if (quick) return quick;
+    void discover(this.deps.opts.cwd, { sinceMs: spawnedAt }).then((id) => {
+      if (id) this.deps.onLateBind?.(id);
+    }).catch(() => {
     });
-    if (discovered) return discovered;
-    throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
+    return null;
   }
   async stop() {
     this.agent.kill();
@@ -30640,7 +30666,12 @@ async function runBatonSession(opts) {
       cwd: opts.cwd
     },
     getRelay: () => relay,
-    getBeads: opts.getBeads ?? (() => null)
+    getBeads: opts.getBeads ?? (() => null),
+    // Late-bind for first-turn-minted ids (Codex): the background discovery
+    // calls this once the user's first terminal turn creates the transcript.
+    // Safe forward-ref — `controller` is initialised long before `begin()` runs,
+    // and onLateBind only fires from inside `begin()`'s spawn.
+    onLateBind: (id) => controller.rebindConversation(id)
   });
   let mirror = null;
   let firstLocalDrive = true;
@@ -33632,7 +33663,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.21" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.22" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -33831,7 +33862,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.21" : "unknown";
+  const v = true ? "2.60.22" : "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.21",
+  "version": "2.60.22",
   "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",