codeam-cli 2.27.6 → 2.27.8

package/CHANGELOG.md

@@ -4,6 +4,18 @@ 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.27.7] — 2026-06-06
+
+### Fixed
+
+- **cli:** ACP — wire-level instrumentation + prompt timeout
+
+## [2.27.6] — 2026-06-06
+
+### Fixed
+
+- **cli:** ACP runner — ack every relay command + body envelope for auth
+
 ## [2.27.5] — 2026-06-06
 
 ### Chore

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.27.6",
+  version: "2.27.8",
   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",
@@ -889,8 +889,8 @@ async function _postJsonAuthed(url, body, pluginAuthToken) {
       (res) => {
         res.on("error", reject);
         let responseBody = "";
-        res.on("data", (chunk2) => {
-          responseBody += chunk2.toString();
+        res.on("data", (chunk) => {
+          responseBody += chunk.toString();
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
@@ -937,8 +937,8 @@ async function _postJson(url, body) {
       (res) => {
         res.on("error", reject);
         let body2 = "";
-        res.on("data", (chunk2) => {
-          body2 += chunk2.toString();
+        res.on("data", (chunk) => {
+          body2 += chunk.toString();
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
@@ -978,8 +978,8 @@ async function _getJson(url) {
       (res) => {
         res.on("error", reject);
         let body = "";
-        res.on("data", (chunk2) => {
-          body += chunk2.toString();
+        res.on("data", (chunk) => {
+          body += chunk.toString();
         });
         res.on("end", () => {
           if (res.statusCode && res.statusCode >= 400) {
@@ -5873,7 +5873,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.27.6" : "0.0.0-dev",
+    cliVersion: true ? "2.27.8" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -6080,9 +6080,9 @@ var CommandRelayService = class {
         this.armSseWatchdog();
         let buffer = "";
         res.setEncoding("utf8");
-        res.on("data", (chunk2) => {
+        res.on("data", (chunk) => {
           this.sseLastByteAt = Date.now();
-          buffer += chunk2;
+          buffer += chunk;
           let frameEnd;
           while ((frameEnd = buffer.indexOf("\n\n")) !== -1) {
             const frame = buffer.slice(0, frameEnd);
@@ -6751,9 +6751,9 @@ var UnixPtyStrategy = class {
       );
       process.exit(1);
     });
-    this.proc.stdout?.on("data", (chunk2) => {
-      process.stdout.write(chunk2);
-      this.opts.onData(chunk2.toString("utf8"));
+    this.proc.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+      this.opts.onData(chunk.toString("utf8"));
     });
     if (process.stdin.isTTY) process.stdin.setRawMode(true);
     process.stdin.resume();
@@ -6845,8 +6845,8 @@ var UnixPtyStrategy = class {
       }
     }
   }
-  stdinHandler = (chunk2) => {
-    this.proc?.stdin?.write(chunk2);
+  stdinHandler = (chunk) => {
+    this.proc?.stdin?.write(chunk);
   };
   handleResize = () => {
     if (this.proc?.pid) {
@@ -7032,8 +7032,8 @@ var WindowsConPtyStrategy = class _WindowsConPtyStrategy {
     }
     this.pty = null;
   }
-  stdinHandler = (chunk2) => {
-    this.pty?.write(chunk2.toString("utf8"));
+  stdinHandler = (chunk) => {
+    this.pty?.write(chunk.toString("utf8"));
   };
 };
 
@@ -7066,9 +7066,9 @@ var WindowsPtyStrategy = class {
       );
       process.exit(1);
     });
-    this.proc.stdout?.on("data", (chunk2) => {
-      process.stdout.write(chunk2);
-      this.opts.onData(chunk2.toString("utf8"));
+    this.proc.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+      this.opts.onData(chunk.toString("utf8"));
     });
     this.proc.stdin?.write("");
     if (process.stdin.isTTY) process.stdin.setRawMode(true);
@@ -7095,8 +7095,8 @@ var WindowsPtyStrategy = class {
       }
     }
   }
-  stdinHandler = (chunk2) => {
-    this.proc?.stdin?.write(chunk2);
+  stdinHandler = (chunk) => {
+    this.proc?.stdin?.write(chunk);
   };
 };
 
@@ -9379,8 +9379,8 @@ async function fetchClaudeQuota() {
     });
     let output = "";
     let resolved = false;
-    proc.stdout?.on("data", (chunk2) => {
-      output += chunk2.toString("utf8");
+    proc.stdout?.on("data", (chunk) => {
+      output += chunk.toString("utf8");
     });
     setTimeout(() => {
       proc.stdin?.write("/usage\r");
@@ -9453,11 +9453,11 @@ async function spawnAndCapture(cmd, args2, opts = {}) {
     }
     activeChildren.add(child);
     let stdout = "";
-    child.stdout?.on("data", (chunk2) => {
-      stdout += chunk2.toString("utf8");
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString("utf8");
     });
-    child.stderr?.on("data", (chunk2) => {
-      opts.onStderr?.(chunk2.toString("utf8"));
+    child.stderr?.on("data", (chunk) => {
+      opts.onStderr?.(chunk.toString("utf8"));
     });
     const timer = setTimeout(() => {
       try {
@@ -12058,6 +12058,7 @@ var fs21 = __toESM(require("fs/promises"));
 var import_node_stream = require("stream");
 var import_sdk = require("@agentclientprotocol/sdk");
 var PROTOCOL_VERSION2 = 1;
+var PROMPT_TIMEOUT_MS = 9e4;
 var CLIENT_CAPABILITIES = {
   fs: { readTextFile: true, writeTextFile: true },
   terminal: false
@@ -12079,6 +12080,10 @@ var AcpClient = class {
   async start() {
     if (this.child) throw new Error("AcpClient already started");
     const { adapter, cwd } = this.opts;
+    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,
@@ -12086,10 +12091,13 @@ var AcpClient = class {
     });
     this.child = child;
     child.stderr?.setEncoding("utf8");
-    child.stderr?.on("data", (chunk2) => {
-      for (const line of chunk2.split(/\r?\n/)) {
+    child.stderr?.on("data", (chunk) => {
+      for (const line of chunk.split(/\r?\n/)) {
         const trimmed = line.trim();
-        if (trimmed) this.opts.onStderr?.(trimmed);
+        if (trimmed) {
+          log.info("acpAdapter", trimmed);
+          this.opts.onStderr?.(trimmed);
+        }
       }
     });
     child.on("exit", (code, signal) => {
@@ -12107,15 +12115,22 @@ var AcpClient = class {
       (_agent) => this.buildClient(),
       stream
     );
+    log.info("acpClient", "initialize \u2192 sending");
     const initialize = await this.connection.initialize({
       protocolVersion: PROTOCOL_VERSION2,
       clientCapabilities: CLIENT_CAPABILITIES
     });
+    log.info(
+      "acpClient",
+      `initialize \u2190 ok protocolVersion=${initialize.protocolVersion} agentCaps=${JSON.stringify(initialize.agentCapabilities ?? {}).slice(0, 200)}`
+    );
+    log.info("acpClient", "newSession \u2192 sending");
     const newSession = await this.connection.newSession({
       cwd,
       mcpServers: []
     });
     this.sessionId = newSession.sessionId;
+    log.info("acpClient", `newSession \u2190 ok sessionId=${newSession.sessionId.slice(0, 8)}`);
     return { sessionId: newSession.sessionId, initialize };
   }
   /**
@@ -12123,15 +12138,49 @@ var AcpClient = class {
    * {@link PromptResponse} which carries the agent's stop reason
    * once the turn finishes. Session/update notifications keep
    * arriving on `onSessionUpdate` while the turn streams.
+   *
+   * Wrapped in a hard timeout because adapters CAN hang silently
+   * when their underlying agent's auth/network is broken — without
+   * a ceiling the relay command sits "pending" forever and mobile
+   * shows a permanent "Thinking…" spinner with no way to recover.
    */
   async prompt(text) {
     if (!this.connection || !this.sessionId) {
       throw new Error("AcpClient.prompt called before start()");
     }
-    return this.connection.prompt({
+    log.info(
+      "acpClient",
+      `prompt \u2192 session=${this.sessionId.slice(0, 8)} chars=${text.length}`
+    );
+    const t0 = Date.now();
+    const send = this.connection.prompt({
       sessionId: this.sessionId,
       prompt: [{ type: "text", text }]
     });
+    const timeout = new Promise((_resolve, reject) => {
+      const id = setTimeout(() => {
+        reject(
+          new Error(
+            `ACP prompt timed out after ${PROMPT_TIMEOUT_MS / 1e3}s \u2014 adapter never responded. Likely the underlying agent's auth or network is misconfigured; check the adapter stderr lines above (acpAdapter tag) for the actual error.`
+          )
+        );
+      }, PROMPT_TIMEOUT_MS);
+      void send.finally(() => clearTimeout(id));
+    });
+    try {
+      const result = await Promise.race([send, timeout]);
+      log.info(
+        "acpClient",
+        `prompt \u2190 ok stopReason=${result.stopReason ?? "?"} elapsedMs=${Date.now() - t0}`
+      );
+      return result;
+    } catch (err) {
+      log.warn(
+        "acpClient",
+        `prompt \u2190 failed elapsedMs=${Date.now() - t0} err=${err instanceof Error ? err.message : String(err)}`
+      );
+      throw err;
+    }
   }
   /**
    * Cancel the in-flight prompt turn. Notification — no response.
@@ -12434,17 +12483,17 @@ function mapSessionUpdate(notification) {
     case "agent_message_chunk": {
       const text = extractText2(update.content);
       if (!text) return [];
-      return [chunk(messageChunkId(update.messageId), "text", text)];
+      return [{ chunkId: messageChunkId(update.messageId), kind: "text", delta: text }];
     }
     case "agent_thought_chunk": {
       const text = extractText2(update.content);
       if (!text) return [];
-      return [chunk(messageChunkId(update.messageId), "thinking", text)];
+      return [{ chunkId: messageChunkId(update.messageId), kind: "thinking", delta: text }];
     }
     case "tool_call": {
       const summary = describeToolCall(update);
       if (!summary) return [];
-      return [chunk(update.toolCallId, "tool_use", summary)];
+      return [{ chunkId: update.toolCallId, kind: "tool_use", delta: summary }];
     }
     case "tool_call_update": {
       if (update.status !== "completed" && update.status !== "failed") {
@@ -12453,7 +12502,7 @@ function mapSessionUpdate(notification) {
       const body = describeToolCallUpdate(update);
       if (!body) return [];
       const prefix = update.status === "failed" ? "[failed] " : "";
-      return [chunk(update.toolCallId, "tool_result", prefix + body)];
+      return [{ chunkId: update.toolCallId, kind: "tool_result", delta: prefix + body }];
     }
     case "user_message_chunk":
       return [];
@@ -12492,9 +12541,6 @@ function mapPermissionRequest(request) {
     kindByLabel
   };
 }
-function chunk(chunkId, kind, content) {
-  return { chunkId, kind, content, isFinal: true };
-}
 function messageChunkId(messageId) {
   if (typeof messageId === "string" && messageId.length > 0) return messageId;
   return (0, import_node_crypto5.randomUUID)();
@@ -12560,6 +12606,50 @@ function humanizeKind(kind) {
 }
 
 // src/agents/acp/runner.ts
+var StreamingState = class {
+  constructor(publisher) {
+    this.publisher = publisher;
+  }
+  publisher;
+  open = /* @__PURE__ */ new Map();
+  append(delta) {
+    const existing = this.open.get(delta.chunkId);
+    const content = (existing?.content ?? "") + delta.delta;
+    if (existing && existing.kind !== delta.kind) {
+      log.warn(
+        "acpRunner",
+        `chunk kind flip detected chunkId=${delta.chunkId.slice(0, 8)} from=${existing.kind} to=${delta.kind} \u2014 using new kind`
+      );
+    }
+    this.open.set(delta.chunkId, { kind: delta.kind, content });
+    void this.publisher.publishChunk({ chunkId: delta.chunkId, kind: delta.kind, content, isFinal: false }).catch((err) => {
+      log.warn(
+        "acpRunner",
+        `publishChunk (streaming) failed: ${err instanceof Error ? err.message : String(err)}`
+      );
+    });
+  }
+  /**
+   * Close every open chunk with `isFinal: true`. Idempotent — safe
+   * to call multiple times per turn (e.g. once on prompt-completed,
+   * once on cancel, once on adapter-exit).
+   */
+  async closeAll() {
+    if (this.open.size === 0) return;
+    const closing = Array.from(this.open.entries());
+    this.open.clear();
+    await Promise.all(
+      closing.map(
+        ([chunkId, { kind, content }]) => this.publisher.publishChunk({ chunkId, kind, content, isFinal: true }).catch((err) => {
+          log.warn(
+            "acpRunner",
+            `publishChunk (closing) failed: ${err instanceof Error ? err.message : String(err)}`
+          );
+        })
+      )
+    );
+  }
+};
 var ANSWER_POLL_MS = 1500;
 var PERMISSION_TIMEOUT_MS = 5 * 60 * 1e3;
 async function runAcpSession(opts) {
@@ -12568,13 +12658,21 @@ async function runAcpSession(opts) {
     pluginId: opts.pluginId,
     pluginAuthToken: opts.pluginAuthToken
   });
+  const streaming = new StreamingState(publisher);
+  let updateCount = 0;
   const client2 = new AcpClient({
     adapter: opts.adapter,
     cwd: opts.cwd,
     onSessionUpdate: (notification) => {
-      const chunks = mapSessionUpdate(notification);
-      for (const chunk2 of chunks) {
-        void publisher.publishChunk(chunk2);
+      updateCount += 1;
+      const variant = notification.update?.sessionUpdate ?? "unknown";
+      const deltas = mapSessionUpdate(notification);
+      log.info(
+        "acpRunner",
+        `update #${updateCount} variant=${variant} mappedDeltas=${deltas.length}`
+      );
+      for (const delta of deltas) {
+        streaming.append(delta);
       }
     },
     onRequestPermission: async (request) => {
@@ -12594,11 +12692,11 @@ async function runAcpSession(opts) {
       }
       return { outcome: { outcome: "selected", optionId } };
     },
-    onStderr: (line) => {
-      log.trace("acpAdapter", line);
+    onStderr: (_line) => {
     },
     onUnexpectedExit: (code, signal) => {
       log.warn("acpRunner", `adapter died code=${code} signal=${signal}; shutting down session`);
+      void streaming.closeAll();
       void publisher.publishChunk({
         chunkId: (0, import_node_crypto6.randomUUID)(),
         kind: "text",
@@ -12620,7 +12718,7 @@ async function runAcpSession(opts) {
   const relay = new CommandRelayService(
     opts.pluginId,
     async (cmd) => {
-      await handleCommand(cmd, client2, relay, acpSessionId, models);
+      await handleCommand(cmd, client2, relay, acpSessionId, models, streaming);
     },
     { id: opts.agent, name: opts.agent, displayName: opts.agent }
   );
@@ -12637,7 +12735,7 @@ async function runAcpSession(opts) {
   await new Promise(() => {
   });
 }
-async function handleCommand(cmd, client2, relay, acpSessionId, models) {
+async function handleCommand(cmd, client2, relay, acpSessionId, models, streaming) {
   switch (cmd.type) {
     case "start_task": {
       const payload = cmd.payload;
@@ -12647,10 +12745,14 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models) {
         await relay.sendResult(cmd.id, "failed", { error: "empty prompt" });
         return;
       }
+      log.info("acpRunner", `start_task \u2192 forwarding prompt chars=${prompt.length} id=${cmd.id.slice(0, 8)}`);
       try {
         const reply = await client2.prompt(prompt);
+        await streaming.closeAll();
+        log.info("acpRunner", `start_task \u2190 done stopReason=${reply.stopReason ?? "?"} id=${cmd.id.slice(0, 8)}`);
         await relay.sendResult(cmd.id, "completed", { stopReason: reply.stopReason });
       } catch (err) {
+        await streaming.closeAll();
         log.warn("acpRunner", `prompt failed: ${describeError(err)}`);
         await relay.sendResult(cmd.id, "failed", { error: describeError(err) });
       }
@@ -12660,6 +12762,7 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models) {
     case "escape_key": {
       try {
         await client2.cancel();
+        await streaming.closeAll();
         await relay.sendResult(cmd.id, "completed", {});
       } catch (err) {
         log.warn("acpRunner", `cancel failed: ${describeError(err)}`);
@@ -15129,13 +15232,13 @@ var TurnFileAggregator = class {
         return;
       }
       const chunks = chunkArray(novel, MAX_BATCH_SIZE);
-      for (const chunk2 of chunks) {
+      for (const chunk of chunks) {
         const entry = {
           turnId: (0, import_crypto2.randomUUID)(),
           sessionId: this.opts.sessionId,
           pluginId: this.opts.pluginId,
           enqueuedAt: Date.now(),
-          files: chunk2
+          files: chunk
         };
         await this.outbox.enqueue(entry);
       }
@@ -15296,11 +15399,11 @@ var StreamingEmitterService = class {
     }
     if (this.activeChunk) {
       const finalContent = this.activeChunk.currentContent;
-      const chunk2 = this.activeChunk;
+      const chunk = this.activeChunk;
       this.activeChunk = null;
       await this.postChunk({
-        chunkId: chunk2.chunkId,
-        kind: chunk2.kind,
+        chunkId: chunk.chunkId,
+        kind: chunk.kind,
         content: finalContent,
         isFinal: true
       });
@@ -15372,17 +15475,17 @@ var StreamingEmitterService = class {
     this.maybeFlushActive(false);
   }
   maybeFlushActive(force) {
-    const chunk2 = this.activeChunk;
-    if (!chunk2) return;
+    const chunk = this.activeChunk;
+    if (!chunk) return;
     const now = Date.now();
-    if (!force && now - chunk2.lastEmitAt < TICK_MS) return;
-    if (chunk2.currentContent === chunk2.emittedContent) return;
-    chunk2.emittedContent = chunk2.currentContent;
-    chunk2.lastEmitAt = 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: chunk2.chunkId,
-      kind: chunk2.kind,
-      content: chunk2.currentContent,
+      chunkId: chunk.chunkId,
+      kind: chunk.kind,
+      content: chunk.currentContent,
       isFinal: false
     });
   }
@@ -17919,8 +18022,8 @@ var previewStartH = (ctx, _cmd, parsed) => {
     let readyMatched = false;
     let expoUrl = null;
     const readyRe = new RegExp(detection.ready_pattern);
-    const onChunk = (chunk2) => {
-      const s = chunk2.toString();
+    const onChunk = (chunk) => {
+      const s = chunk.toString();
       if (!readyMatched && readyRe.test(s)) readyMatched = true;
       if (!expoUrl && detection.framework === "Expo") expoUrl = parseExpoUrl(s);
     };
@@ -18043,8 +18146,8 @@ var previewStartH = (ctx, _cmd, parsed) => {
         stdio: ["ignore", "pipe", "pipe"]
       });
       let parsedUrl = null;
-      const onTunnelChunk = (chunk2) => {
-        const s = chunk2.toString();
+      const onTunnelChunk = (chunk) => {
+        const s = chunk.toString();
         if (!parsedUrl) parsedUrl = parseCloudflaredUrl(s);
         const trimmed = s.replace(/\n+$/g, "");
         if (trimmed.length > 0) log.info("preview", `cloudflared: ${trimmed}`);
@@ -18143,8 +18246,8 @@ function runOnce(cmd, args2, cwd, env) {
       stdio: ["ignore", "pipe", "pipe"]
     });
     const tag = `setup:${cmd}`;
-    const onChunk = (chunk2) => {
-      const text = chunk2.toString().replace(/\n+$/g, "");
+    const onChunk = (chunk) => {
+      const text = chunk.toString().replace(/\n+$/g, "");
       if (text.length === 0) return;
       log.info("preview", `${tag}: ${text}`);
     };
@@ -21171,7 +21274,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.27.6" : "0.0.0-dev";
+  const cliVersion = true ? "2.27.8" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto8.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -21370,7 +21473,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.27.6" : "unknown";
+  const v = true ? "2.27.8" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -21557,8 +21660,8 @@ function fetchLatest() {
         }
         let buf = "";
         res.setEncoding("utf8");
-        res.on("data", (chunk2) => {
-          buf += chunk2;
+        res.on("data", (chunk) => {
+          buf += chunk;
         });
         res.on("end", () => {
           try {
@@ -21598,7 +21701,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.27.6" : null;
+  const current = true ? "2.27.8" : 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.27.6",
+  "version": "2.27.8",
   "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",