@openclaw/codex 2026.5.30-beta.1 → 2026.5.31-beta.2

package/dist/{run-attempt-lD4FLxNV.js → run-attempt-CgaY9r5u.js}

@@ -1,16 +1,17 @@
-import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-bqIbmRDu.js";
-import { c as readCodexPluginConfig, d as resolveCodexPluginsPolicy, f as resolveOpenClawExecPolicyForCodexAppServer, i as isCodexAppServerApprovalPolicyAllowedByRequirements, l as resolveCodexAppServerRuntimeOptions, m as withMcpElicitationsApprovalPolicy, o as isCodexSandboxExecServerEnabled, p as shouldAutoApproveCodexAppServerApprovals, u as resolveCodexComputerUseConfig } from "./config--tW89bHH.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-DtjYmUw_.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-B08x7Y93.js";
-import { C as sanitizeCodexHistoryImagePayloads, D as resolveCodexContextEngineProjectionReserveTokens, E as resolveCodexContextEngineProjectionMaxChars, T as projectContextEngineAssemblyForCodex, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-BR74qMaY.js";
-import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, t as clearCodexAppServerBinding } from "./session-binding-BGOpicy0.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-DGOj3AyX.js";
-import { _ as shouldRefreshCodexRateLimitsForUsageLimitMessage, g as resolveCodexUsageLimitResetAtMs, h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-DR9cQN_M.js";
-import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-2d0XB7wz.js";
+import { a as isCodexAppServerApprovalPolicyAllowedByRequirements, c as isCodexSandboxExecServerEnabled, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as withMcpElicitationsApprovalPolicy, h as shouldAutoApproveCodexAppServerApprovals, m as resolveOpenClawExecPolicyForCodexAppServer, p as resolveCodexPluginsPolicy, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-DIt7cXIp.js";
+import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-BnOmn0y-.js";
+import { C as sanitizeCodexHistoryImagePayloads, D as resolveCodexContextEngineProjectionReserveTokens, E as resolveCodexContextEngineProjectionMaxChars, T as projectContextEngineAssemblyForCodex, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-Bnlv_Q8u.js";
+import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-DuFgTwRU.js";
+import { _ as shouldRefreshCodexRateLimitsForUsageLimitMessage, g as resolveCodexUsageLimitResetAtMs, h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-BykOI_jh.js";
+import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-DBlR-rV2.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-DMCJlzmz.js";
-import { C as resolveCodexTurnAssistantCompletionIdleTimeoutMs, E as withCodexStartupTimeout, S as resolveCodexStartupTimeoutMs, T as resolveCodexTurnTerminalIdleTimeoutMs, _ as normalizeCodexDynamicToolName$1, a as createCodexNativeHookRelay, b as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as isForcedPrivateQaCodexRuntime, h as filterCodexDynamicTools, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexDynamicToolsLoading, w as resolveCodexTurnCompletionIdleTimeoutMs, x as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, y as handleCodexAppServerApprovalRequest } from "./native-hook-relay-zY7m-pAu.js";
-import { t as ensureCodexComputerUse } from "./computer-use-Cq-EEnLL.js";
+import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-B8dh39UW.js";
+import { C as resolveCodexTurnAssistantCompletionIdleTimeoutMs, E as withCodexStartupTimeout, S as resolveCodexStartupTimeoutMs, T as resolveCodexTurnTerminalIdleTimeoutMs, _ as normalizeCodexDynamicToolName$1, a as createCodexNativeHookRelay, b as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as isForcedPrivateQaCodexRuntime, h as filterCodexDynamicTools, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexDynamicToolsLoading, w as resolveCodexTurnCompletionIdleTimeoutMs, x as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, y as handleCodexAppServerApprovalRequest } from "./native-hook-relay-DCxPRaBN.js";
+import { t as ensureCodexComputerUse } from "./computer-use-D-0EFJBJ.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
+import { asDateTimestampMs, parseStrictNonNegativeInteger, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash, randomUUID } from "node:crypto";
 import fsSync from "node:fs";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
@@ -20,7 +21,6 @@ import { spawn } from "node:child_process";
 import { once } from "node:events";
 import { WebSocketServer } from "ws";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import { parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
 import { createDiagnosticTraceContextFromActiveScope, emitTrustedDiagnosticEvent, emitTrustedDiagnosticEventWithPrivateData, freezeDiagnosticTraceContext, hasPendingInternalDiagnosticEvent, onInternalDiagnosticEvent, resolveDiagnosticModelContentCapturePolicy } from "openclaw/plugin-sdk/diagnostic-runtime";
@@ -2964,6 +2964,12 @@ function createCodexAttemptTurnWatchController(params) {
 	let attemptLastProgressAt = Date.now();
 	let attemptLastProgressReason = "startup";
 	let attemptLastProgressDetails;
+	const turnCompletionIdleTimeoutMs = resolveTimerTimeoutMs(params.turnCompletionIdleTimeoutMs, 1);
+	const turnAssistantCompletionIdleTimeoutMs = resolveTimerTimeoutMs(params.turnAssistantCompletionIdleTimeoutMs, 1);
+	const turnAttemptIdleTimeoutMs = resolveTimerTimeoutMs(params.turnAttemptIdleTimeoutMs, 1);
+	const turnTerminalIdleTimeoutMs = resolveTimerTimeoutMs(params.turnTerminalIdleTimeoutMs, 1);
+	const interruptTimeoutMs = resolveTimerTimeoutMs(params.interruptTimeoutMs, 1);
+	const resolveWatchTimeoutMs = (timeoutMs) => resolveTimerTimeoutMs(timeoutMs, 1);
 	const clearCompletionIdleTimer = () => {
 		if (completionIdleTimer) {
 			clearTimeout(completionIdleTimer);
@@ -2998,8 +3004,7 @@ function createCodexAttemptTurnWatchController(params) {
 		clearCompletionIdleTimer();
 		if (params.isCompleted() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - completionLastActivityAt);
-		const timeoutMs = completionIdleTimeoutOverrideMs ?? params.turnCompletionIdleTimeoutMs;
-		const delayMs = Math.max(1, timeoutMs - elapsedMs);
+		const delayMs = Math.max(1, (completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs) - elapsedMs);
 		completionIdleTimer = setTimeout(fireCompletionIdleTimeout, delayMs);
 		completionIdleTimer.unref?.();
 	}
@@ -3007,7 +3012,7 @@ function createCodexAttemptTurnWatchController(params) {
 		clearAssistantCompletionIdleTimer();
 		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed) return;
 		const elapsedMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
-		const delayMs = Math.max(1, params.turnAssistantCompletionIdleTimeoutMs - elapsedMs);
+		const delayMs = Math.max(1, turnAssistantCompletionIdleTimeoutMs - elapsedMs);
 		assistantCompletionIdleTimer = setTimeout(fireAssistantCompletionIdleRelease, delayMs);
 		assistantCompletionIdleTimer.unref?.();
 	}
@@ -3015,8 +3020,7 @@ function createCodexAttemptTurnWatchController(params) {
 		clearAttemptIdleTimer();
 		if (params.isCompleted() || params.signal.aborted || !attemptIdleWatchArmed) return;
 		const elapsedMs = Math.max(0, Date.now() - attemptLastProgressAt);
-		const timeoutMs = attemptIdleTimeoutOverrideMs ?? params.turnAttemptIdleTimeoutMs;
-		const delayMs = Math.max(1, timeoutMs - elapsedMs);
+		const delayMs = Math.max(1, (attemptIdleTimeoutOverrideMs ?? turnAttemptIdleTimeoutMs) - elapsedMs);
 		attemptIdleTimer = setTimeout(fireAttemptIdleTimeout, delayMs);
 		attemptIdleTimer.unref?.();
 	}
@@ -3024,7 +3028,7 @@ function createCodexAttemptTurnWatchController(params) {
 		clearTerminalIdleTimer();
 		if (params.isCompleted() || params.signal.aborted || !terminalIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - completionLastActivityAt);
-		const delayMs = Math.max(1, params.turnTerminalIdleTimeoutMs - elapsedMs);
+		const delayMs = Math.max(1, turnTerminalIdleTimeoutMs - elapsedMs);
 		terminalIdleTimer = setTimeout(fireTerminalIdleTimeout, delayMs);
 		terminalIdleTimer.unref?.();
 	}
@@ -3034,7 +3038,7 @@ function createCodexAttemptTurnWatchController(params) {
 		scheduleTerminalIdleWatch();
 	}
 	function recordAttemptProgress(reason, options) {
-		attemptIdleTimeoutOverrideMs = options?.attemptTimeoutMs !== void 0 ? Math.max(1, Math.floor(options.attemptTimeoutMs)) : void 0;
+		attemptIdleTimeoutOverrideMs = options?.attemptTimeoutMs !== void 0 ? resolveWatchTimeoutMs(options.attemptTimeoutMs) : void 0;
 		attemptLastProgressAt = completionLastActivityAt;
 		attemptLastProgressReason = reason;
 		attemptLastProgressDetails = options?.details;
@@ -3048,7 +3052,7 @@ function createCodexAttemptTurnWatchController(params) {
 			return;
 		}
 		const idleMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
-		if (idleMs < params.turnAssistantCompletionIdleTimeoutMs) {
+		if (idleMs < turnAssistantCompletionIdleTimeoutMs) {
 			scheduleAssistantCompletionIdleWatch();
 			return;
 		}
@@ -3060,20 +3064,20 @@ function createCodexAttemptTurnWatchController(params) {
 			threadId: params.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: params.turnAssistantCompletionIdleTimeoutMs,
+			timeoutMs: turnAssistantCompletionIdleTimeoutMs,
 			...assistantCompletionLastActivityDetails
 		});
 		embeddedAgentLog.warn("codex app-server turn released after completed assistant item without terminal event", {
 			threadId: params.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: params.turnAssistantCompletionIdleTimeoutMs,
+			timeoutMs: turnAssistantCompletionIdleTimeoutMs,
 			...assistantCompletionLastActivityDetails
 		});
 		if (turnId) params.onInterruptTurn({
 			threadId: params.threadId,
 			turnId,
-			timeoutMs: params.interruptTimeoutMs
+			timeoutMs: interruptTimeoutMs
 		});
 		params.onCompleted();
 		params.onResolveCompletion();
@@ -3081,7 +3085,7 @@ function createCodexAttemptTurnWatchController(params) {
 	function fireAttemptIdleTimeout() {
 		if (params.isCompleted() || params.signal.aborted || !attemptIdleWatchArmed) return;
 		const idleMs = Math.max(0, Date.now() - attemptLastProgressAt);
-		const timeoutMs = attemptIdleTimeoutOverrideMs ?? params.turnAttemptIdleTimeoutMs;
+		const timeoutMs = attemptIdleTimeoutOverrideMs ?? turnAttemptIdleTimeoutMs;
 		if (idleMs < timeoutMs) {
 			scheduleAttemptIdleWatch();
 			return;
@@ -3115,7 +3119,7 @@ function createCodexAttemptTurnWatchController(params) {
 	}
 	function fireCompletionIdleTimeout() {
 		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
-		const timeoutMs = completionIdleTimeoutOverrideMs ?? params.turnCompletionIdleTimeoutMs;
+		const timeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - completionLastActivityAt);
 		if (idleMs < timeoutMs) {
 			scheduleCompletionIdleWatch();
@@ -3151,14 +3155,14 @@ function createCodexAttemptTurnWatchController(params) {
 	function fireTerminalIdleTimeout() {
 		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !terminalIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
 		const idleMs = Math.max(0, Date.now() - completionLastActivityAt);
-		if (idleMs < params.turnTerminalIdleTimeoutMs) {
+		if (idleMs < turnTerminalIdleTimeoutMs) {
 			scheduleTerminalIdleWatch();
 			return;
 		}
 		const timeout = {
 			kind: "terminal",
 			idleMs,
-			timeoutMs: params.turnTerminalIdleTimeoutMs,
+			timeoutMs: turnTerminalIdleTimeoutMs,
 			lastActivityReason: completionLastActivityReason,
 			details: completionLastActivityDetails
 		};
@@ -3197,7 +3201,7 @@ function createCodexAttemptTurnWatchController(params) {
 		armCompletionIdleWatch: (options) => {
 			completionIdleWatchArmed = true;
 			completionIdleWatchPinnedByTerminalError = options?.pinnedByTerminalError === true;
-			completionIdleTimeoutOverrideMs = options?.timeoutMs !== void 0 ? Math.max(1, Math.floor(options.timeoutMs)) : void 0;
+			completionIdleTimeoutOverrideMs = options?.timeoutMs !== void 0 ? resolveWatchTimeoutMs(options.timeoutMs) : void 0;
 			scheduleCompletionIdleWatch();
 		},
 		disarmCompletionIdleWatch: () => {
@@ -3237,7 +3241,7 @@ function createCodexAttemptTurnWatchController(params) {
 			if (options?.attemptProgress) recordAttemptProgress(completionLastActivityReason, options);
 		},
 		extendAttemptIdleWatch: (timeoutMs) => {
-			attemptIdleTimeoutOverrideMs = Math.max(1, Math.floor(timeoutMs));
+			attemptIdleTimeoutOverrideMs = resolveWatchTimeoutMs(timeoutMs);
 			scheduleAttemptIdleWatch();
 		},
 		scheduleProgressWatches,
@@ -3307,7 +3311,7 @@ async function handleDynamicToolCallWithTimeout(params) {
 	let resolveAbort;
 	const abortFromRun = () => {
 		const message = "OpenClaw dynamic tool call aborted.";
-		controller.abort(params.signal.reason ?? new Error(message));
+		controller.abort(params.signal.reason ?? /* @__PURE__ */ new Error(message));
 		resolveAbort?.(failedDynamicToolResponse(message, { sideEffectEvidence: true }));
 	};
 	const abortPromise = new Promise((resolve) => {
@@ -3387,6 +3391,9 @@ function toCodexDynamicToolProgressResponse(response, protocolResponse) {
 function shouldReleaseTurnAfterTerminalDynamicTool(state) {
 	return !state.completed && !state.aborted && state.responseSuccess && !state.currentTurnHadNonTerminalDynamicToolResult && state.activeAppServerTurnRequests === 0 && state.activeTurnItemIdsCount === 0 && state.pendingOpenClawDynamicToolCompletionIdsCount === 0;
 }
+function shouldBlockTerminalReleaseForNonTerminalDynamicToolResult(response) {
+	return response.asyncStarted !== true;
+}
 function resolveTerminalDynamicToolBatchAction(state) {
 	if (state.activeAppServerTurnRequests > 0 || state.activeTurnItemIdsCount > 0 || state.pendingOpenClawDynamicToolCompletionIdsCount > 0) return "wait";
 	if (state.currentTurnHadNonTerminalDynamicToolResult) return "clear-nonterminal-batch";
@@ -4632,7 +4639,7 @@ var CodexAppServerEventProjector = class {
 		this.afterToolCallObservedItemIds.add(item.id);
 		const result = itemToolResult(item).result;
 		const error = itemToolError(item, status, this.toolResultOutputTextByItem);
-		const startedAt = typeof item.durationMs === "number" ? Date.now() - Math.max(0, item.durationMs) : void 0;
+		const startedAt = resolveStartedAtFromDurationMs(item.durationMs);
 		const hookParams = {
 			toolName: name,
 			toolCallId: item.id,
@@ -4985,6 +4992,10 @@ function readNumber$1(record, key) {
 	const value = record[key];
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
+function resolveStartedAtFromDurationMs(durationMs) {
+	if (typeof durationMs !== "number" || !Number.isFinite(durationMs)) return;
+	return asDateTimestampMs(Date.now() - Math.max(0, durationMs));
+}
 function readNonNegativeInteger(record, key) {
 	const value = readNumber$1(record, key);
 	return value !== void 0 && Number.isInteger(value) && value >= 0 ? value : void 0;
@@ -7308,8 +7319,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		sessionKey: contextSessionKey,
 		...startupAuthProfileId ? { authProfileId: startupAuthProfileId } : {}
 	};
-	let activeSessionId = params.sessionId;
-	let activeSessionFile = params.sessionFile;
+	const activeSessionId = params.sessionId;
+	const activeSessionFile = params.sessionFile;
 	const buildActiveRunAttemptParams = () => ({
 		...runtimeParams,
 		sessionId: activeSessionId,
@@ -7479,6 +7490,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let developerInstructions = baseDeveloperInstructions;
 	let prePromptMessageCount = historyMessages.length;
 	let contextEngineProjection;
+	let precomputedStaleBindingContinuityProjectionApplied = false;
+	let staleBindingContinuityForcedFreshStart = false;
+	const applyFreshThreadContinuityProjection = () => {
+		const projection = projectContextEngineAssemblyForCodex({
+			assembledMessages: historyMessages,
+			originalHistoryMessages: historyMessages,
+			prompt: params.prompt
+		});
+		promptText = projection.promptText;
+		prePromptMessageCount = projection.prePromptMessageCount;
+	};
 	const applyActiveContextEngineProjection = async (decisionStartupBinding) => {
 		if (!activeContextEngine) return;
 		const assembled = await assembleHarnessContextEngine({
@@ -7557,10 +7579,65 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		heartbeatCollaborationInstructions: workspaceBootstrapContext.heartbeatCollaborationInstructions
 	}).settings.developer_instructions ?? void 0;
 	const buildRenderedCodexDeveloperInstructions = () => joinPresentSections(promptBuild.developerInstructions, buildCodexTurnCollaborationDeveloperInstructions());
-	const rebuildCodexTurnPromptFromCurrentProjection = async () => {
+	const rebuildCodexPromptBuildFromCurrentProjection = async () => {
 		promptBuild = await buildPromptFromCurrentInputs();
 		codexTurnPromptText = decorateCodexTurnPromptText(promptBuild.prompt);
 	};
+	const rebuildCodexTurnPromptTextFromCurrentProjection = async () => {
+		const nextPromptBuild = await buildPromptFromCurrentInputs();
+		promptBuild = {
+			...promptBuild,
+			prompt: nextPromptBuild.prompt
+		};
+		codexTurnPromptText = decorateCodexTurnPromptText(nextPromptBuild.prompt);
+	};
+	const selectNewerVisibleHistoryAfterBinding = (binding) => {
+		const bindingUpdatedAt = Date.parse(binding.updatedAt);
+		if (!Number.isFinite(bindingUpdatedAt)) return [];
+		return historyMessages.filter((message) => {
+			if (message.role !== "user" && message.role !== "assistant") return false;
+			const record = message;
+			const idempotencyKey = record.idempotencyKey;
+			if (typeof idempotencyKey === "string" && idempotencyKey.startsWith("codex-app-server:")) return false;
+			const meta = record["__openclaw"];
+			const mirrorIdentity = meta && typeof meta === "object" && !Array.isArray(meta) ? meta.mirrorIdentity : void 0;
+			if (typeof mirrorIdentity === "string" && mirrorIdentity.startsWith("codex-app-server:")) return false;
+			const timestamp = typeof message.timestamp === "number" ? message.timestamp : typeof message.timestamp === "string" ? Date.parse(message.timestamp) : NaN;
+			return Number.isFinite(timestamp) && timestamp > bindingUpdatedAt;
+		});
+	};
+	const applyResumeStaleBindingContinuityProjection = (binding) => {
+		const newerVisibleMessages = selectNewerVisibleHistoryAfterBinding(binding);
+		if (newerVisibleMessages.length === 0) return false;
+		const projection = projectContextEngineAssemblyForCodex({
+			assembledMessages: newerVisibleMessages,
+			originalHistoryMessages: historyMessages,
+			prompt: params.prompt
+		});
+		promptText = projection.promptText;
+		prePromptMessageCount = projection.prePromptMessageCount;
+		return true;
+	};
+	const precomputeNoContextEngineStaleBindingProjection = (binding) => {
+		precomputedStaleBindingContinuityProjectionApplied = false;
+		staleBindingContinuityForcedFreshStart = false;
+		if (activeContextEngine || !binding?.threadId) return false;
+		const projected = applyResumeStaleBindingContinuityProjection(binding);
+		precomputedStaleBindingContinuityProjectionApplied = projected;
+		return projected;
+	};
+	const applyNoContextEngineContinuityProjection = (action, binding) => {
+		if (activeContextEngine || !historyMessages.some((message) => message.role === "user")) return false;
+		if (action === "resumed" && precomputedStaleBindingContinuityProjectionApplied) return true;
+		if (action === "started" && staleBindingContinuityForcedFreshStart) return true;
+		if (action === "resumed" && binding) return applyResumeStaleBindingContinuityProjection(binding);
+		if (action === "started") {
+			applyFreshThreadContinuityProjection();
+			return true;
+		}
+		return false;
+	};
+	if (precomputeNoContextEngineStaleBindingProjection(startupBinding)) await rebuildCodexPromptBuildFromCurrentProjection();
 	const rotateStartupBindingForProjectedTurn = async () => {
 		if (!startupBinding?.threadId) return;
 		const previousThreadId = startupBinding.threadId;
@@ -7578,6 +7655,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			projectedTurnTokens
 		});
 		if (startupBinding?.threadId) return;
+		staleBindingContinuityForcedFreshStart = precomputedStaleBindingContinuityProjectionApplied;
 		if (activeContextEngine) {
 			contextEngineProjection = void 0;
 			try {
@@ -7586,7 +7664,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				embeddedAgentLog.warn("context engine assemble failed; using Codex baseline prompt", { error: formatErrorMessage(assembleErr) });
 			}
 		}
-		await rebuildCodexTurnPromptFromCurrentProjection();
+		await rebuildCodexPromptBuildFromCurrentProjection();
 		embeddedAgentLog.info("codex app-server rebuilt turn prompt after native thread rotation", {
 			sessionId: params.sessionId,
 			sessionKey: contextSessionKey,
@@ -7715,6 +7793,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
 		throw error;
 	}
+	if (applyNoContextEngineContinuityProjection(thread.lifecycle.action, thread)) await rebuildCodexTurnPromptTextFromCurrentProjection();
 	trajectoryRecorder?.recordEvent("session.started", {
 		sessionFile: params.sessionFile,
 		threadId: thread.threadId,
@@ -7729,11 +7808,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: codexTurnPromptText,
 		tools: toolBridge.availableSpecs
 	});
-	let projector;
-	let turnId;
 	const pendingNotifications = [];
-	let userInputBridge;
-	let steeringQueue;
 	let completed = false;
 	let terminalTurnNotificationQueued = false;
 	let timedOut = false;
@@ -7763,6 +7838,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let pendingTerminalDynamicToolRelease;
 	let terminalDynamicToolReleaseCheckScheduled = false;
 	let currentTurnHadNonTerminalDynamicToolResult = false;
+	const turnIdRef = {};
+	const projectorRef = {};
+	const userInputBridgeRef = {};
+	const steeringQueueRef = {};
 	const renewNativeHookRelayForTurnProgress = () => {
 		if (!nativeHookRelay || options.nativeHookRelay?.ttlMs !== void 0) return;
 		const now = Date.now();
@@ -7780,7 +7859,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const turnWatches = createCodexAttemptTurnWatchController({
 		threadId: thread.threadId,
 		signal: runAbortController.signal,
-		getTurnId: () => turnId,
+		getTurnId: () => turnIdRef.current,
 		isCompleted: () => completed,
 		isTerminalTurnNotificationQueued: () => terminalTurnNotificationQueued,
 		getActiveAppServerTurnRequests: () => activeAppServerTurnRequests,
@@ -7797,7 +7876,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnWatchTimeoutKind = timeout.kind;
 			turnCompletionIdleTimeoutMessage = "codex app-server turn idle timed out waiting for turn/completed";
 		},
-		onMarkTimedOut: () => projector?.markTimedOut(),
+		onMarkTimedOut: () => projectorRef.current?.markTimedOut(),
 		onAbort: (reason) => runAbortController.abort(reason),
 		onCompleted: () => {
 			completed = true;
@@ -7928,6 +8007,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		currentPromptTexts: [codexTurnPromptText]
 	});
 	const handleNotification = async (notification) => {
+		const projector = projectorRef.current;
+		const turnId = turnIdRef.current;
+		const userInputBridge = userInputBridgeRef.current;
+		const steeringQueue = steeringQueueRef.current;
 		userInputBridge?.handleNotification(notification);
 		if (!projector || !turnId) {
 			pendingNotifications.push(notification);
@@ -7970,6 +8053,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		}
 	};
 	const enqueueNotification = (notification) => {
+		const projector = projectorRef.current;
+		const turnId = turnIdRef.current;
+		const userInputBridge = userInputBridgeRef.current;
 		const correlation = describeCodexNotificationCorrelation(notification, {
 			threadId: thread.threadId,
 			...turnId ? { turnId } : {}
@@ -8004,6 +8090,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	const notificationCleanup = client.addNotificationHandler(enqueueNotification);
 	const requestCleanup = client.addRequestHandler(async (request) => {
+		const turnId = turnIdRef.current;
+		const userInputBridge = userInputBridgeRef.current;
+		const projector = projectorRef.current;
 		let armCompletionWatchOnResponse = false;
 		let requestCountsAsTurnActivity = false;
 		const markCurrentTurnRequestProgress = () => {
@@ -8185,19 +8274,20 @@ async function runCodexAppServerAttempt(params, options = {}) {
 					sessionKey: params.sessionKey,
 					durationMs: toolDurationMs
 				});
-				if (response.terminate === true) {
-					pendingOpenClawDynamicToolCompletionIds.delete(call.callId);
-					scheduleTurnReleaseAfterTerminalDynamicTool({
-						call,
-						response,
-						durationMs: toolDurationMs
-					});
-				} else {
+				pendingOpenClawDynamicToolCompletionIds.delete(call.callId);
+				if (response.terminate === true) scheduleTurnReleaseAfterTerminalDynamicTool({
+					call,
+					response,
+					durationMs: toolDurationMs
+				});
+				else if (!shouldBlockTerminalReleaseForNonTerminalDynamicToolResult(response)) scheduleTerminalDynamicToolReleaseCheck();
+				else {
 					currentTurnHadNonTerminalDynamicToolResult = true;
 					pendingTerminalDynamicToolRelease = void 0;
 				}
 				return protocolResponse;
 			} catch (error) {
+				pendingOpenClawDynamicToolCompletionIds.delete(call.callId);
 				if (!terminalDiagnosticObserved && !hasPendingDynamicToolTerminalDiagnostic({
 					call,
 					runId: params.runId,
@@ -8228,7 +8318,6 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			} else turnWatches.scheduleProgressWatches();
 		}
 	});
-	let closeCleanup;
 	const buildLlmInputEvent = () => ({
 		runId: params.runId,
 		sessionId: params.sessionId,
@@ -8446,10 +8535,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		releaseSharedClientLease = void 0;
 		throw new Error("codex app-server turn/start failed without an error");
 	}
-	turnId = turn.turn.id;
+	turnIdRef.current = turn.turn.id;
 	const activeTurnId = turn.turn.id;
 	emitExecutionPhaseOnce("turn_accepted", { phase: "turn_accepted" });
-	userInputBridge = createCodexUserInputBridge({
+	userInputBridgeRef.current = createCodexUserInputBridge({
 		paramsForRun: params,
 		threadId: thread.threadId,
 		turnId: activeTurnId,
@@ -8461,12 +8550,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prompt: codexTurnPromptText,
 		imagesCount: params.images?.length ?? 0
 	});
-	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, {
+	projectorRef.current = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, {
 		nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true && nativeHookRelay.shouldRelayEvent("post_tool_use"),
 		trajectoryRecorder
 	});
 	if (isTerminalTurnStatus(turn.turn.status) || pendingNotifications.some((notification) => isTerminalTurnNotificationForTurn(notification, activeTurnId))) terminalTurnNotificationQueued = true;
-	closeCleanup = client.addCloseHandler?.(() => {
+	const closeCleanup = client.addCloseHandler?.(() => {
 		if (completed || terminalTurnNotificationQueued || runAbortController.signal.aborted) return;
 		clientClosedPromptError = "codex app-server client closed before turn completed";
 		trajectoryRecorder?.recordEvent("turn.client_closed", {
@@ -8484,7 +8573,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		resolveCompletion?.();
 	});
 	emitLifecycleStart();
-	const activeProjector = projector;
+	const activeProjector = projectorRef.current;
+	if (!activeProjector) throw new Error("codex app-server projector was not initialized");
 	turnWatches.armTerminalIdleWatch();
 	turnWatches.touchActivity("turn:start", { arm: true });
 	turnWatches.armAttemptIdleWatch();
@@ -8502,15 +8592,15 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		client,
 		threadId: thread.threadId,
 		turnId: activeTurnId,
-		answerPendingUserInput: (text) => userInputBridge?.handleQueuedMessage(text) ?? false,
+		answerPendingUserInput: (text) => userInputBridgeRef.current?.handleQueuedMessage(text) ?? false,
 		signal: runAbortController.signal
 	});
-	steeringQueue = activeSteeringQueue;
+	steeringQueueRef.current = activeSteeringQueue;
 	const handle = {
 		kind: "embedded",
 		queueMessage: async (text, options) => activeSteeringQueue.queue(text, options),
 		isStreaming: () => !completed,
-		isCompacting: () => projector?.isCompacting() ?? false,
+		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 		cancel: () => runAbortController.abort("cancelled"),
 		abort: () => runAbortController.abort("aborted")
@@ -8698,6 +8788,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			hookRunner
 		});
 		shouldDelayNativeHookRelayUnregister = activeProjector.getCompletedTurnStatus() === "completed" && !timedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
+		if (shouldDelayNativeHookRelayUnregister) await markCodexAppServerBindingCoveredThroughTurn({
+			sessionFile: params.sessionFile,
+			threadId: thread.threadId,
+			authProfileStore: params.authProfileStore,
+			agentDir: params.agentDir,
+			config: params.config
+		});
 		return {
 			...result,
 			timedOut,
@@ -8738,12 +8835,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				await trajectoryRecorder?.flush();
 			}
 		});
-		if (!timedOut && !runAbortController.signal.aborted) await steeringQueue?.flushPending();
+		if (!timedOut && !runAbortController.signal.aborted) await steeringQueueRef.current?.flushPending();
 		if (!timedOut) await unsubscribeCodexThreadBestEffort(client, {
 			threadId: thread.threadId,
 			timeoutMs: CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS
 		});
-		userInputBridge?.cancelPending();
+		userInputBridgeRef.current?.cancelPending();
 		turnWatches.clearAllTimers();
 		notificationCleanup();
 		requestCleanup();
@@ -8757,7 +8854,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		await releaseSandboxExecEnvironment();
 		runAbortController.signal.removeEventListener("abort", abortListener);
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
-		steeringQueue?.cancel();
+		steeringQueueRef.current?.cancel();
 		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
 	}
 }
@@ -8776,6 +8873,20 @@ async function clearCodexBindingAfterInvalidImagePayload(sessionFile, fields) {
 	embeddedAgentLog.warn("codex app-server image payload error detected; clearing thread binding", fields);
 	await clearCodexAppServerBinding(sessionFile);
 }
+async function markCodexAppServerBindingCoveredThroughTurn(params) {
+	const currentBinding = await readCodexAppServerBinding(params.sessionFile, {
+		authProfileStore: params.authProfileStore,
+		agentDir: params.agentDir,
+		config: params.config
+	});
+	if (!currentBinding || currentBinding.threadId !== params.threadId) return;
+	const { schemaVersion: _schemaVersion, sessionFile: _boundSessionFile, updatedAt: _updatedAt, ...bindingForWrite } = currentBinding;
+	await writeCodexAppServerBinding(params.sessionFile, bindingForWrite, {
+		authProfileStore: params.authProfileStore,
+		agentDir: params.agentDir,
+		config: params.config
+	});
+}
 function isNonEmptyString(value) {
 	return typeof value === "string" && value.length > 0;
 }

package/dist/{session-binding-BGOpicy0.js → session-binding-BXJAV_xy.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { s as normalizeCodexServiceTier } from "./config--tW89bHH.js";
+import { l as normalizeCodexServiceTier, s as isCodexPluginsMarketplaceName } from "./config-AlzuNKCY.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import fs from "node:fs/promises";
 import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
@@ -133,7 +133,7 @@ function readPluginAppPolicyContext(value) {
 	for (const [appId, rawEntry] of Object.entries(apps)) {
 		if (!rawEntry || typeof rawEntry !== "object" || Array.isArray(rawEntry)) return;
 		const entry = rawEntry;
-		if ("appId" in entry || typeof entry.configKey !== "string" || entry.marketplaceName !== "openai-curated" || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
+		if ("appId" in entry || typeof entry.configKey !== "string" || typeof entry.marketplaceName !== "string" || !isCodexPluginsMarketplaceName(entry.marketplaceName) || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
 		parsedApps[appId] = {
 			configKey: entry.configKey,
 			marketplaceName: entry.marketplaceName,
@@ -186,11 +186,13 @@ function isCodexAppServerNativeAuthProfile(lookup) {
 	const authProfileId = lookup.authProfileId?.trim();
 	if (!authProfileId) return false;
 	try {
-		return isCodexAppServerNativeAuthProvider({
-			provider: resolveCodexAppServerAuthProfileCredential({
-				...lookup,
-				authProfileId
-			})?.provider,
+		const credential = resolveCodexAppServerAuthProfileCredential({
+			...lookup,
+			authProfileId
+		});
+		if (!credential || credential.type === "api_key") return false;
+		return isOpenAiAuthProvider({
+			provider: credential.provider,
 			config: lookup.config
 		});
 	} catch (error) {
@@ -224,7 +226,7 @@ function loadCodexAppServerAuthProfileStore(params) {
 		externalCliProfileIds: [params.authProfileId]
 	});
 }
-function isCodexAppServerNativeAuthProvider(params) {
+function isOpenAiAuthProvider(params) {
 	const provider = params.provider?.trim();
 	return Boolean(provider && resolveProviderIdForAuth(provider, { config: params.config }) === CODEX_APP_SERVER_NATIVE_AUTH_PROVIDER);
 }

package/dist/{shared-client-2d0XB7wz.js → shared-client-DBlR-rV2.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { l as resolveCodexAppServerRuntimeOptions, n as codexAppServerStartOptionsKey } from "./config--tW89bHH.js";
-import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-B08x7Y93.js";
+import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-AlzuNKCY.js";
+import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-BnOmn0y-.js";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import fsSync, { constants, readFileSync } from "node:fs";