codeam-cli 2.10.7 → 2.11.0

package/dist/index.js

@@ -519,9 +519,9 @@ var require_windowsPtyAgent = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.argsToCommandLine = exports2.WindowsPtyAgent = void 0;
-    var fs13 = require("fs");
-    var os12 = require("os");
-    var path19 = require("path");
+    var fs15 = require("fs");
+    var os14 = require("os");
+    var path21 = require("path");
     var child_process_1 = require("child_process");
     var net_1 = require("net");
     var windowsConoutConnection_1 = require_windowsConoutConnection();
@@ -557,7 +557,7 @@ var require_windowsPtyAgent = __commonJS({
             }
           }
           this._ptyNative = this._useConpty ? conptyNative : winptyNative;
-          cwd = path19.resolve(cwd);
+          cwd = path21.resolve(cwd);
           var commandLine = argsToCommandLine(file, args2);
           var term;
           if (this._useConpty) {
@@ -578,7 +578,7 @@ var require_windowsPtyAgent = __commonJS({
           this._outSocket.on("connect", function() {
             _this._outSocket.emit("ready_datapipe");
           });
-          var inSocketFD = fs13.openSync(term.conin, "w");
+          var inSocketFD = fs15.openSync(term.conin, "w");
           this._inSocket = new net_1.Socket({
             fd: inSocketFD,
             readable: false,
@@ -679,7 +679,7 @@ var require_windowsPtyAgent = __commonJS({
         WindowsPtyAgent2.prototype._getConsoleProcessList = function() {
           var _this = this;
           return new Promise(function(resolve2) {
-            var agent = child_process_1.fork(path19.join(__dirname, "conpty_console_list_agent"), [_this._innerPid.toString()]);
+            var agent = child_process_1.fork(path21.join(__dirname, "conpty_console_list_agent"), [_this._innerPid.toString()]);
             agent.on("message", function(message) {
               clearTimeout(timeout);
               resolve2(message.consoleProcessList);
@@ -702,7 +702,7 @@ var require_windowsPtyAgent = __commonJS({
           configurable: true
         });
         WindowsPtyAgent2.prototype._getWindowsBuildNumber = function() {
-          var osVersion = /(\d+)\.(\d+)\.(\d+)/g.exec(os12.release());
+          var osVersion = /(\d+)\.(\d+)\.(\d+)/g.exec(os14.release());
           var buildNumber = 0;
           if (osVersion && osVersion.length === 4) {
             buildNumber = parseInt(osVersion[3]);
@@ -1012,15 +1012,15 @@ var require_unixTerminal = __commonJS({
     })();
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.UnixTerminal = void 0;
-    var fs13 = require("fs");
-    var path19 = require("path");
+    var fs15 = require("fs");
+    var path21 = require("path");
     var tty = require("tty");
     var terminal_1 = require_terminal();
     var utils_1 = require_utils();
     var native = utils_1.loadNativeModule("pty");
     var pty = native.module;
     var helperPath = native.dir + "/spawn-helper";
-    helperPath = path19.resolve(__dirname, helperPath);
+    helperPath = path21.resolve(__dirname, helperPath);
     helperPath = helperPath.replace("app.asar", "app.asar.unpacked");
     helperPath = helperPath.replace("node_modules.asar", "node_modules.asar.unpacked");
     var DEFAULT_FILE = "sh";
@@ -1275,7 +1275,7 @@ var require_unixTerminal = __commonJS({
             return;
           }
           var task = this._writeQueue[0];
-          fs13.write(this._fd, task.buffer, task.offset, function(err, written) {
+          fs15.write(this._fd, task.buffer, task.offset, function(err, written) {
             if (err) {
               if ("code" in err && err.code === "EAGAIN") {
                 _this._writeImmediate = setImmediate(function() {
@@ -1392,6 +1392,419 @@ var require_src = __commonJS({
 // src/commands/start.ts
 var import_picocolors2 = __toESM(require("picocolors"));
 
+// ../../packages/shared/src/protocol/parseChrome.ts
+var SPINNER_RE = /^(?:[✳✢✶✻✽✴✷✸✹⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏◐◑◒◓▁▂▃▄▅▆▇█]|🔴|🟠|🟡|🟢|🔵|🟣|🟤|⚫|⚪|🌀|💭|✨)\s/u;
+var BULLET_TOOL_RE = /^•\s+(?:Read(?:ing)?|Edit(?:ing)?|Writ(?:e|ing)|Bash|Runn(?:ing)?|Search(?:ing)?|Glob(?:bing)?|Grep(?:ping)?|Creat(?:e|ing)|Execut(?:e|ing)|Task|Agent|NotebookEdit)\b/i;
+var TREE_LINE_RE = /^└\s/;
+var STATUS_LINE_RE = /^(?:\+|[🔴🟠🟡🟢🔵🟣🟤⚫⚪🌀💭✨])\s/u;
+function isChromeLine(line) {
+  const t2 = line.replace(/️/g, "").trim();
+  if (!t2) return false;
+  if (/^[─━—═─\-]{3,}$/.test(t2)) return true;
+  if (SPINNER_RE.test(t2)) return true;
+  if (BULLET_TOOL_RE.test(t2)) return true;
+  if (TREE_LINE_RE.test(t2)) return true;
+  if (STATUS_LINE_RE.test(t2) && /\d+\s*s\s*[·•]|\bthought\s+for\b|\d+\s*tokens|\(thinking\)/i.test(t2)) return true;
+  if (/^↓\s*\d+\s*tokens/i.test(t2)) return true;
+  if (/^\bthought\s+for\s+\d+/i.test(t2)) return true;
+  if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) return true;
+  if (/high\s*[·•]\s*\/effort/i.test(t2)) return true;
+  if (/^[❯>]\s*$/.test(t2)) return true;
+  if (/^\(thinking\)\s*$/.test(t2)) return true;
+  if (/^\?\s.*shortcut/i.test(t2)) return true;
+  if (/spending limit|usage limit/i.test(t2) && t2.length < 80) return true;
+  if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) return true;
+  if (t2.replace(/\s/g, "").length === 1) return true;
+  if ((t2.match(/─/g)?.length ?? 0) >= 6) return true;
+  if (/ctrl\+?o\s+to\s+expand/i.test(t2)) return true;
+  const hasBoxPrefix = /^[│╭╰╮╯┌└┐┘├┤┬┴┼]/.test(t2);
+  const stripped = t2.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "");
+  if (hasBoxPrefix && /^[❯>]\s+\S/.test(stripped) && !/^[❯>]\s*\d+\./.test(stripped)) return true;
+  return false;
+}
+function parseChromeLine(line) {
+  const t2 = line.replace(/️/g, "").trim();
+  if (!t2) return null;
+  if (/^[─━—═─\-]{3,}$/.test(t2)) return null;
+  if (/^[❯>]\s*$/.test(t2)) return null;
+  if (t2.replace(/\s/g, "").length === 1) return null;
+  if ((t2.match(/─/g)?.length ?? 0) >= 6) return null;
+  if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) return null;
+  if (/high\s*[·•]\s*\/effort/i.test(t2)) return null;
+  if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) return null;
+  if (/ctrl\+?o\s+to\s+expand/i.test(t2)) return null;
+  if (/spending limit|usage limit/i.test(t2)) return null;
+  if (/^\(thinking\)\s*$/.test(t2)) {
+    return { tool: "thinking", label: "Thinking\u2026", status: "running" };
+  }
+  if (TREE_LINE_RE.test(t2)) return null;
+  if (STATUS_LINE_RE.test(t2)) {
+    const label = t2.slice(2).replace(/….*/s, "").trim() || "Thinking\u2026";
+    return { tool: "thinking", label, status: "running" };
+  }
+  let text = t2;
+  if (SPINNER_RE.test(t2)) {
+    text = t2.slice(2).trim().replace(/….*/s, "").trim();
+  } else if (BULLET_TOOL_RE.test(t2)) {
+    text = t2.slice(2).trim();
+    text = text.replace(/\s*\(ctrl\+?o[^)]*\)/gi, "").replace(/,\s*reading\s+\d+\s+files?\s*…?/gi, "").replace(/,\s*\d+\s+files?\s*…?/gi, "").replace(/…$/, "").trim();
+  }
+  if (!text) return null;
+  return classifyStep(text);
+}
+function classifyStep(text) {
+  if (/^Read(?:ing)?\s+/i.test(text)) {
+    const label2 = text.replace(/^Read(?:ing)?\s+/i, "").replace(/\.\.\.$/, "").trim();
+    return { tool: "read", label: label2, status: "running" };
+  }
+  if (/^Edit(?:ing)?\s+|^Writ(?:e|ing|ing to)\s+|^Creat(?:e|ing)\s+/i.test(text)) {
+    const label2 = text.replace(/^(?:Edit(?:ing)?|Writ(?:e|ing(?: to)?)|Creat(?:e|ing))\s+/i, "").replace(/\.\.\.$/, "").trim();
+    return { tool: "edit", label: label2, status: "running" };
+  }
+  if (/^Runn(?:ing)?\s+|^Execut(?:e|ing)\s+|^Bash(?:ing)?\s*:|^\$\s+/i.test(text)) {
+    const label2 = text.replace(/^(?:Runn(?:ing)?|Execut(?:e|ing)|Bash(?:ing)?:|\$)\s+/i, "").replace(/\.\.\.$/, "").trim();
+    return { tool: "bash", label: label2, status: "running" };
+  }
+  if (/^Search(?:ing)?\s+for\s+|^Grep(?:ping)?\s*:/i.test(text)) {
+    const label2 = text.replace(/^(?:Search(?:ing)?\s+for|Grep(?:ping)?:)\s+/i, "").replace(/\.\.\.$/, "").trim();
+    return { tool: "search", label: label2, status: "running" };
+  }
+  const label = text.replace(/\.\.\.$/, "").trim();
+  return { tool: "other", label, status: "running" };
+}
+
+// ../../packages/shared/src/protocol/renderToLines.ts
+function renderToLines(raw) {
+  const screen = [""];
+  let row = 0;
+  let col = 0;
+  function ensureRow() {
+    while (screen.length <= row) screen.push("");
+  }
+  function writeChar(ch) {
+    ensureRow();
+    if (col < screen[row].length) {
+      screen[row] = screen[row].slice(0, col) + ch + screen[row].slice(col + 1);
+    } else {
+      while (screen[row].length < col) screen[row] += " ";
+      screen[row] += ch;
+    }
+    col++;
+  }
+  let i = 0;
+  while (i < raw.length) {
+    const ch = raw[i];
+    if (ch === "\x1B") {
+      i++;
+      if (i >= raw.length) break;
+      if (raw[i] === "[") {
+        i++;
+        let param = "";
+        while (i < raw.length && !/[@-~]/.test(raw[i])) param += raw[i++];
+        const cmd = raw[i] ?? "";
+        const n = parseInt(param) || 1;
+        if (cmd === "A") {
+          row = Math.max(0, row - n);
+        } else if (cmd === "B") {
+          row += n;
+          ensureRow();
+        } else if (cmd === "C") {
+          col += n;
+        } else if (cmd === "D") {
+          col = Math.max(0, col - n);
+        } else if (cmd === "G") {
+          col = Math.max(0, n - 1);
+        } else if (cmd === "H" || cmd === "f") {
+          const p2 = param.split(";");
+          row = Math.max(0, (parseInt(p2[0] ?? "1") || 1) - 1);
+          col = Math.max(0, (parseInt(p2[1] ?? "1") || 1) - 1);
+          ensureRow();
+        } else if (cmd === "J") {
+          if (param === "2" || param === "3") {
+            screen.length = 1;
+            screen[0] = "";
+            row = 0;
+            col = 0;
+          } else if (param === "1") {
+            for (let r = 0; r < row; r++) screen[r] = "";
+            screen[row] = " ".repeat(col) + screen[row].slice(col);
+          } else {
+            screen[row] = screen[row].slice(0, col);
+            screen.splice(row + 1);
+          }
+        } else if (cmd === "K") {
+          ensureRow();
+          if (param === "" || param === "0") screen[row] = screen[row].slice(0, col);
+          else if (param === "1") screen[row] = " ".repeat(col) + screen[row].slice(col);
+          else if (param === "2") screen[row] = "";
+        } else if (cmd === "h" && (param === "?1049" || param === "?47")) {
+          screen.length = 1;
+          screen[0] = "";
+          row = 0;
+          col = 0;
+        } else if (cmd === "l" && (param === "?1049" || param === "?47")) {
+          screen.length = 1;
+          screen[0] = "";
+          row = 0;
+          col = 0;
+        }
+      } else if (raw[i] === "]") {
+        i++;
+        while (i < raw.length) {
+          if (raw[i] === "\x07") break;
+          if (raw[i] === "\x1B" && i + 1 < raw.length && raw[i + 1] === "\\") {
+            i++;
+            break;
+          }
+          i++;
+        }
+      }
+    } else if (ch === "\r") {
+      if (i + 1 < raw.length && raw[i + 1] === "\n") {
+        row++;
+        col = 0;
+        ensureRow();
+        i++;
+      } else {
+        col = 0;
+      }
+    } else if (ch === "\n") {
+      row++;
+      col = 0;
+      ensureRow();
+    } else if (ch >= " " || ch === "	") {
+      writeChar(ch);
+    }
+    i++;
+  }
+  return screen;
+}
+
+// ../../packages/shared/src/protocol/selector.ts
+function detectSelector(lines) {
+  if (lines.some((l) => /\?\s+for\s+shortcuts/i.test(l.trim()))) return null;
+  const clean = lines.map(
+    (l) => l.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "").replace(/\s*[│╭╰╮╯┌└┐┘├┤┬┴┼─━═]+\s*$/, "")
+  );
+  const hasCursor = clean.some((l) => /^[❯>]\s*\d+\./.test(l.trim()));
+  const looksLikeTrust = clean.some(
+    (l) => /\b(?:trust\s+the\s+files|trust\s+this\s+folder|safety\s+check)\b/i.test(l)
+  );
+  if (!hasCursor && !looksLikeTrust) return null;
+  let optionStartIdx = -1;
+  for (let i = 0; i < clean.length; i++) {
+    if (/^(?:[❯>]\s*)?\d+\.\s/.test(clean[i].trim())) {
+      optionStartIdx = i;
+      break;
+    }
+  }
+  if (optionStartIdx === -1) return null;
+  const questionParts = [];
+  for (let i = 0; i < optionStartIdx; i++) {
+    const t2 = clean[i].trim();
+    if (!t2) continue;
+    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
+    if (/^\[.*\]$/.test(t2)) continue;
+    if (/^[>❯]\s/.test(t2)) continue;
+    if (!t2.includes(" ") && t2.length > 15) continue;
+    questionParts.push(t2);
+  }
+  const question = questionParts.filter((line, i, arr) => !arr.some((other, j2) => j2 !== i && other.includes(line))).join("\n").trim();
+  const optionLabels = /* @__PURE__ */ new Map();
+  const optionDescs = /* @__PURE__ */ new Map();
+  let currentNum = -1;
+  for (let i = optionStartIdx; i < clean.length; i++) {
+    const t2 = clean[i].trim();
+    if (!t2) continue;
+    const m = t2.match(/^(?:[❯>]\s*)?(\d+)\.\s+(.+)/);
+    if (m) {
+      const num = parseInt(m[1], 10);
+      if (!optionLabels.has(num)) {
+        optionLabels.set(num, m[2].trim());
+        optionDescs.set(num, []);
+      }
+      currentNum = num;
+    } else if (currentNum !== -1 && !/^Enter to/i.test(t2) && !/^[─━—═\-]{3,}$/.test(t2) && !/↑.*↓.*navigate/i.test(t2) && !/Esc to/i.test(t2)) {
+      optionDescs.get(currentNum)?.push(t2);
+    }
+  }
+  const keys = [...optionLabels.keys()].sort((a, b) => a - b);
+  if (keys.length < 2 || keys[0] !== 1) return null;
+  return {
+    question,
+    options: keys.map((k2) => optionLabels.get(k2)),
+    optionDescriptions: keys.map((k2) => (optionDescs.get(k2) ?? []).join(" ").trim()),
+    currentIndex: 0
+  };
+}
+function detectListSelector(lines) {
+  if (!lines.some((l) => /[↑↓].*navigate/i.test(l.trim()))) return null;
+  if (lines.some((l) => /^❯\s*\d+\./.test(l.trim()))) return null;
+  if (!lines.some((l) => /^\s+❯\s+\S/.test(l))) return null;
+  const isSelected = (line) => /^\s+❯\s+\S/.test(line);
+  const isUnselected = (line) => /^    \S/.test(line);
+  const isItem = (line) => isSelected(line) || isUnselected(line);
+  let optionStartIdx = -1;
+  for (let i = 0; i < lines.length; i++) {
+    if (isItem(lines[i])) {
+      optionStartIdx = i;
+      break;
+    }
+  }
+  if (optionStartIdx === -1) return null;
+  const questionParts = [];
+  for (let i = 0; i < optionStartIdx; i++) {
+    const t2 = lines[i].trim();
+    if (!t2) continue;
+    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
+    if (/[┌└│┐┘├┤┬┴┼]/.test(t2)) {
+      const inner = t2.replace(/[│┌└┐┘├┤┬┴┼─]/g, "").trim();
+      if (inner) questionParts.push(inner);
+      continue;
+    }
+    if (/^[>❯]\s/.test(t2)) continue;
+    if (/[↑↓].*navigate/i.test(t2)) continue;
+    if (!t2.includes(" ") && t2.length > 15) continue;
+    questionParts.push(t2);
+  }
+  const question = questionParts.filter((line, i, arr) => !arr.some((other, j2) => j2 !== i && other.includes(line))).join("\n").trim();
+  const options = [];
+  let currentIndex = 0;
+  for (const line of lines.slice(optionStartIdx)) {
+    const t2 = line.trim();
+    if (!t2) continue;
+    if (/[↑↓].*navigate/i.test(t2)) break;
+    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
+    if (isSelected(line)) {
+      currentIndex = options.length;
+      options.push(t2.replace(/^❯\s+/, "").trim());
+    } else if (isUnselected(line)) {
+      options.push(t2);
+    }
+  }
+  if (options.length < 2) return null;
+  return {
+    question,
+    options,
+    optionDescriptions: options.map(() => ""),
+    currentIndex
+  };
+}
+
+// ../../packages/shared/src/protocol/filterChrome.ts
+function filterChrome(lines) {
+  const result = [];
+  let skipEchoContinuation = false;
+  for (const line of lines) {
+    const t2 = line.trim();
+    if (!t2) {
+      skipEchoContinuation = false;
+      continue;
+    }
+    if (/^[─━—═─\-]{3,}$/.test(t2)) {
+      skipEchoContinuation = false;
+      continue;
+    }
+    if (/^[●⏺]\s/.test(t2)) skipEchoContinuation = false;
+    if (/^[✳✢✶✻✽✴✷✸✹⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏◐◑◒◓▁▂▃▄▅▆▇█]\s/.test(t2)) continue;
+    if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) continue;
+    if (/high\s*[·•]\s*\/effort/i.test(t2)) continue;
+    if (/^[❯>]\s*$/.test(t2)) continue;
+    if (/^\(thinking\)\s*$/.test(t2)) continue;
+    if (/^\?\s.*shortcut/i.test(t2)) continue;
+    if (/spending limit|usage limit/i.test(t2) && t2.length < 80) continue;
+    if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) continue;
+    if (t2.replace(/\s/g, "").length === 1) continue;
+    if ((t2.match(/─/g)?.length ?? 0) >= 6) continue;
+    if (/ctrl\+?o\s+to\s+expand/i.test(t2)) continue;
+    if (/^•\s+(?:Read(?:ing)?|Edit(?:ing)?|Writ(?:e|ing)|Bash|Runn(?:ing)?|Search(?:ing)?|Glob(?:bing)?|Grep(?:ping)?|Creat(?:e|ing)|Execut(?:e|ing)|Task|Agent|NotebookEdit)\b/i.test(
+      t2
+    ))
+      continue;
+    if (/^└\s/.test(t2)) continue;
+    if (/^\+\s/.test(t2) && /\d+\s*s\s*[·•]|\bthought\s+for\b|\d+\s*tokens|\(thinking\)/i.test(t2)) continue;
+    if (/^↓\s*\d+\s*tokens/i.test(t2)) continue;
+    if (/^\bthought\s+for\s+\d+/i.test(t2)) continue;
+    const stripped = t2.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "");
+    if (/^[❯>]\s+\S/.test(stripped) && !/^[❯>]\s*\d+\./.test(stripped)) {
+      skipEchoContinuation = true;
+      continue;
+    }
+    if (skipEchoContinuation) continue;
+    result.push(line);
+  }
+  return result;
+}
+
+// ../../packages/shared/src/models/pricing.ts
+var MODEL_PRICING = {
+  "claude-sonnet-4": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
+  "claude-opus-4": { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 },
+  "claude-3-5-sonnet": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
+  "claude-3-5-haiku": { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 },
+  "claude-3-haiku": { input: 0.25, output: 1.25, cacheRead: 0.03, cacheWrite: 0.3 }
+};
+var MODEL_CONTEXT_WINDOW = {
+  "claude-opus-4": 1e6,
+  "claude-sonnet-4": 1e6,
+  "claude-3-5-sonnet": 2e5,
+  "claude-3-5-haiku": 2e5,
+  "claude-3-haiku": 2e5
+};
+var DEFAULT_CONTEXT_WINDOW = 2e5;
+function getPricing(model) {
+  for (const [prefix, pricing] of Object.entries(MODEL_PRICING)) {
+    if (model.startsWith(prefix)) return pricing;
+  }
+  return MODEL_PRICING["claude-sonnet-4"];
+}
+function getContextWindow(model) {
+  if (!model) return DEFAULT_CONTEXT_WINDOW;
+  for (const [prefix, size] of Object.entries(MODEL_CONTEXT_WINDOW)) {
+    if (model.startsWith(prefix)) return size;
+  }
+  return DEFAULT_CONTEXT_WINDOW;
+}
+
+// ../../packages/shared/src/agents/registry.ts
+var AGENT_REGISTRY = {
+  claude: {
+    id: "claude",
+    displayName: "Claude Code",
+    binaryName: "claude",
+    enabled: true,
+    supportedAuthKinds: ["oauth_token", "api_key"],
+    preferredAuthKind: "oauth_token"
+  },
+  codex: {
+    id: "codex",
+    displayName: "Codex CLI",
+    binaryName: "codex",
+    enabled: false,
+    supportedAuthKinds: ["oauth_token", "api_key"],
+    preferredAuthKind: "oauth_token"
+  },
+  copilot: {
+    id: "copilot",
+    displayName: "GitHub Copilot CLI",
+    binaryName: "gh",
+    enabled: false,
+    supportedAuthKinds: ["oauth_token"],
+    preferredAuthKind: "oauth_token"
+  }
+};
+function getEnabledAgents() {
+  return Object.values(AGENT_REGISTRY).filter((m) => m.enabled);
+}
+function getAgent(id) {
+  const meta = AGENT_REGISTRY[id];
+  if (!meta) throw new Error(`Unknown agent id: ${id}`);
+  return meta;
+}
+function isKnownAgentId(id) {
+  return id === "claude" || id === "codex" || id === "copilot";
+}
+
 // src/config.ts
 var fs = __toESM(require("fs"));
 var os = __toESM(require("os"));
@@ -1402,6 +1815,9 @@ var EMPTY_CONFIG = () => ({
   activeSessionId: null,
   sessions: []
 });
+function migrateSession(s) {
+  return { ...s, agent: s.agent ?? "claude" };
+}
 function makeConfig(baseDir) {
   const dir = path.join(baseDir ?? os.homedir(), ".codeam");
   const file = path.join(dir, "config.json");
@@ -1411,7 +1827,8 @@ function makeConfig(baseDir) {
       return {
         pluginId: typeof raw.pluginId === "string" ? raw.pluginId : crypto.randomUUID(),
         activeSessionId: typeof raw.activeSessionId === "string" ? raw.activeSessionId : null,
-        sessions: Array.isArray(raw.sessions) ? raw.sessions : []
+        sessions: Array.isArray(raw.sessions) ? raw.sessions.map(migrateSession) : [],
+        preferredAgent: typeof raw.preferredAgent === "string" ? raw.preferredAgent : void 0
       };
     } catch {
       return EMPTY_CONFIG();
@@ -1465,10 +1882,16 @@ function makeConfig(baseDir) {
     } catch {
     }
   }
-  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, clearAll: clearAll2 };
+  function saveCliConfig2(c2) {
+    save(c2);
+  }
+  function loadCliConfig2() {
+    return load();
+  }
+  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, clearAll: clearAll2, saveCliConfig: saveCliConfig2, loadCliConfig: loadCliConfig2 };
 }
 var _default = makeConfig();
-var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, clearAll } = _default;
+var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, clearAll, saveCliConfig, loadCliConfig } = _default;
 
 // src/ui/banner.ts
 var import_picocolors = __toESM(require("picocolors"));
@@ -1477,7 +1900,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.10.7",
+  version: "2.11.0",
   description: "Remote control Claude Code (and other AI coding agents) from your mobile phone. Pair your device, send prompts, stream responses in real-time, and approve commands \u2014 from anywhere.",
   type: "commonjs",
   main: "dist/index.js",
@@ -1848,6 +2271,13 @@ var CommandRelayService = class {
   /** Polling backoff state (only used on the fallback). */
   pollTimer = null;
   pollFailures = 0;
+  // Successive polls that returned no commands. Drives an idle
+  // backoff so a CLI sitting on the polling fallback (SSE was
+  // unavailable) doesn't keep hammering the API every 2 s when
+  // there's nothing to do. Reset to 0 whenever a poll DELIVERS a
+  // command, so the first real work after a quiet period still
+  // reaches the CLI quickly.
+  pollEmptyStreak = 0;
   /** Reconnect backoff state for the SSE stream. */
   sseFailures = 0;
   sseReconnectTimer = null;
@@ -1976,7 +2406,9 @@ var CommandRelayService = class {
     if (!this._running) return;
     await this.pollOnce();
     if (this._running) {
-      const delay = computePollDelay({ baseMs: 2e3, failures: this.pollFailures });
+      const idleExp = Math.min(this.pollEmptyStreak, 4);
+      const effectiveFailures = Math.max(this.pollFailures, idleExp);
+      const delay = computePollDelay({ baseMs: 2e3, failures: effectiveFailures });
       this.pollTimer = setTimeout(() => this.pollLoop(), delay);
     }
   }
@@ -1985,7 +2417,11 @@ var CommandRelayService = class {
       const data = await _getJson(`${API_BASE2}/api/commands/pending?pluginId=${this.pluginId}`);
       const commands = data?.data;
       this.pollFailures = 0;
-      if (!Array.isArray(commands) || commands.length === 0) return;
+      if (!Array.isArray(commands) || commands.length === 0) {
+        this.pollEmptyStreak += 1;
+        return;
+      }
+      this.pollEmptyStreak = 0;
       log.trace("relay", `poll received ${commands.length} command(s)`);
       await this.dispatchCommands(commands);
     } catch (err) {
@@ -2380,7 +2816,7 @@ var WindowsConPtyStrategy = class _WindowsConPtyStrategy {
   resizeHandler = null;
   /**
    * Factory that returns a working ConPTY strategy or `null` if
-   * node-pty can't load. The caller (claude.service.ts) decides
+   * node-pty can't load. The caller (agent.service.ts) decides
    * whether to fall back to the legacy pipe strategy.
    */
   static tryCreate(opts) {
@@ -4485,9 +4921,10 @@ function buildClaudeLaunch(extraArgs = []) {
   return { cmd: found, args: extraArgs };
 }
 
-// src/services/claude.service.ts
-var ClaudeService = class {
-  constructor(opts) {
+// src/services/agent.service.ts
+var AgentService = class {
+  constructor(runtime, opts) {
+    this.runtime = runtime;
     this.opts = opts;
     this.strategyOpts = {
       onData: (d3) => {
@@ -4501,6 +4938,7 @@ var ClaudeService = class {
       onExit: opts.onExit
     };
   }
+  runtime;
   opts;
   // Strategy is selected lazily inside spawn() so we can fall back from
   // ConPTY → legacy pipe at runtime if the native binding fails to load.
@@ -4532,10 +4970,20 @@ var ClaudeService = class {
     this.pendingInputs.length = 0;
   }
   async spawn() {
-    let launch = buildClaudeLaunch();
-    if (!launch) {
+    let launch;
+    try {
+      launch = await this.runtime.prepareLaunch();
+    } catch {
       const installed = await ensureClaudeInstalled();
-      if (installed) launch = buildClaudeLaunch();
+      if (installed) {
+        try {
+          launch = await this.runtime.prepareLaunch();
+        } catch {
+          launch = null;
+        }
+      } else {
+        launch = null;
+      }
       if (!launch) {
         const cmd = process.platform === "win32" ? "irm https://claude.ai/install.ps1 | iex" : "curl -fsSL https://claude.ai/install.sh | bash";
         console.error(
@@ -4648,6 +5096,20 @@ var ClaudeService = class {
       s.write("\r");
     }, steps * ARROW_MS + ENTER_MS);
   }
+  /**
+   * Write raw bytes to the PTY without any auto-appended `\r` or delay.
+   * Use this when the caller already owns the full input (e.g. the
+   * `ptyInput` returned by `RuntimeStrategy.changeModelInstruction()`
+   * already contains the trailing `\r`).
+   */
+  sendRawPtyInput(text) {
+    if (!this.strategy) {
+      log.trace("claude", "sendRawPtyInput dropped (no strategy)");
+      return;
+    }
+    log.trace("claude", `sendRawPtyInput len=${text.length}`);
+    this.strategy.write(text);
+  }
   /** Send Escape key to Claude (cancels interactive prompts). */
   sendEscape() {
     this.strategy?.write("\x1B");
@@ -4662,390 +5124,559 @@ var ClaudeService = class {
   /**
    * Kill the current Claude process and relaunch it resuming the given session.
    * Pass auto=true to add --dangerously-skip-permissions (no confirmation prompts).
+   *
+   * For agents that use CLI flags (Claude: --resume <id>), `resumeLaunchArgs`
+   * returns a non-empty array and we pass those directly to the binary.
+   * For agents that use a post-spawn PTY instruction (e.g. Codex), `resumeLaunchArgs`
+   * returns [] and `postSpawnInstruction` types the resume command into the PTY.
    */
   restart(sessionId, auto = false) {
     if (!this.strategy) return;
-    const extraArgs = ["--resume", sessionId];
-    if (auto) extraArgs.push("--dangerously-skip-permissions");
-    const launch = buildClaudeLaunch(extraArgs);
+    const resumeArgs = auto ? this.runtime.resumeLaunchArgs(sessionId) : ["--resume", sessionId];
+    const launch = buildClaudeLaunch(resumeArgs);
     if (!launch) return;
     this.strategy.kill();
     this.strategy.spawn(launch.cmd, this.opts.cwd, launch.args);
+    if (resumeArgs.length === 0 && this.runtime.postSpawnInstruction) {
+      const { ptyInput } = this.runtime.postSpawnInstruction(sessionId);
+      setTimeout(() => {
+        this.strategy?.write(ptyInput);
+      }, 500);
+    }
   }
 };
 
-// ../../packages/shared/src/protocol/parseChrome.ts
-var SPINNER_RE = /^(?:[✳✢✶✻✽✴✷✸✹⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏◐◑◒◓▁▂▃▄▅▆▇█]|🔴|🟠|🟡|🟢|🔵|🟣|🟤|⚫|⚪|🌀|💭|✨)\s/u;
-var BULLET_TOOL_RE = /^•\s+(?:Read(?:ing)?|Edit(?:ing)?|Writ(?:e|ing)|Bash|Runn(?:ing)?|Search(?:ing)?|Glob(?:bing)?|Grep(?:ping)?|Creat(?:e|ing)|Execut(?:e|ing)|Task|Agent|NotebookEdit)\b/i;
-var TREE_LINE_RE = /^└\s/;
-var STATUS_LINE_RE = /^(?:\+|[🔴🟠🟡🟢🔵🟣🟤⚫⚪🌀💭✨])\s/u;
-function isChromeLine(line) {
-  const t2 = line.replace(/️/g, "").trim();
-  if (!t2) return false;
-  if (/^[─━—═─\-]{3,}$/.test(t2)) return true;
-  if (SPINNER_RE.test(t2)) return true;
-  if (BULLET_TOOL_RE.test(t2)) return true;
-  if (TREE_LINE_RE.test(t2)) return true;
-  if (STATUS_LINE_RE.test(t2) && /\d+\s*s\s*[·•]|\bthought\s+for\b|\d+\s*tokens|\(thinking\)/i.test(t2)) return true;
-  if (/^↓\s*\d+\s*tokens/i.test(t2)) return true;
-  if (/^\bthought\s+for\s+\d+/i.test(t2)) return true;
-  if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) return true;
-  if (/high\s*[·•]\s*\/effort/i.test(t2)) return true;
-  if (/^[❯>]\s*$/.test(t2)) return true;
-  if (/^\(thinking\)\s*$/.test(t2)) return true;
-  if (/^\?\s.*shortcut/i.test(t2)) return true;
-  if (/spending limit|usage limit/i.test(t2) && t2.length < 80) return true;
-  if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) return true;
-  if (t2.replace(/\s/g, "").length === 1) return true;
-  if ((t2.match(/─/g)?.length ?? 0) >= 6) return true;
-  if (/ctrl\+?o\s+to\s+expand/i.test(t2)) return true;
-  const hasBoxPrefix = /^[│╭╰╮╯┌└┐┘├┤┬┴┼]/.test(t2);
-  const stripped = t2.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "");
-  if (hasBoxPrefix && /^[❯>]\s+\S/.test(stripped) && !/^[❯>]\s*\d+\./.test(stripped)) return true;
-  return false;
-}
-function parseChromeLine(line) {
-  const t2 = line.replace(/️/g, "").trim();
-  if (!t2) return null;
-  if (/^[─━—═─\-]{3,}$/.test(t2)) return null;
-  if (/^[❯>]\s*$/.test(t2)) return null;
-  if (t2.replace(/\s/g, "").length === 1) return null;
-  if ((t2.match(/─/g)?.length ?? 0) >= 6) return null;
-  if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) return null;
-  if (/high\s*[·•]\s*\/effort/i.test(t2)) return null;
-  if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) return null;
-  if (/ctrl\+?o\s+to\s+expand/i.test(t2)) return null;
-  if (/spending limit|usage limit/i.test(t2)) return null;
-  if (/^\(thinking\)\s*$/.test(t2)) {
-    return { tool: "thinking", label: "Thinking\u2026", status: "running" };
-  }
-  if (TREE_LINE_RE.test(t2)) return null;
-  if (STATUS_LINE_RE.test(t2)) {
-    const label = t2.slice(2).replace(/….*/s, "").trim() || "Thinking\u2026";
-    return { tool: "thinking", label, status: "running" };
-  }
-  let text = t2;
-  if (SPINNER_RE.test(t2)) {
-    text = t2.slice(2).trim().replace(/….*/s, "").trim();
-  } else if (BULLET_TOOL_RE.test(t2)) {
-    text = t2.slice(2).trim();
-    text = text.replace(/\s*\(ctrl\+?o[^)]*\)/gi, "").replace(/,\s*reading\s+\d+\s+files?\s*…?/gi, "").replace(/,\s*\d+\s+files?\s*…?/gi, "").replace(/…$/, "").trim();
-  }
-  if (!text) return null;
-  return classifyStep(text);
-}
-function classifyStep(text) {
-  if (/^Read(?:ing)?\s+/i.test(text)) {
-    const label2 = text.replace(/^Read(?:ing)?\s+/i, "").replace(/\.\.\.$/, "").trim();
-    return { tool: "read", label: label2, status: "running" };
-  }
-  if (/^Edit(?:ing)?\s+|^Writ(?:e|ing|ing to)\s+|^Creat(?:e|ing)\s+/i.test(text)) {
-    const label2 = text.replace(/^(?:Edit(?:ing)?|Writ(?:e|ing(?: to)?)|Creat(?:e|ing))\s+/i, "").replace(/\.\.\.$/, "").trim();
-    return { tool: "edit", label: label2, status: "running" };
-  }
-  if (/^Runn(?:ing)?\s+|^Execut(?:e|ing)\s+|^Bash(?:ing)?\s*:|^\$\s+/i.test(text)) {
-    const label2 = text.replace(/^(?:Runn(?:ing)?|Execut(?:e|ing)|Bash(?:ing)?:|\$)\s+/i, "").replace(/\.\.\.$/, "").trim();
-    return { tool: "bash", label: label2, status: "running" };
-  }
-  if (/^Search(?:ing)?\s+for\s+|^Grep(?:ping)?\s*:/i.test(text)) {
-    const label2 = text.replace(/^(?:Search(?:ing)?\s+for|Grep(?:ping)?:)\s+/i, "").replace(/\.\.\.$/, "").trim();
-    return { tool: "search", label: label2, status: "running" };
-  }
-  const label = text.replace(/\.\.\.$/, "").trim();
-  return { tool: "other", label, status: "running" };
-}
-
-// ../../packages/shared/src/protocol/renderToLines.ts
-function renderToLines(raw) {
-  const screen = [""];
-  let row = 0;
-  let col = 0;
-  function ensureRow() {
-    while (screen.length <= row) screen.push("");
-  }
-  function writeChar(ch) {
-    ensureRow();
-    if (col < screen[row].length) {
-      screen[row] = screen[row].slice(0, col) + ch + screen[row].slice(col + 1);
-    } else {
-      while (screen[row].length < col) screen[row] += " ";
-      screen[row] += ch;
+// src/agents/claude/quota.ts
+var fs5 = __toESM(require("fs"));
+var os6 = __toESM(require("os"));
+var path8 = __toESM(require("path"));
+var import_child_process4 = require("child_process");
+var HELPER_SCRIPT = `import os,pty,sys,select,signal,struct,fcntl,termios,errno
+m,s=pty.openpty()
+try:
+    fcntl.ioctl(s,termios.TIOCSWINSZ,struct.pack('HHHH',30,120,0,0))
+except Exception:pass
+pid=os.fork()
+if pid==0:
+    os.close(m);os.setsid()
+    try:fcntl.ioctl(s,termios.TIOCSCTTY,0)
+    except Exception:pass
+    for fd in[0,1,2]:os.dup2(s,fd)
+    if s>2:os.close(s)
+    os.execvp(sys.argv[1],sys.argv[1:])
+    sys.exit(127)
+os.close(s)
+done=[False]
+def onchld(n,f):
+    try:os.waitpid(pid,os.WNOHANG)
+    except Exception:pass
+    done[0]=True
+signal.signal(signal.SIGCHLD,onchld)
+i=sys.stdin.fileno();o=sys.stdout.fileno()
+while not done[0]:
+    try:r,_,_=select.select([i,m],[],[],0.1)
+    except OSError as e:
+        if e.errno==errno.EINTR:continue
+        break
+    if i in r:
+        try:
+            d=os.read(i,4096)
+            if d:os.write(m,d)
+            else:break
+        except OSError:break
+    if m in r:
+        try:
+            d=os.read(m,4096)
+            if d:os.write(o,d)
+        except OSError:done[0]=True
+try:os.kill(pid,signal.SIGTERM)
+except Exception:pass
+try:
+    _,st=os.waitpid(pid,0)
+    sys.exit((st>>8)&0xFF)
+except Exception:sys.exit(0)
+`;
+function parseUsageOutput(raw) {
+  const clean = raw.replace(/\x1B\[[^@-~]*[@-~]/g, "").replace(/[\x00-\x1F\x7F]/g, " ");
+  const weekMatch = clean.match(/(\d+)%\s*used/i) || clean.match(/(\d+)\s*%/);
+  if (!weekMatch) return null;
+  const percent = parseInt(weekMatch[1], 10);
+  const resetMatch = clean.match(/resets\s+(.+?)(?:\s*[\(\)]|$)/im);
+  const resetAt = resetMatch?.[1]?.trim() || void 0;
+  return { percent, resetAt };
+}
+async function fetchClaudeQuota() {
+  return new Promise((resolve2) => {
+    const claudeCmd = findInPath("claude") ? "claude" : "claude-code";
+    if (!claudeCmd) {
+      resolve2(null);
+      return;
     }
-    col++;
-  }
-  let i = 0;
-  while (i < raw.length) {
-    const ch = raw[i];
-    if (ch === "\x1B") {
-      i++;
-      if (i >= raw.length) break;
-      if (raw[i] === "[") {
-        i++;
-        let param = "";
-        while (i < raw.length && !/[@-~]/.test(raw[i])) param += raw[i++];
-        const cmd = raw[i] ?? "";
-        const n = parseInt(param) || 1;
-        if (cmd === "A") {
-          row = Math.max(0, row - n);
-        } else if (cmd === "B") {
-          row += n;
-          ensureRow();
-        } else if (cmd === "C") {
-          col += n;
-        } else if (cmd === "D") {
-          col = Math.max(0, col - n);
-        } else if (cmd === "G") {
-          col = Math.max(0, n - 1);
-        } else if (cmd === "H" || cmd === "f") {
-          const p2 = param.split(";");
-          row = Math.max(0, (parseInt(p2[0] ?? "1") || 1) - 1);
-          col = Math.max(0, (parseInt(p2[1] ?? "1") || 1) - 1);
-          ensureRow();
-        } else if (cmd === "J") {
-          if (param === "2" || param === "3") {
-            screen.length = 1;
-            screen[0] = "";
-            row = 0;
-            col = 0;
-          } else if (param === "1") {
-            for (let r = 0; r < row; r++) screen[r] = "";
-            screen[row] = " ".repeat(col) + screen[row].slice(col);
-          } else {
-            screen[row] = screen[row].slice(0, col);
-            screen.splice(row + 1);
-          }
-        } else if (cmd === "K") {
-          ensureRow();
-          if (param === "" || param === "0") screen[row] = screen[row].slice(0, col);
-          else if (param === "1") screen[row] = " ".repeat(col) + screen[row].slice(col);
-          else if (param === "2") screen[row] = "";
-        } else if (cmd === "h" && (param === "?1049" || param === "?47")) {
-          screen.length = 1;
-          screen[0] = "";
-          row = 0;
-          col = 0;
-        } else if (cmd === "l" && (param === "?1049" || param === "?47")) {
-          screen.length = 1;
-          screen[0] = "";
-          row = 0;
-          col = 0;
+    const helperPath = path8.join(os6.tmpdir(), "codeam-quota-helper.py");
+    fs5.writeFileSync(helperPath, HELPER_SCRIPT, { mode: 420 });
+    const python = findInPath("python3") ?? findInPath("python");
+    if (!python) {
+      resolve2(null);
+      return;
+    }
+    const proc = (0, import_child_process4.spawn)(python, [helperPath, claudeCmd, "--tools", ""], {
+      stdio: ["pipe", "pipe", "ignore"],
+      cwd: process.cwd(),
+      env: { ...process.env, TERM: "dumb", COLUMNS: "120", LINES: "30" }
+    });
+    let output = "";
+    let resolved = false;
+    proc.stdout?.on("data", (chunk) => {
+      output += chunk.toString("utf8");
+    });
+    setTimeout(() => {
+      proc.stdin?.write("/usage\r");
+      setTimeout(() => {
+        if (resolved) return;
+        resolved = true;
+        const result = parseUsageOutput(output);
+        try {
+          proc.kill();
+        } catch {
         }
-      } else if (raw[i] === "]") {
-        i++;
-        while (i < raw.length) {
-          if (raw[i] === "\x07") break;
-          if (raw[i] === "\x1B" && i + 1 < raw.length && raw[i + 1] === "\\") {
-            i++;
-            break;
-          }
-          i++;
+        try {
+          fs5.unlinkSync(helperPath);
+        } catch {
         }
+        resolve2(result);
+      }, 5e3);
+    }, 8e3);
+    setTimeout(() => {
+      if (!resolved) {
+        resolved = true;
+        resolve2(null);
       }
-    } else if (ch === "\r") {
-      if (i + 1 < raw.length && raw[i + 1] === "\n") {
-        row++;
-        col = 0;
-        ensureRow();
-        i++;
-      } else {
-        col = 0;
+      try {
+        proc.kill();
+      } catch {
       }
-    } else if (ch === "\n") {
-      row++;
-      col = 0;
-      ensureRow();
-    } else if (ch >= " " || ch === "	") {
-      writeChar(ch);
-    }
-    i++;
-  }
-  return screen;
+    }, 2e4);
+  });
 }
 
-// ../../packages/shared/src/protocol/selector.ts
-function detectSelector(lines) {
-  if (lines.some((l) => /\?\s+for\s+shortcuts/i.test(l.trim()))) return null;
-  const clean = lines.map(
-    (l) => l.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "").replace(/\s*[│╭╰╮╯┌└┐┘├┤┬┴┼─━═]+\s*$/, "")
-  );
-  const hasCursor = clean.some((l) => /^[❯>]\s*\d+\./.test(l.trim()));
-  const looksLikeTrust = clean.some(
-    (l) => /\b(?:trust\s+the\s+files|trust\s+this\s+folder|safety\s+check)\b/i.test(l)
-  );
-  if (!hasCursor && !looksLikeTrust) return null;
-  let optionStartIdx = -1;
-  for (let i = 0; i < clean.length; i++) {
-    if (/^(?:[❯>]\s*)?\d+\.\s/.test(clean[i].trim())) {
-      optionStartIdx = i;
-      break;
+// src/agents/claude/history.ts
+var fs6 = __toESM(require("fs"));
+var path9 = __toESM(require("path"));
+var os7 = __toESM(require("os"));
+function encodeCwd(cwd) {
+  return cwd.replace(/[\\/:]/g, "-");
+}
+function resolveHistoryDir(cwd, projectsRoot) {
+  const root = projectsRoot ?? path9.join(os7.homedir(), ".claude", "projects");
+  const primary = path9.join(root, encodeCwd(cwd));
+  if (fs6.existsSync(primary)) return primary;
+  try {
+    const entries = fs6.readdirSync(root, { withFileTypes: true });
+    const wanted = encodeCwd(cwd);
+    for (const e of entries) {
+      if (!e.isDirectory()) continue;
+      const candidate = e.name.replace(/-+/g, "-");
+      if (candidate === wanted.replace(/-+/g, "-")) {
+        return path9.join(root, e.name);
+      }
     }
+  } catch {
   }
-  if (optionStartIdx === -1) return null;
-  const questionParts = [];
-  for (let i = 0; i < optionStartIdx; i++) {
-    const t2 = clean[i].trim();
-    if (!t2) continue;
-    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
-    if (/^\[.*\]$/.test(t2)) continue;
-    if (/^[>❯]\s/.test(t2)) continue;
-    if (!t2.includes(" ") && t2.length > 15) continue;
-    questionParts.push(t2);
+  return null;
+}
+function getCurrentUsage(historyDir, bootTimeMs = 0) {
+  const GRACE_MS = 5e3;
+  const cutoff = bootTimeMs > 0 ? bootTimeMs - GRACE_MS : 0;
+  let entries;
+  try {
+    entries = fs6.readdirSync(historyDir, { withFileTypes: true });
+  } catch {
+    return null;
   }
-  const question = questionParts.filter((line, i, arr) => !arr.some((other, j2) => j2 !== i && other.includes(line))).join("\n").trim();
-  const optionLabels = /* @__PURE__ */ new Map();
-  const optionDescs = /* @__PURE__ */ new Map();
-  let currentNum = -1;
-  for (let i = optionStartIdx; i < clean.length; i++) {
-    const t2 = clean[i].trim();
-    if (!t2) continue;
-    const m = t2.match(/^(?:[❯>]\s*)?(\d+)\.\s+(.+)/);
-    if (m) {
-      const num = parseInt(m[1], 10);
-      if (!optionLabels.has(num)) {
-        optionLabels.set(num, m[2].trim());
-        optionDescs.set(num, []);
-      }
-      currentNum = num;
-    } else if (currentNum !== -1 && !/^Enter to/i.test(t2) && !/^[─━—═\-]{3,}$/.test(t2) && !/↑.*↓.*navigate/i.test(t2) && !/Esc to/i.test(t2)) {
-      optionDescs.get(currentNum)?.push(t2);
+  const files = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
+    try {
+      const stat3 = fs6.statSync(path9.join(historyDir, 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) return null;
+  const filePath = path9.join(historyDir, files[0].name);
+  let raw;
+  try {
+    raw = fs6.readFileSync(filePath, "utf8");
+  } catch {
+    return null;
+  }
+  let lastUsage = null;
+  let lastModel = null;
+  for (const line of raw.split("\n").filter(Boolean)) {
+    try {
+      const record = JSON.parse(line);
+      if (record["type"] !== "assistant") continue;
+      const msg = record["message"];
+      if (msg?.["model"] === "<synthetic>") continue;
+      const usage = msg?.["usage"];
+      if (usage && (usage["input_tokens"] !== void 0 || usage["prompt_tokens"] !== void 0)) {
+        lastUsage = usage;
+      }
+      if (msg?.["model"]) lastModel = msg["model"];
+    } catch {
     }
   }
-  const keys = [...optionLabels.keys()].sort((a, b) => a - b);
-  if (keys.length < 2 || keys[0] !== 1) return null;
+  const total = getContextWindow(lastModel);
+  if (!lastUsage) {
+    if (!lastModel) return null;
+    return { used: 0, total, percent: 0, model: lastModel };
+  }
+  const inputTokens = (lastUsage["input_tokens"] ?? lastUsage["prompt_tokens"] ?? 0) + (lastUsage["cache_read_input_tokens"] ?? 0) + (lastUsage["cache_creation_input_tokens"] ?? 0);
+  const percent = Math.min(100, Math.round(inputTokens / total * 100));
   return {
-    question,
-    options: keys.map((k2) => optionLabels.get(k2)),
-    optionDescriptions: keys.map((k2) => (optionDescs.get(k2) ?? []).join(" ").trim()),
-    currentIndex: 0
+    used: inputTokens,
+    total,
+    percent,
+    model: lastModel ?? void 0
   };
 }
-function detectListSelector(lines) {
-  if (!lines.some((l) => /[↑↓].*navigate/i.test(l.trim()))) return null;
-  if (lines.some((l) => /^❯\s*\d+\./.test(l.trim()))) return null;
-  if (!lines.some((l) => /^\s+❯\s+\S/.test(l))) return null;
-  const isSelected = (line) => /^\s+❯\s+\S/.test(line);
-  const isUnselected = (line) => /^    \S/.test(line);
-  const isItem = (line) => isSelected(line) || isUnselected(line);
-  let optionStartIdx = -1;
-  for (let i = 0; i < lines.length; i++) {
-    if (isItem(lines[i])) {
-      optionStartIdx = i;
-      break;
-    }
+function extractText(content) {
+  if (typeof content === "string") return content;
+  if (Array.isArray(content)) {
+    return content.filter((b) => b["type"] === "text").map((b) => b["text"]).join("\n");
   }
-  if (optionStartIdx === -1) return null;
-  const questionParts = [];
-  for (let i = 0; i < optionStartIdx; i++) {
-    const t2 = lines[i].trim();
-    if (!t2) continue;
-    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
-    if (/[┌└│┐┘├┤┬┴┼]/.test(t2)) {
-      const inner = t2.replace(/[│┌└┐┘├┤┬┴┼─]/g, "").trim();
-      if (inner) questionParts.push(inner);
+  return "";
+}
+function parseHistoryFile(filePath) {
+  const out = [];
+  let raw;
+  try {
+    raw = fs6.readFileSync(filePath, "utf8");
+  } catch {
+    return out;
+  }
+  for (const line of raw.split("\n").filter(Boolean)) {
+    let rec;
+    try {
+      rec = JSON.parse(line);
+    } catch {
       continue;
     }
-    if (/^[>❯]\s/.test(t2)) continue;
-    if (/[↑↓].*navigate/i.test(t2)) continue;
-    if (!t2.includes(" ") && t2.length > 15) continue;
-    questionParts.push(t2);
+    if (typeof rec !== "object" || rec === null) continue;
+    const r = rec;
+    if (r["isMeta"]) continue;
+    const type = r["type"];
+    if (type !== "user" && type !== "assistant") continue;
+    const msg = r["message"];
+    if (!msg) continue;
+    const text = extractText(msg["content"]).trim();
+    if (!text) continue;
+    const ts = r["timestamp"];
+    const timestamp = typeof ts === "string" ? ts : typeof ts === "number" ? new Date(ts).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
+    const uuid = typeof r["uuid"] === "string" ? r["uuid"] : `${Date.now()}-${Math.random()}`;
+    const usage = msg["usage"];
+    out.push({
+      id: uuid,
+      role: type === "user" ? "user" : "agent",
+      text,
+      timestamp,
+      modelId: typeof msg["model"] === "string" ? msg["model"] : void 0,
+      usage: usage ? {
+        input: usage["input_tokens"] ?? 0,
+        output: usage["output_tokens"] ?? 0,
+        cacheRead: usage["cache_read_input_tokens"],
+        cacheCreation: usage["cache_creation_input_tokens"]
+      } : void 0
+    });
+  }
+  return out;
+}
+
+// src/agents/claude/runtime.ts
+var ClaudeRuntimeStrategy = class {
+  id = "claude";
+  meta = getAgent("claude");
+  async prepareLaunch() {
+    const launch = buildClaudeLaunch();
+    if (!launch) throw new Error("claude binary not found in PATH");
+    return { cmd: launch.cmd, args: launch.args };
+  }
+  resumeLaunchArgs(sessionId) {
+    return ["--resume", sessionId, "--dangerously-skip-permissions"];
+  }
+  resolveHistoryDir(cwd) {
+    return resolveHistoryDir(cwd);
+  }
+  parseHistoryFile(filePath) {
+    return parseHistoryFile(filePath);
+  }
+  getCurrentUsage(historyDir) {
+    return getCurrentUsage(historyDir);
+  }
+  async fetchWeeklyUsage() {
+    return fetchClaudeQuota();
+  }
+  async listModels() {
+    return [
+      { id: "claude-opus-4-7", label: "Claude Opus 4.7", contextWindow: 2e5 },
+      { id: "claude-opus-4-6", label: "Claude Opus 4.6", contextWindow: 2e5 },
+      { id: "claude-sonnet-4-6", label: "Claude Sonnet 4.6", contextWindow: 2e5 },
+      { id: "claude-haiku-4-5-20251001", label: "Claude Haiku 4.5", contextWindow: 2e5 }
+    ];
+  }
+  changeModelInstruction(modelId) {
+    return { type: "pty", ptyInput: `/model ${modelId}\r` };
+  }
+  summarizeInstruction(mode) {
+    if (mode === "normal") return { ptyInput: "/compact\r" };
+    return { ptyInput: "/compact\r" };
+  }
+};
+
+// src/agents/claude/deploy.ts
+var fs8 = __toESM(require("fs"));
+var os9 = __toESM(require("os"));
+var path11 = __toESM(require("path"));
+
+// src/agents/claude/credentials.ts
+var import_child_process5 = require("child_process");
+var fs7 = __toESM(require("fs"));
+var os8 = __toESM(require("os"));
+var path10 = __toESM(require("path"));
+var import_util = require("util");
+var execFileP = (0, import_util.promisify)(import_child_process5.execFile);
+async function detectLocalClaudeCredentials() {
+  const localClaudeDir = path10.join(os8.homedir(), ".claude");
+  const flat = path10.join(localClaudeDir, ".credentials.json");
+  if (fs7.existsSync(flat)) {
+    return { source: "flat-file", description: "~/.claude/.credentials.json" };
+  }
+  if (os8.platform() === "darwin") {
+    try {
+      await execFileP(
+        "security",
+        ["find-generic-password", "-s", "Claude Code-credentials"],
+        { maxBuffer: 1024 * 1024 }
+      );
+      return { source: "macos-keychain", description: "macOS Keychain" };
+    } catch {
+      return { source: "none", description: "" };
+    }
   }
-  const question = questionParts.filter((line, i, arr) => !arr.some((other, j2) => j2 !== i && other.includes(line))).join("\n").trim();
-  const options = [];
-  let currentIndex = 0;
-  for (const line of lines.slice(optionStartIdx)) {
-    const t2 = line.trim();
-    if (!t2) continue;
-    if (/[↑↓].*navigate/i.test(t2)) break;
-    if (/^[─━—═\-]{3,}$/.test(t2)) continue;
-    if (isSelected(line)) {
-      currentIndex = options.length;
-      options.push(t2.replace(/^❯\s+/, "").trim());
-    } else if (isUnselected(line)) {
-      options.push(t2);
+  return { source: "none", description: "" };
+}
+async function bridgeClaudeCredentials(provider, workspaceId) {
+  const localClaudeDir = path10.join(os8.homedir(), ".claude");
+  const fileBased = path10.join(localClaudeDir, ".credentials.json");
+  if (fs7.existsSync(fileBased)) {
+    return { source: "flat-file", description: "~/.claude/.credentials.json" };
+  }
+  if (process.platform === "darwin") {
+    try {
+      const { stdout } = await execFileP(
+        "security",
+        ["find-generic-password", "-s", "Claude Code-credentials", "-w"],
+        { maxBuffer: 1024 * 1024 }
+      );
+      const json = stdout.trim();
+      if (json.length === 0) return { source: "none", description: "" };
+      await provider.uploadFile(
+        workspaceId,
+        "/home/codespace/.claude/.credentials.json",
+        json,
+        { mode: 384 }
+      );
+      return { source: "macos-keychain", description: "macOS Keychain" };
+    } catch {
+      return { source: "none", description: "" };
     }
   }
-  if (options.length < 2) return null;
-  return {
-    question,
-    options,
-    optionDescriptions: options.map(() => ""),
-    currentIndex
-  };
+  return { source: "none", description: "" };
+}
+async function runRemoteClaudeLogin(provider, workspaceId) {
+  wt(
+    [
+      "A login URL will print below. Open it in your local browser, sign in,",
+      "and paste any code Claude asks for back into this terminal."
+    ].join("\n"),
+    "Authenticating Claude on workspace"
+  );
+  const result = await provider.streamCommand(
+    workspaceId,
+    'bash -lc "claude login || claude /login || true"'
+  );
+  if (result.code !== 0) {
+    wt(
+      "claude login exited non-zero. You can re-run it manually inside the codespace later.",
+      "Heads up"
+    );
+  }
+}
+async function verifyClaudeAuth(provider, workspaceId) {
+  const result = await provider.exec(
+    workspaceId,
+    'bash -lc "claude auth status 2>/dev/null || true"'
+  );
+  if (result.code !== 0) return false;
+  const jsonStart = result.stdout.indexOf("{");
+  if (jsonStart < 0) return false;
+  try {
+    const parsed = JSON.parse(result.stdout.slice(jsonStart));
+    return parsed.loggedIn === true;
+  } catch {
+    return false;
+  }
 }
 
-// ../../packages/shared/src/protocol/filterChrome.ts
-function filterChrome(lines) {
-  const result = [];
-  let skipEchoContinuation = false;
-  for (const line of lines) {
-    const t2 = line.trim();
-    if (!t2) {
-      skipEchoContinuation = false;
-      continue;
+// src/agents/claude/deploy.ts
+var ClaudeDeployStrategy = class {
+  id = "claude";
+  async detectLocalCredentials() {
+    return detectLocalClaudeCredentials();
+  }
+  async bridgeLocalCredentials(provider, workspaceId) {
+    return bridgeClaudeCredentials(provider, workspaceId);
+  }
+  async runRemoteLogin(provider, workspaceId) {
+    return runRemoteClaudeLogin(provider, workspaceId);
+  }
+  /**
+   * Steps 5-9 of the deploy flow:
+   *  - Install Claude CLI on the workspace
+   *  - Copy local ~/.claude config dir (excluding heavy state)
+   *  - Ship ~/.claude.json (only when creds were bridged — privacy)
+   *  - Verify auth, fallback to runRemoteLogin
+   */
+  async setupOnWorkspace(provider, workspaceId, opts) {
+    const claudeStep = fe();
+    claudeStep.start("Installing Claude CLI on workspace\u2026");
+    const installResult = await provider.exec(
+      workspaceId,
+      "curl -fsSL https://claude.ai/install.sh | bash"
+    );
+    if (installResult.code !== 0) {
+      claudeStep.stop("\u2717 Claude CLI install failed");
+      pt(installResult.stderr.slice(0, 1e3));
+      process.exit(1);
     }
-    if (/^[─━—═─\-]{3,}$/.test(t2)) {
-      skipEchoContinuation = false;
-      continue;
+    claudeStep.stop("\u2713 Claude CLI installed");
+    const localClaudeDir = path11.join(os9.homedir(), ".claude");
+    const haveLocalClaude = fs8.existsSync(localClaudeDir) && fs8.statSync(localClaudeDir).isDirectory();
+    if (haveLocalClaude) {
+      const copyStep = fe();
+      copyStep.start("Copying local Claude config to workspace\u2026");
+      try {
+        await provider.uploadDirectory(
+          workspaceId,
+          localClaudeDir,
+          "/home/codespace/.claude",
+          {
+            exclude: [
+              "./projects",
+              // per-project conversation history (often 700MB+)
+              "./file-history",
+              // per-project file diffs
+              "./downloads",
+              // downloaded artifacts
+              "./image-cache",
+              // cached images
+              "./paste-cache",
+              // clipboard/paste cache
+              "./backups",
+              // local backups
+              "./shell-snapshots",
+              // shell history snapshots
+              "./telemetry",
+              // analytics dumps
+              "./statsig",
+              // feature-flag cache
+              "./cache",
+              // generic cache dir
+              "./history.jsonl",
+              // global REPL history
+              "./ide",
+              // local IDE bridge state
+              "./todos",
+              // local todo state
+              "./tasks",
+              // local task state
+              // Don't overwrite the credentials we already staged in
+              // step 4 — the local dir on macOS doesn't have a flat
+              // credentials file anyway, but on Linux it would, and a
+              // re-write here would be redundant.
+              "./.credentials.json"
+            ]
+          }
+        );
+        copyStep.stop("\u2713 Claude config uploaded");
+      } catch (err) {
+        copyStep.stop("\u26A0 Could not upload Claude config (continuing)");
+        void err;
+      }
     }
-    if (/^[●⏺]\s/.test(t2)) skipEchoContinuation = false;
-    if (/^[✳✢✶✻✽✴✷✸✹⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏◐◑◒◓▁▂▃▄▅▆▇█]\s/.test(t2)) continue;
-    if (/esc.{0,5}to.{0,5}interrupt/i.test(t2)) continue;
-    if (/high\s*[·•]\s*\/effort/i.test(t2)) continue;
-    if (/^[❯>]\s*$/.test(t2)) continue;
-    if (/^\(thinking\)\s*$/.test(t2)) continue;
-    if (/^\?\s.*shortcut/i.test(t2)) continue;
-    if (/spending limit|usage limit/i.test(t2) && t2.length < 80) continue;
-    if (/↑\s*\/?\s*↓\s*to\s*navigate/i.test(t2)) continue;
-    if (t2.replace(/\s/g, "").length === 1) continue;
-    if ((t2.match(/─/g)?.length ?? 0) >= 6) continue;
-    if (/ctrl\+?o\s+to\s+expand/i.test(t2)) continue;
-    if (/^•\s+(?:Read(?:ing)?|Edit(?:ing)?|Writ(?:e|ing)|Bash|Runn(?:ing)?|Search(?:ing)?|Glob(?:bing)?|Grep(?:ping)?|Creat(?:e|ing)|Execut(?:e|ing)|Task|Agent|NotebookEdit)\b/i.test(
-      t2
-    ))
-      continue;
-    if (/^└\s/.test(t2)) continue;
-    if (/^\+\s/.test(t2) && /\d+\s*s\s*[·•]|\bthought\s+for\b|\d+\s*tokens|\(thinking\)/i.test(t2)) continue;
-    if (/^↓\s*\d+\s*tokens/i.test(t2)) continue;
-    if (/^\bthought\s+for\s+\d+/i.test(t2)) continue;
-    const stripped = t2.replace(/^[│╭╰╮╯┌└┐┘├┤┬┴┼]\s?/, "");
-    if (/^[❯>]\s+\S/.test(stripped) && !/^[❯>]\s*\d+\./.test(stripped)) {
-      skipEchoContinuation = true;
-      continue;
+    if (opts.bridged !== "none") {
+      const localClaudeJson = path11.join(os9.homedir(), ".claude.json");
+      if (fs8.existsSync(localClaudeJson)) {
+        try {
+          const contents = fs8.readFileSync(localClaudeJson);
+          await provider.uploadFile(
+            workspaceId,
+            "/home/codespace/.claude.json",
+            contents,
+            { mode: 384 }
+          );
+        } catch (err) {
+          void err;
+        }
+      }
+    }
+    const verifyStep = fe();
+    verifyStep.start("Verifying Claude auth on workspace\u2026");
+    const verified = await verifyClaudeAuth(provider, workspaceId);
+    if (verified) {
+      verifyStep.stop("\u2713 Claude is logged in \u2014 no re-auth needed");
+    } else {
+      verifyStep.stop("\xB7 Claude not yet authenticated \u2014 running login flow");
+      await runRemoteClaudeLogin(provider, workspaceId);
+      const reverified = await verifyClaudeAuth(provider, workspaceId);
+      if (!reverified) {
+        wt(
+          "Claude auth could not be confirmed. You may need to run `claude /login` manually inside the codespace.",
+          "Heads up"
+        );
+      }
     }
-    if (skipEchoContinuation) continue;
-    result.push(line);
   }
-  return result;
-}
+};
 
-// ../../packages/shared/src/models/pricing.ts
-var MODEL_PRICING = {
-  "claude-sonnet-4": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-opus-4": { input: 15, output: 75, cacheRead: 1.5, cacheWrite: 18.75 },
-  "claude-3-5-sonnet": { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3.75 },
-  "claude-3-5-haiku": { input: 0.8, output: 4, cacheRead: 0.08, cacheWrite: 1 },
-  "claude-3-haiku": { input: 0.25, output: 1.25, cacheRead: 0.03, cacheWrite: 0.3 }
+// src/agents/registry.ts
+var runtimeBuilders = {
+  claude: () => new ClaudeRuntimeStrategy()
+  // codex and copilot added in Phase 2 / later
 };
-var MODEL_CONTEXT_WINDOW = {
-  "claude-opus-4": 1e6,
-  "claude-sonnet-4": 1e6,
-  "claude-3-5-sonnet": 2e5,
-  "claude-3-5-haiku": 2e5,
-  "claude-3-haiku": 2e5
+var deployBuilders = {
+  claude: () => new ClaudeDeployStrategy()
 };
-var DEFAULT_CONTEXT_WINDOW = 2e5;
-function getPricing(model) {
-  for (const [prefix, pricing] of Object.entries(MODEL_PRICING)) {
-    if (model.startsWith(prefix)) return pricing;
+function createRuntimeStrategy(agent) {
+  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'.`
+    );
   }
-  return MODEL_PRICING["claude-sonnet-4"];
+  const build = runtimeBuilders[agent];
+  if (!build) {
+    throw new Error(`No runtime strategy registered for agent "${agent}"`);
+  }
+  return build();
 }
-function getContextWindow(model) {
-  if (!model) return DEFAULT_CONTEXT_WINDOW;
-  for (const [prefix, size] of Object.entries(MODEL_CONTEXT_WINDOW)) {
-    if (model.startsWith(prefix)) return size;
+function createDeployStrategy(agent) {
+  if (!AGENT_REGISTRY[agent]?.enabled) {
+    throw new Error(`Agent "${agent}" is not supported in this codeam-cli version.`);
   }
-  return DEFAULT_CONTEXT_WINDOW;
+  const build = deployBuilders[agent];
+  if (!build) {
+    throw new Error(`No deploy strategy registered for agent "${agent}"`);
+  }
+  return build();
 }
 
 // src/services/output/chrome-tracker.ts
@@ -5504,19 +6135,8 @@ var OutputService = class _OutputService {
   tryExtractSessionId(text) {
     if (!this.onSessionIdDetected) return;
     const printable = text.replace(/\x1B\[[^@-~]*[@-~]/g, "").replace(/[\x00-\x1F\x7F]/g, "");
-    const patterns = [
-      /Resuming session[:\s]+([a-f0-9-]{36})/i,
-      /Session[:\s]+([a-f0-9-]{36})/i,
-      /Conversation[:\s]+([a-f0-9-]{36})/i,
-      /Session\s+ID[:\s]+([a-f0-9-]{36})/i
-    ];
-    for (const pattern of patterns) {
-      const match = printable.match(pattern);
-      if (match) {
-        this.onSessionIdDetected(match[1]);
-        return;
-      }
-    }
+    const match = printable.match(/Resuming session[:\s]+([a-f0-9-]{36})/i);
+    if (match) this.onSessionIdDetected(match[1]);
   }
   tryDetectRateLimit(text) {
     if (!this.onRateLimitDetected) return;
@@ -5529,9 +6149,9 @@ var OutputService = class _OutputService {
 };
 
 // src/services/history.service.ts
-var fs5 = __toESM(require("fs"));
-var path8 = __toESM(require("path"));
-var os6 = __toESM(require("os"));
+var fs9 = __toESM(require("fs"));
+var path12 = __toESM(require("path"));
+var os10 = __toESM(require("os"));
 var https4 = __toESM(require("https"));
 var http4 = __toESM(require("http"));
 var import_zod = require("zod");
@@ -5546,28 +6166,7 @@ var historyRecordSchema = import_zod.z.object({
   }).passthrough().optional()
 }).passthrough();
 var API_BASE4 = process.env.CODEAM_API_URL ?? "https://codeagent-mobile-api.vercel.app";
-function encodeCwd(cwd) {
-  return cwd.replace(/[\\/:]/g, "-");
-}
-function findProjectDir(cwd) {
-  const projectsRoot = path8.join(os6.homedir(), ".claude", "projects");
-  const primary = path8.join(projectsRoot, encodeCwd(cwd));
-  if (fs5.existsSync(primary)) return primary;
-  try {
-    const entries = fs5.readdirSync(projectsRoot, { withFileTypes: true });
-    const wanted = encodeCwd(cwd);
-    for (const e of entries) {
-      if (!e.isDirectory()) continue;
-      const candidate = e.name.replace(/-+/g, "-");
-      if (candidate === wanted.replace(/-+/g, "-")) {
-        return path8.join(projectsRoot, e.name);
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-function extractText(content) {
+function extractText2(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
     return content.filter((b) => b["type"] === "text").map((b) => b["text"]).join("\n");
@@ -5579,7 +6178,7 @@ function parseJsonl(filePath) {
   const messages = [];
   let raw;
   try {
-    raw = fs5.readFileSync(filePath, "utf8");
+    raw = fs9.readFileSync(filePath, "utf8");
   } catch (err) {
     if (err.code !== "ENOENT") {
       log.warn("history:parseJsonl", `read failed for ${filePath}`, err);
@@ -5606,10 +6205,10 @@ function parseJsonl(filePath) {
     const uuid = record.uuid ?? `${Date.now()}-${Math.random()}`;
     const msg = record.message;
     if (record.type === "user" && msg) {
-      const text = extractText(msg.content).trim();
+      const text = extractText2(msg.content).trim();
       if (text) messages.push({ id: uuid, role: "user", text, timestamp });
     } else if (record.type === "assistant" && msg) {
-      const text = extractText(msg.content).trim();
+      const text = extractText2(msg.content).trim();
       if (text) messages.push({ id: uuid, role: "agent", text, timestamp });
     }
   }
@@ -5652,10 +6251,12 @@ function post(endpoint, body) {
     req.end();
   });
 }
-var HistoryService = class {
-  constructor(pluginId, cwd) {
+var HistoryService = class _HistoryService {
+  constructor(runtime, pluginId, cwd, options) {
     this.pluginId = pluginId;
     this.cwd = cwd;
+    this.runtime = runtime;
+    this.bootTimeMs = options?.bootTimeMs ?? Date.now();
   }
   pluginId;
   cwd;
@@ -5671,6 +6272,26 @@ var HistoryService = class {
    * resume re-uploads the full transcript on first call.
    */
   lastUploadedUuid = /* @__PURE__ */ new Map();
+  /**
+   * Captured at construction time so every JSONL discovery (detect,
+   * usage stats) can ignore files that already existed in the
+   * project's `~/.claude/projects/<cwd>/` dir *before* this CLI
+   * run started. Without this filter, an old conversation — or
+   * a *parallel* Claude session actively writing to the same
+   * project — wins the mtime sort and we publish its content
+   * to the mobile app as if it were the fresh pair's chat.
+   */
+  bootTimeMs;
+  /**
+   * Small grace window subtracted from `bootTimeMs` when filtering
+   * by `birthtime`. Covers clock skew + filesystem timestamp
+   * rounding (HFS+ floors to 1 s; some Linux filesystems round to
+   * the nearest second). 5 s is comfortably wider than any
+   * filesystem rounding while still excluding everything from a
+   * previous pair / previous Claude run.
+   */
+  static BIRTHTIME_GRACE_MS = 5e3;
+  runtime;
   /** Store rate limit reset info detected from Claude Code output */
   setRateLimitReset(reset) {
     this._rateLimitReset = reset;
@@ -5691,7 +6312,7 @@ var HistoryService = class {
     return this._quotaPercent === null || Date.now() - this._quotaFetchedAt > ttlMs;
   }
   get projectDir() {
-    return findProjectDir(this.cwd) ?? path8.join(os6.homedir(), ".claude", "projects", encodeCwd(this.cwd));
+    return this.runtime.resolveHistoryDir(this.cwd) ?? path12.join(os10.homedir(), ".claude", "projects", encodeCwd(this.cwd));
   }
   /** Set the current Claude conversation ID (extracted from /cost command or session start) */
   setCurrentConversationId(id) {
@@ -5703,7 +6324,7 @@ var HistoryService = class {
   /** Return the current message count in the active conversation. */
   getCurrentMessageCount() {
     if (!this.currentConversationId) return 0;
-    const filePath = path8.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+    const filePath = path12.join(this.projectDir, `${this.currentConversationId}.jsonl`);
     return parseJsonl(filePath).length;
   }
   /**
@@ -5714,7 +6335,7 @@ var HistoryService = class {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
       if (!this.currentConversationId) return null;
-      const filePath = path8.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+      const filePath = path12.join(this.projectDir, `${this.currentConversationId}.jsonl`);
       const messages = parseJsonl(filePath);
       if (messages.length > previousCount) {
         for (let i = messages.length - 1; i >= previousCount; i--) {
@@ -5725,37 +6346,50 @@ var HistoryService = class {
     }
     return null;
   }
-  /** Detect the active conversation by finding the most recently modified JSONL file */
+  /**
+   * Detect the active conversation by finding the most recently
+   * modified JSONL file that was **created during this CLI run**.
+   * The birthtime filter is critical: without it, an old
+   * conversation in the same project dir — or a parallel Claude
+   * session actively writing to a sibling JSONL — wins the mtime
+   * sort, and we publish that other run's content to mobile as if
+   * it were the fresh pair's chat. With the filter, only files
+   * Claude created on or after `bootTimeMs` are eligible, so a
+   * fresh pair stays empty until the user actually types a turn.
+   */
   detectCurrentConversation() {
     const dir = this.projectDir;
+    const cutoff = this.bootTimeMs - _HistoryService.BIRTHTIME_GRACE_MS;
     try {
-      const files = fs5.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
+      const files = fs9.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
         try {
-          return { name: e.name, mtime: fs5.statSync(path8.join(dir, e.name)).mtimeMs };
+          const stat3 = fs9.statSync(path12.join(dir, e.name));
+          return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
         } catch {
-          return { name: e.name, mtime: 0 };
+          return { name: e.name, mtime: 0, birthtime: 0 };
         }
-      }).sort((a, b) => b.mtime - a.mtime);
+      }).filter((f) => f.birthtime >= cutoff).sort((a, b) => b.mtime - a.mtime);
       if (files.length > 0) {
-        this.currentConversationId = path8.basename(files[0].name, ".jsonl");
+        this.currentConversationId = path12.basename(files[0].name, ".jsonl");
       }
     } catch {
     }
   }
-  /** Extract conversation ID from Claude output (e.g., from session resume messages) */
+  /**
+   * Extract conversation ID from Claude output. Limited to the
+   * unambiguous "Resuming session: <uuid>" pattern — the older
+   * generic `Session: <uuid>` / `Conversation: <uuid>` patterns
+   * were too greedy and matched any incidental UUID-bearing line
+   * Claude printed (debug logs, status info, etc.), causing the
+   * CLI to "detect" the wrong conversation on a fresh pair.
+   * Resume is the only flow that legitimately needs to bind via
+   * output text; everything else sets `currentConversationId`
+   * via `setCurrentConversationId()` or the birthtime-filtered
+   * `detectCurrentConversation()`.
+   */
   tryExtractConversationIdFromOutput(output) {
-    const patterns = [
-      /Resuming session[:\s]+([a-f0-9-]{36})/i,
-      /session[:\s]+([a-f0-9-]{36})/i,
-      /conversation[:\s]+([a-f0-9-]{36})/i
-    ];
-    for (const pattern of patterns) {
-      const match = output.match(pattern);
-      if (match) {
-        this.currentConversationId = match[1];
-        return;
-      }
-    }
+    const match = output.match(/Resuming session[:\s]+([a-f0-9-]{36})/i);
+    if (match) this.currentConversationId = match[1];
   }
   /**
    * Read the most recently modified JSONL session file and extract the
@@ -5767,28 +6401,30 @@ var HistoryService = class {
    */
   getCurrentUsage() {
     const dir = this.projectDir;
+    const cutoff = this.bootTimeMs - _HistoryService.BIRTHTIME_GRACE_MS;
     let entries;
     try {
-      entries = fs5.readdirSync(dir, { withFileTypes: true });
+      entries = fs9.readdirSync(dir, { withFileTypes: true });
     } catch {
       return null;
     }
     const files = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
       try {
-        return { name: e.name, mtime: fs5.statSync(path8.join(dir, e.name)).mtimeMs };
+        const stat3 = fs9.statSync(path12.join(dir, e.name));
+        return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
       } catch {
-        return { name: e.name, mtime: 0 };
+        return { name: e.name, mtime: 0, birthtime: 0 };
       }
-    }).sort((a, b) => b.mtime - a.mtime);
+    }).filter((f) => f.birthtime >= cutoff).sort((a, b) => b.mtime - a.mtime);
     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(path8.join(dir, targetFile));
+    return this.extractUsageFromFile(path12.join(dir, targetFile));
   }
   extractUsageFromFile(filePath) {
     let raw;
     try {
-      raw = fs5.readFileSync(filePath, "utf8");
+      raw = fs9.readFileSync(filePath, "utf8");
     } catch {
       return null;
     }
@@ -5833,9 +6469,9 @@ var HistoryService = class {
     let totalCost = 0;
     let files;
     try {
-      files = fs5.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).filter((f) => {
+      files = fs9.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).filter((f) => {
         try {
-          return fs5.statSync(path8.join(projectDir, f)).mtimeMs >= monthStartMs;
+          return fs9.statSync(path12.join(projectDir, f)).mtimeMs >= monthStartMs;
         } catch {
           return false;
         }
@@ -5846,7 +6482,7 @@ var HistoryService = class {
     for (const file of files) {
       let raw;
       try {
-        raw = fs5.readFileSync(path8.join(projectDir, file), "utf8");
+        raw = fs9.readFileSync(path12.join(projectDir, file), "utf8");
       } catch {
         continue;
       }
@@ -5881,30 +6517,30 @@ var HistoryService = class {
     const dir = this.projectDir;
     let entries;
     try {
-      entries = fs5.readdirSync(dir, { withFileTypes: true });
+      entries = fs9.readdirSync(dir, { withFileTypes: true });
     } catch {
       return;
     }
     const sessions2 = [];
     for (const entry of entries) {
       if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-      const id = path8.basename(entry.name, ".jsonl");
-      const filePath = path8.join(dir, entry.name);
+      const id = path12.basename(entry.name, ".jsonl");
+      const filePath = path12.join(dir, entry.name);
       let mtime = Date.now();
       try {
-        mtime = fs5.statSync(filePath).mtimeMs;
+        mtime = fs9.statSync(filePath).mtimeMs;
       } catch {
       }
       let summary = "";
       try {
-        const raw = fs5.readFileSync(filePath, "utf8");
+        const raw = fs9.readFileSync(filePath, "utf8");
         for (const line of raw.split("\n")) {
           if (!line.trim()) continue;
           try {
             const record = JSON.parse(line);
             if (record["type"] === "user") {
               const msg = record["message"];
-              const text = extractText(msg?.["content"]).trim();
+              const text = extractText2(msg?.["content"]).trim();
               if (text) {
                 summary = text.slice(0, 120);
                 break;
@@ -5930,7 +6566,7 @@ var HistoryService = class {
    * showing an empty conversation.
    */
   async loadConversation(sessionId) {
-    const filePath = path8.join(this.projectDir, `${sessionId}.jsonl`);
+    const filePath = path12.join(this.projectDir, `${sessionId}.jsonl`);
     const messages = parseJsonl(filePath);
     if (messages.length === 0) return;
     const totalBatches = Math.ceil(messages.length / CONVERSATION_BATCH_SIZE);
@@ -5973,7 +6609,7 @@ var HistoryService = class {
       if (!this.currentConversationId) return 0;
     }
     const sessionId = this.currentConversationId;
-    const filePath = path8.join(this.projectDir, `${sessionId}.jsonl`);
+    const filePath = path12.join(this.projectDir, `${sessionId}.jsonl`);
     const messages = parseJsonl(filePath);
     if (messages.length === 0) return 0;
     const marker = this.lastUploadedUuid.get(sessionId);
@@ -6001,119 +6637,28 @@ var HistoryService = class {
   }
 };
 
-// src/commands/start/quota-fetcher.ts
-var fs6 = __toESM(require("fs"));
-var os7 = __toESM(require("os"));
-var path9 = __toESM(require("path"));
-var import_child_process4 = require("child_process");
-var inProgress = false;
-var HELPER_SCRIPT = `import os,pty,sys,select,signal,struct,fcntl,termios,errno
-m,s=pty.openpty()
-try:
-    fcntl.ioctl(s,termios.TIOCSWINSZ,struct.pack('HHHH',30,120,0,0))
-except Exception:pass
-pid=os.fork()
-if pid==0:
-    os.close(m);os.setsid()
-    try:fcntl.ioctl(s,termios.TIOCSCTTY,0)
-    except Exception:pass
-    for fd in[0,1,2]:os.dup2(s,fd)
-    if s>2:os.close(s)
-    os.execvp(sys.argv[1],sys.argv[1:])
-    sys.exit(127)
-os.close(s)
-done=[False]
-def onchld(n,f):
-    try:os.waitpid(pid,os.WNOHANG)
-    except Exception:pass
-    done[0]=True
-signal.signal(signal.SIGCHLD,onchld)
-i=sys.stdin.fileno();o=sys.stdout.fileno()
-while not done[0]:
-    try:r,_,_=select.select([i,m],[],[],0.1)
-    except OSError as e:
-        if e.errno==errno.EINTR:continue
-        break
-    if i in r:
-        try:
-            d=os.read(i,4096)
-            if d:os.write(m,d)
-            else:break
-        except OSError:break
-    if m in r:
-        try:
-            d=os.read(m,4096)
-            if d:os.write(o,d)
-        except OSError:done[0]=True
-try:os.kill(pid,signal.SIGTERM)
-except Exception:pass
-try:
-    _,st=os.waitpid(pid,0)
-    sys.exit((st>>8)&0xFF)
-except Exception:sys.exit(0)
-`;
-function fetchQuotaUsage(historySvc) {
+// src/commands/start/quota-fetcher.ts
+var inProgress = false;
+function fetchQuotaUsage(runtime, historySvc) {
   if (inProgress) return;
   inProgress = true;
-  const claudeCmd = findInPath("claude") ? "claude" : "claude-code";
-  if (!claudeCmd) {
-    inProgress = false;
-    return;
-  }
-  const helperPath = path9.join(os7.tmpdir(), "codeam-quota-helper.py");
-  fs6.writeFileSync(helperPath, HELPER_SCRIPT, { mode: 420 });
-  const python = findInPath("python3") ?? findInPath("python");
-  if (!python) {
-    inProgress = false;
-    return;
-  }
-  const proc = (0, import_child_process4.spawn)(python, [helperPath, claudeCmd, "--tools", ""], {
-    stdio: ["pipe", "pipe", "ignore"],
-    cwd: process.cwd(),
-    env: { ...process.env, TERM: "dumb", COLUMNS: "120", LINES: "30" }
-  });
-  let output = "";
-  proc.stdout?.on("data", (chunk) => {
-    output += chunk.toString("utf8");
-  });
-  setTimeout(() => {
-    proc.stdin?.write("/usage\r");
-    setTimeout(() => {
-      const clean = output.replace(/\x1B\[[^@-~]*[@-~]/g, "").replace(/[\x00-\x1F\x7F]/g, " ").replace(/\s+/g, " ");
-      const weekMatch = clean.match(/(\d+)%\s*used/i) || clean.match(/(\d+)\s*%/);
-      if (weekMatch) historySvc.setQuotaPercent(parseInt(weekMatch[1], 10));
-      const resetMatch = clean.match(/resets\s+(.+?)(?:\s*\(|$)/im);
-      if (resetMatch) historySvc.setRateLimitReset(resetMatch[1].trim());
-      try {
-        proc.kill();
-      } catch {
-      }
-      try {
-        fs6.unlinkSync(helperPath);
-      } catch {
-      }
-      inProgress = false;
-    }, 5e3);
-  }, 8e3);
-  proc.on("exit", () => {
+  runtime.fetchWeeklyUsage().then((result) => {
+    if (!result) return;
+    historySvc.setQuotaPercent(result.percent);
+    if (result.resetAt) historySvc.setRateLimitReset(result.resetAt);
+  }).finally(() => {
     inProgress = false;
   });
-  setTimeout(() => {
-    try {
-      proc.kill();
-    } catch {
-    }
-  }, 2e4);
 }
 
 // src/commands/start/keep-alive.ts
-var import_child_process5 = require("child_process");
+var import_child_process6 = require("child_process");
 function buildKeepAlive(ctx) {
   let timer = null;
   async function setIdleTimeout(minutes) {
     if (!ctx.inCodespace || !ctx.codespaceName) return;
     await new Promise((resolve2) => {
-      const proc = (0, import_child_process5.spawn)(
+      const proc = (0, import_child_process6.spawn)(
         "gh",
         [
           "api",
@@ -6150,11 +6695,11 @@ function buildKeepAlive(ctx) {
 }
 
 // src/commands/start/handlers.ts
-var fs9 = __toESM(require("fs"));
-var os8 = __toESM(require("os"));
-var path12 = __toESM(require("path"));
+var fs12 = __toESM(require("fs"));
+var os11 = __toESM(require("os"));
+var path15 = __toESM(require("path"));
 var import_crypto = require("crypto");
-var import_child_process7 = require("child_process");
+var import_child_process8 = require("child_process");
 
 // src/lib/payload.ts
 var import_zod2 = require("zod");
@@ -6191,8 +6736,8 @@ function parsePayload(schema, raw) {
 }
 
 // src/services/file-ops.service.ts
-var fs7 = __toESM(require("fs/promises"));
-var path10 = __toESM(require("path"));
+var fs10 = __toESM(require("fs/promises"));
+var path13 = __toESM(require("path"));
 var MAX_FILE_BYTES = 5 * 1024 * 1024;
 var MAX_WALK_DEPTH = 6;
 var MAX_VISITED_DIRS = 5e3;
@@ -6227,12 +6772,12 @@ var SUBDIR_IGNORE = /* @__PURE__ */ new Set([
   "__pycache__"
 ]);
 function isUnder(parent, candidate) {
-  const rel = path10.relative(parent, candidate);
-  return rel === "" || !rel.startsWith("..") && !path10.isAbsolute(rel);
+  const rel = path13.relative(parent, candidate);
+  return rel === "" || !rel.startsWith("..") && !path13.isAbsolute(rel);
 }
 async function isExistingFile(absPath) {
   try {
-    const stat3 = await fs7.stat(absPath);
+    const stat3 = await fs10.stat(absPath);
     return stat3.isFile();
   } catch {
     return false;
@@ -6245,13 +6790,13 @@ async function walkForSuffix(dir, needleVariants, depth, ctx) {
   ctx.visited++;
   let entries = [];
   try {
-    entries = await fs7.readdir(dir, { withFileTypes: true });
+    entries = await fs10.readdir(dir, { withFileTypes: true });
   } catch {
     return;
   }
   for (const e of entries) {
     if (!e.isFile()) continue;
-    const full = path10.join(dir, e.name);
+    const full = path13.join(dir, e.name);
     if (needleVariants.some((needle) => full.endsWith(needle))) {
       ctx.matches.push(full);
       if (ctx.matches.length >= ctx.cap) return;
@@ -6261,21 +6806,21 @@ async function walkForSuffix(dir, needleVariants, depth, ctx) {
     if (!e.isDirectory()) continue;
     if (SUBDIR_IGNORE.has(e.name)) continue;
     if (e.name.startsWith(".") && SUBDIR_IGNORE.has(e.name)) continue;
-    await walkForSuffix(path10.join(dir, e.name), needleVariants, depth + 1, ctx);
+    await walkForSuffix(path13.join(dir, e.name), needleVariants, depth + 1, ctx);
     if (ctx.matches.length >= ctx.cap) return;
   }
 }
 async function findFile(rawPath) {
   const cwd = process.cwd();
-  if (path10.isAbsolute(rawPath)) {
-    const abs = path10.normalize(rawPath);
+  if (path13.isAbsolute(rawPath)) {
+    const abs = path13.normalize(rawPath);
     if (isUnder(cwd, abs) && await isExistingFile(abs)) return abs;
   }
-  const direct = path10.resolve(cwd, rawPath);
+  const direct = path13.resolve(cwd, rawPath);
   if (isUnder(cwd, direct) && await isExistingFile(direct)) return direct;
-  const normalized = path10.normalize(rawPath).replace(/^[./\\]+/, "");
+  const normalized = path13.normalize(rawPath).replace(/^[./\\]+/, "");
   const needles = [
-    `${path10.sep}${normalized}`,
+    `${path13.sep}${normalized}`,
     `/${normalized}`
   ].filter((v, i, a) => a.indexOf(v) === i);
   const ctx = { visited: 0, matches: [], cap: 16 };
@@ -6289,7 +6834,7 @@ async function findWriteTarget(rawPath) {
   const found = await findFile(rawPath);
   if (found) return found;
   const cwd = process.cwd();
-  const fallback = path10.isAbsolute(rawPath) ? path10.normalize(rawPath) : path10.resolve(cwd, rawPath);
+  const fallback = path13.isAbsolute(rawPath) ? path13.normalize(rawPath) : path13.resolve(cwd, rawPath);
   if (!isUnder(cwd, fallback)) return null;
   return fallback;
 }
@@ -6306,11 +6851,11 @@ async function readProjectFile(rawPath) {
     if (!abs) {
       return { error: `File not found in the project tree: ${rawPath}` };
     }
-    const stat3 = await fs7.stat(abs);
+    const stat3 = await fs10.stat(abs);
     if (stat3.size > MAX_FILE_BYTES) {
       return { error: `File too large (${(stat3.size / 1024 / 1024).toFixed(1)} MB > ${MAX_FILE_BYTES / 1024 / 1024} MB).` };
     }
-    const buf = await fs7.readFile(abs);
+    const buf = await fs10.readFile(abs);
     if (looksBinary(buf)) {
       return { error: "Binary file \u2014 refusing to open in a code editor." };
     }
@@ -6329,8 +6874,8 @@ async function writeProjectFile(rawPath, content) {
     if (Buffer.byteLength(content, "utf-8") > MAX_FILE_BYTES) {
       return { error: "Content too large." };
     }
-    await fs7.mkdir(path10.dirname(abs), { recursive: true });
-    await fs7.writeFile(abs, content, "utf-8");
+    await fs10.mkdir(path13.dirname(abs), { recursive: true });
+    await fs10.writeFile(abs, content, "utf-8");
     return { ok: true };
   } catch (e) {
     const msg = e instanceof Error ? e.message : "Write failed";
@@ -6339,11 +6884,11 @@ async function writeProjectFile(rawPath, content) {
 }
 
 // src/services/project-ops.service.ts
-var import_child_process6 = require("child_process");
-var import_util = require("util");
-var fs8 = __toESM(require("fs/promises"));
-var path11 = __toESM(require("path"));
-var execFileP = (0, import_util.promisify)(import_child_process6.execFile);
+var import_child_process7 = require("child_process");
+var import_util2 = require("util");
+var fs11 = __toESM(require("fs/promises"));
+var path14 = __toESM(require("path"));
+var execFileP2 = (0, import_util2.promisify)(import_child_process7.execFile);
 var PROJECT_IGNORE = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -6390,7 +6935,7 @@ async function listProjectFiles(opts = {}) {
     }
     let entries = [];
     try {
-      entries = await fs8.readdir(dir, { withFileTypes: true });
+      entries = await fs11.readdir(dir, { withFileTypes: true });
     } catch {
       return;
     }
@@ -6400,18 +6945,18 @@ async function listProjectFiles(opts = {}) {
         return;
       }
       if (PROJECT_IGNORE.has(e.name)) continue;
-      const full = path11.join(dir, e.name);
+      const full = path14.join(dir, e.name);
       if (e.isDirectory()) {
         if (depth >= 12) continue;
         await walk(full, depth + 1);
       } else if (e.isFile()) {
-        const rel = path11.relative(root, full);
+        const rel = path14.relative(root, full);
         if (q2 && !rel.toLowerCase().includes(q2) && !e.name.toLowerCase().includes(q2)) {
           continue;
         }
         let size = 0;
         try {
-          const st3 = await fs8.stat(full);
+          const st3 = await fs11.stat(full);
           size = st3.size;
         } catch {
         }
@@ -6425,7 +6970,7 @@ async function listProjectFiles(opts = {}) {
 }
 async function git(args2, cwd) {
   try {
-    const { stdout, stderr } = await execFileP("git", args2, {
+    const { stdout, stderr } = await execFileP2("git", args2, {
       cwd: cwd ?? process.cwd(),
       maxBuffer: MAX_GIT_OUTPUT,
       timeout: 3e4
@@ -6513,8 +7058,8 @@ async function gitStatus(cwd) {
   let hasMergeInProgress = false;
   try {
     const gitDir = (await git(["rev-parse", "--git-dir"], root)).stdout.trim();
-    const mergeHead = path11.isAbsolute(gitDir) ? path11.join(gitDir, "MERGE_HEAD") : path11.join(root, gitDir, "MERGE_HEAD");
-    await fs8.access(mergeHead);
+    const mergeHead = path14.isAbsolute(gitDir) ? path14.join(gitDir, "MERGE_HEAD") : path14.join(root, gitDir, "MERGE_HEAD");
+    await fs11.access(mergeHead);
     hasMergeInProgress = true;
   } catch {
   }
@@ -6591,8 +7136,8 @@ async function gitResolve(file, side, cwd) {
 function saveFilesTemp(files) {
   return files.filter(({ base64 }) => base64 && base64.length > 0).map(({ filename, base64 }) => {
     const safeName = filename.replace(/[^a-zA-Z0-9._-]/g, "_").slice(0, 80);
-    const tmpPath = path12.join(os8.tmpdir(), `codeam-${(0, import_crypto.randomUUID)()}-${safeName}`);
-    fs9.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
+    const tmpPath = path15.join(os11.tmpdir(), `codeam-${(0, import_crypto.randomUUID)()}-${safeName}`);
+    fs12.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
     return tmpPath;
   });
 }
@@ -6611,7 +7156,7 @@ var startTask = (ctx, _cmd, parsed) => {
     setTimeout(() => {
       for (const p2 of paths) {
         try {
-          fs9.unlinkSync(p2);
+          fs12.unlinkSync(p2);
         } catch {
         }
       }
@@ -6671,14 +7216,35 @@ var getConversation = async (ctx, cmd) => {
   }
 };
 var listModels = async (ctx, cmd) => {
-  const models = [
-    { id: "claude-opus-4-7", label: "Claude Opus 4.7", description: "Most capable", family: "claude", vendor: "anthropic", isDefault: false },
-    { id: "claude-opus-4-6", label: "Claude Opus 4.6", description: "Top tier", family: "claude", vendor: "anthropic", isDefault: false },
-    { id: "claude-sonnet-4-6", label: "Claude Sonnet 4.6", description: "Balanced", family: "claude", vendor: "anthropic", isDefault: true },
-    { id: "claude-haiku-4-5-20251001", label: "Claude Haiku 4.5", description: "Fastest", family: "claude", vendor: "anthropic", isDefault: false }
-  ];
+  const models = await ctx.runtime.listModels();
   await ctx.relay.sendResult(cmd.id, "completed", { models });
 };
+var changeModel = async (ctx, cmd) => {
+  const params = cmd.payload;
+  if (typeof params.modelId !== "string" || !params.modelId) {
+    await ctx.relay.sendResult(cmd.id, "failed", { error: "modelId required" });
+    return;
+  }
+  const instr = ctx.runtime.changeModelInstruction(params.modelId);
+  if (instr.type === "pty") {
+    if (!instr.ptyInput) {
+      await ctx.relay.sendResult(cmd.id, "failed", { error: "no pty input for this agent" });
+      return;
+    }
+    ctx.claude.sendRawPtyInput(instr.ptyInput);
+  } else if (instr.type === "restart") {
+    await ctx.relay.sendResult(cmd.id, "failed", { error: "restart-mode change_model not supported in Phase 1" });
+    return;
+  }
+  await ctx.relay.sendResult(cmd.id, "completed", {});
+};
+var summarize = async (ctx, cmd) => {
+  const params = cmd.payload;
+  const mode = params.mode === "auto" ? "auto" : "normal";
+  const instr = ctx.runtime.summarizeInstruction(mode);
+  ctx.claude.sendRawPtyInput(instr.ptyInput);
+  await ctx.relay.sendResult(cmd.id, "completed", {});
+};
 var setKeepAlive = async (ctx, cmd) => {
   const enabled = !!cmd.payload.enabled;
   ctx.setKeepAlive(enabled);
@@ -6702,7 +7268,7 @@ var sessionTerminated = (ctx) => {
   } catch {
   }
   try {
-    const proc = (0, import_child_process7.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
+    const proc = (0, import_child_process8.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
       detached: true,
       stdio: "ignore"
     });
@@ -6724,7 +7290,7 @@ var shutdownSession = async (ctx, cmd) => {
   }
   if (ctx.keepAliveCtx.inCodespace && ctx.keepAliveCtx.codespaceName) {
     try {
-      const stopProc = (0, import_child_process7.spawn)(
+      const stopProc = (0, import_child_process8.spawn)(
         "bash",
         ["-lc", `sleep 1; gh codespace stop -c ${JSON.stringify(ctx.keepAliveCtx.codespaceName)} >/dev/null 2>&1 || true`],
         { detached: true, stdio: "ignore" }
@@ -6734,7 +7300,7 @@ var shutdownSession = async (ctx, cmd) => {
     }
   }
   try {
-    const proc = (0, import_child_process7.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
+    const proc = (0, import_child_process8.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
       detached: true,
       stdio: "ignore"
     });
@@ -6815,6 +7381,8 @@ var handlers = {
   get_context: getContext,
   get_conversation: getConversation,
   list_models: listModels,
+  change_model: changeModel,
+  summarize,
   set_keep_alive: setKeepAlive,
   session_terminated: sessionTerminated,
   shutdown_session: shutdownSession,
@@ -6851,11 +7419,16 @@ async function start() {
 `);
     process.exit(0);
   }
+  if (!session.agent) {
+    throw new Error("Active session has no agent \u2014 re-pair with `codeam pair`.");
+  }
   const pluginId = session.pluginId ?? ensurePluginId();
   showInfo(`${session.userName}  \xB7  ${import_picocolors2.default.cyan(session.plan)}`);
-  showInfo("Launching Claude Code...\n");
+  showInfo(`Launching ${AGENT_REGISTRY[session.agent].displayName}...
+`);
   const cwd = process.cwd();
-  const historySvc = new HistoryService(pluginId, cwd);
+  const runtime = createRuntimeStrategy(session.agent);
+  const historySvc = new HistoryService(runtime, pluginId, cwd);
   const keepAliveCtx = {
     inCodespace: process.env.CODESPACES === "true",
     codespaceName: process.env.CODESPACE_NAME
@@ -6867,7 +7440,7 @@ async function start() {
     (conversationId) => historySvc.setCurrentConversationId(conversationId),
     (reset) => historySvc.setRateLimitReset(reset),
     () => {
-      if (historySvc.isQuotaStale()) fetchQuotaUsage(historySvc);
+      if (historySvc.isQuotaStale()) fetchQuotaUsage(runtime, historySvc);
       setTimeout(() => {
         historySvc.uploadDelta().catch(() => {
         });
@@ -6879,22 +7452,26 @@ async function start() {
     },
     session.pluginAuthToken
   );
-  const claude = new ClaudeService({
-    cwd,
-    onData(raw) {
-      outputSvc.push(raw);
-    },
-    onExit(code) {
-      process.removeListener("SIGINT", sigintHandler);
-      outputSvc.dispose();
-      relay.stop();
-      process.exit(code);
+  const claude = new AgentService(
+    runtime,
+    {
+      cwd,
+      onData(raw) {
+        outputSvc.push(raw);
+      },
+      onExit(code) {
+        process.removeListener("SIGINT", sigintHandler);
+        outputSvc.dispose();
+        relay.stop();
+        process.exit(code);
+      }
     }
-  });
+  );
   const ctx = {
     outputSvc,
     claude,
     historySvc,
+    runtime,
     relay: void 0,
     setKeepAlive: setKeepAlive2,
     keepAliveCtx
@@ -6917,7 +7494,7 @@ async function start() {
     historySvc.load().catch(() => {
     });
   }, 2e3);
-  setTimeout(() => fetchQuotaUsage(historySvc), 5e3);
+  setTimeout(() => fetchQuotaUsage(runtime, historySvc), 5e3);
 }
 
 // src/commands/pair.ts
@@ -6944,8 +7521,45 @@ async function selectSession(sessions2, activeId) {
   return result;
 }
 
+// src/utils/agent-prompt.ts
+function parseAgentFlag(args2) {
+  const flag = args2.find((a) => a.startsWith("--agent="));
+  if (!flag) return null;
+  const value = flag.slice("--agent=".length);
+  if (!isKnownAgentId(value)) {
+    throw new Error(
+      `invalid agent "${value}"; valid: ${Object.keys(AGENT_REGISTRY).join(", ")}`
+    );
+  }
+  if (!AGENT_REGISTRY[value].enabled) {
+    throw new Error(
+      `${AGENT_REGISTRY[value].displayName} is not available in this codeam-cli version`
+    );
+  }
+  return value;
+}
+async function promptForAgent(initialValue) {
+  const enabled = getEnabledAgents();
+  if (enabled.length === 1) {
+    return enabled[0].id;
+  }
+  const chosen = await _t({
+    message: "Pick an agent:",
+    options: enabled.map((m) => ({ value: m.id, label: m.displayName })),
+    initialValue: initialValue ?? enabled[0].id
+  });
+  if (q(chosen)) {
+    pt("Cancelled.");
+    process.exit(0);
+  }
+  return chosen;
+}
+
 // src/commands/pair.ts
-async function pair() {
+async function pair(args2 = []) {
+  const config = loadCliConfig();
+  const flagAgent = parseAgentFlag(args2);
+  const agentId = flagAgent ?? await promptForAgent(config.preferredAgent ?? "claude");
   showIntro();
   const pluginId = (0, import_crypto2.randomUUID)();
   const spin = dist_exports.spinner();
@@ -6981,8 +7595,10 @@ async function pair() {
           userEmail: info.userEmail,
           plan: info.plan,
           pairedAt: Date.now(),
-          pluginAuthToken: info.pluginAuthToken
+          pluginAuthToken: info.pluginAuthToken,
+          agent: agentId
         });
+        saveCliConfig({ ...loadCliConfig(), preferredAgent: agentId });
         showSuccess(`Paired with ${info.userName} (${info.plan})`);
         console.log("");
         resolve2();
@@ -6999,8 +7615,8 @@ async function pair() {
 }
 
 // src/commands/pair-auto.ts
-var fs10 = __toESM(require("fs"));
-var os9 = __toESM(require("os"));
+var fs13 = __toESM(require("fs"));
+var os12 = __toESM(require("os"));
 var import_crypto3 = require("crypto");
 var API_BASE5 = process.env.CODEAM_API_URL ?? "https://codeagent-mobile-api.vercel.app";
 function fail(msg) {
@@ -7017,12 +7633,12 @@ function readTokenFromArgs(args2) {
   }
   const fileFlag = args2.find((a) => a.startsWith("--token-file="));
   if (fileFlag) {
-    const path19 = fileFlag.slice("--token-file=".length);
+    const path21 = fileFlag.slice("--token-file=".length);
     try {
-      const content = fs10.readFileSync(path19, "utf8").trim();
-      if (content.length === 0) fail(`--token-file ${path19} is empty`);
+      const content = fs13.readFileSync(path21, "utf8").trim();
+      if (content.length === 0) fail(`--token-file ${path21} is empty`);
       try {
-        fs10.unlinkSync(path19);
+        fs13.unlinkSync(path21);
       } catch {
       }
       return content;
@@ -7040,7 +7656,7 @@ async function claim(token, pluginId) {
     pluginId,
     ideName: "codeam-cli (codespace)",
     ideVersion: process.env.npm_package_version ?? "unknown",
-    hostname: os9.hostname(),
+    hostname: os12.hostname(),
     codespaceName: process.env.CODESPACE_NAME ?? ""
   };
   const res = await fetch(url, {
@@ -7066,6 +7682,11 @@ async function pairAuto(args2) {
   const pluginId = (0, import_crypto3.randomUUID)();
   console.log("  Claiming pairing token\u2026");
   const claimed = await claim(token, pluginId);
+  if (!isKnownAgentId(claimed.agent)) {
+    fail(
+      `agent "${claimed.agent}" is not supported in this codeam-cli version. Upgrade with 'npm i -g codeam-cli@latest'.`
+    );
+  }
   addSession({
     id: claimed.sessionId,
     pluginId,
@@ -7073,7 +7694,8 @@ async function pairAuto(args2) {
     userEmail: claimed.user.email,
     plan: claimed.user.plan,
     pairedAt: Date.now(),
-    pluginAuthToken: claimed.pluginAuthToken
+    pluginAuthToken: claimed.pluginAuthToken,
+    agent: claimed.agent
   });
   console.log(`  Paired with ${claimed.user.name} (${claimed.user.plan})`);
   console.log("  Starting agent loop\u2026");
@@ -7180,19 +7802,14 @@ async function logout() {
 }
 
 // src/commands/deploy.ts
-var import_child_process12 = require("child_process");
-var fs11 = __toESM(require("fs"));
-var os10 = __toESM(require("os"));
-var path17 = __toESM(require("path"));
-var import_util6 = require("util");
 var import_picocolors9 = __toESM(require("picocolors"));
 
 // src/services/providers/github-codespaces.ts
-var import_child_process8 = require("child_process");
-var import_util2 = require("util");
+var import_child_process9 = require("child_process");
+var import_util3 = require("util");
 var import_picocolors7 = __toESM(require("picocolors"));
-var path13 = __toESM(require("path"));
-var execFileP2 = (0, import_util2.promisify)(import_child_process8.execFile);
+var path16 = __toESM(require("path"));
+var execFileP3 = (0, import_util3.promisify)(import_child_process9.execFile);
 var MAX_BUFFER = 8 * 1024 * 1024;
 function resetStdinForChild() {
   if (process.stdin.isTTY) {
@@ -7209,11 +7826,11 @@ var GitHubCodespacesProvider = class {
   available = true;
   async authorize() {
     try {
-      await execFileP2("gh", ["--version"], { maxBuffer: MAX_BUFFER });
+      await execFileP3("gh", ["--version"], { maxBuffer: MAX_BUFFER });
     } catch {
       await this.tryInstallGh();
       try {
-        await execFileP2("gh", ["--version"], { maxBuffer: MAX_BUFFER });
+        await execFileP3("gh", ["--version"], { maxBuffer: MAX_BUFFER });
       } catch {
         throw new Error(
           [
@@ -7229,14 +7846,14 @@ var GitHubCodespacesProvider = class {
     }
     let isAuthed = false;
     try {
-      await execFileP2("gh", ["auth", "status"], { maxBuffer: MAX_BUFFER });
+      await execFileP3("gh", ["auth", "status"], { maxBuffer: MAX_BUFFER });
       isAuthed = true;
     } catch {
     }
     if (!isAuthed) {
       resetStdinForChild();
       await new Promise((resolve2, reject) => {
-        const proc = (0, import_child_process8.spawn)("gh", ["auth", "login", "-s", "codespace,repo,read:user"], {
+        const proc = (0, import_child_process9.spawn)("gh", ["auth", "login", "-s", "codespace,repo,read:user"], {
           stdio: "inherit"
         });
         proc.on("exit", (code) => {
@@ -7270,7 +7887,7 @@ var GitHubCodespacesProvider = class {
       wt(noteLines.join("\n"), "One more permission needed");
       resetStdinForChild();
       const refreshCode = await new Promise((resolve2, reject) => {
-        const proc = (0, import_child_process8.spawn)(
+        const proc = (0, import_child_process9.spawn)(
           "gh",
           ["auth", "refresh", "-h", "github.com", "-s", "codespace"],
           { stdio: "inherit" }
@@ -7305,7 +7922,7 @@ var GitHubCodespacesProvider = class {
    */
   async getActiveGhUser() {
     try {
-      const { stdout } = await execFileP2(
+      const { stdout } = await execFileP3(
         "gh",
         ["api", "user", "--jq", ".login"],
         { maxBuffer: MAX_BUFFER }
@@ -7325,7 +7942,7 @@ var GitHubCodespacesProvider = class {
    */
   async hasCodespaceScope() {
     try {
-      const { stdout } = await execFileP2(
+      const { stdout } = await execFileP3(
         "gh",
         ["api", "-i", "user"],
         { maxBuffer: MAX_BUFFER }
@@ -7355,12 +7972,12 @@ var GitHubCodespacesProvider = class {
    * install error if it's still missing.
    */
   async tryInstallGh() {
-    const platform = process.platform;
+    const platform2 = process.platform;
     wt(
       `GitHub CLI (${import_picocolors7.default.cyan("gh")}) is required for Codespaces deploys but isn't on your PATH.`,
       "Heads up"
     );
-    if (platform === "linux") {
+    if (platform2 === "linux") {
       wt(
         [
           "On Linux, please install gh from the official guide:",
@@ -7372,9 +7989,9 @@ var GitHubCodespacesProvider = class {
       return;
     }
     let installCmd = null;
-    if (platform === "darwin") {
+    if (platform2 === "darwin") {
       try {
-        await execFileP2("brew", ["--version"], { maxBuffer: MAX_BUFFER });
+        await execFileP3("brew", ["--version"], { maxBuffer: MAX_BUFFER });
       } catch {
         wt(
           [
@@ -7391,9 +8008,9 @@ var GitHubCodespacesProvider = class {
         args: ["install", "gh"],
         describe: "brew install gh"
       };
-    } else if (platform === "win32") {
+    } else if (platform2 === "win32") {
       try {
-        await execFileP2("winget", ["--version"], { maxBuffer: MAX_BUFFER });
+        await execFileP3("winget", ["--version"], { maxBuffer: MAX_BUFFER });
       } catch {
         wt(
           [
@@ -7420,7 +8037,7 @@ var GitHubCodespacesProvider = class {
     O2.step(`Installing gh via ${installCmd.describe}\u2026`);
     resetStdinForChild();
     const ok = await new Promise((resolve2) => {
-      const proc = (0, import_child_process8.spawn)(installCmd.exe, installCmd.args, { stdio: "inherit" });
+      const proc = (0, import_child_process9.spawn)(installCmd.exe, installCmd.args, { stdio: "inherit" });
       proc.on("exit", (code) => resolve2(code === 0));
       proc.on("error", () => resolve2(false));
     });
@@ -7447,7 +8064,7 @@ var GitHubCodespacesProvider = class {
     );
     resetStdinForChild();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process8.spawn)(
+      const proc = (0, import_child_process9.spawn)(
         "gh",
         ["auth", "refresh", "-h", "github.com", "-s", "repo,read:org"],
         { stdio: "inherit" }
@@ -7472,7 +8089,7 @@ var GitHubCodespacesProvider = class {
         "200"
       );
       try {
-        const { stdout } = await execFileP2("gh", args2, { maxBuffer: MAX_BUFFER });
+        const { stdout } = await execFileP3("gh", args2, { maxBuffer: MAX_BUFFER });
         return JSON.parse(stdout);
       } catch {
         return [];
@@ -7481,7 +8098,7 @@ var GitHubCodespacesProvider = class {
     const own = await fetchRepos();
     let orgRepos = [];
     try {
-      const { stdout } = await execFileP2(
+      const { stdout } = await execFileP3(
         "gh",
         ["api", "--paginate", "user/orgs", "--jq", ".[].login"],
         { maxBuffer: MAX_BUFFER }
@@ -7518,7 +8135,7 @@ var GitHubCodespacesProvider = class {
    */
   async listMachineTypes(projectId) {
     try {
-      const { stdout } = await execFileP2(
+      const { stdout } = await execFileP3(
         "gh",
         ["api", `/repos/${projectId}/codespaces/machines`],
         { maxBuffer: MAX_BUFFER }
@@ -7549,7 +8166,7 @@ var GitHubCodespacesProvider = class {
     const machine = machineTypeId ?? await this.pickDefaultMachine(projectId);
     const args2 = ["codespace", "create", "-R", projectId, "--default-permissions"];
     if (machine) args2.push("-m", machine);
-    const { stdout } = await execFileP2(
+    const { stdout } = await execFileP3(
       "gh",
       args2,
       { maxBuffer: MAX_BUFFER, timeout: 12e4 }
@@ -7589,7 +8206,7 @@ var GitHubCodespacesProvider = class {
   async waitUntilAvailable(name) {
     const deadline = Date.now() + 5 * 60 * 1e3;
     while (Date.now() < deadline) {
-      const { stdout } = await execFileP2(
+      const { stdout } = await execFileP3(
         "gh",
         ["codespace", "list", "--json", "name,state"],
         { maxBuffer: MAX_BUFFER }
@@ -7607,7 +8224,7 @@ var GitHubCodespacesProvider = class {
   }
   async exec(workspaceId, command2) {
     try {
-      const { stdout, stderr } = await execFileP2(
+      const { stdout, stderr } = await execFileP3(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", command2],
         { maxBuffer: MAX_BUFFER, timeout: 6e5 }
@@ -7625,7 +8242,7 @@ var GitHubCodespacesProvider = class {
   async streamCommand(workspaceId, command2) {
     resetStdinForChild();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process8.spawn)(
+      const proc = (0, import_child_process9.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
@@ -7652,11 +8269,11 @@ var GitHubCodespacesProvider = class {
       `mkdir -p ${shellQuote(remoteDir)} && tar -xzf - -C ${shellQuote(remoteDir)}`
     ];
     await new Promise((resolve2, reject) => {
-      const tar = (0, import_child_process8.spawn)("tar", tarArgs, {
+      const tar = (0, import_child_process9.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
       });
-      const ssh = (0, import_child_process8.spawn)("gh", sshArgs, {
+      const ssh = (0, import_child_process9.spawn)("gh", sshArgs, {
         stdio: [tar.stdout, "pipe", "pipe"]
       });
       let tarErr = "";
@@ -7680,7 +8297,7 @@ var GitHubCodespacesProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path13.posix.dirname(remotePath);
+    const remoteDir = path16.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote(remoteDir)}`,
       `cat > ${shellQuote(remotePath)}`
@@ -7690,7 +8307,7 @@ var GitHubCodespacesProvider = class {
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process8.spawn)(
+      const proc = (0, import_child_process9.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -7712,7 +8329,7 @@ var GitHubCodespacesProvider = class {
     try {
       const args2 = ["codespace", "list", "--json", "name,displayName,state,lastUsedAt"];
       if (projectId) args2.push("--repo", projectId);
-      const { stdout } = await execFileP2("gh", args2, { maxBuffer: MAX_BUFFER });
+      const { stdout } = await execFileP3("gh", args2, { maxBuffer: MAX_BUFFER });
       const list = JSON.parse(stdout);
       return list.map((c2) => ({
         id: c2.name,
@@ -7727,7 +8344,7 @@ var GitHubCodespacesProvider = class {
   }
   async startWorkspace(workspaceId) {
     try {
-      await execFileP2(
+      await execFileP3(
         "gh",
         ["api", "-X", "POST", `/user/codespaces/${workspaceId}/start`],
         { maxBuffer: MAX_BUFFER, timeout: 6e4 }
@@ -7748,11 +8365,11 @@ function shellQuote(s) {
 }
 
 // src/services/providers/gitpod.ts
-var import_child_process9 = require("child_process");
-var import_util3 = require("util");
-var path14 = __toESM(require("path"));
+var import_child_process10 = require("child_process");
+var import_util4 = require("util");
+var path17 = __toESM(require("path"));
 var import_picocolors8 = __toESM(require("picocolors"));
-var execFileP3 = (0, import_util3.promisify)(import_child_process9.execFile);
+var execFileP4 = (0, import_util4.promisify)(import_child_process10.execFile);
 var MAX_BUFFER2 = 8 * 1024 * 1024;
 function resetStdinForChild2() {
   if (process.stdin.isTTY) {
@@ -7769,7 +8386,7 @@ var GitpodProvider = class {
   available = true;
   async authorize() {
     try {
-      await execFileP3("gitpod", ["--version"], { maxBuffer: MAX_BUFFER2 });
+      await execFileP4("gitpod", ["--version"], { maxBuffer: MAX_BUFFER2 });
     } catch {
       throw new Error(
         [
@@ -7782,7 +8399,7 @@ var GitpodProvider = class {
       );
     }
     try {
-      await execFileP3("gitpod", ["whoami"], { maxBuffer: MAX_BUFFER2 });
+      await execFileP4("gitpod", ["whoami"], { maxBuffer: MAX_BUFFER2 });
       return;
     } catch {
     }
@@ -7792,7 +8409,7 @@ var GitpodProvider = class {
     );
     resetStdinForChild2();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process9.spawn)("gitpod", ["login"], { stdio: "inherit" });
+      const proc = (0, import_child_process10.spawn)("gitpod", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
         if (code === 0) resolve2();
         else reject(new Error("gitpod login failed."));
@@ -7802,7 +8419,7 @@ var GitpodProvider = class {
   }
   async listProjects() {
     try {
-      const { stdout } = await execFileP3(
+      const { stdout } = await execFileP4(
         "gitpod",
         ["workspace", "list", "--output", "json", "--limit", "200"],
         { maxBuffer: MAX_BUFFER2 }
@@ -7835,7 +8452,7 @@ var GitpodProvider = class {
   async createWorkspace(projectId, machineTypeId) {
     const args2 = ["workspace", "create", projectId, "--start", "--output", "json"];
     if (machineTypeId) args2.push("--class", machineTypeId);
-    const { stdout } = await execFileP3("gitpod", args2, {
+    const { stdout } = await execFileP4("gitpod", args2, {
       maxBuffer: MAX_BUFFER2,
       timeout: 3e5
     });
@@ -7859,7 +8476,7 @@ var GitpodProvider = class {
     const deadline = Date.now() + 5 * 60 * 1e3;
     while (Date.now() < deadline) {
       try {
-        const { stdout } = await execFileP3(
+        const { stdout } = await execFileP4(
           "gitpod",
           ["workspace", "get", workspaceId, "--output", "json"],
           { maxBuffer: MAX_BUFFER2 }
@@ -7877,7 +8494,7 @@ var GitpodProvider = class {
   }
   async listMachineTypes(_projectId) {
     try {
-      const { stdout } = await execFileP3(
+      const { stdout } = await execFileP4(
         "gitpod",
         ["organization", "list-classes", "--output", "json"],
         { maxBuffer: MAX_BUFFER2 }
@@ -7895,7 +8512,7 @@ var GitpodProvider = class {
   async listExistingWorkspaces(projectId) {
     try {
       const args2 = ["workspace", "list", "--output", "json", "--limit", "200"];
-      const { stdout } = await execFileP3("gitpod", args2, { maxBuffer: MAX_BUFFER2 });
+      const { stdout } = await execFileP4("gitpod", args2, { maxBuffer: MAX_BUFFER2 });
       const list = JSON.parse(stdout);
       return list.filter((w3) => !projectId || w3.contextUrl === projectId).map((w3) => ({
         id: w3.id,
@@ -7910,7 +8527,7 @@ var GitpodProvider = class {
   }
   async startWorkspace(workspaceId) {
     try {
-      await execFileP3(
+      await execFileP4(
         "gitpod",
         ["workspace", "start", workspaceId],
         { maxBuffer: MAX_BUFFER2, timeout: 6e4 }
@@ -7926,7 +8543,7 @@ var GitpodProvider = class {
   }
   async exec(workspaceId, command2) {
     try {
-      const { stdout, stderr } = await execFileP3(
+      const { stdout, stderr } = await execFileP4(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", command2],
         { maxBuffer: MAX_BUFFER2, timeout: 6e5 }
@@ -7944,7 +8561,7 @@ var GitpodProvider = class {
   async streamCommand(workspaceId, command2) {
     resetStdinForChild2();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process9.spawn)(
+      const proc = (0, import_child_process10.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
@@ -7964,11 +8581,11 @@ var GitpodProvider = class {
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote2(remoteDir)} && tar -xzf - -C ${shellQuote2(remoteDir)}`;
     await new Promise((resolve2, reject) => {
-      const tar = (0, import_child_process9.spawn)("tar", tarArgs, {
+      const tar = (0, import_child_process10.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
       });
-      const ssh = (0, import_child_process9.spawn)(
+      const ssh = (0, import_child_process10.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -7990,7 +8607,7 @@ var GitpodProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path14.posix.dirname(remotePath);
+    const remoteDir = path17.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote2(remoteDir)}`,
       `cat > ${shellQuote2(remotePath)}`
@@ -8000,7 +8617,7 @@ var GitpodProvider = class {
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process9.spawn)(
+      const proc = (0, import_child_process10.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -8024,10 +8641,10 @@ function shellQuote2(s) {
 }
 
 // src/services/providers/gitlab-workspaces.ts
-var import_child_process10 = require("child_process");
-var import_util4 = require("util");
-var path15 = __toESM(require("path"));
-var execFileP4 = (0, import_util4.promisify)(import_child_process10.execFile);
+var import_child_process11 = require("child_process");
+var import_util5 = require("util");
+var path18 = __toESM(require("path"));
+var execFileP5 = (0, import_util5.promisify)(import_child_process11.execFile);
 var MAX_BUFFER3 = 8 * 1024 * 1024;
 var GITLAB_API_BASE = process.env.CODEAM_GITLAB_API_URL ?? "https://gitlab.com/api/v4";
 function resetStdinForChild3() {
@@ -8045,7 +8662,7 @@ var GitLabWorkspacesProvider = class {
   available = true;
   async authorize() {
     try {
-      await execFileP4("glab", ["--version"], { maxBuffer: MAX_BUFFER3 });
+      await execFileP5("glab", ["--version"], { maxBuffer: MAX_BUFFER3 });
     } catch {
       throw new Error(
         [
@@ -8059,7 +8676,7 @@ var GitLabWorkspacesProvider = class {
       );
     }
     try {
-      await execFileP4("glab", ["auth", "status"], { maxBuffer: MAX_BUFFER3 });
+      await execFileP5("glab", ["auth", "status"], { maxBuffer: MAX_BUFFER3 });
       return;
     } catch {
     }
@@ -8069,7 +8686,7 @@ var GitLabWorkspacesProvider = class {
     );
     resetStdinForChild3();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process10.spawn)(
+      const proc = (0, import_child_process11.spawn)(
         "glab",
         ["auth", "login", "--scopes", "api,read_user,read_repository"],
         { stdio: "inherit" }
@@ -8083,7 +8700,7 @@ var GitLabWorkspacesProvider = class {
   }
   async listProjects() {
     try {
-      const { stdout } = await execFileP4(
+      const { stdout } = await execFileP5(
         "glab",
         ["repo", "list", "--per-page", "200", "--output", "json"],
         { maxBuffer: MAX_BUFFER3 }
@@ -8215,7 +8832,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
   async exec(workspaceId, command2) {
     const sshHost = process.env.CODEAM_GITLAB_SSH_HOST ?? "workspaces.gitlab.com";
     try {
-      const { stdout, stderr } = await execFileP4(
+      const { stdout, stderr } = await execFileP5(
         "ssh",
         [
           "-o",
@@ -8241,7 +8858,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
     const sshHost = process.env.CODEAM_GITLAB_SSH_HOST ?? "workspaces.gitlab.com";
     resetStdinForChild3();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process10.spawn)(
+      const proc = (0, import_child_process11.spawn)(
         "ssh",
         ["-tt", "-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, command2],
         { stdio: "inherit" }
@@ -8262,8 +8879,8 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote3(remoteDir)} && tar -xzf - -C ${shellQuote3(remoteDir)}`;
     await new Promise((resolve2, reject) => {
-      const tar = (0, import_child_process10.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
-      const ssh = (0, import_child_process10.spawn)(
+      const tar = (0, import_child_process11.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
+      const ssh = (0, import_child_process11.spawn)(
         "ssh",
         ["-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -8286,14 +8903,14 @@ 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 = path15.posix.dirname(remotePath);
+    const remoteDir = path18.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)}`);
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process10.spawn)(
+      const proc = (0, import_child_process11.spawn)(
         "ssh",
         ["-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -8318,7 +8935,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
    */
   async getGlabToken() {
     try {
-      const { stdout, stderr } = await execFileP4(
+      const { stdout, stderr } = await execFileP5(
         "glab",
         ["auth", "status", "--show-token"],
         { maxBuffer: MAX_BUFFER3 }
@@ -8352,10 +8969,10 @@ function shellQuote3(s) {
 }
 
 // src/services/providers/railway.ts
-var import_child_process11 = require("child_process");
-var import_util5 = require("util");
-var path16 = __toESM(require("path"));
-var execFileP5 = (0, import_util5.promisify)(import_child_process11.execFile);
+var import_child_process12 = require("child_process");
+var import_util6 = require("util");
+var path19 = __toESM(require("path"));
+var execFileP6 = (0, import_util6.promisify)(import_child_process12.execFile);
 var MAX_BUFFER4 = 8 * 1024 * 1024;
 function resetStdinForChild4() {
   if (process.stdin.isTTY) {
@@ -8372,7 +8989,7 @@ var RailwayProvider = class {
   available = true;
   async authorize() {
     try {
-      await execFileP5("railway", ["--version"], { maxBuffer: MAX_BUFFER4 });
+      await execFileP6("railway", ["--version"], { maxBuffer: MAX_BUFFER4 });
     } catch {
       throw new Error(
         [
@@ -8386,7 +9003,7 @@ var RailwayProvider = class {
       );
     }
     try {
-      await execFileP5("railway", ["whoami"], { maxBuffer: MAX_BUFFER4 });
+      await execFileP6("railway", ["whoami"], { maxBuffer: MAX_BUFFER4 });
       return;
     } catch {
     }
@@ -8396,7 +9013,7 @@ var RailwayProvider = class {
     );
     resetStdinForChild4();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)("railway", ["login"], { stdio: "inherit" });
+      const proc = (0, import_child_process12.spawn)("railway", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
         if (code === 0) resolve2();
         else reject(new Error("railway login failed."));
@@ -8406,7 +9023,7 @@ var RailwayProvider = class {
   }
   async listProjects() {
     try {
-      const { stdout } = await execFileP5(
+      const { stdout } = await execFileP6(
         "railway",
         ["list", "--json"],
         { maxBuffer: MAX_BUFFER4 }
@@ -8422,7 +9039,7 @@ var RailwayProvider = class {
       }));
     } catch {
       try {
-        const { stdout } = await execFileP5("railway", ["list"], { maxBuffer: MAX_BUFFER4 });
+        const { stdout } = await execFileP6("railway", ["list"], { maxBuffer: MAX_BUFFER4 });
         const projects = [];
         for (const line of stdout.split("\n")) {
           const trimmed = line.trim();
@@ -8473,7 +9090,7 @@ var RailwayProvider = class {
   async listExistingWorkspaces(projectId) {
     if (!projectId) return [];
     try {
-      const { stdout } = await execFileP5(
+      const { stdout } = await execFileP6(
         "railway",
         ["service", "list", "--project", projectId, "--json"],
         { maxBuffer: MAX_BUFFER4 }
@@ -8498,7 +9115,7 @@ var RailwayProvider = class {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
     try {
-      await execFileP5(
+      await execFileP6(
         "railway",
         ["service", "restart", "--service", serviceId, "--project", projectId],
         { maxBuffer: MAX_BUFFER4, timeout: 6e4 }
@@ -8517,7 +9134,7 @@ var RailwayProvider = class {
       };
     }
     try {
-      const { stdout, stderr } = await execFileP5(
+      const { stdout, stderr } = await execFileP6(
         "railway",
         ["run", "--project", projectId, "--service", serviceId, "--", "bash", "-lc", command2],
         { maxBuffer: MAX_BUFFER4, timeout: 6e5 }
@@ -8539,7 +9156,7 @@ var RailwayProvider = class {
     }
     resetStdinForChild4();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)(
+      const proc = (0, import_child_process12.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", command2],
         { stdio: "inherit" }
@@ -8563,8 +9180,8 @@ var RailwayProvider = class {
     const tarEnv = { ...process.env, COPYFILE_DISABLE: "1" };
     const remoteCmd = `mkdir -p ${shellQuote4(remoteDir)} && tar -xzf - -C ${shellQuote4(remoteDir)}`;
     await new Promise((resolve2, reject) => {
-      const tar = (0, import_child_process11.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
-      const sh = (0, import_child_process11.spawn)(
+      const tar = (0, import_child_process12.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
+      const sh = (0, import_child_process12.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -8590,14 +9207,14 @@ var RailwayProvider = class {
     if (!projectId || !serviceId) {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
-    const remoteDir = path16.posix.dirname(remotePath);
+    const remoteDir = path19.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)}`);
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)(
+      const proc = (0, import_child_process12.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -8629,8 +9246,7 @@ var PROVIDERS = [
 ];
 
 // src/commands/deploy.ts
-var execFileP6 = (0, import_util6.promisify)(import_child_process12.execFile);
-async function deploy() {
+async function deploy(args2 = []) {
   console.log();
   mt(import_picocolors9.default.bgMagenta(import_picocolors9.default.white(" codeam deploy ")));
   const provider = await pickProvider();
@@ -8782,13 +9398,14 @@ async function deploy() {
       process.exit(1);
     }
   }
-  const localClaudeDir = path17.join(os10.homedir(), ".claude");
-  const localCredsKind = await detectLocalClaudeCredentials(localClaudeDir);
+  const cfg = loadCliConfig();
+  const agentId = parseAgentFlag(args2) ?? await promptForAgent(cfg.preferredAgent ?? "claude");
+  const strategy = createDeployStrategy(agentId);
+  const localCreds = await strategy.detectLocalCredentials();
   let bridged = "none";
-  if (localCredsKind !== "none") {
-    const sourceLabel = localCredsKind === "flat-file" ? "~/.claude/.credentials.json" : "macOS Keychain";
+  if (localCreds.source !== "none") {
     const useLocal = await ot2({
-      message: `Copy your local Claude credentials (${sourceLabel}) to the workspace?`,
+      message: `Copy your local ${AGENT_REGISTRY[agentId].displayName} credentials (${localCreds.description}) to the workspace?`,
       active: "Yes \u2014 same account, no re-auth",
       inactive: "No \u2014 log in with a different account",
       initialValue: true
@@ -8799,118 +9416,13 @@ async function deploy() {
     }
     if (useLocal) {
       const credStep = fe();
-      credStep.start("Bridging Claude credentials\u2026");
-      bridged = await bridgeClaudeCredentials(provider, workspace.id, localClaudeDir);
-      switch (bridged) {
-        case "flat-file":
-          credStep.stop("\u2713 Local credentials staged");
-          break;
-        case "macos-keychain":
-          credStep.stop("\u2713 Credentials extracted from macOS Keychain and staged");
-          break;
-        case "none":
-          credStep.stop("\u26A0 Could not extract local credentials \u2014 falling back to remote login");
-          break;
-      }
-    }
-  }
-  const claudeStep = fe();
-  claudeStep.start("Installing Claude CLI on workspace\u2026");
-  const installResult = await provider.exec(
-    workspace.id,
-    "curl -fsSL https://claude.ai/install.sh | bash"
-  );
-  if (installResult.code !== 0) {
-    claudeStep.stop("\u2717 Claude CLI install failed");
-    pt(installResult.stderr.slice(0, 1e3));
-    process.exit(1);
-  }
-  claudeStep.stop("\u2713 Claude CLI installed");
-  const haveLocalClaude = fs11.existsSync(localClaudeDir) && fs11.statSync(localClaudeDir).isDirectory();
-  if (haveLocalClaude) {
-    const copyStep = fe();
-    copyStep.start("Copying local Claude config to workspace\u2026");
-    try {
-      await provider.uploadDirectory(
-        workspace.id,
-        localClaudeDir,
-        "/home/codespace/.claude",
-        {
-          exclude: [
-            "./projects",
-            // per-project conversation history (often 700MB+)
-            "./file-history",
-            // per-project file diffs
-            "./downloads",
-            // downloaded artifacts
-            "./image-cache",
-            // cached images
-            "./paste-cache",
-            // clipboard/paste cache
-            "./backups",
-            // local backups
-            "./shell-snapshots",
-            // shell history snapshots
-            "./telemetry",
-            // analytics dumps
-            "./statsig",
-            // feature-flag cache
-            "./cache",
-            // generic cache dir
-            "./history.jsonl",
-            // global REPL history
-            "./ide",
-            // local IDE bridge state
-            "./todos",
-            // local todo state
-            "./tasks",
-            // local task state
-            // Don't overwrite the credentials we already staged in
-            // step 4 — the local dir on macOS doesn't have a flat
-            // credentials file anyway, but on Linux it would, and a
-            // re-write here would be redundant.
-            "./.credentials.json"
-          ]
-        }
-      );
-      copyStep.stop("\u2713 Claude config uploaded");
-    } catch (err) {
-      copyStep.stop("\u26A0 Could not upload Claude config (continuing)");
-      void err;
-    }
-  }
-  if (bridged !== "none") {
-    const localClaudeJson = path17.join(os10.homedir(), ".claude.json");
-    if (fs11.existsSync(localClaudeJson)) {
-      try {
-        const contents = fs11.readFileSync(localClaudeJson);
-        await provider.uploadFile(
-          workspace.id,
-          "/home/codespace/.claude.json",
-          contents,
-          { mode: 384 }
-        );
-      } catch (err) {
-        void err;
-      }
-    }
-  }
-  const verifyStep = fe();
-  verifyStep.start("Verifying Claude auth on workspace\u2026");
-  const verified = await verifyClaudeAuth(provider, workspace.id);
-  if (verified) {
-    verifyStep.stop("\u2713 Claude is logged in \u2014 no re-auth needed");
-  } else {
-    verifyStep.stop("\xB7 Claude not yet authenticated \u2014 running login flow");
-    await runRemoteClaudeLogin(provider, workspace.id);
-    const reverified = await verifyClaudeAuth(provider, workspace.id);
-    if (!reverified) {
-      wt(
-        "Claude auth could not be confirmed. You may need to run `claude /login` manually inside the codespace.",
-        "Heads up"
-      );
+      credStep.start(`Bridging ${AGENT_REGISTRY[agentId].displayName} credentials\u2026`);
+      const result = await strategy.bridgeLocalCredentials(provider, workspace.id);
+      bridged = result.source;
+      credStep.stop(`\u2713 Credentials staged (${bridged})`);
     }
   }
+  await strategy.setupOnWorkspace(provider, workspace.id, { bridged });
   const cliStep = fe();
   cliStep.start("Installing codeam-cli on workspace\u2026");
   const cliInstall = await provider.exec(workspace.id, "npm install -g codeam-cli@latest");
@@ -8925,8 +9437,8 @@ async function deploy() {
       `Workspace: ${import_picocolors9.default.cyan(workspace.displayName ?? workspace.id)}`,
       workspace.webUrl ? `Web:       ${import_picocolors9.default.cyan(workspace.webUrl)}` : "",
       "",
-      "Starting `codeam pair` on the workspace.",
-      "Scan the QR code below with the CodeAgent Mobile app to finish pairing.",
+      `Starting \`codeam pair\` on the workspace (agent: ${AGENT_REGISTRY[agentId].displayName}).`,
+      "Scan the QR code from your phone to pair.",
       import_picocolors9.default.dim("(Once paired, this terminal disconnects automatically; the session stays alive on the codespace.)")
     ].filter(Boolean).join("\n"),
     "Almost there"
@@ -8936,10 +9448,9 @@ async function deploy() {
     "LOG=~/.codeam-deploy/session.log",
     ': > "$LOG"',
     // The default `gh codespace ssh` cwd is the repo root
-    // (/workspaces/<repo>), which is exactly where Claude needs to
+    // (/workspaces/<repo>), which is exactly where the agent needs to
     // run so it can read/edit project files. Pass that to PM2 via
-    // --cwd so the relay's child Claude inherits the right
-    // working directory.
+    // --cwd so the relay's child agent inherits the right directory.
     'PROJECT_DIR="$(pwd)"',
     // Install PM2 if it isn't already on PATH. Idempotent.
     "if ! command -v pm2 >/dev/null 2>&1; then",
@@ -8951,11 +9462,11 @@ async function deploy() {
     // Start codeam pair under PM2. `--merge-logs` writes stdout
     // and stderr to the same file so we only need one tail.
     // --max-restarts 3 keeps PM2 from looping forever if codeam pair
-    // can't start (e.g. backend unreachable) — three attempts is
-    // enough for transient flakes, anything more wastes time.
-    // No `--time` (would prefix every line with a timestamp and
-    // break the QR rendering); no `--no-pmx` either (default off).
-    'pm2 start codeam --name codeam-pair --cwd "$PROJECT_DIR" --max-restarts 3 -o "$LOG" -e "$LOG" --merge-logs -- pair >/dev/null 2>&1',
+    // can't start (e.g. backend unreachable) — three attempts is enough
+    // for transient flakes.
+    // No `--time` (would prefix every line with a timestamp); no
+    // `--no-pmx` either (default off).
+    `pm2 start codeam --name codeam-pair --cwd "$PROJECT_DIR" --max-restarts 3 -o "$LOG" -e "$LOG" --merge-logs -- pair --agent=${agentId} >/dev/null 2>&1`,
     // Give PM2 a moment to spawn the process before we start polling
     // status — otherwise the very first jlist can race the spawn.
     "sleep 2",
@@ -9053,83 +9564,6 @@ async function deploy() {
 function shellQuoteSingle(s) {
   return `'${s.replace(/'/g, `'\\''`)}'`;
 }
-async function runRemoteClaudeLogin(provider, workspaceId) {
-  wt(
-    [
-      "A login URL will print below. Open it in your local browser, sign in,",
-      "and paste any code Claude asks for back into this terminal."
-    ].join("\n"),
-    "Authenticating Claude on workspace"
-  );
-  const result = await provider.streamCommand(
-    workspaceId,
-    'bash -lc "claude login || claude /login || true"'
-  );
-  if (result.code !== 0) {
-    wt(
-      "claude login exited non-zero. You can re-run it manually inside the codespace later.",
-      "Heads up"
-    );
-  }
-}
-async function detectLocalClaudeCredentials(localClaudeDir) {
-  if (fs11.existsSync(path17.join(localClaudeDir, ".credentials.json"))) {
-    return "flat-file";
-  }
-  if (process.platform === "darwin") {
-    try {
-      await execFileP6(
-        "security",
-        ["find-generic-password", "-s", "Claude Code-credentials"],
-        { maxBuffer: 1024 * 1024 }
-      );
-      return "macos-keychain";
-    } catch {
-      return "none";
-    }
-  }
-  return "none";
-}
-async function verifyClaudeAuth(provider, workspaceId) {
-  const result = await provider.exec(
-    workspaceId,
-    'bash -lc "claude auth status 2>/dev/null || true"'
-  );
-  if (result.code !== 0) return false;
-  const jsonStart = result.stdout.indexOf("{");
-  if (jsonStart < 0) return false;
-  try {
-    const parsed = JSON.parse(result.stdout.slice(jsonStart));
-    return parsed.loggedIn === true;
-  } catch {
-    return false;
-  }
-}
-async function bridgeClaudeCredentials(provider, workspaceId, localClaudeDir) {
-  const fileBased = path17.join(localClaudeDir, ".credentials.json");
-  if (fs11.existsSync(fileBased)) return "flat-file";
-  if (process.platform === "darwin") {
-    try {
-      const { stdout } = await execFileP6(
-        "security",
-        ["find-generic-password", "-s", "Claude Code-credentials", "-w"],
-        { maxBuffer: 1024 * 1024 }
-      );
-      const json = stdout.trim();
-      if (json.length === 0) return "none";
-      await provider.uploadFile(
-        workspaceId,
-        "/home/codespace/.claude/.credentials.json",
-        json,
-        { mode: 384 }
-      );
-      return "macos-keychain";
-    } catch {
-      return "none";
-    }
-  }
-  return "none";
-}
 function formatLastUsed(iso) {
   if (!iso) return "";
   const t2 = Date.parse(iso);
@@ -9315,7 +9749,7 @@ async function stopWorkspaceFromLocal(target) {
 // src/commands/version.ts
 var import_picocolors11 = __toESM(require("picocolors"));
 function version() {
-  const v = true ? "2.10.7" : "unknown";
+  const v = true ? "2.11.0" : "unknown";
   console.log(`${import_picocolors11.default.bold("codeam-cli")} ${import_picocolors11.default.cyan(v)}`);
 }
 
@@ -9352,9 +9786,9 @@ function help() {
 }
 
 // src/lib/updateNotifier.ts
-var fs12 = __toESM(require("fs"));
-var os11 = __toESM(require("os"));
-var path18 = __toESM(require("path"));
+var fs14 = __toESM(require("fs"));
+var os13 = __toESM(require("os"));
+var path20 = __toESM(require("path"));
 var https5 = __toESM(require("https"));
 var import_picocolors13 = __toESM(require("picocolors"));
 var PKG_NAME = "codeam-cli";
@@ -9362,12 +9796,12 @@ var REGISTRY_URL = `https://registry.npmjs.org/${PKG_NAME}/latest`;
 var TTL_MS = 24 * 60 * 60 * 1e3;
 var REQUEST_TIMEOUT_MS = 1500;
 function cachePath() {
-  const dir = path18.join(os11.homedir(), ".codeam");
-  return path18.join(dir, "update-check.json");
+  const dir = path20.join(os13.homedir(), ".codeam");
+  return path20.join(dir, "update-check.json");
 }
 function readCache() {
   try {
-    const raw = fs12.readFileSync(cachePath(), "utf8");
+    const raw = fs14.readFileSync(cachePath(), "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed.fetchedAt !== "number" || typeof parsed.latest !== "string") return null;
     return parsed;
@@ -9378,8 +9812,8 @@ function readCache() {
 function writeCache(cache) {
   try {
     const file = cachePath();
-    fs12.mkdirSync(path18.dirname(file), { recursive: true });
-    fs12.writeFileSync(file, JSON.stringify(cache));
+    fs14.mkdirSync(path20.dirname(file), { recursive: true });
+    fs14.writeFileSync(file, JSON.stringify(cache));
   } catch {
   }
 }
@@ -9450,7 +9884,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current = true ? "2.10.7" : null;
+  const current = true ? "2.11.0" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -9479,7 +9913,7 @@ async function main() {
     case "help":
       return help();
     case "pair":
-      return pair();
+      return pair(args);
     case "pair-auto":
       return pairAuto(args);
     case "sessions":
@@ -9491,7 +9925,7 @@ async function main() {
     case "deploy":
       if (args[0] === "ls" || args[0] === "list") return deployList();
       if (args[0] === "stop" || args[0] === "remove") return deployStop();
-      return deploy();
+      return deploy(args);
     default:
       return start();
   }