codeam-cli 2.60.19 → 2.60.21

package/CHANGELOG.md

@@ -4,6 +4,33 @@ 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.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
+
+- **cli:** Baton — pre-mint Cursor session id via `create-chat`
+
+### Tests
+
+- **cli:** De-flake adapter module-graph gate — crash synchronously in settling fixture
+
+## [2.60.18] — 2026-07-09
+
+### Added
+
+- **cli:** Auto-install Kimi on local pair when the binary is missing
+
+### Fixed
+
+- **cli:** Baton — discover Kimi's self-minted session id after spawn
+
 ## [2.60.17] — 2026-07-09
 
 ### Added

package/dist/index.js

@@ -5680,7 +5680,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.19" : "0.0.0-dev",
+    cliVersion: true ? "2.60.21" : "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.19",
+  version: "2.60.21",
   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.19" ? { ideVersion: "2.60.19" } : {}
+      ..."2.60.21" ? { ideVersion: "2.60.21" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -9089,7 +9089,7 @@ function findGitRoot2(startDir) {
 }
 
 // src/commands/link.ts
-var import_node_crypto7 = require("crypto");
+var import_node_crypto8 = require("crypto");
 var fs30 = __toESM(require("fs"));
 var path34 = __toESM(require("path"));
 var import_chokidar = __toESM(require("chokidar"));
@@ -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);
   }
