codeam-cli 2.75.13 → 2.75.15

package/CHANGELOG.md

@@ -4,6 +4,24 @@ 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.75.14] — 2026-09-24
+
+### Fixed
+
+- **cli:** PTY helper forwards SIGTERM to the agent; kill is awaited before respawn/hand-off
+- **cli:** A new ACP text message after a finished sentence starts a new paragraph
+
+## [2.75.13] — 2026-09-24
+
+### Added
+
+- **cli:** Attribute provider 402s — routing in the debug log, BYO no-credits bubble, pack fail
+
+### Fixed
+
+- **cli:** Host-agent resumes every session live at shutdown, bounded, not just the last one
+- **cli:** Collapse `bd prime` tool result so its docs tail no longer shows under the reply
+
 ## [2.75.12] — 2026-09-24
 
 ### Fixed

package/dist/index.js

@@ -10509,7 +10509,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.75.13" : "0.0.0-dev",
+    cliVersion: true ? "2.75.15" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -10751,7 +10751,7 @@ var http = __toESM(require("http"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.75.13",
+  version: "2.75.15",
   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",
@@ -12081,7 +12081,7 @@ var CommandRelayService = class _CommandRelayService {
       // fresh + clear the "CLI update available" banner after a self-update
       // (a codespace that reinstalls @latest reconnects via heartbeat, not
       // pair/reconnect). Older backends ignore the extra field.
-      ..."2.75.13" ? { ideVersion: "2.75.13" } : {}
+      ..."2.75.15" ? { ideVersion: "2.75.15" } : {}
     };
     try {
       const res = await _postJson(`${API_BASE2}/api/plugin/heartbeat`, body);
@@ -16510,9 +16510,13 @@ def onwinch(n,f):
         sz=os.get_terminal_size(2)
         fcntl.ioctl(m,termios.TIOCSWINSZ,struct.pack('HHHH',sz.lines,sz.columns,0,0))
     except Exception:pass
+def onterm(n,f):
+    done[0]=True
 signal.signal(signal.SIGCHLD,onchld)
 signal.signal(signal.SIGWINCH,onwinch)
 signal.signal(signal.SIGHUP,signal.SIG_IGN)
+signal.signal(signal.SIGTERM,onterm)
+signal.signal(signal.SIGINT,onterm)
 i=sys.stdin.fileno()
 o=sys.stdout.fileno()
 while not done[0]:
@@ -16533,10 +16537,20 @@ while not done[0]:
         except OSError:done[0]=True
 try:os.kill(pid,signal.SIGTERM)
 except Exception:pass
-try:
-    _,st=os.waitpid(pid,0)
-    sys.exit((st>>8)&0xFF)
-except Exception:sys.exit(0)
+import time
+t0=time.time()
+while True:
+    try:w,st=os.waitpid(pid,os.WNOHANG)
+    except ChildProcessError:sys.exit(0)
+    except Exception:sys.exit(0)
+    if w==pid:sys.exit((st>>8)&0xFF)
+    if time.time()-t0>5:
+        try:os.kill(pid,signal.SIGKILL)
+        except Exception:pass
+        try:os.waitpid(pid,0)
+        except Exception:pass
+        sys.exit(137)
+    time.sleep(0.05)
 `;
 var UnixPtyStrategy = class {
   constructor(opts) {
@@ -16653,11 +16667,42 @@ var UnixPtyStrategy = class {
     this.proc?.stdin?.write(data);
   }
   kill() {
+    void this.killAndWait();
+  }
+  /**
+   * SIGTERM the helper and resolve once it has EXITED (bounded; SIGKILL
+   * fallback). The helper forwards the signal to the agent and waits for it,
+   * so when this resolves the agent process is gone too.
+   *
+   * ⚠️ Why awaited (2026-09-24): the helper used to die under SIGTERM with no
+   * handler, leaving the agent orphaned; on a baton hand-off and in the
+   * baton integration suite the orphaned Claude exited a beat later and
+   * rewrote `~/.claude.json` from memory, clobbering the just-written
+   * workspace-trust entry for the NEXT session — which then wedged on the
+   * trust dialog (CI run 35946818546). Callers that start a new agent or a
+   * new session must `await` this.
+   */
+  async killAndWait(timeoutMs = 6e3) {
     const proc = this.proc;
     this.proc = null;
     if (proc) {
       proc.removeAllListeners("exit");
-      proc.kill();
+      const exited = new Promise((resolve12) => {
+        if (proc.exitCode !== null || proc.signalCode !== null) return resolve12();
+        proc.once("exit", () => resolve12());
+      });
+      proc.kill("SIGTERM");
+      const timer = new Promise((resolve12) => {
+        const t2 = setTimeout(() => resolve12("timeout"), timeoutMs);
+        void exited.then(() => clearTimeout(t2));
+      });
+      if (await Promise.race([exited, timer]) === "timeout") {
+        try {
+          proc.kill("SIGKILL");
+        } catch {
+        }
+        await Promise.race([exited, new Promise((r) => setTimeout(r, 1e3))]);
+      }
     }
     this.removeTempFile();
     this.dispose();
@@ -16847,6 +16892,9 @@ var WindowsConPtyStrategy = class _WindowsConPtyStrategy {
     if (!this.pty) return;
     this.pty.write(typeof data === "string" ? data : data.toString("utf8"));
   }
+  async killAndWait() {
+    this.kill();
+  }
   kill() {
     try {
       this.pty?.kill();
@@ -16927,6 +16975,9 @@ var WindowsPtyStrategy = class {
     this.proc?.kill();
     this.dispose();
   }
+  async killAndWait() {
+    this.kill();
+  }
   dispose() {
     process.stdin.removeListener("data", this.stdinHandler);
     if (process.stdin.isTTY) {
@@ -26515,7 +26566,7 @@ var resumeSession = async (ctx, _cmd, parsed) => {
   ctx.historySvc.setCurrentConversationId(id);
   await ctx.historySvc.loadConversation(id);
   await ctx.outputSvc.newTurnResume(id);
-  ctx.agent.restart(id, auto ?? false);
+  void ctx.agent.restart(id, auto ?? false);
 };
 var getContext = async (ctx, cmd) => {
   const usage = ctx.historySvc.getCurrentUsage();
@@ -28748,6 +28799,10 @@ var AgentService = class _AgentService {
   kill() {
     this.strategy?.kill();
   }
+  /** Kill and resolve once the agent process is gone (see `IPtyStrategy.killAndWait`). */
+  async killAndWait() {
+    await this.strategy?.killAndWait();
+  }
   /**
    * Kill the current Claude process and relaunch it resuming the given session.
    * Pass auto=true to add --dangerously-skip-permissions (no confirmation prompts).
@@ -28757,7 +28812,7 @@ var AgentService = class _AgentService {
    * For agents that use a post-spawn PTY instruction (e.g. Codex), `resumeLaunchArgs`
    * returns [] and `postSpawnInstruction` types the resume command into the PTY.
    */
-  restart(sessionId, auto = false) {
+  async restart(sessionId, auto = false) {
     if (!this.strategy || !this.initialLaunch) return;
     const resumeArgs = this.runtime.resumeLaunchArgs(sessionId, { auto });
     const launch = this.runtime.prepareResumeLaunch?.(sessionId, { auto }) ?? {
@@ -28769,7 +28824,7 @@ var AgentService = class _AgentService {
       clearTimeout(this.quietTimer);
       this.quietTimer = null;
     }
-    this.strategy.kill();
+    await this.strategy.killAndWait();
     this.strategy.spawn(launch.cmd, this.opts.cwd, launch.args);
     if (resumeArgs.length === 0 && this.runtime.postSpawnInstruction) {
       const { ptyInput } = this.runtime.postSpawnInstruction(sessionId);
@@ -37610,7 +37665,7 @@ function replyIsHouseAgentLimit(finalText) {
   const t2 = finalText.trim();
   return t2.length > 0 && t2.length <= 400 && looksLikeHouseAgentLimit(t2);
 }
-var BYO_PROVIDER_BILLING_RE = /(?:api error|http|status)[:\s]+402\b[^\n]{0,80}insufficient (?:credits?|balance)|\b402\b[^\n]{0,40}insufficient (?:credits?|balance)|insufficient (?:credits?|balance)[^\n]{0,40}\b402\b/i;
+var BYO_PROVIDER_BILLING_RE = /(?:api error|http|status)[:\s]+402\b[^\n]{0,80}(?:insufficient (?:credits?|balance)|requires more credits)|\b402\b[^\n]{0,40}(?:insufficient (?:credits?|balance)|requires more credits)|insufficient (?:credits?|balance)[^\n]{0,40}\b402\b/i;
 function looksLikeByoProviderBilling(text, env = process.env) {
   return !isHouseProxyEnv(env) && BYO_PROVIDER_BILLING_RE.test(text);
 }
@@ -40507,6 +40562,16 @@ var StreamingState = class {
    * no matter how many message ids the adapter spreads it across.
    */
   turnTextChunkId = null;
+  /**
+   * Adapter message id of the LAST text delta appended this turn. A text delta
+   * under a NEW message id that appends (not a snapshot re-emit) is a new
+   * paragraph — Codex emits several `agent_message_chunk` messages per turn
+   * around tool calls ('…run every gate.' → tools → 'I'm resuming at…') and,
+   * collapsed onto `turnTextChunkId`, they glued into 'gate.I'm resuming'
+   * (replay 2026-09-23, bead codeagent-wqpi). Both feeds carry the joined
+   * string, so the boundary can only be restored here.
+   */
+  lastTextMessageId = null;
   /**
    * Stable chunkId that ALL `thinking` segments of the current turn collapse
    * onto (set to the first thought chunk's id, reset each {@link beginTurn}) —
@@ -40675,6 +40740,7 @@ var StreamingState = class {
     this.text = "";
     this.streamingChunks.clear();
     this.turnTextChunkId = null;
+    this.lastTextMessageId = null;
     this.turnThoughtChunkId = null;
     this.turnSeq += 1;
     if (this.pending?.kind === "permission") {
@@ -40707,7 +40773,18 @@ var StreamingState = class {
         `streaming-chunk kind flip chunkId=${chunkId.slice(0, 8)} from=${existing.kind} to=${delta.kind}`
       );
     }
-    const cumulativeContent = reconcileCumulative(existing?.content ?? "", delta.delta);
+    const prior = existing?.content ?? "";
+    let cumulativeContent = reconcileCumulative(prior, delta.delta);
+    if (delta.kind === "text") {
+      const newMessage = this.lastTextMessageId !== null && this.lastTextMessageId !== delta.chunkId;
+      const appended = cumulativeContent === prior + delta.delta;
+      if (newMessage && appended && /\S$/.test(prior) && !/^\s/.test(delta.delta)) {
+        cumulativeContent = `${prior}
+
+${delta.delta}`;
+      }
+      this.lastTextMessageId = delta.chunkId;
+    }
     this.streamingChunks.set(chunkId, { kind: delta.kind, content: cumulativeContent });
     let fenceCut = -1;
     let textVisible = null;
@@ -43181,7 +43258,7 @@ var NativeTuiDriver = class _NativeTuiDriver {
   async stop() {
     this.unwatchSwitch?.();
     this.unwatchSwitch = null;
-    this.agent.kill();
+    await this.agent.killAndWait();
     parkTerminalForReadonly();
   }
   async dispatch(cmd) {
@@ -43733,7 +43810,7 @@ async function runBatonSession(opts) {
     process.removeListener("SIGTERM", onSignal);
     process.removeListener("SIGHUP", onSignal);
     mirror?.stop();
-    void controller.shutdown();
+    await controller.shutdown();
     await stopRelayWithGoodbye(relay);
   }
   const onSignal = () => {
@@ -44265,9 +44342,18 @@ var import_picocolors4 = __toESM(require("picocolors"));
 
 // src/lib/agent-prompt.ts
 function parseAgentFlag(args2) {
-  const flag = args2.find((a) => a.startsWith("--agent="));
-  if (!flag) return null;
-  const value = flag.slice("--agent=".length);
+  let value;
+  const eq = args2.find((a) => a.startsWith("--agent="));
+  if (eq) {
+    value = eq.slice("--agent=".length);
+  } else {
+    const i = args2.indexOf("--agent");
+    if (i === -1) return null;
+    value = args2[i + 1];
+    if (!value || value.startsWith("-")) {
+      throw new Error(`--agent needs a value; valid: ${Object.keys(AGENT_REGISTRY).join(", ")}`);
+    }
+  }
   if (!isKnownAgentId(value)) {
     throw new Error(
       `invalid agent "${value}"; valid: ${Object.keys(AGENT_REGISTRY).join(", ")}`
@@ -47512,7 +47598,7 @@ async function autoUpgradeBeforeCriticalCommand() {
   if (process.env.NODE_ENV === "test") return;
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
-  const current2 = true ? "2.75.13" : null;
+  const current2 = true ? "2.75.15" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -47529,7 +47615,7 @@ function checkForUpdates() {
   if (process.env.CODEAM_DISABLE_UPDATE_CHECK === "1") return;
   if (process.env.CI) return;
   if (!process.stdout.isTTY) return;
-  const current2 = true ? "2.75.13" : null;
+  const current2 = true ? "2.75.15" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -47552,7 +47638,7 @@ var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 var SELF_UPDATE_LS_TIMEOUT_MS = 15e3;
 var SUDO_PREFLIGHT_TIMEOUT_MS = 5e3;
 function currentCliVersion() {
-  return true ? "2.75.13" : null;
+  return true ? "2.75.15" : null;
 }
 async function installedVersion(deps) {
   const ls = await deps.run(
@@ -49413,7 +49499,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.75.13" : "0.0.0-dev";
+  const cliVersion = true ? "2.75.15" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -49937,7 +50023,7 @@ async function mcpWarm(argv = [], opts = {}) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.75.13" : "unknown";
+  const v = true ? "2.75.15" : "unknown";
   console.log(`${import_picocolors15.default.bold("codeam-cli")} ${import_picocolors15.default.cyan(v)}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.75.13",
+  "version": "2.75.15",
   "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",