codeam-cli 2.61.17 → 2.61.18

package/CHANGELOG.md

@@ -4,6 +4,14 @@ 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.61.17] — 2026-07-18
+
+### Fixed
+
+- **cli:** Reuse bounded adapter-resolve retry in baton + codespace-gate paths; honest fail-then-succeed retry test
+- **cli:** Make buildNpmInstallInvocation platform-injectable → deterministic cross-OS tests (fixes red Windows CI)
+- **cli:** Never wipe a streamed transcript on a turn error (false 'couldn't finish')
+
 ## [2.61.16] — 2026-07-17
 
 ### Fixed

package/dist/index.js

@@ -6024,7 +6024,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.61.17" : "0.0.0-dev",
+    cliVersion: true ? "2.61.18" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -6205,7 +6205,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.61.17",
+  version: "2.61.18",
   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",
@@ -7348,7 +7348,7 @@ var CommandRelayService = class _CommandRelayService {
       // 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.61.17" ? { ideVersion: "2.61.17" } : {}
+      ..."2.61.18" ? { ideVersion: "2.61.18" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -17949,7 +17949,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.61.17" : null;
+  const current = true ? "2.61.18" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17966,7 +17966,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.61.17" : null;
+  const current = true ? "2.61.18" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17986,7 +17986,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.61.17" : null;
+  return true ? "2.61.18" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve8) => {
@@ -29192,6 +29192,34 @@ var AcpClient = class {
   connection = null;
   stopping = false;
   sessionId = null;
+  /** The id of the NATIVE ACP `category:'model'` `SessionConfigSelect` option
+   *  captured from `newSession`/`loadSession` `configOptions`. It's the SINGLE
+   *  source of truth for model listing/switching: `session/set_config_option`
+   *  targets this id, and `undefined` here means the agent exposes no native
+   *  model selector → {@link getAvailableModels} is empty and {@link setModel}
+   *  throws (mobile then hides the picker). */
+  modelConfigId = void 0;
+  /** The models the native model config option advertises — mapped from its
+   *  `options` (id = option `value`, label = option `name`). Empty when the
+   *  agent has no model config option. NO hardcoded fallback. */
+  availableModels = [];
+  /** The native model select's current value — seeded from the config option's
+   *  `currentValue` and updated on a successful {@link setModel}. Exposed via
+   *  {@link getCurrentModelId} so `list_models` can report the in-use model to
+   *  mobile (the model line under the composer). `undefined` when no model
+   *  config option is advertised. */
+  currentModelId = void 0;
+  /** The operating/permission MODES the native ACP `SessionModeState` advertises
+   *  (a DIFFERENT axis than models) — mapped from `newSession`/`loadSession`
+   *  `modes.availableModes` (id = mode id, label = mode name, description passthrough).
+   *  Empty when the agent advertises no modes → {@link getAvailableModes} is empty
+   *  and {@link setMode} throws (mobile then hides the mode picker). */
+  availableModes = [];
+  /** The native `SessionModeState.currentModeId` — seeded from `modes.currentModeId`
+   *  and updated on a successful {@link setMode}. Exposed via {@link getCurrentModeId}
+   *  so `list_modes` can report the in-use mode to mobile. `undefined` when the agent
+   *  advertises no modes. */
+  currentModeId = void 0;
   /** Whether the agent advertised `loadSession` on `initialize`. Drives the
    *  post-turn session-closed recovery: an agent that supports resume (kimi,
    *  claude, codex, gemini) is re-established with `session/load` — preserving
@@ -29412,16 +29440,18 @@ var AcpClient = class {
       }
       this.startAbortReject = null;
       this.sessionId = newSession.sessionId;
-      const newSessionMeta = newSession;
+      this.captureModelConfig(newSession.configOptions ?? []);
+      this.captureModes(newSession.modes ?? null);
+      const tier = newSession.currentServiceTier;
       log.info(
         "acpClient",
-        `newSession \u2190 ok sessionId=${newSession.sessionId.slice(0, 8)} model=${newSessionMeta.currentModelId ?? "?"} tier=${newSessionMeta.currentServiceTier ?? "?"}`
+        `newSession \u2190 ok sessionId=${newSession.sessionId.slice(0, 8)} model=${this.currentModelId ?? "?"} models=${this.availableModels.length} tier=${tier ?? "?"}`
       );
       return {
         sessionId: newSession.sessionId,
         initialize,
-        model: newSessionMeta.currentModelId,
-        tier: newSessionMeta.currentServiceTier
+        model: this.currentModelId,
+        tier
       };
     } catch (err) {
       this.cleanupAfterFailedStart(child);
@@ -29628,8 +29658,9 @@ var AcpClient = class {
     }
     log.info("acpClient", `loadSession \u2192 sessionId=${sessionId.slice(0, 8)}`);
     this.opts.beginLoadReplay?.();
+    let loaded;
     try {
-      await this.connection.loadSession({
+      loaded = await this.connection.loadSession({
         sessionId,
         cwd: this.opts.cwd,
         mcpServers: this.opts.mcpServers ?? []
@@ -29638,6 +29669,8 @@ var AcpClient = class {
       this.opts.endLoadReplay?.();
     }
     this.sessionId = sessionId;
+    if (loaded?.configOptions) this.captureModelConfig(loaded.configOptions);
+    if (loaded?.modes !== void 0) this.captureModes(loaded.modes ?? null);
     log.info("acpClient", `loadSession \u2190 ok sessionId=${sessionId.slice(0, 8)}`);
   }
   /**
@@ -29666,24 +29699,132 @@ var AcpClient = class {
     }
   }
   /**
-   * Switch the active session's model via the non-standard
-   * `session/set_model` RPC. The standard ACP SDK doesn't expose
-   * this — claude-agent-acp and codex-acp implement it as an
-   * extension. Adapters without it reject and `change_model`
-   * surfaces a clean "not supported" affordance on mobile.
+   * Switch the active session's model via the NATIVE ACP
+   * `session/set_config_option` RPC, targeting the `category:'model'`
+   * `SessionConfigSelect` option captured on newSession/loadSession. This is
+   * the single source of truth — there is no PTY `/model` fallback and no
+   * non-standard `session/set_model` extension.
+   *
+   * Throws a clear error when the agent exposes no model config option, so
+   * `change_model` acks `failed` and mobile surfaces "model picker not
+   * supported on this agent".
    */
   async setModel(modelId) {
     if (!this.connection || !this.sessionId) {
       throw new Error("AcpClient.setModel called before start()");
     }
-    log.info("acpClient", `setModel \u2192 ${modelId}`);
-    const rawConn = this.connection;
-    await rawConn.connection.sendRequest("session/set_model", {
+    if (!this.modelConfigId) {
+      throw new Error(
+        "model selection not available: this agent exposes no ACP model config option"
+      );
+    }
+    log.info("acpClient", `setModel \u2192 ${modelId} (configId=${this.modelConfigId})`);
+    await this.connection.setSessionConfigOption({
       sessionId: this.sessionId,
-      modelId
+      configId: this.modelConfigId,
+      value: modelId
     });
+    this.currentModelId = modelId;
     log.info("acpClient", `setModel \u2190 ok modelId=${modelId}`);
   }
+  /**
+   * The models the agent natively advertises via its `category:'model'` config
+   * option (mapped: id = option value, label = option name, contextWindow
+   * derived from the id). Empty array when the agent has no model config option
+   * — mobile then hides the model selector. NO hardcoded fallback.
+   */
+  getAvailableModels() {
+    return this.availableModels;
+  }
+  /** The native model select's current value (or undefined if none advertised). */
+  getCurrentModelId() {
+    return this.currentModelId;
+  }
+  /**
+   * Parse the native model config option out of a `newSession`/`loadSession`
+   * `configOptions` array and populate {@link modelConfigId},
+   * {@link availableModels}, and {@link currentModelId}. The list itself is
+   * native (the option's `options`); `contextWindow` is a display attribute
+   * derived per-id via {@link getContextWindow}. When no `category:'model'`
+   * select option is present, everything resets to empty/undefined — no
+   * hardcoded list, no guessed model.
+   */
+  captureModelConfig(configOptions) {
+    const modelOption = configOptions.find(
+      (o) => o.category === "model" && o.type === "select"
+    );
+    if (!modelOption || modelOption.type !== "select") {
+      this.modelConfigId = void 0;
+      this.availableModels = [];
+      this.currentModelId = void 0;
+      return;
+    }
+    this.modelConfigId = modelOption.id;
+    this.currentModelId = modelOption.currentValue;
+    this.availableModels = flattenSelectOptions(modelOption.options).map((opt) => ({
+      id: opt.value,
+      label: opt.name,
+      contextWindow: getContextWindow(opt.value)
+    }));
+  }
+  /**
+   * Switch the active session's operating/permission MODE via the NATIVE ACP
+   * `session/set_mode` RPC (the standard {@link SessionModeState} axis — DISTINCT
+   * from the model config option). This is the single source of truth — there is
+   * no PTY fallback.
+   *
+   * Throws a clear error when the agent advertises no modes, so `set_mode` acks
+   * `failed` and mobile surfaces "mode switching not supported on this agent".
+   */
+  async setMode(modeId) {
+    if (!this.connection || !this.sessionId) {
+      throw new Error("AcpClient.setMode called before start()");
+    }
+    if (this.availableModes.length === 0) {
+      throw new Error(
+        "mode selection not available: this agent advertises no ACP session modes"
+      );
+    }
+    log.info("acpClient", `setMode \u2192 ${modeId}`);
+    await this.connection.setSessionMode({
+      sessionId: this.sessionId,
+      modeId
+    });
+    this.currentModeId = modeId;
+    log.info("acpClient", `setMode \u2190 ok modeId=${modeId}`);
+  }
+  /**
+   * The operating/permission modes the agent natively advertises via its ACP
+   * `SessionModeState` (mapped: id = mode id, label = mode name, description
+   * passthrough). Empty array when the agent advertises no modes — mobile then
+   * hides the mode selector. NO hardcoded fallback.
+   */
+  getAvailableModes() {
+    return this.availableModes;
+  }
+  /** The native current mode id (or undefined if the agent advertises no modes). */
+  getCurrentModeId() {
+    return this.currentModeId;
+  }
+  /**
+   * Parse the native ACP {@link SessionModeState} out of a `newSession`/`loadSession`
+   * response `modes` field and populate {@link availableModes} + {@link currentModeId}.
+   * When absent (`null`/undefined — the agent advertises no modes) everything resets
+   * to empty/undefined — no hardcoded list, no guessed mode.
+   */
+  captureModes(modes) {
+    if (!modes) {
+      this.availableModes = [];
+      this.currentModeId = void 0;
+      return;
+    }
+    this.currentModeId = modes.currentModeId;
+    this.availableModes = (modes.availableModes ?? []).map((mode) => ({
+      id: mode.id,
+      label: mode.name,
+      description: mode.description ?? void 0
+    }));
+  }
   /**
    * Cancel the in-flight prompt turn. Notification — no response.
    * Safe to call when nothing is in flight (the adapter no-ops).
@@ -29836,6 +29977,17 @@ var AcpClient = class {
     };
   }
 };
+function flattenSelectOptions(options) {
+  const out2 = [];
+  for (const entry of options) {
+    if ("group" in entry) {
+      out2.push(...entry.options);
+    } else {
+      out2.push(entry);
+    }
+  }
+  return out2;
+}
 function applyLineRange(content, line, limit) {
   if (line === null && limit === null) return { content };
   const lines = content.split("\n");
@@ -31792,8 +31944,38 @@ async function getConversationH(ctx) {
   return;
 }
 async function listModelsH(ctx) {
-  const { cmd, relay, models } = ctx;
-  await relay.sendResult(cmd.id, "completed", { models });
+  const { cmd, relay, client: client3 } = ctx;
+  await relay.sendResult(cmd.id, "completed", {
+    models: client3.getAvailableModels(),
+    currentModelId: client3.getCurrentModelId()
+  });
+  return;
+}
+async function listModesH(ctx) {
+  const { cmd, relay, client: client3 } = ctx;
+  await relay.sendResult(cmd.id, "completed", {
+    modes: client3.getAvailableModes(),
+    currentModeId: client3.getCurrentModeId()
+  });
+  return;
+}
+async function setModeH(ctx) {
+  const { cmd, client: client3, relay, opts } = ctx;
+  const payload = cmd.payload;
+  const modeId = payload?.modeId?.trim();
+  if (!modeId) {
+    await relay.sendResult(cmd.id, "failed", { error: "modeId required" });
+    return;
+  }
+  try {
+    await client3.setMode(modeId);
+    await relay.sendResult(cmd.id, "completed", { modeId });
+  } catch (err) {
+    log.warn("acpRunner", `set_mode failed: ${describeError(err)}`);
+    await relay.sendResult(cmd.id, "failed", {
+      error: `Mode switching not supported on ${opts.agent} via ACP: ${describeError(err)}`
+    });
+  }
   return;
 }
 async function ackEmptyH(ctx) {
@@ -32049,6 +32231,8 @@ var ACP_COMMAND_HANDLERS = {
   escape_key: stopTaskH,
   get_conversation: getConversationH,
   list_models: listModelsH,
+  list_modes: listModesH,
+  set_mode: setModeH,
   set_keep_alive: ackEmptyH,
   get_context: ackEmptyH,
   select_option: selectOptionH,
@@ -32795,7 +32979,6 @@ async function runAcpSession(opts) {
     done: true
   });
   const runtime = createInteractiveAgentStrategy(opts.agent, createOsStrategy());
-  const models = await runtime.listModels();
   const history = new AcpHistory(publisher, {
     agent: opts.agent,
     acpSessionId,
@@ -32871,7 +33054,6 @@ async function runAcpSession(opts) {
         client3,
         relay,
         acpSessionId,
-        models,
         streaming,
         opts,
         history,
@@ -32927,12 +33109,11 @@ async function runAcpSession(opts) {
   await new Promise(() => {
   });
 }
-async function handleCommand(cmd, client3, relay, acpSessionId, models, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, budgetRecovery, budgetReachedFlag, onActiveSessionChanged) {
+async function handleCommand(cmd, client3, relay, acpSessionId, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, budgetRecovery, budgetReachedFlag, onActiveSessionChanged) {
   const session = {
     client: client3,
     relay,
     acpSessionId,
-    models,
     streaming,
     opts,
     history,
@@ -34268,7 +34449,6 @@ var AcpDriver = class {
   async ensureSession(relay, acpSessionId, agentCaps) {
     if (this.session) return this.session;
     const { opts, publisher, streaming, runtime, recentStderr } = this.deps;
-    const models = await runtime.listModels();
     const jsonlHistory = new HistoryService(runtime, opts.pluginId, opts.cwd, {
       pluginAuthToken: opts.pluginAuthToken
     });
@@ -34308,7 +34488,6 @@ var AcpDriver = class {
       client: this.deps.client,
       relay,
       acpSessionId,
-      models,
       streaming,
       opts,
       history,
@@ -37633,7 +37812,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.61.17" : "0.0.0-dev";
+  const cliVersion = true ? "2.61.18" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -38144,7 +38323,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.61.17" : "unknown";
+  const v = true ? "2.61.18" : "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.61.17",
+  "version": "2.61.18",
   "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",