@@ -13444,7 +13535,70 @@ var CoderabbitRuntimeStrategy = class {
 var fs23 = __toESM(require("fs"));
 var os21 = __toESM(require("os"));
 var path27 = __toESM(require("path"));
+var import_node_crypto5 = require("crypto");
 var HISTORY_ROOT = path27.join(os21.homedir(), ".cursor", "projects");
+var CURSOR_HOME = path27.join(os21.homedir(), ".cursor");
+var STORE_FILES = ["store.db", "store.db-wal", "store.db-shm"];
+function acpSessionDir(sessionId) {
+  return path27.join(CURSOR_HOME, "acp-sessions", sessionId);
+}
+function nativeStoreDir(cwd, sessionId) {
+  const chatsRoot = path27.join(CURSOR_HOME, "chats");
+  let buckets = [];
+  try {
+    buckets = fs23.readdirSync(chatsRoot);
+  } catch {
+  }
+  for (const b of buckets) {
+    const candidate = path27.join(chatsRoot, b, sessionId);
+    if (fs23.existsSync(path27.join(candidate, "store.db"))) return candidate;
+  }
+  const computed = path27.join(chatsRoot, (0, import_node_crypto5.createHash)("md5").update(cwd).digest("hex"), sessionId);
+  return fs23.existsSync(computed) ? computed : null;
+}
+function copyStoreFiles(srcDir, dstDir) {
+  fs23.mkdirSync(dstDir, { recursive: true });
+  for (const f of STORE_FILES) {
+    const dst = path27.join(dstDir, f);
+    if (fs23.existsSync(dst)) fs23.rmSync(dst, { force: true });
+  }
+  for (const f of STORE_FILES) {
+    const src = path27.join(srcDir, f);
+    if (fs23.existsSync(src)) fs23.copyFileSync(src, path27.join(dstDir, f));
+  }
+}
+function bridgeNativeToAcp(cwd, sessionId) {
+  try {
+    const src = nativeStoreDir(cwd, sessionId);
+    if (!src) {
+      log.warn("cursor", `baton bridge: no native store for ${sessionId.slice(0, 8)} \u2014 skip`);
+      return;
+    }
+    const dst = acpSessionDir(sessionId);
+    copyStoreFiles(src, dst);
+    fs23.writeFileSync(
+      path27.join(dst, "meta.json"),
+      JSON.stringify({ schemaVersion: 1, cwd })
+    );
+    log.info("cursor", `baton bridge native\u2192acp ok (${sessionId.slice(0, 8)})`);
+  } catch (err) {
+    log.warn("cursor", `baton bridge native\u2192acp failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
+function bridgeAcpToNative(cwd, sessionId) {
+  try {
+    const src = acpSessionDir(sessionId);
+    if (!fs23.existsSync(path27.join(src, "store.db"))) {
+      log.warn("cursor", `baton bridge: no acp store for ${sessionId.slice(0, 8)} \u2014 skip`);
+      return;
+    }
+    const dst = nativeStoreDir(cwd, sessionId) ?? path27.join(CURSOR_HOME, "chats", (0, import_node_crypto5.createHash)("md5").update(cwd).digest("hex"), sessionId);
+    copyStoreFiles(src, dst);
+    log.info("cursor", `baton bridge acp\u2192native ok (${sessionId.slice(0, 8)})`);
+  } catch (err) {
+    log.warn("cursor", `baton bridge acp\u2192native failed: ${err instanceof Error ? err.message : String(err)}`);
+  }
+}
 function encodeCursorCwd(cwd) {
   return cwd.replace(/^[/\\]+/, "").replace(/[/\\:]/g, "-");
 }
@@ -13685,6 +13839,25 @@ var CursorRuntimeStrategy = class {
   parseHistoryFile(filePath) {
     return parseHistoryFile3(filePath);
   }
+  /**
+   * Baton Take Control (native TUI → mobile ACP). Cursor keeps native-TUI
+   * conversations in `~/.cursor/chats/<md5(cwd)>/<id>` but ACP `session/load`
+   * only reads `~/.cursor/acp-sessions/<id>` — so without this, loading the
+   * native session id fails "not found". Bridge the native store into the ACP
+   * store just before the load. Best-effort; verified live (identical
+   * `blobs`+`meta` SQLite schema, raw file copy replays the conversation).
+   */
+  async syncTranscriptForAcpResume(cwd, sessionId) {
+    bridgeNativeToAcp(cwd, sessionId);
+  }
+  /**
+   * Baton hand-back (mobile ACP → native TUI). Copy the ACP conversation store
+   * back into the native `~/.cursor/chats` store so `cursor-agent --resume <id>`
+   * in the terminal picks up whatever mobile did. Best-effort.
+   */
+  async syncTranscriptForNativeResume(cwd, sessionId) {
+    bridgeAcpToNative(cwd, sessionId);
+  }
   getCurrentUsage(historyDir) {
     return getCurrentUsage3(historyDir);
   }
@@ -13957,7 +14130,7 @@ var AiderRuntimeStrategy = class {
 };
 
 // src/agents/gemini/runtime.ts
-var import_node_crypto5 = require("crypto");
+var import_node_crypto6 = require("crypto");
 
 // src/agents/gemini/link.ts
 var import_node_child_process12 = require("child_process");
@@ -14222,7 +14395,7 @@ var GeminiRuntimeStrategy = class {
         "Gemini CLI is not on PATH. Install it with:\n    npm install -g @google/gemini-cli\n    Then run `codeam pair` again."
       );
     }
-    const sessionId = (0, import_node_crypto5.randomUUID)();
+    const sessionId = (0, import_node_crypto6.randomUUID)();
     const launch = this.os.buildLaunch(binary, ["--session-id", sessionId]);
     log.info(
       "gemini",
@@ -14329,12 +14502,12 @@ var import_node_path4 = require("path");
 var fs29 = __toESM(require("fs"));
 var os26 = __toESM(require("os"));
 var path33 = __toESM(require("path"));
-var import_node_crypto6 = require("crypto");
+var import_node_crypto7 = require("crypto");
 function kimiHome() {
   return process.env.KIMI_CODE_HOME || path33.join(os26.homedir(), ".kimi-code");
 }
 function workDirKey(cwd) {
-  const hash = (0, import_node_crypto6.createHash)("sha256").update(cwd).digest("hex").slice(0, 12);
+  const hash = (0, import_node_crypto7.createHash)("sha256").update(cwd).digest("hex").slice(0, 12);
   return `wd_${path33.basename(cwd)}_${hash}`;
 }
 function resolveHistoryDir6(cwd) {
@@ -14391,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);
@@ -14399,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) {
@@ -14426,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) {
@@ -14549,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);
@@ -14727,9 +14900,9 @@ async function link(args2 = []) {
     await linkDryRunPreflight(ctx);
     return;
   }
-  const pluginId = (0, import_node_crypto7.randomUUID)();
-  const pollSecret = (0, import_node_crypto7.randomBytes)(32).toString("base64url");
-  const pluginSecretHash = (0, import_node_crypto7.createHash)("sha256").update(pollSecret).digest("hex");
+  const pluginId = (0, import_node_crypto8.randomUUID)();
+  const pollSecret = (0, import_node_crypto8.randomBytes)(32).toString("base64url");
+  const pluginSecretHash = (0, import_node_crypto8.createHash)("sha256").update(pollSecret).digest("hex");
   const spin = dist_exports.spinner();
   spin.start("Requesting pairing code...");
   const pairing = await requestCode(pluginId, pluginSecretHash);
@@ -16560,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.19" : null;
+  const current = true ? "2.60.21" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16577,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.19" : null;
+  const current = true ? "2.60.21" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16597,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.19" : null;
+  return true ? "2.60.21" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -22129,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,
@@ -22139,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;
   }
@@ -22161,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();
@@ -22190,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();
@@ -22244,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;
@@ -22431,7 +22604,7 @@ function requiresAcp(agent) {
 }
 
 // src/agents/acp/runner.ts
-var import_node_crypto9 = require("crypto");
+var import_node_crypto10 = require("crypto");
 
 // src/services/history.service.ts
 var fs55 = __toESM(require("fs"));
@@ -26632,7 +26805,7 @@ async function runOnboardingTurn(opts) {
 }
 
 // src/agents/acp/mappers.ts
-var import_node_crypto8 = require("crypto");
+var import_node_crypto9 = require("crypto");
 function mapSessionUpdate(notification) {
   const update = notification.update;
   switch (update.sessionUpdate) {
@@ -26695,7 +26868,7 @@ function mapPermissionRequest(request) {
   }
   return {
     event: {
-      questionId: (0, import_node_crypto8.randomUUID)(),
+      questionId: (0, import_node_crypto9.randomUUID)(),
       prompt,
       options: labels.length > 0 ? labels : void 0
     },
@@ -26705,7 +26878,7 @@ function mapPermissionRequest(request) {
 }
 function messageChunkId(messageId) {
   if (typeof messageId === "string" && messageId.length > 0) return messageId;
-  return (0, import_node_crypto8.randomUUID)();
+  return (0, import_node_crypto9.randomUUID)();
 }
 function extractText4(content) {
   if (!content || typeof content !== "object") return null;
@@ -28518,7 +28691,7 @@ var AcpHistory = class {
       this.summary = trimmed.length > 120 ? trimmed.slice(0, 117) + "\u2026" : trimmed;
     }
     this.messages.push({
-      id: (0, import_node_crypto9.randomUUID)(),
+      id: (0, import_node_crypto10.randomUUID)(),
       role: "user",
       text,
       timestamp: Date.now()
@@ -28527,7 +28700,7 @@ var AcpHistory = class {
   appendAgentReply(text) {
     if (text.length === 0) return;
     this.messages.push({
-      id: (0, import_node_crypto9.randomUUID)(),
+      id: (0, import_node_crypto10.randomUUID)(),
       role: "agent",
       text,
       timestamp: Date.now()
@@ -28733,7 +28906,7 @@ async function runAcpSession(opts) {
       currentIndex: 0,
       done: true
     }),
-    publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto9.randomUUID)(), prompt, options }),
+    publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto10.randomUUID)(), prompt, options }),
     publishRawChunk: (chunk) => publisher.publishOutput(chunk),
     sendResult: (commandId, status2, result) => relay.sendResult(commandId, status2, result),
     appendAgentReply: (text) => history.appendAgentReply(text),
@@ -29857,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*└/;
@@ -30041,6 +30214,7 @@ var NativeTuiDriver = class {
   keepAliveCtx;
   async start(resumeId) {
     if (resumeId !== void 0) {
+      await this.deps.runtime.syncTranscriptForNativeResume?.(this.deps.opts.cwd, resumeId);
       await this.agent.restart(resumeId, false);
       return resumeId;
     }
@@ -30099,7 +30273,7 @@ var NativeTuiDriver = class {
 };
 
 // src/baton/acp-driver.ts
-var import_node_crypto10 = require("crypto");
+var import_node_crypto11 = require("crypto");
 var AcpDriver = class {
   constructor(deps) {
     this.deps = deps;
@@ -30121,6 +30295,7 @@ var AcpDriver = class {
     try {
       started = await this.deps.client.start();
       if (resumeId !== void 0) {
+        await this.deps.runtime.syncTranscriptForAcpResume?.(this.deps.opts.cwd, resumeId);
         this.deps.streaming.beginLoadReplay();
         try {
           await this.deps.client.loadSession(resumeId);
@@ -30192,7 +30367,7 @@ var AcpDriver = class {
         currentIndex: 0,
         done: true
       }),
-      publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto10.randomUUID)(), prompt, options }),
+      publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto11.randomUUID)(), prompt, options }),
       publishRawChunk: (chunk) => publisher.publishOutput(chunk),
       sendResult: (commandId, status2, result) => relay.sendResult(commandId, status2, result),
       appendAgentReply: (text) => history.appendAgentReply(text),
@@ -33287,7 +33462,7 @@ async function invite() {
 // src/commands/doctor.ts
 var import_node_dns = require("dns");
 var import_node_util5 = require("util");
-var import_node_crypto11 = require("crypto");
+var import_node_crypto12 = require("crypto");
 var fs62 = __toESM(require("fs"));
 var path69 = __toESM(require("path"));
 var import_picocolors14 = __toESM(require("picocolors"));
@@ -33457,9 +33632,9 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.19" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.21" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
-  const diagnosticId = (0, import_node_crypto11.randomUUID)();
+  const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
   const [dns, health] = await Promise.all([
     checkDns(apiBase2),
@@ -33656,7 +33831,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.19" : "unknown";
+  const v = true ? "2.60.21" : "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.19",
+  "version": "2.60.21",
   "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",