@openclaw/codex 2026.6.11-beta.2 → 2026.7.1-1

package/dist/{side-question-C-DhgJOd.js → side-question-CMOpEhvY.js}

@@ -1,23 +1,25 @@
-import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { H as readCodexNotificationTurnId, N as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-DtT3-ehU.js";
-import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-CszD0vP3.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-B19q5BIX.js";
-import { i as formatCodexUsageLimitErrorMessage } from "./provider-B-OHpbD3.js";
-import { i as isCodexAppServerApprovalRequest } from "./client-CLrtWgrD.js";
-import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-HOuPt-E0.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
-import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-3tnjhjFb.js";
-import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-D7hnTO76.js";
-import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
+import { r as isJsonObject } from "./protocol-2POPqAY4.js";
+import { _ as shouldAutoApproveCodexAppServerApprovals, d as resolveCodexAppServerRuntimeOptions, g as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexModelBackedReviewerPolicyContext, n as canUseCodexModelBackedApprovalsReviewerForModel, u as readCodexPluginConfig } from "./config-CYEDnLJ2.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-dZQ-UTOa.js";
+import { C as filterCodexDynamicTools, E as resolveCodexDynamicToolsLoading, H as mergeCodexThreadConfigs, d as resolveCodexAppServerModelProvider, f as resolveCodexAppServerRequestModelSelection, h as resolveReasoningEffort, m as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, v as resolveCodexWebSearchPlan, z as buildCodexPluginAppsConfigPatchFromPolicyContext } from "./thread-lifecycle-qWE88Dn2.js";
+import { a as readCodexSupportedReasoningEfforts, c as formatCodexUsageLimitErrorMessage } from "./provider-zjPfx5Fs.js";
+import { a as getLeasedSharedCodexAppServerClient, d as isCodexAppServerApprovalRequest, h as readRecentCodexRateLimits, o as releaseLeasedSharedCodexAppServerClient, p as ensureCodexAppServerClientRuntime } from "./shared-client-4ICy3U6d.js";
+import { i as isCodexAppServerNativeAuthProfile, s as sessionBindingIdentity } from "./session-binding-C1ZXdP-x.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-C968Kgin.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DA2TQfZW.js";
+import { n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-Bo7KB3ks.js";
+import { D as emitDynamicToolStartedDiagnostic, E as emitDynamicToolErrorDiagnostic, I as resolveCodexMessageToolProvider, O as emitDynamicToolTerminalDiagnostic, R as shouldEnableCodexAppServerNativeToolSurface, T as createCodexDynamicToolBridge, U as handleCodexAppServerApprovalRequest, V as filterToolsForVisionInputs, Z as handleDynamicToolCallWithTimeout, _ as buildCodexNativeHookRelayDisabledConfig, g as buildCodexNativeHookRelayConfig, i as CodexNativeToolLifecycleProjector, m as CODEX_NATIVE_HOOK_RELAY_EVENTS, n as resolveCodexProviderWebSearchSupportForClient, st as resolveCodexToolAbortTerminalReason, tt as resolveDynamicToolCallTimeoutMs, w as handleCodexAppServerElicitationRequest, y as emitCodexNativePreToolUseFailureDiagnostic } from "./provider-capabilities-DzI8fgEu.js";
+import { randomUUID } from "node:crypto";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/side-question.ts
-const CODEX_SIDE_DYNAMIC_TOOL_TIMEOUT_MS = 9e4;
-const CODEX_SIDE_DYNAMIC_TOOL_MAX_TIMEOUT_MS = 6e5;
-const CODEX_SIDE_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS = 12e4;
-const CODEX_SIDE_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS = 6e4;
 const SIDE_QUESTION_COMPLETION_TIMEOUT_MS = 6e5;
+var CodexSideQuestionTimeoutError = class extends Error {
+	constructor(..._args) {
+		super(..._args);
+		this.name = "TimeoutError";
+	}
+};
 const CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
 const CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 6e4;
 const CODEX_SIDE_NATIVE_HOOK_RELAY_STARTUP_REQUEST_COUNT = 3;
@@ -46,11 +48,13 @@ External tools may be available according to this thread's current permissions.
 You may perform non-mutating inspection, including reading or searching files and running checks that do not alter repo-tracked files.
 
 Do not modify files, source, git state, permissions, configuration, workspace state, or external state unless the user explicitly requests that mutation in this side conversation. Do not request escalated permissions or broader sandbox access unless the user explicitly requests a mutation that requires it. If the user explicitly requests a mutation, keep it minimal, local to the request, and avoid disrupting the main thread.`;
-async function runCodexAppServerSideQuestion(params, options = {}) {
-	const binding = await readCodexAppServerBinding(params.sessionFile, {
-		agentDir: params.agentDir,
+async function runCodexAppServerSideQuestion(params, options) {
+	const binding = await options.bindingStore.read(sessionBindingIdentity({
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		agentId: params.agentId,
 		config: params.cfg
-	});
+	}));
 	if (!binding?.threadId) throw new Error("Codex /btw needs an active Codex thread. Send a normal message first, then try /btw again.");
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const { sessionAgentId } = resolveSessionAgentIds({
@@ -102,9 +106,11 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 		agentDir: params.agentDir
 	});
 	const cwd = binding.cwd || params.workspaceDir || process.cwd();
+	const runId = params.opts?.runId ?? randomUUID();
 	const sideRunParams = buildSideRunAttemptParams(params, {
 		cwd,
-		authProfileId
+		authProfileId,
+		runId
 	});
 	const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
 		config: sideRunParams.config,
@@ -122,9 +128,44 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 		agentDir: params.agentDir,
 		config: params.cfg
 	});
-	const collector = new CodexSideQuestionCollector(params);
-	const removeNotificationHandler = client.addNotificationHandler((notification) => collector.handleNotification(notification));
+	const collector = new CodexSideQuestionCollector(params, () => readRecentCodexRateLimits(client));
 	const runAbortController = new AbortController();
+	let nativeToolLifecycleProjector;
+	const pendingNativeToolNotifications = [];
+	const pendingNativePreToolUseFailures = [];
+	let nativePreToolUseFailureFallbackActive = false;
+	let nativeToolRunWasAbortedBeforeCleanup;
+	let nativePreToolUseFailureFallbackTerminalReason;
+	const emitNativePreToolUseFailure = (failure) => {
+		emitCodexNativePreToolUseFailureDiagnostic({
+			agentId: sessionAgentId,
+			sessionId: params.sessionId,
+			sessionKey: params.sessionKey,
+			runId: sideRunParams.runId,
+			signal: runAbortController.signal,
+			failure,
+			...nativePreToolUseFailureFallbackActive ? { terminalReason: nativePreToolUseFailureFallbackTerminalReason ?? failure.disposition } : {}
+		});
+	};
+	const flushPendingNativePreToolUseFailures = () => {
+		for (const failure of pendingNativePreToolUseFailures.splice(0)) emitNativePreToolUseFailure(failure);
+	};
+	const activateNativePreToolUseFailureFallback = () => {
+		if (!nativePreToolUseFailureFallbackActive) {
+			nativePreToolUseFailureFallbackTerminalReason = nativeToolRunWasAbortedBeforeCleanup ? resolveCodexToolAbortTerminalReason(runAbortController.signal) : void 0;
+			nativePreToolUseFailureFallbackActive = true;
+		}
+		flushPendingNativePreToolUseFailures();
+	};
+	const removeNotificationHandler = client.addNotificationHandler((notification) => {
+		collector.handleNotification(notification);
+		if (notification.method !== "item/started" && notification.method !== "item/completed" && notification.method !== "rawResponseItem/completed" && notification.method !== "turn/completed") return;
+		if (!nativeToolLifecycleProjector) {
+			pendingNativeToolNotifications.push(notification);
+			return;
+		}
+		nativeToolLifecycleProjector.handleNotification(notification);
+	});
 	const abortFromUpstream = () => runAbortController.abort(params.opts?.abortSignal?.reason ?? "codex_side_question_abort");
 	if (params.opts?.abortSignal?.aborted) abortFromUpstream();
 	else params.opts?.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
@@ -165,14 +206,15 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 				modelProviderOverride: modelSelection.modelProvider,
 				signal: runAbortController.signal
 			}) : "unsupported",
+			runId,
 			signal: runAbortController.signal
 		});
+		ensureCodexAppServerClientRuntime(client, {
+			agentDir: params.agentDir,
+			authProfileId,
+			config: params.cfg
+		});
 		removeRequestHandler = client.addRequestHandler(async (request) => {
-			if (request.method === "account/chatgptAuthTokens/refresh") return await refreshCodexAppServerAuthTokens({
-				agentDir: params.agentDir,
-				authProfileId,
-				config: params.cfg
-			});
 			if (!childThreadId || !turnId) return;
 			if (request.method === "mcpServer/elicitation/request") return handleCodexAppServerElicitationRequest({
 				requestParams: request.params,
@@ -198,25 +240,27 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 					networkProxy: modelScopedAppServer.networkProxy,
 					sandbox
 				}),
-				signal: runAbortController.signal
+				signal: runAbortController.signal,
+				onNativeToolFailureDisposition: (itemId, disposition) => nativeToolLifecycleProjector?.recordApprovalFailureDisposition(itemId, disposition)
 			});
 			if (request.method !== "item/tool/call") return;
 			const call = readCodexDynamicToolCallParams(request.params);
 			if (!call || call.threadId !== childThreadId || call.turnId !== turnId) return;
-			const timeoutMs = resolveSideDynamicToolCallTimeoutMs({
+			const timeoutMs = resolveDynamicToolCallTimeoutMs({
 				call,
 				config: params.cfg
 			});
 			const toolStartedAt = Date.now();
 			const diagnosticContext = {
 				call,
+				agentId: sessionAgentId,
 				runId: sideRunParams.runId,
 				sessionId: params.sessionId,
 				sessionKey: params.sessionKey
 			};
 			emitDynamicToolStartedDiagnostic(diagnosticContext);
 			try {
-				const response = await handleSideDynamicToolCallWithTimeout({
+				const response = await handleDynamicToolCallWithTimeout({
 					call,
 					toolBridge,
 					signal: runAbortController.signal,
@@ -234,7 +278,8 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			} catch (error) {
 				emitDynamicToolErrorDiagnostic({
 					...diagnosticContext,
-					durationMs: Math.max(0, Date.now() - toolStartedAt)
+					durationMs: Math.max(0, Date.now() - toolStartedAt),
+					terminalReason: runAbortController.signal.aborted ? resolveCodexToolAbortTerminalReason(runAbortController.signal) : "failed"
 				});
 				throw error;
 			}
@@ -260,7 +305,12 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			}).channelId,
 			requestTimeoutMs: appServer.requestTimeoutMs,
 			completionTimeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS),
-			signal: runAbortController.signal
+			signal: runAbortController.signal,
+			onPreToolUseFailure: (failure) => {
+				if (nativePreToolUseFailureFallbackActive) emitNativePreToolUseFailure(failure);
+				else if (nativeToolLifecycleProjector) nativeToolLifecycleProjector.recordPreToolUseFailure(failure, nativeToolRunWasAbortedBeforeCleanup);
+				else pendingNativePreToolUseFailures.push(failure);
+			}
 		}) : void 0;
 		const nativeHookRelayConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
 			relay: nativeHookRelay,
@@ -272,7 +322,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
 			nativeCodeModeOnlyEnabled: appServer.codeModeOnly
 		});
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
+		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
 		childThreadId = assertCodexThreadForkResponse(await forkCodexSideThread(client, {
 			threadId: binding.threadId,
 			model: modelSelection.model,
@@ -298,7 +348,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			timeoutMs: appServer.requestTimeoutMs,
 			signal: params.opts?.abortSignal
 		});
-		const effort = resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model);
+		const effort = resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model, readCodexSupportedReasoningEfforts(params.runtimeModel?.compat));
 		turnId = assertCodexTurnStartResponse(await client.request("turn/start", {
 			threadId: childThreadId,
 			input: [{
@@ -324,25 +374,51 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			signal: params.opts?.abortSignal
 		})).turn.id;
 		collector.setTurn(childThreadId, turnId);
-		const trimmed = (await collector.wait({
-			signal: params.opts?.abortSignal,
-			timeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS)
-		})).trim();
+		nativeToolLifecycleProjector = new CodexNativeToolLifecycleProjector({
+			...sideRunParams,
+			agentId: sessionAgentId
+		}, childThreadId, turnId, { runAbortSignal: runAbortController.signal });
+		for (const failure of pendingNativePreToolUseFailures) nativeToolLifecycleProjector.recordPreToolUseFailure(failure);
+		pendingNativePreToolUseFailures.length = 0;
+		for (const notification of pendingNativeToolNotifications) nativeToolLifecycleProjector.handleNotification(notification);
+		pendingNativeToolNotifications.length = 0;
+		let text;
+		try {
+			text = await collector.wait({
+				signal: params.opts?.abortSignal,
+				timeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS)
+			});
+		} catch (error) {
+			if (error instanceof CodexSideQuestionTimeoutError && !runAbortController.signal.aborted) runAbortController.abort(error);
+			throw error;
+		}
+		const trimmed = text.trim();
 		if (!trimmed) throw new Error("Codex /btw completed without an answer.");
 		return { text: trimmed };
 	} finally {
 		try {
+			const runWasAbortedBeforeCleanup = runAbortController.signal.aborted;
+			nativeToolRunWasAbortedBeforeCleanup = runWasAbortedBeforeCleanup;
 			params.opts?.abortSignal?.removeEventListener("abort", abortFromUpstream);
-			if (!runAbortController.signal.aborted) runAbortController.abort("codex_side_question_finished");
-			removeNotificationHandler();
 			removeRequestHandler?.();
-			await cleanupCodexSideThread(client, {
-				threadId: childThreadId,
-				turnId,
-				interrupt: !collector.completed,
-				timeoutMs: appServer.requestTimeoutMs
-			});
+			if (!runAbortController.signal.aborted) runAbortController.abort("codex_side_question_finished");
+			try {
+				await cleanupCodexSideThread(client, {
+					threadId: childThreadId,
+					turnId,
+					interrupt: !collector.completed,
+					timeoutMs: appServer.requestTimeoutMs
+				});
+			} finally {
+				removeNotificationHandler();
+				try {
+					nativeToolLifecycleProjector?.finalizeActive(runWasAbortedBeforeCleanup);
+				} finally {
+					activateNativePreToolUseFailureFallback();
+				}
+			}
 		} finally {
+			flushPendingNativePreToolUseFailures();
 			releaseLeasedSharedCodexAppServerClient(client);
 			nativeHookRelay?.unregister();
 		}
@@ -369,6 +445,7 @@ function registerCodexSideNativeHookRelay(params) {
 			completionTimeoutMs: params.completionTimeoutMs
 		}),
 		signal: params.signal,
+		onPreToolUseFailure: params.onPreToolUseFailure,
 		command: { timeoutMs: params.options.gatewayTimeoutMs }
 	});
 }
@@ -418,7 +495,7 @@ function buildSideRunAttemptParams(params, options) {
 		authStorage: void 0,
 		authProfileStore: void 0,
 		modelRegistry: void 0,
-		runId: params.opts?.runId ?? `codex-btw:${params.sessionId}`,
+		runId: options.runId,
 		abortSignal: params.opts?.abortSignal,
 		onAgentEvent: (event) => {
 			if (event.stream === "approval") params.opts?.onApprovalEvent?.(event.data);
@@ -447,7 +524,7 @@ async function createCodexSideToolBridge(input) {
 			sessionKey: sandboxSessionKey,
 			runSessionKey: input.params.sessionKey && input.params.sessionKey !== sandboxSessionKey ? input.params.sessionKey : void 0,
 			sessionId: input.params.sessionId,
-			runId: input.params.opts?.runId ?? `codex-btw:${input.params.sessionId}`,
+			runId: input.runId,
 			agentDir: input.params.agentDir ?? resolveAgentDir(input.params.cfg ?? {}, input.sessionAgentId),
 			workspaceDir: input.cwd,
 			spawnWorkspaceDir: resolveAttemptSpawnWorkspaceDir({
@@ -523,7 +600,7 @@ async function createCodexSideToolBridge(input) {
 				config: input.params.cfg,
 				sessionId: input.params.sessionId,
 				sessionKey: input.params.sessionKey,
-				runId: input.params.opts?.runId ?? `codex-btw:${input.params.sessionId}`,
+				runId: input.runId,
 				currentChannelProvider: messageToolProvider,
 				...hookChannelFields
 			}
@@ -531,87 +608,12 @@ async function createCodexSideToolBridge(input) {
 		webSearchPlan
 	};
 }
-async function handleSideDynamicToolCallWithTimeout(params) {
-	if (params.signal.aborted) return failedSideDynamicToolResponse("OpenClaw dynamic tool call aborted before execution.");
-	const controller = new AbortController();
-	let timeout;
-	let resolveAbort;
-	const abortFromRun = () => {
-		const message = "OpenClaw dynamic tool call aborted.";
-		controller.abort(params.signal.reason ?? /* @__PURE__ */ new Error(message));
-		resolveAbort?.(failedSideDynamicToolResponse(message));
-	};
-	const abortPromise = new Promise((resolve) => {
-		resolveAbort = resolve;
-	});
-	const timeoutPromise = new Promise((resolve) => {
-		const timeoutMs = clampSideDynamicToolTimeoutMs(params.timeoutMs);
-		timeout = setTimeout(() => {
-			controller.abort(/* @__PURE__ */ new Error(`OpenClaw dynamic tool call timed out after ${timeoutMs}ms.`));
-			resolve(failedSideDynamicToolResponse(`OpenClaw dynamic tool call timed out after ${timeoutMs}ms.`));
-		}, timeoutMs);
-		timeout.unref?.();
-	});
-	try {
-		params.signal.addEventListener("abort", abortFromRun, { once: true });
-		if (params.signal.aborted) abortFromRun();
-		return await Promise.race([
-			params.toolBridge.handleToolCall(params.call, { signal: controller.signal }),
-			abortPromise,
-			timeoutPromise
-		]);
-	} catch (error) {
-		return failedSideDynamicToolResponse(error instanceof Error ? error.message : String(error));
-	} finally {
-		if (timeout) clearTimeout(timeout);
-		params.signal.removeEventListener("abort", abortFromRun);
-		resolveAbort = void 0;
-		if (!controller.signal.aborted) controller.abort(/* @__PURE__ */ new Error("OpenClaw dynamic tool call finished."));
-	}
-}
-function failedSideDynamicToolResponse(message) {
-	const response = {
-		contentItems: [{
-			type: "inputText",
-			text: message
-		}],
-		success: false
-	};
-	Object.defineProperty(response, "diagnosticTerminalType", {
-		configurable: true,
-		enumerable: false,
-		value: "error"
-	});
-	return response;
-}
 function emptySideUserInputResponse() {
 	return { answers: {} };
 }
 function isSideUserInputRequest(value, threadId, turnId) {
 	return isJsonObject(value) && value.threadId === threadId && value.turnId === turnId;
 }
-function resolveSideDynamicToolCallTimeoutMs(params) {
-	return clampSideDynamicToolTimeoutMs(readSideDynamicToolCallTimeoutMs(params.call.arguments) ?? (params.call.tool === "image_generate" ? readSideImageGenerationModelTimeoutMs(params.config) ?? CODEX_SIDE_DYNAMIC_IMAGE_GENERATION_TOOL_TIMEOUT_MS : void 0) ?? (params.call.tool === "image" ? readSideTimeoutSecondsAsMs(params.config?.tools?.media?.image?.timeoutSeconds) ?? CODEX_SIDE_DYNAMIC_IMAGE_TOOL_TIMEOUT_MS : void 0) ?? CODEX_SIDE_DYNAMIC_TOOL_TIMEOUT_MS);
-}
-function readSideDynamicToolCallTimeoutMs(value) {
-	if (!isJsonObject(value)) return;
-	return readSidePositiveFiniteTimeoutMs(value.timeoutMs);
-}
-function readSideImageGenerationModelTimeoutMs(config) {
-	const imageGenerationModel = config?.agents?.defaults?.imageGenerationModel;
-	if (!imageGenerationModel || typeof imageGenerationModel !== "object") return;
-	return readSidePositiveFiniteTimeoutMs(imageGenerationModel.timeoutMs);
-}
-function readSideTimeoutSecondsAsMs(value) {
-	const seconds = readSidePositiveFiniteTimeoutMs(value);
-	return seconds === void 0 ? void 0 : seconds * 1e3;
-}
-function readSidePositiveFiniteTimeoutMs(value) {
-	return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
-}
-function clampSideDynamicToolTimeoutMs(timeoutMs) {
-	return Math.max(1, Math.min(CODEX_SIDE_DYNAMIC_TOOL_MAX_TIMEOUT_MS, Math.floor(timeoutMs)));
-}
 async function forkCodexSideThread(client, params, options) {
 	try {
 		return await client.request("thread/fork", params, options);
@@ -651,8 +653,9 @@ async function cleanupCodexSideThread(client, params) {
 	}
 }
 var CodexSideQuestionCollector = class {
-	constructor(params) {
+	constructor(params, readRecentRateLimits) {
 		this.params = params;
+		this.readRecentRateLimits = readRecentRateLimits;
 		this.pendingNotifications = [];
 		this.assistantStarted = false;
 		this.assistantText = "";
@@ -668,11 +671,6 @@ var CodexSideQuestionCollector = class {
 	handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
-		if (notification.method === "account/rateLimits/updated") {
-			this.latestRateLimits = params;
-			rememberCodexRateLimits(params);
-			return;
-		}
 		if (!this.threadId || !this.turnId) {
 			this.pendingNotifications.push(notification);
 			return;
@@ -686,7 +684,7 @@ var CodexSideQuestionCollector = class {
 			this.completeFromTurn(params);
 			return;
 		}
-		if (notification.method === "error" && readBooleanAlias(params, ["willRetry", "will_retry"]) !== true) this.reject(formatCodexErrorMessage(params, this.latestRateLimits));
+		if (notification.method === "error" && params.willRetry !== true) this.reject(formatCodexErrorMessage(params, this.readRecentRateLimits()));
 	}
 	wait(options) {
 		if (this.terminalError) return Promise.reject(this.terminalError);
@@ -709,7 +707,7 @@ var CodexSideQuestionCollector = class {
 			timeout = setTimeout(() => {
 				cleanup();
 				this.settle = void 0;
-				reject(/* @__PURE__ */ new Error("Codex /btw timed out waiting for the side thread to finish."));
+				reject(new CodexSideQuestionTimeoutError("Codex /btw timed out waiting for the side thread to finish."));
 			}, Math.max(100, options.timeoutMs));
 			timeout.unref?.();
 			options.signal?.addEventListener("abort", abort, { once: true });
@@ -742,7 +740,7 @@ var CodexSideQuestionCollector = class {
 			this.reject(formatCodexUsageLimitErrorMessage({
 				message: turn.error?.message,
 				codexErrorInfo: turn.error?.codexErrorInfo,
-				rateLimits: this.latestRateLimits ?? readRecentCodexRateLimits()
+				rateLimits: this.readRecentRateLimits()
 			}) ?? turn.error?.message ?? "Codex /btw side thread failed.");
 			return;
 		}
@@ -775,22 +773,16 @@ function isNotificationForTurn(params, threadId, turnId) {
 function readNotificationTurnId(record) {
 	return readCodexNotificationTurnId(record);
 }
-function readBooleanAlias(record, keys) {
-	for (const key of keys) {
-		const value = record[key];
-		if (typeof value === "boolean") return value;
-	}
-}
 function readString(record, key) {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
 }
-function formatCodexErrorMessage(params, latestRateLimits) {
+function formatCodexErrorMessage(params, rateLimits) {
 	const error = isJsonObject(params.error) ? params.error : void 0;
 	const message = formatCodexUsageLimitErrorMessage({
 		message: error ? readString(error, "message") : void 0,
 		codexErrorInfo: error?.codexErrorInfo,
-		rateLimits: latestRateLimits ?? readRecentCodexRateLimits()
+		rateLimits
 	}) ?? (error ? readString(error, "message") ?? readString(error, "error") : void 0) ?? readString(params, "message") ?? "Codex /btw side thread failed.";
 	return new Error(formatErrorMessage(message));
 }