@openclaw/codex 2026.7.2-beta.2 → 2026.7.2-beta.3

package/dist/{run-attempt-MLzoMe_m.js → run-attempt-BIoO8ISr.js}

@@ -1,15 +1,15 @@
-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, R as CodexAppServerRpcError, S as resolveCodexAppServerAuthProfileIdForAgent, T as resolveCodexAppServerPreparedAuthHandoff, V as isCodexAppServerBrokenPipeError, X as flattenCodexDynamicToolFunctions, Z as isJsonObject, _ 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 } from "./shared-client-JiAnW6pc.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-BFmNhqFl.js";
-import { C as resolveCodexComputerUseConfig, D as resolveOpenClawExecPolicyForCodexAppServer, O as shouldAutoApproveCodexAppServerApprovals, T as resolveCodexPluginsPolicy, c as sessionBindingIdentity, g as isCodexAppServerApprovalPolicyAllowedByRequirements, k as withMcpElicitationsApprovalPolicy, s as reclaimCurrentCodexSessionGeneration, v as isCodexSandboxExecServerEnabled, w as resolveCodexModelBackedReviewerPolicyContext, y as readCodexPluginConfig } from "./session-binding-h1mmCGnl.js";
+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, R as CodexAppServerRpcError, S as resolveCodexAppServerAuthProfileIdForAgent, T as resolveCodexAppServerPreparedAuthHandoff, V as isCodexAppServerBrokenPipeError, X as flattenCodexDynamicToolFunctions, Z as isJsonObject, _ 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 } from "./shared-client-CSXLtCLE.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-Ecjyzufe.js";
+import { C as resolveCodexComputerUseConfig, D as resolveOpenClawExecPolicyForCodexAppServer, O as shouldAutoApproveCodexAppServerApprovals, T as resolveCodexPluginsPolicy, c as sessionBindingIdentity, g as isCodexAppServerApprovalPolicyAllowedByRequirements, k as withMcpElicitationsApprovalPolicy, s as reclaimCurrentCodexSessionGeneration, v as isCodexSandboxExecServerEnabled, w as resolveCodexModelBackedReviewerPolicyContext, y as readCodexPluginConfig } from "./session-binding-Bmt20HfB.js";
 import { _ as readCodexTurnCompletedNotification, f as assertCodexTurnStartResponse, i as mirrorPromptAtTurnStartBestEffort, n as createCodexAppServerUserMessagePersistenceNotifier, o as buildCodexUserPromptMessage, p as readCodexDynamicToolCallParams, t as codexTranscriptMirrorRuntime } from "./transcript-mirror-D9rTxx2P.js";
