@openclaw/codex 2026.8.1 → 2026.8.2

package/dist/{thread-lifecycle-Ss-uwnC4.js → thread-lifecycle-CGGKP720.js}

@@ -1,12 +1,12 @@
-import { E as resolveCodexPluginsPolicy, F as resolveCodexAppServerLocalHomeDir, M as CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME, P as resolveCodexAppServerHomeDir, f as assertCodexModelBackedReviewerEffectiveConfig, j as CODEX_PLUGINS_MARKETPLACE_NAME, n as codexSandboxPolicyForTurn } from "./config-Cxw3Cl3k.js";
-import { $ as CodexAppServerRpcError, D as CodexThreadStartRequestError, E as CodexThreadBindingConflictError, H as getCodexAppServerClientInstanceId, Ht as isJsonObject, J as isCodexAppServerOverloadError, Q as resolveCodexAppServerClientInstanceId, St as releaseCodexAppServerLiveThread, T as CodexRestrictedToolSurfaceAttestationError, Vt as flattenCodexDynamicToolFunctions, _ as retainSharedCodexAppServerClientByInstanceId, bt as isCodexAppServerLiveThreadClaimed, dt as resolveCodexToolAbortTerminalReason, gt as consumeCodexAppServerLiveThread, n as captureExclusiveSharedCodexAppServerClient, w as CodexAdoptedThreadActiveError, wt as unsubscribeCodexAppServerLiveThread } from "./shared-client-kNkljY-R.js";
-import { a as hashCodexAppServerBindingFingerprint, c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-q2WSTVmC.js";
+import { E as resolveCodexPluginsPolicy, F as resolveCodexAppServerLocalHomeDir, M as CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME, P as resolveCodexAppServerHomeDir, f as assertCodexModelBackedReviewerEffectiveConfig, j as CODEX_PLUGINS_MARKETPLACE_NAME, n as codexSandboxPolicyForTurn } from "./config-CcYL77O6.js";
+import { $ as CodexAppServerRpcError, D as CodexThreadStartRequestError, E as CodexThreadBindingConflictError, H as getCodexAppServerClientInstanceId, Ht as isJsonObject, J as isCodexAppServerOverloadError, Q as resolveCodexAppServerClientInstanceId, St as releaseCodexAppServerLiveThread, T as CodexRestrictedToolSurfaceAttestationError, Vt as flattenCodexDynamicToolFunctions, _ as retainSharedCodexAppServerClientByInstanceId, bt as isCodexAppServerLiveThreadClaimed, dt as resolveCodexToolAbortTerminalReason, gt as consumeCodexAppServerLiveThread, n as captureExclusiveSharedCodexAppServerClient, w as CodexAdoptedThreadActiveError, wt as unsubscribeCodexAppServerLiveThread, yt as isCodexAppServerClientRuntimeLive } from "./shared-client-B1tT5U6r.js";
+import { a as hashCodexAppServerBindingFingerprint, c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-D0zinCP1.js";
 import { a as assertCodexThreadForkResponse, r as assertCodexThreadAcceptsDirectInput, s as assertCodexThreadStartResponse, t as CodexThreadDirectInputError } from "./protocol-validators-Bg5rpNxk.js";
-import { a as closeCodexStartupClientBestEffort, c as isCodexAppServerUnsafeSubscriptionError, f as unsubscribeCodexThreadBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CVPvp9dL.js";
-import { c as serializeCodexAppInventoryError, n as buildCodexAppServerConnectionFingerprint, s as defaultCodexAppInventoryCache, t as resumeCodexAppServerThread } from "./thread-resume-DF54hagX.js";
-import { c as withExclusiveCodexAppServerThread, l as isIncognitoSessionKey } from "./thread-ownership-CeYBqg_4.js";
-import { i as readCodexSessionMeta, n as codexCatalogHomeId } from "./session-catalog-home-id-DAKUrm3C.js";
-import { d as projectBoundedCodexThreadHistory } from "./transcript-mirror-CkEQIna-.js";
+import { a as closeCodexStartupClientBestEffort, c as isCodexAppServerUnsafeSubscriptionError, f as unsubscribeCodexThreadBestEffort, n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CpVfwctT.js";
+import { c as serializeCodexAppInventoryError, n as buildCodexAppServerConnectionFingerprint, s as defaultCodexAppInventoryCache, t as resumeCodexAppServerThread } from "./thread-resume-BFt1-ZDa.js";
+import { c as withExclusiveCodexAppServerThread, l as isIncognitoSessionKey } from "./thread-ownership-RkaoZCmQ.js";
+import { i as readCodexSessionMeta, n as codexCatalogHomeId } from "./session-catalog-home-id-Dt2GiG5o.js";
+import { f as projectBoundedCodexThreadHistory } from "./transcript-mirror-1ep4XjzF.js";
 import { r as sanitizeInlineImageDataUrl, t as invalidInlineImageText } from "./image-payload-sanitizer-CnfoUPCE.js";
 import { asOptionalRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
@@ -1198,6 +1198,7 @@ function renderMessagesForCodexContext(messages, options) {
 	}).filter((value) => Boolean(value)).join("\n\n");
 }
 function renderMessageBody(message, options) {
+	if (message.role === "compactionSummary" || message.role === "branchSummary") return truncateText(message.summary.trim(), options.maxTextPartChars);
 	if (!hasMessageContent(message)) return "";
 	if (typeof message.content === "string") return truncateText(message.content.trim(), options.maxTextPartChars);
 	if (!Array.isArray(message.content)) return "[non-text content omitted]";
@@ -1666,7 +1667,8 @@ async function collectPersonalSkillRealPaths(homes, codexHome) {
 	}
 	const configuredCodexHome = codexHome?.trim() || process.env.CODEX_HOME?.trim();
 	if (configuredCodexHome) {
-		const stateOwned = isPathInside(realStateDir, await canonicalizeExistingPath(configuredCodexHome));
+		const realCodexHome = await canonicalizeExistingPath(configuredCodexHome);
+		const stateOwned = isPathInside(realStateDir, realCodexHome);
 		roots.push({
 			dir: path.join(configuredCodexHome, "skills"),
 			onlyEscapedStateTargets: stateOwned
@@ -1729,12 +1731,14 @@ async function collectPersonalSkillRealPaths(homes, codexHome) {
 					try {
 						const stat = await fs.stat(entryPath);
 						if (entry.name === "SKILL.md" && stat.isFile()) await recordSkillFile(entryPath, current.onlyEscapedStateTargets);
-						else if (stat.isDirectory()) if (current.depth < MAX_PERSONAL_SKILL_DEPTH) queue.push({
-							dir: entryPath,
-							depth: current.depth + 1,
-							onlyEscapedStateTargets: current.onlyEscapedStateTargets
-						});
-						else complete = false;
+						else if (stat.isDirectory()) {
+							if (current.depth < MAX_PERSONAL_SKILL_DEPTH) queue.push({
+								dir: entryPath,
+								depth: current.depth + 1,
+								onlyEscapedStateTargets: current.onlyEscapedStateTargets
+							});
+							else complete = false;
+						}
 					} catch (error) {
 						if (!isMissingPathError(error)) complete = false;
 					}
@@ -1852,6 +1856,10 @@ function managedThreadStoreKey(sourceHomeId, threadId) {
 /** Durable ownership index for Codex threads created by OpenClaw. */
 function createCodexManagedThreadStore(state) {
 	return {
+		async has(sourceHomeId, threadId) {
+			const parsed = managedThreadSchema.safeParse(state.lookup(managedThreadStoreKey(sourceHomeId, threadId)));
+			return parsed.success && parsed.data.sourceHomeId === sourceHomeId && parsed.data.threadId === threadId;
+		},
 		async mark(params) {
 			try {
 				const value = managedThreadSchema.parse({
@@ -2107,7 +2115,7 @@ function resolveReasoningEffort(thinkLevel, modelId, supportedReasoningEfforts)
 }
 //#endregion
 //#region extensions/codex/src/app-server/project-doc-thread-config.ts
-const CODEX_NATIVE_PROJECT_DOC_MAX_BYTES = 128 * 1024;
+const CODEX_NATIVE_PROJECT_DOC_MAX_BYTES = 131072;
 function buildCodexProjectDocThreadConfig(config) {
 	const defaults = { project_doc_max_bytes: CODEX_NATIVE_PROJECT_DOC_MAX_BYTES };
 	return mergeCodexThreadConfigs(defaults, config) ?? defaults;
@@ -2634,6 +2642,7 @@ async function resumeExistingCodexThread(params, context) {
 	const { binding: resumeBinding, bindingIdentity, startModelSelection, startModelProvider, userMcpServersConfigPatch, dynamicToolsFingerprint, dynamicToolsContainDeferred, webSearchThreadConfigFingerprint, nativeSkillIsolationFingerprint, userMcpServersFingerprint, ringZeroConfigFingerprint, ringZeroClientInstanceId, networkProxyConfigFingerprint, contextEngineBinding, environmentSelectionFingerprint, hostSystemAgentActive, ringZeroActive, restrictedToolSurface, restrictedToolSurfaceInheritedMcpServerNames, nativeSkillIsolation, lifecycleTiming, normalizeBindingModelProvider, throwIfAborted, clearCurrentBinding } = context;
 	let resumeReservation;
 	let resumeResponseAccepted = false;
+	let checkingLoadedPluginThreadConfig = false;
 	const abandonClient = params.abandonClient ?? (() => closeCodexStartupClientBestEffort(params.client));
 	try {
 		const authProfileId = resumeBinding.connectionScope === "supervision" ? void 0 : params.params.authProfileId ?? resumeBinding.authProfileId;
@@ -2644,7 +2653,8 @@ async function resumeExistingCodexThread(params, context) {
 			configPatch: params.finalConfigPatch,
 			nativeHookRelayGeneration: params.nativeHookRelayGeneration
 		};
-		const pluginAppsConfigPatch = context.prebuiltPluginThreadConfig?.configPatch ?? (params.pluginThreadConfig?.enabled && resumeBinding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(resumeBinding.pluginAppPolicyContext) : void 0);
+		const pluginThreadConfig = context.prebuiltPluginThreadConfig ?? (params.pluginThreadConfig?.requiresCurrentPolicyCheck ? await lifecycleTiming.measure("plugin-config-build", () => params.pluginThreadConfig?.build()) : void 0);
+		const pluginAppsConfigPatch = pluginThreadConfig?.configPatch ?? (params.pluginThreadConfig?.enabled && resumeBinding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(resumeBinding.pluginAppPolicyContext) : void 0);
 		const resumeConfig = applyCodexNativeSkillIsolation(mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginAppsConfigPatch, finalConfigPatch.configPatch), nativeSkillIsolation);
 		const resumeParams = lifecycleTiming.measureSync("thread-resume-params", () => buildThreadResumeParams(params.params, {
 			threadId: resumeBinding.threadId,
@@ -2680,12 +2690,19 @@ async function resumeExistingCodexThread(params, context) {
 		resumeResponseAccepted = true;
 		assertCodexThreadAcceptsDirectInput(response.thread);
 		context.assertResumeConfiguration?.();
-		if (resumeBinding.pendingResumeConfiguration) await attestCodexPluginThreadApps({
+		checkingLoadedPluginThreadConfig = true;
+		const loadedPluginThreadConfig = await context.buildLoadedPluginThreadConfig?.(resumeBinding);
+		if (loadedPluginThreadConfig && loadedPluginThreadConfig.fingerprint !== (pluginThreadConfig?.fingerprint ?? resumeBinding.pluginAppsFingerprint)) {
+			checkingLoadedPluginThreadConfig = false;
+			throw new Error("Codex thread app policy changed; a fresh thread configuration is required");
+		}
+		await attestCodexPluginThreadApps({
 			client: params.client,
 			threadId: response.thread.id,
-			appIds: context.prebuiltPluginThreadConfig?.provisionalAppIds ?? [],
+			appIds: loadedPluginThreadConfig?.provisionalAppIds ?? pluginThreadConfig?.provisionalAppIds ?? [],
 			signal: params.signal
 		});
+		checkingLoadedPluginThreadConfig = false;
 		if (ringZeroActive || isMessageOnlyCodexSourceReply(params.params) || params.params.pluginHarnessToolPolicyRestricted === true) try {
 			await lifecycleTiming.measure("restricted-tool-surface-mcp-attestation", () => attestCodexRestrictedToolSurfaceMcpServersDisabled(params.client, response.thread.id, resumeParams.config, params.signal));
 		} catch (error) {
@@ -2719,9 +2736,9 @@ async function resumeExistingCodexThread(params, context) {
 			networkProxyConfigFingerprint,
 			nativeHookRelayGeneration: finalConfigPatch.nativeHookRelayGeneration ?? resumeBinding.nativeHookRelayGeneration,
 			appServerRuntimeFingerprint: resumeBinding.connectionScope === "supervision" ? buildCodexAppServerConnectionFingerprint(params.appServer, params.params.agentDir) : params.appServerRuntimeFingerprint,
-			pluginAppsFingerprint: context.prebuiltPluginThreadConfig?.fingerprint ?? resumeBinding.pluginAppsFingerprint,
-			pluginAppsInputFingerprint: context.prebuiltPluginThreadConfig?.inputFingerprint ?? resumeBinding.pluginAppsInputFingerprint,
-			pluginAppPolicyContext: context.prebuiltPluginThreadConfig?.policyContext ?? resumeBinding.pluginAppPolicyContext,
+			pluginAppsFingerprint: pluginThreadConfig?.fingerprint ?? resumeBinding.pluginAppsFingerprint,
+			pluginAppsInputFingerprint: pluginThreadConfig?.inputFingerprint ?? resumeBinding.pluginAppsInputFingerprint,
+			pluginAppPolicyContext: pluginThreadConfig?.policyContext ?? resumeBinding.pluginAppPolicyContext,
 			contextEngine: contextEngineBinding,
 			environmentSelectionFingerprint
 		};
@@ -2785,7 +2802,7 @@ async function resumeExistingCodexThread(params, context) {
 				throw new CodexAppServerUnsafeSubscriptionError("Codex thread/resume subscription cleanup failed", { cause: error });
 			}
 		}
-		if (resumeBinding.pendingResumeConfiguration || error instanceof CodexThreadDirectInputError || params.signal?.aborted) throw error;
+		if (checkingLoadedPluginThreadConfig || resumeBinding.pendingResumeConfiguration || error instanceof CodexThreadDirectInputError || 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");
 	}
@@ -2818,14 +2835,15 @@ async function startFreshCodexThread(params, context) {
 		disableLoginShell: params.disableLoginShell
 	}));
 	const requestModelProvider = typeof startParams.modelProvider === "string" && startParams.modelProvider.trim() ? startParams.modelProvider : void 0;
-	const response = assertCodexThreadStartResponse(await lifecycleTiming.measure("thread-start-request", async () => {
+	const threadStartResponse = 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;
 		}
-	}));
+	});
+	const response = assertCodexThreadStartResponse(threadStartResponse);
 	const provisionalAppIds = pluginThreadConfig?.provisionalAppIds;
 	if (provisionalAppIds?.length) try {
 		await lifecycleTiming.measure("plugin-app-attestation", () => attestCodexPluginThreadApps({
@@ -3010,52 +3028,67 @@ async function releaseCodexRetainedLiveThread(options) {
 }
 /** Reuses one safely owned, fully matching subscription on its original client. */
 async function tryReuseCodexLiveThread(options) {
-	const { params, binding, bindingIdentity, clientId, dynamicToolsFingerprint, environmentSelectionFingerprint, hostSystemAgentActive, lifecycleTiming, nativeSkillIsolation, releaseConsumedThread, ringZeroActive, restrictedToolSurfaceInheritedMcpServerNames, startModelProvider, startModelSelection, throwIfAborted, userMcpServersConfigPatch } = options;
-	if (!binding.clientId || binding.clientId !== clientId || binding.preserveNativeModel === true || binding.connectionScope === "supervision" || ringZeroActive) return {};
-	const prebuiltFinalConfigPatch = params.buildFinalConfigPatch?.({
-		action: "resume",
-		binding
-	}) ?? {
-		configPatch: params.finalConfigPatch,
-		nativeHookRelayGeneration: params.nativeHookRelayGeneration
+	const { params, binding, bindingIdentity, clientId, dynamicToolsFingerprint, environmentSelectionFingerprint, hostSystemAgentActive, lifecycleTiming, nativeSkillIsolation, ringZeroActive, restrictedToolSurfaceInheritedMcpServerNames, startModelProvider, startModelSelection, throwIfAborted, userMcpServersConfigPatch } = options;
+	if (!binding.clientId || binding.clientId !== clientId || binding.preserveNativeModel === true || binding.connectionScope === "supervision" || ringZeroActive) return { kind: "resume" };
+	const retainedThread = await consumeCodexAppServerLiveThread(params.client, binding.threadId);
+	if (!retainedThread) return { kind: "resume" };
+	const assertCurrentClient = () => {
+		throwIfAborted();
+		if (!isCodexAppServerClientRuntimeLive(params.client)) throw params.client.getCloseError() ?? /* @__PURE__ */ new Error("codex app-server client is closed");
 	};
-	const pluginAppsConfigPatch = params.pluginThreadConfig?.enabled && binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0;
-	const resumeAuthProfileId = params.params.authProfileId ?? binding.authProfileId;
-	const resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginAppsConfigPatch, prebuiltFinalConfigPatch.configPatch);
-	const resumeParams = lifecycleTiming.measureSync("warm-thread-resume-params", () => buildThreadResumeParams(params.params, {
-		threadId: binding.threadId,
-		cwd: params.cwd,
-		authProfileId: resumeAuthProfileId,
-		model: startModelSelection.model,
-		modelProvider: startModelProvider,
-		preserveNativeModel: false,
-		appServer: params.appServer,
-		dynamicTools: params.dynamicTools,
-		developerInstructions: params.developerInstructions,
-		config: applyCodexNativeSkillIsolation(resumeConfig, nativeSkillIsolation),
-		nativeCodeModeEnabled: params.nativeCodeModeEnabled,
-		nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
-		nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
-		webSearchAllowed: params.webSearchAllowed,
-		hostSystemAgentActive,
-		restrictedToolSurfaceInheritedMcpServerNames,
-		shellEnvironment: params.shellEnvironment,
-		disableLoginShell: params.disableLoginShell
-	}));
-	const liveThreadConfigFingerprint = fingerprintCodexThreadConfig({
-		...resumeParams,
-		model: binding.model ?? resumeParams.model ?? null,
-		requestedModel: resumeParams.model ?? null,
-		modelProvider: binding.modelProvider ?? resumeParams.modelProvider ?? null,
-		requestedModelProvider: resumeParams.modelProvider ?? binding.modelProvider ?? null
-	}, resumeAuthProfileId, dynamicToolsFingerprint);
-	const retainedThread = await consumeCodexAppServerLiveThread(params.client, binding.threadId, liveThreadConfigFingerprint);
-	if (!retainedThread) {
-		const incompatibleOwnership = await consumeCodexAppServerLiveThread(params.client, binding.threadId);
-		if (incompatibleOwnership) await incompatibleOwnership.release(binding.threadId);
-		return { prebuiltFinalConfigPatch };
-	}
+	let ownershipTransferred = false;
 	try {
+		const pluginThreadConfig = await options.buildLoadedPluginThreadConfig(binding);
+		assertCurrentClient();
+		if (pluginThreadConfig && pluginThreadConfig.fingerprint !== binding.pluginAppsFingerprint) return { kind: "rotate" };
+		const prebuiltFinalConfigPatch = params.buildFinalConfigPatch?.({
+			action: "resume",
+			binding
+		}) ?? {
+			configPatch: params.finalConfigPatch,
+			nativeHookRelayGeneration: params.nativeHookRelayGeneration
+		};
+		const pluginAppsConfigPatch = pluginThreadConfig?.configPatch ?? (params.pluginThreadConfig?.enabled && binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0);
+		const resumeAuthProfileId = params.params.authProfileId ?? binding.authProfileId;
+		const resumeConfig = mergeCodexThreadConfigs(params.config, userMcpServersConfigPatch, pluginAppsConfigPatch, prebuiltFinalConfigPatch.configPatch);
+		const resumeParams = lifecycleTiming.measureSync("warm-thread-resume-params", () => buildThreadResumeParams(params.params, {
+			threadId: binding.threadId,
+			cwd: params.cwd,
+			authProfileId: resumeAuthProfileId,
+			model: startModelSelection.model,
+			modelProvider: startModelProvider,
+			preserveNativeModel: false,
+			appServer: params.appServer,
+			dynamicTools: params.dynamicTools,
+			developerInstructions: params.developerInstructions,
+			config: applyCodexNativeSkillIsolation(resumeConfig, nativeSkillIsolation),
+			nativeCodeModeEnabled: params.nativeCodeModeEnabled,
+			nativeProviderWebSearchSupport: params.nativeProviderWebSearchSupport,
+			nativeCodeModeOnlyEnabled: params.nativeCodeModeOnlyEnabled,
+			webSearchAllowed: params.webSearchAllowed,
+			hostSystemAgentActive,
+			restrictedToolSurfaceInheritedMcpServerNames,
+			shellEnvironment: params.shellEnvironment,
+			disableLoginShell: params.disableLoginShell
+		}));
+		const liveThreadConfigFingerprint = fingerprintCodexThreadConfig({
+			...resumeParams,
+			model: binding.model ?? resumeParams.model ?? null,
+			requestedModel: resumeParams.model ?? null,
+			modelProvider: binding.modelProvider ?? resumeParams.modelProvider ?? null,
+			requestedModelProvider: resumeParams.modelProvider ?? binding.modelProvider ?? null
+		}, resumeAuthProfileId, dynamicToolsFingerprint);
+		if (retainedThread.configFingerprint !== liveThreadConfigFingerprint) return {
+			kind: "resume",
+			prebuiltFinalConfigPatch
+		};
+		await attestCodexPluginThreadApps({
+			client: params.client,
+			threadId: binding.threadId,
+			appIds: pluginThreadConfig?.provisionalAppIds ?? [],
+			signal: params.signal
+		});
+		assertCurrentClient();
 		const nativeHookRelayGeneration = prebuiltFinalConfigPatch.nativeHookRelayGeneration ?? binding.nativeHookRelayGeneration;
 		const model = startModelSelection.model;
 		if (!await lifecycleTiming.measure("warm-thread-write-binding", () => params.bindingStore.mutate(bindingIdentity, {
@@ -3067,8 +3100,8 @@ async function tryReuseCodexLiveThread(options) {
 				nativeHookRelayGeneration,
 				environmentSelectionFingerprint
 			}
-		}))) throw new CodexThreadBindingConflictError(binding.threadId, "committing a reused thread");
-		throwIfAborted();
+		}, assertCurrentClient))) throw new CodexThreadBindingConflictError(binding.threadId, "committing a reused thread");
+		assertCurrentClient();
 		lifecycleTiming.mark("thread-ready");
 		lifecycleTiming.logSummary({
 			runId: params.params.runId,
@@ -3077,7 +3110,9 @@ async function tryReuseCodexLiveThread(options) {
 			threadId: binding.threadId,
 			action: "resumed"
 		});
+		ownershipTransferred = true;
 		return {
+			kind: "ready",
 			binding: {
 				...binding,
 				cwd: params.cwd,
@@ -3088,12 +3123,19 @@ async function tryReuseCodexLiveThread(options) {
 				liveThreadOwnership: retainedThread,
 				...retainedThread.serviceTier && resumeParams.serviceTier === void 0 ? { clearInheritedServiceTier: true } : {},
 				lifecycle: { action: "resumed" }
-			},
-			prebuiltFinalConfigPatch
+			}
 		};
-	} catch (error) {
-		await releaseConsumedThread(binding.threadId, error);
-		throw error;
+	} finally {
+		if (!ownershipTransferred) try {
+			await retainedThread.release(binding.threadId);
+		} catch (error) {
+			await abandonCodexLiveThreadRelease({
+				client: params.client,
+				abandonClient: params.abandonClient,
+				lifecycleTiming,
+				threadId: binding.threadId
+			}, error);
+		}
 	}
 }
 //#endregion
@@ -3244,9 +3286,9 @@ const CODEX_NATIVE_HOOK_RELAY_EVENTS = [
 	"before_agent_finalize"
 ];
 const CODEX_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
-const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
+const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 18e5;
 /** Extra relay lifetime after the expected turn budget, preventing late hook drops. */
-const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 6e4;
+const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 3e5;
 const CODEX_NATIVE_HOOK_RELAY_COMMAND_MIN_PARENT_MARGIN_MS = 250;
 const CODEX_NATIVE_HOOK_RELAY_COMMAND_MAX_PARENT_MARGIN_MS = 1e3;
 const CODEX_NATIVE_HOOK_RELAY_DEFAULT_TIMEOUT_SEC = 10;
@@ -4311,10 +4353,28 @@ async function startOrResumeThread(params) {
 			binding = void 0;
 		}
 		const requestContext = resolveRequestContext();
-		const { startModelSelection, startModelProvider } = requestContext;
 		let preserveExistingBinding = transientDelegationRestriction || !ringZeroActive && params.nativeProviderWebSearchSupport === "unknown" && !binding?.threadId;
 		let rotatedContextEngineBinding = false;
 		let prebuiltPluginThreadConfig;
+		const buildLoadedPluginThreadConfig = async (current) => {
+			if (!params.pluginThreadConfig?.requiresCurrentPolicyCheck && !shouldRecheckRecoverablePluginBinding({
+				binding: current,
+				pluginThreadConfig: params.pluginThreadConfig
+			})) return;
+			try {
+				prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin-config-recovery", () => params.pluginThreadConfig?.build({ threadId: current.threadId }));
+			} catch (error) {
+				throwIfAborted();
+				if (params.pluginThreadConfig?.requiresCurrentPolicyCheck) throw error;
+				embeddedAgentLog.warn("codex app-server plugin app config recovery check failed", {
+					error,
+					threadId: current.threadId
+				});
+				return;
+			}
+			throwIfAborted();
+			return prebuiltPluginThreadConfig;
+		};
 		const webSearchBindingChanged = binding?.threadId && binding.webSearchThreadConfigFingerprint !== webSearchThreadConfigFingerprint;
 		const explicitTransientWebSearchRestriction = params.webSearchAllowed === false && params.persistentWebSearchAllowed !== false && transientWebSearchRestriction;
 		const unknownProviderWebSearchSupport = params.nativeProviderWebSearchSupport === "unknown";
@@ -4393,28 +4453,13 @@ async function startOrResumeThread(params) {
 			binding = void 0;
 		}
 		if (binding?.threadId) {
-			let pluginBindingStale = isCodexPluginThreadBindingStale({
+			if (isCodexPluginThreadBindingStale({
 				codexPluginsEnabled: params.pluginThreadConfig?.enabled ?? false,
 				bindingFingerprint: binding.pluginAppsFingerprint,
 				bindingInputFingerprint: binding.pluginAppsInputFingerprint,
 				currentInputFingerprint: params.pluginThreadConfig?.inputFingerprint,
 				hasBindingPolicyContext: Boolean(binding.pluginAppPolicyContext)
-			});
-			if (!pluginBindingStale && (params.pluginThreadConfig?.requiresCurrentPolicyCheck || shouldRecheckRecoverablePluginBinding({
-				binding,
-				pluginThreadConfig: params.pluginThreadConfig
-			}))) try {
-				const bindingThreadId = binding.threadId;
-				prebuiltPluginThreadConfig = await lifecycleTiming.measure("plugin-config-recovery", () => params.pluginThreadConfig?.build({ threadId: bindingThreadId }));
-				pluginBindingStale = prebuiltPluginThreadConfig?.fingerprint !== binding.pluginAppsFingerprint;
-			} catch (error) {
-				if (params.pluginThreadConfig?.requiresCurrentPolicyCheck) throw 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;
@@ -4427,75 +4472,66 @@ async function startOrResumeThread(params) {
 				binding = void 0;
 			}
 		}
-		if (binding?.threadId) if (binding.dynamicToolsFingerprint && !areDynamicToolFingerprintsCompatible(binding.dynamicToolsFingerprint, dynamicToolsFingerprint, legacyDynamicToolsFingerprint)) {
-			assertCodexBindingMayBeReplaced(binding, "changing the dynamic tool catalog");
-			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 if (incognito) {
-			if (binding.clientId && binding.clientId === clientId) {
-				params.buildFinalConfigPatch?.({
-					action: "resume",
-					binding
+		if (binding?.threadId) {
+			if (binding.dynamicToolsFingerprint && !areDynamicToolFingerprintsCompatible(binding.dynamicToolsFingerprint, dynamicToolsFingerprint, legacyDynamicToolsFingerprint)) {
+				assertCodexBindingMayBeReplaced(binding, "changing the dynamic tool catalog");
+				preserveExistingBinding = shouldStartTransientNoToolThread({
+					previous: binding.dynamicToolsFingerprint,
+					nextHasDynamicTools: params.dynamicTools.length > 0
 				});
-				throwIfAborted();
-				lifecycleTiming.mark("thread-ready");
-				lifecycleTiming.logSummary({
-					runId: params.params.runId,
-					sessionId: params.params.sessionId,
-					sessionKey: params.params.sessionKey,
-					threadId: binding.threadId,
-					action: "resumed"
+				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 if (incognito) {
+				if (binding.clientId && binding.clientId === clientId && ((await buildLoadedPluginThreadConfig(binding))?.fingerprint ?? binding.pluginAppsFingerprint) === binding.pluginAppsFingerprint) {
+					params.buildFinalConfigPatch?.({
+						action: "resume",
+						binding
+					});
+					throwIfAborted();
+					lifecycleTiming.mark("thread-ready");
+					lifecycleTiming.logSummary({
+						runId: params.params.runId,
+						sessionId: params.params.sessionId,
+						sessionKey: params.params.sessionKey,
+						threadId: binding.threadId,
+						action: "resumed"
+					});
+					return {
+						...binding,
+						lifecycle: { action: "resumed" }
+					};
+				}
+				await clearCurrentBinding("rotating an unavailable ephemeral thread binding");
+				binding = void 0;
+			} else {
+				const warmReuse = await tryReuseCodexLiveThread({
+					...requestContext,
+					params,
+					binding,
+					clientId,
+					buildLoadedPluginThreadConfig
 				});
-				return {
-					...binding,
-					lifecycle: { action: "resumed" }
-				};
+				if (warmReuse.kind === "ready") return warmReuse.binding;
+				if (warmReuse.kind === "rotate") {
+					throwIfAborted();
+					await clearCurrentBinding("rotating a stale plugin app binding");
+				} else {
+					if (binding.preserveNativeModel === true) await assertAdoptedCodexThreadResumeAllowed(params, binding.threadId, requestContext);
+					await releaseRetainedThread(binding.threadId);
+					const resumed = await resumeExistingCodexThread(params, {
+						...requestContext,
+						binding,
+						clearCurrentBinding,
+						prebuiltFinalConfigPatch: warmReuse.prebuiltFinalConfigPatch,
+						prebuiltPluginThreadConfig,
+						buildLoadedPluginThreadConfig
+					});
+					if (resumed) return resumed;
+				}
 			}
-			await clearCurrentBinding("rotating an unavailable ephemeral thread binding");
-			binding = void 0;
-		} else {
-			const warmReuse = await tryReuseCodexLiveThread({
-				params,
-				binding,
-				bindingIdentity,
-				clientId,
-				dynamicToolsFingerprint,
-				environmentSelectionFingerprint,
-				hostSystemAgentActive,
-				lifecycleTiming,
-				nativeSkillIsolation,
-				releaseConsumedThread: (threadId, cause) => releaseCodexConsumedLiveThread({
-					client: params.client,
-					abandonClient: params.abandonClient,
-					lifecycleTiming,
-					threadId,
-					cause
-				}),
-				ringZeroActive,
-				restrictedToolSurfaceInheritedMcpServerNames,
-				startModelProvider,
-				startModelSelection,
-				throwIfAborted,
-				userMcpServersConfigPatch
-			});
-			if (warmReuse.binding) return warmReuse.binding;
-			if (binding.preserveNativeModel === true) await assertAdoptedCodexThreadResumeAllowed(params, binding.threadId, requestContext);
-			await releaseRetainedThread(binding.threadId);
-			const resumed = await resumeExistingCodexThread(params, {
-				...requestContext,
-				binding,
-				clearCurrentBinding,
-				prebuiltFinalConfigPatch: warmReuse.prebuiltFinalConfigPatch,
-				prebuiltPluginThreadConfig
-			});
-			if (resumed) return resumed;
 		}
 		if (initialBoundThreadId && !preserveExistingBinding && !replacementPredecessor) await releaseRetainedThread(initialBoundThreadId);
 		const started = await startFreshCodexThread(params, {
@@ -4564,10 +4600,17 @@ function buildTurnStartParams(params, options) {
 	});
 	const useThreadPermissionProfile = options.appServer.networkProxy && !options.sandboxPolicy;
 	const currentSenderContext = params.trigger === "user" ? buildCodexCurrentSenderContextValue(params) : void 0;
-	const additionalContext = currentSenderContext ? { openclaw_current_sender: {
+	let additionalContext = currentSenderContext ? { openclaw_current_sender: {
 		kind: "untrusted",
 		value: currentSenderContext
 	} } : void 0;
+	if (params.permissionChange?.notice) additionalContext = {
+		...additionalContext,
+		openclaw_permission_change: {
+			kind: "application",
+			value: params.permissionChange.notice
+		}
+	};
 	return {
 		threadId: options.threadId,
 		input: [...buildCodexUserInput(options.promptText ?? params.prompt, params.images), ...options.explicitSkillInputs ?? []],

package/dist/{thread-ownership-CeYBqg_4.js → thread-ownership-RkaoZCmQ.js}

@@ -1,5 +1,5 @@
-import { Ct as retainCodexAppServerLiveThread, St as releaseCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, bt as isCodexAppServerLiveThreadClaimed } from "./shared-client-kNkljY-R.js";
-import { a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CVPvp9dL.js";
+import { Ct as retainCodexAppServerLiveThread, St as releaseCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientByInstanceId, bt as isCodexAppServerLiveThreadClaimed } from "./shared-client-B1tT5U6r.js";
+import { a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CpVfwctT.js";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/routing";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 //#region extensions/codex/src/app-server/thread-ownership.ts

package/dist/{thread-resume-DF54hagX.js → thread-resume-BFt1-ZDa.js}

@@ -1,8 +1,8 @@
-import { F as resolveCodexAppServerLocalHomeDir, I as resolveCodexAppServerUserHomeDir, P as resolveCodexAppServerHomeDir } from "./config-Cxw3Cl3k.js";
-import { $ as CodexAppServerRpcError, J as isCodexAppServerOverloadError, P as isCodexAppServerStartupError, Y as isCodexAppServerPrewriteRequestCancellationError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-kNkljY-R.js";
+import { F as resolveCodexAppServerLocalHomeDir, I as resolveCodexAppServerUserHomeDir, P as resolveCodexAppServerHomeDir } from "./config-CcYL77O6.js";
+import { $ as CodexAppServerRpcError, J as isCodexAppServerOverloadError, P as isCodexAppServerStartupError, Y as isCodexAppServerPrewriteRequestCancellationError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-B1tT5U6r.js";
 import { o as assertCodexThreadResumeResponse } from "./protocol-validators-Bg5rpNxk.js";
-import { f as unsubscribeCodexThreadBestEffort, i as assertCodexThreadResumeSubscription, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CVPvp9dL.js";
-import { t as CodexAppServerScopedRequestRejectedError } from "./request-CCm4LaED.js";
+import { f as unsubscribeCodexThreadBestEffort, i as assertCodexThreadResumeSubscription, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CpVfwctT.js";
+import { t as CodexAppServerScopedRequestRejectedError } from "./request-BWxweEdK.js";
 import { createRequire } from "node:module";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { readPluginPackageVersion } from "openclaw/plugin-sdk/extension-shared";
@@ -16,7 +16,7 @@ import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 * identity and safe to refresh in the background.
 */
 /** Default app inventory cache freshness window. */
-const CODEX_APP_INVENTORY_CACHE_TTL_MS = 3600 * 1e3;
+const CODEX_APP_INVENTORY_CACHE_TTL_MS = 36e5;
 const CODEX_APP_READ_BATCH_LIMIT = 100;
 const MAX_SERIALIZED_ERROR_MESSAGE_LENGTH = 500;
 /** In-memory app inventory cache with coalesced refreshes per key. */
@@ -337,7 +337,8 @@ function isSensitiveErrorDataKey(key) {
 * Builds stable Codex plugin/app inventory cache keys from app-server startup,
 * auth, account, and version inputs without storing secret material.
 */
-const CODEX_PLUGIN_VERSION = readPluginPackageVersion({ require: createRequire(import.meta.url) });
+const require = createRequire(import.meta.url);
+const CODEX_PLUGIN_VERSION = readPluginPackageVersion({ require });
 let catalogConnectionHomes = /* @__PURE__ */ new Map();
 function catalogConnectionHomeKey(fingerprint, agentDir) {
 	return `${agentDir ?? ""}\0${fingerprint}`;

package/dist/{transcript-mirror-CkEQIna-.js → transcript-mirror-1ep4XjzF.js}

@@ -1,4 +1,4 @@
-import { i as readUpstreamUserText, n as attachUpstreamUserText, r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
+import { i as readUpstreamUserText, n as attachUpstreamUserText, r as readMirrorIdentity, t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.js";
 import { asOptionalRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { deliverAgentHarnessUserInputPrompt, embeddedAgentLog, formatErrorMessage, projectAgentHarnessTranscriptMessageForDisplay, runAgentHarnessBeforeMessageWriteHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createHash } from "node:crypto";
@@ -8,8 +8,8 @@ import { publishSessionTranscriptUpdateByIdentity } from "openclaw/plugin-sdk/se
 import { Buffer } from "node:buffer";
 //#region extensions/codex/src/app-server/transcript-history-projection.ts
 const CODEX_HISTORY_IMPORT_MAX_MESSAGES = 200;
-const CODEX_HISTORY_IMPORT_MAX_BYTES = 512 * 1024;
-const CODEX_HISTORY_IMPORT_MAX_MESSAGE_BYTES = 64 * 1024;
+const CODEX_HISTORY_IMPORT_MAX_BYTES = 524288;
+const CODEX_HISTORY_IMPORT_MAX_MESSAGE_BYTES = 65536;
 const CODEX_HISTORY_TRUNCATION_SUFFIX = "\n\n[Message truncated during Codex history import.]";
 const CODEX_HISTORY_ASSISTANT_API = "openai-chatgpt-responses";
 const CODEX_HISTORY_ASSISTANT_PROVIDER = "openai";
@@ -34,7 +34,8 @@ function normalizeImportedHistoryText(value) {
 	if (!text) return;
 	if (Buffer.byteLength(text, "utf8") <= CODEX_HISTORY_IMPORT_MAX_MESSAGE_BYTES) return text;
 	const suffixBytes = Buffer.byteLength(CODEX_HISTORY_TRUNCATION_SUFFIX, "utf8");
-	return `${truncateUtf8Prefix(text, Math.max(0, CODEX_HISTORY_IMPORT_MAX_MESSAGE_BYTES - suffixBytes))}${CODEX_HISTORY_TRUNCATION_SUFFIX}`;
+	const contentLimitBytes = Math.max(0, CODEX_HISTORY_IMPORT_MAX_MESSAGE_BYTES - suffixBytes);
+	return `${truncateUtf8Prefix(text, contentLimitBytes)}${CODEX_HISTORY_TRUNCATION_SUFFIX}`;
 }
 function projectCodexUserItemText(item) {
 	if (!Array.isArray(item.content)) return;
@@ -183,7 +184,8 @@ function applyCodexTranscriptTaint(message, state) {
 		state.tainted = false;
 		return message;
 	}
-	const metadata = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0);
+	const existing = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
+	const metadata = asOptionalRecord(existing);
 	state.tainted ||= metadata?.turnTainted === true || metadata?.resultContentSource === "network";
 	return message.role === "assistant" && state.tainted ? {
 		...message,
@@ -206,7 +208,8 @@ function attachCodexMirrorAttestation(message, sourceFingerprint) {
 	};
 }
 function attachCodexMirrorRunId(message, runId, terminal = false) {
-	const { runTerminal: _staleTerminal, ...current } = asOptionalRecord(CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0) ?? {};
+	const existing = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
+	const { runTerminal: _staleTerminal, ...current } = asOptionalRecord(existing) ?? {};
 	return {
 		...message,
 		[CODEX_META_KEY]: {
@@ -216,6 +219,10 @@ function attachCodexMirrorRunId(message, runId, terminal = false) {
 		}
 	};
 }
+function hasCodexMirrorOrigin(message) {
+	const meta = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
+	return asOptionalRecord(meta)?.[MIRROR_ORIGIN_META_KEY] === CODEX_APP_SERVER_MIRROR_ORIGIN;
+}
 function readCodexMirrorSourceFingerprint(message) {
 	const meta = CODEX_META_KEY in message ? message[CODEX_META_KEY] : void 0;
 	if (!meta || typeof meta !== "object" || Array.isArray(meta)) return;
@@ -684,4 +691,4 @@ function resolveCodexMirrorTranscriptTarget(params) {
 	};
 }
 //#endregion
-export { buildCodexUserPromptMessage as a, fingerprintCodexMirrorSourceMessage as c, projectBoundedCodexThreadHistory as d, projectBoundedCodexVisibleSessionHistory as f, mirrorPromptAtTurnStartBestEffort as i, readCodexMirrorSourceFingerprint as l, createCodexAppServerUserMessagePersistenceNotifier as n, promptSnapshot as o, projectCodexUserItemText as p, importCodexThreadHistoryToTranscript as r, applyCodexTranscriptTaint as s, codexTranscriptMirrorRuntime as t, serializeCodexMirrorSourceEvidence as u };
+export { buildCodexUserPromptMessage as a, fingerprintCodexMirrorSourceMessage as c, serializeCodexMirrorSourceEvidence as d, projectBoundedCodexThreadHistory as f, mirrorPromptAtTurnStartBestEffort as i, hasCodexMirrorOrigin as l, projectCodexUserItemText as m, createCodexAppServerUserMessagePersistenceNotifier as n, promptSnapshot as o, projectBoundedCodexVisibleSessionHistory as p, importCodexThreadHistoryToTranscript as r, applyCodexTranscriptTaint as s, codexTranscriptMirrorRuntime as t, readCodexMirrorSourceFingerprint as u };