@openclaw/codex 2026.8.2 → 2026.9.1

package/dist/{capabilities-D6m_TdVy.js → capabilities-dIjNVCYH.js}

@@ -1,4 +1,4 @@
-import { $ as CodexAppServerRpcError } from "./shared-client-B1tT5U6r.js";
+import { q as CodexAppServerRpcError } from "./shared-client-DxcfF9KX.js";
 //#region extensions/codex/src/app-server/capabilities.ts
 /**
 * Capability helpers for optional Codex app-server control-plane methods.

package/dist/cli-metadata.js

@@ -2,7 +2,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/codex/cli-metadata.ts
 function registerCodexCliMetadata(api) {
 	api.registerCli(async ({ program }) => {
-		const { registerCodexSessionCli } = await import("./session-cli-B2lyjJA0.js");
+		const { registerCodexSessionCli } = await import("./session-cli-CmFEXMAM.js");
 		registerCodexSessionCli(program);
 	}, { descriptors: [{
 		name: "codex",

package/dist/{command-formatters--UToCokS.js → command-formatters-CLHhEB1Q.js}

@@ -1,5 +1,5 @@
-import { Ht as isJsonObject } from "./shared-client-B1tT5U6r.js";
-import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-BqHEHXQJ.js";
+import { $t as isJsonObject } from "./shared-client-DxcfF9KX.js";
+import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-CawQJfUS.js";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/command-formatters.ts
 /**
@@ -279,4 +279,4 @@ function extractArray(value) {
 	return [];
 }
 //#endregion
-export { formatComputerUseStatus as a, formatSkills as c, formatCodexStatus as i, formatThreads as l, formatAccount as n, formatList as o, formatCodexDisplayText as r, formatModels as s, buildHelp as t };
+export { formatCodexDisplayText as a, formatComputerUseStatus as c, formatSkills as d, formatThreads as f, formatAccount as i, formatList as l, buildHelp as n, formatCodexStatus as o, escapeCodexChatText as r, formatCodexTextForDisplay as s, CODEX_RESUME_SAFE_THREAD_ID_PATTERN as t, formatModels as u };

package/dist/{command-handlers-CLFx2Ypa.js → command-handlers-CTGb2csu.js}

@@ -1,25 +1,27 @@
-import { i as resolveCodexAppServerRuntimeOptions, j as CODEX_PLUGINS_MARKETPLACE_NAME, k as isCodexFastServiceTier } from "./config-CcYL77O6.js";
-import { Ft as resolveCodexAppServerFallbackApiKeyCacheKey, Ht as isJsonObject, Nt as resolveCodexAppServerAuthProfileIdForAgent, c as getLeasedSharedCodexAppServerClient, gt as consumeCodexAppServerLiveThread, h as releaseLeasedSharedCodexAppServerClient, jt as resolveCodexAppServerAuthAccountCacheKey, vt as hasCodexAppServerLiveThread } from "./shared-client-B1tT5U6r.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-D0zinCP1.js";
-import { o as assertCodexThreadResumeResponse, r as assertCodexThreadAcceptsDirectInput } from "./protocol-validators-Bg5rpNxk.js";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CpVfwctT.js";
-import { t as listAllCodexAppServerModels } from "./models-DaWfETQk.js";
-import { i as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./thread-resume-BFt1-ZDa.js";
-import { dt as isOpenAiCuratedMarketplaceName, lt as refreshCodexPluginRuntimeState } from "./thread-lifecycle-CGGKP720.js";
-import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, l as isIncognitoSessionKey, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withCodexConversationThreadActivity, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-RkaoZCmQ.js";
-import { c as resolveCodexNativeSandboxBlock, s as resolveCodexNativeExecutionBlock } from "./request-BWxweEdK.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-D6m_TdVy.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-BqHEHXQJ.js";
-import { a as formatComputerUseStatus, c as formatSkills, i as formatCodexStatus, l as formatThreads, n as formatAccount, o as formatList, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters--UToCokS.js";
-import { _ as hasCodexAdminScope, a as parseCodexPermissionsModeArg, c as setCodexConversationModel, d as stopCodexConversationTurn, g as canMutateCodexHost, h as CODEX_NATIVE_EXECUTION_AUTH_ERROR, i as parseCodexFastModeArg, l as setCodexConversationPermissions, m as CODEX_HOST_INSPECTION_AUTH_ERROR, n as parseCodexPluginMarketplaceId, o as readCodexConversationActiveTurn, p as CODEX_FULL_PERMISSIONS_AUTH_ERROR, r as formatPermissionsMode, s as setCodexConversationFastMode, t as discoverCodexMarketplacePlugins, u as steerCodexConversationTurn } from "./plugin-marketplace-discovery-BXjIFEiw.js";
+import { $ as assertCodexThreadResumeResponse, $t as isJsonObject, Bt as resolveCodexAppServerAuthProfileIdForAgent, Ht as resolveCodexAppServerFallbackApiKeyCacheKey, Rt as resolveCodexAppServerAuthAccountCacheKey, St as consumeCodexAppServerLiveThread, X as assertCodexThreadAcceptsDirectInput, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, wt as hasCodexAppServerLiveThread } from "./shared-client-DxcfF9KX.js";
+import { A as isCodexFastServiceTier, M as CODEX_PLUGINS_MARKETPLACE_NAME, i as resolveCodexAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
+import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BHuTCRZQ.js";
+import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DYHcRQAa.js";
+import { t as listAllCodexAppServerModels } from "./models-sYnEc0gd.js";
+import { i as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./thread-resume-C7pyVKeW.js";
+import { At as refreshCodexPluginRuntimeState, Mt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-DAcEJ_Om.js";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, l as isIncognitoSessionKey, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withCodexConversationThreadActivity, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-zGokd8i1.js";
+import { c as resolveCodexNativeSandboxBlock, s as resolveCodexNativeExecutionBlock } from "./request-DYAI5FQE.js";
+import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-g4KbJPzp.js";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-dIjNVCYH.js";
+import { s as summarizeCodexAccountUsage } from "./rate-limits-CawQJfUS.js";
+import { a as formatCodexDisplayText, c as formatComputerUseStatus, d as formatSkills, f as formatThreads, i as formatAccount, l as formatList, n as buildHelp, o as formatCodexStatus, r as escapeCodexChatText, s as formatCodexTextForDisplay, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatModels } from "./command-formatters-CLHhEB1Q.js";
+import { _ as hasCodexAdminScope, a as parseCodexPermissionsModeArg, c as setCodexConversationModel, d as stopCodexConversationTurn, g as canMutateCodexHost, h as CODEX_NATIVE_EXECUTION_AUTH_ERROR, i as parseCodexFastModeArg, l as setCodexConversationPermissions, m as CODEX_HOST_INSPECTION_AUTH_ERROR, n as parseCodexPluginMarketplaceId, o as readCodexConversationActiveTurn, p as CODEX_FULL_PERMISSIONS_AUTH_ERROR, r as formatPermissionsMode, s as setCodexConversationFastMode, t as discoverCodexMarketplacePlugins, u as steerCodexConversationTurn } from "./plugin-marketplace-discovery-CfFlKqDl.js";
 import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CF7BmrDk.js";
-import { c as readCodexStatusProbes, l as requestOptions, p as formatCodexCliSessions, s as codexControlRequest, u as safeCodexControlRequest } from "./session-catalog-eMhVm0Ql.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-DQQm4gWT.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-E6uDsPlx.js";
+import { c as readCodexStatusProbes, l as requestOptions, p as formatCodexCliSessions, s as codexControlRequest, u as safeCodexControlRequest } from "./session-catalog-yyvTWFOw.js";
+import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-BFrPhb2c.js";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
-import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
+import { isDeepStrictEqual } from "node:util";
+import { ensureAuthProfileStore, resolveAgentDir, resolveAuthProfileEligibility, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
+import { findNormalizedProviderValue, resolveAuthProfileOrder } from "openclaw/plugin-sdk/provider-auth";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
@@ -757,7 +759,6 @@ const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 3e5;
 const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE = 100;
 const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES = 100;
 const CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS = 128;
-const CODEX_RESUME_SAFE_THREAD_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
 const { lastUploadByThread: lastCodexDiagnosticsUploadByThread, lastUploadByScope: lastCodexDiagnosticsUploadByScope, pendingConfirmations: pendingCodexDiagnosticsConfirmations, pendingTokensByScope: pendingCodexDiagnosticsConfirmationTokensByScope } = codexDiagnosticsFeedbackState;
 function normalizeDiagnosticsReason(note) {
 	const normalized = normalizeOptionalString(note);
@@ -910,7 +911,7 @@ function formatCodexDiagnosticsTargetLines(targets) {
 }
 function formatCodexDiagnosticsTargetBlock(target, index) {
 	const lines = [`Session ${index + 1}`];
-	if (target.channel) lines.push(`Channel: ${formatCodexValueForDisplay(target.channel)}`);
+	if (target.channel) lines.push(`Channel: ${formatCodexDisplayText(target.channel)}`);
 	if (target.sessionKey) lines.push(`OpenClaw session key: ${formatCodexCopyableValueForDisplay(target.sessionKey)}`);
 	if (target.sessionId) lines.push(`OpenClaw session id: ${formatCodexCopyableValueForDisplay(target.sessionId)}`);
 	lines.push(`Codex thread id: ${formatCodexCopyableValueForDisplay(target.threadId)}`);
@@ -919,30 +920,18 @@ function formatCodexDiagnosticsTargetBlock(target, index) {
 }
 function formatCodexDiagnosticsTargetLine(target) {
 	const parts = [];
-	if (target.channel) parts.push(`channel ${formatCodexValueForDisplay(target.channel)}`);
+	if (target.channel) parts.push(`channel ${formatCodexDisplayText(target.channel)}`);
 	const sessionLabel = target.sessionId || target.sessionKey;
-	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexValueForDisplay(sessionLabel)}`);
-	parts.push(`Codex thread ${formatCodexThreadIdForDisplay(target.threadId)}`);
+	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexDisplayText(sessionLabel)}`);
+	parts.push(`Codex thread ${formatCodexDisplayText(target.threadId)}`);
 	return `- ${parts.join(", ")}`;
 }
-function escapeCodexChatText(value) {
-	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("@", "＠").replaceAll("`", "｀").replaceAll("[", "［").replaceAll("]", "］").replaceAll("(", "（").replaceAll(")", "）").replaceAll("*", "∗").replaceAll("_", "＿").replaceAll("~", "～").replaceAll("|", "｜");
-}
-function formatCodexTextForDisplay(value) {
-	let safe = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		safe += codePoint != null && isUnsafeDisplayCodePoint(codePoint) ? "?" : character;
-	}
-	safe = safe.trim();
-	return safe || "<unknown>";
-}
 function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options = {}) {
 	for (const target of targets) {
 		const cooldownMs = readCodexDiagnosticsCooldownMs(target.threadId, now);
 		if (cooldownMs > 0) {
 			if (options.includeThreadId === false) return `Codex diagnostics were already sent for one of these Codex threads recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
-			return `Codex diagnostics were already sent for thread ${formatCodexThreadIdForDisplay(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
+			return `Codex diagnostics were already sent for thread ${formatCodexDisplayText(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
 		}
 	}
 	const scopeCooldownMs = readCodexDiagnosticsScopeCooldownMs(options.cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), now);
@@ -974,12 +963,6 @@ function buildDiagnosticsTags(ctx) {
 function addTag(tags, key, value) {
 	if (typeof value === "string" && value.trim()) tags[key] = value.trim();
 }
-function formatCodexThreadIdForDisplay(threadId) {
-	return escapeCodexChatText(formatCodexTextForDisplay(threadId));
-}
-function formatCodexValueForDisplay(value) {
-	return escapeCodexChatText(formatCodexTextForDisplay(value));
-}
 function formatCodexCopyableValueForDisplay(value) {
 	const safe = formatCodexTextForDisplay(value);
 	if (CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safe)) return `\`${safe}\``;
@@ -1015,16 +998,14 @@ function pruneCodexDiagnosticsCooldownMap(map, now) {
 	for (const [key, lastSentAt] of map) if (now - lastSentAt >= CODEX_DIAGNOSTICS_COOLDOWN_MS) map.delete(key);
 }
 function formatCodexErrorForDisplay(error) {
-	return escapeCodexChatText(truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS)) || "unknown error";
+	const safe = truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS);
+	return escapeCodexChatText(safe) || "unknown error";
 }
 function formatCodexResumeCommandForDisplay(threadId) {
 	const safeThreadId = formatCodexTextForDisplay(threadId);
 	if (!CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safeThreadId)) return "run codex resume and paste the thread id shown above";
 	return `\`codex resume ${safeThreadId}\``;
 }
-function isUnsafeDisplayCodePoint(codePoint) {
-	return codePoint <= 31 || codePoint >= 127 && codePoint <= 159 || codePoint === 173 || codePoint === 1564 || codePoint === 6158 || codePoint >= 8203 && codePoint <= 8207 || codePoint >= 8234 && codePoint <= 8238 || codePoint >= 8288 && codePoint <= 8303 || codePoint === 65279 || codePoint >= 65529 && codePoint <= 65531 || codePoint >= 917504 && codePoint <= 917631;
-}
 function normalizeCodexDiagnosticsScopeField(value) {
 	const normalized = normalizeOptionalString(value);
 	if (!normalized) return;
@@ -1158,7 +1139,7 @@ async function requestCodexDiagnosticsFeedbackApproval(deps, ctx, note, commandP
 	});
 	const confirmCommand = `${commandPrefix} confirm ${token}`;
 	const cancelCommand = `${commandPrefix} cancel ${token}`;
-	const displayReason = reason ? escapeCodexChatText(formatCodexTextForDisplay(reason)) : void 0;
+	const displayReason = reason ? formatCodexDisplayText(reason) : void 0;
 	return {
 		text: [
 			targets.length === 1 ? "Codex runtime thread detected." : "Codex runtime threads detected.",
@@ -1200,7 +1181,7 @@ async function previewCodexDiagnosticsFeedbackApproval(deps, ctx, note) {
 	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, Date.now(), { includeThreadId: false });
 	if (cooldownMessage) return cooldownMessage;
 	const reason = normalizeDiagnosticsReason(note);
-	const displayReason = reason ? escapeCodexChatText(formatCodexTextForDisplay(reason)) : void 0;
+	const displayReason = reason ? formatCodexDisplayText(reason) : void 0;
 	return [
 		targets.length === 1 ? "Codex runtime thread detected." : "Codex runtime threads detected.",
 		`Approving diagnostics will also send ${targets.length === 1 ? "this thread's feedback bundle" : "these threads' feedback bundles"} to OpenAI servers.`,
@@ -1806,11 +1787,14 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 	const isObjectiveUpdate = action === "set";
 	if (!requestedStatus && !isObjectiveUpdate || isObjectiveUpdate && !objective) return "Usage: /codex goal [status|set <objective>|pause|resume|block|complete|clear]";
 	if (requestedStatus && args.length > 1) return `Usage: /codex goal ${action}`;
-	return formatNativeGoal(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.setThreadGoal, {
+	return formatNativeGoal(await deps.bindingStore.withLease(target.identity, () => deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.setThreadGoal, {
 		threadId: binding.threadId,
 		...objective ? { objective } : {},
 		...requestedStatus ? { status: requestedStatus } : {}
-	}, goalRequestOptions));
+	}, {
+		...goalRequestOptions,
+		...(isObjectiveUpdate || requestedStatus === "active") && connection.usesSupervisionConnection ? { beforeRequest: supervisedCommandGuard(deps, target.identity, binding) } : {}
+	})));
 }
 function formatNativeGoal(response) {
 	const goal = isJsonObject(response) && isJsonObject(response.goal) ? response.goal : void 0;
@@ -1942,20 +1926,35 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		authProfileId: binding.authProfileId,
 		pluginConfig
 	});
-	await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.review, {
+	await deps.bindingStore.withLease(target.identity, () => deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.review, {
 		threadId: binding.threadId,
 		target: { type: "uncommittedChanges" }
 	}, {
 		agentDir: target.agentDir,
 		authProfileId: connection.clientAuthProfileId,
 		config: ctx.config,
-		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {}
-	});
+		...connection.usesSupervisionConnection ? {
+			startOptions: connection.appServer.start,
+			beforeRequest: supervisedCommandGuard(deps, target.identity, binding)
+		} : {}
+	}));
 	return `Started Codex review for thread ${formatCodexDisplayText(binding.threadId)}.`;
 }
+function supervisedCommandGuard(deps, identity, binding) {
+	return async (_request, client, scope) => {
+		const { thread } = await client.request("thread/read", {
+			threadId: binding.threadId,
+			includeTurns: false
+		});
+		scope.assertCurrent();
+		if (!isDeepStrictEqual(await deps.bindingStore.read(identity), binding)) throw new Error("Codex command binding changed before model execution");
+		scope.assertCurrent();
+		assertCodexSupervisionThreadLineage(binding, thread);
+	};
+}
 //#endregion
 //#region extensions/codex/src/command-plugins-management.ts
-const POLICY_REFRESH_HINT = "New Codex conversations pick this up automatically. Use /new or /reset to refresh the current one.";
+const POLICY_REFRESH_HINT = "Takes effect on your next message.";
 async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
 	const [verb = "list", ...args] = rest;
 	const normalized = verb.toLowerCase();
@@ -2314,7 +2313,7 @@ function formatPluginList(plugins, options = {}) {
 		...rows.map((r) => `  ${r.state}  ${r.displayKey.padEnd(keyW)}  ${r.pluginName.padEnd(pluginW)}  [${r.marketplace}]`),
 		"",
 		...globalEnabled ? [] : ["Global codexPlugins.enabled is off; configured sub-plugins are inactive.", ""],
-		"New Codex conversations pick up policy changes automatically; /new or /reset to refresh the current one."
+		POLICY_REFRESH_HINT
 	].join("\n");
 }
 //#endregion

package/dist/{compact-5xqW1oCh.js → compact-_t0HQrUS.js}

@@ -1,12 +1,13 @@
-import { $ as CodexAppServerRpcError, Ct as retainCodexAppServerLiveThread, Ht as isJsonObject, c as getLeasedSharedCodexAppServerClient, gt as consumeCodexAppServerLiveThread, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-B1tT5U6r.js";
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-D0zinCP1.js";
-import { _ as readCodexNotificationThreadId, a as closeCodexStartupClientBestEffort, f as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError, v as readCodexNotificationTurnId } from "./attempt-client-cleanup-CpVfwctT.js";
-import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-B2r5vhWH.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BFt1-ZDa.js";
-import { l as isIncognitoSessionKey, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-RkaoZCmQ.js";
-import { s as resolveCodexNativeExecutionBlock } from "./request-BWxweEdK.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-CF7BmrDk.js";
-import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.js";
+import { $t as isJsonObject, At as retainCodexAppServerLiveThread, St as consumeCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError } from "./shared-client-DxcfF9KX.js";
+import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BHuTCRZQ.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-DYHcRQAa.js";
+import { f as readCodexNotificationItem, i as readCodexThreadContextSnapshot } from "./event-projector-usage-C5mcrGjp.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-C7pyVKeW.js";
+import { l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-zGokd8i1.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-DYAI5FQE.js";
+import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-g4KbJPzp.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-E6uDsPlx.js";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -14,17 +15,12 @@ import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-
 import { resolveDefaultAgentId as resolveDefaultAgentId$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 //#region extensions/codex/src/app-server/compact.ts
-/**
-* Native Codex app-server compaction bridge for bound OpenClaw sessions.
-*/
 const warnedIgnoredCompactionOverrides = createDedupeCache({
 	ttlMs: 0,
 	maxSize: 4096
 });
