codeam-cli 2.30.0 → 2.32.0

package/CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to `codeam-cli` are documented here.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.31.0] — 2026-06-07
+
+### Chore
+
+- **cli:** Drop originator-HMAC fields from /api/pairing/code
+
+## [2.30.0] — 2026-06-06
+
+### Added
+
+- **vsc-plugin:** Banner recommends update when marketplace ships a fix
+- **jetbrains-plugin:** Banner recommends update when marketplace ships a fix
+
+### Fixed
+
+- **cli:** Forward mobile image attachments to ACP as image blocks (QA #290)
+- **cli, vsc-plugin:** Echo mobile prompts + clear Reconnecting UX (QA #287/#291)
+- **cli:** Replace pair pollStatus with SSE pair_completed event (QA #285)
+
 ## [2.29.0] — 2026-06-06
 
 ### Added

package/dist/index.js

@@ -498,7 +498,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.30.0",
+  version: "2.32.0",
   description: "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device \u2014 async. The terminal companion for CodeAgent Mobile.",
   type: "commonjs",
   main: "dist/index.js",
@@ -685,7 +685,7 @@ var _execSeam = {
 // src/services/pairing.service.ts
 var API_BASE = resolveApiBaseUrl();
 var REQUEST_CODE_TIMEOUT_MS = 1e4;
-async function requestCode(pluginId, options = {}) {
+async function requestCode(pluginId) {
   try {
     const runtime = process.env.CODESPACES === "true" ? "github-codespaces" : "local";
     const codespaceName = process.env.CODESPACE_NAME;
@@ -697,12 +697,7 @@ async function requestCode(pluginId, options = {}) {
       hostname: os2.hostname(),
       runtime,
       branch,
-      ...codespaceName ? { codespaceName } : {},
-      ...options.originatorSessionId && options.originatorPluginId && options.originatorAuthToken ? {
-        originatorSessionId: options.originatorSessionId,
-        originatorPluginId: options.originatorPluginId,
-        originatorAuthToken: options.originatorAuthToken
-      } : {}
+      ...codespaceName ? { codespaceName } : {}
     });
     let timer;
     const timeoutSentinel = /* @__PURE__ */ Symbol("request-code-timeout");
@@ -711,12 +706,27 @@ async function requestCode(pluginId, options = {}) {
     });
     const result = await Promise.race([post2, timeoutPromise]);
     clearTimeout(timer);
-    if (result === timeoutSentinel) return null;
+    if (result === timeoutSentinel) return { ok: false, reason: "timeout" };
     const data = result?.data;
-    if (!data?.code) return null;
-    return { code: data.code, expiresAt: data.expiresAt };
-  } catch {
-    return null;
+    if (!data?.code) return { ok: false, reason: "network" };
+    return {
+      ok: true,
+      code: data.code,
+      expiresAt: data.expiresAt
+    };
+  } catch (err) {
+    const e = err;
+    if (e.statusCode === 429) {
+      return {
+        ok: false,
+        reason: "rate-limited",
+        retryAfterSeconds: typeof e.retryAfterSeconds === "number" && e.retryAfterSeconds > 0 ? e.retryAfterSeconds : 60
+      };
+    }
+    if (typeof e.statusCode === "number") {
+      return { ok: false, reason: "http", status: e.statusCode };
+    }
+    return { ok: false, reason: "network" };
   }
 }
 async function fetchCurrentPluginAuthToken(sessionId, pluginId) {
@@ -862,9 +872,9 @@ async function _postJsonAuthed(url, body, pluginAuthToken) {
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
-            const err = new Error(`HTTP ${res.statusCode}: ${responseBody.slice(0, 200)}`);
-            err.statusCode = res.statusCode;
-            reject(err);
+            reject(
+              makeHttpError(res.statusCode, res.headers["retry-after"], responseBody)
+            );
             return;
           }
           try {
@@ -884,6 +894,16 @@ async function _postJsonAuthed(url, body, pluginAuthToken) {
     req.end();
   });
 }
+function makeHttpError(statusCode, retryAfterHeader, responseBody) {
+  const raw = Array.isArray(retryAfterHeader) ? retryAfterHeader[0] : retryAfterHeader;
+  const retryAfterSeconds = raw && /^\d+$/.test(raw.trim()) ? Number.parseInt(raw, 10) : void 0;
+  const err = new Error(
+    `HTTP ${statusCode}${responseBody ? ": " + responseBody.slice(0, 200) : ""}`
+  );
+  err.statusCode = statusCode;
+  if (typeof retryAfterSeconds === "number") err.retryAfterSeconds = retryAfterSeconds;
+  return err;
+}
 async function _postJson(url, body) {
   return new Promise((resolve6, reject) => {
     const data = JSON.stringify(body);
@@ -910,7 +930,7 @@ async function _postJson(url, body) {
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
-            reject(new Error(`HTTP ${res.statusCode}`));
+            reject(makeHttpError(res.statusCode, res.headers["retry-after"], body2));
             return;
           }
           try {
@@ -951,7 +971,7 @@ async function _getJson(url) {
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
-            reject(new Error(`HTTP ${res.statusCode}`));
+            reject(makeHttpError(res.statusCode, res.headers["retry-after"], body));
             return;
           }
           try {
@@ -1135,8 +1155,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? (0, import_pat
     return decodedFile;
   };
 }
-function normalizeWindowsPath(path45) {
-  return path45.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path46) {
+  return path46.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 
 // ../../node_modules/@posthog/core/dist/featureFlagUtils.mjs
@@ -3616,9 +3636,9 @@ async function addSourceContext(frames) {
   LRU_FILE_CONTENTS_CACHE.reduce();
   return frames;
 }
-function getContextLinesFromFile(path45, ranges, output) {
+function getContextLinesFromFile(path46, ranges, output) {
   return new Promise((resolve6) => {
-    const stream = (0, import_node_fs.createReadStream)(path45);
+    const stream = (0, import_node_fs.createReadStream)(path46);
     const lineReaded = (0, import_node_readline.createInterface)({
       input: stream
     });
@@ -3633,7 +3653,7 @@ function getContextLinesFromFile(path45, ranges, output) {
     let rangeStart = range[0];
     let rangeEnd = range[1];
     function onStreamError() {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path45, 1);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path46, 1);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -3694,8 +3714,8 @@ function clearLineContext(frame) {
   delete frame.context_line;
   delete frame.post_context;
 }
-function shouldSkipContextLinesForFile(path45) {
-  return path45.startsWith("node:") || path45.endsWith(".min.js") || path45.endsWith(".min.cjs") || path45.endsWith(".min.mjs") || path45.startsWith("data:");
+function shouldSkipContextLinesForFile(path46) {
+  return path46.startsWith("node:") || path46.endsWith(".min.js") || path46.endsWith(".min.cjs") || path46.endsWith(".min.mjs") || path46.startsWith("data:");
 }
 function shouldSkipContextLinesForFrame(frame) {
   if (void 0 !== frame.lineno && frame.lineno > MAX_CONTEXTLINES_LINENO) return true;
@@ -5849,7 +5869,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.30.0" : "0.0.0-dev",
+    cliVersion: true ? "2.32.0" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -7191,10 +7211,10 @@ function buildForPlatform(platform2) {
 var import_node_crypto4 = require("crypto");
 
 // src/agents/claude/resolver.ts
-function buildClaudeLaunch(extraArgs = [], os28 = createOsStrategy()) {
-  const found = os28.findInPath("claude") ?? os28.findInPath("claude-code");
+function buildClaudeLaunch(extraArgs = [], os29 = createOsStrategy()) {
+  const found = os29.findInPath("claude") ?? os29.findInPath("claude-code");
   if (!found) return null;
-  return os28.buildLaunch(found, extraArgs);
+  return os29.buildLaunch(found, extraArgs);
 }
 
 // src/agents/claude/installer.ts
@@ -9921,13 +9941,13 @@ function detectStartupBanner(lines) {
   while (artStart > 0 && BANNER_ART_RE.test(lines[artStart - 1])) artStart--;
   if (metaIdx - artStart < 2) return null;
   const pathLine = (lines[metaIdx + 1] ?? "").trim();
-  const path45 = pathLine && !BANNER_ART_RE.test(pathLine) ? pathLine : "";
+  const path46 = pathLine && !BANNER_ART_RE.test(pathLine) ? pathLine : "";
   return {
     title: "",
     subtitle: lines[metaIdx].trim(),
-    path: path45,
+    path: path46,
     startIdx: artStart,
-    endIdx: metaIdx + (path45 ? 1 : 0)
+    endIdx: metaIdx + (path46 ? 1 : 0)
   };
 }
 
@@ -9937,8 +9957,8 @@ var ClaudeRuntimeStrategy = class {
   meta = getAgent("claude");
   mode = "interactive";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   /**
    * Claude Code's react-ink TUI enables bracketed-paste mode at
@@ -10946,8 +10966,8 @@ function codexCredentialLocator() {
 function codexLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os28 = createOsStrategy();
-      return os28.findInPath("codex") !== null;
+      const os29 = createOsStrategy();
+      return os29.findInPath("codex") !== null;
     },
     launch() {
       return (0, import_node_child_process3.spawn)("codex", ["login"], { stdio: "inherit" });
@@ -10970,8 +10990,8 @@ var CodexRuntimeStrategy = class {
   meta = getAgent("codex");
   mode = "interactive";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   async prepareLaunch() {
     let binary = this.os.findInPath("codex");
@@ -11077,12 +11097,12 @@ var CodexRuntimeStrategy = class {
     });
   }
 };
-function resolveNpm(os28) {
-  return os28.id === "win32" ? "npm.cmd" : "npm";
+function resolveNpm(os29) {
+  return os29.id === "win32" ? "npm.cmd" : "npm";
 }
-async function installCodexViaNpm(os28) {
+async function installCodexViaNpm(os29) {
   return new Promise((resolve6, reject) => {
-    const proc = (0, import_node_child_process4.spawn)(resolveNpm(os28), ["install", "-g", "@openai/codex"], {
+    const proc = (0, import_node_child_process4.spawn)(resolveNpm(os29), ["install", "-g", "@openai/codex"], {
       stdio: "inherit"
     });
     proc.on("close", (code) => {
@@ -11099,16 +11119,16 @@ async function installCodexViaNpm(os28) {
     });
   });
 }
-function augmentNpmGlobalBin(os28) {
+function augmentNpmGlobalBin(os29) {
   try {
-    const result = (0, import_node_child_process4.spawnSync)(resolveNpm(os28), ["prefix", "-g"], {
+    const result = (0, import_node_child_process4.spawnSync)(resolveNpm(os29), ["prefix", "-g"], {
       stdio: ["ignore", "pipe", "ignore"]
     });
     if (result.status !== 0) return;
     const prefix = result.stdout.toString().trim();
     if (!prefix) return;
-    const binDir = os28.id === "win32" ? prefix : path17.join(prefix, "bin");
-    os28.augmentPath([binDir]);
+    const binDir = os29.id === "win32" ? prefix : path17.join(prefix, "bin");
+    os29.augmentPath([binDir]);
   } catch {
   }
 }
@@ -11192,9 +11212,9 @@ var import_node_child_process7 = require("child_process");
 // src/agents/coderabbit/installer.ts
 var import_node_child_process5 = require("child_process");
 var INSTALL_URL = "https://cli.coderabbit.ai/install.sh";
-async function ensureCoderabbitInstalled(os28) {
-  if (os28.findInPath("coderabbit")) return true;
-  if (os28.id === "win32") {
+async function ensureCoderabbitInstalled(os29) {
+  if (os29.findInPath("coderabbit")) return true;
+  if (os29.id === "win32") {
     console.error(
       "\n  \u2717 CodeRabbit on Windows requires WSL.\n    Install the CLI inside your WSL distribution\n    (curl -fsSL https://cli.coderabbit.ai/install.sh | sh)\n    then re-run `codeam link coderabbit` from WSL.\n"
     );
@@ -11209,8 +11229,8 @@ async function ensureCoderabbitInstalled(os28) {
     proc.on("error", () => resolve6(false));
   });
   if (!ok) return false;
-  os28.augmentPath([`${os28.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
-  return os28.findInPath("coderabbit") !== null;
+  os29.augmentPath([`${os29.homeDir()}/.local/bin`, "/opt/homebrew/bin"]);
+  return os29.findInPath("coderabbit") !== null;
 }
 
 // src/agents/coderabbit/link.ts
@@ -11237,10 +11257,10 @@ function coderabbitCredentialLocator() {
     extract: extractLocalCoderabbitToken
   };
 }
-function coderabbitLoginLauncher(os28) {
+function coderabbitLoginLauncher(os29) {
   return {
     async ensureInstalled() {
-      return ensureCoderabbitInstalled(os28);
+      return ensureCoderabbitInstalled(os29);
     },
     launch() {
       return (0, import_node_child_process6.spawn)("coderabbit", ["login"], { stdio: "inherit" });
@@ -11263,11 +11283,11 @@ function parseReview(stdout) {
   for (const line of lines) {
     const m = line.match(HUNK_LINE_RE);
     if (!m) continue;
-    const [, path45, lineNo, sevToken, message] = m;
-    if (!path45 || !lineNo || !message) continue;
+    const [, path46, lineNo, sevToken, message] = m;
+    if (!path46 || !lineNo || !message) continue;
     const cleanedMessage = message.trim().replace(/^[*-]\s+/, "");
     hunks.push({
-      path: path45.trim(),
+      path: path46.trim(),
       line: Number(lineNo),
       severity: sevToken ? SEVERITY_MAP[sevToken.toLowerCase()] : void 0,
       message: cleanedMessage
@@ -11286,8 +11306,8 @@ var CoderabbitRuntimeStrategy = class {
   meta = getAgent("coderabbit");
   mode = "batch";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   getDefaultArgs() {
     return ["review"];
@@ -11402,10 +11422,10 @@ function cursorCredentialLocator() {
     extract: extractLocalCursorToken
   };
 }
-function cursorLoginLauncher(os28) {
+function cursorLoginLauncher(os29) {
   return {
     async ensureInstalled() {
-      if (os28.findInPath("cursor-agent")) return true;
+      if (os29.findInPath("cursor-agent")) return true;
       console.error(
         "\n  \u2717 cursor-agent binary not on PATH.\n    Install Cursor (https://cursor.com/) and ensure the CLI\n    plugin is enabled, then re-run `codeam link cursor`.\n"
       );
@@ -11467,8 +11487,8 @@ var CursorRuntimeStrategy = class {
   meta = getAgent("cursor");
   mode = "interactive";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("cursor-agent");
@@ -11588,10 +11608,10 @@ function aiderCredentialLocator() {
     extract: extractLocalAiderToken
   };
 }
-function aiderLoginLauncher(os28) {
+function aiderLoginLauncher(os29) {
   return {
     async ensureInstalled() {
-      if (os28.findInPath("aider")) return true;
+      if (os29.findInPath("aider")) return true;
       console.error(
         "\n  \u2717 aider binary not on PATH.\n    Install Aider:\n      pip install aider-chat\n    then re-run `codeam link aider`.\n"
       );
@@ -11601,7 +11621,7 @@ function aiderLoginLauncher(os28) {
       console.error(
         "\n  Aider has no interactive login flow.\n    Set ANTHROPIC_API_KEY or OPENAI_API_KEY in your shell,\n    or re-run `codeam link aider --api-key=<your-key>`.\n"
       );
-      return (0, import_node_child_process9.spawn)(os28.id === "win32" ? "cmd.exe" : "sh", os28.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
+      return (0, import_node_child_process9.spawn)(os29.id === "win32" ? "cmd.exe" : "sh", os29.id === "win32" ? ["/c", "exit", "0"] : ["-c", "exit 0"], {
         stdio: "ignore"
       });
     }
@@ -11673,8 +11693,8 @@ var AiderRuntimeStrategy = class {
   meta = getAgent("aider");
   mode = "interactive";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("aider");
@@ -11797,8 +11817,8 @@ function geminiCredentialLocator() {
 function geminiLoginLauncher() {
   return {
     async ensureInstalled() {
-      const os28 = createOsStrategy();
-      return os28.findInPath("gemini") !== null;
+      const os29 = createOsStrategy();
+      return os29.findInPath("gemini") !== null;
     },
     launch() {
       return (0, import_node_child_process10.spawn)("gemini", ["auth", "login"], { stdio: "inherit" });
@@ -11831,8 +11851,8 @@ var GeminiRuntimeStrategy = class {
   meta = getAgent("gemini");
   mode = "interactive";
   os;
-  constructor(os28) {
-    this.os = os28;
+  constructor(os29) {
+    this.os = os29;
   }
   async prepareLaunch() {
     const binary = this.os.findInPath("gemini");
@@ -11932,18 +11952,18 @@ var GeminiRuntimeStrategy = class {
 
 // src/agents/registry.ts
 var runtimeBuilders = {
-  claude: (os28) => new ClaudeRuntimeStrategy(os28),
-  codex: (os28) => new CodexRuntimeStrategy(os28),
-  coderabbit: (os28) => new CoderabbitRuntimeStrategy(os28),
-  cursor: (os28) => new CursorRuntimeStrategy(os28),
-  aider: (os28) => new AiderRuntimeStrategy(os28),
-  gemini: (os28) => new GeminiRuntimeStrategy(os28)
+  claude: (os29) => new ClaudeRuntimeStrategy(os29),
+  codex: (os29) => new CodexRuntimeStrategy(os29),
+  coderabbit: (os29) => new CoderabbitRuntimeStrategy(os29),
+  cursor: (os29) => new CursorRuntimeStrategy(os29),
+  aider: (os29) => new AiderRuntimeStrategy(os29),
+  gemini: (os29) => new GeminiRuntimeStrategy(os29)
 };
 var deployBuilders = {
   claude: () => new ClaudeDeployStrategy(),
   codex: () => new CodexDeployStrategy()
 };
-function createAgentStrategy(agent, os28 = createOsStrategy()) {
+function createAgentStrategy(agent, os29 = createOsStrategy()) {
   if (!AGENT_REGISTRY[agent]?.enabled) {
     throw new Error(
       `Agent "${agent}" is not supported in this codeam-cli version. Upgrade with 'npm i -g codeam-cli@latest'.`
@@ -11953,10 +11973,10 @@ function createAgentStrategy(agent, os28 = createOsStrategy()) {
   if (!build) {
     throw new Error(`No runtime strategy registered for agent "${agent}"`);
   }
-  return build(os28);
+  return build(os29);
 }
-function createInteractiveAgentStrategy(agent, os28 = createOsStrategy()) {
-  const s = createAgentStrategy(agent, os28);
+function createInteractiveAgentStrategy(agent, os29 = createOsStrategy()) {
+  const s = createAgentStrategy(agent, os29);
   if (s.mode !== "interactive") {
     throw new Error(
       `Agent "${agent}" is a batch agent; use createAgentStrategy + .runOneShot for one-shot reviews.`
@@ -12056,6 +12076,9 @@ var import_node_crypto7 = require("crypto");
 // src/agents/acp/client.ts
 var import_node_child_process11 = require("child_process");
 var fs21 = __toESM(require("fs/promises"));
+var fsSync = __toESM(require("fs"));
+var os22 = __toESM(require("os"));
+var path26 = __toESM(require("path"));
 var import_node_stream = require("stream");
 
 // ../../node_modules/@agentclientprotocol/sdk/dist/acp.js
@@ -14534,13 +14557,14 @@ var AcpClient = class {
   async start() {
     if (this.child) throw new Error("AcpClient already started");
     const { adapter, cwd } = this.opts;
+    const augmentedPath = expandPathForAgentBinaries(process.env.PATH ?? "");
     log.info(
       "acpClient",
       `spawn cmd=${adapter.command} args=[${adapter.args.join(",")}] cwd=${cwd}`
     );
     const child = (0, import_node_child_process11.spawn)(adapter.command, adapter.args, {
       cwd,
-      env: process.env,
+      env: { ...process.env, PATH: augmentedPath },
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.child = child;
@@ -14817,6 +14841,48 @@ function applyLineRange(content, line, limit) {
   const end = limit !== null ? start2 + limit : lines.length;
   return { content: lines.slice(start2, end).join("\n") };
 }
+function knownAgentBinaryDirs() {
+  const home = os22.homedir();
+  const out2 = [];
+  out2.push("/tmp/codeam-node20/bin");
+  for (const root of [
+    "/usr/local/share/nvm/versions/node",
+    path26.join(home, ".nvm/versions/node")
+  ]) {
+    try {
+      for (const child of fsSync.readdirSync(root)) {
+        out2.push(path26.join(root, child, "bin"));
+      }
+    } catch {
+    }
+  }
+  out2.push(path26.join(home, ".volta/bin"));
+  out2.push("/usr/local/bin");
+  out2.push("/usr/bin");
+  out2.push(path26.join(home, ".local/bin"));
+  out2.push(path26.join(home, "bin"));
+  return out2.filter((p2) => {
+    try {
+      return fsSync.statSync(p2).isDirectory();
+    } catch {
+      return false;
+    }
+  });
+}
+function expandPathForAgentBinaries(existingPath) {
+  const existing = new Set(
+    existingPath.split(path26.delimiter).filter((p2) => p2.length > 0)
+  );
+  const additions = [];
+  for (const dir of knownAgentBinaryDirs()) {
+    if (!existing.has(dir)) {
+      additions.push(dir);
+      existing.add(dir);
+    }
+  }
+  if (additions.length === 0) return existingPath;
+  return [...additions, existingPath].filter((p2) => p2.length > 0).join(path26.delimiter);
+}
 
 // src/services/streaming/transport.ts
 var http3 = __toESM(require("http"));
@@ -15602,8 +15668,8 @@ function extractSelectPrompt(text) {
 
 // src/commands/start/handlers.ts
 var fs29 = __toESM(require("fs"));
-var os23 = __toESM(require("os"));
-var path34 = __toESM(require("path"));
+var os24 = __toESM(require("os"));
+var path35 = __toESM(require("path"));
 var import_crypto3 = require("crypto");
 var import_child_process12 = require("child_process");
 
@@ -15728,7 +15794,7 @@ function parsePayload2(schema, raw) {
 
 // src/services/file-ops.service.ts
 var fs22 = __toESM(require("fs/promises"));
-var path27 = __toESM(require("path"));
+var path28 = __toESM(require("path"));
 var MAX_FILE_BYTES = 5 * 1024 * 1024;
 var MAX_WALK_DEPTH = 6;
 var MAX_VISITED_DIRS = 5e3;
@@ -15763,8 +15829,8 @@ var SUBDIR_IGNORE = /* @__PURE__ */ new Set([
   "__pycache__"
 ]);
 function isUnder(parent, candidate) {
-  const rel = path27.relative(parent, candidate);
-  return rel === "" || !rel.startsWith("..") && !path27.isAbsolute(rel);
+  const rel = path28.relative(parent, candidate);
+  return rel === "" || !rel.startsWith("..") && !path28.isAbsolute(rel);
 }
 async function isExistingFile(absPath) {
   try {
@@ -15787,7 +15853,7 @@ async function walkForSuffix(dir, needleVariants, depth, ctx) {
   }
   for (const e of entries) {
     if (!e.isFile()) continue;
-    const full = path27.join(dir, e.name);
+    const full = path28.join(dir, e.name);
     if (needleVariants.some((needle) => full.endsWith(needle))) {
       ctx.matches.push(full);
       if (ctx.matches.length >= ctx.cap) return;
@@ -15797,21 +15863,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(path27.join(dir, e.name), needleVariants, depth + 1, ctx);
+    await walkForSuffix(path28.join(dir, e.name), needleVariants, depth + 1, ctx);
     if (ctx.matches.length >= ctx.cap) return;
   }
 }
 async function findFile(rawPath) {
   const cwd = process.cwd();
-  if (path27.isAbsolute(rawPath)) {
-    const abs = path27.normalize(rawPath);
+  if (path28.isAbsolute(rawPath)) {
+    const abs = path28.normalize(rawPath);
     if (isUnder(cwd, abs) && await isExistingFile(abs)) return abs;
   }
-  const direct = path27.resolve(cwd, rawPath);
+  const direct = path28.resolve(cwd, rawPath);
   if (isUnder(cwd, direct) && await isExistingFile(direct)) return direct;
-  const normalized = path27.normalize(rawPath).replace(/^[./\\]+/, "");
+  const normalized = path28.normalize(rawPath).replace(/^[./\\]+/, "");
   const needles = [
-    `${path27.sep}${normalized}`,
+    `${path28.sep}${normalized}`,
     `/${normalized}`
   ].filter((v, i, a) => a.indexOf(v) === i);
   const ctx = { visited: 0, matches: [], cap: 16 };
@@ -15825,7 +15891,7 @@ async function findWriteTarget(rawPath) {
   const found = await findFile(rawPath);
   if (found) return found;
   const cwd = process.cwd();
-  const fallback = path27.isAbsolute(rawPath) ? path27.normalize(rawPath) : path27.resolve(cwd, rawPath);
+  const fallback = path28.isAbsolute(rawPath) ? path28.normalize(rawPath) : path28.resolve(cwd, rawPath);
   if (!isUnder(cwd, fallback)) return null;
   return fallback;
 }
@@ -15865,7 +15931,7 @@ async function writeProjectFile(rawPath, content) {
     if (Buffer.byteLength(content, "utf-8") > MAX_FILE_BYTES) {
       return { error: "Content too large." };
     }
-    await fs22.mkdir(path27.dirname(abs), { recursive: true });
+    await fs22.mkdir(path28.dirname(abs), { recursive: true });
     await fs22.writeFile(abs, content, "utf-8");
     return { ok: true };
   } catch (e) {
@@ -15878,7 +15944,7 @@ async function writeProjectFile(rawPath, content) {
 var import_child_process9 = require("child_process");
 var import_util2 = require("util");
 var fs23 = __toESM(require("fs/promises"));
-var path28 = __toESM(require("path"));
+var path29 = __toESM(require("path"));
 var execFileP3 = (0, import_util2.promisify)(import_child_process9.execFile);
 var PROJECT_IGNORE = /* @__PURE__ */ new Set([
   "node_modules",
@@ -15936,12 +16002,12 @@ async function listProjectFiles(opts = {}) {
         return;
       }
       if (PROJECT_IGNORE.has(e.name)) continue;
-      const full = path28.join(dir, e.name);
+      const full = path29.join(dir, e.name);
       if (e.isDirectory()) {
         if (depth >= 12) continue;
         await walk(full, depth + 1);
       } else if (e.isFile()) {
-        const rel = path28.relative(root, full);
+        const rel = path29.relative(root, full);
         if (q2 && !rel.toLowerCase().includes(q2) && !e.name.toLowerCase().includes(q2)) {
           continue;
         }
@@ -16049,7 +16115,7 @@ async function gitStatus(cwd) {
   let hasMergeInProgress = false;
   try {
     const gitDir = (await git(["rev-parse", "--git-dir"], root)).stdout.trim();
-    const mergeHead = path28.isAbsolute(gitDir) ? path28.join(gitDir, "MERGE_HEAD") : path28.join(root, gitDir, "MERGE_HEAD");
+    const mergeHead = path29.isAbsolute(gitDir) ? path29.join(gitDir, "MERGE_HEAD") : path29.join(root, gitDir, "MERGE_HEAD");
     await fs23.access(mergeHead);
     hasMergeInProgress = true;
   } catch {
@@ -16196,7 +16262,7 @@ async function jsSearchFiles(opts, cwd, cap) {
     }
     let content = "";
     try {
-      content = await fs23.readFile(path28.join(cwd, f.path), "utf8");
+      content = await fs23.readFile(path29.join(cwd, f.path), "utf8");
     } catch {
       continue;
     }
@@ -16221,13 +16287,13 @@ async function jsSearchFiles(opts, cwd, cap) {
 // src/services/apply-file-review.service.ts
 var import_child_process10 = require("child_process");
 var fs24 = __toESM(require("fs"));
-var path29 = __toESM(require("path"));
+var path30 = __toESM(require("path"));
 async function applyFileReview(workingDir, filePath, action) {
-  if (filePath.includes("..") || path29.isAbsolute(filePath)) {
+  if (filePath.includes("..") || path30.isAbsolute(filePath)) {
     return { ok: false, action, filePath, error: "invalid file path" };
   }
-  const absFile = path29.resolve(workingDir, filePath);
-  const repoRoot = findGitRoot(path29.dirname(absFile));
+  const absFile = path30.resolve(workingDir, filePath);
+  const repoRoot = findGitRoot(path30.dirname(absFile));
   if (!repoRoot) {
     return {
       ok: false,
@@ -16236,7 +16302,7 @@ async function applyFileReview(workingDir, filePath, action) {
       error: `no enclosing git repo for ${filePath}`
     };
   }
-  const relInRepo = path29.relative(repoRoot, absFile);
+  const relInRepo = path30.relative(repoRoot, absFile);
   if (!relInRepo || relInRepo.startsWith("..")) {
     return { ok: false, action, filePath, error: "path escapes repo root" };
   }
@@ -16285,17 +16351,17 @@ function runGit(cwd, args2) {
   });
 }
 function findGitRoot(startDir) {
-  let dir = path29.resolve(startDir);
+  let dir = path30.resolve(startDir);
   const seen = /* @__PURE__ */ new Set();
   for (let i = 0; i < 256; i++) {
     if (seen.has(dir)) return null;
     seen.add(dir);
     try {
-      const stat3 = fs24.statSync(path29.join(dir, ".git"), { throwIfNoEntry: false });
+      const stat3 = fs24.statSync(path30.join(dir, ".git"), { throwIfNoEntry: false });
       if (stat3 && (stat3.isDirectory() || stat3.isFile())) return dir;
     } catch {
     }
-    const parent = path29.dirname(dir);
+    const parent = path30.dirname(dir);
     if (parent === dir) return null;
     dir = parent;
   }
@@ -16305,7 +16371,7 @@ function findGitRoot(startDir) {
 // src/commands/link.ts
 var import_node_crypto6 = require("crypto");
 var fs25 = __toESM(require("fs"));
-var path30 = __toESM(require("path"));
+var path31 = __toESM(require("path"));
 var import_chokidar = __toESM(require("chokidar"));
 var import_picocolors2 = __toESM(require("picocolors"));
 
@@ -16484,7 +16550,7 @@ function parseLinkArgs(args2) {
   if (apiKeyFileArg) {
     const filePath = apiKeyFileArg.slice("--api-key-file=".length);
     try {
-      apiKey = fs25.readFileSync(path30.resolve(filePath), "utf8").trim();
+      apiKey = fs25.readFileSync(path31.resolve(filePath), "utf8").trim();
     } catch (err) {
       throw new Error(`Could not read --api-key-file ${filePath}: ${err.message}`);
     }
@@ -16514,15 +16580,20 @@ async function link(args2 = []) {
   const pluginId = (0, import_node_crypto6.randomUUID)();
   const spin = dist_exports.spinner();
   spin.start("Requesting pairing code...");
-  const originator = getActiveSession();
-  const pairing = await requestCode(pluginId, {
-    originatorSessionId: originator?.id,
-    originatorPluginId: originator?.pluginId,
-    originatorAuthToken: originator?.pluginAuthToken
-  });
-  if (!pairing) {
+  const pairing = await requestCode(pluginId);
+  if (!pairing.ok) {
     spin.stop("Failed");
-    showError("Could not reach the server. Check your connection and try again.");
+    if (pairing.reason === "rate-limited") {
+      showError(
+        `Server is rate-limiting this request (HTTP 429). Retry in ${pairing.retryAfterSeconds}s.`
+      );
+    } else if (pairing.reason === "timeout") {
+      showError("Server took too long to respond. Check your connection and try again.");
+    } else if (pairing.reason === "http") {
+      showError(`Server returned HTTP ${pairing.status}. Try again later.`);
+    } else {
+      showError("Could not reach the server. Check your connection and try again.");
+    }
     process.exit(1);
   }
   spin.stop("Got pairing code");
@@ -16583,7 +16654,7 @@ async function link(args2 = []) {
     return;
   }
   if (parsed.tokenFile) {
-    const credential = fs25.readFileSync(path30.resolve(parsed.tokenFile), "utf8").trim();
+    const credential = fs25.readFileSync(path31.resolve(parsed.tokenFile), "utf8").trim();
     if (!credential) {
       showError(`--token-file ${parsed.tokenFile} is empty.`);
       process.exit(1);
@@ -17102,7 +17173,7 @@ function cleanupAttachmentTempFiles() {
 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 = path34.join(os23.tmpdir(), `codeam-${(0, import_crypto3.randomUUID)()}-${safeName}`);
+    const tmpPath = path35.join(os24.tmpdir(), `codeam-${(0, import_crypto3.randomUUID)()}-${safeName}`);
     fs29.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
     pendingAttachmentFiles.add(tmpPath);
     return tmpPath;
@@ -18049,8 +18120,8 @@ async function dispatchCommand(ctx, cmd) {
 // src/services/file-watcher.service.ts
 var import_child_process13 = require("child_process");
 var fs30 = __toESM(require("fs"));
-var os24 = __toESM(require("os"));
-var path35 = __toESM(require("path"));
+var os25 = __toESM(require("os"));
+var path36 = __toESM(require("path"));
 var import_ignore = __toESM(require("ignore"));
 
 // src/services/file-watcher/diff-parser.ts
@@ -18209,10 +18280,10 @@ var WINDOWS_LEGACY_JUNCTIONS = [
   /[\\/]Start Menu([\\/]|$)/i,
   /[\\/]Templates([\\/]|$)/i
 ];
-function isUnsafeWindowsWatchRoot(dir, homedir20) {
+function isUnsafeWindowsWatchRoot(dir, homedir21) {
   const norm = (p2) => p2.replace(/\//g, "\\").replace(/\\+$/, "").toLowerCase();
   const cwd = norm(dir);
-  const home = norm(homedir20);
+  const home = norm(homedir21);
   if (cwd === home) return true;
   if (/^[a-z]:$/.test(cwd)) return true;
   const sysRoots = [
@@ -18242,18 +18313,18 @@ var _findGitRootSeam = {
   resolve: _defaultFindGitRoot
 };
 function _defaultFindGitRoot(startDir) {
-  let dir = path35.resolve(startDir);
+  let dir = path36.resolve(startDir);
   const seen = /* @__PURE__ */ new Set();
   for (let i = 0; i < 256; i++) {
     if (seen.has(dir)) return null;
     seen.add(dir);
     try {
-      const gitPath = path35.join(dir, ".git");
+      const gitPath = path36.join(dir, ".git");
       const stat3 = fs30.statSync(gitPath, { throwIfNoEntry: false });
       if (stat3 && (stat3.isDirectory() || stat3.isFile())) return dir;
     } catch {
     }
-    const parent = path35.dirname(dir);
+    const parent = path36.dirname(dir);
     if (parent === dir) return null;
     dir = parent;
   }
@@ -18311,7 +18382,7 @@ var FileWatcherService = class {
       throw new Error("FileWatcherService has already been stopped \u2014 re-instantiate to restart.");
     }
     const isWin = process.platform === "win32";
-    if (isWin && isUnsafeWindowsWatchRoot(this.opts.workingDir, os24.homedir())) {
+    if (isWin && isUnsafeWindowsWatchRoot(this.opts.workingDir, os25.homedir())) {
       log.warn(
         "fileWatcher",
         `refusing to watch ${this.opts.workingDir} \u2014 looks like a Windows user-profile or system path. Run codeam from your project folder to enable file change emission.`
@@ -18498,7 +18569,7 @@ var FileWatcherService = class {
   }
   async emitForFile(absPath, changeType) {
     if (this.stopped) return;
-    const fileDir = path35.dirname(absPath);
+    const fileDir = path36.dirname(absPath);
     let gitRoot = this.gitRootByDir.get(fileDir);
     if (gitRoot === void 0) {
       gitRoot = findGitRoot2(fileDir);
@@ -18511,19 +18582,19 @@ var FileWatcherService = class {
       );
       return;
     }
-    const relPathInRepo = path35.relative(gitRoot, absPath);
+    const relPathInRepo = path36.relative(gitRoot, absPath);
     if (!relPathInRepo || relPathInRepo.startsWith("..")) return;
     const matcher = this.getGitIgnoreMatcher(gitRoot);
     if (matcher && matcher.ignores(relPathInRepo)) {
       log.trace(
         "fileWatcher",
-        `${relPathInRepo} ignored by ${path35.basename(gitRoot)}/.gitignore \u2014 suppressing emit`
+        `${relPathInRepo} ignored by ${path36.basename(gitRoot)}/.gitignore \u2014 suppressing emit`
       );
       return;
     }
     this.opts.onRepoDirty?.(gitRoot);
-    const repoPath = path35.relative(this.opts.workingDir, gitRoot);
-    const repoName = path35.basename(gitRoot);
+    const repoPath = path36.relative(this.opts.workingDir, gitRoot);
+    const repoName = path36.basename(gitRoot);
     let diffText = "";
     let fileStatus = "modified";
     if (changeType === "unlink") {
@@ -18707,16 +18778,16 @@ var FileWatcherService = class {
     );
     if (gitignoreEntry) {
       try {
-        const body = fs30.readFileSync(path35.join(dir, ".gitignore"), "utf8");
-        const rel = path35.relative(repoRoot, dir).replace(/\\/g, "/");
+        const body = fs30.readFileSync(path36.join(dir, ".gitignore"), "utf8");
+        const rel = path36.relative(repoRoot, dir).replace(/\\/g, "/");
         const prefixed = body.split(/\r?\n/).map((line) => {
           const trimmed = line.trim();
           if (!trimmed || trimmed.startsWith("#")) return line;
           if (!rel) return line;
           if (trimmed.startsWith("!")) {
-            return "!" + path35.posix.join(rel, trimmed.slice(1));
+            return "!" + path36.posix.join(rel, trimmed.slice(1));
           }
-          return path35.posix.join(rel, trimmed);
+          return path36.posix.join(rel, trimmed);
         }).join("\n");
         matcher.add(prefixed);
       } catch {
@@ -18725,7 +18796,7 @@ var FileWatcherService = class {
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
       if (entry.name === ".git") continue;
-      const childAbs = path35.join(dir, entry.name);
+      const childAbs = path36.join(dir, entry.name);
       if (isIgnoredFilePath(childAbs)) continue;
       this.collectGitignoreFiles(repoRoot, childAbs, matcher);
     }
@@ -18895,7 +18966,7 @@ var import_crypto4 = require("crypto");
 
 // src/services/turn-files/git-changeset.ts
 var import_child_process14 = require("child_process");
-var path36 = __toESM(require("path"));
+var path37 = __toESM(require("path"));
 async function collectRepoChangeset(opts) {
   const status2 = await runGit3(opts.repoRoot, ["status", "--porcelain=v1", "-z"]);
   if (status2 === null) return null;
@@ -19025,8 +19096,8 @@ async function discoverRepos(workingDir, maxDepth = 4) {
     if (hasGit) {
       out2.push({
         repoRoot: dir,
-        repoPath: path36.relative(workingDir, dir),
-        repoName: path36.basename(dir)
+        repoPath: path37.relative(workingDir, dir),
+        repoName: path37.basename(dir)
       });
       return;
     }
@@ -19034,14 +19105,14 @@ async function discoverRepos(workingDir, maxDepth = 4) {
       if (!entry.isDirectory) continue;
       if (entry.name === "node_modules") continue;
       if (entry.name === "dist" || entry.name === "build") continue;
-      await walk(path36.join(dir, entry.name), depth + 1);
+      await walk(path37.join(dir, entry.name), depth + 1);
     }
   }
 }
 
 // src/services/turn-files/files-outbox.ts
 var fs31 = __toESM(require("fs/promises"));
-var path37 = __toESM(require("path"));
+var path38 = __toESM(require("path"));
 var import_os7 = require("os");
 var HOME_OUTBOX_DIR = ".codeam/outbox";
 var MAX_AGE_MS = 24 * 60 * 60 * 1e3;
@@ -19074,15 +19145,15 @@ var FilesOutbox = class {
   backoffIndex = 0;
   stopped = false;
   constructor(opts) {
-    const base = opts.baseDir ?? path37.join(homeDir(), HOME_OUTBOX_DIR);
-    this.filePath = path37.join(base, `${opts.sessionId}.jsonl`);
+    const base = opts.baseDir ?? path38.join(homeDir(), HOME_OUTBOX_DIR);
+    this.filePath = path38.join(base, `${opts.sessionId}.jsonl`);
     this.post = opts.post;
     this.autoSchedule = opts.autoSchedule !== false;
   }
   /** Persist the entry to disk and trigger a flush. Returns once the
    *  line is durable on disk (not once the POST succeeds). */
   async enqueue(entry) {
-    await fs31.mkdir(path37.dirname(this.filePath), { recursive: true });
+    await fs31.mkdir(path38.dirname(this.filePath), { recursive: true });
     await fs31.appendFile(this.filePath, JSON.stringify(entry) + "\n", "utf8");
     this.backoffIndex = 0;
     if (this.autoSchedule) this.scheduleFlush(0);
@@ -20937,8 +21008,8 @@ var OutputService = class _OutputService {
 
 // src/services/history.service.ts
 var fs32 = __toESM(require("fs"));
-var path38 = __toESM(require("path"));
-var os25 = __toESM(require("os"));
+var path39 = __toESM(require("path"));
+var os26 = __toESM(require("os"));
 var https7 = __toESM(require("https"));
 var http7 = __toESM(require("http"));
 var import_zod2 = require("zod");
@@ -21100,7 +21171,7 @@ var HistoryService = class _HistoryService {
     return this._quotaPercent === null || Date.now() - this._quotaFetchedAt > ttlMs;
   }
   get projectDir() {
-    return this.runtime.resolveHistoryDir(this.cwd) ?? path38.join(os25.homedir(), ".claude", "projects", encodeCwd(this.cwd));
+    return this.runtime.resolveHistoryDir(this.cwd) ?? path39.join(os26.homedir(), ".claude", "projects", encodeCwd(this.cwd));
   }
   /** Set the current Claude conversation ID (extracted from /cost command or session start) */
   setCurrentConversationId(id) {
@@ -21112,7 +21183,7 @@ var HistoryService = class _HistoryService {
   /** Return the current message count in the active conversation. */
   getCurrentMessageCount() {
     if (!this.currentConversationId) return 0;
-    const filePath = path38.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+    const filePath = path39.join(this.projectDir, `${this.currentConversationId}.jsonl`);
     return parseJsonl(filePath).length;
   }
   /**
@@ -21123,7 +21194,7 @@ var HistoryService = class _HistoryService {
     const deadline = Date.now() + timeoutMs;
     while (Date.now() < deadline) {
       if (!this.currentConversationId) return null;
-      const filePath = path38.join(this.projectDir, `${this.currentConversationId}.jsonl`);
+      const filePath = path39.join(this.projectDir, `${this.currentConversationId}.jsonl`);
       const messages = parseJsonl(filePath);
       if (messages.length > previousCount) {
         for (let i = messages.length - 1; i >= previousCount; i--) {
@@ -21151,14 +21222,14 @@ var HistoryService = class _HistoryService {
     try {
       const files = fs32.readdirSync(dir, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
         try {
-          const stat3 = fs32.statSync(path38.join(dir, e.name));
+          const stat3 = fs32.statSync(path39.join(dir, e.name));
           return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
         } catch {
           return { name: e.name, mtime: 0, birthtime: 0 };
         }
       }).filter((f) => f.birthtime >= cutoff).sort((a, b) => b.mtime - a.mtime);
       if (files.length > 0) {
-        this.currentConversationId = path38.basename(files[0].name, ".jsonl");
+        this.currentConversationId = path39.basename(files[0].name, ".jsonl");
       }
     } catch {
     }
@@ -21198,7 +21269,7 @@ var HistoryService = class _HistoryService {
     }
     const files = entries.filter((e) => e.isFile() && e.name.endsWith(".jsonl")).map((e) => {
       try {
-        const stat3 = fs32.statSync(path38.join(dir, e.name));
+        const stat3 = fs32.statSync(path39.join(dir, e.name));
         return { name: e.name, mtime: stat3.mtimeMs, birthtime: stat3.birthtimeMs };
       } catch {
         return { name: e.name, mtime: 0, birthtime: 0 };
@@ -21207,7 +21278,7 @@ var HistoryService = class _HistoryService {
     if (files.length === 0) return null;
     const targetFile = this.currentConversationId ? `${this.currentConversationId}.jsonl` : files[0].name;
     if (!files.some((f) => f.name === targetFile)) return null;
-    return this.extractUsageFromFile(path38.join(dir, targetFile));
+    return this.extractUsageFromFile(path39.join(dir, targetFile));
   }
   extractUsageFromFile(filePath) {
     let raw;
@@ -21259,7 +21330,7 @@ var HistoryService = class _HistoryService {
     try {
       files = fs32.readdirSync(projectDir).filter((f) => f.endsWith(".jsonl")).filter((f) => {
         try {
-          return fs32.statSync(path38.join(projectDir, f)).mtimeMs >= monthStartMs;
+          return fs32.statSync(path39.join(projectDir, f)).mtimeMs >= monthStartMs;
         } catch {
           return false;
         }
@@ -21270,7 +21341,7 @@ var HistoryService = class _HistoryService {
     for (const file of files) {
       let raw;
       try {
-        raw = fs32.readFileSync(path38.join(projectDir, file), "utf8");
+        raw = fs32.readFileSync(path39.join(projectDir, file), "utf8");
       } catch {
         continue;
       }
@@ -21334,7 +21405,7 @@ var HistoryService = class _HistoryService {
    * showing an empty conversation.
    */
   async loadConversation(sessionId) {
-    const filePath = path38.join(this.projectDir, `${sessionId}.jsonl`);
+    const filePath = path39.join(this.projectDir, `${sessionId}.jsonl`);
     const messages = parseJsonl(filePath);
     if (messages.length === 0) return;
     const totalBatches = Math.ceil(messages.length / CONVERSATION_BATCH_SIZE);
@@ -21388,7 +21459,7 @@ var HistoryService = class _HistoryService {
       if (!this.currentConversationId) return 0;
     }
     const sessionId = this.currentConversationId;
-    const filePath = path38.join(this.projectDir, `${sessionId}.jsonl`);
+    const filePath = path39.join(this.projectDir, `${sessionId}.jsonl`);
     const messages = parseJsonl(filePath);
     if (messages.length === 0) return 0;
     const marker = this.lastUploadedUuid.get(sessionId);
@@ -22145,9 +22216,19 @@ async function pair(args2 = []) {
   const spin = dist_exports.spinner();
   spin.start("Requesting pairing code...");
   const result = await requestCode(pluginId);
-  if (!result) {
+  if (!result.ok) {
     spin.stop("Failed");
-    showError("Could not reach the server. Check your connection and try again.");
+    if (result.reason === "rate-limited") {
+      showError(
+        `Server is rate-limiting this request (HTTP 429). Retry in ${result.retryAfterSeconds}s.`
+      );
+    } else if (result.reason === "timeout") {
+      showError("Server took too long to respond. Check your connection and try again.");
+    } else if (result.reason === "http") {
+      showError(`Server returned HTTP ${result.status}. Try again later.`);
+    } else {
+      showError("Could not reach the server. Check your connection and try again.");
+    }
     process.exit(1);
   }
   spin.stop("Got pairing code");
@@ -22276,7 +22357,7 @@ async function autoLinkAfterPair(opts) {
 
 // src/commands/pair-auto.ts
 var fs33 = __toESM(require("fs"));
-var os26 = __toESM(require("os"));
+var os27 = __toESM(require("os"));
 var import_crypto7 = require("crypto");
 
 // src/commands/start-infra-only.ts
@@ -22444,12 +22525,12 @@ function readTokenFromArgs(args2) {
   }
   const fileFlag = args2.find((a) => a.startsWith("--token-file="));
   if (fileFlag) {
-    const path45 = fileFlag.slice("--token-file=".length);
+    const path46 = fileFlag.slice("--token-file=".length);
     try {
-      const content = fs33.readFileSync(path45, "utf8").trim();
-      if (content.length === 0) fail(`--token-file ${path45} is empty`);
+      const content = fs33.readFileSync(path46, "utf8").trim();
+      if (content.length === 0) fail(`--token-file ${path46} is empty`);
       try {
-        fs33.unlinkSync(path45);
+        fs33.unlinkSync(path46);
       } catch {
       }
       return content;
@@ -22475,7 +22556,7 @@ async function claimOnce(token, pluginId) {
     pluginId,
     ideName: "codeam-cli (codespace)",
     ideVersion: process.env.npm_package_version ?? "unknown",
-    hostname: os26.hostname(),
+    hostname: os27.hostname(),
     codespaceName: process.env.CODESPACE_NAME ?? "",
     // Current git branch of the codespace's working directory, so the
     // backend can populate `PairedSession.branch` for the codespace pair.
@@ -22715,7 +22796,7 @@ var import_picocolors10 = __toESM(require("picocolors"));
 var import_child_process16 = require("child_process");
 var import_util4 = require("util");
 var import_picocolors8 = __toESM(require("picocolors"));
-var path39 = __toESM(require("path"));
+var path40 = __toESM(require("path"));
 var execFileP5 = (0, import_util4.promisify)(import_child_process16.execFile);
 var MAX_BUFFER = 8 * 1024 * 1024;
 function resetStdinForChild() {
@@ -23204,7 +23285,7 @@ var GitHubCodespacesProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path39.posix.dirname(remotePath);
+    const remoteDir = path40.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote(remoteDir)}`,
       `cat > ${shellQuote(remotePath)}`
@@ -23274,7 +23355,7 @@ function shellQuote(s) {
 // src/services/providers/gitpod.ts
 var import_child_process17 = require("child_process");
 var import_util5 = require("util");
-var path40 = __toESM(require("path"));
+var path41 = __toESM(require("path"));
 var import_picocolors9 = __toESM(require("picocolors"));
 var execFileP6 = (0, import_util5.promisify)(import_child_process17.execFile);
 var MAX_BUFFER2 = 8 * 1024 * 1024;
@@ -23514,7 +23595,7 @@ var GitpodProvider = class {
     });
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
-    const remoteDir = path40.posix.dirname(remotePath);
+    const remoteDir = path41.posix.dirname(remotePath);
     const parts = [
       `mkdir -p ${shellQuote2(remoteDir)}`,
       `cat > ${shellQuote2(remotePath)}`
@@ -23550,7 +23631,7 @@ function shellQuote2(s) {
 // src/services/providers/gitlab-workspaces.ts
 var import_child_process18 = require("child_process");
 var import_util6 = require("util");
-var path41 = __toESM(require("path"));
+var path42 = __toESM(require("path"));
 var execFileP7 = (0, import_util6.promisify)(import_child_process18.execFile);
 var MAX_BUFFER3 = 8 * 1024 * 1024;
 var GITLAB_API_BASE = process.env.CODEAM_GITLAB_API_URL ?? "https://gitlab.com/api/v4";
@@ -23810,7 +23891,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
   }
   async uploadFile(workspaceId, remotePath, contents, options = {}) {
     const sshHost = process.env.CODEAM_GITLAB_SSH_HOST ?? "workspaces.gitlab.com";
-    const remoteDir = path41.posix.dirname(remotePath);
+    const remoteDir = path42.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)}`);
@@ -23878,7 +23959,7 @@ function shellQuote3(s) {
 // src/services/providers/railway.ts
 var import_child_process19 = require("child_process");
 var import_util7 = require("util");
-var path42 = __toESM(require("path"));
+var path43 = __toESM(require("path"));
 var execFileP8 = (0, import_util7.promisify)(import_child_process19.execFile);
 var MAX_BUFFER4 = 8 * 1024 * 1024;
 function resetStdinForChild4() {
@@ -24114,7 +24195,7 @@ var RailwayProvider = class {
     if (!projectId || !serviceId) {
       throw new Error("Invalid Railway workspace id (expected projectId/serviceId).");
     }
-    const remoteDir = path42.posix.dirname(remotePath);
+    const remoteDir = path43.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)}`);
@@ -24658,7 +24739,7 @@ var import_node_dns = require("dns");
 var import_node_util4 = require("util");
 var import_node_crypto8 = require("crypto");
 var fs34 = __toESM(require("fs"));
-var path43 = __toESM(require("path"));
+var path44 = __toESM(require("path"));
 var import_picocolors12 = __toESM(require("picocolors"));
 var dnsResolveP = (0, import_node_util4.promisify)(import_node_dns.resolve);
 async function checkDns(apiBase) {
@@ -24714,10 +24795,10 @@ async function checkHealth(apiBase) {
   }
 }
 function checkConfigDir() {
-  const dir = path43.join(require("os").homedir(), ".codeam");
+  const dir = path44.join(require("os").homedir(), ".codeam");
   try {
     fs34.mkdirSync(dir, { recursive: true, mode: 448 });
-    const probe = path43.join(dir, ".doctor-probe");
+    const probe = path44.join(dir, ".doctor-probe");
     fs34.writeFileSync(probe, "ok", { mode: 384 });
     const read = fs34.readFileSync(probe, "utf8");
     fs34.unlinkSync(probe);
@@ -24760,9 +24841,9 @@ function checkSessions() {
   }
 }
 function checkAgentBinaries() {
-  const os28 = createOsStrategy();
+  const os29 = createOsStrategy();
   return getEnabledAgents().map((meta) => {
-    const found = os28.findInPath(meta.binaryName);
+    const found = os29.findInPath(meta.binaryName);
     return {
       id: `agent-${meta.id}`,
       label: `Agent binary: ${meta.displayName} (${meta.binaryName})`,
@@ -24784,7 +24865,7 @@ function checkNodePty() {
       detail: "not required on this platform"
     };
   }
-  const vendoredPath = path43.join(__dirname, "vendor", "node-pty");
+  const vendoredPath = path44.join(__dirname, "vendor", "node-pty");
   for (const target of [vendoredPath, "node-pty"]) {
     try {
       require(target);
@@ -24826,7 +24907,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.30.0" : "0.0.0-dev";
+  const cliVersion = true ? "2.32.0" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto8.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -25025,7 +25106,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.30.0" : "unknown";
+  const v = true ? "2.32.0" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -25154,8 +25235,8 @@ var _subcommandHelpKeys = Object.keys(HELPS);
 
 // src/lib/updateNotifier.ts
 var fs35 = __toESM(require("fs"));
-var os27 = __toESM(require("os"));
-var path44 = __toESM(require("path"));
+var os28 = __toESM(require("os"));
+var path45 = __toESM(require("path"));
 var https8 = __toESM(require("https"));
 var import_node_child_process12 = require("child_process");
 var import_picocolors16 = __toESM(require("picocolors"));
@@ -25164,8 +25245,8 @@ 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 = path44.join(os27.homedir(), ".codeam");
-  return path44.join(dir, "update-check.json");
+  const dir = path45.join(os28.homedir(), ".codeam");
+  return path45.join(dir, "update-check.json");
 }
 function readCache() {
   try {
@@ -25180,7 +25261,7 @@ function readCache() {
 function writeCache(cache) {
   try {
     const file = cachePath();
-    fs35.mkdirSync(path44.dirname(file), { recursive: true });
+    fs35.mkdirSync(path45.dirname(file), { recursive: true });
     const tmp = `${file}.${process.pid}.tmp`;
     fs35.writeFileSync(tmp, JSON.stringify(cache));
     fs35.renameSync(tmp, file);
@@ -25257,7 +25338,7 @@ function isLinkedInstall() {
       timeout: 2e3
     }).trim();
     if (!root) return false;
-    const pkgPath = path44.join(root, PKG_NAME);
+    const pkgPath = path45.join(root, PKG_NAME);
     return fs35.lstatSync(pkgPath).isSymbolicLink();
   } catch {
     return false;
@@ -25311,7 +25392,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.30.0" : null;
+  const current = true ? "2.32.0" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.30.0",
+  "version": "2.32.0",
   "description": "Workflow-continuity bridge for AI coding agents. Wrap Claude Code or Codex in a PTY and supervise, approve, and redirect the session from any device — async. The terminal companion for CodeAgent Mobile.",
   "type": "commonjs",
   "main": "dist/index.js",