codeam-cli 2.74.6 → 2.74.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.74.7] — 2026-09-06
+
+### Fixed
+
+- **cli:** Daemon lock no longer defers to a reused pid — warm-codespace resume left the session dead (#715)
+
+## [2.74.6] — 2026-09-05
+
+### Fixed
+
+- **cli:** Expo preview reads the tunnel URL a non-TTY Expo actually emits (exp.direct) (#713)
+
 ## [2.74.5] — 2026-09-04
 
 ### Chore

package/dist/index.js

@@ -8136,7 +8136,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.74.6" : "0.0.0-dev",
+    cliVersion: true ? "2.74.8" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -8378,7 +8378,7 @@ var http = __toESM(require("http"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.74.6",
+  version: "2.74.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",
@@ -9971,7 +9971,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.74.6" ? { ideVersion: "2.74.6" } : {}
+      ..."2.74.8" ? { ideVersion: "2.74.8" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -18410,14 +18410,14 @@ function defaultSdkDir() {
   return resolveSdkDirViaRequire();
 }
 function resolveClaudeNativeBinary(deps = {}) {
-  const existsSync30 = deps.existsSync ?? import_fs.default.existsSync;
+  const existsSync29 = deps.existsSync ?? import_fs.default.existsSync;
   const platformKey = deps.platformKey ?? currentPlatformKey();
   const sdkDir = deps.sdkDir !== void 0 ? deps.sdkDir : defaultSdkDir();
   if (!sdkDir) return null;
   const scopeDir = import_path4.default.dirname(sdkDir);
   const binName = platformKey.startsWith("win32-") ? "claude.exe" : "claude";
   const candidate = import_path4.default.join(scopeDir, `claude-agent-sdk-${platformKey}`, binName);
-  return existsSync30(candidate) ? candidate : null;
+  return existsSync29(candidate) ? candidate : null;
 }
 var realSleep = (ms) => new Promise((resolve11) => setTimeout(resolve11, ms));
 async function waitForClaudeNativeBinary(opts = {}) {
@@ -18499,18 +18499,18 @@ function augmentUserLocalBinPaths(deps = {}) {
   env.PATH = [...additions, ...parts].join(p2.delimiter);
 }
 function resolveCursorAgentBinary(deps = {}) {
-  const existsSync30 = deps.existsSync ?? import_fs.default.existsSync;
+  const existsSync29 = deps.existsSync ?? import_fs.default.existsSync;
   const platform3 = deps.platform ?? process.platform;
   const env = deps.env ?? process.env;
   if (platform3 === "win32") {
     const localAppData = env.LOCALAPPDATA;
     if (!localAppData) return null;
     const exe = import_path4.default.win32.join(localAppData, "cursor-agent", "cursor-agent.exe");
-    return existsSync30(exe) ? exe : null;
+    return existsSync29(exe) ? exe : null;
   }
   const home = deps.homedir ?? import_os4.default.homedir();
   const unix = import_path4.default.posix.join(home, ".local", "bin", "cursor-agent");
-  return existsSync30(unix) ? unix : null;
+  return existsSync29(unix) ? unix : null;
 }
 async function waitForCursorAgent(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
@@ -22272,7 +22272,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.74.6" : null;
+  const current2 = true ? "2.74.8" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -22289,7 +22289,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.74.6" : null;
+  const current2 = true ? "2.74.8" : null;
   if (!current2) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -22312,7 +22312,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.74.6" : null;
+  return true ? "2.74.8" : null;
 }
 async function installedVersion(deps) {
   const ls = await deps.run(
@@ -23279,7 +23279,9 @@ var HostAgentSupervisor = class {
       );
       return;
     }
-    if (!await this.fleetBoxImageStale(containerName)) {
+    const stale = await this.fleetBoxImageStale(containerName);
+    if (stale === null) return;
+    if (!stale) {
       log.info("host-agent", `fleet_migrate_box_image: ${containerName} already current`);
       return;
     }
@@ -23362,7 +23364,7 @@ var HostAgentSupervisor = class {
    * current registry `:latest` (a stale runtime), or the container is gone.
    * Pulls `:latest` first so the comparison is against the freshest image.
    * Best-effort + fail-SAFE: a local-image override (int test / operator) or any
-   * pull/inspect error returns false → the caller falls back to a plain
+   * pull/inspect error returns false (null for a failed pull, logged) → the caller falls back to a plain
    * `docker start`, so a transient docker hiccup can never wedge a wake.
    */
   async fleetBoxImageStale(containerName) {
@@ -23372,8 +23374,16 @@ var HostAgentSupervisor = class {
     if (cur.code !== 0) {
       return isMissingContainerError(cur.stderr);
     }
-    const pull = await this.docker.run(["pull", image], { timeoutMs: DOCKER_RUN_TIMEOUT_MS });
-    if (pull.code !== 0) return false;
+    const pull = await this.docker.run(["pull", image], {
+      timeoutMs: DOCKER_RUN_WITH_PULL_TIMEOUT_MS
+    });
+    if (pull.code !== 0) {
+      log.warn(
+        "host-agent",
+        `fleet image pull failed (code=${pull.code}) \u2014 cannot tell whether ${containerName} is stale, leaving it: ` + pull.stderr.trim().slice(-300)
+      );
+      return null;
+    }
     const latest = await this.docker.run(["inspect", "--format", "{{.Id}}", image]);
     if (latest.code !== 0) return false;
     return cur.stdout.trim() !== "" && cur.stdout.trim() !== latest.stdout.trim();
@@ -23738,11 +23748,16 @@ var HostAgentSupervisor = class {
       };
       proc.stdout?.on("data", appendTail);
       proc.stderr?.on("data", appendTail);
-      proc.once("exit", (code) => {
+      proc.once("exit", (code, signal) => {
         if (this.children.get(deployId)?.proc === proc) this.children.delete(deployId);
         if (typeof code === "number" && code !== 0) {
           this.onResumeChildExit(session, code, tail.trim().slice(-300));
+          return;
         }
+        log.warn(
+          "host-agent",
+          `resumed session ${session.id.slice(0, 8)} exited ${signal ?? code ?? 0} without taking over \u2014 tail: ${tail.trim().slice(-300) || "(no output)"}`
+        );
       });
       log.info(
         "host-agent",
@@ -30153,6 +30168,52 @@ async function claim(token, pluginId, pluginSecretHash) {
 function pairAutoLockPath() {
   return path72.join(os55.homedir(), ".codeam", "pair-auto.lock");
 }
+var procRoot = "/proc";
+function readProcFile(rel) {
+  try {
+    return fs66.readFileSync(path72.join(procRoot, rel), "utf8");
+  } catch {
+    return void 0;
+  }
+}
+function procStartTicks(pid) {
+  const stat3 = readProcFile(`${pid}/stat`);
+  if (!stat3) return void 0;
+  const afterComm = stat3.slice(stat3.lastIndexOf(")") + 2).trim().split(/\s+/);
+  return afterComm[19];
+}
+function procTgid(pid) {
+  const m = readProcFile(`${pid}/status`)?.match(/^Tgid:\s+(\d+)/m);
+  return m ? Number(m[1]) : void 0;
+}
+function currentBootId() {
+  return readProcFile("sys/kernel/random/boot_id")?.trim() || void 0;
+}
+function readLockRecord(lockPath) {
+  let raw;
+  try {
+    raw = fs66.readFileSync(lockPath, "utf8");
+  } catch {
+    return void 0;
+  }
+  const [first = "", second = ""] = raw.split("\n");
+  const pid = Number(first.trim());
+  if (!Number.isInteger(pid) || pid <= 0) return void 0;
+  const rec = { pid };
+  const start2 = /(?:^|\s)start=(\S+)/.exec(second)?.[1];
+  const boot = /(?:^|\s)boot=(\S+)/.exec(second)?.[1];
+  if (start2) rec.start = start2;
+  if (boot) rec.boot = boot;
+  return rec;
+}
+function ownLockBody() {
+  const start2 = procStartTicks(process.pid);
+  const boot = currentBootId();
+  const tags = [start2 ? `start=${start2}` : "", boot ? `boot=${boot}` : ""].filter(Boolean);
+  return tags.length ? `${process.pid}
+${tags.join(" ")}
+` : String(process.pid);
+}
 function isLivePairAuto(pid) {
   if (!Number.isInteger(pid) || pid <= 0 || pid === process.pid) return false;
   try {
@@ -30160,15 +30221,30 @@ function isLivePairAuto(pid) {
   } catch (e) {
     if (e.code !== "EPERM") return false;
   }
+  const cmdline = readProcFile(`${pid}/cmdline`);
+  if (cmdline === void 0) return true;
+  const tgid = procTgid(pid);
+  if (tgid !== void 0 && tgid !== pid) return false;
+  return cmdline.includes("codeam");
+}
+function isLiveLockHolder(rec) {
+  if (!rec || rec.pid === process.pid) return false;
+  if (rec.boot) {
+    const boot = currentBootId();
+    if (boot && boot !== rec.boot) return false;
+  }
+  if (rec.start) {
+    const start2 = procStartTicks(rec.pid);
+    if (start2 !== void 0 && start2 !== rec.start) return false;
+  }
+  return isLivePairAuto(rec.pid);
+}
+function releaseOwnLock(lockPath) {
   try {
-    return fs66.readFileSync(`/proc/${pid}/cmdline`, "utf8").includes("codeam");
+    if (readLockRecord(lockPath)?.pid === process.pid) fs66.unlinkSync(lockPath);
   } catch {
-    return true;
   }
 }
-function isLiveCodeam(pid) {
-  return isLivePairAuto(pid);
-}
 function daemonLockPath(sessionId) {
   const safe = sessionId.replace(/[^a-zA-Z0-9_-]/g, "_");
   return path72.join(os55.homedir(), ".codeam", `daemon-${safe}.lock`);
@@ -30178,21 +30254,13 @@ function acquireDaemonLock(sessionId) {
   try {
     fs66.mkdirSync(path72.dirname(lockPath), { recursive: true });
     try {
-      fs66.writeFileSync(lockPath, String(process.pid), { flag: "wx" });
+      fs66.writeFileSync(lockPath, ownLockBody(), { flag: "wx" });
     } catch (e) {
       if (e.code !== "EEXIST") throw e;
-      const holder = Number(fs66.readFileSync(lockPath, "utf8").trim());
-      if (holder && holder !== process.pid && isLiveCodeam(holder)) return false;
-      fs66.writeFileSync(lockPath, String(process.pid));
+      if (isLiveLockHolder(readLockRecord(lockPath))) return false;
+      fs66.writeFileSync(lockPath, ownLockBody());
     }
-    const release3 = () => {
-      try {
-        if (fs66.existsSync(lockPath) && Number(fs66.readFileSync(lockPath, "utf8").trim()) === process.pid) {
-          fs66.unlinkSync(lockPath);
-        }
-      } catch {
-      }
-    };
+    const release3 = () => releaseOwnLock(lockPath);
     process.once("exit", release3);
     process.once("SIGTERM", () => {
       release3();
@@ -30212,21 +30280,13 @@ function acquireSingletonLock() {
   try {
     fs66.mkdirSync(path72.dirname(lockPath), { recursive: true });
     try {
-      fs66.writeFileSync(lockPath, String(process.pid), { flag: "wx" });
+      fs66.writeFileSync(lockPath, ownLockBody(), { flag: "wx" });
     } catch (e) {
       if (e.code !== "EEXIST") throw e;
-      const holder = Number(fs66.readFileSync(lockPath, "utf8").trim());
-      if (isLivePairAuto(holder)) return false;
-      fs66.writeFileSync(lockPath, String(process.pid));
+      if (isLiveLockHolder(readLockRecord(lockPath))) return false;
+      fs66.writeFileSync(lockPath, ownLockBody());
     }
-    process.once("exit", () => {
-      try {
-        if (fs66.existsSync(lockPath) && Number(fs66.readFileSync(lockPath, "utf8").trim()) === process.pid) {
-          fs66.unlinkSync(lockPath);
-        }
-      } catch {
-      }
-    });
+    process.once("exit", () => releaseOwnLock(lockPath));
     return true;
   } catch {
     return true;
@@ -47540,7 +47600,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.74.6" : "0.0.0-dev";
+  const cliVersion = true ? "2.74.8" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto13.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -48064,7 +48124,7 @@ async function mcpWarm(argv = [], opts = {}) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.74.6" : "unknown";
+  const v = true ? "2.74.8" : "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.74.6",
+  "version": "2.74.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",