@openclaw/codex 2026.5.3 → 2026.5.4-beta.2

package/dist/{command-handlers-CeaXhO5y.js → command-handlers-Bbr7RAUs.js}

@@ -1,155 +1,44 @@
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-CkkoMeqF.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-Ds7g6191.js";
+import { i as resolveCodexAppServerRuntimeOptions } from "./config-ByrA30No.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-CkowdYbm.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-BmhO5h8O.js";
+import { a as formatComputerUseStatus, c as formatThreads, d as CODEX_CONTROL_METHODS, f as describeControlFailure, i as formatCodexStatus, l as readString, n as formatAccount, o as formatList, r as formatCodexDisplayText, s as formatModels, t as buildHelp } from "./command-formatters-PiJcdUbu.js";
 import { i as readCodexAppServerBinding, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DuJYTJQy.js";
-import { a as parseCodexFastModeArg, c as setCodexConversationFastMode, d as steerCodexConversationTurn, f as stopCodexConversationTurn, i as formatPermissionsMode, l as setCodexConversationModel, m as resolveCodexDefaultWorkspaceDir, o as parseCodexPermissionsModeArg, p as readCodexConversationBindingData, r as startCodexConversationThread, s as readCodexConversationActiveTurn, u as setCodexConversationPermissions } from "./conversation-binding-DjptpT9W.js";
-import { i as requestCodexAppServerJson, n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-amNk2zrB.js";
+import { a as parseCodexFastModeArg, c as setCodexConversationFastMode, d as steerCodexConversationTurn, f as stopCodexConversationTurn, i as formatPermissionsMode, l as setCodexConversationModel, m as resolveCodexDefaultWorkspaceDir, o as parseCodexPermissionsModeArg, p as readCodexConversationBindingData, r as startCodexConversationThread, s as readCodexConversationActiveTurn, u as setCodexConversationPermissions } from "./conversation-binding-IhbXJcXQ.js";
+import { a as readCodexComputerUseStatus, i as installCodexComputerUse, n as rememberCodexRateLimits, o as requestCodexAppServerJson } from "./rate-limit-cache-t6ebYmfS.js";
 import crypto from "node:crypto";
-//#region extensions/codex/src/command-formatters.ts
-function formatCodexStatus(probes) {
-	const lines = [`Codex app-server: ${probes.models.ok || probes.account.ok || probes.limits.ok || probes.mcps.ok || probes.skills.ok ? "connected" : "unavailable"}`];
-	if (probes.models.ok) lines.push(`Models: ${probes.models.value.models.map((model) => model.id).slice(0, 8).join(", ") || "none"}`);
-	else lines.push(`Models: ${probes.models.error}`);
-	lines.push(`Account: ${probes.account.ok ? summarizeAccount(probes.account.value) : probes.account.error}`);
-	lines.push(`Rate limits: ${probes.limits.ok ? summarizeArrayLike(probes.limits.value) : probes.limits.error}`);
-	lines.push(`MCP servers: ${probes.mcps.ok ? summarizeArrayLike(probes.mcps.value) : probes.mcps.error}`);
-	lines.push(`Skills: ${probes.skills.ok ? summarizeArrayLike(probes.skills.value) : probes.skills.error}`);
-	return lines.join("\n");
-}
-function formatModels(result) {
-	if (result.models.length === 0) return "No Codex app-server models returned.";
-	const lines = ["Codex models:", ...result.models.map((model) => `- ${model.id}${model.isDefault ? " (default)" : ""}`)];
-	if (result.truncated) lines.push("- More models available; output truncated.");
-	return lines.join("\n");
-}
-function formatThreads(response) {
-	const threads = extractArray(response);
-	if (threads.length === 0) return "No Codex threads returned.";
-	return ["Codex threads:", ...threads.slice(0, 10).map((thread) => {
-		const record = isJsonObject(thread) ? thread : {};
-		const id = readString(record, "threadId") ?? readString(record, "id") ?? "<unknown>";
-		const title = readString(record, "title") ?? readString(record, "name") ?? readString(record, "summary");
-		const details = [
-			readString(record, "model"),
-			readString(record, "cwd"),
-			readString(record, "updatedAt") ?? readString(record, "lastUpdatedAt")
-		].filter(Boolean);
-		return `- ${id}${title ? ` - ${title}` : ""}${details.length > 0 ? ` (${details.join(", ")})` : ""}\n  Resume: /codex resume ${id}`;
-	})].join("\n");
-}
-function formatAccount(account, limits) {
-	return [`Account: ${account.ok ? summarizeAccount(account.value) : account.error}`, `Rate limits: ${limits.ok ? summarizeArrayLike(limits.value) : limits.error}`].join("\n");
-}
-function formatComputerUseStatus(status) {
-	const lines = [`Computer Use: ${status.ready ? "ready" : status.enabled ? "not ready" : "disabled"}`];
-	lines.push(`Plugin: ${status.pluginName} (${computerUsePluginState(status)})`);
-	lines.push(`MCP server: ${status.mcpServerName}${status.mcpServerAvailable ? ` (${status.tools.length} tools)` : " (unavailable)"}`);
-	if (status.marketplaceName) lines.push(`Marketplace: ${status.marketplaceName}`);
-	if (status.tools.length > 0) lines.push(`Tools: ${status.tools.slice(0, 8).join(", ")}`);
-	lines.push(status.message);
-	return lines.join("\n");
-}
-function computerUsePluginState(status) {
-	if (!status.installed) return "not installed";
-	return status.pluginEnabled ? "installed" : "installed, disabled";
-}
-function formatList(response, label) {
-	const entries = extractArray(response);
-	if (entries.length === 0) return `${label}: none returned.`;
-	return [`${label}:`, ...entries.slice(0, 25).map((entry) => {
-		const record = isJsonObject(entry) ? entry : {};
-		return `- ${readString(record, "name") ?? readString(record, "id") ?? JSON.stringify(entry)}`;
-	})].join("\n");
-}
-function buildHelp() {
-	return [
-		"Codex commands:",
-		"- /codex status",
-		"- /codex models",
-		"- /codex threads [filter]",
-		"- /codex resume <thread-id>",
-		"- /codex bind [thread-id] [--cwd <path>] [--model <model>] [--provider <provider>]",
-		"- /codex binding",
-		"- /codex stop",
-		"- /codex steer <message>",
-		"- /codex model [model]",
-		"- /codex fast [on|off|status]",
-		"- /codex permissions [default|yolo|status]",
-		"- /codex detach",
-		"- /codex compact",
-		"- /codex review",
-		"- /codex diagnostics [note]",
-		"- /codex computer-use [status|install]",
-		"- /codex account",
-		"- /codex mcp",
-		"- /codex skills"
-	].join("\n");
-}
-function summarizeAccount(value) {
-	if (!isJsonObject(value)) return "unavailable";
-	const account = isJsonObject(value.account) ? value.account : value;
-	if (readString(account, "type") === "amazonBedrock") return "Amazon Bedrock";
-	return readString(account, "email") ?? readString(account, "accountEmail") ?? readString(account, "planType") ?? readString(account, "id") ?? "available";
-}
-function summarizeArrayLike(value) {
-	const entries = extractArray(value);
-	if (entries.length === 0) return "none returned";
-	return `${entries.length}`;
-}
-function extractArray(value) {
-	if (Array.isArray(value)) return value;
-	if (!isJsonObject(value)) return [];
-	for (const key of [
-		"data",
-		"items",
-		"threads",
-		"models",
-		"skills",
-		"servers",
-		"rateLimits"
-	]) {
-		const child = value[key];
-		if (Array.isArray(child)) return child;
-	}
-	return [];
-}
-function readString(record, key) {
-	const value = record[key];
-	return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-//#endregion
 //#region extensions/codex/src/command-rpc.ts
-function requestOptions(pluginConfig, limit) {
+function requestOptions(pluginConfig, limit, config) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig });
 	return {
 		limit,
 		timeoutMs: runtime.requestTimeoutMs,
-		startOptions: runtime.start
+		startOptions: runtime.start,
+		config
 	};
 }
-async function codexControlRequest(pluginConfig, method, requestParams) {
+async function codexControlRequest(pluginConfig, method, requestParams, options = {}) {
 	const runtime = resolveCodexAppServerRuntimeOptions({ pluginConfig });
 	return await requestCodexAppServerJson({
 		method,
 		requestParams,
 		timeoutMs: runtime.requestTimeoutMs,
-		startOptions: runtime.start
+		startOptions: runtime.start,
+		config: options.config
 	});
 }
-async function safeCodexControlRequest(pluginConfig, method, requestParams) {
-	return await safeValue(async () => await codexControlRequest(pluginConfig, method, requestParams));
+async function safeCodexControlRequest(pluginConfig, method, requestParams, options = {}) {
+	return await safeValue(async () => await codexControlRequest(pluginConfig, method, requestParams, options));
 }
-async function safeCodexModelList(pluginConfig, limit) {
-	return await safeValue(async () => await listCodexAppServerModels(requestOptions(pluginConfig, limit)));
+async function safeCodexModelList(pluginConfig, limit, config) {
+	return await safeValue(async () => await listCodexAppServerModels(requestOptions(pluginConfig, limit, config)));
 }
-async function readCodexStatusProbes(pluginConfig) {
+async function readCodexStatusProbes(pluginConfig, config) {
 	const [models, account, limits, mcps, skills] = await Promise.all([
-		safeCodexModelList(pluginConfig, 20),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listSkills, {})
+		safeCodexModelList(pluginConfig, 20, config),
+		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }, { config }),
+		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, { config }),
+		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }, { config }),
+		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}, { config })
 	]);
 	return {
 		models,
@@ -217,29 +106,52 @@ async function handleCodexSubcommand(ctx, options) {
 	const [subcommand = "status", ...rest] = splitArgs(ctx.args);
 	const normalized = subcommand.toLowerCase();
 	if (normalized === "help") return { text: buildHelp() };
-	if (normalized === "status") return { text: formatCodexStatus(await deps.readCodexStatusProbes(options.pluginConfig)) };
-	if (normalized === "models") return { text: formatModels(await deps.listCodexAppServerModels(deps.requestOptions(options.pluginConfig, 100))) };
+	if (normalized === "status") {
+		if (rest.length > 0) return { text: "Usage: /codex status" };
+		return { text: formatCodexStatus(await deps.readCodexStatusProbes(options.pluginConfig, ctx.config)) };
+	}
+	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))) };
+	}
 	if (normalized === "threads") return { text: await buildThreads(deps, options.pluginConfig, rest.join(" ")) };
