@openclaw/codex 2026.9.7 → 2026.10.1-beta.1

package/dist/.setup/{client-catalog-response-5HHLdcde.mjs → client-catalog-response-CmvIiDdj.mjs}

@@ -1,8 +1,8 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { n as projectCodexCatalogNativeResponse, r as projectCodexCatalogNativeThread } from "./session-catalog-native-projection-DjhwGL6x.mjs";
-import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { n as projectCodexCatalogNativeResponse, r as projectCodexCatalogNativeThread } from "./session-catalog-native-projection-CTBd4EUm.mjs";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
+import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/protocol-json.ts
 function isRpcResponse(message) {
 	return message !== null && typeof message === "object" && "id" in message && (typeof message.id === "number" || typeof message.id === "string") && !("method" in message);
@@ -38,14 +38,14 @@ var CodexAppServerMessageDecoder = class {
 		try {
 			return JSON.parse(trimmed);
 		} catch (error) {
-			if (isRecoverableParseFailure(trimmed, error)) {
-				const text = rawLine.trimStart();
-				this.pending = {
-					fragments: [text],
-					length: text.length,
-					inString: endsInsideJsonString(text)
-				};
-			} else this.reportError(trimmed, error, 1);
+			const text = rawLine.trimStart();
+			const inString = recoverableJsonStringState(text, error);
+			if (inString !== void 0) this.pending = {
+				fragments: [text],
+				length: text.length,
+				inString
+			};
+			else this.reportError(trimmed, error, 1);
 		}
 	}
 	parseContinuation(line, pending) {
@@ -58,27 +58,35 @@ var CodexAppServerMessageDecoder = class {
 		try {
 			return JSON.parse(candidate);
 		} catch (error) {
-			if (withinBounds && isRecoverableParseFailure(candidate, error)) {
-				pending.inString = endsInsideJsonString(candidate);
+			const inString = withinBounds ? recoverableJsonStringState(candidate, error) : void 0;
+			if (inString !== void 0) {
+				pending.inString = inString;
 				this.pending = pending;
 			} else this.reportError(candidate, error, pending.fragments.length);
 		}
 	}
 };
-function isRecoverableParseFailure(value, error) {
-	if (!value.startsWith("{") && !value.startsWith("[")) return false;
-	const message = coerceErrorMessage(error);
-	return message.includes("Unterminated string") || message.includes("Unexpected end of JSON input");
-}
-function endsInsideJsonString(value) {
+/** Undefined rejects malformed JSON; false retains a trailing escape for native parsing. */
+function recoverableJsonStringState(value, error) {
+	if (!(error instanceof SyntaxError) || !value.startsWith("{") && !value.startsWith("[")) return;
+	const closers = [];
 	for (let index = 0; index < value.length; index++) {
-		if (value[index] !== "\"") continue;
+		const character = value[index];
+		if (character === "{" || character === "[") closers.push(character === "{" ? "}" : "]");
+		else if (character === "}" || character === "]") closers.pop();
+		if (character !== "\"") continue;
 		const end = scanJsonString(value, index + 1);
-		if (end < 0) return false;
-		if (end === value.length) return true;
+		if (end < 0) return;
+		if (end >= value.length) {
+			const closing = closers.toReversed().join("");
+			for (const suffix of ["\"", "\":null"]) try {
+				JSON.parse(`${value}\\n${suffix}${closing}`);
+				return end === value.length;
+			} catch {}
+			return;
+		}
 		index = end;
 	}
-	return false;
 }
 /** Finds a closing quote; incomplete or invalid escapes require native parsing. */
 function scanJsonString(value, start) {
@@ -88,15 +96,39 @@ function scanJsonString(value, start) {
 		if (value.charCodeAt(index) < 32) return -1;
 		if (character !== "\\") continue;
 		const escape = value[++index];
-		if (escape === "u") {
+		if (!escape) return value.length + 1;
+		else if (escape === "u") {
 			if (!UNICODE_ESCAPE_QUAD.test(value.slice(index + 1, index + 5))) return -1;
 			index += 4;
-		} else if (!escape || !"\"\\/bfnrt".includes(escape)) return -1;
+		} else if (!"\"\\/bfnrt".includes(escape)) return -1;
 	}
 	return value.length;
 }
 //#endregion
 //#region extensions/codex/src/app-server/client-message-frames.ts
+function createCodexAppServerMessageWriter(options) {
+	return (message, onError, beforeWrite, onWriteResult) => {
+		if (options.isClosed()) return;
+		const child = options.getTransport();
+		const id = "id" in message ? message.id : void 0;
+		const method = "method" in message ? message.method : void 0;
+		const frame = stringifyCodexAppServerMessage(message);
+		if (child.maxFrameBytes && Buffer.byteLength(frame) > child.maxFrameBytes) throw new Error("Codex request exceeds the transport frame limit; reduce attached images or context.");
+		beforeWrite?.();
+		if (method === "command/exec") options.onNativeExecution();
+		child.stdin.write(`${frame}\n`, (error) => {
+			onWriteResult?.(error);
+			if (error) {
+				embeddedAgentLog.warn("codex app-server write failed", {
+					error,
+					id,
+					method
+				});
+				onError?.(error);
+			}
+		});
+	};
+}
 const UNPAIRED_SURROGATE_RE = /[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g;
 /** One byte reader owns framing and stops at an asynchronous page decode. */
 function listenCodexAppServerLines(input, onLine, onError) {
@@ -282,4 +314,4 @@ function projectCodexCatalogMessage(parsed, input, cachedPreview) {
 	return result;
 }
 //#endregion
-export { stringifyCodexAppServerMessage as a, isRpcResponse as c, readCodexCatalogDecodeRoute as i, projectCodexCatalogMessage as n, CodexAppServerMessageDecoder as o, listenCodexAppServerLines as r, redactCodexAppServerLinePreview as s, createCodexCatalogDecoder as t };
+export { readCodexCatalogDecodeRoute as a, isRpcResponse as c, listenCodexAppServerLines as i, projectCodexCatalogMessage as n, CodexAppServerMessageDecoder as o, createCodexAppServerMessageWriter as r, redactCodexAppServerLinePreview as s, createCodexCatalogDecoder as t };

package/dist/.setup/command-authorization-AikPDtcc.mjs

@@ -0,0 +1,15 @@
+//#region extensions/codex/src/command-authorization.ts
+const CODEX_NATIVE_EXECUTION_AUTH_ERROR = "Only an owner or operator.admin can control Codex native execution.";
+const CODEX_HOST_INSPECTION_AUTH_ERROR = "Only an owner or operator.admin can inspect Codex host state.";
+const CODEX_FULL_PERMISSIONS_AUTH_ERROR = "Full Codex permissions require operator.admin. Choose Admin in the Control UI permission picker, or use an admin-authenticated CLI.";
+function hasCodexAdminScope(ctx) {
+	return ctx.gatewayClientScopes?.includes("operator.admin") === true;
+}
+function canMutateCodexHost(ctx) {
+	return ctx.senderIsOwner === true || hasCodexAdminScope(ctx);
+}
+function assertCodexHostOwnerCurrent(ctx) {
+	if (!hasCodexAdminScope(ctx)) ctx.assertOwnerCurrent?.();
+}
+//#endregion
+export { canMutateCodexHost as a, assertCodexHostOwnerCurrent as i, CODEX_HOST_INSPECTION_AUTH_ERROR as n, hasCodexAdminScope as o, CODEX_NATIVE_EXECUTION_AUTH_ERROR as r, CODEX_FULL_PERMISSIONS_AUTH_ERROR as t };

package/dist/.setup/{command-dispatch-BeAoaovI.mjs → command-dispatch-BE_RdMou.mjs}

@@ -1,5 +1,5 @@
-import { o as formatCodexDisplayText } from "./command-formatters-R3ckE3Co.mjs";
-import { n as describeControlFailure } from "./capabilities-B3WEZl4e.mjs";
+import { o as formatCodexDisplayText } from "./command-formatters-DV3DHhdr.mjs";
+import { n as describeControlFailure } from "./capabilities-kQntafj_.mjs";
 //#region extensions/codex/src/command-dispatch.ts
 /** Dispatches a `/codex` command to the lazily loaded handler. */
 async function handleCodexCommand(ctx, options) {
@@ -9,7 +9,7 @@ async function handleCodexCommand(ctx, options) {
 	};
 	const { resolvePluginConfig, ...subcommandOptions } = options;
 	try {
-		const { handleCodexSubcommand } = await import("./command-handlers-ylTMS00z.mjs");
+		const { handleCodexSubcommand } = await import("./command-handlers-DNoRq5Ps.mjs");
 		return await handleCodexSubcommand(commandContext, {
 			...subcommandOptions,
 			pluginConfig: resolvePluginConfig?.() ?? subcommandOptions.pluginConfig

package/dist/.setup/{command-formatters-R3ckE3Co.mjs → command-formatters-DV3DHhdr.mjs}

@@ -1,6 +1,11 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-B7-X2TgG.mjs";
+import { c as summarizeCodexRateLimits, o as summarizeCodexAccountRateLimits, r as hasCodexRateLimitSnapshots } from "./rate-limits-CMPy24F5.mjs";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+//#region extensions/codex/src/command-account-email.ts
+function isLikelyEmailAddress(value) {
+	return /^[^\s@<>()[\]`]+@[^\s@<>()[\]`]+\.[^\s@<>()[\]`]+$/.test(value);
+}
+//#endregion
 //#region extensions/codex/src/command-formatters.ts
 /**
 * Formats Codex command responses for safe chat display, including status,
@@ -141,9 +146,6 @@ function formatCodexAccountLine(value) {
 	formatted += escapeCodexChatText(safe.slice(lastIndex));
 	return formatted;
 }
-function isLikelyEmailAddress(value) {
-	return /^[^\s@<>()[\]`]+@[^\s@<>()[\]`]+\.[^\s@<>()[\]`]+$/.test(value);
-}
 function buildHelp() {
 	return [
 		"Codex commands:",
@@ -252,4 +254,4 @@ function extractArray(value) {
 	return [];
 }
 //#endregion
-export { formatCodexAccountLine as a, formatCodexTextForDisplay as c, formatModels as d, formatSkills as f, formatAccount as i, formatComputerUseStatus as l, buildHelp as n, formatCodexDisplayText as o, formatThreads as p, escapeCodexChatText as r, formatCodexStatus as s, CODEX_RESUME_SAFE_THREAD_ID_PATTERN as t, formatList as u };
+export { formatCodexAccountLine as a, formatCodexTextForDisplay as c, formatModels as d, formatSkills as f, formatAccount as i, formatComputerUseStatus as l, isLikelyEmailAddress as m, buildHelp as n, formatCodexDisplayText as o, formatThreads as p, escapeCodexChatText as r, formatCodexStatus as s, CODEX_RESUME_SAFE_THREAD_ID_PATTERN as t, formatList as u };

package/dist/.setup/{command-handlers-ylTMS00z.mjs → command-handlers-DNoRq5Ps.mjs}

@@ -1,48 +1,51 @@
-import { n as isCodexFastServiceTier } from "./config-utils-D0CXecki.mjs";
-import { o as pluginReadParams, r as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary, u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-Cky2XJUw.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { n as assertCodexBindingMayBeReplaced, r as bindingStoreKey, v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
-import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-Dbvq-QgB.mjs";
+import { m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, r as bindingStoreKey } from "./session-binding-record-BZB8RgcF.mjs";
+import { m as isCodexFastServiceTier } from "./config-parsing-BQq-CHTF.mjs";
+import { c as resolveCodexAppServerPreparedApiKeyCacheKey, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-CEd9QlIs.mjs";
 import { n as withCodexConversationThreadActivity } from "./thread-ownership-queue-Dp24d7-F.mjs";
-import { a as CODEX_HOST_INSPECTION_AUTH_ERROR, c as canMutateCodexHost, i as CODEX_FULL_PERMISSIONS_AUTH_ERROR, l as hasCodexAdminScope, n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, r as parseCodexPluginMarketplaceId, s as assertCodexHostOwnerCurrent, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-D_dV9FXa.mjs";
-import { l as formatRelativeDuration, s as summarizeCodexAccountUsage } from "./rate-limits-B7-X2TgG.mjs";
-import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, n as buildHelp, o as formatCodexDisplayText, p as formatThreads, r as escapeCodexChatText, s as formatCodexStatus, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatList } from "./command-formatters-R3ckE3Co.mjs";
-import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-C746z5Pn.mjs";
-import { t as isIncognitoSessionKey } from "./incognito-session-DWYapfwf.mjs";
-import { n as CodexAppServerRpcError } from "./rpc-error-BlD2vuzn.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-B3WEZl4e.mjs";
-import { o as formatCodexCliSessions } from "./node-cli-sessions-HC4W6FLI.mjs";
-import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BL9B5H0L.mjs";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-DTtN1KrX.mjs";
-import { o as withCodexAppServerJsonClient } from "./request-BHZ1nz8d.mjs";
-import "./config-DKhXquav.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
-import { a as resolveCodexAppServerAuthProfileStore, i as resolveCodexAppServerAuthProfileIdForAgent, n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-B0okYl2D.mjs";
-import { F as consumeCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DqyTMYug.mjs";
-import { b as assertCodexThreadResumeResponse, s as isCodexAppServerIndeterminateRequestCancellationError, u as isCodexAppServerPrewriteRequestCancellationError, v as assertCodexThreadAcceptsDirectInput } from "./client-N0JpgSzF.mjs";
-import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DOP-cW5j.mjs";
-import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-BLWz7stm.mjs";
-import { n as listAllCodexAppServerModels } from "./models-DHXZtVVk.mjs";
-import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-cNHRfaxU.mjs";
-import { n as createCodexSessionGenerationSupersededError, o as resolveCodexSessionBinding } from "./session-binding-DGCYAfvD.mjs";
-import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-DTd-DtkX.mjs";
-import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-roNP0l1c.mjs";
-import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DjCz2eOw.mjs";
-import { i as readCodexComputerUseStatus, r as installCodexComputerUse, t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-DsjsL1dr.mjs";
-import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-CGJGUQ6Y.mjs";
-import { a as setCodexConversationFastMode, c as steerCodexConversationTurn, i as readCodexConversationActiveTurn, l as stopCodexConversationTurn, n as parseCodexFastModeArg, o as setCodexConversationModel, r as parseCodexPermissionsModeArg, s as setCodexConversationPermissions, t as formatPermissionsMode } from "./conversation-control-CEP8X5JC.mjs";
+import { a as canMutateCodexHost, i as assertCodexHostOwnerCurrent, n as CODEX_HOST_INSPECTION_AUTH_ERROR, o as hasCodexAdminScope, r as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as CODEX_FULL_PERMISSIONS_AUTH_ERROR } from "./command-authorization-AikPDtcc.mjs";
+import { l as formatRelativeDuration, s as summarizeCodexAccountUsage } from "./rate-limits-CMPy24F5.mjs";
+import { a as formatCodexAccountLine, c as formatCodexTextForDisplay, d as formatModels, f as formatSkills, i as formatAccount, l as formatComputerUseStatus, m as isLikelyEmailAddress, n as buildHelp, o as formatCodexDisplayText, p as formatThreads, r as escapeCodexChatText, s as formatCodexStatus, t as CODEX_RESUME_SAFE_THREAD_ID_PATTERN, u as formatList } from "./command-formatters-DV3DHhdr.mjs";
+import { i as readCodexConversationBindingData, n as createCodexCliNodeConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-DJ4ix-W5.mjs";
+import { r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-kQntafj_.mjs";
+import { n as filterCodexMarketplacePlugins, r as parseCodexPluginMarketplaceId, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-SQPhSuic.mjs";
+import { o as formatCodexCliSessions } from "./node-cli-sessions-B5oNDkUS.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BW8rd98k.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-C-08ez1w.mjs";
+import { a as withCodexAppServerJsonClient } from "./request-BH3FvYUE.mjs";
+import { a as pluginReadParams, l as CODEX_PLUGINS_MARKETPLACE_NAME, n as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-Bf0_piTw.mjs";
+import "./config-0Gxk3_eq.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
+import { a as resolveCodexAppServerAuthProfileStore, i as resolveCodexAppServerAuthProfileIdForAgent, n as normalizeCodexAppServerBindingModelProvider } from "./auth-profile-CgHQ8Vot.mjs";
+import { F as consumeCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, et as resolveCodexAppServerAuthAccountCacheKey, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DJJ3ljH2.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, h as assertCodexThreadResumeResponse, p as assertCodexThreadAcceptsDirectInput, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-CBzEVDyb.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-yLjGwbwT.mjs";
+import { n as fingerprintCodexAppServerAuthBinding } from "./auth-binding-BoMwpuPN.mjs";
+import { n as listAllCodexAppServerModels } from "./models-Du_i5G_t.mjs";
+import { n as refreshCodexAppRuntimeState, r as refreshCodexPluginRuntimeState } from "./plugin-activation-BcyBv8PG.mjs";
+import { o as createCodexSessionGenerationSupersededError, r as resolveCodexSessionBinding } from "./session-binding-Ce7BqiPN.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-CXZV97TS.mjs";
+import { a as rollbackCodexAppServerBindingSubscription, c as withExclusiveCodexAppServerThread, i as retireCodexConversationThreadBinding, n as releaseCodexAppServerBindingSubscription, r as retainCodexAppServerBindingSubscription, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-0aRHD9iK.mjs";
+import { n as resolveCodexNativeSandboxBlock, t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-WqE8yPge.mjs";
+import { t as defaultCodexPluginMetadataCache } from "./plugin-metadata-cache-DWnB7VMj.mjs";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-DpolvQHw.mjs";
+import { a as requestOptions, i as readCodexStatusProbes, o as safeCodexControlRequest, r as prepareCodexControlSessionAuth, t as codexControlRequest } from "./command-rpc-B6xsq2dB.mjs";
+import { a as readCodexConversationActiveTurn, c as setCodexConversationModel, d as stopCodexConversationTurn, i as parseCodexPermissionsModeArg, l as setCodexConversationPermissions, n as formatPermissionsMode, r as parseCodexFastModeArg, s as setCodexConversationFastMode, u as steerCodexConversationTurn } from "./conversation-control-tCg763cI.mjs";
 import { normalizeOptionalString, normalizeUniqueStringEntries } from "openclaw/plugin-sdk/string-coerce-runtime";
 import crypto from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { parseAgentSessionKey } from "openclaw/plugin-sdk/routing";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { ensureAuthProfileStore, resolveAgentDir as resolveAgentDir$1, resolveAgentWorkspaceDir, resolveAuthProfileEligibility, resolveProfileUnusableUntilForDisplay } from "openclaw/plugin-sdk/agent-runtime";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { findNormalizedProviderValue, resolveAuthProfileOrder } from "openclaw/plugin-sdk/provider-auth";
+import { pruneMapToMaxSize } from "openclaw/plugin-sdk/collection-runtime";
 import { renderMessagePresentationFallbackText } from "openclaw/plugin-sdk/interactive-runtime";
 import { MODEL_SELECTION_LOCKED_MESSAGE, isModelSelectionLocked, resolvePersistedSessionRuntimeId } from "openclaw/plugin-sdk/model-session-runtime";
 //#region extensions/codex/src/command-account.ts
@@ -173,15 +176,13 @@ function isChatGptSubscriptionProfile(credential) {
 }
 function formatProfileKind(credential) {
 	if (!credential) return "credential";
-	if (isChatGptSubscriptionProfile(credential)) return "ChatGPT subscription";
-	if (credential.type === "api_key") return "API key";
-	return "credential";
+	return credential.type === "api_key" ? "API key" : "ChatGPT subscription";
 }
 function formatProfileLabel(profileId, credential) {
 	const tail = profileId.includes(":") ? profileId.slice(profileId.indexOf(":") + 1) : profileId;
 	const displayName = credential?.displayName?.trim();
 	if (displayName) return credential?.type === "api_key" ? simplifyApiKeyDisplayName(displayName, tail) : displayName;
-	const email = credential?.email?.trim() ?? extractEmailFromProfileId(profileId);
+	const email = credential?.email?.trim() ?? (isLikelyEmailAddress(tail) ? tail : void 0);
 	if (email) return email;
 	if (credential?.type === "api_key") return tail || "API key";
 	return humanizeProfileTail(tail);
@@ -210,10 +211,6 @@ function splitProfileTail(tail) {
 function titleCase(value) {
 	return value ? `${value[0]?.toUpperCase() ?? ""}${value.slice(1)}` : value;
 }
-function extractEmailFromProfileId(profileId) {
-	const tail = profileId.includes(":") ? profileId.slice(profileId.indexOf(":") + 1) : profileId;
-	return /^[^\s@<>()[\]`]+@[^\s@<>()[\]`]+\.[^\s@<>()[\]`]+$/.test(tail) ? tail : void 0;
-}
 function describeFailureStatus(reason, credential) {
 	if (reason === "auth" || reason === "auth_permanent" || reason === "session_expired") return credential?.type === "api_key" ? "auth failed - check key" : "sign-in expired";
 	if (reason === "billing") return "billing unavailable";
@@ -290,14 +287,11 @@ function buildCodexPluginStatusButtons(pluginId, canRefreshHostedApps) {
 }
 function safeCodexAppLink(value) {
 	if (!value || value.length > 2048 || /[\s\p{Cc}\p{Cf}<>]/u.test(value)) return;
-	try {
-		const url = new URL(value);
-		const host = url.hostname;
-		const hosted = host === "chatgpt.com" || host === "chatgpt-staging.com" || host.endsWith(".chatgpt.com") || host.endsWith(".chatgpt-staging.com");
-		return url.protocol === "https:" && !url.username && !url.password && hosted ? value : void 0;
-	} catch {
-		return;
-	}
+	const url = URL.parse(value);
+	if (!url) return;
+	const host = url.hostname;
+	const hosted = host === "chatgpt.com" || host === "chatgpt-staging.com" || host.endsWith(".chatgpt.com") || host.endsWith(".chatgpt-staging.com");
+	return url.protocol === "https:" && !url.username && !url.password && hosted ? value : void 0;
 }
 //#endregion
 //#region extensions/codex/src/command-plugin-config.ts
@@ -997,7 +991,8 @@ function parseComputerUseArgs(args) {
 				parsed.help = true;
 				continue;
 			}
-			parsed.overrides[option] = value;
+			parsed.overrides[option] = value.trim();
+			parsed.hasOverrides = true;
 			index += 1;
 			continue;
 		}
@@ -1014,19 +1009,6 @@ function parseComputerUseArgs(args) {
 		}
 		parsed.help = true;
 	}
-	const overrides = parsed.overrides;
-	parsed.overrides = {};
-	for (const key of [
-		"marketplaceSource",
-		"marketplacePath",
-		"marketplaceName"
-	]) {
-		const value = normalizeOptionalString(overrides[key]);
-		if (value) {
-			parsed.overrides[key] = value;
-			parsed.hasOverrides = true;
-		}
-	}
 	return parsed;
 }
 function formatComputerUsePersistentIdentityMigration(parsed) {
@@ -1097,20 +1079,11 @@ function createCodexDiagnosticsConfirmation(params) {
 	const token = crypto.randomBytes(6).toString("hex");
 	scopeTokens.push(token);
 	pendingCodexDiagnosticsConfirmationTokensByScope.set(params.scopeKey, scopeTokens);
+	const { now, ...confirmation } = params;
 	pendingCodexDiagnosticsConfirmations.set(token, {
+		...confirmation,
 		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
+		createdAt: now
 	});
 	return token;
 }
@@ -1186,19 +1159,15 @@ function formatCodexDiagnosticsUploadResult(sent, failed) {
 }
 function formatCodexDiagnosticsTargetLines(targets) {
 	return targets.flatMap((target, index) => {
-		const lines = formatCodexDiagnosticsTargetBlock(target, index);
+		const lines = [`Session ${index + 1}`];
+		if (target.channel) lines.push(`Channel: ${formatCodexDisplayText(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 index < targets.length - 1 ? [...lines, ""] : lines;
 	});
 }
-function formatCodexDiagnosticsTargetBlock(target, index) {
-	const lines = [`Session ${index + 1}`];
-	if (target.channel) lines.push(`Channel: ${formatCodexDisplayText(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;
-}
 function formatCodexDiagnosticsTargetLine(target) {
 	const parts = [];
 	if (target.channel) parts.push(`channel ${formatCodexDisplayText(target.channel)}`);
@@ -1219,7 +1188,7 @@ function readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, options =
 	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);
+	for (const map of [lastCodexDiagnosticsUploadByThread, lastCodexDiagnosticsUploadByScope]) for (const [key, lastSentAt] of map) if (now - lastSentAt >= CODEX_DIAGNOSTICS_COOLDOWN_MS) map.delete(key);
 	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByScope, cooldownScope ?? readCodexDiagnosticsCooldownScope(ctx), CODEX_DIAGNOSTICS_COOLDOWN_MAX_SCOPES, now);
 	recordBoundedCodexDiagnosticsCooldown(lastCodexDiagnosticsUploadByThread, threadId, CODEX_DIAGNOSTICS_COOLDOWN_MAX_THREADS, now);
 }
@@ -1256,20 +1225,9 @@ function readCodexDiagnosticsCooldownMs(map, key, now) {
 	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);
-	}
+	if (!map.has(key)) pruneMapToMaxSize(map, maxSize - 1);
 	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) {
 	const safe = truncateUtf16Safe(formatCodexTextForDisplay(error), CODEX_DIAGNOSTICS_ERROR_MAX_CHARS);
 	return escapeCodexChatText(safe) || "unknown error";
@@ -1358,7 +1316,7 @@ async function resolvePreparedCodexCommandAuthority(deps, ctx) {
 		config: ctx.config,
 		storePath
 	}) : void 0;
-	const assertHostCurrent = currentSession?.assertCurrent ?? (() => {});
+	const assertHostCurrent = currentSession?.authority.assertLegacyCurrent ?? (() => {});
 	const binding = (target && (!sessionIdentity || !isDeepStrictEqual(target.identity, sessionIdentity)) ? await resolveCodexSessionBinding({
 		bindingStore: deps.bindingStore,
 		identity: target.identity,
@@ -1454,13 +1412,13 @@ async function handleCodexDiagnosticsFeedback(deps, context, pluginConfig, 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) };
-	if (ctx.diagnosticsPreviewOnly === true) return { text: await previewCodexDiagnosticsFeedbackApproval(deps, ctx, parsed.note) };
-	return await requestCodexDiagnosticsFeedbackApproval(deps, ctx, parsed.note, commandPrefix);
-}
-async function requestCodexDiagnosticsFeedbackApproval(deps, ctx, note, commandPrefix) {
 	const targets = await requireCodexDiagnosticsTargets(deps, ctx);
 	if (typeof targets === "string") return { text: targets };
+	if (ctx.diagnosticsUploadApproved === true) return { text: await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, parsed.note, targets) };
+	if (ctx.diagnosticsPreviewOnly === true) return { text: previewCodexDiagnosticsFeedbackApproval(targets, ctx, parsed.note) };
+	return requestCodexDiagnosticsFeedbackApproval(targets, ctx, parsed.note, commandPrefix);
+}
+function requestCodexDiagnosticsFeedbackApproval(targets, ctx, note, commandPrefix) {
 	const now = Date.now();
 	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now);
 	if (cooldownMessage) return { text: cooldownMessage };
@@ -1513,9 +1471,7 @@ async function requestCodexDiagnosticsFeedbackApproval(deps, ctx, note, commandP
 		}] }
 	};
 }
-async function previewCodexDiagnosticsFeedbackApproval(deps, ctx, note) {
-	const targets = await requireCodexDiagnosticsTargets(deps, ctx);
-	if (typeof targets === "string") return targets;
+function previewCodexDiagnosticsFeedbackApproval(targets, ctx, note) {
 	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, Date.now(), { includeThreadId: false });
 	if (cooldownMessage) return cooldownMessage;
 	const reason = normalizeDiagnosticsReason(note);
@@ -1534,7 +1490,7 @@ async function confirmCodexDiagnosticsFeedback(deps, ctx, pluginConfig, token) {
 	if (!pending.privateRouted && !await hasAnyCodexDiagnosticsIdentity(ctx)) return "Cannot send Codex diagnostics because this command did not include a stable session identity.";
 	const currentTargets = pending.privateRouted ? resolvePendingCodexDiagnosticsTargets(deps, pending.targets, ctx.config) : await resolveCodexDiagnosticsTargets(deps, ctx);
 	if (!codexDiagnosticsTargetsMatch(pending.targets, currentTargets)) return "The Codex diagnostics sessions changed before confirmation. Run /diagnostics again for the current threads.";
-	return await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, pending.note ?? "", currentTargets, { cooldownScope: pending.scopeKey });
+	return await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, pending.note ?? "", currentTargets, pending.scopeKey);
 }
 function cancelCodexDiagnosticsFeedback(ctx, token) {
 	const pending = consumeCodexDiagnosticsConfirmation(ctx, token, "cancel");
@@ -1545,15 +1501,10 @@ function cancelCodexDiagnosticsFeedback(ctx, token) {
 		...formatCodexDiagnosticsTargetLines(pending.targets)
 	].join("\n");
 }
-async function sendCodexDiagnosticsFeedbackForContext(deps, ctx, pluginConfig, note) {
-	const targets = await requireCodexDiagnosticsTargets(deps, ctx);
-	if (typeof targets === "string") return targets;
-	return await sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, note, targets);
-}
-async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, note, targets, options = {}) {
+async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, note, targets, cooldownScope) {
 	if (targets.length === 0) return NO_DIAGNOSTICS_THREAD;
 	const now = Date.now();
-	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, { cooldownScope: options.cooldownScope });
+	const cooldownMessage = readCodexDiagnosticsTargetsCooldownMessage(targets, ctx, now, { cooldownScope });
 	if (cooldownMessage) return cooldownMessage;
 	const reason = normalizeDiagnosticsReason(note);
 	const sent = [];
@@ -1608,7 +1559,7 @@ async function sendCodexDiagnosticsFeedbackForTargets(deps, ctx, pluginConfig, n
 			...target,
 			threadId: responseThreadId ?? target.threadId
 		});
-		recordCodexDiagnosticsUpload(target.threadId, ctx, now, options.cooldownScope);
+		recordCodexDiagnosticsUpload(target.threadId, ctx, now, cooldownScope);
 	}
 	return formatCodexDiagnosticsUploadResult(sent, failed);
 }
@@ -1891,13 +1842,14 @@ async function resumeThread(deps, ctx, pluginConfig, args) {
 		agentId: scope.agentId,
 		config: ctx.config
 	});
-	const { assertCurrent: assertHostGeneration } = await resolveCodexSessionBinding({
+	const { authority } = await resolveCodexSessionBinding({
 		reclaimStale: true,
 		bindingStore: deps.bindingStore,
 		identity,
 		config: ctx.config,
 		storePath: ctx.sessionTarget?.storePath
 	});
+	const assertHostGeneration = authority.assertLegacyCurrent;
 	return await withExclusiveCodexAppServerThread({
 		bindingStore: deps.bindingStore,
 		identity,
@@ -2055,9 +2007,7 @@ const CODEX_NATIVE_CONTROL_SUBCOMMANDS = /* @__PURE__ */ new Set([
 	"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 (isReadOnlyCodexGoalCommand(subcommand, args) || !CODEX_NATIVE_EXECUTION_SUBCOMMANDS.has(subcommand) || returnsBeforeNativeCodexExecution(subcommand, args)) return;
 	if (isCodexCliNodeResumeBind(subcommand, args)) return resolveCodexNativeSandboxBlock({
 		config: ctx.config,
 		sessionKey: ctx.sessionKey,
@@ -2100,10 +2050,8 @@ function isCodexCliNodeResumeBind(subcommand, args) {
 }
 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;
+	if (parsed.help || !parsed.threadId) return true;
+	return parsed.host ? parsed.bindHere !== true : args.length !== 1;
 }
 async function handleComputerUseCommand(deps, ctx, pluginConfig, args) {
 	const parsed = parseComputerUseArgs(args);
@@ -2188,28 +2136,21 @@ function formatNativeGoal(response) {
 		`- Tokens: ${tokensUsed}${tokenBudget === void 0 ? "" : ` / ${tokenBudget}`}`
 	].join("\n");
 }
-async function stopConversationTurn(deps, ctx) {
-	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
-	const { target, binding } = authority;
-	if (!target) return "Cannot stop Codex because this command did not include a stable binding identity.";
-	return (await deps.stopCodexConversationTurn({
-		identity: target.identity,
-		binding,
-		assertCurrent: authority.assertMutationCurrent
-	})).message;
-}
-async function steerConversationTurn(deps, ctx, message) {
+async function controlConversationTurn(deps, ctx, command, message) {
 	const authority = await resolvePreparedCodexCommandAuthority(deps, ctx);
 	const { target, binding } = authority;
-	if (!target) return "Cannot steer Codex because this command did not include a stable binding identity.";
-	return (await deps.steerCodexConversationTurn({
+	if (!target) return `Cannot ${command} Codex because this command did not include a stable binding identity.`;
+	const params = {
 		identity: target.identity,
 		binding,
-		message,
 		assertCurrent: authority.assertMutationCurrent
+	};
+	return (command === "stop" ? await deps.stopCodexConversationTurn(params) : await deps.steerCodexConversationTurn({
+		...params,
+		message
 	})).message;
 }
-async function setConversationModel(deps, ctx, pluginConfig, args) {
+async function setConversationModel(deps, ctx, args) {
 	if (args.length > 1) return "Usage: /codex model <model>";
 	const [model = ""] = args;
 	const normalized = model.trim();
@@ -2232,7 +2173,6 @@ async function setConversationModel(deps, ctx, pluginConfig, args) {
 	return await deps.setCodexConversationModel({
 		identity: target.identity,
 		bindingStore: deps.bindingStore,
-		pluginConfig,
 		model: normalized,
 		agentDir: target.agentDir,
 		config: ctx.config,
@@ -2417,7 +2357,7 @@ async function handleCodexPluginsSubcommand(input, rest, io, runtime) {
 	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 }) };
+		return { text: formatPluginList(current.plugins ?? {}, current.enabled === true) };
 	}
 	if (normalized === "available") {
 		if (!canMutateCodexHost(ctx)) return { text: "Only an owner or operator.admin gateway client can list available Codex plugins." };
@@ -2724,8 +2664,7 @@ async function installCodexPlugin(requestedId, io, runtime, ctx) {
 	const status = alreadyInstalled ? "bundle was already installed in Codex" : "bundle was installed in Codex";
 	return { text: `${formatCodexDisplayText(requestedId)} ${status}. OpenClaw app access is configured.${refreshWarning} ${POLICY_REFRESH_HINT}` };
 }
-function formatPluginList(plugins, options = {}) {
-	const globalEnabled = options.globalEnabled === true;
+function formatPluginList(plugins, globalEnabled) {
 	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) => {
@@ -3004,9 +2943,8 @@ async function handleCodexSubcommand(ctx, options) {
 	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) };
-	if (normalized === "steer") return { text: await steerConversationTurn(deps, ctx, rest.join(" ")) };
-	if (normalized === "model") return { text: await setConversationModel(deps, ctx, options.pluginConfig, rest) };
+	if (normalized === "stop" || normalized === "steer") return { text: await controlConversationTurn(deps, ctx, normalized, rest.join(" ")) };
+	if (normalized === "model") return { text: await setConversationModel(deps, ctx, rest) };
 	if (normalized === "fast") {
 		if (isMenuVerb(rest)) return buildCodexFastMenuReply();
 		return { text: await setConversationFastMode(deps, ctx, rest) };