@openclaw/codex 2026.6.11 → 2026.7.1-1

package/dist/{thread-lifecycle-DtT3-ehU.js → thread-lifecycle-qWE88Dn2.js}

@@ -1,79 +1,23 @@
-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-CszD0vP3.js";
-import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-B19q5BIX.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 { r as isModernCodexModel } from "./provider-B-OHpbD3.js";
-import { a as isCodexAppServerConnectionClosedError, n as CodexAppServerRpcError } from "./client-CLrtWgrD.js";
-import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-HOuPt-E0.js";
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexFallbackReasoningEfforts, r as isMaxReasoningCodexModel, s as resolveCodexSupportedReasoningEffort } from "./provider-zjPfx5Fs.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 normalizeCodexAppServerBindingModelProvider, i as isCodexAppServerNativeAuthProfile, o as reclaimCurrentCodexSessionGeneration, r as hashCodexAppServerBindingFingerprint, s as sessionBindingIdentity } from "./session-binding-C1ZXdP-x.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. */
 var CodexAppInventoryCache = class {
@@ -212,9 +156,11 @@ function serializeCodexAppInventoryError(error) {
 }
 /** Shared app inventory cache used by Codex app-server runtime paths. */
 const defaultCodexAppInventoryCache = new CodexAppInventoryCache();
-/** Builds a stable cache key from runtime identity fields. */
-function buildCodexAppInventoryCacheKey(input) {
+/** Builds a stable cache key from build versions and runtime identity fields. */
+function buildCodexAppInventoryCacheKey(input, openClawVersion, codexPluginVersion) {
 	return JSON.stringify({
+		openClawVersion,
+		codexPluginVersion,
 		codexHome: input.codexHome ?? null,
 		endpoint: input.endpoint ?? null,
 		runtimeIdentity: normalizeRuntimeIdentityForCacheKey(input.runtimeIdentity),
@@ -235,18 +181,21 @@ function normalizeRuntimeIdentityForCacheKey(value) {
 async function listAllApps(request, forceRefetch, targetAppIds = []) {
 	const apps = [];
 	const targetIds = new Set(targetAppIds.filter(Boolean));
-	const foundTargetIds = /* @__PURE__ */ new Set();
+	const remainingTargetIds = new Set(targetIds);
+	const seenCursors = /* @__PURE__ */ new Set();
 	let cursor;
 	do {
 		const response = await request("app/list", {
 			cursor,
-			limit: 100,
+			limit: targetIds.size > 0 ? CODEX_TARGETED_APP_INVENTORY_LIMIT : 100,
 			forceRefetch
 		});
 		apps.push(...response.data);
-		for (const app of response.data) if (targetIds.has(app.id)) foundTargetIds.add(app.id);
+		for (const app of response.data) remainingTargetIds.delete(app.id);
+		if (targetIds.size > 0 && remainingTargetIds.size === 0) break;
 		cursor = response.nextCursor;
-		if (targetIds.size > 0 && foundTargetIds.size === targetIds.size) break;
+		if (cursor && seenCursors.has(cursor)) throw new Error(`app/list returned repeated cursor ${cursor}`);
+		if (cursor) seenCursors.add(cursor);
 	} while (cursor);
 	return apps;
 }
@@ -269,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()";
@@ -290,6 +239,7 @@ function isSensitiveErrorDataKey(key) {
 * Reads Codex plugin marketplace state and app inventory to decide which
 * plugin-owned apps can be exposed to a native Codex thread.
 */
+const CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME = `${CODEX_PLUGINS_MARKETPLACE_NAME}-remote`;
 /** Reads configured Codex plugin state and maps owned apps to readiness diagnostics. */
 async function readCodexPluginInventory(params) {
 	const policy = params.policy ?? resolveCodexPluginsPolicy(params.pluginConfig);
@@ -302,7 +252,8 @@ async function readCodexPluginInventory(params) {
 		}]
 	};
 	const appInventory = readCachedAppInventory(params);
-	const marketplaceEntry = (await params.request("plugin/list", { cwds: [] })).marketplaces.find((marketplace) => marketplace.name === CODEX_PLUGINS_MARKETPLACE_NAME);
+	const listed = await params.request("plugin/list", { cwds: [] });
+	const marketplaceEntry = listed.marketplaces.find(isOpenAiCuratedMarketplace);
 	if (!marketplaceEntry) return {
 		policy,
 		records: [],
@@ -313,7 +264,7 @@ async function readCodexPluginInventory(params) {
 		})),
 		...appInventory ? { appInventory } : {}
 	};
-	const marketplace = marketplaceRef(marketplaceEntry);
+	let marketplace = marketplaceRef(marketplaceEntry);
 	const diagnostics = [];
 	const records = [];
 	if (appInventory?.state === "missing") diagnostics.push({
@@ -326,8 +277,8 @@ async function readCodexPluginInventory(params) {
 	});
 	for (const pluginPolicy of policy.pluginPolicies) {
 		if (!pluginPolicy.enabled) continue;
-		const summary = findPluginSummary(marketplaceEntry, pluginPolicy.pluginName);
-		if (!summary) {
+		const resolvedPlugin = findOpenAiCuratedMarketplacePlugin(listed, pluginPolicy.pluginName);
+		if (!resolvedPlugin) {
 			diagnostics.push({
 				code: "plugin_missing",
 				plugin: pluginPolicy,
@@ -335,7 +286,10 @@ async function readCodexPluginInventory(params) {
 			});
 			continue;
 		}
-		const detail = await readPluginDetail(params, marketplace, pluginPolicy, diagnostics);
+		const { summary } = resolvedPlugin;
+		const pluginMarketplace = marketplaceRef(resolvedPlugin.marketplace);
+		if (records.length === 0) marketplace = pluginMarketplace;
+		const detail = await readPluginDetail(params, pluginMarketplace, pluginPolicy, summary, diagnostics);
 		const ownedAppIds = detail?.apps.map((app) => app.id).filter(Boolean).toSorted() ?? [];
 		const appOwnership = resolveAppOwnership({
 			detail,
@@ -378,12 +332,10 @@ async function readCodexPluginInventory(params) {
 }
 /** Finds one plugin summary in the OpenAI curated marketplace response. */
 function findOpenAiCuratedPluginSummary(listed, pluginName) {
-	const marketplaceEntry = listed.marketplaces.find((marketplace) => marketplace.name === CODEX_PLUGINS_MARKETPLACE_NAME);
-	if (!marketplaceEntry) return;
-	const summary = findPluginSummary(marketplaceEntry, pluginName);
-	return summary ? {
-		marketplace: marketplaceRef(marketplaceEntry),
-		summary
+	const resolved = findOpenAiCuratedMarketplacePlugin(listed, pluginName);
+	return resolved ? {
+		marketplace: marketplaceRef(resolved.marketplace),
+		summary: resolved.summary
 	} : void 0;
 }
 /** Builds plugin/read or plugin/install params from a marketplace reference. */
@@ -404,10 +356,10 @@ function readCachedAppInventory(params) {
 		suppressRefresh: params.suppressAppInventoryRefresh
 	});
 }
-async function readPluginDetail(params, marketplace, pluginPolicy, diagnostics) {
+async function readPluginDetail(params, marketplace, pluginPolicy, summary, diagnostics) {
 	if (params.readPluginDetails === false) return;
 	try {
-		return (await params.request("plugin/read", pluginReadParams(marketplace, pluginPolicy.pluginName))).plugin;
+		return (await params.request("plugin/read", pluginReadParams(marketplace, marketplace.remoteMarketplaceName && summary.remotePluginId ? summary.remotePluginId : pluginPolicy.pluginName))).plugin;
 	} catch (error) {
 		diagnostics.push({
 			code: "plugin_detail_unavailable",
@@ -454,6 +406,16 @@ function resolveOwnedApps(params) {
 function findPluginSummary(marketplace, pluginName) {
 	return marketplace.plugins.find((plugin) => plugin.name === pluginName || plugin.id === pluginName || plugin.id === `${pluginName}@${marketplace.name}` || pluginNameFromPluginId(plugin.id, marketplace.name) === pluginName);
 }
+function findOpenAiCuratedMarketplacePlugin(listed, pluginName) {
+	for (const marketplace of listed.marketplaces) {
+		if (!isOpenAiCuratedMarketplace(marketplace)) continue;
+		const summary = findPluginSummary(marketplace, pluginName);
+		if (summary) return {
+			marketplace,
+			summary
+		};
+	}
+}
 function pluginNameFromPluginId(pluginId, marketplaceName) {
 	const trimmed = pluginId.trim();
 	if (!trimmed) return;
@@ -467,6 +429,9 @@ function marketplaceRef(marketplace) {
 		...!marketplace.path ? { remoteMarketplaceName: marketplace.name } : {}
 	};
 }
+function isOpenAiCuratedMarketplace(marketplace) {
+	return marketplace.name === "openai-curated" || marketplace.name === CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME;
+}
 //#endregion
 //#region extensions/codex/src/app-server/plugin-activation.ts
 /** Installs/enables a configured Codex plugin and refreshes plugin/app state. */
@@ -486,7 +451,7 @@ async function ensureCodexPluginActivation(params) {
 		marketplace: resolved.marketplace,
 		diagnostics: []
 	};
-	const installResponse = await params.request("plugin/install", pluginReadParams(resolved.marketplace, params.identity.pluginName));
+	const installResponse = await params.request("plugin/install", pluginReadParams(resolved.marketplace, resolved.marketplace.remoteMarketplaceName && resolved.summary.remotePluginId ? resolved.summary.remotePluginId : params.identity.pluginName));
 	const refreshDiagnostics = [];
 	let refreshFailed = false;
 	try {
@@ -554,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
 	});
 }
@@ -584,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,
@@ -592,10 +558,11 @@ 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, {
-			forceRefetch: true,
+			forceRefetch: false,
 			reason: "initial_missing",
 			targetAppIds: collectInventoryOwnedAppIds(inventory)
 		});
@@ -630,10 +597,12 @@ async function buildCodexPluginThreadConfig(params) {
 			message: activation.diagnostics.map((item) => item.message).join(" ") || activation.reason
 		});
 	}
-	if (activationResults.some((activation) => activation.ok && activation.installAttempted)) {
+	const postInstallRefreshRequired = activationResults.some((activation) => activation.ok && activation.installAttempted);
+	const deferredMissingRefreshRequired = appInventoryRefreshDeferredForActivation && !postInstallRefreshRequired && shouldRefreshMissingAppInventory(params, policy, inventory);
+	if (postInstallRefreshRequired || deferredMissingRefreshRequired) {
 		await refreshAppInventoryNow(params, appCache, {
 			forceRefetch: true,
-			reason: "post_install",
+			reason: postInstallRefreshRequired ? "post_install" : "deferred_missing",
 			targetAppIds: collectInventoryOwnedAppIds(inventory)
 		});
 		inventory = await readCodexPluginInventory({
@@ -668,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,
@@ -676,31 +650,32 @@ 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) {
-		if (record.activationRequired) {
-			if (!activationResults.find((item) => item.identity.configKey === record.policy.configKey)?.ok) continue;
-		}
+		const activation = activationResults.find((item) => item.identity.configKey === record.policy.configKey);
+		if (activation?.ok === false || record.activationRequired && !activation?.ok) continue;
 		if (record.appOwnership !== "proven") continue;
 		pluginAppIds[record.policy.configKey] = [...record.ownedAppIds].toSorted();
 		for (const app of resolveThreadConfigAppsForRecord({
 			record,
 			inventory
 		})) {
-			if (!app.accessible || !app.enabled) {
+			if (!isPluginAppReadyForThreadStart(app)) {
 				diagnostics.push({
 					code: "app_not_ready",
 					plugin: record.policy,
-					message: `${app.id} is not accessible or enabled for ${record.policy.pluginName}.`
+					message: `${app.id} is not accessible for ${record.policy.pluginName}.`
 				});
 				continue;
 			}
-			const appConfig = {
-				enabled: true,
-				destructive_enabled: record.policy.allowDestructiveActions,
-				open_world_enabled: true,
-				default_tools_approval_mode: "auto"
-			};
-			apps[app.id] = appConfig;
+			if (record.policy.destructiveApprovalMode === "ask" && !await clearPersistedAppToolApprovalOverrides({
+				request: params.request,
+				configCwd: params.configCwd,
+				plugin: record.policy,
+				app,
+				diagnostics
+			})) continue;
+			apps[app.id] = buildEnabledAppConfig(record.policy);
 			policyApps[app.id] = {
 				configKey: record.policy.configKey,
 				marketplaceName: record.policy.marketplaceName,
@@ -711,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 {
@@ -766,10 +759,35 @@ 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: {
+		enabled: false,
+		destructive_enabled: false,
+		open_world_enabled: false
+	} };
+	for (const [appId, policy] of Object.entries(policyContext.apps).toSorted(([left], [right]) => left.localeCompare(right))) apps[appId] = {
+		enabled: true,
+		destructive_enabled: policy.allowDestructiveActions,
+		open_world_enabled: true,
+		default_tools_approval_mode: "auto",
+		...policy.destructiveApprovalMode === "ask" ? { approvals_reviewer: "user" } : {}
+	};
+	return { apps };
+}
 function buildPluginAppPolicyContext(apps, pluginAppIds) {
 	return {
 		fingerprint: fingerprintJson({
-			version: 1,
+			version: 2,
 			apps,
 			pluginAppIds
 		}),
@@ -777,8 +795,53 @@ function buildPluginAppPolicyContext(apps, pluginAppIds) {
 		pluginAppIds
 	};
 }
+async function clearPersistedAppToolApprovalOverrides(params) {
+	try {
+		const overrideNames = await readPersistedAppToolApprovalOverrideNames(params);
+		for (const toolName of overrideNames) if (isOverriddenConfigWriteResponse(await params.request("config/value/write", {
+			keyPath: `apps.${quoteConfigKeyPathSegment(params.app.id)}.tools.${quoteConfigKeyPathSegment(toolName)}.approval_mode`,
+			value: null,
+			mergeStrategy: "replace"
+		}))) throw new Error(`approval override for ${toolName} is controlled by another config layer`);
+		const remainingOverrideNames = await readPersistedAppToolApprovalOverrideNames(params);
+		if (remainingOverrideNames.length > 0) throw new Error(`effective approval overrides remain for ${remainingOverrideNames.join(", ")}`);
+		return true;
+	} catch (error) {
+		params.diagnostics.push({
+			code: "approval_overrides_clear_failed",
+			...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;
+	}
+}
+async function readPersistedAppToolApprovalOverrideNames(params) {
+	const response = await params.request("config/read", {
+		includeLayers: false,
+		...params.configCwd ? { cwd: params.configCwd } : {}
+	});
+	const config = isJsonObject(response) ? response.config : void 0;
+	const appsRoot = isJsonObject(config) ? config.apps : void 0;
+	const nestedApps = isJsonObject(appsRoot) ? appsRoot.apps : void 0;
+	const appConfig = isJsonObject(appsRoot) ? appsRoot[params.app.id] ?? (isJsonObject(nestedApps) ? nestedApps[params.app.id] : void 0) : void 0;
+	const tools = isJsonObject(appConfig) ? appConfig.tools : void 0;
+	if (!isJsonObject(tools)) return [];
+	return Object.entries(tools).filter(([, value]) => hasPersistedToolApprovalOverride(value)).map(([toolName]) => toolName).toSorted();
+}
+function hasPersistedToolApprovalOverride(value) {
+	return isJsonObject(value) && (value.approval_mode !== void 0 || value.approvalMode !== void 0);
+}
+function isOverriddenConfigWriteResponse(response) {
+	return isJsonObject(response) && response.status === "okOverridden";
+}
+function quoteConfigKeyPathSegment(segment) {
+	return `"${segment.replace(/["\\]/g, (char) => `\\${char}`)}"`;
+}
 function shouldWaitForInitialAppInventory(params, policy, inventory) {
 	if (inventory.records.some((record) => record.activationRequired)) return false;
+	return shouldRefreshMissingAppInventory(params, policy, inventory);
+}
+function shouldRefreshMissingAppInventory(params, policy, inventory) {
 	return Boolean(params.appCacheKey && policy.pluginPolicies.some((plugin) => plugin.enabled) && inventory.appInventory?.state === "missing");
 }
 async function refreshAppInventoryNow(params, appCache, options = {}) {
@@ -805,18 +868,53 @@ 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;
 }
+function isPluginAppReadyForThreadStart(app) {
+	return app.accessible;
+}
 function shouldForceRefreshForNotReadyPluginApps(params, policy, inventory) {
 	if (!params.appCacheKey || !policy.pluginPolicies.some((plugin) => plugin.enabled)) return false;
 	if (inventory.appInventory?.state === "missing") return false;
-	return inventory.records.some((record) => record.appOwnership === "proven" && record.ownedAppIds.length > 0 && (record.apps.length === 0 || record.apps.some((app) => !app.accessible || !app.enabled)));
+	return inventory.records.some((record) => record.appOwnership === "proven" && record.ownedAppIds.length > 0 && (record.apps.length === 0 || record.apps.some((app) => !app.accessible)));
 }
 function policyFingerprint(policy) {
 	return {
 		enabled: policy.enabled,
+		allowAllPlugins: policy.allowAllPlugins,
 		allowDestructiveActions: policy.allowDestructiveActions,
 		destructiveApprovalMode: policy.destructiveApprovalMode,
 		plugins: policy.pluginPolicies.map((plugin) => ({
@@ -849,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>";
@@ -1015,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",
@@ -1249,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,
@@ -1323,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,
@@ -1423,227 +1673,383 @@ 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);
+	return await params.bindingStore.withLease(bindingIdentity, async () => {
+		const lifecycleTiming = createCodexThreadLifecycleTimingTracker({
+			...params.timing,
+			enabled: params.timing?.enabled ?? isCodexAppServerProfilerEnabled(params.params.config)
+		});
+		const legacyDynamicToolsFingerprint = lifecycleTiming.measureSync("legacy-dynamic-tools-fingerprint", () => legacyFingerprintDynamicTools(params.dynamicTools));
+		const dynamicToolsFingerprint = lifecycleTiming.measureSync("dynamic-tools-fingerprint", () => hashCodexAppServerBindingFingerprint(legacyDynamicToolsFingerprint));
+		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 legacyUserMcpServersFingerprint = legacyFingerprintUserMcpServersConfigPatch(userMcpServersConfigPatch);
+		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;
-	}
-	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);
+		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,
+				connectionClass: params.appServer.connectionClass
+			});
+			await clearCurrentBinding("rotating a stale thread binding");
+			binding = void 0;
 		}
-		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", {
+		if (binding?.threadId && shouldRotateCodexGpt56MultiAgentBinding({
+			bindingModel: binding.model,
+			requestedModel: params.params.modelId
+		})) {
+			embeddedAgentLog.debug("codex app-server GPT-5.6 multi-agent version 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
+				bindingModel: binding.model,
+				requestedModel: params.params.modelId
 			});
-			await clearCodexAppServerBinding(params.params.sessionFile);
+			await clearCurrentBinding("rotating a GPT-5.6 multi-agent 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 resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, 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 && !areUserMcpServersFingerprintsCompatible({
+			previous: binding.userMcpServersFingerprint,
+			next: userMcpServersFingerprint,
+			nextLegacy: legacyUserMcpServersFingerprint
+		})) {
+			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, legacyDynamicToolsFingerprint)) {
+			preserveExistingBinding = shouldStartTransientNoToolThread({
+				previous: binding.dynamicToolsFingerprint,
+				nextHasDynamicTools: params.dynamicTools.length > 0
+			});
+			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,
@@ -1651,90 +2057,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,
@@ -1742,7 +2076,6 @@ async function startOrResumeThread(params) {
 			modelProvider: response.modelProvider ?? requestModelProvider ?? startModelProvider ?? modelProvider,
 			dynamicToolsFingerprint,
 			dynamicToolsContainDeferred,
-			webSearchThreadConfigFingerprint,
 			userMcpServersFingerprint,
 			mcpServersFingerprint: nextMcpServersFingerprint,
 			networkProxyProfileName: params.appServer.networkProxy?.profileName,
@@ -1754,64 +2087,35 @@ 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;
 	if (params.binding === params.current) return false;
 	return params.connectionClass === "remote" || Boolean(params.binding);
 }
+function resolveCodexGpt56MultiAgentVersion(modelRef) {
+	let modelId = modelRef?.trim().toLowerCase();
+	if (!modelId) return;
+	const slashIndex = modelId.indexOf("/");
+	if (slashIndex > 0) {
+		const provider = modelId.slice(0, slashIndex);
+		if (provider !== "openai" && provider !== "codex") return;
+		modelId = modelId.slice(slashIndex + 1);
+	}
+	if (modelId === "gpt-5.6-sol" || modelId === "gpt-5.6-terra") return "v2";
+	return modelId === "gpt-5.6-luna" ? "v1" : void 0;
+}
+function shouldRotateCodexGpt56MultiAgentBinding(params) {
+	const bindingVersion = resolveCodexGpt56MultiAgentVersion(params.bindingModel);
+	const requestedVersion = resolveCodexGpt56MultiAgentVersion(params.requestedModel);
+	return Boolean(bindingVersion && requestedVersion && bindingVersion !== requestedVersion);
+}
 function isTransientWebSearchRestriction(params) {
 	if (params.nativeProviderWebSearchSupport === "unknown") return true;
 	if (params.params.config?.tools?.web?.search?.enabled === false) return false;
@@ -1907,7 +2211,7 @@ function buildThreadStartParams(params, options) {
 		...modelSelection.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
 		cwd: options.cwd,
 		approvalPolicy: options.appServer.approvalPolicy,
-		approvalsReviewer: options.appServer.approvalsReviewer,
+		approvalsReviewer: resolveCodexThreadApprovalsReviewer(options.appServer, options.config),
 		...codexThreadSandboxOrPermissions(options.appServer),
 		...options.appServer.serviceTier !== void 0 ? { serviceTier: options.appServer.serviceTier } : {},
 		personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -1921,21 +2225,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,
@@ -1957,7 +2250,7 @@ function buildThreadResumeParams(params, options) {
 		model: modelSelection.model,
 		...modelSelection.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
 		approvalPolicy: options.appServer.approvalPolicy,
-		approvalsReviewer: options.appServer.approvalsReviewer,
+		approvalsReviewer: resolveCodexThreadApprovalsReviewer(options.appServer, options.config),
 		...codexThreadSandboxOrPermissions(options.appServer),
 		...options.appServer.serviceTier !== void 0 ? { serviceTier: options.appServer.serviceTier } : {},
 		personality: CODEX_NATIVE_PERSONALITY_NONE,
@@ -1968,8 +2261,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) {
@@ -2082,7 +2374,7 @@ function buildTurnStartParams(params, options) {
 		model: modelSelection.model,
 		personality: CODEX_NATIVE_PERSONALITY_NONE,
 		...options.appServer.serviceTier !== void 0 ? { serviceTier: options.appServer.serviceTier } : {},
-		effort: resolveReasoningEffort(params.thinkLevel, modelSelection.model),
+		effort: resolveReasoningEffort(params.thinkLevel, modelSelection.model, readCodexSupportedReasoningEfforts(params.model?.compat)),
 		...options.environmentSelection ? { environments: options.environmentSelection } : {},
 		collaborationMode: buildTurnCollaborationMode(params, {
 			model: modelSelection.model,
@@ -2093,6 +2385,9 @@ function buildTurnStartParams(params, options) {
 		})
 	};
 }
+function resolveCodexThreadApprovalsReviewer(appServer, config) {
+	return config?.approvals_reviewer === "user" ? "user" : appServer.approvalsReviewer;
+}
 function codexThreadSandboxOrPermissions(appServer) {
 	if (appServer.networkProxy) return {};
 	return { sandbox: appServer.sandbox };
@@ -2108,7 +2403,7 @@ function buildTurnCollaborationMode(params, options = {}) {
 		mode: "default",
 		settings: {
 			model,
-			reasoning_effort: resolveReasoningEffort(params.thinkLevel, model),
+			reasoning_effort: resolveReasoningEffort(params.thinkLevel, model, readCodexSupportedReasoningEfforts(params.model?.compat)),
 			developer_instructions: buildTurnScopedCollaborationInstructions(params, options)
 		}
 	};
@@ -2116,7 +2411,7 @@ function buildTurnCollaborationMode(params, options = {}) {
 function buildTurnScopedCollaborationInstructions(params, options = {}) {
 	const contextInstructions = joinPresentSections(options.turnScopedDeveloperInstructions, options.memoryCollaborationInstructions, options.skillsCollaborationInstructions);
 	if (params.trigger === "cron") return joinPresentSections(buildCronCollaborationInstructions(), contextInstructions);
-	if (params.trigger === "heartbeat") return joinPresentSections(buildHeartbeatCollaborationInstructions(), contextInstructions, options.heartbeatCollaborationInstructions);
+	if (params.trigger === "heartbeat" && params.bootstrapContextRunKind !== "commitment-only") return joinPresentSections(buildHeartbeatCollaborationInstructions(), contextInstructions, options.heartbeatCollaborationInstructions);
 	if (contextInstructions?.trim()) return joinPresentSections(buildDefaultCollaborationInstructions(), contextInstructions);
 	return null;
 }
@@ -2156,15 +2451,24 @@ function joinPresentSections(...sections) {
 function codexDynamicToolsFingerprint(dynamicTools) {
 	return fingerprintDynamicTools(dynamicTools);
 }
+function codexLegacyDynamicToolsFingerprint(dynamicTools) {
+	return legacyFingerprintDynamicTools(dynamicTools);
+}
 function areCodexDynamicToolFingerprintsCompatible(params) {
-	return areDynamicToolFingerprintsCompatible(params.previous, params.next);
+	return areDynamicToolFingerprintsCompatible(params.previous, params.next, params.nextLegacy);
 }
 function fingerprintDynamicTools(dynamicTools) {
+	return hashCodexAppServerBindingFingerprint(legacyFingerprintDynamicTools(dynamicTools));
+}
+function legacyFingerprintDynamicTools(dynamicTools) {
 	return JSON.stringify(dynamicTools.map(fingerprintDynamicToolSpec).toSorted(compareJsonFingerprint));
 }
-function fingerprintUserMcpServersConfigPatch(configPatch) {
+function legacyFingerprintUserMcpServersConfigPatch(configPatch) {
 	return configPatch ? JSON.stringify(stabilizeJsonValue(configPatch)) : void 0;
 }
+function fingerprintUserMcpServersConfigPatch(configPatch) {
+	return configPatch ? hashCodexAppServerBindingFingerprint(JSON.stringify(stabilizeJsonValue(configPatch))) : void 0;
+}
 function fingerprintJsonObject(value) {
 	return JSON.stringify(stabilizeJsonValue(value));
 }
@@ -2194,12 +2498,19 @@ function stabilizeJsonValue(value) {
 function readActiveCodexTurnIds(thread) {
 	return (thread.turns ?? []).filter((turn) => turn.status === "inProgress").map((turn) => typeof turn.id === "string" ? turn.id : "").filter((turnId) => turnId.trim().length > 0);
 }
-const EMPTY_DYNAMIC_TOOLS_FINGERPRINT = JSON.stringify([]);
-function areDynamicToolFingerprintsCompatible(previous, next) {
-	return !previous || previous === next;
+const LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT = legacyFingerprintDynamicTools([]);
+const EMPTY_DYNAMIC_TOOLS_FINGERPRINT = hashCodexAppServerBindingFingerprint(LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT);
+function areDynamicToolFingerprintsCompatible(previous, next, nextLegacy) {
+	return !previous || previous === next || previous === nextLegacy;
+}
+function areUserMcpServersFingerprintsCompatible(params) {
+	return params.previous === params.next || params.previous === params.nextLegacy || params.nextLegacy !== void 0 && params.previous === hashCodexAppServerBindingFingerprint(params.nextLegacy);
 }
 function shouldStartTransientNoToolThread(params) {
-	return Boolean(params.previous && params.previous !== EMPTY_DYNAMIC_TOOLS_FINGERPRINT && params.next === EMPTY_DYNAMIC_TOOLS_FINGERPRINT);
+	return Boolean(params.previous && !isEmptyDynamicToolsFingerprint(params.previous) && !params.nextHasDynamicTools);
+}
+function isEmptyDynamicToolsFingerprint(fingerprint) {
+	return fingerprint === EMPTY_DYNAMIC_TOOLS_FINGERPRINT || fingerprint === LEGACY_EMPTY_DYNAMIC_TOOLS_FINGERPRINT;
 }
 function compareJsonFingerprint(left, right) {
 	return JSON.stringify(left).localeCompare(JSON.stringify(right));
@@ -2213,7 +2524,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
@@ -2259,10 +2570,21 @@ function resolveCodexAppServerModelProvider(params) {
 	if (isCodexAppServerNativeAuthProfile(params) && normalizedLower === "openai") return;
 	return normalizedLower === "openai" ? "openai" : normalized;
 }
-function resolveReasoningEffort(thinkLevel, modelId) {
+function resolveReasoningEffort(thinkLevel, modelId, supportedReasoningEfforts) {
+	if (thinkLevel === "off" || thinkLevel === "adaptive") return null;
+	if (supportedReasoningEfforts) return resolveCodexSupportedReasoningEffort({
+		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, isCodexNotificationForTurn as B, isForcedPrivateQaCodexRuntime as C, fitCodexProjectedContextForTurnStart as D, resolveCodexDynamicToolsLoadingForRuntime as E, ensureCodexPluginActivation as F, readCodexNotificationTurnId as H, pluginReadParams as I, buildCodexAppInventoryCacheKey as L, buildCodexPluginThreadConfigInputFingerprint as M, mergeCodexThreadConfigs as N, projectContextEngineAssemblyForCodex as O, shouldBuildCodexPluginThreadConfig as P, defaultCodexAppInventoryCache as R, filterCodexDynamicTools as S, resolveCodexDynamicToolsLoading as T, readCodexNotificationThreadId 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, buildCodexPluginThreadConfig 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, describeCodexNotificationCorrelation as z };
+export { resolveCodexContextEngineProjectionMaxChars as A, buildCodexPluginThreadConfig as B, filterCodexDynamicTools as C, resolveCodexDynamicToolsLoadingForRuntime as D, resolveCodexDynamicToolsLoading as E, closeCodexStartupClientBestEffort as F, pluginReadParams as G, mergeCodexThreadConfigs as H, interruptCodexTurnBestEffort as I, buildCodexAppInventoryCacheKey as K, retireCodexAppServerClientAfterTimedOutTurn as L, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as M, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as N, fitCodexProjectedContextForTurnStart as O, CodexAppServerUnsafeSubscriptionError as P, unsubscribeCodexThreadBestEffort as R, sanitizeInlineImageDataUrl$1 as S, normalizeCodexDynamicToolName as T, shouldBuildCodexPluginThreadConfig as U, buildCodexPluginThreadConfigInputFingerprint as V, ensureCodexPluginActivation as W, buildCodexNativeWebSearchThreadConfig as _, buildDeveloperInstructions as a, invalidInlineImageText as b, codexDynamicToolsFingerprint as c, resolveCodexAppServerModelProvider as d, resolveCodexAppServerRequestModelSelection as f, startOrResumeThread as g, resolveReasoningEffort as h, buildContextEngineBinding as i, resolveCodexContextEngineProjectionReserveTokens as j, projectContextEngineAssemblyForCodex as k, codexLegacyDynamicToolsFingerprint as l, resolveCodexBindingModelProviderFallback as m, areCodexDynamicToolFingerprintsCompatible as n, buildTurnCollaborationMode as o, resolveCodexAppServerThreadModelSelection as p, defaultCodexAppInventoryCache as q, buildCodexRuntimeThreadConfig as r, buildTurnStartParams as s, CODEX_NATIVE_PERSONALITY_NONE as t, isContextEngineBindingCompatible as u, resolveCodexWebSearchPlan as v, isForcedPrivateQaCodexRuntime as w, sanitizeCodexHistoryImagePayloads as x, isCodexAppServerProfilerEnabled as y, buildCodexPluginAppsConfigPatchFromPolicyContext as z };