@openclaw/codex 2026.6.8 → 2026.6.9

package/dist/{run-attempt-D_q-VrpR.js → run-attempt-DYt00Jxz.js}

@@ -1,34 +1,33 @@
-import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-DJXpBkGf.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-B48C6S9O.js";
-import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { i as formatCodexUsageLimitErrorMessage, o as resolveCodexUsageLimitResetAtMs, s as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-C5P6352f.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-DovmVtbr.js";
-import { C as defaultCodexAppInventoryCache, D as filterCodexDynamicTools, M as projectContextEngineAssemblyForCodex, N as resolveCodexContextEngineProjectionMaxChars, O as isForcedPrivateQaCodexRuntime, P as resolveCodexContextEngineProjectionReserveTokens, T as sanitizeCodexHistoryImagePayloads, _ as buildCodexPluginThreadConfigInputFingerprint, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, g as buildCodexPluginThreadConfig, h as isCodexAppServerProfilerEnabled, i as buildContextEngineBinding, j as resolveCodexDynamicToolsLoadingForModel, k as normalizeCodexDynamicToolName$1, l as isContextEngineBindingCompatible, m as startOrResumeThread, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as mergeCodexThreadConfigs, y as shouldBuildCodexPluginThreadConfig } from "./thread-lifecycle-cban34w3.js";
-import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-ElbcSq2o.js";
-import { n as CODEX_CONTROL_METHODS, t as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-kIqpGTQj.js";
-import { a as resolveCodexAppServerForModelProvider, i as readCodexNotificationTurnId, l as formatCodexDisplayText, n as isCodexNotificationForTurn, o as resolveCodexAppServerForOpenClawToolPolicy, r as readCodexNotificationThreadId, t as describeCodexNotificationCorrelation } from "./notification-correlation-BGoG0N90.js";
-import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-jFMumCOe.js";
-import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-C-Yv9uwY.js";
-import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-C71Xdb6z.js";
-import { S as withCodexStartupTimeout, _ as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, a as createCodexNativeHookRelay, b as resolveCodexTurnCompletionIdleTimeoutMs, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexStartupTimeoutMs, x as resolveCodexTurnTerminalIdleTimeoutMs, y as resolveCodexTurnAssistantCompletionIdleTimeoutMs } from "./native-hook-relay-C3i3FYtc.js";
-import { t as ensureCodexComputerUse } from "./computer-use-D1qxvTE_.js";
+import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
+import { A as resolveCodexContextEngineProjectionReserveTokens, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, H as readCodexNotificationTurnId, M as buildCodexPluginThreadConfigInputFingerprint, N as mergeCodexThreadConfigs, O as projectContextEngineAssemblyForCodex, P as shouldBuildCodexPluginThreadConfig, R as defaultCodexAppInventoryCache, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, j as buildCodexPluginThreadConfig, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as describeCodexNotificationCorrelation } from "./thread-lifecycle-DQyii5vp.js";
+import { C as readNotificationItemId, E as updateActiveTurnItemIds, S as readCodexNotificationItem, T as shouldDisarmAssistantCompletionIdleWatch, _ as isReasoningItemCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isTerminalTurnStatus, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawToolOutputCompletionNotification, h as isRawReasoningCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningProgressNotification, w as readRawResponseToolCallId, x as isTurnNotification, y as isRetryableErrorNotification } from "./attempt-notifications-7oZeRa71.js";
+import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-CszD0vP3.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-B19q5BIX.js";
+import { i as formatCodexUsageLimitErrorMessage, o as resolveCodexUsageLimitResetAtMs, s as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-B-OHpbD3.js";
+import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-CLrtWgrD.js";
+import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-HOuPt-E0.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-vaZ_8Usz.js";
+import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
+import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-Bm6HsGob.js";
+import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-ByR82ytL.js";
+import { t as ensureCodexComputerUse } from "./computer-use-BmuwYrW6.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
+import fs from "node:fs/promises";
+import path, { posix } from "node:path";
 import { asDateTimestampMs, parseStrictNonNegativeInteger, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
+import { asFiniteNumber, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import fsSync from "node:fs";
-import path, { posix } from "node:path";
 import { markAuthProfileBlockedUntil, resolveAgentDir, resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
-import { asBoolean, asFiniteNumber, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentHarnessAgentEndHook, bootstrapHarnessContextEngine, buildAgentHookContextChannelFields, buildBootstrapContextForFiles, buildEmbeddedAttemptToolRunContext, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, filterProviderNormalizableTools, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, isSubagentSessionKey, loadCodexBundleMcpThreadConfig, normalizeAgentRuntimeTools, normalizeUsage, resolveAgentHarnessBeforePromptBuildResult, resolveAttemptSpawnWorkspaceDir, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveSessionWriteLockOptions, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, TOOL_PROGRESS_OUTPUT_MAX_CHARS, acquireSessionWriteLock, appendSessionTranscriptMessage, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentHarnessAgentEndHook, bootstrapHarnessContextEngine, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, embeddedAgentLog, emitAgentEvent, emitSessionTranscriptUpdate, finalizeHarnessContextEngineTurn, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, loadCodexBundleMcpThreadConfig, normalizeUsage, resolveAgentHarnessBeforePromptBuildResult, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveSessionWriteLockOptions, resolveUserPath, runAgentCleanupStep, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessAgentEndHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessBeforeMessageWriteHook, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { buildMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
 import { spawn } from "node:child_process";
 import { once } from "node:events";
 import { WebSocketServer } from "ws";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import fs from "node:fs/promises";
 import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent, emitTrustedDiagnosticEventWithPrivateData, freezeDiagnosticTraceContext, hasPendingInternalDiagnosticEvent, onInternalDiagnosticEvent, resolveDiagnosticModelContentCapturePolicy } from "openclaw/plugin-sdk/diagnostic-runtime";
-import { isToolAllowed } from "openclaw/plugin-sdk/sandbox";
 import { appendRegularFile, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { MESSAGE_TOOL_DELIVERY_HINTS } from "openclaw/plugin-sdk/message-tool-delivery-hints";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "openclaw/plugin-sdk/agent-sessions";
@@ -39,12 +38,42 @@ import { saveMediaBuffer } from "openclaw/plugin-sdk/media-store";
 import { createAgentHarnessTaskRuntime, deliverAgentHarnessTaskCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-task-runtime";
 //#region extensions/codex/src/app-server/attempt-client-cleanup.ts
 /**
-* Best-effort cleanup helpers for timed-out or aborted Codex app-server turns.
+* Best-effort cleanup helpers for Codex app-server startup attempts and turns.
 */
 /** Timeout for best-effort app-server turn interruption during cleanup. */
 const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
 /** Timeout for best-effort thread unsubscribe during cleanup. */
 const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
+async function closeClientAndWaitIfAvailable(client) {
+	const closeable = client;
+	if (typeof closeable.closeAndWait === "function") {
+		await closeable.closeAndWait();
+		return;
+	}
+	closeable.close?.();
+}
+async function closeCodexStartupClientBestEffort(client) {
+	if (!client) return;
+	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
+	if (unclaimedSharedClient.closed) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (unclaimedSharedClient.found) {
+		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	if (retiredSharedClient) {
+		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (clearSharedCodexAppServerClientIfCurrent(client)) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	await closeClientAndWaitIfAvailable(client);
+}
 /** Sends a turn interrupt without blocking abort cleanup on app-server errors. */
 function interruptCodexTurnBestEffort(client, params) {
 	const requestOptions = params.timeoutMs && Number.isFinite(params.timeoutMs) && params.timeoutMs > 0 ? { timeoutMs: params.timeoutMs } : void 0;
@@ -293,7 +322,7 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 * report for a Codex run.
 */
 function buildCodexSystemPromptReport(params) {
-	const toolEntries = params.tools.map(buildCodexToolReportEntry);
+	const toolEntries = flattenCodexDynamicToolFunctions(params.tools).map(buildCodexToolReportEntry);
 	const schemaChars = toolEntries.reduce((sum, tool) => sum + tool.schemaChars, 0);
 	const skillsPrompt = params.skillsPrompt.trim();
 	const bootstrapMaxChars = readPositiveNumber(params.attempt.config?.agents?.defaults?.bootstrapMaxChars);
@@ -389,7 +418,7 @@ function stableJsonHash(value) {
 function buildCodexBootstrapInjectionStats(params) {
 	const injectedIndex = indexCodexContextFileContent(params.injectedFiles);
 	const developerInstructionIndex = indexCodexContextFileContent(params.developerInstructionFiles ?? []);
-	const memoryToolRoutedPaths = new Set((params.memoryToolRoutedBootstrapFiles ?? []).map((file) => readNonEmptyString$1(file.path)).filter(isNonEmptyString$2).map(normalizeCodexContextFilePath));
+	const memoryToolRoutedPaths = new Set((params.memoryToolRoutedBootstrapFiles ?? []).map((file) => readNonEmptyString$1(file.path)).filter(isNonEmptyString$1).map(normalizeCodexContextFilePath));
 	return params.bootstrapFiles.map((file) => {
 		const fileName = readNonEmptyString$1(file.name);
 		const pathValue = readNonEmptyString$1(file.path) ?? fileName ?? "";
@@ -459,7 +488,7 @@ function buildCodexOpenClawPromptContext(params) {
 		"## OpenClaw Workspace Context",
 		"",
 		params.workspacePromptContext.trim()
-	].join("\n") : void 0].filter(isNonEmptyString$2);
+	].join("\n") : void 0].filter(isNonEmptyString$1);
 	if (sections.length === 0) return;
 	return [
 		"OpenClaw runtime context for this turn:",
@@ -619,7 +648,7 @@ function renderCodexWorkspaceMemoryCollaborationInstructions(params) {
 	}) : void 0, renderCodexWorkspaceMemoryReference({
 		files: params.files,
 		toolNames: params.toolNames
-	})].filter(isNonEmptyString$2);
+	})].filter(isNonEmptyString$1);
 	return sections.length > 0 ? sections.join("\n\n") : void 0;
 }
 function renderCodexMemoryRecallInstructions(params) {
@@ -628,7 +657,7 @@ function renderCodexMemoryRecallInstructions(params) {
 		citationsMode: params.citationsMode
 	});
 	if (!memoryPrompt) return;
-	return [memoryPrompt, renderCodexMemoryToolSearchBridge(params.toolNames)].filter(isNonEmptyString$2).join("\n").trim();
+	return [memoryPrompt, renderCodexMemoryToolSearchBridge(params.toolNames)].filter(isNonEmptyString$1).join("\n").trim();
 }
 function renderCodexMemoryToolSearchBridge(toolNames) {
 	const memoryToolNames = toolNames.map((name) => normalizeCodexDynamicToolName(name)).filter((name) => CODEX_MEMORY_TOOL_NAMES.has(name)).toSorted();
@@ -637,7 +666,7 @@ function renderCodexMemoryToolSearchBridge(toolNames) {
 }
 /** Lists available memory tool names understood by Codex workspace memory routing. */
 function getCodexWorkspaceMemoryToolNames(tools) {
-	const availableToolNames = new Set(tools.map((tool) => normalizeCodexDynamicToolName(tool.name)));
+	const availableToolNames = new Set(flattenCodexDynamicToolFunctions(tools).map((tool) => normalizeCodexDynamicToolName(tool.name)));
 	return Array.from(CODEX_MEMORY_TOOL_NAMES).filter((name) => availableToolNames.has(name));
 }
 function canRouteCodexWorkspaceMemoryThroughTools(params) {
@@ -714,7 +743,7 @@ function getCodexContextFileBasename(filePath) {
 function normalizeCodexDynamicToolName(name) {
 	return name.trim().toLowerCase();
 }
-function isNonEmptyString$2(value) {
+function isNonEmptyString$1(value) {
 	return typeof value === "string" && value.length > 0;
 }
 //#endregion
@@ -843,236 +872,6 @@ function classifyCodexModelCallFailureKind(params) {
 	return errorMessage.includes("aborted") ? "aborted" : void 0;
 }
 //#endregion
-//#region extensions/codex/src/app-server/attempt-notifications.ts
-/**
-* Predicates and readers for Codex app-server notification envelopes.
-*/
-const CODEX_TURN_ABORT_MARKER_START = "<turn_aborted>";
-const CODEX_TURN_ABORT_MARKER_END = "</turn_aborted>";
-const CODEX_INTERRUPTED_USER_GUIDANCE = "The user interrupted the previous turn on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";
-const CODEX_INTERRUPTED_DEVELOPER_GUIDANCE = "The previous turn was interrupted on purpose. Any running unified exec processes may still be running in the background. If any tools/commands were aborted, they may have partially executed.";
-/** Builds compact activity metadata for watchdog and diagnostic updates. */
-function describeNotificationActivity(notification) {
-	if (!isJsonObject(notification.params)) return { lastNotificationMethod: notification.method };
-	if (notification.method !== "rawResponseItem/completed") return { lastNotificationMethod: notification.method };
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	if (!item) return { lastNotificationMethod: notification.method };
-	return {
-		lastNotificationMethod: notification.method,
-		lastNotificationItemId: readString$6(item, "id"),
-		lastNotificationItemType: readString$6(item, "type"),
-		lastNotificationItemRole: readString$6(item, "role"),
-		lastAssistantTextPreview: readRawAssistantTextPreview(item)
-	};
-}
-/** Tracks active app-server item ids from item start/completion notifications. */
-function updateActiveTurnItemIds(notification, activeItemIds) {
-	if (notification.method !== "item/started" && notification.method !== "item/completed") return;
-	const itemId = readNotificationItemId(notification);
-	if (!itemId) return;
-	if (notification.method === "item/started") {
-		activeItemIds.add(itemId);
-		return;
-	}
-	activeItemIds.delete(itemId);
-}
-function isCompletedAssistantNotification(notification) {
-	if (!isJsonObject(notification.params)) return false;
-	if (notification.method !== "item/completed") return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString$6(item, "type") === "agentMessage" && readString$6(item, "phase") !== "commentary");
-}
-/** Returns true for completed app-server reasoning items. */
-function isReasoningItemCompletionNotification(notification) {
-	if (!isJsonObject(notification.params) || notification.method !== "item/completed") return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString$6(item, "type") === "reasoning" : false;
-}
-/** Returns true for completed assistant commentary items. */
-function isAssistantCommentaryCompletionNotification(notification) {
-	if (!isJsonObject(notification.params) || notification.method !== "item/completed") return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString$6(item, "type") === "agentMessage" && readString$6(item, "phase") === "commentary");
-}
-/** Returns true for completed raw response reasoning items. */
-function isRawReasoningCompletionNotification(notification) {
-	if (!isJsonObject(notification.params) || notification.method !== "rawResponseItem/completed") return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString$6(item, "type") === "reasoning" : false;
-}
-/** Returns true for streamed app-server reasoning progress. */
-function isReasoningProgressNotification(notification) {
-	return notification.method === "item/reasoning/textDelta" || notification.method === "item/reasoning/summaryTextDelta" || notification.method === "item/reasoning/summaryPartAdded";
-}
-/** Returns true when assistant completion can release the short idle watch. */
-function isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff) {
-	if (isCompletedAssistantNotification(notification)) return true;
-	return !turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification);
-}
-/** Returns true when a notification proves assistant output is still active. */
-function shouldDisarmAssistantCompletionIdleWatch(notification) {
-	if (!isJsonObject(notification.params)) return false;
-	if (notification.method === "item/started") return true;
-	if (notification.method === "item/agentMessage/delta") return true;
-	return false;
-}
-/** Reads an item id from supported notification envelope shapes. */
-function readNotificationItemId(notification) {
-	if (!isJsonObject(notification.params)) return;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return (item ? readString$6(item, "id") : void 0) ?? readString$6(notification.params, "itemId") ?? readString$6(notification.params, "id");
-}
-/** Detects completion for an OpenClaw dynamic tool result still awaited by Codex. */
-function isPendingOpenClawDynamicToolCompletionNotification(notification, pendingOpenClawDynamicToolCompletionIds) {
-	if (notification.method !== "item/completed" || !isJsonObject(notification.params)) return false;
-	const itemId = readNotificationItemId(notification);
-	if (!itemId || !pendingOpenClawDynamicToolCompletionIds.has(itemId)) return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	const itemType = item ? readString$6(item, "type") : void 0;
-	return itemType === void 0 || itemType === "dynamicToolCall";
-}
-/** Returns true for raw response tool-output completion notifications. */
-function isRawToolOutputCompletionNotification(notification) {
-	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return item ? readString$6(item, "type") === "custom_tool_call_output" : false;
-}
-/** Returns true for progress on Codex-native tool item types. */
-function isNativeToolProgressNotification(notification) {
-	if (notification.method !== "item/started" && notification.method !== "item/completed" && notification.method !== "item/updated") return false;
-	if (!isJsonObject(notification.params)) return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	switch (item ? readString$6(item, "type") : void 0) {
-		case "commandExecution":
-		case "fileChange":
-		case "mcpToolCall":
-		case "webSearch": return true;
-		default: return false;
-	}
-}
-/** Returns true for raw native response stream delta events. */
-function isNativeResponseStreamDeltaNotification(notification) {
-	return notification.method.startsWith("response.") && notification.method.endsWith(".delta");
-}
-/** Returns true for file-change patch update notifications. */
-function isFileChangePatchUpdatedNotification(notification) {
-	return notification.method === "item/fileChange/patchUpdated" && isJsonObject(notification.params);
-}
-/** Returns true for raw assistant message progress with readable text. */
-function isRawAssistantProgressNotification(notification) {
-	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString$6(item, "type") === "message" && readString$6(item, "role") === "assistant" && readRawAssistantTextPreview(item));
-}
-/** Returns true for raw assistant completion outside commentary phase. */
-function isRawAssistantCompletionNotification(notification) {
-	if (!isRawAssistantProgressNotification(notification) || !isJsonObject(notification.params)) return false;
-	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
-	return Boolean(item && readString$6(item, "phase") !== "commentary");
-}
-function readRawAssistantTextPreview(item) {
-	if (readString$6(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
-	const text = item.content.flatMap((content) => {
-		if (!isJsonObject(content)) return [];
-		const contentText = readString$6(content, "text");
-		return contentText ? [contentText] : [];
-	}).join("\n").trim();
-	if (!text) return;
-	return text.length > 240 ? `${text.slice(0, 237)}...` : text;
-}
-/** Returns true when notification params correlate to a specific thread/turn. */
-function isTurnNotification(value, threadId, turnId) {
-	return isCodexNotificationForTurn(value, threadId, turnId);
-}
-/** Returns true when a correlated notification belongs to another active run. */
-function isCodexNotificationOutsideActiveRun(correlation) {
-	if (!Boolean(correlation.threadId || correlation.nestedTurnThreadId)) return false;
-	if (!correlation.matchesActiveThread) return true;
-	return Boolean(correlation.turnId || correlation.nestedTurnId) && correlation.matchesActiveTurn === false;
-}
-/** Checks request params that must contain the current thread and turn ids. */
-function isCurrentThreadTurnRequestParams(value, threadId, turnId) {
-	if (!isJsonObject(value)) return false;
-	return readString$6(value, "threadId") === threadId && readString$6(value, "turnId") === turnId;
-}
-/** Checks approval request params, accepting `conversationId` as thread id. */
-function isCurrentApprovalTurnRequestParams(value, threadId, turnId) {
-	if (!isJsonObject(value)) return false;
-	return (readString$6(value, "threadId") ?? readString$6(value, "conversationId")) === threadId && readString$6(value, "turnId") === turnId;
-}
-/** Checks request params where `turnId` may be omitted or null for the thread. */
-function isCurrentThreadOptionalTurnRequestParams(value, threadId, turnId) {
-	if (!isJsonObject(value) || readString$6(value, "threadId") !== threadId) return false;
-	const requestTurnId = value.turnId;
-	return requestTurnId === null || requestTurnId === void 0 || requestTurnId === turnId;
-}
-/** Returns true for app-server error notifications that will retry. */
-function isRetryableErrorNotification(value) {
-	if (!isJsonObject(value)) return false;
-	return readBoolean$1(value, "willRetry") === true || readBoolean$1(value, "will_retry") === true;
-}
-/** Returns true for terminal app-server thread status strings. */
-function isTerminalTurnStatus(status) {
-	return status === "completed" || status === "interrupted" || status === "failed";
-}
-/**
-* Detects Codex's synthetic interrupted-turn marker while ignoring the current
-* user prompt echoed through raw response events.
-*/
-function isCodexTurnAbortMarkerNotification(notification, options = {}) {
-	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
-	const item = notification.params.item;
-	const role = isJsonObject(item) ? readString$6(item, "role") : void 0;
-	if (!isJsonObject(item) || role !== "user" && role !== "developer") return false;
-	const text = extractRawResponseItemText(item).trim();
-	const currentPromptTexts = [options.currentPromptText, ...options.currentPromptTexts ?? []].filter(isNonEmptyString$1).map((prompt) => prompt.trim());
-	if (role === "user" && currentPromptTexts.includes(text)) return false;
-	const markerBody = readCodexTurnAbortMarkerBody(text);
-	return markerBody === CODEX_INTERRUPTED_USER_GUIDANCE || markerBody === CODEX_INTERRUPTED_DEVELOPER_GUIDANCE;
-}
-function readCodexTurnAbortMarkerBody(text) {
-	if (!text.startsWith(CODEX_TURN_ABORT_MARKER_START) || !text.endsWith(CODEX_TURN_ABORT_MARKER_END)) return;
-	return text.slice(14, -15).trim();
-}
-function extractRawResponseItemText(item) {
-	const content = item.content;
-	if (!Array.isArray(content)) return "";
-	return content.flatMap((entry) => {
-		if (!isJsonObject(entry)) return [];
-		const type = readString$6(entry, "type");
-		if (type !== "input_text" && type !== "text") return [];
-		const text = readString$6(entry, "text");
-		return text ? [text] : [];
-	}).join("");
-}
-function readString$6(record, key) {
-	const value = record[key];
-	return typeof value === "string" ? value : void 0;
-}
-function readBoolean$1(record, key) {
-	return asBoolean(record[key]);
-}
-/** Reads a typed Codex item from notification params when id/type are present. */
-function readCodexNotificationItem(params) {
-	if (!isJsonObject(params) || !isJsonObject(params.item)) return;
-	const item = params.item;
-	return typeof item.id === "string" && typeof item.type === "string" ? item : void 0;
-}
-/** Maps Codex item types to the tool name shown in execution progress. */
-function codexExecutionToolName(item) {
-	if (item.type === "dynamicToolCall" && typeof item.tool === "string") return item.tool;
-	if (item.type === "mcpToolCall" && typeof item.tool === "string") {
-		const server = typeof item.server === "string" && item.server ? item.server : void 0;
-		return server ? `${server}.${item.tool}` : item.tool;
-	}
-	if (item.type === "commandExecution") return "bash";
-	if (item.type === "fileChange") return "apply_patch";
-	if (item.type === "webSearch") return "web_search";
-}
-function isNonEmptyString$1(value) {
-	return typeof value === "string" && value.length > 0;
-}
-//#endregion
 //#region extensions/codex/src/app-server/attempt-notification-state.ts
 /**
 * State machine for Codex app-server turn notifications and idle-watch updates.
@@ -1224,6 +1023,7 @@ function buildCodexTurnStartFailureResult(params) {
 		assistantTexts: [],
 		toolMetas: [],
 		lastAssistant: void 0,
+		currentAttemptAssistant: void 0,
 		didSendViaMessagingTool: false,
 		messagingToolSentTexts: [],
 		messagingToolSentMediaUrls: [],
@@ -1249,396 +1049,6 @@ function isInvalidCodexImagePayloadError(message) {
 	return /\b(?:invalid|malformed)\b[\s\S]{0,120}\b(?:image|image url|base64)\b/iu.test(normalizedMessage) || /\b(?:image|image url|base64)\b[\s\S]{0,120}\b(?:invalid|malformed)\b/iu.test(normalizedMessage);
 }
 //#endregion
-//#region extensions/codex/src/app-server/dynamic-tool-build.ts
-/**
-* Builds the Codex app-server dynamic tool list for one turn, including
-* OpenClaw-owned tools, Codex native-tool fallback rules, sandbox shell shims,
-* and provider allowlist normalization.
-*/
-const CODEX_NATIVE_SANDBOX_TOOL_REQUIREMENTS = [
-	"exec",
-	"process",
-	"read",
-	"write",
-	"edit",
-	"apply_patch"
-];
-const CODEX_MEMORY_FLUSH_DYNAMIC_TOOL_ALLOW = new Set(["read", "write"]);
-/** Splits sandbox and run session keys so tool calls can bind to both scopes when needed. */
-function resolveOpenClawCodingToolsSessionKeys(params, sandboxSessionKey) {
-	return {
-		sessionKey: sandboxSessionKey,
-		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0
-	};
-}
-/** Resolves the channel id that hook events should target for this Codex app-server turn. */
-function resolveCodexAppServerHookChannelId(params, sandboxSessionKey) {
-	return buildAgentHookContextChannelFields({
-		sessionKey: sandboxSessionKey,
-		messageChannel: params.messageChannel,
-		messageProvider: params.messageProvider,
-		currentChannelId: params.currentChannelId,
-		messageTo: params.messageTo
-	}).channelId;
-}
-const CODEX_DYNAMIC_TOOL_BUILD_WARN_TOTAL_MS = 1e3;
-const CODEX_DYNAMIC_TOOL_BUILD_WARN_STAGE_MS = 500;
-/** Creates cheap optional timing instrumentation for the dynamic-tool hot path. */
-function createCodexDynamicToolBuildStageTracker(options = {}) {
-	if (!options.enabled) return {
-		mark() {},
-		snapshot() {
-			return {
-				totalMs: 0,
-				stages: []
-			};
-		}
-	};
-	const startedAt = Date.now();
-	let previousAt = startedAt;
-	const stages = [];
-	const toMs = (value) => Math.max(0, Math.round(value));
-	return {
-		mark(name) {
-			const currentAt = Date.now();
-			stages.push({
-				name,
-				durationMs: toMs(currentAt - previousAt),
-				elapsedMs: toMs(currentAt - startedAt)
-			});
-			previousAt = currentAt;
-		},
-		snapshot() {
-			return {
-				totalMs: toMs(Date.now() - startedAt),
-				stages: stages.slice()
-			};
-		}
-	};
-}
-/** Returns true when dynamic-tool construction is slow enough to warrant a warning log. */
-function shouldWarnCodexDynamicToolBuildStageSummary(summary) {
-	return summary.totalMs >= CODEX_DYNAMIC_TOOL_BUILD_WARN_TOTAL_MS || summary.stages.some((stage) => stage.durationMs >= CODEX_DYNAMIC_TOOL_BUILD_WARN_STAGE_MS);
-}
-/** Formats per-stage timings into the compact form used by Codex app-server logs. */
-function formatCodexDynamicToolBuildStageSummary(summary) {
-	return summary.stages.length > 0 ? summary.stages.map((stage) => `${stage.name}:${stage.durationMs}ms@${stage.elapsedMs}ms`).join(",") : "none";
-}
-/** Builds, filters, and normalizes Codex-compatible runtime tools for a single turn. */
-async function buildDynamicTools(input) {
-	const { params } = input;
-	if (params.disableTools || !supportsModelTools(params.model)) return [];
-	const toolBuildStages = createCodexDynamicToolBuildStageTracker({ enabled: input.profilerEnabled });
-	const modelHasVision = params.model.input?.includes("image") ?? false;
-	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, input.sessionAgentId);
-	const createOpenClawCodingTools = (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
-	toolBuildStages.mark("load-agent-harness-tools");
-	const sessionKeys = resolveOpenClawCodingToolsSessionKeys(params, input.sandboxSessionKey);
-	const allTools = createOpenClawCodingTools({
-		agentId: input.sessionAgentId,
-		...buildEmbeddedAttemptToolRunContext(params),
-		exec: {
-			...params.execOverrides,
-			config: params.config,
-			elevated: params.bashElevated
-		},
-		sandbox: input.sandbox,
-		messageProvider: params.messageChannel ?? params.messageProvider,
-		agentAccountId: params.agentAccountId,
-		messageTo: params.messageTo,
-		messageThreadId: params.messageThreadId,
-		groupId: params.groupId,
-		groupChannel: params.groupChannel,
-		groupSpace: params.groupSpace,
-		spawnedBy: params.spawnedBy,
-		senderId: params.senderId,
-		senderName: params.senderName,
-		senderUsername: params.senderUsername,
-		senderE164: params.senderE164,
-		allowGatewaySubagentBinding: params.allowGatewaySubagentBinding || isForcedPrivateQaCodexRuntime(),
-		...sessionKeys,
-		sessionId: params.sessionId,
-		runId: params.runId,
-		agentDir,
-		cwd: input.effectiveCwd ?? input.effectiveWorkspace,
-		workspaceDir: input.effectiveWorkspace,
-		spawnWorkspaceDir: input.effectiveCwd && input.effectiveCwd !== input.effectiveWorkspace ? input.resolvedWorkspace : resolveAttemptSpawnWorkspaceDir({
-			sandbox: input.sandbox,
-			resolvedWorkspace: input.resolvedWorkspace
-		}),
-		config: params.config,
-		authProfileStore: params.toolAuthProfileStore ?? params.authProfileStore,
-		abortSignal: input.runAbortController.signal,
-		emitBeforeToolCallDiagnostics: false,
-		modelProvider: params.model.provider,
-		modelId: params.modelId,
-		modelCompat: params.model.compat && typeof params.model.compat === "object" ? params.model.compat : void 0,
-		modelApi: params.model.api,
-		modelContextWindowTokens: params.model.contextWindow,
-		modelAuthMode: resolveModelAuthMode(params.model.provider, params.config, params.toolAuthProfileStore ?? params.authProfileStore, { workspaceDir: input.effectiveWorkspace }),
-		suppressManagedWebSearch: false,
-		currentChannelId: params.currentChannelId,
-		hookChannelId: resolveCodexAppServerHookChannelId(params, input.sandboxSessionKey),
-		currentThreadTs: params.currentThreadTs,
-		currentMessageId: params.currentMessageId,
-		replyToMode: params.replyToMode,
-		hasRepliedRef: params.hasRepliedRef,
-		modelHasVision,
-		requireExplicitMessageTarget: params.requireExplicitMessageTarget ?? isSubagentSessionKey(params.sessionKey),
-		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-		disableMessageTool: params.disableMessageTool,
-		forceMessageTool: shouldForceMessageTool(params),
-		enableHeartbeatTool: params.trigger === "heartbeat" || input.forceHeartbeatTool === true,
-		forceHeartbeatTool: params.trigger === "heartbeat" || input.forceHeartbeatTool === true,
-		onYield: (message) => {
-			input.onYieldDetected();
-			input.onCodexAppServerEvent?.({
-				stream: "codex_app_server.tool",
-				data: {
-					name: "sessions_yield",
-					message
-				}
-			});
-		},
-		recordToolPrepStage: (name) => {
-			toolBuildStages.mark(name);
-		}
-	});
-	toolBuildStages.mark("create-openclaw-coding-tools");
-	const preNormalizationDiagnostics = [];
-	const readableAllToolProjection = filterProviderNormalizableTools(allTools);
-	preNormalizationDiagnostics.push(...readableAllToolProjection.diagnostics);
-	const readableAllTools = [...readableAllToolProjection.tools];
-	const codexFilteredTools = addNodeShellDynamicToolsIfNeeded(addSandboxShellDynamicToolsIfAvailable(isCodexMemoryFlushRun(params) ? filterCodexMemoryFlushDynamicTools(readableAllTools) : filterCodexDynamicTools(readableAllTools, input.pluginConfig), readableAllTools, input), readableAllTools, input);
-	toolBuildStages.mark("codex-filtering");
-	const visionFilteredTools = filterToolsForVisionInputs(codexFilteredTools, {
-		modelHasVision,
-		hasInboundImages: (params.images?.length ?? 0) > 0
-	});
-	toolBuildStages.mark("vision-filtering");
-	const filteredTools = filterCodexDynamicToolsForAllowlist(visionFilteredTools, includeForcedCodexDynamicToolAllow(params.toolsAllow, params));
-	toolBuildStages.mark("allowlist-filter");
-	const normalizedTools = normalizeAgentRuntimeTools({
-		runtimePlan: input.ignoreRuntimePlan ? void 0 : params.runtimePlan,
-		tools: filteredTools,
-		provider: params.provider,
-		config: params.config,
-		workspaceDir: input.effectiveWorkspace,
-		env: process.env,
-		modelId: params.modelId,
-		modelApi: params.model.api,
-		model: params.model,
-		onPreNormalizationSchemaDiagnostics: (diagnostics) => preNormalizationDiagnostics.push(...diagnostics)
-	});
-	toolBuildStages.mark("runtime-normalization");
-	if (preNormalizationDiagnostics.length > 0) embeddedAgentLog.warn(`codex app-server quarantined ${preNormalizationDiagnostics.length} unsupported runtime tool schema${preNormalizationDiagnostics.length === 1 ? "" : "s"} before dynamic tool registration`, {
-		runId: params.runId,
-		sessionId: params.sessionId,
-		diagnostics: preNormalizationDiagnostics.map((diagnostic) => ({
-			index: diagnostic.toolIndex,
-			tool: diagnostic.toolName,
-			violations: diagnostic.violations.slice(0, 12),
-			violationCount: diagnostic.violations.length
-		}))
-	});
-	const summary = toolBuildStages.snapshot();
-	if (shouldWarnCodexDynamicToolBuildStageSummary(summary)) {
-		const phase = input.forceHeartbeatTool ? "registered-tools" : "runtime-tools";
-		embeddedAgentLog.warn(`codex app-server dynamic tool build timings runId=${params.runId} sessionId=${params.sessionId} phase=${phase} totalMs=${summary.totalMs} stages=${formatCodexDynamicToolBuildStageSummary(summary)}`, {
-			runId: params.runId,
-			sessionId: params.sessionId,
-			phase,
-			totalMs: summary.totalMs,
-			stages: summary.stages,
-			allToolCount: readableAllTools.length,
-			codexFilteredToolCount: codexFilteredTools.length,
-			visionFilteredToolCount: visionFilteredTools.length,
-			filteredToolCount: filteredTools.length,
-			normalizedToolCount: normalizedTools.length,
-			forceHeartbeatTool: input.forceHeartbeatTool === true,
-			ignoreRuntimePlan: input.ignoreRuntimePlan === true,
-			nativeToolSurfaceEnabled: input.nativeToolSurfaceEnabled === true
-		});
-	}
-	return normalizedTools;
-}
-/** Preserves delivery-critical tools when a narrow allowlist would otherwise hide them. */
-function includeForcedCodexDynamicToolAllow(toolsAllow, params) {
-	if (toolsAllow === void 0 || hasWildcardCodexToolsAllow(toolsAllow)) return toolsAllow;
-	const forcedToolNames = shouldForceMessageTool(params) ? ["message"] : [];
-	if (forcedToolNames.length === 0) return toolsAllow;
-	if (toolsAllow.length === 0) return forcedToolNames;
-	const normalized = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName$1(name)));
-	const missingToolNames = forcedToolNames.filter((toolName) => !normalized.has(normalizeCodexDynamicToolName$1(toolName)));
-	return missingToolNames.length === 0 ? toolsAllow : [...toolsAllow, ...missingToolNames];
-}
-/** Decides whether Codex native code mode can own shell/file tools for this turn. */
-function shouldEnableCodexAppServerNativeToolSurface(params, sandbox, options = {}) {
-	if (isCodexMemoryFlushRun(params)) return false;
-	if (isCodexNativeExecutionBlockedByNodeExecHost(params, {
-		agentId: options.agentId,
-		runtimeSessionKey: options.runtimeSessionKey,
-		sandbox
-	})) return false;
-	const toolsAllow = includeForcedCodexDynamicToolAllow(params.toolsAllow, params);
-	if (toolsAllow === void 0) return canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox, options);
-	return hasWildcardCodexToolsAllow(toolsAllow) && canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox, options);
-}
-/** Returns true when OpenClaw policy requires the Node-owned exec/process tools instead. */
-function isCodexNativeExecutionBlockedByNodeExecHost(params, options = {}) {
-	return !resolveCodexNativeExecutionPolicy({
-		config: params.config,
-		sessionKey: resolveCodexRuntimePolicySessionKey(params, options.runtimeSessionKey),
-		sessionId: params.sessionId,
-		agentId: options.agentId,
-		execOverrides: params.execOverrides,
-		sandboxAvailable: options.sandbox?.enabled,
-		readRuntimeSessionEntry: true
-	}).nativeToolSurfaceAllowed;
-}
-function resolveCodexRuntimePolicySessionKey(params, runtimeSessionKey) {
-	return runtimeSessionKey?.trim() || params.sandboxSessionKey?.trim() || params.sessionKey?.trim() || params.sessionId;
-}
-function canCodexAppServerNativeToolSurfaceHonorSandbox(sandbox, options = {}) {
-	if (!sandbox?.enabled) return true;
-	if (options.sandboxExecServerEnabled === true && sandbox.backend && canSandboxToolPolicyExposeCodexNativeToolSurface(sandbox)) return true;
-	return false;
-}
-function canSandboxToolPolicyExposeCodexNativeToolSurface(sandbox) {
-	return CODEX_NATIVE_SANDBOX_TOOL_REQUIREMENTS.every((toolName) => isToolAllowed(sandbox.tools, toolName));
-}
-function isCodexMemoryFlushRun(params) {
-	return params?.trigger === "memory" && Boolean(params.memoryFlushWritePath?.trim());
-}
-function filterCodexMemoryFlushDynamicTools(tools) {
-	return tools.filter((tool) => CODEX_MEMORY_FLUSH_DYNAMIC_TOOL_ALLOW.has(normalizeCodexDynamicToolName$1(tool.name)));
-}
-/** Requires a Codex sandbox environment only when native tools must run inside OpenClaw sandboxing. */
-function shouldRequireCodexSandboxExecServerEnvironment(params) {
-	return Boolean(params.sandbox?.enabled && params.nativeToolSurfaceEnabled && params.sandboxExecServerEnabled);
-}
-/** Selects the sandbox exec-server environment passed through the Codex app-server protocol. */
-function resolveCodexSandboxEnvironmentSelection(environment, nativeToolSurfaceEnabled) {
-	return environment && nativeToolSurfaceEnabled ? [environment] : void 0;
-}
-/** Chooses the cwd visible to Codex native execution after sandbox exec-server setup. */
-function resolveCodexAppServerExecutionCwd(params) {
-	return params.environment && params.nativeToolSurfaceEnabled ? params.environment.cwd : params.effectiveCwd;
-}
-/** Converts OpenClaw sandbox networking into Codex's external-sandbox policy shape. */
-function resolveCodexExternalSandboxPolicyForOpenClawSandbox(sandbox) {
-	return {
-		type: "externalSandbox",
-		networkAccess: codexNetworkAccessForOpenClawSandbox(sandbox) ? "enabled" : "restricted"
-	};
-}
-function codexNetworkAccessForOpenClawSandbox(sandbox) {
-	if (sandbox?.backendId !== "docker") return true;
-	const network = sandbox?.docker?.network?.trim().toLowerCase();
-	return Boolean(network && network !== "none");
-}
-/** Returns a Codex config copy with app-server Codex plugin loading disabled for thread tools. */
-function disableCodexPluginThreadConfig(pluginConfig) {
-	const config = readCodexPluginConfig(pluginConfig);
-	return {
-		...config,
-		codexPlugins: {
-			...config.codexPlugins,
-			enabled: false
-		}
-	};
-}
-/** Adds sandbox_exec/process aliases when native Code Mode cannot directly honor the sandbox. */
-function addSandboxShellDynamicToolsIfAvailable(filteredTools, allTools, input) {
-	if (!shouldExposeSandboxExecDynamicTool(input) || isSandboxShellDynamicToolExcluded(input.pluginConfig)) return filteredTools;
-	const execTool = allTools.find((tool) => normalizeCodexDynamicToolName$1(tool.name) === "exec");
-	const processTool = allTools.find((tool) => normalizeCodexDynamicToolName$1(tool.name) === "process");
-	if (!execTool || !processTool) return filteredTools;
-	const sandboxExecTool = {
-		...execTool,
-		name: "sandbox_exec",
-		description: "Run a shell command through OpenClaw's configured sandbox backend for this session. Use when OpenClaw sandboxing is active or when a command must execute in the sandbox backend, such as an SSH-backed sandbox or Docker container-path bind layout. Use Codex's native shell only when no OpenClaw sandbox is active and native Code Mode is available.",
-		execute: async (toolCallId, args, signal, onUpdate) => {
-			const result = await execTool.execute(toolCallId, args, signal, onUpdate);
-			return {
-				...result,
-				content: result.content.map((item) => item.type === "text" ? Object.assign({}, item, { text: item.text.replace("Use process (list/poll/log/write/send-keys/submit/paste/kill/clear/remove) for follow-up.", "Use sandbox_process (list/poll/log/write/send-keys/submit/paste/kill/clear/remove) for follow-up.") }) : item)
-			};
-		}
-	};
-	const sandboxProcessTool = {
-		...processTool,
-		name: "sandbox_process",
-		description: "Manage sandbox_exec sessions that were started through OpenClaw's configured sandbox backend for this session: list, poll, log, write, send-keys, submit, paste, kill, clear, or remove. Use only for sandbox_exec follow-up; use Codex's native shell session handling only when no OpenClaw sandbox is active and native Code Mode is available."
-	};
-	return [
-		...filteredTools,
-		sandboxExecTool,
-		sandboxProcessTool
-	];
-}
-function shouldExposeSandboxExecDynamicTool(input) {
-	if (isCodexMemoryFlushRun(input.params)) return false;
-	if (isCodexNativeExecutionBlockedByNodeExecHost(input.params, {
-		agentId: input.sessionAgentId,
-		runtimeSessionKey: input.sandboxSessionKey,
-		sandbox: input.sandbox
-	})) return false;
-	const backendId = input.sandbox?.enabled ? input.sandbox.backendId.trim().toLowerCase() : "";
-	return Boolean(backendId && input.nativeToolSurfaceEnabled === false);
-}
-function isCodexDynamicToolExcluded(config, names) {
-	const normalizedNames = new Set(names.map((name) => normalizeCodexDynamicToolName$1(name)));
-	return (config.codexDynamicToolsExclude ?? []).some((name) => {
-		const normalized = normalizeCodexDynamicToolName$1(name);
-		return normalizedNames.has(normalized);
-	});
-}
-function isSandboxShellDynamicToolExcluded(config) {
-	return isCodexDynamicToolExcluded(config, [
-		"exec",
-		"sandbox_exec",
-		"process",
-		"sandbox_process"
-	]);
-}
-function addNodeShellDynamicToolsIfNeeded(filteredTools, allTools, input) {
-	if (isCodexMemoryFlushRun(input.params) || !isCodexNativeExecutionBlockedByNodeExecHost(input.params, {
-		agentId: input.sessionAgentId,
-		runtimeSessionKey: input.sandboxSessionKey,
-		sandbox: input.sandbox
-	})) return filteredTools;
-	let next = filteredTools;
-	for (const toolName of ["exec", "process"]) {
-		if (isCodexDynamicToolExcluded(input.pluginConfig, [toolName])) continue;
-		if (next.some((tool) => normalizeCodexDynamicToolName$1(tool.name) === toolName)) continue;
-		const tool = allTools.find((candidate) => normalizeCodexDynamicToolName$1(candidate.name) === toolName);
-		if (!tool) continue;
-		if (next === filteredTools) next = [...filteredTools];
-		next.push(tool);
-	}
-	return next;
-}
-/** Applies a normalized tool allowlist while preserving sandbox shell aliases for exec/process. */
-function filterCodexDynamicToolsForAllowlist(tools, toolsAllow) {
-	if (!toolsAllow) return tools;
-	if (toolsAllow.length === 0) return [];
-	if (hasWildcardCodexToolsAllow(toolsAllow)) return tools;
-	const allowSet = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName$1(name)).filter(Boolean));
-	return tools.filter((tool) => {
-		const normalized = normalizeCodexDynamicToolName$1(tool.name);
-		return allowSet.has(normalized) || normalized === "sandbox_exec" && allowSet.has("exec") || normalized === "sandbox_process" && (allowSet.has("exec") || allowSet.has("process"));
-	});
-}
-/** Detects the wildcard allowlist marker after Codex tool-name normalization. */
-function hasWildcardCodexToolsAllow(toolsAllow) {
-	return toolsAllow.some((name) => normalizeCodexDynamicToolName$1(name) === "*");
-}
-/** Forces message delivery through the message tool when the source channel requires it. */
-function shouldForceMessageTool(params) {
-	return params.disableMessageTool !== true && params.sourceReplyDeliveryMode === "message_tool_only";
-}
-//#endregion
 //#region extensions/codex/src/app-server/sandbox-exec-server/json-rpc.ts
 /** JSON-RPC error code used when a sandbox exec-server method is unknown. */
 const JSON_RPC_NOT_FOUND = -32004;
@@ -3039,39 +2449,17 @@ async function startCodexAttemptThread(params) {
 				await releaseStartupResourcesOnTimeout?.();
 				releaseSharedClientLease?.();
 				releaseSharedClientLease = void 0;
-				await closeAbandonedStartupClient(startupClientForAbandonedRequestCleanup);
+				await closeCodexStartupClientBestEffort(startupClientForAbandonedRequestCleanup);
 				startupClientForAbandonedRequestCleanup = void 0;
 			},
 			operation: async () => {
 				const threadConfig = mergeCodexThreadConfigs(params.bundleMcpThreadConfig?.configPatch);
 				const pluginThreadConfigRequired = !params.nativeToolSurfaceEnabled || shouldBuildCodexPluginThreadConfig(params.pluginConfig);
 				const pluginThreadConfigPluginConfig = params.nativeToolSurfaceEnabled ? params.pluginConfig : disableCodexPluginThreadConfig(params.pluginConfig);
-				const pluginAppCacheKey = buildCodexPluginAppCacheKey({
-					appServer: params.appServer,
-					agentDir: params.agentDir,
-					authProfileId: params.startupAuthProfileId,
-					accountId: params.startupAuthAccountCacheKey,
-					envApiKeyFingerprint: params.startupEnvApiKeyCacheKey
-				});
-				const pluginThreadConfigInputFingerprint = pluginThreadConfigRequired ? buildCodexPluginThreadConfigInputFingerprint({
-					pluginConfig: pluginThreadConfigPluginConfig,
-					appCacheKey: pluginAppCacheKey
-				}) : void 0;
 				const resolvedPluginPolicy = pluginThreadConfigRequired ? resolveCodexPluginsPolicy(pluginThreadConfigPluginConfig) : void 0;
 				const computerUseMcpElicitationDelegationRequired = params.computerUseConfig.enabled;
 				const mcpElicitationDelegationRequired = resolvedPluginPolicy?.enabled === true || computerUseMcpElicitationDelegationRequired;
 				const enabledPluginConfigKeys = resolvedPluginPolicy ? resolvedPluginPolicy.pluginPolicies.filter((plugin) => plugin.enabled).map((plugin) => plugin.configKey).toSorted() : void 0;
-				const attemptParams = params.buildAttemptParams();
-				embeddedAgentLog.debug("codex plugin thread config eligibility", buildCodexPluginThreadConfigEligibilityLogData({
-					sessionId: attemptParams.sessionId,
-					sessionKey: attemptParams.sessionKey ?? "",
-					pluginThreadConfigRequired,
-					resolvedPluginPolicy,
-					enabledPluginConfigKeys,
-					pluginAppCacheKey,
-					startupAuthProfileId: params.startupAuthProfileId,
-					appServer: params.appServer
-				}));
 				pluginAppServer = mcpElicitationDelegationRequired ? {
 					...params.appServer,
 					approvalPolicy: withMcpElicitationsApprovalPolicy(params.appServer.approvalPolicy)
@@ -3086,7 +2474,7 @@ async function startCodexAttemptThread(params) {
 						startupClient = await params.attemptClientFactory(params.appServer.start, params.startupAuthProfileId, params.agentDir, params.config, {
 							onStartedClient: (client) => {
 								startupClientForAbandonedRequestCleanup = client;
-								if (startupAbandoned || startupAbandonController.signal.aborted) closeAbandonedStartupClient(client);
+								if (startupAbandoned || startupAbandonController.signal.aborted) closeCodexStartupClientBestEffort(client);
 							},
 							abandonSignal: startupAbandonController.signal
 						});
@@ -3108,6 +2496,36 @@ async function startCodexAttemptThread(params) {
 							timeoutMs: params.appServer.requestTimeoutMs,
 							signal: startupAbandonController.signal
 						});
+						const startupRuntimeIdentity = activeStartupClient.getRuntimeIdentity();
+						const pluginAppCacheKey = buildCodexPluginAppCacheKey({
+							appServer: params.appServer,
+							agentDir: params.agentDir,
+							authProfileId: params.startupAuthProfileId,
+							accountId: params.startupAuthAccountCacheKey,
+							envApiKeyFingerprint: params.startupEnvApiKeyCacheKey,
+							appServerVersion: activeStartupClient.getServerVersion(),
+							runtimeIdentity: startupRuntimeIdentity
+						});
+						const appServerRuntimeFingerprint = buildCodexAppServerRuntimeFingerprint({
+							appServer: params.appServer,
+							appServerVersion: activeStartupClient.getServerVersion(),
+							runtimeIdentity: startupRuntimeIdentity
+						});
+						const pluginThreadConfigInputFingerprint = pluginThreadConfigRequired ? buildCodexPluginThreadConfigInputFingerprint({
+							pluginConfig: pluginThreadConfigPluginConfig,
+							appCacheKey: pluginAppCacheKey
+						}) : void 0;
+						const attemptParams = params.buildAttemptParams();
+						embeddedAgentLog.debug("codex plugin thread config eligibility", buildCodexPluginThreadConfigEligibilityLogData({
+							sessionId: attemptParams.sessionId,
+							sessionKey: attemptParams.sessionKey ?? "",
+							pluginThreadConfigRequired,
+							resolvedPluginPolicy,
+							enabledPluginConfigKeys,
+							pluginAppCacheKey,
+							startupAuthProfileId: params.startupAuthProfileId,
+							appServer: params.appServer
+						}));
 						let startupSandboxEnvironment;
 						let startupSandboxEnvironmentAcquired = false;
 						const releaseStartupSandboxEnvironment = async () => {
@@ -3142,8 +2560,10 @@ async function startCodexAttemptThread(params) {
 						const startupEnvironmentSelection = resolveCodexSandboxEnvironmentSelection(startupSandboxEnvironment, params.nativeToolSurfaceEnabled);
 						const startupExecutionCwd = resolveCodexAppServerExecutionCwd({
 							effectiveCwd: params.effectiveCwd,
+							localWorkspaceRoot: params.effectiveWorkspace,
 							environment: startupSandboxEnvironment,
-							nativeToolSurfaceEnabled: params.nativeToolSurfaceEnabled
+							nativeToolSurfaceEnabled: params.nativeToolSurfaceEnabled,
+							remoteWorkspaceRoot: params.appServer.remoteWorkspaceRoot
 						});
 						const startupSandboxPolicy = startupSandboxEnvironment ? resolveCodexExternalSandboxPolicyForOpenClawSandbox(params.sandbox) : void 0;
 						const buildThreadLifecycleParams = (signal) => ({
@@ -3152,6 +2572,8 @@ async function startCodexAttemptThread(params) {
 							agentId: params.sessionAgentId,
 							cwd: startupExecutionCwd,
 							dynamicTools: params.dynamicTools,
+							persistentWebSearchAllowed: params.persistentWebSearchAllowed,
+							webSearchAllowed: params.webSearchAllowed,
 							appServer: pluginAppServer,
 							developerInstructions: params.developerInstructions,
 							config: threadConfig,
@@ -3159,11 +2581,13 @@ async function startCodexAttemptThread(params) {
 							buildFinalConfigPatch: params.buildFinalConfigPatch,
 							nativeHookRelayGeneration: params.nativeHookRelayGeneration,
 							nativeCodeModeEnabled: params.nativeToolSurfaceEnabled,
+							nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
 							nativeCodeModeOnlyEnabled: params.appServer.codeModeOnly,
 							userMcpServersEnabled: params.nativeToolSurfaceEnabled,
 							mcpServersFingerprint: params.bundleMcpThreadConfig.fingerprint,
 							mcpServersFingerprintEvaluated: params.bundleMcpThreadConfig.evaluated,
 							environmentSelection: startupEnvironmentSelection,
+							appServerRuntimeFingerprint,
 							contextEngineProjection: params.contextEngineProjection,
 							signal,
 							pluginThreadConfig: pluginThreadConfigRequired ? {
@@ -3213,13 +2637,13 @@ async function startCodexAttemptThread(params) {
 							startupClientLease?.();
 							if (startupAbandoned || params.signal.aborted) {
 								if (startupClientForAbandonedRequestCleanup === startupClient) startupClientForAbandonedRequestCleanup = void 0;
-								await closeAbandonedStartupClient(startupClient);
+								await closeCodexStartupClientBestEffort(startupClient);
 							} else if (shouldClearSharedClientAfterStartupRace(startupAttemptError) || shouldClearSharedClientAfterStartupFailure({
 								error: startupAttemptError,
 								spawnedBy: params.spawnedBy
 							})) {
 								if (startupClientForAbandonedRequestCleanup === startupClient) startupClientForAbandonedRequestCleanup = void 0;
-								await evictFailedStartupClient(startupClient);
+								await closeCodexStartupClientBestEffort(startupClient);
 							}
 						}
 					}
@@ -3262,7 +2686,7 @@ async function startCodexAttemptThread(params) {
 		if (params.signal.aborted || shouldClearSharedClientAfterStartupAbandon(error)) {
 			releaseSharedClientLease?.();
 			releaseSharedClientLease = void 0;
-			await closeAbandonedStartupClient(startupClientForAbandonedRequestCleanup);
+			await closeCodexStartupClientBestEffort(startupClientForAbandonedRequestCleanup);
 			startupClientForAbandonedRequestCleanup = void 0;
 		} else if (shouldClearSharedClientAfterStartupRace(error) || shouldClearSharedClientAfterStartupFailure({
 			error,
@@ -3270,7 +2694,7 @@ async function startCodexAttemptThread(params) {
 		})) {
 			releaseSharedClientLease?.();
 			releaseSharedClientLease = void 0;
-			await evictFailedStartupClient(startupClientForAbandonedRequestCleanup);
+			await closeCodexStartupClientBestEffort(startupClientForAbandonedRequestCleanup);
 			startupClientForAbandonedRequestCleanup = void 0;
 		}
 		throw error;
@@ -3278,58 +2702,6 @@ async function startCodexAttemptThread(params) {
 		params.signal.removeEventListener("abort", abandonStartupAcquire);
 	}
 }
-async function closeAbandonedStartupClient(client) {
-	if (!client) return;
-	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
-	if (unclaimedSharedClient.closed) {
-		await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	if (unclaimedSharedClient.found) {
-		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
-	if (retiredSharedClient) {
-		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	if (clearSharedCodexAppServerClientIfCurrent(client)) {
-		await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	await closeClientAndWaitIfAvailable(client);
-}
-async function closeClientAndWaitIfAvailable(client) {
-	const closeable = client;
-	if (typeof closeable.closeAndWait === "function") {
-		await closeable.closeAndWait();
-		return;
-	}
-	closeable.close?.();
-}
-async function evictFailedStartupClient(client) {
-	if (!client) return;
-	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
-	if (unclaimedSharedClient.closed) {
-		await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	if (unclaimedSharedClient.found) {
-		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
-	if (retiredSharedClient) {
-		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	if (clearSharedCodexAppServerClientIfCurrent(client)) {
-		await closeClientAndWaitIfAvailable(client);
-		return;
-	}
-	await closeClientAndWaitIfAvailable(client);
-}
 function shouldClearSharedClientAfterStartupAbandon(error) {
 	return error instanceof Error && (error.message === "codex app-server startup timed out" || error.message === "codex app-server startup aborted");
 }
@@ -3857,6 +3229,7 @@ async function handleDynamicToolCallWithTimeout(params) {
 	};
 	if (params.signal.aborted) {
 		const message = "OpenClaw dynamic tool call aborted before execution.";
+		params.onFallbackSelected?.();
 		notifyFailedToolResult(message);
 		return failedDynamicToolResponse(message);
 	}
@@ -3866,6 +3239,7 @@ async function handleDynamicToolCallWithTimeout(params) {
 	let resolveAbort;
 	const abortFromRun = () => {
 		const message = "OpenClaw dynamic tool call aborted.";
+		params.onFallbackSelected?.();
 		controller.abort(params.signal.reason ?? /* @__PURE__ */ new Error(message));
 		notifyFailedToolResult(message);
 		resolveAbort?.(failedDynamicToolResponse(message, { sideEffectEvidence: true }));
@@ -3881,6 +3255,7 @@ async function handleDynamicToolCallWithTimeout(params) {
 				call: params.call,
 				timeoutMs
 			});
+			params.onFallbackSelected?.();
 			controller.abort(new Error(timeoutDetails.responseMessage));
 			params.onTimeout?.();
 			embeddedAgentLog.warn("codex dynamic tool call timed out", {
@@ -3898,7 +3273,8 @@ async function handleDynamicToolCallWithTimeout(params) {
 		const response = await Promise.race([
 			params.toolBridge.handleToolCall(params.call, {
 				signal: controller.signal,
-				onAgentToolResult: notifyAgentToolResult
+				onAgentToolResult: notifyAgentToolResult,
+				toolCallOrdinal: params.toolCallOrdinal
 			}),
 			abortPromise,
 			timeoutPromise
@@ -4406,6 +3782,7 @@ var CodexAppServerEventProjector = class {
 		this.assistantItemOrder = [];
 		this.assistantPhaseByItem = /* @__PURE__ */ new Map();
 		this.lastCommentaryProgressTextByItem = /* @__PURE__ */ new Map();
+		this.pendingRawCommentaryEchoes = 0;
 		this.reasoningTextByGroup = /* @__PURE__ */ new Map();
 		this.reasoningItemOrder = /* @__PURE__ */ new Map();
 		this.planTextByItem = /* @__PURE__ */ new Map();
@@ -4421,6 +3798,8 @@ var CodexAppServerEventProjector = class {
 		this.toolResultOutputDeltaState = /* @__PURE__ */ new Map();
 		this.toolResultOutputTextByItem = /* @__PURE__ */ new Map();
 		this.toolMetas = /* @__PURE__ */ new Map();
+		this.terminalPresentationClearedItemIds = /* @__PURE__ */ new Set();
+		this.nativeToolOutcomeOrdinals = /* @__PURE__ */ new Map();
 		this.sideEffectingToolItemIds = /* @__PURE__ */ new Set();
 		this.sideEffectingDynamicToolCallIds = /* @__PURE__ */ new Set();
 		this.toolTranscriptMessages = [];
@@ -4453,6 +3832,12 @@ var CodexAppServerEventProjector = class {
 		const finalItem = this.resolveFinalAssistantTextItem();
 		return finalItem !== void 0 && this.completedItemIds.has(finalItem.itemId);
 	}
+	/** Resolves the shared model-order position for a native tool item. */
+	recordNativeToolOutcome(item) {
+		if (!item || this.nativeToolOutcomeOrdinals.has(item.id) || !shouldClearTerminalPresentationForNativeItem(item)) return;
+		const ordinal = this.params.allocateToolOutcomeOrdinal?.(item.id);
+		if (ordinal !== void 0) this.nativeToolOutcomeOrdinals.set(item.id, ordinal);
+	}
 	async handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
@@ -4527,6 +3912,7 @@ var CodexAppServerEventProjector = class {
 			recordPromptError: legacyFailClosed && !hasDeliverableAssistantOnCompletedTurn
 		});
 		const lastAssistant = assistantTexts.length > 0 ? this.createAssistantMessage(assistantTexts.join("\n\n")) : void 0;
+		const currentAttemptAssistant = this.createCurrentAttemptAssistantMessage();
 		const turnId = this.turnId;
 		const messagesSnapshot = this.params.suppressNextUserMessagePersistence ? [] : [attachCodexMirrorIdentity(buildCodexUserPromptMessage(this.params), `${turnId}:prompt`)];
 		if (reasoningText) messagesSnapshot.push(attachCodexMirrorIdentity(this.createAssistantMirrorMessage("Codex reasoning", reasoningText), `${turnId}:reasoning`));
@@ -4561,6 +3947,7 @@ var CodexAppServerEventProjector = class {
 			assistantTexts,
 			toolMetas,
 			lastAssistant,
+			currentAttemptAssistant,
 			...this.lastNativeToolError ? { lastToolError: this.lastNativeToolError } : {},
 			didSendViaMessagingTool: toolTelemetry.didSendViaMessagingTool,
 			messagingToolSentTexts: toolTelemetry.messagingToolSentTexts,
@@ -4596,6 +3983,7 @@ var CodexAppServerEventProjector = class {
 		});
 	}
 	recordDynamicToolResult(params) {
+		const resultText = collectDynamicToolContentText(params.contentItems);
 		if (params.asyncStarted === true) {
 			const existing = this.toolMetas.get(params.callId);
 			this.toolMetas.set(params.callId, {
@@ -4607,10 +3995,15 @@ var CodexAppServerEventProjector = class {
 		this.recordToolTranscriptResult({
 			id: params.callId,
 			name: params.tool,
-			text: collectDynamicToolContentText(params.contentItems),
+			text: resultText,
 			isError: !params.success
 		});
-		if ((params.terminalType ?? (params.success ? "completed" : "error")) !== "blocked" && params.sideEffectEvidence === true) this.sideEffectingDynamicToolCallIds.add(params.callId);
+		if (!params.success && params.terminalType === "blocked") this.lastNativeToolError = {
+			toolName: params.tool,
+			error: resultText || "codex dynamic tool blocked"
+		};
+		else if (params.success && this.lastNativeToolError && !this.lastNativeToolError.mutatingAction) this.lastNativeToolError = void 0;
+		if (params.sideEffectEvidence === true) this.sideEffectingDynamicToolCallIds.add(params.callId);
 	}
 	markTimedOut() {
 		this.aborted = true;
@@ -4695,6 +4088,7 @@ var CodexAppServerEventProjector = class {
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
 		this.rememberAssistantPhase(item);
 		if (itemId) this.activeItemIds.add(itemId);
+		this.recordNativeToolOutcome(item);
 		if (item?.type === "contextCompaction" && itemId) {
 			this.activeCompactionItemIds.add(itemId);
 			await runAgentHarnessBeforeCompactionHook({
@@ -4744,19 +4138,24 @@ var CodexAppServerEventProjector = class {
 	}
 	async handleItemCompleted(params) {
 		const item = readItem(params.item);
+		this.recordNativeToolOutcome(item);
+		this.clearTerminalPresentationForNativeItem(item);
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
 		if (itemId) {
 			this.activeItemIds.delete(itemId);
 			this.completedItemIds.add(itemId);
 		}
 		this.rememberAssistantPhase(item);
-		if (item?.type === "agentMessage" && typeof item.text === "string" && item.text) {
+		if (item?.type === "agentMessage" && typeof item.text === "string") {
 			this.rememberAssistantItem(item.id);
 			this.assistantTextByItem.set(item.id, item.text);
-			if (this.isCommentaryAssistantItem(item.id)) this.emitCommentaryProgress({
-				itemId: item.id,
-				text: item.text
-			});
+			if (item.text && this.isCommentaryAssistantItem(item.id)) {
+				this.emitCommentaryProgress({
+					itemId: item.id,
+					text: item.text
+				});
+				this.pendingRawCommentaryEchoes += 1;
+			}
 		}
 		this.recordNativeGeneratedMedia(item);
 		if (item?.type === "plan" && typeof item.text === "string" && item.text) {
@@ -4883,9 +4282,19 @@ var CodexAppServerEventProjector = class {
 			}) ?? turn.error?.message ?? "codex app-server turn failed";
 			this.promptErrorSource = "prompt";
 		}
-		for (const item of turn.items ?? []) {
+		const turnItems = turn.items ?? [];
+		for (let index = turnItems.length - 1; index >= 0; index -= 1) {
+			const item = turnItems[index];
+			if (!item || !this.isCurrentTurnSnapshotItem(item)) continue;
+			if (item?.type === "dynamicToolCall") break;
+			if (shouldClearTerminalPresentationForNativeItem(item)) {
+				this.clearTerminalPresentationForNativeItem(item);
+				break;
+			}
+		}
+		for (const item of turnItems) {
 			this.rememberAssistantPhase(item);
-			if (item.type === "agentMessage" && typeof item.text === "string" && item.text) {
+			if (item.type === "agentMessage" && typeof item.text === "string") {
 				this.rememberAssistantItem(item.id);
 				this.assistantTextByItem.set(item.id, item.text);
 			}
@@ -4976,10 +4385,14 @@ var CodexAppServerEventProjector = class {
 		if (!item) return;
 		await this.recordRawGeneratedImageMedia(item);
 		if (readString$5(item, "role") !== "assistant") return;
+		const phase = readString$5(item, "phase");
+		if (phase === "commentary" && this.pendingRawCommentaryEchoes > 0) {
+			this.pendingRawCommentaryEchoes -= 1;
+			return;
+		}
 		const text = extractRawAssistantText(item);
 		if (!text) return;
 		const itemId = readString$5(item, "id") ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
-		const phase = readString$5(item, "phase");
 		if (phase) this.assistantPhaseByItem.set(itemId, phase);
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
@@ -5162,6 +4575,19 @@ var CodexAppServerEventProjector = class {
 		});
 		if (params.phase === "result") this.emitAfterToolCallObservation(item);
 	}
+	clearTerminalPresentationForNativeItem(item) {
+		if (!item || this.terminalPresentationClearedItemIds.has(item.id) || !shouldClearTerminalPresentationForNativeItem(item)) return;
+		const toolCallOrdinal = this.nativeToolOutcomeOrdinals.get(item.id);
+		this.terminalPresentationClearedItemIds.add(item.id);
+		this.params.onToolOutcome?.({
+			toolName: itemName(item) ?? item.type,
+			argsHash: "",
+			resultHash: "",
+			...toolCallOrdinal !== void 0 ? { toolCallOrdinal } : {},
+			terminalPresentation: void 0,
+			presentationOnly: true
+		});
+	}
 	recordNativeToolError(params) {
 		if (!isNonSuccessItemStatus(params.status)) {
 			if (!this.lastNativeToolError) return;
@@ -5333,6 +4759,8 @@ var CodexAppServerEventProjector = class {
 	}
 	recordToolMeta(item) {
 		if (!item) return;
+		if (isSideEffectingNativeToolItem(item)) this.sideEffectingToolItemIds.add(item.id);
+		else this.sideEffectingToolItemIds.delete(item.id);
 		const toolName = itemName(item);
 		if (!toolName) return;
 		const meta = itemMeta(item, this.toolProgressDetailMode());
@@ -5342,8 +4770,6 @@ var CodexAppServerEventProjector = class {
 			...meta ? { meta } : {},
 			...existing?.asyncStarted ? { asyncStarted: true } : {}
 		});
-		if (isSideEffectingNativeToolItem(item)) this.sideEffectingToolItemIds.add(item.id);
-		else this.sideEffectingToolItemIds.delete(item.id);
 	}
 	recordNativeToolTranscriptCall(item) {
 		if (!item || !shouldRecordNativeToolTranscript(item)) return;
@@ -5545,6 +4971,16 @@ var CodexAppServerEventProjector = class {
 		if (!itemId || this.assistantItemOrder.includes(itemId)) return;
 		this.assistantItemOrder.push(itemId);
 	}
+	createCurrentAttemptAssistantMessage() {
+		for (let i = this.assistantItemOrder.length - 1; i >= 0; i -= 1) {
+			const itemId = this.assistantItemOrder[i];
+			if (!itemId || this.isCommentaryAssistantItem(itemId) || !this.assistantTextByItem.has(itemId)) continue;
+			const text = this.assistantTextByItem.get(itemId) ?? "";
+			const normalizedText = text.trim();
+			if (normalizedText && this.toolProgressTexts.has(normalizedText)) continue;
+			return this.createAssistantMessage(text);
+		}
+	}
 	async readMirroredSessionMessages() {
 		return await readCodexMirroredSessionHistoryMessages(this.params.sessionFile) ?? [];
 	}
@@ -5869,7 +5305,20 @@ function shouldRecordNativeToolTranscript(item) {
 	return shouldSynthesizeToolProgressForItem(item) && item.type !== "webSearch";
 }
 function isMutatingNativeToolItem(item) {
-	return item.type === "commandExecution" || item.type === "fileChange";
+	if (item.type === "commandExecution") return true;
+	return item.type === "fileChange" || item.type === "collabAgentToolCall" || item.type === "imageGeneration";
+}
+function shouldClearTerminalPresentationForNativeItem(item) {
+	switch (item.type) {
+		case "collabAgentToolCall":
+		case "commandExecution":
+		case "fileChange":
+		case "imageGeneration":
+		case "imageView":
+		case "mcpToolCall":
+		case "webSearch": return true;
+		default: return false;
+	}
 }
 function nativeToolActionFingerprint(item) {
 	if (item.type === "commandExecution" && typeof item.command === "string") return JSON.stringify({
@@ -6199,8 +5648,18 @@ var CodexNativeSubagentTaskMirror = class {
 		this.mirroredThreadIds = /* @__PURE__ */ new Set();
 		this.failedMirrorThreadIds = /* @__PURE__ */ new Set();
 		this.terminalRunIds = /* @__PURE__ */ new Set();
+		this.authoritativeRunIds = /* @__PURE__ */ new Set();
+		this.expectedAuthoritativeRunIds = /* @__PURE__ */ new Set();
 		this.now = params.now ?? Date.now;
 	}
+	markAuthoritativeCompletion(childThreadId) {
+		const runId = codexNativeSubagentRunId(childThreadId);
+		this.authoritativeRunIds.add(runId);
+		this.terminalRunIds.add(runId);
+	}
+	markAuthoritativeCompletionExpected(childThreadId) {
+		this.expectedAuthoritativeRunIds.add(codexNativeSubagentRunId(childThreadId));
+	}
 	handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
@@ -6246,6 +5705,7 @@ var CodexNativeSubagentTaskMirror = class {
 		}
 		this.failedMirrorThreadIds.delete(threadId);
 		this.terminalRunIds.delete(runId);
+		this.authoritativeRunIds.delete(runId);
 		this.applyStatus(threadId, thread.status);
 	}
 	handleThreadStatusChanged(params) {
@@ -6258,6 +5718,7 @@ var CodexNativeSubagentTaskMirror = class {
 		const statusType = status?.type;
 		if (!statusType) return;
 		const runId = codexNativeSubagentRunId(threadId);
+		if (this.authoritativeRunIds.has(runId)) return;
 		if (this.terminalRunIds.has(runId) && statusType !== "systemError") return;
 		const eventAt = this.now();
 		if (statusType === "active") {
@@ -6270,13 +5731,10 @@ var CodexNativeSubagentTaskMirror = class {
 		}
 		if (statusType === "idle") {
 			this.terminalRunIds.add(runId);
-			this.runtime.finalizeTaskRunByRunId({
+			this.runtime.recordTaskRunProgressByRunId({
 				runId,
-				status: "succeeded",
-				endedAt: eventAt,
 				lastEventAt: eventAt,
-				progressSummary: "Codex native subagent is idle.",
-				terminalSummary: "Codex native subagent finished."
+				progressSummary: "Codex native subagent is idle."
 			});
 			return;
 		}
@@ -6353,12 +5811,14 @@ var CodexNativeSubagentTaskMirror = class {
 		}
 		this.failedMirrorThreadIds.delete(normalizedThreadId);
 		this.terminalRunIds.delete(runId);
+		this.authoritativeRunIds.delete(runId);
 	}
 	applyCollabAgentStatus(threadId, status, message) {
 		if (!this.mirroredThreadIds.has(threadId) && this.failedMirrorThreadIds.has(threadId)) return;
 		const normalizedStatus = normalizeAgentStateStatus(status);
 		if (!normalizedStatus) return;
 		const runId = codexNativeSubagentRunId(threadId);
+		if (this.authoritativeRunIds.has(runId)) return;
 		if (this.terminalRunIds.has(runId) && isNonTerminalAgentStateStatus(normalizedStatus)) return;
 		const eventAt = this.now();
 		if (normalizedStatus === "pendingInit" || normalizedStatus === "running") {
@@ -6371,13 +5831,19 @@ var CodexNativeSubagentTaskMirror = class {
 		}
 		if (normalizedStatus === "completed") {
 			this.terminalRunIds.add(runId);
-			this.runtime.finalizeTaskRunByRunId({
+			const summary = trimOptional(message) ?? "Codex native subagent completed.";
+			if (this.expectedAuthoritativeRunIds.has(runId)) this.runtime.recordTaskRunProgressByRunId({
+				runId,
+				lastEventAt: eventAt,
+				progressSummary: summary
+			});
+			else this.runtime.finalizeTaskRunByRunId({
 				runId,
 				status: "succeeded",
 				endedAt: eventAt,
 				lastEventAt: eventAt,
-				progressSummary: trimOptional(message) ?? "Codex native subagent completed.",
-				terminalSummary: trimOptional(message) ?? "Codex native subagent finished."
+				progressSummary: summary,
+				terminalSummary: summary
 			});
 			return;
 		}
@@ -6608,6 +6074,8 @@ var CodexNativeSubagentMonitor = class {
 				error: formatErrorMessage(error)
 			});
 		}
+		this.captureChildAssistantMessage(notification);
+		await this.handleChildTurnCompletion(notification);
 		await this.handleCompletionNotification(notification);
 	}
 	ensureParentTaskRuntime(state) {
@@ -6661,7 +6129,7 @@ var CodexNativeSubagentMonitor = class {
 		for (const nativeCompletion of completions) {
 			const childThreadId = this.resolveChildThreadIdForAgentPath(state.parentThreadId, nativeCompletion.agentPath);
 			const childState = childThreadId ? this.childStates.get(childThreadId) : void 0;
-			if (!childState || childState.parentThreadId !== state.parentThreadId) {
+			if (!childState || childState.parentThreadId !== state.parentThreadId || childState.transcriptTerminal) {
 				embeddedAgentLog.warn("Ignoring Codex native subagent completion for unknown child thread", {
 					parentThreadId: state.parentThreadId,
 					agentPath: nativeCompletion.agentPath
@@ -6669,16 +6137,86 @@ var CodexNativeSubagentMonitor = class {
 				continue;
 			}
 			const completion = toThreadCompletion(nativeCompletion, childState.childThreadId);
-			if (shouldWaitForTranscriptCompletion(completion, this.codexHome)) {
-				const eventAt = Date.now();
-				if (!await this.reconcileChildTranscript(childState.childThreadId)) {
-					this.scheduleTranscriptPoll(childState);
-					this.scheduleNoFinalCompletionFallback(state, childState, completion, eventAt);
-				}
-				continue;
+			await this.processChildCompletion(state, childState, completion);
+		}
+	}
+	captureChildAssistantMessage(notification) {
+		const params = isJsonObject(notification.params) ? notification.params : void 0;
+		const childThreadId = readString$2(params, "threadId")?.trim();
+		const childState = childThreadId ? this.childStates.get(childThreadId) : void 0;
+		if (!childState || childState.transcriptTerminal) return;
+		if (notification.method === "item/agentMessage/delta") {
+			const turnId = readString$2(params, "turnId");
+			const itemId = readString$2(params, "itemId");
+			const delta = readString$2(params, "delta");
+			if (turnId && itemId && delta) this.recordChildAssistantMessage(childState, turnId, itemId, delta);
+			return;
+		}
+		if (notification.method !== "item/started" && notification.method !== "item/completed") return;
+		const turnId = readString$2(params, "turnId");
+		const item = isJsonObject(params?.item) ? params.item : void 0;
+		this.captureChildAssistantMessageItem(childState, turnId, item);
+	}
+	captureChildAssistantMessageItem(childState, turnId, item) {
+		if (readString$2(item, "type") !== "agentMessage") return;
+		const itemId = readString$2(item, "id");
+		if (!turnId || !itemId) return;
+		const assistantMessages = this.getChildAssistantMessages(childState, turnId);
+		if (readString$2(item, "phase") === "commentary") assistantMessages.commentaryIds.add(itemId);
+		else assistantMessages.finalMessageIds.add(itemId);
+		const text = readString$2(item, "text");
+		if (text) this.recordChildAssistantMessage(childState, turnId, itemId, text, { replace: true });
+	}
+	captureChildTurnAssistantMessages(childState, turn) {
+		const turnId = readString$2(turn, "id");
+		if (!turnId || !Array.isArray(turn.items)) return;
+		for (const item of turn.items) this.captureChildAssistantMessageItem(childState, turnId, isJsonObject(item) ? item : void 0);
+	}
+	recordChildAssistantMessage(childState, turnId, itemId, text, options = {}) {
+		const assistantMessages = this.getChildAssistantMessages(childState, turnId);
+		if (!assistantMessages.texts.has(itemId)) assistantMessages.order.push(itemId);
+		const existing = assistantMessages.texts.get(itemId) ?? "";
+		assistantMessages.texts.set(itemId, options.replace ? text : `${existing}${text}`);
+	}
+	getChildAssistantMessages(childState, turnId) {
+		const existing = childState.assistantMessagesByTurn.get(turnId);
+		if (existing) return existing;
+		const assistantMessages = {
+			texts: /* @__PURE__ */ new Map(),
+			order: [],
+			commentaryIds: /* @__PURE__ */ new Set(),
+			finalMessageIds: /* @__PURE__ */ new Set()
+		};
+		childState.assistantMessagesByTurn.set(turnId, assistantMessages);
+		return assistantMessages;
+	}
+	async handleChildTurnCompletion(notification) {
+		if (notification.method !== "turn/completed") return;
+		const params = isJsonObject(notification.params) ? notification.params : void 0;
+		const childThreadId = readString$2(params, "threadId")?.trim();
+		const childState = childThreadId ? this.childStates.get(childThreadId) : void 0;
+		const state = childState ? this.parentStates.get(childState.parentThreadId) : void 0;
+		const turn = isJsonObject(params?.turn) ? params.turn : void 0;
+		if (childState && turn && readString$2(turn, "status") === "interrupted") {
+			const turnId = readString$2(turn, "id");
+			if (turnId) childState.assistantMessagesByTurn.delete(turnId);
+			return;
+		}
+		if (childState && turn) this.captureChildTurnAssistantMessages(childState, turn);
+		const completion = childState && turn ? toChildTurnCompletion(childState, turn) : void 0;
+		if (!state || !childState || childState.transcriptTerminal || !completion) return;
+		await this.processChildCompletion(state, childState, completion);
+	}
+	async processChildCompletion(state, childState, completion) {
+		if (shouldWaitForTranscriptCompletion(completion, this.codexHome)) {
+			const eventAt = Date.now();
+			if (!await this.reconcileChildTranscript(childState.childThreadId)) {
+				this.scheduleTranscriptPoll(childState);
+				this.scheduleNoFinalCompletionFallback(state, childState, completion, eventAt);
 			}
-			await this.processCompletion(state, completion);
+			return;
 		}
+		await this.processCompletion(state, completion);
 	}
 	async reconcileChildTranscript(childThreadId, options = {}) {
 		const childState = this.childStates.get(childThreadId.trim());
@@ -6803,6 +6341,7 @@ var CodexNativeSubagentMonitor = class {
 	finalizeCompletionTask(completion, eventAt) {
 		const taskRuntime = this.getTaskRuntimeForChild(completion.childThreadId);
 		if (!taskRuntime) return;
+		this.getMirrorForChild(completion.childThreadId)?.markAuthoritativeCompletion(completion.childThreadId);
 		taskRuntime.finalizeTaskRunByRunId({
 			runId: codexNativeSubagentRunId(completion.childThreadId),
 			status: completion.status,
@@ -6817,6 +6356,10 @@ var CodexNativeSubagentMonitor = class {
 		const childState = this.childStates.get(childThreadId.trim());
 		return (childState ? this.parentStates.get(childState.parentThreadId) : void 0)?.taskRuntime;
 	}
+	getMirrorForChild(childThreadId) {
+		const childState = this.childStates.get(childThreadId.trim());
+		return (childState ? this.parentStates.get(childState.parentThreadId) : void 0)?.mirror;
+	}
 	registerChildThread(parentThreadId, childThreadId, options = {}) {
 		const normalizedParentThreadId = parentThreadId.trim();
 		const normalizedChildThreadId = childThreadId.trim();
@@ -6824,12 +6367,15 @@ var CodexNativeSubagentMonitor = class {
 		this.childThreadParents.set(normalizedChildThreadId, normalizedParentThreadId);
 		this.childThreadIdsByAgentPath.set(buildParentAgentPathKey(normalizedParentThreadId, normalizedChildThreadId), normalizedChildThreadId);
 		const agentPath = normalizeOptionalString(options.agentPath);
+		const state = this.parentStates.get(normalizedParentThreadId);
+		if (state?.mirror && (this.codexHome || agentPath)) state.mirror.markAuthoritativeCompletionExpected(normalizedChildThreadId);
 		if (agentPath) this.childThreadIdsByAgentPath.set(buildParentAgentPathKey(normalizedParentThreadId, agentPath), normalizedChildThreadId);
 		let childState = this.childStates.get(normalizedChildThreadId);
 		if (!childState) {
 			childState = {
 				childThreadId: normalizedChildThreadId,
 				parentThreadId: normalizedParentThreadId,
+				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				transcriptPollAttempt: 0,
 				transcriptTerminal: false,
 				completionDeliveryAttempt: 0
@@ -7025,6 +6571,40 @@ function buildCompletionDedupeKey(parentThreadId, completion) {
 	const hash = createHash("sha256").update(completion.result).digest("hex").slice(0, 16);
 	return `${parentThreadId}:${completion.childThreadId}:${completion.status}:${hash}`;
 }
+function toChildTurnCompletion(childState, turn) {
+	const status = readString$2(turn, "status");
+	if (status === "completed") {
+		const turnId = readString$2(turn, "id");
+		const result = turnId ? lastChildAssistantMessage(childState, turnId) : void 0;
+		return {
+			childThreadId: childState.childThreadId,
+			status: "succeeded",
+			statusLabel: result ? "turn_completed" : "completed_without_final_message",
+			result: result ?? "Codex native subagent completed without a final assistant message."
+		};
+	}
+	if (status === "failed") return {
+		childThreadId: childState.childThreadId,
+		status: "failed",
+		statusLabel: "turn_failed",
+		result: readTurnErrorMessage(turn) ?? "Codex native subagent failed."
+	};
+}
+function lastChildAssistantMessage(childState, turnId) {
+	const assistantMessages = childState.assistantMessagesByTurn.get(turnId);
+	if (!assistantMessages) return;
+	for (let index = assistantMessages.order.length - 1; index >= 0; index -= 1) {
+		const itemId = assistantMessages.order[index];
+		if (assistantMessages.finalMessageIds.has(itemId) && !assistantMessages.commentaryIds.has(itemId)) {
+			const text = normalizeOptionalString(assistantMessages.texts.get(itemId));
+			if (text) return text;
+		}
+	}
+}
+function readTurnErrorMessage(turn) {
+	const error = isJsonObject(turn.error) ? turn.error : void 0;
+	return normalizeOptionalString(readString$2(error, "message")) ?? normalizeOptionalString(isJsonObject(error?.codexErrorInfo) ? readString$2(error.codexErrorInfo, "message") : void 0);
+}
 function buildParentAgentPathKey(parentThreadId, agentPath) {
 	return `${parentThreadId}\0${agentPath}`;
 }
@@ -7620,7 +7200,7 @@ function resolveContainedPath(baseDir, fileName) {
 }
 function toTrajectoryToolDefinitions(tools) {
 	if (!tools || tools.length === 0) return;
-	return tools.flatMap((tool) => {
+	return flattenCodexDynamicToolFunctions(tools).flatMap((tool) => {
 		const name = tool.name?.trim();
 		if (!name) return [];
 		return [{
@@ -8264,18 +7844,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	const startupEnvApiKeyCacheKey = startupAuthProfileId ? void 0 : resolveCodexAppServerFallbackApiKeyCacheKey({ startOptions: appServer.start });
 	preDynamicStartupStages.mark("auth-cache");
-	const nodeExecBlocksNativeExecution = isCodexNativeExecutionBlockedByNodeExecHost(params, {
-		agentId: sessionAgentId,
-		runtimeSessionKey: sandboxSessionKey,
-		sandbox
-	});
-	preDynamicStartupStages.mark("native-exec-policy");
 	const bundleMcpThreadConfig = await loadCodexBundleMcpThreadConfig({
 		workspaceDir: effectiveWorkspace,
 		cfg: params.config,
 		toolsEnabled: supportsModelTools(params.model),
 		disableTools: params.disableTools,
-		toolsAllow: nodeExecBlocksNativeExecution ? [] : params.toolsAllow
+		toolsAllow: params.toolsAllow
 	});
 	preDynamicStartupStages.mark("bundle-mcp");
 	const sandboxExecServerEnabled = isCodexSandboxExecServerEnabled(pluginConfig);
@@ -8285,6 +7859,28 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sandboxExecServerEnabled
 	});
 	preDynamicStartupStages.mark("native-tool-surface");
+	const nativeProviderWebSearchSupport = resolveCodexWebSearchPlan({
+		config: params.config,
+		disableTools: params.disableTools,
+		nativeToolSurfaceEnabled
+	}).kind === "native-hosted" ? await resolveCodexProviderWebSearchSupport({
+		clientFactory: attemptClientFactory,
+		appServer,
+		authProfileId: startupAuthProfileId,
+		agentDir,
+		config: params.config,
+		modelProviderOverride: resolveCodexAppServerThreadModelSelection({
+			provider: params.provider,
+			model: params.modelId,
+			binding: startupBinding,
+			authProfileId: startupAuthProfileId,
+			authProfileStore: params.authProfileStore,
+			agentDir,
+			config: params.config
+		}).modelProvider,
+		signal: runAbortController.signal
+	}) : "unsupported";
+	preDynamicStartupStages.mark("provider-capabilities");
 	for (const diagnostic of bundleMcpThreadConfig.diagnostics) embeddedAgentLog.warn(`bundle-mcp: ${diagnostic.pluginId}: ${diagnostic.message}`);
 	if (activeContextEngine) assertContextEngineHostSupport({
 		contextEngine: activeContextEngine,
@@ -8305,14 +7901,36 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		nativeToolSurfaceEnabled
 	});
 	let yieldDetected = false;
+	const toolOutcomeOrdinals = /* @__PURE__ */ new Map();
+	const suppressedDynamicToolOutcomeOrdinals = /* @__PURE__ */ new Set();
+	const onCodexToolOutcome = params.onToolOutcome ? (observation) => {
+		if (observation.toolCallOrdinal !== void 0 && suppressedDynamicToolOutcomeOrdinals.has(observation.toolCallOrdinal)) return;
+		params.onToolOutcome?.(observation);
+	} : void 0;
+	const baseAllocateToolOutcomeOrdinal = params.allocateToolOutcomeOrdinal;
+	const allocateCodexToolOutcomeOrdinal = baseAllocateToolOutcomeOrdinal ? (toolCallId) => {
+		const reservedOrdinal = toolCallId ? toolOutcomeOrdinals.get(toolCallId) : void 0;
+		if (reservedOrdinal !== void 0) return reservedOrdinal;
+		const ordinal = baseAllocateToolOutcomeOrdinal(toolCallId);
+		if (toolCallId) toolOutcomeOrdinals.set(toolCallId, ordinal);
+		return ordinal;
+	} : void 0;
+	const dynamicToolParams = allocateCodexToolOutcomeOrdinal || onCodexToolOutcome ? {
+		...params,
+		...allocateCodexToolOutcomeOrdinal ? { allocateToolOutcomeOrdinal: allocateCodexToolOutcomeOrdinal } : {},
+		...onCodexToolOutcome ? { onToolOutcome: onCodexToolOutcome } : {}
+	} : params;
+	let persistentWebSearchAllowed;
+	let webSearchAllowed = false;
 	const tools = await buildDynamicTools({
-		params,
+		params: dynamicToolParams,
 		resolvedWorkspace,
 		effectiveWorkspace,
 		effectiveCwd,
 		sandboxSessionKey,
 		sandbox,
 		nativeToolSurfaceEnabled,
+		nativeProviderWebSearchSupport,
 		runAbortController,
 		sessionAgentId,
 		pluginConfig,
@@ -8320,23 +7938,31 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		onYieldDetected: () => {
 			yieldDetected = true;
 		},
-		onCodexAppServerEvent: (event) => emitCodexAppServerEvent(params, event)
+		onCodexAppServerEvent: (event) => emitCodexAppServerEvent(params, event),
+		onPersistentWebSearchPolicyResolved: (allowed) => {
+			persistentWebSearchAllowed = allowed;
+		},
+		onWebSearchPolicyResolved: (allowed) => {
+			webSearchAllowed = allowed;
+		}
 	});
 	const toolBridge = createCodexDynamicToolBridge({
 		tools,
 		registeredTools: await buildDynamicTools({
-			params,
+			params: dynamicToolParams,
 			resolvedWorkspace,
 			effectiveWorkspace,
 			effectiveCwd,
 			sandboxSessionKey,
 			sandbox,
 			nativeToolSurfaceEnabled,
+			nativeProviderWebSearchSupport,
 			runAbortController,
 			sessionAgentId,
 			pluginConfig,
 			profilerEnabled,
 			forceHeartbeatTool: true,
+			ignoreDisableMessageTool: true,
 			ignoreRuntimePlan: true,
 			onYieldDetected: () => {
 				yieldDetected = true;
@@ -8344,15 +7970,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			onCodexAppServerEvent: (event) => emitCodexAppServerEvent(params, event)
 		}),
 		signal: runAbortController.signal,
-		loading: resolveCodexDynamicToolsLoadingForModel(pluginConfig, params.modelId),
-		directToolNames: shouldForceMessageTool(params) ? ["message"] : [],
+		loading: resolveCodexDynamicToolsLoadingForRuntime(pluginConfig, params.modelId, { connectionClass: appServer.connectionClass }),
+		directToolNames: resolveCodexDynamicToolDirectNames(params),
 		hookContext: {
 			agentId: sessionAgentId,
 			config: params.config,
 			sessionId: params.sessionId,
 			sessionKey: sandboxSessionKey,
 			runId: params.runId,
-			channelId: hookChannelId
+			channelId: hookChannelId,
+			currentChannelProvider: resolveCodexMessageToolProvider(params),
+			currentChannelId: params.currentChannelId,
+			currentMessagingTarget: params.currentMessagingTarget,
+			currentThreadId: params.currentThreadTs,
+			replyToMode: params.replyToMode,
+			hasRepliedRef: params.hasRepliedRef,
+			onToolOutcome: onCodexToolOutcome,
+			allocateToolOutcomeOrdinal: allocateCodexToolOutcomeOrdinal
 		}
 	});
 	const hadSessionFile = await pathExists(activeSessionFile);
@@ -8392,6 +8026,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: contextSessionKey,
 			sessionFile: activeSessionFile,
 			runtimeContext: buildActiveContextEngineRuntimeContext(),
+			contextEngineHostSupport: CODEX_APP_SERVER_CONTEXT_ENGINE_HOST,
+			providerId: params.provider,
+			requestedModelId: params.requestedModelId,
+			modelId: params.modelId,
+			fallbackReason: params.fallbackReason,
+			degradedReason: params.degradedReason,
 			runMaintenance: runHarnessContextEngineMaintenance,
 			config: params.config,
 			warn: (message) => embeddedAgentLog.warn(message)
@@ -8416,8 +8056,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		skillsPrompt: params.skillsSnapshot?.prompt
 	});
 	let promptText = params.prompt;
+	let promptContextRange;
 	let developerInstructions = baseDeveloperInstructions;
 	let prePromptMessageCount = historyMessages.length;
+	const codexContextProjectionMaxChars = resolveCodexContextEngineProjectionMaxChars({
+		contextTokenBudget: params.contextTokenBudget,
+		reserveTokens: resolveCodexContextEngineProjectionReserveTokens({ config: params.config })
+	});
 	let contextEngineProjection;
 	let precomputedStaleBindingContinuityProjectionApplied = false;
 	let staleBindingContinuityForcedFreshStart = false;
@@ -8426,9 +8071,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		const projection = projectContextEngineAssemblyForCodex({
 			assembledMessages: historyMessages,
 			originalHistoryMessages: historyMessages,
-			prompt: params.prompt
+			prompt: params.prompt,
+			maxRenderedContextChars: codexContextProjectionMaxChars
 		});
 		promptText = projection.promptText;
+		promptContextRange = projection.promptContextRange;
 		prePromptMessageCount = projection.prePromptMessageCount;
 	};
 	const applyActiveContextEngineProjection = async (decisionStartupBinding) => {
@@ -8439,9 +8086,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			sessionKey: contextSessionKey,
 			messages: historyMessages,
 			tokenBudget: params.contextTokenBudget,
-			availableTools: new Set(toolBridge.availableSpecs.map((tool) => tool.name).filter(isNonEmptyString)),
+			availableTools: new Set(flattenCodexDynamicToolFunctions(toolBridge.availableSpecs).map((tool) => tool.name).filter(isNonEmptyString)),
 			citationsMode: params.config?.memory?.citations,
 			modelId: params.modelId,
+			contextEngineHostSupport: CODEX_APP_SERVER_CONTEXT_ENGINE_HOST,
+			providerId: params.provider,
+			requestedModelId: params.requestedModelId,
+			fallbackReason: params.fallbackReason,
+			degradedReason: params.degradedReason,
 			prompt: params.prompt
 		});
 		if (!assembled) throw new Error("context engine assemble returned no result");
@@ -8451,10 +8103,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			originalHistoryMessages: historyMessages,
 			prompt: params.prompt,
 			systemPromptAddition: assembled.systemPromptAddition,
-			maxRenderedContextChars: resolveCodexContextEngineProjectionMaxChars({
-				contextTokenBudget: params.contextTokenBudget,
-				reserveTokens: resolveCodexContextEngineProjectionReserveTokens({ config: params.config })
-			}),
+			maxRenderedContextChars: codexContextProjectionMaxChars,
 			toolPayloadMode: contextEngineProjection ? "preserve" : "elide"
 		});
 		const projectionDecision = contextEngineProjection ? resolveContextEngineBootstrapProjectionDecision({
@@ -8484,6 +8133,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			developerInstructionAdditionChars: projection.developerInstructionAddition?.length ?? 0
 		});
 		promptText = projectionDecision.project ? projection.promptText : params.prompt;
+		promptContextRange = projectionDecision.project ? projection.promptContextRange : void 0;
 		developerInstructions = joinPresentSections(baseDeveloperInstructions, projection.developerInstructionAddition);
 		prePromptMessageCount = projection.prePromptMessageCount;
 	};
@@ -8499,8 +8149,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		messages: codexModelInputHistoryMessages,
 		ctx: hookContext
 	});
+	const resolveShiftedPromptContextRange = (prompt, turnPromptText) => {
+		if (!promptContextRange || !prompt.endsWith(promptText) || !turnPromptText.endsWith(prompt)) return;
+		const promptTextOffset = prompt.length - promptText.length;
+		const turnPromptOffset = turnPromptText.length - prompt.length + promptTextOffset;
+		return {
+			start: turnPromptOffset + promptContextRange.start,
+			end: turnPromptOffset + promptContextRange.end
+		};
+	};
 	let promptBuild = await buildPromptFromCurrentInputs();
-	const decorateCodexTurnPromptText = (prompt) => prependCodexOpenClawPromptContext(prompt, openClawPromptContext, { preservePromptWithoutContext: params.bootstrapContextMode === "lightweight" && params.bootstrapContextRunKind === "cron" });
+	const decorateCodexTurnPromptText = (prompt) => {
+		const turnPromptText = prependCodexOpenClawPromptContext(prompt, openClawPromptContext, { preservePromptWithoutContext: params.bootstrapContextMode === "lightweight" && params.bootstrapContextRunKind === "cron" });
+		return fitCodexProjectedContextForTurnStart({
+			promptText: turnPromptText,
+			contextRange: resolveShiftedPromptContextRange(prompt, turnPromptText)
+		});
+	};
 	let codexTurnPromptText = decorateCodexTurnPromptText(promptBuild.prompt);
 	const buildCodexTurnCollaborationDeveloperInstructions = () => buildTurnCollaborationMode(params, {
 		turnScopedDeveloperInstructions: workspaceBootstrapContext.turnScopedDeveloperInstructions,
@@ -8542,9 +8207,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		const projection = projectContextEngineAssemblyForCodex({
 			assembledMessages: newerVisibleMessages,
 			originalHistoryMessages: historyMessages,
-			prompt: params.prompt
+			prompt: params.prompt,
+			maxRenderedContextChars: codexContextProjectionMaxChars
 		});
 		promptText = projection.promptText;
+		promptContextRange = projection.promptContextRange;
 		prePromptMessageCount = projection.prePromptMessageCount;
 		return true;
 	};
@@ -8593,6 +8260,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		if (startupBinding?.threadId) return;
 		inactiveThreadBootstrapBindingForcedFreshStart = hadInactiveThreadBootstrapBinding;
 		staleBindingContinuityForcedFreshStart = precomputedStaleBindingContinuityProjectionApplied && !inactiveThreadBootstrapBindingForcedFreshStart;
+		if (staleBindingContinuityForcedFreshStart) applyFreshThreadContinuityProjection();
 		if (activeContextEngine) {
 			contextEngineProjection = void 0;
 			try {
@@ -8635,12 +8303,35 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	};
 	let nativeHookRelay;
 	let releaseSharedClientLease;
+	let sharedCodexClientRetiredForOneShotCleanup = false;
 	const releaseSharedClientLeaseOnce = () => {
 		const release = releaseSharedClientLease;
 		if (!release) return;
 		releaseSharedClientLease = void 0;
 		release();
 	};
+	const retireSharedCodexClientForOneShotCleanup = async () => {
+		if (params.cleanupBundleMcpOnRunEnd !== true) return;
+		if (sharedCodexClientRetiredForOneShotCleanup) return;
+		sharedCodexClientRetiredForOneShotCleanup = true;
+		const retired = retireSharedCodexAppServerClientIfCurrent(client);
+		embeddedAgentLog.info("codex app-server one-shot cleanup retired shared client", {
+			runId: params.runId,
+			sessionId: params.sessionId,
+			sessionKey: params.sessionKey,
+			activeLeases: retired?.activeLeases ?? null,
+			closed: retired?.closed ?? false,
+			matchedSharedClient: Boolean(retired)
+		});
+		if (retired?.closed) await client.closeAndWait({
+			exitTimeoutMs: 2e3,
+			forceKillDelayMs: 250
+		});
+	};
+	const releaseSharedClientLeaseAndRetireOneShotClient = async () => {
+		releaseSharedClientLeaseOnce();
+		await retireSharedCodexClientForOneShotCleanup();
+	};
 	let sandboxExecEnvironmentAcquired = false;
 	const releaseSandboxExecEnvironment = async () => {
 		if (sandboxExecEnvironmentAcquired) {
@@ -8703,10 +8394,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			effectiveWorkspace,
 			effectiveCwd,
 			dynamicTools: toolBridge.specs,
+			persistentWebSearchAllowed,
+			webSearchAllowed,
 			developerInstructions: promptBuild.developerInstructions,
 			buildFinalConfigPatch: buildNativeHookRelayFinalConfigPatch,
 			bundleMcpThreadConfig,
 			nativeToolSurfaceEnabled,
+			nativeProviderWebSearchSupport,
 			sandboxExecServerEnabled,
 			sandbox,
 			contextEngineProjection,
@@ -8745,7 +8439,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		threadId: thread.threadId,
 		authProfileId: startupAuthProfileId,
 		workspaceDir: effectiveWorkspace,
-		toolCount: toolBridge.specs.length
+		toolCount: flattenCodexDynamicToolFunctions(toolBridge.specs).length
 	});
 	recordCodexTrajectoryContext(trajectoryRecorder, {
 		attempt: params,
@@ -8932,7 +8626,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			data: {
 				startedAt: attemptStartedAt,
 				endedAt: Date.now(),
-				...data
+				...data,
+				...params.deferTerminalLifecycle ?? params.deferTerminalLifecycleEnd ? { phase: "finishing" } : {}
 			}
 		});
 		lifecycleTerminalEmitted = true;
@@ -9055,7 +8750,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		if (isTerminalTurnNotificationForTurn(notification, turnId)) terminalTurnNotificationQueued = true;
 		const isNativeResponseStreamDelta = isNativeResponseStreamDeltaNotification(notification);
 		const nativeResponseStreamDeltaMatchesActiveTurn = isNativeResponseStreamDelta && (correlation.matchesActiveTurn === true || isUnscopedCodexNotification(correlation) && canAttributeUnscopedNativeResponseDeltaToThisTurn(client));
-		if (correlation.matchesActiveTurn === true || !isNativeResponseStreamDelta && correlation.matchesActiveTurn !== false || nativeResponseStreamDeltaMatchesActiveTurn) turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
+		const notificationMatchesActiveTurn = correlation.matchesActiveTurn === true || !isNativeResponseStreamDelta && correlation.matchesActiveTurn !== false || nativeResponseStreamDeltaMatchesActiveTurn;
+		if (correlation.matchesActiveTurn === true) {
+			const modelToolCallId = readRawResponseToolCallId(notification);
+			if (modelToolCallId) allocateCodexToolOutcomeOrdinal?.(modelToolCallId);
+			const nativeItem = readCodexNotificationItem(notification.params);
+			if (nativeItem?.type === "webSearch") projector.recordNativeToolOutcome(nativeItem);
+		}
+		if (notificationMatchesActiveTurn) turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
 			attemptProgress: true,
 			...turnCrossedToolHandoff ? { attemptTimeoutMs: postToolRawAssistantCompletionIdleTimeoutMs } : {},
 			details: { lastNotificationMethod: notification.method }
@@ -9063,13 +8765,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
+	const nativeSubagentCodexHome = appServer.start.transport === "stdio" ? appServer.start.env?.CODEX_HOME ?? resolveCodexAppServerHomeDir(agentDir) : void 0;
 	registerCodexNativeSubagentMonitor({
 		client,
 		parentThreadId: thread.threadId,
 		requesterSessionKey: params.sessionKey,
 		taskRuntimeScope: params.agentHarnessTaskRuntimeScope,
 		agentId: params.agentId,
-		codexHome: appServer.start.env?.CODEX_HOME ?? resolveCodexAppServerHomeDir(agentDir)
+		codexHome: nativeSubagentCodexHome
 	});
 	const notificationCleanup = client.addNotificationHandler(enqueueNotification);
 	const requestCleanup = client.addRequestHandler(async (request) => {
@@ -9141,6 +8844,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 			const call = readDynamicToolCallParams(request.params);
 			if (!call || call.threadId !== thread.threadId || call.turnId !== turnId) return;
+			const toolCallOrdinal = allocateCodexToolOutcomeOrdinal?.(call.callId);
 			armCompletionWatchOnResponse = true;
 			markCurrentTurnRequestProgress();
 			turnCrossedToolHandoff = true;
@@ -9204,7 +8908,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					toolBridge,
 					signal: runAbortController.signal,
 					timeoutMs: dynamicToolTimeoutMs,
+					toolCallOrdinal,
 					onAgentToolResult: params.onAgentToolResult,
+					onFallbackSelected: () => {
+						if (toolCallOrdinal !== void 0) suppressedDynamicToolOutcomeOrdinals.add(toolCallOrdinal);
+					},
 					onTimeout: () => {
 						trajectoryRecorder?.recordEvent("tool.timeout", {
 							threadId: call.threadId,
@@ -9216,6 +8924,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					}
 				});
 				const protocolResponse = toCodexDynamicToolProtocolResponse(response);
+				if (!protocolResponse.success && toolCallOrdinal !== void 0) {
+					suppressedDynamicToolOutcomeOrdinals.add(toolCallOrdinal);
+					params.onToolOutcome?.({
+						toolName: call.tool,
+						argsHash: "",
+						resultHash: "",
+						toolCallOrdinal,
+						terminalPresentation: void 0,
+						presentationOnly: true
+					});
+				}
 				const toolDurationMs = Math.max(0, Date.now() - toolStartedAt);
 				trajectoryRecorder?.recordEvent("tool.result", {
 					threadId: call.threadId,
@@ -9289,6 +9008,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				});
 				throw error;
 			} finally {
+				toolOutcomeOrdinals.delete(call.callId);
 				unsubscribeToolDiagnosticObserver();
 			}
 		} finally {
@@ -9564,7 +9284,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				}
 			});
 			params.abortSignal?.removeEventListener("abort", abortFromUpstream);
-			releaseSharedClientLeaseOnce();
+			await releaseSharedClientLeaseAndRetireOneShotClient();
 			if (usageLimitError) {
 				await markCodexAuthProfileBlockedFromRateLimits({
 					params,
@@ -9582,7 +9302,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 	}
 	if (!turn) {
-		releaseSharedClientLeaseOnce();
+		await releaseSharedClientLeaseAndRetireOneShotClient();
 		throw new Error("codex app-server turn/start failed without an error");
 	}
 	turnIdRef.current = turn.turn.id;
@@ -9600,7 +9320,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: codexTurnPromptText,
 		imagesCount: params.images?.length ?? 0
 	});
-	projectorRef.current = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, {
+	projectorRef.current = new CodexAppServerEventProjector(dynamicToolParams, thread.threadId, activeTurnId, {
 		nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true && nativeHookRelay.shouldRelayEvent("post_tool_use"),
 		trajectoryRecorder
 	});
@@ -9815,6 +9535,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					lastCallUsage: result.attemptUsage,
 					promptCache: result.promptCache
 				}),
+				contextEngineHostSupport: CODEX_APP_SERVER_CONTEXT_ENGINE_HOST,
+				providerId: params.provider,
+				requestedModelId: params.requestedModelId,
+				modelId: params.modelId,
+				fallbackReason: params.fallbackReason,
+				degradedReason: params.degradedReason,
 				runMaintenance: runHarnessContextEngineMaintenance,
 				config: params.config,
 				warn: (message) => embeddedAgentLog.warn(message),
@@ -9906,7 +9632,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		notificationCleanup();
 		requestCleanup();
 		closeCleanup?.();
-		releaseSharedClientLeaseOnce();
+		await releaseSharedClientLeaseAndRetireOneShotClient();
 		if (nativeHookRelay) if (shouldDelayNativeHookRelayUnregister) scheduleCodexNativeHookRelayUnregister({
 			relay: nativeHookRelay,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
@@ -10036,5 +9762,9 @@ function handleApprovalRequest(params) {
 		signal: params.signal
 	});
 }
+function resolveCodexDynamicToolDirectNames(params) {
+	if (params.sourceReplyDeliveryMode !== "message_tool_only") return [];
+	return ["message"];
+}
 //#endregion
 export { runCodexAppServerAttempt };