@openclaw/codex 2026.5.28 → 2026.5.31-beta.1

package/dist/{client-DMXvboVu.js → client-BnOmn0y-.js}

@@ -1,4 +1,4 @@
-import { l as resolveCodexAppServerRuntimeOptions } from "./config--tW89bHH.js";
+import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
 import { OPENCLAW_VERSION, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createInterface } from "node:readline";
@@ -120,11 +120,18 @@ function createWebSocketTransport(options) {
 		const text = websocketFrameToText(data);
 		stdout.write(text.endsWith("\n") ? text : `${text}\n`);
 	});
+	const stdin = new Writable({ write(chunk, _encoding, callback) {
+		for (const frame of chunk.toString("utf8").split("\n")) sendFrame(frame);
+		callback();
+	} });
+	const closeSocket = () => {
+		if (socket.readyState === WebSocket.CLOSED || socket.readyState === WebSocket.CLOSING) return;
+		socket.close();
+	};
+	stdin.once("finish", closeSocket);
+	stdin.once("close", closeSocket);
 	return {
-		stdin: new Writable({ write(chunk, _encoding, callback) {
-			for (const frame of chunk.toString("utf8").split("\n")) sendFrame(frame);
-			callback();
-		} }),
+		stdin,
 		stdout,
 		stderr,
 		get killed() {
@@ -294,7 +301,8 @@ var CodexAppServerClient = class CodexAppServerClient {
 	getServerVersion() {
 		return this.serverVersion;
 	}
-	request(method, params, options) {
+	request(method, params, optionsInput) {
+		let options = optionsInput;
 		options ??= {};
 		if (this.closed) return Promise.reject(this.closeError ?? /* @__PURE__ */ new Error("codex app-server client is closed"));
 		if (options.signal?.aborted) return Promise.reject(/* @__PURE__ */ new Error(`${method} aborted`));
@@ -367,6 +375,12 @@ var CodexAppServerClient = class CodexAppServerClient {
 		this.notificationHandlers.add(handler);
 		return () => this.notificationHandlers.delete(handler);
 	}
+	setActiveSharedLeaseCountProviderForUnscopedNotifications(provider) {
+		this.activeSharedLeaseCountProvider = provider;
+	}
+	getActiveSharedLeaseCountForUnscopedNotifications() {
+		return this.activeSharedLeaseCountProvider?.();
+	}
 	addCloseHandler(handler) {
 		this.closeHandlers.add(handler);
 		return () => this.closeHandlers.delete(handler);

package/dist/client-factory-B8dh39UW.js

@@ -0,0 +1,20 @@
+//#region extensions/codex/src/app-server/client-factory.ts
+let sharedClientModulePromise = null;
+const loadSharedClientModule = async () => {
+	sharedClientModulePromise ??= import("./shared-client-DBlR-rV2.js").then((n) => n.s);
+	return await sharedClientModulePromise;
+};
+const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => loadSharedClientModule().then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
+	startOptions,
+	authProfileId,
+	agentDir,
+	config
+}));
+const defaultLeasedCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => loadSharedClientModule().then(({ getLeasedSharedCodexAppServerClient }) => getLeasedSharedCodexAppServerClient({
+	startOptions,
+	authProfileId,
+	agentDir,
+	config
+}));
+//#endregion
+export { defaultLeasedCodexAppServerClientFactory as n, defaultCodexAppServerClientFactory as t };

package/dist/{command-handlers-C2t6-ChO.js → command-handlers-BsK6kZJi.js}

@@ -1,20 +1,20 @@
-import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions } from "./config--tW89bHH.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-QT-XOhE7.js";
-import { l as isJsonObject } from "./client-DMXvboVu.js";
-import { i as readCodexAppServerBinding, o as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-ueMCn4om.js";
-import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-CF4f5hWY.js";
-import { a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatSkills, l as formatComputerUseStatus, m as readString$1, o as formatAccount, p as formatThreads, s as formatCodexDisplayText, u as formatList, v as summarizeCodexAccountUsage } from "./notification-correlation-BDakP_d3.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-mXE4_vE_.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-CC9XMAwn.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-Ba4vW9fO.js";
+import { d as resolveCodexAppServerRuntimeOptions, o as isCodexFastServiceTier } from "./config-AlzuNKCY.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-mbjSisZL.js";
+import { l as isJsonObject } from "./client-BnOmn0y-.js";
+import { a as readCodexAppServerBinding, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-DuFgTwRU.js";
+import { a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatSkills, l as formatComputerUseStatus, m as readString$1, o as formatAccount, p as formatThreads, s as formatCodexDisplayText, u as formatList, v as summarizeCodexAccountUsage } from "./notification-correlation-BykOI_jh.js";
+import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DMCJlzmz.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-KUDxop-C.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-D-0EFJBJ.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
+import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { ensureAuthProfileStore, findNormalizedProviderValue, resolveAgentDir, resolveAuthProfileEligibility, resolveAuthProfileOrder, resolveDefaultAgentDir, resolveProfileUnusableUntilForDisplay, resolveSessionAgentIds } from "openclaw/plugin-sdk/agent-runtime";
-import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/codex/src/command-account.ts
 const OPENAI_PROVIDER_ID = "openai";
-const OPENAI_CODEX_PROVIDER_ID = "openai-codex";
+const OPENAI_CODEX_PROVIDER_ID = OPENAI_PROVIDER_ID;
 async function readCodexAccountAuthOverview(params) {
 	const config = params.ctx.config;
 	const store = ensureAuthProfileStore(resolveDefaultAgentDir(config), {
@@ -115,7 +115,7 @@ function resolveActiveProfileId(params) {
 		profileId,
 		now: params.now
 	}).eligible);
-	const lastGood = [params.store.lastGood?.[OPENAI_PROVIDER_ID], params.store.lastGood?.[OPENAI_CODEX_PROVIDER_ID]].find((profileId) => !!profileId && params.order.includes(profileId) && isActiveProfileCandidate(params, profileId));
+	const lastGood = [params.store.lastGood?.[OPENAI_PROVIDER_ID], params.store.lastGood?.[OPENAI_CODEX_PROVIDER_ID]].find((profileId) => typeof profileId === "string" && params.order.includes(profileId) && isActiveProfileCandidate(params, profileId));
 	if (lastGood) return lastGood;
 	const mostRecent = params.order.map((profileId) => ({
 		profileId,
@@ -307,9 +307,32 @@ function formatRelativeReset(untilMs, nowMs) {
 //#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.";
+function buildPickerPresentation$1(title, prompt, buttons) {
+	return {
+		title,
+		blocks: [{
+			type: "text",
+			text: prompt
+		}, {
+			type: "buttons",
+			buttons: buttons.map((button) => ({
+				label: button.label,
+				value: button.command
+			}))
+		}]
+	};
+}
 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();
@@ -317,6 +340,7 @@ async function handleCodexPluginsSubcommand(ctx, rest, io) {
 	}
 	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 (!canMutateCodexPlugins(ctx)) return { text: `Only an owner or operator.admin gateway client can run /codex plugins ${normalized}.` };
 		const wantEnabled = normalized === "enable";
@@ -333,6 +357,82 @@ async function handleCodexPluginsSubcommand(ctx, rest, io) {
 	}
 	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: buildPickerPresentation$1("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: buildPickerPresentation$1("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: buildPickerPresentation$1("Codex sub-plugins", `Pick a Codex sub-plugin to ${verb}:`, buttons)
+	};
+}
 function canMutateCodexPlugins(ctx) {
 	if (ctx.senderIsOwner === true) return true;
 	return ctx.gatewayClientScopes?.includes("operator.admin") === true;
@@ -485,12 +585,152 @@ const lastCodexDiagnosticsUploadByThread = /* @__PURE__ */ new Map();
 const lastCodexDiagnosticsUploadByScope = /* @__PURE__ */ new Map();
 const pendingCodexDiagnosticsConfirmations = /* @__PURE__ */ new Map();
 const pendingCodexDiagnosticsConfirmationTokensByScope = /* @__PURE__ */ new Map();
+function buildPickerPresentation(title, prompt, buttons) {
+	return {
+		title,
+		blocks: [{
+			type: "text",
+			text: prompt
+		}, {
+			type: "buttons",
+			buttons: buttons.map((button) => ({
+				label: button.label,
+				value: button.command
+			}))
+		}]
+	};
+}
+/**
+* No-arg `/codex` picker. Core owns the native command tree; channels render
+* the portable buttons as inline controls when their transport can.
+*/
+function buildCodexSubcommandPickerReply() {
+	const verbs = [
+		{
+			label: "plugins",
+			command: "/codex plugins menu"
+		},
+		{
+			label: "permissions",
+			command: "/codex permissions menu"
+		},
+		{
+			label: "fast",
+			command: "/codex fast menu"
+		},
+		{
+			label: "computer-use",
+			command: "/codex computer-use menu"
+		},
+		{
+			label: "account",
+			command: "/codex account"
+		},
+		{
+			label: "help",
+			command: "/codex help"
+		}
+	];
+	return {
+		text: [
+			"Codex commands. Pick a category or type:",
+			"",
+			...verbs.map((v, i) => `  ${i + 1}. ${v.command}`),
+			"",
+			"Tap 'help' (or type /codex help) for the full list of typeable verbs",
+			"including threads, mcp, binding, detach, skills, resume, bind, steer,",
+			"model, diagnostics, compact, review, computer-use.",
+			"",
+			"Top-level shortcuts cover everyday operations: /status, /fast, /help, /stop, /models."
+		].join("\n"),
+		presentation: buildPickerPresentation("Codex commands", "Pick a Codex subcommand:", verbs)
+	};
+}
+/** Sub-picker for `/codex fast menu` (on / off / status). */
+function buildCodexFastMenuReply() {
+	const modes = [
+		"on",
+		"off",
+		"status"
+	];
+	const buttons = [...modes.map((mode) => ({
+		label: mode,
+		command: `/codex fast ${mode}`
+	})), {
+		label: "back",
+		command: "/codex"
+	}];
+	return {
+		text: [
+			"Codex fast mode. Pick one or type /codex fast <mode>:",
+			"",
+			...modes.map((m, i) => `  ${i + 1}. /codex fast ${m}`),
+			"",
+			"Type '/codex' to go back to the main menu."
+		].join("\n"),
+		presentation: buildPickerPresentation("Codex fast mode", "Pick a Codex fast mode:", buttons)
+	};
+}
+/** Sub-picker for `/codex permissions menu` (default / yolo / status). */
+function buildCodexPermissionsMenuReply() {
+	const modes = [
+		"default",
+		"yolo",
+		"status"
+	];
+	const buttons = [...modes.map((mode) => ({
+		label: mode,
+		command: `/codex permissions ${mode}`
+	})), {
+		label: "back",
+		command: "/codex"
+	}];
+	return {
+		text: [
+			"Codex permissions. Pick one or type /codex permissions <mode>:",
+			"",
+			...modes.map((m, i) => `  ${i + 1}. /codex permissions ${m}`),
+			"",
+			"Type '/codex' to go back to the main menu."
+		].join("\n"),
+		presentation: buildPickerPresentation("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) => ({
+		label: action,
+		command: `/codex computer-use ${action}`
+	})), {
+		label: "back",
+		command: "/codex"
+	}];
+	return {
+		text: [
+			"Codex computer-use. Pick one or type /codex computer-use <action>:",
+			"",
+			...actions.map((a, i) => `  ${i + 1}. /codex computer-use ${a}`),
+			"",
+			"Flag-driven invocations (--source, --marketplace-path, --marketplace) are not in the picker. Type '/codex computer-use' or read '/codex help' for the full surface.",
+			"",
+			"Type '/codex' to go back to the main menu."
+		].join("\n"),
+		presentation: buildPickerPresentation("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";
+}
 async function handleCodexSubcommand(ctx, options) {
 	const deps = {
 		...defaultCodexCommandDeps,
 		...options.deps
 	};
-	const [subcommand = "status", ...rest] = splitArgs(ctx.args);
+	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() };
 	const sandboxBlock = resolveCodexNativeCommandSandboxBlock(ctx, normalized, rest);
@@ -525,12 +765,21 @@ async function handleCodexSubcommand(ctx, options) {
 	}
 	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") return { text: await setConversationFastMode(deps, ctx, options.pluginConfig, rest) };
-	if (normalized === "permissions") return { text: await setConversationPermissions(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "fast") {
+		if (isMenuVerb(rest)) return buildCodexFastMenuReply();
+		return { text: await setConversationFastMode(deps, ctx, options.pluginConfig, rest) };
+	}
+	if (normalized === "permissions") {
+		if (isMenuVerb(rest)) return buildCodexPermissionsMenuReply();
+		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 === "computer-use" || normalized === "computeruse") {
+		if (isMenuVerb(rest)) return buildCodexComputerUseMenuReply();
+		return { text: await handleComputerUseCommand(deps, options.pluginConfig, rest) };
+	}
 	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") };

package/dist/{compact-Dlnt5G3v.js → compact-BXLjhUHX.js}

@@ -1,7 +1,7 @@
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-qZvhyyXr.js";
-import { l as resolveCodexAppServerRuntimeOptions } from "./config--tW89bHH.js";
-import { i as readCodexAppServerBinding } from "./session-binding-ueMCn4om.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-mXE4_vE_.js";
+import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
+import { a as readCodexAppServerBinding } from "./session-binding-BXJAV_xy.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DMCJlzmz.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-B8dh39UW.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const warnedIgnoredCompactionOverrides = /* @__PURE__ */ new Set();

package/dist/{computer-use-Ba4vW9fO.js → computer-use-D-0EFJBJ.js}

@@ -1,5 +1,5 @@
-import { l as resolveCodexAppServerRuntimeOptions, u as resolveCodexComputerUseConfig } from "./config--tW89bHH.js";
-import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-CF4f5hWY.js";
+import { d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig } from "./config-AlzuNKCY.js";
+import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-DuFgTwRU.js";
 import { existsSync } from "node:fs";
 //#region extensions/codex/src/app-server/computer-use.ts
 var CodexComputerUseSetupError = class extends Error {
@@ -237,13 +237,12 @@ function marketplaceDiscoveryWaitUntil(params) {
 async function delay(ms, signal) {
 	if (signal?.aborted) throw abortError(signal);
 	await new Promise((resolve, reject) => {
-		let timer;
 		const onAbort = () => {
 			clearTimeout(timer);
 			signal?.removeEventListener("abort", onAbort);
 			reject(abortError(signal));
 		};
-		timer = setTimeout(() => {
+		const timer = setTimeout(() => {
 			signal?.removeEventListener("abort", onAbort);
 			resolve();
 		}, ms);

package/dist/{config--tW89bHH.js → config-AlzuNKCY.js}

@@ -1,3 +1,4 @@
+import { resolvePositiveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHmac, randomBytes } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { hostname } from "node:os";
@@ -12,7 +13,15 @@ const START_OPTIONS_KEY_SECRET = getStartOptionsKeySecret();
 const UNIX_CODEX_REQUIREMENTS_PATH = "/etc/codex/requirements.toml";
 const WINDOWS_CODEX_REQUIREMENTS_SUFFIX = "\\OpenAI\\Codex\\requirements.toml";
 const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
+const CODEX_PLUGINS_MARKETPLACE_NAMES = [
+	"openai-curated",
+	"openai-bundled",
+	"openai-primary-runtime"
+];
 const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
+function isCodexPluginsMarketplaceName(name) {
+	return name !== void 0 && CODEX_PLUGINS_MARKETPLACE_NAMES.includes(name);
+}
 function shouldAutoApproveCodexAppServerApprovals(appServer) {
 	return appServer.approvalPolicy === "never" && appServer.sandbox === "danger-full-access";
 }
@@ -42,7 +51,7 @@ const codexAppServerServiceTierSchema = z.preprocess((value) => value === null ?
 const codexAppServerExperimentalSchema = z.object({ sandboxExecServer: z.boolean().optional() }).strict();
 const codexPluginEntryConfigSchema = z.object({
 	enabled: z.boolean().optional(),
-	marketplaceName: z.literal(CODEX_PLUGINS_MARKETPLACE_NAME).optional(),
+	marketplaceName: z.enum(CODEX_PLUGINS_MARKETPLACE_NAMES).optional(),
 	pluginName: z.string().trim().min(1).optional(),
 	allow_destructive_actions: z.boolean().optional()
 }).strict();
@@ -121,10 +130,10 @@ function resolveCodexPluginsPolicy(pluginConfig) {
 		enabled,
 		allowDestructiveActions,
 		pluginPolicies: Object.entries(config?.plugins ?? {}).flatMap(([configKey, entry]) => {
-			if (entry.marketplaceName !== "openai-curated" || !entry.pluginName) return [];
+			if (!isCodexPluginsMarketplaceName(entry.marketplaceName) || !entry.pluginName) return [];
 			return [{
 				configKey,
-				marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
+				marketplaceName: entry.marketplaceName,
 				pluginName: entry.pluginName,
 				enabled: enabled && entry.enabled !== false,
 				allowDestructiveActions: entry.allow_destructive_actions ?? allowDestructiveActions
@@ -674,7 +683,7 @@ function isCodexFastServiceTier(value) {
 	return normalizeCodexServiceTier(value) === "priority";
 }
 function normalizePositiveNumber(value, fallback) {
-	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : fallback;
+	return resolvePositiveTimerTimeoutMs(value, fallback);
 }
 function normalizeHeaders(value) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return {};
@@ -756,4 +765,4 @@ function splitShellWords(value) {
 	return words;
 }
 //#endregion
-export { isCodexFastServiceTier as a, readCodexPluginConfig as c, resolveCodexPluginsPolicy as d, resolveOpenClawExecPolicyForCodexAppServer as f, isCodexAppServerApprovalPolicyAllowedByRequirements as i, resolveCodexAppServerRuntimeOptions as l, withMcpElicitationsApprovalPolicy as m, codexAppServerStartOptionsKey as n, isCodexSandboxExecServerEnabled as o, shouldAutoApproveCodexAppServerApprovals as p, codexSandboxPolicyForTurn as r, normalizeCodexServiceTier as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, resolveCodexComputerUseConfig as u };
+export { isCodexAppServerApprovalPolicyAllowedByRequirements as a, isCodexSandboxExecServerEnabled as c, resolveCodexAppServerRuntimeOptions as d, resolveCodexComputerUseConfig as f, withMcpElicitationsApprovalPolicy as g, shouldAutoApproveCodexAppServerApprovals as h, codexSandboxPolicyForTurn as i, normalizeCodexServiceTier as l, resolveOpenClawExecPolicyForCodexAppServer as m, CODEX_PLUGINS_MARKETPLACE_NAMES as n, isCodexFastServiceTier as o, resolveCodexPluginsPolicy as p, codexAppServerStartOptionsKey as r, isCodexPluginsMarketplaceName as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, readCodexPluginConfig as u };