codeam-cli 2.74.13 → 2.75.0

package/CHANGELOG.md

@@ -4,6 +4,43 @@ 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.74.14] — 2026-09-11
+
+### Fixed
+
+- **cli:** Stop dropping short ACP text deltas that are a prefix of the reply (#748)
+- **cli:** Resolve select_option by optionId, stop adding `from` as an index offset (#749)
+
+## [2.74.13] — 2026-09-10
+
+### Added
+
+- **cli:** Open the command stream on the stream host with a one-time api-host fallback (#745)
+
+### Build
+
+- **deps:** Bump gradle-wrapper in /apps/jetbrains-plugin (#661)
+- **deps:** Bump com.squareup.okhttp3:okhttp in /apps/jetbrains-plugin (#641)
+- **deps:** Bump actions/setup-java from 5 to 6 (#662)
+
+### CI
+
+- **workflow:** Root the npm Dependabot config at the workspace, so its PRs can actually install (#737)
+
+### Chore
+
+- **deps:** Bump org.jetbrains.kotlin.jvm in /apps/jetbrains-plugin (#743)
+- **deps:** Bump docker/setup-buildx-action from 3 to 4 (#414)
+- **deps:** Bump actions/checkout from 4 to 7 (#366)
+- **deps:** Bump ws from 8.21.0 to 8.21.3 (#740)
+- **deps:** Bump posthog-node from 5.35.1 to 5.51.6 (#741)
+- **deps-dev:** Bump knip from 6.25.0 to 6.34.0 (#742)
+
+### Fixed
+
+- **cli:** Local baton sessions go silent on mobile after the mirror's 10-min startup wait (#744)
+- **vsc-plugin:** Stop advertising a Copilot agent the plugin cannot dispatch to (#746)
+
 ## [2.74.12] — 2026-09-09
 
 ### Fixed

package/dist/index.js

@@ -950,6 +950,38 @@ function isKnownAgentId(id) {
 var HOUSE_AGENT_ID = "house-codeagent-cloud";
 var HOUSE_AGENT_NAME = "CodeAgent Cloud";
 var HOUSE_AGENT_SUBTITLE = "Included \u2014 no setup";
+var MANAGED_PROVIDER_IDS = [
+  "managed-deepseek",
+  "managed-deepseek-flash",
+  "managed-qwen-coder",
+  "managed-codex",
+  "managed-claude"
+];
+function isManagedProviderId(value) {
+  return typeof value === "string" && MANAGED_PROVIDER_IDS.includes(value);
+}
+var MANAGED_PROVIDER_DISPLAY_NAMES = {
+  "managed-deepseek": "DeepSeek V4",
+  "managed-deepseek-flash": "DeepSeek V4 Flash",
+  "managed-qwen-coder": "Qwen3 Coder",
+  "managed-codex": "Codex",
+  "managed-claude": "Claude"
+};
+var MANAGED_AGENT_SUBTITLE = "Prepaid usage credits";
+var MANAGED_AGENT_ENV = "CODEAM_MANAGED_AGENT_ID";
+var LINKED_AGENT_IDS = [
+  "claude_code",
+  "codex",
+  "cursor",
+  "aider",
+  "coderabbit",
+  "gemini",
+  "kimi",
+  "openrouter",
+  "opencode",
+  HOUSE_AGENT_ID,
+  ...MANAGED_PROVIDER_IDS
+];
 var PUBLIC_TO_INTERNAL = {
   claude_code: "claude",
   // CLI-side extra: self-hosted deploy payloads may carry the internal id.
@@ -976,7 +1008,13 @@ var PUBLIC_TO_INTERNAL = {
   openrouter: "claude",
   // The house agent runs Claude Code under the hood (pointed at the
   // MiniMax proxy). Its internal runtime is therefore `claude`.
-  [HOUSE_AGENT_ID]: "claude"
+  [HOUSE_AGENT_ID]: "claude",
+  // Every managed provider runs Claude Code against our proxy too.
+  "managed-deepseek": "claude",
+  "managed-deepseek-flash": "claude",
+  "managed-qwen-coder": "claude",
+  "managed-codex": "claude",
+  "managed-claude": "claude"
 };
 function isPublicToInternalKey(v) {
   return Object.prototype.hasOwnProperty.call(PUBLIC_TO_INTERNAL, v);
@@ -10199,7 +10237,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.74.13" : "0.0.0-dev",
+    cliVersion: true ? "2.75.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -10441,7 +10479,7 @@ var http = __toESM(require("http"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.74.13",
+  version: "2.75.0",
   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",
@@ -10875,6 +10913,7 @@ async function fetchProvisionCredentialDetailed(input) {
         method: data.method,
         credential: data.credential,
         ...typeof data.baseUrl === "string" && data.baseUrl.length > 0 ? { baseUrl: data.baseUrl } : {},
+        ...typeof data.model === "string" && data.model.length > 0 ? { model: data.model } : {},
         ...typeof data.installScript === "string" && data.installScript.length > 0 ? { installScript: data.installScript } : {}
       };
     }
@@ -12131,7 +12170,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.74.13" ? { ideVersion: "2.74.13" } : {}
+      ..."2.75.0" ? { ideVersion: "2.75.0" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -24210,7 +24249,9 @@ function readHouseProxyChildEnv() {
       baseUrl: o.baseUrl,
       token: o.token,
       openRouter: o.openRouter === true,
-      ...typeof o.claudeConfigDir === "string" && o.claudeConfigDir ? { claudeConfigDir: o.claudeConfigDir } : {}
+      ...typeof o.claudeConfigDir === "string" && o.claudeConfigDir ? { claudeConfigDir: o.claudeConfigDir } : {},
+      ...typeof o.model === "string" && o.model ? { model: o.model } : {},
+      ...typeof o.managedAgentId === "string" && o.managedAgentId ? { managedAgentId: o.managedAgentId } : {}
     });
   } catch {
     return {};
@@ -24250,16 +24291,24 @@ function buildHouseProxyChildEnv(cfg) {
   if (cfg.openRouter === true) {
     env.ANTHROPIC_API_KEY = "";
   } else {
-    env.ANTHROPIC_MODEL = "MiniMax-M3";
-    env.ANTHROPIC_DEFAULT_SONNET_MODEL = "MiniMax-M3";
-    env.ANTHROPIC_DEFAULT_OPUS_MODEL = "MiniMax-M3";
-    env.ANTHROPIC_DEFAULT_HAIKU_MODEL = "MiniMax-M3";
+    const model = typeof cfg.model === "string" && cfg.model ? cfg.model : "MiniMax-M3";
+    env.ANTHROPIC_MODEL = model;
+    env.ANTHROPIC_DEFAULT_SONNET_MODEL = model;
+    env.ANTHROPIC_DEFAULT_OPUS_MODEL = model;
+    env.ANTHROPIC_DEFAULT_HAIKU_MODEL = model;
   }
   if (typeof cfg.claudeConfigDir === "string" && cfg.claudeConfigDir) {
     env.CLAUDE_CONFIG_DIR = cfg.claudeConfigDir;
   }
+  if (isManagedProviderId(cfg.managedAgentId)) {
+    env[MANAGED_AGENT_ENV] = cfg.managedAgentId;
+  }
   return env;
 }
+function houseRailWireId(env) {
+  const managed = env[MANAGED_AGENT_ENV];
+  return isManagedProviderId(managed) ? managed : HOUSE_AGENT_ID;
+}
 var HOUSE_PROXY_ENV_KEYS = [
   "ANTHROPIC_BASE_URL",
   "ANTHROPIC_AUTH_TOKEN",
@@ -24271,7 +24320,8 @@ var HOUSE_PROXY_ENV_KEYS = [
   "CLAUDE_CODE_AUTO_COMPACT_WINDOW",
   "CLAUDE_CODE_MAX_CONTEXT_TOKENS",
   "API_TIMEOUT_MS",
-  "CLAUDE_CONFIG_DIR"
+  "CLAUDE_CONFIG_DIR",
+  MANAGED_AGENT_ENV
 ];
 function clearHouseProxyEnvOverrides() {
   const out2 = {};
@@ -24451,7 +24501,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 current2 = true ? "2.74.13" : null;
+  const current2 = true ? "2.75.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -24468,7 +24518,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current2 = true ? "2.74.13" : null;
+  const current2 = true ? "2.75.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -24491,7 +24541,7 @@ var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 var SELF_UPDATE_LS_TIMEOUT_MS = 15e3;
 var SUDO_PREFLIGHT_TIMEOUT_MS = 5e3;
 function currentCliVersion() {
-  return true ? "2.74.13" : null;
+  return true ? "2.75.0" : null;
 }
 async function installedVersion(deps) {
   const ls = await deps.run(
@@ -39210,18 +39260,25 @@ var NON_SWITCHABLE = /* @__PURE__ */ new Set([
 ]);
 function displayName(id) {
   if (id === HOUSE_AGENT_ID) return HOUSE_AGENT_NAME;
+  if (isManagedProviderId(id)) return MANAGED_PROVIDER_DISPLAY_NAMES[id];
   return isKnownAgentId(id) ? AGENT_REGISTRY[id]?.displayName ?? id : id;
 }
 function credentialFailureMessage(agentId, failure) {
   if (failure.message) return failure.message;
   return `No linked credential for ${displayName(agentId)}. Link it in Profile \u203A Agents first.`;
 }
-function resolveSwitchTarget(raw, currentAgent, currentIsHouse = false) {
+function resolveSwitchTarget(raw, currentAgent, currentIsHouse = false, currentHouseWireId = HOUSE_AGENT_ID) {
   if (typeof raw !== "string" || raw.length === 0) {
     return { ok: false, error: "switch_agent: missing agentId" };
   }
+  if (isManagedProviderId(raw)) {
+    if (currentIsHouse && currentHouseWireId === raw) {
+      return { ok: false, error: `${displayName(raw)} is already this session's agent.` };
+    }
+    return { ok: true, agentId: "claude", wireId: raw, house: true };
+  }
   if (raw === HOUSE_AGENT_ID) {
-    if (currentIsHouse) {
+    if (currentIsHouse && currentHouseWireId === HOUSE_AGENT_ID) {
       return { ok: false, error: `${HOUSE_AGENT_NAME} is already this session's agent.` };
     }
     return { ok: true, agentId: "claude", wireId: HOUSE_AGENT_ID, house: true };
@@ -39317,7 +39374,8 @@ function makeSerializedSwitchEmitter(post2) {
 async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   const from = deps.currentAgent();
   const fromIsHouse = deps.currentIsHouse();
-  const target = resolveSwitchTarget(rawAgentId, from, fromIsHouse);
+  const fromHouseWireId = deps.currentHouseWireId?.() ?? HOUSE_AGENT_ID;
+  const target = resolveSwitchTarget(rawAgentId, from, fromIsHouse, fromHouseWireId);
   if (!target.ok) {
     return {
       ok: false,
@@ -39327,7 +39385,7 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   }
   const agentId = target.agentId;
   const wireId = target.wireId;
-  const fromWireId = fromIsHouse ? HOUSE_AGENT_ID : from;
+  const fromWireId = fromIsHouse ? fromHouseWireId : from;
   const targetName = displayName(wireId);
   const emitStatus = (status2) => deps.postEvent("switch_agent_status", { ...status2 });
   const emitStep = (step) => deps.postEvent("switch_agent_progress", { step, agentId: wireId });
@@ -39350,7 +39408,12 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
         return fail2(`${targetName} isn't available on this backend yet.`);
       }
       try {
-        deps.provisionHouseProxy({ baseUrl: cred.baseUrl, token: cred.credential });
+        deps.provisionHouseProxy({
+          baseUrl: cred.baseUrl,
+          token: cred.credential,
+          ...cred.model ? { model: cred.model } : {},
+          ...isManagedProviderId(wireId) ? { managedAgentId: wireId } : {}
+        });
       } catch (err) {
         log.warn("switchAgent", `house proxy provisioning failed: ${err.message}`);
         return fail2(`Couldn't configure ${targetName} on this machine.`);
@@ -39377,11 +39440,17 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   }
   void emitStep("restart");
   try {
-    await deps.swapRuntime(agentId, { house: target.house });
+    await deps.swapRuntime(agentId, {
+      house: target.house,
+      ...isManagedProviderId(wireId) ? { wireId } : {}
+    });
   } catch (err) {
     log.warn("switchAgent", `swap failed, reverting to ${fromWireId}: ${err.message}`);
     try {
-      await deps.revertRuntime(from, { house: fromIsHouse });
+      await deps.revertRuntime(from, {
+        house: fromIsHouse,
+        ...fromIsHouse && isManagedProviderId(fromHouseWireId) ? { wireId: fromHouseWireId } : {}
+      });
     } catch (revertErr) {
       log.warn("switchAgent", `revert failed: ${revertErr.message}`);
       return fail2(
@@ -39845,13 +39914,17 @@ function createWakeCredentialProbe(deps) {
 function reconcileCumulative(existing, incoming) {
   if (incoming.length === 0) return existing;
   if (incoming.startsWith(existing)) return incoming;
-  if (existing.startsWith(incoming)) return existing;
   const shared = commonPrefixLength(existing, incoming);
-  if (shared > 0 && shared >= existing.length / 2) {
+  if (looksLikeSnapshot(existing, incoming, shared)) {
+    if (shared === incoming.length) return existing;
     return existing.slice(0, shared) + incoming.slice(shared);
   }
   return existing + incoming;
 }
+var MIN_SNAPSHOT_PREFIX = 8;
+function looksLikeSnapshot(existing, incoming, shared) {
+  return shared >= MIN_SNAPSHOT_PREFIX && shared * 2 >= existing.length && incoming.length * 2 >= existing.length;
+}
 function commonPrefixLength(a, b) {
   const max = Math.min(a.length, b.length);
   let i = 0;
@@ -40262,25 +40335,19 @@ function mapSessionUpdate(notification) {
   }
 }
 function mapPermissionRequest(request2) {
-  const prompt = describeToolCall(request2.toolCall) ?? "The agent requested permission to continue.";
-  const optionIdByLabel = {};
-  const kindByLabel = {};
-  const labels = [];
-  for (const opt of request2.options) {
-    const label = opt.name?.trim() || humanizeKind(opt.kind);
-    if (label in optionIdByLabel) continue;
-    optionIdByLabel[label] = opt.optionId;
-    kindByLabel[label] = opt.kind;
-    labels.push(label);
-  }
+  const prompt = describePermissionToolCall(request2.toolCall) ?? "The agent requested permission to continue.";
+  const options = request2.options.map((opt) => ({
+    label: opt.name?.trim() || humanizeKind(opt.kind),
+    optionId: opt.optionId,
+    kind: opt.kind
+  }));
   return {
     event: {
       questionId: (0, import_node_crypto10.randomUUID)(),
       prompt,
-      options: labels.length > 0 ? labels : void 0
+      options: options.length > 0 ? options.map((o) => ({ label: o.label, value: o.optionId })) : void 0
     },
-    optionIdByLabel,
-    kindByLabel
+    options
   };
 }
 function messageChunkId(messageId) {
@@ -40311,6 +40378,28 @@ function describeToolCall(call) {
   }
   return null;
 }
+var PERMISSION_DETAIL_MAX = 400;
+function permissionInputDetail(rawInput) {
+  if (!rawInput || typeof rawInput !== "object") return null;
+  const input = rawInput;
+  for (const key of ["command", "file_path", "path"]) {
+    const v = input[key];
+    if (typeof v === "string" && v.trim().length > 0) {
+      const detail = v.trim();
+      return detail.length > PERMISSION_DETAIL_MAX ? `${detail.slice(0, PERMISSION_DETAIL_MAX)}\u2026` : detail;
+    }
+  }
+  return null;
+}
+function describePermissionToolCall(call) {
+  const title = describeToolCall(call);
+  const detail = permissionInputDetail(call.rawInput);
+  if (!detail) return title;
+  if (!title) return detail;
+  if (title.includes(detail)) return title;
+  return `${title}
+${detail}`;
+}
 function describeToolCallUpdate(update) {
   const parts = [];
   if (Array.isArray(update.content)) {
@@ -40404,13 +40493,9 @@ function createOnRequestPermission(deps) {
       }
       log.warn("acpRunner", "AUTO mode \u2014 no allow option offered; falling back to interactive");
     }
-    const { event, optionIdByLabel } = mapPermissionRequest(request2);
+    const { event, options } = mapPermissionRequest(request2);
     await deps.publisher.publishAwaitingAnswer(event);
-    return deps.registerPermission({
-      questionId: event.questionId,
-      labels: event.options ?? [],
-      optionIdByLabel
-    });
+    return deps.registerPermission({ questionId: event.questionId, options });
   };
 }
 
@@ -42590,9 +42675,9 @@ function rebindSessionHandles(ctx, outcome) {
   Object.assign(ctx, outcome.handles);
   return outcome;
 }
-function namesCurrentAgent(requested, currentAgent, currentIsHouse) {
+function namesCurrentAgent(requested, currentAgent, currentIsHouse, currentHouseWireId = HOUSE_AGENT_ID) {
   if (requested === currentAgent) return true;
-  if (currentIsHouse) return requested === HOUSE_AGENT_ID;
+  if (currentIsHouse) return requested === currentHouseWireId;
   return publicToInternal(requested) === currentAgent;
 }
 async function routeSquadTask(ctx, target) {
@@ -42805,7 +42890,12 @@ async function startTaskH(ctx) {
     await relay.sendResult(cmd.id, "failed", { error: "empty prompt" });
     return;
   }
-  if (requestedAgentId.length > 0 && !namesCurrentAgent(requestedAgentId, opts.agent, ctx.currentIsHouse?.() ?? false)) {
+  if (requestedAgentId.length > 0 && !namesCurrentAgent(
+    requestedAgentId,
+    opts.agent,
+    ctx.currentIsHouse?.() ?? false,
+    ctx.currentHouseWireId?.() ?? HOUSE_AGENT_ID
+  )) {
     const routed = await routeSquadTask(ctx, requestedAgentId);
     if (!routed.ok) {
       log.warn("acpRunner", `start_task routing to ${requestedAgentId} failed: ${routed.error}`);
@@ -43172,20 +43262,19 @@ async function selectOptionH(ctx) {
   const { cmd, client: client3, relay, streaming, history, budgetRecovery } = ctx;
   const payload = cmd.payload;
   const index = typeof payload?.index === "number" ? payload.index : 0;
-  const offset = typeof payload?.from === "number" ? payload.from : 0;
-  const absoluteIndex = index + offset;
-  if (await budgetRecovery.tryRecover(cmd.id, absoluteIndex)) return;
-  const result = streaming.resolveSelection(absoluteIndex);
+  const optionId = typeof payload?.optionId === "string" && payload.optionId.length > 0 ? payload.optionId : typeof payload?.answer === "string" && payload.answer.length > 0 ? payload.answer : void 0;
+  if (await budgetRecovery.tryRecover(cmd.id, index)) return;
+  const result = streaming.resolveSelection(index, optionId);
   switch (result.kind) {
     case "resolved":
-      log.info("acpRunner", `select_option index=${absoluteIndex} \u2192 permission resolved`);
-      await relay.sendResult(cmd.id, "completed", {});
-      return;
-    case "reprompt": {
       log.info(
         "acpRunner",
-        `select_option index=${absoluteIndex} \u2192 reprompt chars=${result.text.length}`
+        `select_option index=${index} \u2192 permission resolved optionId=${result.optionId ?? "cancelled"}`
       );
+      await relay.sendResult(cmd.id, "completed", {});
+      return;
+    case "reprompt": {
+      log.info("acpRunner", `select_option index=${index} \u2192 reprompt chars=${result.text.length}`);
       await streaming.beginTurn();
       history.appendUserPrompt(result.text);
       try {
@@ -43205,7 +43294,7 @@ async function selectOptionH(ctx) {
     case "none":
       log.warn(
         "acpRunner",
-        `select_option index=${absoluteIndex} arrived with no pending question \u2014 likely stale`
+        `select_option index=${index} arrived with no pending question \u2014 likely stale`
       );
       await relay.sendResult(cmd.id, "failed", {
         error: "No pending interactive question \u2014 the prompt may have expired."
@@ -43643,9 +43732,17 @@ var StreamingState = class {
   turnSeq = 0;
   /**
    * Register a permission Promise. The Promise stays pending until
-   * `resolveSelection(index)` is called from the relay handler, OR
-   * the safety timer fires after PERMISSION_TIMEOUT_MS and we
-   * default-reject. Caller is the SDK's `onRequestPermission`.
+   * `resolveSelection()` is called from the relay handler, OR the
+   * safety timer fires after PERMISSION_TIMEOUT_MS and we auto-cancel.
+   * Caller is the SDK's `onRequestPermission`.
+   *
+   * The auto-cancel is NEVER silent (same HARD RULE as the auto-denies
+   * in ./permission-gate.ts): a visible chat line says the request
+   * expired. The adapter reports a cancel to the model as a failed tool
+   * ("Tool use aborted"), which the model then narrates as a refusal —
+   * replay 01a08b05 (2026-09-10): two prompts expired while the user was
+   * in the preview, Claude told him HE had refused them twice, and he
+   * protested "J'ai rien refusé". The line is the user's evidence.
    */
   registerPermission(args2) {
     return new Promise((resolve11) => {
@@ -43656,14 +43753,18 @@ var StreamingState = class {
             `permission ${args2.questionId.slice(0, 8)} TTL expired \u2014 auto-cancel`
           );
           this.pending = null;
+          void this.publisher.publishOutput({
+            type: "text",
+            content: permissionExpiredNotice(),
+            done: true
+          });
           resolve11({ outcome: { outcome: "cancelled" } });
         }
       }, PERMISSION_TIMEOUT_MS);
       this.pending = {
         kind: "permission",
         questionId: args2.questionId,
-        labels: args2.labels,
-        optionIdByLabel: args2.optionIdByLabel,
+        options: args2.options,
         resolve: resolve11,
         timeoutTimer
       };
@@ -43683,28 +43784,33 @@ var StreamingState = class {
    * routing instruction the runner uses to drive the next ACP RPC:
    *
    *   - 'resolved' — permission Promise resolved; SDK is unblocked
-   *     and the runner just acks the relay command.
+   *     and the runner just acks the relay command. `optionId` is
+   *     what was answered (null = cancelled).
    *   - 'reprompt' — free-form selection; the runner must call
    *     `client.prompt(text)` with the returned text to send the
    *     user's pick to the adapter as a new turn.
    *   - 'none' — nothing pending; the runner acks the command as
    *     failed so mobile shows a stale-question affordance.
+   *
+   * For a permission, `optionId` (the wire `value` the client echoes
+   * back) wins when it names one of the registered options; otherwise
+   * `index` is the position in the options we put on the wire.
    */
-  resolveSelection(index) {
+  resolveSelection(index, optionId) {
     if (!this.pending) return { kind: "none" };
     if (this.pending.kind === "permission") {
-      const label = this.pending.labels[index];
-      const optionId = label ? this.pending.optionIdByLabel[label] : void 0;
+      const byId = optionId ? this.pending.options.find((o) => o.optionId === optionId) : void 0;
+      const picked = byId ?? this.pending.options[index];
       clearTimeout(this.pending.timeoutTimer);
       const resolve11 = this.pending.resolve;
       this.pending = null;
-      if (!optionId) {
+      if (!picked) {
         log.warn("acpRunner", `select_option index=${index} out of bounds \u2014 cancel`);
         resolve11({ outcome: { outcome: "cancelled" } });
-        return { kind: "resolved" };
+        return { kind: "resolved", optionId: null };
       }
-      resolve11({ outcome: { outcome: "selected", optionId } });
-      return { kind: "resolved" };
+      resolve11({ outcome: { outcome: "selected", optionId: picked.optionId } });
+      return { kind: "resolved", optionId: picked.optionId };
     }
     const text = this.pending.options[index];
     this.pending = null;
@@ -43968,6 +44074,10 @@ var StreamingState = class {
   }
 };
 var PERMISSION_TIMEOUT_MS = 5 * 60 * 1e3;
+function permissionExpiredNotice() {
+  const minutes = Math.round(PERMISSION_TIMEOUT_MS / 6e4);
+  return `\u23F1 A permission request expired after ${minutes} minutes with no answer, so CodeAgent cancelled it \u2014 this was a timeout, not a refusal by you. Ask the agent to try again and approve it from here.`;
+}
 var AcpHistory = class {
   constructor(publisher, opts) {
     this.publisher = publisher;
@@ -44443,7 +44553,9 @@ async function runAcpSession(opts) {
         emitSwitchEvent,
         // Same live flag the switch deps read — a start_task naming the
         // house agent on a house session is the agent already running.
-        () => houseActive
+        () => houseActive,
+        // …and WHICH house-rail agent (a managed id, or the house sentinel).
+        () => houseWireId
       );
     },
     { id: opts.agent, name: opts.agent, displayName: opts.agent },
@@ -44482,6 +44594,7 @@ async function runAcpSession(opts) {
   const pendingProposal = { current: null };
   let switchCredentialEnv = {};
   let houseActive = isHouseProxyEnv(process.env);
+  let houseWireId = houseRailWireId(process.env);
   let houseEnv = houseActive ? pickHouseProxyEnv(process.env) : {};
   let pendingHouseConfig = null;
   const relaunchWith = async (nextAgent, swapOpts = { house: false }) => {
@@ -44529,6 +44642,7 @@ async function runAcpSession(opts) {
     const wasHouse = houseActive;
     houseActive = swapOpts.house;
     if (swapOpts.house) {
+      houseWireId = swapOpts.wireId ?? HOUSE_AGENT_ID;
       if (pendingHouseConfig) {
         persistHouseProxyConfig(pendingHouseConfig);
         pendingHouseConfig = null;
@@ -44536,12 +44650,14 @@ async function runAcpSession(opts) {
     } else if (wasHouse) {
       clearHouseProxyConfig();
     }
+    const managedBanner = swapOpts.house && isManagedProviderId(houseWireId) ? houseWireId : null;
     void publisher.publishOutput({
       type: "agent_banner",
-      agentId: swapOpts.house ? HOUSE_AGENT_ID : nextAgent,
+      agentId: swapOpts.house ? houseWireId : nextAgent,
       // A switch starts a FRESH conversation with the new agent — never "back".
-      title: swapOpts.house ? HOUSE_AGENT_NAME : bannerTitle(false),
-      subtitle: swapOpts.house ? HOUSE_AGENT_SUBTITLE : buildBannerSubtitle(nextAgent, hs.sessionId, hs.model, hs.tier),
+      // A managed target is named by its model; the house agent stays white-label.
+      title: managedBanner ? MANAGED_PROVIDER_DISPLAY_NAMES[managedBanner] : swapOpts.house ? HOUSE_AGENT_NAME : bannerTitle(false),
+      subtitle: managedBanner ? MANAGED_AGENT_SUBTITLE : swapOpts.house ? HOUSE_AGENT_SUBTITLE : buildBannerSubtitle(nextAgent, hs.sessionId, hs.model, hs.tier),
       path: swapOpts.house ? "" : bannerLocation(opts.cwd),
       done: true
     });
@@ -44558,6 +44674,7 @@ async function runAcpSession(opts) {
   const switchDeps = {
     currentAgent: () => opts.agent,
     currentIsHouse: () => houseActive,
+    currentHouseWireId: () => houseWireId,
     postEvent: emitSwitchEvent,
     fetchCredential: (agentId) => fetchProvisionCredentialDetailed({
       agentId,
@@ -44569,7 +44686,7 @@ async function runAcpSession(opts) {
     provisionCredential: (agentId, auth) => {
       switchCredentialEnv = provisionAgentCredentials(agentId, auth);
     },
-    provisionHouseProxy: ({ baseUrl, token }) => {
+    provisionHouseProxy: ({ baseUrl, token, model, managedAgentId }) => {
       const claudeConfigDir = path87.join(
         os62.homedir(),
         ".codeam",
@@ -44580,8 +44697,15 @@ async function runAcpSession(opts) {
         fs78.mkdirSync(claudeConfigDir, { recursive: true, mode: 448 });
       } catch {
       }
-      houseEnv = buildHouseProxyChildEnv({ baseUrl, token, claudeConfigDir });
-      pendingHouseConfig = { baseUrl, token, claudeConfigDir };
+      const cfg = {
+        baseUrl,
+        token,
+        claudeConfigDir,
+        ...model ? { model } : {},
+        ...managedAgentId ? { managedAgentId } : {}
+      };
+      houseEnv = buildHouseProxyChildEnv(cfg);
+      pendingHouseConfig = cfg;
       switchCredentialEnv = {};
     },
     ensureBinary: (agentId, installScript, onRetry) => ensureAgentBinaryForSwitch(agentId, installScript, { onRetry }),
@@ -44669,7 +44793,7 @@ async function runAcpSession(opts) {
   await new Promise(() => {
   });
 }
-async function handleCommand(cmd, client3, relay, acpSessionId, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, budgetRecovery, budgetReachedFlag, onActiveSessionChanged, switchAgent, pendingHandoff, squad, routeToAgent, pendingProposal, postSquadEvent, currentIsHouse) {
+async function handleCommand(cmd, client3, relay, acpSessionId, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, budgetRecovery, budgetReachedFlag, onActiveSessionChanged, switchAgent, pendingHandoff, squad, routeToAgent, pendingProposal, postSquadEvent, currentIsHouse, currentHouseWireId) {
   const session = {
     client: client3,
     relay,
@@ -44692,7 +44816,8 @@ async function handleCommand(cmd, client3, relay, acpSessionId, streaming, opts,
     routeToAgent,
     pendingProposal,
     postSquadEvent,
-    currentIsHouse
+    currentIsHouse,
+    currentHouseWireId
   };
   await dispatchAcpCommand(assembleAcpCommandContext(session, cmd));
 }
@@ -46604,13 +46729,9 @@ async function runBatonSession(opts) {
     beginLoadReplay: () => streaming.beginLoadReplay(),
     endLoadReplay: () => streaming.endLoadReplay(),
     onRequestPermission: async (request2) => {
-      const { event, optionIdByLabel } = mapPermissionRequest(request2);
+      const { event, options } = mapPermissionRequest(request2);
       await publisher.publishAwaitingAnswer(event);
-      return streaming.registerPermission({
-        questionId: event.questionId,
-        labels: event.options ?? [],
-        optionIdByLabel
-      });
+      return streaming.registerPermission({ questionId: event.questionId, options });
     },
     onStderr: (line) => {
       recentStderr.push(line);
@@ -46974,7 +47095,7 @@ async function start(requestedAgent, presetSession) {
       // The house agent runs the `claude` runtime, so `session.agent` cannot
       // tell it apart; the managed-proxy env can (`isHouseProxyEnv`). The
       // backend turns the tool router on for the house agent ONLY.
-      agent: isHouseProxyEnv(process.env) ? HOUSE_AGENT_ID : session.agent
+      agent: isHouseProxyEnv(process.env) ? houseRailWireId(process.env) : session.agent
     });
   }
   const mcpServers = mergeWithLocalMcpServers(
@@ -49825,7 +49946,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.74.13" : "0.0.0-dev";
+  const cliVersion = true ? "2.75.0" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto13.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -50349,7 +50470,7 @@ async function mcpWarm(argv = [], opts = {}) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.74.13" : "unknown";
+  const v = true ? "2.75.0" : "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.74.13",
+  "version": "2.75.0",
   "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",