very-happy-cli 0.2.206 → 0.2.208

package/dist/codex/happyMcpStdioBridge.mjs

@@ -1,6 +1,6 @@
-import { r as registerTeamsTools } from '../tools-Ck6hDYQh.mjs';
-import { r as registerAutomationTools, a as registerProjectTools, b as registerIssueTools, c as registerReportProgressTool } from '../reportProgressTool-B9DJTgdO.mjs';
-import { r as registerSessionPeerTools } from '../peerTools-D66WcwUZ.mjs';
+import { r as registerTeamsTools } from '../tools-BrtfEQhr.mjs';
+import { r as registerAutomationTools, a as registerProjectTools, b as registerIssueTools, c as registerReportProgressTool } from '../reportProgressTool-dSJwAO7H.mjs';
+import { r as registerSessionPeerTools } from '../peerTools-D0rxyRcF.mjs';
 import { P as PREVIEW_TOOL_NAME, a as PREVIEW_TOOL_TITLE, b as PREVIEW_TOOL_DESCRIPTION, c as PREVIEW_DOWNLOAD_PARAM_DESCRIPTION, R as REPORT_PROGRESS_TOOL_NAME } from '../agentGuidance-BDYt2Qy2.mjs';
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -8,40 +8,40 @@ import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { z } from 'zod';
 import { C as CLIPBOARD_TOOL_NAME, a as CLIPBOARD_TOOL_TITLE, b as CLIPBOARD_TOOL_DESCRIPTION } from '../limits-DIo7rEBR.mjs';
-import '../client-Bqyfl2t0.mjs';
+import '../client-BcJGDe88.mjs';
 import 'node:crypto';
 import 'node:child_process';
 import 'node:util';
 import 'node:path';
 import '../index-DWk-WTU-.mjs';
 import '@paralleldrive/cuid2';
-import '../configuration-BreL0beF.mjs';
+import '../configuration-DyUL3r3_.mjs';
 import 'node:fs';
 import 'node:os';
-import '../package-CJeweE1o.mjs';
+import '../package-BObPhT96.mjs';
 import 'node:fs/promises';
-import '../persistence-DURvN3Hm.mjs';
+import '../persistence-Bqjt2vfj.mjs';
 import '../authRelay-DhQhkBvX.mjs';
 import 'tweetnacl';
-import '../logger-DOp6YYAW.mjs';
+import '../logger-B3uJyacO.mjs';
 import 'chalk';
-import '../context-DFudPCad.mjs';
-import '../exitNotice-HOwYf-97.mjs';
+import '../context-D2H9Axdp.mjs';
+import '../exitNotice-BhE9UKcS.mjs';
 import '../prompt-QHuFx9j6.mjs';
-import '../client-ztj20uaj.mjs';
+import '../client-DM4LAJtu.mjs';
 import '../precheckCompat-DeEbilbr.mjs';
-import '../client-DizbJlbC.mjs';
-import '../client-5ekzs8hv.mjs';
-import '../format-2GqpXiRX.mjs';
+import '../client-CHusuUpK.mjs';
+import '../client-D79GAZdH.mjs';
+import '../format-CNxQ0daG.mjs';
 import '../ids-DU6sLx4C.mjs';
-import '../controlClient-DwiujrH8.mjs';
-import '../sessionOps-1_wWgsXG.mjs';
+import '../controlClient-HuyeDWsu.mjs';
+import '../sessionOps-IQlrlpXx.mjs';
 import 'axios';
-import '../time-BHGz6WMO.mjs';
+import '../time-PLmNnNT8.mjs';
 import '../specialCommands-MXUN0wfI.mjs';
 import 'socket.io-client';
 import '../backgroundTaskActivity-8PdPxrvy.mjs';
