codeam-cli 2.64.0 → 2.65.0

package/dist/index.js

@@ -2791,6 +2791,15 @@ function resolveApiBaseUrl() {
 
 // ../../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",
@@ -3257,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);
@@ -3269,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",
@@ -3293,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"));
@@ -8048,7 +8073,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.64.0" : "0.0.0-dev",
+    cliVersion: true ? "2.65.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -8229,7 +8254,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.64.0",
+  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",
@@ -9681,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.64.0" ? { ideVersion: "2.64.0" } : {}
+      ..."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));
   }
   /**
@@ -21100,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.64.0" : null;
+  const current2 = true ? "2.65.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -21117,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.64.0" : null;
+  const current2 = true ? "2.65.0" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -21137,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.64.0" : null;
+  return true ? "2.65.0" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve9) => {
@@ -28558,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(),
@@ -28583,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);
@@ -28728,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) {
@@ -28740,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;
   }
   /**
@@ -28751,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--) {
@@ -28777,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 {
     }
@@ -28820,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 };
@@ -28835,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;
     }
@@ -28885,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;
         }
@@ -28898,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;
       }
@@ -28977,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
@@ -28989,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 [];
@@ -29011,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);
@@ -29079,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;
     }
@@ -29154,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
@@ -33183,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) {
@@ -33192,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;
@@ -34157,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;
@@ -34180,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;
@@ -34240,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 {
@@ -34274,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()) {
@@ -34284,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
@@ -34467,121 +34789,6 @@ async function performAgentSwitch(deps, rawAgentId, fastPath = {}) {
   return { ok: true, agentId };
 }
 
-// src/agents/acp/squad-roster.ts
-var fs67 = __toESM(require("fs"));
-var os58 = __toESM(require("os"));
-var path74 = __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 };
-}
-function journalPathFor(homeDir2, sessionId) {
-  return path74.join(homeDir2, ".codeam", `squad-journal-${sessionId}.json`);
-}
-function loadJournal(journalPath) {
-  try {
-    const raw = JSON.parse(fs67.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;
-  journalPath;
-  turns;
-  members = /* @__PURE__ */ new Map();
-  constructor(opts) {
-    this.journalPath = journalPathFor(opts.homeDir ?? os58.homedir(), opts.sessionId);
-    this.turns = loadJournal(this.journalPath);
-  }
-  /** 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 {
-      fs67.mkdirSync(path74.dirname(this.journalPath), { recursive: true, mode: 448 });
-      fs67.writeFileSync(this.journalPath, JSON.stringify({ turns: this.turns }), { mode: 384 });
-    } catch {
-    }
-  }
-};
-function specialtyFor(agentId) {
-  return SQUAD_SPECIALTIES[agentId] ?? GENERIC_SPECIALTY;
-}
-function buildTeamPreamble(roster, currentAgent, opts) {
-  const others = roster.agents.filter((a) => a.agentId !== currentAgent);
-  if (others.length === 0) return null;
-  const 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:",
-    ...others.map((a) => `- ${a.displayName} \u2014 best at: ${specialtyFor(a.agentId)}`)
-  ];
-  if (opts.handoffInstructions) {
-    lines.push(
-      "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."
-    );
-  }
-  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 = "[Team update] While you were away, other agents worked on this session:";
-  const footer = "Continue from the CURRENT state of the working tree.";
-  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/services/streaming/transport.ts
 var http7 = __toESM(require("http"));
 var https8 = __toESM(require("https"));
@@ -34881,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`;
@@ -35101,8 +35315,19 @@ function stripHandoffFences(text) {
   }
   return restore(stripFences(masked));
 }
-function handoffFenceStart(text) {
-  return text.indexOf(FENCE_OPEN);
+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
@@ -35882,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
@@ -35927,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",
@@ -35946,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)}`);
     }
   }
   /**
@@ -36945,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");
 
@@ -37143,39 +37439,72 @@ async function routeSquadTask(ctx, target) {
   }
   return { ok: true };
 }
-function prefixSquadContext(ctx, blocks) {
+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) {
-    blocks.unshift({ type: "text", text: ctx.pendingHandoff.current });
+    pieces.push(ctx.pendingHandoff.current);
     ctx.pendingHandoff.current = null;
   }
-  const { squad, opts } = ctx;
-  if (!squad) return;
-  const member = squad.member(opts.agent);
-  if (squad.turnCount() > member.lastTurnIndex) {
-    const otherEntries = squad.entriesSince(member.lastTurnIndex).filter((e) => e.agentId !== opts.agent);
-    const briefing = buildDeltaBriefing(otherEntries);
-    if (briefing) blocks.unshift({ type: "text", text: briefing });
+  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;
   }
-  const roster = squad.roster;
-  if (roster && member.lastTurnIndex === 0) {
-    const preamble = buildTeamPreamble(roster, opts.agent, {
-      handoffInstructions: roster.handoffsEnabled === true
-    });
-    if (preamble) blocks.unshift({ type: "text", text: preamble });
+  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 } = ctx;
+  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) and exposes no path list, and its flush is fire-and-forget,
-    // so there is nothing accurate to attribute synchronously here. The
-    // briefing simply omits the files clause rather than guessing.
-    filesTouched: []
+    // 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();
 }
@@ -37190,45 +37519,112 @@ function resolvePendingProposal(ctx, requestedAgentId) {
   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"}`
   );
-  void ctx.postSquadEvent?.("handoff_resolved", {
-    proposalId: pending.proposalId,
-    accepted
-  });
+  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) {
+function emitHandoffProposal(ctx, proposal, hop) {
   const { squad, pendingProposal, postSquadEvent, opts, cmd } = ctx;
-  if (!proposal || !pendingProposal || !postSquadEvent) return;
-  if (squad?.roster?.handoffsEnabled !== true) return;
+  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;
+    return null;
   }
+  const auto = squad.auto.enabled && squad.hopsRemaining() > 0;
+  if (auto) squad.consumeHop();
   const record2 = {
-    proposalId: `hp-${cmd.id}`,
+    proposalId: proposalIdFor(cmd.id, hop),
     fromAgentId: opts.agent,
     toAgentId: proposal.to,
     reason: proposal.reason,
-    prompt: proposal.prompt
+    prompt: proposal.prompt,
+    ...auto ? { auto: true, hopsRemaining: squad.hopsRemaining() } : {}
   };
-  pendingProposal.current = record2;
-  log.info("acpRunner", `squad: handoff proposed ${opts.agent} \u2192 ${record2.toAgentId}`);
+  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, 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;
   }
-  const requestedAgentId = typeof payload?.agentId === "string" ? payload.agentId.trim() : "";
-  resolvePendingProposal(ctx, requestedAgentId);
   if (requestedAgentId.length > 0 && requestedAgentId !== opts.agent) {
     const routed = await routeSquadTask(ctx, requestedAgentId);
     if (!routed.ok) {
@@ -37237,7 +37633,6 @@ async function startTaskH(ctx) {
       return;
     }
   }
-  const { client: client3, history, budgetRecovery } = ctx;
   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(
@@ -37249,133 +37644,214 @@ async function startTaskH(ctx) {
     showInfo(echoLine);
   }
   await streaming.beginTurn();
-  history.appendUserPrompt(promptText);
+  ctx.history.appendUserPrompt(promptText);
   maybePrefaceAgentStandard(blocks, opts.agent, opts.sessionId);
-  prefixSquadContext(ctx, blocks);
-  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 { cleanText, proposal } = extractHandoffProposal(
-        finalText,
-        opts.agent,
-        handoffTargets(ctx)
-      );
-      const replyLine = formatAgentReplyLine(cleanText);
-      if (replyLine.length > 0) {
-        showInfo(replyLine);
-      }
-      history.appendAgentReply(cleanText);
-      void history.flush();
-      recordSquadTurn(ctx, promptText, cleanText);
-      emitHandoffProposal(ctx, proposal);
-      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;
       }
-      await budgetRecovery.offer(cmd.id, blocks, `${detail}
+    } 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")}`)
+          });
+        }
+        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;
@@ -37388,6 +37864,7 @@ async function groupMentionTaskH(ctx) {
     });
     return;
   }
+  ctx.squad?.resetHops();
   await streaming.beginTurn();
   history.appendUserPrompt(promptText);
   let response = "";
@@ -37782,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) });
   }
 }
@@ -37852,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];
@@ -38117,7 +38599,7 @@ var StreamingState = class {
     let fenceCut = -1;
     if (delta.kind === "text") {
       this.recomputeText();
-      fenceCut = handoffFenceStart(this.text);
+      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 });
     }
@@ -38165,11 +38647,12 @@ var StreamingState = class {
    * {@link getCurrentText} keeps returning the RAW text so the turn-close
    * extraction can parse the proposal out of it.
    *
-   * Masked-aware (`stripHandoffFences`), unlike the live-stream `append()`
-   * cut (`handoffFenceStart`, unmasked): a TERMINAL frame is the one that
+   * 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. The live
-   * cut stays unmasked/cheap — a mid-stream example is never terminal.
+   * 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);
@@ -38345,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
     });
   }
   /**
@@ -38694,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({
@@ -38739,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
@@ -38765,7 +39261,10 @@ async function runAcpSession(opts) {
   );
   const HANDOFF_MAX_CHARS = 16e3;
   const pendingHandoff = { current: null };
-  const squad = new SquadState({ sessionId: opts.sessionId });
+  const squad = new SquadState({
+    sessionId: opts.sessionId,
+    auto: getSquadAuto(opts.pluginId)
+  });
   const refreshSquadRoster = () => {
     void fetchSquadRoster({
       sessionId: opts.sessionId,
@@ -43765,7 +44264,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.64.0" : "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}`);
@@ -44156,7 +44655,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.64.0" : "unknown";
+  const v = true ? "2.65.0" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }