very-happy-cli 0.2.165 → 0.2.166

package/dist/{codexCommand-YdYmykAR.cjs → codexCommand-BpD0N1F7.cjs}

@@ -1,61 +1,61 @@
 'use strict';
 
-var auth = require('./auth-CfLd3phE.cjs');
-var index = require('./index-DqlyNgt4.cjs');
+var auth = require('./auth-ietHtvwu.cjs');
+var index = require('./index-C9hI8a10.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-muDCe4Gy.cjs');
+var attachmentContent = require('./attachmentContent-DPWxHgX4.cjs');
 var ink = require('ink');
-var sessionLock = require('./sessionLock-B1GgaO1q.cjs');
+var sessionLock = require('./sessionLock-DfhNICyS.cjs');
 var React = require('react');
-var api = require('./api-AzdzTKFs.cjs');
-var codexAppServerClient = require('./codexAppServerClient-BuSdeUxT.cjs');
-var logger = require('./logger-D0hkk7Vo.cjs');
-var BasePermissionHandler = require('./BasePermissionHandler-BwQHxl6M.cjs');
-var BaseReasoningProcessor = require('./BaseReasoningProcessor-81lf_M8G.cjs');
+var api = require('./api-DnNL5fLw.cjs');
+var codexAppServerClient = require('./codexAppServerClient-BTjn2ZCZ.cjs');
+var specialCommands = require('./specialCommands-DouFaJ_0.cjs');
+var logger = require('./logger-JTcJU-uL.cjs');
+var BasePermissionHandler = require('./BasePermissionHandler-COKc4pmt.cjs');
+var BaseReasoningProcessor = require('./BaseReasoningProcessor-DAGQdkNp.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-C6ztVW1W.cjs');
-var machineMetadata = require('./machineMetadata-BDCYOXQg.cjs');
-var configuration = require('./configuration-BE61XNsg.cjs');
-var registerKillSessionHandler = require('./registerKillSessionHandler-CI23l8aJ.cjs');
+var persistence = require('./persistence-2Xp_o6x6.cjs');
+var machineMetadata = require('./machineMetadata-BBg_Njw3.cjs');
+var configuration = require('./configuration-B0cb3xA3.cjs');
+var registerKillSessionHandler = require('./registerKillSessionHandler-CjitOpUA.cjs');
 var projectPath = require('./projectPath-ChLhdOyt.cjs');
 var path = require('node:path');
-var createSessionMetadata = require('./createSessionMetadata-CPGTztXP.cjs');
-var deterministicJson = require('./deterministicJson-C4Jo2RWy.cjs');
+var createSessionMetadata = require('./createSessionMetadata-DbfRBhRu.cjs');
+var deterministicJson = require('./deterministicJson-Dp3TVyap.cjs');
 var messageBuffer = require('./messageBuffer-fJMH6uY8.cjs');
-var controlClient = require('./controlClient-RWTlQA4_.cjs');
+var controlClient = require('./controlClient-CmnHGcyl.cjs');
 var authRelay = require('./authRelay-BdYkC1Po.cjs');
-var setupOfflineReconnection = require('./setupOfflineReconnection-CKJKVIUS.cjs');
+var setupOfflineReconnection = require('./setupOfflineReconnection-DFmQ8s6I.cjs');
 var trimIdent = require('./trimIdent-4gvk9Wk6.cjs');