-	if (normalized === "resume") return { text: await resumeThread(deps, ctx, options.pluginConfig, rest[0]) };
+	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") return { text: await detachConversation(deps, ctx) };
-	if (normalized === "binding") return { text: await describeConversationBinding(deps, ctx) };
-	if (normalized === "stop") return { text: await stopConversationTurn(deps, ctx, options.pluginConfig) };
+	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.join(" ")) };
-	if (normalized === "fast") return { text: await setConversationFastMode(deps, ctx, options.pluginConfig, rest[0]) };
-	if (normalized === "permissions") return { text: await setConversationPermissions(deps, ctx, options.pluginConfig, rest[0]) };
-	if (normalized === "compact") return { text: await startThreadAction(deps, ctx, options.pluginConfig, CODEX_CONTROL_METHODS.compact, "compaction") };
-	if (normalized === "review") return { text: await startThreadAction(deps, ctx, options.pluginConfig, CODEX_CONTROL_METHODS.review, "review") };
+	if (normalized === "model") return { text: await setConversationModel(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "fast") return { text: await setConversationFastMode(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "permissions") return { text: await setConversationPermissions(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "compact") return { text: await startThreadAction(deps, ctx, options.pluginConfig, CODEX_CONTROL_METHODS.compact, "compaction", rest) };
+	if (normalized === "review") return { text: await startThreadAction(deps, ctx, options.pluginConfig, CODEX_CONTROL_METHODS.review, "review", rest) };
 	if (normalized === "diagnostics") return await handleCodexDiagnosticsFeedback(deps, ctx, options.pluginConfig, rest.join(" "), "/codex diagnostics");
 	if (normalized === "computer-use" || normalized === "computeruse") return { text: await handleComputerUseCommand(deps, options.pluginConfig, rest) };
-	if (normalized === "mcp") return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }), "MCP servers") };
-	if (normalized === "skills") return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}), "Codex skills") };
+	if (normalized === "mcp") {
+		if (rest.length > 0) return { text: "Usage: /codex mcp" };
+		return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }), "MCP servers") };
+	}
+	if (normalized === "skills") {
+		if (rest.length > 0) return { text: "Usage: /codex skills" };
+		return { text: formatList(await deps.codexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}), "Codex skills") };
+	}
 	if (normalized === "account") {
+		if (rest.length > 0) return { text: "Usage: /codex account" };
 		const [account, limits] = await Promise.all([deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }), deps.safeCodexControlRequest(options.pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0)]);
