codeam-cli 2.42.0 → 2.43.1

package/CHANGELOG.md

@@ -4,6 +4,36 @@ 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.43.0] — 2026-06-24
+
+### Added
+
+- **cli:** Classify the 1M-context usage-credits error
+- **cli:** Persist per-session disable1mContext flag
+- **cli:** AcpClient accepts extraEnv for the adapter spawn
+- **cli:** OneMContextRecovery offer + decision helper
+- **cli:** OneMContextRecovery offer + decision helper + DI recovery factory
+- **cli:** On-demand 1M-context disable recovery — offer action, re-spawn ACP with the knob, auto-rerun
+
+### Changed
+
+- **cli:** Move 1M-context classifier into oneMContextRecovery (break runner import cycle)
+
+### Documentation
+
+- **meta:** Record agent-failure-messaging + heartbeat + credential rules (AGENTS.md + CLAUDE.md)
+
+## [2.42.0] — 2026-06-24
+
+### Added
+
+- **cli:** Confirm provider outage via status page on turn stall/failure (catch-all)
+
+### Fixed
+
+- **cli:** Make agent-failure messaging honest — outage only on real provider error, re-auth on auth-notice replies
+- **cli:** Keep the heartbeat punctual by detecting the git branch off the hot path
+
 ## [2.41.0] — 2026-06-24
 
 ### Added

package/dist/index.js

@@ -476,6 +476,13 @@ function makeConfig(baseDir) {
     matches.sort((a, b) => b.pairedAt - a.pairedAt);
     return matches[0];
   }
+  function setDisable1mContext2(pluginId, value) {
+    const c2 = load();
+    const s = c2.sessions.find((x) => x.pluginId === pluginId);
+    if (!s) return;
+    s.disable1mContext = value;
+    save(c2);
+  }
   function clearAll2() {
     try {
       fs.unlinkSync(file);
@@ -488,7 +495,7 @@ function makeConfig(baseDir) {
   function loadCliConfig2() {
     return load();
   }
-  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, getActiveSessionForAgent: getActiveSessionForAgent2, clearAll: clearAll2, saveCliConfig: saveCliConfig2, loadCliConfig: loadCliConfig2 };
+  return { getConfig: getConfig2, ensurePluginId: ensurePluginId2, addSession: addSession2, removeSession: removeSession2, setActiveSession: setActiveSession2, getActiveSession: getActiveSession2, getActiveSessionForAgent: getActiveSessionForAgent2, setDisable1mContext: setDisable1mContext2, clearAll: clearAll2, saveCliConfig: saveCliConfig2, loadCliConfig: loadCliConfig2 };
 }
 var CODESPACE_ENV_KEYS = [
   "PREVIEW_TUNNEL_TOKEN",
@@ -512,7 +519,7 @@ function loadCodespaceEnv() {
   }
 }
 var _default = makeConfig();
-var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, getActiveSessionForAgent, clearAll, saveCliConfig, loadCliConfig } = _default;
+var { getConfig, ensurePluginId, addSession, removeSession, setActiveSession, getActiveSession, getActiveSessionForAgent, setDisable1mContext, clearAll, saveCliConfig, loadCliConfig } = _default;
 
 // src/commands/pair-auto.ts
 var fs41 = __toESM(require("fs"));
