codeam-cli 2.65.14 → 2.65.16

package/dist/index.js

@@ -948,6 +948,8 @@ function isKnownAgentId(id) {
 
 // ../../packages/shared/src/agents/identity.ts
 var HOUSE_AGENT_ID = "house-codeagent-cloud";
+var HOUSE_AGENT_NAME = "CodeAgent Cloud";
+var HOUSE_AGENT_SUBTITLE = "Included \u2014 no setup";
 var PUBLIC_TO_INTERNAL = {
   claude_code: "claude",
   // CLI-side extra: self-hosted deploy payloads may carry the internal id.
@@ -3154,11 +3156,11 @@ function quiet(fn) {
     log.debug(TAG, "ignored sync error", err);
   }
 }
-function rmIfExistsQuiet(path93) {
+function rmIfExistsQuiet(path94) {
   try {
-    fs2.rmSync(path93, { force: true });
+    fs2.rmSync(path94, { force: true });
   } catch (err) {
-    log.debug(TAG, `rmIfExists failed for ${path93}`, err);
+    log.debug(TAG, `rmIfExists failed for ${path94}`, err);
   }
 }
 function killQuiet(target, signal = "SIGTERM") {
@@ -3365,8 +3367,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? (0, import_pat
     return decodedFile;
   };
 }
-function normalizeWindowsPath(path93) {
-  return path93.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path94) {
+  return path94.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 
 // ../../node_modules/@posthog/core/dist/featureFlagUtils.mjs
@@ -5846,9 +5848,9 @@ async function addSourceContext(frames) {
   LRU_FILE_CONTENTS_CACHE.reduce();
   return frames;
 }
-function getContextLinesFromFile(path93, ranges, output) {
+function getContextLinesFromFile(path94, ranges, output) {
   return new Promise((resolve10) => {
-    const stream = (0, import_node_fs.createReadStream)(path93);
+    const stream = (0, import_node_fs.createReadStream)(path94);
     const lineReaded = (0, import_node_readline.createInterface)({
       input: stream
     });
@@ -5863,7 +5865,7 @@ function getContextLinesFromFile(path93, ranges, output) {
     let rangeStart = range[0];
     let rangeEnd = range[1];
     function onStreamError() {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path93, 1);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path94, 1);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -5924,8 +5926,8 @@ function clearLineContext(frame) {
   delete frame.context_line;
   delete frame.post_context;
 }
-function shouldSkipContextLinesForFile(path93) {
-  return path93.startsWith("node:") || path93.endsWith(".min.js") || path93.endsWith(".min.cjs") || path93.endsWith(".min.mjs") || path93.startsWith("data:");
+function shouldSkipContextLinesForFile(path94) {
+  return path94.startsWith("node:") || path94.endsWith(".min.js") || path94.endsWith(".min.cjs") || path94.endsWith(".min.mjs") || path94.startsWith("data:");
 }
 function shouldSkipContextLinesForFrame(frame) {
   if (void 0 !== frame.lineno && frame.lineno > MAX_CONTEXTLINES_LINENO) return true;
@@ -8079,7 +8081,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.65.14" : "0.0.0-dev",
+    cliVersion: true ? "2.65.16" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -8321,7 +8323,7 @@ var http = __toESM(require("http"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.65.14",
+  version: "2.65.16",
   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",
@@ -8719,11 +8721,12 @@ async function fetchProvisionCredentialDetailed(input) {
       input.pluginAuthToken
     );
     const data = res?.data;
-    if (data && (data.method === "api_key" || data.method === "oauth") && typeof data.credential === "string" && data.credential.length > 0) {
+    if (data && (data.method === "api_key" || data.method === "oauth" || data.method === "house_proxy") && typeof data.credential === "string" && data.credential.length > 0) {
       return {
         ok: true,
         method: data.method,
         credential: data.credential,
+        ...typeof data.baseUrl === "string" && data.baseUrl.length > 0 ? { baseUrl: data.baseUrl } : {},
         ...typeof data.installScript === "string" && data.installScript.length > 0 ? { installScript: data.installScript } : {}
       };
     }
@@ -8737,7 +8740,7 @@ async function fetchProvisionCredentialDetailed(input) {
 }
 async function fetchProvisionCredential(input) {
   const res = await fetchProvisionCredentialDetailed(input);
-  if (!res.ok) return null;
+  if (!res.ok || res.method === "house_proxy") return null;
   return {
     method: res.method,
     credential: res.credential,
@@ -9842,7 +9845,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.65.14" ? { ideVersion: "2.65.14" } : {}
+      ..."2.65.16" ? { ideVersion: "2.65.16" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -10102,10 +10105,10 @@ var WINDOWS_LEGACY_JUNCTIONS = [
   /[\\/]Start Menu([\\/]|$)/i,
   /[\\/]Templates([\\/]|$)/i
 ];
-function isUnsafeWindowsWatchRoot(dir, homedir53) {
+function isUnsafeWindowsWatchRoot(dir, homedir54) {
   const norm = (p2) => p2.replace(/\//g, "\\").replace(/\\+$/, "").toLowerCase();
   const cwd = norm(dir);
-  const home = norm(homedir53);
+  const home = norm(homedir54);
   if (cwd === home) return true;
   if (/^[a-z]:$/.test(cwd)) return true;
   const sysRoots = [
@@ -14761,10 +14764,10 @@ function buildForPlatform(platform3) {
 var import_node_crypto4 = require("crypto");
 
 // src/agents/claude/resolver.ts
-function buildClaudeLaunch(extraArgs = [], os67 = createOsStrategy()) {
-  const found = os67.findInPath("claude") ?? os67.findInPath("claude-code");
+function buildClaudeLaunch(extraArgs = [], os68 = createOsStrategy()) {
+  const found = os68.findInPath("claude") ?? os68.findInPath("claude-code");
   if (!found) return null;
-  return os67.buildLaunch(found, extraArgs);
+  return os68.buildLaunch(found, extraArgs);
 }
 
 // src/agents/claude/installer.ts
@@ -15524,8 +15527,8 @@ var ClaudeRuntimeStrategy = class {
   meta = getAgent("claude");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   /**
    * Claude Code's react-ink TUI enables bracketed-paste mode at
@@ -16613,8 +16616,8 @@ function codexCredentialLocator() {
 function codexLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os67 = createOsStrategy();
-      return os67.findInPath("codex") !== null;
+      const os68 = createOsStrategy();
+      return os68.findInPath("codex") !== null;
     },
     launch() {
       return (0, import_node_child_process4.spawn)("codex", ["login"], { stdio: "inherit" });
@@ -16637,8 +16640,8 @@ var CodexRuntimeStrategy = class {
   meta = getAgent("codex");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     let binary = this.os.findInPath("codex");
@@ -16747,12 +16750,12 @@ var CodexRuntimeStrategy = class {
     });
   }
 };
-function resolveNpm(os67) {
-  return os67.id === "win32" ? "npm.cmd" : "npm";
+function resolveNpm(os68) {
+  return os68.id === "win32" ? "npm.cmd" : "npm";
 }
-async function installCodexViaNpm(os67) {
+async function installCodexViaNpm(os68) {
   return new Promise((resolve10, reject) => {
-    const proc = (0, import_node_child_process5.spawn)(resolveNpm(os67), ["install", "-g", "@openai/codex"], {
+    const proc = (0, import_node_child_process5.spawn)(resolveNpm(os68), ["install", "-g", "@openai/codex"], {
       stdio: "inherit"
     });
     proc.on("close", (code) => {
@@ -16769,16 +16772,16 @@ async function installCodexViaNpm(os67) {
     });
   });
 }
-function augmentNpmGlobalBin(os67) {
+function augmentNpmGlobalBin(os68) {
   try {
-    const result = (0, import_node_child_process5.spawnSync)(resolveNpm(os67), ["prefix", "-g"], {
+    const result = (0, import_node_child_process5.spawnSync)(resolveNpm(os68), ["prefix", "-g"], {
       stdio: ["ignore", "pipe", "ignore"]
     });
     if (result.status !== 0) return;
     const prefix = result.stdout.toString().trim();
     if (!prefix) return;
-    const binDir = os67.id === "win32" ? prefix : path27.join(prefix, "bin");
-    os67.augmentPath([binDir]);
+    const binDir = os68.id === "win32" ? prefix : path27.join(prefix, "bin");
+    os68.augmentPath([binDir]);
   } catch {
   }
 }
@@ -17189,10 +17192,10 @@ function manualInstallHint(runner, tools) {
   const argv = osPackageInstallArgv(detectPackageManager(runner), [...tools]);
   return argv ? `\`sudo ${argv.join(" ")}\`` : `your package manager (e.g. \`${pkgs}\`)`;
 }
-function writeUnzipShim(os67, runner) {
+function writeUnzipShim(os68, runner) {
   const python = ["python3", "python"].find((p2) => runner.which(p2));
   if (!python) return null;
-  const dir = os67.scratchPath("codeam-cr-prereq");
+  const dir = os68.scratchPath("codeam-cr-prereq");
   const shim = path29.join(dir, "unzip");
   const script = `#!/bin/sh
 set -e
@@ -17214,9 +17217,9 @@ exec ${python} -m zipfile -e "$archive" "$dest"
   (0, import_node_fs5.chmodSync)(shim, 448);
   return dir;
 }
-async function ensureInstallPrerequisites(os67, deps = {}) {
+async function ensureInstallPrerequisites(os68, deps = {}) {
   const runner = deps.runner ?? defaultHeadroomRunner;
-  const missing = REQUIRED_TOOLS.filter((t2) => os67.findInPath(t2) === null);
+  const missing = REQUIRED_TOOLS.filter((t2) => os68.findInPath(t2) === null);
   if (missing.length === 0) return { ok: true, extraPath: [] };
   log.info(
     "coderabbit",
@@ -17235,10 +17238,10 @@ async function ensureInstallPrerequisites(os67, deps = {}) {
       );
     }
   }
-  const stillMissing = REQUIRED_TOOLS.filter((t2) => os67.findInPath(t2) === null);
+  const stillMissing = REQUIRED_TOOLS.filter((t2) => os68.findInPath(t2) === null);
   if (stillMissing.length === 0) return { ok: true, extraPath: [] };
   if (stillMissing.length === 1 && stillMissing[0] === "unzip") {
-    const shimDir = writeUnzipShim(os67, runner);
+    const shimDir = writeUnzipShim(os68, runner);
     if (shimDir) {
       log.info("coderabbit", "unzip is unavailable \u2014 using a scoped python zipfile shim");
       return { ok: true, extraPath: [shimDir] };
@@ -17301,15 +17304,15 @@ function summarizeInstallFailure(output) {
   }
   return lines.length > 0 ? lines[lines.length - 1] : null;
 }
-async function ensureCoderabbitInstalled(os67, deps = {}) {
-  if (os67.findInPath("coderabbit")) return { ok: true };
-  if (os67.id === "win32") {
+async function ensureCoderabbitInstalled(os68, deps = {}) {
+  if (os68.findInPath("coderabbit")) return { ok: true };
+  if (os68.id === "win32") {
     return {
       ok: false,
       error: "CodeRabbit on Windows requires WSL. Install the CLI inside your WSL distribution (curl -fsSL https://cli.coderabbit.ai/install.sh | sh), then try again."
     };
   }
-  const prereq = await ensureInstallPrerequisites(os67, deps);
+  const prereq = await ensureInstallPrerequisites(os68, deps);
   if (!prereq.ok) return { ok: false, error: prereq.error };
   const env = { ...process.env };
   if (prereq.extraPath.length > 0) {
@@ -17318,8 +17321,8 @@ async function ensureCoderabbitInstalled(os67, deps = {}) {
   log.info("coderabbit", "CodeRabbit CLI not found \u2014 installing via the official script");
   const run = deps.runInstallScript ?? defaultRunInstallScript;
   const { code, output } = await run(env);
-  os67.augmentPath([`${os67.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
-  const binary = os67.findInPath("coderabbit");
+  os68.augmentPath([`${os68.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
+  const binary = os68.findInPath("coderabbit");
   const detail = summarizeInstallFailure(output);
   if (binary !== null) {
     if (code === 0) return { ok: true };
@@ -17373,10 +17376,10 @@ function coderabbitCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function coderabbitLoginLauncher(os67) {
+function coderabbitLoginLauncher(os68) {
   return {
     async ensureInstalled() {
-      const result = await ensureCoderabbitInstalled(os67);
+      const result = await ensureCoderabbitInstalled(os68);
       if (!result.ok && result.error) console.error(`
   \u2717 ${result.error}
 `);
@@ -17436,8 +17439,8 @@ function pickLine(obj) {
 function toHunk(raw, groupSeverity) {
   if (!raw || typeof raw !== "object") return null;
   const o = raw;
-  const path93 = asString(pick(o, ["file_path", "filePath", "file", "path", "filename", "fileName"])) ?? asString(pick(o, ["location"])?.path);
-  if (!path93) return null;
+  const path94 = asString(pick(o, ["file_path", "filePath", "file", "path", "filename", "fileName"])) ?? asString(pick(o, ["location"])?.path);
+  if (!path94) return null;
   const message = asString(
     pick(o, [
       "comment",
@@ -17454,7 +17457,7 @@ function toHunk(raw, groupSeverity) {
   const severity = normSeverity(pick(o, ["severity", "level", "priority", "impact"])) ?? normSeverity(groupSeverity);
   const locObj = pick(o, ["location"]) ?? o;
   return {
-    path: path93.trim(),
+    path: path94.trim(),
     line: pickLine(o) ?? pickLine(locObj),
     severity,
     message: (title && message ? `${title}: ${message}` : title || message).trim() || "(no message)"
@@ -17537,10 +17540,10 @@ function parsePlain(stdout) {
   for (const line of stdout.split(/\r?\n/)) {
     const m = line.match(HUNK_LINE_RE);
     if (!m) continue;
-    const [, path93, lineNo, sevToken, message] = m;
-    if (!path93 || !lineNo || !message) continue;
+    const [, path94, lineNo, sevToken, message] = m;
+    if (!path94 || !lineNo || !message) continue;
     hunks.push({
-      path: path93.trim(),
+      path: path94.trim(),
       line: Number(lineNo),
       severity: sevToken ? SEVERITY_MAP[sevToken.toLowerCase()] : void 0,
       message: message.trim().replace(/^[*-]\s+/, "")
@@ -17600,8 +17603,8 @@ var CoderabbitRuntimeStrategy = class {
   meta = getAgent("coderabbit");
   mode = "batch";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   getDefaultArgs() {
     return ["review", "--agent"];
@@ -17872,10 +17875,10 @@ function cursorCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function cursorLoginLauncher(os67) {
+function cursorLoginLauncher(os68) {
   return {
     async ensureInstalled() {
-      if (os67.findInPath("cursor-agent")) return true;
+      if (os68.findInPath("cursor-agent")) return true;
       console.error(
         "\n  \u2717 cursor-agent binary not on PATH.\n    Install Cursor (https://cursor.com/) and ensure the CLI\n    plugin is enabled, then re-run `codeam link cursor`.\n"
       );
@@ -17939,8 +17942,8 @@ var CursorRuntimeStrategy = class {
   meta = getAgent("cursor");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("cursor-agent");
@@ -18156,10 +18159,10 @@ function aiderCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function aiderLoginLauncher(os67) {
+function aiderLoginLauncher(os68) {
   return {
     async ensureInstalled() {
-      if (os67.findInPath("aider")) return true;
+      if (os68.findInPath("aider")) return true;
       console.error(
         "\n  \u2717 aider binary not on PATH.\n    Install Aider:\n      pip install aider-chat\n    then re-run `codeam link aider`.\n"
       );
@@ -18169,7 +18172,7 @@ function aiderLoginLauncher(os67) {
       console.error(
         "\n  Aider has no interactive login flow.\n    Set ANTHROPIC_API_KEY or OPENAI_API_KEY in your shell,\n    or re-run `codeam link aider --api-key=<your-key>`.\n"
       );
-      return (0, import_node_child_process12.spawn)(os67.id === "win32" ? "cmd.exe" : "sh", os67.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
+      return (0, import_node_child_process12.spawn)(os68.id === "win32" ? "cmd.exe" : "sh", os68.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
         stdio: "ignore"
       });
     }
@@ -18315,22 +18318,31 @@ async function waitForCommandOnPath(cmd, opts = {}) {
   }
   return check();
 }
-function augmentUserLocalBinPaths(deps = {}) {
+function agentInstallBinDirs(deps = {}) {
   const env = deps.env ?? process.env;
   const home = deps.homedir ?? import_os4.default.homedir();
   const p2 = deps.pathApi ?? import_path4.default;
-  const candidates = [
+  return [
     // XDG-style per-user bin — npm's default global-prefix bin dir on most
     // Linux setups (`npm config set prefix ~/.local` or an nvm-less
-    // per-user npm), and where curl-based agent installers commonly land.
+    // per-user npm), and where curl-based agent installers commonly land
+    // (cursor-agent, coderabbit, pip --user's aider).
     p2.join(home, ".local", "bin"),
     // Common explicit npm global-prefix conventions seen in the wild
     // (`npm config set prefix ~/.npm-global`, and Debian/Fedora's
     // `~/.local/share/npm` layout for `npm config set prefix
     // ~/.local/share/npm`).
     p2.join(home, ".npm-global", "bin"),
-    p2.join(home, ".local", "share", "npm", "bin")
+    p2.join(home, ".local", "share", "npm", "bin"),
+    // Vendor curl-installer targets that are NOT on any default PATH.
+    p2.join(env.KIMI_CODE_HOME || p2.join(home, ".kimi-code"), "bin"),
+    p2.join(env.OPENCODE_HOME || p2.join(home, ".opencode"), "bin")
   ];
+}
+function augmentUserLocalBinPaths(deps = {}) {
+  const env = deps.env ?? process.env;
+  const p2 = deps.pathApi ?? import_path4.default;
+  const candidates = agentInstallBinDirs(deps);
   const parts = (env.PATH ?? "").split(p2.delimiter).filter((s) => s.length > 0);
   const existing = new Set(parts);
   const additions = candidates.filter((dir) => !existing.has(dir));
@@ -18435,8 +18447,8 @@ var AiderRuntimeStrategy = class {
   meta = getAgent("aider");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     augmentUserLocalBinPaths();
@@ -18569,8 +18581,8 @@ function geminiCredentialLocator() {
 function geminiLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os67 = createOsStrategy();
-      return os67.findInPath("gemini") !== null;
+      const os68 = createOsStrategy();
+      return os68.findInPath("gemini") !== null;
     },
     launch() {
       return (0, import_node_child_process13.spawn)("gemini", ["auth", "login"], { stdio: "inherit" });
@@ -18760,8 +18772,8 @@ var GeminiRuntimeStrategy = class {
   meta = getAgent("gemini");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("gemini");
@@ -19052,8 +19064,8 @@ var KimiRuntimeStrategy = class {
   meta = getAgent("kimi");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("kimi");
@@ -19195,8 +19207,8 @@ var OpencodeRuntimeStrategy = class {
   meta = getAgent("opencode");
   mode = "interactive";
   os;
-  constructor(os67) {
-    this.os = os67;
+  constructor(os68) {
+    this.os = os68;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("opencode");
@@ -19280,20 +19292,20 @@ var OpencodeRuntimeStrategy = class {
 
 // src/agents/registry.ts
 var runtimeBuilders = {
-  claude: (os67) => new ClaudeRuntimeStrategy(os67),
-  codex: (os67) => new CodexRuntimeStrategy(os67),
-  coderabbit: (os67) => new CoderabbitRuntimeStrategy(os67),
-  cursor: (os67) => new CursorRuntimeStrategy(os67),
-  aider: (os67) => new AiderRuntimeStrategy(os67),
-  gemini: (os67) => new GeminiRuntimeStrategy(os67),
-  kimi: (os67) => new KimiRuntimeStrategy(os67),
-  opencode: (os67) => new OpencodeRuntimeStrategy(os67)
+  claude: (os68) => new ClaudeRuntimeStrategy(os68),
+  codex: (os68) => new CodexRuntimeStrategy(os68),
+  coderabbit: (os68) => new CoderabbitRuntimeStrategy(os68),
+  cursor: (os68) => new CursorRuntimeStrategy(os68),
+  aider: (os68) => new AiderRuntimeStrategy(os68),
+  gemini: (os68) => new GeminiRuntimeStrategy(os68),
+  kimi: (os68) => new KimiRuntimeStrategy(os68),
+  opencode: (os68) => new OpencodeRuntimeStrategy(os68)
 };
 var deployBuilders = {
   claude: () => new ClaudeDeployStrategy(),
   codex: () => new CodexDeployStrategy()
 };
-function createAgentStrategy(agent, os67 = createOsStrategy()) {
+function createAgentStrategy(agent, os68 = createOsStrategy()) {
   if (!AGENT_REGISTRY[agent]?.enabled) {
     throw new Error(
       `Agent "${agent}" is not supported in this codeam-cli version. Upgrade with 'npm i -g codeam-cli@latest'.`
@@ -19303,10 +19315,10 @@ function createAgentStrategy(agent, os67 = createOsStrategy()) {
   if (!build) {
     throw new Error(`No runtime strategy registered for agent "${agent}"`);
   }
-  return build(os67);
+  return build(os68);
 }
-function createInteractiveAgentStrategy(agent, os67 = createOsStrategy()) {
-  const s = createAgentStrategy(agent, os67);
+function createInteractiveAgentStrategy(agent, os68 = createOsStrategy()) {
+  const s = createAgentStrategy(agent, os68);
   if (s.mode !== "interactive") {
     throw new Error(
       `Agent "${agent}" is a batch agent; use createAgentStrategy + .runOneShot for one-shot reviews.`
@@ -19984,8 +19996,8 @@ function collectChangedFiles(cwd) {
   }
   return [...byPath.values()];
 }
-function restoreCoderabbitOauthBlob(os67, value) {
-  const dir = path41.join(os67.homeDir(), ".coderabbit");
+function restoreCoderabbitOauthBlob(os68, value) {
+  const dir = path41.join(os68.homeDir(), ".coderabbit");
   (0, import_node_fs6.mkdirSync)(dir, { recursive: true });
   let file = "auth.json";
   let contents = value.trim();
@@ -20005,26 +20017,26 @@ function installFailureMessage(result) {
   return result.error ?? "CodeRabbit CLI could not be installed";
 }
 async function configureCoderabbit(input, deps = {}) {
-  const os67 = deps.os ?? createOsStrategy();
+  const os68 = deps.os ?? createOsStrategy();
   const ensureInstalled = deps.ensureInstalled ?? ensureCoderabbitInstalled;
   const isLoggedIn = deps.isLoggedIn ?? defaultIsLoggedIn;
   const runOAuth = deps.runOAuthLogin ?? runCoderabbitOAuthLogin;
   const snapshot = deps.snapshotDir ?? (() => snapshotCredentialDir());
   const capture2 = deps.captureCredential ?? ((b) => diffCapturedCredential(b));
   const loginWithApiKey = deps.loginWithApiKey ?? defaultLoginWithApiKey;
-  const home = os67.homeDir();
-  os67.augmentPath(
-    os67.id === "win32" ? [
+  const home = os68.homeDir();
+  os68.augmentPath(
+    os68.id === "win32" ? [
       path41.join(home, ".local", "bin"),
       path41.join(process.env.APPDATA ?? path41.join(home, "AppData", "Roaming"), "npm"),
       path41.join(home, "scoop", "shims")
     ] : [path41.join(home, ".local", "bin"), "/opt/homebrew/bin", "/usr/local/bin"]
   );
-  const installed2 = os67.findInPath("coderabbit") !== null;
+  const installed2 = os68.findInPath("coderabbit") !== null;
   const base = () => ({
     action: input.action,
     supported: true,
-    installed: os67.findInPath("coderabbit") !== null,
+    installed: os68.findInPath("coderabbit") !== null,
     loggedIn: false
   });
   if (input.action === "status") {
@@ -20038,7 +20050,7 @@ async function configureCoderabbit(input, deps = {}) {
     const key = (input.apiKey ?? "").trim();
     if (!key) return { ...res2, error: "No API key provided" };
     if (!res2.installed) {
-      const inst = await ensureInstalled(os67);
+      const inst = await ensureInstalled(os68);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -20062,7 +20074,7 @@ async function configureCoderabbit(input, deps = {}) {
     }
     if (!res2.installed) {
       deps.onEvent?.({ kind: "installing" });
-      const inst = await ensureInstalled(os67);
+      const inst = await ensureInstalled(os68);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -20079,7 +20091,7 @@ async function configureCoderabbit(input, deps = {}) {
       return { ...res2, loggedIn: true, linked: true };
     }
     try {
-      restoreCoderabbitOauthBlob(os67, cred.credential);
+      restoreCoderabbitOauthBlob(os68, cred.credential);
     } catch (err) {
       return {
         ...res2,
@@ -20103,7 +20115,7 @@ async function configureCoderabbit(input, deps = {}) {
     const res2 = base();
     if (!installed2) {
       deps.onEvent?.({ kind: "installing" });
-      const inst = await ensureInstalled(os67);
+      const inst = await ensureInstalled(os68);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -20143,7 +20155,7 @@ async function configureCoderabbit(input, deps = {}) {
   }
   const res = base();
   if (!res.installed) {
-    const inst = await ensureInstalled(os67);
+    const inst = await ensureInstalled(os68);
     res.installed = inst.ok;
     if (!inst.ok) return { ...res, error: installFailureMessage(inst) };
   }
@@ -20784,6 +20796,38 @@ async function reportDeployProgress(auth, deployId, step, message, sessionId) {
   } catch {
   }
 }
+async function postSessionErrorBubble(auth, message) {
+  const chunks = [
+    { type: "new_turn", done: false },
+    { type: "text", content: message, done: true }
+  ];
+  for (const chunk of chunks) {
+    try {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), PROGRESS_TIMEOUT_MS);
+      timer.unref?.();
+      try {
+        await fetch(`${apiBase()}/api/commands/output`, {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/json",
+            "X-Plugin-Auth-Token": auth.pluginAuthToken,
+            ...vercelBypassHeader()
+          },
+          body: JSON.stringify({
+            sessionId: auth.sessionId,
+            pluginId: auth.pluginId,
+            ...chunk
+          }),
+          signal: controller.signal
+        });
+      } finally {
+        clearTimeout(timer);
+      }
+    } catch {
+    }
+  }
+}
 
 // src/commands/host/workspace.ts
 var fs39 = __toESM(require("fs"));
@@ -21782,28 +21826,64 @@ function readHouseProxyChildEnv() {
     const o = parsed;
     if (typeof o.baseUrl !== "string" || !o.baseUrl) return {};
     if (typeof o.token !== "string" || !o.token) return {};
-    const env = {
-      ANTHROPIC_BASE_URL: o.baseUrl,
-      ANTHROPIC_AUTH_TOKEN: o.token,
-      CLAUDE_CODE_AUTO_COMPACT_WINDOW: "512000",
-      API_TIMEOUT_MS: "3000000"
-    };
-    if (o.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";
-    }
-    if (typeof o.claudeConfigDir === "string" && o.claudeConfigDir) {
-      env.CLAUDE_CONFIG_DIR = o.claudeConfigDir;
-    }
-    return env;
+    return buildHouseProxyChildEnv({
+      baseUrl: o.baseUrl,
+      token: o.token,
+      openRouter: o.openRouter === true,
+      ...typeof o.claudeConfigDir === "string" && o.claudeConfigDir ? { claudeConfigDir: o.claudeConfigDir } : {}
+    });
   } catch {
     return {};
   }
 }
+function buildHouseProxyChildEnv(cfg) {
+  const env = {
+    ANTHROPIC_BASE_URL: cfg.baseUrl,
+    ANTHROPIC_AUTH_TOKEN: cfg.token,
+    CLAUDE_CODE_AUTO_COMPACT_WINDOW: "512000",
+    API_TIMEOUT_MS: "3000000"
+  };
+  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";
+  }
+  if (typeof cfg.claudeConfigDir === "string" && cfg.claudeConfigDir) {
+    env.CLAUDE_CONFIG_DIR = cfg.claudeConfigDir;
+  }
+  return env;
+}
+var HOUSE_PROXY_ENV_KEYS = [
+  "ANTHROPIC_BASE_URL",
+  "ANTHROPIC_AUTH_TOKEN",
+  "ANTHROPIC_API_KEY",
+  "ANTHROPIC_MODEL",
+  "ANTHROPIC_DEFAULT_SONNET_MODEL",
+  "ANTHROPIC_DEFAULT_OPUS_MODEL",
+  "ANTHROPIC_DEFAULT_HAIKU_MODEL",
+  "CLAUDE_CODE_AUTO_COMPACT_WINDOW",
+  "API_TIMEOUT_MS",
+  "CLAUDE_CONFIG_DIR"
+];
+function clearHouseProxyEnvOverrides() {
+  const out2 = {};
+  for (const key of HOUSE_PROXY_ENV_KEYS) out2[key] = void 0;
+  return out2;
+}
+function isHouseProxyEnv(env) {
+  return typeof env.ANTHROPIC_AUTH_TOKEN === "string" && env.ANTHROPIC_AUTH_TOKEN.length > 0 && (env.ANTHROPIC_BASE_URL ?? "").includes("/api/v1/agent-proxy");
+}
+function pickHouseProxyEnv(env) {
+  const out2 = {};
+  for (const key of HOUSE_PROXY_ENV_KEYS) {
+    const v = env[key];
+    if (typeof v === "string") out2[key] = v;
+  }
+  return out2;
+}
 
 // src/commands/host/self-update.ts
 var import_node_child_process23 = require("child_process");
@@ -21966,7 +22046,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.65.14" : null;
+  const current2 = true ? "2.65.16" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -21983,7 +22063,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.65.14" : null;
+  const current2 = true ? "2.65.16" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -22003,7 +22083,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.65.14" : null;
+  return true ? "2.65.16" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve10) => {
@@ -22096,6 +22176,9 @@ function resolveInputPricePerMillion(agentId) {
   return getPricing(model).input;
 }
 var HEARTBEAT_INTERVAL_MS = 2e4;
+var RESUME_RETRY_BACKOFF_MS = [15e3, 3e4, 6e4, 12e4];
+var RESUME_REPROBE_INTERVAL_MS = 5 * 6e4;
+var RESUME_HEALTHY_AFTER_MS = 10 * 6e4;
 function maybeStartHeadroomReporter(ctx) {
   if (process.env["HEADROOM_ENABLED"] !== "1") return null;
   try {
@@ -22431,6 +22514,7 @@ var HostAgentSupervisor = class {
     this.selfUpdate = deps.selfUpdate ?? runSelfUpdate;
     this.onUpdated = deps.onUpdated ?? defaultOnUpdated;
     this.docker = deps.docker ?? defaultDockerRunner;
+    this.postResumeFailure = deps.postResumeFailure ?? postSessionErrorBubble;
   }
   identity;
   deps;
@@ -22472,6 +22556,20 @@ var HostAgentSupervisor = class {
   docker;
   /** Guards against firing the self-heal more than once. */
   healing = false;
+  /** Visible-error poster for the exhausted-resume path (injectable). */
+  postResumeFailure;
+  /** How many resume re-spawns have failed since the last healthy child. */
+  resumeRetryAttempts = 0;
+  /** Pending bounded-backoff resume retry (cleared on stop()). */
+  resumeRetryTimer = null;
+  /** Set once the bounded retries exhaust → heartbeat-ridden slow re-probe. */
+  resumeExhausted = false;
+  /** Guards the one-shot visible error bubble per failure episode. */
+  resumeFailurePosted = false;
+  /** Last slow re-probe attempt (epoch ms) — throttles the heartbeat rider. */
+  lastResumeReprobeAt = 0;
+  /** True after stop() — no resume retries may be scheduled past teardown. */
+  stopped = false;
   /**
    * Resolve the self-update interval, honoring `CODEAM_HOST_SELF_UPDATE_MS`.
    * A finite value > 0 overrides the default; 0 or negative DISABLES the
@@ -22515,6 +22613,11 @@ var HostAgentSupervisor = class {
   }
   /** Stop the control channel + heartbeats + kill every child. */
   stop() {
+    this.stopped = true;
+    if (this.resumeRetryTimer) {
+      clearTimeout(this.resumeRetryTimer);
+      this.resumeRetryTimer = null;
+    }
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
@@ -22530,6 +22633,7 @@ var HostAgentSupervisor = class {
     this.children.clear();
   }
   async beat() {
+    this.resumeRecoveryTick();
     try {
       let metrics;
       try {
@@ -23222,15 +23326,12 @@ var HostAgentSupervisor = class {
       proc.once("exit", (code) => {
         if (this.children.get(session.id)?.proc === proc) this.children.delete(session.id);
         if (typeof code === "number" && code !== 0) {
-          log.warn(
-            "host-agent",
-            `resumed session ${session.id.slice(0, 8)} exited (${code}): ${tail.trim().slice(-300)}`
-          );
+          this.onResumeChildExit(session, code, tail.trim().slice(-300));
         }
       });
       log.info(
         "host-agent",
-        `resumed session ${session.id.slice(0, 8)} pluginId=${session.pluginId.slice(0, 12)} (ACP)`
+        `resumed session ${session.id.slice(0, 8)} pluginId=${session.pluginId.slice(0, 12)} (ACP)` + (this.resumeRetryAttempts > 0 ? ` [retry ${this.resumeRetryAttempts}]` : "")
       );
     } catch (err) {
       log.warn(
@@ -23239,6 +23340,92 @@ var HostAgentSupervisor = class {
       );
     }
   }
+  /**
+   * A resumed session child died with a non-zero exit. Before 2026-08-20 this
+   * was ONE warn log and permanent, silent surrender: the v2.65.13 self-update
+   * restarted the fleet-1 unit, the resumed kimi child died `ENOENT — 'kimi'
+   * was not found on PATH`, and the session sat dead for 3+ hours while the
+   * HOST heartbeat stayed green (nothing retried, nothing surfaced anywhere).
+   * Now: bounded backoff retries ({@link RESUME_RETRY_BACKOFF_MS}); when they
+   * exhaust, post an HONEST error bubble into the session's chat (the relay/
+   * backend are up — only the agent child is dead) and hand off to the
+   * heartbeat-ridden slow re-probe ({@link resumeRecoveryTick}) so an
+   * externally-fixed cause heals without a manual restart.
+   */
+  onResumeChildExit(session, code, detail) {
+    if (this.stopped) return;
+    const reason = detail ? `exit ${code}: ${detail}` : `exit ${code}`;
+    if (this.resumeRetryAttempts < RESUME_RETRY_BACKOFF_MS.length) {
+      const delay = RESUME_RETRY_BACKOFF_MS[this.resumeRetryAttempts];
+      this.resumeRetryAttempts += 1;
+      log.warn(
+        "host-agent",
+        `resumed session ${session.id.slice(0, 8)} died (${reason}) \u2014 retry ${this.resumeRetryAttempts}/${RESUME_RETRY_BACKOFF_MS.length} in ${Math.round(delay / 1e3)}s`
+      );
+      this.resumeRetryTimer = setTimeout(() => {
+        this.resumeRetryTimer = null;
+        this.resumePersistedSession();
+      }, delay);
+      this.resumeRetryTimer.unref?.();
+      return;
+    }
+    this.resumeExhausted = true;
+    this.lastResumeReprobeAt = Date.now();
+    log.error(
+      "host-agent",
+      `resumed session ${session.id.slice(0, 8)} FAILED permanently after ${RESUME_RETRY_BACKOFF_MS.length + 1} attempts (${reason}) \u2014 posting visible error, re-probing every ${Math.round(RESUME_REPROBE_INTERVAL_MS / 6e4)} min`
+    );
+    if (!this.resumeFailurePosted) {
+      this.resumeFailurePosted = true;
+      if (session.pluginId && session.pluginAuthToken) {
+        void this.postResumeFailure(
+          {
+            sessionId: session.id,
+            pluginId: session.pluginId,
+            pluginAuthToken: session.pluginAuthToken
+          },
+          `The agent failed to restart after a CLI update/restart (${reason}). I tried ${RESUME_RETRY_BACKOFF_MS.length + 1} times without success. The host stays online and keeps retrying about every ${Math.round(RESUME_REPROBE_INTERVAL_MS / 6e4)} minutes \u2014 once the cause is fixed (for example the agent binary is reinstalled), the session reconnects automatically. You can also redeploy this server from My Servers.`
+        ).catch(() => void 0);
+      } else {
+        log.warn(
+          "host-agent",
+          "resume failure bubble skipped \u2014 persisted session has no pluginAuthToken"
+        );
+      }
+    }
+  }
+  /**
+   * Heartbeat rider for resume recovery (synchronous scheduling only — the
+   * beat must stay punctual, and this adds NO new timers):
+   *   - a live session child ⇒ the failure episode (if any) is over: reset
+   *     the retry counter + flags so a FUTURE restart gets fresh retries and
+   *     a fresh (single) error bubble.
+   *   - retries exhausted + no child ⇒ re-probe the resume, throttled to
+   *     {@link RESUME_REPROBE_INTERVAL_MS}, so a fixed PATH / reinstalled
+   *     binary heals the session WITHOUT another manual restart. A re-probe
+   *     that fails again stays in this state (the bubble is not re-posted).
+   */
+  resumeRecoveryTick() {
+    if (this.children.size > 0) {
+      const now2 = Date.now();
+      const hasHealthyChild = [...this.children.values()].some(
+        (c2) => now2 - c2.startedAt >= RESUME_HEALTHY_AFTER_MS
+      );
+      if (hasHealthyChild && (this.resumeRetryAttempts > 0 || this.resumeExhausted)) {
+        log.info("host-agent", "resume recovered \u2014 session child healthy, retry state reset");
+        this.resumeRetryAttempts = 0;
+        this.resumeExhausted = false;
+        this.resumeFailurePosted = false;
+      }
+      return;
+    }
+    if (!this.resumeExhausted || this.resumeRetryTimer) return;
+    const now = Date.now();
+    if (now - this.lastResumeReprobeAt < RESUME_REPROBE_INTERVAL_MS) return;
+    this.lastResumeReprobeAt = now;
+    log.info("host-agent", "resume re-probe (post-exhaustion heartbeat rider)");
+    this.resumePersistedSession();
+  }
   /**
    * Run the backend-supplied per-agent CLI install script (e.g.
    * `claude.ai/install.sh`, `npm i -g @openai/codex`). Best-effort + bounded:
@@ -23672,7 +23859,7 @@ async function defaultFetchJson(url2) {
 async function readUsageReport(deps = {}) {
   const port = deps.port ?? HEADROOM_PROXY_PORT;
   const base = `http://127.0.0.1:${port}`;
-  const get2 = deps.fetchJson ?? ((path93) => defaultFetchJson(`${base}${path93}`));
+  const get2 = deps.fetchJson ?? ((path94) => defaultFetchJson(`${base}${path94}`));
   let history;
   try {
     history = await get2("/stats-history");
@@ -25589,11 +25776,11 @@ function resolveDoltInstallStrategy(platform3) {
 }
 var DOLT_RELEASE_BASE = "https://github.com/dolthub/dolt/releases/latest/download";
 function doltPlatformTuple(platform3, arch2) {
-  const os67 = platform3 === "win32" ? "windows" : platform3 === "darwin" ? "darwin" : "linux";
+  const os68 = platform3 === "win32" ? "windows" : platform3 === "darwin" ? "darwin" : "linux";
   const a = arch2 === "x64" ? "amd64" : arch2 === "arm64" ? "arm64" : null;
   if (!a) return null;
-  if (os67 === "windows" && a !== "amd64") return null;
-  return `${os67}-${a}`;
+  if (os68 === "windows" && a !== "amd64") return null;
+  return `${os68}-${a}`;
 }
 function resolveDoltTarballStrategy(targetDir, platform3, arch2) {
   const tuple = doltPlatformTuple(platform3, arch2);
@@ -27245,7 +27432,7 @@ var vcsAgentReviewH = async (ctx, cmd, parsed) => {
   });
   const token = ctx.pluginAuthToken;
   void (async () => {
-    const os67 = createOsStrategy();
+    const os68 = createOsStrategy();
     try {
       const report = await reviewPullRequest(
         {
@@ -27254,7 +27441,7 @@ var vcsAgentReviewH = async (ctx, cmd, parsed) => {
           baseBranch: parsed.baseBranch
         },
         {
-          runReview: (input) => new CoderabbitRuntimeStrategy(os67).runOneShot(input),
+          runReview: (input) => new CoderabbitRuntimeStrategy(os68).runOneShot(input),
           runGh: (args2) => defaultRunGh(args2),
           postReport: async (r) => {
             if (!token) return;
@@ -28357,11 +28544,11 @@ function resolveTokenValue(args2) {
   }
   const fileFlag = args2.find((a) => a.startsWith("--token-file="));
   if (fileFlag) {
-    const path93 = fileFlag.slice("--token-file=".length);
+    const path94 = fileFlag.slice("--token-file=".length);
     try {
-      const content = fs65.readFileSync(path93, "utf8").trim();
-      if (content.length === 0) fail(`--token-file ${path93} is empty`);
-      rmIfExistsQuiet(path93);
+      const content = fs65.readFileSync(path94, "utf8").trim();
+      if (content.length === 0) fail(`--token-file ${path94} is empty`);
+      rmIfExistsQuiet(path94);
       return content;
     } catch (err) {
       fail(`Could not read --token-file: ${err.message}`);
@@ -29281,6 +29468,9 @@ async function resolveAcpAdapterWithRetry(agent, opts = {}) {
 
 // src/agents/acp/runner.ts
 var import_node_crypto11 = require("crypto");
+var fs77 = __toESM(require("fs"));
+var os62 = __toESM(require("os"));
+var path85 = __toESM(require("path"));
 
 // src/services/history.service.ts
 var fs66 = __toESM(require("fs"));
@@ -35061,6 +35251,7 @@ function knownAgentBinaryDirs() {
   out2.push("/usr/bin");
   out2.push(path75.join(home, ".local/bin"));
   out2.push(path75.join(home, "bin"));
+  out2.push(...agentInstallBinDirs());
   if (process.platform === "win32") {
     const { LOCALAPPDATA, APPDATA } = process.env;
     if (LOCALAPPDATA) out2.push(path75.join(LOCALAPPDATA, "cursor-agent"));
@@ -35125,16 +35316,23 @@ var NON_SWITCHABLE = /* @__PURE__ */ new Set([
   "coderabbit"
 ]);
 function displayName(id) {
+  if (id === HOUSE_AGENT_ID) return HOUSE_AGENT_NAME;
   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) {
+function resolveSwitchTarget(raw, currentAgent, currentIsHouse = false) {
   if (typeof raw !== "string" || raw.length === 0) {
     return { ok: false, error: "switch_agent: missing agentId" };
   }
+  if (raw === HOUSE_AGENT_ID) {
+    if (currentIsHouse) {
+      return { ok: false, error: `${HOUSE_AGENT_NAME} is already this session's agent.` };
+    }
+    return { ok: true, agentId: "claude", wireId: HOUSE_AGENT_ID, house: true };
+  }
   if (!isKnownAgentId(raw)) {
     return { ok: false, error: `Unknown agent "${raw}".` };
   }
@@ -35147,10 +35345,10 @@ function resolveSwitchTarget(raw, currentAgent) {
       error: `${displayName(raw)} can't be switched to in a live session yet.`
     };
   }
-  if (raw === currentAgent) {
+  if (raw === currentAgent && !currentIsHouse) {
     return { ok: false, error: `${displayName(raw)} is already this session's agent.` };
   }
-  return { ok: true, agentId: raw };
+  return { ok: true, agentId: raw, wireId: raw, house: false };
 }
 function toAgentAuth(method, credential) {
   return { kind: method === "api_key" ? "api_key" : "oauth_token", value: credential };
@@ -35225,7 +35423,8 @@ function makeSerializedSwitchEmitter(post2) {
 }
 async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   const from = deps.currentAgent();
-  const target = resolveSwitchTarget(rawAgentId, from);
+  const fromIsHouse = deps.currentIsHouse();
+  const target = resolveSwitchTarget(rawAgentId, from, fromIsHouse);
   if (!target.ok) {
     return {
       ok: false,
@@ -35234,27 +35433,45 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
     };
   }
   const agentId = target.agentId;
+  const wireId = target.wireId;
+  const fromWireId = fromIsHouse ? HOUSE_AGENT_ID : from;
+  const targetName = displayName(wireId);
   const emitStatus = (status2) => deps.postEvent("switch_agent_status", { ...status2 });
-  const emitStep = (step) => deps.postEvent("switch_agent_progress", { step, agentId });
+  const emitStep = (step) => deps.postEvent("switch_agent_progress", { step, agentId: wireId });
   const fail2 = (error) => {
-    log.warn("switchAgent", `switch ${from} \u2192 ${agentId} failed: ${error}`);
-    void emitStatus({ state: "error", agentId, fromAgentId: from, error });
-    return { ok: false, agentId, error };
+    log.warn("switchAgent", `switch ${fromWireId} \u2192 ${wireId} failed: ${error}`);
+    void emitStatus({ state: "error", agentId: wireId, fromAgentId: fromWireId, error });
+    return { ok: false, agentId: wireId, error };
   };
-  log.info("switchAgent", `switch requested ${from} \u2192 ${agentId}`);
-  void emitStatus({ state: "switching", agentId, fromAgentId: from });
+  log.info("switchAgent", `switch requested ${fromWireId} \u2192 ${wireId}`);
+  void emitStatus({ state: "switching", agentId: wireId, fromAgentId: fromWireId });
   let installScript;
   if (!fastPath.skipProvision) {
     void emitStep("credential");
-    const cred = await deps.fetchCredential(agentId);
+    const cred = await deps.fetchCredential(wireId);
     if (!cred.ok) {
-      return fail2(credentialFailureMessage(agentId, cred));
+      return fail2(credentialFailureMessage(wireId, cred));
     }
-    try {
-      deps.provisionCredential(agentId, toAgentAuth(cred.method, cred.credential));
-    } catch (err) {
-      log.warn("switchAgent", `credential provisioning failed: ${err.message}`);
-      return fail2(`Couldn't write the ${displayName(agentId)} credential on this machine.`);
+    if (target.house) {
+      if (cred.method !== "house_proxy" || !cred.baseUrl) {
+        return fail2(`${targetName} isn't available on this backend yet.`);
+      }
+      try {
+        deps.provisionHouseProxy({ baseUrl: cred.baseUrl, token: cred.credential });
+      } catch (err) {
+        log.warn("switchAgent", `house proxy provisioning failed: ${err.message}`);
+        return fail2(`Couldn't configure ${targetName} on this machine.`);
+      }
+    } else {
+      if (cred.method === "house_proxy") {
+        return fail2(`Couldn't fetch the ${targetName} credential.`);
+      }
+      try {
+        deps.provisionCredential(agentId, toAgentAuth(cred.method, cred.credential));
+      } catch (err) {
+        log.warn("switchAgent", `credential provisioning failed: ${err.message}`);
+        return fail2(`Couldn't write the ${targetName} credential on this machine.`);
+      }
     }
     installScript = cred.installScript;
   }
@@ -35267,19 +35484,19 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   }
   void emitStep("restart");
   try {
-    await deps.swapRuntime(agentId);
+    await deps.swapRuntime(agentId, { house: target.house });
   } catch (err) {
-    log.warn("switchAgent", `swap failed, reverting to ${from}: ${err.message}`);
+    log.warn("switchAgent", `swap failed, reverting to ${fromWireId}: ${err.message}`);
     try {
-      await deps.revertRuntime(from);
+      await deps.revertRuntime(from, { house: fromIsHouse });
     } catch (revertErr) {
       log.warn("switchAgent", `revert failed: ${revertErr.message}`);
       return fail2(
-        `Switching to ${displayName(agentId)} failed and ${displayName(from)} couldn't be restored \u2014 restart the session.`
+        `Switching to ${targetName} failed and ${displayName(fromWireId)} couldn't be restored \u2014 restart the session.`
       );
     }
     return fail2(
-      `Couldn't start ${displayName(agentId)} \u2014 the session stays on ${displayName(from)}.`
+      `Couldn't start ${targetName} \u2014 the session stays on ${displayName(fromWireId)}.`
     );
   }
   try {
@@ -35288,9 +35505,9 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
     log.warn("switchAgent", `persist failed (non-fatal): ${err.message}`);
   }
   deps.reannounce(agentId);
-  await emitStatus({ state: "ready", agentId, fromAgentId: from });
-  log.info("switchAgent", `switch complete ${from} \u2192 ${agentId}`);
-  return { ok: true, agentId };
+  await emitStatus({ state: "ready", agentId: wireId, fromAgentId: fromWireId });
+  log.info("switchAgent", `switch complete ${fromWireId} \u2192 ${wireId}`);
+  return { ok: true, agentId: wireId };
 }
 
 // src/services/streaming/transport.ts
@@ -36567,7 +36784,7 @@ function defaultRunGit(cwd, args2) {
   });
 }
 async function discoverRepos(workingDir, maxDepth = 4) {
-  const fs81 = await import("fs/promises");
+  const fs82 = await import("fs/promises");
   const out2 = [];
   await walk(workingDir, 0);
   return out2;
@@ -36575,7 +36792,7 @@ async function discoverRepos(workingDir, maxDepth = 4) {
     if (depth > maxDepth) return;
     let entries = [];
     try {
-      const dirents = await fs81.readdir(dir, { withFileTypes: true });
+      const dirents = await fs82.readdir(dir, { withFileTypes: true });
       entries = dirents.filter((d3) => !d3.name.startsWith(".") || d3.name === ".git").map((d3) => ({ name: d3.name, isDirectory: d3.isDirectory() }));
     } catch {
       return;
@@ -40124,7 +40341,10 @@ async function runAcpSession(opts) {
   refreshSquadRoster();
   const pendingProposal = { current: null };
   let switchCredentialEnv = {};
-  const relaunchWith = async (nextAgent) => {
+  let houseActive = isHouseProxyEnv(process.env);
+  let houseEnv = houseActive ? pickHouseProxyEnv(process.env) : {};
+  let pendingHouseConfig = null;
+  const relaunchWith = async (nextAgent, swapOpts = { house: false }) => {
     try {
       await client3.cancel();
     } catch {
@@ -40138,13 +40358,15 @@ async function runAcpSession(opts) {
     if (!adapter) throw new Error(`no ACP adapter available for ${nextAgent}`);
     const disable1m = loadCliConfig().sessions.find((s) => s.pluginId === opts.pluginId)?.disable1mContext === true;
     clientOptions.adapter = adapter;
+    const leavingHouseEnv = !swapOpts.house && (houseActive || isHouseProxyEnv(process.env) || Object.keys(houseEnv).length > 0) ? clearHouseProxyEnvOverrides() : {};
     clientOptions.extraEnv = {
       ...computeAdapterExtraEnv({
         agent: nextAgent,
         autoApprovePermissions: opts.autoApprovePermissions,
         disable1mContext: disable1m
       }),
-      ...switchCredentialEnv
+      ...leavingHouseEnv,
+      ...swapOpts.house ? houseEnv : switchCredentialEnv
     };
     const next = new AcpClient(clientOptions);
     const hs = await next.start();
@@ -40164,13 +40386,23 @@ async function runAcpSession(opts) {
     });
     budgetRecovery = makeBudgetRecovery();
     pendingHandoff.current = buildHandoffPreamble(prevAgent, nextAgent, transcript);
+    const wasHouse = houseActive;
+    houseActive = swapOpts.house;
+    if (swapOpts.house) {
+      if (pendingHouseConfig) {
+        persistHouseProxyConfig(pendingHouseConfig);
+        pendingHouseConfig = null;
+      }
+    } else if (wasHouse) {
+      clearHouseProxyConfig();
+    }
     void publisher.publishOutput({
       type: "agent_banner",
-      agentId: nextAgent,
+      agentId: swapOpts.house ? HOUSE_AGENT_ID : nextAgent,
       // A switch starts a FRESH conversation with the new agent — never "back".
-      title: bannerTitle(false),
-      subtitle: buildBannerSubtitle(nextAgent, hs.sessionId, hs.model, hs.tier),
-      path: bannerLocation(opts.cwd),
+      title: swapOpts.house ? HOUSE_AGENT_NAME : bannerTitle(false),
+      subtitle: swapOpts.house ? HOUSE_AGENT_SUBTITLE : buildBannerSubtitle(nextAgent, hs.sessionId, hs.model, hs.tier),
+      path: swapOpts.house ? "" : bannerLocation(opts.cwd),
       done: true
     });
   };
@@ -40185,6 +40417,7 @@ async function runAcpSession(opts) {
   );
   const switchDeps = {
     currentAgent: () => opts.agent,
+    currentIsHouse: () => houseActive,
     postEvent: emitSwitchEvent,
     fetchCredential: (agentId) => fetchProvisionCredentialDetailed({
       agentId,
@@ -40196,6 +40429,21 @@ async function runAcpSession(opts) {
     provisionCredential: (agentId, auth) => {
       switchCredentialEnv = provisionAgentCredentials(agentId, auth);
     },
+    provisionHouseProxy: ({ baseUrl, token }) => {
+      const claudeConfigDir = path85.join(
+        os62.homedir(),
+        ".codeam",
+        "house-claude",
+        `switch-${opts.pluginId}`
+      );
+      try {
+        fs77.mkdirSync(claudeConfigDir, { recursive: true, mode: 448 });
+      } catch {
+      }
+      houseEnv = buildHouseProxyChildEnv({ baseUrl, token, claudeConfigDir });
+      pendingHouseConfig = { baseUrl, token, claudeConfigDir };
+      switchCredentialEnv = {};
+    },
     ensureBinary: (agentId, installScript, onRetry) => ensureAgentBinaryForSwitch(agentId, installScript, { onRetry }),
     swapRuntime: relaunchWith,
     revertRuntime: relaunchWith,
@@ -41391,9 +41639,9 @@ function startClaudeCredentialSync(opts) {
 }
 
 // src/beads/workflow-hint.ts
-var fs77 = __toESM(require("fs"));
-var path85 = __toESM(require("path"));
-var os62 = __toESM(require("os"));
+var fs78 = __toESM(require("fs"));
+var path86 = __toESM(require("path"));
+var os63 = __toESM(require("os"));
 var BEADS_HINT_MARKER = "<!-- codeam:beads-workflow -->";
 var BEADS_HINT = `${BEADS_HINT_MARKER}
 # Beads (bd) \u2014 task tracking + persistent memory (ALWAYS use it)
@@ -41407,22 +41655,22 @@ This environment uses **bd (beads)** for issue/task tracking and persistent memo
 - \`bd ready\` (available work) \xB7 \`bd show <id>\` \xB7 \`bd update <id> --claim\` \xB7 \`bd close <id>\`.
 - Use \`bd remember "..."\` for persistent knowledge \u2014 do NOT use MEMORY.md files.
 ${BEADS_HINT_MARKER}`;
-function ensureBeadsWorkflowHint(homeDir2 = os62.homedir()) {
+function ensureBeadsWorkflowHint(homeDir2 = os63.homedir()) {
   try {
-    const file = path85.join(homeDir2, ".claude", "CLAUDE.md");
+    const file = path86.join(homeDir2, ".claude", "CLAUDE.md");
     let existing = "";
     try {
-      existing = fs77.readFileSync(file, "utf8");
+      existing = fs78.readFileSync(file, "utf8");
     } catch {
     }
     if (existing.includes(BEADS_HINT_MARKER)) return;
-    fs77.mkdirSync(path85.dirname(file), { recursive: true });
+    fs78.mkdirSync(path86.dirname(file), { recursive: true });
     const next = existing.trim() ? `${existing.trimEnd()}
 
 ${BEADS_HINT}
 ` : `${BEADS_HINT}
 `;
-    fs77.writeFileSync(file, next);
+    fs78.writeFileSync(file, next);
   } catch {
   }
 }
@@ -41933,7 +42181,7 @@ var AcpDriver = class {
 };
 
 // src/baton/transcript-mirror.ts
-var fs78 = __toESM(require("fs"));
+var fs79 = __toESM(require("fs"));
 var TranscriptMirror = class {
   constructor(deps) {
     this.deps = deps;
@@ -42000,7 +42248,7 @@ var TranscriptMirror = class {
   }
 };
 function defaultWatch(file, onChange) {
-  const w3 = fs78.watch(file, { persistent: false }, () => onChange());
+  const w3 = fs79.watch(file, { persistent: false }, () => onChange());
   return () => w3.close();
 }
 
@@ -42330,16 +42578,16 @@ function keepDeviceAwake(deps = {}) {
 }
 
 // src/agents/claude/onboarding.ts
-var fs79 = __toESM(require("fs"));
-var os64 = __toESM(require("os"));
-var path86 = __toESM(require("path"));
+var fs80 = __toESM(require("fs"));
+var os65 = __toESM(require("os"));
+var path87 = __toESM(require("path"));
 var ONBOARDING_VERSION_SENTINEL = "9999.0.0";
 function ensureClaudeOnboarded(cwd) {
   try {
-    const file = path86.join(os64.homedir(), ".claude.json");
+    const file = path87.join(os65.homedir(), ".claude.json");
     let config = {};
     try {
-      config = JSON.parse(fs79.readFileSync(file, "utf8"));
+      config = JSON.parse(fs80.readFileSync(file, "utf8"));
     } catch {
     }
     let changed = false;
@@ -42364,8 +42612,8 @@ function ensureClaudeOnboarded(cwd) {
       }
     }
     if (!changed) return;
-    fs79.mkdirSync(path86.dirname(file), { recursive: true });
-    fs79.writeFileSync(file, JSON.stringify(config, null, 2));
+    fs80.mkdirSync(path87.dirname(file), { recursive: true });
+    fs80.writeFileSync(file, JSON.stringify(config, null, 2));
     log.info(
       "claude",
       `pre-completed Claude onboarding${cwd ? ` + trusted workspace ${cwd}` : ""}`
@@ -43102,7 +43350,7 @@ var import_picocolors11 = __toESM(require("picocolors"));
 var import_child_process31 = require("child_process");
 var import_util4 = require("util");
 var import_picocolors9 = __toESM(require("picocolors"));
-var path87 = __toESM(require("path"));
+var path88 = __toESM(require("path"));
 var execFileP6 = (0, import_util4.promisify)(import_child_process31.execFile);
 var MAX_BUFFER = 8 * 1024 * 1024;
 function resetStdinForChild() {
@@ -43591,7 +43839,7 @@ var GitHubCodespacesProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path87.posix.dirname(remotePath);
+    const remoteDir = path88.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote(remoteDir)}`,
       `cat > ${shellQuote(remotePath)}`
@@ -43661,7 +43909,7 @@ function shellQuote(s) {
 // src/services/providers/gitpod.ts
 var import_child_process32 = require("child_process");
 var import_util5 = require("util");
-var path88 = __toESM(require("path"));
+var path89 = __toESM(require("path"));
 var import_picocolors10 = __toESM(require("picocolors"));
 var execFileP7 = (0, import_util5.promisify)(import_child_process32.execFile);
 var MAX_BUFFER2 = 8 * 1024 * 1024;
@@ -43901,7 +44149,7 @@ var GitpodProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path88.posix.dirname(remotePath);
+    const remoteDir = path89.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote2(remoteDir)}`,
       `cat > ${shellQuote2(remotePath)}`
@@ -43937,7 +44185,7 @@ function shellQuote2(s) {
 // src/services/providers/gitlab-workspaces.ts
 var import_child_process33 = require("child_process");
 var import_util6 = require("util");
-var path89 = __toESM(require("path"));
+var path90 = __toESM(require("path"));
 var execFileP8 = (0, import_util6.promisify)(import_child_process33.execFile);
 var MAX_BUFFER3 = 8 * 1024 * 1024;
 var GITLAB_API_BASE = process.env.CODEAM_GITLAB_API_URL ?? "https://gitlab.com/api/v4";
@@ -44197,7 +44445,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
     const sshHost = process.env.CODEAM_GITLAB_SSH_HOST ?? "workspaces.gitlab.com";
-    const remoteDir = path89.posix.dirname(remotePath);
+    const remoteDir = path90.posix.dirname(remotePath);
     const parts = [`mkdir -p ${shellQuote3(remoteDir)}`, `cat > ${shellQuote3(remotePath)}`];
     if (options.mode != null) {
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote3(remotePath)}`);
@@ -44265,7 +44513,7 @@ function shellQuote3(s) {
 // src/services/providers/railway.ts
 var import_child_process34 = require("child_process");
 var import_util7 = require("util");
-var path90 = __toESM(require("path"));
+var path91 = __toESM(require("path"));
 var execFileP9 = (0, import_util7.promisify)(import_child_process34.execFile);
 var MAX_BUFFER4 = 8 * 1024 * 1024;
 function resetStdinForChild4() {
@@ -44501,7 +44749,7 @@ var RailwayProvider = class {
     if (!projectId || !serviceId) {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
-    const remoteDir = path90.posix.dirname(remotePath);
+    const remoteDir = path91.posix.dirname(remotePath);
     const parts = [`mkdir -p ${shellQuote4(remoteDir)}`, `cat > ${shellQuote4(remotePath)}`];
     if (options.mode != null) {
       parts.push(`chmod ${options.mode.toString(8)} ${shellQuote4(remotePath)}`);
@@ -45147,8 +45395,8 @@ async function invite() {
 var import_node_dns = require("dns");
 var import_node_util5 = require("util");
 var import_node_crypto13 = require("crypto");
-var fs80 = __toESM(require("fs"));
-var path91 = __toESM(require("path"));
+var fs81 = __toESM(require("fs"));
+var path92 = __toESM(require("path"));
 var import_picocolors14 = __toESM(require("picocolors"));
 var dnsResolveP = (0, import_node_util5.promisify)(import_node_dns.resolve);
 async function checkDns(apiBase2) {
@@ -45204,13 +45452,13 @@ async function checkHealth(apiBase2) {
   }
 }
 function checkConfigDir() {
-  const dir = path91.join(require("os").homedir(), ".codeam");
+  const dir = path92.join(require("os").homedir(), ".codeam");
   try {
-    fs80.mkdirSync(dir, { recursive: true, mode: 448 });
-    const probe = path91.join(dir, ".doctor-probe");
-    fs80.writeFileSync(probe, "ok", { mode: 384 });
-    const read2 = fs80.readFileSync(probe, "utf8");
-    fs80.unlinkSync(probe);
+    fs81.mkdirSync(dir, { recursive: true, mode: 448 });
+    const probe = path92.join(dir, ".doctor-probe");
+    fs81.writeFileSync(probe, "ok", { mode: 384 });
+    const read2 = fs81.readFileSync(probe, "utf8");
+    fs81.unlinkSync(probe);
     if (read2 !== "ok") throw new Error("write/read round-trip mismatch");
     return {
       id: "config-dir",
@@ -45250,9 +45498,9 @@ function checkSessions() {
   }
 }
 function checkAgentBinaries() {
-  const os67 = createOsStrategy();
+  const os68 = createOsStrategy();
   return getEnabledAgents().map((meta) => {
-    const found = os67.findInPath(meta.binaryName);
+    const found = os68.findInPath(meta.binaryName);
     return {
       id: `agent-${meta.id}`,
       label: `Agent binary: ${meta.displayName} (${meta.binaryName})`,
@@ -45274,7 +45522,7 @@ function checkNodePty() {
       detail: "not required on this platform"
     };
   }
-  const vendoredPath = path91.join(__dirname, "vendor", "node-pty");
+  const vendoredPath = path92.join(__dirname, "vendor", "node-pty");
   for (const target of [vendoredPath, "node-pty"]) {
     try {
       require(target);
@@ -45316,7 +45564,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.65.14" : "0.0.0-dev";
+  const cliVersion = true ? "2.65.16" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto13.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -45707,7 +45955,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.65.14" : "unknown";
+  const v = true ? "2.65.16" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }
 
@@ -45856,10 +46104,10 @@ var EXIT_CODE_NAMES = {
 };
 
 // src/index.ts
-var os66 = __toESM(require("os"));
+var os67 = __toESM(require("os"));
 if (!process.env.HOME) {
   try {
-    const home = os66.homedir();
+    const home = os67.homedir();
     if (home) process.env.HOME = home;
   } catch {
   }