@openclaw/codex 2026.7.2-beta.7 → 2026.7.34

package/dist/{command-handlers-DAHUSry9.js → .setup/command-handlers-DSRFfor4.mjs}

@@ -1,31 +1,27 @@
-import { I as resolveCodexAppServerAuthProfileIdForAgent, W as isJsonObject } from "./shared-client-DTbvH-XV.js";
-import { c as reclaimCurrentCodexSessionGeneration, d as sessionBindingIdentity, i as createCodexSessionGenerationSupersededError, j as isCodexFastServiceTier, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-BXpo9ymA.js";
-import { g as assertCodexThreadResumeResponse } from "./transcript-mirror-DzsdNCf5.js";
-import { t as listAllCodexAppServerModels } from "./models-BBMKU4jA.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-BFDTVYr4.js";
-import { s as summarizeCodexAccountUsage } from "./rate-limits-CU-gVCCS.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, u as readString$1 } from "./command-formatters-C336eRVS.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-NuhpXmPB.js";
-import { a as setCodexConversationFastMode, c as steerCodexConversationTurn, d as CODEX_NATIVE_EXECUTION_AUTH_ERROR, f as canMutateCodexHost, i as readCodexConversationActiveTurn, l as stopCodexConversationTurn, n as parseCodexFastModeArg, o as setCodexConversationModel, r as parseCodexPermissionsModeArg, s as setCodexConversationPermissions, t as formatPermissionsMode } from "./conversation-control-xsIeXbo4.js";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BHRpYbX3.js";
-import { a as resolveCodexBindingAppServerConnection } from "./notification-correlation-CU6_AnOb.js";
-import { c as requestOptions, l as safeCodexControlRequest, o as codexControlRequest, p as formatCodexCliSessions, s as readCodexStatusProbes } from "./session-catalog-DyOgR4WH.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-CYEc8U3w.js";
+import { r as isJsonObject } from "./protocol-2POPqAY4.mjs";
+import { o as isCodexFastServiceTier } from "./config-CYEDnLJ2.mjs";
+import { n as assertCodexThreadResumeResponse } from "./protocol-validators-dZQ-UTOa.mjs";
+import { t as listAllCodexAppServerModels } from "./models-C_aZk03A.mjs";
+import { p as summarizeCodexAccountUsage } from "./provider-DGxDs6g8.mjs";
+import { y as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-B2KmLPRw.mjs";
+import { a as normalizeCodexAppServerBindingModelProvider, n as bindingStoreKey, o as reclaimCurrentCodexSessionGeneration, s as sessionBindingIdentity } from "./session-binding-DuihlMJc.mjs";
+import { r as CODEX_CONTROL_METHODS } from "./plugin-app-cache-key-DR8jV9oS.mjs";
+import { a as formatCodexDisplayText, c as formatList, d as formatThreads, f as readString$1, i as formatAccount, l as formatModels, o as formatCodexStatus, r as buildHelp, s as formatComputerUseStatus, u as formatSkills } from "./app-server-policy-C_qTMEMy.mjs";
+import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DA2TQfZW.mjs";
+import { S as canMutateCodexHost, _ as setCodexConversationPermissions, d as formatPermissionsMode, f as parseCodexFastModeArg, g as setCodexConversationModel, h as setCodexConversationFastMode, i as safeCodexControlRequest, m as readCodexConversationActiveTurn, n as readCodexStatusProbes, p as parseCodexPermissionsModeArg, r as requestOptions, s as formatCodexCliSessions, t as codexControlRequest, v as steerCodexConversationTurn, x as CODEX_NATIVE_EXECUTION_AUTH_ERROR, y as stopCodexConversationTurn } from "./command-rpc-BvYsfQ7G.mjs";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-CrRxtDBu.mjs";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-C3QkmSO3.mjs";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
-import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
+import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
-import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
-import { MODEL_SELECTION_LOCKED_MESSAGE, isModelSelectionLocked } 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) {
 	const config = params.ctx.config;
-	const agentDir = params.agentDir;
+	const agentDir = resolveDefaultAgentDir(config);
 	const store = ensureAuthProfileStore(agentDir, {
 		allowKeychainPrompt: false,
 		config
@@ -50,7 +46,6 @@ async function readCodexAccountAuthOverview(params) {
 	const activeUsage = activeIsSubscription && params.limits.ok ? summarizeCodexAccountUsage(params.limits.value, now) : void 0;
 	const subscriptionUsage = subscriptionProfileId && (!activeIsSubscription || subscriptionProfileId !== activeProfileId) ? await readSubscriptionUsage({
 		...params,
-		agentDir,
 		config,
 		subscriptionProfileId,
 		now
@@ -155,7 +150,7 @@ function resolveLiveAccountProfileId(params) {
 		if (!email) return firstSubscription;
 		return params.order.find((profileId) => {
 			const credential = params.store.profiles[profileId];
-			if (!credential || !isChatGptSubscriptionProfile(credential)) return false;
+			if (!isChatGptSubscriptionProfile(credential)) return false;
 			return (credential.email?.trim().toLowerCase() ?? extractEmailFromProfileId(profileId))?.toLowerCase() === email;
 		}) ?? firstSubscription;
 	}
@@ -167,7 +162,6 @@ function shouldInferApiKeyActiveFromRateLimitProbe(limits) {
 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
 	});
@@ -315,21 +309,6 @@ function formatRelativeReset(untilMs, nowMs) {
 	return `in ${days} ${days === 1 ? "day" : "days"}`;
 }
 //#endregion
-//#region extensions/codex/src/command-diagnostics-state.ts
-/** Runtime state for diagnostics upload throttling and confirmation handshakes. */
-const codexDiagnosticsFeedbackState = {
-	lastUploadByThread: /* @__PURE__ */ new Map(),
-	lastUploadByScope: /* @__PURE__ */ new Map(),
-	pendingConfirmations: /* @__PURE__ */ new Map(),
-	pendingTokensByScope: /* @__PURE__ */ new Map(),
-	clear() {
-		this.lastUploadByThread.clear();
-		this.lastUploadByScope.clear();
-		this.pendingConfirmations.clear();
-		this.pendingTokensByScope.clear();
-	}
-};
-//#endregion
 //#region extensions/codex/src/command-presentation.ts
 function buildCodexCommandPickerPresentation(title, prompt, buttons) {
 	return {
@@ -350,8 +329,212 @@ function buildCodexCommandPickerPresentation(title, prompt, buttons) {
 	};
 }
 //#endregion
-//#region extensions/codex/src/command-handler-args.ts
-/** No-arg `/codex` picker. */
+//#region extensions/codex/src/command-plugins-management.ts
+const POLICY_REFRESH_HINT = "New Codex conversations pick this up automatically. Use /new or /reset to refresh the current one.";
+async function handleCodexPluginsSubcommand(ctx, rest, io) {
+	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 (normalized === "list") {
+		if (args.length > 0) return { text: "Usage: /codex plugins list" };
+		const current = await io.readConfig();
+		return { text: formatPluginList(current.plugins ?? {}, { globalEnabled: current.enabled === true }) };
+	}
+	const target = args[0];
+	if (normalized === "enable" || normalized === "disable") {
+		if (args.length === 0) return buildPluginNamePickerReply(normalized, await io.readConfig());
+		if (!target || args.length > 1) return { text: `Usage: /codex plugins ${normalized} <name>` };
+		if (!canMutateCodexHost(ctx)) return { text: `Only an owner or operator.admin gateway client can run /codex plugins ${normalized}.` };
+		const wantEnabled = normalized === "enable";
+		if (!((await io.readConfig()).plugins ?? {})[target]) return { text: `Codex sub-plugin '${formatCodexDisplayText(target)}' is not configured. Run '/codex plugins list' to see configured plugins.` };
+		await io.mutate((block) => {
+			if (wantEnabled) block.enabled = true;
+			block.plugins ??= {};
+			block.plugins[target] = {
+				...block.plugins[target],
+				enabled: wantEnabled
+			};
+		});
+		return { text: `${formatCodexDisplayText(target)}: ${wantEnabled ? "enabled" : "disabled"} in openclaw.json. ${POLICY_REFRESH_HINT}` };
+	}
+	return { text: `Unknown /codex plugins subcommand: ${formatCodexDisplayText(verb)}\n\n${buildPluginsHelp()}` };
+}
+function buildPluginsMenuReply() {
+	return {
+		text: [
+			"Codex sub-plugins. Pick a sub-action or type:",
+			"",
+			"  1. /codex plugins list",
+			"  2. /codex plugins enable",
+			"  3. /codex plugins disable",
+			"  4. /codex plugins help",
+			"",
+			"Type '/codex' to go back to the main menu."
+		].join("\n"),
+		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", "Pick a Codex sub-plugin action:", [
+			{
+				label: "list",
+				command: "/codex plugins list"
+			},
+			{
+				label: "enable",
+				command: "/codex plugins enable"
+			},
+			{
+				label: "disable",
+				command: "/codex plugins disable"
+			},
+			{
+				label: "help",
+				command: "/codex plugins help"
+			},
+			{
+				label: "back",
+				command: "/codex"
+			}
+		])
+	};
+}
+function buildPluginNamePickerReply(verb, current) {
+	const globalEnabled = current.enabled === true;
+	const eligible = Object.entries(current.plugins ?? {}).toSorted(([left], [right]) => left.localeCompare(right)).filter(([, entry]) => {
+		const effectivelyEnabled = globalEnabled && entry.enabled !== false;
+		return verb === "disable" ? effectivelyEnabled : !effectivelyEnabled;
+	});
+	if (eligible.length === 0) return {
+		text: [
+			`No configured ${verb === "enable" ? "disabled" : "enabled"} Codex sub-plugins found.`,
+			"",
+			"Type '/codex plugins list' to inspect configured sub-plugins.",
+			"Type '/codex plugins menu' to go back to the plugins menu."
+		].join("\n"),
+		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", "Pick another Codex sub-plugin action:", [{
+			label: "list",
+			command: "/codex plugins list"
+		}, {
+			label: "back",
+			command: "/codex plugins menu"
+		}])
+	};
+	const buttons = [...eligible.map(([key]) => ({
+		label: formatCodexDisplayText(key),
+		command: `/codex plugins ${verb} ${key}`
+	})), {
+		label: "back",
+		command: "/codex plugins menu"
+	}];
+	return {
+		text: [
+			`Codex sub-plugins to ${verb}. Pick one or type:`,
+			"",
+			...eligible.map(([key], index) => `  ${index + 1}. /codex plugins ${verb} ${key}`),
+			"",
+			...verb === "enable" && !globalEnabled ? ["Global codexPlugins.enabled is off; enabling one configured sub-plugin turns it on.", ""] : [],
+			"Type '/codex plugins menu' to go back to the plugins menu."
+		].join("\n"),
+		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", `Pick a Codex sub-plugin to ${verb}:`, buttons)
+	};
+}
+function buildPluginsHelp() {
+	return [
+		"Codex sub-plugin management (writes only to ~/.openclaw/openclaw.json, never to ~/.codex/config.toml):",
+		"- /codex plugins                  (alias for list)",
+		"- /codex plugins list             show all configured Codex sub-plugins",
+		"- /codex plugins enable <name>    enable a configured sub-plugin",
+		"- /codex plugins disable <name>   disable a configured sub-plugin"
+	].join("\n");
+}
+function formatPluginList(plugins, options = {}) {
+	const globalEnabled = options.globalEnabled === true;
+	const keys = Object.keys(plugins).toSorted();
+	if (keys.length === 0) return "No Codex sub-plugins configured under plugins.entries.codex.config.codexPlugins.plugins";
+	const rows = keys.map((key) => {
+		const entry = plugins[key] ?? {};
+		const state = globalEnabled && entry.enabled !== false ? "ON " : "OFF";
+		return {
+			displayKey: formatCodexDisplayText(key),
+			state,
+			pluginName: formatCodexDisplayText(entry.pluginName ?? key),
+			marketplace: formatCodexDisplayText(entry.marketplaceName ?? "?")
+		};
+	});
+	const keyW = Math.max(...rows.map((r) => r.displayKey.length));
+	const pluginW = Math.max(...rows.map((r) => r.pluginName.length));
+	return [
+		"Codex sub-plugins in Openclaw config (~/.openclaw/openclaw.json):",
+		"",
+		...rows.map((r) => `  ${r.state}  ${r.displayKey.padEnd(keyW)}  ${r.pluginName.padEnd(pluginW)}  [${r.marketplace}]`),
+		"",
+		...globalEnabled ? [] : ["Global codexPlugins.enabled is off; configured sub-plugins are inactive.", ""],
+		"New Codex conversations pick up policy changes automatically; /new or /reset to refresh the current one."
+	].join("\n");
+}
+//#endregion
+//#region extensions/codex/src/command-handlers.ts
+const defaultCodexCommandDeps = {
+	codexControlRequest,
+	listCodexAppServerModels: listAllCodexAppServerModels,
+	readCodexStatusProbes,
+	requestOptions,
+	safeCodexControlRequest,
+	readCodexComputerUseStatus,
+	installCodexComputerUse,
+	resolveCodexDefaultWorkspaceDir,
+	readCodexConversationActiveTurn,
+	setCodexConversationFastMode,
+	setCodexConversationModel,
+	setCodexConversationPermissions,
+	steerCodexConversationTurn,
+	stopCodexConversationTurn,
+	listCodexCliSessionsOnNode: async () => {
+		throw new Error("Codex CLI node sessions require Gateway node runtime.");
+	},
+	resolveCodexCliSessionForBindingOnNode: async () => {
+		throw new Error("Codex CLI node sessions require Gateway node runtime.");
+	}
+};
+const CODEX_DIAGNOSTICS_SOURCE = "openclaw-diagnostics";
+const CODEX_DIAGNOSTICS_REASON_MAX_CHARS = 2048;
+const CODEX_DIAGNOSTICS_COOLDOWN_MS = 6e4;
+const CODEX_DIAGNOSTICS_ERROR_MAX_CHARS = 500;
+const CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS = 100;
+const CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES = 100;
+const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 3e5;
+const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE = 100;
+const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES = 100;
+const CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS = 128;
+const CODEX_RESUME_SAFE_THREAD_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
+const CODEX_NATIVE_EXECUTION_SUBCOMMANDS = /* @__PURE__ */ new Set([
+	"bind",
+	"resume",
+	"steer",
+	"model",
+	"fast",
+	"permissions",
+	"compact",
+	"review"
+]);
+const CODEX_NATIVE_CONTROL_SUBCOMMANDS = /* @__PURE__ */ new Set([
+	...CODEX_NATIVE_EXECUTION_SUBCOMMANDS,
+	"detach",
+	"unbind",
+	"stop"
+]);
+const lastCodexDiagnosticsUploadByThread = /* @__PURE__ */ new Map();
+const lastCodexDiagnosticsUploadByScope = /* @__PURE__ */ new Map();
+const pendingCodexDiagnosticsConfirmations = /* @__PURE__ */ new Map();
+const pendingCodexDiagnosticsConfirmationTokensByScope = /* @__PURE__ */ new Map();
+/**
+* No-arg `/codex` picker. Codex owns the command tree; channels render the
+* portable command actions as inline controls when their transport can.
+*/
 function buildCodexSubcommandPickerReply() {
 	const verbs = [
 		{
@@ -394,6 +577,7 @@ function buildCodexSubcommandPickerReply() {
 		presentation: buildCodexCommandPickerPresentation("Codex commands", "Pick a Codex subcommand:", verbs)
 	};
 }
+/** Sub-picker for `/codex fast menu` (on / off / status). */
 function buildCodexFastMenuReply() {
 	const modes = [
 		"on",
@@ -418,6 +602,7 @@ function buildCodexFastMenuReply() {
 		presentation: buildCodexCommandPickerPresentation("Codex fast mode", "Pick a Codex fast mode:", buttons)
 	};
 }
+/** Sub-picker for `/codex permissions menu` (default / yolo / status). */
 function buildCodexPermissionsMenuReply() {
 	const modes = [
 		"default",
@@ -442,6 +627,7 @@ function buildCodexPermissionsMenuReply() {
 		presentation: buildCodexCommandPickerPresentation("Codex permissions", "Pick a Codex permissions mode:", buttons)
 	};
 }
+/** Sub-picker for `/codex computer-use menu` (status / install). */
 function buildCodexComputerUseMenuReply() {
 	const actions = ["status", "install"];
 	const buttons = [...actions.map((action) => ({
@@ -464,643 +650,457 @@ function buildCodexComputerUseMenuReply() {
 		presentation: buildCodexCommandPickerPresentation("Codex computer-use", "Pick a Codex computer-use action:", buttons)
 	};
 }
+/** Returns true when the rest-args are exactly `["menu"]` (case-insensitive). */
 function isMenuVerb(rest) {
 	return rest.length === 1 && (rest[0] ?? "").trim().toLowerCase() === "menu";
 }
-function splitArgs(value) {
-	const input = value ?? "";
-	const args = [];
-	let current = "";
-	let quote;
-	let escaping = false;
-	let tokenStarted = false;
-	for (const char of input) {
-		if (escaping) {
-			current += char;
-			escaping = false;
-			tokenStarted = true;
-			continue;
-		}
-		if (char === "\\" && quote !== "'") {
-			escaping = true;
-			tokenStarted = true;
-			continue;
-		}
-		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)) {
-			if (tokenStarted) {
-				args.push(current);
-				current = "";
-				tokenStarted = false;
-			}
-			continue;
-		}
-		current += char;
-		tokenStarted = true;
+async function handleCodexSubcommand(ctx, options) {
+	const deps = {
+		...defaultCodexCommandDeps,
+		...options.deps
+	};
+	const args = splitArgs(ctx.args);
+	if (args.length === 0) return buildCodexSubcommandPickerReply();
+	const [subcommand = "status", ...rest] = args;
+	const normalized = subcommand.toLowerCase();
+	if (normalized === "help") return { text: buildHelp() };
+	if (CODEX_NATIVE_CONTROL_SUBCOMMANDS.has(normalized) && !returnsBeforeNativeCodexExecution(normalized, rest) && !canMutateCodexHost(ctx)) return { text: CODEX_NATIVE_EXECUTION_AUTH_ERROR };
+	const sandboxBlock = resolveCodexNativeCommandSandboxBlock(ctx, normalized, rest);
+	if (sandboxBlock) return { text: sandboxBlock };
+	if (normalized === "plugins") {
+		if (!deps.codexPluginsManagementIo) return { text: "Codex sub-plugin management is not wired up (codexPluginsManagementIo dep is undefined). Edit ~/.openclaw/openclaw.json or use `openclaw config patch` until the runtime exposes the IO." };
+		return await handleCodexPluginsSubcommand(ctx, rest, deps.codexPluginsManagementIo);
 	}
-	if (escaping) current += "\\";
-	if (tokenStarted) args.push(current);
-	return args;
-}
-function parseBindArgs(args) {
-	const parsed = {};
-	for (let index = 0; index < args.length; index += 1) {
-		const arg = expectDefined(args[index], "current Codex bind argument");
-		if (arg === "--help" || arg === "-h") {
-			parsed.help = true;
-			continue;
-		}
-		if (arg === "--cwd") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.cwd !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.cwd = value;
-			index += 1;
-			continue;
-		}
-		if (arg === "--model") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.model !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.model = value;
-			index += 1;
-			continue;
-		}
-		if (arg === "--provider" || arg === "--model-provider") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.provider !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.provider = value;
-			index += 1;
-			continue;
-		}
-		if (!arg.startsWith("-") && !parsed.threadId) {
-			parsed.threadId = arg;
-			continue;
-		}
-		parsed.help = true;
+	if (normalized === "status") {
+		if (rest.length > 0) return { text: "Usage: /codex status" };
+		return { text: formatCodexStatus(await deps.readCodexStatusProbes(options.pluginConfig, ctx.config)) };
 	}
-	parsed.threadId = normalizeOptionalString(parsed.threadId);
-	parsed.cwd = normalizeOptionalString(parsed.cwd);
-	parsed.model = normalizeOptionalString(parsed.model);
-	parsed.provider = normalizeOptionalString(parsed.provider);
-	return parsed;
-}
-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 parsedLimit = parseStrictPositiveInteger(readRequiredOptionValue(args, index));
-			if (parsedLimit === void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.limit = parsedLimit;
-			index += 1;
-			continue;
-		}
-		if (arg.startsWith("-")) {
-			parsed.help = true;
-			continue;
-		}
-		filter.push(arg);
+	if (normalized === "models") {
+		if (rest.length > 0) return { text: "Usage: /codex models" };
+		return { text: formatModels(await deps.listCodexAppServerModels(deps.requestOptions(options.pluginConfig, 100, ctx.config))) };
 	}
-	parsed.host = normalizeOptionalString(parsed.host);
-	parsed.filter = filter.join(" ").trim();
-	return parsed;
+	if (normalized === "threads") return { text: await buildThreads(deps, ctx, options.pluginConfig, rest.join(" ")) };
+	if (normalized === "sessions") return { text: await buildCodexCliSessions(deps, rest) };
+	if (normalized === "resume") return { text: await resumeThread(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "bind") return await bindConversation(deps, ctx, options.pluginConfig, rest);
+	if (normalized === "detach" || normalized === "unbind") {
+		if (rest.length > 0) return { text: "Usage: /codex detach" };
+		return { text: await detachConversation(deps, ctx) };
+	}
+	if (normalized === "binding") {
+		if (rest.length > 0) return { text: "Usage: /codex binding" };
+		return { text: await describeConversationBinding(deps, ctx) };
+	}
+	if (normalized === "stop") {
+		if (rest.length > 0) return { text: "Usage: /codex stop" };
+		return { text: await stopConversationTurn(deps, ctx, options.pluginConfig) };
+	}
+	if (normalized === "steer") return { text: await steerConversationTurn(deps, ctx, options.pluginConfig, rest.join(" ")) };
+	if (normalized === "model") return { text: await setConversationModel(deps, ctx, options.pluginConfig, 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 === "compact") return { text: await startThreadAction(deps, ctx, options.pluginConfig, "compact", rest) };
+	if (normalized === "review") return { text: await startThreadAction(deps, ctx, options.pluginConfig, "review", rest) };
+	if (normalized === "diagnostics") return await handleCodexDiagnosticsFeedback(deps, ctx, options.pluginConfig, rest.join(" "), "/codex diagnostics");
+	if (normalized === "computer-use" || normalized === "computeruse") {
+		if (isMenuVerb(rest)) return buildCodexComputerUseMenuReply();
+		return { text: await handleComputerUseCommand(deps, ctx, options.pluginConfig, rest) };
+	}
+	if (normalized === "mcp") {
+		if (rest.length > 0) return { text: "Usage: /codex mcp" };
+		const scope = await resolveCommandAppServerScope(deps, ctx);
+		return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }, {
+			config: ctx.config,
+			...scope
+		}), "MCP servers") };
+	}
+	if (normalized === "skills") {
+		if (rest.length > 0) return { text: "Usage: /codex skills" };
+		const scope = await resolveCommandAppServerScope(deps, ctx);
+		return { text: formatSkills(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}, {
+			config: ctx.config,
+			...scope
+		})) };
+	}
+	if (normalized === "account") {
+		if (rest.length > 0) return { text: "Usage: /codex account" };
+		const scope = await resolveCommandAppServerScope(deps, ctx);
+		const requestScope = {
+			config: ctx.config,
+			...scope
+		};
+		const [account, limits] = await Promise.all([deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }, requestScope), deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, requestScope)]);
+		return { text: formatAccount(account, limits, await readCodexAccountAuthOverview({
+			ctx,
+			pluginConfig: options.pluginConfig,
+			safeCodexControlRequest: deps.safeCodexControlRequest,
+			account,
+			limits
+		})) };
+	}
+	return { text: `Unknown Codex command: ${formatCodexDisplayText(subcommand)}\n\n${buildHelp()}` };
 }
