codeam-cli 2.60.4 → 2.60.6

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.4] — 2026-07-08
+
+### Fixed
+
+- **cli:** Serialize baton state POSTs so handback never sticks on "Switching…"
+
+## [2.60.3] — 2026-07-08
+
+### Fixed
+
+- **cli:** Clean up terminal + mobile activity on baton Take Control
+
 ## [2.60.2] — 2026-07-08
 
 ### Fixed

package/dist/index.js

@@ -5653,7 +5653,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.4" : "0.0.0-dev",
+    cliVersion: true ? "2.60.6" : "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.4",
+  version: "2.60.6",
   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.4" ? { ideVersion: "2.60.4" } : {}
+      ..."2.60.6" ? { ideVersion: "2.60.6" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -13399,13 +13399,71 @@ var fs23 = __toESM(require("fs"));
 var os21 = __toESM(require("os"));
 var path27 = __toESM(require("path"));
 var HISTORY_ROOT = path27.join(os21.homedir(), ".cursor", "projects");
+function encodeCursorCwd(cwd) {
+  return cwd.replace(/^[/\\]+/, "").replace(/[/\\:]/g, "-");
+}
+function resolveHistoryFile3(cwd, sessionId, root = HISTORY_ROOT) {
+  const rel = path27.join("agent-transcripts", sessionId, `${sessionId}.jsonl`);
+  const primary = path27.join(root, encodeCursorCwd(cwd), rel);
+  if (fs23.existsSync(primary)) return primary;
+  let entries;
+  try {
+    entries = fs23.readdirSync(root, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  for (const e of entries) {
+    if (!e.isDirectory()) continue;
+    const candidate = path27.join(root, e.name, rel);
+    if (fs23.existsSync(candidate)) return candidate;
+  }
+  return null;
+}
 function resolveHistoryDir3(cwd) {
   if (!fs23.existsSync(HISTORY_ROOT)) return null;
-  void cwd;
-  return HISTORY_ROOT;
+  const dir = path27.join(HISTORY_ROOT, encodeCursorCwd(cwd));
+  return fs23.existsSync(dir) ? dir : null;
 }
-function parseHistoryFile3(_filePath) {
-  return [];
+function extractText2(content) {
+  if (!Array.isArray(content)) return "";
+  return content.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
+}
+function unwrapUserQuery(text) {
+  const m = text.match(/<user_query>\s*([\s\S]*?)\s*<\/user_query>/);
+  return (m ? m[1] : text).trim();
+}
+function parseHistoryFile3(filePath) {
+  let raw;
+  try {
+    raw = fs23.readFileSync(filePath, "utf8");
+  } catch {
+    return [];
+  }
+  const out2 = [];
+  let idx = 0;
+  for (const line of raw.split("\n")) {
+    if (!line.trim()) continue;
+    let rec;
+    try {
+      rec = JSON.parse(line);
+    } catch {
+      continue;
+    }
+    if (rec.role !== "user" && rec.role !== "assistant") continue;
+    const blockText = extractText2(rec.message?.content);
+    const text = rec.role === "user" ? unwrapUserQuery(blockText) : blockText.trim();
+    if (!text) continue;
+    out2.push({
+      id: `cursor:${idx}`,
+      role: rec.role === "user" ? "user" : "agent",
+      text,
+      // Cursor records carry no per-message timestamp; order is preserved by
+      // file position, so a stable epoch keeps the shape valid without lying.
+      timestamp: (/* @__PURE__ */ new Date(0)).toISOString()
+    });
+    idx += 1;
+  }
+  return out2;
 }
 function getCurrentUsage3(_historyDir) {
   return null;
@@ -13527,6 +13585,13 @@ var CursorRuntimeStrategy = class {
   resolveHistoryDir(cwd) {
     return resolveHistoryDir3(cwd);
   }
+  /** Session transcript at
+   *  `~/.cursor/projects/<encoded-cwd>/agent-transcripts/<id>/<id>.jsonl`.
+   *  Presence of this method is what lets the baton engage for Cursor
+   *  (`runtimeSupportsBaton`), so the LOCAL_DRIVE mirror can tail it. */
+  resolveHistoryFile(cwd, sessionId) {
+    return resolveHistoryFile3(cwd, sessionId);
+  }
   parseHistoryFile(filePath) {
     return parseHistoryFile3(filePath);
   }
@@ -15921,7 +15986,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.4" : null;
+  const current = true ? "2.60.6" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15938,7 +16003,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.4" : null;
+  const current = true ? "2.60.6" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -15958,7 +16023,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.4" : null;
+  return true ? "2.60.6" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -21728,7 +21793,7 @@ var historyRecordSchema = import_zod2.z.object({
   }).passthrough().optional()
 }).passthrough();
 var API_BASE8 = resolveApiBaseUrl();
-function extractText2(content) {
+function extractText3(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
     return content.filter((b) => b["type"] === "text").map((b) => b["text"]).join("\n");
@@ -21767,10 +21832,10 @@ function parseJsonl(filePath) {
     const uuid = record.uuid ?? `${Date.now()}-${Math.random()}`;
     const msg = record.message;
     if (record.type === "user" && msg) {
-      const text = extractText2(msg.content).trim();
+      const text = extractText3(msg.content).trim();
       if (text) messages.push({ id: uuid, role: "user", text, timestamp });
     } else if (record.type === "assistant" && msg) {
-      const text = extractText2(msg.content).trim();
+      const text = extractText3(msg.content).trim();
       if (text) messages.push({ id: uuid, role: "agent", text, timestamp });
     }
   }
@@ -24815,6 +24880,12 @@ var AcpClient = class {
    *  (the agent is demonstrably working, just blocked on the tool), and
    *  re-arm only once the last one finishes. Reset per prompt. */
   pendingToolCalls = /* @__PURE__ */ new Set();
+  /** Serializes {@link prompt}: each turn waits for the previous to fully
+   *  settle before arming its own watchdog. `promptIdle`/`pendingToolCalls`
+   *  are single-instance fields, so a 2nd concurrent prompt() would overwrite
+   *  them mid-turn and break turn A's idle watchdog (mobile "send-while-active"
+   *  can fire two prompts back-to-back). See {@link prompt}. */
+  promptChain = Promise.resolve();
   /** Last few adapter stderr lines — so a startup failure surfaces the REAL
    *  cause (e.g. gemini's `IneligibleTierError`) instead of a bare timeout. */
   recentStderr = [];
@@ -24969,6 +25040,14 @@ var AcpClient = class {
    * shows a permanent "Thinking…" spinner with no way to recover.
    */
   async prompt(input) {
+    const run = this.promptChain.then(() => this.runPrompt(input));
+    this.promptChain = run.then(
+      () => void 0,
+      () => void 0
+    );
+    return run;
+  }
+  async runPrompt(input) {
     if (!this.connection || !this.sessionId) {
       throw new Error("AcpClient.prompt called before start()");
     }
@@ -25853,12 +25932,12 @@ function mapSessionUpdate(notification) {
   const update = notification.update;
   switch (update.sessionUpdate) {
     case "agent_message_chunk": {
-      const text = extractText3(update.content);
+      const text = extractText4(update.content);
       if (!text) return [];
       return [{ chunkId: messageChunkId(update.messageId), kind: "text", delta: text }];
     }
     case "agent_thought_chunk": {
-      const text = extractText3(update.content);
+      const text = extractText4(update.content);
       if (!text) return [];
       return [
         {
@@ -25923,7 +26002,7 @@ function messageChunkId(messageId) {
   if (typeof messageId === "string" && messageId.length > 0) return messageId;
   return (0, import_node_crypto6.randomUUID)();
 }
-function extractText3(content) {
+function extractText4(content) {
   if (!content || typeof content !== "object") return null;
   if ("type" in content && content.type === "text") {
     const t2 = content.text;
@@ -25953,7 +26032,7 @@ function describeToolCallUpdate(update) {
     for (const item of update.content) {
       if (!item || typeof item !== "object") continue;
       if (item.type === "content" && item.content) {
-        const text = extractText3(item.content);
+        const text = extractText4(item.content);
         if (text) parts.push(text);
       } else if (item.type === "diff") {
         const p2 = item.path;
@@ -29131,6 +29210,9 @@ function fetchQuotaUsage(runtime, historySvc) {
 }
 
 // src/baton/gate.ts
+function runtimeSupportsBaton(runtime) {
+  return typeof runtime.resolveHistoryFile === "function";
+}
 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;
 }
@@ -29911,7 +29993,8 @@ async function start(requestedAgent) {
   }
   if (isLocalSession() && requiresAcp(session.agent)) {
     const adapter = getAcpAdapter(session.agent);
-    if (adapter && session.pluginAuthToken) {
+    const batonCapable = runtimeSupportsBaton(createRuntimeStrategy(session.agent));
+    if (batonCapable && adapter && session.pluginAuthToken) {
       await runBatonSession({
         agent: session.agent,
         sessionId: session.id,
@@ -32672,7 +32755,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.4" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.6" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto9.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -32871,7 +32954,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.4" : "unknown";
+  const v = true ? "2.60.6" : "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.4",
+  "version": "2.60.6",
   "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",