codeam-cli 2.26.5 → 2.26.7

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.6] — 2026-06-03
+
+### Fixed
+
+- **cli:** Preview shutdown is graceful + parser tolerates prose-wrapped JSON (#239)
+
+## [2.26.5] — 2026-06-03
+
+### Fixed
+
+- **vsc-plugin:** CopilotLmStrategy matches normalized agentId `copilot` (#238)
+
 ## [2.26.4] — 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.5",
+  version: "2.26.7",
   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.5" : "0.0.0-dev",
+    cliVersion: true ? "2.26.7" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -15944,6 +15944,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");
@@ -16074,20 +16088,64 @@ var REQUIRED_FIELDS2 = [
 ];
 function safeParseDetection(raw) {
   if (!raw) return null;
-  const stripped = raw.replace(/^```(?:json)?\s*/m, "").replace(/\s*```\s*$/m, "").trim();
-  let parsed;
-  try {
-    parsed = JSON.parse(stripped);
-  } catch {
-    return null;
+  let parsed = tryParseObject(raw.trim());
+  if (!parsed) {
+    const stripped = raw.replace(/^```(?:json)?\s*/m, "").replace(/\s*```\s*$/m, "").trim();
+    if (stripped !== raw.trim()) {
+      parsed = tryParseObject(stripped);
+    }
   }
-  if (typeof parsed !== "object" || parsed === null) return null;
+  if (!parsed) {
+    const candidate = extractFirstJsonObject(raw);
+    if (candidate) parsed = tryParseObject(candidate);
+  }
+  if (!parsed) return null;
   const obj = parsed;
   for (const field of REQUIRED_FIELDS2) {
     if (!(field in obj)) return null;
   }
   return obj;
 }
+function tryParseObject(s) {
+  try {
+    const v = JSON.parse(s);
+    return typeof v === "object" && v !== null ? v : null;
+  } catch {
+    return null;
+  }
+}
+function extractFirstJsonObject(s) {
+  const start2 = s.indexOf("{");
+  if (start2 < 0) return null;
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = start2; i < s.length; i += 1) {
+    const c2 = s[i];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (inString) {
+      if (c2 === "\\") {
+        escaped = true;
+      } else if (c2 === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (c2 === '"') {
+      inString = true;
+      continue;
+    }
+    if (c2 === "{") depth += 1;
+    else if (c2 === "}") {
+      depth -= 1;
+      if (depth === 0) return s.slice(start2, i + 1);
+    }
+  }
+  return null;
+}
 var CLOUDFLARED_URL_RE = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/i;
 function parseCloudflaredUrl(stderr) {
   const match = stderr.match(CLOUDFLARED_URL_RE);
@@ -16135,6 +16193,9 @@ async function killAllPreviews() {
   const ids = Array.from(activePreviews.keys());
   await Promise.all(ids.map((id) => killPreview(id)));
 }
+function activePreviewSessionIds() {
+  return Array.from(activePreviews.keys());
+}
 
 // src/commands/start/handlers.ts
 var pendingAttachmentFiles = /* @__PURE__ */ new Set();
@@ -16872,10 +16933,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));
       }
@@ -16893,7 +16956,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;
       }
@@ -16939,8 +17022,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));
   });
@@ -17158,7 +17249,10 @@ async function start(requestedAgent) {
       void outputSvc.sendTerminalExit(sessionId, exitCode);
     }
   });
-  function sigintHandler() {
+  let shuttingDown = false;
+  async function sigintHandler() {
+    if (shuttingDown) return;
+    shuttingDown = true;
     agent.kill();
     outputSvc.dispose();
     relay.stop();
@@ -17167,7 +17261,25 @@ async function start(requestedAgent) {
     closeAllTerminals();
     cleanupAttachmentTempFiles();
     killActiveSpawnAndCaptureChildren();
-    void killAllPreviews();
+    const previewSessionIds = activePreviewSessionIds();
+    try {
+      await killAllPreviews();
+    } catch {
+    }
+    const previewAuthToken = session?.pluginAuthToken;
+    if (previewAuthToken && previewSessionIds.length > 0) {
+      await Promise.allSettled(
+        previewSessionIds.map(
+          (sid) => postPreviewEvent({
+            sessionId: sid,
+            pluginId,
+            pluginAuthToken: previewAuthToken,
+            type: "preview_stopped",
+            payload: { reason: "session_end" }
+          })
+        )
+      );
+    }
     void shutdownTelemetry();
     process.exit(0);
   }
@@ -19924,7 +20036,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.26.5" : "0.0.0-dev";
+  const cliVersion = true ? "2.26.7" : "0.0.0-dev";
   const apiBase = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto6.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -20123,7 +20235,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors13 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.26.5" : "unknown";
+  const v = true ? "2.26.7" : "unknown";
   console.log(`${import_picocolors13.default.bold("codeam-cli")} ${import_picocolors13.default.cyan(v)}`);
 }
 
@@ -20351,7 +20463,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.5" : null;
+  const current = true ? "2.26.7" : 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.5",
+  "version": "2.26.7",
   "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",