-function parseResumeArgs(args) {
-	const parsed = {};
-	for (let index = 0; index < args.length; index += 1) {
-		const arg = expectDefined(args[index], "current Codex resume 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 === "--bind") {
-			if (readRequiredOptionValue(args, index) !== "here" || parsed.bindHere !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.bindHere = true;
-			index += 1;
-			continue;
-		}
-		if (!arg.startsWith("-") && !parsed.threadId) {
-			parsed.threadId = arg;
-			continue;
-		}
-		parsed.help = true;
+function resolveCodexNativeCommandSandboxBlock(ctx, subcommand, args) {
+	if (!CODEX_NATIVE_EXECUTION_SUBCOMMANDS.has(subcommand)) return;
+	if (returnsBeforeNativeCodexExecution(subcommand, args)) return;
+	if (isCodexCliNodeResumeBind(subcommand, args)) return resolveCodexNativeSandboxBlock({
+		config: ctx.config,
+		sessionKey: ctx.sessionKey,
+		sessionId: ctx.sessionId,
+		surface: `/${["codex", subcommand].join(" ")}`
+	});
+	return resolveCodexNativeExecutionBlock({
+		config: ctx.config,
+		agentId: ctx.agentId,
+		sessionKey: ctx.sessionKey,
+		sessionId: ctx.sessionId,
+		surface: `/${["codex", subcommand].join(" ")}`
+	});
+}
+function returnsBeforeNativeCodexExecution(subcommand, args) {
+	switch (subcommand) {
+		case "bind": return parseBindArgs([...args]).help === true;
+		case "resume": return returnsBeforeNativeCodexResume(args);
+		case "steer": return args.join(" ").trim() === "";
+		case "model": return args.length === 0 || args.length > 1;
+		case "fast": return args.length === 0 || args.length > 1 || parseCodexFastModeArg(args[0]) === void 0;
+		case "permissions": return args.length === 0 || args.length > 1 || parseCodexPermissionsModeArg(args[0]) === void 0;
+		case "compact":
+		case "review":
+		case "detach":
+		case "unbind":
+		case "stop": return args.length > 0;
+		default: return false;
 	}
-	parsed.threadId = normalizeOptionalString(parsed.threadId);
-	parsed.host = normalizeOptionalString(parsed.host);
-	return parsed;
 }
-function parseComputerUseArgs(args) {
-	const parsed = {
-		action: "status",
-		overrides: {},
-		hasOverrides: false,
-		persistentIdentity: {}
+function isCodexCliNodeResumeBind(subcommand, args) {
+	if (subcommand !== "resume") return false;
+	const parsed = parseResumeArgs([...args]);
+	return Boolean(parsed.host && parsed.threadId && parsed.bindHere === true && !parsed.help);
+}
+function returnsBeforeNativeCodexResume(args) {
+	const parsed = parseResumeArgs([...args]);
+	const normalizedThreadId = parsed.threadId?.trim();
+	if (parsed.help) return true;
+	if (parsed.host) return !normalizedThreadId || parsed.bindHere !== true;
+	return !normalizedThreadId || args.length !== 1;
+}
+async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
+	const parsed = parseComputerUseArgs(args);
+	if (parsed.help) return ["Usage: /codex computer-use [status|install] [--source <marketplace-source>] [--marketplace-path <path>] [--marketplace <name>]", "Checks or installs the configured Codex Computer Use plugin through app-server."].join("\n");
+	if (parsed.action === "install" && !canMutateCodexHost(ctx)) return "Only an owner or operator.admin gateway client can configure Codex Computer Use.";
+	const params = {
+		pluginConfig,
+		forceEnable: parsed.action === "install" || parsed.hasOverrides,
+		...Object.keys(parsed.overrides).length > 0 ? { overrides: parsed.overrides } : {}
 	};
-	let sawAction = false;
-	for (let index = 0; index < args.length; index += 1) {
-		const arg = args[index];
-		if (arg === "--help" || arg === "-h") {
-			parsed.help = true;
-			continue;
-		}
-		if (arg === "status" || arg === "install") {
-			if (sawAction) {
-				parsed.help = true;
-				continue;
-			}
-			sawAction = true;
-			parsed.action = arg;
-			continue;
-		}
-		if (arg === "--source" || arg === "--marketplace-source") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.overrides.marketplaceSource !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.overrides.marketplaceSource = value;
-			index += 1;
-			continue;
-		}
-		if (arg === "--marketplace-path" || arg === "--path") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.overrides.marketplacePath !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.overrides.marketplacePath = value;
-			index += 1;
-			continue;
-		}
-		if (arg === "--marketplace") {
-			const value = readRequiredOptionValue(args, index);
-			if (!value || parsed.overrides.marketplaceName !== void 0) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.overrides.marketplaceName = value;
-			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) {
-				parsed.help = true;
-				continue;
-			}
-			parsed.persistentIdentity[configKey] = value.trim();
-			index += 1;
-			continue;
-		}
-		parsed.help = true;
-	}
-	parsed.overrides = normalizeComputerUseStringOverrides(parsed.overrides);
-	parsed.hasOverrides = Object.values(parsed.overrides).some(Boolean);
-	return parsed;
-}
-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));
-	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) {
-	const value = args[index + 1];
-	const normalized = value?.trim();
-	if (!normalized || normalized.startsWith("-")) return;
-	return value;
-}
-function normalizeComputerUseStringOverrides(overrides) {
-	const normalized = {};
-	const marketplaceSource = normalizeOptionalString(overrides.marketplaceSource);
-	if (marketplaceSource) normalized.marketplaceSource = marketplaceSource;
-	const marketplacePath = normalizeOptionalString(overrides.marketplacePath);
-	if (marketplacePath) normalized.marketplacePath = marketplacePath;
-	const marketplaceName = normalizeOptionalString(overrides.marketplaceName);
-	if (marketplaceName) normalized.marketplaceName = marketplaceName;
-	return normalized;
+	if (parsed.action === "install") return formatComputerUseStatus(await deps.installCodexComputerUse(params));
+	return formatComputerUseStatus(await deps.readCodexComputerUseStatus(params));
 }
