codeam-cli 2.63.1 → 2.65.0

package/dist/index.js

@@ -2789,6 +2789,26 @@ function resolveApiBaseUrl() {
   return DEFAULT_API_BASE_URL;
 }
 
+// ../../packages/shared/src/types/agent-squad.ts
+var HANDOFF_FENCE_TAG = "codeam-handoff";
+var SQUAD_CONFIGURE_COMMAND = "squad_configure";
+var SQUAD_STATS_COMMAND = "squad_stats";
+var SQUAD_HOP_BUDGET_DEFAULT = 3;
+var SQUAD_HOP_BUDGET_MIN = 1;
+var SQUAD_HOP_BUDGET_MAX = 10;
+function clampHopBudget(value) {
+  if (typeof value !== "number" || !Number.isFinite(value)) return SQUAD_HOP_BUDGET_DEFAULT;
+  return Math.min(SQUAD_HOP_BUDGET_MAX, Math.max(SQUAD_HOP_BUDGET_MIN, Math.round(value)));
+}
+var SQUAD_SPECIALTIES = {
+  claude: "deep reasoning, refactors, and multi-step architecture work",
+  codex: "fast, focused implementation and test fixing",
+  cursor: "multi-file edits and codebase-wide changes",
+  gemini: "large-context analysis across big files and logs",
+  kimi: "long-context code reading and summarization",
+  opencode: "general implementation tasks"
+};
+
 // ../../packages/shared/src/headroom/manifest.ts
 var HEADROOM_PROXY_PORT = 8787;
 var HEADROOM_PIP_COMPANIONS = [
@@ -2921,6 +2941,9 @@ var USER_EVENTS = {
   // the backend re-publishes them on the per-user SSE bus (mirrored in repo A).
   SWITCH_AGENT_PROGRESS: "switch_agent_progress",
   SWITCH_AGENT_STATUS: "switch_agent_status",
+  // Agent Squad — the CLI posts these to /api/agent-switch/events; PRO-gated.
+  HANDOFF_PROPOSED: "handoff_proposed",
+  HANDOFF_RESOLVED: "handoff_resolved",
   // VCS / PR Command Center — the backend publishes this after an agent finishes
   // reviewing a PR (verdict + comment count + findings), driving the mobile
   // completion screen + push. Mirrored in repo A's app-shared events.ts.
@@ -3125,11 +3148,11 @@ function quiet(fn) {
     log.debug(TAG, "ignored sync error", err);
   }
 }
-function rmIfExistsQuiet(path90) {
+function rmIfExistsQuiet(path91) {
   try {
-    fs2.rmSync(path90, { force: true });
+    fs2.rmSync(path91, { force: true });
   } catch (err) {
-    log.debug(TAG, `rmIfExists failed for ${path90}`, err);
+    log.debug(TAG, `rmIfExists failed for ${path91}`, err);
   }
 }
 function killQuiet(target, signal = "SIGTERM") {
@@ -3243,6 +3266,22 @@ function makeConfig(baseDir) {
     s.agent = agent;
     save(c2);
   }
+  function setSquadAuto2(pluginId, value) {
+    const stored = {
+      enabled: value.enabled === true,
+      hopBudget: clampHopBudget(value.hopBudget)
+    };
+    const c2 = load();
+    const s = c2.sessions.find((x) => x.pluginId === pluginId);
+    if (!s) return null;
+    s.squadAuto = stored;
+    save(c2);
+    return stored;
+  }
+  function getSquadAuto2(pluginId) {
+    const s = load().sessions.find((x) => x.pluginId === pluginId);
+    return s?.squadAuto ?? null;
+  }
   function clearAll2() {
     try {
       fs3.unlinkSync(file);
@@ -3255,7 +3294,7 @@ function makeConfig(baseDir) {
   function loadCliConfig2() {
     return load();
   }
-  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, getActiveSessionForAgent: getActiveSessionForAgent2, setDisable1mContext: setDisable1mContext2, setSessionAgent: setSessionAgent2, clearAll: clearAll2, saveCliConfig: saveCliConfig2, loadCliConfig: loadCliConfig2 };
+  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, getActiveSessionForAgent: getActiveSessionForAgent2, setDisable1mContext: setDisable1mContext2, setSessionAgent: setSessionAgent2, setSquadAuto: setSquadAuto2, getSquadAuto: getSquadAuto2, clearAll: clearAll2, saveCliConfig: saveCliConfig2, loadCliConfig: loadCliConfig2 };
 }
 var CODESPACE_ENV_KEYS = [
   "PREVIEW_TUNNEL_TOKEN",
@@ -3279,7 +3318,7 @@ function loadCodespaceEnv() {
   }
 }
 var _default = makeConfig();
-var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, getActiveSessionForAgent, setDisable1mContext, setSessionAgent, clearAll, saveCliConfig, loadCliConfig } = _default;
+var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, getActiveSessionForAgent, setDisable1mContext, setSessionAgent, setSquadAuto, getSquadAuto, clearAll, saveCliConfig, loadCliConfig } = _default;
 
 // src/commands/pair-auto.ts
 var fs63 = __toESM(require("fs"));
@@ -3320,8 +3359,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? (0, import_pat
     return decodedFile;
   };
 }