-import '../remoteSessionClient-iIWEgwCP.mjs';
+import '../remoteSessionClient-DHuh-nj5.mjs';
 import '../trimIdent-BAjmv_TG.mjs';
 
 function parseArgs(argv) {

package/dist/{codexAppServerClient-oSG91fFK.cjs → codexAppServerClient-1UQzZZVz.cjs}

@@ -3,11 +3,11 @@
 var node_child_process = require('node:child_process');
 var spawn = require('cross-spawn');
 var node_readline = require('node:readline');
-var logger = require('./logger-B_GiBdoD.cjs');
+var logger = require('./logger-el0cE85h.cjs');
 var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
 var manager = require('./manager-HrEj442o.cjs');
-var _package = require('./package-DTEEvw5V.cjs');
-var rateLimitWindows = require('./rateLimitWindows-BmZ6gZY8.cjs');
+var _package = require('./package-COEvA5iY.cjs');
+var rateLimitWindows = require('./rateLimitWindows-CnmV6sQI.cjs');
 var processTree = require('./processTree-CMHWlVse.cjs');
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -45,6 +45,87 @@ function codexChildAnnouncements(item) {
   return [];
 }
 
+const UNEXPECTED_STATUS = /^unexpected status (\d{3}) ([^:]*?):\s*([\s\S]*?)(?:,\s*url:\s*(\S+))?$/;
+function readableCodexErrorText(text) {
+  const trimmed = text.trim();
+  const status = UNEXPECTED_STATUS.exec(trimmed);
+  if (status) {
+    const [, code, reason, rawBody, url] = status;
+    const head = `HTTP ${code} ${reason.trim()} from the model API`;
+    const detail = readableHttpBody(rawBody, `${code} ${reason}`);
+    return `${head}${detail ? `: ${detail}` : ""}${url ? ` (${url})` : ""}`;
+  }
+  return unwrapJsonMessage(trimmed) ?? trimmed;
+}
+function unwrapJsonMessage(text) {
+  if (!text.startsWith("{")) return null;
+  try {
+    const body = JSON.parse(text);
+    const inner = typeof body.error === "object" && body.error ? body.error.message : void 0;
+    const message = typeof inner === "string" && inner.trim() ? inner : typeof body.error === "string" && body.error.trim() ? body.error : typeof body.message === "string" && body.message.trim() ? body.message : null;
+    return message ? message.trim() : null;
+  } catch {
+    return null;
+  }
+}
+function readableHttpBody(raw, statusLine) {
+  let body = unwrapJsonMessage(raw.trim()) ?? raw.trim();
+  if (/<[a-z!/][^>]*>/i.test(body)) {
+    const title = /<title[^>]*>([\s\S]*?)<\/title>/i.exec(body);
+    body = title ? title[1] : body.replace(/<[^>]+>/g, " ");
+  }
+  body = body.replace(/\s+/g, " ").trim();
+  if (!body) return null;
+  const normalize = (value) => value.toLowerCase().replace(/[^a-z0-9]/g, "");
+  if (normalize(body) === normalize(statusLine)) return null;
+  return body.length > 240 ? `${body.slice(0, 240)}\u2026` : body;
+}
+function describeCodexFailure(msg) {
+  const hasFailure = msg?.status === "failed" || msg?.error !== void 0 && msg?.error !== null;
+  if (!hasFailure) return null;
+  const err = msg.error;
+  if (typeof err === "string" && err.length > 0) return readableCodexErrorText(err);
+  if (err && typeof err === "object" && typeof err.message === "string" && err.message.length > 0) {
+    return readableCodexErrorText(err.message);
+  }
+  return "Unknown error";
+}
+function describeCodexRetry(msg) {
+  const message = typeof msg?.message === "string" ? msg.message.trim() : "";
+  const status = typeof msg?.http_status === "number" ? msg.http_status : null;
+  const cause = status ? `HTTP ${status} from the model API` : "a model API error";
+  return message ? `Codex is retrying after ${cause} (${message})` : `Codex is retrying after ${cause}`;
+}
+function codexStderrTailOf(error) {
+  const tail = error?.codexStderrTail;
+  return typeof tail === "string" && tail.trim() ? tail.trim() : null;
+}
+const TRANSPORT_LOSS = /^Codex process (exited|disconnected)\b|stdin not writable| timed out after \d+ms/;
+function describeThrownTurnError(error) {
+  const message = error instanceof Error ? error.message : typeof error === "string" ? error : "";
+  if (!message.trim() || TRANSPORT_LOSS.test(message)) return null;
+  return readableCodexErrorText(message);
+}
+function codexExitOf(error) {
+  const exit = error?.codexExit;
+  if (!exit || typeof exit !== "object") return null;
+  return {
+    code: typeof exit.code === "number" ? exit.code : null,
+    signal: typeof exit.signal === "string" && exit.signal ? exit.signal : null
+  };
+}
+function describeCodexExit(exit, tail) {
+  const status = exit.signal ? `signal=${exit.signal}` : `code=${exit.code ?? "null"}`;
+  const hint = exit.signal === "SIGKILL" ? " \u2014 killed by the system, most likely out of memory (a very large Codex thread can need several GB to resume)" : "";
+  return `Codex process exited (${status})${hint}${tail ? `: ${tail}` : ""}`;
+}
+function processLossMessage(error) {
+  const tail = codexStderrTailOf(error);
+  const exit = codexExitOf(error);
+  if (exit) return `Process exited unexpectedly: ${describeCodexExit(exit, tail)}`;
+  return tail ? `Process exited unexpectedly: ${tail}` : "Process exited unexpectedly";
+}
+
 function jsonRpcErrorCodeOf(error) {
   const code = error?.jsonRpcCode;
   return typeof code === "number" ? code : null;
@@ -170,6 +251,9 @@ class CodexAppServerClient {
   threadStopGrace = null;
   /** Last few hundred chars of the app-server's stderr: Codex's own last words when it dies. */
   stderrRing = "";
+  /** B-901: this app-server ended a turn — it got past loading the thread. */
+  servedTurnSinceSpawn = false;
+  unexpectedExitHandler = null;
   rawFileChangesByItemId = /* @__PURE__ */ new Map();
   // B-622: inactivity watchdog for the pending turn — re-armed by every
   // notification, never a cap on how long a turn may run (see sendTurnAndWait).
@@ -220,6 +304,10 @@ class CodexAppServerClient {
   get threadModel() {
     return this._threadModel;
   }
+  /** B-901: the app-server died on its own (never called for our own disconnect/release). */
+  setUnexpectedExitHandler(handler) {
+    this.unexpectedExitHandler = handler;
+  }
   setEventHandler(handler) {
     this.eventHandler = handler;
   }
@@ -346,6 +434,7 @@ class CodexAppServerClient {
     const aborted = status === "cancelled" || status === "canceled" || status === "aborted" || status === "interrupted";
     const failed = status === "failed" || error !== void 0 && error !== null;
     this.clearThreadStopGrace();
+    this.servedTurnSinceSpawn = true;
     this.tryResolvePendingTurn(aborted, turnId, source);
     this._turnId = null;
     this.maybeRefreshRateLimits();
@@ -592,11 +681,14 @@ class CodexAppServerClient {
       }
       this.connected = false;
       const tail = this.stderrTail();
+      const exit = { code: code ?? null, signal: signal ?? null };
       const exited = `Codex process exited (code=${code ?? "null"}${signal ? `, signal=${signal}` : ""})`;
+      this.unexpectedExitHandler?.({ ...exit, threadId: this._threadId, servedTurn: this.servedTurnSinceSpawn });
       for (const [id, req] of this.pending) {
         if (req.epoch !== epoch) continue;
         const error = new Error(`${exited} while waiting for ${req.method}`);
         error.codexStderrTail = tail;
+        error.codexExit = exit;
         req.reject(error);
         this.pending.delete(id);
       }
@@ -607,12 +699,13 @@ class CodexAppServerClient {
           type: "turn_aborted",
           reason: "process-exit",
           ...turnId ? { turn_id: turnId } : {},
-          error: { message: `${exited}${tail ? `: ${tail}` : ""}` }
+          error: { message: describeCodexExit(exit, tail) }
         });
       }
       this.resolvePendingTurn(true);
     });
     this.stderrRing = "";
+    this.servedTurnSinceSpawn = false;
     this.steerUnsupported = false;
     this.steeredAwaitingEcho.clear();
     this.childThreadLabels.clear();
@@ -798,7 +891,12 @@ ${text}`.slice(-400);
       config: this.buildThreadConfig(opts?.mcpServers ?? defaults.mcpServers),
       baseInstructions: null,
       developerInstructions: null,
-      persistExtendedHistory: true
+      persistExtendedHistory: true,
+      // B-901: nothing here reads the resumed turns, and on a long thread
+      // they came back as one JSON line of hundreds of MB (400 MB for an
+      // 850 MB rollout) that this process had to buffer and parse. Older
+      // Codex ignores the unknown param, as with lastTurnId (B-851).
+      excludeTurns: true
     };
     const result = await this.request("thread/resume", params);
     this._threadId = result.thread.id;
@@ -1651,3 +1749,7 @@ ${text}`.slice(-400);
 }
 
 exports.CodexAppServerClient = CodexAppServerClient;