-//#endregion
-//#region extensions/codex/src/command-diagnostics-support.ts
-const CODEX_DIAGNOSTICS_SOURCE = "openclaw-diagnostics";
-const CODEX_DIAGNOSTICS_REASON_MAX_CHARS = 2048;
-const CODEX_DIAGNOSTICS_COOLDOWN_MS = 6e4;
-const CODEX_DIAGNOSTICS_ERROR_MAX_CHARS = 500;
-const CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS = 100;
-const CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES = 100;
-const CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS = 5 * 6e4;
-const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE = 100;
-const CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES = 100;
-const CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS = 128;
-const CODEX_RESUME_SAFE_THREAD_ID_PATTERN = /^[A-Za-z0-9._:-]+$/;
-const { lastUploadByThread: lastCodexDiagnosticsUploadByThread, lastUploadByScope: lastCodexDiagnosticsUploadByScope, pendingConfirmations: pendingCodexDiagnosticsConfirmations, pendingTokensByScope: pendingCodexDiagnosticsConfirmationTokensByScope } = codexDiagnosticsFeedbackState;
-function normalizeDiagnosticsReason(note) {
-	const normalized = normalizeOptionalString(note);
-	return normalized ? truncateUtf16Safe(normalized, CODEX_DIAGNOSTICS_REASON_MAX_CHARS) : void 0;
+async function bindConversation(deps, ctx, pluginConfig, args) {
+	const parsed = parseBindArgs(args);
+	if (parsed.help) return { text: "Usage: /codex bind [thread-id] [--cwd <path>] [--model <model>] [--provider <provider>]" };
+	const scope = resolveCodexConversationControlScope(ctx);
+	const workspaceDir = parsed.cwd ?? deps.resolveCodexDefaultWorkspaceDir(pluginConfig);
+	const currentConversation = await ctx.getCurrentConversationBinding();
+	const currentConversationData = readCodexConversationBindingData(currentConversation);
+	const bindingId = currentConversationData?.kind === "codex-app-server-session" ? currentConversationData.bindingId : currentConversation ? `conversation-${currentConversation.bindingId}` : void 0;
+	const sessionOwner = ctx.sessionId ? sessionBindingIdentity({
+		sessionId: ctx.sessionId,
+		sessionKey: ctx.sessionKey,
+		agentId: scope.agentId,
+		config: ctx.config
+	}) : void 0;
+	const currentOwner = currentConversationData?.kind === "codex-app-server-session" ? conversationBindingIdentity(currentConversationData.bindingId) : sessionOwner;
+	const existingBinding = currentOwner ? await deps.bindingStore.read(currentOwner) : void 0;
+	const sessionSource = sessionOwner && existingBinding ? {
+		agentId: sessionOwner.agentId,
+		sessionId: sessionOwner.sessionId,
+		threadId: existingBinding.threadId,
+		...sessionOwner.sessionKey ? { sessionKey: sessionOwner.sessionKey } : {}
+	} : void 0;
+	const authProfileId = existingBinding?.authProfileId;
+	const data = createCodexConversationBindingData({
+		bindingId,
+		workspaceDir,
+		agentId: scope.agentId,
+		agentDir: scope.agentDir,
+		source: currentConversationData?.kind === "codex-app-server-session" ? currentConversationData.source : sessionSource,
+		start: {
+			id: crypto.randomUUID(),
+			threadId: parsed.threadId,
+			model: parsed.model,
+			modelProvider: parsed.provider,
+			authProfileId
+		}
+	});
+	const threadLabel = parsed.threadId ?? "a new thread";
+	const request = await ctx.requestConversationBinding({
+		summary: `Codex app-server thread ${formatCodexDisplayText(threadLabel)} in ${formatCodexDisplayText(workspaceDir)}`,
+		detachHint: "/codex detach",
+		data
+	});
+	if (request.status === "pending") return request.reply;
+	if (request.status === "error") return { text: formatCodexDisplayText(request.message) };
+	return { text: `Bound this conversation to ${formatCodexDisplayText(threadLabel)} in ${formatCodexDisplayText(workspaceDir)}. The next message will initialize it.` };
 }
-function parseDiagnosticsArgs(args) {
-	const [action, token, ...extra] = splitArgs(args);
-	const normalizedAction = action?.toLowerCase();
-	if ((normalizedAction === "confirm" || normalizedAction === "--confirm") && token && extra.length === 0) return {
-		action: "confirm",
-		token
-	};
-	if ((normalizedAction === "cancel" || normalizedAction === "--cancel") && token && extra.length === 0) return {
-		action: "cancel",
-		token
-	};
-	if (normalizedAction === "confirm" || normalizedAction === "--confirm" || normalizedAction === "cancel" || normalizedAction === "--cancel") return { action: "usage" };
-	return {
-		action: "request",
-		note: args
-	};
+async function detachConversation(deps, ctx) {
+	const current = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(current);
+	const detached = await ctx.detachConversationBinding();
+	if (data?.kind === "codex-app-server-session") await deps.bindingStore.mutate(conversationBindingIdentity(data.bindingId), { kind: "clear" });
+	return detached.removed ? "Detached this conversation from Codex." : "No Codex conversation binding was attached.";
 }
-function formatDiagnosticsUsage(commandPrefix) {
+async function describeConversationBinding(deps, ctx) {
+	const current = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(current);
+	if (!current || !data) return "No Codex conversation binding is attached.";
+	if (data.kind === "codex-cli-node-session") return [
+		"Codex conversation binding:",
+		"- Mode: Codex CLI node session",
+		`- Node: ${formatCodexDisplayText(data.nodeId)}`,
+		`- Session: ${formatCodexDisplayText(data.sessionId)}`,
+		`- Workspace: ${formatCodexDisplayText(data.cwd ?? "unknown")}`,
+		"- Active run: not tracked"
+	].join("\n");
+	const identity = conversationBindingIdentity(data.bindingId);
+	const threadBinding = await deps.bindingStore.read(identity);
+	const active = deps.readCodexConversationActiveTurn(identity);
 	return [
-		`Usage: ${commandPrefix} [note]`,
-		`Usage: ${commandPrefix} confirm <token>`,
-		`Usage: ${commandPrefix} cancel <token>`
+		"Codex conversation binding:",
+		`- Thread: ${formatCodexDisplayText(threadBinding?.threadId ?? "unknown")}`,
+		`- Workspace: ${formatCodexDisplayText(data.workspaceDir)}`,
+		`- Model: ${formatCodexDisplayText(threadBinding?.model ?? "default")}`,
+		`- Fast: ${isCodexFastServiceTier(threadBinding?.serviceTier) ? "on" : "off"}`,
+		`- Permissions: ${threadBinding ? formatPermissionsMode(threadBinding) : "default"}`,
+		`- Active run: ${formatCodexDisplayText(active ? active.turnId : "none")}`,
+		`- Binding: ${formatCodexDisplayText(data.bindingId)}`
 	].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);
-	}
-	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(params.scopeKey) ?? [];
-	while (scopeTokens.length >= CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE) {
-		const oldestToken = scopeTokens.shift();
-		if (!oldestToken) break;
-		pendingCodexDiagnosticsConfirmations.delete(oldestToken);
-	}
-	const token = crypto.randomBytes(6).toString("hex");
-	scopeTokens.push(token);
-	pendingCodexDiagnosticsConfirmationTokensByScope.set(params.scopeKey, scopeTokens);
-	pendingCodexDiagnosticsConfirmations.set(token, {
-		token,
-		targets: params.targets,
-		note: params.note,
-		senderId: params.senderId,
-		channel: params.channel,
-		accountId: params.accountId,
-		channelId: params.channelId,
-		messageThreadId: params.messageThreadId,
-		threadParentId: params.threadParentId,
-		sessionKey: params.sessionKey,
-		scopeKey: params.scopeKey,
-		...params.privateRouted === void 0 ? {} : { privateRouted: params.privateRouted },
-		createdAt: params.now
+async function buildThreads(deps, ctx, pluginConfig, filter) {
+	const scope = await resolveCommandAppServerScope(deps, ctx);
+	const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
+		limit: 10,
+		...filter.trim() ? { searchTerm: filter.trim() } : {}
+	}, {
+		config: ctx.config,
+		...scope
 	});
-	return token;
-}
-function readCodexDiagnosticsConfirmationScope(ctx) {
-	return {
-		accountId: normalizeCodexDiagnosticsScopeField(ctx.accountId),
-		channelId: normalizeCodexDiagnosticsScopeField(ctx.channelId),
-		messageThreadId: typeof ctx.messageThreadId === "string" || typeof ctx.messageThreadId === "number" ? normalizeCodexDiagnosticsScopeField(String(ctx.messageThreadId)) : void 0,
-		threadParentId: normalizeCodexDiagnosticsScopeField(ctx.threadParentId),
-		sessionKey: normalizeCodexDiagnosticsScopeField(ctx.sessionKey)
-	};
-}
-function readCodexDiagnosticsScopeMismatch(pending, ctx) {
-	const current = readCodexDiagnosticsConfirmationScope(ctx);
-	if (pending.accountId !== current.accountId) return {
-		confirmMessage: "This Codex diagnostics confirmation belongs to a different account.",
-		cancelMessage: "This Codex diagnostics confirmation belongs to a different account."
-	};
-	if (pending.privateRouted) return;
-	if (pending.channelId !== current.channelId) return {
-		confirmMessage: "This Codex diagnostics confirmation belongs to a different channel instance.",
-		cancelMessage: "This Codex diagnostics confirmation belongs to a different channel instance."
-	};
-	if (pending.messageThreadId !== current.messageThreadId) return {
-		confirmMessage: "This Codex diagnostics confirmation belongs to a different thread.",
-		cancelMessage: "This Codex diagnostics confirmation belongs to a different thread."
-	};
-	if (pending.threadParentId !== current.threadParentId) return {
-		confirmMessage: "This Codex diagnostics confirmation belongs to a different parent thread.",
-		cancelMessage: "This Codex diagnostics confirmation belongs to a different parent thread."
-	};
-	if (pending.sessionKey !== current.sessionKey) return {
-		confirmMessage: "This Codex diagnostics confirmation belongs to a different session.",
-		cancelMessage: "This Codex diagnostics confirmation belongs to a different session."
-	};
+	return formatThreads(response);
 }
-function readPendingCodexDiagnosticsConfirmation(token, now) {
-	prunePendingCodexDiagnosticsConfirmations(now);
-	return pendingCodexDiagnosticsConfirmations.get(token);
+async function buildCodexCliSessions(deps, args) {
+	const parsed = parseCodexCliSessionsArgs(args);
+	if (parsed.help || !parsed.host) return "Usage: /codex sessions --host <node> [filter] [--limit <n>]";
+	return formatCodexCliSessions(await deps.listCodexCliSessionsOnNode({
+		requestedNode: parsed.host,
+		filter: parsed.filter,
+		limit: parsed.limit
+	}));
 }
-function deletePendingCodexDiagnosticsConfirmation(token) {
-	const pending = pendingCodexDiagnosticsConfirmations.get(token);
-	pendingCodexDiagnosticsConfirmations.delete(token);
-	if (!pending) return;
-	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(pending.scopeKey);
-	if (!scopeTokens) return;
-	const tokenIndex = scopeTokens.indexOf(token);
-	if (tokenIndex >= 0) scopeTokens.splice(tokenIndex, 1);
-	if (scopeTokens.length === 0) pendingCodexDiagnosticsConfirmationTokensByScope.delete(pending.scopeKey);
+async function resumeThread(deps, ctx, pluginConfig, args) {
+	const parsed = parseResumeArgs(args);
+	const normalizedThreadId = parsed.threadId?.trim();
+	if (parsed.help) return args.includes("--help") || args.includes("-h") || parsed.host ? "Usage: /codex resume <thread-id>\nUsage: /codex resume <session-id> --host <node> --bind here" : "Usage: /codex resume <thread-id>";
+	if (parsed.host) return await bindCodexCliNodeSession(deps, ctx, parsed);
+	if (!normalizedThreadId || args.length !== 1) return "Usage: /codex resume <thread-id>";
+	if (!ctx.sessionId) return "Cannot attach a Codex thread because this command did not include an OpenClaw session id.";
+	const scope = resolveCodexConversationControlScope(ctx);
+	const identity = sessionBindingIdentity({
+		sessionId: ctx.sessionId,
+		sessionKey: ctx.sessionKey,
+		agentId: scope.agentId,
+		config: ctx.config
+	});
+	return await deps.bindingStore.withLease(identity, async () => {
+		if (!await reclaimCurrentCodexSessionGeneration({
+			bindingStore: deps.bindingStore,
+			identity,
+			config: ctx.config
+		})) throw new Error(`Codex session generation is no longer current: ${identity.sessionId}`);
+		const currentBinding = await deps.bindingStore.read(identity);
+		const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
+			authProfileId: currentBinding?.authProfileId,
+			agentDir: scope.agentDir,
+			config: ctx.config
+		});
+		const response = assertCodexThreadResumeResponse(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
+			threadId: normalizedThreadId,
+			excludeTurns: true
+		}, {
+			config: ctx.config,
+			agentDir: scope.agentDir,
+			authProfileId,
+			sessionKey: ctx.sessionKey,
+			sessionId: ctx.sessionId
+		}));
+		const effectiveThreadId = response.thread.id;
+		if (effectiveThreadId !== normalizedThreadId) throw new Error(`Codex thread/resume returned ${effectiveThreadId} for ${normalizedThreadId}`);
+		const resumedCwd = response.thread.cwd;
+		if (typeof resumedCwd !== "string") throw new Error(`Codex thread/resume returned no cwd for ${normalizedThreadId}`);
+		const modelProvider = normalizeCodexAppServerBindingModelProvider({
+			authProfileId,
+			modelProvider: response.modelProvider ?? void 0,
+			agentDir: scope.agentDir,
+			config: ctx.config
+		});
+		if (!await deps.bindingStore.mutate(identity, {
+			kind: "set",
+			binding: {
+				threadId: effectiveThreadId,
+				cwd: resumedCwd,
+				authProfileId,
+				model: response.model,
+				modelProvider,
+				historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
+			}
+		})) throw new Error("Codex thread binding changed while attaching the resumed thread.");
+		return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(effectiveThreadId)}.`;
+	});
 }
-function prunePendingCodexDiagnosticsConfirmations(now) {
-	for (const [token, pending] of pendingCodexDiagnosticsConfirmations) if (now - pending.createdAt >= CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS) deletePendingCodexDiagnosticsConfirmation(token);
+async function bindCodexCliNodeSession(deps, ctx, parsed) {
+	if (!parsed.threadId || !parsed.host || parsed.bindHere !== true) return "Usage: /codex resume <session-id> --host <node> --bind here";
+	const resolved = await deps.resolveCodexCliSessionForBindingOnNode({
+		requestedNode: parsed.host,
+		sessionId: parsed.threadId
+	});
+	if (!resolved.session) return `No Codex CLI session ${formatCodexDisplayText(parsed.threadId)} was found on ${formatCodexDisplayText(parsed.host)}.`;
+	const nodeId = resolved.node.nodeId;
+	if (!nodeId) return "Cannot bind Codex CLI session because the selected node did not include a node id.";
+	const scope = resolveCodexConversationControlScope(ctx);
+	const data = createCodexCliNodeConversationBindingData({
+		nodeId,
+		sessionId: parsed.threadId,
+		agentId: scope.agentId,
+		cwd: resolved.session?.cwd
+	});
+	const summary = `Codex CLI session ${formatCodexDisplayText(parsed.threadId)} on ${formatCodexDisplayText(nodeId)}`;
+	const request = await ctx.requestConversationBinding({
+		summary,
+		detachHint: "/codex detach",
+		data
+	});
+	if (request.status === "bound") return `Bound this conversation to Codex CLI session ${formatCodexDisplayText(parsed.threadId)} on ${formatCodexDisplayText(nodeId)}.`;
+	if (request.status === "pending") return request.reply.text ?? "Codex CLI session binding is pending approval.";
+	return formatCodexDisplayText(request.message);
 }
-function deletePendingCodexDiagnosticsConfirmationScope(scopeKey) {
-	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(scopeKey) ?? [];
-	for (const token of scopeTokens) pendingCodexDiagnosticsConfirmations.delete(token);
-	pendingCodexDiagnosticsConfirmationTokensByScope.delete(scopeKey);
+async function stopConversationTurn(deps, ctx, pluginConfig) {
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot stop Codex because this command did not include a stable binding identity.";
+	return (await deps.stopCodexConversationTurn({
+		identity: target.identity,
+		bindingStore: deps.bindingStore,
+		pluginConfig,
+		agentDir: target.agentDir,
+		config: ctx.config
+	})).message;
 }
-function codexDiagnosticsTargetsMatch(expected, actual) {
-	const fingerprint = (target) => JSON.stringify([
-		bindingStoreKey(target.identity),
-		target.threadId,
-		target.connectionScope ?? null,
-		target.pendingSupervisionBranch?.connectionFingerprint ?? target.appServerRuntimeFingerprint ?? null,
-		target.authProfileId ?? null
-	]);
-	const expectedTargets = expected.map(fingerprint).toSorted();
-	const actualTargets = actual.map(fingerprint).toSorted();
-	return expectedTargets.length === actualTargets.length && expectedTargets.every((target, index) => target === actualTargets[index]);
+async function steerConversationTurn(deps, ctx, pluginConfig, message) {
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot steer Codex because this command did not include a stable binding identity.";
+	return (await deps.steerCodexConversationTurn({
+		identity: target.identity,
+		bindingStore: deps.bindingStore,
+		message,
+		pluginConfig,
+		agentDir: target.agentDir,
+		config: ctx.config
+	})).message;
 }
-function formatCodexDiagnosticsUploadResult(sent, failed) {
-	const lines = [];
-	if (sent.length > 0) {
-		lines.push("Codex diagnostics sent to OpenAI servers:");
-		lines.push(...formatCodexDiagnosticsTargetLines(sent));
-		lines.push("Included Codex logs and spawned Codex subthreads when available.");
-	}
-	if (failed.length > 0) {
-		if (lines.length > 0) lines.push("");
-		lines.push("Could not send Codex diagnostics:");
-		lines.push(...failed.map(({ target, error }) => `${formatCodexDiagnosticsTargetLine(target)}: ${formatCodexErrorForDisplay(error)}`));
-		lines.push("Inspect locally:");
-		lines.push(...failed.map(({ target }) => `- ${formatCodexResumeCommandForDisplay(target.threadId)}`));
+async function setConversationModel(deps, ctx, pluginConfig, args) {
+	if (args.length > 1) return "Usage: /codex model <model>";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot set Codex model because this command did not include a stable binding identity.";
+	const [model = ""] = args;
+	const normalized = model.trim();
+	if (!normalized) {
+		const binding = await deps.bindingStore.read(target.identity);
+		return binding?.model ? `Codex model: ${formatCodexDisplayText(binding.model)}` : "Usage: /codex model <model>";
 	}
-	return lines.join("\n");
-}
-function formatCodexDiagnosticsTargetLines(targets) {
-	return targets.flatMap((target, index) => {
-		const lines = formatCodexDiagnosticsTargetBlock(target, index);
-		return index < targets.length - 1 ? [...lines, ""] : lines;
+	return await deps.setCodexConversationModel({
+		identity: target.identity,
+		bindingStore: deps.bindingStore,
+		pluginConfig,
+		model: normalized,
+		agentDir: target.agentDir,
+		config: ctx.config
 	});
 }
-function formatCodexDiagnosticsTargetBlock(target, index) {
-	const lines = [`Session ${index + 1}`];
-	if (target.channel) lines.push(`Channel: ${formatCodexValueForDisplay(target.channel)}`);
-	if (target.sessionKey) lines.push(`OpenClaw session key: ${formatCodexCopyableValueForDisplay(target.sessionKey)}`);
-	if (target.sessionId) lines.push(`OpenClaw session id: ${formatCodexCopyableValueForDisplay(target.sessionId)}`);
-	lines.push(`Codex thread id: ${formatCodexCopyableValueForDisplay(target.threadId)}`);
-	lines.push(`Inspect locally: ${formatCodexResumeCommandForDisplay(target.threadId)}`);
-	return lines;
+async function setConversationFastMode(deps, ctx, args) {
+	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
+	const target = await resolveControlTarget(ctx);
+	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,
+		enabled: parsed
+	});
 }
-function formatCodexDiagnosticsTargetLine(target) {
-	const parts = [];
-	if (target.channel) parts.push(`channel ${formatCodexValueForDisplay(target.channel)}`);
-	const sessionLabel = target.sessionId || target.sessionKey;
-	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexValueForDisplay(sessionLabel)}`);
-	parts.push(`Codex thread ${formatCodexThreadIdForDisplay(target.threadId)}`);
-	return `- ${parts.join(", ")}`;
+async function setConversationPermissions(deps, ctx, args) {
+	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
+	const target = await resolveControlTarget(ctx);
+	if (!target) return "Cannot set Codex permissions because this command did not include a stable binding identity.";
+	const value = args[0];
+	const parsed = parseCodexPermissionsModeArg(value);
+	if (value && !parsed && value.trim().toLowerCase() !== "status") return "Usage: /codex permissions [default|yolo|status]";
+	return await deps.setCodexConversationPermissions({
+		identity: target.identity,
+		bindingStore: deps.bindingStore,
+		mode: parsed
+	});
 }
-function escapeCodexChatText(value) {
-	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("@", "＠").replaceAll("`", "｀").replaceAll("[", "［").replaceAll("]", "］").replaceAll("(", "（").replaceAll(")", "）").replaceAll("*", "∗").replaceAll("_", "＿").replaceAll("~", "～").replaceAll("|", "｜");
+async function resolveControlTarget(ctx) {
+	const binding = await ctx.getCurrentConversationBinding();
+	const data = readCodexConversationBindingData(binding);
+	const scope = resolveCodexConversationControlScope(ctx);
+	if (data?.kind === "codex-app-server-session") return {
+		identity: conversationBindingIdentity(data.bindingId),
+		agentId: data.agentId ?? scope.agentId,
+		agentDir: data.agentDir ?? scope.agentDir,
+		requestedAuthProfileId: data.start?.authProfileId
+	};
+	return ctx.sessionId ? {
+		identity: sessionBindingIdentity({
+			sessionId: ctx.sessionId,
+			sessionKey: ctx.sessionKey,
+			agentId: scope.agentId,
+			config: ctx.config
+		}),
+		agentId: scope.agentId,
+		agentDir: scope.agentDir
+	} : void 0;
 }
-function formatCodexTextForDisplay(value) {
-	let safe = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		safe += codePoint != null && isUnsafeDisplayCodePoint(codePoint) ? "?" : character;
-	}
-	safe = safe.trim();
-	return safe || "<unknown>";
+async function resolveCommandAppServerScope(deps, ctx) {
+	const target = await resolveControlTarget(ctx);
+	const fallback = resolveCodexConversationControlScope(ctx);
+	const agentDir = target?.agentDir ?? fallback.agentDir;
+	const binding = target ? await deps.bindingStore.read(target.identity) : void 0;
+	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
+		authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
+		agentDir,
+		config: ctx.config
+	});
+	return {
+		agentId: target?.agentId ?? fallback.agentId,
+		agentDir,
+		...authProfileId ? { authProfileId } : {},
+		...ctx.sessionKey ? { sessionKey: ctx.sessionKey } : {},
+		...ctx.sessionId ? { sessionId: ctx.sessionId } : {}
+	};
 }
