codeam-cli 2.60.16 → 2.60.18

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.60.17] — 2026-07-09
+
+### Added
+
+- **cli:** Auto-install Kimi on local pair when the binary is missing
+
+## [2.60.16] — 2026-07-09
+
+### Added
+
+- **cli:** Session Baton support for Kimi Code (local Take Control)
+
 ## [2.60.15] — 2026-07-09
 
 ### Fixed

package/dist/index.js

@@ -5680,7 +5680,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.16" : "0.0.0-dev",
+    cliVersion: true ? "2.60.18" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5861,7 +5861,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.60.16",
+  version: "2.60.18",
   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",
@@ -6932,7 +6932,7 @@ var CommandRelayService = class {
       // 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.60.16" ? { ideVersion: "2.60.16" } : {}
+      ..."2.60.18" ? { ideVersion: "2.60.18" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -7159,10 +7159,10 @@ var WINDOWS_LEGACY_JUNCTIONS = [
   /[\\/]Start Menu([\\/]|$)/i,
   /[\\/]Templates([\\/]|$)/i
 ];
-function isUnsafeWindowsWatchRoot(dir, homedir40) {
+function isUnsafeWindowsWatchRoot(dir, homedir41) {
   const norm = (p2) => p2.replace(/\//g, "\\").replace(/\\+$/, "").toLowerCase();
   const cwd = norm(dir);
-  const home = norm(homedir40);
+  const home = norm(homedir41);
   if (cwd === home) return true;
   if (/^[a-z]:$/.test(cwd)) return true;
   const sysRoots = [
@@ -14347,6 +14347,44 @@ function scanBucketsForSession(sessionId) {
   }
   return null;
 }
+async function discoverSessionId(cwd, opts) {
+  const bucket = path33.join(kimiHome(), "sessions", workDirKey(cwd));
+  const floor = opts.sinceMs - 2e3;
+  const deadline = Date.now() + (opts.timeoutMs ?? 15e3);
+  for (; ; ) {
+    const id = newestSessionSince(bucket, floor);
+    if (id) return id;
+    if (Date.now() >= deadline) return null;
+    await sleep2(250);
+  }
+}
+function newestSessionSince(bucket, floorMs) {
+  let entries;
+  try {
+    entries = fs29.readdirSync(bucket, { withFileTypes: true });
+  } catch {
+    return null;
+  }
+  let bestId = null;
+  let bestMtime = -1;
+  for (const e of entries) {
+    if (!e.isDirectory() || !e.name.startsWith("session_")) continue;
+    let mtime;
+    try {
+      mtime = fs29.statSync(path33.join(bucket, e.name)).mtimeMs;
+    } catch {
+      continue;
+    }
+    if (mtime >= floorMs && mtime > bestMtime) {
+      bestMtime = mtime;
+      bestId = e.name;
+    }
+  }
+  return bestId;
+}
+function sleep2(ms) {
+  return new Promise((resolve7) => setTimeout(resolve7, ms));
+}
 function joinTextParts(parts) {
   if (!Array.isArray(parts)) return "";
   return parts.filter((p2) => p2 && p2.type === "text" && typeof p2.text === "string").map((p2) => p2.text).join("").trim();
@@ -14456,6 +14494,19 @@ var KimiRuntimeStrategy = class {
   parseHistoryFile(filePath) {
     return parseHistoryFile6(filePath);
   }
+  /**
+   * Kimi neither accepts a pre-set session id (`kimi -S <newid>` fails
+   * "Session not found") NOR prints its id on stdout — it MINTS one itself and
+   * writes it to `<KIMI_CODE_HOME>/sessions/wd_<key>/<sessionId>/` when the
+   * native TUI boots. So `prepareLaunch` can't return a `sessionId` and the
+   * baton's NativeTuiDriver has nothing to bind. This hook bounded-polls that
+   * store for the dir kimi just created (mtime ≥ spawn time) and returns its id.
+   * Kimi-specific — no other agent implements this (claude pre-mints; the rest
+   * have no baton), so the driver's optional call is inert for them.
+   */
+  discoverSessionId(cwd, opts) {
+    return discoverSessionId(cwd, opts);
+  }
   getCurrentUsage(historyDir) {
     return getCurrentUsage5(historyDir);
   }
@@ -16465,7 +16516,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 current = true ? "2.60.16" : null;
+  const current = true ? "2.60.18" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16482,7 +16533,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.60.16" : null;
+  const current = true ? "2.60.18" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -16502,7 +16553,7 @@ var SELF_UPDATE_INTERVAL_MS = 60 * 60 * 1e3;
 var SELF_UPDATE_VIEW_TIMEOUT_MS = 3e4;
 var SELF_UPDATE_INSTALL_TIMEOUT_MS = 18e4;
 function currentCliVersion() {
-  return true ? "2.60.16" : null;
+  return true ? "2.60.18" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -22034,7 +22085,7 @@ async function waitForClaudeNativeBinary(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep3 = opts.sleep ?? realSleep;
+  const sleep4 = opts.sleep ?? realSleep;
   const deps = {
     sdkDir: opts.sdkDir,
     platformKey: opts.platformKey,
@@ -22044,7 +22095,7 @@ async function waitForClaudeNativeBinary(opts = {}) {
   let found = resolveClaudeNativeBinary(deps);
   if (found) return found;
   while (now() < deadline) {
-    await sleep3(pollMs);
+    await sleep4(pollMs);
     found = resolveClaudeNativeBinary(deps);
     if (found) return found;
   }
@@ -22066,13 +22117,13 @@ async function waitForCommandOnPath(cmd, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep3 = opts.sleep ?? realSleep;
+  const sleep4 = opts.sleep ?? realSleep;
   const probe = opts.probe;
   const check = () => isCommandOnPath(cmd, probe);
   const deadline = now() + timeoutMs;
   if (check()) return true;
   while (now() < deadline) {
-    await sleep3(pollMs);
+    await sleep4(pollMs);
     if (check()) return true;
   }
   return check();
@@ -22095,12 +22146,12 @@ async function waitForCursorAgent(opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep3 = opts.sleep ?? realSleep;
+  const sleep4 = opts.sleep ?? realSleep;
   const check = () => resolveCursorAgentBinary(opts) !== null || isCommandOnPath("cursor-agent", opts.probe);
   const deadline = now() + timeoutMs;
   if (check()) return true;
   while (now() < deadline) {
-    await sleep3(pollMs);
+    await sleep4(pollMs);
     if (check()) return true;
   }
   return check();
@@ -22149,17 +22200,77 @@ async function waitForAdapterModuleGraph(command2, args2, opts = {}) {
   const timeoutMs = opts.timeoutMs ?? 18e4;
   const pollMs = opts.pollMs ?? 500;
   const now = opts.now ?? Date.now;
-  const sleep3 = opts.sleep ?? realSleep;
+  const sleep4 = opts.sleep ?? realSleep;
   const probeOpts = { livenessMs: opts.livenessMs, spawnFn: opts.spawnFn };
   const deadline = now() + timeoutMs;
   if (await probeAdapterModuleGraph(command2, args2, probeOpts) === "ok") return true;
   while (now() < deadline) {
-    await sleep3(pollMs);
+    await sleep4(pollMs);
     if (await probeAdapterModuleGraph(command2, args2, probeOpts) === "ok") return true;
   }
   return false;
 }
 
+// src/agents/kimi/installer.ts
+var import_node_child_process22 = require("child_process");
+var import_node_os6 = require("os");
+var import_node_path6 = require("path");
+var INSTALL_URL2 = "https://code.kimi.com/kimi-code/install.sh";
+function kimiBinDir() {
+  return (0, import_node_path6.join)(process.env.KIMI_CODE_HOME || (0, import_node_path6.join)((0, import_node_os6.homedir)(), ".kimi-code"), "bin");
+}
+function kimiRuns() {
+  const r = (0, import_node_child_process22.spawnSync)("kimi", ["--version"], { stdio: "ignore", timeout: 15e3 });
+  return !r.error && r.status === 0;
+}
+function augmentPath2() {
+  const dir = kimiBinDir();
+  const parts = (process.env.PATH ?? "").split(":");
+  if (!parts.includes(dir)) process.env.PATH = `${dir}:${process.env.PATH ?? ""}`;
+}
+async function runInstaller2() {
+  return new Promise((resolve7) => {
+    const proc = (0, import_node_child_process22.spawn)("sh", ["-c", `curl -fsSL ${INSTALL_URL2} | bash`], { stdio: "inherit" });
+    proc.on("close", (code) => resolve7(code === 0));
+    proc.on("error", () => resolve7(false));
+  });
+}
+async function ensureKimiInstalled() {
+  augmentPath2();
+  if (kimiRuns()) return true;
+  if (process.platform === "win32") {
+    console.error(
+      `
+  \u2717 Kimi Code CLI on Windows requires WSL.
+    Install it inside WSL (curl -fsSL ${INSTALL_URL2} | bash)
+    then re-run \`codeam pair\`.
+`
+    );
+    return false;
+  }
+  console.log("\n  Kimi Code CLI not found \u2014 installing via the official script\u2026\n");
+  let ok = await runInstaller2();
+  augmentPath2();
+  if (ok && !kimiRuns()) {
+    log.warn("kimi", "installed binary does not run (partial download?) \u2014 re-installing once");
+    ok = await runInstaller2();
+    augmentPath2();
+  }
+  if (!ok) {
+    log.warn("kimi", "installer failed \u2014 Kimi will be reported as not installed");
+    return false;
+  }
+  return kimiRuns();
+}
+
+// src/baton/gate.ts
+function runtimeSupportsBaton(runtime) {
+  return typeof runtime.resolveHistoryFile === "function";
+}
+function isLocalSession(env = process.env) {
+  return env.CODESPACES !== "true" && env.CODEAM_AUTO_APPROVE !== "1" && env.HEADROOM_ENABLED !== "1" && !env.CODEAM_AUTO_TOKEN && !env.CODEAM_ENROLL_TOKEN;
+}
+
 // src/agents/acp/adapters.ts
 var require_ = require;
 function claudeBinaryWaiter(opts = {}) {
@@ -22256,7 +22367,15 @@ var REGISTRY = {
     command: "kimi",
     args: ["acp"],
     requiresAgentBinary: "kimi",
-    waitForBinary: (o) => waitForCommandOnPath("kimi", o)
+    // On a LOCAL `codeam pair` the CLI installs kimi ON DEMAND before spawning
+    // (parity with the codespace bootstrap's KimiProvisioningStrategy) — so a
+    // user who selected Kimi but hasn't installed the CLI doesn't hit a raw
+    // `ENOENT — 'kimi' not found`. On a codespace/self-hosted box the backend
+    // provisions it, so there we just wait for the binary to appear.
+    waitForBinary: async (o) => {
+      if (isLocalSession()) await ensureKimiInstalled();
+      return waitForCommandOnPath("kimi", o);
+    }
   })
 };
 function getAcpAdapter(agent) {
@@ -22848,7 +22967,7 @@ var HistoryService = class _HistoryService {
 };
 
 // src/agents/acp/client.ts
-var import_node_child_process22 = require("child_process");
+var import_node_child_process23 = require("child_process");
 var fs56 = __toESM(require("fs/promises"));
 var fsSync = __toESM(require("fs"));
 var os45 = __toESM(require("os"));
@@ -25452,7 +25571,7 @@ var AcpClient = class {
       "acpClient",
       `spawn cmd=${adapter.command} args=[${adapter.args.join(",")}] cwd=${cwd}`
     );
-    const child = (0, import_node_child_process22.spawn)(adapter.command, adapter.args, {
+    const child = (0, import_node_child_process23.spawn)(adapter.command, adapter.args, {
       cwd,
       // extraEnv (e.g. CLAUDE_CODE_DISABLE_1M_CONTEXT=1 on an on-demand
       // re-spawn) layers over process.env; PATH stays last so the augmented
@@ -25890,12 +26009,12 @@ function buildRelaunchProxyEnv(baseEnv) {
   return env;
 }
 var relaunchProxyWithoutBudget = async () => {
-  const { spawn: spawn39 } = await import("child_process");
+  const { spawn: spawn40 } = await import("child_process");
   killHeadroomProxy();
   await new Promise((r) => setTimeout(r, 500));
   const proxyEnv = buildRelaunchProxyEnv(process.env);
   try {
-    const proxy = spawn39(
+    const proxy = spawn40(
       "headroom",
       ["proxy", "--port", "8787"],
       { stdio: "ignore", detached: true, env: proxyEnv }
@@ -29694,12 +29813,12 @@ var StreamingEmitterService = class {
         log.warn("streamingEmitter", `post error url=${url} attempt=${attempt + 1}`, err);
       }
       if (attempt < MAX_RETRIES2) {
-        await sleep2(RETRY_BACKOFF_MS3 * (attempt + 1));
+        await sleep3(RETRY_BACKOFF_MS3 * (attempt + 1));
       }
     }
   }
 };
-function sleep2(ms) {
+function sleep3(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
 var TREE_CONTINUATION_RE = /^\s*└/;
@@ -29751,14 +29870,6 @@ function fetchQuotaUsage(runtime, historySvc) {
   });
 }
 
-// src/baton/gate.ts
-function runtimeSupportsBaton(runtime) {
-  return typeof runtime.resolveHistoryFile === "function";
-}
-function isLocalSession(env = process.env) {
-  return env.CODESPACES !== "true" && env.CODEAM_AUTO_APPROVE !== "1" && env.HEADROOM_ENABLED !== "1" && !env.CODEAM_AUTO_TOKEN && !env.CODEAM_ENROLL_TOKEN;
-}
-
 // src/baton/baton-controller.ts
 var BatonController = class {
   constructor(deps) {
@@ -29889,10 +30000,15 @@ var NativeTuiDriver = class {
       await this.agent.restart(resumeId, false);
       return resumeId;
     }
+    const spawnedAt = this.now();
     await this.agent.spawn();
-    const id = this.agent.spawnedSessionId;
-    if (!id) throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
-    return id;
+    const preMinted = this.agent.spawnedSessionId;
+    if (preMinted) return preMinted;
+    const discovered = await this.deps.runtime.discoverSessionId?.(this.deps.opts.cwd, {
+      sinceMs: spawnedAt
+    });
+    if (discovered) return discovered;
+    throw new Error("NativeTuiDriver: agent did not expose a session id after spawn");
   }
   async stop() {
     this.agent.kill();
@@ -33297,7 +33413,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.16" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.18" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto11.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -33496,7 +33612,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.16" : "unknown";
+  const v = true ? "2.60.18" : "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.60.16",
+  "version": "2.60.18",
   "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",