@openclaw/codex 2026.10.7 → 2026.10.9

package/dist/.setup/{project-doc-thread-config-D_sWbxFR.mjs → project-doc-thread-config-BYFXSVGk.mjs}

@@ -3,9 +3,9 @@ import { l as fingerprintCodexPolicy } from "./config-security-DpkGNy5T.mjs";
 import { f as resolveCodexPluginsPolicy } from "./config-parsing-CVK2Q463.mjs";
 import { u as CODEX_SESSION_OVERRIDABLE_LAYER_TYPES } from "./config-options-CZmH25Xq.mjs";
 import { a as defaultCodexAppInventoryCache, i as CodexAppInventoryCache, o as serializeCodexAppInventoryError, s as codexAppIdentityKey } from "./plugin-app-cache-key-Bg9DbDI6.mjs";
-import { l as toCodexPluginOwnedAccountApp, s as readCodexPluginInventory, t as createCodexAppInventoryRequest } from "./plugin-inventory-OhiCoyPH.mjs";
-import "./config-LQemoqTL.mjs";
-import { t as ensureCodexPluginActivation } from "./plugin-activation-BgfNFH2L.mjs";
+import { l as toCodexPluginOwnedAccountApp, s as readCodexPluginInventory, t as createCodexAppInventoryRequest } from "./plugin-inventory-CZLnMaxf.mjs";
+import "./config-d0gOFYEk.mjs";
+import { t as ensureCodexPluginActivation } from "./plugin-activation-Dbq2m2gh.mjs";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/plugin-app-approval-overrides.ts
 /** Projects ask approvals into the native session layer without changing saved settings. */

package/dist/.setup/{provider-Bi9QCsg1.mjs → provider-D8R-IBhv.mjs}