-function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options = {}) {
-	for (const target of targets) {
-		const cooldownMs = readCodexDiagnosticsCooldownMs(target.threadId, now);
-		if (cooldownMs > 0) {
-			if (options.includeThreadId === false) return `Codex diagnostics were already sent for one of these Codex threads recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
-			return `Codex diagnostics were already sent for thread ${formatCodexThreadIdForDisplay(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
-		}
-	}
-	const scopeCooldownMs = readCodexDiagnosticsScopeCooldownMs(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.`;
-}
-function recordCodexDiagnosticsUpload(threadId, ctx, now, cooldownScope) {
-	pruneCodexDiagnosticsCooldowns(now);
-	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByScope, cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES, now);
-	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByThread, threadId, CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS, now);
-}
-function readCodexDiagnosticsCooldownScope(ctx) {
-	const scope = readCodexDiagnosticsConfirmationScope(ctx);
-	const payload = JSON.stringify({
-		accountId: scope.accountId ?? null,
-		channelId: scope.channelId ?? null,
-		sessionKey: scope.sessionKey ?? null,
-		messageThreadId: scope.messageThreadId ?? null,
-		threadParentId: scope.threadParentId ?? null,
-		senderId: normalizeCodexDiagnosticsScopeField(ctx.senderId) ?? null,
-		channel: normalizeCodexDiagnosticsScopeField(ctx.channel) ?? ""
-	});
-	return crypto.createHash("sha256").update(payload).digest("hex");
-}
-function buildDiagnosticsTags(ctx) {
-	const tags = { source: CODEX_DIAGNOSTICS_SOURCE };
-	addTag(tags, "channel", ctx.channel);
-	return tags;
-}
-function addTag(tags, key, value) {
-	if (typeof value === "string" && value.trim()) tags[key] = value.trim();
-}
-function formatCodexThreadIdForDisplay(threadId) {
-	return escapeCodexChatText(formatCodexTextForDisplay(threadId));
-}
-function formatCodexValueForDisplay(value) {
-	return escapeCodexChatText(formatCodexTextForDisplay(value));
-}
-function formatCodexCopyableValueForDisplay(value) {
-	const safe = formatCodexTextForDisplay(value);
-	if (CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safe)) return `\`${safe}\``;
-	return escapeCodexChatText(safe);
-}
-function readCodexDiagnosticsCooldownMs(threadId, now) {
-	const lastSentAt = lastCodexDiagnosticsUploadByThread.get(threadId);
-	if (!lastSentAt) return 0;
-	const remainingMs = Math.max(0, CODEX_DIAGNOSTICS_COOLDOWN_MS - (now - lastSentAt));
-	if (remainingMs === 0) lastCodexDiagnosticsUploadByThread.delete(threadId);
-	return remainingMs;
-}
-function readCodexDiagnosticsScopeCooldownMs(scope, now) {
-	const lastSentAt = lastCodexDiagnosticsUploadByScope.get(scope);
-	if (!lastSentAt) return 0;
-	const remainingMs = Math.max(0, CODEX_DIAGNOSTICS_COOLDOWN_MS - (now - lastSentAt));
-	if (remainingMs === 0) lastCodexDiagnosticsUploadByScope.delete(scope);
-	return remainingMs;
-}
-function recordBoundedCodexDiagnosticsCooldown(map, key, maxSize, now) {
-	if (!map.has(key)) while (map.size >= maxSize) {
-		const oldestKey = map.keys().next().value;
-		if (typeof oldestKey !== "string") break;
-		map.delete(oldestKey);
-	}
-	map.set(key, now);
-}
-function pruneCodexDiagnosticsCooldowns(now) {
-	pruneCodexDiagnosticsCooldownMap(lastCodexDiagnosticsUploadByThread, now);
-	pruneCodexDiagnosticsCooldownMap(lastCodexDiagnosticsUploadByScope, now);
-}
-function pruneCodexDiagnosticsCooldownMap(map, now) {
-	for (const [key, lastSentAt] of map) if (now - lastSentAt >= CODEX_DIAGNOSTICS_COOLDOWN_MS) map.delete(key);
-}
-function formatCodexErrorForDisplay(error) {
-	return escapeCodexChatText(truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS)) || "unknown error";
-}
-function formatCodexResumeCommandForDisplay(threadId) {
-	const safeThreadId = formatCodexTextForDisplay(threadId);
-	if (!CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safeThreadId)) return "run codex resume and paste the thread id shown above";
-	return `\`codex resume ${safeThreadId}\``;
-}
-function isUnsafeDisplayCodePoint(codePoint) {
-	return codePoint <= 31 || codePoint >= 127 && codePoint <= 159 || codePoint === 173 || codePoint === 1564 || codePoint === 6158 || codePoint >= 8203 && codePoint <= 8207 || codePoint >= 8234 && codePoint <= 8238 || codePoint >= 8288 && codePoint <= 8303 || codePoint === 65279 || codePoint >= 65529 && codePoint <= 65531 || codePoint >= 917504 && codePoint <= 917631;
-}
-function normalizeCodexDiagnosticsScopeField(value) {
-	const normalized = normalizeOptionalString(value);
-	if (!normalized) return;
-	if (normalized.length <= CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS) return normalized;
-	return `sha256:${crypto.createHash("sha256").update(normalized).digest("hex")}`;
-}
-//#endregion
-//#region extensions/codex/src/command-handler-deps.ts
-const defaultCodexCommandDeps = {
-	codexControlRequest,
-	listCodexAppServerModels: listAllCodexAppServerModels,
-	readCodexStatusProbes,
-	requestOptions,
-	safeCodexControlRequest,
-	readCodexComputerUseStatus,
-	installCodexComputerUse,
-	resolveCodexDefaultWorkspaceDir,
-	readCodexConversationActiveTurn,
-	setCodexConversationFastMode,
-	setCodexConversationModel,
-	setCodexConversationPermissions,
-	steerCodexConversationTurn,
-	stopCodexConversationTurn,
-	listCodexCliSessionsOnNode: async () => {
-		throw new Error("Codex CLI node sessions require Gateway node runtime.");
-	},
-	resolveCodexCliSessionForBindingOnNode: async () => {
-		throw new Error("Codex CLI node sessions require Gateway node runtime.");
-	}
-};
-function resolveCodexCommandDeps(overrides) {
-	return {
-		...defaultCodexCommandDeps,
-		...overrides
-	};
-}
-//#endregion
-//#region extensions/codex/src/command-handler-scope.ts
-async function resolveControlTarget(ctx) {
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
-	const scope = resolveCodexConversationControlScope(ctx);
-	if (data?.kind === "codex-app-server-session") return {
-		identity: conversationBindingIdentity(data.bindingId),
-		agentId: data.agentId ?? scope.agentId,
-		agentDir: data.agentDir ?? scope.agentDir,
-		requestedAuthProfileId: data.start?.authProfileId
-	};
-	return ctx.sessionId ? {
-		identity: sessionBindingIdentity({
-			sessionId: ctx.sessionId,
-			sessionKey: ctx.sessionKey,
-			agentId: scope.agentId,
-			config: ctx.config
-		}),
-		agentId: scope.agentId,
-		agentDir: scope.agentDir
-	} : void 0;
-}
-async function resolveCommandAppServerScope(deps, ctx, pluginConfig) {
-	const target = await resolveControlTarget(ctx);
-	const fallback = resolveCodexConversationControlScope(ctx);
-	const agentDir = target?.agentDir ?? fallback.agentDir;
-	const binding = target ? await deps.bindingStore.read(target.identity) : void 0;
-	const connection = resolveCodexBindingAppServerConnection({
-		binding,
-		authProfileId: binding?.connectionScope === "supervision" ? void 0 : resolveCodexAppServerAuthProfileIdForAgent({
-			authProfileId: binding?.authProfileId ?? target?.requestedAuthProfileId,
-			agentDir,
-			config: ctx.config
-		}),
-		pluginConfig
-	});
-	return {
-		agentId: target?.agentId ?? fallback.agentId,
-		agentDir,
-		...connection.clientAuthProfileId !== void 0 ? { authProfileId: connection.clientAuthProfileId } : {},
-		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {},
-		...ctx.sessionKey ? { sessionKey: ctx.sessionKey } : {},
-		...ctx.sessionId ? { sessionId: ctx.sessionId } : {}
-	};
-}
-function conversationBindingIdentity(bindingId) {
-	return {
-		kind: "conversation",
-		bindingId
-	};
+function conversationBindingIdentity(bindingId) {
+	return {
+		kind: "conversation",
+		bindingId
+	};
 }
 function resolveCodexConversationControlScope(ctx) {
 	const { sessionAgentId } = resolveSessionAgentIds({
@@ -1113,8 +1113,6 @@ function resolveCodexConversationControlScope(ctx) {
 		agentDir: resolveAgentDir(ctx.config, sessionAgentId)
 	};
 }
-//#endregion
-//#region extensions/codex/src/command-diagnostics.ts
 async function handleCodexDiagnosticsFeedback(deps, ctx, pluginConfig, args, commandPrefix) {
 	if (ctx.senderIsOwner !== true) return { text: "Only an owner can send Codex diagnostics." };
 	const parsed = parseDiagnosticsArgs(args);
@@ -1241,20 +1239,6 @@ async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, n
 	const sent = [];
 	const failed = [];
 	for (const target of targets) {
-		let connection;
-		try {
-			connection = resolveCodexBindingAppServerConnection({
-				binding: target,
-				authProfileId: target.authProfileId,
-				pluginConfig
-			});
-		} catch (error) {
-			failed.push({
-				target,
-				error: error instanceof Error ? error.message : String(error)
-			});
-			continue;
-		}
 		const response = await deps.safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.feedback, {
 			classification: "bug",
 			threadId: target.threadId,
@@ -1264,8 +1248,7 @@ async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, n
 		}, {
 			config: ctx.config,
 			agentDir: target.agentDir,
-			...connection.clientAuthProfileId !== void 0 ? { authProfileId: connection.clientAuthProfileId } : {},
-			...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {},
+			...target.authProfileId ? { authProfileId: target.authProfileId } : {},
 			...target.sessionId ? { sessionId: target.sessionId } : {},
 			...target.sessionKey ? { sessionKey: target.sessionKey } : {}
 		});
@@ -1348,453 +1331,286 @@ async function resolvePendingCodexDiagnosticsTargets(deps, targets, config) {
 	return resolved;
 }
 function resolveCodexDiagnosticsTarget(target, binding, config) {
-	const candidate = {
-		identity: target.identity,
-		agentDir: target.agentDir,
-		sessionKey: target.sessionKey,
-		sessionId: target.sessionId,
-		channel: target.channel,
-		channelId: target.channelId,
-		accountId: target.accountId,
-		messageThreadId: target.messageThreadId,
-		threadParentId: target.threadParentId
-	};
-	if (binding.connectionScope === "supervision") return {
-		...candidate,
-		threadId: binding.threadId,
-		connectionScope: binding.connectionScope,
-		appServerRuntimeFingerprint: binding.appServerRuntimeFingerprint,
-		pendingSupervisionBranch: binding.pendingSupervisionBranch
-	};
 	const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
 		authProfileId: binding.authProfileId,
 		agentDir: target.agentDir,
 		config
 	});
 	return {
-		...candidate,
+		...target,
 		threadId: binding.threadId,
 		authProfileId
 	};
 }
-//#endregion
-//#region extensions/codex/src/command-handler-bindings.ts
-function isCurrentSessionModelSelectionLocked(ctx) {
-	const sessionKey = ctx.sessionKey?.trim();
-	if (!sessionKey) return false;
-	const { agentId } = resolveCodexConversationControlScope(ctx);
-	return isModelSelectionLocked(getSessionEntry({
-		storePath: resolveStorePath(ctx.config.session?.store, { agentId }),
-		sessionKey,
-		hydrateSkillPromptRefs: false,
-		readConsistency: "latest"
-	}));
+function codexDiagnosticsTargetsMatch(expected, actual) {
+	const fingerprint = (target) => JSON.stringify([
+		bindingStoreKey(target.identity),
+		target.threadId,
+		target.authProfileId ?? null
+	]);
+	const expectedTargets = expected.map(fingerprint).toSorted();
+	const actualTargets = actual.map(fingerprint).toSorted();
+	return expectedTargets.length === actualTargets.length && expectedTargets.every((target, index) => target === actualTargets[index]);
 }
-async function bindConversation(deps, ctx, pluginConfig, args) {
-	const parsed = parseBindArgs(args);
-	if (parsed.help) return { text: "Usage: /codex bind [thread-id] [--cwd <path>] [--model <model>] [--provider <provider>]" };
-	if (isCurrentSessionModelSelectionLocked(ctx)) return { text: MODEL_SELECTION_LOCKED_MESSAGE };
-	const scope = resolveCodexConversationControlScope(ctx);
-	const workspaceDir = parsed.cwd ?? deps.resolveCodexDefaultWorkspaceDir(pluginConfig);
-	const currentConversation = await ctx.getCurrentConversationBinding();
-	const currentConversationData = readCodexConversationBindingData(currentConversation);
-	const bindingId = currentConversationData?.kind === "codex-app-server-session" ? currentConversationData.bindingId : currentConversation ? `conversation-${currentConversation.bindingId}` : void 0;
-	const sessionOwner = ctx.sessionId ? sessionBindingIdentity({
-		sessionId: ctx.sessionId,
-		sessionKey: ctx.sessionKey,
-		agentId: scope.agentId,
-		config: ctx.config
-	}) : void 0;
-	const currentOwner = currentConversationData?.kind === "codex-app-server-session" ? conversationBindingIdentity(currentConversationData.bindingId) : sessionOwner;
-	const existingBinding = currentOwner ? await deps.bindingStore.read(currentOwner) : void 0;
-	assertCodexBindingMayBeReplaced(existingBinding, "binding this conversation to another thread");
-	const sessionSource = sessionOwner && existingBinding ? {
-		agentId: sessionOwner.agentId,
-		sessionId: sessionOwner.sessionId,
-		threadId: existingBinding.threadId,
-		...sessionOwner.sessionKey ? { sessionKey: sessionOwner.sessionKey } : {}
-	} : void 0;
-	const authProfileId = existingBinding?.authProfileId;
-	const data = createCodexConversationBindingData({
-		bindingId,
-		workspaceDir,
-		agentId: scope.agentId,
-		agentDir: scope.agentDir,
-		source: currentConversationData?.kind === "codex-app-server-session" ? currentConversationData.source : sessionSource,
-		start: {
-			id: crypto.randomUUID(),
-			threadId: parsed.threadId,
-			model: parsed.model,
-			modelProvider: parsed.provider,
-			authProfileId
-		}
-	});
-	const threadLabel = parsed.threadId ?? "a new thread";
-	const request = await ctx.requestConversationBinding({
-		summary: `Codex app-server thread ${formatCodexDisplayText(threadLabel)} in ${formatCodexDisplayText(workspaceDir)}`,
-		detachHint: "/codex detach",
-		data
+function formatCodexDiagnosticsUploadResult(sent, failed) {
+	const lines = [];
+	if (sent.length > 0) {
+		lines.push("Codex diagnostics sent to OpenAI servers:");
+		lines.push(...formatCodexDiagnosticsTargetLines(sent));
+		lines.push("Included Codex logs and spawned Codex subthreads when available.");
+	}
+	if (failed.length > 0) {
+		if (lines.length > 0) lines.push("");
+		lines.push("Could not send Codex diagnostics:");
+		lines.push(...failed.map(({ target, error }) => `${formatCodexDiagnosticsTargetLine(target)}: ${formatCodexErrorForDisplay(error)}`));
+		lines.push("Inspect locally:");
+		lines.push(...failed.map(({ target }) => `- ${formatCodexResumeCommandForDisplay(target.threadId)}`));
+	}
+	return lines.join("\n");
+}
+function formatCodexDiagnosticsTargetLines(targets) {
+	return targets.flatMap((target, index) => {
+		const lines = formatCodexDiagnosticsTargetBlock(target, index);
+		return index < targets.length - 1 ? [...lines, ""] : lines;
 	});
-	if (request.status === "pending") return request.reply;
-	if (request.status === "error") return { text: formatCodexDisplayText(request.message) };
-	return { text: `Bound this conversation to ${formatCodexDisplayText(threadLabel)} in ${formatCodexDisplayText(workspaceDir)}. The next message will initialize it.` };
 }
-async function detachConversation(deps, ctx) {
-	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
-	if (data?.kind === "codex-app-server-session") assertCodexBindingMayBeReplaced(await deps.bindingStore.read(conversationBindingIdentity(data.bindingId)), "detaching its conversation binding");
-	const detached = await ctx.detachConversationBinding();
-	if (data?.kind === "codex-app-server-session") await deps.bindingStore.mutate(conversationBindingIdentity(data.bindingId), { kind: "clear" });
-	return detached.removed ? "Detached this conversation from Codex." : "No Codex conversation binding was attached.";
+function formatCodexDiagnosticsTargetBlock(target, index) {
+	const lines = [`Session ${index + 1}`];
+	if (target.channel) lines.push(`Channel: ${formatCodexValueForDisplay(target.channel)}`);
+	if (target.sessionKey) lines.push(`OpenClaw session key: ${formatCodexCopyableValueForDisplay(target.sessionKey)}`);
+	if (target.sessionId) lines.push(`OpenClaw session id: ${formatCodexCopyableValueForDisplay(target.sessionId)}`);
+	lines.push(`Codex thread id: ${formatCodexCopyableValueForDisplay(target.threadId)}`);
+	lines.push(`Inspect locally: ${formatCodexResumeCommandForDisplay(target.threadId)}`);
+	return lines;
 }
-async function describeConversationBinding(deps, ctx) {
-	const current = await ctx.getCurrentConversationBinding();
-	const data = readCodexConversationBindingData(current);
-	if (!current || !data) return "No Codex conversation binding is attached.";
-	if (data.kind === "codex-cli-node-session") return [
-		"Codex conversation binding:",
-		"- Mode: Codex CLI node session",
-		`- Node: ${formatCodexDisplayText(data.nodeId)}`,
-		`- Session: ${formatCodexDisplayText(data.sessionId)}`,
-		`- Workspace: ${formatCodexDisplayText(data.cwd ?? "unknown")}`,
-		"- Active run: not tracked"
-	].join("\n");
-	const identity = conversationBindingIdentity(data.bindingId);
-	const threadBinding = await deps.bindingStore.read(identity);
-	const active = deps.readCodexConversationActiveTurn(identity);
-	return [
-		"Codex conversation binding:",
-		`- Thread: ${formatCodexDisplayText(threadBinding?.threadId ?? "unknown")}`,
-		`- Workspace: ${formatCodexDisplayText(data.workspaceDir)}`,
-		`- Model: ${formatCodexDisplayText(threadBinding?.model ?? "default")}`,
-		`- Fast: ${isCodexFastServiceTier(threadBinding?.serviceTier) ? "on" : "off"}`,
-		`- Permissions: ${threadBinding ? formatPermissionsMode(threadBinding) : "default"}`,
-		`- Active run: ${formatCodexDisplayText(active ? active.turnId : "none")}`,
-		`- Binding: ${formatCodexDisplayText(data.bindingId)}`
-	].join("\n");
+function formatCodexDiagnosticsTargetLine(target) {
+	const parts = [];
+	if (target.channel) parts.push(`channel ${formatCodexValueForDisplay(target.channel)}`);
+	const sessionLabel = target.sessionId || target.sessionKey;
+	if (sessionLabel) parts.push(`OpenClaw session ${formatCodexValueForDisplay(sessionLabel)}`);
+	parts.push(`Codex thread ${formatCodexThreadIdForDisplay(target.threadId)}`);
+	return `- ${parts.join(", ")}`;
 }
-async function buildThreads(deps, ctx, pluginConfig, filter) {
-	const scope = await resolveCommandAppServerScope(deps, ctx, pluginConfig);
-	return formatThreads(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listThreads, {
-		limit: 10,
-		...filter.trim() ? { searchTerm: filter.trim() } : {}
-	}, {
-		config: ctx.config,
-		...scope
-	}));
+function normalizeDiagnosticsReason(note) {
+	const normalized = normalizeOptionalString(note);
+	return normalized ? normalized.slice(0, CODEX_DIAGNOSTICS_REASON_MAX_CHARS) : void 0;
 }
-async function buildCodexCliSessions(deps, args) {
-	const parsed = parseCodexCliSessionsArgs(args);
-	if (parsed.help || !parsed.host) return "Usage: /codex sessions --host <node> [filter] [--limit <n>]";
-	return formatCodexCliSessions(await deps.listCodexCliSessionsOnNode({
-		requestedNode: parsed.host,
-		filter: parsed.filter,
-		limit: parsed.limit
-	}));
+function parseDiagnosticsArgs(args) {
+	const [action, token, ...extra] = splitArgs(args);
+	const normalizedAction = action?.toLowerCase();
+	if ((normalizedAction === "confirm" || normalizedAction === "--confirm") && token && extra.length === 0) return {
+		action: "confirm",
+		token
+	};
+	if ((normalizedAction === "cancel" || normalizedAction === "--cancel") && token && extra.length === 0) return {
+		action: "cancel",
+		token
+	};
+	if (normalizedAction === "confirm" || normalizedAction === "--confirm" || normalizedAction === "cancel" || normalizedAction === "--cancel") return { action: "usage" };
+	return {
+		action: "request",
+		note: args
+	};
 }
-async function resumeThread(deps, ctx, pluginConfig, args) {
-	const parsed = parseResumeArgs(args);
-	const normalizedThreadId = parsed.threadId?.trim();
-	if (parsed.help) return args.includes("--help") || args.includes("-h") || parsed.host ? "Usage: /codex resume <thread-id>\nUsage: /codex resume <session-id> --host <node> --bind here" : "Usage: /codex resume <thread-id>";
-	if (parsed.host) return await bindCodexCliNodeSession(deps, ctx, parsed);
-	if (!normalizedThreadId || args.length !== 1) return "Usage: /codex resume <thread-id>";
-	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	if (!ctx.sessionId) return "Cannot attach a Codex thread because this command did not include an OpenClaw session id.";
-	const scope = resolveCodexConversationControlScope(ctx);
-	const identity = sessionBindingIdentity({
-		sessionId: ctx.sessionId,
-		sessionKey: ctx.sessionKey,
-		agentId: scope.agentId,
-		config: ctx.config
-	});
-	return await deps.bindingStore.withLease(identity, async () => {
-		if (!await reclaimCurrentCodexSessionGeneration({
-			bindingStore: deps.bindingStore,
-			identity,
-			config: ctx.config
-		})) throw createCodexSessionGenerationSupersededError(identity.sessionId);
-		const currentBinding = await deps.bindingStore.read(identity);
-		assertCodexBindingMayBeReplaced(currentBinding, "attaching a different resumed thread");
-		const authProfileId = resolveCodexAppServerAuthProfileIdForAgent({
-			authProfileId: currentBinding?.authProfileId,
-			agentDir: scope.agentDir,
-			config: ctx.config
-		});
-		const response = assertCodexThreadResumeResponse(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
-			threadId: normalizedThreadId,
-			excludeTurns: true
-		}, {
-			config: ctx.config,
-			agentDir: scope.agentDir,
-			authProfileId,
-			sessionKey: ctx.sessionKey,
-			sessionId: ctx.sessionId
-		}));
-		const effectiveThreadId = response.thread.id;
-		if (effectiveThreadId !== normalizedThreadId) throw new Error(`Codex thread/resume returned ${effectiveThreadId} for ${normalizedThreadId}`);
-		const resumedCwd = response.thread.cwd;
-		if (typeof resumedCwd !== "string") throw new Error(`Codex thread/resume returned no cwd for ${normalizedThreadId}`);
-		const modelProvider = normalizeCodexAppServerBindingModelProvider({
-			authProfileId,
-			modelProvider: response.modelProvider ?? void 0,
-			agentDir: scope.agentDir,
-			config: ctx.config
-		});
-		assertCodexBindingMayBeReplaced(await deps.bindingStore.read(identity), "committing a different resumed thread");
-		if (!await deps.bindingStore.mutate(identity, {
-			kind: "set",
-			binding: {
-				threadId: effectiveThreadId,
-				cwd: resumedCwd,
-				authProfileId,
-				model: response.model,
-				modelProvider,
-				historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
-			}
-		})) throw new Error("Codex thread binding changed while attaching the resumed thread.");
-		return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(effectiveThreadId)}.`;
-	});
+function formatDiagnosticsUsage(commandPrefix) {
+	return [
+		`Usage: ${commandPrefix} [note]`,
+		`Usage: ${commandPrefix} confirm <token>`,
+		`Usage: ${commandPrefix} cancel <token>`
+	].join("\n");
 }
-async function bindCodexCliNodeSession(deps, ctx, parsed) {
-	if (!parsed.threadId || !parsed.host || parsed.bindHere !== true) return "Usage: /codex resume <session-id> --host <node> --bind here";
-	if (isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	if (ctx.sessionId) {
-		const scope = resolveCodexConversationControlScope(ctx);
-		assertCodexBindingMayBeReplaced(await deps.bindingStore.read(sessionBindingIdentity({
-			sessionId: ctx.sessionId,
-			sessionKey: ctx.sessionKey,
-			agentId: scope.agentId,
-			config: ctx.config
-		})), "binding a Codex CLI node session");
+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);
 	}
-	const resolved = await deps.resolveCodexCliSessionForBindingOnNode({
-		requestedNode: parsed.host,
-		sessionId: parsed.threadId
-	});
-	if (!resolved.session) return `No Codex CLI session ${formatCodexDisplayText(parsed.threadId)} was found on ${formatCodexDisplayText(parsed.host)}.`;
-	const nodeId = resolved.node.nodeId;
-	if (!nodeId) return "Cannot bind Codex CLI session because the selected node did not include a node id.";
-	const scope = resolveCodexConversationControlScope(ctx);
-	const data = createCodexCliNodeConversationBindingData({
-		nodeId,
-		sessionId: parsed.threadId,
-		agentId: scope.agentId,
-		cwd: resolved.session?.cwd
-	});
-	const summary = `Codex CLI session ${formatCodexDisplayText(parsed.threadId)} on ${formatCodexDisplayText(nodeId)}`;
-	const request = await ctx.requestConversationBinding({
-		summary,
-		detachHint: "/codex detach",
-		data
+	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(params.scopeKey) ?? [];
+	while (scopeTokens.length >= CODEX_DIAGNOSTICS_CONFIRMATION_MAX_REQUESTS_PER_SCOPE) {
+		const oldestToken = scopeTokens.shift();
+		if (!oldestToken) break;
+		pendingCodexDiagnosticsConfirmations.delete(oldestToken);
+	}
+	const token = crypto.randomBytes(6).toString("hex");
+	scopeTokens.push(token);
+	pendingCodexDiagnosticsConfirmationTokensByScope.set(params.scopeKey, scopeTokens);
+	pendingCodexDiagnosticsConfirmations.set(token, {
+		token,
+		targets: params.targets,
+		note: params.note,
+		senderId: params.senderId,
+		channel: params.channel,
+		accountId: params.accountId,
+		channelId: params.channelId,
+		messageThreadId: params.messageThreadId,
+		threadParentId: params.threadParentId,
+		sessionKey: params.sessionKey,
+		scopeKey: params.scopeKey,
+		...params.privateRouted === void 0 ? {} : { privateRouted: params.privateRouted },
+		createdAt: params.now
 	});
-	if (request.status === "bound") return `Bound this conversation to Codex CLI session ${formatCodexDisplayText(parsed.threadId)} on ${formatCodexDisplayText(nodeId)}.`;
-	if (request.status === "pending") return request.reply.text ?? "Codex CLI session binding is pending approval.";
-	return formatCodexDisplayText(request.message);
+	return token;
 }
-//#endregion
-//#region extensions/codex/src/command-handler-actions.ts
-const CODEX_NATIVE_EXECUTION_SUBCOMMANDS = /* @__PURE__ */ new Set([
-	"bind",
-	"resume",
-	"steer",
-	"model",
-	"fast",
-	"permissions",
-	"compact",
-	"review",
-	"goal"
-]);
-const CODEX_NATIVE_CONTROL_SUBCOMMANDS = /* @__PURE__ */ new Set([
-	...CODEX_NATIVE_EXECUTION_SUBCOMMANDS,
-	"detach",
-	"unbind",
-	"stop"
-]);
-function resolveCodexNativeCommandSandboxBlock(ctx, subcommand, args) {
-	if (isReadOnlyCodexGoalCommand(subcommand, args)) return;
-	if (!CODEX_NATIVE_EXECUTION_SUBCOMMANDS.has(subcommand)) return;
-	if (returnsBeforeNativeCodexExecution(subcommand, args)) return;
-	if (isCodexCliNodeResumeBind(subcommand, args)) return resolveCodexNativeSandboxBlock({
-		config: ctx.config,
-		sessionKey: ctx.sessionKey,
-		sessionId: ctx.sessionId,
-		surface: `/${["codex", subcommand].join(" ")}`
-	});
-	return resolveCodexNativeExecutionBlock({
-		config: ctx.config,
-		agentId: ctx.agentId,
-		sessionKey: ctx.sessionKey,
-		sessionId: ctx.sessionId,
-		surface: `/${["codex", subcommand].join(" ")}`
-	});
+function readCodexDiagnosticsConfirmationScope(ctx) {
+	return {
+		accountId: normalizeCodexDiagnosticsScopeField(ctx.accountId),
+		channelId: normalizeCodexDiagnosticsScopeField(ctx.channelId),
+		messageThreadId: typeof ctx.messageThreadId === "string" || typeof ctx.messageThreadId === "number" ? normalizeCodexDiagnosticsScopeField(String(ctx.messageThreadId)) : void 0,
+		threadParentId: normalizeCodexDiagnosticsScopeField(ctx.threadParentId),
+		sessionKey: normalizeCodexDiagnosticsScopeField(ctx.sessionKey)
+	};
 }
-function isReadOnlyCodexGoalCommand(subcommand, args) {
-	if (subcommand !== "goal" || args.length > 1) return false;
-	const action = (args[0] ?? "status").toLowerCase();
-	return action === "status" || action === "get";
+function readCodexDiagnosticsScopeMismatch(pending, ctx) {
+	const current = readCodexDiagnosticsConfirmationScope(ctx);
+	if (pending.accountId !== current.accountId) return {
+		confirmMessage: "This Codex diagnostics confirmation belongs to a different account.",
+		cancelMessage: "This Codex diagnostics confirmation belongs to a different account."
+	};
+	if (pending.privateRouted) return;
+	if (pending.channelId !== current.channelId) return {
+		confirmMessage: "This Codex diagnostics confirmation belongs to a different channel instance.",
+		cancelMessage: "This Codex diagnostics confirmation belongs to a different channel instance."
+	};
+	if (pending.messageThreadId !== current.messageThreadId) return {
+		confirmMessage: "This Codex diagnostics confirmation belongs to a different thread.",
+		cancelMessage: "This Codex diagnostics confirmation belongs to a different thread."
+	};
+	if (pending.threadParentId !== current.threadParentId) return {
+		confirmMessage: "This Codex diagnostics confirmation belongs to a different parent thread.",
+		cancelMessage: "This Codex diagnostics confirmation belongs to a different parent thread."
+	};
+	if (pending.sessionKey !== current.sessionKey) return {
+		confirmMessage: "This Codex diagnostics confirmation belongs to a different session.",
+		cancelMessage: "This Codex diagnostics confirmation belongs to a different session."
+	};
 }
-function returnsBeforeNativeCodexExecution(subcommand, args) {
-	switch (subcommand) {
-		case "bind": return parseBindArgs([...args]).help === true;
-		case "resume": return returnsBeforeNativeCodexResume(args);
-		case "steer": return args.join(" ").trim() === "";
-		case "model": return args.length === 0 || args.length > 1;
-		case "fast": return args.length === 0 || args.length > 1 || parseCodexFastModeArg(args[0]) === void 0;
-		case "permissions": return args.length === 0 || args.length > 1 || parseCodexPermissionsModeArg(args[0]) === void 0;
-		case "compact":
-		case "review":
-		case "detach":
-		case "unbind":
-		case "stop": return args.length > 0;
-		default: return false;
-	}
+function readPendingCodexDiagnosticsConfirmation(token, now) {
+	prunePendingCodexDiagnosticsConfirmations(now);
+	return pendingCodexDiagnosticsConfirmations.get(token);
 }
-function isCodexCliNodeResumeBind(subcommand, args) {
-	if (subcommand !== "resume") return false;
-	const parsed = parseResumeArgs([...args]);
-	return Boolean(parsed.host && parsed.threadId && parsed.bindHere === true && !parsed.help);
+function prunePendingCodexDiagnosticsConfirmations(now) {
+	for (const [token, pending] of pendingCodexDiagnosticsConfirmations) if (now - pending.createdAt >= CODEX_DIAGNOSTICS_CONFIRMATION_TTL_MS) deletePendingCodexDiagnosticsConfirmation(token);
 }
-function returnsBeforeNativeCodexResume(args) {
-	const parsed = parseResumeArgs([...args]);
-	const normalizedThreadId = parsed.threadId?.trim();
-	if (parsed.help) return true;
-	if (parsed.host) return !normalizedThreadId || parsed.bindHere !== true;
-	return !normalizedThreadId || args.length !== 1;
+function deletePendingCodexDiagnosticsConfirmation(token) {
+	const pending = pendingCodexDiagnosticsConfirmations.get(token);
+	pendingCodexDiagnosticsConfirmations.delete(token);
+	if (!pending) return;
+	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(pending.scopeKey);
+	if (!scopeTokens) return;
+	const tokenIndex = scopeTokens.indexOf(token);
+	if (tokenIndex >= 0) scopeTokens.splice(tokenIndex, 1);
+	if (scopeTokens.length === 0) pendingCodexDiagnosticsConfirmationTokensByScope.delete(pending.scopeKey);
 }
-async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
-	const parsed = parseComputerUseArgs(args);
-	if (parsed.help) return ["Usage: /codex computer-use [status|install] [--source <marketplace-source>] [--marketplace-path <path>] [--marketplace <name>]", "Checks or installs the configured Codex Computer Use plugin through app-server."].join("\n");
-	if (Object.keys(parsed.persistentIdentity).length > 0) return formatComputerUsePersistentIdentityMigration(parsed);
-	if (parsed.action === "install" && !canMutateCodexHost(ctx)) return "Only an owner or operator.admin gateway client can configure Codex Computer Use.";
-	const { agentDir } = resolveCodexConversationControlScope(ctx);
-	const params = {
-		pluginConfig,
-		config: ctx.config,
-		agentDir,
-		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));
-	return formatComputerUseStatus(await deps.readCodexComputerUseStatus(params));
+function deletePendingCodexDiagnosticsConfirmationScope(scopeKey) {
+	const scopeTokens = pendingCodexDiagnosticsConfirmationTokensByScope.get(scopeKey) ?? [];
+	for (const token of scopeTokens) pendingCodexDiagnosticsConfirmations.delete(token);
+	pendingCodexDiagnosticsConfirmationTokensByScope.delete(scopeKey);
 }
-async function handleNativeGoal(deps, ctx, pluginConfig, args) {
-	const action = (args[0] ?? "status").toLowerCase();
-	const objective = args.slice(1).join(" ").trim();
-	const target = await resolveControlTarget(ctx);
-	if (!target) return "Cannot manage the Codex goal because this command has no stable binding identity.";
-	const binding = await deps.bindingStore.read(target.identity);
-	if (!binding?.threadId) return "No Codex thread is attached to this OpenClaw session yet.";
-	const connection = resolveCodexBindingAppServerConnection({
-		binding,
-		authProfileId: binding.authProfileId,
-		pluginConfig
-	});
-	const goalRequestOptions = {
-		agentDir: target.agentDir,
-		authProfileId: connection.clientAuthProfileId,
-		config: ctx.config,
-		...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));
+function buildDiagnosticsTags(ctx) {
+	const tags = { source: CODEX_DIAGNOSTICS_SOURCE };
+	addTag(tags, "channel", ctx.channel);
+	return tags;
+}
+function addTag(tags, key, value) {
+	if (typeof value === "string" && value.trim()) tags[key] = value.trim();
+}
+function formatCodexThreadIdForDisplay(threadId) {
+	return escapeCodexChatText(formatCodexTextForDisplay(threadId));
+}
+function formatCodexValueForDisplay(value) {
+	return escapeCodexChatText(formatCodexTextForDisplay(value));
+}
+function formatCodexCopyableValueForDisplay(value) {
+	const safe = formatCodexTextForDisplay(value);
+	if (CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safe)) return `\`${safe}\``;
+	return escapeCodexChatText(safe);
+}
+function formatCodexTextForDisplay(value) {
+	let safe = "";
+	for (const character of value) {
+		const codePoint = character.codePointAt(0);
+		safe += codePoint != null && isUnsafeDisplayCodePoint(codePoint) ? "?" : character;
 	}
-	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);
-		return isJsonObject(response) && response.cleared === true ? "Cleared the Codex goal." : "No Codex goal was active.";
+	safe = safe.trim();
+	return safe || "<unknown>";
+}
+function escapeCodexChatText(value) {
+	return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("@", "＠").replaceAll("`", "｀").replaceAll("[", "［").replaceAll("]", "］").replaceAll("(", "（").replaceAll(")", "）").replaceAll("*", "∗").replaceAll("_", "＿").replaceAll("~", "～").replaceAll("|", "｜");
+}
+function readCodexDiagnosticsCooldownMs(threadId, now) {
+	const lastSentAt = lastCodexDiagnosticsUploadByThread.get(threadId);
+	if (!lastSentAt) return 0;
+	const remainingMs = Math.max(0, CODEX_DIAGNOSTICS_COOLDOWN_MS - (now - lastSentAt));
+	if (remainingMs === 0) lastCodexDiagnosticsUploadByThread.delete(threadId);
+	return remainingMs;
+}
+function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options = {}) {
+	for (const target of targets) {
+		const cooldownMs = readCodexDiagnosticsCooldownMs(target.threadId, now);
+		if (cooldownMs > 0) {
+			if (options.includeThreadId === false) return `Codex diagnostics were already sent for one of these Codex threads recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
+			return `Codex diagnostics were already sent for thread ${formatCodexThreadIdForDisplay(target.threadId)} recently. Try again in ${Math.ceil(cooldownMs / 1e3)}s.`;
+		}
 	}
-	const requestedStatus = action === "pause" ? "paused" : action === "resume" ? "active" : action === "block" ? "blocked" : action === "complete" ? "complete" : void 0;
-	const isObjectiveUpdate = action === "set";
-	if (!requestedStatus && !isObjectiveUpdate || isObjectiveUpdate && !objective) return "Usage: /codex goal [status|set <objective>|pause|resume|block|complete|clear]";
-	if (requestedStatus && args.length > 1) return `Usage: /codex goal ${action}`;
-	return formatNativeGoal(await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.setThreadGoal, {
-		threadId: binding.threadId,
-		...objective ? { objective } : {},
-		...requestedStatus ? { status: requestedStatus } : {}
-	}, goalRequestOptions));
-}
-function formatNativeGoal(response) {
-	const goal = isJsonObject(response) && isJsonObject(response.goal) ? response.goal : void 0;
-	if (!goal) return "No Codex goal is active.";
-	const objective = readString$1(goal, "objective") ?? "unknown";
-	const status = readString$1(goal, "status") ?? "unknown";
-	const tokensUsed = typeof goal.tokensUsed === "number" ? goal.tokensUsed : 0;
-	const tokenBudget = typeof goal.tokenBudget === "number" ? goal.tokenBudget : void 0;
-	return [
-		`Codex goal: ${formatCodexDisplayText(objective)}`,
-		`- Status: ${formatCodexDisplayText(status)}`,
-		`- Tokens: ${tokensUsed}${tokenBudget === void 0 ? "" : ` / ${tokenBudget}`}`
-	].join("\n");
+	const scopeCooldownMs = readCodexDiagnosticsScopeCooldownMs(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.`;
 }
-async function stopConversationTurn(deps, ctx, pluginConfig) {
-	const target = await resolveControlTarget(ctx);
-	if (!target) return "Cannot stop Codex because this command did not include a stable binding identity.";
-	return (await deps.stopCodexConversationTurn({
-		identity: target.identity,
-		bindingStore: deps.bindingStore,
-		pluginConfig,
-		agentDir: target.agentDir,
-		config: ctx.config
-	})).message;
+function readCodexDiagnosticsScopeCooldownMs(scope, now) {
+	const lastSentAt = lastCodexDiagnosticsUploadByScope.get(scope);
+	if (!lastSentAt) return 0;
+	const remainingMs = Math.max(0, CODEX_DIAGNOSTICS_COOLDOWN_MS - (now - lastSentAt));
+	if (remainingMs === 0) lastCodexDiagnosticsUploadByScope.delete(scope);
+	return remainingMs;
 }
-async function steerConversationTurn(deps, ctx, pluginConfig, message) {
-	const target = await resolveControlTarget(ctx);
-	if (!target) return "Cannot steer Codex because this command did not include a stable binding identity.";
-	return (await deps.steerCodexConversationTurn({
-		identity: target.identity,
-		bindingStore: deps.bindingStore,
-		message,
-		pluginConfig,
-		agentDir: target.agentDir,
-		config: ctx.config
-	})).message;
+function recordCodexDiagnosticsUpload(threadId, ctx, now, cooldownScope) {
+	pruneCodexDiagnosticsCooldowns(now);
+	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByScope, cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES, now);
+	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByThread, threadId, CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS, now);
 }
-async function setConversationModel(deps, ctx, pluginConfig, args) {
-	if (args.length > 1) return "Usage: /codex model <model>";
-	const [model = ""] = args;
-	const normalized = model.trim();
-	if (normalized && isCurrentSessionModelSelectionLocked(ctx)) return MODEL_SELECTION_LOCKED_MESSAGE;
-	const target = await resolveControlTarget(ctx);
-	if (!target) return "Cannot set Codex model because this command did not include a stable binding identity.";
-	if (!normalized) {
-		const binding = await deps.bindingStore.read(target.identity);
-		return binding?.model ? `Codex model: ${formatCodexDisplayText(binding.model)}` : "Usage: /codex model <model>";
+function recordBoundedCodexDiagnosticsCooldown(map, key, maxSize, now) {
+	if (!map.has(key)) while (map.size >= maxSize) {
+		const oldestKey = map.keys().next().value;
+		if (typeof oldestKey !== "string") break;
+		map.delete(oldestKey);
 	}
-	return await deps.setCodexConversationModel({
-		identity: target.identity,
-		bindingStore: deps.bindingStore,
-		pluginConfig,
-		model: normalized,
-		agentDir: target.agentDir,
-		config: ctx.config
-	});
+	map.set(key, now);
 }
-async function setConversationFastMode(deps, ctx, args) {
-	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
-	const target = await resolveControlTarget(ctx);
-	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,
-		enabled: parsed
+function readCodexDiagnosticsCooldownScope(ctx) {
+	const scope = readCodexDiagnosticsConfirmationScope(ctx);
+	const payload = JSON.stringify({
+		accountId: scope.accountId ?? null,
+		channelId: scope.channelId ?? null,
+		sessionKey: scope.sessionKey ?? null,
+		messageThreadId: scope.messageThreadId ?? null,
+		threadParentId: scope.threadParentId ?? null,
+		senderId: normalizeCodexDiagnosticsScopeField(ctx.senderId) ?? null,
+		channel: normalizeCodexDiagnosticsScopeField(ctx.channel) ?? ""
 	});
+	return crypto.createHash("sha256").update(payload).digest("hex");
 }
-async function setConversationPermissions(deps, ctx, args) {
-	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
-	const target = await resolveControlTarget(ctx);
-	if (!target) return "Cannot set Codex permissions because this command did not include a stable binding identity.";
-	const value = args[0];
-	const parsed = parseCodexPermissionsModeArg(value);
-	if (value && !parsed && value.trim().toLowerCase() !== "status") return "Usage: /codex permissions [default|yolo|status]";
-	return await deps.setCodexConversationPermissions({
-		identity: target.identity,
-		bindingStore: deps.bindingStore,
-		mode: parsed
-	});
+function pruneCodexDiagnosticsCooldowns(now) {
+	pruneCodexDiagnosticsCooldownMap(lastCodexDiagnosticsUploadByThread, now);
+	pruneCodexDiagnosticsCooldownMap(lastCodexDiagnosticsUploadByScope, now);
+}
+function pruneCodexDiagnosticsCooldownMap(map, now) {
+	for (const [key, lastSentAt] of map) if (now - lastSentAt >= CODEX_DIAGNOSTICS_COOLDOWN_MS) map.delete(key);
+}
+function formatCodexErrorForDisplay(error) {
+	return escapeCodexChatText(formatCodexTextForDisplay(error).slice(0, CODEX_DIAGNOSTICS_ERROR_MAX_CHARS)) || "unknown error";
+}
+function formatCodexResumeCommandForDisplay(threadId) {
+	const safeThreadId = formatCodexTextForDisplay(threadId);
+	if (!CODEX_RESUME_SAFE_THREAD_ID_PATTERN.test(safeThreadId)) return "run codex resume and paste the thread id shown above";
+	return `\`codex resume ${safeThreadId}\``;
+}
+function isUnsafeDisplayCodePoint(codePoint) {
+	return codePoint <= 31 || codePoint >= 127 && codePoint <= 159 || codePoint === 173 || codePoint === 1564 || codePoint === 6158 || codePoint >= 8203 && codePoint <= 8207 || codePoint >= 8234 && codePoint <= 8238 || codePoint >= 8288 && codePoint <= 8303 || codePoint === 65279 || codePoint >= 65529 && codePoint <= 65531 || codePoint >= 917504 && codePoint <= 917631;
+}
+function normalizeCodexDiagnosticsScopeField(value) {
+	const normalized = normalizeOptionalString(value);
+	if (!normalized) return;
+	if (normalized.length <= CODEX_DIAGNOSTICS_SCOPE_FIELD_MAX_CHARS) return normalized;
+	return `sha256:${crypto.createHash("sha256").update(normalized).digest("hex")}`;
 }
 async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 	const label = kind === "compact" ? "compaction" : "review";
@@ -1803,264 +1619,285 @@ async function startThreadAction(deps, ctx, pluginConfig, kind, args) {
 	if (!target) return `Cannot start Codex ${label} because this command did not include a stable binding identity.`;
 	const binding = await deps.bindingStore.read(target.identity);
 	if (!binding?.threadId) return `No Codex thread is attached to this OpenClaw session yet.`;
-	const connection = resolveCodexBindingAppServerConnection({
-		binding,
-		authProfileId: binding.authProfileId,
-		pluginConfig
-	});
 	await deps.codexControlRequest(pluginConfig, kind === "compact" ? CODEX_CONTROL_METHODS.compact : CODEX_CONTROL_METHODS.review, kind === "review" ? {
 		threadId: binding.threadId,
 		target: { type: "uncommittedChanges" }
 	} : { threadId: binding.threadId }, {
 		agentDir: target.agentDir,
-		authProfileId: connection.clientAuthProfileId,
-		config: ctx.config,
-		...connection.usesSupervisionConnection ? { startOptions: connection.appServer.start } : {}
+		authProfileId: binding.authProfileId,
+		config: ctx.config
 	});
 	return `Started Codex ${label} for thread ${formatCodexDisplayText(binding.threadId)}.`;
 }
-//#endregion
-//#region extensions/codex/src/command-plugins-management.ts
-const POLICY_REFRESH_HINT = "New Codex conversations pick this up automatically. Use /new or /reset to refresh the current one.";
-async function handleCodexPluginsSubcommand(ctx, rest, io) {
-	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 (normalized === "list") {
-		if (args.length > 0) return { text: "Usage: /codex plugins list" };
-		const current = await io.readConfig();
-		return { text: formatPluginList(current.plugins ?? {}, { globalEnabled: current.enabled === true }) };
-	}
-	const target = args[0];
-	if (normalized === "enable" || normalized === "disable") {
-		if (args.length === 0) return buildPluginNamePickerReply(normalized, await io.readConfig());
-		if (!target || args.length > 1) return { text: `Usage: /codex plugins ${normalized} <name>` };
-		if (!canMutateCodexHost(ctx)) return { text: `Only an owner or operator.admin gateway client can run /codex plugins ${normalized}.` };
-		const wantEnabled = normalized === "enable";
-		if (!((await io.readConfig()).plugins ?? {})[target]) return { text: `Codex sub-plugin '${formatCodexDisplayText(target)}' is not configured. Run '/codex plugins list' to see configured plugins.` };
-		await io.mutate((block) => {
-			if (wantEnabled) block.enabled = true;
-			block.plugins ??= {};
-			block.plugins[target] = {
-				...block.plugins[target],
-				enabled: wantEnabled
-			};
-		});
-		return { text: `${formatCodexDisplayText(target)}: ${wantEnabled ? "enabled" : "disabled"} in openclaw.json. ${POLICY_REFRESH_HINT}` };
-	}
-	return { text: `Unknown /codex plugins subcommand: ${formatCodexDisplayText(verb)}\n\n${buildPluginsHelp()}` };
-}
-function buildPluginsMenuReply() {
-	return {
-		text: [
-			"Codex sub-plugins. Pick a sub-action or type:",
-			"",
-			"  1. /codex plugins list",
-			"  2. /codex plugins enable",
-			"  3. /codex plugins disable",
-			"  4. /codex plugins help",
-			"",
-			"Type '/codex' to go back to the main menu."
-		].join("\n"),
-		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", "Pick a Codex sub-plugin action:", [
-			{
-				label: "list",
-				command: "/codex plugins list"
-			},
-			{
-				label: "enable",
-				command: "/codex plugins enable"
-			},
-			{
-				label: "disable",
-				command: "/codex plugins disable"
-			},
-			{
-				label: "help",
-				command: "/codex plugins help"
-			},
-			{
-				label: "back",
-				command: "/codex"
+function splitArgs(value) {
+	const input = value ?? "";
+	const args = [];
+	let current = "";
+	let quote;
+	let escaping = false;
+	let tokenStarted = false;
+	for (const char of input) {
+		if (escaping) {
+			current += char;
+			escaping = false;
+			tokenStarted = true;
+			continue;
+		}
+		if (char === "\\" && quote !== "'") {
+			escaping = true;
+			tokenStarted = true;
+			continue;
+		}
+		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)) {
+			if (tokenStarted) {
+				args.push(current);
+				current = "";
+				tokenStarted = false;
 			}
-		])
-	};
-}
-function buildPluginNamePickerReply(verb, current) {
-	const globalEnabled = current.enabled === true;
-	const eligible = Object.entries(current.plugins ?? {}).toSorted(([left], [right]) => left.localeCompare(right)).filter(([, entry]) => {
-		const effectivelyEnabled = globalEnabled && entry.enabled !== false;
-		return verb === "disable" ? effectivelyEnabled : !effectivelyEnabled;
-	});
-	if (eligible.length === 0) return {
-		text: [
-			`No configured ${verb === "enable" ? "disabled" : "enabled"} Codex sub-plugins found.`,
-			"",
-			"Type '/codex plugins list' to inspect configured sub-plugins.",
-			"Type '/codex plugins menu' to go back to the plugins menu."
-		].join("\n"),
-		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", "Pick another Codex sub-plugin action:", [{
-			label: "list",
-			command: "/codex plugins list"
-		}, {
-			label: "back",
-			command: "/codex plugins menu"
-		}])
-	};
-	const buttons = [...eligible.map(([key]) => ({
-		label: formatCodexDisplayText(key),
-		command: `/codex plugins ${verb} ${key}`
-	})), {
-		label: "back",
-		command: "/codex plugins menu"
-	}];
-	return {
-		text: [
-			`Codex sub-plugins to ${verb}. Pick one or type:`,
-			"",
-			...eligible.map(([key], index) => `  ${index + 1}. /codex plugins ${verb} ${key}`),
-			"",
-			...verb === "enable" && !globalEnabled ? ["Global codexPlugins.enabled is off; enabling one configured sub-plugin turns it on.", ""] : [],
-			"Type '/codex plugins menu' to go back to the plugins menu."
-		].join("\n"),
-		presentation: buildCodexCommandPickerPresentation("Codex sub-plugins", `Pick a Codex sub-plugin to ${verb}:`, buttons)
-	};
-}
-function buildPluginsHelp() {
-	return [
-		"Codex sub-plugin management (writes only to ~/.openclaw/openclaw.json, never to ~/.codex/config.toml):",
-		"- /codex plugins                  (alias for list)",
-		"- /codex plugins list             show all configured Codex sub-plugins",
-		"- /codex plugins enable <name>    enable a configured sub-plugin",
-		"- /codex plugins disable <name>   disable a configured sub-plugin"
-	].join("\n");
-}
-function formatPluginList(plugins, options = {}) {
-	const globalEnabled = options.globalEnabled === true;
-	const keys = Object.keys(plugins).toSorted();
-	if (keys.length === 0) return "No Codex sub-plugins configured under plugins.entries.codex.config.codexPlugins.plugins";
-	const rows = keys.map((key) => {
-		const entry = plugins[key] ?? {};
-		const state = globalEnabled && entry.enabled !== false ? "ON " : "OFF";
-		return {
-			displayKey: formatCodexDisplayText(key),
-			state,
-			pluginName: formatCodexDisplayText(entry.pluginName ?? key),
-			marketplace: formatCodexDisplayText(entry.marketplaceName ?? "?")
-		};
-	});
-	const keyW = Math.max(...rows.map((r) => r.displayKey.length));
-	const pluginW = Math.max(...rows.map((r) => r.pluginName.length));
-	return [
-		"Codex sub-plugins in Openclaw config (~/.openclaw/openclaw.json):",
-		"",
-		...rows.map((r) => `  ${r.state}  ${r.displayKey.padEnd(keyW)}  ${r.pluginName.padEnd(pluginW)}  [${r.marketplace}]`),
-		"",
-		...globalEnabled ? [] : ["Global codexPlugins.enabled is off; configured sub-plugins are inactive.", ""],
-		"New Codex conversations pick up policy changes automatically; /new or /reset to refresh the current one."
-	].join("\n");
-}
-//#endregion
-//#region extensions/codex/src/command-handlers.ts
-async function handleCodexSubcommand(ctx, options) {
-	const deps = resolveCodexCommandDeps(options.deps);
-	const args = splitArgs(ctx.args);
-	if (args.length === 0) return buildCodexSubcommandPickerReply();
-	const [subcommand = "status", ...rest] = args;
-	const normalized = subcommand.toLowerCase();
-	if (normalized === "help") return { text: buildHelp() };
-	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 };
-	if (normalized === "plugins") {
-		if (!deps.codexPluginsManagementIo) return { text: "Codex sub-plugin management is not wired up (codexPluginsManagementIo dep is undefined). Edit ~/.openclaw/openclaw.json or use `openclaw config patch` until the runtime exposes the IO." };
-		return await handleCodexPluginsSubcommand(ctx, rest, deps.codexPluginsManagementIo);
-	}
-	if (normalized === "status") {
-		if (rest.length > 0) return { text: "Usage: /codex status" };
-		const { agentDir } = resolveCodexConversationControlScope(ctx);
-		return { text: formatCodexStatus(await deps.readCodexStatusProbes(options.pluginConfig, ctx.config, agentDir)) };
-	}
-	if (normalized === "models") {
-		if (rest.length > 0) return { text: "Usage: /codex models" };
-		const { agentDir } = resolveCodexConversationControlScope(ctx);
-		return { text: formatModels(await deps.listCodexAppServerModels(deps.requestOptions(options.pluginConfig, 100, ctx.config, agentDir))) };
-	}
-	if (normalized === "threads") return { text: await buildThreads(deps, ctx, options.pluginConfig, rest.join(" ")) };
-	if (normalized === "goal") return { text: await handleNativeGoal(deps, ctx, options.pluginConfig, rest) };
-	if (normalized === "sessions") return { text: await buildCodexCliSessions(deps, rest) };
-	if (normalized === "resume") return { text: await resumeThread(deps, ctx, options.pluginConfig, rest) };
-	if (normalized === "bind") return await bindConversation(deps, ctx, options.pluginConfig, rest);
-	if (normalized === "detach" || normalized === "unbind") {
-		if (rest.length > 0) return { text: "Usage: /codex detach" };
-		return { text: await detachConversation(deps, ctx) };
-	}
-	if (normalized === "binding") {
-		if (rest.length > 0) return { text: "Usage: /codex binding" };
-		return { text: await describeConversationBinding(deps, ctx) };
-	}
-	if (normalized === "stop") {
-		if (rest.length > 0) return { text: "Usage: /codex stop" };
-		return { text: await stopConversationTurn(deps, ctx, options.pluginConfig) };
-	}
-	if (normalized === "steer") return { text: await steerConversationTurn(deps, ctx, options.pluginConfig, rest.join(" ")) };
-	if (normalized === "model") return { text: await setConversationModel(deps, ctx, options.pluginConfig, 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) };
+			continue;
+		}
+		current += char;
+		tokenStarted = true;
 	}
-	if (normalized === "compact") return { text: await startThreadAction(deps, ctx, options.pluginConfig, "compact", rest) };
-	if (normalized === "review") return { text: await startThreadAction(deps, ctx, options.pluginConfig, "review", rest) };
-	if (normalized === "diagnostics") return await handleCodexDiagnosticsFeedback(deps, ctx, options.pluginConfig, rest.join(" "), "/codex diagnostics");
-	if (normalized === "computer-use" || normalized === "computeruse") {
-		if (isMenuVerb(rest)) return buildCodexComputerUseMenuReply();
-		return { text: await handleComputerUseCommand(deps, ctx, options.pluginConfig, rest) };
+	if (escaping) current += "\\";
+	if (tokenStarted) args.push(current);
+	return args;
+}
+function parseBindArgs(args) {
+	const parsed = {};
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		if (arg === "--help" || arg === "-h") {
+			parsed.help = true;
+			continue;
+		}
+		if (arg === "--cwd") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.cwd !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.cwd = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--model") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.model !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.model = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--provider" || arg === "--model-provider") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.provider !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.provider = value;
+			index += 1;
+			continue;
+		}
+		if (!arg.startsWith("-") && !parsed.threadId) {
+			parsed.threadId = arg;
+			continue;
+		}
+		parsed.help = true;
 	}
-	if (normalized === "mcp") {
-		if (rest.length > 0) return { text: "Usage: /codex mcp" };
-		const scope = await resolveCommandAppServerScope(deps, ctx, options.pluginConfig);
-		return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }, {
-			config: ctx.config,
-			...scope
-		}), "MCP servers") };
+	parsed.threadId = normalizeOptionalString(parsed.threadId);
+	parsed.cwd = normalizeOptionalString(parsed.cwd);
+	parsed.model = normalizeOptionalString(parsed.model);
+	parsed.provider = normalizeOptionalString(parsed.provider);
+	return parsed;
+}
+function parseCodexCliSessionsArgs(args) {
+	const parsed = { filter: "" };
+	const filter = [];
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		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);
 	}
-	if (normalized === "skills") {
-		if (rest.length > 0) return { text: "Usage: /codex skills" };
-		const scope = await resolveCommandAppServerScope(deps, ctx, options.pluginConfig);
-		return { text: formatSkills(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}, {
-			config: ctx.config,
-			...scope
-		})) };
+	parsed.host = normalizeOptionalString(parsed.host);
+	parsed.filter = filter.join(" ").trim();
+	return parsed;
+}
+function parseResumeArgs(args) {
+	const parsed = {};
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		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 === "--bind") {
+			if (readRequiredOptionValue(args, index) !== "here" || parsed.bindHere !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.bindHere = true;
+			index += 1;
+			continue;
+		}
+		if (!arg.startsWith("-") && !parsed.threadId) {
+			parsed.threadId = arg;
+			continue;
+		}
+		parsed.help = true;
 	}
