codeam-cli 2.60.50 → 2.60.52

package/CHANGELOG.md

@@ -4,6 +4,22 @@ 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.51] — 2026-07-12
+
+### Fixed
+
+- **cli:** Recover kimi ACP 'Session is closed' by re-establishing the session + retry (multi-turn)
+
+### Tests
+
+- **cli:** Reusable ACP-provision smoke harness (per-agent real handshake auth check; automates CLAUDE.md Step 8)
+
+## [2.60.50] — 2026-07-11
+
+### Fixed
+
+- **cli:** Guard kimi ACP login-state slot + real `kimi acp` regression test
+
 ## [2.60.49] — 2026-07-11
 
 ### Fixed

package/dist/index.js

@@ -478,13 +478,27 @@ function headroomKindFor(agentId) {
 // ../../packages/shared/src/integrations/registry.ts
 var INTEGRATION_REGISTRY = {
   jira: {
+    // Registry id kept 'jira' for id-stability (existing LinkedIntegration rows
+    // stay valid — zero data migration); only the DISPLAY is "Atlassian". The
+    // one mcp-atlassian server serves BOTH Jira and Confluence, so the same
+    // entry now requests Confluence scopes too.
     id: "jira",
-    name: "Jira",
+    name: "Atlassian",
     icon: "jira",
     enabled: true,
     auth: {
       kind: "oauth_redirect",
-      scopes: ["read:jira-work", "write:jira-work", "offline_access"]
+      // Jira + Confluence 3LO granular scopes. The Confluence pair
+      // (read:confluence-content.all / write:confluence-content) is the set
+      // mcp-atlassian's own Authentication docs recommend for full read+write
+      // Confluence (matches its documented env scope string).
+      scopes: [
+        "read:jira-work",
+        "write:jira-work",
+        "read:confluence-content.all",
+        "write:confluence-content",
+        "offline_access"
+      ]
     },
     delivery: {
       mcp: {
@@ -5733,7 +5747,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.60.50" : "0.0.0-dev",
+    cliVersion: true ? "2.60.52" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5914,7 +5928,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.60.50",
+  version: "2.60.52",
   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",
@@ -7023,7 +7037,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.50" ? { ideVersion: "2.60.50" } : {}
+      ..."2.60.52" ? { ideVersion: "2.60.52" } : {}
     }).then(() => log.trace("relay", `heartbeat ok online=${online}`)).catch((err) => log.trace("relay", `heartbeat failed online=${online}`, err));
   }
   /**
@@ -17592,7 +17606,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.50" : null;
+  const current = true ? "2.60.52" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17609,7 +17623,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.50" : null;
+  const current = true ? "2.60.52" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17629,7 +17643,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.50" : null;
+  return true ? "2.60.52" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -26736,6 +26750,7 @@ function createIdleTimeout(idleMs, makeError) {
 var TRANSIENT_ADAPTER_SPAWN_RE = /ETXTBSY|ENOENT/;
 var MAX_START_ATTEMPTS = 5;
 var TRANSPORT_DOWN_DURING_START_RE = /connection (is )?closed|stream (is )?closed|ECONNRESET|EPIPE|write after end|premature close/i;
+var SESSION_CLOSED_RE = /session is closed/i;
 var AdapterStartCrashError = class extends Error {
   adapterExitedDuringStart = true;
   constructor(message) {
@@ -26763,6 +26778,12 @@ var AcpClient = class {
   connection = null;
   stopping = false;
   sessionId = null;
+  /** Whether the agent advertised `loadSession` on `initialize`. Drives the
+   *  post-turn session-closed recovery: an agent that supports resume (kimi,
+   *  claude, codex, gemini) is re-established with `session/load` — preserving
+   *  the conversation — whereas one without it falls back to a fresh
+   *  `session/new`. Set once during {@link startOnce}. */
+  supportsLoadSession = false;
   /** Idle watchdog for the in-flight prompt. The `Client` handlers
    *  (`sessionUpdate` / `requestPermission`) reach for this to keep
    *  the turn alive while the adapter is demonstrably working. Null
@@ -26946,6 +26967,7 @@ var AcpClient = class {
         "acpClient",
         `initialize \u2190 ok protocolVersion=${initialize.protocolVersion} agentCaps=${JSON.stringify(initialize.agentCapabilities ?? {}).slice(0, 200)}`
       );
+      this.supportsLoadSession = initialize.agentCapabilities?.loadSession === true;
       log.info("acpClient", "newSession \u2192 sending");
       let startupTimer;
       const startupFailure = new Promise((_2, reject) => {
@@ -27033,6 +27055,29 @@ var AcpClient = class {
       throw new Error("AcpClient.prompt called before start()");
     }
     const blocks = typeof input === "string" ? [{ type: "text", text: input }] : input;
+    try {
+      return await this.sendPromptOnce(blocks);
+    } catch (err) {
+      if (this.isSessionClosedError(err)) {
+        log.warn(
+          "acpClient",
+          "session/prompt rejected 'Session is closed' \u2014 re-establishing session and retrying once"
+        );
+        await this.reestablishSession();
+        return await this.sendPromptOnce(blocks);
+      }
+      throw err;
+    }
+  }
+  /**
+   * Send ONE `session/prompt` round-trip with the idle watchdog. Extracted from
+   * {@link runPrompt} so the closed-session recovery can re-invoke it for the
+   * single retry without duplicating the watchdog / tool-ledger setup.
+   */
+  async sendPromptOnce(blocks) {
+    if (!this.connection || !this.sessionId) {
+      throw new Error("AcpClient.sendPromptOnce called before start()");
+    }
     const textLen = blocks.reduce(
       (n, b) => b.type === "text" ? n + b.text.length : n,
       0
@@ -27078,6 +27123,71 @@ var AcpClient = class {
       this.promptIdle = null;
     }
   }
+  /**
+   * True when a `session/prompt` rejection is the "the agent closed its ACP
+   * session between turns" fact — the kimi post-turn/idle close. Keyed on the
+   * `session is closed` phrase (in `message` / `details` / serialised `data`),
+   * NOT on the bare `-32603` code: that generic "Internal error" code is also
+   * used for the adapter's own transient spawn races, so matching it alone would
+   * misfire. See {@link SESSION_CLOSED_RE}.
+   */
+  isSessionClosedError(err) {
+    if (!err || typeof err !== "object") return false;
+    const e = err;
+    const parts = [];
+    if (typeof e.message === "string") parts.push(e.message);
+    if (typeof e.details === "string") parts.push(e.details);
+    if (e.data !== void 0) {
+      try {
+        parts.push(JSON.stringify(e.data));
+      } catch {
+      }
+    }
+    return SESSION_CLOSED_RE.test(parts.join(" "));
+  }
+  /**
+   * Re-establish a session the agent closed out from under us (kimi post-turn),
+   * on the SAME still-running adapter process, so the pending prompt can be
+   * retried. Prefers `session/load` (resume) when the agent advertised
+   * `loadSession` — proven live to re-open kimi's closed session with the
+   * conversation context intact. Calls `connection.loadSession` DIRECTLY — the
+   * public {@link loadSession} skips a same-id load (a Claude relaunch-wedge
+   * guard), which is exactly the load we MUST perform here (the closed id IS the
+   * active id). Falls back to a fresh `session/new` (context lost) only when the
+   * agent can't resume.
+   *
+   * ⚠️ kimi's `session/load` (0.23.6, live-verified) REPLAYS the ENTIRE prior
+   * conversation as `session/update` notifications BEFORE it resolves — the
+   * earlier assumption that it emitted no replay was wrong and caused a P0: the
+   * replayed prior-turn text was published as live chunks and prepended to the
+   * recovered turn's real reply. So the load is bracketed with
+   * `beginLoadReplay()/endLoadReplay()` (wired by the runner to StreamingState)
+   * so those replay updates are swallowed, exactly like the baton's load. The
+   * retried `session/prompt` (after the load resolves) then streams the REAL new
+   * reply cleanly. The `finally` guarantees the guard clears even if the load
+   * throws, so a failed recovery can't wedge streaming off.
+   */
+  async reestablishSession() {
+    if (!this.connection) throw new Error("AcpClient.reestablishSession: no connection");
+    const cwd = this.opts.cwd;
+    const mcpServers = this.opts.mcpServers ?? [];
+    const closedSid = this.sessionId;
+    if (this.supportsLoadSession && closedSid) {
+      log.info("acpClient", `reestablish \u2192 loadSession(resume) sid=${closedSid.slice(0, 8)}`);
+      this.opts.beginLoadReplay?.();
+      try {
+        await this.connection.loadSession({ sessionId: closedSid, cwd, mcpServers });
+      } finally {
+        this.opts.endLoadReplay?.();
+      }
+      log.info("acpClient", "reestablish \u2190 loadSession ok");
+      return;
+    }
+    log.info("acpClient", "reestablish \u2192 newSession (agent has no loadSession capability)");
+    const ns = await this.connection.newSession({ cwd, mcpServers });
+    this.sessionId = ns.sessionId;
+    log.info("acpClient", `reestablish \u2190 newSession ok sid=${ns.sessionId.slice(0, 8)}`);
+  }
   /**
    * Load a previously persisted session by id. Mobile's
    * `resume_session` command flows through here. Requires the
@@ -29966,6 +30076,13 @@ async function runAcpSession(opts) {
         streaming.append(delta);
       }
     },
+    // kimi post-turn "Session is closed" recovery brackets its `session/load`
+    // with these so the conversation history the load REPLAYS as session/update
+    // notifications is swallowed by StreamingState instead of published as live
+    // chunks (which prepended a prior turn's text to the recovered reply — P0).
+    // Same guard the baton uses; the happy path never calls loadSession.
+    beginLoadReplay: () => streaming.beginLoadReplay(),
+    endLoadReplay: () => streaming.endLoadReplay(),
     onRequestPermission: async (request) => {
       if (opts.autoApprovePermissions) {
         const allow = pickAllowOption(request.options);
@@ -31763,6 +31880,14 @@ async function runBatonSession(opts) {
     onSessionUpdate: (notification) => {
       for (const delta of mapSessionUpdate(notification)) streaming.append(delta);
     },
+    // Swallow the ACP session/load history replay during the kimi "Session is
+    // closed" recovery (AcpClient.reestablishSession) — kimi 0.23.6 replays the
+    // whole conversation as session/update, which would otherwise prepend a
+    // prior turn's text to the recovered reply on the baton's mobile stream too
+    // (same leak the plain ACP runner wires at runner.ts). Same `streaming`
+    // instance the baton's own AcpDriver.start bracketing uses.
+    beginLoadReplay: () => streaming.beginLoadReplay(),
+    endLoadReplay: () => streaming.endLoadReplay(),
     onRequestPermission: async (request) => {
       const { event, optionIdByLabel } = mapPermissionRequest(request);
       await publisher.publishAwaitingAnswer(event);
@@ -34846,7 +34971,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.60.50" : "0.0.0-dev";
+  const cliVersion = true ? "2.60.52" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto12.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -35323,7 +35448,7 @@ async function mcpRun(args2) {
 // src/commands/version.ts
 var import_picocolors15 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.60.50" : "unknown";
+  const v = true ? "2.60.52" : "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.50",
+  "version": "2.60.52",
   "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",