@@ -11,7 +11,7 @@ function buildCodexMigrationProvider(params = {}) {
 		].join(" "),
 		supportedItemKinds: ["memory", "auth"],
 		async detect(ctx) {
-			const { discoverCodexSource, hasCodexSource } = await import("./source-BszpKEvi.mjs").then((n) => n.a);
+			const { discoverCodexSource, hasCodexSource } = await import("./source-CgYvv2h-.mjs").then((n) => n.a);
 			const memoryOnly = isOnlyMigrationKind(ctx, "memory");
 			const authOnly = isOnlyMigrationKind(ctx, "auth");
 			const source = await discoverCodexSource({
@@ -29,16 +29,16 @@ function buildCodexMigrationProvider(params = {}) {
 			};
 		},
 		async plan(ctx) {
-			const { buildCodexMigrationPlan } = await import("./plan-GqWF4XGA.mjs");
+			const { buildCodexMigrationPlan } = await import("./plan-BE7gWwkn.mjs");
 			return buildCodexMigrationPlan(ctx);
 		},
 		deferredApply: { retrySafe: true },
 		prepareApply(ctx) {
 			if (isOnlyMigrationKind(ctx, "memory") || isOnlyMigrationKind(ctx, "auth")) return;
-			return import("./apply-BaBl0hiG.mjs").then(({ prepareTargetCodexAppServer }) => prepareTargetCodexAppServer(ctx));
+			return import("./apply-DmhHTC5c.mjs").then(({ prepareTargetCodexAppServer }) => prepareTargetCodexAppServer(ctx));
 		},
 		async apply(ctx, plan) {
-			const { applyCodexMigrationPlan } = await import("./apply-BaBl0hiG.mjs");
+			const { applyCodexMigrationPlan } = await import("./apply-DmhHTC5c.mjs");
 			return await applyCodexMigrationPlan({
 				ctx,
 				plan,

package/dist/.setup/{provider-capabilities-BCZeV7xZ.mjs → provider-capabilities-C4ENlstc.mjs}

@@ -1,4 +1,11 @@
-import { h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-AdQX0Tdq.mjs";
+import { h as releaseLeasedSharedCodexAppServerClient, s as createIsolatedCodexAppServerClient } from "./shared-client-C0gEybHs.mjs";
+//#region extensions/codex/src/app-server/probe-client.ts
+/** Temporary probes own isolated processes but only borrow shared-client leases. */
+async function releaseCodexProbeClient(client, factory) {
+	if (factory === createIsolatedCodexAppServerClient) await client.closeAndWait();
+	else releaseLeasedSharedCodexAppServerClient(client);
+}
+//#endregion
 //#region extensions/codex/src/app-server/provider-capabilities.ts
 function resolveOverriddenProviderWebSearchSupport(modelProviderOverride) {
 	const provider = modelProviderOverride?.trim().toLowerCase();
@@ -43,8 +50,8 @@ async function resolveCodexProviderWebSearchSupport(params) {
 	} catch {
 		return "unknown";
 	} finally {
-		if (client) releaseLeasedSharedCodexAppServerClient(client);
+		if (client) await releaseCodexProbeClient(client, params.clientFactory);
 	}
 }
 //#endregion
-export { resolveCodexProviderWebSearchSupportForClient as n, resolveCodexProviderWebSearchSupport as t };
+export { resolveCodexProviderWebSearchSupportForClient as n, releaseCodexProbeClient as r, resolveCodexProviderWebSearchSupport as t };

package/dist/.setup/{request-XC1RG34l.mjs → request-ufWmJNN1.mjs}

@@ -1,7 +1,7 @@
 import { i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
 import { t as CODEX_CONTROL_METHODS } from "./capabilities-DbOzOglY.mjs";
 import { i as withTimeout$1, r as withAbortableTimeout } from "./timeout-D0mEWSGG.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-DijNZb31.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-CAHe3enw.mjs";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
 import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { areDiagnosticsEnabledForProcess } from "openclaw/plugin-sdk/diagnostic-runtime";
@@ -164,7 +164,7 @@ async function requestCodexAppServerClientJson(params) {
 	let phase = "prepare";
 	observeControl(params.controlObservation, phase);
 	try {
-		const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-Cf9XMRrg.mjs").then((n) => n.r);
+		const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-CwOc36_1.mjs").then((n) => n.r);
 		const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock(params);
 		if (sandboxBlock) throw new Error(sandboxBlock);
 		const timeoutMs = params.timeoutMs ?? 6e4;
@@ -188,7 +188,7 @@ async function requestCodexAppServerClientJson(params) {
 }
 async function requestCodexAppServerJson(params) {
 	observeControl(params.controlObservation, "prepare");
-	const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-Cf9XMRrg.mjs").then((n) => n.r);
+	const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-CwOc36_1.mjs").then((n) => n.r);
 	const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock(params);
 	if (sandboxBlock) throw new Error(sandboxBlock);
 	return await withCodexAppServerJsonClient({
@@ -292,8 +292,8 @@ async function withCodexAppServerJsonClient(params, run) {
 			timeoutMs,
 			timeoutMessage,
 			promise: (async () => {
-				const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-Cf9XMRrg.mjs").then((n) => n.r);
-				const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, isCodexAppServerStartSelectionChangedError, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-AdQX0Tdq.mjs").then((n) => n.v);
+				const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-CwOc36_1.mjs").then((n) => n.r);
+				const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, isCodexAppServerStartSelectionChangedError, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-C0gEybHs.mjs").then((n) => n.v);
 				for (let attempt = 0; attempt < 2; attempt += 1) {
 					errorPhase = void 0;
 					setPhase("prepare");

package/dist/.setup/{run-attempt-8U2CrqjW.mjs → run-attempt-CGHsrfPB.mjs}

@@ -1,14 +1,15 @@
 import { n as readCodexRuntimeModelId } from "./model-runtime-BdqzOMkU.mjs";
-import { g as createCodexNativeSubagentHistoryOwner } from "./native-subagent-pending-assignments-DmVhedNs.mjs";
+import { _ as createCodexNativeSubagentHistoryOwner } from "./native-subagent-pending-assignments-BAOzwy85.mjs";
+import { D as toCodexDynamicToolProgressResponse, E as resolveDynamicToolCallTimeoutMs, L as resolveCodexAppServerClientInstanceId, M as readCodexAppServerWarningMessage, O as toCodexDynamicToolProtocolResponse, P as CODEX_APP_SERVER_OPT_OUT_NOTIFICATION_METHODS, T as handleDynamicToolCallWithTimeout, _ as assertCodexTurnStartResponse, a as isCodexAppServerIndeterminateRequestCancellationError, i as isCodexAppServerConnectionClosedError, l as CodexServerRequestResolvedError, o as isCodexAppServerIndeterminateTransportError, r as isCodexAppServerApprovalRequest, w as createCodexElicitationResponse, x as readCodexTurnCompletedNotification, y as readCodexDynamicToolCallParams } from "./client-CafYfF2n.mjs";
 import { i as isJsonObject, r as flattenCodexDynamicToolFunctions } from "./protocol-CANUwXJ3.mjs";
-import { i as matchesCodexNativeSubagentSubmissionBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-C2kDBZhx.mjs";
-import { n as defineCodexBuildState } from "./build-state-B5mKL-in.mjs";
+import { i as matchesCodexNativeSubagentSubmissionBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced } from "./session-binding-record-O62ZRFhy.mjs";
+import { n as defineCodexBuildState } from "./build-state-CvGKuaeP.mjs";
 import { c as withMcpElicitationsApprovalPolicy, d as readCodexRequirementsToml, n as hasCodexMcpToolApprovalOverrides, s as shouldAutoApproveCodexAppServerApprovals } from "./config-security-DpkGNy5T.mjs";
 import { c as isCodexPairedNodeRemoteExecPlacementSandbox, d as readCodexPluginConfig, f as resolveCodexPluginsPolicy, l as isCodexRemoteExecPlacementSandbox, u as isCodexSandboxExecServerEnabled } from "./config-parsing-CVK2Q463.mjs";
 import { n as isCodexAppServerProxyLaunch } from "./launch-args-DbFCehO7.mjs";
 import { t as resolveCodexAppServerHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
 import { i as resolveCodexAppServerHomeScope, l as resolveCodexModelBackedReviewerPolicyContext, o as resolveCodexComputerUseConfig } from "./config-options-CZmH25Xq.mjs";
-import { c as resolveCodexAppServerPreparedApiKeyCacheKey, g as observeAcquire, s as resolveCodexAppServerFallbackApiKeyCacheKey, w as retireSharedCodexAppServerClientIfCurrent } from "./auth-cache-key-DrieYJUQ.mjs";
+import { c as resolveCodexAppServerPreparedApiKeyCacheKey, g as observeAcquire, s as resolveCodexAppServerFallbackApiKeyCacheKey, w as retireSharedCodexAppServerClientIfCurrent } from "./auth-cache-key-KogLtj0t.mjs";
 import { o as formatCodexDisplayText } from "./command-formatters-xW9KpoSZ.mjs";
 import { a as codexPrewriteRejectionCause, i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
 import { n as waitForPromiseOrAbort } from "./timeout-D0mEWSGG.mjs";
@@ -16,50 +17,49 @@ import { t as readCodexAsyncQuestions } from "./async-questions-DdhOCwGi.mjs";
 import { i as readCodexProviderRefusal, n as extractRawResponseItemText, o as readItem, r as readCodexErrorNotificationMessage, s as readNullableString } from "./event-projector-values-CLvG1Hil.mjs";
 import { i as readMirrorIdentity, n as attachCodexMirrorIdentity, t as attachCodexAssistantItemIds } from "./upstream-prompt-provenance-Ccd9MFRJ.mjs";
 import { n as buildCodexAppServerRuntimeFingerprint, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-Bg9DbDI6.mjs";
-import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection, t as assertCodexSessionRuntimeOwnership } from "./binding-connection-C0t9TBX_.mjs";
-import { n as requestCodexAppServerClientJson } from "./request-XC1RG34l.mjs";
-import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-LQemoqTL.mjs";
+import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection, t as assertCodexSessionRuntimeOwnership } from "./binding-connection-BIo1-hoT.mjs";
+import { n as requestCodexAppServerClientJson } from "./request-ufWmJNN1.mjs";
+import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-d0gOFYEk.mjs";
 import { a as isCodexDurableCustomMessage, c as resolveCodexContextEngineProjectionMaxChars, i as fitCodexProjectedContextForTurnStart, l as resolveCodexContinuityProjectionMaxChars, n as CodexContextAttachmentError, o as neutralizeCodexExplicitMentionSigils, r as buildCodexContinuityCalibration, s as projectContextEngineAssemblyForCodex, t as CODEX_TURN_START_TEXT_INPUT_MAX_CHARS, u as resolveProjectionPromptBudgetTokens } from "./context-engine-projection-ps-yn_ci.mjs";
 import { a as buildCodexMirrorIdempotencyKey, i as buildCodexMirrorDedupeIdentity, s as hasCodexMirrorOrigin, t as applyCodexTranscriptTaint } from "./transcript-mirror-attestation-BzUXnrvv.mjs";
 import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-BO6i_pfk.mjs";
 import { i as resolveCodexAppServerAuthProfileIdForAgent, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-CgHQ8Vot.mjs";
-import { E as isCodexContextRestartSelectionChangedError, G as protectCodexAppServerLiveThread, I as ensureCodexAppServerClientRuntime, M as getCodexInferenceThreadQualification, Q as readRecentCodexRateLimits, W as prepareCodexWorkspaceReferences, Z as readCodexRateLimitsRevision, _ as retainSharedCodexAppServerClientIfCurrent, a as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, at as resolveCodexAppServerPreparedAuthHandoff, c as getLeasedSharedCodexAppServerClient, f as readCodexAppServerClientDesktopGenerationFingerprint, h as releaseLeasedSharedCodexAppServerClient, ht as TURN_TERMINAL_SETTLEMENT_TIMEOUT_MS, i as clearSharedCodexAppServerClientIfCurrent, it as resolveCodexAppServerAuthAccountCacheKey, j as getCodexInferenceThread, l as getSharedCodexAppServerClient, mt as TURN_FINALIZE_DRAIN_ABORT_GRACE_MS, pt as CodexAppServerStartupError, s as createIsolatedCodexAppServerClient, u as isCodexAppServerStartSelectionChangedError, vt as resolveCodexStartupTimeoutMs, w as CodexThreadClientReplacementError, x as CODEX_APP_SERVER_CONTEXT_RESTART_SELECTION_CHANGED, yt as withCodexStartupTimeout } from "./shared-client-AdQX0Tdq.mjs";
+import { E as isCodexContextRestartSelectionChangedError, G as protectCodexAppServerLiveThread, I as ensureCodexAppServerClientRuntime, M as getCodexInferenceThreadQualification, Q as readRecentCodexRateLimits, W as prepareCodexWorkspaceReferences, Z as readCodexRateLimitsRevision, _ as retainSharedCodexAppServerClientIfCurrent, a as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, at as resolveCodexAppServerPreparedAuthHandoff, c as getLeasedSharedCodexAppServerClient, f as readCodexAppServerClientDesktopGenerationFingerprint, h as releaseLeasedSharedCodexAppServerClient, ht as TURN_TERMINAL_SETTLEMENT_TIMEOUT_MS, i as clearSharedCodexAppServerClientIfCurrent, it as resolveCodexAppServerAuthAccountCacheKey, j as getCodexInferenceThread, l as getSharedCodexAppServerClient, mt as TURN_FINALIZE_DRAIN_ABORT_GRACE_MS, pt as CodexAppServerStartupError, s as createIsolatedCodexAppServerClient, u as isCodexAppServerStartSelectionChangedError, vt as resolveCodexStartupTimeoutMs, w as CodexThreadClientReplacementError, x as CODEX_APP_SERVER_CONTEXT_RESTART_SELECTION_CHANGED, yt as withCodexStartupTimeout } from "./shared-client-C0gEybHs.mjs";
 import { a as isCodexResponsesOAuthRun, r as isCodexResponsesOAuth } from "./responses-oauth-twnuTaAa.mjs";
-import { D as toCodexDynamicToolProgressResponse, E as resolveDynamicToolCallTimeoutMs, L as resolveCodexAppServerClientInstanceId, M as readCodexAppServerWarningMessage, O as toCodexDynamicToolProtocolResponse, P as CODEX_APP_SERVER_OPT_OUT_NOTIFICATION_METHODS, T as handleDynamicToolCallWithTimeout, _ as assertCodexTurnStartResponse, a as isCodexAppServerIndeterminateRequestCancellationError, i as isCodexAppServerConnectionClosedError, l as CodexServerRequestResolvedError, o as isCodexAppServerIndeterminateTransportError, r as isCodexAppServerApprovalRequest, w as createCodexElicitationResponse, x as readCodexTurnCompletedNotification, y as readCodexDynamicToolCallParams } from "./client-BM97zH3z.mjs";
-import { n as isCodexWebSocketOpenFailure } from "./transport-websocket-CEBjEtFP.mjs";
-import { S as shouldClearTerminalPresentationForNativeItem, _ as itemName, a as isCodexNotificationForTurn, b as matchesCodexSnapshotTurn, i as CodexProjectionDiagnostics, n as getCodexAppServerTurnRouter, o as readCodexNotificationScope, s as readCodexNotificationThreadId, t as CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS, x as shouldAdvancePersistableAssistantBarrier } from "./turn-router-DnfbVPvu.mjs";
-import { d as terminateCodexBackgroundTerminals, f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as interruptCodexTurnAndWaitBestEffort, u as shouldRetireCodexStartupClient } from "./attempt-client-cleanup-jWVRH043.mjs";
-import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-BFTkrP_b.mjs";
+import { n as isCodexWebSocketOpenFailure } from "./transport-websocket-B5mq2Iq2.mjs";
+import { S as shouldClearTerminalPresentationForNativeItem, _ as itemName, a as isCodexNotificationForTurn, b as matchesCodexSnapshotTurn, i as CodexProjectionDiagnostics, n as getCodexAppServerTurnRouter, o as readCodexNotificationScope, s as readCodexNotificationThreadId, t as CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS, x as shouldAdvancePersistableAssistantBarrier } from "./turn-router-8CkGlezp.mjs";
+import { d as terminateCodexBackgroundTerminals, f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as interruptCodexTurnAndWaitBestEffort, u as shouldRetireCodexStartupClient } from "./attempt-client-cleanup-DQBa7iiq.mjs";
+import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-D1TJwzWf.mjs";
 import { a as isRawFunctionToolOutputCompletionNotification, c as readRawResponseToolCallId, i as isCodexTurnAbortMarkerNotification, l as updateActiveTurnItemIds, o as isTerminalTurnStatus, r as completePendingOpenClawDynamicToolNotification, s as readCodexNotificationItem, t as CodexUsageProjection } from "./event-projector-usage-BpKfdoTm.mjs";
-import { n as listAllCodexAppServerModels } from "./models-B65GHU4g.mjs";
-import { d as mergeCodexThreadConfigs } from "./project-doc-thread-config-D_sWbxFR.mjs";
-import { B as resolveCodexDynamicToolsLoadingForRuntime, L as isSystemAgentOnlyCodexDynamicToolAllowlist, P as filterCodexDynamicTools, V as joinPresentSections, _ as buildDeveloperInstructions, b as codexDynamicToolsFingerprint, h as resolveCodexWebSearchPlan, k as stabilizeJsonValue, l as isCodexNativeDelegationDisabledForRun, v as areCodexDynamicToolFingerprintsCompatible, w as fingerprintJsonObject, x as codexLegacyDynamicToolsFingerprint } from "./thread-requests-DjyDmCo4.mjs";
-import { i as resolveCodexSessionBinding, n as createCodexSessionGenerationSupersededError, t as clearCodexBindingForClient } from "./session-binding-BDnNz-Co.mjs";
+import { n as listAllCodexAppServerModels } from "./models-Dw0qUZl3.mjs";
+import { d as mergeCodexThreadConfigs } from "./project-doc-thread-config-BYFXSVGk.mjs";
+import { B as resolveCodexDynamicToolsLoadingForRuntime, L as isSystemAgentOnlyCodexDynamicToolAllowlist, P as filterCodexDynamicTools, V as joinPresentSections, _ as buildDeveloperInstructions, b as codexDynamicToolsFingerprint, h as resolveCodexWebSearchPlan, k as stabilizeJsonValue, l as isCodexNativeDelegationDisabledForRun, v as areCodexDynamicToolFingerprintsCompatible, w as fingerprintJsonObject, x as codexLegacyDynamicToolsFingerprint } from "./thread-requests-pX9_RXpU.mjs";
+import { i as resolveCodexSessionBinding, n as createCodexSessionGenerationSupersededError, t as clearCodexBindingForClient } from "./session-binding-_RE7vtVN.mjs";
 import { i as resolveCodexAppServerThreadModelSelection } from "./thread-model-selection-DcVebr8N.mjs";
-import { a as resolveCodexPromptError, i as refreshCodexUsageLimitPromptError, n as formatCodexTurnStartUsageLimitError, r as markCodexAuthProfileBlockedFromRateLimits, t as CodexUsageLimitPromptError } from "./usage-limit-error-EoQ7Vl2A.mjs";
-import { c as withExclusiveCodexAppServerThread, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-OXzPB_RV.mjs";
+import { a as resolveCodexPromptError, i as refreshCodexUsageLimitPromptError, n as formatCodexTurnStartUsageLimitError, r as markCodexAuthProfileBlockedFromRateLimits, t as CodexUsageLimitPromptError } from "./usage-limit-error-DycN7mED.mjs";
+import { c as withExclusiveCodexAppServerThread, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-BJpeo5Xk.mjs";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.mjs";
-import { a as CodexToolTranscriptProjection, c as isCodexCommandBearingToolCall, d as sanitizeCodexToolArguments, i as emitCodexAgentEvent, l as resolveCodexToolProgressDetailMode, o as CodexToolProgressProjection, r as CodexEventProjection, s as shouldEmitTranscriptToolProgress, t as codexNativeSubagentMonitorRuntime, u as sanitizeCodexAgentEventRecord } from "./native-subagent-monitor-CJaIve3h.mjs";
-import { a as requestPluginApprovalOutcome } from "./plugin-approval-roundtrip-x7UI_uqk.mjs";
-import { n as CodexThreadPolicyHandoffError, s as restoreCodexThreadInstructionsAfterCompaction } from "./thread-policy-Dp4CQjdL.mjs";
+import { a as CodexToolTranscriptProjection, c as isCodexCommandBearingToolCall, d as sanitizeCodexToolArguments, i as emitCodexAgentEvent, l as resolveCodexToolProgressDetailMode, o as CodexToolProgressProjection, r as CodexEventProjection, s as shouldEmitTranscriptToolProgress, t as codexNativeSubagentMonitorRuntime, u as sanitizeCodexAgentEventRecord } from "./native-subagent-monitor-D_tvjJxa.mjs";
+import { a as requestPluginApprovalOutcome } from "./plugin-approval-roundtrip-ts-2EU8i.mjs";
+import { n as CodexThreadPolicyHandoffError, s as restoreCodexThreadInstructionsAfterCompaction } from "./thread-policy-BlzkKVno.mjs";
 import { t as attemptTerminal } from "./attempt-terminal-sZutF0WY.mjs";
 import { a as runCodexAgentEndHook, c as withCodexAppServerFastModeServiceTier, i as reportCodexBackgroundCleanupFailure, n as ensureCodexWorkspaceDirOnce, o as runCodexCleanupStep, r as estimateCodexAppServerProjectedTurnTokens, s as shouldKeepCodexSharedAbortOpen, t as emitCodexAppServerEvent } from "./run-attempt-lifecycle-DN-ATDp9.mjs";
 import { t as CODEX_INFERENCE_GENERATION_KEY } from "./inference-metadata-DCvcG_N_.mjs";
 import "./inference-context-DNlGwzwy.mjs";
 import { i as createAssistantReasoningMessage, n as createAssistantCommentaryMessage, r as createAssistantMessage, t as createAssistantAsyncMessage } from "./event-projector-assistant-message-CLMKN4x-.mjs";
-import { a as resolveCodexExternalSandboxPolicyForOpenClawSandbox, c as shouldEnableCodexAppServerNativeToolSurface, i as resolveCodexAppServerHookChannelId, l as shouldRequireCodexSandboxExecServerEnvironment, o as resolveCodexMessageToolProvider, p as mapCodexAppServerRemoteWorkspacePath, r as resolveCodexAppServerExecutionCwd, s as resolveCodexSandboxEnvironmentSelection, t as buildDynamicTools, u as shouldWarnCodexDynamicToolBuildStageSummary } from "./dynamic-tool-build-Dp4v52Kl.mjs";
-import { a as buildCodexNativeHookRelayDisabledConfig, d as scheduleCodexNativeHookRelayUnregister, i as buildCodexNativeHookRelayConfig, l as resolveCodexNativeHookRelayEvents, n as CodexManagedHooksOnlyError, r as assertCodexNativeHookRelayAllowed, s as createCodexNativeHookRelay, t as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, u as resolveCodexNativeHookRelayTtlMs } from "./native-hook-relay-Ctyky2Qt.mjs";
-import { a as prepareCodexPluginThreadConfigStartupProvider, c as buildLegacyScheduledCodexAppRecoveryPrompt, d as resolveScheduledCodexAppCreatorCaptureDecision, i as isContextEngineBindingCompatible, l as buildScheduledCodexAppServerConnectionIdentity, n as isCodexAppServerProfilerEnabled, o as resolveCodexPluginThreadConfigStartupPolicy, r as buildContextEngineBinding, s as assertScheduledCodexAppAuthorityRuntime, t as startOrResumeThread, u as captureScheduledCodexAppAuthority } from "./thread-lifecycle-run-DezS4UNT.mjs";
+import { a as resolveCodexExternalSandboxPolicyForOpenClawSandbox, c as shouldEnableCodexAppServerNativeToolSurface, i as resolveCodexAppServerHookChannelId, l as shouldRequireCodexSandboxExecServerEnvironment, o as resolveCodexMessageToolProvider, p as mapCodexAppServerRemoteWorkspacePath, r as resolveCodexAppServerExecutionCwd, s as resolveCodexSandboxEnvironmentSelection, t as buildDynamicTools, u as shouldWarnCodexDynamicToolBuildStageSummary } from "./dynamic-tool-build-BPkHfpul.mjs";
+import { a as buildCodexNativeHookRelayDisabledConfig, d as scheduleCodexNativeHookRelayUnregister, i as buildCodexNativeHookRelayConfig, l as resolveCodexNativeHookRelayEvents, n as CodexManagedHooksOnlyError, r as assertCodexNativeHookRelayAllowed, s as createCodexNativeHookRelay, t as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, u as resolveCodexNativeHookRelayTtlMs } from "./native-hook-relay-CwkDznGH.mjs";
+import { a as prepareCodexPluginThreadConfigStartupProvider, c as buildLegacyScheduledCodexAppRecoveryPrompt, d as resolveScheduledCodexAppCreatorCaptureDecision, i as isContextEngineBindingCompatible, l as buildScheduledCodexAppServerConnectionIdentity, n as isCodexAppServerProfilerEnabled, o as resolveCodexPluginThreadConfigStartupPolicy, r as buildContextEngineBinding, s as assertScheduledCodexAppAuthorityRuntime, t as startOrResumeThread, u as captureScheduledCodexAppAuthority } from "./thread-lifecycle-run-BHM-L-56.mjs";
 import { i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy } from "./session-permission-policy-C7kYxPGd.mjs";
-import { o as hasCodexNativeToolCatalog, s as loadCodexNativeToolCatalog } from "./native-skill-isolation-C4XYLm33.mjs";
-import { r as prepareCodexNativeMcpFormResourceContext, t as createCodexNativeMcpAppResultDetailsPreparer } from "./native-mcp-app-DprMGBqj.mjs";
-import { _ as invalidateCodexComputerFrame, a as handleCodexAppServerApprovalRequest, c as createCodexNativePreToolUseFailureBuffer, f as buildTurnCollaborationMode, g as buildCodexUserInput, h as readCodexRetainedBackgroundCommands, i as createCodexDynamicToolDiagnostics, l as buildCodexHistoryProvenancePrefix, m as CodexNativeProcessAuthority, n as projectCodexExecutableDynamicTools, o as ensureCodexSandboxExecServerEnvironment, p as buildTurnStartParams, r as routeCodexAppServerElicitationRequest, s as releaseCodexSandboxExecServerEnvironment, t as createCodexDynamicToolBridge, u as buildCodexParentLocalInstructions, v as createCodexRemoteWorkspaceFileReader, y as CodexNativeToolLifecycleProjector } from "./dynamic-tools-C1Egdhrx.mjs";
-import { c as promptSnapshot, i as mirrorPromptAtTurnStartBestEffort, n as createCodexAppServerUserMessagePersistenceNotifier, o as buildCodexUserPromptMessage, s as buildResolvedCodexUserPromptMessage, t as codexTranscriptMirrorRuntime } from "./transcript-mirror-DVEzdOs0.mjs";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-V8zuN8q_.mjs";
-import { a as getCodexContextFileDisplayBasename, i as getCodexContextFileBasename, n as CODEX_NATIVE_PROJECT_DOC_BASENAMES, o as isNonEmptyString, r as buildCodexWorkspaceBootstrapContext, s as normalizeCodexContextFilePath } from "./attempt-workspace-context-BkA0W8Jy.mjs";
+import { o as hasCodexNativeToolCatalog, s as loadCodexNativeToolCatalog } from "./native-skill-isolation-0pEyxLRX.mjs";
+import { r as prepareCodexNativeMcpFormResourceContext, t as createCodexNativeMcpAppResultDetailsPreparer } from "./native-mcp-app-B7N--ols.mjs";
+import { _ as invalidateCodexComputerFrame, a as handleCodexAppServerApprovalRequest, c as createCodexNativePreToolUseFailureBuffer, f as buildTurnCollaborationMode, g as buildCodexUserInput, h as readCodexRetainedBackgroundCommands, i as createCodexDynamicToolDiagnostics, l as buildCodexHistoryProvenancePrefix, m as CodexNativeProcessAuthority, n as projectCodexExecutableDynamicTools, o as ensureCodexSandboxExecServerEnvironment, p as buildTurnStartParams, r as routeCodexAppServerElicitationRequest, s as releaseCodexSandboxExecServerEnvironment, t as createCodexDynamicToolBridge, u as buildCodexParentLocalInstructions, v as createCodexRemoteWorkspaceFileReader, y as CodexNativeToolLifecycleProjector } from "./dynamic-tools-CCezdz5n.mjs";
+import { c as promptSnapshot, i as mirrorPromptAtTurnStartBestEffort, n as createCodexAppServerUserMessagePersistenceNotifier, o as buildCodexUserPromptMessage, s as buildResolvedCodexUserPromptMessage, t as codexTranscriptMirrorRuntime } from "./transcript-mirror-CPdcVWTn.mjs";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-CF-JwGUD.mjs";
+import { a as getCodexContextFileDisplayBasename, i as getCodexContextFileBasename, n as CODEX_NATIVE_PROJECT_DOC_BASENAMES, o as isNonEmptyString, r as buildCodexWorkspaceBootstrapContext, s as normalizeCodexContextFilePath } from "./attempt-workspace-context-EAeScFrg.mjs";
 import { n as captureCodexSettledTurnFinalizationContext } from "./settled-turn-context-BPL6D3RO.mjs";
-import { t as resolveCodexProviderWebSearchSupport } from "./provider-capabilities-BCZeV7xZ.mjs";
-import { a as runCodexComputerUseLiveTest, i as createComputerUseRequest, t as ensureCodexComputerUse } from "./computer-use-CZhx4nNO.mjs";
+import { r as releaseCodexProbeClient, t as resolveCodexProviderWebSearchSupport } from "./provider-capabilities-C4ENlstc.mjs";
+import { a as runCodexComputerUseLiveTest, i as createComputerUseRequest, t as ensureCodexComputerUse } from "./computer-use-C4HhkAcj.mjs";
 import { asOptionalRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, readNonBlankString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -69,7 +69,7 @@ import { truncateUtf16Safe, truncateUtf8Prefix } from "openclaw/plugin-sdk/text-
 import path from "node:path";
 import fs from "node:fs/promises";
 import { isPathStrictlyInside, readFileWindowFully, root } from "openclaw/plugin-sdk/file-access-runtime";
-import { createStageTimingTracker, formatStageTimings } from "openclaw/plugin-sdk/time-runtime";
+import { createStageTimingTracker, formatStageTimings, raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { addAbortListener } from "node:events";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
 import { Type } from "typebox";
@@ -85,7 +85,7 @@ import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
 import { acknowledgeInternalToolResult, createAgentHarnessToolExecutionRegistry } from "openclaw/plugin-sdk/agent-harness-tool-runtime";
 import { createNativeSessionBindingAuthority, prepareNativeSessionGenerationAuthority } from "openclaw/plugin-sdk/agent-harness-session-runtime";
-import { appendSessionYieldContext, composeSessionTranscriptWriteAssertion, hasPromptImageInput } from "openclaw/plugin-sdk/session-transcript-runtime";
+import { appendSessionTranscriptMessageByIdentityStrict, appendSessionYieldContext, composeSessionTranscriptWriteAssertion, hasPromptImageInput } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { captureFinalCodexCronCreatorToolAllowlist, formatMcpCodexApprovalRemedy, materializeStaticMcpToolsForHarnessRun, resolveCodexMcpToolOverridesForAgent, resolveCodexTtsProvenanceTransfer } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { getAgentScopedMediaLocalRoots } from "openclaw/plugin-sdk/media-local-roots";
 import { isSilentReplyPayloadText } from "openclaw/plugin-sdk/reply-chunking";
@@ -139,6 +139,7 @@ function createCodexAttemptPreparationTiming(params) {
 //#endregion
 //#region extensions/codex/src/app-server/attempt-steering.ts
 const CODEX_STEER_ALL_DEBOUNCE_MS = 500;
+const CODEX_STEER_TERMINAL_DRAIN_MS = 1e3;
 function createCodexQuestionInputHandlers(sessionKey, assertActive) {
 	const questionAuthority = (kind, assertSource, toolAuthorityPreparation) => ({
 		kind,
@@ -191,6 +192,11 @@ function createCodexSteeringQueue(params) {
 	let sendChain = Promise.resolve();
 	let sealedError;
 	let closedError;
+	let terminalDrain;
+	const removeDispatchedBatch = (id) => {
+		dispatchedBatches.delete(id);
+		if (dispatchedBatches.size === 0) terminalDrain?.resolve();
+	};
 	const assertActive = () => {
 		const unavailableError = closedError ?? sealedError;
 		if (unavailableError) throw unavailableError;
@@ -235,6 +241,7 @@ function createCodexSteeringQueue(params) {
 		for (const batch of dispatchedBatches.values()) for (const item of batch) acceptItem(item);
 		dispatchedBatches.clear();
 		for (const item of pendingMessages) rejectItem(item, error);
+		terminalDrain?.resolve();
 	};
 	const sealQueueAdmission = () => {
 		if (sealedError || closedError) return;
@@ -309,7 +316,7 @@ function createCodexSteeringQueue(params) {
 				timeoutMs: params.requestTimeoutMs,
 				signal: params.signal,
 				...withCurrent ? { withCurrent } : {},
-				onIngressRejected: () => dispatchedBatches.delete(request.clientUserMessageId),
+				onIngressRejected: () => removeDispatchedBatch(request.clientUserMessageId),
 				assertCurrent: () => {
 					assertActive();
 					liveItems = liveItems.filter(isCurrent);
@@ -323,7 +330,7 @@ function createCodexSteeringQueue(params) {
 			});
 			for (const item of liveItems) acceptItem(item);
 		} catch (error) {
-			if (clientUserMessageId) dispatchedBatches.delete(clientUserMessageId);
+			if (clientUserMessageId) removeDispatchedBatch(clientUserMessageId);
 			if (skippedRevokedBatch) return;
 			if (clientUserMessageId !== void 0 && (isCodexAppServerIndeterminateRequestCancellationError(error) || isCodexAppServerIndeterminateTransportError(error))) for (const item of liveItems) acceptItem(item);
 			for (const item of items) rejectItem(item, error);
@@ -379,12 +386,21 @@ function createCodexSteeringQueue(params) {
 		confirmConsumed(clientUserMessageId) {
 			const batch = dispatchedBatches.get(clientUserMessageId);
 			if (!batch) return false;
-			dispatchedBatches.delete(clientUserMessageId);
+			removeDispatchedBatch(clientUserMessageId);
 			for (const item of batch) resolveItem(item);
 			return true;
 		},
 		getAcceptedMessages: () => acceptedMessages.slice(),
 		sealAdmission: sealQueueAdmission,
+		drainBeforeCancel() {
+			sealQueueAdmission();
+			if (closedError || dispatchedBatches.size === 0) {
+				cancelQueue();
+				return;
+			}
+			terminalDrain ??= createDeferred();
+			return raceWithTimeout(terminalDrain.promise, CODEX_STEER_TERMINAL_DRAIN_MS, () => {}, { ref: false }).then(cancelQueue);
+		},
 		cancel: cancelQueue
 	};
 }
@@ -2737,7 +2753,7 @@ function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notificatio
 		model: params.model,
 		config: params.config,
 		workspaceOnly,
-		localRoots: workspaceOnly ? void 0 : getAgentScopedMediaLocalRoots(params.config ?? {}, sessionAgentId),
+		localRoots: workspaceOnly ? void 0 : getAgentScopedMediaLocalRoots(params.config ?? {}, sessionAgentId, params.workspaceDir),
 		sandbox: connection.sandbox?.enabled && connection.sandbox.fsBridge ? {
 			root: connection.sandbox.workspaceDir,
 			bridge: connection.sandbox.fsBridge
@@ -2893,7 +2909,7 @@ function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notificatio
 		isStreaming: () => !state.completed && !runAbortController.signal.aborted,
 		isAborted: () => runAbortController.signal.aborted,
 		isStopped: () => state.completed || runAbortController.signal.aborted,
-		ownsLiveness: () => deadlines.ownsExecutionWait() && resourceState.turnRoute?.signal.aborted === false && !state.completed && !state.terminalTurnNotificationQueued && state.activeAppServerTurnRequests === 0 && state.activeLocalProjections === 0,
+		ownsLiveness: () => deadlines.ownsExecutionWait() && resourceState.turnRoute?.signal.aborted === false && !state.completed && !state.terminalTurnNotificationQueued,
 		isAbortable: () => !terminalState.terminalOutcomeFrozen || terminalState.sharedAbortAllowedAfterTerminalOutcome,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		supportsTranscriptCommitWait: true,
@@ -4749,14 +4765,20 @@ async function finalizeCodexAttempt(resources, turnRuntime, lifecycle, notificat
 		else if (finalPromptError) codexModelCallDiagnostics.emitError(finalPromptError);
 		else codexModelCallDiagnostics.emitCompleted(result);
 		const { assistantTranscriptOwned, assistantTranscriptIdempotencyKey, terminalAnchor } = mirrorOutcome;
-		const settledTurnFinalizationContext = result.assistantTexts.every((text) => !text.trim()) && result.messagesSnapshot.some((message) => message.role === "toolResult") && (!finalPromptError || activeProjector.settledTurnFailureFinalizationAllowed) ? (!usesSupervisionConnection && !resourceState.nativeSettlementExpired ? await captureCodexSettledTurnFinalizationContext({
+		const shouldCaptureSettledTurnFinalizationContext = result.assistantTexts.every((text) => !text.trim()) && result.messagesSnapshot.some((message) => message.role === "toolResult") && (!finalPromptError || activeProjector.settledTurnFailureFinalizationAllowed);
+		const continuedPrompt = params.suppressNextUserMessagePersistence ? params.userTurnTranscriptRecorder?.getPersistedMessage?.() : void 0;
+		const continuedPromptIdentity = continuedPrompt && readMirrorIdentity(continuedPrompt);
+		const evidencePrefix = continuedPrompt && continuedPromptIdentity ? [continuedPrompt] : [];
+		const settledTurnFinalizationContext = shouldCaptureSettledTurnFinalizationContext ? (!usesSupervisionConnection && !resourceState.nativeSettlementExpired ? await captureCodexSettledTurnFinalizationContext({
 			...activeTranscriptTarget,
 			model: resourceState.thread.model,
 			modelProvider: resourceState.thread.modelProvider,
 			authProfileId: startupAuthProfileId,
-			mirroredMessages: mirrorOutcome.mirroredMessages,
-			settledMessages: result.messagesSnapshot,
+			mirroredMessages: [...evidencePrefix, ...mirrorOutcome.mirroredMessages],
+			settledMessages: [...evidencePrefix, ...result.messagesSnapshot],
+			...continuedPromptIdentity ? { promptIdentity: continuedPromptIdentity } : {},
 			turnId: activeTurnId,
+			promptSuppressed: params.suppressNextUserMessagePersistence === true && !params.userTurnTranscriptRecorder,
 			signal: params.abortSignal,
 			assertActive: connection.assertCurrent,
 			withCurrent: connection.withCurrent
@@ -4917,12 +4939,13 @@ function createCodexAttemptLifecycleController(resources, turnRuntime) {
 	const { params, attemptStartedAt, runAbortController, fastModeAutoStartedAtMs, fastModeAutoProgressState } = connection;
 	const { state, activeTurnItemIds, pendingOpenClawDynamicToolCompletionIds } = turnRuntime;
 	const batchHadNonTerminalResult = () => state.currentTurnHadNonTerminalDynamicToolResult && !state.currentTurnHadToolAuthoredFinalReply;
+	let terminalSteeringDrainPending = false;
 	const scheduleTerminalDynamicToolReleaseCheck = () => {
-		if (state.terminalDynamicToolReleaseCheckScheduled || !state.pendingTerminalDynamicToolRelease && !state.currentTurnHadNonTerminalDynamicToolResult) return;
+		if (state.terminalDynamicToolReleaseCheckScheduled || terminalSteeringDrainPending || !state.pendingTerminalDynamicToolRelease && !state.currentTurnHadNonTerminalDynamicToolResult) return;
 		state.terminalDynamicToolReleaseCheckScheduled = true;
 		setImmediate(() => {
 			state.terminalDynamicToolReleaseCheckScheduled = false;
-			if (state.pendingTerminalDynamicToolRelease?.response.success === true && !batchHadNonTerminalResult() && state.activeAppServerTurnRequests === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0) turnRuntime.steeringQueueRef.current?.cancel();
+			if (state.pendingTerminalDynamicToolRelease?.response.success === true && !batchHadNonTerminalResult() && state.activeAppServerTurnRequests === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0) turnRuntime.steeringQueueRef.current?.sealAdmission();
 			if (state.activeAppServerTurnRequests > 0 || activeTurnItemIds.size > 0 || pendingOpenClawDynamicToolCompletionIds.size > 0) return;
 			if (batchHadNonTerminalResult()) {
 				state.pendingTerminalDynamicToolRelease = void 0;
@@ -4932,6 +4955,15 @@ function createCodexAttemptLifecycleController(resources, turnRuntime) {
 			}
 			const value = state.pendingTerminalDynamicToolRelease;
 			if (!value || state.completed || runAbortController.signal.aborted || !value.response.success || state.activeAppServerTurnRequests !== 0 || activeTurnItemIds.size !== 0 || pendingOpenClawDynamicToolCompletionIds.size !== 0) return;
+			const steeringDrain = turnRuntime.steeringQueueRef.current?.drainBeforeCancel();
+			if (steeringDrain) {
+				terminalSteeringDrainPending = true;
+				steeringDrain.then(() => {
+					terminalSteeringDrainPending = false;
+					scheduleTerminalDynamicToolReleaseCheck();
+				});
+				return;
+			}
 			state.pendingTerminalDynamicToolRelease = void 0;
 			state.currentTurnHadToolAuthoredFinalReply = false;
 			trajectoryRecorder?.recordEvent("turn.dynamic_tool_terminal_release", {
@@ -4948,7 +4980,6 @@ function createCodexAttemptLifecycleController(resources, turnRuntime) {
 				tool: value.call.tool,
 				durationMs: value.durationMs
 			});
-			turnRuntime.steeringQueueRef.current?.cancel();
 			turnRuntime.interruptTurn(value.call.turnId, { locallyCompleted: true });
 			turnRuntime.completeTurn();
 		}).unref?.();
@@ -5650,22 +5681,63 @@ function createNativeSubagentAssignmentStore(params) {
 		const binding = bindingStore.read(identity);
 		if (!binding || !matchesCodexNativeSubagentSubmissionBinding(binding, owner)) throw new Error("Native assignment binding is no longer current.");
 	};
-	const mutate = (kind) => (assignment, assertSourceCurrent) => bindingStore.mutate(identity, {
-		kind,
-		owner,
-		assignment
-	}, () => {
-		assertCurrent();
-		assertSourceCurrent();
-	});
 	return {
 		assertCurrent,
 		read: () => {
 			assertCurrent();
 			return bindingStore.readNativeSubagentAssignments?.(identity, owner) ?? [];
 		},
-		record: mutate("record-native-subagent-assignment"),
-		consume: mutate("consume-native-subagent-assignment")
+		record: (assignment, assertSourceCurrent) => bindingStore.mutate(identity, {
+			kind: "record-native-subagent-assignment",
+			owner,
+			assignment
+		}, () => {
+			assertCurrent();
+			assertSourceCurrent();
+		}),
+		consume: async (assignment, assertSourceCurrent, undelivered) => {
+			const applied = await bindingStore.mutate(identity, {
+				kind: "consume-native-subagent-assignment",
+				owner,
+				assignment,
+				...undelivered ? { undelivered: true } : {}
+			}, () => {
+				assertCurrent();
+				assertSourceCurrent();
+			});
+			if (applied && undelivered) {
+				embeddedAgentLog.warn("Native subagent completion retired without delivery", {
+					childThreadId: assignment.childThreadId,
+					nativeTurnId: assignment.nativeTurnId,
+					status: undelivered.status,
+					childSessionKey: assignment.runId
+				});
+				try {
+					if (identity.kind !== "session" || !identity.sessionKey) throw new Error("Native completion has no parent transcript identity.");
+					const note = await appendSessionTranscriptMessageByIdentityStrict({
+						agentId: identity.agentId,
+						sessionId: owner.sessionId,
+						sessionKey: identity.sessionKey,
+						updateMode: "inline",
+						message: {
+							role: "custom",
+							customType: "openclaw.system-note",
+							display: true,
+							content: `Native subagent ${assignment.childThreadId} finished with status ${undelivered.status}, but its completion could not be delivered. Automatic delivery has stopped. Inspect its native Codex thread history${assignment.nativeTurnId ? ` at turn ${assignment.nativeTurnId}` : ""}; child session key: ${assignment.runId}.`.slice(0, 2048),
+							timestamp: Date.now(),
+							idempotencyKey: `codex-undelivered:${owner.lifecycleRevision ?? owner.sessionId}:${assignment.childThreadId}:${assignment.nativeTurnId ?? "initial"}`
+						}
+					});
+					if (note.kind !== "result") throw new Error(`Native completion note was ${note.kind}.`);
+				} catch (error) {
+					embeddedAgentLog.warn("Could not persist native completion retirement note", {
+						childSessionKey: assignment.runId,
+						error: formatErrorMessage(error)
+					});
+				}
+			}
+			return applied;
+		}
 	};
 }
 //#endregion
@@ -6316,8 +6388,7 @@ async function prepareCodexAttemptRuntime(connection) {
 			nativeToolSurfaceEnabled = false;
 			embeddedAgentLog.info("Codex managed-only hooks require sandbox-backed OpenClaw tools");
 		} finally {
-			if (attemptClientFactory === createIsolatedCodexAppServerClient) await client.closeAndWait();
-			else releaseLeasedSharedCodexAppServerClient(client);
+			await releaseCodexProbeClient(client, attemptClientFactory);
 		}
 	}
 	const configuredMcpSurface = params.requireWorkspaceOnly === true ? void 0 : scheduledConfiguredMcpSurface ? "scheduled" : !nativeToolSurfaceEnabled && bundleMcpThreadConfig.staticServerNames.length > 0 ? "transient" : void 0;
@@ -6714,7 +6785,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-CCPLKFGR.mjs");
+	const { readCodexAppServerClientRuntimeArtifact, validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-Ch7fCcgJ.mjs");
 	const runtimeArtifact = readCodexAppServerClientRuntimeArtifact(params.client);
 	const expected = params.request.expected;
 	const matchesExpected = !expected || runtimeArtifact?.id === expected.id && runtimeArtifact.fingerprint === expected.fingerprint;
@@ -7543,7 +7614,7 @@ async function prepareCodexAttemptTools(runtime) {
 				}
 			});
 		} finally {
-			releaseLeasedSharedCodexAppServerClient(client);
+			await releaseCodexProbeClient(client, connection.attemptClientFactory);
 		}
 	}
 	let requireExplicitMessageTarget;

package/dist/.setup/{runtime-artifact-CCPLKFGR.mjs → runtime-artifact-Ch7fCcgJ.mjs}

@@ -1,7 +1,7 @@
 import { n as isCodexAppServerProxyLaunch } from "./launch-args-DbFCehO7.mjs";
-import { a as resolvePackagedCodexNativeCommand } from "./managed-binary-DwC9wxch.mjs";
-import { n as resolveCodexAppServerSpawnEnv, r as resolveCodexAppServerSpawnInvocation } from "./transport-stdio-lgeKKHyw.mjs";
-import { captureCodexConfiguredConnection, finalizeCodexConfiguredConnection, isCodexConfiguredConnectionArtifact, validateCodexConfiguredConnectionCapture } from "./runtime-artifact-connection-dFoSOKy7.mjs";
+import { a as resolvePackagedCodexNativeCommand } from "./managed-binary-Boj8_lWV.mjs";
+import { n as resolveCodexAppServerSpawnEnv, r as resolveCodexAppServerSpawnInvocation } from "./transport-stdio-BsXQmXll.mjs";
+import { captureCodexConfiguredConnection, finalizeCodexConfiguredConnection, isCodexConfiguredConnectionArtifact, validateCodexConfiguredConnectionCapture } from "./runtime-artifact-connection-C3ootnwd.mjs";
 import { createHash } from "node:crypto";
 import { resolveWindowsExecutablePath } from "openclaw/plugin-sdk/windows-spawn";
 import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";

package/dist/.setup/{runtime-artifact-connection-dFoSOKy7.mjs → runtime-artifact-connection-C3ootnwd.mjs}

@@ -1,6 +1,6 @@
 import { t as codexAppServerStartOptionsKey } from "./config-options-CZmH25Xq.mjs";
-import "./config-runtime-DGB1-VbB.mjs";
-import { r as resolveCodexAppServerUnixSocketPath } from "./transport-websocket-CEBjEtFP.mjs";
+import "./config-runtime-BUH-IDVE.mjs";
+import { r as resolveCodexAppServerUnixSocketPath } from "./transport-websocket-B5mq2Iq2.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import path from "node:path";

package/dist/.setup/{sandbox-guard-Cf9XMRrg.mjs → sandbox-guard-CwOc36_1.mjs}

@@ -1,6 +1,6 @@
 import { l as isCodexRemoteExecPlacementSandbox } from "./config-parsing-CVK2Q463.mjs";
 import { n as resolveCodexNativeExecutionPolicy, t as formatCodexNativeNodeExecBlock } from "./native-execution-policy-MXEe7PB3.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-DijNZb31.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-CAHe3enw.mjs";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { tryResolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";

package/dist/.setup/{session-binding-BDnNz-Co.mjs → session-binding-_RE7vtVN.mjs}

@@ -1,9 +1,9 @@
-import { i as adoptCodexNativeSubagentSubmissions, n as mutateNativePendingAssignments, o as mutateCodexNativeSubagentSubmissions } from "./native-subagent-pending-assignments-DmVhedNs.mjs";
+import { a as adoptCodexNativeSubagentSubmissions, c as readCodexNativeSubagentSubmissions, l as codexNativeSubagentRunId, n as mutateNativePendingAssignments, o as matchesCodexNativeSubagentSubmissionOwner, s as mutateCodexNativeSubagentSubmissions } from "./native-subagent-pending-assignments-BAOzwy85.mjs";
 import { a as readStoredCodexAppServerBinding, i as readCodexBindingTimestamp, n as matchesPendingSupervisionBranch, o as stripUndefinedBinding, r as readCodexAppServerThreadBinding, s as validateBindingForWrite } from "./session-binding-record-codec-CWQXr9os.mjs";
-import { a as ownsStoredSessionGeneration, c as preserveNativeTaskImport, d as readCurrentCodexNativeSubagentSubmissions, f as readCurrentNativePendingAssignments, i as matchesCodexNativeSubagentSubmissionBinding, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as preserveCodexNativeSubagentSubmissions, p as readPluginAppPolicyContext, r as bindingStoreKey, s as preserveNativePendingAssignments, t as CodexSupervisionBindingReplacementError, u as readCurrentCodexAppServerBindings } from "./session-binding-record-C2kDBZhx.mjs";
+import { a as ownsStoredSessionGeneration, c as preserveNativeTaskImport, d as readCurrentCodexNativeSubagentSubmissions, f as readCurrentNativePendingAssignments, i as matchesCodexNativeSubagentSubmissionBinding, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as preserveCodexNativeSubagentSubmissions, p as readPluginAppPolicyContext, r as bindingStoreKey, s as preserveNativePendingAssignments, t as CodexSupervisionBindingReplacementError, u as readCurrentCodexAppServerBindings } from "./session-binding-record-O62ZRFhy.mjs";
 import { a as PHYSICAL_SESSION_RETIRE_TTL_MS, i as CODEX_APP_SERVER_BINDING_NAMESPACE, n as CODEX_APP_SERVER_BINDING_LEASE, r as CODEX_APP_SERVER_BINDING_MAX_ENTRIES, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-meta-Lkm5Lpf4.mjs";
 import { n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-CgHQ8Vot.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-DijNZb31.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-CAHe3enw.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { AgentHarnessSessionSupersededError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -15,25 +15,51 @@ function mutateNativeSubagentBinding({ identity, current, mutation, assertCurren
 	if (!assertCurrent) throw new Error(`Codex native ${isAssignment ? "assignment" : "subagent submission"} mutation requires current authority.`);
 	assertCurrent();
 	if (current?.state !== "active" || !ownsStoredSessionGeneration(identity, current) || identity.kind === "session" && mutation.owner.sessionId !== identity.sessionId || !matchesCodexNativeSubagentSubmissionBinding(current.binding, mutation.owner)) return { result: false };
-	const field = isAssignment ? "nativeSubagentAssignments" : "nativeSubagentSubmissions";
-	const changed = isAssignment ? mutateNativePendingAssignments({
-		current: current.nativeSubagentAssignments,
-		owner: mutation.owner,
-		assignment: mutation.assignment,
-		consume: mutation.kind === "consume-native-subagent-assignment"
-	}) : mutateCodexNativeSubagentSubmissions({
+	if (isAssignment) {
+		const changed = mutateNativePendingAssignments({
+			current: current.nativeSubagentAssignments,
+			owner: mutation.owner,
+			assignment: mutation.assignment,
+			consume: mutation.kind === "consume-native-subagent-assignment"
+		});
+		if (!changed.applied) return { result: mutation.kind === "consume-native-subagent-assignment" && mutation.undelivered === true && changed.absent === true };
+		const { nativeSubagentAssignments: _previous, ...bindingOwner } = current;
+		const retired = changed.consumed;
+		if (retired && mutation.kind === "consume-native-subagent-assignment" && mutation.undelivered) {
+			let submissions;
+			try {
+				submissions = readCodexNativeSubagentSubmissions(bindingOwner.nativeSubagentSubmissions);
+			} catch {}
+			if (submissions && matchesCodexNativeSubagentSubmissionOwner(submissions.owner, mutation.owner)) {
+				const receipts = submissions.receipts.filter((receipt) => receipt.childThreadId !== retired.childThreadId || receipt.submissionId !== retired.nativeTurnId && codexNativeSubagentRunId(receipt.childThreadId, receipt.submissionId) !== retired.runId);
+				delete bindingOwner.nativeSubagentSubmissions;
+				if (receipts.length) bindingOwner.nativeSubagentSubmissions = {
+					...submissions,
+					receipts
+				};
+			}
+		}
+		return {
+			result: true,
+			next: {
+				...bindingOwner,
+				...changed.next ? { nativeSubagentAssignments: changed.next } : {}
+			}
+		};
+	}
+	const changed = mutateCodexNativeSubagentSubmissions({
 		current: current.nativeSubagentSubmissions,
 		owner: mutation.owner,
 		receipt: mutation.receipt,
 		consume: mutation.kind === "consume-native-subagent-submission"
 	});
 	if (!changed.applied) return { result: false };
-	const { [field]: _previous, ...bindingOwner } = current;
+	const { nativeSubagentSubmissions: _previous, ...bindingOwner } = current;
 	return {
 		result: true,
 		next: {
 			...bindingOwner,
-			...changed.next ? { [field]: changed.next } : {}
+			...changed.next ? { nativeSubagentSubmissions: changed.next } : {}
 		}
 	};
 }