@openclaw/codex 2026.7.2-beta.4 → 2026.7.2-beta.5

package/dist/{run-attempt--858NXDl.js → run-attempt-C5GTPJOE.js}

@@ -1,34 +1,36 @@
-import { A as isCodexAppServerStartupError, B as isCodexAppServerApprovalRequest, C as resolveCodexAppServerFallbackApiKeyCacheKey, D as resolveCodexAppServerHomeDir, F as resolveCodexTurnCompletionIdleTimeoutMs, H as isCodexAppServerConnectionClosedError, I as resolveCodexTurnTerminalIdleTimeoutMs, K as isCodexAppServerRequestTimeoutError, L as withCodexStartupTimeout, M as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, N as resolveCodexStartupTimeoutMs, O as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, P as resolveCodexTurnAssistantCompletionIdleTimeoutMs, Q as isJsonObject, R as CodexAppServerRpcError, S as resolveCodexAppServerAuthProfileIdForAgent, T as resolveCodexAppServerPreparedAuthHandoff, V as isCodexAppServerBrokenPipeError, Z as flattenCodexDynamicToolFunctions, _ as readCodexRateLimitsRevision, a as getLeasedSharedCodexAppServerClient, b as resolveCodexAppServerAuthAccountCacheKey, c as releaseLeasedSharedCodexAppServerClient, d as retireSharedCodexAppServerClientIfCurrent, g as ensureCodexAppServerClientRuntime, k as CodexAppServerStartupError, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as isCodexAppServerStartSelectionChangedError, t as clearSharedCodexAppServerClientIfCurrent, u as retainSharedCodexAppServerClientIfCurrent, v as readRecentCodexRateLimits, w as resolveCodexAppServerPreparedApiKeyCacheKey, x as resolveCodexAppServerAuthProfileId, y as rememberCodexRateLimitsRead } from "./shared-client-wmgNFNYp.js";
-import { S as updateActiveTurnItemIds, _ as readCodexNotificationItem, a as isCodexTurnAbortMarkerNotification, b as shouldDisarmAssistantCompletionIdleWatch, c as isPendingOpenClawDynamicToolCompletionNotification, d as isRawReasoningCompletionNotification, f as isRawToolOutputCompletionNotification, g as isTerminalTurnStatus, h as isRetryableErrorNotification, i as isAssistantCompletionReleaseNotification, l as isRawAssistantProgressNotification, m as isReasoningProgressNotification, n as describeNotificationActivity, o as isFileChangePatchUpdatedNotification, p as isReasoningItemCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isNativeToolProgressNotification, t as codexExecutionToolName, u as isRawFunctionToolOutputCompletionNotification, v as readNotificationItemId, x as updateActiveCompletionBlockerItemIds, y as readRawResponseToolCallId } from "./attempt-notifications-DdmnBMUp.js";
-import { A as withMcpElicitationsApprovalPolicy, E as resolveCodexPluginsPolicy, O as resolveOpenClawExecPolicyForCodexAppServer, T as resolveCodexModelBackedReviewerPolicyContext, _ as isCodexAppServerApprovalPolicyAllowedByRequirements, b as readCodexPluginConfig, c as reclaimCurrentCodexSessionGeneration, i as createCodexSessionGenerationSupersededError, k as shouldAutoApproveCodexAppServerApprovals, l as sessionBindingIdentity, w as resolveCodexComputerUseConfig, y as isCodexSandboxExecServerEnabled } from "./session-binding-ZSMX1omP.js";
-import { $ as shouldBuildCodexPluginThreadConfig, B as codexDynamicToolsFingerprint, F as closeCodexStartupClientBestEffort, G as projectContextEngineAssemblyForCodex, H as buildContextEngineBinding, I as interruptCodexTurnBestEffort, K as resolveCodexContextEngineProjectionMaxChars, L as retireCodexAppServerClientAfterTimedOutTurn, M as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, N as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, O as isSystemAgentOnlyCodexDynamicToolAllowlist, P as CodexAppServerUnsafeSubscriptionError, Q as mergeCodexThreadConfigs, R as unsubscribeCodexThreadBestEffort, T as filterCodexDynamicTools, U as isContextEngineBindingCompatible, V as codexLegacyDynamicToolsFingerprint, W as fitCodexProjectedContextForTurnStart, X as buildCodexPluginThreadConfigInputFingerprint, Y as buildCodexPluginThreadConfig, Z as buildCodexPluginThreadConfigTimeoutFallback, a as sanitizeCodexHistoryImagePayloads, at as readCodexErrorNotificationMessage, b as resolveCodexAppServerThreadModelSelection, ct as readItemString, dt as readNonNegativeInteger, ft as readNullableString$1, g as buildDeveloperInstructions, h as resolveCodexWebSearchPlan, ht as splitPlanText, it as normalizeNonEmptyString, j as resolveCodexDynamicToolsLoadingForRuntime, lt as readNonEmptyString$1, mt as readString$5, n as buildTurnStartParams, nt as resolveRecoverableCodexPluginConfigKeys, ot as readHookOutputEntries, pt as readNumber, q as resolveCodexContextEngineProjectionReserveTokens, r as buildCodexUserInput, rt as extractRawAssistantText, s as startOrResumeThread, st as readItem, t as buildTurnCollaborationMode, ut as readNonEmptyStringArray, w as isCodexAppServerProfilerEnabled, z as areCodexDynamicToolFingerprintsCompatible } from "./thread-lifecycle-cqrOlJkq.js";
-import { n as projectCodexThreadUsageUpdate, t as normalizeCodexResponseTokenUsage } from "./event-projector-usage-D6tE7_qD.js";
-import { C as readCodexTurnCompletedNotification, S as readCodexTurn, d as attachCodexMirrorIdentity, f as readMirrorIdentity, i as mirrorPromptAtTurnStartBestEffort, n as createCodexAppServerUserMessagePersistenceNotifier, o as buildCodexUserPromptMessage, s as promptSnapshot, t as codexTranscriptMirrorRuntime, u as serializeCodexMirrorSourceEvidence, v as assertCodexTurnStartResponse, y as readCodexDynamicToolCallParams } from "./transcript-mirror-2p7kl6e4.js";
-import { i as defaultCodexAppInventoryCache, n as buildCodexAppServerRuntimeFingerprint, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-CvzvmBRz.js";
+import { $ as withCodexStartupTimeout, A as rememberCodexRateLimitsRead, B as flattenCodexDynamicToolFunctions, D as ensureCodexAppServerClientRuntime, F as resolveCodexAppServerPreparedApiKeyCacheKey, G as CodexAppServerStartupError, I as resolveCodexAppServerPreparedAuthHandoff, J as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, K as isCodexAppServerStartupError, M as resolveCodexAppServerAuthProfileId, N as resolveCodexAppServerAuthProfileIdForAgent, O as readCodexRateLimitsRevision, P as resolveCodexAppServerFallbackApiKeyCacheKey, Q as resolveCodexTurnTerminalIdleTimeoutMs, T as isCodexAppServerRequestTimeoutError, U as resolveCodexAppServerHomeDir, V as isJsonObject, W as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, X as resolveCodexTurnAssistantCompletionIdleTimeoutMs, Y as resolveCodexStartupTimeoutMs, Z as resolveCodexTurnCompletionIdleTimeoutMs, _ as CodexAppServerRpcError, a as getLeasedSharedCodexAppServerClient, b as isCodexAppServerBrokenPipeError, d as retainSharedCodexAppServerClientIfCurrent, f as retireSharedCodexAppServerClientIfCurrent, j as resolveCodexAppServerAuthAccountCacheKey, k as readRecentCodexRateLimits, l as releaseLeasedSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as getSharedCodexAppServerClient, s as isCodexAppServerStartSelectionChangedError, t as clearSharedCodexAppServerClientIfCurrent, v as getCodexAppServerClientInstanceId, x as isCodexAppServerConnectionClosedError, y as isCodexAppServerApprovalRequest } from "./shared-client-BVKE40c-.js";
+import { C as isCodexAppServerApprovalPolicyAllowedByRequirements, D as resolveOpenClawExecPolicyForCodexAppServer, E as resolveCodexPluginsPolicy, S as resolveCodexModelBackedReviewerPolicyContext, T as readCodexPluginConfig, c as reclaimCurrentCodexSessionGeneration, h as resolveCodexComputerUseConfig, i as createCodexSessionGenerationSupersededError, l as sessionBindingIdentity, v as shouldAutoApproveCodexAppServerApprovals, w as isCodexSandboxExecServerEnabled, y as withMcpElicitationsApprovalPolicy } from "./session-binding-DlVQ-Pxs.js";
+import { a as closeCodexStartupClientBestEffort, l as retireCodexAppServerClientAfterTimedOutTurn, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError, s as interruptCodexTurnBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, u as unsubscribeCodexThreadBestEffort } from "./attempt-client-cleanup-Ia52yRWc.js";
+import { S as updateActiveTurnItemIds, _ as readCodexNotificationItem, a as isCodexTurnAbortMarkerNotification, b as shouldDisarmAssistantCompletionIdleWatch, c as isPendingOpenClawDynamicToolCompletionNotification, d as isRawReasoningCompletionNotification, f as isRawToolOutputCompletionNotification, g as isTerminalTurnStatus, h as isRetryableErrorNotification, i as isAssistantCompletionReleaseNotification, l as isRawAssistantProgressNotification, m as isReasoningProgressNotification, n as describeNotificationActivity, o as isFileChangePatchUpdatedNotification, p as isReasoningItemCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isNativeToolProgressNotification, t as codexExecutionToolName, u as isRawFunctionToolOutputCompletionNotification, v as readNotificationItemId, x as updateActiveCompletionBlockerItemIds, y as readRawResponseToolCallId } from "./attempt-notifications-CMR2_fmR.js";
+import { $ as readHookOutputEntries, B as resolveCodexContextEngineProjectionReserveTokens, F as buildContextEngineBinding, G as mergeCodexThreadConfigs, H as buildCodexPluginThreadConfig, I as isContextEngineBindingCompatible, K as shouldBuildCodexPluginThreadConfig, L as fitCodexProjectedContextForTurnStart, M as areCodexDynamicToolFingerprintsCompatible, N as codexDynamicToolsFingerprint, O as isSystemAgentOnlyCodexDynamicToolAllowlist, P as codexLegacyDynamicToolsFingerprint, Q as readCodexErrorNotificationMessage, R as projectContextEngineAssemblyForCodex, T as filterCodexDynamicTools, U as buildCodexPluginThreadConfigInputFingerprint, W as buildCodexPluginThreadConfigTimeoutFallback, X as extractRawAssistantText, Y as resolveRecoverableCodexPluginConfigKeys, Z as normalizeNonEmptyString, a as sanitizeCodexHistoryImagePayloads, at as readNullableString$1, b as resolveCodexAppServerThreadModelSelection, ct as splitPlanText, et as readItem, g as buildDeveloperInstructions, h as resolveCodexWebSearchPlan, it as readNonNegativeInteger, j as resolveCodexDynamicToolsLoadingForRuntime, n as buildTurnStartParams, nt as readNonEmptyString$1, ot as readNumber, r as buildCodexUserInput, rt as readNonEmptyStringArray, s as startOrResumeThread, st as readString$6, t as buildTurnCollaborationMode, tt as readItemString, w as isCodexAppServerProfilerEnabled, z as resolveCodexContextEngineProjectionMaxChars } from "./thread-lifecycle-DRg_FdzC.js";
+import { n as projectCodexThreadUsageUpdate, t as normalizeCodexResponseTokenUsage } from "./event-projector-usage-tvgb1NCX.js";
+import { a as assertCodexTurnStartResponse, l as readCodexTurn, o as readCodexDynamicToolCallParams, u as readCodexTurnCompletedNotification } from "./protocol-validators-Dm4eXZmt.js";
+import { i as defaultCodexAppInventoryCache, n as buildCodexAppServerRuntimeFingerprint, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DSXX-rXO.js";
 import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-CLICvTxf.js";
-import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-D0IJT-a6.js";
-import { r as formatCodexDisplayText } from "./command-formatters-DgADqnHa.js";
-import { n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BO3jYBkv.js";
-import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId, t as isCodexNotificationForTurn } from "./notification-correlation-BGLixv5_.js";
-import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-C1czuHPA.js";
+import { d as attachCodexMirrorIdentity, f as readMirrorIdentity, i as mirrorPromptAtTurnStartBestEffort, n as createCodexAppServerUserMessagePersistenceNotifier, o as buildCodexUserPromptMessage, s as promptSnapshot, t as codexTranscriptMirrorRuntime, u as serializeCodexMirrorSourceEvidence } from "./transcript-mirror-uKA-A4tB.js";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-BHRSI6Cn.js";
+import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-S_PXs0ul.js";
+import { r as formatCodexDisplayText } from "./command-formatters-ico4ZFnk.js";
+import { n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BmDgseo_.js";
+import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId, t as isCodexNotificationForTurn } from "./notification-correlation-Bj_Ak_jI.js";
+import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-B4FfbcCg.js";
 import { i as resolveCodexLocalRuntimeAttribution, n as createAssistantMessage, r as createAssistantMirrorMessage, t as createAssistantCommentaryMessage } from "./event-projector-assistant-message-DTgnPPVF.js";
-import { $ as shouldSynthesizeToolProgressForItem, A as resolveCodexNativeHookRelayEvents, B as shouldReleaseTurnAfterTerminalDynamicTool, C as CodexNativeToolLifecycleProjector, D as buildCodexNativeHookRelayDisabledConfig, E as buildCodexNativeHookRelayConfig, F as isDynamicToolTerminalDiagnosticEvent, G as isNonSuccessItemStatus, H as toCodexDynamicToolProtocolResponse, I as isMatchingDynamicToolTerminalDiagnostic, J as itemName, K as isSideEffectingNativeToolItem, L as resolveDynamicToolCallTimeoutMs, M as scheduleCodexNativeHookRelayUnregister, N as handleDynamicToolCallWithTimeout, O as createCodexNativeHookRelay, P as hasPendingDynamicToolTerminalDiagnostic, Q as shouldRecordNativeToolTranscript, R as resolveTerminalDynamicToolBatchAction, T as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, U as resolveCodexToolAbortTerminalReason, V as toCodexDynamicToolProgressResponse, W as isMutatingNativeToolItem, X as itemTitle, Y as itemStatus, Z as shouldClearTerminalPresentationForNativeItem, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, b as shouldRequireCodexSandboxExecServerEnvironment, d as createCodexDynamicToolBuildStageTracker, et as unknownItemStatus, f as disableCodexPluginThreadConfig, g as resolveCodexExternalSandboxPolicyForOpenClawSandbox, h as resolveCodexAppServerHookChannelId, i as emitDynamicToolErrorDiagnostic, j as resolveCodexNativeHookRelayTtlMs, k as emitCodexNativePreToolUseFailureDiagnostic, l as settleCodexSourceReplyFinality, m as resolveCodexAppServerExecutionCwd, n as handleCodexAppServerApprovalRequest, o as emitDynamicToolTerminalDiagnostic, p as formatCodexDynamicToolBuildStageSummary, q as itemKind, r as handleCodexAppServerElicitationRequest, s as resolveCodexProviderWebSearchSupport, t as createCodexDynamicToolBridge, u as buildDynamicTools, v as resolveCodexSandboxEnvironmentSelection, x as shouldWarnCodexDynamicToolBuildStageSummary, y as shouldEnableCodexAppServerNativeToolSurface, z as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult } from "./dynamic-tools-CQI3UwqY.js";
-import { a as runCodexComputerUseLiveTest, r as killStaleComputerUseMcpChildren, t as ensureCodexComputerUse } from "./computer-use-Ip1-QGa-.js";
+import { $ as shouldSynthesizeToolProgressForItem, A as resolveCodexNativeHookRelayEvents, B as shouldReleaseTurnAfterTerminalDynamicTool, C as CodexNativeToolLifecycleProjector, D as buildCodexNativeHookRelayDisabledConfig, E as buildCodexNativeHookRelayConfig, F as isDynamicToolTerminalDiagnosticEvent, G as isNonSuccessItemStatus, H as toCodexDynamicToolProtocolResponse, I as isMatchingDynamicToolTerminalDiagnostic, J as itemName, K as isSideEffectingNativeToolItem, L as resolveDynamicToolCallTimeoutMs, M as scheduleCodexNativeHookRelayUnregister, N as handleDynamicToolCallWithTimeout, O as createCodexNativeHookRelay, P as hasPendingDynamicToolTerminalDiagnostic, Q as shouldRecordNativeToolTranscript, R as resolveTerminalDynamicToolBatchAction, T as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, U as resolveCodexToolAbortTerminalReason, V as toCodexDynamicToolProgressResponse, W as isMutatingNativeToolItem, X as itemTitle, Y as itemStatus, Z as shouldClearTerminalPresentationForNativeItem, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, b as shouldRequireCodexSandboxExecServerEnvironment, d as createCodexDynamicToolBuildStageTracker, et as unknownItemStatus, f as disableCodexPluginThreadConfig, g as resolveCodexExternalSandboxPolicyForOpenClawSandbox, h as resolveCodexAppServerHookChannelId, i as emitDynamicToolErrorDiagnostic, j as resolveCodexNativeHookRelayTtlMs, k as emitCodexNativePreToolUseFailureDiagnostic, l as settleCodexSourceReplyFinality, m as resolveCodexAppServerExecutionCwd, n as handleCodexAppServerApprovalRequest, o as emitDynamicToolTerminalDiagnostic, p as formatCodexDynamicToolBuildStageSummary, q as itemKind, r as handleCodexAppServerElicitationRequest, s as resolveCodexProviderWebSearchSupport, t as createCodexDynamicToolBridge, u as buildDynamicTools, v as resolveCodexSandboxEnvironmentSelection, x as shouldWarnCodexDynamicToolBuildStageSummary, y as shouldEnableCodexAppServerNativeToolSurface, z as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult } from "./dynamic-tools-LIt9ojep.js";
+import { a as runCodexComputerUseLiveTest, r as killStaleComputerUseMcpChildren, t as ensureCodexComputerUse } from "./computer-use-BjGylO-E.js";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
 import { asDateTimestampMs, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
-import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { AgentHarnessPreflightError, CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, FAST_MODE_AUTO_PROGRESS_KIND, TOOL_PROGRESS_OUTPUT_MAX_CHARS, agentHarnessAttemptTerminal, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildAgentHarnessUserInputAnswers, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, cancelPendingAgentQuestionForSession, claimPendingAgentQuestionAnswer, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, deliverAgentHarnessUserInputPrompt, embeddedAgentLog, emitAgentEvent, emptyAgentHarnessUserInputAnswers, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, isHostScopedAgentToolActive, loadCodexBundleMcpThreadConfig, materializeRequesterScopedMcpToolsForHarnessRun, prepareHarnessNativeMcpAppPreview, projectAgentHarnessTranscriptMessageForDisplay, resolveAgentDir, resolveAgentHarnessBeforePromptBuildResult, resolveAgentRunAbortLifecycleFields, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessGatewayQuestion, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createHash, randomUUID } from "node:crypto";
-import { markAuthProfileBlockedUntil, resolveAgentDir, resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
+import { markAuthProfileBlockedUntil, resolveAgentDir as resolveAgentDir$1, resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { asFiniteNumber, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, FAST_MODE_AUTO_PROGRESS_KIND, TOOL_PROGRESS_OUTPUT_MAX_CHARS, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildAgentHarnessUserInputAnswers, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, cancelPendingAgentQuestionForSession, claimPendingAgentQuestionAnswer, classifyAgentHarnessTerminalOutcome, clearActiveEmbeddedRun, deliverAgentHarnessUserInputPrompt, embeddedAgentLog, emitAgentEvent, emptyAgentHarnessUserInputAnswers, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, formatToolAggregate, formatToolProgressOutput, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, inferToolMetaFromArgs, isActiveHarnessContextEngine, isHostScopedAgentToolActive, loadCodexBundleMcpThreadConfig, materializeRequesterScopedMcpToolsForHarnessRun, projectAgentHarnessTranscriptMessageForDisplay, resolveAgentDir as resolveAgentDir$1, resolveAgentHarnessBeforePromptBuildResult, resolveAgentRunAbortLifecycleFields, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessAfterCompactionHook, runAgentHarnessAfterToolCallHook, runAgentHarnessBeforeCompactionHook, runAgentHarnessGatewayQuestion, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { listSessionEntries, parseSqliteSessionFileMarker } from "openclaw/plugin-sdk/session-store-runtime";
 import { spawn } from "node:child_process";
+import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { once } from "node:events";
 import { isIP } from "node:net";
 import { WebSocketServer } from "ws";
-import { listSessionEntries, parseSqliteSessionFileMarker } from "openclaw/plugin-sdk/session-store-runtime";
 import { fileURLToPath } from "node:url";
 import { redactSensitiveFieldValue, redactSensitiveText, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent, emitTrustedDiagnosticEventWithPrivateData, freezeDiagnosticTraceContext, onInternalDiagnosticEvent, resolveDiagnosticModelContentCapturePolicy } from "openclaw/plugin-sdk/diagnostic-runtime";
@@ -37,6 +39,7 @@ import { prepareMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "openclaw/plugin-sdk/agent-sessions";
 import { generatedImageAssetFromBase64 } from "openclaw/plugin-sdk/image-generation";
+import { resolveGeneratedMediaMaxBytes } from "openclaw/plugin-sdk/media-generation-runtime";
 import { saveMediaBuffer } from "openclaw/plugin-sdk/media-store";
 import { MESSAGE_TOOL_DELIVERY_HINTS } from "openclaw/plugin-sdk/message-tool-delivery-hints";
 import { createAgentHarnessTaskRuntime, deliverAgentHarnessTaskCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-task-runtime";
@@ -201,6 +204,9 @@ function normalizeCodexSteerDebounceMs(value) {
 	return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.floor(value) : CODEX_STEER_ALL_DEBOUNCE_MS;
 }
 //#endregion
+//#region extensions/codex/src/app-server/attempt-terminal.ts
+const attemptTerminal = agentHarnessAttemptTerminal;
+//#endregion
 //#region extensions/codex/src/app-server/event-projector-assistant.ts
 var CodexAssistantProjection = class {
 	constructor(params, emitAgentEvent, matchesToolProgressEcho, nextTranscriptTimestamp) {
@@ -244,8 +250,8 @@ var CodexAssistantProjection = class {
 		return this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff && this.hasLatestTerminalAssistantCandidateText();
 	}
 	async handleAssistantDelta(params) {
-		const itemId = readString$5(params, "itemId") ?? "assistant";
-		const delta = readString$5(params, "delta") ?? "";
+		const itemId = readString$6(params, "itemId") ?? "assistant";
+		const delta = readString$6(params, "delta") ?? "";
 		if (!delta) return;
 		if (itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		const isCommentary = this.isCommentaryAssistantItem(itemId);
@@ -327,9 +333,9 @@ var CodexAssistantProjection = class {
 		}
 	}
 	handleRawResponseItemCompleted(item, activeItemIds) {
-		const role = readString$5(item, "role");
-		const phase = readString$5(item, "phase");
-		const rawItemId = readString$5(item, "id");
+		const role = readString$6(item, "role");
+		const phase = readString$6(item, "phase");
+		const rawItemId = readString$6(item, "id");
 		const candidateWasSupersededBeforeRaw = this.latestTerminalAssistantCandidateSuperseded;
 		const pendingTerminalAssistantEchoItemId = this.pendingRawTerminalAssistantEchoItemId;
 		const isPendingTerminalAssistantEcho = role === "assistant" && phase !== "commentary" && pendingTerminalAssistantEchoItemId !== void 0 && (rawItemId === void 0 || rawItemId === pendingTerminalAssistantEchoItemId);
@@ -652,7 +658,7 @@ function collectDynamicToolContentText(contentItems) {
 	if (!Array.isArray(contentItems)) return "";
 	return contentItems.flatMap((entry) => {
 		if (!isJsonObject(entry)) return [];
-		const text = readString$5(entry, "text");
+		const text = readString$6(entry, "text");
 		return text ? [text] : [];
 	}).join("\n");
 }
@@ -1043,8 +1049,8 @@ var CodexToolProgressProjection = class {
 		if (params.sideEffectEvidence === true) this.sideEffectingDynamicIds.add(params.callId);
 	}
 	handleOutputDelta(params, toolName) {
-		const itemId = readString$5(params, "itemId");
-		const delta = readString$5(params, "delta");
+		const itemId = readString$6(params, "itemId");
+		const delta = readString$6(params, "delta");
 		if (!itemId || !delta) return;
 		const storedOutput = this.output.append(itemId, delta);
 		this.rememberEcho(itemId, {
@@ -1276,6 +1282,13 @@ var CodexToolProgressProjection = class {
 function isMissingFileError(error) {
 	return Boolean(error && typeof error === "object" && "code" in error && error.code === "ENOENT");
 }
+function selectPreferredSessionKey(matches, sessionId) {
+	const structural = matches.filter(({ sessionKey }) => sessionKey === sessionId || sessionKey.endsWith(`:${sessionId}`));
+	const candidates = structural.length > 0 ? structural : matches;
+	if (candidates.length === 1) return candidates[0]?.sessionKey;
+	const sorted = candidates.toSorted((left, right) => (right.entry.updatedAt ?? 0) - (left.entry.updatedAt ?? 0));
+	return (sorted[0]?.entry.updatedAt ?? 0) > (sorted[1]?.entry.updatedAt ?? 0) ? sorted[0]?.sessionKey : void 0;
+}
 /** Returns sanitized session-context messages for a Codex mirrored session file. */
 async function readCodexMirroredSessionHistoryMessages(target) {
 	try {
@@ -1310,17 +1323,16 @@ async function readCodexMirroredSessionEntries(target) {
 }
 function resolveSqliteMarkerSessionKey(target, marker) {
 	const explicitSessionKey = target.sessionKey?.trim();
-	if (explicitSessionKey) return explicitSessionKey;
 	const entries = listSessionEntries({
 		agentId: marker.agentId,
 		readOnly: true,
 		storePath: marker.storePath
 	});
-	return (entries.find(({ entry }) => {
-		return entry.sessionId === marker.sessionId && entry.sessionFile === target.sessionFile;
-	}) ?? entries.find(({ entry }) => {
-		return entry.sessionId === marker.sessionId;
-	}))?.sessionKey;
+	if (explicitSessionKey) {
+		const explicitEntry = entries.find(({ sessionKey }) => sessionKey === explicitSessionKey);
+		if (explicitEntry) return explicitEntry.entry.sessionId === marker.sessionId ? explicitSessionKey : void 0;
+	}
+	return selectPreferredSessionKey(entries.filter(({ entry }) => entry.sessionId === marker.sessionId), marker.sessionId);
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-transcript.ts
@@ -1356,6 +1368,8 @@ var CodexToolTranscriptProjection = class {
 		this.trajectoryNamesById = /* @__PURE__ */ new Map();
 		this.trajectoryItemsById = /* @__PURE__ */ new Map();
 		this.afterToolCallObservedItemIds = /* @__PURE__ */ new Set();
+		this.nativeMcpAppResultDetails = /* @__PURE__ */ new Map();
+		this.nativeMcpAppResultDetailsAttempted = /* @__PURE__ */ new Set();
 	}
 	get transcriptMessages() {
 		return this.messages;
@@ -1372,7 +1386,8 @@ var CodexToolTranscriptProjection = class {
 			id: params.callId,
 			name: params.tool,
 			text: collectDynamicToolContentText(params.contentItems),
-			isError: !params.success
+			isError: !params.success,
+			details: params.details
 		});
 	}
 	recordNativeToolCall(item) {
@@ -1384,16 +1399,37 @@ var CodexToolTranscriptProjection = class {
 			arguments: itemToolArgs(item)
 		});
 	}
-	recordNativeToolResult(item) {
+	recordNativeToolResult(item, details) {
 		if (!item || !shouldRecordNativeToolTranscript(item)) return;
 		const name = itemName(item);
 		if (name) this.recordToolResult({
 			id: item.id,
 			name,
 			text: itemTranscriptResultText(item, this.progress.outputTextByItem),
-			isError: isNonSuccessItemStatus(itemStatus(item))
+			isError: isNonSuccessItemStatus(itemStatus(item)),
+			details
 		});
 	}
+	async recordNativeToolResultWithDetails(item) {
+		this.recordNativeToolResult(item, await this.prepareNativeMcpAppResultDetails(item));
+	}
+	async prepareNativeMcpAppResultDetails(item) {
+		if (!item || item.type !== "mcpToolCall" || itemStatus(item) === "running") return;
+		if (this.nativeMcpAppResultDetails.has(item.id)) return this.nativeMcpAppResultDetails.get(item.id);
+		if (this.nativeMcpAppResultDetailsAttempted.has(item.id) || !this.options.prepareNativeMcpAppResultDetails) return;
+		this.nativeMcpAppResultDetailsAttempted.add(item.id);
+		try {
+			const details = await this.options.prepareNativeMcpAppResultDetails(item);
+			if (details !== void 0) this.nativeMcpAppResultDetails.set(item.id, details);
+			return details;
+		} catch (error) {
+			embeddedAgentLog.debug("codex native MCP App preview preparation failed", {
+				itemId: item.id,
+				error
+			});
+			return;
+		}
+	}
 	recordTrajectoryEvent(params) {
 		if (params.phase === "start") {
 			this.trajectoryCallIds.add(params.item.id);
@@ -1578,6 +1614,7 @@ var CodexToolTranscriptProjection = class {
 				content: text,
 				text
 			}],
+			...params.details !== void 0 ? { details: params.details } : {},
 			timestamp: this.nextTranscriptTimestamp()
 		};
 	}
@@ -1616,14 +1653,14 @@ var CodexEventProjection = class {
 			data: {
 				method,
 				phase: method.endsWith("/started") ? "started" : "completed",
-				reviewId: readString$5(params, "reviewId"),
+				reviewId: readString$6(params, "reviewId"),
 				targetItemId: readNullableString$1(params, "targetItemId"),
-				decisionSource: readString$5(params, "decisionSource"),
-				status: review ? readString$5(review, "status") : void 0,
-				riskLevel: review ? readString$5(review, "riskLevel") : void 0,
-				userAuthorization: review ? readString$5(review, "userAuthorization") : void 0,
+				decisionSource: readString$6(params, "decisionSource"),
+				status: review ? readString$6(review, "status") : void 0,
+				riskLevel: review ? readString$6(review, "riskLevel") : void 0,
+				userAuthorization: review ? readString$6(review, "userAuthorization") : void 0,
 				rationale: review ? readNullableString$1(review, "rationale") : void 0,
-				actionType: action ? readString$5(action, "type") : void 0
+				actionType: action ? readString$6(action, "type") : void 0
 			}
 		});
 	}
@@ -1632,7 +1669,7 @@ var CodexEventProjection = class {
 			stream: "codex_app_server.guardian",
 			data: {
 				phase: "warning",
-				message: readString$5(params, "message")
+				message: readString$6(params, "message")
 			}
 		});
 	}
@@ -1648,14 +1685,14 @@ var CodexEventProjection = class {
 				phase: method === "hook/started" ? "started" : "completed",
 				threadId: this.threadId,
 				turnId: hookTurnId === void 0 ? this.turnId : hookTurnId,
-				hookRunId: readString$5(run, "id"),
-				eventName: readString$5(run, "eventName"),
-				handlerType: readString$5(run, "handlerType"),
-				executionMode: readString$5(run, "executionMode"),
-				scope: readString$5(run, "scope"),
-				source: readString$5(run, "source"),
-				sourcePath: readString$5(run, "sourcePath"),
-				status: readString$5(run, "status"),
+				hookRunId: readString$6(run, "id"),
+				eventName: readString$6(run, "eventName"),
+				handlerType: readString$6(run, "handlerType"),
+				executionMode: readString$6(run, "executionMode"),
+				scope: readString$6(run, "scope"),
+				source: readString$6(run, "source"),
+				sourcePath: readString$6(run, "sourcePath"),
+				status: readString$6(run, "status"),
 				statusMessage: readNullableString$1(run, "statusMessage"),
 				...durationMs !== void 0 ? { durationMs } : {},
 				...entries.length > 0 ? { entries } : {}
@@ -1736,8 +1773,6 @@ var CodexEventProjection = class {
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-media.ts
 const GENERATED_IMAGE_MEDIA_SUBDIR = "tool-image-generation";
-const BYTES_PER_MB = 1024 * 1024;
-const DEFAULT_GENERATED_IMAGE_MAX_BYTES = 6 * BYTES_PER_MB;
 var CodexGeneratedMediaProjection = class {
 	constructor(config) {
 		this.config = config;
@@ -1756,12 +1791,12 @@ var CodexGeneratedMediaProjection = class {
 		});
 	}
 	async recordRaw(item) {
-		if (readString$5(item, "type") !== "image_generation_call") return;
-		const result = readString$5(item, "result");
+		if (readString$6(item, "type") !== "image_generation_call") return;
+		const result = readString$6(item, "result");
 		if (!result) return;
-		const itemId = readString$5(item, "id") ?? `raw-image-${this.itemIds.size}`;
+		const itemId = readString$6(item, "id") ?? `raw-image-${this.itemIds.size}`;
 		this.itemIds.add(itemId);
-		const maxBytes = resolveGeneratedImageMaxBytes(this.config);
+		const maxBytes = resolveGeneratedMediaMaxBytes(this.config, "image");
 		const estimatedDecodedBytes = estimateBase64DecodedBytes(result);
 		if (estimatedDecodedBytes !== void 0 && estimatedDecodedBytes > maxBytes) {
 			embeddedAgentLog.warn("codex app-server raw image generation result exceeds media limit", {
@@ -1774,7 +1809,7 @@ var CodexGeneratedMediaProjection = class {
 		const asset = generatedImageAssetFromBase64({
 			base64: result,
 			index: this.itemIds.size,
-			revisedPrompt: readString$5(item, "revised_prompt") ?? readString$5(item, "revisedPrompt"),
+			revisedPrompt: readString$6(item, "revised_prompt") ?? readString$6(item, "revisedPrompt"),
 			fileNamePrefix: "codex-image-generation",
 			sniffMimeType: true
 		});
@@ -1831,11 +1866,6 @@ function estimateBase64DecodedBytes(base64) {
 function isBase64WhitespaceCode(code) {
 	return code === 32 || code === 9 || code === 10 || code === 13;
 }
-function resolveGeneratedImageMaxBytes(config) {
-	const configured = config?.agents?.defaults?.mediaMaxMb;
-	if (typeof configured === "number" && Number.isFinite(configured) && configured > 0) return Math.floor(configured * BYTES_PER_MB);
-	return DEFAULT_GENERATED_IMAGE_MAX_BYTES;
-}
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-reasoning.ts
 var CodexReasoningProjection = class {
@@ -1849,8 +1879,8 @@ var CodexReasoningProjection = class {
 		this.reasoningEnded = false;
 	}
 	async handleReasoningDelta(method, params) {
-		const itemId = readString$5(params, "itemId") ?? "reasoning";
-		const delta = readString$5(params, "delta") ?? "";
+		const itemId = readString$6(params, "itemId") ?? "reasoning";
+		const delta = readString$6(params, "delta") ?? "";
 		if (!delta) return;
 		this.reasoningStarted = true;
 		if (!this.reasoningItemOrder.has(itemId)) this.reasoningItemOrder.set(itemId, this.reasoningItemOrder.size);
@@ -1869,8 +1899,8 @@ var CodexReasoningProjection = class {
 		});
 	}
 	handlePlanDelta(params) {
-		const itemId = readString$5(params, "itemId") ?? "plan";
-		const delta = readString$5(params, "delta") ?? "";
+		const itemId = readString$6(params, "itemId") ?? "plan";
+		const delta = readString$6(params, "delta") ?? "";
 		if (!delta) return;
 		const text = `${this.planTextByItem.get(itemId) ?? ""}${delta}`;
 		this.planTextByItem.set(itemId, text);
@@ -1887,11 +1917,11 @@ var CodexReasoningProjection = class {
 		const plan = Array.isArray(params.plan) ? params.plan.flatMap((entry) => {
 			if (!entry || typeof entry !== "object" || Array.isArray(entry)) return [];
 			const record = entry;
-			const step = readString$5(record, "step");
+			const step = readString$6(record, "step");
 			if (!step) return [];
 			return [{
 				step,
-				status: normalizePlanStepStatus(readString$5(record, "status"))
+				status: normalizePlanStepStatus(readString$6(record, "status"))
 			}];
 		}) : void 0;
 		const planText = [explanation, ...(plan ?? []).map(({ step, status }) => `- [${status}] ${step}`)].filter((part) => Boolean(part)).join("\n");
@@ -2086,7 +2116,7 @@ function readCodexErrorNotification(notification) {
 	if (notification?.method !== "error" || !isJsonObject(notification.params)) return;
 	const error = notification.params.error;
 	return isJsonObject(error) ? {
-		message: readString$4(error, "message"),
+		message: readString$5(error, "message"),
 		codexErrorInfo: error.codexErrorInfo
 	} : void 0;
 }
@@ -2098,12 +2128,12 @@ function readCodexErrorPayload(error) {
 	const nestedError = isJsonObject(data.error) ? data.error : data;
 	const rateLimits = nestedError.rateLimits ?? data.rateLimits;
 	return {
-		message: readString$4(nestedError, "message") ?? message,
+		message: readString$5(nestedError, "message") ?? message,
 		codexErrorInfo: nestedError.codexErrorInfo,
 		rateLimits
 	};
 }
-function readString$4(record, key) {
+function readString$5(record, key) {
 	const value = record[key];
 	return typeof value === "string" ? value : void 0;
 }
@@ -2131,6 +2161,7 @@ var CodexAppServerEventProjector = class {
 		this.toolProgressProjection = new CodexToolProgressProjection(params);
 		this.toolTranscriptProjection = new CodexToolTranscriptProjection(params, threadId, turnId, this.toolProgressProjection, () => this.nextTranscriptTimestamp(), {
 			nativePostToolUseRelayEnabled: options.nativePostToolUseRelayEnabled,
+			prepareNativeMcpAppResultDetails: options.prepareNativeMcpAppResultDetails,
 			trajectoryRecorder: options.trajectoryRecorder
 		});
 		this.eventProjection = new CodexEventProjection(threadId, turnId, (event) => this.emitAgentEvent(event), this.toolProgressProjection, this.toolTranscriptProjection, options.onNativeToolResultRecorded);
@@ -2305,14 +2336,11 @@ var CodexAppServerEventProjector = class {
 		const toolMetas = this.toolProgressProjection.toolMetas;
 		const hadPotentialSideEffects = toolTelemetry.didSendViaMessagingTool || (toolTelemetry.successfulCronAdds ?? 0) > 0 || this.generatedMediaProjection.hasGeneratedMedia() || this.toolProgressProjection.hasPotentialSideEffects;
 		return {
-			aborted: this.aborted,
-			externalAbort: false,
-			timedOut: false,
-			idleTimedOut: false,
-			timedOutDuringCompaction: false,
-			timedOutDuringToolExecution: false,
-			promptError,
-			promptErrorSource: promptError ? this.promptErrorSource || "prompt" : null,
+			terminal: attemptTerminal.normalize({
+				aborted: this.aborted,
+				promptError,
+				promptErrorSource: promptError ? this.promptErrorSource || "prompt" : null
+			}),
 			sessionIdUsed: this.params.sessionId,
 			...agentHarnessResultClassification ? { agentHarnessResultClassification } : {},
 			bootstrapPromptWarningSignaturesSeen: this.params.bootstrapPromptWarningSignaturesSeen,
@@ -2371,7 +2399,7 @@ var CodexAppServerEventProjector = class {
 	}
 	async handleItemStarted(params) {
 		const item = readItem(params.item);
-		const itemId = item?.id ?? readString$5(params, "itemId");
+		const itemId = item?.id ?? readString$6(params, "itemId");
 		this.assistantProjection.recordItemStarted(item, itemId);
 		if (itemId) this.activeItemIds.add(itemId);
 		this.recordNativeToolOutcome(item);
@@ -2427,7 +2455,7 @@ var CodexAppServerEventProjector = class {
 		this.diagnostics.warnUnknownItemStatus(item);
 		this.recordNativeToolOutcome(item);
 		this.clearTerminalPresentationForNativeItem(item);
-		const itemId = item?.id ?? readString$5(params, "itemId");
+		const itemId = item?.id ?? readString$6(params, "itemId");
 		if (itemId) {
 			this.activeItemIds.delete(itemId);
 			this.completedItemIds.add(itemId);
@@ -2477,7 +2505,7 @@ var CodexAppServerEventProjector = class {
 			item
 		});
 		this.toolTranscriptProjection.recordNativeToolCall(item);
-		this.toolTranscriptProjection.recordNativeToolResult(item);
+		await this.toolTranscriptProjection.recordNativeToolResultWithDetails(item);
 		this.toolProgressProjection.emitToolResultSummary(item);
 		this.toolProgressProjection.emitToolResultOutput(item);
 		this.emitAgentEvent({
@@ -2526,7 +2554,7 @@ var CodexAppServerEventProjector = class {
 			this.toolProgressProjection.rememberCommandAggregateOutputEcho(item);
 			await this.emitSnapshotOnlyNativeToolProgress(item);
 			this.toolTranscriptProjection.recordNativeToolCall(item);
-			this.toolTranscriptProjection.recordNativeToolResult(item);
+			await this.toolTranscriptProjection.recordNativeToolResultWithDetails(item);
 			this.toolTranscriptProjection.emitAfterToolCallObservation(item);
 			this.toolProgressProjection.emitToolResultSummary(item);
 			this.toolProgressProjection.emitToolResultOutput(item);
@@ -2584,7 +2612,7 @@ var CodexAppServerEventProjector = class {
 	formatCodexErrorMessage(params) {
 		const error = isJsonObject(params.error) ? params.error : void 0;
 		const usageLimitMessage = formatCodexUsageLimitErrorMessage({
-			message: error ? readString$5(error, "message") : void 0,
+			message: error ? readString$6(error, "message") : void 0,
 			codexErrorInfo: error?.codexErrorInfo,
 			rateLimits: this.options.readRecentRateLimits?.()
 		});
@@ -2616,7 +2644,7 @@ var CodexAppServerEventProjector = class {
 		return threadId === this.threadId && turnId === this.turnId;
 	}
 	isHookNotificationForCurrentThread(params) {
-		const threadId = readString$5(params, "threadId");
+		const threadId = readString$6(params, "threadId");
 		const turnId = params.turnId;
 		return threadId === this.threadId && (turnId === this.turnId || turnId === null);
 	}
@@ -2625,6 +2653,128 @@ function isHookNotificationMethod(method) {
 	return method === "hook/started" || method === "hook/completed";
 }
 //#endregion
+//#region extensions/codex/src/app-server/native-mcp-app.ts
+function asRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readString$4(value) {
+	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function readMcpAppResourceUri(item) {
+	const uri = readString$4(asRecord(item.appContext)?.resourceUri) ?? readString$4(item.mcpAppResourceUri);
+	return uri?.startsWith("ui://") ? uri : void 0;
+}
+function readMcpToolResult(item) {
+	const result = asRecord(item.result);
+	if (!result || !Array.isArray(result.content)) return;
+	const resultMeta = asRecord(result["_meta"]);
+	return {
+		content: result.content,
+		...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {},
+		...result.isError === true ? { isError: true } : {},
+		...resultMeta ? { _meta: resultMeta } : {}
+	};
+}
+function statusTools(status) {
+	return Object.entries(status.tools).map(([name, value]) => Object.assign({}, asRecord(value), { name }));
+}
+function createNativeMcpRuntime(params) {
+	let catalog = null;
+	let statuses;
+	const createdAt = Date.now();
+	const loadStatuses = async () => {
+		if (statuses) return statuses;
+		statuses = (await params.client.request("mcpServerStatus/list", {
+			threadId: params.threadId,
+			detail: "full"
+		})).data;
+		return statuses;
+	};
+	const getCatalog = async () => {
+		if (catalog) return catalog;
+		const loaded = await loadStatuses();
+		catalog = {
+			version: 1,
+			generatedAt: Date.now(),
+			servers: Object.fromEntries(loaded.map((status) => [status.name, {
+				serverName: status.name,
+				launchSummary: "Codex native MCP connection",
+				toolCount: Object.keys(status.tools).length
+			}])),
+			tools: loaded.flatMap((status) => statusTools(status).map((tool) => ({
+				serverName: status.name,
+				safeServerName: status.name,
+				toolName: String(tool.name),
+				inputSchema: asRecord(tool.inputSchema) ?? { type: "object" },
+				fallbackDescription: readString$4(tool.description) ?? String(tool.name)
+			})))
+		};
+		return catalog;
+	};
+	const runtime = {
+		sessionId: params.attempt.sessionId,
+		sessionKey: params.attempt.sessionKey,
+		workspaceDir: params.attempt.workspaceDir,
+		configFingerprint: `${getCodexAppServerClientInstanceId(params.client)}:${params.threadId}`,
+		mcpAppsEnabled: true,
+		createdAt,
+		lastUsedAt: createdAt,
+		acquireLease: () => retainSharedCodexAppServerClientIfCurrent(params.client) ?? (() => {}),
+		getCatalog,
+		peekCatalog: () => catalog,
+		markUsed: () => {
+			runtime.lastUsedAt = Date.now();
+		},
+		callTool: async (serverName, toolName, input) => await params.client.request("mcpServer/tool/call", {
+			threadId: params.threadId,
+			server: serverName,
+			tool: toolName,
+			arguments: asRecord(input) ?? {}
+		}),
+		listTools: async (serverName) => {
+			const status = (await loadStatuses()).find((entry) => entry.name === serverName);
+			return { tools: status ? statusTools(status) : [] };
+		},
+		readResource: async (serverName, uri) => await params.client.request("mcpServer/resource/read", {
+			threadId: params.threadId,
+			server: serverName,
+			uri
+		}),
+		listResources: async (serverName) => {
+			return { resources: (await loadStatuses()).find((entry) => entry.name === serverName)?.resources ?? [] };
+		},
+		listResourceTemplates: async (serverName) => {
+			return { resourceTemplates: (await loadStatuses()).find((entry) => entry.name === serverName)?.resourceTemplates ?? [] };
+		},
+		dispose: async () => {}
+	};
+	return runtime;
+}
+function createCodexNativeMcpAppResultDetailsPreparer(params) {
+	if (params.attempt.config?.mcp?.apps?.enabled !== true) return;
+	const runtime = createNativeMcpRuntime(params);
+	return async (item) => {
+		const serverName = readString$4(item.server);
+		const toolName = readString$4(item.tool);
+		const uiResourceUri = readMcpAppResourceUri(item);
+		const toolResult = readMcpToolResult(item);
+		if (!serverName || !toolName || !uiResourceUri || !toolResult) return;
+		const allowedAppToolNames = new Set((await runtime.getCatalog()).tools.filter((tool) => tool.serverName === serverName).map((tool) => tool.toolName));
+		if (allowedAppToolNames.size === 0) return;
+		return await prepareHarnessNativeMcpAppPreview({
+			runtime,
+			serverName,
+			toolName,
+			uiResourceUri,
+			toolCallId: item.id,
+			toolInput: item.arguments ?? {},
+			toolResult,
+			allowedAppToolNames,
+			...toolResult["_meta"] !== void 0 ? { resultMetaState: "unavailable" } : {}
+		});
+	};
+}
+//#endregion
 //#region extensions/codex/src/app-server/user-input-bridge.ts
 /** Bridges Codex request_user_input calls to gateway questions and secret text prompts. */
 const DEFAULT_USER_INPUT_TIMEOUT_MS = 15 * 6e4;
@@ -2693,6 +2843,7 @@ function createCodexUserInputBridge(params) {
 					questions: requestParams.questions,
 					sessionKey: params.paramsForRun.sessionKey ?? params.paramsForRun.sessionId,
 					agentId: params.paramsForRun.agentId,
+					runId: params.paramsForRun.runId,
 					timeoutMs: requestParams.autoResolutionMs ?? params.paramsForRun.timeoutMs ?? DEFAULT_USER_INPUT_TIMEOUT_MS,
 					gatewayCall,
 					delivery: params.paramsForRun,
@@ -2812,6 +2963,11 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 	const { emitExecutionPhaseOnce, emitLifecycleStart, maybeAnnounceFastModeAutoOff } = lifecycle;
 	const { enqueueNotification } = notifications;
 	const activeTurnId = turn.turn.id;
+	const prepareNativeMcpAppResultDetails = createCodexNativeMcpAppResultDetailsPreparer({
+		client: resourceState.client,
+		threadId: resourceState.thread.threadId,
+		attempt: dynamicToolParams
+	});
 	const streamState = {
 		eventEmitted: false,
 		needsTerminalSnapshot: false
@@ -2844,6 +3000,7 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 		runAbortSignal: runAbortController.signal,
 		trajectoryRecorder,
 		onNativeToolResultRecorded: maybeAnnounceFastModeAutoOff,
+		...prepareNativeMcpAppResultDetails ? { prepareNativeMcpAppResultDetails } : {},
 		upstreamUserText: turnState.codexTurnPromptText,
 		onContextCompacted: () => {
 			computerContextEpoch.value += 1;
@@ -2909,6 +3066,7 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 			await activeSteeringQueue.queue(text, optionsLocal);
 		},
 		isStreaming: () => !state.completed && !runAbortController.signal.aborted,
+		isAborted: () => runAbortController.signal.aborted,
 		isStopped: () => state.completed || state.timedOut || runAbortController.signal.aborted,
 		isAbortable: () => !terminalState.terminalOutcomeFrozen || terminalState.sharedAbortAllowedAfterTerminalOutcome,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
@@ -3049,7 +3207,8 @@ const codexWorkspaceDirCache = /* @__PURE__ */ new Set();
 //#region extensions/codex/src/app-server/run-attempt-lifecycle.ts
 const CODEX_APP_SERVER_PROJECTED_CHARS_PER_TOKEN = 4;
 function shouldKeepCodexSharedAbortOpen(params) {
-	if (params.explicitCancellationObserved || params.result.aborted || params.result.externalAbort) return false;
+	const terminal = attemptTerminal.project(params.result.terminal);
+	if (params.explicitCancellationObserved || terminal.aborted || terminal.externalAbort) return false;
 	return params.trigger === "memory" || !params.attemptSucceeded;
 }
 function withCodexAppServerFastModeServiceTier(appServer, params) {
@@ -3400,7 +3559,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 	const runtimeArtifactRequest = params.captureRuntimeArtifact || params.expectedRuntimeArtifact ? params.expectedRuntimeArtifact ? { expected: params.expectedRuntimeArtifact } : {} : void 0;
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const computerUseConfig = resolveCodexComputerUseConfig({ pluginConfig });
-	const { sessionAgentId } = resolveSessionAgentIds$1({
+	const { sessionAgentId } = resolveSessionAgentIds({
 		sessionKey: params.sessionKey,
 		config: params.config,
 		agentId: params.agentId
@@ -3424,7 +3583,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 		config: params.config,
 		agentId: sessionAgentId
 	});
-	const agentDir = params.agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId);
+	const agentDir = params.agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId);
 	const bindingIdentity = sessionBindingIdentity({
 		sessionId: params.sessionId,
 		sessionKey: params.sessionKey,
@@ -3484,6 +3643,7 @@ async function prepareCodexAttemptConnection({ params, options }) {
 		authProfileId: resolvedStartupAuthProfileId,
 		authProfileStore: params.authProfileStore,
 		agentDir,
+		...pluginConfig.appServer?.homeScope ? { homeScope: pluginConfig.appServer.homeScope } : {},
 		config: params.config,
 		subscriptionProfileRequiredError: "Prepared Codex subscription route requires a forwarded OpenAI OAuth or token profile.",
 		subscriptionProfileUnusableError: "Prepared Codex subscription auth profile is unusable."
@@ -3665,20 +3825,18 @@ async function prepareCodexAttemptConnection({ params, options }) {
 * system-prompt reports, and context-engine projection decisions.
 */
 const CODEX_NATIVE_PROJECT_DOC_BASENAMES = /* @__PURE__ */ new Set(["agents.md"]);
-const CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = /* @__PURE__ */ new Set(["tools.md"]);
 const CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = /* @__PURE__ */ new Set([
 	"identity.md",
 	"soul.md",
 	"user.md"
 ]);
-const CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = /* @__PURE__ */ new Set([...CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES, ...CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES]);
+const CODEX_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES = new Set(CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES);
 const CODEX_MEMORY_CONTEXT_BASENAME = "memory.md";
 const CODEX_MEMORY_TOOL_NAMES = /* @__PURE__ */ new Set(["memory_search", "memory_get"]);
 const CODEX_BOOTSTRAP_CONTEXT_ORDER = /* @__PURE__ */ new Map([
 	["soul.md", 10],
 	["identity.md", 20],
 	["user.md", 30],
-	["tools.md", 40],
 	["bootstrap.md", 50],
 	["memory.md", 60]
 ]);
@@ -3779,20 +3937,17 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 			excludeMemory: memoryToolsAvailable,
 			memoryWorkspaceDir: params.effectiveWorkspace
 		});
-		const developerInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceInheritedDeveloperInstructionFiles(contextFiles) : [];
 		const turnScopedDeveloperInstructionFiles = shouldInjectCodexOpenClawPromptContext(params.params) ? selectCodexWorkspaceTurnScopedDeveloperInstructionFiles(contextFiles) : [];
 		return {
 			bootstrapFiles,
 			contextFiles,
 			promptContextFiles,
-			developerInstructionFiles,
 			turnScopedDeveloperInstructionFiles,
 			memoryReferenceFiles,
 			memoryToolRoutedBootstrapFiles,
 			memoryToolNames: [...params.memoryToolNames],
 			memoryToolRouted: memoryToolsAvailable,
 			promptContext: renderCodexWorkspaceBootstrapPromptContext(promptContextFiles),
-			developerInstructions: renderCodexWorkspaceThreadDeveloperInstructions(developerInstructionFiles),
 			turnScopedDeveloperInstructions: renderCodexWorkspaceCollaborationDeveloperInstructions(turnScopedDeveloperInstructionFiles),
 			memoryCollaborationInstructions: shouldInjectCodexOpenClawPromptContext(params.params) ? await renderCodexWorkspaceMemoryCollaborationInstructions({
 				files: memoryReferenceFiles,
@@ -3841,7 +3996,7 @@ function buildCodexSystemPromptReport(params) {
 		injectedWorkspaceFiles: buildCodexBootstrapInjectionStats({
 			bootstrapFiles: params.workspaceBootstrapContext.bootstrapFiles,
 			injectedFiles: params.workspaceBootstrapContext.promptContextFiles ?? [],
-			developerInstructionFiles: [...params.workspaceBootstrapContext.developerInstructionFiles ?? [], ...params.workspaceBootstrapContext.turnScopedDeveloperInstructionFiles ?? []],
+			developerInstructionFiles: params.workspaceBootstrapContext.turnScopedDeveloperInstructionFiles ?? [],
 			memoryToolRoutedBootstrapFiles: params.workspaceBootstrapContext.memoryToolRoutedBootstrapFiles ?? [],
 			memoryToolRouted: params.workspaceBootstrapContext.memoryToolRouted === true
 		}),
@@ -4050,7 +4205,7 @@ function renderCodexWorkspaceBootstrapPromptContext(contextFiles) {
 	const files = contextFiles;
 	if (files.length === 0) return;
 	const lines = [
-		"OpenClaw loaded these user-editable workspace files for the current turn. Codex loads AGENTS.md natively. TOOLS.md is provided as inherited Codex developer instructions. SOUL.md, IDENTITY.md, and USER.md are provided as turn-scoped collaboration instructions so native Codex subagents do not inherit them. Those files are not repeated here.",
+		"OpenClaw loaded these user-editable workspace files for the current turn. Codex loads AGENTS.md natively. SOUL.md, IDENTITY.md, and USER.md are provided as turn-scoped collaboration instructions so native Codex subagents do not inherit them. Those files are not repeated here.",
 		"",
 		"# Project Context",
 		"",
@@ -4070,9 +4225,6 @@ function selectCodexWorkspacePromptContextFiles(contextFiles, options = {}) {
 		})) && !isMissingCodexBootstrapContextFile(file);
 	}).toSorted(compareCodexContextFiles);
 }
-function selectCodexWorkspaceInheritedDeveloperInstructionFiles(contextFiles) {
-	return selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, CODEX_INHERITED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES);
-}
 function selectCodexWorkspaceTurnScopedDeveloperInstructionFiles(contextFiles) {
 	return selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, CODEX_TURN_SCOPED_WORKSPACE_DEVELOPER_CONTEXT_BASENAMES);
 }
@@ -4082,13 +4234,6 @@ function selectCodexWorkspaceDeveloperInstructionFiles(contextFiles, basenames)
 		return baseName && basenames.has(baseName) && !isMissingCodexBootstrapContextFile(file) && file.content.trim().length > 0;
 	}).toSorted(compareCodexContextFiles);
 }
-function renderCodexWorkspaceThreadDeveloperInstructions(files) {
-	return renderCodexWorkspaceDeveloperInstructions({
-		files,
-		header: "## OpenClaw Workspace Instructions",
-		preamble: "OpenClaw loaded these workspace instruction files from the active agent workspace. Internalize and follow them accordingly."
-	});
-}
 function renderCodexWorkspaceCollaborationDeveloperInstructions(files) {
 	return renderCodexWorkspaceDeveloperInstructions({
 		files,
@@ -4246,107 +4391,6 @@ function isNonEmptyString$1(value) {
 	return typeof value === "string" && value.length > 0;
 }
 //#endregion
-//#region extensions/codex/src/app-server/run-attempt-state.ts
-async function clearCodexBindingAfterInvalidImagePayload(bindingStore, identity, fields) {
-	const currentBinding = await bindingStore.read(identity);
-	const expectedThreadId = fields.threadId ?? currentBinding?.threadId;
-	if (!expectedThreadId) return;
-	if (currentBinding && currentBinding.threadId !== expectedThreadId) {
-		embeddedAgentLog.warn("codex app-server image payload error detected for unbound thread; preserving thread binding", {
-			...fields,
-			boundThreadId: currentBinding.threadId
-		});
-		return;
-	}
-	if (currentBinding?.connectionScope === "supervision") {
-		embeddedAgentLog.warn("codex app-server image payload error detected for supervised thread; preserving native binding", fields);
-		return;
-	}
-	embeddedAgentLog.warn("codex app-server image payload error detected; clearing thread binding", fields);
-	await bindingStore.mutate(identity, {
-		kind: "clear",
-		threadId: expectedThreadId
-	});
-}
-async function markCodexAppServerBindingCoveredThroughTurn(params) {
-	await params.bindingStore.mutate(params.identity, {
-		kind: "patch",
-		threadId: params.threadId,
-		patch: { historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString() }
-	});
-}
-function isNonEmptyString(value) {
-	return typeof value === "string" && value.length > 0;
-}
-function shouldUseFreshCodexThreadAfterContextEngineOverflow(params) {
-	if (!params.contextEngineActive || params.thread.lifecycle.action !== "resumed") return false;
-	const message = formatErrorMessage(params.error);
-	return /ran out of room in the model'?s context window/iu.test(message) || /context window/iu.test(message) || /context length/iu.test(message) || /maximum context/iu.test(message) || /too many tokens/iu.test(message);
-}
-function isCodexActiveCompactTurnError(error) {
-	if (!(error instanceof CodexAppServerRpcError)) return false;
-	const data = isJsonObject(error.data) ? error.data : void 0;
-	const codexErrorInfo = isJsonObject(data?.codexErrorInfo) ? data.codexErrorInfo : void 0;
-	return (isJsonObject(codexErrorInfo?.activeTurnNotSteerable) ? codexErrorInfo.activeTurnNotSteerable : void 0)?.turnKind === "compact";
-}
-function readCodexFinalizationHookNotification(notification, threadId, turnId) {
-	if (notification.method !== "hook/started" && notification.method !== "hook/completed") return;
-	const params = isJsonObject(notification.params) ? notification.params : void 0;
-	const run = params && isJsonObject(params.run) ? params.run : void 0;
-	if (params?.threadId !== threadId || params.turnId !== turnId || run?.eventName !== "stop" && run?.eventName !== "subagentStop" || typeof run.id !== "string" || !run.id) return;
-	if (notification.method === "hook/started") return {
-		phase: "started",
-		runId: run.id
-	};
-	return {
-		phase: "completed",
-		runId: run.id,
-		status: typeof run.status === "string" ? run.status : void 0
-	};
-}
-function joinPresentSections(...sections) {
-	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
-}
-function prependCurrentInboundContext(prompt, context) {
-	const text = context?.text.trim();
-	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
-}
-function waitForCodexNotificationDispatchTurn() {
-	return new Promise((resolve) => {
-		setImmediate(resolve);
-	});
-}
-function buildCodexAppServerTimeoutDiagnostics(params) {
-	const readString = (key) => {
-		const value = params.details?.[key];
-		return typeof value === "string" && value.trim() ? value : void 0;
-	};
-	const readNumber = (key) => {
-		const value = params.details?.[key];
-		return typeof value === "number" && Number.isFinite(value) ? value : void 0;
-	};
-	const readBoolean = (key) => {
-		const value = params.details?.[key];
-		return typeof value === "boolean" ? value : void 0;
-	};
-	return {
-		...params.idleMs !== void 0 ? { idleMs: params.idleMs } : {},
-		...params.timeoutMs !== void 0 ? { timeoutMs: params.timeoutMs } : {},
-		...params.lastActivityReason ? { lastActivityReason: params.lastActivityReason } : {},
-		...readString("lastNotificationMethod") ? { lastNotificationMethod: readString("lastNotificationMethod") } : {},
-		...readString("lastNotificationItemId") ? { lastNotificationItemId: readString("lastNotificationItemId") } : {},
-		...readString("lastNotificationItemType") ? { lastNotificationItemType: readString("lastNotificationItemType") } : {},
-		...readString("lastNotificationItemRole") ? { lastNotificationItemRole: readString("lastNotificationItemRole") } : {},
-		...readString("lastAssistantTextPreview") ? { lastAssistantTextPreview: readString("lastAssistantTextPreview") } : {},
-		...readNumber("activeAppServerTurnRequests") !== void 0 ? { activeAppServerTurnRequests: readNumber("activeAppServerTurnRequests") } : {},
-		...readNumber("activeTurnItemCount") !== void 0 ? { activeTurnItemCount: readNumber("activeTurnItemCount") } : {},
-		...readBoolean("terminalTurnNotificationQueued") !== void 0 ? { terminalTurnNotificationQueued: readBoolean("terminalTurnNotificationQueued") } : {},
-		...readBoolean("completionIdleWatchArmed") !== void 0 ? { completionIdleWatchArmed: readBoolean("completionIdleWatchArmed") } : {},
-		...readBoolean("assistantCompletionIdleWatchArmed") !== void 0 ? { assistantCompletionIdleWatchArmed: readBoolean("assistantCompletionIdleWatchArmed") } : {},
-		...readBoolean("terminalIdleWatchArmed") !== void 0 ? { terminalIdleWatchArmed: readBoolean("terminalIdleWatchArmed") } : {}
-	};
-}
-//#endregion
 //#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;
@@ -4417,7 +4461,7 @@ async function prepareCodexAttemptContext(runtime, attemptTools) {
 		memoryToolNames: getCodexWorkspaceMemoryToolNames(toolBridge.availableSpecs),
 		sandboxed: sandbox?.enabled === true
 	});
-	const baseDeveloperInstructions = joinPresentSections(buildDeveloperInstructions(runtimeParams, { dynamicTools: toolBridge.availableSpecs }), workspaceBootstrapContext.developerInstructions);
+	const baseDeveloperInstructions = buildDeveloperInstructions(runtimeParams, { dynamicTools: toolBridge.availableSpecs });
 	return {
 		runtime,
 		attemptTools,
@@ -4625,14 +4669,10 @@ function resolveCodexAppServerReplayBlockedReason(result) {
 /** Builds an attempt result for failures before the app-server turn starts. */
 function buildCodexTurnStartFailureResult(params) {
 	return {
-		aborted: false,
-		externalAbort: false,
-		timedOut: false,
-		idleTimedOut: false,
-		timedOutDuringCompaction: false,
-		timedOutDuringToolExecution: false,
-		promptError: params.promptError ?? params.message,
-		promptErrorSource: "prompt",
+		terminal: attemptTerminal.normalize({
+			promptError: params.promptError ?? params.message,
+			promptErrorSource: "prompt"
+		}),
 		sessionIdUsed: params.params.sessionId,
 		messagesSnapshot: params.messagesSnapshot,
 		assistantTexts: [],
@@ -4664,6 +4704,107 @@ 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/run-attempt-state.ts
+async function clearCodexBindingAfterInvalidImagePayload(bindingStore, identity, fields) {
+	const currentBinding = await bindingStore.read(identity);
+	const expectedThreadId = fields.threadId ?? currentBinding?.threadId;
+	if (!expectedThreadId) return;
+	if (currentBinding && currentBinding.threadId !== expectedThreadId) {
+		embeddedAgentLog.warn("codex app-server image payload error detected for unbound thread; preserving thread binding", {
+			...fields,
+			boundThreadId: currentBinding.threadId
+		});
+		return;
+	}
+	if (currentBinding?.connectionScope === "supervision") {
+		embeddedAgentLog.warn("codex app-server image payload error detected for supervised thread; preserving native binding", fields);
+		return;
+	}
+	embeddedAgentLog.warn("codex app-server image payload error detected; clearing thread binding", fields);
+	await bindingStore.mutate(identity, {
+		kind: "clear",
+		threadId: expectedThreadId
+	});
+}
+async function markCodexAppServerBindingCoveredThroughTurn(params) {
+	await params.bindingStore.mutate(params.identity, {
+		kind: "patch",
+		threadId: params.threadId,
+		patch: { historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString() }
+	});
+}
+function isNonEmptyString(value) {
+	return typeof value === "string" && value.length > 0;
+}
+function shouldUseFreshCodexThreadAfterContextEngineOverflow(params) {
+	if (!params.contextEngineActive || params.thread.lifecycle.action !== "resumed") return false;
+	const message = formatErrorMessage(params.error);
+	return /ran out of room in the model'?s context window/iu.test(message) || /context window/iu.test(message) || /context length/iu.test(message) || /maximum context/iu.test(message) || /too many tokens/iu.test(message);
+}
+function isCodexActiveCompactTurnError(error) {
+	if (!(error instanceof CodexAppServerRpcError)) return false;
+	const data = isJsonObject(error.data) ? error.data : void 0;
+	const codexErrorInfo = isJsonObject(data?.codexErrorInfo) ? data.codexErrorInfo : void 0;
+	return (isJsonObject(codexErrorInfo?.activeTurnNotSteerable) ? codexErrorInfo.activeTurnNotSteerable : void 0)?.turnKind === "compact";
+}
+function readCodexFinalizationHookNotification(notification, threadId, turnId) {
+	if (notification.method !== "hook/started" && notification.method !== "hook/completed") return;
+	const params = isJsonObject(notification.params) ? notification.params : void 0;
+	const run = params && isJsonObject(params.run) ? params.run : void 0;
+	if (params?.threadId !== threadId || params.turnId !== turnId || run?.eventName !== "stop" && run?.eventName !== "subagentStop" || typeof run.id !== "string" || !run.id) return;
+	if (notification.method === "hook/started") return {
+		phase: "started",
+		runId: run.id
+	};
+	return {
+		phase: "completed",
+		runId: run.id,
+		status: typeof run.status === "string" ? run.status : void 0
+	};
+}
+function joinPresentSections(...sections) {
+	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
+}
+function prependCurrentInboundContext(prompt, context) {
+	const text = context?.text.trim();
+	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
+}
+function waitForCodexNotificationDispatchTurn() {
+	return new Promise((resolve) => {
+		setImmediate(resolve);
+	});
+}
+function buildCodexAppServerTimeoutDiagnostics(params) {
+	const readString = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "string" && value.trim() ? value : void 0;
+	};
+	const readNumber = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+	};
+	const readBoolean = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "boolean" ? value : void 0;
+	};
+	return {
+		...params.idleMs !== void 0 ? { idleMs: params.idleMs } : {},
+		...params.timeoutMs !== void 0 ? { timeoutMs: params.timeoutMs } : {},
+		...params.lastActivityReason ? { lastActivityReason: params.lastActivityReason } : {},
+		...readString("lastNotificationMethod") ? { lastNotificationMethod: readString("lastNotificationMethod") } : {},
+		...readString("lastNotificationItemId") ? { lastNotificationItemId: readString("lastNotificationItemId") } : {},
+		...readString("lastNotificationItemType") ? { lastNotificationItemType: readString("lastNotificationItemType") } : {},
+		...readString("lastNotificationItemRole") ? { lastNotificationItemRole: readString("lastNotificationItemRole") } : {},
+		...readString("lastAssistantTextPreview") ? { lastAssistantTextPreview: readString("lastAssistantTextPreview") } : {},
+		...readNumber("activeAppServerTurnRequests") !== void 0 ? { activeAppServerTurnRequests: readNumber("activeAppServerTurnRequests") } : {},
+		...readNumber("activeTurnItemCount") !== void 0 ? { activeTurnItemCount: readNumber("activeTurnItemCount") } : {},
+		...readBoolean("terminalTurnNotificationQueued") !== void 0 ? { terminalTurnNotificationQueued: readBoolean("terminalTurnNotificationQueued") } : {},
+		...readBoolean("completionIdleWatchArmed") !== void 0 ? { completionIdleWatchArmed: readBoolean("completionIdleWatchArmed") } : {},
+		...readBoolean("assistantCompletionIdleWatchArmed") !== void 0 ? { assistantCompletionIdleWatchArmed: readBoolean("assistantCompletionIdleWatchArmed") } : {},
+		...readBoolean("terminalIdleWatchArmed") !== void 0 ? { terminalIdleWatchArmed: readBoolean("terminalIdleWatchArmed") } : {}
+	};
+}
+//#endregion
 //#region extensions/codex/src/app-server/settled-turn-context.ts
 function collectUniqueMessageIdentities(messages) {
 	const identities = /* @__PURE__ */ new Map();
@@ -4843,13 +4984,14 @@ function recordCodexTrajectoryContext(recorder, params) {
 /** Records final Codex model completion metadata and assistant snapshots. */
 function recordCodexTrajectoryCompletion(recorder, params) {
 	if (!recorder) return;
+	const terminal = attemptTerminal.project(params.result.terminal);
 	recorder.recordEvent("model.completed", {
 		threadId: params.threadId,
 		turnId: params.turnId,
 		timedOut: params.timedOut,
 		yieldDetected: params.yieldDetected ?? false,
-		aborted: params.result.aborted,
-		promptError: normalizeCodexTrajectoryError(params.result.promptError),
+		aborted: terminal.aborted,
+		promptError: normalizeCodexTrajectoryError(terminal.promptError),
 		usage: params.result.attemptUsage,
 		assistantTexts: params.result.assistantTexts,
 		messagesSnapshot: params.result.messagesSnapshot
@@ -4943,11 +5085,12 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 		});
 	}
 	const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected: toolState.yieldDetected });
+	const projectedTerminal = attemptTerminal.project(result.terminal);
 	const effectiveTimedOut = state.timedOut && !recoveredTurnWatchTimeout;
 	const effectiveTurnCompletionIdleTimedOut = state.turnCompletionIdleTimedOut && !recoveredTurnWatchTimeout;
-	const isFinalAborted = () => result.aborted || terminalState.explicitCancellationObserved || runAbortController.signal.aborted && !state.clientClosedAbort && !recoveredTurnWatchTimeout;
+	const isFinalAborted = () => projectedTerminal.aborted || terminalState.explicitCancellationObserved || runAbortController.signal.aborted && !state.clientClosedAbort && !recoveredTurnWatchTimeout;
 	const clientClosedPromptErrorForFinal = state.clientClosedPromptError && hasRecoverableCompletedAssistant ? void 0 : state.clientClosedPromptError;
-	let finalPromptError = clientClosedPromptErrorForFinal ?? (effectiveTurnCompletionIdleTimedOut ? state.turnCompletionIdleTimeoutMessage : effectiveTimedOut ? "codex app-server attempt timed out" : result.promptError);
+	let finalPromptError = clientClosedPromptErrorForFinal ?? (effectiveTurnCompletionIdleTimedOut ? state.turnCompletionIdleTimeoutMessage : effectiveTimedOut ? "codex app-server attempt timed out" : projectedTerminal.promptError);
 	const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError instanceof Error ? finalPromptError.message : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
 	if (isInvalidCodexImagePayloadError(finalPromptErrorMessage)) await clearCodexBindingAfterInvalidImagePayload(bindingStore, bindingIdentity, {
 		phase: "turn_completed",
@@ -4988,7 +5131,7 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 		authProfileId: startupAuthProfileId,
 		rateLimits: readRecentCodexRateLimits(resourceState.client)
 	});
-	const finalPromptErrorSource = effectiveTimedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
+	const finalPromptErrorSource = effectiveTimedOut || clientClosedPromptErrorForFinal ? "prompt" : projectedTerminal.promptErrorSource;
 	const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : effectiveTurnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
 	const replayBlockedReason = codexAppServerFailureKind ? resolveCodexAppServerReplayBlockedReason(result) : void 0;
 	const promptTimeoutOutcome = buildCodexAppServerPromptTimeoutOutcome({
@@ -5183,10 +5326,12 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 	});
 	return {
 		...result,
-		timedOut: effectiveTimedOut,
-		aborted: finalAborted,
-		promptError: finalPromptError,
-		promptErrorSource: finalPromptErrorSource,
+		terminal: attemptTerminal.normalize({
+			timedOut: effectiveTimedOut,
+			aborted: finalAborted,
+			promptError: finalPromptError,
+			promptErrorSource: finalPromptErrorSource
+		}),
 		...codexAppServerFailure ? { codexAppServerFailure } : {},
 		...promptTimeoutOutcome ? { promptTimeoutOutcome } : {},
 		...assistantTranscriptOwned ? { assistantTranscriptOwned: true } : {},
@@ -9454,6 +9599,28 @@ async function prepareCodexAttemptRoute(resources, turnRuntime, notifications, h
 	return { ensureCurrentThreadRoute };
 }
 //#endregion
+//#region extensions/codex/src/app-server/run-attempt-client-prewarm.ts
+/** Starts the shared process while tools and prompt context are still being prepared. */
+function prewarmCodexAttemptClient(params) {
+	const { connection, authProfileStore, authBindingFingerprint } = params;
+	const { appServer, attemptClientFactory, options, pluginConfig, runtimeArtifactRequest, startupAuthRequirement, startupClientAuthProfileId, startupPreparedAuth, agentDir, params: runParams, runAbortController } = connection;
+	if (options.clientFactory || attemptClientFactory !== getLeasedSharedCodexAppServerClient || runtimeArtifactRequest) return;
+	getSharedCodexAppServerClient({
+		startOptions: appServer.start,
+		pluginConfig,
+		...startupPreparedAuth ? { preparedAuth: startupPreparedAuth } : { authProfileId: startupClientAuthProfileId },
+		authRequirement: startupAuthRequirement,
+		authProfileStore,
+		authBindingFingerprint,
+		agentDir,
+		config: runParams.config,
+		timeoutMs: appServer.requestTimeoutMs,
+		abandonSignal: runAbortController.signal
+	}).catch((error) => {
+		embeddedAgentLog.debug("codex app-server client prewarm failed", { error });
+	});
+}
+//#endregion
 //#region extensions/codex/src/app-server/run-attempt-runtime.ts
 async function prepareCodexAttemptRuntime(connection) {
 	const { params, pluginConfig, usesSupervisionConnection, appServer, startupAuthProfileId, startupPreparedAuth, startupClientAuthProfileId, agentDir, preDynamicStartupStages, effectiveWorkspace, contextSessionKey, sandboxSessionKey, sessionAgentId, sandbox, attemptClientFactory, runAbortController, activeContextEngine, mutable } = connection;
@@ -9464,6 +9631,11 @@ async function prepareCodexAttemptRuntime(connection) {
 		config: params.config
 	}) : void 0;
 	const attemptAuthProfileStore = preparedAuthBinding?.authProfileStore ?? params.authProfileStore;
+	prewarmCodexAttemptClient({
+		connection,
+		authProfileStore: attemptAuthProfileStore,
+		authBindingFingerprint: preparedAuthBinding?.fingerprint
+	});
 	const effectiveContextWindowInfo = usesSupervisionConnection ? void 0 : params.contextWindowInfo;
 	const effectiveContextTokenBudget = usesSupervisionConnection ? void 0 : params.contextTokenBudget;
 	const effectiveRuntimeProviderId = usesSupervisionConnection ? mutable.startupBinding?.modelProvider ?? "codex" : params.provider;
@@ -9592,7 +9764,8 @@ function recordCodexDynamicToolResult(projector, call, response, protocolRespons
 		success: protocolResponse.success,
 		terminalType: response.diagnosticTerminalType ?? (protocolResponse.success ? "completed" : "error"),
 		sideEffectEvidence: response.sideEffectEvidence === true || response.terminalResolution?.sideEffectEvidence === true,
-		contentItems: protocolResponse.contentItems
+		contentItems: protocolResponse.contentItems,
+		details: response.transcriptDetails
 	});
 }
 //#endregion
@@ -10284,6 +10457,7 @@ async function startCodexAttemptThread(params) {
 						const attemptParams = params.buildAttemptParams();
 						startupClient = await params.attemptClientFactory({
 							startOptions: params.appServer.start,
+							pluginConfig: params.pluginConfig,
 							...params.startupPreparedAuth ? { preparedAuth: params.startupPreparedAuth } : { authProfileId: params.startupAuthProfileId },
 							authRequirement: params.startupAuthRequirement,
 							authProfileStore: attemptParams.authProfileStore,
@@ -10332,14 +10506,19 @@ async function startCodexAttemptThread(params) {
 							config: params.config
 						});
 						const turnRouter = getCodexAppServerTurnRouter(activeStartupClient);
-						await ensureCodexComputerUse({
-							client: activeStartupClient,
-							pluginConfig: params.pluginConfig,
-							config: params.config,
-							agentDir: params.agentDir,
-							timeoutMs: params.appServer.requestTimeoutMs,
-							signal: startupAbandonController.signal
-						});
+						try {
+							await ensureCodexComputerUse({
+								client: activeStartupClient,
+								pluginConfig: params.pluginConfig,
+								config: params.config,
+								agentDir: params.agentDir,
+								timeoutMs: params.appServer.requestTimeoutMs,
+								signal: startupAbandonController.signal
+							});
+						} catch (error) {
+							if (startupAbandonController.signal.aborted) throw error;
+							throw new AgentHarnessPreflightError(`Codex Computer Use readiness failed: ${formatErrorMessage(error)}`, { cause: error });
+						}
 						const startupRuntimeIdentity = activeStartupClient.getRuntimeIdentity();
 						const pluginAppCacheKey = buildCodexPluginAppCacheKey({
 							appServer: params.appServer,
@@ -10807,7 +10986,7 @@ async function prepareCodexAttemptTools(runtime) {
 		sessionId: params.sessionId,
 		sessionKey: params.sessionKey,
 		workspaceDir: effectiveWorkspace,
-		agentDir: agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId),
+		agentDir: agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId),
 		cfg: params.config,
 		requesterSenderId: params.senderId,
 		agentAccountId: params.agentAccountId,
@@ -10821,7 +11000,7 @@ async function prepareCodexAttemptTools(runtime) {
 			sessionId: params.sessionId,
 			runId: params.runId,
 			agentId: sessionAgentId,
-			agentDir: agentDir ?? resolveAgentDir$1(params.config ?? {}, sessionAgentId),
+			agentDir: agentDir ?? resolveAgentDir(params.config ?? {}, sessionAgentId),
 			agentAccountId: params.agentAccountId,
 			messageProvider: params.messageProvider ?? params.messageChannel,
 			messageChannel: params.messageChannel,
@@ -10873,6 +11052,7 @@ async function prepareCodexAttemptTools(runtime) {
 			hookContext: {
 				agentId: sessionAgentId,
 				config: params.config,
+				contextWindowTokens: params.contextTokenBudget ?? params.model.contextWindow,
 				workspaceDir: effectiveWorkspace,
 				sessionId: params.sessionId,
 				sessionKey: sandboxSessionKey,