-const codexNativeCompactionQueue = new KeyedAsyncQueue();
 const CODEX_NATIVE_COMPACTION_INTERRUPT_GRACE_MS = 3e4;
 function watchCodexNativeCompactionCompletion(params) {
 	const runOutsideBindingLease = AsyncLocalStorage.snapshot();
@@ -195,7 +191,7 @@ function watchCodexNativeCompactionCompletion(params) {
 async function runExclusiveCodexNativeCompaction(threadId, signal, run) {
 	signal?.throwIfAborted();
 	let started = false;
-	const queued = codexNativeCompactionQueue.enqueue(threadId, async () => {
+	const queued = withCodexAppServerThreadMutation(threadId, async () => {
 		started = true;
 		signal?.throwIfAborted();
 		return run();
@@ -399,17 +395,29 @@ async function compactCodexNativeThread(params, options) {
 			const acquireThreadSubscription = async (timeoutMs) => {
 				if (!isIncognitoSessionKey(params.sessionKey)) {
 					retainedThreadOwnership = await consumeCodexAppServerLiveThread(client, binding.threadId);
-					if (!retainedThreadOwnership) await resumeCodexAppServerThread({
-						client,
-						abandonClient: async () => closeCodexStartupClientBestEffort(client),
-						request: {
+					if (!retainedThreadOwnership) {
+						const resumed = await resumeCodexAppServerThread({
+							client,
+							abandonClient: async () => closeCodexStartupClientBestEffort(client),
+							request: {
+								threadId: binding.threadId,
+								excludeTurns: true
+							},
+							timeoutMs: timeoutMs ?? appServer.requestTimeoutMs,
+							...params.abortSignal ? { signal: params.abortSignal } : {}
+						});
+						releaseThreadSubscription = async () => releaseCompactionThread(binding.threadId);
+						assertCodexSupervisionThreadLineage(binding, resumed.thread);
+					} else if (binding.connectionScope === "supervision") {
+						releaseThreadSubscription = async () => retainedThreadOwnership?.release(binding.threadId);
+						const { thread } = await client.request("thread/read", {
 							threadId: binding.threadId,
-							excludeTurns: true
-						},
-						timeoutMs: timeoutMs ?? appServer.requestTimeoutMs,
-						...params.abortSignal ? { signal: params.abortSignal } : {}
-					});
-					releaseThreadSubscription = async () => releaseCompactionThread(binding.threadId);
+							includeTurns: false
+						});
+						retainedThreadOwnership.assertCurrent();
+						assertCodexSupervisionThreadLineage(binding, thread);
+					}
+					releaseThreadSubscription ??= async () => releaseCompactionThread(binding.threadId);
 				}
 			};
 			try {

package/dist/{config-CcYL77O6.js → config-BhmfC1s6.js}

@@ -1,4 +1,4 @@
-import { n as readCodexAppServerConfigOptions, t as normalizeCodexAppServerArgs } from "./launch-args-sXOAg0SX.js";
+import { n as normalizeCodexAppServerArgs, r as readCodexAppServerConfigOptions } from "./launch-args-RXQwn8zV.js";
 import { asNullableRecord, asOptionalRecord as readRecord, normalizeOptionalString, normalizeOptionalString as readNonEmptyString, normalizeTrimmedStringList, parseBooleanValue } from "openclaw/plugin-sdk/string-coerce-runtime";
 import path from "node:path";
 import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
@@ -443,9 +443,6 @@ const codexPluginConfigSchema = z.object({
 		codeModeOnly: z.boolean().optional(),
 		loopDetectionPreToolUseRelay: z.boolean().optional(),
 		requestTimeoutMs: z.number().positive().optional(),
-		turnCompletionIdleTimeoutMs: z.number().positive().optional(),
-		turnAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
-		postToolRawAssistantCompletionIdleTimeoutMs: z.number().positive().optional(),
 		approvalPolicy: codexAppServerApprovalPolicySchema.optional(),
 		sandbox: codexAppServerSandboxSchema.optional(),
 		approvalsReviewer: codexAppServerApprovalsReviewerSchema.optional(),
@@ -997,6 +994,16 @@ function stableStringifyJson(value) {
 	if (value && typeof value === "object") return `{${Object.entries(value).toSorted(([left], [right]) => left.localeCompare(right)).map(([key, item]) => `${JSON.stringify(key)}:${stableStringifyJson(item)}`).join(",")}}`;
 	return JSON.stringify(value);
 }
+/** Explicit MCP prompting must bypass Codex's unconditional Never-policy approval. */
+function hasCodexMcpToolApprovalOverrides(servers, serverNames, projectedMcpServers) {
+	const modes = new Map(Object.entries(projectedMcpServers ?? {}).map(([name, server]) => [name, server.default_tools_approval_mode]));
+	for (const name of serverNames ?? Object.keys(servers ?? {})) {
+		const server = servers?.[name];
+		const mode = server?.codex?.defaultToolsApprovalMode;
+		if (mode !== void 0 && (serverNames !== void 0 || server?.enabled !== false)) modes.set(name, mode);
+	}
+	return [...modes.values()].some((mode) => mode === "auto" || mode === "prompt");
+}
 function withMcpElicitationsApprovalPolicy(policy) {
 	if (policy === "untrusted") return policy;
 	if (typeof policy !== "string") return { granular: {
@@ -1246,9 +1253,6 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		codeModeOnly: config.codeModeOnly === true,
 		loopDetectionPreToolUseRelay: config.loopDetectionPreToolUseRelay !== false,
 		requestTimeoutMs: normalizePositiveNumber(config.requestTimeoutMs, 6e4),
-		turnCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnCompletionIdleTimeoutMs, 6e4),
-		turnAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.turnAssistantCompletionIdleTimeoutMs, 1e4),
-		...config.postToolRawAssistantCompletionIdleTimeoutMs !== void 0 ? { postToolRawAssistantCompletionIdleTimeoutMs: normalizePositiveNumber(config.postToolRawAssistantCompletionIdleTimeoutMs, 6e4) } : {},
 		approvalPolicy: forcedPolicy?.approvalPolicy ?? approvalPolicy,
 		approvalPolicySource,
 		sandbox: resolvedSandbox,
@@ -1394,4 +1398,4 @@ function resolveCodexSupervisionAppServerRuntimeOptions(params = {}) {
 	});
 }
 //#endregion
-export { normalizeCodexServiceTier as A, isCodexRemoteExecPlacementSandbox as C, resolveOpenClawExecPolicyForCodexAppServer as D, resolveCodexPluginsPolicy as E, resolveCodexAppServerLocalHomeDir as F, resolveCodexAppServerUserHomeDir as I, withEphemeralCodexAuthStore as L, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as M, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as N, selectGuardianSandbox as O, resolveCodexAppServerHomeDir as P, isCodexPairedNodeRemoteExecPlacementSandbox as S, readCodexPluginConfig as T, parseAllowedSandboxModesFromCodexRequirements as _, resolveCodexAppServerStartOptionsForAgent as a, selectGuardianApprovalsReviewer as b, assertCodexAppServerConnectionSecurity as c, withMcpElicitationsApprovalPolicy as d, assertCodexModelBackedReviewerEffectiveConfig as f, parseAllowedApprovalsReviewersFromCodexRequirements as g, parseAllowedApprovalPoliciesFromCodexRequirements as h, resolveCodexAppServerRuntimeOptions as i, CODEX_PLUGINS_MARKETPLACE_NAME as j, isCodexFastServiceTier as k, resolveCodexAppServerNetworkProxy as l, resolveCodexModelBackedReviewerPolicyContext as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, canUseCodexModelBackedApprovalsReviewerForModel as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, shouldAutoApproveCodexAppServerApprovals as u, readCodexRequirementsToml as v, isCodexSandboxExecServerEnabled as w, selectUserApprovalsReviewer as x, selectGuardianApprovalPolicy as y };
+export { isCodexFastServiceTier as A, isCodexPairedNodeRemoteExecPlacementSandbox as C, resolveCodexPluginsPolicy as D, readCodexPluginConfig as E, resolveCodexAppServerHomeDir as F, resolveCodexAppServerLocalHomeDir as I, resolveCodexAppServerUserHomeDir as L, CODEX_PLUGINS_MARKETPLACE_NAME as M, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as N, resolveOpenClawExecPolicyForCodexAppServer as O, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as P, withEphemeralCodexAuthStore as R, selectUserApprovalsReviewer as S, isCodexSandboxExecServerEnabled as T, parseAllowedApprovalsReviewersFromCodexRequirements as _, resolveCodexAppServerStartOptionsForAgent as a, selectGuardianApprovalPolicy as b, assertCodexAppServerConnectionSecurity as c, shouldAutoApproveCodexAppServerApprovals as d, withMcpElicitationsApprovalPolicy as f, parseAllowedApprovalPoliciesFromCodexRequirements as g, resolveCodexModelBackedReviewerPolicyContext as h, resolveCodexAppServerRuntimeOptions as i, normalizeCodexServiceTier as j, selectGuardianSandbox as k, hasCodexMcpToolApprovalOverrides as l, canUseCodexModelBackedApprovalsReviewerForModel as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, assertCodexModelBackedReviewerEffectiveConfig as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, resolveCodexAppServerNetworkProxy as u, parseAllowedSandboxModesFromCodexRequirements as v, isCodexRemoteExecPlacementSandbox as w, selectGuardianApprovalsReviewer as x, readCodexRequirementsToml as y };

package/dist/{context-compaction-activity-BOeJf7yo.js → context-compaction-activity-CMla5FPJ.js}

@@ -20,7 +20,10 @@ async function persistCodexContextCompactionActivity(params) {
 			itemId: params.itemId,
 			...params.runId ? { runId: params.runId } : {}
 		},
-		...params.runId ? { __openclaw: { runId: params.runId } } : {},
+		__openclaw: {
+			itemId: params.itemId,
+			...params.runId ? { runId: params.runId } : {}
+		},
 		timestamp: params.timestamp,
 		idempotencyKey: activityId
 	};

package/dist/doctor-contract-api.js

@@ -2,13 +2,13 @@ import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_
 import { asNullableRecord, asOptionalRecord, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
+import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { listAgentIds, resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { setImmediate } from "node:timers/promises";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
-import { canonicalPathFromExistingAncestor, isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
 import { archiveLegacyStateSource, legacyStateFileExists } from "openclaw/plugin-sdk/runtime-doctor-migrations";
 //#region extensions/codex/src/migration/session-binding-orphans.ts
@@ -392,7 +392,7 @@ async function migrateSource(source, candidates, params, store) {
 		return await withFileLock(source.sidecarPath, LEGACY_BINDING_LOCK_OPTIONS, async () => {
 			const [contents, stat] = await Promise.all([fs.readFile(source.sidecarPath, "utf8"), fs.stat(source.sidecarPath)]);
 			const raw = JSON.parse(contents);
-			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-D0zinCP1.js").then((n) => n.f), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-BHuTCRZQ.js").then((n) => n.f), import("./conversation-binding-data-BiodpIzq.js").then((n) => n.t)]);
 			const agentId = owner?.agentId ?? (source.agentIds.size === 1 ? [...source.agentIds][0] : void 0);
 			const baseStored = createStoredCodexAppServerBinding(raw, {
 				now: stat.mtime.toISOString(),
@@ -640,6 +640,15 @@ function hasRetiredApprovalPolicy(value) {
 	const approvalPolicy = asNullableRecord(value)?.approvalPolicy;
 	return approvalPolicy === "on-failure" || approvalPolicy === "untrusted";
 }
+const RETIRED_TURN_IDLE_TIMEOUT_KEYS = [
+	"turnCompletionIdleTimeoutMs",
+	"turnAssistantCompletionIdleTimeoutMs",
+	"postToolRawAssistantCompletionIdleTimeoutMs"
+];
+function hasRetiredTurnIdleTimeout(value) {
+	const appServer = asNullableRecord(value);
+	return appServer !== null && RETIRED_TURN_IDLE_TIMEOUT_KEYS.some((key) => Object.hasOwn(appServer, key));
+}
 /** Legacy Codex config keys that doctor should report or repair. */
 const legacyConfigRules = [
 	{
@@ -673,6 +682,17 @@ const legacyConfigRules = [
 		],
 		message: "plugins.entries.codex.config.appServer.approvalPolicy values \"on-failure\" and \"untrusted\" are retired; use \"on-request\". Run \"openclaw doctor --fix\".",
 		match: hasRetiredApprovalPolicy
+	},
+	{
+		path: [
+			"plugins",
+			"entries",
+			"codex",
+			"config",
+			"appServer"
+		],
+		message: "Codex app-server turn idle timeouts are retired; native Codex owns provider liveness and turn completion. The existing agents.defaults.timeoutSeconds run limit remains unchanged. Run \"openclaw doctor --fix\" to remove the old settings.",
+		match: hasRetiredTurnIdleTimeout
 	}
 ];
 /**
@@ -686,7 +706,8 @@ function normalizeCompatibilityConfig({ cfg }) {
 	const shouldRemoveDynamicToolsProfile = rawPluginConfig !== null && hasRetiredDynamicToolsProfile(rawPluginConfig);
 	const shouldRewriteDestructivePolicy = hasLegacyPluginDestructivePolicy(rawCodexPlugins);
 	const shouldRewriteApprovalPolicy = hasRetiredApprovalPolicy(rawAppServer);
-	if (!rawPluginConfig || !shouldRemoveDynamicToolsProfile && !shouldRewriteDestructivePolicy && !shouldRewriteApprovalPolicy) return {
+	const shouldRemoveTurnIdleTimeouts = hasRetiredTurnIdleTimeout(rawAppServer);
+	if (!rawPluginConfig || !shouldRemoveDynamicToolsProfile && !shouldRewriteDestructivePolicy && !shouldRewriteApprovalPolicy && !shouldRemoveTurnIdleTimeouts) return {
 		config: cfg,
 		changes: []
 	};
@@ -714,8 +735,14 @@ function normalizeCompatibilityConfig({ cfg }) {
 		}
 		changes.push("Renamed plugins.entries.codex.config.codexPlugins allow_destructive_actions=\"on-request\" values to \"auto\".");
 	}
+	const nextAppServer = asNullableRecord(nextPluginConfig.appServer);
+	if (nextAppServer && shouldRemoveTurnIdleTimeouts) {
+		for (const key of RETIRED_TURN_IDLE_TIMEOUT_KEYS) if (Object.hasOwn(nextAppServer, key)) {
+			delete nextAppServer[key];
+			changes.push(`Removed retired plugins.entries.codex.config.appServer.${key}; native Codex owns provider liveness and turn completion. agents.defaults.timeoutSeconds was not changed.`);
+		}
+	}
 	if (shouldRewriteApprovalPolicy) {
-		const nextAppServer = asNullableRecord(nextPluginConfig.appServer);
 		if (nextAppServer?.approvalPolicy === "on-failure" || nextAppServer?.approvalPolicy === "untrusted") nextAppServer.approvalPolicy = "on-request";
 		changes.push("Renamed retired plugins.entries.codex.config.appServer.approvalPolicy to \"on-request\".");
 	}