codeam-cli 2.26.6 → 2.26.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.26.7] — 2026-06-03
+
+### Fixed
+
+- **cli:** Preview no longer pollutes the host terminal + waits for tunnel DNS (#240)
+
+## [2.26.6] — 2026-06-03
+
+### Fixed
+
+- **cli:** Preview shutdown is graceful + parser tolerates prose-wrapped JSON (#239)
+
 ## [2.26.5] — 2026-06-03
 
 ### Fixed

package/dist/index.js

@@ -472,7 +472,7 @@ var import_qrcode_terminal = __toESM(require("qrcode-terminal"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.26.6",
+  version: "2.26.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",
@@ -5829,7 +5829,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.26.6" : "0.0.0-dev",
+    cliVersion: true ? "2.26.8" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -9572,6 +9572,50 @@ function parseHistoryFile(filePath) {
   }
   return out2;
 }
+function listResumableSessions(cwd) {
+  const dir = resolveHistoryDir(cwd);
+  if (!dir) return [];
+  let entries;
+  try {
+    entries = fs9.readdirSync(dir, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  const out2 = [];
+  for (const entry of entries) {
+    if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
+    const id = entry.name.slice(0, -".jsonl".length);
+    const filePath = path12.join(dir, entry.name);
+    let timestamp = Date.now();
+    try {
+      timestamp = fs9.statSync(filePath).mtimeMs;
+    } catch {
+    }
+    let summary = "";
+    try {
+      const raw = fs9.readFileSync(filePath, "utf8");
+      for (const line of raw.split("\n")) {
+        if (!line.trim()) continue;
+        try {
+          const record = JSON.parse(line);
+          if (record["type"] === "user") {
+            const msg = record["message"];
+            const text = extractText(msg?.["content"]).trim();
+            if (text) {
+              summary = text.slice(0, 120);
+              break;
+            }
+          }
+        } catch {
+        }
+      }
+    } catch {
+    }
+    if (summary) out2.push({ id, summary, timestamp });
+  }
+  out2.sort((a, b) => b.timestamp - a.timestamp);
+  return out2;
+}
 
 // src/agents/claude/parsing.ts
 function filterChrome(lines) {
@@ -9933,6 +9977,9 @@ var ClaudeRuntimeStrategy = class {
   getCurrentUsage(historyDir) {
     return getCurrentUsage(historyDir);
   }
+  listResumableSessions(cwd) {
+    return listResumableSessions(cwd);
+  }
   async fetchWeeklyUsage() {
     return fetchClaudeQuota();
   }
@@ -10297,6 +10344,84 @@ function parseHistoryFile2(filePath) {
   }
   return out2;
 }
+function listResumableSessions2(cwd, homeOverride) {
+  const home = homeOverride ?? import_node_os.default.homedir();
+  const sessionsRoot = import_node_path2.default.join(home, ".codex", "sessions");
+  if (!import_node_fs3.default.existsSync(sessionsRoot)) return [];
+  let resolvedCurrent;
+  try {
+    resolvedCurrent = import_node_fs3.default.realpathSync(cwd);
+  } catch {
+    resolvedCurrent = import_node_path2.default.resolve(cwd);
+  }
+  const out2 = [];
+  const now = /* @__PURE__ */ new Date();
+  for (let dayOffset = 0; dayOffset < 7; dayOffset += 1) {
+    const d3 = new Date(now.getTime() - dayOffset * 24 * 60 * 60 * 1e3);
+    const yyyy = String(d3.getUTCFullYear());
+    const mm = String(d3.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(d3.getUTCDate()).padStart(2, "0");
+    const dayDir = import_node_path2.default.join(sessionsRoot, yyyy, mm, dd);
+    if (!import_node_fs3.default.existsSync(dayDir)) continue;
+    let dayFiles;
+    try {
+      dayFiles = import_node_fs3.default.readdirSync(dayDir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of dayFiles) {
+      if (!entry.isFile()) continue;
+      if (!entry.name.startsWith("rollout-") || !entry.name.endsWith(".jsonl")) {
+        continue;
+      }
+      const filePath = import_node_path2.default.join(dayDir, entry.name);
+      let timestamp = Date.now();
+      try {
+        timestamp = import_node_fs3.default.statSync(filePath).mtimeMs;
+      } catch {
+      }
+      let metaCwd;
+      let metaId;
+      let summary = "";
+      try {
+        const raw = import_node_fs3.default.readFileSync(filePath, "utf8");
+        for (const line of raw.split("\n")) {
+          if (!line.trim()) continue;
+          const rec = parseLine(line);
+          if (!rec) continue;
+          if (rec.type === "session_meta") {
+            const meta = rec.payload;
+            metaCwd = typeof meta?.cwd === "string" ? meta.cwd : void 0;
+            metaId = typeof meta?.id === "string" ? meta.id : void 0;
+            continue;
+          }
+          if (!summary && rec.type === "response_item") {
+            const payload = rec.payload;
+            const msg = payload?.Message;
+            if (msg && msg.role === "user") {
+              const text = extractMessageText(msg.content).trim();
+              if (text) summary = text.slice(0, 120);
+            }
+          }
+          if (metaCwd !== void 0 && summary) break;
+        }
+      } catch {
+        continue;
+      }
+      if (!metaCwd || !metaId || !summary) continue;
+      let resolvedMeta;
+      try {
+        resolvedMeta = import_node_fs3.default.realpathSync(metaCwd);
+      } catch {
+        resolvedMeta = import_node_path2.default.resolve(metaCwd);
+      }
+      if (resolvedMeta !== resolvedCurrent) continue;
+      out2.push({ id: metaId, summary, timestamp });
+    }
+  }
+  out2.sort((a, b) => b.timestamp - a.timestamp);
+  return out2;
+}
 function getCurrentUsage2(historyDir) {
   if (!import_node_fs3.default.existsSync(historyDir)) return null;
   const files = import_node_fs3.default.readdirSync(historyDir).filter((f) => f.startsWith("rollout-") && f.endsWith(".jsonl")).map((f) => ({ name: f, full: import_node_path2.default.join(historyDir, f) })).map((e) => ({ ...e, mtime: import_node_fs3.default.statSync(e.full).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
@@ -10830,6 +10955,9 @@ var CodexRuntimeStrategy = class {
   getCurrentUsage(historyDir) {
     return getCurrentUsage2(historyDir);
   }
+  listResumableSessions(cwd) {
+    return listResumableSessions2(cwd);
+  }
   /**
    * Codex's quota lives behind the `account/get_account_rate_limits` RPC,
    * not a TUI slash command. Phase 2 ships with this stubbed to null so the
@@ -12731,52 +12859,32 @@ var HistoryService = class _HistoryService {
     return Math.round(totalCost * 100) / 100;
   }
   /**
-   * Read session list from disk and POST it to the API.
-   * Called once ~2 s after Claude spawns (non-blocking).
+   * Push the active agent's resumable-sessions list to the backend.
+   * Delegates the per-agent JSONL/rollout walk to
+   * `runtime.listResumableSessions(cwd)` so each agent reads its own
+   * on-disk format (Claude's JSONL files vs Codex's date-bucketed
+   * rollouts). Strategies that don't yet expose the helper (Cursor,
+   * Aider) cause this to no-op — the Conversations sheet on mobile
+   * just shows the empty state for those agents until each one's
+   * `listResumableSessions` lands.
+   *
+   * The push body now includes `agentId` so the backend keys by
+   * (pluginId, agentId). Old CLI clients that omit `agentId` continue
+   * to land in the `claude-code` slot via the backend's default.
+   *
+   * Called once ~2 s after the agent spawns (non-blocking).
    */
   async load() {
-    const dir = this.projectDir;
-    let entries;
-    try {
-      entries = fs20.readdirSync(dir, { withFileTypes: true });
-    } catch {
+    if (!this.runtime.listResumableSessions) {
       return;
     }
-    const sessions3 = [];
-    for (const entry of entries) {
-      if (!entry.isFile() || !entry.name.endsWith(".jsonl")) continue;
-      const id = path24.basename(entry.name, ".jsonl");
-      const filePath = path24.join(dir, entry.name);
-      let mtime = Date.now();
-      try {
-        mtime = fs20.statSync(filePath).mtimeMs;
-      } catch {
-      }
-      let summary = "";
-      try {
-        const raw = fs20.readFileSync(filePath, "utf8");
-        for (const line of raw.split("\n")) {
-          if (!line.trim()) continue;
-          try {
-            const record = JSON.parse(line);
-            if (record["type"] === "user") {
-              const msg = record["message"];
-              const text = extractText2(msg?.["content"]).trim();
-              if (text) {
-                summary = text.slice(0, 120);
-                break;
-              }
-            }
-          } catch {
-          }
-        }
-      } catch {
-      }
-      if (summary) sessions3.push({ id, summary, timestamp: mtime });
-    }
+    const sessions3 = this.runtime.listResumableSessions(this.cwd);
     if (sessions3.length === 0) return;
-    sessions3.sort((a, b) => b.timestamp - a.timestamp);
-    await post("/api/sessions/list", { pluginId: this.pluginId, sessions: sessions3 });
+    await post("/api/sessions/list", {
+      pluginId: this.pluginId,
+      agentId: this.runtime.id,
+      sessions: sessions3
+    });
   }
   /**
    * Read a specific session's full conversation and POST it to the API in batches.
@@ -15944,6 +16052,20 @@ var import_path4 = __toESM(require("path"));
 var import_promises2 = require("stream/promises");
 var import_which = __toESM(require("which"));
 var CACHED_BINARY = import_path4.default.join(import_os7.default.homedir(), ".codeam", "bin", "cloudflared");
+async function waitForCloudflaredReady(url, timeoutMs = 3e4) {
+  const start2 = Date.now();
+  while (Date.now() - start2 < timeoutMs) {
+    try {
+      const res = await fetch(url, { method: "HEAD" });
+      if (res.status < 500) return;
+    } catch {
+    }
+    await new Promise((r) => setTimeout(r, 500));
+  }
+  throw new Error(
+    `Tunnel URL ${url} not reachable after ${timeoutMs}ms (DNS may still be propagating).`
+  );
+}
 async function resolveCloudflared(opts = {}) {
   try {
     return await (0, import_which.default)("cloudflared");
@@ -16919,10 +17041,12 @@ var previewStartH = (ctx, _cmd, parsed) => {
       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}`);
       };
       tunnel.stderr.on("data", onTunnelChunk);
       tunnel.stdout.on("data", onTunnelChunk);
-      const tunnelDeadline = Date.now() + 15e3;
+      const tunnelDeadline = Date.now() + 45e3;
       while (!parsedUrl && Date.now() < tunnelDeadline) {
         await new Promise((r) => setTimeout(r, 250));
       }
@@ -16940,7 +17064,27 @@ var previewStartH = (ctx, _cmd, parsed) => {
           pluginId: ctx.pluginId,
           pluginAuthToken,
           type: "preview_error",
-          payload: { stage: "tunnel", message: "cloudflared did not emit a URL within 15s." }
+          payload: { stage: "tunnel", message: "cloudflared did not emit a URL within 45s." }
+        });
+        return;
+      }
+      try {
+        await waitForCloudflaredReady(parsedUrl, 3e4);
+      } catch (e) {
+        try {
+          tunnel.kill("SIGTERM");
+        } catch {
+        }
+        try {
+          devServer.kill("SIGTERM");
+        } catch {
+        }
+        void postPreviewEvent({
+          sessionId: ctx.sessionId,
+          pluginId: ctx.pluginId,
+          pluginAuthToken,
+          type: "preview_error",
+          payload: { stage: "tunnel", message: e.message }
         });
         return;
       }
@@ -16986,8 +17130,16 @@ function runOnce(cmd, args2, cwd, env) {
     const child = (0, import_child_process15.spawn)(cmd, args2, {
       cwd,
       env: { ...process.env, ...env ?? {} },
-      stdio: "inherit"
+      stdio: ["ignore", "pipe", "pipe"]
     });
+    const tag = `setup:${cmd}`;
+    const onChunk = (chunk) => {
+      const text = chunk.toString().replace(/\n+$/g, "");
+      if (text.length === 0) return;
+      log.info("preview", `${tag}: ${text}`);
+    };
+    child.stdout?.on("data", onChunk);
+    child.stderr?.on("data", onChunk);
     child.once("exit", (code) => resolve5(code));
     child.once("error", () => resolve5(-1));
   });
@@ -19992,7 +20144,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.26.6" : "0.0.0-dev";
+  const cliVersion = true ? "2.26.8" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto6.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -20191,7 +20343,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.26.6" : "unknown";
+  const v = true ? "2.26.8" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -20419,7 +20571,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.26.6" : null;
+  const current = true ? "2.26.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.26.6",
+  "version": "2.26.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",