-import { i as defaultCodexAppInventoryCache, n as buildCodexAppServerRuntimeFingerprint, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-Ceb-lm2c.js";
-import { A as CodexAppServerUnsafeSubscriptionError, B as fitCodexProjectedContextForTurnStart, D as resolveCodexDynamicToolsLoadingForRuntime, F as areCodexDynamicToolFingerprintsCompatible, G as buildCodexPluginThreadConfig, H as resolveCodexContextEngineProjectionMaxChars, I as codexDynamicToolsFingerprint, J as mergeCodexThreadConfigs, K as buildCodexPluginThreadConfigInputFingerprint, L as codexLegacyDynamicToolsFingerprint, M as interruptCodexTurnBestEffort, N as retireCodexAppServerClientAfterTimedOutTurn, O as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, P as unsubscribeCodexThreadBestEffort, Q as resolveRecoverableCodexPluginConfigKeys, R as buildContextEngineBinding, U as resolveCodexContextEngineProjectionReserveTokens, V as projectContextEngineAssemblyForCodex, Y as shouldBuildCodexPluginThreadConfig, b as isCodexAppServerProfilerEnabled, d as resolveCodexWebSearchPlan, f as buildDeveloperInstructions, g as resolveCodexAppServerThreadModelSelection, j as closeCodexStartupClientBestEffort, k as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, n as buildTurnStartParams, q as buildCodexPluginThreadConfigTimeoutFallback, r as buildCodexUserInput, s as startOrResumeThread, t as buildTurnCollaborationMode, w as isSystemAgentOnlyCodexDynamicToolAllowlist, x as filterCodexDynamicTools, z as isContextEngineBindingCompatible } from "./thread-lifecycle-CN_pPtPh.js";
-import { r as formatCodexDisplayText } from "./command-formatters-Dq9InZUK.js";
-import { n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-Scc-Wevo.js";
-import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId, t as isCodexNotificationForTurn } from "./notification-correlation-KmfV4EkP.js";
+import { i as defaultCodexAppInventoryCache, n as buildCodexAppServerRuntimeFingerprint, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DJbhLYSK.js";
+import { A as CodexAppServerUnsafeSubscriptionError, B as fitCodexProjectedContextForTurnStart, D as resolveCodexDynamicToolsLoadingForRuntime, F as areCodexDynamicToolFingerprintsCompatible, G as buildCodexPluginThreadConfig, H as resolveCodexContextEngineProjectionMaxChars, I as codexDynamicToolsFingerprint, J as mergeCodexThreadConfigs, K as buildCodexPluginThreadConfigInputFingerprint, L as codexLegacyDynamicToolsFingerprint, M as interruptCodexTurnBestEffort, N as retireCodexAppServerClientAfterTimedOutTurn, O as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS, P as unsubscribeCodexThreadBestEffort, Q as resolveRecoverableCodexPluginConfigKeys, R as buildContextEngineBinding, U as resolveCodexContextEngineProjectionReserveTokens, V as projectContextEngineAssemblyForCodex, Y as shouldBuildCodexPluginThreadConfig, b as isCodexAppServerProfilerEnabled, d as resolveCodexWebSearchPlan, f as buildDeveloperInstructions, g as resolveCodexAppServerThreadModelSelection, j as closeCodexStartupClientBestEffort, k as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, n as buildTurnStartParams, q as buildCodexPluginThreadConfigTimeoutFallback, r as buildCodexUserInput, s as startOrResumeThread, t as buildTurnCollaborationMode, w as isSystemAgentOnlyCodexDynamicToolAllowlist, x as filterCodexDynamicTools, z as isContextEngineBindingCompatible } from "./thread-lifecycle-CQ_9mAa1.js";
+import { r as formatCodexDisplayText } from "./command-formatters-NCTL7A2q.js";
+import { n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-DUMF2Xyr.js";
+import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId, t as isCodexNotificationForTurn } from "./notification-correlation-C8DVQ_Bq.js";
 import { n as prepareCodexAppServerAuthBinding } from "./auth-binding-C1czuHPA.js";
-import { $ as resolveCodexToolProgressDetailMode, B as hasPendingDynamicToolTerminalDiagnostic, C as CodexAppServerEventProjector, D as markCodexAuthProfileBlockedFromRateLimits, E as isCodexUsageLimitPromptError, F as emitCodexNativePreToolUseFailureDiagnostic, G as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, H as isMatchingDynamicToolTerminalDiagnostic, I as resolveCodexNativeHookRelayEvents, J as toCodexDynamicToolProtocolResponse, K as shouldReleaseTurnAfterTerminalDynamicTool, L as resolveCodexNativeHookRelayTtlMs, M as buildCodexNativeHookRelayConfig, N as buildCodexNativeHookRelayDisabledConfig, O as refreshCodexUsageLimitPromptError, P as createCodexNativeHookRelay, Q as inferCodexDynamicToolMeta, R as scheduleCodexNativeHookRelayUnregister, T as formatCodexTurnStartUsageLimitError, U as resolveDynamicToolCallTimeoutMs, V as isDynamicToolTerminalDiagnosticEvent, W as resolveTerminalDynamicToolBatchAction, X as readCodexMirroredSessionHistoryMessages, Y as resolveCodexToolAbortTerminalReason, Z as shouldEmitTranscriptToolProgress, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, b as shouldRequireCodexSandboxExecServerEnvironment, d as createCodexDynamicToolBuildStageTracker, et as sanitizeCodexToolArguments, f as disableCodexPluginThreadConfig, g as resolveCodexExternalSandboxPolicyForOpenClawSandbox, h as resolveCodexAppServerHookChannelId, i as emitDynamicToolErrorDiagnostic, j as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, l as settleCodexSourceReplyFinality, m as resolveCodexAppServerExecutionCwd, n as handleCodexAppServerApprovalRequest, nt as resolveCodexLocalRuntimeAttribution, o as emitDynamicToolTerminalDiagnostic, p as formatCodexDynamicToolBuildStageSummary, q as toCodexDynamicToolProgressResponse, r as handleCodexAppServerElicitationRequest, s as resolveCodexProviderWebSearchSupport, t as createCodexDynamicToolBridge, tt as sanitizeCodexToolResponse, u as buildDynamicTools, v as resolveCodexSandboxEnvironmentSelection, w as createCodexUsageLimitPromptError, x as shouldWarnCodexDynamicToolBuildStageSummary, y as shouldEnableCodexAppServerNativeToolSurface, z as handleDynamicToolCallWithTimeout } from "./dynamic-tools-C_1tEs34.js";
-import { a as runCodexComputerUseLiveTest, r as killStaleComputerUseMcpChildren, t as ensureCodexComputerUse } from "./computer-use-CPcU8TjG.js";
+import { $ as resolveCodexToolProgressDetailMode, B as hasPendingDynamicToolTerminalDiagnostic, C as CodexAppServerEventProjector, D as markCodexAuthProfileBlockedFromRateLimits, E as isCodexUsageLimitPromptError, F as emitCodexNativePreToolUseFailureDiagnostic, G as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, H as isMatchingDynamicToolTerminalDiagnostic, I as resolveCodexNativeHookRelayEvents, J as toCodexDynamicToolProtocolResponse, K as shouldReleaseTurnAfterTerminalDynamicTool, L as resolveCodexNativeHookRelayTtlMs, M as buildCodexNativeHookRelayConfig, N as buildCodexNativeHookRelayDisabledConfig, O as refreshCodexUsageLimitPromptError, P as createCodexNativeHookRelay, Q as inferCodexDynamicToolMeta, R as scheduleCodexNativeHookRelayUnregister, T as formatCodexTurnStartUsageLimitError, U as resolveDynamicToolCallTimeoutMs, V as isDynamicToolTerminalDiagnosticEvent, W as resolveTerminalDynamicToolBatchAction, X as readCodexMirroredSessionHistoryMessages, Y as resolveCodexToolAbortTerminalReason, Z as shouldEmitTranscriptToolProgress, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, b as shouldRequireCodexSandboxExecServerEnvironment, d as createCodexDynamicToolBuildStageTracker, et as sanitizeCodexToolArguments, f as disableCodexPluginThreadConfig, g as resolveCodexExternalSandboxPolicyForOpenClawSandbox, h as resolveCodexAppServerHookChannelId, i as emitDynamicToolErrorDiagnostic, j as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, l as settleCodexSourceReplyFinality, m as resolveCodexAppServerExecutionCwd, n as handleCodexAppServerApprovalRequest, nt as redactCodexEventKind, o as emitDynamicToolTerminalDiagnostic, p as formatCodexDynamicToolBuildStageSummary, q as toCodexDynamicToolProgressResponse, r as handleCodexAppServerElicitationRequest, rt as resolveCodexLocalRuntimeAttribution, s as resolveCodexProviderWebSearchSupport, t as createCodexDynamicToolBridge, tt as sanitizeCodexToolResponse, u as buildDynamicTools, v as resolveCodexSandboxEnvironmentSelection, w as createCodexUsageLimitPromptError, x as shouldWarnCodexDynamicToolBuildStageSummary, y as shouldEnableCodexAppServerNativeToolSurface, z as handleDynamicToolCallWithTimeout } from "./dynamic-tools-D_vSVmv9.js";
+import { a as runCodexComputerUseLiveTest, r as killStaleComputerUseMcpChildren, t as ensureCodexComputerUse } from "./computer-use-C7x4ZaqR.js";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
@@ -18,7 +18,7 @@ import { createHash, randomUUID } from "node:crypto";
 import { resolveAgentDir, 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, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildAgentHarnessUserInputAnswers, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, clearActiveEmbeddedRun, deliverAgentHarnessUserInputPrompt, embeddedAgentLog, emitAgentEvent, emptyAgentHarnessUserInputAnswers, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, isActiveHarnessContextEngine, isHostScopedAgentToolActive, loadCodexBundleMcpThreadConfig, materializeRequesterScopedMcpToolsForHarnessRun, resolveAgentDir as resolveAgentDir$1, resolveAgentHarnessBeforePromptBuildResult, resolveAgentRunAbortLifecycleFields, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { CODEX_APP_SERVER_CONTEXT_ENGINE_HOST, FAST_MODE_AUTO_PROGRESS_KIND, assembleHarnessContextEngine, assertContextEngineHostSupport, awaitAgentEndSideEffects, bootstrapHarnessContextEngine, buildAgentHarnessUserInputAnswers, buildBootstrapContextForFiles, buildHarnessContextEngineRuntimeContext, buildHarnessContextEngineRuntimeContextFromUsage, callGatewayTool, cancelPendingAgentQuestionForSession, claimPendingAgentQuestionAnswer, clearActiveEmbeddedRun, deliverAgentHarnessUserInputPrompt, embeddedAgentLog, emitAgentEvent, emptyAgentHarnessUserInputAnswers, finalizeHarnessContextEngineTurn, formatErrorMessage, formatFastModeAutoProgressText, getAgentHarnessHookRunner, getBeforeToolCallPolicyDiagnosticState, isActiveHarnessContextEngine, isHostScopedAgentToolActive, loadCodexBundleMcpThreadConfig, materializeRequesterScopedMcpToolsForHarnessRun, resolveAgentDir as resolveAgentDir$1, resolveAgentHarnessBeforePromptBuildResult, resolveAgentRunAbortLifecycleFields, resolveBootstrapFilesForRun, resolveContextEngineOwnerPluginId, resolveFastModeForElapsed, resolveSandboxContext, resolveSessionAgentIds as resolveSessionAgentIds$1, resolveUserPath, runAgentCleanupStep, runAgentEndSideEffects, runAgentHarnessGatewayQuestion, runAgentHarnessLlmInputHook, runAgentHarnessLlmOutputHook, runHarnessContextEngineMaintenance, setActiveEmbeddedRun, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { spawn } from "node:child_process";
 import { once } from "node:events";
 import { isIP } from "node:net";
@@ -26,7 +26,7 @@ import { WebSocketServer } from "ws";
 import { parseSqliteSessionFileMarker } from "openclaw/plugin-sdk/session-store-runtime";
 import { fileURLToPath } from "node:url";
 import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent, emitTrustedDiagnosticEventWithPrivateData, freezeDiagnosticTraceContext, onInternalDiagnosticEvent, resolveDiagnosticModelContentCapturePolicy } from "openclaw/plugin-sdk/diagnostic-runtime";
-import { buildMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
+import { prepareMemorySystemPromptAddition } from "openclaw/plugin-sdk/core";
 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";
 import { SsrFBlockedError, isBlockedHostnameOrIp } from "openclaw/plugin-sdk/ssrf-runtime";
@@ -191,40 +191,42 @@ function normalizeCodexSteerDebounceMs(value) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/user-input-bridge.ts
-/**
-* Bridges Codex item/tool user-input requests to OpenClaw messaging prompts and
-* turns replies into app-server answer payloads.
-*/
+/** Bridges Codex request_user_input calls to gateway questions and secret text prompts. */
+const DEFAULT_USER_INPUT_TIMEOUT_MS = 15 * 6e4;
 /** Creates a per-turn bridge for pending Codex user-input requests. */
 function createCodexUserInputBridge(params) {
-	let pending;
-	const resolvePending = (value) => {
-		const current = pending;
+	let sensitiveInput;
+	let pendingGateway;
+	const gatewayCall = params.gatewayCall ?? callGatewayTool;
+	const resolveSecret = (value) => {
+		const current = sensitiveInput;
 		if (!current) return;
-		pending = void 0;
+		sensitiveInput = void 0;
 		current.cleanup();
 		current.resolve(value);
 	};
-	const resolvePendingIfCurrent = (current, value) => {
-		if (pending !== current) return false;
-		resolvePending(value);
+	const resolveSecretIfCurrent = (current, value) => {
+		if (sensitiveInput !== current) return false;
+		resolveSecret(value);
 		return true;
 	};
+	const cancelGateway = () => {
+		pendingGateway?.abort.abort(/* @__PURE__ */ new Error("Codex user input request cancelled"));
+	};
 	return {
 		async handleRequest(request) {
 			const requestParams = readUserInputParams(request.params);
 			if (!requestParams) return;
 			if (requestParams.threadId !== params.threadId || requestParams.turnId !== params.turnId) return;
 			if (requestParams.questions.length === 0) return emptyUserInputResponse();
-			resolvePending(emptyUserInputResponse());
-			return new Promise((resolve) => {
-				const abortListener = () => resolvePending(emptyUserInputResponse());
+			resolveSecret(emptyUserInputResponse());
+			cancelGateway();
+			if (requestParams.questions.some((question) => question.isSecret)) return new Promise((resolve) => {
+				const abortListener = () => resolveSecret(emptyUserInputResponse());
 				const cleanup = () => params.signal?.removeEventListener("abort", abortListener);
-				pending = {
+				sensitiveInput = {
 					requestId: request.id,
 					threadId: requestParams.threadId,
-					turnId: requestParams.turnId,
-					itemId: requestParams.itemId,
 					questions: requestParams.questions,
 					claimed: false,
 					resolve,
@@ -232,37 +234,68 @@ function createCodexUserInputBridge(params) {
 				};
 				params.signal?.addEventListener("abort", abortListener, { once: true });
 				if (params.signal?.aborted) {
-					resolvePending(emptyUserInputResponse());
+					resolveSecret(emptyUserInputResponse());
 					return;
 				}
-				deliverUserInputPrompt(params.paramsForRun, requestParams.questions).catch((error) => {
-					embeddedAgentLog.warn("failed to deliver codex user input prompt", { error });
+				deliverAgentHarnessUserInputPrompt(params.paramsForRun, requestParams.questions, {
+					formatText: formatCodexDisplayText,
+					intro: "Codex needs input:"
+				}).catch((error) => {
+					embeddedAgentLog.warn("failed to deliver secret codex user input prompt", { error });
 				});
 			});
+			const abort = new AbortController();
+			const abortFromRun = () => abort.abort(params.signal?.reason);
+			params.signal?.addEventListener("abort", abortFromRun, { once: true });
+			if (params.signal?.aborted) abortFromRun();
+			pendingGateway = {
+				requestId: request.id,
+				threadId: requestParams.threadId,
+				abort
+			};
+			try {
+				const result = await runAgentHarnessGatewayQuestion({
+					questions: requestParams.questions,
+					sessionKey: params.paramsForRun.sessionKey ?? params.paramsForRun.sessionId,
+					agentId: params.paramsForRun.agentId,
+					timeoutMs: requestParams.autoResolutionMs ?? params.paramsForRun.timeoutMs ?? DEFAULT_USER_INPUT_TIMEOUT_MS,
+					gatewayCall,
+					delivery: params.paramsForRun,
+					promptOptions: {
+						formatText: formatCodexDisplayText,
+						intro: "Codex needs input:"
+					},
+					signal: abort.signal
+				});
+				return result.status === "answered" ? result.answers : emptyUserInputResponse();
+			} catch (error) {
+				embeddedAgentLog.warn("failed to bridge codex user input through gateway", { error });
+				return emptyUserInputResponse();
+			} finally {
+				params.signal?.removeEventListener("abort", abortFromRun);
+				if (pendingGateway?.abort === abort) pendingGateway = void 0;
+			}
 		},
 		claimPendingRequest() {
-			const current = pending;
+			const current = sensitiveInput;
 			if (!current || current.claimed) return;
 			current.claimed = true;
 			return {
-				answer: (text) => resolvePendingIfCurrent(current, buildUserInputResponse(current.questions, text)),
-				cancel: () => resolvePendingIfCurrent(current, emptyUserInputResponse())
+				answer: (text) => resolveSecretIfCurrent(current, buildUserInputResponse(current.questions, text)),
+				cancel: () => resolveSecretIfCurrent(current, emptyUserInputResponse())
 			};
 		},
-		handleQueuedMessage(text) {
-			const current = pending;
-			if (!current || current.claimed) return false;
-			resolvePending(buildUserInputResponse(current.questions, text));
-			return true;
-		},
 		handleNotification(notification) {
-			if (notification.method !== "serverRequest/resolved" || !pending) return;
+			if (notification.method !== "serverRequest/resolved") return;
 			const notificationParams = isJsonObject(notification.params) ? notification.params : void 0;
 			const requestId = notificationParams ? readRequestId(notificationParams) : void 0;
-			if (notificationParams && readString$3(notificationParams, "threadId") === pending.threadId && requestId !== void 0 && String(requestId) === String(pending.requestId)) resolvePending(emptyUserInputResponse());
+			if (!notificationParams || requestId === void 0) return;
+			if (sensitiveInput && readString$3(notificationParams, "threadId") === sensitiveInput.threadId && String(requestId) === String(sensitiveInput.requestId)) resolveSecret(emptyUserInputResponse());
+			if (pendingGateway && readString$3(notificationParams, "threadId") === pendingGateway.threadId && String(requestId) === String(pendingGateway.requestId)) pendingGateway.abort.abort(/* @__PURE__ */ new Error("Codex server request resolved"));
 		},
 		cancelPending() {
-			resolvePending(emptyUserInputResponse());
+			resolveSecret(emptyUserInputResponse());
+			cancelGateway();
 		}
 	};
 }
@@ -277,7 +310,12 @@ function readUserInputParams(value) {
 		threadId,
 		turnId,
 		itemId,
-		questions: questionsRaw.map(readQuestion).filter((question) => Boolean(question))
+		questions: questionsRaw.map((rawQuestion) => {
+			const question = readQuestion(rawQuestion);
+			if (question && isJsonObject(rawQuestion) && rawQuestion.multiSelect === true) question.multiSelect = true;
+			return question;
+		}).filter((question) => Boolean(question)),
+		autoResolutionMs: typeof value.autoResolutionMs === "number" && value.autoResolutionMs > 0 ? value.autoResolutionMs : void 0
 	};
 }
 function readQuestion(value) {
@@ -309,12 +347,6 @@ function readOption(value) {
 		description
 	} : void 0;
 }
-async function deliverUserInputPrompt(params, questions) {
-	await deliverAgentHarnessUserInputPrompt(params, questions, {
-		formatText: formatCodexDisplayText,
-		intro: "Codex needs input:"
-	});
-}
 function buildUserInputResponse(questions, inputText) {
 	return buildAgentHarnessUserInputAnswers(questions, inputText);
 }
@@ -421,7 +453,23 @@ async function activateCodexAttemptTurn(resources, turnRuntime, lifecycle, notif
 	const handle = {
 		kind: "embedded",
 		runId: params.runId,
-		queueMessage: async (text, optionsLocal) => activeSteeringQueue.queue(text, optionsLocal),
+		queueMessage: async (text, optionsLocal) => {
+			const isInboundUserMessage = optionsLocal?.isInboundUserMessage === true;
+			if (isInboundUserMessage && !optionsLocal?.images?.length) {
+				if (await claimPendingAgentQuestionAnswer({
+					sessionKey: params.sessionKey ?? params.sessionId,
+					text
+				})) return;
+			} else if (isInboundUserMessage) try {
+				await cancelPendingAgentQuestionForSession({
+					sessionKey: params.sessionKey ?? params.sessionId,
+					resolvedBy: "image-reply"
+				});
+			} catch (error) {
+				embeddedAgentLog.warn("failed to cancel codex gateway question before image steering", { error });
+			}
+			await activeSteeringQueue.queue(text, optionsLocal);
+		},
 		isStreaming: () => !state.completed && !runAbortController.signal.aborted,
 		isStopped: () => state.completed || state.timedOut || runAbortController.signal.aborted,
 		isAbortable: () => !terminalState.terminalOutcomeFrozen || terminalState.sharedAbortAllowedAfterTerminalOutcome,
@@ -1295,13 +1343,14 @@ async function buildCodexWorkspaceBootstrapContext(params) {
 			promptContext: renderCodexWorkspaceBootstrapPromptContext(promptContextFiles),
 			developerInstructions: renderCodexWorkspaceThreadDeveloperInstructions(developerInstructionFiles),
 			turnScopedDeveloperInstructions: renderCodexWorkspaceCollaborationDeveloperInstructions(turnScopedDeveloperInstructionFiles),
-			memoryCollaborationInstructions: shouldInjectCodexOpenClawPromptContext(params.params) ? renderCodexWorkspaceMemoryCollaborationInstructions({
+			memoryCollaborationInstructions: shouldInjectCodexOpenClawPromptContext(params.params) ? await renderCodexWorkspaceMemoryCollaborationInstructions({
 				files: memoryReferenceFiles,
 				toolNames: params.memoryToolNames,
 				memoryToolRouted: memoryToolsAvailable,
 				citationsMode: params.params.config?.memory?.citations,
 				agentId: params.params.agentId ?? params.sessionAgentId,
-				agentSessionKey: params.sessionKey
+				agentSessionKey: params.sessionKey,
+				sandboxed: params.sandboxed
 			}) : void 0,
 			heartbeatCollaborationInstructions: renderCodexWorkspaceHeartbeatReference(heartbeatReferenceFiles)
 		};
@@ -1656,24 +1705,26 @@ function renderCodexWorkspaceMemoryReference(params) {
 	for (const file of params.files) lines.push(`- ${file.path}`);
 	return lines.join("\n").trim();
 }
-function renderCodexWorkspaceMemoryCollaborationInstructions(params) {
-	const sections = [params.memoryToolRouted ? renderCodexMemoryRecallInstructions({
+async function renderCodexWorkspaceMemoryCollaborationInstructions(params) {
+	const sections = [params.memoryToolRouted ? await renderCodexMemoryRecallInstructions({
 		toolNames: params.toolNames,
 		citationsMode: params.citationsMode,
 		agentId: params.agentId,
-		agentSessionKey: params.agentSessionKey
+		agentSessionKey: params.agentSessionKey,
+		sandboxed: params.sandboxed
 	}) : void 0, renderCodexWorkspaceMemoryReference({
 		files: params.files,
 		toolNames: params.toolNames
 	})].filter(isNonEmptyString$1);
 	return sections.length > 0 ? sections.join("\n\n") : void 0;
 }
-function renderCodexMemoryRecallInstructions(params) {
-	const memoryPrompt = buildMemorySystemPromptAddition({
+async function renderCodexMemoryRecallInstructions(params) {
+	const memoryPrompt = await prepareMemorySystemPromptAddition({
 		availableTools: new Set(params.toolNames),
 		citationsMode: params.citationsMode,
 		agentId: params.agentId,
-		agentSessionKey: params.agentSessionKey
+		agentSessionKey: params.agentSessionKey,
+		sandboxed: params.sandboxed
 	});
 	if (!memoryPrompt) return;
 	return [memoryPrompt, renderCodexMemoryToolSearchBridge(params.toolNames)].filter(isNonEmptyString$1).join("\n").trim();
@@ -1870,7 +1921,7 @@ function buildCodexAppServerTimeoutDiagnostics(params) {
 //#region extensions/codex/src/app-server/run-attempt-context.ts
 async function prepareCodexAttemptContext(runtime, attemptTools) {
 	const { connection, runtimeParams, activeSessionId, activeSessionFile, buildActiveRunAttemptParams, effectiveContextWindowInfo, effectiveContextTokenBudget, effectiveRuntimeProviderId, effectiveRuntimeModelId, hookChannelId } = runtime;
-	const { params, sessionAgentId, contextSessionKey, activeContextEngine, initialStartupBindingHadInactiveThreadBootstrap, sandboxSessionKey, effectiveWorkspace, effectiveCwd, agentDir, usesSupervisionConnection, resolvedWorkspace, initialInactiveThreadBootstrapBindingForcedFreshStart } = connection;
+	const { params, sessionAgentId, contextSessionKey, activeContextEngine, initialStartupBindingHadInactiveThreadBootstrap, sandboxSessionKey, effectiveWorkspace, effectiveCwd, agentDir, usesSupervisionConnection, resolvedWorkspace, initialInactiveThreadBootstrapBindingForcedFreshStart, sandbox } = connection;
 	const { toolBridge } = attemptTools;
 	const activeTranscriptTarget = {
 		agentId: sessionAgentId,
@@ -1934,7 +1985,8 @@ async function prepareCodexAttemptContext(runtime, attemptTools) {
 		effectiveWorkspace,
 		sessionKey: contextSessionKey,
 		sessionAgentId,
-		memoryToolNames: getCodexWorkspaceMemoryToolNames(toolBridge.availableSpecs)
+		memoryToolNames: getCodexWorkspaceMemoryToolNames(toolBridge.availableSpecs),
+		sandboxed: sandbox?.enabled === true
 	});
 	const baseDeveloperInstructions = joinPresentSections(buildDeveloperInstructions(runtimeParams, { dynamicTools: toolBridge.availableSpecs }), workspaceBootstrapContext.developerInstructions);
 	return {
@@ -2851,7 +2903,7 @@ function createCodexAttemptLifecycleController(resources, turnRuntime) {
 				startedAt: attemptStartedAt,
 				endedAt: Date.now(),
 				...data,
-				...params.deferTerminalLifecycle ?? params.deferTerminalLifecycleEnd ? { phase: "finishing" } : {}
+				...params.deferTerminalLifecycle ? { phase: "finishing" } : {}
 			}
 		});
 		state.lifecycleTerminalEmitted = true;
@@ -2974,7 +3026,8 @@ var ClientTurnRouter = class {
 			gate: "open",
 			pending: [],
 			notificationTail: Promise.resolve(),
-			nativeTurnCompleted: false
+			nativeTurnCompleted: false,
+			ignoredTurnNotificationKeys: /* @__PURE__ */ new Set()
 		};
 		this.routes.set(threadId, route);
 		if (options.onNotification || options.onRequest) this.activateNow(route, options);
@@ -3057,6 +3110,7 @@ var ClientTurnRouter = class {
 		this.assertRoute(route);
 		if (route.gate !== "open") throw new Error(`codex app-server thread route cannot arm from ${route.gate}`);
 		route.gate = "armed";
+		route.ignoredTurnNotificationKeys.clear();
 		route.nativeTurnCompleted = false;
 		route.binding = deferred();
 	}
@@ -3106,7 +3160,10 @@ var ClientTurnRouter = class {
 		}
 		const handler = route.handlers.onNotification;
 		if (!handler) return;
-		if (route.gate === "bound" && scope.turnId && scope.turnId !== route.turnId) return;
+		if (route.gate === "bound" && scope.turnId && scope.turnId !== route.turnId) {
+			this.warnDroppedStaleTurnNotification(route, notification, routeScope);
+			return;
+		}
 		if (route.gate === "armed") {
 			this.bufferNotification(route, notification, routeScope, receivedAtMs);
 			return;
@@ -3149,11 +3206,31 @@ var ClientTurnRouter = class {
 	flushNotifications(route) {
 		const handler = route.handlers?.onNotification;
 		if (!handler) return;
-		for (const pending of route.pending.splice(0)) if (!pending.scope.turnId || route.gate !== "bound" || pending.scope.turnId === route.turnId) {
+		for (const pending of route.pending.splice(0)) {
+			if (route.gate === "bound" && pending.scope.turnId && pending.scope.turnId !== route.turnId) {
+				this.warnDroppedStaleTurnNotification(route, pending.notification, pending.scope);
+				continue;
+			}
 			route.handlers?.onNotificationReceived?.(pending.notification, pending.scope, pending.receivedAtMs);
 			this.enqueueNotification(route, handler, pending.notification, pending.scope);
 		}
 	}
+	warnDroppedStaleTurnNotification(route, notification, scope) {
+		if (notification.method === "turn/completed" || !scope.turnId || !route.turnId) return;
+		const eventKind = redactCodexEventKind(notification.method);
+		const key = JSON.stringify([notification.method, scope.turnId]);
+		if (route.ignoredTurnNotificationKeys.has(key)) return;
+		route.ignoredTurnNotificationKeys.add(key);
+		embeddedAgentLog.warn("codex app-server notification ignored for inactive turn", {
+			eventKind,
+			activeThreadId: route.threadId,
+			activeTurnId: route.turnId,
+			threadId: scope.threadId,
+			turnId: scope.turnId,
+			matchesActiveThread: true,
+			matchesActiveTurn: false
+		});
+	}
 	bufferNotification(route, notification, scope, receivedAtMs) {
 		if (route.pending.length < DEFAULT_PREBIND_NOTIFICATION_LIMIT) {
 			route.pending.push({
@@ -3415,7 +3492,7 @@ function createCodexAttemptNotificationController(resources, turnRuntime, lifecy
 async function prepareCodexAttemptPrompt(context) {
 	const { runtime, attemptTools, historyState, hookContext, workspaceBootstrapContext, baseDeveloperInstructions, openClawPromptContext, skillsCollaborationInstructions, promptState, codexContextProjectionMaxChars } = context;
 	const { connection, buildActiveRunAttemptParams, effectiveContextTokenBudget, effectiveRuntimeModelId, effectiveRuntimeProviderId } = runtime;
-	const { params, activeContextEngine, usesSupervisionConnection, mutable, isInactiveThreadBootstrapBinding, bindingStore, bindingIdentity, agentDir, appServer, contextSessionKey, effectiveWorkspace } = connection;
+	const { params, activeContextEngine, usesSupervisionConnection, mutable, isInactiveThreadBootstrapBinding, bindingStore, bindingIdentity, agentDir, appServer, contextSessionKey, effectiveWorkspace, sandbox } = connection;
 	const { toolBridge } = attemptTools;
 	const applyFreshThreadContinuityProjection = () => {
 		const projection = projectContextEngineAssemblyForCodex({
@@ -3438,6 +3515,7 @@ async function prepareCodexAttemptPrompt(context) {
 			tokenBudget: effectiveContextTokenBudget,
 			availableTools: new Set(flattenCodexDynamicToolFunctions(toolBridge.availableSpecs).map((tool) => tool.name).filter(isNonEmptyString)),
 			citationsMode: params.config?.memory?.citations,
+			sandboxed: sandbox?.enabled === true,
 			modelId: effectiveRuntimeModelId,
 			contextEngineHostSupport: CODEX_APP_SERVER_CONTEXT_ENGINE_HOST,
 			providerId: effectiveRuntimeProviderId,
@@ -3499,7 +3577,7 @@ async function prepareCodexAttemptPrompt(context) {
 	const buildPromptFromCurrentInputs = () => resolveAgentHarnessBeforePromptBuildResult({
 		prompt: prependCurrentInboundContext(promptState.promptText, params.currentInboundContext),
 		developerInstructions: promptState.developerInstructions,
-		messages: codexModelInputHistoryMessages,
+		messages: structuredClone(historyState.messages),
 		ctx: hookContext,
 		bootstrapContextRunKind: params.bootstrapContextRunKind,
 		..."beforeAgentStartResult" in params ? { beforeAgentStartResult: params.beforeAgentStartResult } : {}
@@ -6662,16 +6740,17 @@ function prepareCodexAttemptResources(prompt) {
 	const retireSharedCodexClientForOneShotCleanup = async () => {
 		if (params.cleanupBundleMcpOnRunEnd !== true || state.sharedCodexClientRetiredForOneShotCleanup) return;
 		state.sharedCodexClientRetiredForOneShotCleanup = true;
-		const retired = retireSharedCodexAppServerClientIfCurrent(state.client);
-		embeddedAgentLog.info("codex app-server one-shot cleanup retired shared client", {
+		const retired = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(state.client);
+		embeddedAgentLog.info("codex app-server one-shot cleanup checked shared client retirement", {
 			runId: params.runId,
 			sessionId: params.sessionId,
 			sessionKey: params.sessionKey,
-			activeLeases: retired?.activeLeases ?? null,
-			closed: retired?.closed ?? false,
-			matchedSharedClient: Boolean(retired)
+			activeLeases: retired.activeLeases,
+			pendingAcquires: retired.pendingAcquires,
+			closed: retired.closed,
+			matchedSharedClient: retired.found
 		});
-		if (retired?.closed) await state.client.closeAndWait({
+		if (retired.closed) await state.client.closeAndWait({
 			exitTimeoutMs: 2e3,
 			forceKillDelayMs: 250
 		});
@@ -8075,7 +8154,9 @@ async function startCodexAttemptRuntime(resources) {
 			stream: "codex_app_server.lifecycle",
 			data: {
 				phase: "thread_ready",
-				threadId: state.thread.threadId
+				threadId: state.thread.threadId,
+				action: state.thread.lifecycle.action,
+				clientId: state.client.getInstanceId()
 			}
 		});
 	} catch (error) {
@@ -8299,6 +8380,7 @@ async function prepareCodexAttemptTurnRequest(resources, turnRuntime, ensureCurr
 			model: usesSupervisionConnection ? resourceState.thread.model ?? effectiveRuntimeModelId : params.modelId,
 			api: usesSupervisionConnection ? runtimeParams.model.api : params.model.api,
 			transport: appServer.start.transport,
+			observationUnit: "turn",
 			...hookContextWindowFields,
 			trace: codexModelCallTrace
 		},
@@ -9002,7 +9084,7 @@ function createCodexAttemptTurnState(resources) {
 		state.resolveCompletion = resolve;
 	});
 	const turnCompletionIdleTimeoutMs = resolveCodexTurnCompletionIdleTimeoutMs(options.turnCompletionIdleTimeoutMs ?? appServer.turnCompletionIdleTimeoutMs);
-	const turnAssistantCompletionIdleTimeoutMs = resolveCodexTurnAssistantCompletionIdleTimeoutMs(options.turnAssistantCompletionIdleTimeoutMs);
+	const turnAssistantCompletionIdleTimeoutMs = resolveCodexTurnAssistantCompletionIdleTimeoutMs(options.turnAssistantCompletionIdleTimeoutMs ?? appServer.turnAssistantCompletionIdleTimeoutMs);
 	const postToolRawAssistantCompletionIdleTimeoutMs = resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(options.postToolRawAssistantCompletionIdleTimeoutMs ?? appServer.postToolRawAssistantCompletionIdleTimeoutMs, turnAssistantCompletionIdleTimeoutMs);
 	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs, params.runTimeoutOverrideMs);
 	const turnAttemptIdleTimeoutMs = Math.max(100, Math.floor(params.timeoutMs));

package/dist/{session-binding-h1mmCGnl.js → session-binding-Bmt20HfB.js}

@@ -171,6 +171,7 @@ const codexPluginConfigSchema = z.object({
 		loopDetectionPreToolUseRelay: z.boolean().optional(),
 		requestTimeoutMs: z.number().positive().optional(),
 		turnCompletionIdleTimeoutMs: z.number().positive().optional(),
+		turnAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
 		postToolRawAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
 		approvalPolicy: codexAppServerApprovalPolicySchema.optional(),
 		sandbox: codexAppServerSandboxSchema.optional(),
@@ -367,6 +368,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		loopDetectionPreToolUseRelay: config.loopDetectionPreToolUseRelay !== false,
 		requestTimeoutMs: normalizePositiveNumber(config.requestTimeoutMs, 6e4),
 		turnCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnCompletionIdleTimeoutMs, 6e4),
+		turnAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnAssistantCompletionIdleTimeoutMs, 1e4),
 		...config.postToolRawAssistantCompletionIdleTimeoutMs !== void 0 ? { postToolRawAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.postToolRawAssistantCompletionIdleTimeoutMs, 6e4) } : {},
 		approvalPolicy: forcedPolicy?.approvalPolicy ?? approvalPolicy,
 		approvalPolicySource,

package/dist/{session-catalog-CEvoXWHA.js → session-catalog-CA7R-hX2.js}

@@ -1,11 +1,11 @@
-import { J as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, R as CodexAppServerRpcError, Z as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient, q as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES } from "./shared-client-JiAnW6pc.js";
-import { E as resolveCodexSupervisionAppServerRuntimeOptions, b as resolveCodexAppServerRuntimeOptions, c as sessionBindingIdentity, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-h1mmCGnl.js";
+import { J as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, R as CodexAppServerRpcError, Z as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseLeasedSharedCodexAppServerClient, m as withTimeout, q as CODEX_INTERACTIVE_CUSTOM_THREAD_SOURCES } from "./shared-client-CSXLtCLE.js";
+import { E as resolveCodexSupervisionAppServerRuntimeOptions, b as resolveCodexAppServerRuntimeOptions, c as sessionBindingIdentity, s as reclaimCurrentCodexSessionGeneration } from "./session-binding-Bmt20HfB.js";
 import { r as importCodexThreadHistoryToTranscript } from "./transcript-mirror-D9rTxx2P.js";
-import { n as listCodexAppServerModels } from "./models-uh26C8QU.js";
-import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-Ceb-lm2c.js";
-import { d as CODEX_CONTROL_METHODS, f as describeControlFailure, r as formatCodexDisplayText } from "./command-formatters-Dq9InZUK.js";
+import { n as listCodexAppServerModels } from "./models-DD5zBdX5.js";
+import { t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-DJbhLYSK.js";
+import { d as CODEX_CONTROL_METHODS, f as describeControlFailure, r as formatCodexDisplayText } from "./command-formatters-NCTL7A2q.js";
 import { n as createCodexCliNodeConversationBindingData } from "./conversation-binding-data-BHRpYbX3.js";
-import { n as requestCodexAppServerClientJson, r as requestCodexAppServerJson } from "./request-B_oQsCXy.js";
+import { n as requestCodexAppServerClientJson, r as requestCodexAppServerJson } from "./request-9yf9pZjf.js";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
@@ -1063,6 +1063,7 @@ const CODEX_NODE_CONTINUE_COMMANDS = [
 	CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND,
 	CODEX_CLI_SESSION_RESUME_COMMAND
 ];
+const NODE_CATALOG_LIST_RESPONSE_TIMEOUT_MS = 8e3;
 function nodeLabel(node) {
 	return node.displayName?.trim() || node.remoteIp?.trim() || node.nodeId;
 }
@@ -1085,16 +1086,20 @@ async function listPairedNode(params) {
 		nodeId: params.node.nodeId,
 		canContinueCodex: canContinueCodexOnNode(params.node)
 	};
-	if (params.node.connected !== true) return {
-		...common,
-		connected: false,
-		sessions: [],
-		error: {
-			code: "NODE_OFFLINE",
-			message: "Paired node is offline"
-		}
-	};
-	try {
+	if (params.node.connected !== true) {
+		const host = {
+			...common,
+			connected: false,
+			sessions: [],
+			error: {
+				code: "NODE_OFFLINE",
+				message: "Paired node is offline"
+			}
+		};
+		params.onHost?.(host);
+		return host;
+	}
+	const eventualHost = Promise.resolve().then(async () => {
 		const page = filterCatalogPageByTitle(parseCatalogPage(unwrapNodeInvokePayload(await params.runtime.nodes.invoke({
 			nodeId: params.node.nodeId,
 			command: CODEX_APP_SERVER_THREADS_LIST_COMMAND,
@@ -1115,6 +1120,15 @@ async function listPairedNode(params) {
 				return adopted ? Object.assign({}, session, { openClawSessionKey: adopted.key }) : session;
 			})
 		};
+	}).catch((error) => ({
+		...common,
+		connected: true,
+		sessions: [],
+		error: catalogError("NODE_INVOKE_FAILED", error)
+	}));
+	if (params.onHost) eventualHost.then(params.onHost).catch(() => void 0);
+	try {
+		return await withTimeout(eventualHost, NODE_CATALOG_LIST_RESPONSE_TIMEOUT_MS, "paired node Codex session catalog timed out");
 	} catch (error) {
 		return {
 			...common,
@@ -1632,7 +1646,7 @@ function createCodexSessionCatalogControlFromRequests(params) {
 					archived: false,
 					limit: remaining,
 					modelProviders: [],
-					sortKey: "recency_at",
+					sortKey: "updated_at",
 					sortDirection: "desc",
 					...cwd ? { cwd } : {},
 					...cursor ? { cursor } : {}
@@ -1803,19 +1817,22 @@ async function listCodexSessionCatalog(params) {
 		query,
 		runtime: params.runtime
 	})] : [];
+	for (const host of localHosts) if (params.onHost) host.then(params.onHost).catch(() => void 0);
 	if (!(!requestedHostIds || query.hostIds?.some((hostId) => hostId.startsWith("node:")))) return { hosts: await Promise.all(localHosts) };
 	let nodes;
 	try {
 		nodes = (await params.runtime.nodes.list()).nodes.filter((node) => node.commands?.includes("codex.appServer.threads.list.v1") && (!requestedHostIds || requestedHostIds.has(`node:${node.nodeId}`))).slice(0, 100 - localHosts.length);
 	} catch (error) {
-		return { hosts: [...await Promise.all(localHosts), {
+		const registryHost = {
 			hostId: "node:registry",
 			label: "Paired nodes",
 			kind: "node",
 			connected: false,
 			sessions: [],
 			error: catalogError("NODE_LIST_FAILED", error)
-		}] };
+		};
+		params.onHost?.(registryHost);
+		return { hosts: [...await Promise.all(localHosts), registryHost] };
 	}
 	const adoptedNodeSessions = listNodeAdoptedSessionEntries({
 		config: params.config,
@@ -1826,7 +1843,8 @@ async function listCodexSessionCatalog(params) {
 			runtime: params.runtime,
 			node,
 			query,
-			adoptedSessions: adoptedNodeSessions
+			adoptedSessions: adoptedNodeSessions,
+			...params.onHost ? { onHost: params.onHost } : {}
 		});
 		return Object.assign(host, codexNodeTerminalCapability(node));
 	});
@@ -2331,13 +2349,16 @@ function registerCodexSessionCatalog(params) {
 		label: "Codex",
 		list: async (query) => {
 			const localTerminalAvailable = resolveLocalCodexTerminalExecutable() !== void 0;
+			const { onHost, ...gatewayQuery } = query;
+			const mapHost = (host) => toGenericCatalogHost(host, localTerminalAvailable);
 			return (await listCodexSessionCatalog({
 				bindingStore: params.bindingStore,
 				config: params.getRuntimeConfig(),
 				runtime: params.api.runtime,
 				control: params.control,
-				query
-			})).hosts.map((host) => toGenericCatalogHost(host, localTerminalAvailable));
+				query: gatewayQuery,
+				...onHost ? { onHost: (host) => onHost(mapHost(host)) } : {}
+			})).hosts.map(mapHost);
 		},
 		read: async (request) => {
 			const page = await readCodexSessionTranscript({

package/dist/{session-cli-XsEuWb_C.js → session-cli-Bxk3-Wqz.js}

@@ -1,8 +1,8 @@
-import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-CEvoXWHA.js";
+import { a as CODEX_LOCAL_SESSION_HOST_ID } from "./session-catalog-CA7R-hX2.js";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { addGatewayClientOptions, callGatewayFromCli } from "openclaw/plugin-sdk/gateway-runtime";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { addGatewayClientOptions, callGatewayFromCli } from "openclaw/plugin-sdk/gateway-runtime";
 //#region extensions/codex/src/session-cli.ts
 const CODEX_SESSION_CATALOG_CLI_TIMEOUT_MS = 75e3;
 function writeLine(value = "") {