+		if (limits.ok) rememberCodexRateLimits(limits.value);
 		return { text: formatAccount(account, limits) };
 	}
-	return { text: `Unknown Codex command: ${subcommand}\n\n${buildHelp()}` };
+	return { text: `Unknown Codex command: ${formatCodexDisplayText(subcommand)}\n\n${buildHelp()}` };
 }
 async function handleComputerUseCommand(deps, pluginConfig, args) {
 	const parsed = parseComputerUseArgs(args);
@@ -253,9 +165,9 @@ async function handleComputerUseCommand(deps, pluginConfig, args) {
 	return formatComputerUseStatus(await deps.readCodexComputerUseStatus(params));
 }
 async function bindConversation(deps, ctx, pluginConfig, args) {
-	if (!ctx.sessionFile) return { text: "Cannot bind Codex because this command did not include an OpenClaw session file." };
 	const parsed = parseBindArgs(args);
 	if (parsed.help) return { text: "Usage: /codex bind [thread-id] [--cwd <path>] [--model <model>] [--provider <provider>]" };
+	if (!ctx.sessionFile) return { text: "Cannot bind Codex because this command did not include an OpenClaw session file." };
 	const workspaceDir = parsed.cwd ?? deps.resolveCodexDefaultWorkspaceDir(pluginConfig);
 	const authProfileId = (await deps.readCodexAppServerBinding(ctx.sessionFile))?.authProfileId;
 	const startParams = {
@@ -270,7 +182,7 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 	if (authProfileId) startParams.authProfileId = authProfileId;
 	const data = await deps.startCodexConversationThread(startParams);
 	const threadId = (await deps.readCodexAppServerBinding(ctx.sessionFile))?.threadId ?? parsed.threadId ?? "new thread";
-	const summary = `Codex app-server thread ${threadId} in ${workspaceDir}`;
+	const summary = `Codex app-server thread ${formatCodexDisplayText(threadId)} in ${formatCodexDisplayText(workspaceDir)}`;
 	let request;
 	try {
 		request = await ctx.requestConversationBinding({
@@ -282,10 +194,10 @@ async function bindConversation(deps, ctx, pluginConfig, args) {
 		await deps.clearCodexAppServerBinding(ctx.sessionFile);
 		throw error;
 	}
-	if (request.status === "bound") return { text: `Bound this conversation to Codex thread ${threadId} in ${workspaceDir}.` };
+	if (request.status === "bound") return { text: `Bound this conversation to Codex thread ${formatCodexDisplayText(threadId)} in ${formatCodexDisplayText(workspaceDir)}.` };
 	if (request.status === "pending") return request.reply;
 	await deps.clearCodexAppServerBinding(ctx.sessionFile);
-	return { text: request.message };
+	return { text: formatCodexDisplayText(request.message) };
 }
 async function detachConversation(deps, ctx) {
 	const data = readCodexConversationBindingData(await ctx.getCurrentConversationBinding());
@@ -302,13 +214,13 @@ async function describeConversationBinding(deps, ctx) {
 	const active = deps.readCodexConversationActiveTurn(data.sessionFile);
 	return [
 		"Codex conversation binding:",
-		`- Thread: ${threadBinding?.threadId ?? "unknown"}`,
-		`- Workspace: ${data.workspaceDir}`,
-		`- Model: ${threadBinding?.model ?? "default"}`,
+		`- Thread: ${formatCodexDisplayText(threadBinding?.threadId ?? "unknown")}`,
+		`- Workspace: ${formatCodexDisplayText(data.workspaceDir)}`,
+		`- Model: ${formatCodexDisplayText(threadBinding?.model ?? "default")}`,
 		`- Fast: ${threadBinding?.serviceTier === "fast" ? "on" : "off"}`,
 		`- Permissions: ${threadBinding ? formatPermissionsMode(threadBinding) : "default"}`,
-		`- Active run: ${active ? active.turnId : "none"}`,
-		`- Session: ${data.sessionFile}`
+		`- Active run: ${formatCodexDisplayText(active ? active.turnId : "none")}`,
+		`- Session: ${formatCodexDisplayText(data.sessionFile)}`
 	].join("\n");
 }
 async function buildThreads(deps, pluginConfig, filter) {
@@ -317,9 +229,10 @@ async function buildThreads(deps, pluginConfig, filter) {
 		...filter.trim() ? { searchTerm: filter.trim() } : {}
 	}));
 }
-async function resumeThread(deps, ctx, pluginConfig, threadId) {
+async function resumeThread(deps, ctx, pluginConfig, args) {
+	const [threadId] = args;
 	const normalizedThreadId = threadId?.trim();
-	if (!normalizedThreadId) return "Usage: /codex resume <thread-id>";
+	if (!normalizedThreadId || args.length !== 1) return "Usage: /codex resume <thread-id>";
 	if (!ctx.sessionFile) return "Cannot attach a Codex thread because this command did not include an OpenClaw session file.";
 	const response = await deps.codexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.resumeThread, {
 		threadId: normalizedThreadId,
@@ -333,7 +246,7 @@ async function resumeThread(deps, ctx, pluginConfig, threadId) {
 		model: isJsonObject(response) ? readString(response, "model") : void 0,
 		modelProvider: isJsonObject(response) ? readString(response, "modelProvider") : void 0
 	});
-	return `Attached this OpenClaw session to Codex thread ${effectiveThreadId}.`;
+	return `Attached this OpenClaw session to Codex thread ${formatCodexDisplayText(effectiveThreadId)}.`;
 }
 async function stopConversationTurn(deps, ctx, pluginConfig) {
 	const sessionFile = await resolveControlSessionFile(ctx);
@@ -352,13 +265,15 @@ async function steerConversationTurn(deps, ctx, pluginConfig, message) {
 		message
 	})).message;
 }
-async function setConversationModel(deps, ctx, pluginConfig, model) {
+async function setConversationModel(deps, ctx, pluginConfig, args) {
+	if (args.length > 1) return "Usage: /codex model <model>";
 	const sessionFile = await resolveControlSessionFile(ctx);
 	if (!sessionFile) return "Cannot set Codex model because this command did not include an OpenClaw session file.";
+	const [model = ""] = args;
 	const normalized = model.trim();
 	if (!normalized) {
 		const binding = await deps.readCodexAppServerBinding(sessionFile);
-		return binding?.model ? `Codex model: ${binding.model}` : "Usage: /codex model <model>";
+		return binding?.model ? `Codex model: ${formatCodexDisplayText(binding.model)}` : "Usage: /codex model <model>";
 	}
 	return await deps.setCodexConversationModel({
 		sessionFile,
@@ -366,9 +281,11 @@ async function setConversationModel(deps, ctx, pluginConfig, model) {
 		model: normalized
 	});
 }
-async function setConversationFastMode(deps, ctx, pluginConfig, value) {
+async function setConversationFastMode(deps, ctx, pluginConfig, args) {
+	if (args.length > 1) return "Usage: /codex fast [on|off|status]";
 	const sessionFile = await resolveControlSessionFile(ctx);
 	if (!sessionFile) return "Cannot set Codex fast mode because this command did not include an OpenClaw session file.";
+	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({
@@ -377,9 +294,11 @@ async function setConversationFastMode(deps, ctx, pluginConfig, value) {
 		enabled: parsed
 	});
 }
-async function setConversationPermissions(deps, ctx, pluginConfig, value) {
+async function setConversationPermissions(deps, ctx, pluginConfig, args) {
+	if (args.length > 1) return "Usage: /codex permissions [default|yolo|status]";
 	const sessionFile = await resolveControlSessionFile(ctx);
 	if (!sessionFile) return "Cannot set Codex permissions because this command did not include an OpenClaw session file.";
+	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({
@@ -394,6 +313,7 @@ async function resolveControlSessionFile(ctx) {
 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);
+	if (parsed.action === "usage") return { text: formatDiagnosticsUsage(commandPrefix) };
 	if (parsed.action === "confirm") return { text: await confirmCodexDiagnosticsFeedback(deps, ctx, pluginConfig, parsed.token) };
 	if (parsed.action === "cancel") return { text: cancelCodexDiagnosticsFeedback(ctx, parsed.token) };
 	if (ctx.diagnosticsUploadApproved === true) return { text: await sendCodexDiagnosticsFeedbackForContext(deps, ctx, pluginConfig, parsed.note) };
@@ -640,21 +560,29 @@ function normalizeDiagnosticsReason(note) {
 	return normalized ? normalized.slice(0, CODEX_DIAGNOSTICS_REASON_MAX_CHARS) : void 0;
 }
 function parseDiagnosticsArgs(args) {
-	const [action, token] = splitArgs(args);
+	const [action, token, ...extra] = splitArgs(args);
 	const normalizedAction = action?.toLowerCase();
-	if ((normalizedAction === "confirm" || normalizedAction === "--confirm") && token) return {
+	if ((normalizedAction === "confirm" || normalizedAction === "--confirm") && token && extra.length === 0) return {
 		action: "confirm",
 		token
 	};
-	if ((normalizedAction === "cancel" || normalizedAction === "--cancel") && token) return {
+	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
 	};
 }
+function formatDiagnosticsUsage(commandPrefix) {
+	return [
+		`Usage: ${commandPrefix} [note]`,
+		`Usage: ${commandPrefix} confirm <token>`,
+		`Usage: ${commandPrefix} cancel <token>`
+	].join("\n");
+}
 function createCodexDiagnosticsConfirmation(params) {
 	prunePendingCodexDiagnosticsConfirmations(params.now);
 	if (!pendingCodexDiagnosticsConfirmationTokensByScope.has(params.scopeKey) && pendingCodexDiagnosticsConfirmationTokensByScope.size >= CODEX_DIAGNOSTICS_CONFIRMATION_MAX_SCOPES) {
@@ -848,7 +776,8 @@ function normalizeCodexDiagnosticsScopeField(value) {
 	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, method, label) {
+async function startThreadAction(deps, ctx, pluginConfig, method, label, args) {
+	if (args.length > 0) return `Usage: /codex ${label === "compaction" ? "compact" : label}`;
 	const sessionFile = await resolveControlSessionFile(ctx);
 	if (!sessionFile) return `Cannot start Codex ${label} because this command did not include an OpenClaw session file.`;
 	const binding = await deps.readCodexAppServerBinding(sessionFile);
@@ -858,10 +787,52 @@ async function startThreadAction(deps, ctx, pluginConfig, method, label) {
 		target: { type: "uncommittedChanges" }
 	});
 	else await deps.codexControlRequest(pluginConfig, method, { threadId: binding.threadId });
-	return `Started Codex ${label} for thread ${binding.threadId}.`;
+	return `Started Codex ${label} for thread ${formatCodexDisplayText(binding.threadId)}.`;
 }
 function splitArgs(value) {
-	return (value ?? "").trim().split(/\s+/).filter(Boolean);
+	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;
+	}
+	if (escaping) current += "\\";
+	if (tokenStarted) args.push(current);
+	return args;
 }
 function parseBindArgs(args) {
 	const parsed = {};
@@ -872,17 +843,32 @@ function parseBindArgs(args) {
 			continue;
 		}
 		if (arg === "--cwd") {
-			parsed.cwd = args[index + 1];
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.cwd !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.cwd = value;
 			index += 1;
 			continue;
 		}
 		if (arg === "--model") {
-			parsed.model = args[index + 1];
+			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") {
-			parsed.provider = args[index + 1];
+			const value = readRequiredOptionValue(args, index);
+			if (!value || parsed.provider !== void 0) {
+				parsed.help = true;
+				continue;
+			}
+			parsed.provider = value;
 			index += 1;
 			continue;
 		}
@@ -904,6 +890,7 @@ function parseComputerUseArgs(args) {
 		overrides: {},
 		hasOverrides: false
 	};
+	let sawAction = false;
 	for (let index = 0; index < args.length; index += 1) {
 		const arg = args[index];
 		if (arg === "--help" || arg === "-h") {
@@ -911,12 +898,17 @@ function parseComputerUseArgs(args) {
 			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) {
+			if (!value || parsed.overrides.marketplaceSource !== void 0) {
 				parsed.help = true;
 				continue;
 			}
@@ -926,7 +918,7 @@ function parseComputerUseArgs(args) {
 		}
 		if (arg === "--marketplace-path" || arg === "--path") {
 			const value = readRequiredOptionValue(args, index);
-			if (!value) {
+			if (!value || parsed.overrides.marketplacePath !== void 0) {
 				parsed.help = true;
 				continue;
 			}
@@ -936,7 +928,7 @@ function parseComputerUseArgs(args) {
 		}
 		if (arg === "--marketplace") {
 			const value = readRequiredOptionValue(args, index);
-			if (!value) {
+			if (!value || parsed.overrides.marketplaceName !== void 0) {
 				parsed.help = true;
 				continue;
 			}
@@ -946,7 +938,7 @@ function parseComputerUseArgs(args) {
 		}
 		if (arg === "--plugin") {
 			const value = readRequiredOptionValue(args, index);
-			if (!value) {
+			if (!value || parsed.overrides.pluginName !== void 0) {
 				parsed.help = true;
 				continue;
 			}
@@ -956,7 +948,7 @@ function parseComputerUseArgs(args) {
 		}
 		if (arg === "--server" || arg === "--mcp-server") {
 			const value = readRequiredOptionValue(args, index);
-			if (!value) {
+			if (!value || parsed.overrides.mcpServerName !== void 0) {
 				parsed.help = true;
 				continue;
 			}
@@ -972,7 +964,8 @@ function parseComputerUseArgs(args) {
 }
 function readRequiredOptionValue(args, index) {
 	const value = args[index + 1];
-	if (!value || value.startsWith("-")) return;
+	const normalized = value?.trim();
+	if (!normalized || normalized.startsWith("-")) return;
 	return value;
 }
 function normalizeComputerUseStringOverrides(overrides) {

package/dist/{compact-C0_rGlHZ.js → compact-DcR5aTxd.js}

@@ -1,7 +1,7 @@
-import { i as resolveCodexAppServerRuntimeOptions } from "./config-CkkoMeqF.js";
+import { i as resolveCodexAppServerRuntimeOptions } from "./config-ByrA30No.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
 import { i as readCodexAppServerBinding } from "./session-binding-DuJYTJQy.js";
-import { n as defaultCodexAppServerClientFactory, t as createCodexAppServerClientFactoryTestHooks } from "./client-factory-MaOMEltT.js";
+import { n as defaultCodexAppServerClientFactory, t as createCodexAppServerClientFactoryTestHooks } from "./client-factory--cll1Fba.js";
 import { embeddedAgentLog, formatErrorMessage, isActiveHarnessContextEngine, runHarnessContextEngineMaintenance } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const DEFAULT_CODEX_COMPACTION_WAIT_TIMEOUT_MS = 300 * 1e3;
@@ -65,7 +65,7 @@ async function maybeCompactCodexAppServerSession(params, options = {}) {
 }
 async function compactCodexNativeThread(params, options = {}) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: options.pluginConfig });
-	const binding = await readCodexAppServerBinding(params.sessionFile);
+	const binding = await readCodexAppServerBinding(params.sessionFile, { config: params.config });
 	if (!binding?.threadId) return {
 		ok: false,
 		compacted: false,
@@ -77,7 +77,7 @@ async function compactCodexNativeThread(params, options = {}) {
 		compacted: false,
 		reason: "auth profile mismatch for session binding"
 	};
-	const client = await clientFactory(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir);
+	const client = await clientFactory(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir, params.config);
 	const waiter = createCodexNativeCompactionWaiter(client, binding.threadId);
 	let completion;
 	try {

package/dist/{config-CkkoMeqF.js → config-ByrA30No.js}

@@ -139,13 +139,11 @@ function codexSandboxPolicyForTurn(mode, cwd) {
 	if (mode === "danger-full-access") return { type: "dangerFullAccess" };
 	if (mode === "read-only") return {
 		type: "readOnly",
-		access: { type: "fullAccess" },
 		networkAccess: false
 	};
 	return {
 		type: "workspaceWrite",
 		writableRoots: [cwd],
-		readOnlyAccess: { type: "fullAccess" },
 		networkAccess: false,
 		excludeTmpdirEnvVar: false,
 		excludeSlashTmp: false