@openclaw/codex 2026.8.1-beta.3 → 2026.9.1-beta.1

package/dist/api.js

@@ -1,5 +1,5 @@
-import { a as resolveCodexAppServerStartOptionsForAgent, i as resolveCodexAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { a as CODEX_APP_SERVER_VERSION, n as resolveManagedCodexAppServerStartOptions, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-By4FZC6i.js";
+import { a as resolveCodexAppServerStartOptionsForAgent, i as resolveCodexAppServerRuntimeOptions } from "./config-giW8X0QA.js";
+import { a as CODEX_APP_SERVER_VERSION, n as resolveManagedCodexAppServerStartOptions, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-DFYK4DWq.js";
 import path from "node:path";
 import { resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
 import { listAgentIds as listAgentIds$1, resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
@@ -117,7 +117,7 @@ function createCodexManagedAppServerHealthCheck(params) {
 				})];
 			}
 			const detectedVersion = parseCodexVersion(`${output.stdout}\n${output.stderr}`);
-			if (detectedVersion !== "0.149.1") return [managedCodexFinding({
+			if (detectedVersion !== "0.150.1") return [managedCodexFinding({
 				message: detectedVersion ? `Managed Codex app-server version mismatch: expected ${CODEX_APP_SERVER_VERSION}, detected ${detectedVersion}.` : `Managed Codex app-server did not report a parseable version; expected ${CODEX_APP_SERVER_VERSION}.`,
 				path: nativeCommand,
 				requirement: `the exact OpenClaw-pinned Codex version ${CODEX_APP_SERVER_VERSION}`,

package/dist/{attempt-client-cleanup-URjUlCHg.js → attempt-client-cleanup-bfsmcQ6m.js}

@@ -1,4 +1,4 @@
-import { B as CodexAppServerRpcError, X as unsubscribeCodexAppServerLiveThread, p as retireSharedCodexAppServerClientIfCurrent, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
+import { G as CodexAppServerRpcError, _ as retireSharedCodexAppServerClientIfCurrent, tt as unsubscribeCodexAppServerLiveThread, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
 import { asFiniteNumber, normalizeOptionalString, normalizeOptionalString as normalizeOptionalString$1, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -259,6 +259,7 @@ var CodexProjectionDiagnostics = class {
 //#region extensions/codex/src/app-server/turn-router.ts
 /** Keyed routing for all turn traffic on one shared Codex app-server client. */
 const DEFAULT_PREBIND_NOTIFICATION_LIMIT = 256;
+const DEFAULT_GLOBAL_WARNING_LIMIT = 32;
 const CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS = 3e4;
 const routers = /* @__PURE__ */ new WeakMap();
 /** Returns the sole router installed on a physical app-server client. */
@@ -272,6 +273,7 @@ function getCodexAppServerTurnRouter(client) {
 var ClientTurnRouter = class {
 	constructor(client) {
 		this.routes = /* @__PURE__ */ new Map();
+		this.globalWarnings = [];
 		this.nativeTurnCompletionWatchers = /* @__PURE__ */ new Map();
 		this.disposed = false;
 		client.addNotificationHandler((notification) => this.routeNotification(notification));
@@ -290,7 +292,11 @@ var ClientTurnRouter = class {
 			ended: createDeferred(),
 			activated: createDeferred(),
 			gate: "open",
-			pending: [],
+			pending: this.globalWarnings.map((notification) => ({
+				notification,
+				receivedAtMs: Date.now(),
+				scope: { threadId }
+			})),
 			notificationTail: Promise.resolve(),
 			completedNativeTurnIds: /* @__PURE__ */ new Set(),
 			ignoredTurnNotificationKeys: /* @__PURE__ */ new Set()
@@ -412,6 +418,15 @@ var ClientTurnRouter = class {
 	routeNotification(notification) {
 		if (this.disposed) return;
 		const scope = readScope(notification.params);
+		if (!scope.threadId && (notification.method === "configWarning" || notification.method === "warning")) {
+			if (this.globalWarnings.length === DEFAULT_GLOBAL_WARNING_LIMIT) this.globalWarnings.shift();
+			this.globalWarnings.push(notification);
+			for (const route of this.routes.values()) {
+				this.bufferNotification(route, notification, { threadId: route.threadId }, Date.now());
+				if (route.gate === "bound") this.flushNotifications(route);
+			}
+			return Promise.all([...this.routes.values()].map((route) => route.notificationTail)).then(() => void 0);
+		}
 		const watchers = scope.threadId ? this.nativeTurnCompletionWatchers.get(scope.threadId) : void 0;
 		const route = scope.threadId ? this.routes.get(scope.threadId) : void 0;
 		if (!watchers && !route) return;
@@ -489,6 +504,10 @@ var ClientTurnRouter = class {
 		const handler = route.handlers?.onNotification;
 		if (!handler) return;
 		for (const pending of route.pending.splice(0)) {
+			if (route.gate !== "bound" && (pending.notification.method === "configWarning" || pending.notification.method === "warning" && !readScope(pending.notification.params).threadId)) {
+				route.pending.push(pending);
+				continue;
+			}
 			if (route.gate === "bound" && pending.scope.turnId && pending.scope.turnId !== route.turnId) {
 				this.warnDroppedStaleTurnNotification(route, pending.notification, pending.scope);
 				continue;

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

@@ -1,5 +1,5 @@
-import { h as readCodexPluginConfig, i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { a as resolveCodexCatalogConnectionHome, t as buildCodexAppServerConnectionFingerprint } from "./plugin-app-cache-key-DMNQ8Zi8.js";
+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";
 //#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-4BjrZEwW.js → bounded-turn-B7iBUcuP.js}

@@ -1,10 +1,10 @@
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { V as createCodexElicitationResponse, s as isCodexAppServerStartSelectionChangedError, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, o as interruptCodexTurnAndWaitBestEffort, t as CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS } from "./attempt-client-cleanup-URjUlCHg.js";
-import { b as isTerminalTurnStatus, n as normalizeCodexResponseTokenUsage, x as readCodexNotificationItem, y as isRetryableErrorNotification } from "./event-projector-usage-CLwNEJqW.js";
-import { a as assertCodexThreadStartResponse, c as readCodexErrorNotification, o as assertCodexTurnStartResponse, u as readCodexTurnCompletedNotification } from "./protocol-validators-VAVyEnDp.js";
-import { r as readModelListResult } from "./models-CZw1wClT.js";
-import { Z as mergeCodexThreadConfigs, c as buildCodexRingZeroThreadConfigPatch, l as buildCodexRuntimeThreadConfig, o as assertCodexManagedRequirementsDoNotOverrideToolPolicy, s as attestCodexRestrictedToolSurfaceMcpServersDisabled, u as readCodexInheritedMcpServerNames } from "./thread-lifecycle-DKdrnTMX.js";
+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 { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -80,7 +80,7 @@ async function runBoundedCodexAppServerTurnInWorkspace(params, appServer, worksp
 		config: params.config,
 		timeoutMs,
 		...params.signal ? { abandonSignal: params.signal } : {}
-	}) : await import("./shared-client-Dw-rzii0.js").then((n) => n.m).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	}) : await import("./shared-client-DKz23hHY.js").then((n) => n.y).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions,
 		timeoutMs,
 		...authSelection,

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

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

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

@@ -1,5 +1,5 @@
-import { ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-BI1dMHDG.js";
+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 { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/command-formatters.ts
 /**

package/dist/{command-handlers-DC86lgT4.js → command-handlers-D_-1_qRp.js}

@@ -1,22 +1,22 @@
-import { M as isCodexFastServiceTier, _ as CODEX_PLUGINS_MARKETPLACE_NAME, i as resolveCodexAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { U as consumeCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, l as releaseLeasedSharedCodexAppServerClient, nt as resolveCodexAppServerAuthProfileIdForAgent, rt as resolveCodexAppServerFallbackApiKeyCacheKey, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BTrLf9Qm.js";
-import { i as assertCodexThreadResumeResponse } from "./protocol-validators-VAVyEnDp.js";
-import { t as listAllCodexAppServerModels } from "./models-CZw1wClT.js";
-import { o as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DMNQ8Zi8.js";
-import { et as refreshCodexPluginRuntimeState, nt as isOpenAiCuratedMarketplaceName } from "./thread-lifecycle-DKdrnTMX.js";
+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-CH3K57v4.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-BI1dMHDG.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-D0nZ3qtd.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-C1qEeZ5C.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-i2NBwDUL.js";
-import { a as parseCodexPermissionsModeArg, c as setCodexConversationModel, d as stopCodexConversationTurn, g as hasCodexAdminScope, h as canMutateCodexHost, i as parseCodexFastModeArg, l as setCodexConversationPermissions, m as CODEX_NATIVE_EXECUTION_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-CSWDkMrP.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-DAvZwp96.js";
-import { l as formatCodexCliSessions } from "./session-catalog-ezP_UcRM.js";
-import { i as safeCodexControlRequest, n as readCodexStatusProbes, r as requestOptions, t as codexControlRequest } from "./command-rpc-xUIIonsO.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-BXH5NF-4.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 { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
@@ -51,8 +51,8 @@ async function readCodexAccountAuthOverview(params) {
 		limits: params.limits,
 		now
 	});
-	const subscriptionProfileId = order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId]));
 	const activeIsSubscription = activeProfileId !== void 0 && isChatGptSubscriptionProfile(store.profiles[activeProfileId]);
+	const subscriptionProfileId = activeIsSubscription ? activeProfileId : order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId]));
 	const activeUsage = activeIsSubscription && params.limits.ok ? summarizeCodexAccountUsage(params.limits.value, now) : void 0;
 	const subscriptionUsage = subscriptionProfileId && (!activeIsSubscription || subscriptionProfileId !== activeProfileId) ? await readSubscriptionUsage({
 		...params,
@@ -157,13 +157,20 @@ function resolveLiveAccountProfileId(params) {
 	const type = normalizeOptionalString(account.type)?.toLowerCase();
 	if (type === "chatgpt") {
 		const email = normalizeOptionalString(account.email)?.toLowerCase();
-		const firstSubscription = params.order.find((profileId) => isChatGptSubscriptionProfile(params.store.profiles[profileId]));
-		if (!email) return firstSubscription;
-		return params.order.find((profileId) => {
-			const credential = params.store.profiles[profileId];
-			if (!credential || !isChatGptSubscriptionProfile(credential)) return false;
-			return (credential.email?.trim().toLowerCase() ?? extractEmailFromProfileId(profileId))?.toLowerCase() === email;
-		}) ?? firstSubscription;
+		const accountId = normalizeOptionalString(account.accountId ?? account.chatgptAccountId);
+		const subscriptionProfiles = params.order.filter((profileId) => isChatGptSubscriptionProfile(params.store.profiles[profileId]));
+		if (accountId) {
+			const exactWorkspace = subscriptionProfiles.find((profileId) => {
+				const credential = params.store.profiles[profileId];
+				return credential && "accountId" in credential && credential.accountId === accountId;
+			});
+			if (exactWorkspace) return exactWorkspace;
+		}
+		const matchingProfiles = email ? subscriptionProfiles.filter((profileId) => {
+			return (params.store.profiles[profileId]?.email?.trim().toLowerCase() ?? extractEmailFromProfileId(profileId))?.toLowerCase() === email;
+		}) : subscriptionProfiles;
+		const lastGood = params.store.lastGood?.[OPENAI_PROVIDER_ID];
+		return (lastGood && matchingProfiles.includes(lastGood) ? lastGood : void 0) ?? matchingProfiles[0] ?? subscriptionProfiles[0];
 	}
 	if (type === "apikey" || type === "api_key") return params.order.find((profileId) => params.store.profiles[profileId]?.type === "api_key");
 }
@@ -1834,7 +1841,7 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		}) : void 0;
 		const selectedModel = currentSession && currentSession.sessionId === ctx.sessionId ? currentSession.modelOverride ?? currentSession.model : void 0;
 		const binding = await deps.bindingStore.read(target.identity);
-		const activeModel = selectedModel ?? binding?.model;
+		const activeModel = target.identity.kind === "conversation" ? binding?.model : selectedModel ?? binding?.model;
 		return activeModel ? `Codex model: ${formatCodexDisplayText(activeModel)}` : "Usage: /codex model <model>";
 	}
 	return await deps.setCodexConversationModel({
@@ -1843,12 +1850,7 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		pluginConfig,
 		model: normalized,
 		agentDir: target.agentDir,
-		config: ctx.config,
-		...ctx.sessionId && ctx.sessionKey ? { session: {
-			agentId: target.agentId,
-			sessionId: ctx.sessionId,
-			sessionKey: ctx.sessionKey
-		} } : {}
+		config: ctx.config
 	});
 }
 async function setConversationFastMode(deps, ctx, args) {
@@ -2293,6 +2295,14 @@ function formatPluginList(plugins, options = {}) {
 }
 //#endregion
 //#region extensions/codex/src/command-handlers.ts
+const CODEX_HOST_INSPECTION_SUBCOMMANDS = /* @__PURE__ */ new Set([
+	"account",
+	"mcp",
+	"sessions",
+	"skills",
+	"status",
+	"threads"
+]);
 async function handleCodexSubcommand(ctx, options) {
 	const deps = resolveCodexCommandDeps(options.deps);
 	const args = splitArgs(ctx.args);
@@ -2300,6 +2310,7 @@ async function handleCodexSubcommand(ctx, options) {
 	const [subcommand = "status", ...rest] = args;
 	const normalized = subcommand.toLowerCase();
 	if (normalized === "help") return { text: buildHelp() };
+	if (CODEX_HOST_INSPECTION_SUBCOMMANDS.has(normalized) && !canMutateCodexHost(ctx)) return { text: CODEX_HOST_INSPECTION_AUTH_ERROR };
 	if (CODEX_NATIVE_CONTROL_SUBCOMMANDS.has(normalized) && !returnsBeforeNativeCodexExecution(normalized, rest) && !isReadOnlyCodexGoalCommand(normalized, rest) && !canMutateCodexHost(ctx)) return { text: CODEX_NATIVE_EXECUTION_AUTH_ERROR };
 	const sandboxBlock = resolveCodexNativeCommandSandboxBlock(ctx, normalized, rest);
 	if (sandboxBlock) return { text: sandboxBlock };

package/dist/{command-rpc-xUIIonsO.js → command-rpc-CCeCkf_v.js}

@@ -1,7 +1,7 @@
-import { i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-CpNeo5AE.js";
-import { n as listCodexAppServerModels } from "./models-CZw1wClT.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-CH3K57v4.js";
-import { i as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-DSK0W6YI.js";
+import { i as resolveCodexAppServerRuntimeOptions, s as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-giW8X0QA.js";
+import { n as listCodexAppServerModels } from "./models-TS3HBU-q.js";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-BRMh0aIq.js";
+import { i as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-DXXGHko0.js";
 //#region extensions/codex/src/command-rpc.ts
 function requestOptions(pluginConfig, limit, config, agentDir) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig });

package/dist/{compact-COqgBRny.js → compact-BglNFZrQ.js}

@@ -1,12 +1,12 @@
-import { B as CodexAppServerRpcError, U as consumeCodexAppServerLiveThread, Y as retainCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, l as releaseLeasedSharedCodexAppServerClient, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BTrLf9Qm.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-URjUlCHg.js";
-import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-CLwNEJqW.js";
+import { G as CodexAppServerRpcError, J as consumeCodexAppServerLiveThread, et as retainCodexAppServerLiveThread, o as getLeasedSharedCodexAppServerClient, p as releaseLeasedSharedCodexAppServerClient, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
+import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-Bcynfd-_.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-bfsmcQ6m.js";
+import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-Bk1I90Bg.js";
 import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-CdJk2Ehf.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C1qEeZ5C.js";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-i2NBwDUL.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-DAvZwp96.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BE9qNEW0.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-kuWTn9C5.js";
+import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DZeuKH1j.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-BMvPX73o.js";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";

package/dist/{config-CpNeo5AE.js → config-giW8X0QA.js}

@@ -1,4 +1,4 @@
-import { asOptionalRecord as readRecord, normalizeOptionalString as readNonEmptyString, normalizeTrimmedStringList, parseBooleanValue } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { asNullableRecord, asOptionalRecord as readRecord, 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";
 import { AgentHarnessPreflightError } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -118,8 +118,9 @@ function selectGuardianSandbox(allowedSandboxModes) {
 	return "workspace-write";
 }
 function resolveApprovalPolicy(value) {
+	if (value === "untrusted") throw new Error("Codex app-server approval policy \"untrusted\" is retired; run \"openclaw doctor --fix\" and use \"on-request\".");
 	if (value === "on-failure") return "on-request";
-	return value === "on-request" || value === "untrusted" || value === "never" ? value : void 0;
+	return value === "on-request" || value === "never" ? value : void 0;
 }
 function resolveSandbox(value) {
 	return value === "read-only" || value === "workspace-write" || value === "danger-full-access" ? value : void 0;
@@ -434,6 +435,7 @@ function globPatternMatches(value, pattern) {
 function normalizeRequirementsApprovalPolicy(value) {
 	const normalized = value.trim().toLowerCase();
 	if (normalized === "on-failure") return "on-request";
+	if (normalized === "untrusted") return normalized;
 	return resolveApprovalPolicy(normalized);
 }
 function normalizeRequirementsApprovalsReviewer(value) {
@@ -441,8 +443,8 @@ function normalizeRequirementsApprovalsReviewer(value) {
 }
 function selectGuardianApprovalPolicy(allowedApprovalPolicies, execModeRequiringPromptingApprovals) {
 	if (allowedApprovalPolicies === void 0 || allowedApprovalPolicies.has("on-request")) return "on-request";
-	if (execModeRequiringPromptingApprovals) throw new Error(`tools.exec.mode=${execModeRequiringPromptingApprovals} requires Codex app-server prompting approvals`);
 	if (allowedApprovalPolicies.has("untrusted")) return "untrusted";
+	if (execModeRequiringPromptingApprovals) throw new Error(`tools.exec.mode=${execModeRequiringPromptingApprovals} requires Codex app-server prompting approvals`);
 	if (allowedApprovalPolicies.has("never")) return "never";
 	return "on-request";
 }
@@ -461,6 +463,24 @@ function selectUserApprovalsReviewer(allowedApprovalsReviewers, execModeRequirin
 //#region extensions/codex/src/app-server/config-reviewer.ts
 const CODEX_APP_SERVER_HOME_DIRNAME = "codex-home";
 const CODEX_CONFIG_TOML_FILENAME = "config.toml";
+/** Cloud/system config can redirect reviews after local home/profile checks have passed. */
+async function assertCodexModelBackedReviewerEffectiveConfig(params) {
+	if (params.approvalsReviewer !== "auto_review" && params.approvalsReviewer !== "guardian_subagent") return;
+	const effectiveConfig = readRecord(readRecord(await params.client.request("config/read", {
+		cwd: path.resolve(params.cwd),
+		includeLayers: false
+	}, { signal: params.signal }))?.config);
+	if (!effectiveConfig) throw new Error("Codex config/read returned an invalid model-backed reviewer config");
+	const modelProvider = effectiveConfig.model_provider;
+	const providers = effectiveConfig.model_providers;
+	const providerRecords = providers == null ? void 0 : readRecord(providers);
+	const provider = providerRecords?.openai;
+	const openAIProvider = provider == null ? void 0 : readRecord(provider);
+	if (modelProvider != null && modelProvider !== "openai" || providers != null && !providerRecords || provider != null && !openAIProvider || !isTrustedOptionalReviewerEndpoint(effectiveConfig.openai_base_url, isNativeOpenAIBaseUrl) || !isTrustedOptionalReviewerEndpoint(effectiveConfig.chatgpt_base_url, isNativeChatGPTBaseUrl) || !isTrustedOptionalReviewerEndpoint(openAIProvider?.base_url, isNativeOpenAIBaseUrl)) throw new Error("Codex model-backed approval reviewer requires the running server to use a trusted OpenAI endpoint");
+}
+function isTrustedOptionalReviewerEndpoint(value, isTrusted) {
+	return value == null || typeof value === "string" && isTrusted(value);
+}
 function canUseCodexModelBackedApprovalsReviewerForModel(params) {
 	const explicitProvider = params.modelProvider?.trim().toLowerCase();
 	const inferredProvider = inferProviderFromModelRef(params.model);
@@ -513,33 +533,60 @@ function isTrustedCodexModelBackedApprovalsReviewerProvider(provider, params) {
 		model: params.model,
 		agentDir: params.agentDir,
 		codexConfigToml: params.codexConfigToml,
-		homeScope: params.homeScope
+		homeScope: params.homeScope,
+		codexArgs: params.codexArgs
 	});
 }
 function readCodexBaseUrlOverridesForModelBackedReview(params) {
 	const configToml = readCodexAppServerConfigToml(params);
 	if (configToml === false) return false;
-	if (configToml === void 0) return {
-		openAI: [],
-		chatGPT: []
-	};
-	const topLevelContent = stripTomlLineComments(configToml).slice(0, firstTomlTableOffset(configToml));
-	const modelProviderOpenAISection = parseTomlTableSection(configToml, "model_providers.openai");
-	const openAIBaseUrl = parseTomlStringValue(topLevelContent, "openai_base_url");
-	const chatGPTBaseUrl = parseTomlStringValue(topLevelContent, "chatgpt_base_url");
-	const openAI = [
-		openAIBaseUrl,
-		parseTomlStringValue(topLevelContent, "model_providers.openai.base_url"),
-		parseInlineOpenAIModelProviderBaseUrl(topLevelContent),
-		modelProviderOpenAISection ? parseTomlStringValue(modelProviderOpenAISection, "base_url") : void 0
-	];
-	const chatGPT = [chatGPTBaseUrl];
+	const configTomls = configToml === void 0 ? [] : [configToml];
+	const nativeOverrides = readNativeCodexReviewerConfigOverrides(params);
+	if (nativeOverrides === false) return false;
+	configTomls.push(...nativeOverrides);
+	const openAI = [];
+	const chatGPT = [];
+	for (const content of configTomls) {
+		const topLevelContent = stripTomlLineComments(content).slice(0, firstTomlTableOffset(content));
+		const modelProviderOpenAISection = parseTomlTableSection(content, "model_providers.openai");
+		const modelProvider = parseTomlStringValue(topLevelContent, "model_provider");
+		if (modelProvider === false || modelProvider && modelProvider !== "openai") return false;
+		openAI.push(parseTomlStringValue(topLevelContent, "openai_base_url"), parseTomlStringValue(topLevelContent, "model_providers.openai.base_url"), parseInlineOpenAIModelProviderBaseUrl(topLevelContent), modelProviderOpenAISection ? parseTomlStringValue(modelProviderOpenAISection, "base_url") : void 0);
+		chatGPT.push(parseTomlStringValue(topLevelContent, "chatgpt_base_url"));
+	}
 	if ([...openAI, ...chatGPT].includes(false)) return false;
 	return {
 		openAI: openAI.filter((entry) => typeof entry === "string"),
 		chatGPT: chatGPT.filter((entry) => typeof entry === "string")
 	};
 }
+function readNativeCodexReviewerConfigOverrides(params) {
+	const overrides = [];
+	let profile;
+	const args = params.codexArgs ?? [];
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		if (!arg) return false;
+		if (arg === "--profile" || arg === "-p") profile = args[++index];
+		else if (arg.startsWith("--profile=")) profile = arg.slice(10);
+		else if (arg === "-c" || arg === "--config") {
+			const override = args[++index];
+			if (!override) return false;
+			overrides.push(`${override}\n`);
+		} else if (arg.startsWith("--config=")) overrides.push(`${arg.slice(9)}\n`);
+	}
+	if (profile) {
+		if (path.basename(profile) !== profile || profile === "." || profile === "..") return false;
+		const configPath = resolveCodexAppServerConfigPath(params);
+		if (!configPath) return false;
+		try {
+			overrides.unshift(readFileSync(path.join(path.dirname(configPath), `${profile}.config.toml`), "utf8"));
+		} catch (error) {
+			if (readErrorCode(error) !== "ENOENT") return false;
+		}
+	}
+	return overrides;
+}
 function readCodexAppServerConfigToml(params) {
 	if (params.codexConfigToml !== void 0) return params.codexConfigToml ?? void 0;
 	const configPath = resolveCodexAppServerConfigPath(params);
@@ -689,11 +736,7 @@ const codexAppServerTransportSchema = z.enum([
 const codexAppServerHomeScopeSchema = z.enum(["agent", "user"]);
 const SecretInputSchema = buildSecretInputSchema();
 const codexAppServerPolicyModeSchema = z.enum(["yolo", "guardian"]);
-const codexAppServerApprovalPolicySchema = z.preprocess((value) => value === "on-failure" ? "on-request" : value, z.enum([
-	"never",
-	"on-request",
-	"untrusted"
-]));
+const codexAppServerApprovalPolicySchema = z.preprocess((value) => value === "on-failure" ? "on-request" : value, z.enum(["never", "on-request"]));
 const codexAppServerSandboxSchema = z.enum([
 	"read-only",
 	"workspace-write",
@@ -821,6 +864,7 @@ const codexPluginConfigSchema = z.object({
 	}).strict().optional()
 }).strict();
 function readCodexPluginConfig(value) {
+	if (asNullableRecord(asNullableRecord(value)?.appServer)?.approvalPolicy === "untrusted") throw new Error("plugins.entries.codex.config.appServer.approvalPolicy=\"untrusted\" is retired; run \"openclaw doctor --fix\" to migrate it to \"on-request\".");
 	const parsed = codexPluginConfigSchema.safeParse(value);
 	if (!parsed.success) return {};
 	const { codexPlugins: rawCodexPlugins, ...config } = parsed.data;
@@ -951,6 +995,7 @@ function stableStringifyJson(value) {
 	return JSON.stringify(value);
 }
 function withMcpElicitationsApprovalPolicy(policy) {
+	if (policy === "untrusted") return policy;
 	if (typeof policy !== "string") return { granular: {
 		...policy.granular,
 		mcp_elicitations: true
@@ -1034,7 +1079,7 @@ function resolveDefaultCodexAppServerPolicy(params) {
 	const allowedApprovalPolicies = parseAllowedApprovalPoliciesFromCodexRequirements(content);
 	const allowedApprovalsReviewers = parseAllowedApprovalsReviewersFromCodexRequirements(content);
 	const yoloSandboxAllowed = allowedSandboxModes === void 0 || allowedSandboxModes.has("danger-full-access");
-	const yoloApprovalAllowed = allowedApprovalPolicies === void 0 || allowedApprovalPolicies.has("never");
+	const yoloApprovalAllowed = allowedApprovalPolicies === void 0 || allowedApprovalPolicies.has("never") && !allowedApprovalPolicies.has("untrusted");
 	const yoloReviewerAllowed = allowedApprovalsReviewers === void 0 || allowedApprovalsReviewers.has("user");
 	if (!params.forceGuardian && yoloSandboxAllowed && yoloApprovalAllowed && yoloReviewerAllowed) return {
 		mode: "yolo",
@@ -1114,6 +1159,15 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	const forceGuardianReviewer = execMode === "auto" && canUseModelBackedReviewer;
 	const execModeRequiringPromptingApprovals = execMode === "auto" || execMode === "ask" ? execMode : forceUserReviewer ? "ask" : void 0;
 	const forceDangerFullAccessSandbox = params.execPolicy?.touched === true && params.execPolicy.security === "full" && params.execPolicy.ask === "always";
+	const forcePerCommandApprovals = params.execPolicy?.ask === "always";
+	const requirementsToml = forcePerCommandApprovals ? readCodexRequirementsToml({
+		env,
+		requirementsToml: params.requirementsToml,
+		requirementsPath: params.requirementsPath,
+		readRequirementsFile: params.readRequirementsFile,
+		platform: params.platform
+	}) ?? null : params.requirementsToml;
+	if (forcePerCommandApprovals && requirementsToml && parseAllowedApprovalPoliciesFromCodexRequirements(requirementsToml)?.has("untrusted") === false) throw new Error("tools.exec.ask=always requires Codex app-server per-command approvals");
 	const forceRuntimePolicy = forceUserReviewer || forceGuardianReviewer || forceDangerFullAccessSandbox;
 	const defaultPolicy = explicitPolicyMode && !forceRuntimePolicy && !ignoreLegacyYoloPolicyMode ? void 0 : resolveDefaultCodexAppServerPolicy({
 		transport,
@@ -1121,7 +1175,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 		forceGuardian: normalizedPolicyMode === "guardian",
 		forceUserReviewer: forceUserReviewer || !canUseModelBackedReviewer,
 		execModeRequiringPromptingApprovals,
-		requirementsToml: params.requirementsToml,
+		requirementsToml,
 		requirementsPath: params.requirementsPath,
 		readRequirementsFile: params.readRequirementsFile,
 		platform: params.platform,
@@ -1130,7 +1184,7 @@ function resolveCodexAppServerRuntimeOptions(params = {}) {
 	});
 	const preserveExplicitAutoSandbox = forceGuardianReviewer && configuredSandbox === "read-only";
 	const forcedPolicy = forceRuntimePolicy ? {
-		approvalPolicy: defaultPolicy?.approvalPolicy ?? "on-request",
+		approvalPolicy: forcePerCommandApprovals ? "untrusted" : defaultPolicy?.approvalPolicy ?? "on-request",
 		sandbox: preserveExplicitAutoSandbox ? void 0 : forceDangerFullAccessSandbox ? selectForcedDangerFullAccessSandbox({
 			configuredSandbox,
 			defaultPolicy,
@@ -1332,4 +1386,4 @@ function resolveCodexSupervisionAppServerRuntimeOptions(params = {}) {
 	});
 }
 //#endregion
-export { resolveOpenClawExecPolicyForCodexAppServer as A, parseAllowedApprovalPoliciesFromCodexRequirements as C, selectGuardianApprovalPolicy as D, readCodexRequirementsToml as E, isCodexFastServiceTier as M, normalizeCodexServiceTier as N, selectGuardianApprovalsReviewer as O, resolveCodexModelBackedReviewerPolicyContext as S, parseAllowedSandboxModesFromCodexRequirements as T, CODEX_PLUGINS_MARKETPLACE_NAME as _, resolveCodexAppServerStartOptionsForAgent as a, canUseCodexModelBackedApprovalsReviewerForModel as b, assertCodexAppServerConnectionSecurity as c, withMcpElicitationsApprovalPolicy as d, isCodexPairedNodeRemoteExecPlacementSandbox as f, resolveCodexPluginsPolicy as g, readCodexPluginConfig as h, resolveCodexAppServerRuntimeOptions as i, selectGuardianSandbox as j, selectUserApprovalsReviewer as k, resolveCodexAppServerNetworkProxy as l, isCodexSandboxExecServerEnabled as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, isCodexRemoteExecPlacementSandbox as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, shouldAutoApproveCodexAppServerApprovals as u, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as v, parseAllowedApprovalsReviewersFromCodexRequirements as w, resolveCodexAppServerUserHomeDir as x, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as y };
+export { selectUserApprovalsReviewer as A, resolveCodexModelBackedReviewerPolicyContext as C, readCodexRequirementsToml as D, parseAllowedSandboxModesFromCodexRequirements as E, selectGuardianSandbox as M, isCodexFastServiceTier as N, selectGuardianApprovalPolicy as O, normalizeCodexServiceTier as P, resolveCodexAppServerUserHomeDir as S, parseAllowedApprovalsReviewersFromCodexRequirements as T, CODEX_PLUGINS_MARKETPLACE_NAME as _, resolveCodexAppServerStartOptionsForAgent as a, assertCodexModelBackedReviewerEffectiveConfig as b, assertCodexAppServerConnectionSecurity as c, withMcpElicitationsApprovalPolicy as d, isCodexPairedNodeRemoteExecPlacementSandbox as f, resolveCodexPluginsPolicy as g, readCodexPluginConfig as h, resolveCodexAppServerRuntimeOptions as i, resolveOpenClawExecPolicyForCodexAppServer as j, selectGuardianApprovalsReviewer as k, resolveCodexAppServerNetworkProxy as l, isCodexSandboxExecServerEnabled as m, codexSandboxPolicyForTurn as n, resolveCodexComputerUseConfig as o, isCodexRemoteExecPlacementSandbox as p, resolveCodexAppServerHomeScope as r, resolveCodexSupervisionAppServerRuntimeOptions as s, codexAppServerStartOptionsKey as t, shouldAutoApproveCodexAppServerApprovals as u, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as v, parseAllowedApprovalPoliciesFromCodexRequirements as w, canUseCodexModelBackedApprovalsReviewerForModel as x, CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN as y };

package/dist/doctor-contract-api.js

@@ -293,7 +293,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-BTrLf9Qm.js").then((n) => n.f), import("./conversation-binding-data-CW2GuupV.js").then((n) => n.t)]);
+			const [{ bindingStoreKey, createStoredCodexAppServerBinding, normalizeStoredCodexAppServerBindingFingerprints, readStoredCodexAppServerBinding }, { legacyCodexConversationBindingId }] = await Promise.all([import("./session-binding-Bcynfd-_.js").then((n) => n.f), import("./conversation-binding-data-CW2GuupV.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(),
@@ -537,8 +537,9 @@ function hasLegacyPluginDestructivePolicy(value) {
 	const plugins = asNullableRecord(codexPlugins.plugins);
 	return Object.values(plugins ?? {}).some((plugin) => asNullableRecord(plugin)?.allow_destructive_actions === "on-request");
 }
-function hasRetiredOnFailureApprovalPolicy(value) {
-	return asNullableRecord(value)?.approvalPolicy === "on-failure";
+function hasRetiredApprovalPolicy(value) {
+	const approvalPolicy = asNullableRecord(value)?.approvalPolicy;
+	return approvalPolicy === "on-failure" || approvalPolicy === "untrusted";
 }
 /** Legacy Codex config keys that doctor should report or repair. */
 const legacyConfigRules = [
@@ -571,8 +572,8 @@ const legacyConfigRules = [
 			"config",
 			"appServer"
 		],
-		message: "plugins.entries.codex.config.appServer.approvalPolicy=\"on-failure\" was retired by Codex 0.143; use \"on-request\". Run \"openclaw doctor --fix\".",
-		match: hasRetiredOnFailureApprovalPolicy
+		message: "plugins.entries.codex.config.appServer.approvalPolicy values \"on-failure\" and \"untrusted\" are retired; use \"on-request\". Run \"openclaw doctor --fix\".",
+		match: hasRetiredApprovalPolicy
 	}
 ];
 /**
@@ -584,7 +585,7 @@ function normalizeCompatibilityConfig({ cfg }) {
 	const rawAppServer = asNullableRecord(rawPluginConfig?.appServer);
 	const shouldRemoveDynamicToolsProfile = rawPluginConfig !== null && hasRetiredDynamicToolsProfile(rawPluginConfig);
 	const shouldRewriteDestructivePolicy = hasLegacyPluginDestructivePolicy(rawCodexPlugins);
-	const shouldRewriteApprovalPolicy = hasRetiredOnFailureApprovalPolicy(rawAppServer);
+	const shouldRewriteApprovalPolicy = hasRetiredApprovalPolicy(rawAppServer);
 	if (!rawPluginConfig || !shouldRemoveDynamicToolsProfile && !shouldRewriteDestructivePolicy && !shouldRewriteApprovalPolicy) return {
 		config: cfg,
 		changes: []
@@ -612,8 +613,8 @@ function normalizeCompatibilityConfig({ cfg }) {
 	}
 	if (shouldRewriteApprovalPolicy) {
 		const nextAppServer = asNullableRecord(nextPluginConfig.appServer);
-		if (nextAppServer?.approvalPolicy === "on-failure") nextAppServer.approvalPolicy = "on-request";
-		changes.push("Renamed plugins.entries.codex.config.appServer.approvalPolicy=\"on-failure\" to \"on-request\".");
+		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\".");
 	}
 	return {
 		config: nextConfig,