very-happy-cli 0.2.172 → 0.2.174

package/dist/{codexAppServerClient-CRDG7opD.mjs → codexAppServerClient-pnCpJlD8.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-5nrNOr9k.mjs';
+import { l as logger } from './logger-CUxbqfrp.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-BqyoBO6-.mjs';
-import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-CN8-h93x.mjs';
+import { p as packageJson } from './package-DkI3yDe0.mjs';
+import { s as shouldReadCodexRateLimits, i as isUnsupportedCodexMethodError } from './rateLimitWindows-i2-530Zt.mjs';
 
 function isAppServerAvailable() {
   try {
@@ -100,6 +100,12 @@ class CodexAppServerClient {
   notificationProtocol = "unknown";
   completedTurnIds = /* @__PURE__ */ new Set();
   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).
+  turnWatchdog = null;
+  // Approval / elicitation requests we are still answering: a human may take
+  // longer than the watchdog to decide, and that is not Codex going silent.
+  inflightServerRequests = 0;
   // Handlers set by the consumer (runCodex.ts)
   eventHandler = null;
   approvalHandler = null;
@@ -176,11 +182,12 @@ class CodexAppServerClient {
   }
   emitRawTurnCompletion(turnId, status, error, source) {
     const aborted = status === "cancelled" || status === "canceled" || status === "aborted" || status === "interrupted";
+    const failed = status === "failed" || error !== void 0 && error !== null;
     this.tryResolvePendingTurn(aborted, turnId, source);
     this._turnId = null;
     this.maybeRefreshRateLimits();
     if (turnId && this.completedTurnIds.has(turnId)) {
-      return;
+      if (!failed) return;
     }
     if (turnId) {
       this.completedTurnIds.add(turnId);
@@ -316,14 +323,6 @@ class CodexAppServerClient {
           phase: item.phase
         });
       }
-      if (item.phase === "final_answer" && this.pendingTurnCompletion) {
-        this.emitRawTurnCompletion(
-          this.extractTurnId(params),
-          "completed",
-          null,
-          `${method}:final_answer`
-        );
-      }
       return true;
     }
     return method.startsWith("item/");
@@ -661,6 +660,7 @@ class CodexAppServerClient {
   }
   resolvePendingTurn(aborted) {
     if (!this.pendingTurnCompletion) return;
+    this.clearTurnWatchdog();
     this.pendingTurnCompletion.resolve(aborted);
     this.pendingTurnCompletion = null;
   }
@@ -782,30 +782,55 @@ class CodexAppServerClient {
     }
     await this.ensureConnected();
     const timeoutMs = opts?.turnTimeoutMs ?? CodexAppServerClient.TURN_TIMEOUT_MS;
-    let timer = null;
     const completion = new Promise((resolve) => {
       this.pendingTurnCompletion = {
         resolve,
         turnId: null
       };
-      timer = setTimeout(() => {
-        if (this.pendingTurnCompletion) {
-          logger.warn(`[CodexAppServer] Turn timed out after ${timeoutMs}ms \u2014 treating as abort`);
-          this.resolvePendingTurn(true);
-        }
-      }, timeoutMs);
+      this.armTurnWatchdog(timeoutMs);
     });
     try {
       await this.sendTurn(prompt, opts);
     } catch (err) {
-      if (timer) clearTimeout(timer);
+      this.clearTurnWatchdog();
       this.pendingTurnCompletion = null;
       throw err;
     }
     const aborted = await completion;
-    if (timer) clearTimeout(timer);
+    this.clearTurnWatchdog();
     return { aborted };
   }
+  armTurnWatchdog(timeoutMs) {
+    this.clearTurnWatchdog();
+    const timer = setTimeout(() => {
+      this.turnWatchdog = null;
+      if (!this.pendingTurnCompletion) return;
+      if (this.inflightServerRequests > 0) {
+        this.armTurnWatchdog(timeoutMs);
+        return;
+      }
+      logger.warn(`[CodexAppServer] No notification from Codex for ${timeoutMs}ms \u2014 giving the turn up as aborted`);
+      const turnId = this.pendingTurnCompletion.turnId ?? this._turnId;
+      this.eventHandler?.({
+        type: "turn_aborted",
+        reason: "timeout",
+        ...turnId ? { turn_id: turnId } : {},
+        error: { message: `Codex sent nothing for ${Math.max(1, Math.round(timeoutMs / 6e4))} minutes; this turn was given up. Send the message again, or restart the session if it keeps happening.` }
+      });
+      this.resolvePendingTurn(true);
+    }, timeoutMs);
+    this.turnWatchdog = { timer, timeoutMs };
+  }
+  /** Any sign of life from the app-server while a turn is pending restarts the clock. */
+  touchTurnWatchdog() {
+    if (!this.turnWatchdog || !this.pendingTurnCompletion) return;
+    this.armTurnWatchdog(this.turnWatchdog.timeoutMs);
+  }
+  clearTurnWatchdog() {
+    if (!this.turnWatchdog) return;
+    clearTimeout(this.turnWatchdog.timer);
+    this.turnWatchdog = null;
+  }
   async interruptTurn() {
     if (!this._threadId) return;
     if (!this._turnId) {
@@ -1013,6 +1038,15 @@ class CodexAppServerClient {
     };
   }
   async handleServerRequest(id, method, params) {
+    this.inflightServerRequests += 1;
+    try {
+      await this.handleServerRequestInner(id, method, params);
+    } finally {
+      this.inflightServerRequests -= 1;
+      this.touchTurnWatchdog();
+    }
+  }
+  async handleServerRequestInner(id, method, params) {
     if (method === "mcpServer/elicitation/request") {
       const toolName = this.parseToolNameFromElicitationMessage(params?.message) ?? params?.serverName ?? "McpTool";
       const decision = await this.handleApproval({
@@ -1066,6 +1100,7 @@ class CodexAppServerClient {
     return "denied";
   }
   handleNotification(method, params) {
+    this.touchTurnWatchdog();
     if (method === "codex/event" || method.startsWith("codex/event/")) {
       this.notificationProtocol = "legacy";
       const msg = params?.msg;
@@ -1125,6 +1160,21 @@ class CodexAppServerClient {
       logger.debug(`[CodexAppServer] mcpServer startup status:`, params);
       return;
     }
+    if (method === "error" && params?.willRetry === true) {
+      const error = params?.error ?? {};
+      const message = typeof error.message === "string" ? error.message : "";
+      const info = error.codexErrorInfo;
+      const httpStatus = info && typeof info === "object" ? info.responseStreamDisconnected?.httpStatusCode ?? info.httpStatusCode ?? null : null;
+      const turnId = typeof params?.turnId === "string" ? params.turnId : null;
+      this.eventHandler?.({
+        type: "turn_retry",
+        message,
+        ...typeof httpStatus === "number" ? { http_status: httpStatus } : {},
+        ...turnId ? { turn_id: turnId } : {},
+        ...typeof error.additionalDetails === "string" ? { details: error.additionalDetails } : {}
+      });
+      return;
+    }
     logger.debug(`[CodexAppServer] Notification: ${method}`);
   }
 }

package/dist/{codexCommand-IPGPB6Y6.mjs → codexCommand-BmtdCu-D.mjs}

@@ -1,59 +1,59 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-C5BUqr8C.mjs';
-import { c as createEnvelope, o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-B0HEEYGh.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-CiZfkTkd.mjs';
+import { c as createEnvelope, o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-boE-d8CM.mjs';
 import { p as publishForkBackfillWhenCommitted, F as FORK_BACKFILL_CAPABILITY } from './forkBackfill-DYIjlN1Z.mjs';
 import { randomUUID } from 'node:crypto';
 import { createId } from '@paralleldrive/cuid2';
 import { r as registerAgentAttachmentDownloads } from './agentAttachments-M_B5qEF2.mjs';
-import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-B4EWVVwP.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CSGb8uDJ.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-GYpvB-tl.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, b as applyHibernationReplay, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-D_-T15Y-.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { c as connectionState, A as ApiClient } from './api-Dl7GzFSE.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-CRDG7opD.mjs';
-import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-D-hSW2fF.mjs';
-import { l as logger } from './logger-5nrNOr9k.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-gfvApjaM.mjs';
-import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-HgNpdMCK.mjs';
+import { c as connectionState, A as ApiClient } from './api-rOLB1-sV.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-pnCpJlD8.mjs';
+import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-BbNlcS3G.mjs';
+import { l as logger } from './logger-CUxbqfrp.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-BiWdGyL1.mjs';
+import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-2sLuoRYw.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-BLytfR_W.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-KO-etduY.mjs';
-import { c as configuration } from './configuration-B06-un22.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-CkECyNzM.mjs';
+import { r as readSettings, l as latchKeepAwake, e as evaluateWrapperIdle, a as resolveCheckMs, H as HIBERNATION_CAPABILITY } from './persistence-CBToZ0R6.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-QfdvKIrL.mjs';
+import { c as configuration } from './configuration-zOfO2qdB.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-B7zpuzvS.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-D5WuPqNq.mjs';
-import { h as hashObject, s as startHappyServer } from './deterministicJson-_ueym6P9.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-CM7ErnPh.mjs';
+import { h as hashObject, s as startHappyServer } from './deterministicJson-DVvfcibH.mjs';
 import { M as MessageBuffer } from './messageBuffer-BWlGgR3A.mjs';
-import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-jnRQaZHz.mjs';
-import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-ysDCwvLZ.mjs';
+import { n as notifyDaemonSessionStarted, j as reportSessionEditToDaemon, c as checkDaemonHibernation } from './controlClient-CbmWgWJW.mjs';
+import { a as HibernationExitLatch, H as HibernationProbe, c as commitHibernation, b as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-CmgCDVpL.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DSAvg1uv.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-Bo71spZj.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-D51KXWAP.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-BovyjKpb.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CWo9yDAC.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-C2l8XLZh.mjs';
-import './browser-C3RfAAKZ.mjs';
+import './time-7iVn8KLQ.mjs';
+import './browser-IVfX6PQT.mjs';
 import 'open';
 import 'zod';
 import 'node:fs/promises';
-import './attachmentLimits-CxG3T18E.mjs';
+import './attachmentLimits-BLbji11b.mjs';
 import 'node:fs';
-import './lidState-CiwwMPiC.mjs';
+import './lidState-Bv862v_R.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
 import './limits-DIo7rEBR.mjs';
-import './registerCommonHandlers-CKGuVOeg.mjs';
+import './registerCommonHandlers-C_KbP5Mq.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
-import './sync-BCvWgeKP.mjs';
+import './sync-MTpgBfV2.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
@@ -61,36 +61,36 @@ import 'node:readline';
 import './manager-BEsI4qt3.mjs';
 import '@anthropic-ai/sandbox-runtime';
 import 'node:os';
-import './package-BqyoBO6-.mjs';
-import './rateLimitWindows-CN8-h93x.mjs';
+import './package-DkI3yDe0.mjs';
+import './rateLimitWindows-i2-530Zt.mjs';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-BBc18QLQ.mjs';
+import './localHappyAgentAuth-CLP3CBMK.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './client-fK8W49FV.mjs';
-import './context-BAtDjDOk.mjs';
-import './sessionOps-CcmJqdXx.mjs';
+import './client-DbqP92Fy.mjs';
+import './context-BTX3YYdt.mjs';
+import './sessionOps-DfAtoDD5.mjs';
 import './resources-BdFBQi8r.mjs';
-import './tools-BePFwQbi.mjs';
-import './reportProgressTool-s1gsP8m0.mjs';
-import './client-zwQlJRMk.mjs';
+import './tools-BSlqfWAq.mjs';
+import './reportProgressTool-DujvMncK.mjs';
+import './client-Bi1DOVy9.mjs';
 import './precheckCompat-DeEbilbr.mjs';
 import './agentGuidance-BDYt2Qy2.mjs';
-import './peerTools-mGYiO3l7.mjs';
+import './peerTools-zfe59JAw.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-DzUNuVJ2.mjs';
+import './remoteSessionClient-Bk1Qzb5I.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import './downloadTarget-BtxrKDTj.mjs';
+import './downloadTarget-C-18yOBz.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-BZWMYFvq.mjs';
+import './bootstrap-D1RRCJdQ.mjs';
 import './previewPath-CXN4Vag0.mjs';
-import './spawnHappyCLI-DoQNyr_S.mjs';
+import './spawnHappyCLI-CYS23qZY.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -1028,18 +1028,41 @@ function unsupportedEffortReason(catalog, model, effort) {
   return `Reasoning effort "${effort}" is not supported by ${model ?? "the default model"}. Choose a supported level.`;
 }
 
+const UNEXPECTED_STATUS = /^unexpected status (\d{3}) ([^:]*?):\s*([\s\S]*?)(?:,\s*url:\s*(\S+))?$/;
 function readableCodexErrorText(text) {
   const trimmed = text.trim();
-  if (!trimmed.startsWith("{")) return trimmed;
+  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(trimmed);
+    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() : trimmed;
+    return message ? message.trim() : null;
   } catch {
-    return trimmed;
+    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;
@@ -1050,6 +1073,12 @@ function describeCodexFailure(msg) {
   }
   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}`;
+}
 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 : "";
@@ -1741,6 +1770,10 @@ async function runCodex(opts) {
       } else {
         messageBuffer.addMessage("Turn aborted", "status");
       }
+    } else if (msg.type === "turn_retry") {
+      const notice = describeCodexRetry(msg);
+      messageBuffer.addMessage(notice, "status");
+      session.sendSessionEvent({ type: "message", message: notice });
     }
     if (msg.type === "task_started") {
       if (!thinking) {
@@ -1955,6 +1988,10 @@ async function runCodex(opts) {
       if (!message) {
         break;
       }
+      if (!thinking) {
+        thinking = true;
+        session.keepAlive(thinking, "remote");
+      }
       idleRelease.cancel();
       turnActive = true;
       if (isCodexClearText(message.message)) {

package/dist/{codexCommand-BB-IfyuD.cjs → codexCommand-u4m_X8VA.cjs}

@@ -1,61 +1,61 @@
 'use strict';
 
-var auth = require('./auth-WejIQ4It.cjs');
-var index = require('./index-C9hI8a10.cjs');
+var auth = require('./auth-BD2z4MCH.cjs');
+var index = require('./index-BZdhwBKa.cjs');
 var forkBackfill = require('./forkBackfill-8eLDeS73.cjs');
 var node_crypto = require('node:crypto');
 var cuid2 = require('@paralleldrive/cuid2');
 var agentAttachments = require('./agentAttachments-Dbw8iMCZ.cjs');
-var attachmentContent = require('./attachmentContent-CHf3eL0Y.cjs');
+var attachmentContent = require('./attachmentContent-ULnsMsIL.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-0-SrV4-1.cjs');
+var sessionLock = require('./sessionLock-ClIuWFru.cjs');
 var React = require('react');
-var api = require('./api-CaJSqKNs.cjs');
-var codexAppServerClient = require('./codexAppServerClient-DycnOzQe.cjs');
-var specialCommands = require('./specialCommands-DoqboGXs.cjs');
-var logger = require('./logger-DzlviMqj.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-CJ-hBqXC.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-4bFzseG-.cjs');
+var api = require('./api-Cy_Mbe8W.cjs');
+var codexAppServerClient = require('./codexAppServerClient-BWB1267F.cjs');
+var specialCommands = require('./specialCommands-Dkg5wrXd.cjs');
+var logger = require('./logger-XjIS0lU7.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-CJQPjMEa.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-BY9a3RTU.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-C4EJH25e.cjs');
-var machineMetadata = require('./machineMetadata-DqiEPR3V.cjs');
-var configuration = require('./configuration-STY7x-7R.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-ClBRcSIB.cjs');
+var persistence = require('./persistence-BO7AS2NK.cjs');
+var machineMetadata = require('./machineMetadata-DTxYqMdE.cjs');
+var configuration = require('./configuration-Btwt68O2.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-B_FqygY4.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-D4-HIfgv.cjs');
-var deterministicJson = require('./deterministicJson-DAc-zyN5.cjs');
+var createSessionMetadata = require('./createSessionMetadata-Cgfcg0WZ.cjs');
+var deterministicJson = require('./deterministicJson-B3V5Ss2l.cjs');
 var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var controlClient = require('./controlClient-CebVACe-.cjs');
-var defaultPermissionMode = require('./defaultPermissionMode-Dpp_0LDW.cjs');
+var controlClient = require('./controlClient-CEpaptre.cjs');
+var defaultPermissionMode = require('./defaultPermissionMode-DqdkzYUY.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-Cez3OAew.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-BJCXuFad.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-C9hT0Xsu.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-Dk1yo6aK.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-rHMAZbtS.cjs');
-require('./browser-CCHGJm7N.cjs');
+require('./time-ChuhR6SU.cjs');
+require('./browser-i45hmvWw.cjs');
 require('open');
 require('zod');
 require('node:fs/promises');
-require('./attachmentLimits-BEYEEBm8.cjs');
+require('./attachmentLimits-D6bT2jU1.cjs');
 require('node:fs');
-require('./lidState-Cg_Py7_U.cjs');
+require('./lidState-7uLoa43a.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./registerCommonHandlers-CVRDxFE_.cjs');
+require('./registerCommonHandlers-DTeuk3Hw.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-Du8nvGy7.cjs');
+require('./sync-CGVTRg-R.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
@@ -63,36 +63,36 @@ require('node:readline');
 require('./manager-HrEj442o.cjs');
 require('@anthropic-ai/sandbox-runtime');
 require('node:os');
-require('./package-nbb58BLd.cjs');
-require('./rateLimitWindows-Dhxqp5vg.cjs');
+require('./package-DFQUF2in.cjs');
+require('./rateLimitWindows-U7NsRvIa.cjs');
 require('node:util');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-C4o6MzBa.cjs');
+require('./localHappyAgentAuth-CfILduPd.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./client-KN7Dx4KY.cjs');
-require('./context-D7aq_E7l.cjs');
-require('./sessionOps-DjJBl__b.cjs');
+require('./client-QtWC3yii.cjs');
+require('./context-BknomZTq.cjs');
+require('./sessionOps-C7wI8Ll6.cjs');
 require('./resources-JDPugcDq.cjs');
-require('./tools-Orwoeq44.cjs');
-require('./reportProgressTool-DLpxKy7b.cjs');
-require('./client-C2uxNVt0.cjs');
+require('./tools-9hPR5-u8.cjs');
+require('./reportProgressTool-oJMMqzKb.cjs');
+require('./client-B6H6ZROd.cjs');
 require('./precheckCompat-CWOi5c9L.cjs');
 require('./agentGuidance-BtBx2xxE.cjs');
-require('./peerTools-CN1YbU5o.cjs');
+require('./peerTools-DbI6tEk1.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-4ZpYg_DF.cjs');
+require('./remoteSessionClient-D79ci1L8.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./downloadTarget-CnELVEOV.cjs');
+require('./downloadTarget-DJKG6wVj.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-hq284uwX.cjs');
+require('./bootstrap-BYrt5zUv.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./spawnHappyCLI-BDgnsyAD.cjs');
+require('./spawnHappyCLI-CrKdy_rv.cjs');
 require('./doctorReadiness-BCZGcN0a.cjs');
 
 function getStartedSubagents(state) {
@@ -1030,18 +1030,41 @@ function unsupportedEffortReason(catalog, model, effort) {
   return `Reasoning effort "${effort}" is not supported by ${model ?? "the default model"}. Choose a supported level.`;
 }
 
+const UNEXPECTED_STATUS = /^unexpected status (\d{3}) ([^:]*?):\s*([\s\S]*?)(?:,\s*url:\s*(\S+))?$/;
 function readableCodexErrorText(text) {
   const trimmed = text.trim();
-  if (!trimmed.startsWith("{")) return trimmed;
+  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(trimmed);
+    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() : trimmed;
+    return message ? message.trim() : null;
   } catch {
-    return trimmed;
+    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;
@@ -1052,6 +1075,12 @@ function describeCodexFailure(msg) {
   }
   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}`;
+}
 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 : "";
@@ -1743,6 +1772,10 @@ async function runCodex(opts) {
       } else {
         messageBuffer$1.addMessage("Turn aborted", "status");
       }
+    } else if (msg.type === "turn_retry") {
+      const notice = describeCodexRetry(msg);
+      messageBuffer$1.addMessage(notice, "status");
+      session.sendSessionEvent({ type: "message", message: notice });
     }
     if (msg.type === "task_started") {
       if (!thinking) {
@@ -1957,6 +1990,10 @@ async function runCodex(opts) {
       if (!message) {
         break;
       }
+      if (!thinking) {
+        thinking = true;
+        session.keepAlive(thinking, "remote");
+      }
       idleRelease.cancel();
       turnActive = true;
       if (isCodexClearText(message.message)) {

package/dist/{config-BMrE7XNv.cjs → config-BaJCpLzN.cjs}

@@ -4,15 +4,15 @@ var fs = require('fs');
 var path = require('path');
 var os = require('os');
 var child_process = require('child_process');
-var logger = require('./logger-DzlviMqj.cjs');
+var logger = require('./logger-XjIS0lU7.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-STY7x-7R.cjs');
+require('./configuration-Btwt68O2.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-nbb58BLd.cjs');
+require('./package-DFQUF2in.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{config-BNCfbqWi.mjs → config-Czc1tQDn.mjs}

@@ -2,15 +2,15 @@ import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
-import { l as logger } from './logger-5nrNOr9k.mjs';
+import { l as logger } from './logger-CUxbqfrp.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-B06-un22.mjs';
+import './configuration-zOfO2qdB.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-BqyoBO6-.mjs';
+import './package-DkI3yDe0.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';