@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{command-handlers-ztOOzm6O.mjs → command-handlers-VBaJnpZo.mjs}

@@ -1,53 +1,54 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey } from "./session-binding-record-BZB8RgcF.mjs";
-import { m as isCodexFastServiceTier } from "./config-parsing-BQq-CHTF.mjs";
-import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-CGm0UJOr.mjs";
-import { n as withCodexConversationThreadActivity } from "./thread-ownership-queue-Dp24d7-F.mjs";
+import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey } from "./session-binding-record-DU_0biMD.mjs";
+import { r as isCodexFastServiceTier } from "./config-utils-DN_YT7dE.mjs";
+import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-DyfUvsSa.mjs";
+import { n as withCodexConversationThreadActivity } from "./thread-ownership-queue-CeyYScUC.mjs";
 import { a as canMutateCodexHost, i as assertCodexHostOwnerCurrent, n as CODEX_HOST_INSPECTION_AUTH_ERROR, o as hasCodexAdminScope, r as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as CODEX_FULL_PERMISSIONS_AUTH_ERROR } from "./command-authorization-AikPDtcc.mjs";
-import { l as formatRelativeDuration, s as summarizeCodexAccountUsage } from "./rate-limits-CMPy24F5.mjs";
-import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, m as isLikelyEmailAddress, 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-DV3DHhdr.mjs";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-DJ4ix-W5.mjs";
-import { r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-kQntafj_.mjs";
-import { n as filterCodexMarketplacePlugins, r as parseCodexPluginMarketplaceId, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-SQPhSuic.mjs";
-import { o as formatCodexCliSessions } from "./node-cli-sessions-B5oNDkUS.mjs";
-import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BW8rd98k.mjs";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-C-08ez1w.mjs";
-import { a as withCodexAppServerJsonClient } from "./request-jSbhc1sg.mjs";
-import { a as pluginReadParams, l as CODEX_PLUGINS_MARKETPLACE_NAME, n as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-Bf0_piTw.mjs";
-import "./config-0Gxk3_eq.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
+import { l as formatRelativeDuration, s as summarizeCodexAccountUsage } from "./rate-limits-CI8pTPqL.mjs";
+import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, m as isLikelyEmailAddress, 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-xW9KpoSZ.mjs";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-UgLuTSQT.mjs";
+import { r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-DbOzOglY.mjs";
+import { n as filterCodexMarketplacePlugins, r as parseCodexPluginMarketplaceId, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-BblHM3DU.mjs";
+import { o as formatCodexCliSessions } from "./node-cli-sessions-CzKg2nGq.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-Bg9DbDI6.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-B7HAAZSI.mjs";
+import { a as withCodexAppServerJsonClient } from "./request-Y8dmbqZ3.mjs";
+import { n as findCodexMarketplacePluginSummary, o as pluginReadParams, r as isOpenAiCuratedMarketplaceName, u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-CYgdo14P.mjs";
+import "./config-C1YVVLEA.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-DWzK-k0n.mjs";
 import { a as resolveCodexAppServerAuthProfileStore, i as resolveCodexAppServerAuthProfileIdForAgent, n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-CgHQ8Vot.mjs";
-import { F as consumeCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-qhyYWbew.mjs";
-import { a as isCodexAppServerIndeterminateRequestCancellationError, h as assertCodexThreadResumeResponse, p as assertCodexThreadAcceptsDirectInput, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-C8lgBOoO.mjs";
-import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-BH0hW2xU.mjs";
-import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-BoMwpuPN.mjs";
-import { n as listAllCodexAppServerModels } from "./models-DSseKSMg.mjs";
-import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-BcyBv8PG.mjs";
-import { o as createCodexSessionGenerationSupersededError, r as resolveCodexSessionBinding } from "./session-binding-Ce7BqiPN.mjs";
-import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-DoNxbhqt.mjs";
-import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DwuSrt3s.mjs";
-import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-WqE8yPge.mjs";
-import { t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-DWnB7VMj.mjs";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-BBN9y326.mjs";
-import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-CuC5fPom.mjs";
-import { a as readCodexConversationActiveTurn, c as setCodexConversationModel, d as stopCodexConversationTurn, i as parseCodexPermissionsModeArg, l as setCodexConversationPermissions, n as formatPermissionsMode, r as parseCodexFastModeArg, s as setCodexConversationFastMode, u as steerCodexConversationTurn } from "./conversation-control-CYsMlCuE.mjs";
+import { F as consumeCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-ByIwuAC-.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, h as assertCodexThreadResumeResponse, p as assertCodexThreadAcceptsDirectInput, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-y7nO6X9c.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-t-kd_1ys.mjs";
+import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-BaxlhaNx.mjs";
+import { n as listAllCodexAppServerModels } from "./models-DdRyi93L.mjs";
+import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-D7WkJMvU.mjs";
+import { i as resolveCodexSessionBinding, n as createCodexSessionGenerationSupersededError } from "./session-binding-JEHNMPsr.mjs";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-Be53aiaG.mjs";
+import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DIImwCy1.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-CHgY-KNl.mjs";
+import { t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-Bi8TAPwX.mjs";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-CiToXF5C.mjs";
+import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-C9VxOLuG.mjs";
+import { a as readCodexConversationActiveTurn, c as setCodexConversationModel, d as stopCodexConversationTurn, i as parseCodexPermissionsModeArg, l as setCodexConversationPermissions, n as formatPermissionsMode, r as parseCodexFastModeArg, s as setCodexConversationFastMode, u as steerCodexConversationTurn } from "./conversation-control-GXM3unE4.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 { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-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 { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { findNormalizedProviderValue, resolveAuthProfileOrder } from "openclaw/plugin-sdk/provider-auth";
 import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";
 import { MODEL_SELECTION_LOCKED_MESSAGE, isModelSelectionLocked, resolvePersistedSessionRuntimeId } from "openclaw/plugin-sdk/model-session-runtime";
+import { composeSessionEntryCommitGuards } from "openclaw/plugin-sdk/session-binding-runtime";
 //#region extensions/codex/src/command-account.ts
 const OPENAI_PROVIDER_ID = "openai";
 async function readCodexAccountAuthOverview(params) {
@@ -68,22 +69,37 @@ async function readCodexAccountAuthOverview(params) {
 	const now = Date.now();
 	const activeIsSubscription = activeProfileId !== void 0 && isChatGptSubscriptionProfile(store.profiles[activeProfileId]);
 	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 ? await readSubscriptionUsage({
-		...params,
-		agentDir,
-		config,
-		subscriptionProfileId,
-		now
-	}) : activeUsage;
-	const rows = order.map((profileId) => buildProfileRow({
-		store,
-		config,
-		profileId,
-		activeProfileId,
-		now,
-		usage: profileId === subscriptionProfileId ? subscriptionUsage : void 0
-	}));
+	let subscriptionUsage = activeIsSubscription && params.limits.ok ? summarizeCodexAccountUsage(params.limits.value, now) : void 0;
+	if (subscriptionProfileId && !activeIsSubscription) {
+		const limits = await params.safeCodexControlRequest(params.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, {
+			config,
+			agentDir,
+			authProfileId: subscriptionProfileId,
+			isolated: true
+		});
+		subscriptionUsage = limits.ok ? summarizeCodexAccountUsage(limits.value, now) : void 0;
+	}
+	const rows = order.map((profileId) => {
+		const credential = store.profiles[profileId];
+		const label = formatProfileLabel(profileId, credential);
+		const kind = formatProfileKind(credential);
+		const active = profileId === activeProfileId;
+		const row = {
+			profileId,
+			label,
+			kind,
+			status: active ? "active now" : (profileId === subscriptionProfileId ? subscriptionUsage : void 0)?.blocked ? "rate-limited" : describeInactiveProfileStatus({
+				store,
+				config,
+				profileId,
+				credential,
+				now
+			}),
+			active
+		};
+		if (credential?.type === "api_key" && active) row.billingNote = "billed per token";
+		return row;
+	});
 	const activeRow = rows.find((row) => row.active);
 	if (!activeRow) return {
 		orderTitle: "Auth order",
@@ -109,37 +125,6 @@ function resolveDisplayAuthOrder(params) {
 		provider: OPENAI_PROVIDER_ID
 	});
 }
-async function readSubscriptionUsage(params) {
-	const limits = await params.safeCodexControlRequest(params.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, {
-		config: params.config,
-		agentDir: params.agentDir,
-		authProfileId: params.subscriptionProfileId,
-		isolated: true
-	});
-	if (!limits.ok) return;
-	return summarizeCodexAccountUsage(limits.value, params.now);
-}
-function buildProfileRow(params) {
-	const credential = params.store.profiles[params.profileId];
-	const label = formatProfileLabel(params.profileId, credential);
-	const kind = formatProfileKind(credential);
-	const active = params.profileId === params.activeProfileId;
-	const status = active ? "active now" : params.usage?.blocked ? "rate-limited" : describeInactiveProfileStatus({
-		store: params.store,
-		config: params.config,
-		profileId: params.profileId,
-		credential,
-		now: params.now
-	});
-	return {
-		profileId: params.profileId,
-		label,
-		kind,
-		status,
-		active,
-		...credential?.type === "api_key" && active ? { billingNote: "billed per token" } : {}
-	};
-}
 function describeInactiveProfileStatus(params) {
 	const stats = params.store.usageStats?.[params.profileId];
 	const blockedUntil = stats?.blockedUntil;
@@ -217,13 +202,16 @@ function describeFailureStatus(reason, credential) {
 	if (reason === "rate_limit") return "rate-limited";
 	return "temporarily unavailable";
 }
+const ELIGIBILITY_STATUS = /* @__PURE__ */ new Map([
+	["expired", "sign-in expired"],
+	["invalid_expires", "sign-in expired"],
+	["unresolved_ref", "credential unavailable"],
+	["provider_mismatch", "wrong provider"],
+	["mode_mismatch", "wrong credential type"]
+]);
 function describeEligibilityStatus(reason, credential) {
 	if (reason === "profile_missing" || reason === "missing_credential") return credential?.type === "api_key" ? "not configured" : "sign-in required";
-	if (reason === "expired" || reason === "invalid_expires") return "sign-in expired";
-	if (reason === "unresolved_ref") return "credential unavailable";
-	if (reason === "provider_mismatch") return "wrong provider";
-	if (reason === "mode_mismatch") return "wrong credential type";
-	return "unavailable";
+	return ELIGIBILITY_STATUS.get(reason) ?? "unavailable";
 }
 function isActiveUntil(value, now) {
 	return typeof value === "number" && Number.isFinite(value) && value > now;
@@ -374,6 +362,33 @@ function describeConfiguredPluginIdentityConflict(target, status) {
 	return status === "ambiguous" ? `Multiple configured Codex plugins match '${identity}'; resolve duplicate plugin policies first.` : `Configured Codex plugin key '${identity}' points to a different plugin identity; resolve the configuration conflict first.`;
 }
 //#endregion
+//#region extensions/codex/src/command-presentation.ts
+function buildCodexPresentationReply(presentation) {
+	return {
+		text: renderMessagePresentationFallbackText({ presentation }),
+		presentation,
+		presentationTextMode: "fallback"
+	};
+}
+function buildCodexCommandPickerPresentation(title, prompt, buttons) {
+	return {
+		title,
+		blocks: [{
+			type: "text",
+			text: prompt
+		}, {
+			type: "buttons",
+			buttons: buttons.map((button) => ({
+				label: button.label,
+				action: {
+					type: "command",
+					command: button.command
+				}
+			}))
+		}]
+	};
+}
+//#endregion
 //#region extensions/codex/src/command-plugins-readiness.ts
 /** Runtime support is not account-wide permission to browse, connect or invoke apps. */
 async function readCodexHostedAppsSupport(context, account) {
@@ -592,15 +607,10 @@ function formatCodexPluginReadiness(readiness, page = 1) {
 			blocks.push(buildCodexPluginStatusButtons(readiness.commandId, canRefreshHostedApps));
 		}
 	}
-	const presentation = {
+	return buildCodexPresentationReply({
 		title: "Codex plugin status",
 		blocks
-	};
-	return {
-		text: renderMessagePresentationFallbackText({ presentation }),
-		presentation,
-		presentationTextMode: "fallback"
-	};
+	});
 }
 async function readEvidence(read) {
 	try {
@@ -652,7 +662,7 @@ async function refreshCodexHostedApps(context) {
 		await context.validateCurrent();
 		return { text: `${error instanceof CodexAppServerRpcError && error.code === -32601 ? "This Codex app-server does not support the required app inventory methods. Update the Codex plugin and retry." : (isCodexAppServerIndeterminateRequestCancellationError(error) || isCodexAppServerPrewriteRequestCancellationError(error)) && "reason" in error && error.reason === "aborted" ? "The hosted app refresh was cancelled." : "Hosted app tools could not be refreshed. Check the Codex connection and try again."} Run /codex plugins refresh to retry for the current Codex account/runtime. Previous inventory was not confirmed; no conversation policy was changed.` };
 	}
-	const presentation = {
+	return buildCodexPresentationReply({
 		title: "Hosted app refresh",
 		blocks: [{
 			type: "text",
@@ -668,12 +678,7 @@ async function refreshCodexHostedApps(context) {
 			type: "text",
 			text: "Use /codex plugins list to find configured plugins, then /codex plugins status <name>@<marketplace> to inspect one."
 		}]
-	};
-	return {
-		text: renderMessagePresentationFallbackText({ presentation }),
-		presentation,
-		presentationTextMode: "fallback"
-	};
+	});
 }
 //#endregion
 //#region extensions/codex/src/command-diagnostics-state.ts
@@ -691,28 +696,35 @@ const codexDiagnosticsFeedbackState = {
 	}
 };
 //#endregion
-//#region extensions/codex/src/command-presentation.ts
-function buildCodexCommandPickerPresentation(title, prompt, buttons) {
-	return {
-		title,
-		blocks: [{
-			type: "text",
-			text: prompt
-		}, {
-			type: "buttons",
-			buttons: buttons.map((button) => ({
-				label: button.label,
-				action: {
-					type: "command",
-					command: button.command
-				}
-			}))
-		}]
-	};
-}
-//#endregion
 //#region extensions/codex/src/command-handler-args.ts
-/** No-arg `/codex` picker. */
+const COMPUTER_USE_OPTIONS = [
+	["--source", "marketplaceSource"],
+	["--marketplace-source", "marketplaceSource"],
+	["--marketplace-path", "marketplacePath"],
+	["--path", "marketplacePath"],
+	["--marketplace", "marketplaceName"],
+	["--plugin", "pluginName"],
+	["--server", "mcpServerName"],
+	["--mcp-server", "mcpServerName"]
+];
+const CONNECTION_OPTIONS = {
+	bind: /* @__PURE__ */ new Map([
+		["--cwd", "cwd"],
+		["--model", "model"],
+		["--provider", "provider"],
+		["--model-provider", "provider"]
+	]),
+	resume: /* @__PURE__ */ new Map([
+		["--host", "host"],
+		["--node", "host"],
+		["--bind", "bind"]
+	]),
+	sessions: /* @__PURE__ */ new Map([
+		["--host", "host"],
+		["--node", "host"],
+		["--limit", "limit"]
+	])
+};
 function buildCodexSubcommandPickerReply() {
 	const verbs = [
 		{
@@ -759,60 +771,40 @@ function buildCodexSubcommandPickerReply() {
 		presentation: buildCodexCommandPickerPresentation("Codex commands", "Pick a Codex subcommand:", verbs)
 	};
 }
-function buildCodexFastMenuReply() {
-	return buildCodexChoiceMenuReply({
-		title: "Codex fast mode",
-		prompt: "Pick a Codex fast mode:",
-		introduction: "Codex fast mode. Pick one or type /codex fast <mode>:",
-		command: "/codex fast",
-		choices: [
+function buildCodexChoiceMenuReply(kind) {
+	const choices = {
+		fast: [
 			"on",
 			"off",
 			"status"
-		]
-	});
-}
-function buildCodexPermissionsMenuReply() {
-	return buildCodexChoiceMenuReply({
-		title: "Codex permissions",
-		prompt: "Pick a Codex permissions mode:",
-		introduction: "Codex permissions. Pick one or type /codex permissions <mode>:",
-		command: "/codex permissions",
-		choices: [
+		],
+		permissions: [
 			"default",
 			"yolo",
 			"status"
-		]
-	});
-}
-function buildCodexComputerUseMenuReply() {
-	return buildCodexChoiceMenuReply({
-		title: "Codex computer-use",
-		prompt: "Pick a Codex computer-use action:",
-		introduction: "Codex computer-use. Pick one or type /codex computer-use <action>:",
-		command: "/codex computer-use",
-		choices: ["status", "install"],
-		hint: "Flag-driven invocations (--source, --marketplace-path, --marketplace) are not in the picker. Type '/codex computer-use' or read '/codex help' for the full surface."
-	});
-}
-function buildCodexChoiceMenuReply(params) {
-	const buttons = [...params.choices.map((choice) => ({
+		],
+		"computer-use": ["status", "install"]
+	}[kind];
+	const title = `Codex ${kind === "fast" ? "fast mode" : kind}`;
+	const argument = kind === "computer-use" ? "action" : "mode";
+	const command = `/codex ${kind}`;
+	const buttons = [...choices.map((choice) => ({
 		label: choice,
-		command: `${params.command} ${choice}`
+		command: `${command} ${choice}`
 	})), {
 		label: "back",
 		command: "/codex"
 	}];
 	return {
 		text: [
-			params.introduction,
+			`${title}. Pick one or type ${command} <${argument}>:`,
 			"",
-			...params.choices.map((choice, index) => `  ${index + 1}. ${params.command} ${choice}`),
+			...choices.map((choice, index) => `  ${index + 1}. ${command} ${choice}`),
 			"",
-			...params.hint ? [params.hint, ""] : [],
+			...kind === "computer-use" ? ["Flag-driven invocations (--source, --marketplace-path, --marketplace) are not in the picker. Type '/codex computer-use' or read '/codex help' for the full surface.", ""] : [],
 			"Type '/codex' to go back to the main menu."
 		].join("\n"),
-		presentation: buildCodexCommandPickerPresentation(params.title, params.prompt, buttons)
+		presentation: buildCodexCommandPickerPresentation(title, `Pick a Codex ${kind} ${argument}:`, buttons)
 	};
 }
 function isMenuVerb(rest) {
@@ -829,34 +821,19 @@ function splitArgs(value) {
 		if (escaping) {
 			current += char;
 			escaping = false;
-			tokenStarted = true;
-			continue;
-		}
-		if (char === "\\" && quote !== "'") {
-			escaping = true;
-			tokenStarted = true;
-			continue;
-		}
-		if (quote) {
+		} else if (char === "\\" && quote !== "'") escaping = true;
+		else if (quote) {
 			if (char === quote) quote = void 0;
 			else current += char;
-			tokenStarted = true;
-			continue;
-		}
-		if (char === "\"" || char === "'") {
-			quote = char;
-			tokenStarted = true;
-			continue;
-		}
-		if (/\s/.test(char)) {
+		} else if (char === "\"" || char === "'") quote = char;
+		else if (/\s/.test(char)) {
 			if (tokenStarted) {
 				args.push(current);
 				current = "";
 				tokenStarted = false;
 			}
 			continue;
-		}
-		current += char;
+		} else current += char;
 		tokenStarted = true;
 	}
 	if (escaping) current += "\\";
@@ -864,12 +841,7 @@ function splitArgs(value) {
 	return args;
 }
 function parseBindArgs(args) {
-	const { parsed, values } = parseThreadArgs(args, /* @__PURE__ */ new Map([
-		["--cwd", "cwd"],
-		["--model", "model"],
-		["--provider", "provider"],
-		["--model-provider", "provider"]
-	]));
+	const { parsed, values } = parseConnectionArgs(args, "bind");
 	return {
 		...parsed,
 		cwd: normalizeOptionalString(values.get("cwd")),
@@ -878,69 +850,44 @@ function parseBindArgs(args) {
 	};
 }
 function parseCodexCliSessionsArgs(args) {
-	const parsed = { filter: "" };
-	const filter = [];
-	for (let index = 0; index < args.length; index += 1) {
-		const arg = expectDefined(args[index], "current Codex sessions argument");
-		if (arg === "--help" || arg === "-h") {
-			parsed.help = true;
-			continue;
-		}
-		if (arg === "--host" || arg === "--node") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.host !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.host = value;
-			index += 1;
-			continue;
-		}
-		if (arg === "--limit") {
-			const value = readRequiredOptionValue(args, index);
-			const parsedLimit = parseStrictPositiveInteger(value);
-			if (parsedLimit === void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.limit = parsedLimit;
-			index += 1;
-			continue;
-		}
-		if (arg.startsWith("-")) {
-			parsed.help = true;
-			continue;
-		}
-		filter.push(arg);
-	}
-	parsed.host = normalizeOptionalString(parsed.host);
-	parsed.filter = filter.join(" ").trim();
-	return parsed;
+	const { parsed, values, filter } = parseConnectionArgs(args, "sessions");
+	return {
+		...parsed,
+		host: normalizeOptionalString(values.get("host")),
+		filter: filter.join(" ").trim()
+	};
 }
 function parseResumeArgs(args) {
-	const { parsed, values } = parseThreadArgs(args, /* @__PURE__ */ new Map([
-		["--host", "host"],
-		["--node", "host"],
-		["--bind", "bind"]
-	]));
+	const { parsed, values } = parseConnectionArgs(args, "resume");
 	return {
 		...parsed,
 		...values.has("bind") ? { bindHere: true } : {},
 		host: normalizeOptionalString(values.get("host"))
 	};
 }
-function parseThreadArgs(args, options) {
+function parseConnectionArgs(args, kind) {
 	const parsed = {};
 	const values = /* @__PURE__ */ new Map();
+	const filter = [];
 	for (let index = 0; index < args.length; index += 1) {
-		const arg = expectDefined(args[index], "current Codex thread argument");
+		const arg = expectDefined(args[index], `current Codex ${kind === "sessions" ? "sessions" : "thread"} argument`);
 		if (arg === "--help" || arg === "-h") {
 			parsed.help = true;
 			continue;
 		}
-		const option = options.get(arg);
+		const option = CONNECTION_OPTIONS[kind].get(arg);
 		if (option) {
 			const value = readRequiredOptionValue(args, index);
+			if (option === "limit") {
+				const limit = parseStrictPositiveInteger(value);
+				if (limit === void 0) {
+					parsed.help = true;
+					continue;
+				}
+				parsed.limit = limit;
+				index += 1;
+				continue;
+			}
 			if (!value || values.has(option) || option === "bind" && value !== "here") {
 				parsed.help = true;
 				continue;
@@ -949,23 +896,27 @@ function parseThreadArgs(args, options) {
 			index += 1;
 			continue;
 		}
+		if (kind === "sessions" && !arg.startsWith("-")) {
+			filter.push(arg);
+			continue;
+		}
 		if (!arg.startsWith("-") && !parsed.threadId) {
 			parsed.threadId = arg;
 			continue;
 		}
 		parsed.help = true;
 	}
-	parsed.threadId = normalizeOptionalString(parsed.threadId);
+	if (kind !== "sessions") parsed.threadId = normalizeOptionalString(parsed.threadId);
 	return {
 		parsed,
-		values
+		values,
+		filter
 	};
 }
 function parseComputerUseArgs(args) {
 	const parsed = {
 		action: "status",
 		overrides: {},
-		hasOverrides: false,
 		persistentIdentity: {}
 	};
 	let sawAction = false;
@@ -984,26 +935,15 @@ function parseComputerUseArgs(args) {
 			parsed.action = arg;
 			continue;
 		}
-		const option = arg === "--source" || arg === "--marketplace-source" ? "marketplaceSource" : arg === "--marketplace-path" || arg === "--path" ? "marketplacePath" : arg === "--marketplace" ? "marketplaceName" : void 0;
+		const option = COMPUTER_USE_OPTIONS.find(([flag]) => flag === arg)?.[1];
 		if (option) {
+			const target = option === "pluginName" || option === "mcpServerName" ? parsed.persistentIdentity : parsed.overrides;
 			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.overrides[option] !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.overrides[option] = value.trim();
-			parsed.hasOverrides = true;
-			index += 1;
-			continue;
-		}
-		if (arg === "--plugin" || arg === "--server" || arg === "--mcp-server") {
-			const value = readRequiredOptionValue(args, index);
-			const configKey = arg === "--plugin" ? "pluginName" : "mcpServerName";
-			if (!value || parsed.persistentIdentity[configKey] !== void 0) {
+			if (!value || target[option] !== void 0) {
 				parsed.help = true;
 				continue;
 			}
-			parsed.persistentIdentity[configKey] = value.trim();
+			target[option] = value.trim();
 			index += 1;
 			continue;
 		}
@@ -1013,13 +953,18 @@ function parseComputerUseArgs(args) {
 }
 function formatComputerUsePersistentIdentityMigration(parsed) {
 	const configPrefix = "plugins.entries.codex.config.computerUse";
-	const settings = [parsed.persistentIdentity.pluginName ? `${configPrefix}.pluginName = ${JSON.stringify(parsed.persistentIdentity.pluginName)}` : void 0, parsed.persistentIdentity.mcpServerName ? `${configPrefix}.mcpServerName = ${JSON.stringify(parsed.persistentIdentity.mcpServerName)}` : void 0].filter((setting) => Boolean(setting));
-	const retryArgs = [
-		`/codex computer-use ${parsed.action}`,
-		parsed.overrides.marketplaceSource ? `--source ${JSON.stringify(parsed.overrides.marketplaceSource)}` : void 0,
-		parsed.overrides.marketplacePath ? `--marketplace-path ${JSON.stringify(parsed.overrides.marketplacePath)}` : void 0,
-		parsed.overrides.marketplaceName ? `--marketplace ${JSON.stringify(parsed.overrides.marketplaceName)}` : void 0
-	].filter((arg) => Boolean(arg));
+	const settings = ["pluginName", "mcpServerName"].flatMap((key) => {
+		const value = parsed.persistentIdentity[key];
+		return value ? [`${configPrefix}.${key} = ${JSON.stringify(value)}`] : [];
+	});
+	const retryArgs = [`/codex computer-use ${parsed.action}`, ...[
+		["marketplaceSource", "--source"],
+		["marketplacePath", "--marketplace-path"],
+		["marketplaceName", "--marketplace"]
+	].flatMap(([key, flag]) => {
+		const value = parsed.overrides[key];
+		return value ? [`${flag} ${JSON.stringify(value)}`] : [];
+	})];
 	return ["One-off Computer Use plugin/server overrides are no longer supported.", `Set ${settings.join(" and ")} persistently, then rerun ${retryArgs.join(" ")}.`].join(" ");
 }
 function readRequiredOptionValue(args, index) {
@@ -1057,18 +1002,14 @@ function parseDiagnosticsArgs(args) {
 		note: args
 	};
 }
-function formatDiagnosticsUsage(commandPrefix) {
-	return [
-		`Usage: ${commandPrefix} [note]`,
-		`Usage: ${commandPrefix} confirm <token>`,
-		`Usage: ${commandPrefix} cancel <token>`
-	].join("\n");
-}
 function createCodexDiagnosticsConfirmation(params) {
 	prunePendingCodexDiagnosticsConfirmations(params.now);
 	if (!pendingCodexDiagnosticsConfirmationTokensByScope.has(params.scopeKey) && pendingCodexDiagnosticsConfirmationTokensByScope.size >= CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES) {
 		const oldestScopeKey = pendingCodexDiagnosticsConfirmationTokensByScope.keys().next().value;
-		if (typeof oldestScopeKey === "string") deletePendingCodexDiagnosticsConfirmationScope(oldestScopeKey);
+		if (typeof oldestScopeKey === "string") {
+			for (const token of pendingCodexDiagnosticsConfirmationTokensByScope.get(oldestScopeKey) ?? []) pendingCodexDiagnosticsConfirmations.delete(token);
+			pendingCodexDiagnosticsConfirmationTokensByScope.delete(oldestScopeKey);
+		}
 	}
 	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(params.scopeKey) ?? [];
 	while (scopeTokens.length >= CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE) {
@@ -1124,11 +1065,6 @@ function deletePendingCodexDiagnosticsConfirmation(token) {
 function prunePendingCodexDiagnosticsConfirmations(now) {
 	for (const [token, pending] of pendingCodexDiagnosticsConfirmations) if (now - pending.createdAt >= CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS) deletePendingCodexDiagnosticsConfirmation(token);
 }
-function deletePendingCodexDiagnosticsConfirmationScope(scopeKey) {
-	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(scopeKey) ?? [];
-	for (const token of scopeTokens) pendingCodexDiagnosticsConfirmations.delete(token);
-	pendingCodexDiagnosticsConfirmationTokensByScope.delete(scopeKey);
-}
 function codexDiagnosticsTargetsMatch(expected, actual) {
 	const fingerprint = (target) => JSON.stringify([
 		bindingStoreKey(target.identity),
@@ -1179,10 +1115,7 @@ function formatCodexDiagnosticsTargetLine(target) {
 function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options = {}) {
 	for (const target of targets) {
 		const cooldownMs = readCodexDiagnosticsCooldownMs(lastCodexDiagnosticsUploadByThread, 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 ${formatCodexDisplayText(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
-		}
+		if (cooldownMs > 0) return `Codex diagnostics were already sent for ${options.includeThreadId === false ? "one of these Codex threads" : `thread ${formatCodexDisplayText(target.threadId)}`} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
 	}
 	const scopeCooldownMs = readCodexDiagnosticsCooldownMs(lastCodexDiagnosticsUploadByScope, options.cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), now);
 	if (scopeCooldownMs > 0) return `Codex diagnostics were already sent for this account or channel recently. Try again in ${Math.ceil(scopeCooldownMs / 1e3)}s.`;
@@ -1316,7 +1249,7 @@ async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 		config: ctx.config,
 		storePath
 	}) : void 0;
-	const assertHostCurrent = currentSession?.authority.assertLegacyCurrent ?? (() => {});
+	const assertHostCurrent = currentSession?.authority.assertLegacyCurrent ?? composeSessionEntryCommitGuards([]);
 	const binding = (target && (!sessionIdentity || !isDeepStrictEqual(target.identity, sessionIdentity)) ? await resolveCodexSessionBinding({
 		bindingStore: deps.bindingStore,
 		identity: target.identity,
@@ -1324,11 +1257,11 @@ async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 		storePath,
 		assertCurrent: assertHostCurrent
 	}) : currentSession)?.binding;
-	const assertCurrent = () => {
-		assertHostCurrent();
+	const assertCurrent = composeSessionEntryCommitGuards([assertHostCurrent], (assertSource) => {
+		assertSource();
 		if (target && !isDeepStrictEqual(deps.bindingStore.read(target.identity), binding)) throw new Error("Codex command binding changed before dispatch");
-		assertHostCurrent();
-	};
+		assertSource();
+	});
 	assertCurrent();
 	return {
 		target,
@@ -1339,14 +1272,14 @@ async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 		storePath,
 		assertHostCurrent,
 		assertCurrent,
-		assertMutationCurrent: () => {
+		assertMutationCurrent: composeSessionEntryCommitGuards([assertCurrent], (assertSource) => {
 			assertCodexHostOwnerCurrent(ctx);
-			assertCurrent();
-		},
-		assertHostMutationCurrent: () => {
+			assertSource();
+		}),
+		assertHostMutationCurrent: composeSessionEntryCommitGuards([assertHostCurrent], (assertSource) => {
 			assertCodexHostOwnerCurrent(ctx);
-			assertHostCurrent();
-		}
+			assertSource();
+		})
 	};
 }
 async function resolveCommandAppServerContext(deps, ctx, pluginConfig) {
@@ -1405,20 +1338,25 @@ function resolveCodexConversationControlScope(ctx) {
 //#endregion
 //#region extensions/codex/src/command-diagnostics.ts
 const NO_DIAGNOSTICS_THREAD = ["No Codex thread is attached to this OpenClaw session yet.", "Use /codex threads to find a thread, then /codex resume <thread-id> before sending diagnostics."].join("\n");
-async function handleCodexDiagnosticsFeedback(deps, context, pluginConfig, args, commandPrefix) {
+async function handleCodexDiagnosticsFeedback(deps, context, pluginConfig, args) {
 	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) };
+	if (parsed.action === "usage") return { text: [
+		"Usage: /codex diagnostics [note]",
+		"Usage: /codex diagnostics confirm <token>",
+		"Usage: /codex diagnostics cancel <token>"
+	].join("\n") };
 	if (parsed.action === "confirm") return { text: await confirmCodexDiagnosticsFeedback(deps, ctx, pluginConfig, parsed.token) };
 	if (parsed.action === "cancel") return { text: cancelCodexDiagnosticsFeedback(ctx, parsed.token) };
-	const targets = await requireCodexDiagnosticsTargets(deps, ctx);
-	if (typeof targets === "string") return { text: targets };
+	if (!await hasAnyCodexDiagnosticsIdentity(ctx)) return { text: "Cannot send Codex diagnostics because this command did not include a stable session identity." };
+	const targets = await resolveCodexDiagnosticsTargets(deps, ctx);
+	if (targets.length === 0) return { text: NO_DIAGNOSTICS_THREAD };
 	if (ctx.diagnosticsUploadApproved === true) return { text: await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, parsed.note, targets) };
 	if (ctx.diagnosticsPreviewOnly === true) return { text: previewCodexDiagnosticsFeedbackApproval(targets, ctx, parsed.note) };
-	return requestCodexDiagnosticsFeedbackApproval(targets, ctx, parsed.note, commandPrefix);
+	return requestCodexDiagnosticsFeedbackApproval(targets, ctx, parsed.note);
 }
-function requestCodexDiagnosticsFeedbackApproval(targets, ctx, note, commandPrefix) {
+function requestCodexDiagnosticsFeedbackApproval(targets, ctx, note) {
 	const now = Date.now();
 	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now);
 	if (cooldownMessage) return { text: cooldownMessage };
@@ -1434,8 +1372,8 @@ function requestCodexDiagnosticsFeedbackApproval(targets, ctx, note, commandPref
 		...readCodexDiagnosticsConfirmationScope(ctx),
 		now
 	});
-	const confirmCommand = `${commandPrefix} confirm ${token}`;
-	const cancelCommand = `${commandPrefix} cancel ${token}`;
+	const confirmCommand = `/codex diagnostics confirm ${token}`;
+	const cancelCommand = `/codex diagnostics cancel ${token}`;
 	const displayReason = reason ? formatCodexDisplayText(reason) : void 0;
 	return {
 		text: [
@@ -1574,11 +1512,6 @@ function consumeCodexDiagnosticsConfirmation(ctx, token, action) {
 	deletePendingCodexDiagnosticsConfirmation(token);
 	return pending;
 }
-async function requireCodexDiagnosticsTargets(deps, ctx) {
-	if (!await hasAnyCodexDiagnosticsIdentity(ctx)) return "Cannot send Codex diagnostics because this command did not include a stable session identity.";
-	const targets = await resolveCodexDiagnosticsTargets(deps, ctx);
-	return targets.length > 0 ? targets : NO_DIAGNOSTICS_THREAD;
-}
 async function hasAnyCodexDiagnosticsIdentity(ctx) {
 	if (await resolveControlTarget(ctx)) return true;
 	return (ctx.diagnosticsSessions ?? []).some((session) => Boolean(session.sessionId));
@@ -1633,13 +1566,10 @@ async function resolveCodexDiagnosticsTargets(deps, ctx) {
 	return targets;
 }
 function resolvePendingCodexDiagnosticsTargets(deps, targets, config) {
-	const resolved = [];
-	for (const target of targets) {
+	return targets.flatMap((target) => {
 		const binding = deps.bindingStore.read(target.identity);
-		if (!binding?.threadId) continue;
-		resolved.push(resolveCodexDiagnosticsTarget(target, binding, config));
-	}
-	return resolved;
+		return binding?.threadId ? [resolveCodexDiagnosticsTarget(target, binding, config)] : [];
+	});
 }
 function resolveCodexDiagnosticsTarget(target, binding, config) {
 	const candidate = {
@@ -2063,7 +1993,7 @@ async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
 		pluginConfig,
 		config: ctx.config,
 		agentDir,
-		forceEnable: parsed.action === "install" || parsed.hasOverrides,
+		forceEnable: parsed.action === "install" || Object.keys(parsed.overrides).length > 0,
 		...Object.keys(parsed.overrides).length > 0 ? { overrides: parsed.overrides } : {}
 	};
 	if (parsed.action === "install") return formatComputerUseStatus(await deps.installCodexComputerUse({
@@ -2097,17 +2027,15 @@ async function handleNativeGoal(deps, ctx, pluginConfig, args) {
 		assertCurrent: authority.assertCurrent,
 		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {}
 	};
-	if (action === "status" || action === "get") {
-		if (args.length > 1) return "Usage: /codex goal [status]";
-		return formatNativeGoal(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.getThreadGoal, { threadId: binding.threadId }, goalRequestOptions));
-	}
-	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 }, {
+	if (action === "status" || action === "get" || action === "clear") {
+		const clear = action === "clear";
+		if (args.length > 1) return clear ? "Usage: /codex goal clear" : "Usage: /codex goal [status]";
+		const response = await deps.codexControlRequest(pluginConfig, clear ? CODEX_CONTROL_METHODS.clearThreadGoal : CODEX_CONTROL_METHODS.getThreadGoal, { threadId: binding.threadId }, clear ? {
 			...goalRequestOptions,
 			assertOwnerCurrent: () => assertCodexHostOwnerCurrent(ctx)
-		});
-		return isJsonObject(response) && response.cleared === true ? "Cleared the Codex goal." : "No Codex goal was active.";
+		} : goalRequestOptions);
+		if (clear) return isJsonObject(response) && response.cleared === true ? "Cleared the Codex goal." : "No Codex goal was active.";
+		return formatNativeGoal(response);
 	}
 	const requestedStatus = action === "pause" ? "paused" : action === "resume" ? "active" : action === "block" ? "blocked" : action === "complete" ? "complete" : void 0;
 	const isObjectiveUpdate = action === "set";
@@ -2182,30 +2110,28 @@ async function setConversationModel(deps, ctx, args) {
 		assertCommitAllowed: authority.assertMutationCurrent
 	});
 }
-async function setConversationFastMode(deps, ctx, args) {
-	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
+async function setConversationPreference(deps, ctx, args, kind) {
+	const usage = `Usage: /codex ${kind} ${kind === "fast" ? "[on|off|status]" : "[default|yolo|status]"}`;
+	if (args.length > 1) return usage;
 	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
 	const { target, binding } = authority;
-	if (!target) return "Cannot set Codex fast mode because this command did not include a stable binding identity.";
-	const value = args[0];
-	const parsed = parseCodexFastModeArg(value);
-	if (value && parsed == null && value.trim().toLowerCase() !== "status") return "Usage: /codex fast [on|off|status]";
-	return await deps.setCodexConversationFastMode({
-		identity: target.identity,
-		bindingStore: deps.bindingStore,
-		binding,
-		enabled: parsed,
-		assertCurrent: parsed === void 0 ? authority.assertCurrent : authority.assertMutationCurrent
-	});
-}
-async function setConversationPermissions(deps, ctx, args) {
-	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
-	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
-	const { target } = authority;
+	if (kind === "fast") {
+		if (!target) return "Cannot set Codex fast mode because this command did not include a stable binding identity.";
+		const value = args[0];
+		const parsed = parseCodexFastModeArg(value);
+		if (value && parsed == null && value.trim().toLowerCase() !== "status") return usage;
+		return await deps.setCodexConversationFastMode({
+			identity: target.identity,
+			bindingStore: deps.bindingStore,
+			binding,
+			enabled: parsed,
+			assertCurrent: parsed === void 0 ? authority.assertCurrent : authority.assertMutationCurrent
+		});
+	}
 	if (!target || !ctx.sessionId || !ctx.sessionKey) return "Cannot set Codex permissions because this command did not include a complete session identity.";
 	const value = args[0];
 	const parsed = parseCodexPermissionsModeArg(value);
-	if (value && !parsed && value.trim().toLowerCase() !== "status") return "Usage: /codex permissions [default|yolo|status]";
+	if (value && !parsed && value.trim().toLowerCase() !== "status") return usage;
 	if (parsed === "yolo" && !hasCodexAdminScope(ctx)) return CODEX_FULL_PERMISSIONS_AUTH_ERROR;
 	return await deps.setCodexConversationPermissions({
 		mode: parsed,
@@ -2328,12 +2254,7 @@ function formatCodexAvailablePlugins(plugins, warnings, query, page) {
 		label: "Plugin controls",
 		command: "/codex plugins menu"
 	});
-	const presentation = buildCodexCommandPickerPresentation("Discoverable Codex plugins", lines.join("\n"), buttons);
-	return {
-		text: renderMessagePresentationFallbackText({ presentation }),
-		presentation,
-		presentationTextMode: "fallback"
-	};
+	return buildCodexPresentationReply(buildCodexCommandPickerPresentation("Discoverable Codex plugins", lines.join("\n"), buttons));
 }
 //#endregion
 //#region extensions/codex/src/command-plugins-management.ts
@@ -2346,16 +2267,14 @@ async function handleCodexPluginsSubcommand(input, rest, io, runtime) {
 	};
 	const [verb = "list", ...args] = rest;
 	const normalized = verb.toLowerCase();
-	if (normalized === "menu") {
-		if (args.length > 0) return { text: "Usage: /codex plugins menu" };
-		return buildPluginsMenuReply();
-	}
-	if (normalized === "help") {
-		if (args.length > 0) return { text: "Usage: /codex plugins help" };
-		return { text: buildPluginsHelp() };
-	}
+	if ([
+		"menu",
+		"help",
+		"list"
+	].includes(normalized) && args.length > 0) return { text: `Usage: /codex plugins ${normalized}` };
+	if (normalized === "menu") return buildPluginsMenuReply();
+	if (normalized === "help") return { text: buildPluginsHelp() };
 	if (normalized === "list") {
-		if (args.length > 0) return { text: "Usage: /codex plugins list" };
 		const current = await io.readConfig();
 		return { text: formatPluginList(current.plugins ?? {}, current.enabled === true) };
 	}
@@ -2635,7 +2554,7 @@ async function installCodexPlugin(requestedId, io, runtime, ctx) {
 			});
 		} catch {}
 		const authRequirement = appsNeedingAuth.length === 1 ? "1 app still requires" : `${appsNeedingAuth.length} apps still require`;
-		const presentation = {
+		return buildCodexPresentationReply({
 			title: "Codex plugin app setup",
 			tone: "warning",
 			blocks: [
@@ -2654,12 +2573,7 @@ async function installCodexPlugin(requestedId, io, runtime, ctx) {
 					text: `${refreshWarning.trim()} ${POLICY_REFRESH_HINT}`.trim()
 				}
 			]
-		};
-		return {
-			text: renderMessagePresentationFallbackText({ presentation }),
-			presentation,
-			presentationTextMode: "fallback"
-		};
+		});
 	}
 	const status = alreadyInstalled ? "bundle was already installed in Codex" : "bundle was installed in Codex";
 	return { text: `${formatCodexDisplayText(requestedId)} ${status}. OpenClaw app access is configured.${refreshWarning} ${POLICY_REFRESH_HINT}` };
@@ -2945,18 +2859,14 @@ async function handleCodexSubcommand(ctx, options) {
 	if (normalized === "binding") return { text: await describeConversationBinding(deps, ctx) };
 	if (normalized === "stop" || normalized === "steer") return { text: await controlConversationTurn(deps, ctx, normalized, rest.join(" ")) };
 	if (normalized === "model") return { text: await setConversationModel(deps, ctx, rest) };
-	if (normalized === "fast") {
-		if (isMenuVerb(rest)) return buildCodexFastMenuReply();
-		return { text: await setConversationFastMode(deps, ctx, rest) };
-	}
-	if (normalized === "permissions") {
-		if (isMenuVerb(rest)) return buildCodexPermissionsMenuReply();
-		return { text: await setConversationPermissions(deps, ctx, rest) };
+	if (normalized === "fast" || normalized === "permissions") {
+		if (isMenuVerb(rest)) return buildCodexChoiceMenuReply(normalized);
+		return { text: await setConversationPreference(deps, ctx, rest, normalized) };
 	}
 	if (normalized === "compact" || normalized === "review") return { text: await startThreadAction(deps, ctx, options.pluginConfig, normalized, rest) };
-	if (normalized === "diagnostics") return await handleCodexDiagnosticsFeedback(deps, ctx, options.pluginConfig, rest.join(" "), "/codex diagnostics");
+	if (normalized === "diagnostics") return await handleCodexDiagnosticsFeedback(deps, ctx, options.pluginConfig, rest.join(" "));
 	if (normalized === "computer-use" || normalized === "computeruse") {
-		if (isMenuVerb(rest)) return buildCodexComputerUseMenuReply();
+		if (isMenuVerb(rest)) return buildCodexChoiceMenuReply("computer-use");
 		return { text: await handleComputerUseCommand(deps, ctx, options.pluginConfig, rest) };
 	}
 	if (normalized === "mcp" || normalized === "skills") {