codeam-cli 2.15.5 → 2.15.6

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.15.5] — 2026-05-20
+
+### Added
+
+- **shared:** Add FileChangedEvent + PendingReviewHunkEvent wire types
+- **cli:** Emit file-change + review-hunk events during paired sessions
+
+### CI
+
+- **release:** Make CLI npm publish idempotent
+
 ## [2.15.1] — 2026-05-17
 
 ### Fixed

package/dist/index.js

@@ -386,7 +386,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.15.5",
+  version: "2.15.6",
   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",
@@ -521,6 +521,34 @@ function vercelBypassHeader() {
   return token ? { "x-vercel-protection-bypass": token } : {};
 }
 
+// src/lib/git-branch.ts
+var import_child_process = require("child_process");
+function detectCurrentBranch(cwd = process.cwd()) {
+  try {
+    const raw = _execSeam.exec("git branch --show-current", {
+      cwd,
+      // 1 s ceiling is comfortably above normal git latency (<50 ms
+      // on a healthy repo) and well below the pair POST's 10 s budget.
+      timeout: 1e3,
+      // Swallow stderr — non-git directories print "fatal: not a git
+      // repository" to stderr and we don't want that on the CLI's
+      // own stderr while pairing.
+      stdio: ["ignore", "pipe", "ignore"],
+      encoding: "utf8"
+    });
+    const trimmed = raw.trim();
+    return trimmed.length > 0 ? trimmed : null;
+  } catch {
+    return null;
+  }
+}
+var _execSeam = {
+  exec: (cmd, opts) => {
+    const out = (0, import_child_process.execSync)(cmd, opts);
+    return typeof out === "string" ? out : out.toString("utf8");
+  }
+};
+
 // src/lib/poll-delay.ts
 var MAX_DELAY_MS = 3e4;
 function computePollDelay({ baseMs, failures }) {
@@ -535,12 +563,14 @@ async function requestCode(pluginId) {
   try {
     const runtime = process.env.CODESPACES === "true" ? "github-codespaces" : "local";
     const codespaceName = process.env.CODESPACE_NAME;
+    const branch = detectCurrentBranch();
     const result = await _transport.postJson(`${API_BASE}/api/pairing/code`, {
       pluginId,
       ideName: "Terminal (codeam-cli)",
       ideVersion: package_default.version,
       hostname: os2.hostname(),
       runtime,
+      branch,
       ...codespaceName ? { codespaceName } : {}
     });
     const data = result?.data;
@@ -983,7 +1013,7 @@ var CommandRelayService = class {
 };
 
 // src/services/pty/unix.strategy.ts
-var import_child_process = require("child_process");
+var import_child_process2 = require("child_process");
 var fs4 = __toESM(require("fs"));
 var os4 = __toESM(require("os"));
 var path4 = __toESM(require("path"));
@@ -1087,7 +1117,7 @@ var UnixPtyStrategy = class {
     const rows = process.stdout.rows || 50;
     this.helperPath = path4.join(os4.tmpdir(), "codeam-pty-helper.py");
     fs4.writeFileSync(this.helperPath, PYTHON_PTY_HELPER, { mode: 420 });
-    this.proc = (0, import_child_process.spawn)(python, [this.helperPath, cmd, ...args2], {
+    this.proc = (0, import_child_process2.spawn)(python, [this.helperPath, cmd, ...args2], {
       stdio: ["pipe", "pipe", "inherit"],
       cwd,
       env: {
@@ -1152,7 +1182,7 @@ var UnixPtyStrategy = class {
    * are NOT interpreted by /bin/sh.
    */
   spawnDirect(cmd, cwd, args2 = []) {
-    this.proc = (0, import_child_process.spawn)(cmd, args2, {
+    this.proc = (0, import_child_process2.spawn)(cmd, args2, {
       stdio: ["pipe", "inherit", "inherit"],
       cwd,
       env: process.env,
@@ -1224,7 +1254,7 @@ var UnixPtyStrategy = class {
 };
 
 // src/services/pty/windows.strategy.ts
-var import_child_process2 = require("child_process");
+var import_child_process3 = require("child_process");
 var WindowsPtyStrategy = class {
   constructor(opts) {
     this.opts = opts;
@@ -1232,7 +1262,7 @@ var WindowsPtyStrategy = class {
   opts;
   proc = null;
   spawn(cmd, cwd, args2 = []) {
-    this.proc = (0, import_child_process2.spawn)(cmd, args2, {
+    this.proc = (0, import_child_process3.spawn)(cmd, args2, {
       stdio: ["pipe", "pipe", "inherit"],
       cwd,
       env: {
@@ -1408,7 +1438,7 @@ var WindowsConPtyStrategy = class _WindowsConPtyStrategy {
 };
 
 // src/services/claude-installer.ts
-var import_child_process3 = require("child_process");
+var import_child_process4 = require("child_process");
 var path6 = __toESM(require("path"));
 var os5 = __toESM(require("os"));
 
@@ -3361,7 +3391,7 @@ function runInstaller() {
     "irm https://claude.ai/install.ps1 | iex"
   ] : ["-c", "curl -fsSL https://claude.ai/install.sh | bash"];
   return new Promise((resolve2) => {
-    const proc = (0, import_child_process3.spawn)(cmd, args2, { stdio: "inherit" });
+    const proc = (0, import_child_process4.spawn)(cmd, args2, { stdio: "inherit" });
     proc.on("error", (err) => {
       console.error(`
   \u2717 Installer failed to launch: ${err.message}`);
@@ -3660,7 +3690,7 @@ var AgentService = class {
 var fs5 = __toESM(require("fs"));
 var os6 = __toESM(require("os"));
 var path8 = __toESM(require("path"));
-var import_child_process4 = require("child_process");
+var import_child_process5 = require("child_process");
 var HELPER_SCRIPT = `import os,pty,sys,select,signal,struct,fcntl,termios,errno
 m,s=pty.openpty()
 try:
@@ -3729,7 +3759,7 @@ async function fetchClaudeQuota() {
       resolve2(null);
       return;
     }
-    const proc = (0, import_child_process4.spawn)(python, [helperPath, claudeCmd, "--tools", ""], {
+    const proc = (0, import_child_process5.spawn)(python, [helperPath, claudeCmd, "--tools", ""], {
       stdio: ["pipe", "pipe", "ignore"],
       cwd: process.cwd(),
       env: { ...process.env, TERM: "dumb", COLUMNS: "120", LINES: "30" }
@@ -4192,12 +4222,12 @@ var os9 = __toESM(require("os"));
 var path11 = __toESM(require("path"));
 
 // src/agents/claude/credentials.ts
-var import_child_process5 = require("child_process");
+var import_child_process6 = 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);
+var execFileP = (0, import_util.promisify)(import_child_process6.execFile);
 async function detectLocalClaudeCredentials() {
   const localClaudeDir = path10.join(os8.homedir(), ".claude");
   const flat = path10.join(localClaudeDir, ".credentials.json");
@@ -6127,7 +6157,7 @@ var HistoryService = class _HistoryService {
 };
 
 // src/services/file-watcher.service.ts
-var import_child_process6 = require("child_process");
+var import_child_process7 = require("child_process");
 var path15 = __toESM(require("path"));
 
 // src/services/file-watcher/diff-parser.ts
@@ -6552,7 +6582,7 @@ async function _runGitImpl(cwd, args2, opts = {}) {
   return new Promise((resolve2) => {
     let proc;
     try {
-      proc = (0, import_child_process6.spawn)("git", args2, { cwd, env: process.env });
+      proc = (0, import_child_process7.spawn)("git", args2, { cwd, env: process.env });
     } catch {
       resolve2(null);
       return;
@@ -6580,6 +6610,432 @@ function _runGit(cwd, args2, opts = {}) {
   return _gitSeam.run(cwd, args2, opts);
 }
 
+// src/services/streaming-emitter.service.ts
+var import_crypto = require("crypto");
+
+// src/services/streaming/transport.ts
+var http6 = __toESM(require("http"));
+var https6 = __toESM(require("https"));
+var _transport4 = {
+  post: _post3,
+  get: _get
+};
+function _post3(url, headers, payload) {
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    const u2 = new URL(url);
+    const lib = u2.protocol === "https:" ? https6 : http6;
+    const req = lib.request(
+      {
+        hostname: u2.hostname,
+        port: u2.port || (u2.protocol === "https:" ? 443 : 80),
+        path: u2.pathname + u2.search,
+        method: "POST",
+        headers: {
+          ...headers,
+          ...vercelBypassHeader(),
+          "Content-Length": Buffer.byteLength(payload)
+        },
+        timeout: 8e3
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (c2) => {
+          body += c2.toString();
+        });
+        res.on("end", () => {
+          if (settled) return;
+          settled = true;
+          resolve2({ statusCode: res.statusCode ?? 0, body });
+        });
+      }
+    );
+    req.on("error", (err) => {
+      if (settled) return;
+      settled = true;
+      reject(err);
+    });
+    req.on("timeout", () => {
+      req.destroy();
+    });
+    req.write(payload);
+    req.end();
+  });
+}
+function _get(url, headers) {
+  return new Promise((resolve2, reject) => {
+    let settled = false;
+    const u2 = new URL(url);
+    const lib = u2.protocol === "https:" ? https6 : http6;
+    const req = lib.request(
+      {
+        hostname: u2.hostname,
+        port: u2.port || (u2.protocol === "https:" ? 443 : 80),
+        path: u2.pathname + u2.search,
+        method: "GET",
+        headers: {
+          ...headers,
+          ...vercelBypassHeader()
+        },
+        timeout: 8e3
+      },
+      (res) => {
+        let body = "";
+        res.on("data", (c2) => {
+          body += c2.toString();
+        });
+        res.on("end", () => {
+          if (settled) return;
+          settled = true;
+          resolve2({ statusCode: res.statusCode ?? 0, body });
+        });
+      }
+    );
+    req.on("error", (err) => {
+      if (settled) return;
+      settled = true;
+      reject(err);
+    });
+    req.on("timeout", () => {
+      req.destroy();
+    });
+    req.end();
+  });
+}
+
+// src/services/streaming-emitter.service.ts
+var API_BASE6 = process.env.CODEAM_API_URL ?? "https://codeagent-mobile-api.vercel.app";
+var TICK_MS = 50;
+var ANSWER_POLL_MS = 1500;
+var SELECTOR_STABLE_MS = 800;
+var MAX_RETRIES2 = 1;
+var RETRY_BACKOFF_MS2 = 200;
+var StreamingEmitterService = class {
+  constructor(opts) {
+    this.opts = opts;
+    this.apiBase = opts.apiBaseUrl ?? API_BASE6;
+    this.headers = {
+      "Content-Type": "application/json",
+      "X-Codeam-Protocol-Version": "2.0.0",
+      "X-Plugin-Auth-Token": opts.pluginAuthToken
+    };
+  }
+  opts;
+  apiBase;
+  headers;
+  rawBuffer = "";
+  active = false;
+  tickTimer = null;
+  answerPollTimer = null;
+  /** Open chunk we're appending bytes to; cleared on kind change or stop. */
+  activeChunk = null;
+  /** Outstanding answer we're polling the backend for. Null when idle. */
+  pendingAnswer = null;
+  /**
+   * Memoised selector signature so we don't fire `awaiting-answer` on
+   * every tick while the user thinks. Cleared once an answer resolves.
+   */
+  lastSelectorSignature = null;
+  selectorFirstSeenAt = 0;
+  // ─── Lifecycle ─────────────────────────────────────────────────────
+  start() {
+    if (this.active) return;
+    this.active = true;
+    this.tickTimer = setInterval(() => this.tick(), TICK_MS);
+    this.answerPollTimer = setInterval(() => {
+      void this.pollPendingAnswer();
+    }, ANSWER_POLL_MS);
+    log.trace("streamingEmitter", `started session=${this.opts.sessionId.slice(0, 8)}`);
+  }
+  /**
+   * Stop the emitter. Finalises the open chunk (if any) so the
+   * backend doesn't leave a half-streamed message in the SSE
+   * buffer. Idempotent.
+   */
+  async stop() {
+    if (!this.active) return;
+    this.active = false;
+    if (this.tickTimer) {
+      clearInterval(this.tickTimer);
+      this.tickTimer = null;
+    }
+    if (this.answerPollTimer) {
+      clearInterval(this.answerPollTimer);
+      this.answerPollTimer = null;
+    }
+    if (this.activeChunk) {
+      const finalContent = this.activeChunk.currentContent;
+      const chunk = this.activeChunk;
+      this.activeChunk = null;
+      await this.postChunk({
+        chunkId: chunk.chunkId,
+        kind: chunk.kind,
+        content: finalContent,
+        isFinal: true
+      });
+    }
+    log.trace("streamingEmitter", `stopped session=${this.opts.sessionId.slice(0, 8)}`);
+  }
+  // ─── Input pump ────────────────────────────────────────────────────
+  /**
+   * Forward a chunk of raw PTY bytes into the emitter. Safe to call
+   * before `start()` — bytes accumulate in the internal buffer and the
+   * first tick processes the backlog.
+   */
+  push(raw) {
+    if (raw.length === 0) return;
+    this.rawBuffer += raw;
+  }
+  // ─── Tick ──────────────────────────────────────────────────────────
+  /**
+   * Visible for tests. Runs one classify-and-emit pass against the
+   * current PTY buffer.
+   */
+  /* @internal */
+  _tickForTest() {
+    this.tick();
+  }
+  tick() {
+    if (!this.active) return;
+    const lines = (this.opts.runtime.renderToLines ?? renderToLines)(this.rawBuffer);
+    const selector = this.opts.runtime.detectInteractivePrompt(lines);
+    if (selector) {
+      this.maybeEmitAwaitingAnswer(selector);
+      return;
+    }
+    this.lastSelectorSignature = null;
+    this.selectorFirstSeenAt = 0;
+    const groups = this.classifyLines(lines, this.opts.runtime);
+    if (groups.length === 0) return;
+    const last = groups[groups.length - 1];
+    if (this.activeChunk && this.activeChunk.kind === last.kind) {
+      this.activeChunk.currentContent = last.content;
+      this.maybeFlushActive(false);
+      return;
+    }
+    if (this.activeChunk) {
+      const closing = this.activeChunk;
+      this.activeChunk = null;
+      void this.postChunk({
+        chunkId: closing.chunkId,
+        kind: closing.kind,
+        content: closing.currentContent,
+        isFinal: true
+      });
+    }
+    this.activeChunk = {
+      chunkId: (0, import_crypto.randomUUID)(),
+      kind: last.kind,
+      emittedContent: "",
+      currentContent: last.content,
+      lastEmitAt: 0
+    };
+    this.maybeFlushActive(false);
+  }
+  maybeFlushActive(force) {
+    const chunk = this.activeChunk;
+    if (!chunk) return;
+    const now = Date.now();
+    if (!force && now - chunk.lastEmitAt < TICK_MS) return;
+    if (chunk.currentContent === chunk.emittedContent) return;
+    chunk.emittedContent = chunk.currentContent;
+    chunk.lastEmitAt = now;
+    void this.postChunk({
+      chunkId: chunk.chunkId,
+      kind: chunk.kind,
+      content: chunk.currentContent,
+      isFinal: false
+    });
+  }
+  // ─── Line classification ───────────────────────────────────────────
+  /**
+   * Walk the rendered screen lines and bucket them into kind-groups.
+   *
+   * Visible for tests so we can assert discrimination against fixture
+   * inputs without standing up the full POST loop.
+   */
+  /* @internal */
+  _classifyForTest(lines) {
+    return this.classifyLines(lines, this.opts.runtime);
+  }
+  classifyLines(lines, runtime) {
+    const parseLine2 = runtime.parseTuiChrome?.bind(runtime);
+    const groups = [];
+    let current = null;
+    const flush = () => {
+      if (!current) return;
+      const text = current.lines.join("\n").replace(/\n{3,}/g, "\n\n").trim();
+      if (text.length > 0) groups.push({ kind: current.kind, content: text });
+      current = null;
+    };
+    for (const rawLine of lines) {
+      const kind = classifyLine(rawLine, parseLine2, runtime);
+      if (kind === null) continue;
+      if (!current || current.kind !== kind) {
+        flush();
+        current = { kind, lines: [rawLine] };
+      } else {
+        current.lines.push(rawLine);
+      }
+    }
+    flush();
+    return groups;
+  }
+  // ─── Awaiting-answer + answer subscription ─────────────────────────
+  maybeEmitAwaitingAnswer(selector) {
+    const signature = `${selector.question}::${selector.options.join("|")}`;
+    const now = Date.now();
+    if (this.lastSelectorSignature !== signature) {
+      this.lastSelectorSignature = signature;
+      this.selectorFirstSeenAt = now;
+      return;
+    }
+    if (this.pendingAnswer) return;
+    if (now - this.selectorFirstSeenAt < SELECTOR_STABLE_MS) return;
+    const questionId = (0, import_crypto.randomUUID)();
+    this.pendingAnswer = {
+      questionId,
+      options: selector.options.length > 0 ? selector.options : void 0,
+      fromIndex: selector.currentIndex
+    };
+    const event = {
+      questionId,
+      prompt: selector.question,
+      ...selector.options.length > 0 ? { options: selector.options } : {}
+    };
+    void this.postAwaitingAnswer(event);
+  }
+  async pollPendingAnswer() {
+    if (!this.active) return;
+    if (!this.pendingAnswer) return;
+    const questionId = this.pendingAnswer.questionId;
+    try {
+      const { statusCode, body } = await _transport4.get(
+        `${this.apiBase}/api/sessions/${encodeURIComponent(this.opts.sessionId)}/pending-answer?questionId=${encodeURIComponent(questionId)}`,
+        this.headers
+      );
+      if (statusCode === 204 || statusCode === 404) {
+        return;
+      }
+      if (statusCode < 200 || statusCode >= 300) {
+        log.warn("streamingEmitter", `pending-answer status=${statusCode} body=${body.slice(0, 200)}`);
+        return;
+      }
+      const parsed = parsePendingAnswerResponse(body);
+      if (!parsed || parsed.questionId !== questionId) return;
+      const pending = this.pendingAnswer;
+      this.pendingAnswer = null;
+      this.lastSelectorSignature = null;
+      this.selectorFirstSeenAt = 0;
+      this.deliverAnswer(parsed, pending);
+    } catch (err) {
+      log.trace("streamingEmitter", "pending-answer poll failed", err);
+    }
+  }
+  deliverAnswer(answer, pending) {
+    if (pending.options && pending.options.length > 0) {
+      let targetIndex = answer.optionIndex ?? -1;
+      if (targetIndex < 0) {
+        targetIndex = pending.options.findIndex((o) => o === answer.answer);
+      }
+      if (targetIndex < 0 || targetIndex >= pending.options.length) {
+        log.warn(
+          "streamingEmitter",
+          `answer label "${answer.answer}" not found in selector options \u2014 defaulting to 0`
+        );
+        targetIndex = 0;
+      }
+      this.opts.ptyInput.selectOption(targetIndex, pending.fromIndex ?? 0);
+      return;
+    }
+    this.opts.ptyInput.sendCommand(answer.answer);
+  }
+  // ─── POSTs ─────────────────────────────────────────────────────────
+  async postChunk(event) {
+    await this.postWithRetries(
+      `${this.apiBase}/api/sessions/${encodeURIComponent(this.opts.sessionId)}/streaming-chunk`,
+      event
+    );
+  }
+  async postAwaitingAnswer(event) {
+    await this.postWithRetries(
+      `${this.apiBase}/api/sessions/${encodeURIComponent(this.opts.sessionId)}/awaiting-answer`,
+      event
+    );
+  }
+  async postWithRetries(url, body) {
+    const payload = JSON.stringify(body);
+    for (let attempt = 0; attempt <= MAX_RETRIES2; attempt += 1) {
+      try {
+        const { statusCode, body: resBody } = await _transport4.post(url, this.headers, payload);
+        if (statusCode >= 200 && statusCode < 300) {
+          log.trace("streamingEmitter", `post ok url=${url} status=${statusCode}`);
+          return;
+        }
+        if (statusCode === 410 || statusCode === 404) {
+          log.warn("streamingEmitter", `session dead (status=${statusCode}) \u2014 disabling emitter`);
+          this.active = false;
+          if (this.tickTimer) {
+            clearInterval(this.tickTimer);
+            this.tickTimer = null;
+          }
+          if (this.answerPollTimer) {
+            clearInterval(this.answerPollTimer);
+            this.answerPollTimer = null;
+          }
+          return;
+        }
+        log.warn(
+          "streamingEmitter",
+          `post failed url=${url} status=${statusCode} attempt=${attempt + 1} body=${resBody.slice(0, 200)}`
+        );
+      } catch (err) {
+        log.warn("streamingEmitter", `post error url=${url} attempt=${attempt + 1}`, err);
+      }
+      if (attempt < MAX_RETRIES2) {
+        await sleep2(RETRY_BACKOFF_MS2 * (attempt + 1));
+      }
+    }
+  }
+};
+function sleep2(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+var TREE_CONTINUATION_RE = /^\s*└/;
+function classifyLine(line, parseChrome, runtime) {
+  if (line.trim().length === 0) return null;
+  if (TREE_CONTINUATION_RE.test(line)) return "tool_result";
+  const step = parseChrome?.(line) ?? null;
+  if (step) {
+    if (step.tool === "thinking") return "thinking";
+    return "tool_use";
+  }
+  const filtered = runtime.filterTuiOutput([line]);
+  if (filtered.length === 0) return null;
+  return "text";
+}
+function parsePendingAnswerResponse(body) {
+  if (!body) return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(body);
+  } catch {
+    return null;
+  }
+  if (typeof parsed !== "object" || parsed === null) return null;
+  const root = parsed;
+  const candidate = root.data && typeof root.data === "object" ? root.data : root;
+  const questionId = candidate.questionId;
+  const answer = candidate.answer;
+  const optionIndex = candidate.optionIndex;
+  if (typeof questionId !== "string" || typeof answer !== "string") return null;
+  const result = { questionId, answer };
+  if (typeof optionIndex === "number" && Number.isInteger(optionIndex)) {
+    result.optionIndex = optionIndex;
+  }
+  return result;
+}
+
 // src/commands/start/quota-fetcher.ts
 var inProgress = false;
 function fetchQuotaUsage(runtime, historySvc) {
@@ -6595,13 +7051,13 @@ function fetchQuotaUsage(runtime, historySvc) {
 }
 
 // src/commands/start/keep-alive.ts
-var import_child_process7 = require("child_process");
+var import_child_process8 = 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_process7.spawn)(
+      const proc = (0, import_child_process8.spawn)(
         "gh",
         [
           "api",
@@ -6641,8 +7097,8 @@ function buildKeepAlive(ctx) {
 var fs14 = __toESM(require("fs"));
 var os13 = __toESM(require("os"));
 var path19 = __toESM(require("path"));
-var import_crypto2 = require("crypto");
-var import_child_process10 = require("child_process");
+var import_crypto3 = require("crypto");
+var import_child_process11 = require("child_process");
 
 // src/lib/payload.ts
 var import_zod2 = require("zod");
@@ -6846,11 +7302,11 @@ async function writeProjectFile(rawPath, content) {
 }
 
 // src/services/project-ops.service.ts
-var import_child_process8 = require("child_process");
+var import_child_process9 = require("child_process");
 var import_util2 = require("util");
 var fs13 = __toESM(require("fs/promises"));
 var path17 = __toESM(require("path"));
-var execFileP2 = (0, import_util2.promisify)(import_child_process8.execFile);
+var execFileP2 = (0, import_util2.promisify)(import_child_process9.execFile);
 var PROJECT_IGNORE = /* @__PURE__ */ new Set([
   "node_modules",
   ".git",
@@ -7190,8 +7646,8 @@ async function jsSearchFiles(opts, cwd, cap) {
 }
 
 // src/services/terminal-ops.service.ts
-var import_child_process9 = require("child_process");
-var import_crypto = require("crypto");
+var import_child_process10 = require("child_process");
+var import_crypto2 = require("crypto");
 var import_path = __toESM(require("path"));
 var MAX_CONCURRENT_SESSIONS = 4;
 var nodePtyModule;
@@ -7312,7 +7768,7 @@ function createPythonSession(id, shell, cwd, env, cols, rows) {
   }
   let child;
   try {
-    child = (0, import_child_process9.spawn)(python, ["-c", PYTHON_TERMINAL_HELPER, shell], {
+    child = (0, import_child_process10.spawn)(python, ["-c", PYTHON_TERMINAL_HELPER, shell], {
       cwd,
       env: { ...env, COLUMNS: String(cols), LINES: String(rows) },
       stdio: ["pipe", "pipe", "pipe"]
@@ -7367,7 +7823,7 @@ function openTerminal(opts) {
   };
   const cols = Math.max(1, Math.min(opts.cols ?? 80, 500));
   const rows = Math.max(1, Math.min(opts.rows ?? 24, 200));
-  const id = (0, import_crypto.randomUUID)();
+  const id = (0, import_crypto2.randomUUID)();
   const ptyMod = loadNodePty2();
   if (ptyMod) {
     try {
@@ -7447,7 +7903,7 @@ function closeTerminal(sessionId) {
 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 = path19.join(os13.tmpdir(), `codeam-${(0, import_crypto2.randomUUID)()}-${safeName}`);
+    const tmpPath = path19.join(os13.tmpdir(), `codeam-${(0, import_crypto3.randomUUID)()}-${safeName}`);
     fs14.writeFileSync(tmpPath, Buffer.from(base64, "base64"));
     return tmpPath;
   });
@@ -7579,7 +8035,7 @@ var sessionTerminated = (ctx) => {
   } catch {
   }
   try {
-    const proc = (0, import_child_process10.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
+    const proc = (0, import_child_process11.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
       detached: true,
       stdio: "ignore"
     });
@@ -7601,7 +8057,7 @@ var shutdownSession = async (ctx, cmd) => {
   }
   if (ctx.keepAliveCtx.inCodespace && ctx.keepAliveCtx.codespaceName) {
     try {
-      const stopProc = (0, import_child_process10.spawn)(
+      const stopProc = (0, import_child_process11.spawn)(
         "bash",
         ["-lc", `sleep 1; gh codespace stop -c ${JSON.stringify(ctx.keepAliveCtx.codespaceName)} >/dev/null 2>&1 || true`],
         { detached: true, stdio: "ignore" }
@@ -7611,7 +8067,7 @@ var shutdownSession = async (ctx, cmd) => {
     }
   }
   try {
-    const proc = (0, import_child_process10.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
+    const proc = (0, import_child_process11.spawn)("bash", ["-lc", "pm2 delete codeam-pair >/dev/null 2>&1 || true"], {
       detached: true,
       stdio: "ignore"
     });
@@ -7836,22 +8292,34 @@ async function start(requestedAgent) {
     pluginId,
     pluginAuthToken: session.pluginAuthToken
   }) : null;
+  let streamingEmitter = null;
   const claude = new AgentService(
     runtime,
     {
       cwd,
       onData(raw) {
         outputSvc.push(raw);
+        streamingEmitter?.push(raw);
       },
       onExit(code) {
         process.removeListener("SIGINT", sigintHandler);
         outputSvc.dispose();
         relay.stop();
         void fileWatcher?.stop();
+        void streamingEmitter?.stop();
         process.exit(code);
       }
     }
   );
+  if (session.pluginAuthToken) {
+    streamingEmitter = new StreamingEmitterService({
+      sessionId: session.id,
+      pluginId,
+      pluginAuthToken: session.pluginAuthToken,
+      runtime,
+      ptyInput: claude
+    });
+  }
   const ctx = {
     outputSvc,
     claude,
@@ -7878,6 +8346,7 @@ async function start(requestedAgent) {
     outputSvc.dispose();
     relay.stop();
     void fileWatcher?.stop();
+    void streamingEmitter?.stop();
     process.exit(0);
   }
   process.once("SIGINT", sigintHandler);
@@ -7888,6 +8357,7 @@ async function start(requestedAgent) {
     fileWatcher.start().catch(() => {
     });
   }
+  streamingEmitter?.start();
   setTimeout(() => {
     historySvc.load().catch(() => {
     });
@@ -7896,7 +8366,7 @@ async function start(requestedAgent) {
 }
 
 // src/commands/pair.ts
-var import_crypto3 = require("crypto");
+var import_crypto4 = require("crypto");
 var import_picocolors3 = __toESM(require("picocolors"));
 
 // src/ui/prompts.ts
@@ -7959,7 +8429,7 @@ async function pair(args2 = []) {
   const flagAgent = parseAgentFlag(args2);
   const agentId = flagAgent ?? await promptForAgent(config.preferredAgent ?? "claude");
   showIntro();
-  const pluginId = (0, import_crypto3.randomUUID)();
+  const pluginId = (0, import_crypto4.randomUUID)();
   const spin = dist_exports.spinner();
   spin.start("Requesting pairing code...");
   const result = await requestCode(pluginId);
@@ -8015,8 +8485,8 @@ async function pair(args2 = []) {
 // src/commands/pair-auto.ts
 var fs15 = __toESM(require("fs"));
 var os14 = __toESM(require("os"));
-var import_crypto4 = require("crypto");
-var API_BASE6 = process.env.CODEAM_API_URL ?? "https://codeagent-mobile-api.vercel.app";
+var import_crypto5 = require("crypto");
+var API_BASE7 = process.env.CODEAM_API_URL ?? "https://codeagent-mobile-api.vercel.app";
 function fail(msg) {
   console.error(`
   ${msg}
@@ -8048,14 +8518,18 @@ function readTokenFromArgs(args2) {
   fail("codeam pair-auto requires --token-file=<path>, --token=<value>, or CODEAM_AUTO_TOKEN env");
 }
 async function claim(token, pluginId) {
-  const url = `${API_BASE6}/api/pairing/claim-auto-token`;
+  const url = `${API_BASE7}/api/pairing/claim-auto-token`;
   const body = {
     token,
     pluginId,
     ideName: "codeam-cli (codespace)",
     ideVersion: process.env.npm_package_version ?? "unknown",
     hostname: os14.hostname(),
-    codespaceName: process.env.CODESPACE_NAME ?? ""
+    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.
+    // `null` when detached HEAD / not a git repo.
+    branch: detectCurrentBranch()
   };
   const res = await fetch(url, {
     method: "POST",
@@ -8077,7 +8551,7 @@ async function claim(token, pluginId) {
 }
 async function pairAuto(args2) {
   const token = readTokenFromArgs(args2);
-  const pluginId = (0, import_crypto4.randomUUID)();
+  const pluginId = (0, import_crypto5.randomUUID)();
   console.log("  Claiming pairing token\u2026");
   const claimed = await claim(token, pluginId);
   if (!isKnownAgentId(claimed.agent)) {
@@ -8203,11 +8677,11 @@ async function logout() {
 var import_picocolors9 = __toESM(require("picocolors"));
 
 // src/services/providers/github-codespaces.ts
-var import_child_process11 = require("child_process");
+var import_child_process12 = require("child_process");
 var import_util3 = require("util");
 var import_picocolors7 = __toESM(require("picocolors"));
 var path20 = __toESM(require("path"));
-var execFileP3 = (0, import_util3.promisify)(import_child_process11.execFile);
+var execFileP3 = (0, import_util3.promisify)(import_child_process12.execFile);
 var MAX_BUFFER = 8 * 1024 * 1024;
 function resetStdinForChild() {
   if (process.stdin.isTTY) {
@@ -8251,7 +8725,7 @@ var GitHubCodespacesProvider = class {
     if (!isAuthed) {
       resetStdinForChild();
       await new Promise((resolve2, reject) => {
-        const proc = (0, import_child_process11.spawn)("gh", ["auth", "login", "-s", "codespace,repo,read:user"], {
+        const proc = (0, import_child_process12.spawn)("gh", ["auth", "login", "-s", "codespace,repo,read:user"], {
           stdio: "inherit"
         });
         proc.on("exit", (code) => {
@@ -8285,7 +8759,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_process11.spawn)(
+        const proc = (0, import_child_process12.spawn)(
           "gh",
           ["auth", "refresh", "-h", "github.com", "-s", "codespace"],
           { stdio: "inherit" }
@@ -8435,7 +8909,7 @@ var GitHubCodespacesProvider = class {
     O2.step(`Installing gh via ${installCmd.describe}\u2026`);
     resetStdinForChild();
     const ok = await new Promise((resolve2) => {
-      const proc = (0, import_child_process11.spawn)(installCmd.exe, installCmd.args, { stdio: "inherit" });
+      const proc = (0, import_child_process12.spawn)(installCmd.exe, installCmd.args, { stdio: "inherit" });
       proc.on("exit", (code) => resolve2(code === 0));
       proc.on("error", () => resolve2(false));
     });
@@ -8462,7 +8936,7 @@ var GitHubCodespacesProvider = class {
     );
     resetStdinForChild();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)(
+      const proc = (0, import_child_process12.spawn)(
         "gh",
         ["auth", "refresh", "-h", "github.com", "-s", "repo,read:org"],
         { stdio: "inherit" }
@@ -8640,7 +9114,7 @@ var GitHubCodespacesProvider = class {
   async streamCommand(workspaceId, command2) {
     resetStdinForChild();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)(
+      const proc = (0, import_child_process12.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
@@ -8667,11 +9141,11 @@ var GitHubCodespacesProvider = class {
       `mkdir -p ${shellQuote(remoteDir)} && tar -xzf - -C ${shellQuote(remoteDir)}`
     ];
     await new Promise((resolve2, reject) => {
-      const tar = (0, import_child_process11.spawn)("tar", tarArgs, {
+      const tar = (0, import_child_process12.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
       });
-      const ssh = (0, import_child_process11.spawn)("gh", sshArgs, {
+      const ssh = (0, import_child_process12.spawn)("gh", sshArgs, {
         stdio: [tar.stdout, "pipe", "pipe"]
       });
       let tarErr = "";
@@ -8705,7 +9179,7 @@ var GitHubCodespacesProvider = class {
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process11.spawn)(
+      const proc = (0, import_child_process12.spawn)(
         "gh",
         ["codespace", "ssh", "-c", workspaceId, "--", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -8763,11 +9237,11 @@ function shellQuote(s) {
 }
 
 // src/services/providers/gitpod.ts
-var import_child_process12 = require("child_process");
+var import_child_process13 = require("child_process");
 var import_util4 = require("util");
 var path21 = __toESM(require("path"));
 var import_picocolors8 = __toESM(require("picocolors"));
-var execFileP4 = (0, import_util4.promisify)(import_child_process12.execFile);
+var execFileP4 = (0, import_util4.promisify)(import_child_process13.execFile);
 var MAX_BUFFER2 = 8 * 1024 * 1024;
 function resetStdinForChild2() {
   if (process.stdin.isTTY) {
@@ -8807,7 +9281,7 @@ var GitpodProvider = class {
     );
     resetStdinForChild2();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process12.spawn)("gitpod", ["login"], { stdio: "inherit" });
+      const proc = (0, import_child_process13.spawn)("gitpod", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
         if (code === 0) resolve2();
         else reject(new Error("gitpod login failed."));
@@ -8959,7 +9433,7 @@ var GitpodProvider = class {
   async streamCommand(workspaceId, command2) {
     resetStdinForChild2();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process12.spawn)(
+      const proc = (0, import_child_process13.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", "-tt", command2],
         { stdio: "inherit" }
@@ -8979,11 +9453,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_process12.spawn)("tar", tarArgs, {
+      const tar = (0, import_child_process13.spawn)("tar", tarArgs, {
         stdio: ["ignore", "pipe", "pipe"],
         env: tarEnv
       });
-      const ssh = (0, import_child_process12.spawn)(
+      const ssh = (0, import_child_process13.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -9015,7 +9489,7 @@ var GitpodProvider = class {
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process12.spawn)(
+      const proc = (0, import_child_process13.spawn)(
         "gitpod",
         ["workspace", "ssh", workspaceId, "--", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -9039,10 +9513,10 @@ function shellQuote2(s) {
 }
 
 // src/services/providers/gitlab-workspaces.ts
-var import_child_process13 = require("child_process");
+var import_child_process14 = require("child_process");
 var import_util5 = require("util");
 var path22 = __toESM(require("path"));
-var execFileP5 = (0, import_util5.promisify)(import_child_process13.execFile);
+var execFileP5 = (0, import_util5.promisify)(import_child_process14.execFile);
 var MAX_BUFFER3 = 8 * 1024 * 1024;
 var GITLAB_API_BASE = process.env.CODEAM_GITLAB_API_URL ?? "https://gitlab.com/api/v4";
 function resetStdinForChild3() {
@@ -9084,7 +9558,7 @@ var GitLabWorkspacesProvider = class {
     );
     resetStdinForChild3();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process13.spawn)(
+      const proc = (0, import_child_process14.spawn)(
         "glab",
         ["auth", "login", "--scopes", "api,read_user,read_repository"],
         { stdio: "inherit" }
@@ -9256,7 +9730,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_process13.spawn)(
+      const proc = (0, import_child_process14.spawn)(
         "ssh",
         ["-tt", "-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, command2],
         { stdio: "inherit" }
@@ -9277,8 +9751,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_process13.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
-      const ssh = (0, import_child_process13.spawn)(
+      const tar = (0, import_child_process14.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
+      const ssh = (0, import_child_process14.spawn)(
         "ssh",
         ["-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -9308,7 +9782,7 @@ Docs: https://docs.gitlab.com/ee/user/workspace/configuration.html`
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process13.spawn)(
+      const proc = (0, import_child_process14.spawn)(
         "ssh",
         ["-o", "StrictHostKeyChecking=accept-new", `${workspaceId}@${sshHost}`, cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -9367,10 +9841,10 @@ function shellQuote3(s) {
 }
 
 // src/services/providers/railway.ts
-var import_child_process14 = require("child_process");
+var import_child_process15 = require("child_process");
 var import_util6 = require("util");
 var path23 = __toESM(require("path"));
-var execFileP6 = (0, import_util6.promisify)(import_child_process14.execFile);
+var execFileP6 = (0, import_util6.promisify)(import_child_process15.execFile);
 var MAX_BUFFER4 = 8 * 1024 * 1024;
 function resetStdinForChild4() {
   if (process.stdin.isTTY) {
@@ -9411,7 +9885,7 @@ var RailwayProvider = class {
     );
     resetStdinForChild4();
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process14.spawn)("railway", ["login"], { stdio: "inherit" });
+      const proc = (0, import_child_process15.spawn)("railway", ["login"], { stdio: "inherit" });
       proc.on("exit", (code) => {
         if (code === 0) resolve2();
         else reject(new Error("railway login failed."));
@@ -9554,7 +10028,7 @@ var RailwayProvider = class {
     }
     resetStdinForChild4();
     return new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process14.spawn)(
+      const proc = (0, import_child_process15.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", command2],
         { stdio: "inherit" }
@@ -9578,8 +10052,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_process14.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
-      const sh = (0, import_child_process14.spawn)(
+      const tar = (0, import_child_process15.spawn)("tar", tarArgs, { stdio: ["ignore", "pipe", "pipe"], env: tarEnv });
+      const sh = (0, import_child_process15.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", remoteCmd],
         { stdio: [tar.stdout, "pipe", "pipe"] }
@@ -9612,7 +10086,7 @@ var RailwayProvider = class {
     }
     const cmd = parts.join(" && ");
     await new Promise((resolve2, reject) => {
-      const proc = (0, import_child_process14.spawn)(
+      const proc = (0, import_child_process15.spawn)(
         "railway",
         ["shell", "--project", projectId, "--service", serviceId, "--command", cmd],
         { stdio: ["pipe", "pipe", "pipe"] }
@@ -10147,7 +10621,7 @@ async function stopWorkspaceFromLocal(target) {
 // src/commands/version.ts
 var import_picocolors11 = __toESM(require("picocolors"));
 function version() {
-  const v = true ? "2.15.5" : "unknown";
+  const v = true ? "2.15.6" : "unknown";
   console.log(`${import_picocolors11.default.bold("codeam-cli")} ${import_picocolors11.default.cyan(v)}`);
 }
 
@@ -10191,7 +10665,7 @@ function help() {
 var fs16 = __toESM(require("fs"));
 var os15 = __toESM(require("os"));
 var path24 = __toESM(require("path"));
-var https6 = __toESM(require("https"));
+var https7 = __toESM(require("https"));
 var import_picocolors13 = __toESM(require("picocolors"));
 var PKG_NAME = "codeam-cli";
 var REGISTRY_URL = `https://registry.npmjs.org/${PKG_NAME}/latest`;
@@ -10234,7 +10708,7 @@ function compareSemver(a, b) {
 }
 function fetchLatest() {
   return new Promise((resolve2) => {
-    const req = https6.get(
+    const req = https7.get(
       REGISTRY_URL,
       { headers: { Accept: "application/json" }, timeout: REQUEST_TIMEOUT_MS },
       (res) => {
@@ -10286,7 +10760,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.15.5" : null;
+  const current = true ? "2.15.6" : 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.15.5",
+  "version": "2.15.6",
   "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",