@@ -5390,7 +5397,7 @@ function readAnonId() {
 }
 function superProperties() {
   return {
-    cliVersion: true ? "2.42.0" : "0.0.0-dev",
+    cliVersion: true ? "2.43.1" : "0.0.0-dev",
     nodeVersion: process.version,
     platform: process.platform,
     arch: process.arch,
@@ -5571,7 +5578,7 @@ var os4 = __toESM(require("os"));
 // package.json
 var package_default = {
   name: "codeam-cli",
-  version: "2.42.0",
+  version: "2.43.1",
   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",
@@ -17804,7 +17811,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.42.0" : null;
+  const current = true ? "2.43.1" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -17821,7 +17828,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.42.0" : null;
+  const current = true ? "2.43.1" : null;
   if (!current) return;
   const cache = readCache();
   const fresh = cache && Date.now() - cache.fetchedAt < TTL_MS;
@@ -18259,7 +18266,7 @@ var defaultSpawner = (env, cwd, args2 = []) => (0, import_node_child_process14.s
   detached: false
 });
 function currentCliVersion() {
-  return true ? "2.42.0" : null;
+  return true ? "2.43.1" : null;
 }
 function runCmd(cmd, args2, timeoutMs) {
   return new Promise((resolve7) => {
@@ -22737,7 +22744,10 @@ var AcpClient = class {
     );
     const child = (0, import_node_child_process16.spawn)(adapter.command, adapter.args, {
       cwd,
-      env: { ...process.env, PATH: augmentedPath },
+      // 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
+      // PATH always wins.
+      env: { ...process.env, ...this.opts.extraEnv ?? {}, PATH: augmentedPath },
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.child = child;
@@ -23431,6 +23441,67 @@ function buildAcpPromptBlocks(payload) {
   return blocks;
 }
 
+// src/agents/acp/oneMContextRecovery.ts
+var ONE_M_CONTEXT_CREDITS_RE = /usage credits required for 1m context/i;
+function looksLike1mContextCreditsError(text) {
+  return ONE_M_CONTEXT_CREDITS_RE.test(text);
+}
+var ONE_M_DISABLE_OPTION = "Disable 1M context and continue";
+function shouldOfferOneMRecovery(opts) {
+  return looksLike1mContextCreditsError(opts.detail) || looksLike1mContextCreditsError(opts.recentStderr) || looksLike1mContextCreditsError(opts.finalText);
+}
+function oneMRecoverySelectPrompt() {
+  return {
+    question: "\u26A0\uFE0F This agent's Anthropic account needs usage credits for 1M context. You can disable 1M context (uses standard 200K context) and continue.",
+    options: [ONE_M_DISABLE_OPTION]
+  };
+}
+function createOneMRecovery(deps) {
+  let pending = null;
+  const sp = oneMRecoverySelectPrompt();
+  return {
+    offer: async (commandId, blocks) => {
+      pending = { blocks };
+      await deps.publishText(sp.question);
+      await deps.publishSelectPrompt(sp.question, sp.options);
+      await deps.publishAwaitingAnswer(sp.question, sp.options);
+      deps.appendAgentReply(sp.question);
+      deps.flushHistory();
+      deps.log?.(`1M-context credits gate \u2014 recovery offered id=${commandId.slice(0, 8)}`);
+      await deps.sendResult(commandId, "failed", {
+        error: "1M context requires usage credits \u2014 recovery offered"
+      });
+    },
+    tryRecover: async (commandId) => {
+      if (!pending) return false;
+      const blocks = pending.blocks;
+      pending = null;
+      deps.log?.("1M-context recovery \u2192 disable + reconnect + rerun");
+      await deps.reconnectWith1mDisabled();
+      await deps.beginTurn();
+      try {
+        const reply = await deps.promptAgent(blocks);
+        const finalText = deps.getCurrentText();
+        await deps.closeTurn();
+        deps.appendAgentReply(finalText);
+        deps.flushHistory();
+        await deps.sendResult(commandId, "completed", { stopReason: reply.stopReason });
+      } catch (err) {
+        await deps.recoverFromFailedTurn();
+        const d3 = deps.describeError(err);
+        const b = deps.failureBubbleFor(d3);
+        if (b) {
+          await deps.publishText(b);
+          deps.appendAgentReply(b);
+          deps.flushHistory();
+        }
+        await deps.sendResult(commandId, "failed", { error: d3 });
+      }
+      return true;
+    }
+  };
+}
+
 // src/agents/acp/reconcileDelta.ts
 function reconcileCumulative(existing, incoming) {
   if (incoming.length === 0) return existing;
@@ -24793,9 +24864,11 @@ async function runAcpSession(opts) {
     }
   });
   let updateCount = 0;
-  const client2 = new AcpClient({
+  const disable1mContext = loadCliConfig().sessions.find((s) => s.pluginId === opts.pluginId)?.disable1mContext === true;
+  const clientOptions = {
     adapter: opts.adapter,
     cwd: opts.cwd,
+    extraEnv: disable1mContext ? { CLAUDE_CODE_DISABLE_1M_CONTEXT: "1" } : {},
     onSessionUpdate: (notification) => {
       updateCount += 1;
       const variant = notification.update?.sessionUpdate ?? "unknown";
@@ -24860,6 +24933,43 @@ async function runAcpSession(opts) {
         process.exit(1);
       })();
     }
+  };
+  let client2 = new AcpClient(clientOptions);
+  const reconnectWith1mDisabled = async () => {
+    setDisable1mContext(opts.pluginId, true);
+    try {
+      await client2.stop();
+    } catch {
+    }
+    client2 = new AcpClient({ ...clientOptions, extraEnv: { CLAUDE_CODE_DISABLE_1M_CONTEXT: "1" } });
+    await client2.start();
+  };
+  const oneMRecovery = createOneMRecovery({
+    publishText: (text) => publisher.publishOutput({ type: "text", content: text, done: true }),
+    publishSelectPrompt: (question, options) => publisher.publishOutput({
+      type: "select_prompt",
+      content: question,
+      options,
+      optionDescriptions: options.map(() => ""),
+      currentIndex: 0,
+      done: true
+    }),
+    // The button driver — mobile renders the tappable option from this
+    // awaiting-answer event; the user's tap returns as a `select_option`
+    // command, caught at the top of the select_option case by tryRecover.
+    publishAwaitingAnswer: (prompt, options) => publisher.publishAwaitingAnswer({ questionId: (0, import_node_crypto7.randomUUID)(), prompt, options }),
+    sendResult: (commandId, status2, result) => relay.sendResult(commandId, status2, result),
+    appendAgentReply: (text) => history.appendAgentReply(text),
+    flushHistory: () => void history.flush(),
+    beginTurn: () => streaming.beginTurn(),
+    getCurrentText: () => streaming.getCurrentText(),
+    closeTurn: () => streaming.closeTurnWithInteractiveDetection(),
+    recoverFromFailedTurn: () => recoverFromFailedTurn(client2, streaming),
+    reconnectWith1mDisabled,
+    promptAgent: (blocks) => client2.prompt(blocks),
+    failureBubbleFor: (detail) => failureBubble({ detail, recentStderr: recentStderr.join("\n"), hadText: false, agent: opts.agent }),
+    describeError,
+    log: (msg) => log.info("acpRunner", msg)
   });
   showInfo(`Starting ${opts.agent} via ACP adapter (${opts.adapter.requiresAgentBinary})\u2026`);
   const {
@@ -24954,7 +25064,8 @@ async function runAcpSession(opts) {
         turnFiles,
         getBeads,
         publisher,
-        recentStderr
+        recentStderr,
+        oneMRecovery
       );
     },
     { id: opts.agent, name: opts.agent, displayName: opts.agent }
@@ -24978,7 +25089,7 @@ async function runAcpSession(opts) {
   await new Promise(() => {
   });
 }
-async function handleCommand(cmd, client2, relay, acpSessionId, models, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr) {
+async function handleCommand(cmd, client2, relay, acpSessionId, models, streaming, opts, history, jsonlHistory, agentCaps, turnFiles, getBeads, publisher, recentStderr, oneMRecovery) {
   switch (cmd.type) {
     case "beads_action": {
       const beads = getBeads();
@@ -25029,6 +25140,8 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
           void reportCredentialInvalid(opts);
           log.info("acpRunner", `start_task \u2190 auth-failure-in-reply id=${cmd.id.slice(0, 8)}`);
           await relay.sendResult(cmd.id, "failed", { error: "agent reply reported auth failure" });
+        } else if (shouldOfferOneMRecovery({ detail: "", recentStderr: recentStderr.join("\n"), finalText })) {
+          await oneMRecovery.offer(cmd.id, blocks);
         } else {
           await streaming.closeTurnWithInteractiveDetection();
           const replyLine = formatAgentReplyLine(finalText);
@@ -25048,6 +25161,10 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
         await recoverFromFailedTurn(client2, streaming);
         const detail = describeError(err);
         log.warn("acpRunner", `prompt failed: ${detail}`);
+        if (shouldOfferOneMRecovery({ detail, recentStderr: recentStderr.join("\n"), finalText: "" })) {
+          await oneMRecovery.offer(cmd.id, blocks);
+          return;
+        }
         const bubble = failureBubble({
           detail,
           recentStderr: recentStderr.join("\n"),
@@ -25142,6 +25259,7 @@ async function handleCommand(cmd, client2, relay, acpSessionId, models, streamin
       return;
     }
     case "select_option": {
+      if (await oneMRecovery.tryRecover(cmd.id)) return;
       const payload = cmd.payload;
       const index = typeof payload?.index === "number" ? payload.index : 0;
       const offset = typeof payload?.from === "number" ? payload.from : 0;
@@ -29211,7 +29329,7 @@ function checkChokidar() {
 }
 async function doctor(args2 = []) {
   const json = args2.includes("--json");
-  const cliVersion = true ? "2.42.0" : "0.0.0-dev";
+  const cliVersion = true ? "2.43.1" : "0.0.0-dev";
   const apiBase2 = resolveApiBaseUrl();
   const diagnosticId = (0, import_node_crypto8.randomUUID)();
   log.info("doctor", `run id=${diagnosticId} cli=${cliVersion}`);
@@ -29410,7 +29528,7 @@ async function completion(args2) {
 // src/commands/version.ts
 var import_picocolors14 = __toESM(require("picocolors"));
 function version2() {
-  const v = true ? "2.42.0" : "unknown";
+  const v = true ? "2.43.1" : "unknown";
   console.log(`${import_picocolors14.default.bold("codeam-cli")} ${import_picocolors14.default.cyan(v)}`);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeam-cli",
-  "version": "2.42.0",
+  "version": "2.43.1",
   "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",