-	if (normalized === "account") {
-		if (rest.length > 0) return { text: "Usage: /codex account" };
-		const scope = await resolveCommandAppServerScope(deps, ctx, options.pluginConfig);
-		const requestScope = {
-			config: ctx.config,
-			...scope
-		};
-		const [account, limits] = await Promise.all([deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }, requestScope), deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, requestScope)]);
-		return { text: formatAccount(account, limits, await readCodexAccountAuthOverview({
-			ctx,
-			agentDir: scope.agentDir,
-			pluginConfig: options.pluginConfig,
-			safeCodexControlRequest: deps.safeCodexControlRequest,
-			account,
-			limits
-		})) };
+	parsed.threadId = normalizeOptionalString(parsed.threadId);
+	parsed.host = normalizeOptionalString(parsed.host);
+	return parsed;
+}
+function parseComputerUseArgs(args) {
+	const parsed = {
+		action: "status",
+		overrides: {},
+		hasOverrides: false
+	};
+	let sawAction = false;
+	for (let index = 0; index < args.length; index += 1) {
+		const arg = args[index];
+		if (arg === "--help" || arg === "-h") {
+			parsed.help = true;
+			continue;
+		}
+		if (arg === "status" || arg === "install") {
+			if (sawAction) {
+				parsed.help = true;
+				continue;
+			}
+			sawAction = true;
+			parsed.action = arg;
+			continue;
+		}
+		if (arg === "--source" || arg === "--marketplace-source") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.overrides.marketplaceSource !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.overrides.marketplaceSource = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--marketplace-path" || arg === "--path") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.overrides.marketplacePath !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.overrides.marketplacePath = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--marketplace") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.overrides.marketplaceName !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.overrides.marketplaceName = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--plugin") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.overrides.pluginName !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.overrides.pluginName = value;
+			index += 1;
+			continue;
+		}
+		if (arg === "--server" || arg === "--mcp-server") {
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.overrides.mcpServerName !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.overrides.mcpServerName = value;
+			index += 1;
+			continue;
+		}
+		parsed.help = true;
 	}