-function normalizeWindowsPath(path90) {
-  return path90.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path91) {
+  return path91.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 
 // ../../node_modules/@posthog/core/dist/featureFlagUtils.mjs
@@ -5801,9 +5840,9 @@ async function addSourceContext(frames) {
   LRU_FILE_CONTENTS_CACHE.reduce();
   return frames;
 }
-function getContextLinesFromFile(path90, ranges, output) {
+function getContextLinesFromFile(path91, ranges, output) {
   return new Promise((resolve9) => {
-    const stream = (0, import_node_fs.createReadStream)(path90);
+    const stream = (0, import_node_fs.createReadStream)(path91);
     const lineReaded = (0, import_node_readline.createInterface)({
       input: stream
     });
@@ -5818,7 +5857,7 @@ function getContextLinesFromFile(path90, ranges, output) {
     let rangeStart = range[0];
     let rangeEnd = range[1];
     function onStreamError() {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path90, 1);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path91, 1);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -5879,8 +5918,8 @@ function clearLineContext(frame) {
   delete frame.context_line;
   delete frame.post_context;
 }
-function shouldSkipContextLinesForFile(path90) {
-  return path90.startsWith("node:") || path90.endsWith(".min.js") || path90.endsWith(".min.cjs") || path90.endsWith(".min.mjs") || path90.startsWith("data:");
+function shouldSkipContextLinesForFile(path91) {
+  return path91.startsWith("node:") || path91.endsWith(".min.js") || path91.endsWith(".min.cjs") || path91.endsWith(".min.mjs") || path91.startsWith("data:");
 }
 function shouldSkipContextLinesForFrame(frame) {
   if (void 0 !== frame.lineno && frame.lineno > MAX_CONTEXTLINES_LINENO) return true;
@@ -8034,7 +8073,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.63.1" : "0.0.0-dev",
+    cliVersion: true ? "2.65.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -8215,7 +8254,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.63.1",
+  version: "2.65.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",
@@ -8611,6 +8650,20 @@ async function fetchProvisionCredential(input) {
     return null;
   }
 }
+async function fetchSquadRoster(input) {
+  try {
+    const res = await _transport.postJsonAuthed(
+      `${API_BASE}/api/plugin/agents/roster`,
+      { sessionId: input.sessionId, pluginId: input.pluginId },
+      input.pluginAuthToken
+    );
+    const data = res?.data;
+    if (!data || !Array.isArray(data.agents)) return null;
+    return { agents: data.agents, handoffsEnabled: data.handoffsEnabled === true };
+  } catch {
+    return null;
+  }
+}
 async function postAgentSwitchEvent(input) {
   try {
     await _transport.postJsonAuthed(
@@ -8773,9 +8826,7 @@ async function _postJsonAuthed(url2, body, pluginAuthToken) {
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
-            reject(
-              makeHttpError(res.statusCode, res.headers["retry-after"], responseBody)
-            );
+            reject(makeHttpError(res.statusCode, res.headers["retry-after"], responseBody));
             return;
           }
           try {
@@ -9655,7 +9706,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.63.1" ? { ideVersion: "2.63.1" } : {}
+      ..."2.65.0" ? { ideVersion: "2.65.0" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -9680,7 +9731,8 @@ var CommandRelayService = class _CommandRelayService {
     ];
     _postJson(`${API_BASE2}/api/plugin/agents`, {
       pluginId: this.pluginId,
-      agents
+      agents,
+      capabilities: { squad: true }
     }).then(() => {
       this.agentsRegistered = true;
     }).catch(() => {
@@ -9899,10 +9951,10 @@ var WINDOWS_LEGACY_JUNCTIONS = [
   /[\\/]Start Menu([\\/]|$)/i,
   /[\\/]Templates([\\/]|$)/i
 ];
-function isUnsafeWindowsWatchRoot(dir, homedir52) {
+function isUnsafeWindowsWatchRoot(dir, homedir53) {
   const norm = (p2) => p2.replace(/\//g, "\\").replace(/\\+$/, "").toLowerCase();
   const cwd = norm(dir);
-  const home = norm(homedir52);
+  const home = norm(homedir53);
   if (cwd === home) return true;
   if (/^[a-z]:$/.test(cwd)) return true;
   const sysRoots = [
@@ -14558,10 +14610,10 @@ function buildForPlatform(platform3) {
 var import_node_crypto4 = require("crypto");
 
 // src/agents/claude/resolver.ts
-function buildClaudeLaunch(extraArgs = [], os65 = createOsStrategy()) {
-  const found = os65.findInPath("claude") ?? os65.findInPath("claude-code");
+function buildClaudeLaunch(extraArgs = [], os66 = createOsStrategy()) {
+  const found = os66.findInPath("claude") ?? os66.findInPath("claude-code");
   if (!found) return null;
-  return os65.buildLaunch(found, extraArgs);
+  return os66.buildLaunch(found, extraArgs);
 }
 
 // src/agents/claude/installer.ts
@@ -15151,8 +15203,8 @@ var ClaudeRuntimeStrategy = class {
   meta = getAgent("claude");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   /**
    * Claude Code's react-ink TUI enables bracketed-paste mode at
@@ -15932,8 +15984,8 @@ function codexCredentialLocator() {
 function codexLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os65 = createOsStrategy();
-      return os65.findInPath("codex") !== null;
+      const os66 = createOsStrategy();
+      return os66.findInPath("codex") !== null;
     },
     launch() {
       return (0, import_node_child_process4.spawn)("codex", ["login"], { stdio: "inherit" });
@@ -15956,8 +16008,8 @@ var CodexRuntimeStrategy = class {
   meta = getAgent("codex");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     let binary = this.os.findInPath("codex");
@@ -16066,12 +16118,12 @@ var CodexRuntimeStrategy = class {
     });
   }
 };
-function resolveNpm(os65) {
-  return os65.id === "win32" ? "npm.cmd" : "npm";
+function resolveNpm(os66) {
+  return os66.id === "win32" ? "npm.cmd" : "npm";
 }
-async function installCodexViaNpm(os65) {
+async function installCodexViaNpm(os66) {
   return new Promise((resolve9, reject) => {
-    const proc = (0, import_node_child_process5.spawn)(resolveNpm(os65), ["install", "-g", "@openai/codex"], {
+    const proc = (0, import_node_child_process5.spawn)(resolveNpm(os66), ["install", "-g", "@openai/codex"], {
       stdio: "inherit"
     });
     proc.on("close", (code) => {
@@ -16088,16 +16140,16 @@ async function installCodexViaNpm(os65) {
     });
   });
 }
-function augmentNpmGlobalBin(os65) {
+function augmentNpmGlobalBin(os66) {
   try {
-    const result = (0, import_node_child_process5.spawnSync)(resolveNpm(os65), ["prefix", "-g"], {
+    const result = (0, import_node_child_process5.spawnSync)(resolveNpm(os66), ["prefix", "-g"], {
       stdio: ["ignore", "pipe", "ignore"]
     });
     if (result.status !== 0) return;
     const prefix = result.stdout.toString().trim();
     if (!prefix) return;
-    const binDir = os65.id === "win32" ? prefix : path25.join(prefix, "bin");
-    os65.augmentPath([binDir]);
+    const binDir = os66.id === "win32" ? prefix : path25.join(prefix, "bin");
+    os66.augmentPath([binDir]);
   } catch {
   }
 }
@@ -16496,10 +16548,10 @@ function manualInstallHint(runner, tools) {
   const argv = osPackageInstallArgv(detectPackageManager(runner), [...tools]);
   return argv ? `\`sudo ${argv.join(" ")}\`` : `your package manager (e.g. \`${pkgs}\`)`;
 }
-function writeUnzipShim(os65, runner) {
+function writeUnzipShim(os66, runner) {
   const python = ["python3", "python"].find((p2) => runner.which(p2));
   if (!python) return null;
-  const dir = os65.scratchPath("codeam-cr-prereq");
+  const dir = os66.scratchPath("codeam-cr-prereq");
   const shim = path27.join(dir, "unzip");
   const script = `#!/bin/sh
 set -e
@@ -16521,9 +16573,9 @@ exec ${python} -m zipfile -e "$archive" "$dest"
   (0, import_node_fs5.chmodSync)(shim, 448);
   return dir;
 }
-async function ensureInstallPrerequisites(os65, deps = {}) {
+async function ensureInstallPrerequisites(os66, deps = {}) {
   const runner = deps.runner ?? defaultHeadroomRunner;
-  const missing = REQUIRED_TOOLS.filter((t2) => os65.findInPath(t2) === null);
+  const missing = REQUIRED_TOOLS.filter((t2) => os66.findInPath(t2) === null);
   if (missing.length === 0) return { ok: true, extraPath: [] };
   log.info(
     "coderabbit",
@@ -16542,10 +16594,10 @@ async function ensureInstallPrerequisites(os65, deps = {}) {
       );
     }
   }
-  const stillMissing = REQUIRED_TOOLS.filter((t2) => os65.findInPath(t2) === null);
+  const stillMissing = REQUIRED_TOOLS.filter((t2) => os66.findInPath(t2) === null);
   if (stillMissing.length === 0) return { ok: true, extraPath: [] };
   if (stillMissing.length === 1 && stillMissing[0] === "unzip") {
-    const shimDir = writeUnzipShim(os65, runner);
+    const shimDir = writeUnzipShim(os66, runner);
     if (shimDir) {
       log.info("coderabbit", "unzip is unavailable \u2014 using a scoped python zipfile shim");
       return { ok: true, extraPath: [shimDir] };
@@ -16608,15 +16660,15 @@ function summarizeInstallFailure(output) {
   }
   return lines.length > 0 ? lines[lines.length - 1] : null;
 }
-async function ensureCoderabbitInstalled(os65, deps = {}) {
-  if (os65.findInPath("coderabbit")) return { ok: true };
-  if (os65.id === "win32") {
+async function ensureCoderabbitInstalled(os66, deps = {}) {
+  if (os66.findInPath("coderabbit")) return { ok: true };
+  if (os66.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(os65, deps);
+  const prereq = await ensureInstallPrerequisites(os66, deps);
   if (!prereq.ok) return { ok: false, error: prereq.error };
   const env = { ...process.env };
   if (prereq.extraPath.length > 0) {
@@ -16632,8 +16684,8 @@ async function ensureCoderabbitInstalled(os65, deps = {}) {
       error: detail ? `CodeRabbit CLI install failed: ${detail}` : "CodeRabbit CLI install failed \u2014 check this machine's network egress and try again."
     };
   }
-  os65.augmentPath([`${os65.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
-  if (os65.findInPath("coderabbit") === null) {
+  os66.augmentPath([`${os66.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
+  if (os66.findInPath("coderabbit") === null) {
     const detail = summarizeInstallFailure(output);
     return {
       ok: false,
@@ -16675,10 +16727,10 @@ function coderabbitCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function coderabbitLoginLauncher(os65) {
+function coderabbitLoginLauncher(os66) {
   return {
     async ensureInstalled() {
-      const result = await ensureCoderabbitInstalled(os65);
+      const result = await ensureCoderabbitInstalled(os66);
       if (!result.ok && result.error) console.error(`
   \u2717 ${result.error}
 `);
@@ -16738,8 +16790,8 @@ function pickLine(obj) {
 function toHunk(raw, groupSeverity) {
   if (!raw || typeof raw !== "object") return null;
   const o = raw;
-  const path90 = asString(pick(o, ["file_path", "filePath", "file", "path", "filename", "fileName"])) ?? asString(pick(o, ["location"])?.path);
-  if (!path90) return null;
+  const path91 = asString(pick(o, ["file_path", "filePath", "file", "path", "filename", "fileName"])) ?? asString(pick(o, ["location"])?.path);
+  if (!path91) return null;
   const message = asString(
     pick(o, [
       "comment",
@@ -16756,7 +16808,7 @@ function toHunk(raw, groupSeverity) {
   const severity = normSeverity(pick(o, ["severity", "level", "priority", "impact"])) ?? normSeverity(groupSeverity);
   const locObj = pick(o, ["location"]) ?? o;
   return {
-    path: path90.trim(),
+    path: path91.trim(),
     line: pickLine(o) ?? pickLine(locObj),
     severity,
     message: (title && message ? `${title}: ${message}` : title || message).trim() || "(no message)"
@@ -16839,10 +16891,10 @@ function parsePlain(stdout) {
   for (const line of stdout.split(/\r?\n/)) {
     const m = line.match(HUNK_LINE_RE);
     if (!m) continue;
-    const [, path90, lineNo, sevToken, message] = m;
-    if (!path90 || !lineNo || !message) continue;
+    const [, path91, lineNo, sevToken, message] = m;
+    if (!path91 || !lineNo || !message) continue;
     hunks.push({
-      path: path90.trim(),
+      path: path91.trim(),
       line: Number(lineNo),
       severity: sevToken ? SEVERITY_MAP[sevToken.toLowerCase()] : void 0,
       message: message.trim().replace(/^[*-]\s+/, "")
@@ -16902,8 +16954,8 @@ var CoderabbitRuntimeStrategy = class {
   meta = getAgent("coderabbit");
   mode = "batch";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   getDefaultArgs() {
     return ["review", "--agent"];
@@ -17174,10 +17226,10 @@ function cursorCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function cursorLoginLauncher(os65) {
+function cursorLoginLauncher(os66) {
   return {
     async ensureInstalled() {
-      if (os65.findInPath("cursor-agent")) return true;
+      if (os66.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"
       );
@@ -17241,8 +17293,8 @@ var CursorRuntimeStrategy = class {
   meta = getAgent("cursor");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("cursor-agent");
@@ -17458,10 +17510,10 @@ function aiderCredentialLocator() {
     validate: validateNonEmptyCredential
   };
 }
-function aiderLoginLauncher(os65) {
+function aiderLoginLauncher(os66) {
   return {
     async ensureInstalled() {
-      if (os65.findInPath("aider")) return true;
+      if (os66.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"
       );
@@ -17471,7 +17523,7 @@ function aiderLoginLauncher(os65) {
       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)(os65.id === "win32" ? "cmd.exe" : "sh", os65.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
+      return (0, import_node_child_process12.spawn)(os66.id === "win32" ? "cmd.exe" : "sh", os66.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
         stdio: "ignore"
       });
     }
@@ -17543,8 +17595,8 @@ var AiderRuntimeStrategy = class {
   meta = getAgent("aider");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("aider");
@@ -17676,8 +17728,8 @@ function geminiCredentialLocator() {
 function geminiLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os65 = createOsStrategy();
-      return os65.findInPath("gemini") !== null;
+      const os66 = createOsStrategy();
+      return os66.findInPath("gemini") !== null;
     },
     launch() {
       return (0, import_node_child_process13.spawn)("gemini", ["auth", "login"], { stdio: "inherit" });
@@ -17867,8 +17919,8 @@ var GeminiRuntimeStrategy = class {
   meta = getAgent("gemini");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("gemini");
@@ -18159,8 +18211,8 @@ var KimiRuntimeStrategy = class {
   meta = getAgent("kimi");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("kimi");
@@ -18302,8 +18354,8 @@ var OpencodeRuntimeStrategy = class {
   meta = getAgent("opencode");
   mode = "interactive";
   os;
-  constructor(os65) {
-    this.os = os65;
+  constructor(os66) {
+    this.os = os66;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("opencode");
@@ -18387,20 +18439,20 @@ var OpencodeRuntimeStrategy = class {
 
 // src/agents/registry.ts
 var runtimeBuilders = {
-  claude: (os65) => new ClaudeRuntimeStrategy(os65),
-  codex: (os65) => new CodexRuntimeStrategy(os65),
-  coderabbit: (os65) => new CoderabbitRuntimeStrategy(os65),
-  cursor: (os65) => new CursorRuntimeStrategy(os65),
-  aider: (os65) => new AiderRuntimeStrategy(os65),
-  gemini: (os65) => new GeminiRuntimeStrategy(os65),
-  kimi: (os65) => new KimiRuntimeStrategy(os65),
-  opencode: (os65) => new OpencodeRuntimeStrategy(os65)
+  claude: (os66) => new ClaudeRuntimeStrategy(os66),
+  codex: (os66) => new CodexRuntimeStrategy(os66),
+  coderabbit: (os66) => new CoderabbitRuntimeStrategy(os66),
+  cursor: (os66) => new CursorRuntimeStrategy(os66),
+  aider: (os66) => new AiderRuntimeStrategy(os66),
+  gemini: (os66) => new GeminiRuntimeStrategy(os66),
+  kimi: (os66) => new KimiRuntimeStrategy(os66),
+  opencode: (os66) => new OpencodeRuntimeStrategy(os66)
 };
 var deployBuilders = {
   claude: () => new ClaudeDeployStrategy(),
   codex: () => new CodexDeployStrategy()
 };
-function createAgentStrategy(agent, os65 = createOsStrategy()) {
+function createAgentStrategy(agent, os66 = 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'.`
@@ -18410,10 +18462,10 @@ function createAgentStrategy(agent, os65 = createOsStrategy()) {
   if (!build) {
     throw new Error(`No runtime strategy registered for agent "${agent}"`);
   }
-  return build(os65);
+  return build(os66);
 }
-function createInteractiveAgentStrategy(agent, os65 = createOsStrategy()) {
-  const s = createAgentStrategy(agent, os65);
+function createInteractiveAgentStrategy(agent, os66 = createOsStrategy()) {
+  const s = createAgentStrategy(agent, os66);
   if (s.mode !== "interactive") {
     throw new Error(
       `Agent "${agent}" is a batch agent; use createAgentStrategy + .runOneShot for one-shot reviews.`
@@ -19091,8 +19143,8 @@ function collectChangedFiles(cwd) {
   }
   return [...byPath.values()];
 }
-function restoreCoderabbitOauthBlob(os65, value) {
-  const dir = path38.join(os65.homeDir(), ".coderabbit");
+function restoreCoderabbitOauthBlob(os66, value) {
+  const dir = path38.join(os66.homeDir(), ".coderabbit");
   (0, import_node_fs6.mkdirSync)(dir, { recursive: true });
   let file = "auth.json";
   let contents = value.trim();
@@ -19112,26 +19164,26 @@ function installFailureMessage(result) {
   return result.error ?? "CodeRabbit CLI could not be installed";
 }
 async function configureCoderabbit(input, deps = {}) {
-  const os65 = deps.os ?? createOsStrategy();
+  const os66 = 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 = os65.homeDir();
-  os65.augmentPath(
-    os65.id === "win32" ? [
+  const home = os66.homeDir();
+  os66.augmentPath(
+    os66.id === "win32" ? [
       path38.join(home, ".local", "bin"),
       path38.join(process.env.APPDATA ?? path38.join(home, "AppData", "Roaming"), "npm"),
       path38.join(home, "scoop", "shims")
     ] : [path38.join(home, ".local", "bin"), "/opt/homebrew/bin", "/usr/local/bin"]
   );
-  const installed2 = os65.findInPath("coderabbit") !== null;
+  const installed2 = os66.findInPath("coderabbit") !== null;
   const base = () => ({
     action: input.action,
     supported: true,
-    installed: os65.findInPath("coderabbit") !== null,
+    installed: os66.findInPath("coderabbit") !== null,
     loggedIn: false
   });
   if (input.action === "status") {
@@ -19145,7 +19197,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(os65);
+      const inst = await ensureInstalled(os66);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -19169,7 +19221,7 @@ async function configureCoderabbit(input, deps = {}) {
     }
     if (!res2.installed) {
       deps.onEvent?.({ kind: "installing" });
-      const inst = await ensureInstalled(os65);
+      const inst = await ensureInstalled(os66);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -19186,7 +19238,7 @@ async function configureCoderabbit(input, deps = {}) {
       return { ...res2, loggedIn: true, linked: true };
     }
     try {
-      restoreCoderabbitOauthBlob(os65, cred.credential);
+      restoreCoderabbitOauthBlob(os66, cred.credential);
     } catch (err) {
       return {
         ...res2,
@@ -19210,7 +19262,7 @@ async function configureCoderabbit(input, deps = {}) {
     const res2 = base();
     if (!installed2) {
       deps.onEvent?.({ kind: "installing" });
-      const inst = await ensureInstalled(os65);
+      const inst = await ensureInstalled(os66);
       res2.installed = inst.ok;
       if (!inst.ok) return { ...res2, error: installFailureMessage(inst) };
     }
@@ -19250,7 +19302,7 @@ async function configureCoderabbit(input, deps = {}) {
   }
   const res = base();
   if (!res.installed) {
-    const inst = await ensureInstalled(os65);
+    const inst = await ensureInstalled(os66);
     res.installed = inst.ok;
     if (!inst.ok) return { ...res, error: installFailureMessage(inst) };
   }
@@ -21073,7 +21125,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.63.1" : null;
+  const current2 = true ? "2.65.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -21090,7 +21142,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.63.1" : null;
+  const current2 = true ? "2.65.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -21110,7 +21162,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.63.1" : null;
+  return true ? "2.65.0" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve9) => {
@@ -22779,7 +22831,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 ?? ((path90) => defaultFetchJson(`${base}${path90}`));
+  const get2 = deps.fetchJson ?? ((path91) => defaultFetchJson(`${base}${path91}`));
   let history;
   try {
     history = await get2("/stats-history");
@@ -24696,11 +24748,11 @@ function resolveDoltInstallStrategy(platform3) {
 }
 var DOLT_RELEASE_BASE = "https://github.com/dolthub/dolt/releases/latest/download";
 function doltPlatformTuple(platform3, arch2) {
-  const os65 = platform3 === "win32" ? "windows" : platform3 === "darwin" ? "darwin" : "linux";
+  const os66 = platform3 === "win32" ? "windows" : platform3 === "darwin" ? "darwin" : "linux";
   const a = arch2 === "x64" ? "amd64" : arch2 === "arm64" ? "arm64" : null;
   if (!a) return null;
-  if (os65 === "windows" && a !== "amd64") return null;
-  return `${os65}-${a}`;
+  if (os66 === "windows" && a !== "amd64") return null;
+  return `${os66}-${a}`;
 }
 function resolveDoltTarballStrategy(targetDir, platform3, arch2) {
   const tuple = doltPlatformTuple(platform3, arch2);
@@ -25761,8 +25813,14 @@ function dispatchPrompt(ctx, prompt) {
   ctx.outputSvc.newTurn();
   ctx.agent.sendCommand(prompt);
 }
-var startTask = (ctx, _cmd, parsed) => {
+var startTask = async (ctx, cmd, parsed) => {
   const { prompt, files } = parsed;
+  if (parsed.agentId && parsed.agentId !== ctx.agentId) {
+    await ctx.relay.sendResult(cmd.id, "failed", {
+      error: "Switching agents isn't supported on this session."
+    });
+    return;
+  }
   const effectivePrompt = prompt ?? "";
   if (files && files.length > 0) {
     const paths = saveFilesTemp(files);
@@ -26346,7 +26404,7 @@ var vcsAgentReviewH = async (ctx, cmd, parsed) => {
   });
   const token = ctx.pluginAuthToken;
   void (async () => {
-    const os65 = createOsStrategy();
+    const os66 = createOsStrategy();
     try {
       const report = await reviewPullRequest(
         {
@@ -26355,7 +26413,7 @@ var vcsAgentReviewH = async (ctx, cmd, parsed) => {
           baseBranch: parsed.baseBranch
         },
         {
-          runReview: (input) => new CoderabbitRuntimeStrategy(os65).runOneShot(input),
+          runReview: (input) => new CoderabbitRuntimeStrategy(os66).runOneShot(input),
           runGh: (args2) => defaultRunGh(args2),
           postReport: async (r) => {
             if (!token) return;
@@ -27458,11 +27516,11 @@ function resolveTokenValue(args2) {
   }
   const fileFlag = args2.find((a) => a.startsWith("--token-file="));
   if (fileFlag) {
-    const path90 = fileFlag.slice("--token-file=".length);
+    const path91 = fileFlag.slice("--token-file=".length);
     try {
-      const content = fs63.readFileSync(path90, "utf8").trim();
-      if (content.length === 0) fail(`--token-file ${path90} is empty`);
-      rmIfExistsQuiet(path90);
+      const content = fs63.readFileSync(path91, "utf8").trim();
+      if (content.length === 0) fail(`--token-file ${path91} is empty`);
+      rmIfExistsQuiet(path91);
       return content;
     } catch (err) {
       fail(`Could not read --token-file: ${err.message}`);
@@ -28525,12 +28583,292 @@ async function resolveAcpAdapterWithRetry(agent, opts = {}) {
 var import_node_crypto11 = require("crypto");
 
 // src/services/history.service.ts
-var fs65 = __toESM(require("fs"));
-var path71 = __toESM(require("path"));
-var os55 = __toESM(require("os"));
+var fs66 = __toESM(require("fs"));
+var path72 = __toESM(require("path"));
+var os56 = __toESM(require("os"));
 var https7 = __toESM(require("https"));
 var http6 = __toESM(require("http"));
 var import_zod2 = require("zod");
+
+// src/agents/acp/squad-roster.ts
+var fs65 = __toESM(require("fs"));
+var os55 = __toESM(require("os"));
+var path71 = __toESM(require("path"));
+var PROMPT_MAX = 500;
+var REPLY_SUMMARY_MAX = 1e3;
+var PREAMBLE_MAX = 2e3;
+var BRIEFING_DEFAULT_MAX = 8e3;
+var GENERIC_SPECIALTY = "general implementation tasks";
+function clip(s, max) {
+  return s.length > max ? s.slice(0, max) : s;
+}
+function defaultMember() {
+  return {
+    acpSessionId: null,
+    provisioned: false,
+    binaryVerified: false,
+    lastTurnIndex: 0,
+    contextTextFallback: false
+  };
+}
+function journalPathFor(homeDir2, sessionId) {
+  return path71.join(homeDir2, ".codeam", `squad-journal-${sessionId}.json`);
+}
+function loadJournal(journalPath) {
+  try {
+    const raw = JSON.parse(fs65.readFileSync(journalPath, "utf-8"));
+    return Array.isArray(raw.turns) ? raw.turns : [];
+  } catch {
+    return [];
+  }
+}
+var SquadState = class {
+  /** Set by the caller after fetchSquadRoster; null until then. */
+  roster = null;
+  /**
+   * Autonomous chained handoffs (P2-2, PRO). Seeded from the persisted
+   * `SavedSession.squadAuto` at session start and rewritten by
+   * `squad_configure`. Read-only to callers — mutate via {@link setAuto}, which
+   * clamps the budget and re-arms the chain.
+   */
+  autoConfig = { enabled: false, hopBudget: SQUAD_HOP_BUDGET_DEFAULT };
+  /**
+   * Hops left in the CURRENT chain. Reset to the budget on every USER-initiated
+   * prompt (so a user turn always interrupts and re-arms) and decremented by
+   * each self-accepted handoff.
+   */
+  hopsLeft = 0;
+  /** Lifetime handoff counters for `squad_stats` (in-memory, this process). */
+  handoffCounters = { proposed: 0, accepted: 0, auto: 0 };
+  journalPath;
+  turns;
+  members = /* @__PURE__ */ new Map();
+  constructor(opts) {
+    this.journalPath = journalPathFor(opts.homeDir ?? os55.homedir(), opts.sessionId);
+    this.turns = loadJournal(this.journalPath);
+    if (opts.auto) this.setAuto(opts.auto);
+  }
+  get auto() {
+    return this.autoConfig;
+  }
+  /** Apply a new mode (clamping the budget) and re-arm the chain. */
+  setAuto(value) {
+    this.autoConfig = {
+      enabled: value.enabled === true,
+      hopBudget: clampHopBudget(value.hopBudget)
+    };
+    this.resetHops();
+    return this.autoConfig;
+  }
+  hopsRemaining() {
+    return this.hopsLeft;
+  }
+  /** Re-arm the chain — called at the start of every USER-initiated turn. */
+  resetHops() {
+    this.hopsLeft = this.autoConfig.enabled ? this.autoConfig.hopBudget : 0;
+  }
+  /** Spend one hop on a self-accepted handoff. */
+  consumeHop() {
+    if (this.hopsLeft > 0) this.hopsLeft -= 1;
+  }
+  countProposal(opts) {
+    this.handoffCounters.proposed += 1;
+    if (opts.auto) this.handoffCounters.auto += 1;
+  }
+  countAccepted() {
+    this.handoffCounters.accepted += 1;
+  }
+  /**
+   * Per-member activity for the `squad_stats` relay command, derived from the
+   * journal (the same shared history the delta briefing reads) plus the
+   * in-memory handoff counters. `filesTouched` counts DISTINCT paths — a member
+   * that edited the same file across three turns touched ONE file.
+   */
+  stats() {
+    const byAgent = /* @__PURE__ */ new Map();
+    for (const t2 of this.turns) {
+      let row = byAgent.get(t2.agentId);
+      if (!row) {
+        row = { turns: 0, files: /* @__PURE__ */ new Set() };
+        byAgent.set(t2.agentId, row);
+      }
+      row.turns += 1;
+      for (const f of t2.filesTouched) row.files.add(f);
+    }
+    const members = [...byAgent.entries()].map(([agentId, row]) => ({
+      agentId,
+      turns: row.turns,
+      filesTouched: row.files.size
+    }));
+    return { members, handoffs: { ...this.handoffCounters }, sinceTurn: 1 };
+  }
+  /** Returns (creating on first access) the mutable per-agent state. */
+  member(agentId) {
+    let m = this.members.get(agentId);
+    if (!m) {
+      m = defaultMember();
+      this.members.set(agentId, m);
+    }
+    return m;
+  }
+  /** Appends a journal entry and persists (fire-and-forget durability). */
+  recordTurn(entry) {
+    const turn = {
+      turn: this.turns.length + 1,
+      agentId: entry.agentId,
+      prompt: clip(entry.prompt, PROMPT_MAX),
+      replySummary: clip(entry.replySummary, REPLY_SUMMARY_MAX),
+      filesTouched: entry.filesTouched
+    };
+    this.turns.push(turn);
+    this.persist();
+  }
+  turnCount() {
+    return this.turns.length;
+  }
+  entriesSince(turnIndex) {
+    return this.turns.filter((t2) => t2.turn > turnIndex);
+  }
+  persist() {
+    try {
+      fs65.mkdirSync(path71.dirname(this.journalPath), { recursive: true, mode: 448 });
+      fs65.writeFileSync(this.journalPath, JSON.stringify({ turns: this.turns }), { mode: 384 });
+    } catch {
+    }
+  }
+};
+function specialtyFor(agentId) {
+  return SQUAD_SPECIALTIES[agentId] ?? GENERIC_SPECIALTY;
+}
+var TEAM_PREAMBLE_MARKER = "[Team context]";
+var TEAM_PREAMBLE_LINES = [
+  "[Team context] You are the active agent in a CodeAgent Mobile session where the user",
+  "has a squad of agents and can pass work between them. Your available teammates:",
+  "If a task clearly fits a teammate better than you, you MAY propose a handoff by ending",
+  `your reply with a fenced code block tagged ${HANDOFF_FENCE_TAG} containing ONE JSON object:`,
+  '{"to":"<teammate id>","reason":"<one sentence>","prompt":"<the prompt they should run>"}',
+  "Propose at most one handoff per reply, only when genuinely better, and never announce",
+  "the block in prose \u2014 the app renders it as a card the user can accept."
+];
+var TEAM_PREAMBLE_BULLET_RE = /^- .+ — best at: /;
+var BRIEFING_MARKER = "[Team update]";
+var BRIEFING_HEADER = "[Team update] While you were away, other agents worked on this session:";
+var BRIEFING_FOOTER = "Continue from the CURRENT state of the working tree.";
+function buildTeamPreamble(roster, currentAgent, opts) {
+  const others = roster.agents.filter((a) => a.agentId !== currentAgent);
+  if (others.length === 0) return null;
+  const lines = [
+    TEAM_PREAMBLE_LINES[0],
+    TEAM_PREAMBLE_LINES[1],
+    ...others.map((a) => `- ${a.displayName} \u2014 best at: ${specialtyFor(a.agentId)}`)
+  ];
+  if (opts.handoffInstructions) {
+    lines.push(...TEAM_PREAMBLE_LINES.slice(2));
+  }
+  return clip(lines.join("\n"), PREAMBLE_MAX);
+}
+function renderJournalEntry(e) {
+  const filesClause = e.filesTouched.length > 0 ? ` (files: ${e.filesTouched.join(", ")})` : "";
+  return `- turn ${e.turn} (${e.agentId}): ${e.prompt} \u2192 ${e.replySummary}${filesClause}`;
+}
+function buildDeltaBriefing(entries, maxChars = BRIEFING_DEFAULT_MAX) {
+  if (entries.length === 0) return null;
+  const header = BRIEFING_HEADER;
+  const footer = BRIEFING_FOOTER;
+  const envelope = header.length + 1 + footer.length + 1;
+  const sorted = [...entries].sort((a, b) => a.turn - b.turn);
+  const lines = [];
+  let bodyLen = 0;
+  for (let i = sorted.length - 1; i >= 0; i--) {
+    const line = renderJournalEntry(sorted[i]);
+    const addedLen = line.length + (lines.length > 0 ? 1 : 0);
+    if (lines.length > 0 && envelope + bodyLen + addedLen > maxChars) break;
+    lines.unshift(line);
+    bodyLen += addedLen;
+  }
+  return [header, lines.join("\n"), footer].join("\n");
+}
+
+// src/agents/acp/squad-context.ts
+var SQUAD_CONTEXT_URI = "codeam://squad-context";
+var HANDOFF_MARKER = "[Session handoff]";
+var HANDOFF_TERMINATOR = "--- End of handoff context ---";
+function buildSquadContextBlock(text) {
+  return {
+    type: "resource",
+    resource: { uri: SQUAD_CONTEXT_URI, mimeType: "text/plain", text }
+  };
+}
+function isSquadContextBlock(block) {
+  return block.type === "resource" && block.resource.uri === SQUAD_CONTEXT_URI;
+}
+function looksLikeUnsupportedPromptShape(err) {
+  const code = err?.code;
+  if (code === -32602) return true;
+  const message = err instanceof Error ? err.message : String(err ?? "");
+  if (/invalid[ _]params|-32602/i.test(message)) return true;
+  return /\bresource\b/i.test(message) && /unsupported|not supported/i.test(message);
+}
+function skipWhile(lines, start2, keepGoing) {
+  let i = start2;
+  while (i < lines.length && keepGoing(lines[i])) i++;
+  return i;
+}
+function endOfTeamPreamble(lines, start2) {
+  if (lines[start2] !== TEAM_PREAMBLE_LINES[0]) return -1;
+  if (lines[start2 + 1] !== TEAM_PREAMBLE_LINES[1]) return -1;
+  return skipWhile(
+    lines,
+    start2 + 2,
+    (line) => TEAM_PREAMBLE_BULLET_RE.test(line) || TEAM_PREAMBLE_LINES.includes(line)
+  );
+}
+function endOfTerminatedBlock(lines, start2, terminator) {
+  for (let i = start2; i < lines.length; i++) {
+    if (lines[i].trimEnd() === terminator) return i + 1;
+  }
+  return -1;
+}
+function stripSquadContext(text) {
+  if (!text.includes(HANDOFF_MARKER) && !text.includes(BRIEFING_MARKER) && !text.includes(TEAM_PREAMBLE_MARKER)) {
+    return text;
+  }
+  const lines = text.split("\n");
+  const kept = [];
+  let i = 0;
+  let stripped = false;
+  while (i < lines.length) {
+    const line = lines[i];
+    if (line.startsWith(HANDOFF_MARKER)) {
+      const end = endOfTerminatedBlock(lines, i, HANDOFF_TERMINATOR);
+      if (end !== -1) {
+        i = end;
+        stripped = true;
+        continue;
+      }
+    } else if (line.startsWith(BRIEFING_MARKER)) {
+      const end = endOfTerminatedBlock(lines, i, BRIEFING_FOOTER);
+      if (end !== -1) {
+        i = end;
+        stripped = true;
+        continue;
+      }
+    } else if (line.startsWith(TEAM_PREAMBLE_MARKER)) {
+      const end = endOfTeamPreamble(lines, i);
+      if (end !== -1) {
+        i = end;
+        stripped = true;
+        continue;
+      }
+    }
+    kept.push(line);
+    i++;
+  }
+  if (!stripped) return text;
+  return kept.join("\n").trim();
+}
+
+// src/services/history.service.ts
 var historyRecordSchema = import_zod2.z.object({
   type: import_zod2.z.string().optional(),
   timestamp: import_zod2.z.union([import_zod2.z.string(), import_zod2.z.number()]).optional(),
@@ -28550,11 +28888,24 @@ function extractText3(content) {
   return "";
 }
 var CONVERSATION_BATCH_SIZE = 30;
+function scrubSquadContext(messages) {
+  const out2 = [];
+  for (const m of messages) {
+    const text = stripSquadContext(m.text);
+    if (text === m.text) {
+      out2.push(m);
+      continue;
+    }
+    if (text.length === 0) continue;
+    out2.push({ ...m, text });
+  }
+  return out2;
+}
 function parseJsonl(filePath) {
   const messages = [];
   let raw;
   try {
-    raw = fs65.readFileSync(filePath, "utf8");
+    raw = fs66.readFileSync(filePath, "utf8");
   } catch (err) {
     if (err.code !== "ENOENT") {
       log.warn("history:parseJsonl", `read failed for ${filePath}`, err);
@@ -28695,7 +29046,7 @@ var HistoryService = class _HistoryService {
     return this._quotaPercent === null || Date.now() - this._quotaFetchedAt > ttlMs;
   }
   get projectDir() {
-    return this.runtime.resolveHistoryDir(this.cwd) ?? path71.join(os55.homedir(), ".claude", "projects", encodeCwd(this.cwd));
+    return this.runtime.resolveHistoryDir(this.cwd) ?? path72.join(os56.homedir(), ".claude", "projects", encodeCwd(this.cwd));
   }
   /** Set the current Claude conversation ID (extracted from /cost command or session start) */
   setCurrentConversationId(id) {
@@ -28707,7 +29058,7 @@ var HistoryService = class _HistoryService {
   /** Return the current message count in the active conversation. */
   getCurrentMessageCount() {
     if (!this.currentConversationId) return 0;
-    const filePath = path71.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+    const filePath = path72.join(this.projectDir, `${this.currentConversationId}.jsonl`);
     return parseJsonl(filePath).length;
   }
   /**
@@ -28718,7 +29069,7 @@ var HistoryService = class _HistoryService {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
       if (!this.currentConversationId) return null;
-      const filePath = path71.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+      const filePath = path72.join(this.projectDir, `${this.currentConversationId}.jsonl`);
       const messages = parseJsonl(filePath);
       if (messages.length > previousCount) {
         for (let i = messages.length - 1; i >= previousCount; i--) {
@@ -28744,16 +29095,16 @@ var HistoryService = class _HistoryService {
     const dir = this.projectDir;
     const cutoff = this.bootTimeMs - _HistoryService.BIRTHTIME_GRACE_MS;
     try {
-      const files = fs65.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
+      const files = fs66.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
         try {
-          const stat3 = fs65.statSync(path71.join(dir, e.name));
+          const stat3 = fs66.statSync(path72.join(dir, e.name));
           return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
         } catch {
           return { name: e.name, mtime: 0, birthtime: 0 };
         }
       }).filter((f) => f.birthtime >= cutoff).sort((a, b) => b.mtime - a.mtime);
       if (files.length > 0) {
-        this.currentConversationId = path71.basename(files[0].name, ".jsonl");
+        this.currentConversationId = path72.basename(files[0].name, ".jsonl");
       }
     } catch {
     }
@@ -28787,13 +29138,13 @@ var HistoryService = class _HistoryService {
     const cutoff = this.bootTimeMs - _HistoryService.BIRTHTIME_GRACE_MS;
     let entries;
     try {
-      entries = fs65.readdirSync(dir, { withFileTypes: true });
+      entries = fs66.readdirSync(dir, { withFileTypes: true });
     } catch {
       return null;
     }
     const files = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
       try {
-        const stat3 = fs65.statSync(path71.join(dir, e.name));
+        const stat3 = fs66.statSync(path72.join(dir, e.name));
         return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
       } catch {
         return { name: e.name, mtime: 0, birthtime: 0 };
@@ -28802,12 +29153,12 @@ var HistoryService = class _HistoryService {
     if (files.length === 0) return null;
     const targetFile = this.currentConversationId ? `${this.currentConversationId}.jsonl` : files[0].name;
     if (!files.some((f) => f.name === targetFile)) return null;
-    return this.extractUsageFromFile(path71.join(dir, targetFile));
+    return this.extractUsageFromFile(path72.join(dir, targetFile));
   }
   extractUsageFromFile(filePath) {
     let raw;
     try {
-      raw = fs65.readFileSync(filePath, "utf8");
+      raw = fs66.readFileSync(filePath, "utf8");
     } catch {
       return null;
     }
@@ -28852,9 +29203,9 @@ var HistoryService = class _HistoryService {
     let totalCost = 0;
     let files;
     try {
-      files = fs65.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).filter((f) => {
+      files = fs66.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).filter((f) => {
         try {
-          return fs65.statSync(path71.join(projectDir, f)).mtimeMs >= monthStartMs;
+          return fs66.statSync(path72.join(projectDir, f)).mtimeMs >= monthStartMs;
         } catch {
           return false;
         }
@@ -28865,7 +29216,7 @@ var HistoryService = class _HistoryService {
     for (const file of files) {
       let raw;
       try {
-        raw = fs65.readFileSync(path71.join(projectDir, file), "utf8");
+        raw = fs66.readFileSync(path72.join(projectDir, file), "utf8");
       } catch {
         continue;
       }
@@ -28944,7 +29295,7 @@ var HistoryService = class _HistoryService {
     if (this.runtime.resolveHistoryFile) {
       return this.runtime.resolveHistoryFile(this.cwd, sessionId);
     }
-    return path71.join(this.projectDir, `${sessionId}.jsonl`);
+    return path72.join(this.projectDir, `${sessionId}.jsonl`);
   }
   /**
    * Parse a conversation's messages from disk, agent-aware. Claude uses the
@@ -28956,6 +29307,10 @@ var HistoryService = class _HistoryService {
    * convention as parseJsonl.
    */
   readConversation(sessionId) {
+    const agentId = this.runtime.id;
+    return scrubSquadContext(this.readConversationRaw(sessionId)).map((m) => ({ ...m, agentId }));
+  }
+  readConversationRaw(sessionId) {
     if (this.runtime.resolveHistoryFile) {
       const filePath = this.runtime.resolveHistoryFile(this.cwd, sessionId);
       if (!filePath) return [];
@@ -28978,7 +29333,7 @@ var HistoryService = class _HistoryService {
         };
       });
     }
-    return parseJsonl(path71.join(this.projectDir, `${sessionId}.jsonl`));
+    return parseJsonl(path72.join(this.projectDir, `${sessionId}.jsonl`));
   }
   async loadConversation(sessionId) {
     const messages = this.readConversation(sessionId);
@@ -29046,7 +29401,7 @@ var HistoryService = class _HistoryService {
     if (!filePath) return false;
     let mtimeMs;
     try {
-      mtimeMs = fs65.statSync(filePath).mtimeMs;
+      mtimeMs = fs66.statSync(filePath).mtimeMs;
     } catch {
       return false;
     }
@@ -29121,10 +29476,10 @@ var HistoryService = class _HistoryService {
 
 // src/agents/acp/client.ts
 var import_node_child_process29 = require("child_process");
-var fs66 = __toESM(require("fs/promises"));
+var fs67 = __toESM(require("fs/promises"));
 var fsSync = __toESM(require("fs"));
-var os57 = __toESM(require("os"));
-var path73 = __toESM(require("path"));
+var os58 = __toESM(require("os"));
+var path74 = __toESM(require("path"));
 var import_node_stream = require("stream");
 
 // ../../node_modules/@agentclientprotocol/sdk/dist/schema/index.js
@@ -33150,8 +33505,8 @@ function createIdleTimeout(idleMs, makeError, activeIdleMs = idleMs) {
 }
 
 // src/agents/acp/internal-paths.ts
-var path72 = __toESM(require("path"));
-var os56 = __toESM(require("os"));
+var path73 = __toESM(require("path"));
+var os57 = __toESM(require("os"));
 var INTERNAL_TOKENS = [".codeam", "house-claude"];
 var SELF_HOSTED_WORKSPACE_RE = /\.codeam[/\\]self-hosted/gi;
 function textReferencesInternal(text) {
@@ -33159,13 +33514,13 @@ function textReferencesInternal(text) {
   const scrubbed = text.replace(SELF_HOSTED_WORKSPACE_RE, " ");
   return INTERNAL_TOKENS.some((t2) => scrubbed.includes(t2));
 }
-function pathIsInternal(p2, homeDir2 = os56.homedir()) {
+function pathIsInternal(p2, homeDir2 = os57.homedir()) {
   if (!p2) return false;
-  const abs = path72.resolve(p2);
-  const home = path72.resolve(homeDir2);
-  const within = (root) => abs === root || abs.startsWith(root + path72.sep);
-  if (within(path72.join(home, ".codeam", "self-hosted"))) return false;
-  return within(path72.join(home, ".codeam")) || within(path72.join(home, ".beads")) || abs === path72.join(home, ".codeam-host.log") || abs.includes(`${path72.sep}house-claude${path72.sep}`) || abs.endsWith(`${path72.sep}house-claude`);
+  const abs = path73.resolve(p2);
+  const home = path73.resolve(homeDir2);
+  const within = (root) => abs === root || abs.startsWith(root + path73.sep);
+  if (within(path73.join(home, ".codeam", "self-hosted"))) return false;
+  return within(path73.join(home, ".codeam")) || within(path73.join(home, ".beads")) || abs === path73.join(home, ".codeam-host.log") || abs.includes(`${path73.sep}house-claude${path73.sep}`) || abs.endsWith(`${path73.sep}house-claude`);
 }
 function toolCallReferencesInternal(call) {
   if (textReferencesInternal(call.title)) return true;
@@ -34124,7 +34479,7 @@ var AcpClient = class {
           throw new RequestError(-32002, GUARDRAIL_SECRET_READ_BLOCK_REASON, { uri: params.path });
         }
         try {
-          const content = await fs66.readFile(params.path, "utf8");
+          const content = await fs67.readFile(params.path, "utf8");
           return applyLineRange(content, params.line ?? null, params.limit ?? null);
         } catch (err) {
           const code = err.code;
@@ -34147,7 +34502,7 @@ var AcpClient = class {
           throw new RequestError(-32002, INTERNAL_BLOCK_REASON, { uri: params.path });
         }
         try {
-          await fs66.writeFile(params.path, params.content, "utf8");
+          await fs67.writeFile(params.path, params.content, "utf8");
           return {};
         } catch (err) {
           const code = err.code;
@@ -34207,29 +34562,29 @@ function applyLineRange(content, line, limit) {
   return { content: lines.slice(start2, end).join("\n") };
 }
 function knownAgentBinaryDirs() {
-  const home = os57.homedir();
+  const home = os58.homedir();
   const out2 = [];
   out2.push("/tmp/codeam-node20/bin");
   for (const root of [
     "/usr/local/share/nvm/versions/node",
-    path73.join(home, ".nvm/versions/node")
+    path74.join(home, ".nvm/versions/node")
   ]) {
     try {
       for (const child of fsSync.readdirSync(root)) {
-        out2.push(path73.join(root, child, "bin"));
+        out2.push(path74.join(root, child, "bin"));
       }
     } catch {
     }
   }
-  out2.push(path73.join(home, ".volta/bin"));
+  out2.push(path74.join(home, ".volta/bin"));
   out2.push("/usr/local/bin");
   out2.push("/usr/bin");
-  out2.push(path73.join(home, ".local/bin"));
-  out2.push(path73.join(home, "bin"));
+  out2.push(path74.join(home, ".local/bin"));
+  out2.push(path74.join(home, "bin"));
   if (process.platform === "win32") {
     const { LOCALAPPDATA, APPDATA } = process.env;
-    if (LOCALAPPDATA) out2.push(path73.join(LOCALAPPDATA, "cursor-agent"));
-    if (APPDATA) out2.push(path73.join(APPDATA, "npm"));
+    if (LOCALAPPDATA) out2.push(path74.join(LOCALAPPDATA, "cursor-agent"));
+    if (APPDATA) out2.push(path74.join(APPDATA, "npm"));
   }
   return out2.filter((p2) => {
     try {
@@ -34241,7 +34596,7 @@ function knownAgentBinaryDirs() {
 }
 function expandPathForAgentBinaries(existingPath) {
   const existing = new Set(
-    existingPath.split(path73.delimiter).filter((p2) => p2.length > 0)
+    existingPath.split(path74.delimiter).filter((p2) => p2.length > 0)
   );
   const additions = [];
   for (const dir of knownAgentBinaryDirs()) {
@@ -34251,7 +34606,7 @@ function expandPathForAgentBinaries(existingPath) {
     }
   }
   if (additions.length === 0) return existingPath;
-  return [...additions, existingPath].filter((p2) => p2.length > 0).join(path73.delimiter);
+  return [...additions, existingPath].filter((p2) => p2.length > 0).join(path74.delimiter);
 }
 
 // src/agents/acp/headroom-budget-proxy.ts
@@ -34370,7 +34725,7 @@ function makeSerializedSwitchEmitter(post2) {
     return chain;
   };
 }
-async function performAgentSwitch(deps, rawAgentId) {
+async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   const from = deps.currentAgent();
   const target = resolveSwitchTarget(rawAgentId, from);
   if (!target.ok) {
@@ -34386,22 +34741,28 @@ async function performAgentSwitch(deps, rawAgentId) {
   };
   log.info("switchAgent", `switch requested ${from} \u2192 ${agentId}`);
   void emitStatus({ state: "switching", agentId, fromAgentId: from });
-  void emitStep("credential");
-  const cred = await deps.fetchCredential(agentId);
-  if (!cred) {
-    return fail2(
-      `No linked credential for ${displayName(agentId)}. Link it in Profile \u203A Agents first.`
-    );
+  let installScript;
+  if (!fastPath.skipProvision) {
+    void emitStep("credential");
+    const cred = await deps.fetchCredential(agentId);
+    if (!cred) {
+      return fail2(
+        `No linked credential for ${displayName(agentId)}. Link it in Profile \u203A Agents first.`
+      );
+    }
+    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.`);
+    }
+    installScript = cred.installScript;
   }
-  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 (!fastPath.skipInstall) {
+    void emitStep("install");
+    const bin = await deps.ensureBinary(agentId, installScript);
+    if (!bin.ok) return fail2(bin.error);
   }
-  void emitStep("install");
-  const bin = await deps.ensureBinary(agentId, cred.installScript);
-  if (!bin.ok) return fail2(bin.error);
   void emitStep("restart");
   try {
     await deps.swapRuntime(agentId);
@@ -34727,6 +35088,13 @@ var AcpPublisher = class {
    * `mode: 'replace'` so a re-send overrides any stale persisted
    * version — important for the ACP path because each turn we ship
    * the cumulative messages, not a delta.
+   *
+   * Each message may carry its OWN `agentId` — the agent that PRODUCED that
+   * turn. The top-level `agentId` only keys the backend's per-agent
+   * conversation bucket, so without the per-message field a multi-agent
+   * session's reloaded history collapsed to whichever agent happened to be
+   * active (the v1 limitation, codeagent-egai). Additive: older backends
+   * ignore it, older CLIs simply omit it.
    */
   async pushConversation(args2) {
     const url2 = `${this.apiBase}/api/sessions/conversation`;
@@ -34873,17 +35241,106 @@ function commonPrefixLength(a, b) {
   return i;
 }
 
+// src/agents/acp/handoff-protocol.ts
+var REASON_MAX = 1e3;
+var PROMPT_MAX2 = 8e3;
+var FENCE_OPEN = "```" + HANDOFF_FENCE_TAG;
+var FENCE_RE = new RegExp("```" + HANDOFF_FENCE_TAG + "\\s*\\n([\\s\\S]*?)\\n?```", "g");
+var OUTER_FENCE_RE = /(`{4,})[\s\S]*?\1/g;
+var outerFencePlaceholder = (i) => `@@HANDOFF_MASK_${i}@@`;
+function maskOuterFences(text) {
+  const spans = [];
+  const masked = text.replace(OUTER_FENCE_RE, (m) => {
+    const token = outerFencePlaceholder(spans.length);
+    spans.push(m);
+    return token;
+  });
+  const restore = (s) => spans.reduce((acc, span, i) => acc.split(outerFencePlaceholder(i)).join(span), s);
+  return { masked, restore };
+}
+function parseProposal(raw, currentAgent, validTargets) {
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    log.debug("handoffProtocol", "dropped proposal: malformed JSON");
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    log.debug("handoffProtocol", "dropped proposal: not a JSON object");
+    return null;
+  }
+  const { to, reason, prompt } = parsed;
+  if (typeof to !== "string" || to.length === 0) {
+    log.debug("handoffProtocol", 'dropped proposal: missing/invalid "to"');
+    return null;
+  }
+  if (!validTargets.has(to)) {
+    log.debug("handoffProtocol", `dropped proposal: unknown target "${to}"`);
+    return null;
+  }
+  if (to === currentAgent) {
+    log.debug("handoffProtocol", "dropped proposal: target is the current agent");
+    return null;
+  }
+  if (typeof reason !== "string" || reason.length === 0 || reason.length > REASON_MAX) {
+    log.debug("handoffProtocol", 'dropped proposal: invalid "reason"');
+    return null;
+  }
+  if (typeof prompt !== "string" || prompt.length === 0 || prompt.length > PROMPT_MAX2) {
+    log.debug("handoffProtocol", 'dropped proposal: invalid "prompt"');
+    return null;
+  }
+  return { to, reason, prompt };
+}
+function stripFences(masked) {
+  const stripped = masked.replace(FENCE_RE, "");
+  return stripped.replace(/(?:\r?\n){3,}/g, "\n\n").trim();
+}
+function extractHandoffProposal(text, currentAgent, validTargets) {
+  const { masked, restore } = maskOuterFences(text);
+  const matches = [...masked.matchAll(FENCE_RE)];
+  if (matches.length === 0) {
+    return { cleanText: text, proposal: null };
+  }
+  const last = matches[matches.length - 1];
+  const proposal = parseProposal(last[1].trim(), currentAgent, validTargets);
+  const cleanText = restore(stripFences(masked));
+  return { cleanText, proposal };
+}
+function stripHandoffFences(text) {
+  const { masked, restore } = maskOuterFences(text);
+  if (masked.search(FENCE_RE) === -1) {
+    return text;
+  }
+  return restore(stripFences(masked));
+}
+function handoffFenceStartMasked(text) {
+  const { masked } = maskOuterFences(text);
+  if (masked.indexOf(FENCE_OPEN) === -1) return -1;
+  const spans = [];
+  for (const m of text.matchAll(OUTER_FENCE_RE)) {
+    const start2 = m.index ?? 0;
+    spans.push({ start: start2, end: start2 + m[0].length });
+  }
+  const insideSpan = (idx) => spans.some((s) => idx >= s.start && idx < s.end);
+  for (let i = text.indexOf(FENCE_OPEN); i !== -1; i = text.indexOf(FENCE_OPEN, i + 1)) {
+    if (!insideSpan(i)) return i;
+  }
+  return -1;
+}
+
 // src/agents/acp/onboarding.ts
 var import_child_process28 = require("child_process");
-var fs67 = __toESM(require("fs"));
-var os58 = __toESM(require("os"));
-var path74 = __toESM(require("path"));
+var fs68 = __toESM(require("fs"));
+var os59 = __toESM(require("os"));
+var path75 = __toESM(require("path"));
 var _onboardingSeam = {
-  markerPath: (sessionId) => path74.join(os58.homedir(), ".codeam", "welcomed", `${sessionId}.done`),
-  exists: (p2) => fs67.existsSync(p2),
+  markerPath: (sessionId) => path75.join(os59.homedir(), ".codeam", "welcomed", `${sessionId}.done`),
+  exists: (p2) => fs68.existsSync(p2),
   write: (p2) => {
-    fs67.mkdirSync(path74.dirname(p2), { recursive: true });
-    fs67.writeFileSync(p2, "");
+    fs68.mkdirSync(path75.dirname(p2), { recursive: true });
+    fs68.writeFileSync(p2, "");
   },
   disabled: () => {
     const v = process.env.CODEAM_ONBOARDING_DISABLED;
@@ -34920,7 +35377,7 @@ function resolveRepoName(cwd) {
       if (name) return name;
     }
   }
-  const base = path74.basename(cwd || "");
+  const base = path75.basename(cwd || "");
   if (base && !isUuid(base)) return base;
   return "this project";
 }
@@ -35178,13 +35635,13 @@ var import_crypto5 = require("crypto");
 
 // src/services/turn-files/git-changeset.ts
 var import_child_process29 = require("child_process");
-var fs69 = __toESM(require("fs/promises"));
-var path76 = __toESM(require("path"));
+var fs70 = __toESM(require("fs/promises"));
+var path77 = __toESM(require("path"));
 
 // src/services/turn-files/review-ignore.ts
 var import_ignore2 = __toESM(require("ignore"));
-var fs68 = __toESM(require("fs"));
-var path75 = __toESM(require("path"));
+var fs69 = __toESM(require("fs"));
+var path76 = __toESM(require("path"));
 var CURATED_REVIEW_IGNORE = [
   // Google Cloud SDK (the incident) — installs a huge python tree.
   "google-cloud-sdk/",
@@ -35223,7 +35680,7 @@ var CURATED_REVIEW_IGNORE = [
 function makeReviewIgnore(repoRoot) {
   const ig = (0, import_ignore2.default)().add(CURATED_REVIEW_IGNORE);
   try {
-    const custom = fs68.readFileSync(path75.join(repoRoot, ".codeam", "reviewignore"), "utf8");
+    const custom = fs69.readFileSync(path76.join(repoRoot, ".codeam", "reviewignore"), "utf8");
     ig.add(custom);
   } catch {
   }
@@ -35268,7 +35725,7 @@ async function collectRepoChangeset(opts) {
     let stats;
     if (!truncated && row.fileStatus === "added" && numstatEntry === void 0) {
       const lineCount = await readUntrackedLineCount(
-        path76.join(opts.repoRoot, row.filePath)
+        path77.join(opts.repoRoot, row.filePath)
       );
       stats = { added: lineCount, removed: 0 };
     } else {
@@ -35299,7 +35756,7 @@ function readUntrackedLineCount(absPath) {
 }
 async function defaultReadUntrackedLineCount(absPath) {
   try {
-    const content = await fs69.readFile(absPath, "utf8");
+    const content = await fs70.readFile(absPath, "utf8");
     let count = 0;
     let pos = -1;
     while ((pos = content.indexOf("\n", pos + 1)) !== -1) {
@@ -35391,7 +35848,7 @@ function defaultRunGit(cwd, args2) {
   });
 }
 async function discoverRepos(workingDir, maxDepth = 4) {
-  const fs79 = await import("fs/promises");
+  const fs80 = await import("fs/promises");
   const out2 = [];
   await walk(workingDir, 0);
   return out2;
@@ -35399,7 +35856,7 @@ async function discoverRepos(workingDir, maxDepth = 4) {
     if (depth > maxDepth) return;
     let entries = [];
     try {
-      const dirents = await fs79.readdir(dir, { withFileTypes: true });
+      const dirents = await fs80.readdir(dir, { withFileTypes: true });
       entries = dirents.filter((d3) => !d3.name.startsWith(".") || d3.name === ".git").map((d3) => ({ name: d3.name, isDirectory: d3.isDirectory() }));
     } catch {
       return;
@@ -35410,8 +35867,8 @@ async function discoverRepos(workingDir, maxDepth = 4) {
     if (hasGit) {
       out2.push({
         repoRoot: dir,
-        repoPath: path76.relative(workingDir, dir),
-        repoName: path76.basename(dir)
+        repoPath: path77.relative(workingDir, dir),
+        repoName: path77.basename(dir)
       });
       return;
     }
@@ -35419,14 +35876,14 @@ async function discoverRepos(workingDir, maxDepth = 4) {
       if (!entry.isDirectory) continue;
       if (entry.name === "node_modules") continue;
       if (entry.name === "dist" || entry.name === "build") continue;
-      await walk(path76.join(dir, entry.name), depth + 1);
+      await walk(path77.join(dir, entry.name), depth + 1);
     }
   }
 }
 
 // src/services/turn-files/files-outbox.ts
-var fs70 = __toESM(require("fs/promises"));
-var path77 = __toESM(require("path"));
+var fs71 = __toESM(require("fs/promises"));
+var path78 = __toESM(require("path"));
 var import_os12 = require("os");
 var HOME_OUTBOX_DIR = ".codeam/outbox";
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
@@ -35459,16 +35916,16 @@ var FilesOutbox = class {
   backoffIndex = 0;
   stopped = false;
   constructor(opts) {
-    const base = opts.baseDir ?? path77.join(homeDir(), HOME_OUTBOX_DIR);
-    this.filePath = path77.join(base, `${opts.sessionId}.jsonl`);
+    const base = opts.baseDir ?? path78.join(homeDir(), HOME_OUTBOX_DIR);
+    this.filePath = path78.join(base, `${opts.sessionId}.jsonl`);
     this.post = opts.post;
     this.autoSchedule = opts.autoSchedule !== false;
   }
   /** Persist the entry to disk and trigger a flush. Returns once the
    *  line is durable on disk (not once the POST succeeds). */
   async enqueue(entry) {
-    await fs70.mkdir(path77.dirname(this.filePath), { recursive: true });
-    await fs70.appendFile(this.filePath, JSON.stringify(entry) + "\n", "utf8");
+    await fs71.mkdir(path78.dirname(this.filePath), { recursive: true });
+    await fs71.appendFile(this.filePath, JSON.stringify(entry) + "\n", "utf8");
     this.backoffIndex = 0;
     if (this.autoSchedule) this.scheduleFlush(0);
   }
@@ -35559,7 +36016,7 @@ var FilesOutbox = class {
   async readAll() {
     let raw = "";
     try {
-      raw = await fs70.readFile(this.filePath, "utf8");
+      raw = await fs71.readFile(this.filePath, "utf8");
     } catch {
       return [];
     }
@@ -35583,12 +36040,12 @@ var FilesOutbox = class {
   async rewrite(entries) {
     const tmpPath = `${this.filePath}.${process.pid}.tmp`;
     if (entries.length === 0) {
-      await fs70.unlink(this.filePath).catch(() => void 0);
+      await fs71.unlink(this.filePath).catch(() => void 0);
       return;
     }
     const payload = entries.map((e) => JSON.stringify(e)).join("\n") + "\n";
-    await fs70.writeFile(tmpPath, payload, "utf8");
-    await fs70.rename(tmpPath, this.filePath);
+    await fs71.writeFile(tmpPath, payload, "utf8");
+    await fs71.rename(tmpPath, this.filePath);
   }
 };
 function applyJitter(ms) {
@@ -35650,11 +36107,34 @@ var TurnFileAggregator = class {
    */
   baselineByKey = /* @__PURE__ */ new Map();
   baselineCaptured = false;
+  /**
+   * The file paths (relative to their repo root) that the MOST RECENT
+   * `flushTurn()` call found novel — i.e. what it just enqueued (or would
+   * have enqueued had the batch not exactly matched the baseline). Updated
+   * unconditionally on every flush, including a no-op one (empties back
+   * out), so `peekTurnPaths()` never returns paths from more than one
+   * flush cycle ago. Not touched by the baseline-capture flush (it returns
+   * before `novel` is computed), which is correct — pre-pair files aren't
+   * "this session's" changes.
+   */
+  lastTurnPaths = [];
   /** Stop the outbox scheduler. Idempotent. */
   stop() {
     this.stopped = true;
     this.outbox.stop();
   }
+  /**
+   * Non-destructive read of the paths the MOST RECENT `flushTurn()` call
+   * found novel — does NOT trigger a scan or clear anything itself. The
+   * squad journal (`recordSquadTurn` in `command-handlers.ts`) `await`s
+   * `flushTurn()` for the turn it's about to record BEFORE calling this, so
+   * the read reflects THAT turn's paths, not a stale one left over from
+   * whatever flushed previously. Empty on a session's very first turn
+   * (still capturing the pre-pair baseline) or a chat-only turn.
+   */
+  peekTurnPaths() {
+    return [...this.lastTurnPaths];
+  }
   /**
    * Run the discovery + git collection + POST pipeline for one
    * turn. Errors are swallowed (logged) so an agent never blocks on a
@@ -35695,6 +36175,7 @@ var TurnFileAggregator = class {
         if (!base) return true;
         return base.linesAdded !== f.linesAdded || base.linesRemoved !== f.linesRemoved || base.fileStatus !== f.fileStatus;
       });
+      this.lastTurnPaths = novel.map((f) => f.filePath);
       if (novel.length === 0) {
         log.trace(
           "turnFiles",
@@ -35714,10 +36195,7 @@ var TurnFileAggregator = class {
         await this.outbox.enqueue(entry);
       }
     } catch (err) {
-      log.warn(
-        "turnFiles",
-        `flushTurn failed: ${err.message ?? String(err)}`
-      );
+      log.warn("turnFiles", `flushTurn failed: ${err.message ?? String(err)}`);
     }
   }
   /**
@@ -36044,8 +36522,8 @@ async function postBudgetReached(opts, fetchImpl = fetch) {
 
 // src/packs/gates.ts
 var import_node_child_process30 = require("child_process");
-var fs71 = __toESM(require("fs"));
-var path78 = __toESM(require("path"));
+var fs72 = __toESM(require("fs"));
+var path79 = __toESM(require("path"));
 var defaultCommandRunner = (file, args2, cwd, timeoutMs) => new Promise((resolve9) => {
   (0, import_node_child_process30.execFile)(
     file,
@@ -36082,14 +36560,14 @@ var NO_TEST_PLACEHOLDER = 'echo "Error: no test specified"';
 var CHECKS_TIMEOUT_MS = 5 * 6e4;
 function detectChecksCommand(cwd) {
   try {
-    const cfg = JSON.parse(fs71.readFileSync(path78.join(cwd, ".codeam", "pack.json"), "utf8"));
+    const cfg = JSON.parse(fs72.readFileSync(path79.join(cwd, ".codeam", "pack.json"), "utf8"));
     if (typeof cfg.checksCommand === "string" && cfg.checksCommand.trim().length > 0) {
       return cfg.checksCommand.trim();
     }
   } catch {
   }
   try {
-    const pkg = JSON.parse(fs71.readFileSync(path78.join(cwd, "package.json"), "utf8"));
+    const pkg = JSON.parse(fs72.readFileSync(path79.join(cwd, "package.json"), "utf8"));
     const test = pkg.scripts?.test;
     if (typeof test === "string" && test.trim().length > 0 && !test.includes(NO_TEST_PLACEHOLDER)) {
       return "npm test";
@@ -36107,39 +36585,39 @@ ${res.stderr}`.trim();
 }
 
 // src/packs/run-store.ts
-var fs72 = __toESM(require("fs"));
-var path79 = __toESM(require("path"));
+var fs73 = __toESM(require("fs"));
+var path80 = __toESM(require("path"));
 var crypto5 = __toESM(require("crypto"));
 function packsDir(cwd) {
-  return path79.join(cwd, ".codeam", "packs");
+  return path80.join(cwd, ".codeam", "packs");
 }
 function runDir(cwd, runId) {
-  return path79.join(packsDir(cwd), runId);
+  return path80.join(packsDir(cwd), runId);
 }
 function newRunId() {
   return `pk_${Date.now().toString(36)}_${crypto5.randomBytes(4).toString("hex")}`;
 }
 function writeJsonAtomic(file, value) {
-  fs72.mkdirSync(path79.dirname(file), { recursive: true });
+  fs73.mkdirSync(path80.dirname(file), { recursive: true });
   const tmp = `${file}.tmp`;
-  fs72.writeFileSync(tmp, JSON.stringify(value, null, 2));
-  fs72.renameSync(tmp, file);
+  fs73.writeFileSync(tmp, JSON.stringify(value, null, 2));
+  fs73.renameSync(tmp, file);
 }
 function saveRun(cwd, state) {
-  writeJsonAtomic(path79.join(runDir(cwd, state.runId), "run.json"), state);
+  writeJsonAtomic(path80.join(runDir(cwd, state.runId), "run.json"), state);
 }
 function saveStageHandoff(cwd, runId, stageIndex, role, handoff) {
   const name = `${String(stageIndex + 1).padStart(2, "0")}-${role}.json`;
-  writeJsonAtomic(path79.join(runDir(cwd, runId), name), handoff);
+  writeJsonAtomic(path80.join(runDir(cwd, runId), name), handoff);
 }
 function loadLatestRun(cwd) {
   try {
     const dir = packsDir(cwd);
-    const entries = fs72.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
+    const entries = fs73.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name).sort();
     for (let i = entries.length - 1; i >= 0; i--) {
-      const file = path79.join(dir, entries[i], "run.json");
+      const file = path80.join(dir, entries[i], "run.json");
       try {
-        const parsed = JSON.parse(fs72.readFileSync(file, "utf8"));
+        const parsed = JSON.parse(fs73.readFileSync(file, "utf8"));
         if (parsed && typeof parsed.runId === "string") return parsed;
       } catch {
       }
@@ -36150,17 +36628,17 @@ function loadLatestRun(cwd) {
 }
 function ensureLedgerIgnored(cwd) {
   try {
-    const gitDir = path79.join(cwd, ".git");
-    if (!fs72.existsSync(gitDir)) return;
-    const exclude = path79.join(gitDir, "info", "exclude");
+    const gitDir = path80.join(cwd, ".git");
+    if (!fs73.existsSync(gitDir)) return;
+    const exclude = path80.join(gitDir, "info", "exclude");
     let existing = "";
     try {
-      existing = fs72.readFileSync(exclude, "utf8");
+      existing = fs73.readFileSync(exclude, "utf8");
     } catch {
     }
     if (existing.includes(".codeam/packs/")) return;
-    fs72.mkdirSync(path79.dirname(exclude), { recursive: true });
-    fs72.writeFileSync(exclude, `${existing.trimEnd()}
+    fs73.mkdirSync(path80.dirname(exclude), { recursive: true });
+    fs73.writeFileSync(exclude, `${existing.trimEnd()}
 .codeam/packs/
 `.trimStart());
   } catch {
@@ -36713,6 +37191,56 @@ async function detectRepoStack(cwd, runtime) {
   }
 }
 
+// src/agents/acp/coderabbit-mention.ts
+var CODERABBIT_AGENT_ID = "coderabbit";
+var CODERABBIT_NOT_LINKED_MESSAGE = "Link CodeRabbit in Profile \u203A Your Squad first.";
+var CODERABBIT_NO_CUSTOM_INSTRUCTIONS_NOTICE = "CodeRabbit reviews your current changes \u2014 custom instructions aren't supported yet.";
+function hasCustomInstructions(prompt) {
+  return prompt.replace(/@coderabbit\b/gi, "").trim().length > 0;
+}
+function composeReviewOutput(markdown, custom) {
+  const body = markdown.trim().length > 0 ? markdown.trim() : "CodeRabbit found no issues to report.";
+  return custom ? `${CODERABBIT_NO_CUSTOM_INSTRUCTIONS_NOTICE}
+
+${body}` : body;
+}
+function defaultRunReview(input) {
+  return new CoderabbitRuntimeStrategy(createOsStrategy()).runOneShot(input);
+}
+async function runCoderabbitMentionReview(deps = {}) {
+  const configure = deps.configure ?? configureCoderabbit;
+  const runReview = deps.runReview ?? defaultRunReview;
+  try {
+    const status2 = await configure({ action: "status" });
+    if (!status2.loggedIn) {
+      const cred = deps.fetchCredential ? await deps.fetchCredential() : null;
+      if (!cred) return { ok: false, error: CODERABBIT_NOT_LINKED_MESSAGE };
+      const provisioned = await configure({
+        action: "provision",
+        provisionCredential: cred
+      });
+      if (!provisioned.loggedIn) {
+        return { ok: false, error: provisioned.error ?? CODERABBIT_NOT_LINKED_MESSAGE };
+      }
+    }
+    const result = await configure({ action: "review" }, { runReview });
+    if (result.error) return { ok: false, error: result.error };
+    return { ok: true, markdown: result.review?.markdown ?? "" };
+  } catch (err) {
+    return {
+      ok: false,
+      error: err instanceof Error ? err.message : "CodeRabbit review failed"
+    };
+  }
+}
+function logMentionOutcome(result) {
+  if (result.ok) {
+    log.info("acpRunner", `squad: coderabbit review completed (${result.markdown.length} chars)`);
+  } else {
+    log.warn("acpRunner", `squad: coderabbit review failed: ${result.error}`);
+  }
+}
+
 // src/agents/acp/command-handlers.ts
 var import_node_child_process31 = require("child_process");
 
@@ -36751,35 +37279,35 @@ function buildAcpPromptBlocks(payload) {
 }
 
 // src/agents/agent-standard.ts
-var fs74 = __toESM(require("fs"));
-var path81 = __toESM(require("path"));
-var os59 = __toESM(require("os"));
-function ensureAgentStandard(homeDir2 = os59.homedir()) {
+var fs75 = __toESM(require("fs"));
+var path82 = __toESM(require("path"));
+var os60 = __toESM(require("os"));
+function ensureAgentStandard(homeDir2 = os60.homedir()) {
   try {
-    const file = path81.join(homeDir2, ".claude", "CLAUDE.md");
+    const file = path82.join(homeDir2, ".claude", "CLAUDE.md");
     let existing = "";
     try {
-      existing = fs74.readFileSync(file, "utf8");
+      existing = fs75.readFileSync(file, "utf8");
     } catch {
     }
     if (existing.includes(AGENT_STANDARD_MARKER)) return;
-    fs74.mkdirSync(path81.dirname(file), { recursive: true });
+    fs75.mkdirSync(path82.dirname(file), { recursive: true });
     const next = existing.trim() ? `${existing.trimEnd()}
 
 ${AGENT_STANDARD_BLOCK}
 ` : `${AGENT_STANDARD_BLOCK}
 `;
-    fs74.writeFileSync(file, next);
+    fs75.writeFileSync(file, next);
   } catch {
   }
 }
 var _agentStandardSeam = {
   isLocalSession: () => isLocalSession(),
-  markerPath: (sessionId) => path81.join(os59.homedir(), ".codeam", "agent-standard", `${sessionId}.done`),
-  exists: (p2) => fs74.existsSync(p2),
+  markerPath: (sessionId) => path82.join(os60.homedir(), ".codeam", "agent-standard", `${sessionId}.done`),
+  exists: (p2) => fs75.existsSync(p2),
   write: (p2) => {
-    fs74.mkdirSync(path81.dirname(p2), { recursive: true });
-    fs74.writeFileSync(p2, "");
+    fs75.mkdirSync(path82.dirname(p2), { recursive: true });
+    fs75.writeFileSync(p2, "");
   }
 };
 function isClaude(agent) {
@@ -36883,27 +37411,228 @@ async function beadsActionH(ctx) {
   }
   return;
 }
+function rebindSessionHandles(ctx, outcome) {
+  Object.assign(ctx, outcome.handles);
+  return outcome;
+}
+async function routeSquadTask(ctx, target) {
+  const { squad, routeToAgent } = ctx;
+  if (!routeToAgent) {
+    return { ok: false, error: "Routing to another agent is not supported on this session." };
+  }
+  const roster = squad?.roster;
+  if (roster && !roster.agents.some((a) => a.agentId === target)) {
+    return { ok: false, error: `Unknown agent '${target}' \u2014 not in your squad.` };
+  }
+  const member = squad?.member(target);
+  const fastPathArmed = Boolean(member && (member.provisioned || member.binaryVerified));
+  let { result } = rebindSessionHandles(ctx, await routeToAgent(target));
+  if (!result.ok && fastPathArmed) {
+    log.warn(
+      "acpRunner",
+      `squad: fast-path route to ${target} failed (${result.error}) \u2014 retrying full path`
+    );
+    ({ result } = rebindSessionHandles(ctx, await routeToAgent(target, { skipFastPath: true })));
+  }
+  if (!result.ok) {
+    return { ok: false, error: result.error ?? `Couldn't switch to ${target}.` };
+  }
+  return { ok: true };
+}
+function collectSquadContext(ctx) {
+  const pieces = [];
+  const { squad, opts } = ctx;
+  if (squad) {
+    const member = squad.member(opts.agent);
+    const roster = squad.roster;
+    if (roster && member.lastTurnIndex === 0) {
+      const preamble = buildTeamPreamble(roster, opts.agent, {
+        handoffInstructions: roster.handoffsEnabled === true
+      });
+      if (preamble) pieces.push(preamble);
+    }
+    if (squad.turnCount() > member.lastTurnIndex) {
+      const otherEntries = squad.entriesSince(member.lastTurnIndex).filter((e) => e.agentId !== opts.agent);
+      const briefing = buildDeltaBriefing(otherEntries);
+      if (briefing) pieces.push(briefing);
+    }
+  }
+  if (ctx.pendingHandoff?.current) {
+    pieces.push(ctx.pendingHandoff.current);
+    ctx.pendingHandoff.current = null;
+  }
+  return pieces;
+}
+function squadContextMode(ctx) {
+  return ctx.squad?.member(ctx.opts.agent).contextTextFallback === true ? "text" : "resource";
+}
+function applySquadContext(blocks, pieces, mode) {
+  if (pieces.length === 0) return;
+  if (mode === "resource") {
+    blocks.unshift(buildSquadContextBlock(pieces.join("\n\n")));
+    return;
+  }
+  for (let i = pieces.length - 1; i >= 0; i--) blocks.unshift({ type: "text", text: pieces[i] });
+}
+async function promptWithContextFallback(ctx, client3, blocks, pieces) {
+  try {
+    return await client3.prompt(blocks);
+  } catch (err) {
+    if (pieces.length === 0 || blocks.length === 0 || !isSquadContextBlock(blocks[0]) || !looksLikeUnsupportedPromptShape(err)) {
+      throw err;
+    }
+    log.warn(
+      "acpRunner",
+      `squad: ${ctx.opts.agent} rejected the native squad-context resource block (${describeError(err)}) \u2014 retrying once with legacy text blocks`
+    );
+    if (ctx.squad) ctx.squad.member(ctx.opts.agent).contextTextFallback = true;
+    blocks.shift();
+    applySquadContext(blocks, pieces, "text");
+    return await client3.prompt(blocks);
+  }
+}
+function recordSquadTurn(ctx, prompt, replySummary) {
+  const { squad, opts, turnFiles } = ctx;
+  if (!squad) return;
+  squad.recordTurn({
+    agentId: opts.agent,
+    prompt,
+    replySummary,
+    // TurnFileAggregator owns per-turn file changesets end-to-end (git diff →
+    // outbox POST). The caller (`startTaskH`) AWAITS `turnFiles.flushTurn()`
+    // for THIS turn before calling recordSquadTurn precisely so
+    // `peekTurnPaths()` reflects THIS turn's novel files, not a stale read
+    // of whatever the aggregator's PREVIOUS flush happened to find. Capped
+    // so a pathological turn (mass refactor) doesn't bloat the journal.
+    filesTouched: turnFiles.peekTurnPaths().slice(0, 20)
+  });
+  squad.member(opts.agent).lastTurnIndex = squad.turnCount();
+}
+function handoffTargets(ctx) {
+  const roster = ctx.squad?.roster;
+  if (!roster) return /* @__PURE__ */ new Set();
+  return new Set(roster.agents.map((a) => a.agentId).filter((id) => id !== ctx.opts.agent));
+}
+function resolvePendingProposal(ctx, requestedAgentId) {
+  const slot = ctx.pendingProposal;
+  const pending = slot?.current;
+  if (!slot || !pending) return;
+  slot.current = null;
+  const accepted = requestedAgentId === pending.toAgentId;
+  if (accepted) ctx.squad?.countAccepted();
+  log.info(
+    "acpRunner",
+    `squad: handoff ${pending.proposalId} ${accepted ? "accepted" : "declined"}`
+  );
+  const resolution = { proposalId: pending.proposalId, accepted };
+  void ctx.postSquadEvent?.("handoff_resolved", { ...resolution });
+}
+function proposalIdFor(commandId, hop) {
+  const id = hop <= 1 ? `hp-${commandId}` : `hp-${commandId}-h${hop}`;
+  return id.length > 128 ? id.slice(0, 128) : id;
+}
+function emitHandoffProposal(ctx, proposal, hop) {
+  const { squad, pendingProposal, postSquadEvent, opts, cmd } = ctx;
+  if (!proposal || !pendingProposal || !postSquadEvent) return null;
+  if (squad?.roster?.handoffsEnabled !== true) return null;
+  if (pendingProposal.current) {
+    log.info("acpRunner", "squad: dropping handoff proposal \u2014 one is already pending");
+    return null;
+  }
+  const auto = squad.auto.enabled && squad.hopsRemaining() > 0;
+  if (auto) squad.consumeHop();
+  const record2 = {
+    proposalId: proposalIdFor(cmd.id, hop),
+    fromAgentId: opts.agent,
+    toAgentId: proposal.to,
+    reason: proposal.reason,
+    prompt: proposal.prompt,
+    ...auto ? { auto: true, hopsRemaining: squad.hopsRemaining() } : {}
+  };
+  squad.countProposal({ auto });
+  log.info(
+    "acpRunner",
+    `squad: handoff proposed ${opts.agent} \u2192 ${record2.toAgentId}${auto ? " (auto)" : ""}`
+  );
+  void postSquadEvent("handoff_proposed", { ...record2 });
+  if (!auto) {
+    pendingProposal.current = record2;
+    return null;
+  }
+  return record2;
+}
+function resolveAutoHandoff(ctx, record2) {
+  ctx.squad?.countAccepted();
+  const resolution = {
+    proposalId: record2.proposalId,
+    accepted: true,
+    auto: true
+  };
+  void ctx.postSquadEvent?.("handoff_resolved", { ...resolution });
+}
+async function runCoderabbitMention(ctx, promptText) {
+  const { cmd, relay, streaming, opts, turnFiles } = ctx;
+  const userText = promptText.length > 0 ? promptText : `@${CODERABBIT_AGENT_ID}`;
+  await streaming.beginTurn();
+  ctx.history.appendUserPrompt(userText);
+  log.info("acpRunner", `squad: coderabbit one-shot review id=${cmd.id.slice(0, 8)}`);
+  const review = await runCoderabbitMentionReview({
+    fetchCredential: () => fetchProvisionCredential({
+      agentId: CODERABBIT_AGENT_ID,
+      sessionId: opts.sessionId,
+      pluginId: opts.pluginId,
+      pluginAuthToken: opts.pluginAuthToken
+    })
+  });
+  logMentionOutcome(review);
+  if (!review.ok) {
+    await streaming.closeWithBubble(review.error);
+    ctx.history.appendAgentReply(review.error, CODERABBIT_AGENT_ID);
+    void ctx.history.flush();
+    await relay.sendResult(cmd.id, "failed", { error: review.error });
+    return;
+  }
+  const output = composeReviewOutput(review.markdown, hasCustomInstructions(promptText));
+  await streaming.closeWithBubble(output);
+  ctx.history.appendAgentReply(output, CODERABBIT_AGENT_ID);
+  void ctx.history.flush();
+  await turnFiles.flushTurn().catch((err) => {
+    log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
+  });
+  recordCoderabbitTurn(ctx, userText, output);
+  await relay.sendResult(cmd.id, "completed", { agentId: CODERABBIT_AGENT_ID });
+}
+function recordCoderabbitTurn(ctx, prompt, replySummary) {
+  ctx.squad?.recordTurn({
+    agentId: CODERABBIT_AGENT_ID,
+    prompt,
+    replySummary,
+    filesTouched: []
+  });
+}
 async function startTaskH(ctx) {
-  const {
-    cmd,
-    client: client3,
-    relay,
-    streaming,
-    opts,
-    history,
-    turnFiles,
-    publisher,
-    recentStderr,
-    budgetRecovery,
-    budgetReachedFlag
-  } = ctx;
+  const { cmd, relay, streaming, opts, turnFiles, publisher, recentStderr, budgetReachedFlag } = ctx;
   const payload = cmd.payload;
+  const requestedAgentId = typeof payload?.agentId === "string" ? payload.agentId.trim() : "";
+  resolvePendingProposal(ctx, requestedAgentId);
+  if (requestedAgentId === CODERABBIT_AGENT_ID) {
+    await runCoderabbitMention(ctx, (payload?.prompt ?? "").trim());
+    return;
+  }
   const blocks = buildAcpPromptBlocks(payload ?? {});
   if (blocks.length === 0) {
     log.warn("acpRunner", "start_task with empty prompt + no attachments; ignoring");
     await relay.sendResult(cmd.id, "failed", { error: "empty prompt" });
     return;
   }
+  if (requestedAgentId.length > 0 && requestedAgentId !== opts.agent) {
+    const routed = await routeSquadTask(ctx, requestedAgentId);
+    if (!routed.ok) {
+      log.warn("acpRunner", `start_task routing to ${requestedAgentId} failed: ${routed.error}`);
+      await relay.sendResult(cmd.id, "failed", { error: routed.error });
+      return;
+    }
+  }
   const promptText = blocks.filter((b) => b.type === "text").map((b) => b.text).join("\n");
   const imageCount = blocks.filter((b) => b.type === "image").length;
   log.info(
@@ -36915,129 +37644,214 @@ async function startTaskH(ctx) {
     showInfo(echoLine);
   }
   await streaming.beginTurn();
-  history.appendUserPrompt(promptText);
+  ctx.history.appendUserPrompt(promptText);
   maybePrefaceAgentStandard(blocks, opts.agent, opts.sessionId);
-  if (ctx.pendingHandoff?.current) {
-    blocks.unshift({ type: "text", text: ctx.pendingHandoff.current });
-    ctx.pendingHandoff.current = null;
-  }
-  let turnClosed = false;
-  try {
-    const reply = await client3.prompt(blocks);
-    const finalText = streaming.getCurrentText();
-    if (agentHooks(opts.agent)?.classifyCompletedReply?.(finalText) === "upgrade_required") {
-      await streaming.closeWithBubble(CURSOR_UPGRADE_MESSAGE);
-      turnClosed = true;
-      history.appendAgentReply(CURSOR_UPGRADE_MESSAGE);
-      void history.flush();
-      log.info("acpRunner", `start_task \u2190 cursor-plan-upgrade-required id=${cmd.id.slice(0, 8)}`);
-      await relay.sendResult(cmd.id, "failed", { error: "cursor plan upgrade required" });
-    } else if (replyIsHouseAgentLimit(finalText)) {
-      const houseBubble = houseAgentLimitMessage(finalText);
-      await streaming.closeWithBubble(houseBubble);
-      turnClosed = true;
-      history.appendAgentReply(houseBubble);
-      void history.flush();
-      turnFiles.flushTurn().catch((err) => {
-        log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
-      });
-      log.info("acpRunner", `start_task \u2190 house-agent-limit id=${cmd.id.slice(0, 8)}`);
-      await relay.sendResult(cmd.id, "failed", {
-        error: "house agent usage ceiling / temporarily unavailable"
-      });
-    } else if (replyIsAuthFailure(finalText)) {
-      await streaming.closeWithBubble(AUTH_FAILURE_MESSAGE);
-      turnClosed = true;
-      history.appendAgentReply(AUTH_FAILURE_MESSAGE);
-      void history.flush();
-      turnFiles.flushTurn().catch((err) => {
-        log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
-      });
-      void reportCredentialInvalid(opts);
-      log.info("acpRunner", `start_task \u2190 auth-failure-in-reply id=${cmd.id.slice(0, 8)}`);
-      await relay.sendResult(cmd.id, "failed", { error: "agent reply reported auth failure" });
-    } else if (shouldOfferOneMRecovery({ detail: "", recentStderr: recentStderr.join("\n"), finalText })) {
-      await streaming.closeWithBubble(ONE_M_CREDITS_MESSAGE);
-      turnClosed = true;
-      history.appendAgentReply(ONE_M_CREDITS_MESSAGE);
-      void history.flush();
-      turnFiles.flushTurn().catch((err) => {
-        log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
-      });
-      void reportCredentialInvalid(opts);
-      log.info("acpRunner", `start_task \u2190 1m-credits-reconnect id=${cmd.id.slice(0, 8)}`);
-      await relay.sendResult(cmd.id, "failed", {
-        error: "agent reply reported 1M-context usage-credits gate"
-      });
-    } else {
-      await streaming.closeTurnWithInteractiveDetection();
-      turnClosed = true;
-      const replyLine = formatAgentReplyLine(finalText);
-      if (replyLine.length > 0) {
-        showInfo(replyLine);
-      }
-      history.appendAgentReply(finalText);
-      void history.flush();
-      void publisher.publishOutput({
-        type: "input_suggestion",
-        content: ACP_QUICK_REPLIES,
-        done: true
-      });
-      turnFiles.flushTurn().catch((err) => {
-        log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
-      });
-      log.info("acpRunner", `start_task \u2190 done stopReason=${reply.stopReason ?? "?"} id=${cmd.id.slice(0, 8)}`);
-      await relay.sendResult(cmd.id, "completed", { stopReason: reply.stopReason });
-    }
-  } catch (err) {
-    if (turnClosed) {
-      log.warn(
-        "acpRunner",
-        `post-close ack failed (turn already delivered) id=${cmd.id.slice(0, 8)}: ${describeError(err)}`
-      );
-      return;
-    }
-    const hadText = streaming.hasVisibleProgress();
-    const detail = describeError(err);
-    log.warn("acpRunner", `prompt failed: ${detail}`);
-    await cancelStuckTurn(client3);
-    if (looksLikeBudgetExceeded(`${detail}
-${recentStderr.join("\n")}`)) {
-      await streaming.closeAll();
-      if (!budgetReachedFlag.get()) {
-        budgetReachedFlag.set(true);
-        void postBudgetReached({
-          sessionId: opts.sessionId,
-          pluginId: opts.pluginId,
-          pluginAuthToken: opts.pluginAuthToken,
-          agent: opts.agent,
-          period: extractBudgetPeriod(`${detail}
-${recentStderr.join("\n")}`)
+  const squadContext = collectSquadContext(ctx);
+  applySquadContext(blocks, squadContext, squadContextMode(ctx));
+  ctx.squad?.resetHops();
+  let turnBlocks = blocks;
+  let turnPieces = squadContext;
+  let turnPrompt = promptText;
+  let hop = 1;
+  for (; ; ) {
+    const { client: client3, history, budgetRecovery } = ctx;
+    let turnClosed = false;
+    try {
+      const reply = await promptWithContextFallback(ctx, client3, turnBlocks, turnPieces);
+      const finalText = streaming.getCurrentText();
+      if (agentHooks(opts.agent)?.classifyCompletedReply?.(finalText) === "upgrade_required") {
+        await streaming.closeWithBubble(CURSOR_UPGRADE_MESSAGE);
+        turnClosed = true;
+        history.appendAgentReply(CURSOR_UPGRADE_MESSAGE);
+        void history.flush();
+        log.info("acpRunner", `start_task \u2190 cursor-plan-upgrade-required id=${cmd.id.slice(0, 8)}`);
+        await relay.sendResult(cmd.id, "failed", { error: "cursor plan upgrade required" });
+        return;
+      } else if (replyIsHouseAgentLimit(finalText)) {
+        const houseBubble = houseAgentLimitMessage(finalText);
+        await streaming.closeWithBubble(houseBubble);
+        turnClosed = true;
+        history.appendAgentReply(houseBubble);
+        void history.flush();
+        turnFiles.flushTurn().catch((err) => {
+          log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
+        });
+        log.info("acpRunner", `start_task \u2190 house-agent-limit id=${cmd.id.slice(0, 8)}`);
+        await relay.sendResult(cmd.id, "failed", {
+          error: "house agent usage ceiling / temporarily unavailable"
+        });
+        return;
+      } else if (replyIsAuthFailure(finalText)) {
+        await streaming.closeWithBubble(AUTH_FAILURE_MESSAGE);
+        turnClosed = true;
+        history.appendAgentReply(AUTH_FAILURE_MESSAGE);
+        void history.flush();
+        turnFiles.flushTurn().catch((err) => {
+          log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
+        });
+        void reportCredentialInvalid(opts);
+        log.info("acpRunner", `start_task \u2190 auth-failure-in-reply id=${cmd.id.slice(0, 8)}`);
+        await relay.sendResult(cmd.id, "failed", { error: "agent reply reported auth failure" });
+        return;
+      } else if (shouldOfferOneMRecovery({ detail: "", recentStderr: recentStderr.join("\n"), finalText })) {
+        await streaming.closeWithBubble(ONE_M_CREDITS_MESSAGE);
+        turnClosed = true;
+        history.appendAgentReply(ONE_M_CREDITS_MESSAGE);
+        void history.flush();
+        turnFiles.flushTurn().catch((err) => {
+          log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
+        });
+        void reportCredentialInvalid(opts);
+        log.info("acpRunner", `start_task \u2190 1m-credits-reconnect id=${cmd.id.slice(0, 8)}`);
+        await relay.sendResult(cmd.id, "failed", {
+          error: "agent reply reported 1M-context usage-credits gate"
+        });
+        return;
+      } else {
+        await streaming.closeTurnWithInteractiveDetection();
+        turnClosed = true;
+        const { cleanText, proposal } = extractHandoffProposal(
+          finalText,
+          opts.agent,
+          handoffTargets(ctx)
+        );
+        const replyLine = formatAgentReplyLine(cleanText);
+        if (replyLine.length > 0) {
+          showInfo(replyLine);
+        }
+        history.appendAgentReply(cleanText);
+        void history.flush();
+        const flush = turnFiles.flushTurn().catch((err) => {
+          log.warn("acpRunner", `turnFiles.flushTurn failed: ${describeError(err)}`);
         });
+        if (ctx.squad) await flush;
+        recordSquadTurn(ctx, turnPrompt, cleanText);
+        const autoHop = emitHandoffProposal(ctx, proposal, hop);
+        if (autoHop) {
+          const routed = await routeSquadTask(ctx, autoHop.toAgentId);
+          if (routed.ok) {
+            resolveAutoHandoff(ctx, autoHop);
+            hop += 1;
+            turnPrompt = autoHop.prompt;
+            turnPieces = collectSquadContext(ctx);
+            turnBlocks = [{ type: "text", text: turnPrompt }];
+            maybePrefaceAgentStandard(turnBlocks, opts.agent, opts.sessionId);
+            applySquadContext(turnBlocks, turnPieces, squadContextMode(ctx));
+            await streaming.beginTurn();
+            ctx.history.appendUserPrompt(turnPrompt);
+            continue;
+          }
+          log.warn(
+            "acpRunner",
+            `squad: auto-handoff to ${autoHop.toAgentId} failed: ${routed.error}`
+          );
+        }
+        void publisher.publishOutput({
+          type: "input_suggestion",
+          content: ACP_QUICK_REPLIES,
+          done: true
+        });
+        log.info(
+          "acpRunner",
+          `start_task \u2190 done stopReason=${reply.stopReason ?? "?"} id=${cmd.id.slice(0, 8)}`
+        );
+        await relay.sendResult(cmd.id, "completed", { stopReason: reply.stopReason });
+        return;
+      }
+    } catch (err) {
+      if (turnClosed) {
+        log.warn(
+          "acpRunner",
+          `post-close ack failed (turn already delivered) id=${cmd.id.slice(0, 8)}: ${describeError(err)}`
+        );
+        return;
       }
-      await budgetRecovery.offer(cmd.id, blocks, `${detail}
+      const hadText = streaming.hasVisibleProgress();
+      const detail = describeError(err);
+      log.warn("acpRunner", `prompt failed: ${detail}`);
+      await cancelStuckTurn(client3);
+      if (looksLikeBudgetExceeded(`${detail}
+${recentStderr.join("\n")}`)) {
+        await streaming.closeAll();
+        if (!budgetReachedFlag.get()) {
+          budgetReachedFlag.set(true);
+          void postBudgetReached({
+            sessionId: opts.sessionId,
+            pluginId: opts.pluginId,
+            pluginAuthToken: opts.pluginAuthToken,
+            agent: opts.agent,
+            period: extractBudgetPeriod(`${detail}
+${recentStderr.join("\n")}`)
+          });
+        }
+        await budgetRecovery.offer(cmd.id, turnBlocks, `${detail}
 ${recentStderr.join("\n")}`);
+        return;
+      }
+      const bubble = failureBubble({
+        detail,
+        recentStderr: recentStderr.join("\n"),
+        hadText,
+        agent: opts.agent
+      });
+      if (bubble) {
+        await streaming.closeWithBubble(bubble);
+        history.appendAgentReply(bubble);
+        void history.flush();
+      } else {
+        await streaming.closeAll();
+      }
+      if (bubble === AUTH_FAILURE_MESSAGE || bubble === ONE_M_CREDITS_MESSAGE) {
+        void reportCredentialInvalid(opts);
+      }
+      await relay.sendResult(cmd.id, "failed", { error: detail });
       return;
     }
-    const bubble = failureBubble({
-      detail,
-      recentStderr: recentStderr.join("\n"),
-      hadText,
-      agent: opts.agent
+  }
+}
+async function squadConfigureH(ctx) {
+  const { cmd, relay, opts, squad } = ctx;
+  if (!squad) {
+    await relay.sendResult(cmd.id, "failed", {
+      error: "Agent Squad is not available on this session."
     });
-    if (bubble) {
-      await streaming.closeWithBubble(bubble);
-      history.appendAgentReply(bubble);
-      void history.flush();
-    } else {
-      await streaming.closeAll();
-    }
-    if (bubble === AUTH_FAILURE_MESSAGE || bubble === ONE_M_CREDITS_MESSAGE) {
-      void reportCredentialInvalid(opts);
-    }
-    await relay.sendResult(cmd.id, "failed", { error: detail });
+    return;
   }
-  return;
+  const payload = cmd.payload;
+  if (payload?.action === "set") {
+    const applied = squad.setAuto({
+      enabled: payload.autoHandoffs === true,
+      hopBudget: clampHopBudget(payload.hopBudget)
+    });
+    setSquadAuto(opts.pluginId, applied);
+    log.info(
+      "acpRunner",
+      `squad: auto handoffs ${applied.enabled ? "ON" : "OFF"} budget=${applied.hopBudget}`
+    );
+    const result = { ...applied, hopsRemaining: squad.hopsRemaining() };
+    await relay.sendResult(cmd.id, "completed", { ...result });
+    return;
+  }
+  if (payload?.action === "status") {
+    const result = {
+      ...squad.auto,
+      hopsRemaining: squad.hopsRemaining()
+    };
+    await relay.sendResult(cmd.id, "completed", { ...result });
+    return;
+  }
+  await relay.sendResult(cmd.id, "failed", { error: "squad_configure: unknown action" });
+}
+async function squadStatsH(ctx) {
+  const { cmd, relay, squad } = ctx;
+  if (!squad) {
+    await relay.sendResult(cmd.id, "failed", {
+      error: "Agent Squad is not available on this session."
+    });
+    return;
+  }
+  const stats = squad.stats();
+  await relay.sendResult(cmd.id, "completed", { ...stats });
 }
 async function groupMentionTaskH(ctx) {
   const { cmd, client: client3, relay, streaming, opts, history } = ctx;
@@ -37050,6 +37864,7 @@ async function groupMentionTaskH(ctx) {
     });
     return;
   }
+  ctx.squad?.resetHops();
   await streaming.beginTurn();
   history.appendUserPrompt(promptText);
   let response = "";
@@ -37444,7 +38259,10 @@ async function integrationsSyncH(ctx) {
       attached: manifest.integrations.map((e) => e.id)
     });
   } catch (err) {
-    log.warn("acpRunner", `integrations_sync failed (tools apply next restart): ${describeError(err)}`);
+    log.warn(
+      "acpRunner",
+      `integrations_sync failed (tools apply next restart): ${describeError(err)}`
+    );
     await relay.sendResult(cmd.id, "completed", { synced: false, error: describeError(err) });
   }
 }
@@ -37514,7 +38332,9 @@ var ACP_COMMAND_HANDLERS = {
   skills_configure: skillsConfigureH2,
   pack_start: packStartH,
   pack_action: packActionH,
-  pack_status: packStatusH
+  pack_status: packStatusH,
+  [SQUAD_CONFIGURE_COMMAND]: squadConfigureH,
+  [SQUAD_STATS_COMMAND]: squadStatsH
 };
 async function dispatchAcpCommand(ctx) {
   const handler = ACP_COMMAND_HANDLERS[ctx.cmd.type];
@@ -37776,14 +38596,18 @@ var StreamingState = class {
     }
     const cumulativeContent = reconcileCumulative(existing?.content ?? "", delta.delta);
     this.streamingChunks.set(chunkId, { kind: delta.kind, content: cumulativeContent });
+    let fenceCut = -1;
     if (delta.kind === "text") {
       this.recomputeText();
-      void this.publisher.publishOutput({ type: "text", content: this.text, done: false });
+      fenceCut = handoffFenceStartMasked(this.text);
+      const visibleText = fenceCut === -1 ? this.text : this.text.slice(0, fenceCut).trimEnd();
+      void this.publisher.publishOutput({ type: "text", content: visibleText, done: false });
     }
+    const visibleChunkContent = delta.kind === "text" && fenceCut !== -1 ? cumulativeContent.slice(0, fenceCut).trimEnd() : cumulativeContent;
     void this.publisher.publishStreamingChunk({
       chunkId,
       kind: delta.kind,
-      content: cumulativeContent,
+      content: visibleChunkContent,
       isFinal: false
     });
   }
@@ -37813,8 +38637,28 @@ var StreamingState = class {
    * spuriously and strand the runner with a free-form pending state
    * the user can't see / answer.
    */
+  /**
+   * Presentation-only view of a text buffer: everything BEFORE a
+   * ```codeam-handoff fence. The fence is protocol litter the app renders as
+   * a proposal card (see `handoff-protocol.ts`) — it must never reach the
+   * user, and the TERMINAL frames (`done:true` / `isFinal:true`) are the ones
+   * that persist, so suppressing it only while streaming would still leave it
+   * pinned on the finished bubble. Internal state is untouched:
+   * {@link getCurrentText} keeps returning the RAW text so the turn-close
+   * extraction can parse the proposal out of it.
+   *
+   * Masked-aware (`stripHandoffFences`), same as the live-stream `append()`
+   * cut (`handoffFenceStartMasked`): a TERMINAL frame is the one that
+   * PERSISTS, so cutting on a fence quoted as an example inside a
+   * 4+-backtick block here would permanently truncate the bubble — and an
+   * unmasked live cut would truncate the LIVE view for the rest of the turn
+   * the moment the quoted example's fence-open marker streams in.
+   */
+  visible(text) {
+    return stripHandoffFences(text);
+  }
   async closeAll() {
-    const finalText = this.text;
+    const finalText = this.visible(this.text);
     this.text = "";
     await Promise.all([
       this.publisher.publishOutput({ type: "text", content: finalText, done: true }),
@@ -37858,7 +38702,9 @@ var StreamingState = class {
         ([chunkId, { kind, content }]) => this.publisher.publishStreamingChunk({
           chunkId,
           kind,
-          content,
+          // Terminal frame — same fence suppression the live deltas apply, so
+          // a proposal fence never survives on the finalised bubble.
+          content: kind === "text" ? this.visible(content) : content,
           isFinal: true
         })
       )
@@ -37885,7 +38731,7 @@ var StreamingState = class {
    * text done:true chunk with the full cumulative).
    */
   async closeTurnWithInteractiveDetection() {
-    const finalText = this.text;
+    const finalText = this.visible(this.text);
     this.text = "";
     const flushSc = this.flushStreamingChunks();
     const extracted = extractSelectPrompt(finalText);
@@ -37982,16 +38828,24 @@ var AcpHistory = class {
       id: (0, import_node_crypto11.randomUUID)(),
       role: "user",
       text,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      agentId: this.opts.agent
     });
   }
-  appendAgentReply(text) {
+  /**
+   * `agentId` overrides the producing agent for a turn this session's RESIDENT
+   * agent did not author — today only the `@coderabbit` one-shot review, which
+   * runs the batch reviewer inside the session without ever swapping. Defaults
+   * to the resident agent.
+   */
+  appendAgentReply(text, agentId = this.opts.agent) {
     if (text.length === 0) return;
     this.messages.push({
       id: (0, import_node_crypto11.randomUUID)(),
       role: "agent",
       text,
-      timestamp: Date.now()
+      timestamp: Date.now(),
+      agentId
     });
   }
   /**
@@ -38331,6 +39185,8 @@ async function runAcpSession(opts) {
     pluginAuthToken: opts.pluginAuthToken,
     agentId: opts.agent
   });
+  void turnFiles.flushTurn().catch(() => {
+  });
   const REPO_DIRTY_FLUSH_DEBOUNCE_MS = 2e3;
   let repoDirtyTimer = null;
   const fileWatcher = new FileWatcherService({
@@ -38376,9 +39232,12 @@ async function runAcpSession(opts) {
         publisher,
         recentStderr,
         budgetRecovery,
-        { get: () => _budgetReachedPosted, set: (v) => {
-          _budgetReachedPosted = v;
-        } },
+        {
+          get: () => _budgetReachedPosted,
+          set: (v) => {
+            _budgetReachedPosted = v;
+          }
+        },
         // resume_session re-points the runner's active conversation: the
         // relay callback reads `acpSessionId` per command, so every FUTURE
         // get_conversation / upload / one-shot serves the RESUMED id — not
@@ -38388,13 +39247,35 @@ async function runAcpSession(opts) {
           acpSessionId = id;
         },
         switchAgentForSession,
-        pendingHandoff
+        pendingHandoff,
+        // Agent Squad: roster/journal state, the @-mention route, the
+        // single-slot proposal, and the SAME serialized event chain the
+        // switch uses (so proposal events can't overtake switch events).
+        squad,
+        routeToAgent,
+        pendingProposal,
+        emitSwitchEvent
       );
     },
     { id: opts.agent, name: opts.agent, displayName: opts.agent }
   );
   const HANDOFF_MAX_CHARS = 16e3;
   const pendingHandoff = { current: null };
+  const squad = new SquadState({
+    sessionId: opts.sessionId,
+    auto: getSquadAuto(opts.pluginId)
+  });
+  const refreshSquadRoster = () => {
+    void fetchSquadRoster({
+      sessionId: opts.sessionId,
+      pluginId: opts.pluginId,
+      pluginAuthToken: opts.pluginAuthToken
+    }).then((roster) => {
+      if (roster) squad.roster = roster;
+    });
+  };
+  refreshSquadRoster();
+  const pendingProposal = { current: null };
   let switchCredentialEnv = {};
   const relaunchWith = async (nextAgent) => {
     try {
@@ -38404,6 +39285,7 @@ async function runAcpSession(opts) {
     await streaming.closeAll();
     const prevAgent = opts.agent;
     const transcript = history.recentTranscript(HANDOFF_MAX_CHARS);
+    squad.member(prevAgent).acpSessionId = acpSessionId;
     await client3.stop();
     const adapter = await resolveAcpAdapterWithRetry(nextAgent);
     if (!adapter) throw new Error(`no ACP adapter available for ${nextAgent}`);
@@ -38453,31 +39335,74 @@ async function runAcpSession(opts) {
       payload
     })
   );
-  const switchAgentForSession = (rawAgentId) => performAgentSwitch(
-    {
-      currentAgent: () => opts.agent,
-      postEvent: emitSwitchEvent,
-      fetchCredential: (agentId) => fetchProvisionCredential({
-        agentId,
-        sessionId: opts.sessionId,
-        pluginId: opts.pluginId,
-        pluginAuthToken: opts.pluginAuthToken,
-        includeInstallScript: true
-      }),
-      provisionCredential: (agentId, auth) => {
-        switchCredentialEnv = provisionAgentCredentials(agentId, auth);
-      },
-      ensureBinary: (agentId, installScript) => ensureAgentBinaryForSwitch(agentId, installScript),
-      swapRuntime: relaunchWith,
-      revertRuntime: relaunchWith,
-      persistAgent: (agentId) => setSessionAgent(opts.pluginId, agentId),
-      reannounce: (agentId) => {
-        relay.setAgentMeta({ id: agentId, name: agentId, displayName: agentId });
-        relay.reannounceAgents();
-      }
+  const switchDeps = {
+    currentAgent: () => opts.agent,
+    postEvent: emitSwitchEvent,
+    fetchCredential: (agentId) => fetchProvisionCredential({
+      agentId,
+      sessionId: opts.sessionId,
+      pluginId: opts.pluginId,
+      pluginAuthToken: opts.pluginAuthToken,
+      includeInstallScript: true
+    }),
+    provisionCredential: (agentId, auth) => {
+      switchCredentialEnv = provisionAgentCredentials(agentId, auth);
     },
-    rawAgentId
-  );
+    ensureBinary: (agentId, installScript) => ensureAgentBinaryForSwitch(agentId, installScript),
+    swapRuntime: relaunchWith,
+    revertRuntime: relaunchWith,
+    persistAgent: (agentId) => setSessionAgent(opts.pluginId, agentId),
+    reannounce: (agentId) => {
+      relay.setAgentMeta({ id: agentId, name: agentId, displayName: agentId });
+      relay.reannounceAgents();
+    }
+  };
+  const switchAgentForSession = async (rawAgentId) => {
+    const result = await performAgentSwitch(switchDeps, rawAgentId);
+    if (result.ok) refreshSquadRoster();
+    return result;
+  };
+  const sessionHandles = () => ({
+    client: client3,
+    acpSessionId,
+    history,
+    jsonlHistory,
+    agentCaps,
+    budgetRecovery
+  });
+  const routeToAgent = async (target, routeOpts = {}) => {
+    const m = squad.member(target);
+    const fast = routeOpts.skipFastPath !== true;
+    const result = await performAgentSwitch(switchDeps, target, {
+      skipProvision: fast && m.provisioned,
+      skipInstall: fast && m.binaryVerified
+    });
+    if (!result.ok) {
+      if (fast) {
+        m.provisioned = false;
+        m.binaryVerified = false;
+      }
+      return { result, handles: sessionHandles() };
+    }
+    m.provisioned = true;
+    m.binaryVerified = true;
+    if (m.acpSessionId && agentCaps?.loadSession) {
+      try {
+        await client3.loadSession(m.acpSessionId);
+        acpSessionId = m.acpSessionId;
+        history.switchActiveSession(m.acpSessionId);
+        pendingHandoff.current = null;
+        log.info(
+          "acpRunner",
+          `squad: resumed ${target}'s conversation ${m.acpSessionId.slice(0, 8)}`
+        );
+      } catch (err) {
+        log.warn("acpRunner", `squad: resume for ${target} failed: ${describeError(err)}`);
+      }
+    }
+    refreshSquadRoster();
+    return { result, handles: sessionHandles() };
+  };
   await onboardingWelcomeDone;
   relay.start();
   void createWakeCredentialProbe({
@@ -38508,7 +39433,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) {
+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) {
   const session = {
     client: client3,
     relay,
@@ -38526,7 +39451,11 @@ async function handleCommand(cmd, client3, relay, acpSessionId, streaming, opts,
     budgetReachedFlag,
     onActiveSessionChanged,
     switchAgent,
-    pendingHandoff
+    pendingHandoff,
+    squad,
+    routeToAgent,
+    pendingProposal,
+    postSquadEvent
   };
   await dispatchAcpCommand(assembleAcpCommandContext(session, cmd));
 }
@@ -39586,9 +40515,9 @@ function startClaudeCredentialSync(opts) {
 }
 
 // src/beads/workflow-hint.ts
-var fs75 = __toESM(require("fs"));
-var path82 = __toESM(require("path"));
-var os60 = __toESM(require("os"));
+var fs76 = __toESM(require("fs"));
+var path83 = __toESM(require("path"));
+var os61 = __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)
@@ -39602,22 +40531,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 = os60.homedir()) {
+function ensureBeadsWorkflowHint(homeDir2 = os61.homedir()) {
   try {
-    const file = path82.join(homeDir2, ".claude", "CLAUDE.md");
+    const file = path83.join(homeDir2, ".claude", "CLAUDE.md");
     let existing = "";
     try {
-      existing = fs75.readFileSync(file, "utf8");
+      existing = fs76.readFileSync(file, "utf8");
     } catch {
     }
     if (existing.includes(BEADS_HINT_MARKER)) return;
-    fs75.mkdirSync(path82.dirname(file), { recursive: true });
+    fs76.mkdirSync(path83.dirname(file), { recursive: true });
     const next = existing.trim() ? `${existing.trimEnd()}
 
 ${BEADS_HINT}
 ` : `${BEADS_HINT}
 `;
-    fs75.writeFileSync(file, next);
+    fs76.writeFileSync(file, next);
   } catch {
   }
 }
@@ -39989,7 +40918,7 @@ var AcpDriver = class {
 };
 
 // src/baton/transcript-mirror.ts
-var fs76 = __toESM(require("fs"));
+var fs77 = __toESM(require("fs"));
 var TranscriptMirror = class {
   constructor(deps) {
     this.deps = deps;
@@ -40056,7 +40985,7 @@ var TranscriptMirror = class {
   }
 };
 function defaultWatch(file, onChange) {
-  const w3 = fs76.watch(file, { persistent: false }, () => onChange());
+  const w3 = fs77.watch(file, { persistent: false }, () => onChange());
   return () => w3.close();
 }
 
@@ -40354,16 +41283,16 @@ function keepDeviceAwake(deps = {}) {
 }
 
 // src/agents/claude/onboarding.ts
-var fs77 = __toESM(require("fs"));
-var os62 = __toESM(require("os"));
-var path83 = __toESM(require("path"));
+var fs78 = __toESM(require("fs"));
+var os63 = __toESM(require("os"));
+var path84 = __toESM(require("path"));
 var ONBOARDING_VERSION_SENTINEL = "9999.0.0";
 function ensureClaudeOnboarded(cwd) {
   try {
-    const file = path83.join(os62.homedir(), ".claude.json");
+    const file = path84.join(os63.homedir(), ".claude.json");
     let config = {};
     try {
-      config = JSON.parse(fs77.readFileSync(file, "utf8"));
+      config = JSON.parse(fs78.readFileSync(file, "utf8"));
     } catch {
     }
     let changed = false;
@@ -40388,8 +41317,8 @@ function ensureClaudeOnboarded(cwd) {
       }
     }
     if (!changed) return;
-    fs77.mkdirSync(path83.dirname(file), { recursive: true });
-    fs77.writeFileSync(file, JSON.stringify(config, null, 2));
+    fs78.mkdirSync(path84.dirname(file), { recursive: true });
+    fs78.writeFileSync(file, JSON.stringify(config, null, 2));
     log.info(
       "claude",
       `pre-completed Claude onboarding${cwd ? ` + trusted workspace ${cwd}` : ""}`
@@ -41121,7 +42050,7 @@ var import_picocolors11 = __toESM(require("picocolors"));
 var import_child_process30 = require("child_process");
 var import_util4 = require("util");
 var import_picocolors9 = __toESM(require("picocolors"));
-var path84 = __toESM(require("path"));
+var path85 = __toESM(require("path"));
 var execFileP6 = (0, import_util4.promisify)(import_child_process30.execFile);
 var MAX_BUFFER = 8 * 1024 * 1024;
 function resetStdinForChild() {
@@ -41610,7 +42539,7 @@ var GitHubCodespacesProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path84.posix.dirname(remotePath);
+    const remoteDir = path85.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote(remoteDir)}`,
       `cat > ${shellQuote(remotePath)}`
@@ -41680,7 +42609,7 @@ function shellQuote(s) {
 // src/services/providers/gitpod.ts
 var import_child_process31 = require("child_process");
 var import_util5 = require("util");
-var path85 = __toESM(require("path"));
+var path86 = __toESM(require("path"));
 var import_picocolors10 = __toESM(require("picocolors"));
 var execFileP7 = (0, import_util5.promisify)(import_child_process31.execFile);
 var MAX_BUFFER2 = 8 * 1024 * 1024;
@@ -41920,7 +42849,7 @@ var GitpodProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path85.posix.dirname(remotePath);
+    const remoteDir = path86.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote2(remoteDir)}`,
       `cat > ${shellQuote2(remotePath)}`
@@ -41956,7 +42885,7 @@ function shellQuote2(s) {
 // src/services/providers/gitlab-workspaces.ts
 var import_child_process32 = require("child_process");
 var import_util6 = require("util");
-var path86 = __toESM(require("path"));
+var path87 = __toESM(require("path"));
 var execFileP8 = (0, import_util6.promisify)(import_child_process32.execFile);
 var MAX_BUFFER3 = 8 * 1024 * 1024;
 var GITLAB_API_BASE = process.env.CODEAM_GITLAB_API_URL ?? "https://gitlab.com/api/v4";
@@ -42216,7 +43145,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 = path86.posix.dirname(remotePath);
+    const remoteDir = path87.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)}`);
@@ -42284,7 +43213,7 @@ function shellQuote3(s) {
 // src/services/providers/railway.ts
 var import_child_process33 = require("child_process");
 var import_util7 = require("util");
-var path87 = __toESM(require("path"));
+var path88 = __toESM(require("path"));
 var execFileP9 = (0, import_util7.promisify)(import_child_process33.execFile);
 var MAX_BUFFER4 = 8 * 1024 * 1024;
 function resetStdinForChild4() {
@@ -42520,7 +43449,7 @@ var RailwayProvider = class {
     if (!projectId || !serviceId) {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
-    const remoteDir = path87.posix.dirname(remotePath);
+    const remoteDir = path88.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)}`);
@@ -43166,8 +44095,8 @@ async function invite() {
 var import_node_dns = require("dns");
 var import_node_util5 = require("util");
 var import_node_crypto13 = require("crypto");
-var fs78 = __toESM(require("fs"));
-var path88 = __toESM(require("path"));
+var fs79 = __toESM(require("fs"));
+var path89 = __toESM(require("path"));
 var import_picocolors14 = __toESM(require("picocolors"));
 var dnsResolveP = (0, import_node_util5.promisify)(import_node_dns.resolve);
 async function checkDns(apiBase2) {
@@ -43223,13 +44152,13 @@ async function checkHealth(apiBase2) {
   }
 }
 function checkConfigDir() {
-  const dir = path88.join(require("os").homedir(), ".codeam");
+  const dir = path89.join(require("os").homedir(), ".codeam");
   try {
-    fs78.mkdirSync(dir, { recursive: true, mode: 448 });
-    const probe = path88.join(dir, ".doctor-probe");
-    fs78.writeFileSync(probe, "ok", { mode: 384 });
-    const read2 = fs78.readFileSync(probe, "utf8");
-    fs78.unlinkSync(probe);
+    fs79.mkdirSync(dir, { recursive: true, mode: 448 });
+    const probe = path89.join(dir, ".doctor-probe");
+    fs79.writeFileSync(probe, "ok", { mode: 384 });
+    const read2 = fs79.readFileSync(probe, "utf8");
+    fs79.unlinkSync(probe);
     if (read2 !== "ok") throw new Error("write/read round-trip mismatch");
     return {
       id: "config-dir",
@@ -43269,9 +44198,9 @@ function checkSessions() {
   }
 }
 function checkAgentBinaries() {
-  const os65 = createOsStrategy();
+  const os66 = createOsStrategy();
   return getEnabledAgents().map((meta) => {
-    const found = os65.findInPath(meta.binaryName);
+    const found = os66.findInPath(meta.binaryName);
     return {
       id: `agent-${meta.id}`,
       label: `Agent binary: ${meta.displayName} (${meta.binaryName})`,
@@ -43293,7 +44222,7 @@ function checkNodePty() {
       detail: "not required on this platform"
     };
   }
-  const vendoredPath = path88.join(__dirname, "vendor", "node-pty");
+  const vendoredPath = path89.join(__dirname, "vendor", "node-pty");
   for (const target of [vendoredPath, "node-pty"]) {
     try {
       require(target);
@@ -43335,7 +44264,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.63.1" : "0.0.0-dev";
+  const cliVersion = true ? "2.65.0" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto13.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -43726,7 +44655,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.63.1" : "unknown";
+  const v = true ? "2.65.0" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }
 
@@ -43875,10 +44804,10 @@ var EXIT_CODE_NAMES = {
 };
 
 // src/index.ts
-var os64 = __toESM(require("os"));
+var os65 = __toESM(require("os"));
 if (!process.env.HOME) {
   try {
-    const home = os64.homedir();
+    const home = os65.homedir();
     if (home) process.env.HOME = home;
   } catch {
   }