-var specialCommands = require('./specialCommands-DSsTeRej.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 var defaultPermissionMode = require('./defaultPermissionMode-CxmTXUQR.cjs');
 var editPaths = require('./editPaths-Bqp4OFPw.cjs');
-var ensureDaemonRunning = require('./ensureDaemonRunning-mIgX2vnc.cjs');
+var ensureDaemonRunning = require('./ensureDaemonRunning-C_aIOhgG.cjs');
 require('tweetnacl');
 require('axios');
-require('./time-BbzJ7PJQ.cjs');
-require('./browser-_gV7tcPs.cjs');
+require('./time-T0YmeOhS.cjs');
+require('./browser-CcG8GLRV.cjs');
 require('open');
 require('zod');
 require('node:fs/promises');
-require('./attachmentLimits-eJZ4ZBjF.cjs');
+require('./attachmentLimits-BfgKV5iE.cjs');
 require('node:fs');
-require('./lidState-z9ekRpZu.cjs');
+require('./lidState-D8BmnJV1.cjs');
 require('os');
 require('child_process');
 require('node:events');
 require('socket.io-client');
 require('./limits-C-a7gr04.cjs');
-require('./registerCommonHandlers--8ds2auE.cjs');
+require('./registerCommonHandlers-Aha_KfM3.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
 require('path');
 require('cross-spawn');
-require('./sync-DwUUGGFz.cjs');
+require('./sync-x_lI_3j_.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('chalk');
@@ -63,34 +63,36 @@ require('node:readline');
 require('./manager-Cly8xVIR.cjs');
 require('@anthropic-ai/sandbox-runtime');
 require('node:os');
-require('./package-UkmvSFsg.cjs');
+require('./package-C1XvUQFy.cjs');
+require('./rateLimitWindows-C2Jk3Ih7.cjs');
 require('node:util');
 require('./detectCLI-DR9ZaN6B.cjs');
 require('fs');
-require('./localHappyAgentAuth-BCx0y1qW.cjs');
+require('./localHappyAgentAuth-d7B6S_o7.cjs');
 require('./types-CRS-srZK.cjs');
 require('url');
-require('./client-Do7cGPEq.cjs');
-require('./context-3WVw8qPz.cjs');
-require('./sessionOps-JP64uJmc.cjs');
+require('./client-JISJx2f-.cjs');
+require('./context-BFUpYT39.cjs');
+require('./sessionOps-DOyy4gkY.cjs');
 require('./resources-JDPugcDq.cjs');
-require('./tools-c2fb0CF5.cjs');
-require('./tools-mWqsE6ji.cjs');
-require('./client-uN9d6Git.cjs');
-require('./peerTools-CttfOxti.cjs');
+require('./tools-IJ0TAcJs.cjs');
+require('./reportProgressTool-B-Rcy0s3.cjs');
+require('./client-DJ0kX_8M.cjs');
+require('./precheckCompat-CWOi5c9L.cjs');
+require('./agentGuidance-BtBx2xxE.cjs');
+require('./peerTools-DPvbcs8V.cjs');
 require('./ids-B6ZC0HGt.cjs');
-require('./remoteSessionClient-BAkIwM2S.cjs');
+require('./remoteSessionClient-BwI8rpQw.cjs');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
-require('./assistantTools-BsrG3PD-.cjs');
+require('./downloadTarget-CiQqRIc-.cjs');
 require('./terminals-B_bfC9c2.cjs');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
 require('./tmuxSocket-D-Xt6Vn-.cjs');
-require('./bootstrap-B1dMZA-u.cjs');
-require('./agentGuidance-B5NATuFa.cjs');
+require('./bootstrap-BpXIc2wn.cjs');
 require('./previewPath-B0rBdhy1.cjs');
-require('./spawnHappyCLI-Dd5_8Vex.cjs');
+require('./spawnHappyCLI-DyaldIe5.cjs');
 require('./doctorReadiness-BCZGcN0a.cjs');
 
 function getStartedSubagents(state) {
@@ -652,20 +654,29 @@ async function readChildThread(client, childId) {
   return { envelopes: mapCodexThreadToSessionEnvelopes(thread) };
 }
 
+const HAPPY_MCP_SERVER_NAME = "happy";
 class CodexPermissionHandler extends BasePermissionHandler.BasePermissionHandler {
   // Exact tool names that should always be auto-approved. Include the bare
   // form (used by Codex elicitation messages like `tool "change_title"`)
-  // and the MCP-qualified form for defense in depth.
+  // and the MCP-qualified form for defense in depth. A BARE name (and an ID
+  // prefix) only counts when the request comes from our own server: any
+  // other MCP server may expose a tool with the same name.
+  // B-556: report_progress only writes this session's own board line (same
+  // trust as change_title); an approval prompt per report would park the
+  // session in "waiting for you" at every milestone.
   static ALWAYS_AUTO_APPROVE_NAMES = /* @__PURE__ */ new Set([
     "change_title",
-    "mcp__happy__change_title"
+    "mcp__happy__change_title",
+    "report_progress",
+    "mcp__happy__report_progress"
   ]);
   // Tool-call IDs that should auto-approve when they exactly match one of
   // these values or start with `<name>-` (e.g. `change_title-1765385846663`).
   // Substring matching was a bypass vector — any tool whose ID happened to
   // contain `change_title` as a substring would be silently approved.
   static ALWAYS_AUTO_APPROVE_ID_PREFIXES = [
-    "change_title"
+    "change_title",
+    "report_progress"
   ];
   constructor(session) {
     super(session);
@@ -673,7 +684,11 @@ class CodexPermissionHandler extends BasePermissionHandler.BasePermissionHandler
   getLogPrefix() {
     return "[Codex]";
   }
-  shouldAutoApprove(toolName, toolCallId) {
+  shouldAutoApprove(toolName, toolCallId, serverName) {
+    if (toolName.startsWith(`mcp__${HAPPY_MCP_SERVER_NAME}__`)) {
+      return CodexPermissionHandler.ALWAYS_AUTO_APPROVE_NAMES.has(toolName);
+    }
+    if (serverName !== HAPPY_MCP_SERVER_NAME) return false;
     if (CodexPermissionHandler.ALWAYS_AUTO_APPROVE_NAMES.has(toolName)) {
       return true;
     }
@@ -689,10 +704,11 @@ class CodexPermissionHandler extends BasePermissionHandler.BasePermissionHandler
    * @param toolCallId - The unique ID of the tool call
    * @param toolName - The name of the tool being called
    * @param input - The input parameters for the tool
+   * @param serverName - MCP server of an elicitation (`mcpServer/elicitation/request`); undefined for exec/patch
    * @returns Promise resolving to permission result
    */
-  async handleToolCall(toolCallId, toolName, input) {
-    if (this.shouldAutoApprove(toolName, toolCallId)) {
+  async handleToolCall(toolCallId, toolName, input, serverName) {
+    if (this.shouldAutoApprove(toolName, toolCallId, serverName)) {
       logger.logger.debug(`${this.getLogPrefix()} Auto-approving tool ${toolName} (${toolCallId})`);
       this.session.updateAgentState((currentState) => ({
         ...currentState,
@@ -1517,7 +1533,7 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
-  async function handleAbort() {
+  async function handleAbort(source) {
     if (abortInProgress) {
       await abortInProgress;
       return;
@@ -1533,6 +1549,9 @@ async function runCodex(opts) {
             gracePeriodMs: 3e3,
             forceRestartOnTimeout: true
           });
+          if (source === "user" && abortResult.hadActiveTurn && abortResult.aborted) {
+            session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          }
           if (abortResult.forcedRestart) {
             logger.logger.warn("[Codex] Forced app-server restart after interrupt timeout");
             session.sendSessionEvent({
@@ -1558,7 +1577,7 @@ async function runCodex(opts) {
   }
   const handleKillSession = async () => {
     logger.logger.debug("[Codex] Kill session requested - terminating process");
-    await handleAbort();
+    await handleAbort("kill");
     logger.logger.debug("[Codex] Abort completed, proceeding with termination");
     try {
       if (session) {
@@ -1593,7 +1612,7 @@ async function runCodex(opts) {
       return { error: error instanceof Error ? error.message : "Child read failed" };
     }
   });
-  session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
   const disposeTermination = registerKillSessionHandler.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session, { processSignals: true });
   const messageBuffer$1 = new messageBuffer.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -1606,7 +1625,7 @@ async function runCodex(opts) {
       onExit: async () => {
         logger.logger.debug("[codex]: Exiting agent via Ctrl-C");
         shouldExit = true;
-        await handleAbort();
+        await handleAbort("exit");
       }
     }), {
       exitOnCtrlC: false,
@@ -1655,7 +1674,7 @@ async function runCodex(opts) {
     const toolName = params.type === "exec" ? "CodexBash" : params.type === "patch" ? "CodexPatch" : params.toolName ?? "McpTool";
     const input = params.type === "exec" ? { command: params.command, cwd: params.cwd } : params.type === "patch" ? { changes: params.fileChanges } : params.input ?? {};
     try {
-      const result = await permissionHandler.handleToolCall(params.callId, toolName, input);
+      const result = await permissionHandler.handleToolCall(params.callId, toolName, input, params.type === "mcp" ? params.serverName : void 0);
       logger.logger.debug("[Codex] Permission request resolved");
       return result.decision;
     } catch (error) {
@@ -1664,6 +1683,7 @@ async function runCodex(opts) {
     }
   });
   const editThrottle = new editPaths.EditReportThrottle();
+  client.setRateLimitHandler((snapshot) => specialCommands.wrapperRateLimitReporter().observeCodex(snapshot));
   client.setEventHandler((msg) => {
     if (msg.type === "token_count") {
       session.sendAgentUsageSnapshot("codex", msg);
@@ -1768,7 +1788,7 @@ async function runCodex(opts) {
   const happyServer = await deterministicJson.startHappyServer(session);
   const bridgeEntrypoint = path.join(projectPath.projectPath(), "bin", "very-happy-mcp.mjs");
   const mcpServers = {
-    happy: {
+    [HAPPY_MCP_SERVER_NAME]: {
       command: process.execPath,
       args: ["--no-warnings", "--no-deprecation", bridgeEntrypoint, "--url", happyServer.url]
     }

package/dist/{codexCommand-C3gdjMAw.mjs → codexCommand-DjMU-Ijf.mjs}

@@ -1,59 +1,59 @@
-import { a as authAndSetupMachineIfNeeded } from './auth-BY5ujhGn.mjs';
-import { e as createEnvelope, l as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-vVWpCoTr.mjs';
+import { a as authAndSetupMachineIfNeeded } from './auth-pzWIFdOD.mjs';
+import { c as createEnvelope, o as BUILTIN_TODO_DISCOVERY, P as PROMPT_QUEUE_CAPABILITY } from './index-B0HEEYGh.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-dzIs-wis.mjs';
+import { C as CLAUDE_ATTACHMENT_KINDS, a as stageClaudeAttachments, b as appendStagedAttachmentsToPrompt } from './attachmentContent-CTXapi-_.mjs';
 import { useStdout, useInput, Box, Text, render } from 'ink';
-import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-Dm8QyGo4.mjs';
+import { c as claimSessionOrExit, a as applyServerSnapshot, w as withoutServerSnapshot, m as mergeReconnectMetadata } from './sessionLock-DqVyHFAQ.mjs';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { c as connectionState, A as ApiClient } from './api-DTVPUE7g.mjs';
-import { C as CodexAppServerClient } from './codexAppServerClient-B0QaMQsC.mjs';
-import { l as logger } from './logger-CknSVkIe.mjs';
-import { B as BasePermissionHandler } from './BasePermissionHandler-CwJ48yiB.mjs';
-import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-ClF2g1qz.mjs';
+import { c as connectionState, A as ApiClient } from './api-Cmz3XS4P.mjs';
+import { C as CodexAppServerClient } from './codexAppServerClient-CldXEojt.mjs';
+import { p as parseSpecialCommand, w as wrapperRateLimitReporter } from './specialCommands-CCWtwIGZ.mjs';
+import { l as logger } from './logger-BpQcwNnt.mjs';
+import { B as BasePermissionHandler } from './BasePermissionHandler-CDCLIrZJ.mjs';
+import { B as BaseReasoningProcessor } from './BaseReasoningProcessor-BDVKvooR.mjs';
 import { execSync } from 'node:child_process';
-import { readSettings } from './persistence-DujtUH94.mjs';
-import { g as getInitialMachineMetadata } from './machineMetadata-Cj1DoFot.mjs';
-import { c as configuration } from './configuration-L1qcGTFM.mjs';
-import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-Czz0tdki.mjs';
+import { readSettings } from './persistence-B9LmhAE2.mjs';
+import { g as getInitialMachineMetadata } from './machineMetadata-CBdxABeI.mjs';
+import { c as configuration } from './configuration-D2v3puap.mjs';
+import { M as MessageQueue2, r as registerKillSessionHandler } from './registerKillSessionHandler-DboQlGcH.mjs';
 import { p as projectPath } from './projectPath-BTBIMB57.mjs';
 import { join } from 'node:path';
-import { c as createSessionMetadata } from './createSessionMetadata-CWR-AB2A.mjs';
-import { h as hashObject, s as startHappyServer } from './deterministicJson-BBwG-Ase.mjs';
+import { c as createSessionMetadata } from './createSessionMetadata-DU0bCg2m.mjs';
+import { h as hashObject, s as startHappyServer } from './deterministicJson-D-WPUrZb.mjs';
 import { M as MessageBuffer } from './messageBuffer-BWlGgR3A.mjs';
-import { n as notifyDaemonSessionStarted, g as reportSessionEditToDaemon } from './controlClient-Ci7HTMII.mjs';
+import { n as notifyDaemonSessionStarted, h as reportSessionEditToDaemon } from './controlClient-BMUJfUeF.mjs';
 import { d as decodeBase64, e as encodeBase64 } from './authRelay-DSAvg1uv.mjs';
-import { s as setupOfflineReconnection } from './setupOfflineReconnection-_MoZtsro.mjs';
+import { s as setupOfflineReconnection } from './setupOfflineReconnection-Byy8aeKT.mjs';
 import { t as trimIdent } from './trimIdent-BAjmv_TG.mjs';
-import { p as parseSpecialCommand } from './specialCommands-BSqhYg5X.mjs';
 import { C as CHANGE_TITLE_INSTRUCTION } from './constants-BC4St0xd.mjs';
 import { a as DEFAULT_CODEX_PERMISSION_MODE } from './defaultPermissionMode-BnxJPVHT.mjs';
 import { E as EditReportThrottle, a as extractCodexPatchPaths } from './editPaths-BVfS_FFL.mjs';
-import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-b1pvEFcS.mjs';
+import { a as extractNoSandboxFlag, e as ensureDaemonRunning } from './ensureDaemonRunning-CAQag1zE.mjs';
 import 'tweetnacl';
 import 'axios';
-import './time-v1Y_qEJp.mjs';
-import './browser-mwzpOmcw.mjs';
+import './time-CfDKj6Bx.mjs';
+import './browser-DDFi1T8C.mjs';
 import 'open';
 import 'zod';
 import 'node:fs/promises';
-import './attachmentLimits-B8nzhw-i.mjs';
+import './attachmentLimits-C1PCCM79.mjs';
 import 'node:fs';
-import './lidState-BLHLmhwd.mjs';
+import './lidState-BfximpjX.mjs';
 import 'os';
 import 'child_process';
 import 'node:events';
 import 'socket.io-client';
 import './limits-DIo7rEBR.mjs';
-import './registerCommonHandlers-BR0J4g64.mjs';
+import './registerCommonHandlers-DdfGsFbM.mjs';
 import 'util';
 import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'cross-spawn';
-import './sync-Dfm6K2te.mjs';
+import './sync-BLpH13Kb.mjs';
 import './backgroundTaskActivity-8PdPxrvy.mjs';
 import './contentLogMetadata-BlWI0egu.mjs';
 import 'chalk';
@@ -61,34 +61,36 @@ import 'node:readline';
 import './manager-BQ4flvQZ.mjs';
 import '@anthropic-ai/sandbox-runtime';
 import 'node:os';
-import './package-VIUXrYZ1.mjs';
+import './package-BqwrPxL0.mjs';
+import './rateLimitWindows-Dhfhbtqu.mjs';
 import 'node:util';
 import './detectCLI-CSGMlV51.mjs';
 import 'fs';
-import './localHappyAgentAuth-BWvmc_Hg.mjs';
+import './localHappyAgentAuth-Ct1aXwqd.mjs';
 import './types-CkqAACXx.mjs';
 import 'url';
-import './client-BwaWdlCm.mjs';
-import './context-DaCCB4cm.mjs';
-import './sessionOps-DG5MMEp_.mjs';
+import './client-CbK33y_s.mjs';
+import './context-DjfqLWzE.mjs';
+import './sessionOps-BnaEaOKs.mjs';
 import './resources-BdFBQi8r.mjs';
-import './tools-jof0Bu54.mjs';
-import './tools-BVRoGcQH.mjs';
-import './client-CJZKBZCE.mjs';
-import './peerTools-SWITnkqz.mjs';
+import './tools-3X2z3YDe.mjs';
+import './reportProgressTool-DnAD8wOa.mjs';
+import './client-GjTnsq6F.mjs';
+import './precheckCompat-DeEbilbr.mjs';
+import './agentGuidance-BDYt2Qy2.mjs';
+import './peerTools-CeCe-3lk.mjs';
 import './ids-DU6sLx4C.mjs';
-import './remoteSessionClient-DCAUHgPz.mjs';
+import './remoteSessionClient-B2DtWuNP.mjs';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
-import './assistantTools-DPGga5lM.mjs';
+import './downloadTarget-DjSwMHun.mjs';
 import './terminals-Dlg0x3nY.mjs';
 import './terminalTitleSuggest-CeKsX_V6.mjs';
 import './tmuxSocket-B8Yx20sT.mjs';
-import './bootstrap-D_ExGrY2.mjs';
-import './agentGuidance-CQuNlNx8.mjs';
+import './bootstrap-XE8A7Ut2.mjs';
 import './previewPath-CXN4Vag0.mjs';
-import './spawnHappyCLI-Dc4xYm8P.mjs';
+import './spawnHappyCLI-BAa49m0q.mjs';
 import './doctorReadiness-C208SMN9.mjs';
 
 function getStartedSubagents(state) {
@@ -650,20 +652,29 @@ async function readChildThread(client, childId) {
   return { envelopes: mapCodexThreadToSessionEnvelopes(thread) };
 }
 
+const HAPPY_MCP_SERVER_NAME = "happy";
 class CodexPermissionHandler extends BasePermissionHandler {
   // Exact tool names that should always be auto-approved. Include the bare
   // form (used by Codex elicitation messages like `tool "change_title"`)
-  // and the MCP-qualified form for defense in depth.
+  // and the MCP-qualified form for defense in depth. A BARE name (and an ID
+  // prefix) only counts when the request comes from our own server: any
+  // other MCP server may expose a tool with the same name.
+  // B-556: report_progress only writes this session's own board line (same
+  // trust as change_title); an approval prompt per report would park the
+  // session in "waiting for you" at every milestone.
   static ALWAYS_AUTO_APPROVE_NAMES = /* @__PURE__ */ new Set([
     "change_title",
-    "mcp__happy__change_title"
+    "mcp__happy__change_title",
+    "report_progress",
+    "mcp__happy__report_progress"
   ]);
   // Tool-call IDs that should auto-approve when they exactly match one of
   // these values or start with `<name>-` (e.g. `change_title-1765385846663`).
   // Substring matching was a bypass vector — any tool whose ID happened to
   // contain `change_title` as a substring would be silently approved.
   static ALWAYS_AUTO_APPROVE_ID_PREFIXES = [
-    "change_title"
+    "change_title",
+    "report_progress"
   ];
   constructor(session) {
     super(session);
@@ -671,7 +682,11 @@ class CodexPermissionHandler extends BasePermissionHandler {
   getLogPrefix() {
     return "[Codex]";
   }
-  shouldAutoApprove(toolName, toolCallId) {
+  shouldAutoApprove(toolName, toolCallId, serverName) {
+    if (toolName.startsWith(`mcp__${HAPPY_MCP_SERVER_NAME}__`)) {
+      return CodexPermissionHandler.ALWAYS_AUTO_APPROVE_NAMES.has(toolName);
+    }
+    if (serverName !== HAPPY_MCP_SERVER_NAME) return false;
     if (CodexPermissionHandler.ALWAYS_AUTO_APPROVE_NAMES.has(toolName)) {
       return true;
     }
@@ -687,10 +702,11 @@ class CodexPermissionHandler extends BasePermissionHandler {
    * @param toolCallId - The unique ID of the tool call
    * @param toolName - The name of the tool being called
    * @param input - The input parameters for the tool
+   * @param serverName - MCP server of an elicitation (`mcpServer/elicitation/request`); undefined for exec/patch
    * @returns Promise resolving to permission result
    */
-  async handleToolCall(toolCallId, toolName, input) {
-    if (this.shouldAutoApprove(toolName, toolCallId)) {
+  async handleToolCall(toolCallId, toolName, input, serverName) {
+    if (this.shouldAutoApprove(toolName, toolCallId, serverName)) {
       logger.debug(`${this.getLogPrefix()} Auto-approving tool ${toolName} (${toolCallId})`);
       this.session.updateAgentState((currentState) => ({
         ...currentState,
@@ -1515,7 +1531,7 @@ async function runCodex(opts) {
   }
   let abortController = new AbortController();
   let shouldExit = false;
-  async function handleAbort() {
+  async function handleAbort(source) {
     if (abortInProgress) {
       await abortInProgress;
       return;
@@ -1531,6 +1547,9 @@ async function runCodex(opts) {
             gracePeriodMs: 3e3,
             forceRestartOnTimeout: true
           });
+          if (source === "user" && abortResult.hadActiveTurn && abortResult.aborted) {
+            session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          }
           if (abortResult.forcedRestart) {
             logger.warn("[Codex] Forced app-server restart after interrupt timeout");
             session.sendSessionEvent({
@@ -1556,7 +1575,7 @@ async function runCodex(opts) {
   }
   const handleKillSession = async () => {
     logger.debug("[Codex] Kill session requested - terminating process");
-    await handleAbort();
+    await handleAbort("kill");
     logger.debug("[Codex] Abort completed, proceeding with termination");
     try {
       if (session) {
@@ -1591,7 +1610,7 @@ async function runCodex(opts) {
       return { error: error instanceof Error ? error.message : "Child read failed" };
     }
   });
-  session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  session.rpcHandlerManager.registerHandler("abort", () => handleAbort("user"));
   const disposeTermination = registerKillSessionHandler(session.rpcHandlerManager, handleKillSession, session, { processSignals: true });
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -1604,7 +1623,7 @@ async function runCodex(opts) {
       onExit: async () => {
         logger.debug("[codex]: Exiting agent via Ctrl-C");
         shouldExit = true;
-        await handleAbort();
+        await handleAbort("exit");
       }
     }), {
       exitOnCtrlC: false,
@@ -1653,7 +1672,7 @@ async function runCodex(opts) {
     const toolName = params.type === "exec" ? "CodexBash" : params.type === "patch" ? "CodexPatch" : params.toolName ?? "McpTool";
     const input = params.type === "exec" ? { command: params.command, cwd: params.cwd } : params.type === "patch" ? { changes: params.fileChanges } : params.input ?? {};
     try {
-      const result = await permissionHandler.handleToolCall(params.callId, toolName, input);
+      const result = await permissionHandler.handleToolCall(params.callId, toolName, input, params.type === "mcp" ? params.serverName : void 0);
       logger.debug("[Codex] Permission request resolved");
       return result.decision;
     } catch (error) {
@@ -1662,6 +1681,7 @@ async function runCodex(opts) {
     }
   });
   const editThrottle = new EditReportThrottle();
+  client.setRateLimitHandler((snapshot) => wrapperRateLimitReporter().observeCodex(snapshot));
   client.setEventHandler((msg) => {
     if (msg.type === "token_count") {
       session.sendAgentUsageSnapshot("codex", msg);
@@ -1766,7 +1786,7 @@ async function runCodex(opts) {
   const happyServer = await startHappyServer(session);
   const bridgeEntrypoint = join(projectPath(), "bin", "very-happy-mcp.mjs");
   const mcpServers = {
-    happy: {
+    [HAPPY_MCP_SERVER_NAME]: {
       command: process.execPath,
       args: ["--no-warnings", "--no-deprecation", bridgeEntrypoint, "--url", happyServer.url]
     }

package/dist/{config-CGCIFRCN.mjs → config-DjSJKatx.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-CknSVkIe.mjs';
+import { l as logger } from './logger-BpQcwNnt.mjs';
 import { D as DEFAULT_GEMINI_MODEL, G as GEMINI_MODEL_ENV } from './constants-BC4St0xd.mjs';
 import 'chalk';
 import 'node:util';
-import './configuration-L1qcGTFM.mjs';
+import './configuration-D2v3puap.mjs';
 import 'node:fs';
 import 'node:os';
 import 'node:path';
-import './package-VIUXrYZ1.mjs';
+import './package-BqwrPxL0.mjs';
 import 'node:fs/promises';
 import './trimIdent-BAjmv_TG.mjs';
 

package/dist/{config-ChoHFnfO.cjs → config-DuLL0Ppe.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-D0hkk7Vo.cjs');
+var logger = require('./logger-JTcJU-uL.cjs');
 var constants = require('./constants-VJ0N6WuG.cjs');
 require('chalk');
 require('node:util');
-require('./configuration-BE61XNsg.cjs');
+require('./configuration-B0cb3xA3.cjs');
 require('node:fs');
 require('node:os');
 require('node:path');
-require('./package-UkmvSFsg.cjs');
+require('./package-C1XvUQFy.cjs');
 require('node:fs/promises');
 require('./trimIdent-4gvk9Wk6.cjs');
 

package/dist/{configuration-BE61XNsg.cjs → configuration-B0cb3xA3.cjs}

@@ -3,7 +3,7 @@
 var node_fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
-var _package = require('./package-UkmvSFsg.cjs');
+var _package = require('./package-C1XvUQFy.cjs');
 var promises = require('node:fs/promises');
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{configuration-L1qcGTFM.mjs → configuration-D2v3puap.mjs}

@@ -1,7 +1,7 @@
 import { mkdirSync, chmodSync, readdirSync, statSync, appendFileSync, writeFileSync, existsSync, readFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { p as packageJson } from './package-VIUXrYZ1.mjs';
+import { p as packageJson } from './package-BqwrPxL0.mjs';
 import { mkdir, chmod, writeFile } from 'node:fs/promises';
 
 const PRIVATE_DIRECTORY_MODE = 448;

package/dist/{connect-D5IKfcfd.cjs → connect-B7JWEzyg.cjs}

@@ -3,12 +3,12 @@
 var chalk = require('chalk');
 var os = require('os');
 var path = require('path');
-var persistence = require('./persistence-C6ztVW1W.cjs');
-var api = require('./api-AzdzTKFs.cjs');
-var configuration = require('./configuration-BE61XNsg.cjs');
+var persistence = require('./persistence-2Xp_o6x6.cjs');
+var api = require('./api-DnNL5fLw.cjs');
+var configuration = require('./configuration-B0cb3xA3.cjs');
 var http = require('http');
 var crypto = require('crypto');
-var browser = require('./browser-_gV7tcPs.cjs');
+var browser = require('./browser-CcG8GLRV.cjs');
 var child_process = require('child_process');
 var util = require('util');
 require('node:fs/promises');
@@ -17,28 +17,28 @@ require('zod');
 require('./authRelay-BdYkC1Po.cjs');
 require('node:crypto');
 require('tweetnacl');
-require('./logger-D0hkk7Vo.cjs');
+require('./logger-JTcJU-uL.cjs');
 require('node:util');
 require('node:path');
 require('node:os');
-require('./package-UkmvSFsg.cjs');
+require('./package-C1XvUQFy.cjs');
 require('axios');
-require('./lidState-z9ekRpZu.cjs');
+require('./lidState-D8BmnJV1.cjs');
 require('node:events');
 require('socket.io-client');
-require('./attachmentLimits-eJZ4ZBjF.cjs');
-require('./index-DqlyNgt4.cjs');
+require('./attachmentLimits-BfgKV5iE.cjs');
+require('./index-C9hI8a10.cjs');
 require('@paralleldrive/cuid2');
 require('./limits-C-a7gr04.cjs');
-require('./time-BbzJ7PJQ.cjs');
-require('./registerCommonHandlers--8ds2auE.cjs');
+require('./time-T0YmeOhS.cjs');
+require('./registerCommonHandlers-Aha_KfM3.cjs');
 require('fs/promises');
 require('cross-spawn');
 require('./projectPath-ChLhdOyt.cjs');
 require('url');
-require('./sync-DwUUGGFz.cjs');
+require('./sync-x_lI_3j_.cjs');
 require('./backgroundTaskActivity-CBvUdj39.cjs');
-require('./controlClient-RWTlQA4_.cjs');
+require('./controlClient-CmnHGcyl.cjs');
 require('./contentLogMetadata-ZSFk_NjQ.cjs');
 require('open');