codeam-cli 2.60.20 → 2.60.22

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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
+
+- **cli:** Baton — pre-mint Cursor session id via `create-chat`
+- **cli:** Baton Take Control for Cursor — bridge native↔ACP session stores
+
 ## [2.60.19] — 2026-07-09
 
 ### Fixed

package/dist/index.js

@@ -5680,7 +5680,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.20" : "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.20",
+  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.20" ? { ideVersion: "2.60.20" } : {}
+      ..."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));
   }
   /**
@@ -12931,6 +12931,87 @@ function resolveHistoryFile2(cwd, sessionId, homeOverride) {
   }
   return null;
 }
+async function discoverSessionId(cwd, opts, homeOverride) {
+  const home = homeOverride ?? import_node_os.default.homedir();
+  const sessionsRoot = import_node_path2.default.join(home, ".codex", "sessions");
+  const floor = opts.sinceMs - 2e3;
+  const deadline = Date.now() + (opts.timeoutMs ?? 24e4);
+  let resolvedCurrent;
+  try {
+    resolvedCurrent = import_node_fs3.default.realpathSync(cwd);
+  } catch {
+    resolvedCurrent = import_node_path2.default.resolve(cwd);
+  }
+  for (; ; ) {
+    const id = newestRolloutIdSince(sessionsRoot, resolvedCurrent, floor);
+    if (id) return id;
+    if (Date.now() >= deadline) return null;
+    await sleep2(500);
+  }
+}
+function newestRolloutIdSince(sessionsRoot, resolvedCwd, floorMs) {
+  if (!import_node_fs3.default.existsSync(sessionsRoot)) return null;
+  const now = /* @__PURE__ */ new Date();
+  let bestId = null;
+  let bestMtime = -1;
+  for (let dayOffset = 0; dayOffset < 2; dayOffset += 1) {
+    const d3 = new Date(now.getTime() - dayOffset * 24 * 60 * 60 * 1e3);
+    const yyyy = String(d3.getUTCFullYear());
+    const mm = String(d3.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(d3.getUTCDate()).padStart(2, "0");
+    const dayDir = import_node_path2.default.join(sessionsRoot, yyyy, mm, dd);
+    let dayFiles;
+    try {
+      dayFiles = import_node_fs3.default.readdirSync(dayDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of dayFiles) {
+      if (!entry.isFile()) continue;
+      if (!entry.name.startsWith("rollout-") || !entry.name.endsWith(".jsonl")) continue;
+      const filePath = import_node_path2.default.join(dayDir, entry.name);
+      let mtime;
+      try {
+        mtime = import_node_fs3.default.statSync(filePath).mtimeMs;
+      } catch {
+        continue;
+      }
+      if (mtime < floorMs || mtime <= bestMtime) continue;
+      let metaCwd;
+      let metaId;
+      try {
+        const raw = import_node_fs3.default.readFileSync(filePath, "utf8");
+        for (const line of raw.split("\n")) {
+          if (!line.trim()) continue;
+          const rec = parseLine(line);
+          if (!rec) continue;
+          if (rec.type === "session_meta") {
+            const meta = rec.payload;
+            metaCwd = typeof meta?.cwd === "string" ? meta.cwd : void 0;
+            metaId = typeof meta?.id === "string" ? meta.id : void 0;
+          }
+          break;
+        }
+      } catch {
+        continue;
+      }
+      if (!metaId || !metaCwd) continue;
+      let resolvedMeta;
+      try {
+        resolvedMeta = import_node_fs3.default.realpathSync(metaCwd);
+      } catch {
+        resolvedMeta = import_node_path2.default.resolve(metaCwd);
+      }
+      if (resolvedMeta !== resolvedCwd) continue;
+      bestMtime = mtime;
+      bestId = metaId;
+    }
+  }
+  return bestId;
+}
+function sleep2(ms) {
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
+}
 function getCurrentUsage2(historyDir) {
   if (!import_node_fs3.default.existsSync(historyDir)) return null;
   const files = import_node_fs3.default.readdirSync(historyDir).filter((f) => f.startsWith("rollout-") && f.endsWith(".jsonl")).map((f) => ({ name: f, full: import_node_path2.default.join(historyDir, f) })).map((e) => ({ ...e, mtime: import_node_fs3.default.statSync(e.full).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
@@ -13098,6 +13179,16 @@ var CodexRuntimeStrategy = class {
   resolveHistoryFile(cwd, sessionId) {
     return resolveHistoryFile2(cwd, sessionId);
   }
+  /**
+   * Codex mints its own session id (into a `rollout-*.jsonl` at TUI boot) and
+   * neither accepts a pre-set one nor prints it — so, like Kimi, the baton's
+   * NativeTuiDriver discovers it post-spawn. Codex shares that rollout store with
+   * its ACP adapter, so discovery alone is enough (no cross-store bridge). The
+   * TUI boots slowly, hence the generous poll budget inside.
+   */
+  discoverSessionId(cwd, opts) {
+    return discoverSessionId(cwd, opts);
+  }
   getCurrentUsage(historyDir) {
     return getCurrentUsage2(historyDir);
   }
@@ -14473,7 +14564,7 @@ function scanBucketsForSession(sessionId) {
   }
   return null;
 }
-async function discoverSessionId(cwd, opts) {
+async function discoverSessionId2(cwd, opts) {
   const bucket = path33.join(kimiHome(), "sessions", workDirKey(cwd));
   const floor = opts.sinceMs - 2e3;
   const deadline = Date.now() + (opts.timeoutMs ?? 15e3);
@@ -14481,7 +14572,7 @@ async function discoverSessionId(cwd, opts) {
     const id = newestSessionSince(bucket, floor);
     if (id) return id;
     if (Date.now() >= deadline) return null;
-    await sleep2(250);
+    await sleep3(250);
   }
 }
 function newestSessionSince(bucket, floorMs) {
@@ -14508,7 +14599,7 @@ function newestSessionSince(bucket, floorMs) {
   }
   return bestId;
 }
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((resolve7) => setTimeout(resolve7, ms));
 }
 function joinTextParts(parts) {
@@ -14631,7 +14722,7 @@ var KimiRuntimeStrategy = class {
    * have no baton), so the driver's optional call is inert for them.
    */
   discoverSessionId(cwd, opts) {
-    return discoverSessionId(cwd, opts);
+    return discoverSessionId2(cwd, opts);
   }
   getCurrentUsage(historyDir) {
     return getCurrentUsage5(historyDir);
@@ -16642,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.20" : null;
+  const current = true ? "2.60.22" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16659,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.20" : null;
+  const current = true ? "2.60.22" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16679,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.20" : null;
+  return true ? "2.60.22" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -22211,7 +22302,7 @@ async function waitForClaudeNativeBinary(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep4 = opts.sleep ?? realSleep;
+  const sleep5 = opts.sleep ?? realSleep;
   const deps = {
     sdkDir: opts.sdkDir,
     platformKey: opts.platformKey,
@@ -22221,7 +22312,7 @@ async function waitForClaudeNativeBinary(opts = {}) {
   let found = resolveClaudeNativeBinary(deps);
   if (found) return found;
   while (now() < deadline) {
-    await sleep4(pollMs);
+    await sleep5(pollMs);
     found = resolveClaudeNativeBinary(deps);
     if (found) return found;
   }
@@ -22243,13 +22334,13 @@ async function waitForCommandOnPath(cmd, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep4 = opts.sleep ?? realSleep;
+  const sleep5 = opts.sleep ?? realSleep;
   const probe = opts.probe;
   const check = () => isCommandOnPath(cmd, probe);
   const deadline = now() + timeoutMs;
   if (check()) return true;
   while (now() < deadline) {
-    await sleep4(pollMs);
+    await sleep5(pollMs);
     if (check()) return true;
   }
   return check();
@@ -22272,12 +22363,12 @@ async function waitForCursorAgent(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep4 = opts.sleep ?? realSleep;
+  const sleep5 = opts.sleep ?? realSleep;
   const check = () => resolveCursorAgentBinary(opts) !== null || isCommandOnPath("cursor-agent", opts.probe);
   const deadline = now() + timeoutMs;
   if (check()) return true;
   while (now() < deadline) {
-    await sleep4(pollMs);
+    await sleep5(pollMs);
     if (check()) return true;
   }
   return check();
@@ -22326,12 +22417,12 @@ async function waitForAdapterModuleGraph(command2, args2, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep4 = opts.sleep ?? realSleep;
+  const sleep5 = opts.sleep ?? realSleep;
   const probeOpts = { livenessMs: opts.livenessMs, spawnFn: opts.spawnFn };
   const deadline = now() + timeoutMs;
   if (await probeAdapterModuleGraph(command2, args2, probeOpts) === "ok") return true;
   while (now() < deadline) {
-    await sleep4(pollMs);
+    await sleep5(pollMs);
     if (await probeAdapterModuleGraph(command2, args2, probeOpts) === "ok") return true;
   }
   return false;
@@ -29939,12 +30030,12 @@ var StreamingEmitterService = class {
         log.warn("streamingEmitter", `post error url=${url} attempt=${attempt + 1}`, err);
       }
       if (attempt < MAX_RETRIES2) {
-        await sleep3(RETRY_BACKOFF_MS3 * (attempt + 1));
+        await sleep4(RETRY_BACKOFF_MS3 * (attempt + 1));
       }
     }
   }
 };
-function sleep3(ms) {
+function sleep4(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 var TREE_CONTINUATION_RE = /^\s*└/;
@@ -30027,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",
@@ -30088,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;
@@ -30117,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;
@@ -30131,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 (discovered) return discovered;
-    throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
+    if (quick) return quick;
+    void discover(this.deps.opts.cwd, { sinceMs: spawnedAt }).then((id) => {
+      if (id) this.deps.onLateBind?.(id);
+    }).catch(() => {
+    });
+    return null;
   }
   async stop() {
     this.agent.kill();
@@ -30549,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;
@@ -33541,7 +33663,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.20" : "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}`);
@@ -33740,7 +33862,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.20" : "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.20",
+  "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",