+exports.describeCodexFailure = describeCodexFailure;
+exports.describeCodexRetry = describeCodexRetry;
+exports.describeThrownTurnError = describeThrownTurnError;
+exports.processLossMessage = processLossMessage;

package/dist/{codexAppServerClient-DFRZ__3w.mjs → codexAppServerClient-4OO0KZot.mjs}

@@ -1,11 +1,11 @@
 import { execSync } from 'node:child_process';
 import { spawn } from 'cross-spawn';
 import { createInterface } from 'node:readline';
-import { l as logger } from './logger-DOp6YYAW.mjs';
+import { l as logger } from './logger-B3uJyacO.mjs';
 import { e as errorLogMetadata, c as contentLogMetadata } from './contentLogMetadata-BlWI0egu.mjs';
-import { i as initializeSandbox, w as wrapForMcpTransport } from './manager-BEsI4qt3.mjs';
-import { p as packageJson } from './package-CJeweE1o.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-BrCPAQCV.mjs';
+import { i as initializeSandbox, a as wrapForMcpTransport } from './manager-2Il8XJVq.mjs';
+import { p as packageJson } from './package-BObPhT96.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-CrWlGKPl.mjs';
 import { s as stopProcessGracefully, k as killProcessTree } from './processTree-CP5IvQ2Z.mjs';
 
 const CODEX_HELPER_LABEL_MAX_CHARS = 80;
