@openclaw/codex 2026.7.1-beta.1 → 2026.7.1-beta.4

package/dist/{thread-lifecycle-DeSMZSXr.js → thread-lifecycle-BskXnNP-.js}

@@ -1,79 +1,22 @@
-import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
-import { i as codexSandboxPolicyForTurn, m as resolveCodexPluginsPolicy, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-C_whBx3M.js";
-import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-CB4mtyrs.js";
+import { n as flattenCodexDynamicToolFunctions, r as isJsonObject } from "./protocol-2POPqAY4.js";
+import { h as resolveCodexPluginsPolicy, i as codexSandboxPolicyForTurn, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-CYEDnLJ2.js";
+import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-dZQ-UTOa.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
-import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel } from "./provider-DosqwRb6.js";
-import { a as isCodexAppServerConnectionClosedError, n as CodexAppServerRpcError } from "./client-IcTBKEqA.js";
-import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexFallbackReasoningEfforts, r as isMaxReasoningCodexModel, s as resolveCodexSupportedReasoningEffort } from "./provider-cc_62eQE.js";
+import { f as isCodexAppServerConnectionClosedError, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as CodexAppServerRpcError } from "./shared-client-4ICy3U6d.js";
+import { a as reclaimCurrentCodexSessionGeneration, i as normalizeCodexAppServerBindingModelProvider, o as sessionBindingIdentity, r as isCodexAppServerNativeAuthProfile } from "./session-binding-Dc03iwRF.js";
 import "node:fs/promises";
 import "node:path";
 import { isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
-import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import crypto from "node:crypto";
+import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { SKILL_WORKSHOP_TOOL_NAME, buildSkillWorkshopPromptSection, embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { buildCodexUserMcpServersThreadConfigPatch } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { listRegisteredPluginAgentPromptGuidance } from "openclaw/plugin-sdk/plugin-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
 import { INLINE_IMAGE_DATA_URL_PREFIX, sanitizeInlineImageDataUrl } from "openclaw/plugin-sdk/inline-image-data-url-runtime";
 import { isDiagnosticFlagEnabled } from "openclaw/plugin-sdk/diagnostic-runtime";
-//#region extensions/codex/src/app-server/notification-correlation.ts
-/**
-* Correlates Codex app-server notifications with the active thread/turn so
-* projectors can ignore global or stale events without losing diagnostics.
-*/
-/** Returns true when a notification payload belongs to the exact active thread and turn. */
-function isCodexNotificationForTurn(value, threadId, turnId) {
-	if (!isJsonObject(value)) return false;
-	return readCodexNotificationThreadId(value) === threadId && readCodexNotificationTurnId(value) === turnId;
-}
-/** Reads a thread id from either top-level notification params or nested turn payloads. */
-function readCodexNotificationThreadId(record) {
-	return readNestedTurnThreadId(record) ?? readString(record, "threadId");
-}
-/** Reads a turn id from either top-level notification params or nested turn payloads. */
-function readCodexNotificationTurnId(record) {
-	return readNestedTurnId(record) ?? readString(record, "turnId");
-}
-/** Builds structured correlation details for logs when notification routing is ambiguous. */
-function describeCodexNotificationCorrelation(notification, active) {
-	const params = isJsonObject(notification.params) ? notification.params : void 0;
-	const turn = params && isJsonObject(params.turn) ? params.turn : void 0;
-	const threadId = params ? readString(params, "threadId") : void 0;
-	const turnId = params ? readString(params, "turnId") : void 0;
-	const nestedTurnThreadId = turn ? readString(turn, "threadId") : void 0;
-	const nestedTurnId = turn ? readString(turn, "id") : void 0;
-	const resolvedThreadId = params ? readCodexNotificationThreadId(params) : void 0;
-	const resolvedTurnId = params ? readCodexNotificationTurnId(params) : void 0;
-	const matchesActiveThread = resolvedThreadId === active.threadId;
-	const matchesActiveTurn = active.turnId ? matchesActiveThread && resolvedTurnId === active.turnId : void 0;
-	const items = turn?.items;
-	return {
-		method: notification.method,
-		...params ? { paramsKeys: Object.keys(params).toSorted() } : {},
-		activeThreadId: active.threadId,
-		...active.turnId ? { activeTurnId: active.turnId } : {},
-		...threadId ? { threadId } : {},
-		...turnId ? { turnId } : {},
-		...nestedTurnThreadId ? { nestedTurnThreadId } : {},
-		...nestedTurnId ? { nestedTurnId } : {},
-		...turn ? { turnStatus: readString(turn, "status") } : {},
-		...Array.isArray(items) ? { turnItemCount: items.length } : {},
-		matchesActiveThread,
-		...matchesActiveTurn === void 0 ? {} : { matchesActiveTurn }
-	};
-}
-function readNestedTurnId(record) {
-	const turn = record.turn;
-	return isJsonObject(turn) ? readString(turn, "id") : void 0;
-}
-function readNestedTurnThreadId(record) {
-	const turn = record.turn;
-	return isJsonObject(turn) ? readString(turn, "threadId") : void 0;
-}
-function readString(record, key) {
-	const value = record[key];
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
 const CODEX_TARGETED_APP_INVENTORY_LIMIT = 1e3;
 const MAX_SERIALIZED_ERROR_MESSAGE_LENGTH = 500;
 /** In-memory app inventory cache with coalesced refreshes per key. */
@@ -275,7 +218,7 @@ function redactErrorData(value, depth = 0) {
 		for (const [key, entry] of Object.entries(value)) redacted[key] = isSensitiveErrorDataKey(key) ? "<redacted>" : redactErrorData(entry, depth + 1) ?? null;
 		return redacted;
 	}
-	if (typeof value === "string" && value.length > 500) return `${value.slice(0, 500)}...`;
+	if (typeof value === "string" && value.length > 500) return `${truncateUtf16Safe(value, 500)}...`;
 	if (typeof value === "string") return value;
 	if (typeof value === "bigint") return value.toString();
 	if (typeof value === "symbol") return value.description ? `Symbol(${value.description})` : "Symbol()";
@@ -576,20 +519,21 @@ function activationFailure(identity, reason, diagnostic, extraDiagnostics = [])
 //#endregion
 //#region extensions/codex/src/app-server/plugin-thread-config.ts
 /**
-* Builds Codex thread config patches that expose only policy-approved
-* plugin-owned apps for native Codex turns.
+* Builds Codex thread config patches that expose only policy-approved apps
+* for native Codex turns.
 */
-const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 2;
-const CODEX_PLUGIN_THREAD_CONFIG_FINGERPRINT_VERSION = 1;
+const CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION = 3;
+const CODEX_PLUGIN_THREAD_CONFIG_FINGERPRINT_VERSION = 2;
 /** Returns true when plugin config exists and thread config may need app patches. */
 function shouldBuildCodexPluginThreadConfig(pluginConfig) {
 	return resolveCodexPluginsPolicy(pluginConfig).configured;
 }
 /** Fingerprints policy and app-cache identity before runtime inventory is read. */
 function buildCodexPluginThreadConfigInputFingerprint(params) {
+	const policy = resolveCodexPluginsPolicy(params.pluginConfig);
 	return fingerprintJson({
 		version: CODEX_PLUGIN_THREAD_CONFIG_INPUT_FINGERPRINT_VERSION,
-		policy: policyFingerprint(resolveCodexPluginsPolicy(params.pluginConfig)),
+		policy: policyFingerprint(policy),
 		appCacheKey: params.appCacheKey ?? null
 	});
 }
@@ -606,7 +550,7 @@ async function buildCodexPluginThreadConfig(params) {
 		inputFingerprint,
 		configPatch: buildDisabledAppsConfigPatch()
 	});
-	let inventory = await readCodexPluginInventory({
+	let inventory = policy.pluginPolicies.length > 0 ? await readCodexPluginInventory({
 		pluginConfig: params.pluginConfig,
 		policy,
 		request: params.request,
@@ -614,7 +558,7 @@ async function buildCodexPluginThreadConfig(params) {
 		appCacheKey: params.appCacheKey,
 		nowMs: params.nowMs,
 		suppressAppInventoryRefresh: true
-	});
+	}) : emptyCodexPluginInventory(policy);
 	const appInventoryRefreshDeferredForActivation = inventory.records.some((record) => record.activationRequired) && shouldRefreshMissingAppInventory(params, policy, inventory);
 	if (shouldWaitForInitialAppInventory(params, policy, inventory)) {
 		await refreshAppInventoryNow(params, appCache, {
@@ -693,7 +637,12 @@ async function buildCodexPluginThreadConfig(params) {
 			appCacheKey: params.appCacheKey
 		});
 	}
-	const diagnostics = [...inventory.diagnostics, ...activationDiagnostics];
+	const accountAppsResult = policy.allowAllPlugins ? await readAccessibleAccountApps(params, appCache) : { apps: [] };
+	const diagnostics = [
+		...inventory.diagnostics,
+		...activationDiagnostics,
+		...accountAppsResult.diagnostic ? [accountAppsResult.diagnostic] : []
+	];
 	const apps = { _default: {
 		enabled: false,
 		destructive_enabled: false,
@@ -701,6 +650,7 @@ async function buildCodexPluginThreadConfig(params) {
 	} };
 	const policyApps = {};
 	const pluginAppIds = {};
+	const pluginOwnedAppIds = new Set(inventory.records.flatMap((record) => record.appOwnership === "proven" ? record.ownedAppIds : []));
 	for (const record of inventory.records) {
 		const activation = activationResults.find((item) => item.identity.configKey === record.policy.configKey);
 		if (activation?.ok === false || record.activationRequired && !activation?.ok) continue;
@@ -725,14 +675,7 @@ async function buildCodexPluginThreadConfig(params) {
 				app,
 				diagnostics
 			})) continue;
-			const appConfig = {
-				enabled: true,
-				destructive_enabled: record.policy.allowDestructiveActions,
-				open_world_enabled: true,
-				default_tools_approval_mode: "auto"
-			};
-			if (record.policy.destructiveApprovalMode === "ask") appConfig.approvals_reviewer = "user";
-			apps[app.id] = appConfig;
+			apps[app.id] = buildEnabledAppConfig(record.policy);
 			policyApps[app.id] = {
 				configKey: record.policy.configKey,
 				marketplaceName: record.policy.marketplaceName,
@@ -743,6 +686,24 @@ async function buildCodexPluginThreadConfig(params) {
 			};
 		}
 	}
+	for (const app of accountAppsResult.apps) {
+		if (pluginOwnedAppIds.has(app.id)) continue;
+		const accountApp = toOwnedAccountApp(app);
+		if (policy.destructiveApprovalMode === "ask" && !await clearPersistedAppToolApprovalOverrides({
+			request: params.request,
+			configCwd: params.configCwd,
+			app: accountApp,
+			diagnostics
+		})) continue;
+		apps[app.id] = buildEnabledAppConfig(policy);
+		policyApps[app.id] = {
+			source: "account",
+			appName: app.name,
+			allowDestructiveActions: policy.allowDestructiveActions,
+			destructiveApprovalMode: policy.destructiveApprovalMode,
+			mcpServerNames: []
+		};
+	}
 	const configPatch = { apps };
 	const policyContext = buildPluginAppPolicyContext(policyApps, pluginAppIds);
 	return {
@@ -798,6 +759,15 @@ function buildDisabledAppsConfigPatch() {
 		open_world_enabled: false
 	} } };
 }
+function buildEnabledAppConfig(policy) {
+	return {
+		enabled: true,
+		destructive_enabled: policy.allowDestructiveActions,
+		open_world_enabled: true,
+		default_tools_approval_mode: "auto",
+		...policy.destructiveApprovalMode === "ask" ? { approvals_reviewer: "user" } : {}
+	};
+}
 /** Rebuilds the safe per-thread apps patch persisted with a Codex thread binding. */
 function buildCodexPluginAppsConfigPatchFromPolicyContext(policyContext) {
 	const apps = { _default: {
@@ -817,7 +787,7 @@ function buildCodexPluginAppsConfigPatchFromPolicyContext(policyContext) {
 function buildPluginAppPolicyContext(apps, pluginAppIds) {
 	return {
 		fingerprint: fingerprintJson({
-			version: 1,
+			version: 2,
 			apps,
 			pluginAppIds
 		}),
@@ -839,7 +809,7 @@ async function clearPersistedAppToolApprovalOverrides(params) {
 	} catch (error) {
 		params.diagnostics.push({
 			code: "approval_overrides_clear_failed",
-			plugin: params.plugin,
+			...params.plugin ? { plugin: params.plugin } : {},
 			message: `Could not clear durable Codex app approval overrides for ${params.app.id}: ${error instanceof Error ? error.message : String(error)}`
 		});
 		return false;
@@ -898,6 +868,37 @@ async function refreshAppInventoryNow(params, appCache, options = {}) {
 function collectInventoryOwnedAppIds(inventory) {
 	return Array.from(new Set(inventory.records.flatMap((record) => record.ownedAppIds).filter(Boolean))).toSorted();
 }
+function emptyCodexPluginInventory(policy) {
+	return {
+		policy,
+		records: [],
+		diagnostics: []
+	};
+}
+async function readAccessibleAccountApps(params, appCache) {
+	const snapshot = await refreshAppInventoryNow(params, appCache, {
+		forceRefetch: false,
+		reason: "account_apps_all",
+		targetAppIds: []
+	});
+	if (!snapshot) return {
+		apps: [],
+		diagnostic: {
+			code: "account_app_inventory_unavailable",
+			message: "Codex account app inventory was unavailable; account apps were not exposed."
+		}
+	};
+	return { apps: snapshot.apps.filter((app) => app.isAccessible).toSorted((left, right) => left.id.localeCompare(right.id)) };
+}
+function toOwnedAccountApp(app) {
+	return {
+		id: app.id,
+		name: app.name,
+		accessible: app.isAccessible,
+		enabled: app.isEnabled,
+		needsAuth: !app.isAccessible
+	};
+}
 function resolveThreadConfigAppsForRecord(params) {
 	if (params.inventory.appInventory?.state === "missing") return [];
 	return params.record.apps;
@@ -913,6 +914,7 @@ function shouldForceRefreshForNotReadyPluginApps(params, policy, inventory) {
 function policyFingerprint(policy) {
 	return {
 		enabled: policy.enabled,
+		allowAllPlugins: policy.allowAllPlugins,
 		allowDestructiveActions: policy.allowDestructiveActions,
 		destructiveApprovalMode: policy.destructiveApprovalMode,
 		plugins: policy.pluginPolicies.map((plugin) => ({
@@ -945,6 +947,127 @@ function stableStringify(value) {
 	return JSON.stringify(value);
 }
 //#endregion
+//#region extensions/codex/src/app-server/attempt-client-cleanup.ts
+/**
+* Best-effort cleanup helpers for Codex app-server startup attempts and turns.
+*/
+/** Timeout for best-effort app-server turn interruption during cleanup. */
+const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
+/** Timeout for best-effort thread unsubscribe during cleanup. */
+const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
+/** Raised when a thread subscription may be live on a client OpenClaw no longer controls. */
+var CodexAppServerUnsafeSubscriptionError = class extends Error {
+	constructor(message, options) {
+		super(message, options);
+		this.name = "CodexAppServerUnsafeSubscriptionError";
+	}
+};
+function isCodexAppServerUnsafeSubscriptionError(error) {
+	return error instanceof CodexAppServerUnsafeSubscriptionError;
+}
+/** Asserts Codex resumed the exact thread this attempt subscribed to. */
+function assertCodexThreadResumeSubscription(requestedThreadId, returnedThreadId) {
+	if (returnedThreadId !== requestedThreadId) throw new CodexAppServerUnsafeSubscriptionError(`Codex thread/resume returned ${returnedThreadId} for ${requestedThreadId}`);
+}
+async function closeClientAndWaitIfAvailable(client) {
+	const closeable = client;
+	if (typeof closeable.closeAndWait === "function") {
+		await closeable.closeAndWait();
+		return;
+	}
+	closeable.close?.();
+}
+async function closeCodexStartupClientBestEffort(client) {
+	if (!client) return;
+	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
+	if (unclaimedSharedClient.closed) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (unclaimedSharedClient.found) {
+		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	if (retiredSharedClient) {
+		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (clearSharedCodexAppServerClientIfCurrent(client)) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	await closeClientAndWaitIfAvailable(client);
+}
+/** Sends a turn interrupt without blocking abort cleanup on app-server errors. */
+function interruptCodexTurnBestEffort(client, params) {
+	const requestOptions = params.timeoutMs && Number.isFinite(params.timeoutMs) && params.timeoutMs > 0 ? { timeoutMs: params.timeoutMs } : void 0;
+	const requestParams = {
+		threadId: params.threadId,
+		turnId: params.turnId
+	};
+	try {
+		const interrupt = requestOptions ? client.request("turn/interrupt", requestParams, requestOptions) : client.request("turn/interrupt", requestParams);
+		Promise.resolve(interrupt).catch((error) => {
+			embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
+		});
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
+	}
+}
+/** Unsubscribes from a thread while swallowing cleanup-only failures. */
+async function unsubscribeCodexThreadBestEffort(client, params) {
+	try {
+		await client.request("thread/unsubscribe", { threadId: params.threadId }, { timeoutMs: params.timeoutMs });
+		return true;
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server thread unsubscribe cleanup failed", {
+			threadId: params.threadId,
+			error
+		});
+		return false;
+	}
+}
+/**
+* Retires the shared client after a timed-out turn so later runs do not reuse a
+* potentially wedged app-server connection.
+*/
+async function retireCodexAppServerClientAfterTimedOutTurn(client, params) {
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	const detachedSharedClient = Boolean(retiredSharedClient);
+	interruptCodexTurnBestEffort(client, {
+		threadId: params.threadId,
+		turnId: params.turnId,
+		timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS
+	});
+	await unsubscribeCodexThreadBestEffort(client, {
+		threadId: params.threadId,
+		timeoutMs: CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS
+	});
+	let closedClient = retiredSharedClient?.closed ?? false;
+	if (!detachedSharedClient) {
+		const close = client.close;
+		if (typeof close === "function") try {
+			close.call(client);
+			closedClient = true;
+		} catch (error) {
+			embeddedAgentLog.debug("codex app-server client close failed during timeout cleanup", {
+				threadId: params.threadId,
+				turnId: params.turnId,
+				error
+			});
+		}
+	}
+	embeddedAgentLog.warn("codex app-server client retired after timed-out turn", {
+		threadId: params.threadId,
+		turnId: params.turnId,
+		reason: params.reason,
+		detachedSharedClient,
+		closedClient,
+		activeSharedClientLeases: retiredSharedClient?.activeLeases ?? 0
+	});
+}
+//#endregion
 //#region extensions/codex/src/app-server/context-engine-projection.ts
 const CONTEXT_HEADER = "OpenClaw assembled context for this turn:";
 const CONTEXT_OPEN = "<conversation_context>";
@@ -1111,7 +1234,7 @@ function renderToolResultPayload(record) {
 	}
 	return payload;
 }
-const TOOL_PAYLOAD_METADATA_KEYS = new Set([
+const TOOL_PAYLOAD_METADATA_KEYS = /* @__PURE__ */ new Set([
 	"type",
 	"name",
 	"id",
@@ -1345,6 +1468,31 @@ function isCodexAppServerProfilerEnabled(config, env = process.env) {
 	return PROFILER_FLAGS.some((flag) => isDiagnosticFlagEnabled(flag, config, env));
 }
 //#endregion
+//#region extensions/codex/src/app-server/thread-resume.ts
+/** Owns Codex thread/resume subscription safety. */
+/** Resumes one thread and retires the physical client when acceptance is indeterminate. */
+async function resumeCodexAppServerThread(params) {
+	const threadId = params.request.threadId;
+	let response;
+	try {
+		response = assertCodexThreadResumeResponse(await params.client.request("thread/resume", params.request, {
+			...params.timeoutMs !== void 0 ? { timeoutMs: params.timeoutMs } : {},
+			...params.signal ? { signal: params.signal } : {}
+		}));
+		assertCodexThreadResumeSubscription(threadId, response.thread.id);
+	} catch (error) {
+		if (error instanceof CodexAppServerRpcError) throw error;
+		try {
+			await params.abandonClient();
+		} catch (abandonError) {
+			throw new CodexAppServerUnsafeSubscriptionError(`Codex thread/resume client could not be retired for ${threadId}`, { cause: abandonError });
+		}
+		if (error instanceof CodexAppServerUnsafeSubscriptionError) throw error;
+		throw new CodexAppServerUnsafeSubscriptionError(error instanceof Error ? error.message : `Codex thread/resume outcome is indeterminate for ${threadId}`, { cause: error });
+	}
+	return response;
+}
+//#endregion
 //#region extensions/codex/src/app-server/web-search.ts
 const CODEX_NATIVE_WEB_SEARCH_DISABLED_CONFIG = {
 	"features.standalone_web_search": false,
@@ -1419,6 +1567,12 @@ var CodexThreadStartRequestError = class extends Error {
 		this.name = "CodexThreadStartRequestError";
 	}
 };
+var CodexThreadBindingConflictError = class extends Error {
+	constructor(threadId, operation) {
+		super(`Codex thread binding changed while ${operation}: ${threadId}`);
+		this.name = "CodexThreadBindingConflictError";
+	}
+};
 const CODEX_NATIVE_PERSONALITY_NONE = "none";
 const CODEX_CODE_MODE_THREAD_CONFIG = {
 	"features.code_mode": true,
@@ -1519,228 +1673,365 @@ function createCodexThreadLifecycleTimingTracker(options = {}) {
 	};
 }
 async function startOrResumeThread(params) {
-	const lifecycleTiming = createCodexThreadLifecycleTimingTracker({
-		...params.timing,
-		enabled: params.timing?.enabled ?? isCodexAppServerProfilerEnabled(params.params.config)
-	});
-	const dynamicToolsFingerprint = lifecycleTiming.measureSync("dynamic-tools-fingerprint", () => fingerprintDynamicTools(params.dynamicTools));
-	const dynamicToolsContainDeferred = flattenCodexDynamicToolFunctions(params.dynamicTools).some((tool) => tool.deferLoading === true);
-	const webSearchThreadConfigFingerprint = fingerprintJsonObject(lifecycleTiming.measureSync("web-search-plan", () => resolveCodexWebSearchPlan({
-		config: params.params.config,
-		disableTools: params.params.disableTools,
-		nativeToolSurfaceEnabled: params.nativeCodeModeEnabled,
-		nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
-		webSearchAllowed: params.webSearchAllowed
-	})).threadConfig);
-	const networkProxyConfigFingerprint = params.appServer.networkProxy?.configFingerprint;
-	const contextEngineBinding = lifecycleTiming.measureSync("context-engine-binding", () => buildContextEngineBinding(params.params, params.contextEngineProjection));
-	const userMcpServersConfigPatch = params.userMcpServersEnabled === false ? void 0 : buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
-	const userMcpServersFingerprint = fingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
-	const environmentSelectionFingerprint = fingerprintEnvironmentSelection(params.environmentSelection);
-	let binding = await lifecycleTiming.measure("read-binding", () => readCodexAppServerBinding(params.params.sessionFile, {
-		authProfileStore: params.params.authProfileStore,
-		agentDir: params.params.agentDir,
-		config: params.params.config
-	}));
-	if (binding?.threadId && shouldRotateCodexAppServerBindingForRuntime({
-		connectionClass: params.appServer.connectionClass,
-		current: params.appServerRuntimeFingerprint,
-		binding: binding.appServerRuntimeFingerprint
-	})) {
-		embeddedAgentLog.debug("codex app-server runtime identity changed; starting a new thread", {
-			threadId: binding.threadId,
-			connectionClass: params.appServer.connectionClass
-		});
-		await clearCodexAppServerBinding(params.params.sessionFile);
-		binding = void 0;
-	}
-	const startModelSelection = resolveCodexAppServerThreadModelSelection({
-		provider: params.params.provider,
-		model: params.params.modelId,
-		binding,
-		authProfileId: params.params.authProfileId,
-		authProfileStore: params.params.authProfileStore,
-		agentDir: params.params.agentDir,
+	const bindingIdentity = sessionBindingIdentity({
+		sessionId: params.params.sessionId,
+		sessionKey: params.params.sessionKey,
+		agentId: params.agentId ?? params.params.agentId,
 		config: params.params.config
 	});
-	const startModelProvider = startModelSelection.modelProvider;
-	let preserveExistingBinding = params.nativeProviderWebSearchSupport === "unknown" && !binding?.threadId;
-	let rotatedContextEngineBinding = false;
-	let prebuiltPluginThreadConfig;
-	const throwIfAborted = () => {
-		if (!params.signal?.aborted) return;
-		const reason = params.signal.reason;
-		if (reason instanceof Error) throw reason;
-		const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "codex app-server thread lifecycle aborted");
-		error.name = "AbortError";
-		throw error;
-	};
-	const webSearchBindingChanged = binding?.threadId && binding.webSearchThreadConfigFingerprint !== webSearchThreadConfigFingerprint;
-	const persistentWebSearchRestriction = params.webSearchAllowed === false && params.persistentWebSearchAllowed === false;
-	const transientNativeToolRestriction = params.nativeCodeModeEnabled === false && !persistentWebSearchRestriction;
-	const transientWebSearchRestriction = isTransientWebSearchRestriction(params);
-	const explicitTransientWebSearchRestriction = params.webSearchAllowed === false && params.persistentWebSearchAllowed !== false && transientWebSearchRestriction;
-	const unknownProviderWebSearchSupport = params.nativeProviderWebSearchSupport === "unknown";
-	if (binding?.threadId && params.mcpServersFingerprintEvaluated === true && binding.mcpServersFingerprint !== params.mcpServersFingerprint) {
-		if (transientNativeToolRestriction || webSearchBindingChanged && (explicitTransientWebSearchRestriction || unknownProviderWebSearchSupport)) {
-			embeddedAgentLog.debug("codex app-server MCP config changed during transient restricted turn; starting transient thread", { threadId: binding.threadId });
-			preserveExistingBinding = true;
-		} else {
-			embeddedAgentLog.debug("codex app-server MCP config changed; starting a new thread", { threadId: binding.threadId });
-			await clearCodexAppServerBinding(params.params.sessionFile);
-		}
-		binding = void 0;
-	}
-	const deferLegacyWebSearchRotationToTransientNativeSurface = params.nativeCodeModeEnabled === false && binding?.webSearchThreadConfigFingerprint === void 0 && !persistentWebSearchRestriction;
-	if (binding?.threadId && webSearchBindingChanged && !deferLegacyWebSearchRotationToTransientNativeSurface) {
-		if (transientWebSearchRestriction) {
-			embeddedAgentLog.debug("codex app-server web search restricted for turn; starting transient thread", { threadId: binding.threadId });
-			preserveExistingBinding = true;
-		} else {
-			embeddedAgentLog.debug("codex app-server web search config changed; starting a new thread", { threadId: binding.threadId });
-			await clearCodexAppServerBinding(params.params.sessionFile);
+	return await params.bindingStore.withLease(bindingIdentity, async () => {
+		const lifecycleTiming = createCodexThreadLifecycleTimingTracker({
+			...params.timing,
+			enabled: params.timing?.enabled ?? isCodexAppServerProfilerEnabled(params.params.config)
+		});
+		const dynamicToolsFingerprint = lifecycleTiming.measureSync("dynamic-tools-fingerprint", () => fingerprintDynamicTools(params.dynamicTools));
+		const dynamicToolsContainDeferred = flattenCodexDynamicToolFunctions(params.dynamicTools).some((tool) => tool.deferLoading === true);
+		const webSearchThreadConfigFingerprint = fingerprintJsonObject(lifecycleTiming.measureSync("web-search-plan", () => resolveCodexWebSearchPlan({
+			config: params.params.config,
+			disableTools: params.params.disableTools,
+			nativeToolSurfaceEnabled: params.nativeCodeModeEnabled,
+			nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
+			webSearchAllowed: params.webSearchAllowed
+		})).threadConfig);
+		const networkProxyConfigFingerprint = params.appServer.networkProxy?.configFingerprint;
+		const contextEngineBinding = lifecycleTiming.measureSync("context-engine-binding", () => buildContextEngineBinding(params.params, params.contextEngineProjection));
+		const userMcpServersConfigPatch = params.userMcpServersEnabled === false ? void 0 : buildCodexUserMcpServersThreadConfigPatch(params.params.config, { agentId: params.agentId ?? params.params.agentId });
+		const userMcpServersFingerprint = fingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
+		const environmentSelectionFingerprint = fingerprintEnvironmentSelection(params.environmentSelection);
+		let binding = await lifecycleTiming.measure("read-binding", () => params.bindingStore.read(bindingIdentity));
+		const normalizeBindingModelProvider = (authProfileId, modelProvider) => normalizeCodexAppServerBindingModelProvider({
+			authProfileId,
+			modelProvider,
+			authProfileStore: params.params.authProfileStore,
+			agentDir: params.params.agentDir,
+			config: params.params.config
+		});
+		if (!binding && bindingIdentity.kind === "session" && bindingIdentity.sessionKey) {
+			if (!await lifecycleTiming.measure("reclaim-binding-generation", () => reclaimCurrentCodexSessionGeneration({
+				bindingStore: params.bindingStore,
+				identity: bindingIdentity,
+				config: params.params.config
+			}))) throw new Error(`Codex session generation is no longer current: ${bindingIdentity.sessionId}`);
 		}
-		binding = void 0;
-	}
-	if (binding?.threadId && transientNativeToolRestriction) {
-		embeddedAgentLog.debug("codex app-server native tool surface disabled for turn; starting transient thread", { threadId: binding.threadId });
-		preserveExistingBinding = true;
-		binding = void 0;
-	}
-	if (binding?.threadId && (binding.contextEngine || contextEngineBinding)) {
-		if (!contextEngineBinding || !isContextEngineBindingCompatible(binding.contextEngine, contextEngineBinding)) {
-			embeddedAgentLog.debug("codex app-server context-engine binding changed; starting a new thread", {
+		const clearCurrentBinding = async (operation) => {
+			const current = binding;
+			if (!current?.threadId) return;
+			if (!await params.bindingStore.mutate(bindingIdentity, {
+				kind: "clear",
+				threadId: current.threadId
+			})) throw new CodexThreadBindingConflictError(current.threadId, operation);
+			binding = void 0;
+		};
+		if (binding?.threadId && shouldRotateCodexAppServerBindingForRuntime({
+			connectionClass: params.appServer.connectionClass,
+			current: params.appServerRuntimeFingerprint,
+			binding: binding.appServerRuntimeFingerprint
+		})) {
+			embeddedAgentLog.debug("codex app-server runtime identity changed; starting a new thread", {
 				threadId: binding.threadId,
-				engineId: contextEngineBinding?.engineId,
-				previousEngineId: binding.contextEngine?.engineId,
-				epoch: contextEngineBinding?.projection?.epoch,
-				previousEpoch: binding.contextEngine?.projection?.epoch,
-				fingerprint: contextEngineBinding?.projection?.fingerprint,
-				previousFingerprint: binding.contextEngine?.projection?.fingerprint,
-				policyFingerprint: contextEngineBinding?.policyFingerprint,
-				previousPolicyFingerprint: binding.contextEngine?.policyFingerprint
+				connectionClass: params.appServer.connectionClass
 			});
-			await clearCodexAppServerBinding(params.params.sessionFile);
+			await clearCurrentBinding("rotating a stale thread binding");
 			binding = void 0;
-			rotatedContextEngineBinding = true;
 		}
-	}
-	if (binding?.threadId && binding.userMcpServersFingerprint !== userMcpServersFingerprint) {
-		embeddedAgentLog.debug("codex app-server user MCP config changed; starting a new thread", { threadId: binding.threadId });
-		await clearCodexAppServerBinding(params.params.sessionFile);
-		binding = void 0;
-	}
-	if (binding?.threadId && binding.environmentSelectionFingerprint !== environmentSelectionFingerprint) {
-		embeddedAgentLog.debug("codex app-server environment selection changed; starting a new thread", { threadId: binding.threadId });
-		await clearCodexAppServerBinding(params.params.sessionFile);
-		binding = void 0;
-	}
-	if (binding?.threadId && (binding.networkProxyConfigFingerprint !== networkProxyConfigFingerprint || binding.networkProxyProfileName !== params.appServer.networkProxy?.profileName)) {
-		embeddedAgentLog.debug("codex app-server network proxy config changed; starting a new thread", { threadId: binding.threadId });
-		await clearCodexAppServerBinding(params.params.sessionFile);
-		binding = void 0;
-	}
-	if (binding?.threadId) {
-		let pluginBindingStale = isCodexPluginThreadBindingStale({
-			codexPluginsEnabled: params.pluginThreadConfig?.enabled ?? false,
-			bindingFingerprint: binding.pluginAppsFingerprint,
-			bindingInputFingerprint: binding.pluginAppsInputFingerprint,
-			currentInputFingerprint: params.pluginThreadConfig?.inputFingerprint,
-			hasBindingPolicyContext: Boolean(binding.pluginAppPolicyContext)
-		});
-		if (!pluginBindingStale && shouldRecheckRecoverablePluginBinding({
+		const startModelSelection = resolveCodexAppServerThreadModelSelection({
+			provider: params.params.provider,
+			model: params.params.modelId,
 			binding,
-			pluginThreadConfig: params.pluginThreadConfig
-		})) try {
-			prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin-config-recovery", () => params.pluginThreadConfig?.build());
-			pluginBindingStale = prebuiltPluginThreadConfig?.fingerprint !== binding.pluginAppsFingerprint;
-		} catch (error) {
-			embeddedAgentLog.warn("codex app-server plugin app config recovery check failed", {
-				error,
-				threadId: binding.threadId
-			});
+			authProfileId: params.params.authProfileId,
+			authProfileStore: params.params.authProfileStore,
+			agentDir: params.params.agentDir,
+			config: params.params.config
+		});
+		const startModelProvider = startModelSelection.modelProvider;
+		let preserveExistingBinding = params.nativeProviderWebSearchSupport === "unknown" && !binding?.threadId;
+		let rotatedContextEngineBinding = false;
+		let prebuiltPluginThreadConfig;
+		const throwIfAborted = () => {
+			if (!params.signal?.aborted) return;
+			const reason = params.signal.reason;
+			if (reason instanceof Error) throw reason;
+			const error = new Error(typeof reason === "string" && reason.length > 0 ? reason : "codex app-server thread lifecycle aborted");
+			error.name = "AbortError";
+			throw error;
+		};
+		const webSearchBindingChanged = binding?.threadId && binding.webSearchThreadConfigFingerprint !== webSearchThreadConfigFingerprint;
+		const persistentWebSearchRestriction = params.webSearchAllowed === false && params.persistentWebSearchAllowed === false;
+		const transientNativeToolRestriction = params.nativeCodeModeEnabled === false && !persistentWebSearchRestriction;
+		const transientWebSearchRestriction = isTransientWebSearchRestriction(params);
+		const explicitTransientWebSearchRestriction = params.webSearchAllowed === false && params.persistentWebSearchAllowed !== false && transientWebSearchRestriction;
+		const unknownProviderWebSearchSupport = params.nativeProviderWebSearchSupport === "unknown";
+		if (binding?.threadId && params.mcpServersFingerprintEvaluated === true && binding.mcpServersFingerprint !== params.mcpServersFingerprint) {
+			if (transientNativeToolRestriction || webSearchBindingChanged && (explicitTransientWebSearchRestriction || unknownProviderWebSearchSupport)) {
+				embeddedAgentLog.debug("codex app-server MCP config changed during transient restricted turn; starting transient thread", { threadId: binding.threadId });
+				preserveExistingBinding = true;
+			} else {
+				embeddedAgentLog.debug("codex app-server MCP config changed; starting a new thread", { threadId: binding.threadId });
+				await clearCurrentBinding("rotating a stale thread binding");
+			}
+			binding = void 0;
 		}
-		if (pluginBindingStale) {
-			embeddedAgentLog.debug("codex app-server plugin app config changed; starting a new thread", { threadId: binding.threadId });
-			await clearCodexAppServerBinding(params.params.sessionFile);
+		const deferLegacyWebSearchRotationToTransientNativeSurface = params.nativeCodeModeEnabled === false && binding?.webSearchThreadConfigFingerprint === void 0 && !persistentWebSearchRestriction;
+		if (binding?.threadId && webSearchBindingChanged && !deferLegacyWebSearchRotationToTransientNativeSurface) {
+			if (transientWebSearchRestriction) {
+				embeddedAgentLog.debug("codex app-server web search restricted for turn; starting transient thread", { threadId: binding.threadId });
+				preserveExistingBinding = true;
+			} else {
+				embeddedAgentLog.debug("codex app-server web search config changed; starting a new thread", { threadId: binding.threadId });
+				await clearCurrentBinding("rotating a stale thread binding");
+			}
 			binding = void 0;
 		}
-	}
-	if (binding?.threadId) {
-		if (binding.dynamicToolsFingerprint && params.dynamicTools.length > 0 && binding.dynamicToolsContainDeferred !== dynamicToolsContainDeferred && (binding.dynamicToolsContainDeferred !== void 0 || !dynamicToolsContainDeferred)) {
-			embeddedAgentLog.debug("codex app-server dynamic tool loading changed; starting a new thread", { threadId: binding.threadId });
-			await clearCodexAppServerBinding(params.params.sessionFile);
+		if (binding?.threadId && transientNativeToolRestriction) {
+			embeddedAgentLog.debug("codex app-server native tool surface disabled for turn; starting transient thread", { threadId: binding.threadId });
+			preserveExistingBinding = true;
 			binding = void 0;
 		}
-	}
-	if (binding?.threadId) if (binding.dynamicToolsFingerprint && !areDynamicToolFingerprintsCompatible(binding.dynamicToolsFingerprint, dynamicToolsFingerprint)) {
-		preserveExistingBinding = shouldStartTransientNoToolThread({
-			previous: binding.dynamicToolsFingerprint,
-			next: dynamicToolsFingerprint
-		});
-		if (preserveExistingBinding) embeddedAgentLog.debug("codex app-server dynamic tools unavailable for turn; starting transient thread", { threadId: binding.threadId });
-		else {
-			embeddedAgentLog.debug("codex app-server dynamic tool catalog changed; starting a new thread", { threadId: binding.threadId });
-			await clearCodexAppServerBinding(params.params.sessionFile);
+		if (binding?.threadId && (binding.contextEngine || contextEngineBinding)) {
+			if (!contextEngineBinding || !isContextEngineBindingCompatible(binding.contextEngine, contextEngineBinding)) {
+				embeddedAgentLog.debug("codex app-server context-engine binding changed; starting a new thread", {
+					threadId: binding.threadId,
+					engineId: contextEngineBinding?.engineId,
+					previousEngineId: binding.contextEngine?.engineId,
+					epoch: contextEngineBinding?.projection?.epoch,
+					previousEpoch: binding.contextEngine?.projection?.epoch,
+					fingerprint: contextEngineBinding?.projection?.fingerprint,
+					previousFingerprint: binding.contextEngine?.projection?.fingerprint,
+					policyFingerprint: contextEngineBinding?.policyFingerprint,
+					previousPolicyFingerprint: binding.contextEngine?.policyFingerprint
+				});
+				await clearCurrentBinding("rotating a stale thread binding");
+				binding = void 0;
+				rotatedContextEngineBinding = true;
+			}
 		}
-	} else {
-		const resumeBinding = binding;
-		try {
-			const authProfileId = params.params.authProfileId ?? resumeBinding.authProfileId;
-			const finalConfigPatch = params.buildFinalConfigPatch?.({
-				action: "resume",
-				binding: resumeBinding
-			}) ?? {
-				configPatch: params.finalConfigPatch,
-				nativeHookRelayGeneration: params.nativeHookRelayGeneration
-			};
-			const pluginAppsConfigPatch = params.pluginThreadConfig?.enabled && resumeBinding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(resumeBinding.pluginAppPolicyContext) : void 0;
-			const resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginAppsConfigPatch, finalConfigPatch.configPatch);
-			const resumeParams = lifecycleTiming.measureSync("thread-resume-params", () => buildThreadResumeParams(params.params, {
-				threadId: resumeBinding.threadId,
-				authProfileId,
-				model: startModelSelection.model,
-				modelProvider: startModelProvider,
-				appServer: params.appServer,
-				dynamicTools: params.dynamicTools,
-				developerInstructions: params.developerInstructions,
-				config: resumeConfig,
-				nativeCodeModeEnabled: params.nativeCodeModeEnabled,
-				nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
-				nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
-				webSearchAllowed: params.webSearchAllowed
-			}));
-			const requestModelProvider = typeof resumeParams.modelProvider === "string" && resumeParams.modelProvider.trim() ? resumeParams.modelProvider : void 0;
-			const response = assertCodexThreadResumeResponse(await lifecycleTiming.measure("thread-resume-request", () => params.client.request("thread/resume", resumeParams, { signal: params.signal })));
-			throwIfAborted();
-			const boundAuthProfileId = authProfileId;
-			const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : resumeBinding.mcpServersFingerprint;
-			await lifecycleTiming.measure("thread-resume-write-binding", () => writeCodexAppServerBinding(params.params.sessionFile, {
-				threadId: response.thread.id,
-				cwd: params.cwd,
-				authProfileId: boundAuthProfileId,
-				model: response.model ?? resumeParams.model ?? params.params.modelId,
-				modelProvider: response.modelProvider ?? requestModelProvider ?? startModelProvider,
-				dynamicToolsFingerprint,
-				dynamicToolsContainDeferred,
-				webSearchThreadConfigFingerprint,
-				userMcpServersFingerprint,
-				mcpServersFingerprint: nextMcpServersFingerprint,
-				networkProxyProfileName: params.appServer.networkProxy?.profileName,
-				networkProxyConfigFingerprint,
-				nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? resumeBinding.nativeHookRelayGeneration,
-				appServerRuntimeFingerprint: params.appServerRuntimeFingerprint,
-				pluginAppsFingerprint: resumeBinding.pluginAppsFingerprint,
-				pluginAppsInputFingerprint: resumeBinding.pluginAppsInputFingerprint,
-				pluginAppPolicyContext: resumeBinding.pluginAppPolicyContext,
-				contextEngine: contextEngineBinding,
-				environmentSelectionFingerprint,
-				createdAt: resumeBinding.createdAt
-			}, {
-				authProfileStore: params.params.authProfileStore,
-				agentDir: params.params.agentDir,
-				config: params.params.config
-			}));
+		if (binding?.threadId && binding.userMcpServersFingerprint !== userMcpServersFingerprint) {
+			embeddedAgentLog.debug("codex app-server user MCP config changed; starting a new thread", { threadId: binding.threadId });
+			await clearCurrentBinding("rotating a stale thread binding");
+			binding = void 0;
+		}
+		if (binding?.threadId && binding.environmentSelectionFingerprint !== environmentSelectionFingerprint) {
+			embeddedAgentLog.debug("codex app-server environment selection changed; starting a new thread", { threadId: binding.threadId });
+			await clearCurrentBinding("rotating a stale thread binding");
+			binding = void 0;
+		}
+		if (binding?.threadId && (binding.networkProxyConfigFingerprint !== networkProxyConfigFingerprint || binding.networkProxyProfileName !== params.appServer.networkProxy?.profileName)) {
+			embeddedAgentLog.debug("codex app-server network proxy config changed; starting a new thread", { threadId: binding.threadId });
+			await clearCurrentBinding("rotating a stale thread binding");
+			binding = void 0;
+		}
+		if (binding?.threadId) {
+			let pluginBindingStale = isCodexPluginThreadBindingStale({
+				codexPluginsEnabled: params.pluginThreadConfig?.enabled ?? false,
+				bindingFingerprint: binding.pluginAppsFingerprint,
+				bindingInputFingerprint: binding.pluginAppsInputFingerprint,
+				currentInputFingerprint: params.pluginThreadConfig?.inputFingerprint,
+				hasBindingPolicyContext: Boolean(binding.pluginAppPolicyContext)
+			});
+			if (!pluginBindingStale && shouldRecheckRecoverablePluginBinding({
+				binding,
+				pluginThreadConfig: params.pluginThreadConfig
+			})) try {
+				prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin-config-recovery", () => params.pluginThreadConfig?.build());
+				pluginBindingStale = prebuiltPluginThreadConfig?.fingerprint !== binding.pluginAppsFingerprint;
+			} catch (error) {
+				embeddedAgentLog.warn("codex app-server plugin app config recovery check failed", {
+					error,
+					threadId: binding.threadId
+				});
+			}
+			if (pluginBindingStale) {
+				embeddedAgentLog.debug("codex app-server plugin app config changed; starting a new thread", { threadId: binding.threadId });
+				await clearCurrentBinding("rotating a stale thread binding");
+				binding = void 0;
+			}
+		}
+		if (binding?.threadId) {
+			if (binding.dynamicToolsFingerprint && params.dynamicTools.length > 0 && binding.dynamicToolsContainDeferred !== dynamicToolsContainDeferred && (binding.dynamicToolsContainDeferred !== void 0 || !dynamicToolsContainDeferred)) {
+				embeddedAgentLog.debug("codex app-server dynamic tool loading changed; starting a new thread", { threadId: binding.threadId });
+				await clearCurrentBinding("rotating a stale thread binding");
+				binding = void 0;
+			}
+		}
+		if (binding?.threadId) if (binding.dynamicToolsFingerprint && !areDynamicToolFingerprintsCompatible(binding.dynamicToolsFingerprint, dynamicToolsFingerprint)) {
+			preserveExistingBinding = shouldStartTransientNoToolThread({
+				previous: binding.dynamicToolsFingerprint,
+				next: dynamicToolsFingerprint
+			});
+			if (preserveExistingBinding) embeddedAgentLog.debug("codex app-server dynamic tools unavailable for turn; starting transient thread", { threadId: binding.threadId });
+			else {
+				embeddedAgentLog.debug("codex app-server dynamic tool catalog changed; starting a new thread", { threadId: binding.threadId });
+				await clearCurrentBinding("rotating a stale thread binding");
+			}
+		} else {
+			const resumeBinding = binding;
+			let resumeReservation;
+			try {
+				const authProfileId = params.params.authProfileId ?? resumeBinding.authProfileId;
+				const finalConfigPatch = params.buildFinalConfigPatch?.({
+					action: "resume",
+					binding: resumeBinding
+				}) ?? {
+					configPatch: params.finalConfigPatch,
+					nativeHookRelayGeneration: params.nativeHookRelayGeneration
+				};
+				const pluginAppsConfigPatch = params.pluginThreadConfig?.enabled && resumeBinding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(resumeBinding.pluginAppPolicyContext) : void 0;
+				const resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginAppsConfigPatch, finalConfigPatch.configPatch);
+				const resumeParams = lifecycleTiming.measureSync("thread-resume-params", () => buildThreadResumeParams(params.params, {
+					threadId: resumeBinding.threadId,
+					authProfileId,
+					model: startModelSelection.model,
+					modelProvider: startModelProvider,
+					appServer: params.appServer,
+					dynamicTools: params.dynamicTools,
+					developerInstructions: params.developerInstructions,
+					config: resumeConfig,
+					nativeCodeModeEnabled: params.nativeCodeModeEnabled,
+					nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
+					nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
+					webSearchAllowed: params.webSearchAllowed
+				}));
+				const requestModelProvider = typeof resumeParams.modelProvider === "string" && resumeParams.modelProvider.trim() ? resumeParams.modelProvider : void 0;
+				throwIfAborted();
+				resumeReservation = params.reserveResumeThread?.(resumeBinding.threadId);
+				const response = await lifecycleTiming.measure("thread-resume-request", () => resumeCodexAppServerThread({
+					client: params.client,
+					abandonClient: params.abandonClient ?? (() => closeCodexStartupClientBestEffort(params.client)),
+					request: resumeParams,
+					signal: params.signal
+				}));
+				throwIfAborted();
+				const boundAuthProfileId = authProfileId;
+				const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : resumeBinding.mcpServersFingerprint;
+				const resumePatch = {
+					cwd: params.cwd,
+					authProfileId: boundAuthProfileId,
+					model: response.model ?? resumeParams.model ?? params.params.modelId,
+					modelProvider: normalizeBindingModelProvider(boundAuthProfileId, response.modelProvider ?? requestModelProvider ?? startModelProvider),
+					dynamicToolsFingerprint,
+					dynamicToolsContainDeferred,
+					webSearchThreadConfigFingerprint,
+					userMcpServersFingerprint,
+					mcpServersFingerprint: nextMcpServersFingerprint,
+					networkProxyProfileName: params.appServer.networkProxy?.profileName,
+					networkProxyConfigFingerprint,
+					nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? resumeBinding.nativeHookRelayGeneration,
+					appServerRuntimeFingerprint: params.appServerRuntimeFingerprint,
+					pluginAppsFingerprint: resumeBinding.pluginAppsFingerprint,
+					pluginAppsInputFingerprint: resumeBinding.pluginAppsInputFingerprint,
+					pluginAppPolicyContext: resumeBinding.pluginAppPolicyContext,
+					contextEngine: contextEngineBinding,
+					environmentSelectionFingerprint
+				};
+				if (!await lifecycleTiming.measure("thread-resume-write-binding", () => params.bindingStore.mutate(bindingIdentity, {
+					kind: "patch",
+					threadId: resumeBinding.threadId,
+					patch: resumePatch
+				}))) throw new CodexThreadBindingConflictError(resumeBinding.threadId, "committing a resumed thread");
+				if (contextEngineBinding) embeddedAgentLog.info("codex app-server wrote context-engine thread binding", {
+					sessionId: params.params.sessionId,
+					sessionKey: params.params.sessionKey,
+					threadId: response.thread.id,
+					engineId: contextEngineBinding.engineId,
+					epoch: contextEngineBinding.projection?.epoch,
+					fingerprint: contextEngineBinding.projection?.fingerprint,
+					action: "resumed"
+				});
+				lifecycleTiming.mark("thread-ready");
+				lifecycleTiming.logSummary({
+					runId: params.params.runId,
+					sessionId: params.params.sessionId,
+					sessionKey: params.params.sessionKey,
+					threadId: response.thread.id,
+					action: "resumed"
+				});
+				const activeTurnIds = readActiveCodexTurnIds(response.thread);
+				return {
+					...resumeBinding,
+					threadId: response.thread.id,
+					...resumePatch,
+					lifecycle: {
+						action: "resumed",
+						...activeTurnIds.length ? { activeTurnIds } : {}
+					}
+				};
+			} catch (error) {
+				resumeReservation?.release();
+				if (isCodexAppServerUnsafeSubscriptionError(error)) throw error;
+				const resumeRejected = error instanceof CodexAppServerRpcError;
+				if (!await unsubscribeCodexThreadBestEffort(params.client, {
+					threadId: resumeBinding.threadId,
+					timeoutMs: 5e3
+				}) && !resumeRejected && !isCodexAppServerConnectionClosedError(error) && !params.signal?.aborted) throw new CodexAppServerUnsafeSubscriptionError("Codex thread/resume subscription cleanup failed", { cause: error });
+				if (isCodexAppServerConnectionClosedError(error) || params.signal?.aborted) throw error;
+				embeddedAgentLog.warn("codex app-server thread resume failed; starting a new thread", { error });
+				await clearCurrentBinding("rotating a stale thread binding");
+			}
+		}
+		const pluginThreadConfig = params.pluginThreadConfig?.enabled ? prebuiltPluginThreadConfig ?? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0;
+		const finalConfigPatch = params.buildFinalConfigPatch?.({ action: "start" }) ?? {
+			configPatch: params.finalConfigPatch,
+			nativeHookRelayGeneration: params.nativeHookRelayGeneration
+		};
+		const config = lifecycleTiming.measureSync("merge-thread-config", () => mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginThreadConfig?.configPatch, finalConfigPatch.configPatch));
+		const startParams = lifecycleTiming.measureSync("thread-start-params", () => buildThreadStartParams(params.params, {
+			cwd: params.cwd,
+			dynamicTools: params.dynamicTools,
+			appServer: params.appServer,
+			developerInstructions: params.developerInstructions,
+			config,
+			nativeCodeModeEnabled: params.nativeCodeModeEnabled,
+			nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
+			nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
+			webSearchAllowed: params.webSearchAllowed,
+			environmentSelection: params.environmentSelection,
+			model: startModelSelection.model,
+			modelProvider: startModelProvider
+		}));
+		const requestModelProvider = typeof startParams.modelProvider === "string" && startParams.modelProvider.trim() ? startParams.modelProvider : void 0;
+		const response = assertCodexThreadStartResponse(await lifecycleTiming.measure("thread-start-request", async () => {
+			try {
+				return await params.client.request("thread/start", startParams, { signal: params.signal });
+			} catch (error) {
+				if (error instanceof CodexAppServerRpcError) throw new CodexThreadStartRequestError(error);
+				throw error;
+			}
+		}));
+		throwIfAborted();
+		const modelProvider = resolveCodexAppServerModelProvider({
+			provider: params.params.provider,
+			authProfileId: params.params.authProfileId,
+			authProfileStore: params.params.authProfileStore,
+			agentDir: params.params.agentDir,
+			config: params.params.config
+		});
+		const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : void 0;
+		if (!preserveExistingBinding) {
+			if (!await lifecycleTiming.measure("thread-start-write-binding", () => params.bindingStore.mutate(bindingIdentity, {
+				kind: "set",
+				if: { kind: "absent" },
+				binding: {
+					threadId: response.thread.id,
+					cwd: params.cwd,
+					authProfileId: params.params.authProfileId,
+					model: response.model ?? startParams.model ?? params.params.modelId,
+					modelProvider: normalizeBindingModelProvider(params.params.authProfileId, response.modelProvider ?? requestModelProvider ?? startModelProvider ?? modelProvider),
+					dynamicToolsFingerprint,
+					dynamicToolsContainDeferred,
+					webSearchThreadConfigFingerprint,
+					userMcpServersFingerprint,
+					mcpServersFingerprint: nextMcpServersFingerprint,
+					networkProxyProfileName: params.appServer.networkProxy?.profileName,
+					networkProxyConfigFingerprint,
+					nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration,
+					appServerRuntimeFingerprint: params.appServerRuntimeFingerprint,
+					pluginAppsFingerprint: pluginThreadConfig?.fingerprint,
+					pluginAppsInputFingerprint: pluginThreadConfig?.inputFingerprint,
+					pluginAppPolicyContext: pluginThreadConfig?.policyContext,
+					contextEngine: contextEngineBinding,
+					environmentSelectionFingerprint
+				}
+			}))) throw new CodexThreadBindingConflictError(response.thread.id, "committing a fresh thread");
 			if (contextEngineBinding) embeddedAgentLog.info("codex app-server wrote context-engine thread binding", {
 				sessionId: params.params.sessionId,
 				sessionKey: params.params.sessionKey,
@@ -1748,90 +2039,18 @@ async function startOrResumeThread(params) {
 				engineId: contextEngineBinding.engineId,
 				epoch: contextEngineBinding.projection?.epoch,
 				fingerprint: contextEngineBinding.projection?.fingerprint,
-				action: "resumed"
+				action: rotatedContextEngineBinding ? "rotated" : "started"
 			});
-			lifecycleTiming.mark("thread-ready");
-			lifecycleTiming.logSummary({
-				runId: params.params.runId,
-				sessionId: params.params.sessionId,
-				sessionKey: params.params.sessionKey,
-				threadId: response.thread.id,
-				action: "resumed"
-			});
-			const activeTurnIds = readActiveCodexTurnIds(response.thread);
-			return {
-				...resumeBinding,
-				threadId: response.thread.id,
-				cwd: params.cwd,
-				authProfileId: boundAuthProfileId,
-				model: response.model ?? resumeParams.model ?? params.params.modelId,
-				modelProvider: response.modelProvider ?? requestModelProvider ?? startModelProvider,
-				dynamicToolsFingerprint,
-				dynamicToolsContainDeferred,
-				webSearchThreadConfigFingerprint,
-				userMcpServersFingerprint,
-				mcpServersFingerprint: nextMcpServersFingerprint,
-				networkProxyProfileName: params.appServer.networkProxy?.profileName,
-				networkProxyConfigFingerprint,
-				nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? resumeBinding.nativeHookRelayGeneration,
-				appServerRuntimeFingerprint: params.appServerRuntimeFingerprint,
-				pluginAppsFingerprint: resumeBinding.pluginAppsFingerprint,
-				pluginAppsInputFingerprint: resumeBinding.pluginAppsInputFingerprint,
-				pluginAppPolicyContext: resumeBinding.pluginAppPolicyContext,
-				contextEngine: contextEngineBinding,
-				environmentSelectionFingerprint,
-				lifecycle: {
-					action: "resumed",
-					...activeTurnIds.length ? { activeTurnIds } : {}
-				}
-			};
-		} catch (error) {
-			if (isCodexAppServerConnectionClosedError(error)) throw error;
-			embeddedAgentLog.warn("codex app-server thread resume failed; starting a new thread", { error });
-			await clearCodexAppServerBinding(params.params.sessionFile);
 		}
-	}
-	const pluginThreadConfig = params.pluginThreadConfig?.enabled ? prebuiltPluginThreadConfig ?? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0;
-	const finalConfigPatch = params.buildFinalConfigPatch?.({ action: "start" }) ?? {
-		configPatch: params.finalConfigPatch,
-		nativeHookRelayGeneration: params.nativeHookRelayGeneration
-	};
-	const config = lifecycleTiming.measureSync("merge-thread-config", () => mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginThreadConfig?.configPatch, finalConfigPatch.configPatch));
-	const startParams = lifecycleTiming.measureSync("thread-start-params", () => buildThreadStartParams(params.params, {
-		cwd: params.cwd,
-		dynamicTools: params.dynamicTools,
-		appServer: params.appServer,
-		developerInstructions: params.developerInstructions,
-		config,
-		nativeCodeModeEnabled: params.nativeCodeModeEnabled,
-		nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
-		nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
-		webSearchAllowed: params.webSearchAllowed,
-		environmentSelection: params.environmentSelection,
-		model: startModelSelection.model,
-		modelProvider: startModelProvider
-	}));
-	const requestModelProvider = typeof startParams.modelProvider === "string" && startParams.modelProvider.trim() ? startParams.modelProvider : void 0;
-	const response = assertCodexThreadStartResponse(await lifecycleTiming.measure("thread-start-request", async () => {
-		try {
-			return await params.client.request("thread/start", startParams, { signal: params.signal });
-		} catch (error) {
-			if (error instanceof CodexAppServerRpcError) throw new CodexThreadStartRequestError(error);
-			throw error;
-		}
-	}));
-	throwIfAborted();
-	const modelProvider = resolveCodexAppServerModelProvider({
-		provider: params.params.provider,
-		authProfileId: params.params.authProfileId,
-		authProfileStore: params.params.authProfileStore,
-		agentDir: params.params.agentDir,
-		config: params.params.config
-	});
-	const createdAt = (/* @__PURE__ */ new Date()).toISOString();
-	const nextMcpServersFingerprint = params.mcpServersFingerprintEvaluated === true ? params.mcpServersFingerprint : void 0;
-	if (!preserveExistingBinding) {
-		await lifecycleTiming.measure("thread-start-write-binding", () => writeCodexAppServerBinding(params.params.sessionFile, {
+		lifecycleTiming.mark("thread-ready");
+		lifecycleTiming.logSummary({
+			runId: params.params.runId,
+			sessionId: params.params.sessionId,
+			sessionKey: params.params.sessionKey,
+			threadId: response.thread.id,
+			action: rotatedContextEngineBinding ? "rotated" : "started"
+		});
+		return {
 			threadId: response.thread.id,
 			cwd: params.cwd,
 			authProfileId: params.params.authProfileId,
@@ -1839,7 +2058,6 @@ async function startOrResumeThread(params) {
 			modelProvider: response.modelProvider ?? requestModelProvider ?? startModelProvider ?? modelProvider,
 			dynamicToolsFingerprint,
 			dynamicToolsContainDeferred,
-			webSearchThreadConfigFingerprint,
 			userMcpServersFingerprint,
 			mcpServersFingerprint: nextMcpServersFingerprint,
 			networkProxyProfileName: params.appServer.networkProxy?.profileName,
@@ -1851,58 +2069,12 @@ async function startOrResumeThread(params) {
 			pluginAppPolicyContext: pluginThreadConfig?.policyContext,
 			contextEngine: contextEngineBinding,
 			environmentSelectionFingerprint,
-			createdAt
-		}, {
-			authProfileStore: params.params.authProfileStore,
-			agentDir: params.params.agentDir,
-			config: params.params.config
-		}));
-		if (contextEngineBinding) embeddedAgentLog.info("codex app-server wrote context-engine thread binding", {
-			sessionId: params.params.sessionId,
-			sessionKey: params.params.sessionKey,
-			threadId: response.thread.id,
-			engineId: contextEngineBinding.engineId,
-			epoch: contextEngineBinding.projection?.epoch,
-			fingerprint: contextEngineBinding.projection?.fingerprint,
-			action: rotatedContextEngineBinding ? "rotated" : "started"
-		});
-	}
-	lifecycleTiming.mark("thread-ready");
-	lifecycleTiming.logSummary({
-		runId: params.params.runId,
-		sessionId: params.params.sessionId,
-		sessionKey: params.params.sessionKey,
-		threadId: response.thread.id,
-		action: rotatedContextEngineBinding ? "rotated" : "started"
+			lifecycle: {
+				action: "started",
+				...rotatedContextEngineBinding ? { rotatedContextEngineBinding } : {}
+			}
+		};
 	});
-	return {
-		schemaVersion: 2,
-		threadId: response.thread.id,
-		sessionFile: params.params.sessionFile,
-		cwd: params.cwd,
-		authProfileId: params.params.authProfileId,
-		model: response.model ?? startParams.model ?? params.params.modelId,
-		modelProvider: response.modelProvider ?? requestModelProvider ?? startModelProvider ?? modelProvider,
-		dynamicToolsFingerprint,
-		dynamicToolsContainDeferred,
-		userMcpServersFingerprint,
-		mcpServersFingerprint: nextMcpServersFingerprint,
-		networkProxyProfileName: params.appServer.networkProxy?.profileName,
-		networkProxyConfigFingerprint,
-		nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration,
-		appServerRuntimeFingerprint: params.appServerRuntimeFingerprint,
-		pluginAppsFingerprint: pluginThreadConfig?.fingerprint,
-		pluginAppsInputFingerprint: pluginThreadConfig?.inputFingerprint,
-		pluginAppPolicyContext: pluginThreadConfig?.policyContext,
-		contextEngine: contextEngineBinding,
-		environmentSelectionFingerprint,
-		createdAt,
-		updatedAt: createdAt,
-		lifecycle: {
-			action: "started",
-			...rotatedContextEngineBinding ? { rotatedContextEngineBinding } : {}
-		}
-	};
 }
 function shouldRotateCodexAppServerBindingForRuntime(params) {
 	if (!params.current) return false;
@@ -2018,21 +2190,10 @@ function buildThreadStartParams(params, options) {
 		}),
 		...resolveCodexThreadEnvironmentSelection(options),
 		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params, { dynamicTools: options.dynamicTools }),
-		dynamicTools: toCodexThreadStartDynamicTools(options.dynamicTools),
-		experimentalRawEvents: true,
-		persistExtendedHistory: true
+		dynamicTools: [...options.dynamicTools],
+		experimentalRawEvents: true
 	};
 }
-function toCodexThreadStartDynamicTools(dynamicTools) {
-	return dynamicTools.flatMap((tool) => tool.type === "namespace" ? tool.tools.map((child) => toCodexLegacyDynamicTool(child, tool.name)) : [toCodexLegacyDynamicTool(tool)]);
-}
-function toCodexLegacyDynamicTool(tool, namespace) {
-	const { type: _type, ...legacyTool } = tool;
-	return namespace ? {
-		...legacyTool,
-		namespace
-	} : legacyTool;
-}
 function buildThreadResumeParams(params, options) {
 	const resolvedModelProvider = resolveCodexAppServerModelProvider({
 		provider: params.provider,
@@ -2065,8 +2226,7 @@ function buildThreadResumeParams(params, options) {
 			webSearchAllowed: options.webSearchAllowed,
 			appServer: options.appServer
 		}),
-		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params, { dynamicTools: options.dynamicTools }),
-		persistExtendedHistory: true
+		developerInstructions: options.developerInstructions ?? buildDeveloperInstructions(params, { dynamicTools: options.dynamicTools })
 	};
 }
 function resolveCodexBindingModelProviderFallback(params) {
@@ -2313,7 +2473,7 @@ function buildDeveloperInstructions(params, options = {}) {
 		"You are a personal agent running inside OpenClaw. OpenClaw has dynamic tools for OpenClaw-owned messaging, cron, sessions, media, gateway, and nodes.",
 		buildDeferredDynamicToolManifest(options.dynamicTools),
 		buildSkillWorkshopInstruction(options.dynamicTools),
-		"Use Codex native `spawn_agent` for Codex subagents. Use OpenClaw `sessions_spawn` only for OpenClaw or ACP delegation.",
+		"Use Codex native `spawn_agent` for Codex subagents. `spawn_agent` and the other native collaboration tools may be deferred: when `spawn_agent` is not directly listed, load it with `tool_search` before spawning. Use OpenClaw `sessions_spawn` only for OpenClaw or ACP delegation, never as a substitute for `spawn_agent`.",
 		buildVisibleReplyInstruction(params, options.dynamicTools),
 		nativeCommandGuidance,
 		params.extraSystemPrompt
@@ -2365,10 +2525,15 @@ function resolveReasoningEffort(thinkLevel, modelId, supportedReasoningEfforts)
 		requested: thinkLevel,
 		supportedReasoningEfforts
 	}) ?? null;
+	const fallbackReasoningEfforts = resolveCodexFallbackReasoningEfforts(modelId);
+	if (fallbackReasoningEfforts) return resolveCodexSupportedReasoningEffort({
+		requested: thinkLevel,
+		supportedReasoningEfforts: fallbackReasoningEfforts
+	}) ?? null;
 	if (thinkLevel === "minimal") return isModernCodexModel(modelId) ? "low" : "minimal";
 	if (thinkLevel === "low" || thinkLevel === "medium" || thinkLevel === "high" || thinkLevel === "xhigh") return thinkLevel;
 	if (thinkLevel === "max" && isMaxReasoningCodexModel(modelId)) return "max";
 	return null;
 }
 //#endregion
-export { resolveCodexContextEngineProjectionReserveTokens as A, describeCodexNotificationCorrelation as B, isForcedPrivateQaCodexRuntime as C, fitCodexProjectedContextForTurnStart as D, resolveCodexDynamicToolsLoadingForRuntime as E, shouldBuildCodexPluginThreadConfig as F, readCodexNotificationThreadId as H, ensureCodexPluginActivation as I, pluginReadParams as L, buildCodexPluginThreadConfig as M, buildCodexPluginThreadConfigInputFingerprint as N, projectContextEngineAssemblyForCodex as O, mergeCodexThreadConfigs as P, buildCodexAppInventoryCacheKey as R, filterCodexDynamicTools as S, resolveCodexDynamicToolsLoading as T, readCodexNotificationTurnId as U, isCodexNotificationForTurn as V, resolveCodexWebSearchPlan as _, buildDeveloperInstructions as a, sanitizeCodexHistoryImagePayloads as b, codexDynamicToolsFingerprint as c, resolveCodexAppServerRequestModelSelection as d, resolveCodexAppServerThreadModelSelection as f, buildCodexNativeWebSearchThreadConfig as g, startOrResumeThread as h, buildContextEngineBinding as i, buildCodexPluginAppsConfigPatchFromPolicyContext as j, resolveCodexContextEngineProjectionMaxChars as k, isContextEngineBindingCompatible as l, resolveReasoningEffort as m, areCodexDynamicToolFingerprintsCompatible as n, buildTurnCollaborationMode as o, resolveCodexBindingModelProviderFallback as p, buildCodexRuntimeThreadConfig as r, buildTurnStartParams as s, CODEX_NATIVE_PERSONALITY_NONE as t, resolveCodexAppServerModelProvider as u, isCodexAppServerProfilerEnabled as v, normalizeCodexDynamicToolName as w, sanitizeInlineImageDataUrl$1 as x, invalidInlineImageText as y, defaultCodexAppInventoryCache as z };
+export { resolveCodexContextEngineProjectionReserveTokens as A, buildCodexPluginThreadConfigInputFingerprint as B, isForcedPrivateQaCodexRuntime as C, fitCodexProjectedContextForTurnStart as D, resolveCodexDynamicToolsLoadingForRuntime as E, interruptCodexTurnBestEffort as F, buildCodexAppInventoryCacheKey as G, shouldBuildCodexPluginThreadConfig as H, retireCodexAppServerClientAfterTimedOutTurn as I, defaultCodexAppInventoryCache as K, unsubscribeCodexThreadBestEffort as L, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as M, CodexAppServerUnsafeSubscriptionError as N, projectContextEngineAssemblyForCodex as O, closeCodexStartupClientBestEffort as P, buildCodexPluginAppsConfigPatchFromPolicyContext as R, filterCodexDynamicTools as S, resolveCodexDynamicToolsLoading as T, ensureCodexPluginActivation as U, mergeCodexThreadConfigs as V, pluginReadParams as W, resolveCodexWebSearchPlan as _, buildDeveloperInstructions as a, sanitizeCodexHistoryImagePayloads as b, codexDynamicToolsFingerprint as c, resolveCodexAppServerRequestModelSelection as d, resolveCodexAppServerThreadModelSelection as f, buildCodexNativeWebSearchThreadConfig as g, startOrResumeThread as h, buildContextEngineBinding as i, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as j, resolveCodexContextEngineProjectionMaxChars as k, isContextEngineBindingCompatible as l, resolveReasoningEffort as m, areCodexDynamicToolFingerprintsCompatible as n, buildTurnCollaborationMode as o, resolveCodexBindingModelProviderFallback as p, buildCodexRuntimeThreadConfig as r, buildTurnStartParams as s, CODEX_NATIVE_PERSONALITY_NONE as t, resolveCodexAppServerModelProvider as u, isCodexAppServerProfilerEnabled as v, normalizeCodexDynamicToolName as w, sanitizeInlineImageDataUrl$1 as x, invalidInlineImageText as y, buildCodexPluginThreadConfig as z };