-	return { text: `Unknown Codex command: ${formatCodexDisplayText(subcommand)}\n\n${buildHelp()}` };
+	parsed.overrides = normalizeComputerUseStringOverrides(parsed.overrides);
+	parsed.hasOverrides = Object.values(parsed.overrides).some(Boolean);
+	return parsed;
+}
+function readRequiredOptionValue(args, index) {
+	const value = args[index + 1];
+	const normalized = value?.trim();
+	if (!normalized || normalized.startsWith("-")) return;
+	return value;
+}
+function normalizeComputerUseStringOverrides(overrides) {
+	const normalized = {};
+	const marketplaceSource = normalizeOptionalString(overrides.marketplaceSource);
+	if (marketplaceSource) normalized.marketplaceSource = marketplaceSource;
+	const marketplacePath = normalizeOptionalString(overrides.marketplacePath);
+	if (marketplacePath) normalized.marketplacePath = marketplacePath;
+	const marketplaceName = normalizeOptionalString(overrides.marketplaceName);
+	if (marketplaceName) normalized.marketplaceName = marketplaceName;
+	const pluginName = normalizeOptionalString(overrides.pluginName);
+	if (pluginName) normalized.pluginName = pluginName;
+	const mcpServerName = normalizeOptionalString(overrides.mcpServerName);
+	if (mcpServerName) normalized.mcpServerName = mcpServerName;
+	return normalized;
 }
 //#endregion
 export { handleCodexSubcommand };