@openclaw/codex 2026.9.1-beta.1 → 2026.9.1

package/dist/{binding-connection-BMvPX73o.js → binding-connection-E6uDsPlx.js}

@@ -1,5 +1,5 @@
-import { h as readCodexPluginConfig, i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-giW8X0QA.js";
-import { a as resolveCodexCatalogConnectionHome, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-C1CAdfcP.js";
+import { E as readCodexPluginConfig, i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
+import { n as buildCodexAppServerConnectionFingerprint, o as resolveCodexCatalogConnectionHome } from "./thread-resume-C7pyVKeW.js";
 //#region extensions/codex/src/app-server/binding-connection.ts
 /** Requires the native model pair after a supervised pending branch has materialized. */
 function requireCodexSupervisionModelSelection(binding) {

package/dist/{bounded-turn-B7iBUcuP.js → bounded-turn-wzJrwKKe.js}

@@ -1,10 +1,10 @@
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-giW8X0QA.js";
-import { K as createCodexElicitationResponse, c as isCodexAppServerStartSelectionChangedError, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, o as interruptCodexTurnAndWaitBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./attempt-client-cleanup-bfsmcQ6m.js";
-import { b as isTerminalTurnStatus, n as normalizeCodexResponseTokenUsage, x as readCodexNotificationItem, y as isRetryableErrorNotification } from "./event-projector-usage-Bk1I90Bg.js";
-import { a as assertCodexThreadStartResponse, c as readCodexErrorNotification, o as assertCodexTurnStartResponse, u as readCodexTurnCompletedNotification } from "./protocol-validators-VeJxxJ0U.js";
-import { r as readModelListResult } from "./models-TS3HBU-q.js";
-import { A as attestCodexRestrictedToolSurfaceMcpServersDisabled, M as buildCodexRuntimeThreadConfig, N as readCodexInheritedMcpServerNames, bt as mergeCodexThreadConfigs, j as buildCodexRingZeroThreadConfigPatch, k as assertCodexManagedRequirementsDoNotOverrideToolPolicy } from "./thread-lifecycle-L7oEkTlq.js";
+import { $t as isJsonObject, at as readCodexTurnCompletedNotification, et as assertCodexThreadStartResponse, ot as createCodexElicitationResponse, rt as readCodexErrorNotification, tt as assertCodexTurnStartResponse, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-DxcfF9KX.js";
+import { r as readCodexAppServerConfigOptions } from "./launch-args-RXQwn8zV.js";
+import { i as resolveCodexAppServerRuntimeOptions } from "./config-BhmfC1s6.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, o as interruptCodexTurnAndWaitBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./attempt-client-cleanup-DYHcRQAa.js";
+import { d as isTerminalTurnStatus, f as readCodexNotificationItem, n as normalizeCodexResponseTokenUsage, u as isRetryableErrorNotification } from "./event-projector-usage-C5mcrGjp.js";
+import { r as readModelListResult } from "./models-sYnEc0gd.js";
+import { Dt as mergeCodexThreadConfigs, G as attestCodexRestrictedToolSurfaceMcpServersDisabled, _ as buildCodexRingZeroThreadConfigPatch, b as readCodexInheritedMcpServerNames, g as assertCodexManagedRequirementsDoNotOverrideToolPolicy, v as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DAcEJ_Om.js";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -65,11 +65,7 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 	const timeoutMs = deadline - Date.now();
 	if (timeoutMs <= 0) throw timeoutError;
 	const agentDir = params.agentDir?.trim() || void 0;
-	const isolatedStartOptions = workspace.codexHome ? buildPrivateCodexAppServerStartOptions(appServer.start, workspace.codexHome) : appServer.start;
-	const startOptions = workspace.codexHome && params.preparedAuth ? {
-		...isolatedStartOptions,
-		homeScope: "agent"
-	} : isolatedStartOptions;
+	const startOptions = workspace.codexHome ? buildPrivateCodexAppServerStartOptions(appServer.start, workspace.codexHome) : appServer.start;
 	const ownsClient = !params.options.clientFactory;
 	const authSelection = params.preparedAuth ? { preparedAuth: params.preparedAuth } : { authProfileId: params.profile };
 	const client = params.options.clientFactory ? await params.options.clientFactory({
@@ -80,7 +76,7 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 		config: params.config,
 		timeoutMs,
 		...params.signal ? { abandonSignal: params.signal } : {}
-	}) : await import("./shared-client-DKz23hHY.js").then((n) => n.y).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	}) : await import("./shared-client-DxcfF9KX.js").then((n) => n.x).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions,
 		timeoutMs,
 		...authSelection,
@@ -204,10 +200,7 @@ function resolveBoundedThreadConfig(params, workspace, inheritedMcpServerNames)
 	return mergeCodexThreadConfigs(privateConfig, CODEX_SETTLED_FINALIZER_THREAD_CONFIG, buildCodexRingZeroThreadConfigPatch({ toolsAllow: ["openclaw"] }, true, inheritedMcpServerNames)) ?? privateConfig;
 }
 function buildPrivateCodexAppServerStartOptions(start, codexHome) {
-	const providerArgs = start.args.flatMap((arg, index) => {
-		const override = arg === "-c" || arg === "--config" ? start.args[index + 1] : arg.startsWith("--config=") ? arg.slice(9) : void 0;
-		return override && /^\s*(?:openai_base_url|model_catalog_json)\s*=/u.test(override) ? ["-c", override] : [];
-	});
+	const providerArgs = readCodexAppServerConfigOptions(start.args).flatMap(({ name, value }) => (name === "-c" || name === "--config") && value && /^\s*(?:openai_base_url|model_catalog_json)\s*=/u.test(value) ? ["-c", value] : []);
 	const privateEnv = Object.fromEntries(Object.entries(start.env ?? {}).filter(([name]) => name.trim().toUpperCase() !== CODEX_APP_SERVER_ARGS_ENV_KEY));
 	const clearEnv = (start.clearEnv ?? []).filter((name) => {
 		const normalized = name.trim().toUpperCase();
@@ -215,6 +208,7 @@ function buildPrivateCodexAppServerStartOptions(start, codexHome) {
 	});
 	return {
 		...start,
+		homeScope: "agent",
 		args: [
 			"app-server",
 			...providerArgs,
@@ -246,14 +240,15 @@ function createCodexBoundedApprovalHandler(taskLabel) {
 	};
 }
 async function resolveCodexBoundedTurnModel(params) {
-	const listed = readModelListResult(await params.client.request("model/list", {
+	const result = await params.client.request("model/list", {
 		limit: null,
 		cursor: null,
-		includeHidden: false
+		includeHidden: params.selection.mode === "required"
 	}, {
 		timeoutMs: Math.min(params.timeoutMs, 5e3),
 		signal: params.signal
-	})).models;
+	});
+	const listed = readModelListResult(result).models;
 	if (params.selection.mode === "live-default") {
 		const supported = listed.filter((entry) => params.requiredModalities.every((modality) => entry.inputModalities.includes(modality)));
 		const selected = supported.find((entry) => entry.isDefault) ?? supported[0];

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

@@ -1,4 +1,4 @@
-import { G as CodexAppServerRpcError } from "./shared-client-DKz23hHY.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-DMc4oS2w.js");
+		const { registerCodexSessionCli } = await import("./session-cli-CmFEXMAM.js");
 		registerCodexSessionCli(program);
 	}, { descriptors: [{
 		name: "codex",

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

@@ -1,5 +1,5 @@
-import { vt as isJsonObject } from "./shared-client-DKz23hHY.js";
-import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-C5_D8Gmb.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
 /**
@@ -118,7 +118,8 @@ function formatSkills(response) {
 	return lines.join("\n");
 }
 function formatCodexSkillEntry(entry) {
-	return `\`${formatCodexDisplayText(normalizeOptionalString((isJsonObject(entry) ? entry : {}).name) ?? "<unknown>")}\``;
+	const record = isJsonObject(entry) ? entry : {};
+	return `\`${formatCodexDisplayText(normalizeOptionalString(record.name) ?? "<unknown>")}\``;
 }
 const CODEX_RESUME_SAFE_THREAD_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
 function formatCodexResumeHint(threadId) {
@@ -278,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-D_-1_qRp.js → command-handlers-CTGb2csu.js}

@@ -1,26 +1,28 @@
-import { N as isCodexFastServiceTier, _ as CODEX_PLUGINS_MARKETPLACE_NAME, i as resolveCodexAppServerRuntimeOptions } from "./config-giW8X0QA.js";
-import { J as consumeCodexAppServerLiveThread, ct as resolveCodexAppServerAuthAccountCacheKey, dt as resolveCodexAppServerFallbackApiKeyCacheKey, o as getLeasedSharedCodexAppServerClient, p as releaseLeasedSharedCodexAppServerClient, ut as resolveCodexAppServerAuthProfileIdForAgent, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-Bcynfd-_.js";
-import { i as assertCodexThreadResumeResponse } from "./protocol-validators-VeJxxJ0U.js";
-import { t as listAllCodexAppServerModels } from "./models-TS3HBU-q.js";
-import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-C1CAdfcP.js";
-import { Ct as refreshCodexPluginRuntimeState, Tt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-L7oEkTlq.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-BRMh0aIq.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-C5_D8Gmb.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-DEsIufkt.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-kuWTn9C5.js";
-import { a as rollbackCodexAppServerBindingSubscription, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, o as withCodexConversationThreadActivity, r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DZeuKH1j.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-B9DvaAG-.js";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-CW2GuupV.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-BMvPX73o.js";
-import { l as formatCodexCliSessions } from "./session-catalog-DaLKVtpH.js";
-import { i as safeCodexControlRequest, n as readCodexStatusProbes, r as requestOptions, t as codexControlRequest } from "./command-rpc-CCeCkf_v.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-CTCT3w5L.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-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, resolveSessionAgentIds } 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";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
@@ -591,7 +593,8 @@ function parseCodexCliSessionsArgs(args) {
 			continue;
 		}
 		if (arg === "--limit") {
-			const parsedLimit = parseStrictPositiveInteger(readRequiredOptionValue(args, index));
+			const value = readRequiredOptionValue(args, index);
+			const parsedLimit = parseStrictPositiveInteger(value);
 			if (parsedLimit === void 0) {
 				parsed.help = true;
 				continue;
@@ -752,11 +755,10 @@ const CODEX_DIAGNOSTICS_COOLDOWN_MS = 6e4;
 const CODEX_DIAGNOSTICS_ERROR_MAX_CHARS = 500;
 const CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS = 100;
 const CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES = 100;
-const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 5 * 6e4;
+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);
@@ -909,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)}`);
@@ -918,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);
@@ -973,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}\``;
@@ -1014,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;
@@ -1063,7 +1045,8 @@ function resolveCodexCommandDeps(overrides) {
 //#endregion
 //#region extensions/codex/src/command-handler-scope.ts
 async function resolveControlTarget(ctx) {
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
+	const binding = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(binding);
 	const scope = resolveCodexConversationControlScope(ctx);
 	if (data?.kind === "codex-app-server-session") return {
 		identity: conversationBindingIdentity(data.bindingId),
@@ -1087,13 +1070,14 @@ async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
 	const fallback = resolveCodexConversationControlScope(ctx);
 	const agentDir = target?.agentDir ?? fallback.agentDir;
 	const binding = target ? await deps.bindingStore.read(target.identity) : void 0;
+	const authProfileId = binding?.connectionScope === "supervision" ? void 0 : resolveCodexAppServerAuthProfileIdForAgent({
+		authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
+		agentDir,
+		config: ctx.config
+	});
 	const connection = resolveCodexBindingAppServerConnection({
 		binding,
-		authProfileId: binding?.connectionScope === "supervision" ? void 0 : resolveCodexAppServerAuthProfileIdForAgent({
-			authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
-			agentDir,
-			config: ctx.config
-		}),
+		authProfileId,
 		pluginConfig
 	});
 	return {
@@ -1112,7 +1096,7 @@ function conversationBindingIdentity(bindingId) {
 	};
 }
 function resolveCodexConversationControlScope(ctx) {
-	const { sessionAgentId } = resolveSessionAgentIds({
+	const { sessionAgentId } = resolveSessionAgentIdsStrict({
 		sessionKey: ctx.sessionKey,
 		agentId: ctx.agentId,
 		config: ctx.config
@@ -1155,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.",
@@ -1197,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.`,
@@ -1392,8 +1376,9 @@ function isCurrentSessionModelSelectionLocked(ctx) {
 	const sessionKey = ctx.sessionKey?.trim();
 	if (!sessionKey) return false;
 	const { agentId } = resolveCodexConversationControlScope(ctx);
+	const storePath = resolveStorePath(ctx.config.session?.store, { agentId });
 	return isModelSelectionLocked(getSessionEntry({
-		storePath: resolveStorePath(ctx.config.session?.store, { agentId }),
+		storePath,
 		sessionKey,
 		hydrateSkillPromptRefs: false,
 		readConsistency: "latest"
@@ -1450,7 +1435,8 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 }
 async function detachConversation(deps, ctx) {
 	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
+	const current = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(current);
 	const identity = data?.kind === "codex-app-server-session" ? conversationBindingIdentity(data.bindingId) : void 0;
 	const sourceSessionKey = data?.kind === "codex-app-server-session" ? data.source?.sessionKey : void 0;
 	let expectedThreadId;
@@ -1519,13 +1505,14 @@ async function describeConversationBinding(deps, ctx) {
 }
 async function buildThreads(deps, ctx, pluginConfig, filter) {
 	const scope = await resolveCommandAppServerScope(deps, ctx, pluginConfig);
-	return formatThreads(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
+	const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
 		limit: 10,
 		...filter.trim() ? { searchTerm: filter.trim() } : {}
 	}, {
 		config: ctx.config,
 		...scope
-	}));
+	});
+	return formatThreads(response);
 }
 async function buildCodexCliSessions(deps, args) {
 	const parsed = parseCodexCliSessionsArgs(args);
@@ -1563,13 +1550,8 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 			})) throw createCodexSessionGenerationSupersededError(identity.sessionId);
 			const currentBinding = await deps.bindingStore.read(identity);
 			assertCodexBindingMayBeReplaced(currentBinding, "attaching a different resumed thread");
-			const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
-				authProfileId: currentBinding?.authProfileId,
-				agentDir: scope.agentDir,
-				config: ctx.config
-			});
-			let committedResponse = false;
-			const commitResumedThread = async (value, client) => {
+			let pendingResumeConfiguration = false;
+			const commitResumedThread = async (value, client, { authProfileId, assertCurrent }) => {
 				const response = assertCodexThreadResumeResponse(value);
 				const effectiveThreadId = response.thread.id;
 				if (effectiveThreadId !== normalizedThreadId) throw new Error(`Codex thread/resume returned ${effectiveThreadId} for ${normalizedThreadId}`);
@@ -1581,52 +1563,73 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 					agentDir: scope.agentDir,
 					config: ctx.config
 				});
-				const bindingBeforeCommit = await deps.bindingStore.read(identity);
-				assertCodexBindingMayBeReplaced(bindingBeforeCommit, "committing a different resumed thread");
-				const clientId = client?.getInstanceId();
-				const sameOwner = client ? isSameCodexAppServerThreadOwner(bindingBeforeCommit, {
-					threadId: effectiveThreadId,
-					clientId
-				}) : bindingBeforeCommit?.threadId === effectiveThreadId;
+				const clientId = client.getInstanceId();
 				let retained = false;
+				let sameOwner = false;
+				let knownOwnership;
 				try {
-					if (client) {
-						retained = await retainCodexAppServerBindingSubscription(client, effectiveThreadId, sameOwner ? await consumeCodexAppServerLiveThread(client, effectiveThreadId) : void 0);
-						if (!retained) throw new Error("Codex resumed thread lost its native subscription owner.");
-					}
+					const bindingBeforeCommit = await deps.bindingStore.read(identity);
+					assertCodexBindingMayBeReplaced(bindingBeforeCommit, "committing a different resumed thread");
+					sameOwner = isSameCodexAppServerThreadOwner(bindingBeforeCommit, {
+						threadId: effectiveThreadId,
+						clientId
+					});
+					const sameThreadBinding = bindingBeforeCommit?.threadId === effectiveThreadId ? bindingBeforeCommit : void 0;
+					pendingResumeConfiguration = sameThreadBinding?.preserveNativeModel !== true && (!sameThreadBinding?.dynamicToolsFingerprint || !sameThreadBinding.webSearchThreadConfigFingerprint || sameThreadBinding.pendingResumeConfiguration === true);
+					assertCurrent();
+					assertCodexThreadAcceptsDirectInput(response.thread);
+					knownOwnership = sameOwner ? await consumeCodexAppServerLiveThread(client, effectiveThreadId) : void 0;
+					assertCurrent();
+					retained = await retainCodexAppServerBindingSubscription(client, effectiveThreadId, knownOwnership);
+					assertCurrent();
+					if (!retained) throw new Error("Codex resumed thread lost its native subscription owner.");
 					if (bindingBeforeCommit && !sameOwner) await releaseCodexAppServerBindingSubscription(bindingBeforeCommit);
+					assertCurrent();
 					if (!await deps.bindingStore.mutate(identity, {
 						kind: "set",
 						binding: {
-							...bindingBeforeCommit?.threadId === effectiveThreadId ? bindingBeforeCommit : {},
+							...sameThreadBinding,
 							threadId: effectiveThreadId,
-							...clientId ? { clientId } : {},
+							clientId,
 							cwd: resumedCwd,
+							rolloutPath: response.thread.path ?? sameThreadBinding?.rolloutPath,
+							pendingResumeConfiguration: pendingResumeConfiguration ? true : void 0,
 							authProfileId,
 							model: response.model,
 							modelProvider,
 							historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
 						}
-					})) throw new Error("Codex thread binding changed while attaching the resumed thread.");
+					}, assertCurrent)) throw new Error("Codex thread binding changed while attaching the resumed thread.");
 				} catch (error) {
-					if (client && !sameOwner) await rollbackCodexAppServerBindingSubscription(client, effectiveThreadId, retained);
+					if (sameOwner && knownOwnership && !retained) {
+						if (!await retainCodexAppServerBindingSubscription(client, effectiveThreadId, knownOwnership)) await closeCodexStartupClientBestEffort(client);
+					} else if (retained && !sameOwner || !hasCodexAppServerLiveThread(client, effectiveThreadId)) await rollbackCodexAppServerBindingSubscription(client, effectiveThreadId, retained);
 					throw error;
 				}
-				committedResponse = true;
 			};
-			const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
+			await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
 				threadId: normalizedThreadId,
 				excludeTurns: true
 			}, {
 				config: ctx.config,
+				agentId: scope.agentId,
 				agentDir: scope.agentDir,
-				authProfileId,
+				authProfileId: currentBinding?.authProfileId,
 				sessionKey: ctx.sessionKey,
 				sessionId: ctx.sessionId,
+				beforeRequest: async (request) => {
+					const { thread } = await request({
+						method: "thread/read",
+						requestParams: {
+							threadId: normalizedThreadId,
+							includeTurns: false
+						}
+					});
+					assertCodexThreadAcceptsDirectInput(thread);
+				},
 				onResponse: commitResumedThread
 			});
-			if (!committedResponse) await commitResumedThread(response);
-			return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(normalizedThreadId)}.`;
+			return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(normalizedThreadId)}.${pendingResumeConfiguration ? " The next turn will validate its tools and apply this session's configuration before continuing." : ""}`;
 		})
 	});
 }
@@ -1635,12 +1638,13 @@ async function bindCodexCliNodeSession(deps, ctx, parsed) {
 	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
 	if (ctx.sessionId) {
 		const scope = resolveCodexConversationControlScope(ctx);
-		assertCodexBindingMayBeReplaced(await deps.bindingStore.read(sessionBindingIdentity({
+		const binding = await deps.bindingStore.read(sessionBindingIdentity({
 			sessionId: ctx.sessionId,
 			sessionKey: ctx.sessionKey,
 			agentId: scope.agentId,
 			config: ctx.config
-		})), "binding a Codex CLI node session");
+		}));
+		assertCodexBindingMayBeReplaced(binding, "binding a Codex CLI node session");
 	}
 	const resolved = await deps.resolveCodexCliSessionForBindingOnNode({
 		requestedNode: parsed.host,
@@ -1783,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;
@@ -1901,12 +1908,13 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		});
 		if (currentSession?.sessionId !== ctx.sessionId || resolvePersistedSessionRuntimeId(currentSession) !== "codex") return "Codex compaction is unavailable because the current OpenClaw session is not using the Codex runtime.";
 		if (target.identity.kind === "conversation") {
-			if (!isSameCodexAppServerThreadOwner(binding, ctx.sessionId ? await deps.bindingStore.read(sessionBindingIdentity({
+			const sessionBinding = ctx.sessionId ? await deps.bindingStore.read(sessionBindingIdentity({
 				sessionId: ctx.sessionId,
 				sessionKey: ctx.sessionKey,
 				agentId: sessionTarget.agentId,
 				config: ctx.config
-			})) : void 0)) return "Codex compaction is unavailable because the conversation-bound thread differs from the current session binding. Resume that thread into the session first.";
+			})) : void 0;
+			if (!isSameCodexAppServerThreadOwner(binding, sessionBinding)) return "Codex compaction is unavailable because the conversation-bound thread differs from the current session binding. Resume that thread into the session first.";
 		}
 		const compactCurrent = ctx.runtimeContext?.compactCurrent;
 		if (!compactCurrent) return "Codex compaction is unavailable because this command is not bound to a session.";
@@ -1918,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();
@@ -2290,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