@@ -43,6 +43,87 @@ function codexChildAnnouncements(item) {
   return [];
 }
 
+const UNEXPECTED_STATUS = /^unexpected status (\d{3}) ([^:]*?):\s*([\s\S]*?)(?:,\s*url:\s*(\S+))?$/;
+function readableCodexErrorText(text) {
+  const trimmed = text.trim();
+  const status = UNEXPECTED_STATUS.exec(trimmed);
+  if (status) {
+    const [, code, reason, rawBody, url] = status;
+    const head = `HTTP ${code} ${reason.trim()} from the model API`;
+    const detail = readableHttpBody(rawBody, `${code} ${reason}`);
+    return `${head}${detail ? `: ${detail}` : ""}${url ? ` (${url})` : ""}`;
+  }
+  return unwrapJsonMessage(trimmed) ?? trimmed;
+}
+function unwrapJsonMessage(text) {
+  if (!text.startsWith("{")) return null;
+  try {
+    const body = JSON.parse(text);
+    const inner = typeof body.error === "object" && body.error ? body.error.message : void 0;
+    const message = typeof inner === "string" && inner.trim() ? inner : typeof body.error === "string" && body.error.trim() ? body.error : typeof body.message === "string" && body.message.trim() ? body.message : null;
+    return message ? message.trim() : null;
+  } catch {
+    return null;
+  }
+}
+function readableHttpBody(raw, statusLine) {
+  let body = unwrapJsonMessage(raw.trim()) ?? raw.trim();
+  if (/<[a-z!/][^>]*>/i.test(body)) {
+    const title = /<title[^>]*>([\s\S]*?)<\/title>/i.exec(body);
+    body = title ? title[1] : body.replace(/<[^>]+>/g, " ");
+  }
+  body = body.replace(/\s+/g, " ").trim();
+  if (!body) return null;
+  const normalize = (value) => value.toLowerCase().replace(/[^a-z0-9]/g, "");
+  if (normalize(body) === normalize(statusLine)) return null;
+  return body.length > 240 ? `${body.slice(0, 240)}\u2026` : body;
+}
+function describeCodexFailure(msg) {
+  const hasFailure = msg?.status === "failed" || msg?.error !== void 0 && msg?.error !== null;
+  if (!hasFailure) return null;
+  const err = msg.error;
+  if (typeof err === "string" && err.length > 0) return readableCodexErrorText(err);
+  if (err && typeof err === "object" && typeof err.message === "string" && err.message.length > 0) {
+    return readableCodexErrorText(err.message);
+  }
+  return "Unknown error";
+}
+function describeCodexRetry(msg) {
+  const message = typeof msg?.message === "string" ? msg.message.trim() : "";
+  const status = typeof msg?.http_status === "number" ? msg.http_status : null;
+  const cause = status ? `HTTP ${status} from the model API` : "a model API error";
+  return message ? `Codex is retrying after ${cause} (${message})` : `Codex is retrying after ${cause}`;
+}
+function codexStderrTailOf(error) {
+  const tail = error?.codexStderrTail;
+  return typeof tail === "string" && tail.trim() ? tail.trim() : null;
+}
+const TRANSPORT_LOSS = /^Codex process (exited|disconnected)\b|stdin not writable| timed out after \d+ms/;
+function describeThrownTurnError(error) {
+  const message = error instanceof Error ? error.message : typeof error === "string" ? error : "";
+  if (!message.trim() || TRANSPORT_LOSS.test(message)) return null;
+  return readableCodexErrorText(message);
+}
+function codexExitOf(error) {
+  const exit = error?.codexExit;
+  if (!exit || typeof exit !== "object") return null;
+  return {
+    code: typeof exit.code === "number" ? exit.code : null,
+    signal: typeof exit.signal === "string" && exit.signal ? exit.signal : null
+  };
+}
+function describeCodexExit(exit, tail) {
+  const status = exit.signal ? `signal=${exit.signal}` : `code=${exit.code ?? "null"}`;
+  const hint = exit.signal === "SIGKILL" ? " \u2014 killed by the system, most likely out of memory (a very large Codex thread can need several GB to resume)" : "";
+  return `Codex process exited (${status})${hint}${tail ? `: ${tail}` : ""}`;
+}
+function processLossMessage(error) {
+  const tail = codexStderrTailOf(error);
+  const exit = codexExitOf(error);
+  if (exit) return `Process exited unexpectedly: ${describeCodexExit(exit, tail)}`;
+  return tail ? `Process exited unexpectedly: ${tail}` : "Process exited unexpectedly";
+}
+
 function jsonRpcErrorCodeOf(error) {
   const code = error?.jsonRpcCode;
   return typeof code === "number" ? code : null;
@@ -168,6 +249,9 @@ class CodexAppServerClient {
   threadStopGrace = null;
   /** Last few hundred chars of the app-server's stderr: Codex's own last words when it dies. */
   stderrRing = "";
+  /** B-901: this app-server ended a turn — it got past loading the thread. */
+  servedTurnSinceSpawn = false;
+  unexpectedExitHandler = null;
   rawFileChangesByItemId = /* @__PURE__ */ new Map();
   // B-622: inactivity watchdog for the pending turn — re-armed by every
   // notification, never a cap on how long a turn may run (see sendTurnAndWait).
@@ -218,6 +302,10 @@ class CodexAppServerClient {
   get threadModel() {
     return this._threadModel;
   }
+  /** B-901: the app-server died on its own (never called for our own disconnect/release). */
+  setUnexpectedExitHandler(handler) {
+    this.unexpectedExitHandler = handler;
+  }
   setEventHandler(handler) {
     this.eventHandler = handler;
   }
@@ -344,6 +432,7 @@ class CodexAppServerClient {
     const aborted = status === "cancelled" || status === "canceled" || status === "aborted" || status === "interrupted";
     const failed = status === "failed" || error !== void 0 && error !== null;
     this.clearThreadStopGrace();
+    this.servedTurnSinceSpawn = true;
     this.tryResolvePendingTurn(aborted, turnId, source);
     this._turnId = null;
     this.maybeRefreshRateLimits();
@@ -590,11 +679,14 @@ class CodexAppServerClient {
       }
       this.connected = false;
       const tail = this.stderrTail();
+      const exit = { code: code ?? null, signal: signal ?? null };
       const exited = `Codex process exited (code=${code ?? "null"}${signal ? `, signal=${signal}` : ""})`;
+      this.unexpectedExitHandler?.({ ...exit, threadId: this._threadId, servedTurn: this.servedTurnSinceSpawn });
       for (const [id, req] of this.pending) {
         if (req.epoch !== epoch) continue;
         const error = new Error(`${exited} while waiting for ${req.method}`);
         error.codexStderrTail = tail;
+        error.codexExit = exit;
         req.reject(error);
         this.pending.delete(id);
       }
@@ -605,12 +697,13 @@ class CodexAppServerClient {
           type: "turn_aborted",
           reason: "process-exit",
           ...turnId ? { turn_id: turnId } : {},
-          error: { message: `${exited}${tail ? `: ${tail}` : ""}` }
+          error: { message: describeCodexExit(exit, tail) }
         });
       }
       this.resolvePendingTurn(true);
     });
     this.stderrRing = "";
+    this.servedTurnSinceSpawn = false;
     this.steerUnsupported = false;
     this.steeredAwaitingEcho.clear();
     this.childThreadLabels.clear();
@@ -796,7 +889,12 @@ ${text}`.slice(-400);
       config: this.buildThreadConfig(opts?.mcpServers ?? defaults.mcpServers),
       baseInstructions: null,
       developerInstructions: null,
-      persistExtendedHistory: true
+      persistExtendedHistory: true,
+      // B-901: nothing here reads the resumed turns, and on a long thread
+      // they came back as one JSON line of hundreds of MB (400 MB for an
+      // 850 MB rollout) that this process had to buffer and parse. Older
+      // Codex ignores the unknown param, as with lastTurnId (B-851).
+      excludeTurns: true
     };
     const result = await this.request("thread/resume", params);
     this._threadId = result.thread.id;
@@ -1648,4 +1746,4 @@ ${text}`.slice(-400);
   }
 }
 
-export { CodexAppServerClient as C };
+export { CodexAppServerClient as C, describeCodexRetry as a, describeThrownTurnError as b, describeCodexFailure as d, processLossMessage as p };