very-happy-cli 0.2.206 → 0.2.208

package/dist/{codexCommand-BE__EfSf.mjs → codexCommand-DXD9hMjf.mjs}

@@ -1,37 +1,37 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-CP7a7YqH.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-D20iF90G.mjs';
 import { t as createEnvelope, M as BUILTIN_TODO_DISCOVERY, I as ISSUE_SESSION_CAPABILITY, r as restoredEffort, x as readEffortIntent, Y as EFFORT_INTENT_AUTO, P as PROMPT_QUEUE_CAPABILITY, ai as CODEX_STEER_CAPABILITY, a as PROJECT_SESSION_CAPABILITY, aj as CODEX_COMPACT_CAPABILITY, R as RUN_INTENT_CAPABILITY, A as AGENT_PROFILE_SESSION_CAPABILITY, ak as CODEX_BTW_CAPABILITY, al as CODEX_LIVE_PERMISSION_CAPABILITY } from './index-DWk-WTU-.mjs';
 import { i as issueSessionMetadata } from './sessionMetadata-C1eoAi89.mjs';
 import { a as recordRunIntents, w as withoutEffort, r as registerRunIntentRpc, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-CYQi7vqJ.mjs';
-import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-BUtDwjAU.mjs';
-import { s as sharedProjectsClient } from './client-DizbJlbC.mjs';
+import { h as hashObject, s as startHappyServer, c as createProjectInjector } from './deterministicJson-9MtfxFkH.mjs';
+import { s as sharedProjectsClient } from './client-CHusuUpK.mjs';
 import { unlink } from 'node:fs/promises';
 import { a as announceForkBackfill, p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-C9EfJ64O.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
-import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-DGJVcaIF.mjs';
+import { t as textResultPayload, d as toolResultContentText, c as connectionState, A as ApiClient } from './api-CSqHDB2c.mjs';
 import { r as registerAgentAttachmentDownloads, H as HeldInput } from './heldInput-C69lA2dH.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-C-qFMirp.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-Dz1Klp7p.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-Cg33c_Um.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyReconnectReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata, t as takeAutoRestartedEvent, A as AUTO_RESTART_CAPABILITY, e as exitCursorStamp } from './sessionLock-D5Mt-kl0.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { C as CodexAppServerClient } from './codexAppServerClient-DFRZ__3w.mjs';
-import { S as SIDE_QUESTION_SYSTEM_PROMPT, b as buildSideQuestionPrompt, t as toolAttemptNotice, r as registerSideQuestionHandler, d as describePendingApprovals, w as wrapperRateLimitReporter } from './registerSideQuestionHandler-_YMnEk1L.mjs';
-import { l as logger } from './logger-DOp6YYAW.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-Cg2py7Mi.mjs';
-import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-DuGPgcGv.mjs';
+import { C as CodexAppServerClient, d as describeCodexFailure, a as describeCodexRetry, b as describeThrownTurnError, p as processLossMessage } from './codexAppServerClient-4OO0KZot.mjs';
+import { S as SIDE_QUESTION_SYSTEM_PROMPT, b as buildSideQuestionPrompt, t as toolAttemptNotice, r as registerSideQuestionHandler, d as describePendingApprovals, w as wrapperRateLimitReporter } from './registerSideQuestionHandler-zuvmCRN8.mjs';
+import { l as logger } from './logger-B3uJyacO.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-pWG2_iEy.mjs';
+import { B as BaseReasoningProcessor, s as settleCodexSession } from './codexTermination-CVq2OFB8.mjs';
 import { execSync } from 'node:child_process';
-import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-DURvN3Hm.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-8PjdzhIk.mjs';
-import { c as configuration } from './configuration-BreL0beF.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-DNLUoqKq.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-Bqjt2vfj.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-CO2nMt0D.mjs';
+import { c as configuration } from './configuration-DyUL3r3_.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-UkuPaLm6.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { dirname, join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-B0wB4nIY.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-ysHgFXAk.mjs';
 import { M as MessageBuffer } from './sessionExitLifecycle-iAtZN9sa.mjs';
-import { n as notifyDaemonSessionStarted, q as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-DwiujrH8.mjs';
-import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-DeJNxWtb.mjs';
+import { n as notifyDaemonSessionStarted, q as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-HuyeDWsu.mjs';
+import { c as createSessionForStartup, b as HibernationExitLatch, H as HibernationProbe, a as commitHibernation } from './startupSessionCreate-DZOZ_d4O.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DhQhkBvX.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-DSlXZLP9.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-DXZKHKXk.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
 import { a as parseSpecialCommand, c as compactCommandText, b as parseCompact } from './specialCommands-MXUN0wfI.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
@@ -41,77 +41,77 @@ import { r as readSessionBindings, w as writeSessionBinding, d as defaultSecretP
 import { mkdirSync, writeFileSync, chmodSync, rmSync } from 'node:fs';
 import { a as resolveCodexAccount, r as readCodexProviders, s as syncCodexOverlay, b as baseCodexHome, c as codexAccountSwitched, d as readCodexDefaultProvider, e as codexAccountDefaultModel, f as accountModelsAsCatalog, i as isHistoryRejectedError, g as isCodexAuthRejection } from './codexAccount-BPQ-lPhH.mjs';
 import { s as shouldRecordSpawnAccount, u as unavailableNotice } from './wrapperAccount-CwaA-n1S.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-m6Kd3BM7.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CfWwG5sk.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-BHGz6WMO.mjs';
-import './browser-C-PWxfCE.mjs';
+import './time-PLmNnNT8.mjs';
+import './browser-C9mNP2Jk.mjs';
 import 'open';
 import 'zod';
 import './prompt-QHuFx9j6.mjs';
-import './client-5ekzs8hv.mjs';
-import './exitNotice-HOwYf-97.mjs';
-import './reportProgressTool-B9DJTgdO.mjs';
-import './client-ztj20uaj.mjs';
+import './client-D79GAZdH.mjs';
+import './exitNotice-BhE9UKcS.mjs';
+import './reportProgressTool-dSJwAO7H.mjs';
+import './client-DM4LAJtu.mjs';
 import './precheckCompat-DeEbilbr.mjs';
-import './format-2GqpXiRX.mjs';
+import './format-CNxQ0daG.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
 import 'node:os';
 import './pi-CqyoZMjI.mjs';
 import './fileStore-5qpetZS0.mjs';
-import './client-Bqyfl2t0.mjs';
+import './client-BcJGDe88.mjs';
 import 'node:util';
-import './context-DFudPCad.mjs';
-import './sessionOps-1_wWgsXG.mjs';
+import './context-D2H9Axdp.mjs';
+import './sessionOps-IQlrlpXx.mjs';
 import 'socket.io-client';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './resources-CLP_MpK4.mjs';
-import './tools-Ck6hDYQh.mjs';
-import './peerTools-D66WcwUZ.mjs';
+import './tools-BrtfEQhr.mjs';
+import './peerTools-D0rxyRcF.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-iIWEgwCP.mjs';
+import './remoteSessionClient-DHuh-nj5.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import './limits-DIo7rEBR.mjs';
-import './downloadTarget-CVm8ey3W.mjs';
+import './downloadTarget-Bphxqzlj.mjs';
 import './terminals-Dc38XmZv.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-BmZyixRM.mjs';
-import './bootstrap-BCuF4Kla.mjs';
-import './package-CJeweE1o.mjs';
+import './bootstrap-BNtlEESB.mjs';
+import './package-BObPhT96.mjs';
 import './webPanels-B2_C2-3g.mjs';
-import './pushNotifications-CrN3Ja_a.mjs';
+import './pushNotifications-C4KS8SZe.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import './previewPath-CXN4Vag0.mjs';
 import 'crypto';
-import './reconnectGate-BbxwTsar.mjs';
+import './reconnectGate-4HRVraOQ.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
-import './registerCommonHandlers-Dd5Ld0CL.mjs';
+import './registerCommonHandlers-CZJBrvGH.mjs';
 import 'util';
 import 'fs/promises';
 import 'path';
 import 'cross-spawn';
-import './sync-COxP1DF-.mjs';
+import './sync-BHsEZG8-.mjs';
 import 'chalk';
 import './cliUpdate-Y34VGe9Y.mjs';
 import './processTermination-ChJG5SLW.mjs';
 import './processTreeSnapshot-fuwxC0fr.mjs';
 import 'node:readline';
-import './manager-BEsI4qt3.mjs';
+import './manager-2Il8XJVq.mjs';
 import '@anthropic-ai/sandbox-runtime';
-import './rateLimitWindows-BrCPAQCV.mjs';
+import './rateLimitWindows-CrWlGKPl.mjs';
 import './processTree-CP5IvQ2Z.mjs';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-B2bOV9RF.mjs';
+import './localHappyAgentAuth-3xKBQJOa.mjs';
 import './fsMkdir-DumgLTzR.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
 import './claudeAccountEnv-C6Wl-ZbT.mjs';
-import './spawnHappyCLI-BRcxn8Ui.mjs';
+import './spawnHappyCLI-CKOV5SN4.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1126,66 +1126,39 @@ function codexModelFacts(input) {
   };
 }
 
-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;
-  }
+const CRASH_LOOP_LIMIT = 2;
+const STREAK_WINDOW_MS = 6 * 60 * 60 * 1e3;
+const CODEX_CRASH_LOOP_PREFIX = "Codex thread crash loop:";
+function readCodexResumeCrash(value) {
+  const v = value;
+  if (!v || typeof v !== "object" || typeof v.threadId !== "string" || !v.threadId) return null;
+  if (typeof v.count !== "number" || !Number.isFinite(v.count) || v.count < 1) return null;
+  if (typeof v.at !== "number" || !Number.isFinite(v.at)) return null;
+  return {
+    threadId: v.threadId,
+    count: Math.floor(v.count),
+    at: v.at,
+    ...typeof v.signal === "string" ? { signal: v.signal } : {},
+    ...typeof v.code === "number" ? { code: v.code } : {}
+  };
+}
+function recordCodexCrash(previous, exit, now) {
+  if (!exit.threadId || exit.servedTurn) return null;
+  const continues = previous && previous.threadId === exit.threadId && now - previous.at < STREAK_WINDOW_MS;
+  return {
+    threadId: exit.threadId,
+    count: continues ? previous.count + 1 : 1,
+    at: now,
+    signal: exit.signal,
+    code: exit.code
+  };
 }
-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 isCrashLoopBlocked(streak, threadId, now) {
+  return !!streak && !!threadId && streak.threadId === threadId && streak.count >= CRASH_LOOP_LIMIT && now - streak.at < STREAK_WINDOW_MS;
+}
+function crashLoopNotice(streak) {
+  const how = streak.signal === "SIGKILL" ? "it was killed (SIGKILL), most likely out of memory" : streak.signal ? `it exited (signal=${streak.signal})` : `it exited (code=${streak.code ?? "null"})`;
+  return `${CODEX_CRASH_LOOP_PREFIX} Codex died ${streak.count} times in a row while loading this thread \u2014 ${how}. Very Happy stopped restarting it. Start a new Codex session with a summary of this one to continue.`;
 }
 
 async function resumeExistingThread(opts) {
@@ -2221,6 +2194,32 @@ async function runCodex(opts) {
   });
   const editThrottle = new EditReportThrottle();
   client.setRateLimitHandler((snapshot) => wrapperRateLimitReporter().observeCodex(snapshot));
+  let crashStreakNow = readCodexResumeCrash(session.getMetadata()?.codexResumeCrash);
+  const crashStreak = () => crashStreakNow;
+  let blockedResumeThreadId = null;
+  const crashLoopBlocked = () => isCrashLoopBlocked(crashStreak(), client.threadId ?? blockedResumeThreadId, Date.now());
+  const sendCrashLoopNotice = () => {
+    const streak = crashStreak();
+    if (!streak) return;
+    messageBuffer.addMessage("Codex keeps dying while loading this thread; not restarting it", "status");
+    session.sendSessionEvent({ type: "message", message: crashLoopNotice(streak) });
+  };
+  client.setUnexpectedExitHandler((exit) => {
+    const next = recordCodexCrash(crashStreak(), exit, Date.now());
+    logger.debug(`[Codex] App-server died: code=${exit.code} signal=${exit.signal} servedTurn=${exit.servedTurn} streak=${next?.count ?? 0}`);
+    if (!next) return;
+    crashStreakNow = next;
+    session.updateMetadata((currentMetadata) => ({ ...currentMetadata, codexResumeCrash: next }));
+  });
+  const clearCrashStreak = () => {
+    if (!crashStreakNow) return;
+    crashStreakNow = null;
+    session.updateMetadata((currentMetadata) => {
+      const nextMetadata = { ...currentMetadata };
+      delete nextMetadata.codexResumeCrash;
+      return nextMetadata;
+    });
+  };
   client.setEventHandler((msg) => {
     if (msg.type === "token_count") {
       session.sendAgentUsageSnapshot("codex", msg);
@@ -2386,7 +2385,13 @@ async function runCodex(opts) {
     } catch (error) {
       logger.debug("[Codex] Model discovery unavailable; using compatibility fallback", safeCodexErrorMetadata(error));
     }
-    if (opts.resumeThreadId && !codexAccount.unavailable) {
+    if (opts.resumeThreadId && !codexAccount.unavailable && isCrashLoopBlocked(crashStreak(), opts.resumeThreadId, Date.now())) {
+      blockedResumeThreadId = opts.resumeThreadId;
+      logger.debug("[Codex] Not resuming a thread in a crash loop");
+      sendCrashLoopNotice();
+      first = false;
+      appendSystemPromptInjected = true;
+    } else if (opts.resumeThreadId && !codexAccount.unavailable) {
       try {
         await resumeExistingThread({
           client,
@@ -2528,6 +2533,7 @@ async function runCodex(opts) {
         logger.debug("[Codex] Handling /clear command - resetting Codex thread state");
         heldInput.delivered();
         client.clearThreadState();
+        blockedResumeThreadId = null;
         currentTurnId = null;
         codexStartedSubagents = /* @__PURE__ */ new Set();
         codexActiveSubagents = /* @__PURE__ */ new Set();
@@ -2561,6 +2567,11 @@ async function runCodex(opts) {
       messageBuffer.addMessage(message.message, "user");
       const compactCommand = codexCompactCommand(message.message);
       try {
+        if (crashLoopBlocked()) {
+          heldInput.drop("failed");
+          sendCrashLoopNotice();
+          continue;
+        }
         if (compactCommand !== null) {
           await client.ensureConnected();
           heldInput.delivered();
@@ -2646,6 +2657,7 @@ async function runCodex(opts) {
         });
         reportModeFacts();
         first = false;
+        if (!result.aborted) clearCrashStreak();
         if (includeAppendSystemPrompt) {
           appendSystemPromptInjected = true;
         }
@@ -2661,9 +2673,10 @@ async function runCodex(opts) {
           session.sendSessionEvent({ type: "message", message: `Codex error: ${reason}` });
           noteAccountFailure(reason);
         } else {
-          const tail = codexStderrTailOf(error);
           messageBuffer.addMessage("Process exited unexpectedly", "status");
-          session.sendSessionEvent({ type: "message", message: tail ? `Process exited unexpectedly: ${tail}` : "Process exited unexpectedly" });
+          session.sendSessionEvent({ type: "message", message: processLossMessage(error) });
+          logger.debug(`[Codex] Crash-loop check: streak=${crashStreak()?.count ?? 0} thread=${client.threadId ?? blockedResumeThreadId ?? "none"} blocked=${crashLoopBlocked()}`);
+          if (crashLoopBlocked()) sendCrashLoopNotice();
         }
       } finally {
         permissionHandler.reset();