@openclaw/codex 2026.8.1 → 2026.8.33

package/dist/{run-attempt-BwNQDH2u.js → .setup/run-attempt-BJ6tOQeE.mjs}

@@ -1,25 +1,27 @@
-import { C as isCodexRemoteExecPlacementSandbox, D as resolveOpenClawExecPolicyForCodexAppServer, E as resolveCodexPluginsPolicy, P as resolveCodexAppServerHomeDir, S as isCodexPairedNodeRemoteExecPlacementSandbox, T as readCodexPluginConfig, d as withMcpElicitationsApprovalPolicy, m as resolveCodexModelBackedReviewerPolicyContext, o as resolveCodexComputerUseConfig, p as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveCodexAppServerHomeScope, u as shouldAutoApproveCodexAppServerApprovals, v as readCodexRequirementsToml, w as isCodexSandboxExecServerEnabled } from "./config-Cxw3Cl3k.js";
-import { $ as CodexAppServerRpcError, A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, B as resolveCodexTurnTerminalIdleTimeoutMs, Dt as readCodexRateLimitsRevision, Ft as resolveCodexAppServerFallbackApiKeyCacheKey, G as isCodexAppServerConnectionClosedError, H as getCodexAppServerClientInstanceId, Ht as isJsonObject, I as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, It as resolveCodexAppServerPreparedApiKeyCacheKey, J as isCodexAppServerOverloadError, K as isCodexAppServerIndeterminateRequestCancellationError, L as resolveCodexStartupTimeoutMs, Lt as resolveCodexAppServerPreparedAuthHandoff, M as TURN_FINALIZE_DRAIN_ABORT_GRACE_MS, Mt as resolveCodexAppServerAuthProfileId, N as TURN_TERMINAL_SETTLEMENT_IDLE_TIMEOUT_MS, Nt as resolveCodexAppServerAuthProfileIdForAgent, Ot as readRecentCodexRateLimits, P as isCodexAppServerStartupError, Q as resolveCodexAppServerClientInstanceId, R as resolveCodexTurnAssistantCompletionIdleTimeoutMs, Tt as withAbortableTimeout, U as isCodexAppServerApprovalRequest, V as withCodexStartupTimeout, Vt as flattenCodexDynamicToolFunctions, W as isCodexAppServerBrokenPipeError, X as isCodexAppServerRequestTimeoutError, _t as ensureCodexAppServerClientRuntime, a as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, at as resolveDynamicToolCallTimeoutMs, c as getLeasedSharedCodexAppServerClient, ct as shouldReleaseTurnAfterTerminalDynamicTool, dt as resolveCodexToolAbortTerminalReason, et as createCodexElicitationResponse, f as readCodexAppServerClientDesktopGenerationFingerprint, h as releaseLeasedSharedCodexAppServerClient, i as clearSharedCodexAppServerClientIfCurrent, it as isMatchingDynamicToolTerminalDiagnostic, j as CodexAppServerStartupError, jt as resolveCodexAppServerAuthAccountCacheKey, kt as rememberCodexRateLimitsRead, l as getSharedCodexAppServerClient, lt as toCodexDynamicToolProgressResponse, nt as hasPendingDynamicToolTerminalDiagnostic, ot as resolveTerminalDynamicToolBatchAction, q as isCodexAppServerIndeterminateTransportError, rt as isDynamicToolTerminalDiagnosticEvent, s as createIsolatedCodexAppServerClient, st as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, tt as handleDynamicToolCallWithTimeout, u as isCodexAppServerStartSelectionChangedError, ut as toCodexDynamicToolProtocolResponse, v as retainSharedCodexAppServerClientIfCurrent, xt as protectCodexAppServerLiveThread, y as retireSharedCodexAppServerClientIfCurrent, z as resolveCodexTurnCompletionIdleTimeoutMs } from "./shared-client-kNkljY-R.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, l as resolveCodexRunSessionBindingAuthority, u as scopeCodexRunBindingStore } from "./session-binding-q2WSTVmC.js";
-import { c as assertCodexTurnStartResponse, d as readCodexTurn, f as readCodexTurnCompletedNotification, l as readCodexDynamicToolCallParams } from "./protocol-validators-Bg5rpNxk.js";
-import { B as readNonNegativeInteger, D as itemStatus, E as itemName, H as splitPlanText, I as readItem, L as readItemString, M as extractRawAssistantText, P as readCodexErrorNotificationMessage, V as readNullableString, _ as readCodexNotificationThreadId, a as closeCodexStartupClientBestEffort, d as terminateCodexBackgroundTerminals, f as unsubscribeCodexThreadBestEffort, g as isCodexNotificationForTurn, h as CodexProjectionDiagnostics, j as shouldSynthesizeToolProgressForItem, k as shouldClearTerminalPresentationForNativeItem, l as retireCodexAppServerClientAfterTimedOutTurn, m as getCodexAppServerTurnRouter, o as interruptCodexTurnAndWaitBestEffort, p as CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-CVPvp9dL.js";
-import { C as readRawResponseToolCallId, E as updateActiveTurnItemIds, S as readNotificationItemId, T as updateActiveCompletionBlockerItemIds, _ as isReasoningItemCompletionNotification, a as codexExecutionToolName, b as isTerminalTurnStatus, c as isAssistantCompletionReleaseNotification, d as isNativeToolProgressNotification, f as isPendingOpenClawDynamicToolCompletionNotification, g as isRawToolOutputCompletionNotification, h as isRawReasoningCompletionNotification, l as isCodexTurnAbortMarkerNotification, m as isRawFunctionToolOutputCompletionNotification, o as describeNotificationActivity, p as isRawAssistantProgressNotification, r as projectCodexThreadUsageUpdate, s as isAssistantCommentaryCompletionNotification, t as CodexResponseCompletionProjection, u as isFileChangePatchUpdatedNotification, v as isReasoningProgressNotification, w as shouldDisarmAssistantCompletionIdleWatch, x as readCodexNotificationItem, y as isRetryableErrorNotification } from "./event-projector-usage-D3PHFFXh.js";
-import { i as buildCodexPluginAppCacheKey, r as buildCodexAppServerRuntimeFingerprint, s as defaultCodexAppInventoryCache } from "./thread-resume-DF54hagX.js";
-import { $ as resolveCodexContinuityProjectionMaxChars, B as isMessageOnlyCodexSourceReply, D as resolveCodexAppServerThreadModelSelection, F as codexDynamicToolsFingerprint, G as buildContextEngineBinding, I as codexLegacyDynamicToolsFingerprint, J as fitCodexProjectedContextForTurnStart, K as isContextEngineBindingCompatible, L as filterCodexDynamicTools, P as areCodexDynamicToolFingerprintsCompatible, Q as resolveCodexContextEngineProjectionReserveTokens, S as buildDeveloperInstructions, V as isSystemAgentOnlyCodexDynamicToolAllowlist, W as resolveCodexDynamicToolsLoadingForRuntime, X as projectContextEngineAssemblyForCodex, Y as neutralizeCodexExplicitMentionSigils, Z as resolveCodexContextEngineProjectionMaxChars, a as isCodexAppServerProfilerEnabled, at as buildPluginAppPolicyContext, c as buildCodexNativeHookRelayConfig, d as emitCodexNativePreToolUseFailureDiagnostic, et as buildCodexPluginAppsConfigPatchFromPolicyContext, f as resolveCodexNativeHookRelayEvents, i as startOrResumeThread, l as buildCodexNativeHookRelayDisabledConfig, m as scheduleCodexNativeHookRelayUnregister, n as buildTurnStartParams, nt as buildCodexPluginThreadConfigInputFingerprint, ot as mergeCodexThreadConfigs, p as resolveCodexNativeHookRelayTtlMs, pt as resolveRecoverableCodexPluginConfigKeys, q as buildCodexContinuityCalibration, r as buildCodexUserInput, rt as buildCodexPluginThreadConfigTimeoutFallback, s as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, st as shouldBuildCodexPluginThreadConfig, t as buildTurnCollaborationMode, tt as buildCodexPluginThreadConfig, u as createCodexNativeHookRelay, x as resolveCodexWebSearchPlan } from "./thread-lifecycle-Ss-uwnC4.js";
-import { l as isIncognitoSessionKey, r as retainCodexAppServerBindingSubscription } from "./thread-ownership-CeYBqg_4.js";
-import { i as readUpstreamUserText, n as attachUpstreamUserText, r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
-import { a as buildCodexUserPromptMessage, i as mirrorPromptAtTurnStartBestEffort, l as readCodexMirrorSourceFingerprint, n as createCodexAppServerUserMessagePersistenceNotifier, o as promptSnapshot, s as applyCodexTranscriptTaint, t as codexTranscriptMirrorRuntime, u as serializeCodexMirrorSourceEvidence } from "./transcript-mirror-CkEQIna-.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-CGm_94eL.js";
-import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-hFtzt2Up.js";
-import { r as formatCodexDisplayText } from "./command-formatters-C54Yg3eA.js";
-import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy } from "./session-permission-policy-gLm40Vtq.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CCQFs8lf.js";
-import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-Ds_QVm-X.js";
-import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.js";
-import { i as createAssistantMirrorMessage, n as createAssistantCommentaryMessage, r as createAssistantMessage, t as createAssistantAsyncMessage } from "./event-projector-assistant-message-C5-Ds8mA.js";
-import { a as readCodexMirroredSessionHistoryMessages, c as inferCodexDynamicToolMeta, d as sanitizeCodexToolArguments, f as sanitizeCodexToolResponse, i as CodexToolTranscriptProjection, l as isCodexCommandBearingToolCall, n as CodexEventProjection, o as CodexToolProgressProjection, r as emitCodexAgentEvent, s as shouldEmitTranscriptToolProgress, t as codexNativeSubagentMonitorRuntime, u as resolveCodexToolProgressDetailMode } from "./native-subagent-monitor-CwFyoylz.js";
-import { C as shouldRequireCodexSandboxExecServerEnvironment, D as CodexNativeToolLifecycleProjector, E as readBoundedCodexRemoteWorkspaceFile, S as shouldEnableCodexAppServerNativeToolSurface, _ as resolveCodexAppServerHookChannelId, a as emitDynamicToolStartedDiagnostic, c as resolveCodexProviderWebSearchSupport, d as releaseCodexSandboxExecServerEnvironment, f as buildDynamicTools, g as resolveCodexAppServerExecutionCwd, h as formatCodexDynamicToolBuildStageSummary, i as emitDynamicToolErrorDiagnostic, m as disableCodexPluginThreadConfig, n as projectCodexExecutableDynamicTools, o as emitDynamicToolTerminalDiagnostic, p as createCodexDynamicToolBuildStageTracker, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, u as ensureCodexSandboxExecServerEnvironment, v as resolveCodexExternalSandboxPolicyForOpenClawSandbox, w as shouldWarnCodexDynamicToolBuildStageSummary, x as resolveCodexSandboxEnvironmentSelection, y as resolveCodexMessageToolProvider } from "./dynamic-tools-BFoUcRdx.js";
-import { a as runCodexComputerUseLiveTest, n as ensureCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-CulOABwu.js";
+import { C as isCodexRemoteExecPlacementSandbox, D as resolveOpenClawExecPolicyForCodexAppServer, E as resolveCodexPluginsPolicy, P as resolveCodexAppServerHomeDir, S as isCodexPairedNodeRemoteExecPlacementSandbox, T as readCodexPluginConfig, d as withMcpElicitationsApprovalPolicy, m as resolveCodexModelBackedReviewerPolicyContext, o as resolveCodexComputerUseConfig, p as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveCodexAppServerHomeScope, u as shouldAutoApproveCodexAppServerApprovals, v as readCodexRequirementsToml, w as isCodexSandboxExecServerEnabled } from "./config-ClwHKKTN.mjs";
+import { $ as CodexAppServerRpcError, A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, B as resolveCodexTurnTerminalIdleTimeoutMs, Dt as readCodexRateLimitsRevision, Ft as resolveCodexAppServerFallbackApiKeyCacheKey, G as isCodexAppServerConnectionClosedError, H as getCodexAppServerClientInstanceId, Ht as isJsonObject, I as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, It as resolveCodexAppServerPreparedApiKeyCacheKey, J as isCodexAppServerOverloadError, K as isCodexAppServerIndeterminateRequestCancellationError, L as resolveCodexStartupTimeoutMs, Lt as resolveCodexAppServerPreparedAuthHandoff, M as TURN_FINALIZE_DRAIN_ABORT_GRACE_MS, Mt as resolveCodexAppServerAuthProfileId, N as TURN_TERMINAL_SETTLEMENT_IDLE_TIMEOUT_MS, Nt as resolveCodexAppServerAuthProfileIdForAgent, Ot as readRecentCodexRateLimits, P as isCodexAppServerStartupError, Q as resolveCodexAppServerClientInstanceId, R as resolveCodexTurnAssistantCompletionIdleTimeoutMs, Tt as withAbortableTimeout, U as isCodexAppServerApprovalRequest, V as withCodexStartupTimeout, Vt as flattenCodexDynamicToolFunctions, W as isCodexAppServerBrokenPipeError, X as isCodexAppServerRequestTimeoutError, _t as ensureCodexAppServerClientRuntime, a as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, at as resolveDynamicToolCallTimeoutMs, c as getLeasedSharedCodexAppServerClient, ct as shouldReleaseTurnAfterTerminalDynamicTool, dt as resolveCodexToolAbortTerminalReason, et as createCodexElicitationResponse, f as readCodexAppServerClientDesktopGenerationFingerprint, h as releaseLeasedSharedCodexAppServerClient, i as clearSharedCodexAppServerClientIfCurrent, it as isMatchingDynamicToolTerminalDiagnostic, j as CodexAppServerStartupError, jt as resolveCodexAppServerAuthAccountCacheKey, kt as rememberCodexRateLimitsRead, l as getSharedCodexAppServerClient, lt as toCodexDynamicToolProgressResponse, nt as hasPendingDynamicToolTerminalDiagnostic, ot as resolveTerminalDynamicToolBatchAction, q as isCodexAppServerIndeterminateTransportError, rt as isDynamicToolTerminalDiagnosticEvent, s as createIsolatedCodexAppServerClient, st as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, tt as handleDynamicToolCallWithTimeout, u as isCodexAppServerStartSelectionChangedError, ut as toCodexDynamicToolProtocolResponse, v as retainSharedCodexAppServerClientIfCurrent, xt as protectCodexAppServerLiveThread, y as retireSharedCodexAppServerClientIfCurrent, z as resolveCodexTurnCompletionIdleTimeoutMs } from "./shared-client-DG1kAfGq.mjs";
+import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, l as resolveCodexRunSessionBindingAuthority, u as scopeCodexRunBindingStore } from "./session-binding-Bd9dh1Er.mjs";
+import { c as assertCodexTurnStartResponse, d as readCodexTurn, f as readCodexTurnCompletedNotification, l as readCodexDynamicToolCallParams } from "./protocol-validators-Bg5rpNxk.mjs";
+import { B as readNonNegativeInteger, D as itemStatus, E as itemName, H as splitPlanText, I as readItem, L as readItemString, M as extractRawAssistantText, P as readCodexErrorNotificationMessage, V as readNullableString, _ as readCodexNotificationThreadId, a as closeCodexStartupClientBestEffort, d as terminateCodexBackgroundTerminals, f as unsubscribeCodexThreadBestEffort, g as isCodexNotificationForTurn, h as CodexProjectionDiagnostics, j as shouldSynthesizeToolProgressForItem, k as shouldClearTerminalPresentationForNativeItem, l as retireCodexAppServerClientAfterTimedOutTurn, m as getCodexAppServerTurnRouter, o as interruptCodexTurnAndWaitBestEffort, p as CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-FBnDjmtX.mjs";
+import { C as readRawResponseToolCallId, E as updateActiveTurnItemIds, S as readNotificationItemId, T as updateActiveCompletionBlockerItemIds, _ as isReasoningItemCompletionNotification, a as codexExecutionToolName, b as isTerminalTurnStatus, c as isAssistantCompletionReleaseNotification, d as isNativeToolProgressNotification, f as isPendingOpenClawDynamicToolCompletionNotification, g as isRawToolOutputCompletionNotification, h as isRawReasoningCompletionNotification, l as isCodexTurnAbortMarkerNotification, m as isRawFunctionToolOutputCompletionNotification, o as describeNotificationActivity, p as isRawAssistantProgressNotification, r as projectCodexThreadUsageUpdate, s as isAssistantCommentaryCompletionNotification, t as CodexResponseCompletionProjection, u as isFileChangePatchUpdatedNotification, v as isReasoningProgressNotification, w as shouldDisarmAssistantCompletionIdleWatch, x as readCodexNotificationItem, y as isRetryableErrorNotification } from "./event-projector-usage-h7P0Raok.mjs";
+import { i as buildCodexPluginAppCacheKey, r as buildCodexAppServerRuntimeFingerprint, s as defaultCodexAppInventoryCache } from "./thread-resume-OMjvue9F.mjs";
+import { $ as resolveCodexContinuityProjectionMaxChars, B as isMessageOnlyCodexSourceReply, C as resolveCodexWebSearchPlan, F as codexDynamicToolsFingerprint, G as buildContextEngineBinding, I as codexLegacyDynamicToolsFingerprint, J as fitCodexProjectedContextForTurnStart, K as isContextEngineBindingCompatible, L as filterCodexDynamicTools, P as areCodexDynamicToolFingerprintsCompatible, Q as resolveCodexContextEngineProjectionReserveTokens, V as isSystemAgentOnlyCodexDynamicToolAllowlist, W as resolveCodexDynamicToolsLoadingForRuntime, X as projectContextEngineAssemblyForCodex, Y as neutralizeCodexExplicitMentionSigils, Z as resolveCodexContextEngineProjectionMaxChars, at as buildPluginAppPolicyContext, d as buildCodexNativeHookRelayDisabledConfig, et as buildCodexPluginAppsConfigPatchFromPolicyContext, f as createCodexNativeHookRelay, g as scheduleCodexNativeHookRelayUnregister, h as resolveCodexNativeHookRelayTtlMs, k as resolveCodexAppServerThreadModelSelection, l as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, m as resolveCodexNativeHookRelayEvents, n as buildTurnStartParams, nt as buildCodexPluginThreadConfigInputFingerprint, o as startOrResumeThread, ot as mergeCodexThreadConfigs, p as emitCodexNativePreToolUseFailureDiagnostic, pt as resolveRecoverableCodexPluginConfigKeys, q as buildCodexContinuityCalibration, r as buildCodexUserInput, rt as buildCodexPluginThreadConfigTimeoutFallback, s as isCodexAppServerProfilerEnabled, st as shouldBuildCodexPluginThreadConfig, t as buildTurnCollaborationMode, tt as buildCodexPluginThreadConfig, u as buildCodexNativeHookRelayConfig, w as buildDeveloperInstructions } from "./thread-lifecycle-Cc6I-gbl.mjs";
+import { l as isIncognitoSessionKey, r as retainCodexAppServerBindingSubscription } from "./thread-ownership-B3vjUi0P.mjs";
+import { r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.mjs";
+import { a as buildCodexUserPromptMessage, i as mirrorPromptAtTurnStartBestEffort, l as hasCodexMirrorOrigin, n as createCodexAppServerUserMessagePersistenceNotifier, o as promptSnapshot, s as applyCodexTranscriptTaint, t as codexTranscriptMirrorRuntime } from "./transcript-mirror-DN-ed7Kf.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-oLHKpYRj.mjs";
+import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CQUmEcUk.mjs";
+import { r as formatCodexDisplayText } from "./command-formatters-DylXEqck.mjs";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy } from "./session-permission-policy-C0bdhR_I.mjs";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-BgiXAp29.mjs";
+import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-oyIUSaFi.mjs";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.mjs";
+import { i as createAssistantMirrorMessage, n as createAssistantCommentaryMessage, r as createAssistantMessage, t as createAssistantAsyncMessage } from "./event-projector-assistant-message-BCnzlajn.mjs";
+import { a as CodexToolProgressProjection, c as isCodexCommandBearingToolCall, d as sanitizeCodexToolResponse, i as CodexToolTranscriptProjection, l as resolveCodexToolProgressDetailMode, n as CodexEventProjection, o as shouldEmitTranscriptToolProgress, r as emitCodexAgentEvent, s as inferCodexDynamicToolMeta, t as codexNativeSubagentMonitorRuntime, u as sanitizeCodexToolArguments } from "./native-subagent-monitor-mhFvLcPG.mjs";
+import { n as readCodexMirroredSessionHistoryMessages } from "./session-history-Cg8PzgeU.mjs";
+import { C as shouldRequireCodexSandboxExecServerEnvironment, D as CodexNativeToolLifecycleProjector, E as readBoundedCodexRemoteWorkspaceFile, S as shouldEnableCodexAppServerNativeToolSurface, _ as resolveCodexAppServerHookChannelId, a as emitDynamicToolStartedDiagnostic, c as resolveCodexProviderWebSearchSupport, d as releaseCodexSandboxExecServerEnvironment, f as buildDynamicTools, g as resolveCodexAppServerExecutionCwd, h as formatCodexDynamicToolBuildStageSummary, i as emitDynamicToolErrorDiagnostic, m as disableCodexPluginThreadConfig, n as projectCodexExecutableDynamicTools, o as emitDynamicToolTerminalDiagnostic, p as createCodexDynamicToolBuildStageTracker, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, u as ensureCodexSandboxExecServerEnvironment, v as resolveCodexExternalSandboxPolicyForOpenClawSandbox, w as shouldWarnCodexDynamicToolBuildStageSummary, x as resolveCodexSandboxEnvironmentSelection, y as resolveCodexMessageToolProvider } from "./dynamic-tools-XNStyzzb.mjs";
+import { n as captureCodexSettledTurnFinalizationContext } from "./settled-turn-context-OxoGQWJK.mjs";
+import { a as runCodexComputerUseLiveTest, n as ensureCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-RRQ_VJrs.mjs";
 import { asBoolean, asFiniteNumber, asOptionalRecord, hasNonEmptyString, normalizeOptionalString, readNonBlankString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -35,7 +37,7 @@ import { addAbortListener } from "node:events";
 import { truncateUtf16Safe, truncateUtf8Prefix } from "openclaw/plugin-sdk/text-utility-runtime";
 import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent, emitTrustedDiagnosticEventWithPrivateData, freezeDiagnosticTraceContext, onInternalDiagnosticEvent, resolveDiagnosticModelContentCapturePolicy } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { isPathStrictlyInside, root } from "openclaw/plugin-sdk/file-access-runtime";
-import { captureFinalCodexCronCreatorToolAllowlist, materializeStaticMcpToolsForScheduledHarnessRun, resolveCodexMcpToolOverridesForAgent } from "openclaw/plugin-sdk/codex-mcp-projection";
+import { captureFinalCodexCronCreatorToolAllowlist, materializeStaticMcpToolsForScheduledHarnessRun, resolveCodexMcpToolOverridesForAgent, resolveCodexTtsProvenanceTransfer } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { hasPromptImageInput } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
@@ -1127,7 +1129,9 @@ function buildCodexAttemptResult(input) {
 	});
 	const toolMetas = input.toolProgressProjection.toolMetas;
 	const hadPotentialSideEffects = input.toolTelemetry.didSendViaMessagingTool || Boolean(input.toolTelemetry.successfulCronAdds || input.toolTelemetry.acceptedSessionSpawns?.length) || input.generatedMediaProjection.hasGeneratedMedia() || input.toolProgressProjection.hasPotentialSideEffects;
-	return {
+	const sentMediaUrls = new Set(input.toolTelemetry.messagingToolSentMediaUrls.map((url) => url.trim()));
+	const toolAutoDeliveryMediaUrls = input.toolTelemetry.toolAutoDeliveryMediaUrls?.filter((url) => !sentMediaUrls.has(url.trim()));
+	const result = {
 		terminal: attemptTerminal.normalize({
 			aborted: input.aborted,
 			promptError,
@@ -1174,6 +1178,9 @@ function buildCodexAttemptResult(input) {
 		yieldDetected: input.yieldDetected || false,
 		didSendDeterministicApprovalPrompt: input.guardianReviewCount > 0 ? false : void 0
 	};
+	const transferTtsProvenance = resolveCodexTtsProvenanceTransfer(input.runParams.hostCapabilities);
+	for (const toolResult of input.toolTelemetry.coreTtsToolResults ?? []) transferTtsProvenance?.(toolResult, result, toolAutoDeliveryMediaUrls ?? []);
+	return result;
 }
 //#endregion
 //#region extensions/codex/src/app-server/transcript-checkpoint.ts
@@ -1551,7 +1558,7 @@ var CodexAppServerEventProjector = class {
 				await this.handleTurnCompleted(params);
 				break;
 			case "rawResponse/completed":
-				this.responseCompletions.record(params);
+				this.responseCompletions.record(params, this.params.hostCapabilities.reportOutputTokens);
 				break;
 			case "rawResponseItem/completed":
 				await this.handleRawResponseItemCompleted(params);
@@ -1581,9 +1588,7 @@ var CodexAppServerEventProjector = class {
 			case "model/verification":
 			case "turn/moderationMetadata":
 			case "model/safetyBuffering/updated": break;
-			default:
-				this.diagnostics.warnUnknownEvent(notification, params);
-				break;
+			default: this.diagnostics.warnUnknownEvent(notification, params);
 		}
 	}
 	buildResult(toolTelemetry, options) {
@@ -1899,7 +1904,8 @@ function readCodexMcpToolConnectorId(tool) {
 }
 /** Preserve MCP App visibility so model-only tools cannot become widget authority. */
 function readCodexMcpToolUiVisibility(tool) {
-	const visibility = asOptionalRecord(asOptionalRecord(asOptionalRecord(tool)?.["_meta"])?.ui)?.visibility;
+	const metadata = asOptionalRecord(asOptionalRecord(tool)?.["_meta"]);
+	const visibility = asOptionalRecord(metadata?.ui)?.visibility;
 	if (!Array.isArray(visibility)) return;
 	return [...new Set(visibility.filter((value) => value === "app" || value === "model"))].toSorted();
 }
@@ -1907,7 +1913,8 @@ function readCodexMcpToolUiVisibility(tool) {
 //#region extensions/codex/src/app-server/native-mcp-app.ts
 const CODEX_APPS_MCP_SERVER$1 = "codex_apps";
 function readMcpAppResourceUri(item) {
-	const uri = normalizeOptionalString(asOptionalRecord(item.appContext)?.resourceUri) ?? normalizeOptionalString(item.mcpAppResourceUri);
+	const appContext = asOptionalRecord(item.appContext);
+	const uri = normalizeOptionalString(appContext?.resourceUri) ?? normalizeOptionalString(item.mcpAppResourceUri);
 	return uri?.startsWith("ui://") ? uri : void 0;
 }
 function readMcpAppConnectorId(item) {
@@ -2048,9 +2055,9 @@ function createCodexNativeMcpAppResultDetailsPreparer(params) {
 const RESTORED_PLAN_PREAMBLE = "OpenClaw restored the session progress card after context compaction. This is application state, not a new user request. Continue the current task and call progress_card whenever the status meaningfully changes.";
 const PROGRESS_CARD_MAX_STEPS = 50;
 const PROGRESS_CARD_MAX_STEP_UTF8_BYTES = 512;
-const PROGRESS_CARD_MAX_UTF8_BYTES = 8 * 1024;
-const RESTORED_PLAN_MAX_MARKDOWN_BYTES = 2 * 1024;
-const RESTORED_PLAN_MAX_PAYLOAD_BYTES = 32 * 1024;
+const PROGRESS_CARD_MAX_UTF8_BYTES = 8192;
+const RESTORED_PLAN_MAX_MARKDOWN_BYTES = 2048;
+const RESTORED_PLAN_MAX_PAYLOAD_BYTES = 32768;
 const RESTORED_PLAN_TRUNCATION_SUFFIX = "…";
 function canonicalizeNativeProgressCardInput(input) {
 	const markdown = input.markdown === void 0 ? void 0 : truncateUtf8(stripInvisibleUnicode(input.markdown), PROGRESS_CARD_MAX_UTF8_BYTES);
@@ -2060,8 +2067,10 @@ function canonicalizeNativeProgressCardInput(input) {
 		const text = truncateUtf8(stripInvisibleUnicode(step.step), PROGRESS_CARD_MAX_STEP_UTF8_BYTES);
 		if (!text.trim()) continue;
 		let status = step.status;
-		if (status === "in_progress") if (hasInProgressStep) status = "pending";
-		else hasInProgressStep = true;
+		if (status === "in_progress") {
+			if (hasInProgressStep) status = "pending";
+			else hasInProgressStep = true;
+		}
 		plan.push({
 			step: text,
 			status
@@ -2130,7 +2139,8 @@ function serializePlan(plan) {
 }
 function truncateUtf8(value, maxBytes) {
 	if (Buffer$1.byteLength(value, "utf8") <= maxBytes) return value;
-	return `${truncateUtf8Prefix(value, maxBytes - Buffer$1.byteLength(RESTORED_PLAN_TRUNCATION_SUFFIX, "utf8"))}${RESTORED_PLAN_TRUNCATION_SUFFIX}`;
+	const suffixBytes = Buffer$1.byteLength(RESTORED_PLAN_TRUNCATION_SUFFIX, "utf8");
+	return `${truncateUtf8Prefix(value, maxBytes - suffixBytes)}${RESTORED_PLAN_TRUNCATION_SUFFIX}`;
 }
 function readPlanSteps(value) {
 	if (!Array.isArray(value)) return [];
@@ -2150,7 +2160,7 @@ function isPlanStatus(value) {
 //#endregion
 //#region extensions/codex/src/app-server/user-input-bridge.ts
 /** Owns per-turn Codex request_user_input and ordinary MCP elicitation lifecycles. */
-const DEFAULT_USER_INPUT_TIMEOUT_MS = 15 * 6e4;
+const DEFAULT_USER_INPUT_TIMEOUT_MS = 9e5;
 const NONBLOCKING_USER_INPUT_TIMEOUT_MS = 12e4;
 const MAX_USER_INPUT_QUESTIONS = 3;
 const MAX_USER_INPUT_OPTIONS = 4;
@@ -2258,7 +2268,7 @@ function createCodexUserInputBridge(params) {
 					}
 				});
 			}
-			const { compileCodexOrdinaryElicitation } = await import("./elicitation-input-DMkeki8d.js");
+			const { compileCodexOrdinaryElicitation } = await import("./elicitation-input-DMkeki8d.mjs");
 			const compiled = compileCodexOrdinaryElicitation({
 				value: requestSnapshot,
 				threadId: params.threadId,
@@ -2274,7 +2284,10 @@ function createCodexUserInputBridge(params) {
 				failureValue: declineElicitation("OpenClaw could not handle this elicitation."),
 				run: async (signal) => {
 					const result = await execute(compiled.input, timeoutMs, signal);
-					if (result.status === "answered") return createCodexElicitationResponse("accept", compiled.input.kind === "ready" && compiled.input.plan.kind === "url" ? null : result.content);
+					if (result.status === "answered") {
+						const content = compiled.input.kind === "ready" && compiled.input.plan.kind === "url" ? null : result.content;
+						return createCodexElicitationResponse("accept", content);
+					}
 					if (result.status === "declined") return declineElicitation(result.message);
 					if (result.status === "unsupported") return declineElicitation(result.message);
 					return cancelValue;
@@ -2393,7 +2406,7 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 	const { context, turnState } = prompt;
 	const { runtime, attemptTools } = context;
 	const { connection } = runtime;
-	const { params, runAbortController, terminalState, abortExplicitly, abortFromUpstream, bindingStore, bindingIdentity, sessionAgentId, sandboxSessionKey, contextSessionKey, effectiveCwd } = connection;
+	const { params, runAbortController, terminalState, abortExplicitly, abortFromUpstream, bindingStore, bindingIdentity, sessionAgentId, contextSessionKey, effectiveCwd } = connection;
 	const { dynamicToolParams, compactionPlanState, computerContextEpoch, toolBridge } = attemptTools;
 	const { state, userInputBridgeRef, steeringQueueRef, turnWatches, completeTurn, interruptTurn } = turnRuntime;
 	const { emitExecutionPhaseOnce, emitLifecycleStart, maybeAnnounceFastModeAutoOff } = lifecycle;
@@ -2507,7 +2520,7 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 		params,
 		agentId: sessionAgentId,
 		notifyUserMessagePersisted,
-		sessionKey: sandboxSessionKey,
+		sessionKey: contextSessionKey,
 		cwd: effectiveCwd,
 		threadId: resourceState.thread.threadId,
 		turnId: activeTurnId,
@@ -2578,8 +2591,8 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 			return buildCodexUserInput(text, result.images);
 		},
 		beforeConfirmConsumed: async (items) => {
-			const inboundItems = items.filter((item) => item.isInboundUserMessage === true);
-			if (inboundItems.length === 0) return;
+			const transcriptItems = items.filter((item) => item.isInboundUserMessage === true || item.userTurnTranscriptRecorder !== void 0);
+			if (transcriptItems.length === 0) return;
 			await promptMirrorPromise;
 			const messages = activeProjector.buildSteeringTranscriptPrefix();
 			if (params.sessionTarget && messages.length > 0) {
@@ -2597,7 +2610,7 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 				});
 				activeProjector.markSteeringTranscriptPersisted();
 			}
-			for (const item of inboundItems) {
+			for (const item of transcriptItems) {
 				const recorder = item.userTurnTranscriptRecorder;
 				if (!recorder) continue;
 				await recorder.persistApproved();
@@ -2649,6 +2662,15 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 		runId: params.runId,
 		startedAtMs: params.startedAtMs,
 		toolAuthorityFingerprint: params.toolAuthorityFingerprint,
+		permissionChangeOwner: params.permissionChange?.owner,
+		applyPermissionMode: async (mode, revokeApprovals) => {
+			if (!params.permissionChange || terminalState.terminalOutcomeFrozen || params.abortSignal?.aborted || !state.permissionChangeRestart && (state.completed || runAbortController.signal.aborted)) return false;
+			const applied = params.permissionChange.request(mode);
+			state.permissionChangeRestart ??= "requested";
+			runAbortController.abort("permission-change");
+			revokeApprovals();
+			return await applied;
+		},
 		claimPendingUserInputAnswer,
 		cancelPendingUserInput,
 		queueMessage,
@@ -2691,18 +2713,23 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 			})().finally(completeTurn);
 			return;
 		}
-		const interrupted = interruptTurn(activeTurnId);
-		if (terminalState.explicitCancellationObserved) state.abortCleanup = interrupted.then(async (confirmed) => {
-			if (!confirmed) throw new Error("Codex cancellation could not confirm the turn stopped; background terminals may still be running.");
+		state.abortCleanup = interruptTurn(activeTurnId).then(async (confirmed) => {
+			if (!terminalState.explicitCancellationObserved && !state.permissionChangeRestart) return;
+			if (!confirmed) throw new Error(state.permissionChangeRestart ? "Permission change could not confirm the previous Codex turn stopped." : "Codex cancellation could not confirm the turn stopped; background terminals may still be running.");
 			await terminateCodexBackgroundTerminals(resourceState.client, resourceState.thread.threadId);
+			if (state.permissionChangeRestart) state.permissionChangeRestart = "confirmed";
 		});
-		(terminalState.explicitCancellationObserved ? state.abortCleanup : interrupted).then(completeTurn, (error) => {
+		state.abortCleanup.then(completeTurn, (error) => {
 			embeddedAgentLog.warn("codex app-server cancellation cleanup failed", { error });
 			completeTurn();
 		});
 	};
 	runAbortController.signal.addEventListener("abort", abortListener, { once: true });
 	if (runAbortController.signal.aborted) abortListener();
+	else if (params.permissionChange && !params.permissionChange.applied()) {
+		state.permissionChangeRestart = "requested";
+		runAbortController.abort("permission-change");
+	}
 	return {
 		activeTurnId,
 		activeProjector,
@@ -2746,7 +2773,7 @@ async function cleanupCodexAttempt(resources, turnRuntime, lifecycle, requestRun
 			aborted: runAbortController.signal.aborted && !state.clientClosedAbort
 		});
 		await runCleanupStep("codex-trajectory-flush", () => trajectoryRecorder?.flush());
-		const retainLiveIncognitoThread = terminalState.turnSucceeded && isIncognitoSessionKey(params.sessionKey);
+		const retainLiveIncognitoThread = (terminalState.turnSucceeded || state.permissionChangeRestart === "confirmed" && !params.abortSignal?.aborted) && isIncognitoSessionKey(params.sessionKey);
 		const retainedPersistentThread = terminalState.turnSucceeded && !isIncognitoSessionKey(params.sessionKey) && params.cleanupBundleMcpOnRunEnd !== true && resourceState.thread.liveThreadConfigFingerprint !== void 0 && resourceState.thread.clientId === resolveCodexAppServerClientInstanceId(resourceState.client) && resourceState.thread.preserveNativeModel !== true && resourceState.thread.connectionScope !== "supervision" && !resourceState.thread.ringZeroConfigFingerprint ? (await bindingStore.read(bindingIdentity))?.threadId === resourceState.thread.threadId && await bindingStore.withLease(bindingIdentity, async () => {
 			if ((await bindingStore.read(bindingIdentity))?.threadId !== resourceState.thread.threadId) return false;
 			return await retainCodexAppServerBindingSubscription(resourceState.client, resourceState.thread.threadId, {
@@ -2875,21 +2902,21 @@ const CODEX_APP_SERVER_NATIVE_THREAD_FALLBACK_MAX_TOKENS = 3e5;
 const CODEX_APP_SERVER_NATIVE_THREAD_DEFAULT_RESERVE_TOKENS = 2e4;
 const CODEX_APP_SERVER_NATIVE_THREAD_MIN_PROMPT_BUDGET_TOKENS = 8e3;
 const CODEX_APP_SERVER_NATIVE_THREAD_MIN_PROMPT_BUDGET_RATIO = .5;
-const CODEX_APP_SERVER_ROLLOUT_TAIL_READ_BYTES = 64 * 1024;
+const CODEX_APP_SERVER_ROLLOUT_TAIL_READ_BYTES = 65536;
 const CODEX_APP_SERVER_BYTE_UNITS = {
 	b: 1,
 	k: 1024,
 	kb: 1024,
 	kib: 1024,
-	m: 1024 * 1024,
-	mb: 1024 * 1024,
-	mib: 1024 * 1024,
-	g: 1024 * 1024 * 1024,
-	gb: 1024 * 1024 * 1024,
-	gib: 1024 * 1024 * 1024,
-	t: 1024 * 1024 * 1024 * 1024,
-	tb: 1024 * 1024 * 1024 * 1024,
-	tib: 1024 * 1024 * 1024 * 1024
+	m: 1048576,
+	mb: 1048576,
+	mib: 1048576,
+	g: 1073741824,
+	gb: 1073741824,
+	gib: 1073741824,
+	t: 1099511627776,
+	tb: 1099511627776,
+	tib: 1099511627776
 };
 const codexSessionRecordCache = /* @__PURE__ */ new Map();
 function parseCodexAppServerByteLimit(value) {
@@ -3191,6 +3218,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 		config: params.config,
 		agentId: params.agentId
 	});
+	const policyAgentId = params.sandboxAgentId ?? sessionAgentId;
 	preDynamicStartupStages.mark("config");
 	const resolvedWorkspace = resolveUserPath(params.workspaceDir);
 	await ensureCodexWorkspaceDirOnce(resolvedWorkspace);
@@ -3199,6 +3227,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 	const contextSessionKey = params.sessionKey?.trim() || sandboxSessionKey;
 	const sandbox = params.sandbox !== void 0 ? params.sandbox : await resolveSandboxContext({
 		config: params.config,
+		agentId: params.sandboxAgentId,
 		sessionKey: sandboxSessionKey,
 		workspaceDir: resolvedWorkspace
 	});
@@ -3209,18 +3238,24 @@ async function prepareCodexAttemptConnection({ params, options }) {
 		execOverrides: params.execOverrides,
 		approvals: params.permissionMode === "full" ? void 0 : loadExecApprovals(),
 		config: params.config,
-		agentId: sessionAgentId
+		agentId: policyAgentId
 	});
 	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId);
 	const preparedEnvironment = params.hostCapabilities.preparedEnvironment?.();
 	const remoteExec = isCodexRemoteExecPlacementSandbox(sandbox);
+	const assertLocalTargetSupported = (unsupported) => {
+		if (preparedEnvironment?.localProcessEnv && unsupported) throw new Error("This runtime cannot target the diagnosed local installation. Use the saved prompt with a suggested external or manual handoff on this machine.");
+	};
+	assertLocalTargetSupported(sandbox?.enabled === true || remoteExec);
 	const preparedShellEnvironment = preparedEnvironment ? {
 		...preparedEnvironment.credentialScrubEnv,
-		...!remoteExec ? preparedEnvironment.localIdentityEnv : void 0
+		...!remoteExec ? preparedEnvironment.localIdentityEnv : void 0,
+		...preparedEnvironment.localProcessEnv
 	} : void 0;
 	const shellEnvironment = preparedShellEnvironment && Object.keys(preparedShellEnvironment).length > 0 ? preparedShellEnvironment : void 0;
-	const disableLoginShell = remoteExec || preparedEnvironment?.managedLocalIdentity === true || preparedEnvironment !== void 0 && Object.keys(preparedEnvironment.credentialScrubEnv).length > 0;
+	const disableLoginShell = remoteExec || preparedEnvironment?.localProcessEnv !== void 0 || preparedEnvironment?.managedLocalIdentity === true || preparedEnvironment !== void 0 && Object.keys(preparedEnvironment.credentialScrubEnv).length > 0;
 	const withPreparedProcessEnv = (appServer) => {
+		assertLocalTargetSupported(appServer.start.transport === "websocket" || Boolean(appServer.remoteWorkspaceRoot));
 		return shellEnvironment ? {
 			...appServer,
 			start: {
@@ -3485,6 +3520,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 		pluginConfig,
 		computerUseConfig,
 		sessionAgentId,
+		policyAgentId,
 		resolvedWorkspace,
 		sandboxSessionKey,
 		contextSessionKey,
@@ -3542,7 +3578,7 @@ const CODEX_BOOTSTRAP_CONTEXT_ORDER = /* @__PURE__ */ new Map([
 /** Reads mirrored Codex session history for harness hooks. */
 async function readMirroredSessionHistoryMessages(params) {
 	const { admission, ...target } = params;
-	const messages = await readCodexMirroredSessionHistoryMessages(target, admission);
+	const messages = await readCodexMirroredSessionHistoryMessages(target, admission, "model-context");
 	if (!messages) embeddedAgentLog.warn("failed to read mirrored session history for codex harness hooks", { sessionFile: params.sessionFile });
 	return messages;
 }
@@ -4028,8 +4064,9 @@ async function renderCodexWorkspaceMemoryCollaborationInstructions(params) {
 	return sections.length > 0 ? sections.join("\n\n") : void 0;
 }
 async function renderCodexMemoryRecallInstructions(params) {
+	const availableTools = new Set(params.toolNames);
 	const memoryPrompt = await prepareMemorySystemPromptAddition({
-		availableTools: new Set(params.toolNames),
+		availableTools,
 		citationsMode: params.citationsMode,
 		agentId: params.agentId,
 		agentSessionKey: params.agentSessionKey,
@@ -4226,7 +4263,7 @@ function buildCodexAppServerTimeoutDiagnostics(params) {
 //#region extensions/codex/src/app-server/run-attempt-context.ts
 async function prepareCodexAttemptContext(runtime, attemptTools) {
 	const { connection, runtimeParams, activeSessionId, activeSessionFile, buildActiveRunAttemptParams, effectiveContextWindowInfo, effectiveContextTokenBudget, effectiveRuntimeProviderId, effectiveRuntimeModelId, hookChannelId } = runtime;
-	const { params, sessionAgentId, contextSessionKey, activeContextEngine, initialStartupBindingHadInactiveThreadBootstrap, sandboxSessionKey, effectiveWorkspace, effectiveCwd, agentDir, usesSupervisionConnection, resolvedWorkspace, initialInactiveThreadBootstrapBindingForcedFreshStart, sandbox } = connection;
+	const { params, sessionAgentId, contextSessionKey, activeContextEngine, initialStartupBindingHadInactiveThreadBootstrap, effectiveWorkspace, effectiveCwd, agentDir, usesSupervisionConnection, resolvedWorkspace, initialInactiveThreadBootstrapBindingForcedFreshStart, sandbox } = connection;
 	const { toolBridge } = attemptTools;
 	const activeTranscriptTarget = {
 		agentId: sessionAgentId,
@@ -4252,7 +4289,7 @@ async function prepareCodexAttemptContext(runtime, attemptTools) {
 	const hookContext = {
 		runId: params.runId,
 		agentId: sessionAgentId,
-		sessionKey: sandboxSessionKey,
+		sessionKey: contextSessionKey,
 		sessionId: params.sessionId,
 		workspaceDir: params.workspaceDir,
 		messageProvider: params.messageProvider ?? void 0,
@@ -4560,94 +4597,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/settled-turn-context.ts
-function collectUniqueMessageIdentities(messages) {
-	const identities = /* @__PURE__ */ new Map();
-	for (const [index, message] of messages.entries()) {
-		const identity = readMirrorIdentity(message);
-		if (!identity) continue;
-		if (identities.has(identity)) return;
-		identities.set(identity, index);
-	}
-	return identities;
-}
-function adoptPersistedHostPrompt(params) {
-	const promptIdentity = `${params.turnId}:prompt`;
-	if (params.mirroredMessages.some((message) => readMirrorIdentity(message) === promptIdentity)) return params;
-	const sourcePrompt = params.settledMessages[0];
-	const sourceKey = sourcePrompt?.idempotencyKey;
-	if (sourcePrompt?.role !== "user" || readMirrorIdentity(sourcePrompt) !== promptIdentity || typeof sourceKey !== "string" || sourceKey.trim().length === 0) return params;
-	const matches = params.historyMessages.flatMap((message, index) => message.role === "user" && message.idempotencyKey === sourceKey ? [{
-		index,
-		message
-	}] : []);
-	const persistedPrompt = matches.length === 1 ? matches[0] : void 0;
-	const persistedMetadata = persistedPrompt?.message;
-	if (!persistedPrompt || readMirrorIdentity(persistedPrompt.message) !== void 0 || readCodexMirrorSourceFingerprint(persistedPrompt.message) !== void 0 || persistedMetadata?.["__openclaw"]?.mirrorOrigin === "codex-app-server") return params;
-	const sourceUpstreamText = readUpstreamUserText(sourcePrompt);
-	const persistedUpstreamText = readUpstreamUserText(persistedPrompt.message);
-	if (persistedUpstreamText !== void 0 && persistedUpstreamText !== sourceUpstreamText) return params;
-	let logicalPrompt = attachCodexMirrorIdentity(persistedPrompt.message, promptIdentity);
-	if (sourceUpstreamText !== void 0) logicalPrompt = attachUpstreamUserText(logicalPrompt, sourceUpstreamText);
-	if (serializeCodexMirrorSourceEvidence(logicalPrompt) !== serializeCodexMirrorSourceEvidence(sourcePrompt)) return params;
-	const historyMessages = [...params.historyMessages];
-	historyMessages[persistedPrompt.index] = logicalPrompt;
-	return {
-		historyMessages,
-		mirroredMessages: [logicalPrompt, ...params.mirroredMessages]
-	};
-}
-/** Freezes one complete active transcript branch through the settled tool-result boundary. */
-function buildCodexSettledTurnFinalizationContext(params) {
-	const { historyMessages, mirroredMessages } = adoptPersistedHostPrompt(params);
-	const boundaryMessage = params.settledMessages.findLast((message) => message.role === "toolResult");
-	const boundaryIdentity = boundaryMessage ? readMirrorIdentity(boundaryMessage) : void 0;
-	if (!boundaryMessage || !boundaryIdentity || !boundaryIdentity.startsWith(`${params.turnId}:tool:`)) return;
-	const settledBoundaryIndex = params.settledMessages.indexOf(boundaryMessage);
-	const requiredIdentities = params.settledMessages.slice(0, settledBoundaryIndex + 1).map(readMirrorIdentity);
-	if (requiredIdentities.length === 0 || requiredIdentities.some((identity) => !identity) || new Set(requiredIdentities).size !== requiredIdentities.length || !requiredIdentities.includes(`${params.turnId}:prompt`)) return;
-	const historyIdentities = collectUniqueMessageIdentities(historyMessages);
-	const mirroredIdentities = collectUniqueMessageIdentities(mirroredMessages);
-	if (!historyIdentities || !mirroredIdentities) return;
-	const mirroredBoundaryIndex = mirroredIdentities.get(boundaryIdentity);
-	if (mirroredBoundaryIndex === void 0) return;
-	const mirroredThroughBoundary = mirroredMessages.slice(0, mirroredBoundaryIndex + 1);
-	if (mirroredThroughBoundary.length !== requiredIdentities.length || mirroredThroughBoundary.some((message, index) => readMirrorIdentity(message) !== requiredIdentities[index])) return;
-	const historyBoundaryIndex = historyIdentities.get(boundaryIdentity);
-	if (historyBoundaryIndex === void 0) return;
-	let previousHistoryIndex = -1;
-	for (const mirroredMessage of mirroredThroughBoundary) {
-		const identity = readMirrorIdentity(mirroredMessage);
-		const historyIndex = identity ? historyIdentities.get(identity) : void 0;
-		const historyMessage = historyIndex === void 0 ? void 0 : historyMessages[historyIndex];
-		if (historyIndex === void 0 || historyIndex <= previousHistoryIndex || historyIndex > historyBoundaryIndex || !historyMessage || serializeCodexMirrorSourceEvidence(historyMessage) !== serializeCodexMirrorSourceEvidence(mirroredMessage)) return;
-		previousHistoryIndex = historyIndex;
-	}
-	return {
-		source: "openclaw-transcript",
-		messages: Object.freeze(structuredClone(params.historyMessages.slice(0, historyBoundaryIndex + 1)))
-	};
-}
-/** Reads and freezes the current active transcript branch after mirroring has settled. */
-async function captureCodexSettledTurnFinalizationContext(params) {
-	try {
-		const historyMessages = await readCodexMirroredSessionHistoryMessages(params);
-		if (!historyMessages) return;
-		return buildCodexSettledTurnFinalizationContext({
-			historyMessages,
-			mirroredMessages: params.mirroredMessages,
-			settledMessages: params.settledMessages,
-			turnId: params.turnId
-		});
-	} catch (error) {
-		embeddedAgentLog.warn("codex settled-turn finalization context capture failed", {
-			error: formatErrorMessage(error),
-			turnId: params.turnId
-		});
-		return;
-	}
-}
-//#endregion
 //#region extensions/codex/src/app-server/trajectory.ts
 /** Creates a trajectory recorder when the host exposes its capture capability. */
 function createCodexTrajectoryRecorder(params) {
@@ -4870,14 +4819,13 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 		turnId: activeTurnId
 	});
 	const { assistantTranscriptOwned, assistantTranscriptIdempotencyKey, terminalAnchor } = mirrorOutcome;
-	const shouldCaptureSettledTurnFinalizationContext = result.assistantTexts.every((text) => !text.trim()) && result.messagesSnapshot.some((message) => message.role === "toolResult") && (!finalPromptError || activeProjector.settledTurnFailureFinalizationAllowed);
-	const settledTurnFinalizationContext = shouldCaptureSettledTurnFinalizationContext ? await captureCodexSettledTurnFinalizationContext({
+	const settledTurnFinalizationContext = result.assistantTexts.every((text) => !text.trim()) && result.messagesSnapshot.some((message) => message.role === "toolResult") && (!finalPromptError || activeProjector.settledTurnFailureFinalizationAllowed) ? await captureCodexSettledTurnFinalizationContext({
 		...activeTranscriptTarget,
 		mirroredMessages: mirrorOutcome.mirroredMessages,
 		settledMessages: result.messagesSnapshot,
 		turnId: activeTurnId
-	}) : void 0;
-	if (shouldCaptureSettledTurnFinalizationContext && !settledTurnFinalizationContext) embeddedAgentLog.warn("codex settled-turn finalization context is unavailable", {
+	}) ?? Object.freeze({ source: "unavailable" }) : void 0;
+	if (settledTurnFinalizationContext?.source === "unavailable") embeddedAgentLog.warn("codex settled-turn finalization context is unavailable", {
 		threadId: resourceState.thread.threadId,
 		turnId: activeTurnId
 	});
@@ -4980,8 +4928,7 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 			yielded: toolState.yieldDetected
 		})
 	});
-	const finalizedResult = {
-		...result,
+	const finalizedResult = Object.assign(result, {
 		...toolState.yieldAcknowledgment ? { yieldAcknowledgment: toolState.yieldAcknowledgment } : {},
 		terminal: attemptTerminal.normalize({
 			timedOut: effectiveTimedOut,
@@ -4999,7 +4946,7 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 		...resourceState.runtimeContinuationStarted ? { runtimeContinuationStarted: true } : {},
 		...!finalAborted && !effectiveTimedOut && !finalPromptError && preparedAuthBinding ? { authBindingFingerprint: preparedAuthBinding.fingerprint } : {},
 		systemPromptReport
-	};
+	});
 	if (turnSucceeded && toolState.yieldDetected && !runAbortController.signal.aborted) resourceState.nativeHookRelay?.authorizeRetentionAfterSuccessfulYield();
 	return finalizedResult;
 }
@@ -5083,9 +5030,10 @@ function applyCodexTurnNotificationState(params) {
 	else if (shouldArmNoToolPostProgressReplyWatch || shouldArmNoToolPostRawProgressReplyWatch) armPostProgressReplyWatch();
 	else if (trackedDynamicToolCompletion) armPostToolContinuationWatch();
 	else if (unblockedAssistantCompletionRelease) turnWatches.armAssistantCompletionIdleWatch(describeNotificationActivity(notification));
-	else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) if (shouldUsePostToolContinuationWatch) armPostToolContinuationWatch();
-	else turnWatches.armCompletionIdleWatch();
-	else if (rawResponseItemCompletedWithNoActiveItems) turnWatches.armCompletionIdleWatch();
+	else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) {
+		if (shouldUsePostToolContinuationWatch) armPostToolContinuationWatch();
+		else turnWatches.armCompletionIdleWatch();
+	} else if (rawResponseItemCompletedWithNoActiveItems) turnWatches.armCompletionIdleWatch();
 	else if (isCurrentTurnNotification && rawToolOutputCompletion) armPostToolContinuationWatch();
 	else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) turnWatches.disarmAssistantCompletionIdleWatch();
 	if (turnWatches.isCompletionIdleWatchArmed() && !turnWatches.isCompletionIdleWatchPinnedByTerminalError() && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolProgressNeedsTerminalGuard && !postToolPatchUpdateNeedsTerminalGuard && !rawResponseItemCompletedWithNoActiveItems && !shouldArmNoToolPostProgressReplyWatch && !shouldArmNoToolPostRawProgressReplyWatch && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) turnWatches.disarmCompletionIdleWatch();
@@ -5199,7 +5147,7 @@ function createCodexAttemptLifecycleController(resources, turnRuntime) {
 		state.lifecycleStarted = true;
 	};
 	const emitLifecycleTerminal = (data) => {
-		if (!state.lifecycleStarted || state.lifecycleTerminalEmitted) return;
+		if (!state.lifecycleStarted || state.lifecycleTerminalEmitted || state.permissionChangeRestart) return;
 		emitCodexAppServerEvent(params, {
 			stream: "lifecycle",
 			data: {
@@ -5447,7 +5395,6 @@ function createCodexAttemptNotificationController(resources, turnRuntime, lifecy
 }
 //#endregion
 //#region extensions/codex/src/app-server/run-attempt-prompt.ts
-const CODEX_META_KEY = "__openclaw";
 function isRestrictivePromptToolsAllow(toolsAllow) {
 	return toolsAllow !== void 0 && !toolsAllow.some((name) => name.trim() === "*");
 }
@@ -5546,7 +5493,7 @@ async function prepareCodexAttemptPrompt(context) {
 				if (isRestrictivePromptToolsAllow(toolsAllow)) throw new Error("Codex app-server cannot enforce before_prompt_build toolsAllow; use the embedded or Copilot runtime for turn-scoped tool policy.");
 				return promptState.developerInstructions;
 			} },
-			messages: structuredClone(historyState.messages),
+			messages: historyState.messages,
 			ctx: hookContext,
 			bootstrapContextRunKind: params.bootstrapContextRunKind,
 			toolAuthority: {
@@ -5624,11 +5571,9 @@ async function prepareCodexAttemptPrompt(context) {
 		const cutoff = Date.parse(binding.historyCoveredThrough ?? "");
 		return historyState.messages.filter((message) => {
 			if (message.role !== "user" && message.role !== "assistant") return false;
-			const meta = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
-			const mirrorIdentity = meta && typeof meta === "object" && !Array.isArray(meta) ? meta.mirrorIdentity : void 0;
-			const mirrorOrigin = meta && typeof meta === "object" && !Array.isArray(meta) ? meta.mirrorOrigin : void 0;
+			const mirrorIdentity = readMirrorIdentity(message);
 			const timestamp = typeof message.timestamp === "number" ? message.timestamp : typeof message.timestamp === "string" ? Date.parse(message.timestamp) : NaN;
-			return !("idempotencyKey" in message && typeof message.idempotencyKey === "string" && message.idempotencyKey.startsWith("codex-app-server:")) && mirrorOrigin !== "codex-app-server" && !(typeof mirrorIdentity === "string" && mirrorIdentity.startsWith("codex-app-server:")) && Number.isFinite(timestamp) && timestamp > (Number.isFinite(cutoff) ? cutoff : 0);
+			return !("idempotencyKey" in message && typeof message.idempotencyKey === "string" && message.idempotencyKey.startsWith("codex-app-server:")) && !hasCodexMirrorOrigin(message) && !mirrorIdentity?.startsWith("codex-app-server:") && Number.isFinite(timestamp) && timestamp > (Number.isFinite(cutoff) ? cutoff : 0);
 		});
 	};
 	const applyResumeStaleBindingContinuityProjection = (binding) => {
@@ -5660,7 +5605,8 @@ async function prepareCodexAttemptPrompt(context) {
 		return projected;
 	};
 	const applyNoContextEngineContinuityProjection = (action, binding) => {
-		if (activeContextEngine || !historyState.messages.some((message) => message.role === "user")) return false;
+		const hasContinuity = historyState.messages.some((message) => message.role === "user" || action === "started" && (message.role === "compactionSummary" || message.role === "branchSummary"));
+		if (activeContextEngine || !hasContinuity) return false;
 		if (action === "resumed" && promptState.precomputedStaleBindingContinuityProjectionApplied) return true;
 		if (action === "started" && promptState.staleBindingContinuityForcedFreshStart) return true;
 		if (action === "started" && promptState.inactiveThreadBootstrapBindingForcedFreshStart) return false;
@@ -5753,7 +5699,7 @@ function prepareCodexAttemptResources(prompt) {
 	const { context, turnState, buildRenderedCodexDeveloperInstructions } = prompt;
 	const { runtime, attemptTools } = context;
 	const { connection, hookChannelId } = runtime;
-	const { appServer, params, effectiveCwd, sessionAgentId, sandboxSessionKey, runAbortController, sandbox, options, nativeHookRelayEvents } = connection;
+	const { appServer, params, effectiveCwd, sessionAgentId, contextSessionKey, runAbortController, sandbox, options, nativeHookRelayEvents } = connection;
 	const { toolBridge } = attemptTools;
 	const trajectoryRecorder = createCodexTrajectoryRecorder({
 		attempt: params,
@@ -5793,7 +5739,7 @@ function prepareCodexAttemptResources(prompt) {
 		emitCodexNativePreToolUseFailureDiagnostic({
 			agentId: sessionAgentId,
 			sessionId: params.sessionId,
-			sessionKey: sandboxSessionKey,
+			sessionKey: contextSessionKey,
 			runId: params.runId,
 			signal: runAbortController.signal,
 			failure,
@@ -5915,7 +5861,7 @@ function prepareCodexAttemptResources(prompt) {
 			events: nativeHookRelayEvents,
 			agentId: sessionAgentId,
 			sessionId: params.sessionId,
-			sessionKey: sandboxSessionKey,
+			sessionKey: contextSessionKey,
 			config: params.config,
 			runId: params.runId,
 			channelId: hookChannelId,
@@ -6172,7 +6118,8 @@ async function readCurrentCodexScheduledAppPolicy$1(params) {
 	};
 }
 function readToolApprovalMode(config, appId, toolName, fallback = "auto") {
-	return normalizeAppToolApprovalMode(asOptionalRecord(asOptionalRecord(asOptionalRecord(asOptionalRecord(config.apps)?.[appId])?.tools)?.[toolName])?.approval_mode) ?? fallback;
+	const app = asOptionalRecord(asOptionalRecord(config.apps)?.[appId]);
+	return normalizeAppToolApprovalMode(asOptionalRecord(asOptionalRecord(app?.tools)?.[toolName])?.approval_mode) ?? fallback;
 }
 /** Captures only apps callable on the exact active Codex client/thread. */
 async function captureScheduledCodexAppAuthority(params) {
@@ -6290,7 +6237,8 @@ function intersectCodexPluginThreadConfigWithScheduledAuthority(config, authorit
 			destructiveApprovalMode: stricterApprovalMode(defaultApprovalMode(current), captured.destructiveApprovalMode)
 		};
 	}
-	const policyContext = buildPluginAppPolicyContext(apps, Object.fromEntries(Object.entries(config.policyContext.pluginAppIds).map(([key, ids]) => [key, ids.filter((id) => Object.hasOwn(apps, id))]).filter(([, ids]) => ids.length > 0)));
+	const pluginAppIds = Object.fromEntries(Object.entries(config.policyContext.pluginAppIds).map(([key, ids]) => [key, ids.filter((id) => Object.hasOwn(apps, id))]).filter(([, ids]) => ids.length > 0));
+	const policyContext = buildPluginAppPolicyContext(apps, pluginAppIds);
 	const configPatch = buildCodexPluginAppsConfigPatchFromPolicyContext(policyContext);
 	const appsPatch = asOptionalRecord(configPatch.apps);
 	for (const [appId, captured] of capturedById) {
@@ -6359,7 +6307,7 @@ function resolveCodexAttemptBundleManifestRegistry(preparedModelRuntime) {
 	return metadataSnapshot?.pluginIds === void 0 ? metadataSnapshot?.manifestRegistry : void 0;
 }
 async function prepareCodexAttemptRuntime(connection) {
-	const { params, pluginConfig, usesSupervisionConnection, appServer, startupAuthProfileId, startupPreparedAuth, startupClientAuthProfileId, agentDir, preDynamicStartupStages, effectiveWorkspace, contextSessionKey, sandboxSessionKey, sessionAgentId, sandbox, attemptClientFactory, runAbortController, activeContextEngine, mutable } = connection;
+	const { params, pluginConfig, usesSupervisionConnection, appServer, startupAuthProfileId, startupPreparedAuth, startupClientAuthProfileId, agentDir, preDynamicStartupStages, effectiveWorkspace, contextSessionKey, sandboxSessionKey, sessionAgentId, policyAgentId, sandbox, attemptClientFactory, runAbortController, activeContextEngine, mutable } = connection;
 	const preparedAuthBinding = !usesSupervisionConnection && appServer.start.homeScope !== "user" && startupAuthProfileId ? await prepareCodexAppServerAuthBinding({
 		authProfileId: startupAuthProfileId,
 		authProfileStore: params.authProfileStore,
@@ -6463,7 +6411,7 @@ async function prepareCodexAttemptRuntime(connection) {
 	preDynamicStartupStages.mark("bundle-mcp");
 	const sandboxExecServerEnabled = isCodexSandboxExecServerEnabled(pluginConfig, sandbox);
 	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(runtimeParams, sandbox, {
-		agentId: sessionAgentId,
+		agentId: policyAgentId,
 		runtimeSessionKey: sandboxSessionKey,
 		sandboxExecServerEnabled
 	});
@@ -6905,7 +6853,7 @@ function createCodexAttemptServerRequestController(resources, turnRuntime, lifec
 //#region extensions/codex/src/app-server/attempt-runtime-artifact.ts
 async function verifyStartupArtifact(params) {
 	if (!params.request) return;
-	const { readCodexAppServerClientRuntimeArtifact, validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-DeBvleJw.js");
+	const { readCodexAppServerClientRuntimeArtifact, validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-D0ssVSlz.mjs");
 	const runtimeArtifact = readCodexAppServerClientRuntimeArtifact(params.client);
 	const expected = params.request.expected;
 	const matchesExpected = !expected || runtimeArtifact?.id === expected.id && runtimeArtifact.fingerprint === expected.fingerprint;
@@ -7589,11 +7537,12 @@ async function startCodexAttemptRuntime(resources) {
 		if (usesSupervisionConnection && (state.thread.connectionScope !== "supervision" || state.thread.supervisionSourceThreadId !== connection.mutable.startupBinding?.supervisionSourceThreadId)) throw new Error("Codex supervised thread lost its private connection ownership");
 		if (state.thread.lifecycle.action === "started" || state.thread.lifecycle.action === "forked") {
 			const activePolicy = resolveReviewerPolicyContext(state.thread);
+			const activeConfig = resolveRuntimeOptionsForCurrentBinding({
+				modelProvider: activePolicy.modelProvider,
+				model: activePolicy.model
+			});
 			const activeAppServer = resolveCodexAppServerForModelProvider({
-				appServer: resolveRuntimeOptionsForCurrentBinding({
-					modelProvider: activePolicy.modelProvider,
-					model: activePolicy.model
-				}),
+				appServer: activeConfig,
 				provider: activePolicy.modelProvider,
 				model: activePolicy.model,
 				config: params.config,
@@ -7658,7 +7607,7 @@ function isAuthorityResolutionOperationAbort(error, signal) {
 }
 async function prepareCodexAttemptTools(runtime) {
 	const { connection, bundleMcpThreadConfig, bundleManifestRegistry, runtimeParams, effectiveRuntimeModelId, nativeToolSurfaceEnabled, nativeProviderWebSearchSupport, hookChannelId, codexMcpToolOverrides, authenticatedScheduledMode, ownsScheduledConfiguredMcpSurface, canResolveScheduledConfiguredMcpCreatorAuthority } = runtime;
-	const { params, preDynamicStartupStages, mutable, startupAuthProfileId, resolvedWorkspace, effectiveWorkspace, effectiveCwd, sandboxSessionKey, sandbox, sessionPermissionPolicy, runAbortController, sessionAgentId, pluginConfig, profilerEnabled, agentDir } = connection;
+	const { params, preDynamicStartupStages, mutable, startupAuthProfileId, resolvedWorkspace, effectiveWorkspace, effectiveCwd, sandboxSessionKey, contextSessionKey, sandbox, sessionPermissionPolicy, runAbortController, sessionAgentId, policyAgentId, pluginConfig, profilerEnabled, agentDir } = connection;
 	const preDynamicSummary = preDynamicStartupStages.snapshot();
 	if (shouldWarnCodexDynamicToolBuildStageSummary(preDynamicSummary)) embeddedAgentLog.warn(`codex app-server pre-dynamic startup timings runId=${params.runId} sessionId=${params.sessionId} totalMs=${preDynamicSummary.totalMs} stages=${formatCodexDynamicToolBuildStageSummary(preDynamicSummary)}`, {
 		runId: params.runId,
@@ -7737,6 +7686,7 @@ async function prepareCodexAttemptTools(runtime) {
 		nativeProviderWebSearchSupport,
 		runAbortController,
 		sessionAgentId,
+		policyAgentId,
 		pluginConfig,
 		profilerEnabled,
 		...params.cronCreatorAuthorityUnavailableReason === "queued-local-operator" && bundleMcpThreadConfig.staticServerNames.length > 0 ? { cronCreatorAuthorityUnavailableReason: "queued-local-operator-configured-mcp" } : {},
@@ -7785,7 +7735,7 @@ async function prepareCodexAttemptTools(runtime) {
 		runSessionKey: params.sessionKey && params.sessionKey !== sandboxSessionKey ? params.sessionKey : void 0,
 		sessionId: params.sessionId,
 		runId: params.runId,
-		agentId: sessionAgentId,
+		agentId: policyAgentId,
 		agentDir: agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId),
 		agentAccountId: params.agentAccountId,
 		messageProvider: params.messageProvider ?? params.messageChannel,
@@ -7875,7 +7825,7 @@ async function prepareCodexAttemptTools(runtime) {
 			remoteWorkspaceRoot: connection.appServer.remoteWorkspaceRoot,
 			remoteWorkspaceRequestTimeoutMs: connection.appServer.requestTimeoutMs,
 			sessionId: params.sessionId,
-			sessionKey: sandboxSessionKey,
+			sessionKey: contextSessionKey,
 			runId: params.runId,
 			channelId: hookChannelId,
 			currentChannelProvider: resolveCodexMessageToolProvider(params),
@@ -8690,6 +8640,7 @@ function createCodexAttemptTurnState(resources) {
 		rateLimitsRevisionBeforeLastTurnStart: void 0,
 		completed: false,
 		abortCleanup: Promise.resolve(),
+		permissionChangeRestart: void 0,
 		localCompletionRequested: false,
 		terminalTurnNotificationQueued: false,
 		sawCodexInterruptMarker: false,