@openclaw/codex 2026.9.4 → 2026.9.6

package/dist/{command-handlers-tiL9iWj7.js → .setup/command-handlers-DW7Lx9oH.mjs}

@@ -1,102 +1,91 @@
-import { n as isCodexFastServiceTier } from "./config-utils-DujwEnhg.js";
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, r as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-oL4Na1ZG.js";
-import { l as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey } from "./session-binding-record-Bcvslnhf.js";
-import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
-import { _ as assertCodexThreadAcceptsDirectInput, s as isCodexAppServerIndeterminateRequestCancellationError, u as isCodexAppServerPrewriteRequestCancellationError, y as assertCodexThreadResumeResponse } from "./client-B57KWPQx.js";
-import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-7orQae_j.js";
-import { r as withCodexConversationThreadActivity, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.js";
-import { a as CODEX_HOST_INSPECTION_AUTH_ERROR, c as hasCodexAdminScope, i as CODEX_FULL_PERMISSIONS_AUTH_ERROR, n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, r as parseCodexPluginMarketplaceId, s as canMutateCodexHost, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-P-Vndfqq.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-CBMmWBr9.js";
-import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, n as buildHelp, o as formatCodexDisplayText, p as formatThreads, r as escapeCodexChatText, s as formatCodexStatus, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatList } from "./command-formatters-lxlkNZgU.js";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BiodpIzq.js";
-import { t as CodexAppServerRpcError } from "./rpc-error-ttN_QjEm.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-8vx68WLH.js";
-import { i as formatCodexCliSessions } from "./node-cli-sessions-DKaOmVUh.js";
-import { r as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./plugin-app-cache-key-d0eKxy7b.js";
-import { o as withCodexAppServerJsonClient } from "./request-B7hEkBGq.js";
-import "./config-oIORaQ5T.js";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-D0zGNIHu.js";
-import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-CWlKVccJ.js";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-D3udKbIE.js";
-import { a as resolveCodexAppServerAuthProfileStore, i as resolveCodexAppServerAuthProfileIdForAgent, n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-CwzO4_RG.js";
-import { R as consumeCodexAppServerLiveThread, V as hasCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CscigXXL.js";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DKHzbwt5.js";
-import { t as listAllCodexAppServerModels } from "./models-PCKOim-h.js";
-import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-BYQculil.js";
-import { n as createCodexSessionGenerationSupersededError, o as resolveCodexSessionBinding } from "./session-binding-CI8UuilT.js";
-import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-BuEQfE0g.js";
-import { a as rollbackCodexAppServerBindingSubscription, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-BsDRTsyp.js";
-import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-BxgyoM8M.js";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-ClPJpRio.js";
-import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-CR5EOEZX.js";
-import { a as setCodexConversationFastMode, c as steerCodexConversationTurn, i as readCodexConversationActiveTurn, l as stopCodexConversationTurn, n as parseCodexFastModeArg, o as setCodexConversationModel, r as parseCodexPermissionsModeArg, s as setCodexConversationPermissions, t as formatPermissionsMode } from "./conversation-control-CtUu1b3m.js";
+import { n as isCodexFastServiceTier } from "./config-utils-DujwEnhg.mjs";
+import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, r as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-BoRei8Z4.mjs";
+import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey } from "./session-binding-record-BGoz8wOK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-B2mpaI9D.mjs";
+import { r as withCodexConversationThreadActivity, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.mjs";
+import { a as CODEX_HOST_INSPECTION_AUTH_ERROR, c as canMutateCodexHost, i as CODEX_FULL_PERMISSIONS_AUTH_ERROR, l as hasCodexAdminScope, n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, r as parseCodexPluginMarketplaceId, s as assertCodexHostOwnerCurrent, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-CDOi8IFs.mjs";
+import { s as summarizeCodexAccountUsage } from "./rate-limits-CMU3DUD0.mjs";
+import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, n as buildHelp, o as formatCodexDisplayText, p as formatThreads, r as escapeCodexChatText, s as formatCodexStatus, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatList } from "./command-formatters-Bmqvr9tO.mjs";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-CrcyZk6O.mjs";
+import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-CDXOOFdZ.mjs";
+import { o as formatCodexCliSessions } from "./node-cli-sessions-r3avj02l.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-B2CsSdnV.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-ThoatDcb.mjs";
+import { o as withCodexAppServerJsonClient } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C8Rw1m1m.mjs";
+import { a as resolveCodexAppServerAuthProfileStore, i as resolveCodexAppServerAuthProfileIdForAgent, n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-WqZtZfXN.mjs";
+import { I as hasCodexAppServerLiveThread, N as consumeCodexAppServerLiveThread, X as resolveCodexAppServerAuthAccountCacheKey, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DA4VR4Eb.mjs";
+import { b as assertCodexThreadResumeResponse, s as isCodexAppServerIndeterminateRequestCancellationError, u as isCodexAppServerPrewriteRequestCancellationError, v as assertCodexThreadAcceptsDirectInput } from "./client-Cs08OXVQ.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
+import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-DhLWa_7K.mjs";
+import { t as listAllCodexAppServerModels } from "./models-KnqBv0hE.mjs";
+import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-DT3MNtqj.mjs";
+import { n as createCodexSessionGenerationSupersededError, o as resolveCodexSessionBinding } from "./session-binding-Cm0apEbd.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-DGuQsuFC.mjs";
+import { a as rollbackCodexAppServerBindingSubscription, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, s as withExclusiveCodexAppServerThread, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DcTtAcXj.mjs";
+import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C2sRMOEY.mjs";
+import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-Ctmo83k_.mjs";
+import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-DixIj3HW.mjs";
+import { a as setCodexConversationFastMode, c as steerCodexConversationTurn, i as readCodexConversationActiveTurn, l as stopCodexConversationTurn, n as parseCodexFastModeArg, o as setCodexConversationModel, r as parseCodexPermissionsModeArg, s as setCodexConversationPermissions, t as formatPermissionsMode } from "./conversation-control-uK9Jomlc.mjs";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import crypto from "node:crypto";
+import { isDeepStrictEqual } from "node:util";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
+import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { ensureAuthProfileStore, resolveAgentDir as resolveAgentDir$1, resolveAgentWorkspaceDir, resolveAuthProfileEligibility, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
-import { isDeepStrictEqual } from "node:util";
-import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { findNormalizedProviderValue, resolveAuthProfileOrder } from "openclaw/plugin-sdk/provider-auth";
 import { renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";
 import { MODEL_SELECTION_LOCKED_MESSAGE, isModelSelectionLocked, resolvePersistedSessionRuntimeId } from "openclaw/plugin-sdk/model-session-runtime";
 //#region extensions/codex/src/command-account.ts
 const OPENAI_PROVIDER_ID = "openai";
-const OPENAI_CODEX_PROVIDER_ID = OPENAI_PROVIDER_ID;
 async function readCodexAccountAuthOverview(params) {
+	if (!params.account.ok && !params.limits.ok) return;
 	const config = params.ctx.config;
 	const agentDir = params.agentDir;
 	const store = ensureAuthProfileStore(agentDir, {
 		allowKeychainPrompt: false,
 		config
 	});
-	const { order, explicit: explicitOrder } = resolveDisplayAuthOrder({
+	const order = resolveDisplayAuthOrder({
 		config,
 		store
 	});
+	const activeProfileId = params.authProfileId ?? void 0;
+	if (activeProfileId && !order.includes(activeProfileId)) order.unshift(activeProfileId);
 	if (order.length === 0) return;
 	const now = Date.now();
-	const activeProfileId = resolveActiveProfileId({
-		store,
-		order,
-		explicitOrder,
-		config,
-		account: params.account,
-		limits: params.limits,
-		now
-	});
 	const activeIsSubscription = activeProfileId !== void 0 && isChatGptSubscriptionProfile(store.profiles[activeProfileId]);
-	const subscriptionProfileId = activeIsSubscription ? activeProfileId : order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId]));
+	const subscriptionProfileId = activeIsSubscription ? activeProfileId : activeProfileId ? order.find((profileId) => isChatGptSubscriptionProfile(store.profiles[profileId])) : void 0;
 	const activeUsage = activeIsSubscription && params.limits.ok ? summarizeCodexAccountUsage(params.limits.value, now) : void 0;
-	const subscriptionUsage = subscriptionProfileId && (!activeIsSubscription || subscriptionProfileId !== activeProfileId) ? await readSubscriptionUsage({
+	const subscriptionUsage = subscriptionProfileId && !activeIsSubscription ? await readSubscriptionUsage({
 		...params,
 		agentDir,
 		config,
 		subscriptionProfileId,
 		now
 	}) : activeUsage;
-	if (!params.account.ok && !params.limits.ok && !subscriptionUsage) return;
-	const rows = order.map((profileId, index) => buildProfileRow({
+	const rows = order.map((profileId) => buildProfileRow({
 		store,
 		config,
 		profileId,
 		activeProfileId,
-		activeIndex: activeProfileId ? order.indexOf(activeProfileId) : -1,
-		index,
 		now,
 		usage: profileId === subscriptionProfileId ? subscriptionUsage : void 0
 	}));
 	const activeRow = rows.find((row) => row.active);
 	if (!activeRow) return {
-		currentLine: "OpenAI credentials: no working credential",
 		orderTitle: "Auth order",
 		rows
 	};
 	const activeIsApiKey = store.profiles[activeRow.profileId]?.type === "api_key";
-	const subscriptionLabel = subscriptionProfileId ? formatProfileLabel(subscriptionProfileId, store.profiles[subscriptionProfileId]) : activeIsSubscription ? activeRow.label : void 0;
+	const subscriptionLabel = subscriptionProfileId ? formatProfileLabel(subscriptionProfileId, store.profiles[subscriptionProfileId]) : void 0;
 	const subscriptionUsageLine = formatSubscriptionUsageLine(subscriptionUsage);
 	return {
 		...activeIsApiKey ? { currentLine: buildApiKeyActiveLine(activeRow, subscriptionUsage) } : {},
@@ -107,92 +96,13 @@ async function readCodexAccountAuthOverview(params) {
 	};
 }
 function resolveDisplayAuthOrder(params) {
-	const codexOrder = resolveOrder(params.store.order, OPENAI_CODEX_PROVIDER_ID) ?? resolveOrder(params.config?.auth?.order, OPENAI_CODEX_PROVIDER_ID);
-	if (codexOrder && codexOrder.length > 0) return {
-		order: normalizeUniqueStringEntries(codexOrder),
-		explicit: true
-	};
-	return {
-		order: resolveAuthProfileOrder({
-			cfg: params.config,
-			store: params.store,
-			provider: OPENAI_CODEX_PROVIDER_ID
-		}),
-		explicit: hasExplicitOpenAiAuthOrder(params)
-	};
-}
-function hasExplicitOpenAiAuthOrder(params) {
-	const sources = [params.store.order, params.config?.auth?.order];
-	for (const source of sources) {
-		const codex = resolveOrder(source, OPENAI_CODEX_PROVIDER_ID);
-		if (codex && codex.length > 0) return true;
-		const openai = resolveOrder(source, OPENAI_PROVIDER_ID);
-		if (openai && openai.length > 0) return true;
-	}
-	return false;
-}
-function resolveOrder(order, provider) {
-	return findNormalizedProviderValue(order, provider);
-}
-function resolveActiveProfileId(params) {
-	const liveProfileId = resolveLiveAccountProfileId({
-		account: params.account,
-		store: params.store,
-		order: params.order
-	});
-	if (liveProfileId) return liveProfileId;
-	if (params.explicitOrder) return params.order.find((profileId) => isActiveProfileCandidate(params, profileId) && resolveAuthProfileEligibility({
-		cfg: params.config,
-		store: params.store,
-		provider: OPENAI_CODEX_PROVIDER_ID,
-		profileId,
-		now: params.now
-	}).eligible);
-	const lastGood = [params.store.lastGood?.[OPENAI_PROVIDER_ID], params.store.lastGood?.[OPENAI_CODEX_PROVIDER_ID]].find((profileId) => typeof profileId === "string" && params.order.includes(profileId) && isActiveProfileCandidate(params, profileId));
-	if (lastGood) return lastGood;
-	const mostRecent = params.order.map((profileId) => ({
-		profileId,
-		lastUsed: params.store.usageStats?.[profileId]?.lastUsed ?? 0
-	})).filter((entry) => entry.lastUsed > 0 && isActiveProfileCandidate(params, entry.profileId)).toSorted((left, right) => right.lastUsed - left.lastUsed)[0]?.profileId;
-	if (mostRecent) return mostRecent;
-	if (shouldInferApiKeyActiveFromRateLimitProbe(params.limits)) {
-		const apiKeyProfile = params.order.find((profileId) => params.store.profiles[profileId]?.type === "api_key");
-		if (apiKeyProfile) return apiKeyProfile;
-	}
+	const explicitOrder = findNormalizedProviderValue(params.store.order, OPENAI_PROVIDER_ID) ?? findNormalizedProviderValue(params.config?.auth?.order, OPENAI_PROVIDER_ID);
+	if (explicitOrder && explicitOrder.length > 0) return normalizeUniqueStringEntries(explicitOrder);
 	return resolveAuthProfileOrder({
 		cfg: params.config,
 		store: params.store,
-		provider: OPENAI_CODEX_PROVIDER_ID
-	})[0];
-}
-function isActiveProfileCandidate(params, profileId) {
-	return !isActiveUntil(resolveProfileUnusableUntilForDisplay(params.store, profileId) ?? void 0, params.now);
-}
-function resolveLiveAccountProfileId(params) {
-	if (!params.account.ok || !isJsonObject(params.account.value)) return;
-	const account = isJsonObject(params.account.value.account) ? params.account.value.account : params.account.value;
-	const type = normalizeOptionalString(account.type)?.toLowerCase();
-	if (type === "chatgpt") {
-		const email = normalizeOptionalString(account.email)?.toLowerCase();
-		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");
-}
-function shouldInferApiKeyActiveFromRateLimitProbe(limits) {
-	return !limits.ok && limits.error.toLowerCase().includes("chatgpt authentication required");
+		provider: OPENAI_PROVIDER_ID
+	});
 }
 async function readSubscriptionUsage(params) {
 	const limits = await params.safeCodexControlRequest(params.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, {
@@ -209,13 +119,12 @@ function buildProfileRow(params) {
 	const label = formatProfileLabel(params.profileId, credential);
 	const kind = formatProfileKind(credential);
 	const active = params.profileId === params.activeProfileId;
-	const status = active ? "active now" : params.usage?.blocked ? formatUsageBlockedStatus(params.usage) : describeInactiveProfileStatus({
+	const status = active ? "active now" : params.usage?.blocked ? "rate-limited" : describeInactiveProfileStatus({
 		store: params.store,
 		config: params.config,
 		profileId: params.profileId,
 		credential,
-		now: params.now,
-		afterActive: params.activeIndex >= 0 && params.index > params.activeIndex
+		now: params.now
 	});
 	return {
 		profileId: params.profileId,
@@ -223,13 +132,9 @@ function buildProfileRow(params) {
 		kind,
 		status,
 		active,
-		...credential?.type === "api_key" && active ? { billingNote: "billed per token" } : {},
-		...params.usage?.usageLine ? { usage: params.usage.usageLine } : {}
+		...credential?.type === "api_key" && active ? { billingNote: "billed per token" } : {}
 	};
 }
-function formatUsageBlockedStatus(usage) {
-	return usage.blocked ? "rate-limited" : "available if needed";
-}
 function describeInactiveProfileStatus(params) {
 	const stats = params.store.usageStats?.[params.profileId];
 	const blockedUntil = stats?.blockedUntil;
@@ -238,7 +143,7 @@ function describeInactiveProfileStatus(params) {
 	const eligibility = resolveAuthProfileEligibility({
 		cfg: params.config,
 		store: params.store,
-		provider: OPENAI_CODEX_PROVIDER_ID,
+		provider: OPENAI_PROVIDER_ID,
 		profileId: params.profileId,
 		now: params.now
 	});
@@ -1573,7 +1478,15 @@ async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 		sessionKey,
 		storePath,
 		assertHostCurrent,
-		assertCurrent
+		assertCurrent,
+		assertMutationCurrent: () => {
+			assertCodexHostOwnerCurrent(ctx);
+			assertCurrent();
+		},
+		assertHostMutationCurrent: () => {
+			assertCodexHostOwnerCurrent(ctx);
+			assertHostCurrent();
+		}
 	};
 }
 async function resolveCommandAppServerContext(deps, ctx, pluginConfig) {
@@ -1586,10 +1499,13 @@ async function resolveCommandAppServerContext(deps, ctx, pluginConfig) {
 		agentDir,
 		config: ctx.config
 	});
-	const connection = resolveCodexBindingAppServerConnection({
+	const connection = await resolveCodexBindingAppServerConnection({
 		binding,
 		authProfileId,
-		pluginConfig
+		pluginConfig,
+		agentDir,
+		config: ctx.config,
+		assertCurrent: authority.assertCurrent
 	});
 	return {
 		scope: {
@@ -1628,7 +1544,8 @@ function resolveCodexConversationControlScope(ctx) {
 }
 //#endregion
 //#region extensions/codex/src/command-diagnostics.ts
-async function handleCodexDiagnosticsFeedback(deps, ctx, pluginConfig, args, commandPrefix) {
+async function handleCodexDiagnosticsFeedback(deps, context, pluginConfig, args, commandPrefix) {
+	const ctx = { ...context };
 	if (ctx.senderIsOwner !== true) return { text: "Only an owner can send Codex diagnostics." };
 	const parsed = parseDiagnosticsArgs(args);
 	if (parsed.action === "usage") return { text: formatDiagnosticsUsage(commandPrefix) };
@@ -1754,12 +1671,20 @@ async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, n
 	const sent = [];
 	const failed = [];
 	for (const target of targets) {
+		const assertCurrent = () => {
+			ctx.assertOwnerCurrent?.();
+			const current = resolvePendingCodexDiagnosticsTargets(deps, [target], ctx.config);
+			if (!codexDiagnosticsTargetsMatch([target], current)) throw new Error("The Codex diagnostics session changed before upload; request it again.");
+		};
 		let connection;
 		try {
-			connection = resolveCodexBindingAppServerConnection({
+			connection = await resolveCodexBindingAppServerConnection({
 				binding: target,
 				authProfileId: target.authProfileId,
-				pluginConfig
+				pluginConfig,
+				agentDir: target.agentDir,
+				config: ctx.config,
+				assertCurrent
 			});
 		} catch (error) {
 			failed.push({
@@ -1777,6 +1702,7 @@ async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, n
 		}, {
 			config: ctx.config,
 			agentDir: target.agentDir,
+			assertCurrent,
 			...connection.clientAuthProfileId !== void 0 ? { authProfileId: connection.clientAuthProfileId } : {},
 			...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {},
 			...target.sessionId ? { sessionId: target.sessionId } : {},
@@ -1944,6 +1870,7 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 		}
 	});
 	const threadLabel = parsed.threadId ?? "a new thread";
+	assertCodexHostOwnerCurrent(ctx);
 	const request = await ctx.requestConversationBinding({
 		summary: `Codex app-server thread ${formatCodexDisplayText(threadLabel)} in ${formatCodexDisplayText(workspaceDir)}`,
 		detachHint: "/codex detach",
@@ -1977,6 +1904,7 @@ async function detachConversation(deps, ctx) {
 			bindingStore: deps.bindingStore,
 			identity,
 			expectedThreadId,
+			assertCurrent: () => assertCodexHostOwnerCurrent(ctx),
 			...expectedStartId ? { expectedStartId } : {},
 			...isIncognitoSessionKey(sourceSessionKey) ? { allowUntracked: true } : {},
 			afterClear: async () => {
@@ -1985,6 +1913,7 @@ async function detachConversation(deps, ctx) {
 		})) return "This Codex conversation binding changed while detaching; try again.";
 		return detachedPublicConversation;
 	});
+	assertCodexHostOwnerCurrent(ctx);
 	return await detachPublicConversation();
 }
 async function describeConversationBinding(deps, ctx) {
@@ -2144,6 +2073,7 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 				sessionId: ctx.sessionId,
 				storePath: ctx.sessionTarget?.storePath,
 				assertCurrent: assertHostGeneration,
+				assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx),
 				beforeRequest: async (request) => {
 					const { thread } = await request({
 						method: "thread/read",
@@ -2188,6 +2118,7 @@ async function bindCodexCliNodeSession(deps, ctx, parsed) {
 		cwd: resolved.session?.cwd
 	});
 	const summary = `Codex CLI session ${formatCodexDisplayText(parsed.threadId)} on ${formatCodexDisplayText(nodeId)}`;
+	assertCodexHostOwnerCurrent(ctx);
 	const request = await ctx.requestConversationBinding({
 		summary,
 		detachHint: "/codex detach",
@@ -2280,7 +2211,10 @@ async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
 		forceEnable: parsed.action === "install" || parsed.hasOverrides,
 		...Object.keys(parsed.overrides).length > 0 ? { overrides: parsed.overrides } : {}
 	};
-	if (parsed.action === "install") return formatComputerUseStatus(await deps.installCodexComputerUse(params));
+	if (parsed.action === "install") return formatComputerUseStatus(await deps.installCodexComputerUse({
+		...params,
+		assertCurrent: () => assertCodexHostOwnerCurrent(ctx)
+	}));
 	return formatComputerUseStatus(await deps.readCodexComputerUseStatus(params));
 }
 async function handleNativeGoal(deps, ctx, pluginConfig, args) {
@@ -2290,10 +2224,13 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 	const { target, binding } = authority;
 	if (!target) return "Cannot manage the Codex goal because this command has no stable binding identity.";
 	if (!binding?.threadId) return "No Codex thread is attached to this OpenClaw session yet.";
-	const connection = resolveCodexBindingAppServerConnection({
+	const connection = await resolveCodexBindingAppServerConnection({
 		binding,
 		authProfileId: binding.authProfileId,
-		pluginConfig
+		pluginConfig,
+		agentDir: target.agentDir,
+		config: ctx.config,
+		assertCurrent: authority.assertCurrent
 	});
 	const goalRequestOptions = {
 		agentDir: target.agentDir,
@@ -2311,7 +2248,10 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 	}
 	if (action === "clear") {
 		if (args.length > 1) return "Usage: /codex goal clear";
-		const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.clearThreadGoal, { threadId: binding.threadId }, goalRequestOptions);
+		const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.clearThreadGoal, { threadId: binding.threadId }, {
+			...goalRequestOptions,
+			assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx)
+		});
 		return isJsonObject(response) && response.cleared === true ? "Cleared the Codex goal." : "No Codex goal was active.";
 	}
 	const requestedStatus = action === "pause" ? "paused" : action === "resume" ? "active" : action === "block" ? "blocked" : action === "complete" ? "complete" : void 0;
@@ -2324,6 +2264,7 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 		...requestedStatus ? { status: requestedStatus } : {}
 	}, {
 		...goalRequestOptions,
+		assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx),
 		...(isObjectiveUpdate || requestedStatus === "active") && connection.usesSupervisionConnection ? { beforeRequest: supervisedCommandGuard(deps, target.identity, binding) } : {}
 	})));
 }
@@ -2340,20 +2281,17 @@ function formatNativeGoal(response) {
 		`- Tokens: ${tokensUsed}${tokenBudget === void 0 ? "" : ` / ${tokenBudget}`}`
 	].join("\n");
 }
-async function stopConversationTurn(deps, ctx, pluginConfig) {
+async function stopConversationTurn(deps, ctx) {
 	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
 	const { target, binding } = authority;
 	if (!target) return "Cannot stop Codex because this command did not include a stable binding identity.";
 	return (await deps.stopCodexConversationTurn({
 		identity: target.identity,
 		binding,
-		pluginConfig,
-		agentDir: target.agentDir,
-		config: ctx.config,
-		assertCurrent: authority.assertCurrent
+		assertCurrent: authority.assertMutationCurrent
 	})).message;
 }
-async function steerConversationTurn(deps, ctx, pluginConfig, message) {
+async function steerConversationTurn(deps, ctx, message) {
 	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
 	const { target, binding } = authority;
 	if (!target) return "Cannot steer Codex because this command did not include a stable binding identity.";
@@ -2361,10 +2299,7 @@ async function steerConversationTurn(deps, ctx, pluginConfig, message) {
 		identity: target.identity,
 		binding,
 		message,
-		pluginConfig,
-		agentDir: target.agentDir,
-		config: ctx.config,
-		assertCurrent: authority.assertCurrent
+		assertCurrent: authority.assertMutationCurrent
 	})).message;
 }
 async function setConversationModel(deps, ctx, pluginConfig, args) {
@@ -2396,7 +2331,8 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 		config: ctx.config,
 		binding,
 		storePath: authority.storePath,
-		assertCurrent: authority.assertCurrent
+		assertCurrent: authority.assertCurrent,
+		assertCommitAllowed: authority.assertMutationCurrent
 	});
 }
 async function setConversationFastMode(deps, ctx, args) {
@@ -2412,7 +2348,7 @@ async function setConversationFastMode(deps, ctx, args) {
 		bindingStore: deps.bindingStore,
 		binding,
 		enabled: parsed,
-		assertCurrent: authority.assertCurrent
+		assertCurrent: parsed === void 0 ? authority.assertCurrent : authority.assertMutationCurrent
 	});
 }
 async function setConversationPermissions(deps, ctx, args) {
@@ -2428,7 +2364,7 @@ async function setConversationPermissions(deps, ctx, args) {
 		mode: parsed,
 		config: ctx.config,
 		storePath: authority.storePath,
-		assertCurrent: authority.assertHostCurrent,
+		assertCurrent: parsed ? authority.assertHostMutationCurrent : authority.assertHostCurrent,
 		session: {
 			agentId: target.agentId,
 			sessionId: ctx.sessionId,
@@ -2457,14 +2393,17 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		}
 		const compactCurrent = ctx.runtimeContext?.compactCurrent;
 		if (!compactCurrent) return "Codex compaction is unavailable because this command is not bound to a session.";
-		authority.assertCurrent();
+		authority.assertMutationCurrent();
 		const result = await compactCurrent();
 		return result.compacted ? `Compacted Codex session (${result.tokensAfter ?? "unknown"} tokens after).` : `Codex compaction did not complete: ${formatCodexDisplayText(result.reason ?? "no reason returned")}.`;
 	}
-	const connection = resolveCodexBindingAppServerConnection({
+	const connection = await resolveCodexBindingAppServerConnection({
 		binding,
 		authProfileId: binding.authProfileId,
-		pluginConfig
+		pluginConfig,
+		agentDir: target.agentDir,
+		config: ctx.config,
+		assertCurrent: authority.assertCurrent
 	});
 	await deps.bindingStore.withLease(target.identity, () => deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.review, {
 		threadId: binding.threadId,
@@ -2477,6 +2416,7 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 		sessionKey: authority.sessionKey,
 		storePath: authority.storePath,
 		assertCurrent: authority.assertCurrent,
+		assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx),
 		...connection.usesSupervisionConnection ? {
 			startOptions: connection.appServer.start,
 			beforeRequest: supervisedCommandGuard(deps, target.identity, binding)
@@ -2552,7 +2492,11 @@ function formatCodexAvailablePlugins(plugins, warnings, query, page) {
 //#region extensions/codex/src/command-plugins-management.ts
 const POLICY_REFRESH_HINT = "Takes effect on your next message.";
 const AVAILABLE_USAGE = "Usage: /codex plugins available [query] [--page <positive integer>]. Search text must be at most 100 characters; use -- before literal query text that contains options.";
-async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
+async function handleCodexPluginsSubcommand(input, rest, io, runtime) {
+	const ctx = {
+		...input,
+		gatewayClientScopes: input.gatewayClientScopes?.slice()
+	};
 	const [verb = "list", ...args] = rest;
 	const normalized = verb.toLowerCase();
 	if (normalized === "menu") {
@@ -2618,7 +2562,7 @@ async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
 		if (args.length !== 1 || !args[0]) return { text: "Usage: /codex plugins install <plugin>@<marketplace>" };
 		if (!canMutateCodexHost(ctx)) return { text: "Only an owner or operator.admin gateway client can run /codex plugins install." };
 		if (!runtime) return { text: "Codex plugin installation is unavailable for this command." };
-		return await installCodexPlugin(args[0], io, runtime);
+		return await installCodexPlugin(args[0], io, runtime, ctx);
 	}
 	const target = args[0];
 	if (normalized === "enable" || normalized === "disable") {
@@ -2636,6 +2580,7 @@ async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
 		if (configured.status === "ambiguous" || configured.status === "mismatched") return { text: describeConfiguredPluginIdentityConflict(target, configured.status) };
 		if (configured.status === "missing") return { text: `Codex sub-plugin '${formatCodexDisplayText(target)}' is not configured. Run '/codex plugins list' to see configured plugins.` };
 		const configKey = configured.configKey;
+		assertCodexHostOwnerCurrent(ctx);
 		await io.mutate((block) => {
 			if (wantEnabled) block.enabled = true;
 			block.plugins ??= {};
@@ -2643,7 +2588,7 @@ async function handleCodexPluginsSubcommand(ctx, rest, io, runtime) {
 				...block.plugins[configKey],
 				enabled: wantEnabled
 			};
-		});
+		}, () => assertCodexHostOwnerCurrent(ctx));
 		return { text: `${formatCodexDisplayText(configKey)}: ${wantEnabled ? "enabled" : "disabled"} in openclaw.json. ${POLICY_REFRESH_HINT}` };
 	}
 	return { text: `Unknown /codex plugins subcommand: ${formatCodexDisplayText(verb)}\n\n${buildPluginsHelp()}` };
@@ -2749,7 +2694,7 @@ function buildPluginsHelp() {
 		"Only an owner or operator.admin can discover, inspect, refresh hosted apps, install, enable, or disable plugins."
 	].join("\n");
 }
-async function installCodexPlugin(requestedId, io, runtime) {
+async function installCodexPlugin(requestedId, io, runtime, ctx) {
 	const requested = parseCodexPluginMarketplaceId(requestedId);
 	if (!requested) return { text: "Invalid plugin identifier. Use /codex plugins install <plugin>@<marketplace>. Both names allow ASCII letters, digits, underscores, and hyphens. Plugin names may also contain dots between nonempty segments." };
 	let plugin;
@@ -2791,6 +2736,7 @@ async function installCodexPlugin(requestedId, io, runtime) {
 		} : void 0;
 		if (!requestParams) return { text: `${formatCodexDisplayText(requestedId)} cannot be installed because its marketplace did not provide a trusted local path or remote plugin identifier.` };
 		try {
+			assertCodexHostOwnerCurrent(ctx);
 			result = await runtime.install(requestParams);
 		} catch (error) {
 			return { text: `Could not install ${formatCodexDisplayText(requestedId)}: ${formatCodexDisplayText(errorMessage(error))}` };
@@ -2798,6 +2744,7 @@ async function installCodexPlugin(requestedId, io, runtime) {
 	}
 	const selectedPlugin = plugin;
 	try {
+		assertCodexHostOwnerCurrent(ctx);
 		await io.mutate((block) => {
 			block.plugins ??= {};
 			const configured = resolveInstalledPluginKey(block.plugins, selectedPlugin);
@@ -2814,7 +2761,7 @@ async function installCodexPlugin(requestedId, io, runtime) {
 				pluginName: existing?.pluginName ?? (curated ? selectedPlugin.pluginName : persistedPluginName(selectedPlugin))
 			};
 			block.plugins[configKey] = updated;
-		});
+		}, () => assertCodexHostOwnerCurrent(ctx));
 	} catch (error) {
 		return { text: `${formatCodexDisplayText(requestedId)} was installed in Codex but could not be authorized in OpenClaw and will not be exposed: ${formatCodexDisplayText(errorMessage(error))}` };
 	}
@@ -2918,7 +2865,11 @@ function formatPluginList(plugins, options = {}) {
 //#region extensions/codex/src/command-plugins-runtime.ts
 const SCOPE_CHANGED_MESSAGE = "Codex account, conversation, or plugin policy changed. Run the command again.";
 async function withCodexPluginCommandContext(params, run) {
-	const { deps, ctx, pluginConfig } = params;
+	const { deps, pluginConfig } = params;
+	const ctx = {
+		...params.ctx,
+		gatewayClientScopes: params.ctx.gatewayClientScopes?.slice()
+	};
 	const current = await deps.codexPluginsManagementIo?.readConfig() ?? {};
 	const initialPolicy = JSON.stringify(current);
 	const { scope, target, binding } = await resolveCommandAppServerContext(deps, ctx, pluginConfig);
@@ -2999,7 +2950,10 @@ async function withCodexPluginCommandContext(params, run) {
 					const response = await request({
 						method,
 						requestParams,
-						assertCurrent
+						assertCurrent: () => {
+							assertCurrent();
+							assertCodexHostOwnerCurrent(ctx);
+						}
 					});
 					await validateCurrent();
 					return response;
@@ -3082,7 +3036,8 @@ async function handleCodexSubcommand(ctx, options) {
 				const scope = await getAppServerScope();
 				return await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.installPlugin, requestParams, {
 					...scope,
-					config: ctx.config
+					config: ctx.config,
+					assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx)
 				});
 			},
 			refresh: async (workspaceDir) => {
@@ -3115,7 +3070,6 @@ async function handleCodexSubcommand(ctx, options) {
 						appServerVersion: client.getServerVersion(),
 						runtimeIdentity: client.getRuntimeIdentity()
 					});
-					defaultCodexPluginMetadataCache.invalidate(appCacheKey);
 					return await refreshCodexPluginRuntimeState({
 						configCwd: workspaceDir,
 						appCache: defaultCodexAppInventoryCache,
@@ -3160,9 +3114,9 @@ async function handleCodexSubcommand(ctx, options) {
 	}
 	if (normalized === "stop") {
 		if (rest.length > 0) return { text: "Usage: /codex stop" };
-		return { text: await stopConversationTurn(deps, ctx, options.pluginConfig) };
+		return { text: await stopConversationTurn(deps, ctx) };
 	}
-	if (normalized === "steer") return { text: await steerConversationTurn(deps, ctx, options.pluginConfig, rest.join(" ")) };
+	if (normalized === "steer") return { text: await steerConversationTurn(deps, ctx, rest.join(" ")) };
 	if (normalized === "model") return { text: await setConversationModel(deps, ctx, options.pluginConfig, rest) };
 	if (normalized === "fast") {
 		if (isMenuVerb(rest)) return buildCodexFastMenuReply();
@@ -3206,6 +3160,7 @@ async function handleCodexSubcommand(ctx, options) {
 		return { text: formatAccount(account, limits, await readCodexAccountAuthOverview({
 			ctx,
 			agentDir: scope.agentDir,
+			authProfileId: scope.authProfileId,
 			pluginConfig: options.pluginConfig,
 			safeCodexControlRequest: deps.safeCodexControlRequest,
 			account,
@@ -3217,11 +3172,7 @@ async function handleCodexSubcommand(ctx, options) {
 function resolvePluginRuntimeRefreshMethod(method) {
 	const recognized = [
 		CODEX_CONTROL_METHODS.listPlugins,
-		CODEX_CONTROL_METHODS.listSkills,
-		CODEX_CONTROL_METHODS.listHooks,
-		CODEX_CONTROL_METHODS.reloadMcpServers,
 		CODEX_CONTROL_METHODS.installedApps,
-		CODEX_CONTROL_METHODS.listApps,
 		CODEX_CONTROL_METHODS.readApps
 	].find((candidate) => candidate === method);
 	if (!recognized) throw new Error(`Unexpected Codex plugin refresh method: ${method}`);