@openclaw/codex 2026.9.4 → 2026.9.5

package/dist/index.js

@@ -1,30 +1,35 @@
 import { registerCodexCliMetadata } from "./cli-metadata.js";
-import { n as createCodexAppServerNativeCompaction, t as createCodexAppServerAgentHarness } from "./harness-C7rRa7bm.js";
-import { l as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, s as readCurrentCodexAppServerBinding } from "./session-binding-record-Bcvslnhf.js";
-import { n as defineCodexBuildState } from "./build-state-BCmg9-5p.js";
+import { n as createCodexAppServerNativeCompaction, t as createCodexAppServerAgentHarness } from "./.setup/harness-rxaaoN-o.mjs";
+import { l as readCurrentCodexAppServerBinding, n as assertCodexBindingMayBeReplaced, p as sessionBindingIdentity, u as readCurrentCodexNativeSubagentSubmissions } from "./.setup/session-binding-record-TH3xA0zj.mjs";
+import { n as defineCodexBuildState } from "./.setup/build-state-Xx9ybZqa.mjs";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { n as createCodexAuthProfileSelection } from "./auth-profile-selection-DFu9e167.js";
-import { r as createCodexAppServerConfig, s as assertCodexAppServerConnectionSecurity, t as codexAppServerStartOptionsKey } from "./config-options-CXMq1T-C.js";
-import { n as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, o as isJsonObject, x as readCodexPluginConfig } from "./protocol-5bh1G-H7.js";
-import { o as setManagedCodexPluginRoot } from "./managed-binary-D22rNEcR.js";
-import { g as createCodexDesktopGenerationService, h as retireSharedCodexAppServerClientsBeforeDesktopGeneration, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./auth-cache-key-7orQae_j.js";
-import { n as CODEX_MANAGED_THREAD_NAMESPACE, r as createCodexManagedThreadStore, t as CODEX_MANAGED_THREAD_MAX_ENTRIES } from "./managed-thread-store-D1t5jh3G.js";
-import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
-import { o as createCodexAppServerProcessReaperService } from "./transport-stdio-BGjHoYLr.js";
-import { r as withCodexConversationThreadActivity, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.js";
-import { n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, s as canMutateCodexHost, t as discoverCodexMarketplacePlugins } from "./plugin-marketplace-discovery-P-Vndfqq.js";
-import { o as formatCodexDisplayText } from "./command-formatters-lxlkNZgU.js";
-import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir } from "./conversation-binding-data-BiodpIzq.js";
-import { t as buildCodexMigrationProvider } from "./provider-MQ8PVkuE.js";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-8vx68WLH.js";
-import { t as assertCodexArchiveDescendantsUnowned } from "./thread-archive-guard-DfpBr-Sz.js";
-import { a as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeHostCommands, o as resolveCodexCliSessionForBindingOnNode, r as createCodexCliSessionNodeInvokePolicies, s as resumeCodexCliSessionOnNode } from "./node-cli-sessions-DKaOmVUh.js";
-import { i as createCodexSessionCatalogNodeHostCommands, n as createCodexSessionCatalogNodeInvokePolicies, r as createCodexSessionCatalogControl, t as codexSessionCatalogRuntime } from "./session-catalog-ct-AH01I.js";
-import { i as requestCodexAppServerJson } from "./request-B7hEkBGq.js";
-import { t as createCodexWebSearchProviderBase } from "./web-search-provider.shared-BrZmlqyR.js";
+import codexProviderDiscovery from "./provider-discovery.js";
+import { n as createCodexAuthProfileSelection } from "./.setup/auth-profile-selection-DFu9e167.mjs";
+import { m as isJsonObject, t as assertCodexAppServerConnectionSecurity } from "./.setup/config-security-BRQ2mgW9.mjs";
+import { d as readCodexPluginConfig } from "./.setup/config-parsing-CcB9iPoq.mjs";
+import { V as CODEX_CATALOG_MAX_ROWS, W as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS } from "./.setup/session-catalog-native-projection-ChV3cCtm.mjs";
+import { r as createCodexAppServerConfig, t as codexAppServerStartOptionsKey } from "./.setup/config-options-BsanJ8QG.mjs";
+import { o as setManagedCodexPluginRoot } from "./.setup/managed-binary-DP6Rib3P.mjs";
+import { g as createCodexDesktopGenerationService, h as retireSharedCodexAppServerClientsBeforeDesktopGeneration, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./.setup/auth-cache-key-QirmgiCo.mjs";
+import { n as CODEX_MANAGED_THREAD_NAMESPACE, r as createCodexManagedThreadStore, t as CODEX_MANAGED_THREAD_MAX_ENTRIES } from "./.setup/managed-thread-store-BMqgThVL.mjs";
+import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./.setup/session-binding-meta-B7aEMU7g.mjs";
+import { o as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-Cmx94Oiy.mjs";
+import { r as withCodexConversationThreadActivity, t as isIncognitoSessionKey } from "./.setup/incognito-session-uhrBF6wJ.mjs";
+import { n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, s as canMutateCodexHost, t as discoverCodexMarketplacePlugins } from "./.setup/plugin-marketplace-discovery-P-Vndfqq.mjs";
+import { o as formatCodexDisplayText } from "./.setup/command-formatters-CGEkdawF.mjs";
+import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir } from "./.setup/conversation-binding-data-CrcyZk6O.mjs";
+import { t as buildCodexMigrationProvider } from "./.setup/provider-fFh_-VR3.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./.setup/capabilities-_vXcZGSx.mjs";
+import { t as assertCodexArchiveDescendantsUnowned } from "./.setup/thread-archive-guard-jmecf6OJ.mjs";
+import { a as listCodexCliSessionsOnNode, n as createCodexCliSessionNodeHostCommands, o as resolveCodexCliSessionForBindingOnNode, r as createCodexCliSessionNodeInvokePolicies, s as resumeCodexCliSessionOnNode } from "./.setup/node-cli-sessions-Cl8b2ZF3.mjs";
+import { t as CODEX_CATALOG_STATE_NAMESPACE } from "./.setup/session-catalog-index-state-BAuDztHN.mjs";
+import { i as createCodexSessionCatalogNodeHostCommands, n as createCodexSessionCatalogNodeInvokePolicies, r as createCodexSessionCatalogControl, t as codexSessionCatalogRuntime } from "./.setup/session-catalog-fUdWDx-U.mjs";
+import { i as requestCodexAppServerJson } from "./.setup/request-BioXJLYa.mjs";
+import { t as createCodexWebSearchProviderBase } from "./.setup/web-search-provider.shared-BrZmlqyR.mjs";
 import { normalizePluginsConfig, resolveEffectiveEnableState, resolveLivePluginConfigObject, resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { asBoolean, asOptionalRecord, asSafeIntegerInRange, isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { isDeepStrictEqual } from "node:util";
 import { resolveDefaultAgentDir } from "openclaw/plugin-sdk/agent-harness-registration";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
 import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
@@ -33,6 +38,14 @@ import { jsonResult } from "openclaw/plugin-sdk/tool-results";
 import { Type } from "typebox";
 import { readStringParam } from "openclaw/plugin-sdk/param-readers";
 import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
+//#region extensions/codex/src/account-usage.ts
+function registerCodexAccountUsage(api) {
+	api.registerGatewayMethod("codex.accountUsage", async (options) => {
+		const { handleCodexAccountUsage } = await import("./.setup/account-usage-runtime-C2MOIvfq.mjs");
+		await handleCodexAccountUsage(options);
+	}, { scope: "operator.admin" });
+}
+//#endregion
 //#region extensions/codex/src/app-server/connection-health.ts
 const INITIAL_RECONNECT_DELAY_MS = 1e3;
 const MAX_RECONNECT_DELAY_MS = 3e4;
@@ -40,7 +53,7 @@ function createCodexAppServerConnectionHealthService(options) {
 	let abortController;
 	let monitor;
 	const run = async (ctx, signal) => {
-		const { resolveCodexAppServerRuntimeOptions } = await import("./config-runtime-D0zGNIHu.js").then((n) => n.t);
+		const { resolveCodexAppServerRuntimeOptions } = await import("./.setup/config-runtime-CeAhl_h4.mjs").then((n) => n.t);
 		let consecutiveFailures = 0;
 		while (!signal.aborted) {
 			let pluginConfig;
@@ -56,8 +69,8 @@ function createCodexAppServerConnectionHealthService(options) {
 				return;
 			}
 			if (runtime.start.transport !== "websocket") return;
-			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-CscigXXL.js").then((n) => n.y);
-			const { isUnsupportedCodexAppServerVersionError } = await import("./client-B57KWPQx.js").then((n) => n.n);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./.setup/shared-client-BpTtuLQ5.mjs").then((n) => n.y);
+			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-vXs2929Q.mjs").then((n) => n.n);
 			if (signal.aborted) return;
 			let leasedClient;
 			try {
@@ -158,11 +171,12 @@ function waitForReconnect(delayMs, signal) {
 /** Keeps lifecycle/auth loading behind mutations while sharing the canonical read codec. */
 function createLazyCodexAppServerBindingStore(state, managedThreadState) {
 	let resolved;
-	const store = () => resolved ??= import("./session-binding-CI8UuilT.js").then((n) => n.c).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
+	const store = () => resolved ??= import("./.setup/session-binding-_0W_fHRr.mjs").then((n) => n.c).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
 		read: (identity) => readCurrentCodexAppServerBinding(state, identity),
+		readNativeSubagentSubmissions: (identity, owner) => readCurrentCodexNativeSubagentSubmissions(state, identity, owner),
 		hasOtherThreadOwner: async (threadId, currentIdentity) => (await store()).hasOtherThreadOwner(threadId, currentIdentity),
 		mutate: async (identity, mutation, assertCurrent) => (await store()).mutate(identity, mutation, assertCurrent),
 		prepareSessionGenerationReclaim: async (identity) => (await store()).prepareSessionGenerationReclaim(identity),
@@ -199,7 +213,7 @@ function createCodexCommand(options) {
 		acceptsArgs: true,
 		requireAuth: true,
 		handler: async (ctx) => {
-			const { handleCodexCommand } = await import("./command-dispatch-BpduNGVf.js");
+			const { handleCodexCommand } = await import("./.setup/command-dispatch-naHIZwwF.mjs");
 			return handleCodexCommand(ctx, options);
 		}
 	};
@@ -223,7 +237,7 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 		return {
 			handled: true,
 			reply: (await getNodeConversationState().queue.enqueue(`${data.nodeId}:${data.sessionId}`, async () => {
-				const { resolveCodexNativeSandboxBlock } = await import("./sandbox-guard-BxgyoM8M.js").then((n) => n.r);
+				const { resolveCodexNativeSandboxBlock } = await import("./.setup/sandbox-guard-BBP-RbTf.mjs").then((n) => n.r);
 				const blocked = resolveCodexNativeSandboxBlock({
 					config: options.config,
 					sessionKey,
@@ -256,7 +270,7 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 		return {
 			handled: true,
 			reply: (await withCodexConversationThreadActivity(data.bindingId, async () => {
-				const { resolveCodexNativeExecutionBlock } = await import("./sandbox-guard-BxgyoM8M.js").then((n) => n.r);
+				const { resolveCodexNativeExecutionBlock } = await import("./.setup/sandbox-guard-BBP-RbTf.mjs").then((n) => n.r);
 				const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
 					config: options.config,
 					sessionKey,
@@ -265,7 +279,7 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 				});
 				if (nativeExecutionBlock) return { reply: { text: nativeExecutionBlock } };
 				const { getSessionBindingService } = await import("openclaw/plugin-sdk/conversation-binding-runtime");
-				const { runBoundTurnWithMissingThreadRecovery } = await import("./conversation-binding-DsB4-O7U.js");
+				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-DhzrpTM6.mjs");
 				const currentPublicBinding = getSessionBindingService().resolveByConversation({
 					channel: publicBinding.channel,
 					accountId: publicBinding.accountId,
@@ -305,7 +319,7 @@ async function handleCodexConversationBindingResolved(event, options) {
 	const binding = options.bindingStore.read(identity);
 	assertCodexBindingMayBeReplaced(binding, "clearing a denied conversation binding");
 	if (binding && (!data.start?.id || binding.conversationStartId === data.start.id)) await withCodexConversationThreadActivity(identity.bindingId, async () => {
-		const { retireCodexConversationThreadBinding } = await import("./thread-ownership-BsDRTsyp.js").then((n) => n.o);
+		const { retireCodexConversationThreadBinding } = await import("./.setup/thread-ownership-skomxnIt.mjs").then((n) => n.o);
 		return retireCodexConversationThreadBinding({
 			bindingStore: options.bindingStore,
 			identity,
@@ -317,6 +331,7 @@ async function handleCodexConversationBindingResolved(event, options) {
 }
 //#endregion
 //#region extensions/codex/src/native-plugin-tool.ts
+/** Owner-scoped, read-only discovery of plugins already known to Codex. */
 const CodexPluginsParamsSchema = Type.Object({
 	query: Type.Optional(Type.String({ maxLength: 100 })),
 	marketplace: Type.Optional(Type.String({ pattern: "^[A-Za-z0-9_-]+$" })),
@@ -339,25 +354,36 @@ function createCodexPluginsTool(options) {
 			const query = typeof params.query === "string" ? params.query : "";
 			const marketplace = typeof params.marketplace === "string" ? params.marketplace.trim() : void 0;
 			const limit = typeof params.limit === "number" && Number.isInteger(params.limit) ? Math.max(1, Math.min(params.limit, 20)) : 12;
+			const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-Bm38niE8.mjs").then((n) => n.n);
 			const pluginConfig = options.getPluginConfig();
-			const binding = options.context.sessionId ? options.bindingStore.read(sessionBindingIdentity({
+			const config = runtimeConfig();
+			const identity = options.context.sessionId ? sessionBindingIdentity({
 				sessionId: options.context.sessionId,
 				sessionKey: options.context.sessionKey,
 				agentId: options.context.agentId,
-				config: runtimeConfig()
-			})) : void 0;
+				config
+			}) : void 0;
+			const readBinding = () => identity ? options.bindingStore.read(identity) : void 0;
+			const binding = readBinding();
+			const selection = codexBindingConnectionSelection(binding);
+			const assertCurrent = () => {
+				if (runtimeConfig() !== config || !isDeepStrictEqual(options.getPluginConfig(), pluginConfig) || !isDeepStrictEqual(codexBindingConnectionSelection(readBinding()), selection)) throw new Error("Codex plugin discovery ownership changed; retry the request.");
+			};
 			const workspaceDir = binding?.cwd?.trim() || options.context.workspaceDir?.trim() || resolveCodexDefaultWorkspaceDir(pluginConfig);
-			const request = options.request ?? (await import("./command-rpc-CR5EOEZX.js").then((n) => n.n)).codexControlRequest;
-			const { resolveCodexBindingAppServerConnection } = await import("./binding-connection-D3udKbIE.js").then((n) => n.n);
-			const connection = resolveCodexBindingAppServerConnection({
+			const request = options.request ?? (await import("./.setup/command-rpc-DHFpn4le.mjs").then((n) => n.n)).codexControlRequest;
+			const connection = await resolveCodexBindingAppServerConnection({
 				binding,
-				pluginConfig
+				pluginConfig,
+				config,
+				agentDir: options.context.agentDir,
+				assertCurrent
 			});
 			const discovered = await discoverCodexMarketplacePlugins({
 				workspaceDir,
 				request: async (requestParams) => await request(pluginConfig, CODEX_CONTROL_METHODS.listPlugins, requestParams, {
 					agentDir: options.context.agentDir,
-					config: runtimeConfig(),
+					config,
+					assertCurrent,
 					sessionId: options.context.sessionId,
 					sessionKey: options.context.sessionKey,
 					startOptions: connection.appServer.start,
@@ -395,6 +421,9 @@ function projectAvailablePlugin(plugin) {
 }
 //#endregion
 //#region extensions/codex/src/native-thread-tool.ts
+/**
+* Owner-only access to native Codex threads stored in the user's Codex home.
+*/
 const ListParamsSchema = Type.Object({
 	action: Type.Literal("list"),
 	archived: Type.Optional(Type.Boolean()),
@@ -529,41 +558,43 @@ function createCodexThreadsTool(options) {
 			const mayReadRawTranscripts = supervision?.enabled !== true || supervision.allowRawTranscripts === true;
 			if ((action === "fork" || action === "rename" || action === "archive" || action === "unarchive") && supervision?.enabled === true && supervision.allowWriteControls !== true) throw new Error("Codex native thread mutations are disabled for this codex plugin supervision config.");
 			const run = async (archiveAdmission) => {
-				const request = options.request ?? (await import("./command-rpc-CR5EOEZX.js").then((n) => n.n)).codexControlRequest;
+				const request = options.request ?? (await import("./.setup/command-rpc-DHFpn4le.mjs").then((n) => n.n)).codexControlRequest;
 				const { isModelSelectionLocked, ModelSelectionLockedError } = await import("openclaw/plugin-sdk/model-session-runtime");
-				const { resolveCodexBindingAppServerConnection } = await import("./binding-connection-D3udKbIE.js").then((n) => n.n);
-				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./config-runtime-D0zGNIHu.js").then((n) => n.t);
-				const requestOptions = (pluginConfig) => {
+				const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-Bm38niE8.mjs").then((n) => n.n);
+				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./.setup/config-runtime-CeAhl_h4.mjs").then((n) => n.t);
+				const requestOptions = async (pluginConfig) => {
 					const plugin = readCodexPluginConfig(pluginConfig);
+					const base = baseRequestOptions();
 					const session = currentSession();
-					const binding = currentBinding(session);
-					if (binding?.connectionScope === "supervision") {
-						const connection = resolveCodexBindingAppServerConnection({
-							binding,
-							pluginConfig
-						});
-						return {
-							...baseRequestOptions(),
-							startOptions: connection.appServer.start,
-							authProfileId: connection.clientAuthProfileId
-						};
-					}
-					if (plugin.appServer?.homeScope === "user") {
-						const connection = resolveCodexBindingAppServerConnection({
+					const identity = session ? currentIdentity(session.sessionId) : void 0;
+					const readBinding = () => identity ? options.bindingStore.read(identity) : void 0;
+					const binding = readBinding();
+					const selection = codexBindingConnectionSelection(binding);
+					const assertCurrent = () => {
+						const current = currentSession();
+						if (runtimeConfig() !== base.config || !isDeepStrictEqual(options.getPluginConfig(), pluginConfig) || current?.sessionId !== session?.sessionId || current?.entry?.sessionId !== session?.entry?.sessionId || isModelSelectionLocked(current?.entry) !== isModelSelectionLocked(session?.entry) || !isDeepStrictEqual(codexBindingConnectionSelection(readBinding()), selection)) throw new Error("Codex native thread ownership changed; retry the request.");
+					};
+					if (binding?.connectionScope === "supervision" || plugin.appServer?.homeScope === "user") {
+						const connection = await resolveCodexBindingAppServerConnection({
 							binding,
-							pluginConfig
+							pluginConfig,
+							config: base.config,
+							agentDir: base.agentDir,
+							assertCurrent
 						});
 						return {
-							...baseRequestOptions(),
+							...base,
 							startOptions: connection.appServer.start,
-							authProfileId: null
+							authProfileId: connection.usesSupervisionConnection ? connection.clientAuthProfileId : null,
+							assertCurrent
 						};
 					}
 					if (plugin.supervision?.enabled !== true) throw new Error("Codex native thread access is disabled for this run.");
 					return {
-						...baseRequestOptions(),
+						...base,
 						startOptions: resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig }).start,
-						authProfileId: null
+						authProfileId: null,
+						assertCurrent
 					};
 				};
 				if (action === "list") {
@@ -582,7 +613,7 @@ function createCodexThreadsTool(options) {
 						sourceKinds: [...CODEX_INTERACTIVE_THREAD_SOURCE_KINDS],
 						...cursor ? { cursor } : {},
 						...searchTerm ? { searchTerm } : {}
-					}, requestOptions(admissionConfig));
+					}, await requestOptions(admissionConfig));
 					return jsonResult(mayReadRawTranscripts ? response : redactNativeThreadResponse(response));
 				}
 				const threadId = archiveAdmission?.threadId ?? readThreadId(params);
@@ -592,7 +623,7 @@ function createCodexThreadsTool(options) {
 					const response = await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
 						threadId,
 						includeTurns
-					}, requestOptions(admissionConfig));
+					}, await requestOptions(admissionConfig));
 					return jsonResult(mayReadRawTranscripts ? response : redactNativeThreadResponse(response));
 				}
 				if (action === "rename") {
@@ -603,7 +634,7 @@ function createCodexThreadsTool(options) {
 					await request(admissionConfig, CODEX_CONTROL_METHODS.renameThread, {
 						threadId,
 						name
-					}, requestOptions(admissionConfig));
+					}, await requestOptions(admissionConfig));
 					return jsonResult({
 						action,
 						threadId,
@@ -611,7 +642,7 @@ function createCodexThreadsTool(options) {
 					});
 				}
 				if (action === "unarchive") {
-					const response = await request(admissionConfig, CODEX_CONTROL_METHODS.unarchiveThread, { threadId }, requestOptions(admissionConfig));
+					const response = await request(admissionConfig, CODEX_CONTROL_METHODS.unarchiveThread, { threadId }, await requestOptions(admissionConfig));
 					return jsonResult(mayReadRawTranscripts ? response : redactNativeThreadResponse(response));
 				}
 				const session = archiveAdmission?.session ?? currentSession();
@@ -626,20 +657,20 @@ function createCodexThreadsTool(options) {
 					assertThreadMayBeArchived(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
 						threadId,
 						includeTurns: false
-					}, requestOptions(admissionConfig)), threadId);
+					}, await requestOptions(admissionConfig)), threadId);
 					if (await options.bindingStore.hasOtherThreadOwner(threadId, identity)) throw new Error("cannot archive a native Codex thread owned by another OpenClaw session");
 					await assertCodexArchiveDescendantsUnowned({
 						bindingStore: options.bindingStore,
 						threadId,
-						listPage: async (listParams) => await request(admissionConfig, CODEX_CONTROL_METHODS.listThreads, listParams, requestOptions(admissionConfig)),
+						listPage: async (listParams) => await request(admissionConfig, CODEX_CONTROL_METHODS.listThreads, listParams, await requestOptions(admissionConfig)),
 						assertDescendantIdle: async (descendantThreadId) => {
 							assertThreadMayBeArchived(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
 								threadId: descendantThreadId,
 								includeTurns: false
-							}, requestOptions(admissionConfig)), descendantThreadId);
+							}, await requestOptions(admissionConfig)), descendantThreadId);
 						}
 					});
-					await request(admissionConfig, CODEX_CONTROL_METHODS.archiveThread, { threadId }, requestOptions(admissionConfig));
+					await request(admissionConfig, CODEX_CONTROL_METHODS.archiveThread, { threadId }, await requestOptions(admissionConfig));
 					if (archivedBinding?.threadId === threadId) await options.bindingStore.mutate(identity, {
 						kind: "clear",
 						threadId
@@ -660,13 +691,13 @@ function createCodexThreadsTool(options) {
 					assertThreadMayBeForked(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
 						threadId,
 						includeTurns: false
-					}, requestOptions(admissionConfig)), threadId);
+					}, await requestOptions(admissionConfig)), threadId);
 				}
 				const response = await request(admissionConfig, CODEX_CONTROL_METHODS.forkThread, {
 					threadId,
 					threadSource: "user",
 					excludeTurns: true
-				}, requestOptions(admissionConfig));
+				}, await requestOptions(admissionConfig));
 				if (!isJsonObject(response) || !isJsonObject(response.thread)) throw new Error("Codex app-server returned an invalid thread/fork response");
 				const forkThreadId = typeof response.thread.id === "string" && response.thread.id.trim() ? response.thread.id : void 0;
 				if (!forkThreadId) throw new Error("Codex app-server thread/fork response did not include a thread id");
@@ -754,7 +785,7 @@ function createCodexNodeExecServerCommand() {
 			try {
 				if (!context.prepareExecAuthorization) throw new Error("Codex node execution requires node-local exec policy support; update the node.");
 				const assertExecAuthorized = context.prepareExecAuthorization(request.authorization);
-				const { runCodexNodeExecServer } = await import("./node-exec-server.runtime-Cl2vapEi.js");
+				const { runCodexNodeExecServer } = await import("./.setup/node-exec-server.runtime-BaViBKNz.mjs");
 				return await runCodexNodeExecServer({
 					workspaceDir: workspace.workspaceDir,
 					homeDir: workspace.homeDir,
@@ -1638,7 +1669,7 @@ function createCodexSupervisionTools(options) {
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-B7bGbGWq.js"));
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./.setup/web-search-provider.runtime-CTGuJt6i.mjs"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -1682,7 +1713,9 @@ var codex_default = definePluginEntry({
 	description: "Codex app-server harness and native session supervision.",
 	reload: { noopPrefixes: ["plugins.entries.codex.config.codexPlugins"] },
 	register(api) {
+		registerCodexAccountUsage(api);
 		setManagedCodexPluginRoot(api.rootDir);
+		api.registerProvider(codexProviderDiscovery);
 		const resolveCurrentConfig = () => api.runtime.config?.current ? api.runtime.config.current() : void 0;
 		const resolvePluginConfig = (resolveConfig) => {
 			const liveConfig = resolveConfig();
@@ -1722,7 +1755,7 @@ var codex_default = definePluginEntry({
 				return store.update?.bind(store);
 			}
 		};
-		const openManagedThreadStateStore = () => managedThreadStateStore ??= api.runtime.state.openSyncKeyedStore({
+		const openManagedThreadStateStore = () => managedThreadStateStore ??= api.runtime.state.openKeyedStore({
 			namespace: CODEX_MANAGED_THREAD_NAMESPACE,
 			maxEntries: CODEX_MANAGED_THREAD_MAX_ENTRIES,
 			overflowPolicy: "evict-oldest"
@@ -1739,9 +1772,20 @@ var codex_default = definePluginEntry({
 			managedThreads: bindingStore.managedThreads,
 			config: api.config,
 			getPluginConfig: resolveCurrentPluginConfig,
-			getRuntimeConfig: resolveCurrentConfig
+			getRuntimeConfig: resolveCurrentConfig,
+			openResidentState: (homeId) => api.runtime.state.openKeyedStore({
+				namespace: `${CODEX_CATALOG_STATE_NAMESPACE}.${homeId.replaceAll(":", "-")}`,
+				maxEntries: CODEX_CATALOG_MAX_ROWS + 1,
+				overflowPolicy: "reject-new"
+			})
 		});
-		if (readCodexPluginConfig(resolveCurrentPluginConfig()).sessionCatalog?.enabled !== false) {
+		const sessionCatalogEnabled = readCodexPluginConfig(resolveCurrentPluginConfig()).sessionCatalog?.enabled !== false;
+		api.registerService({
+			id: "codex-session-catalog",
+			start: () => sessionCatalogEnabled ? sessionCatalogControlFactory.start() : void 0,
+			stop: () => sessionCatalogControlFactory.stop()
+		});
+		if (sessionCatalogEnabled) {
 			codexSessionCatalogRuntime.register({
 				api,
 				resolveRuntimeOptions: resolveCodexSupervisionAppServerRuntimeOptions,
@@ -1750,11 +1794,7 @@ var codex_default = definePluginEntry({
 				getPluginConfig: resolveCurrentPluginConfig,
 				getRuntimeConfig: resolveCurrentConfig
 			});
-			for (const command of createCodexSessionCatalogNodeHostCommands(sessionCatalogControlFactory, {
-				getPluginConfig: resolveCurrentPluginConfig,
-				getRuntimeConfig: () => resolveCurrentConfig() ?? api.config,
-				resolveRuntimeOptions: resolveCodexSupervisionAppServerRuntimeOptions
-			}, bindingStore)) api.registerNodeHostCommand(command);
+			for (const command of createCodexSessionCatalogNodeHostCommands(sessionCatalogControlFactory, bindingStore)) api.registerNodeHostCommand(command);
 		}
 		for (const policy of createCodexSessionCatalogNodeInvokePolicies()) api.registerNodeInvokePolicy(policy);
 		if (readCodexPluginConfig(resolveCurrentPluginConfig()).supervision?.enabled === true) {
@@ -1886,7 +1926,7 @@ var codex_default = definePluginEntry({
 			if (endedSessionKey && nextSessionKey && nextSessionKey !== endedSessionKey) return;
 			if (event.nextSessionId?.trim() === event.sessionId.trim()) return;
 			const config = resolveCurrentConfig();
-			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./session-binding-CI8UuilT.js").then((n) => n.c), import("./session-retirement-B2YfbAAT.js")]);
+			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./.setup/session-binding-_0W_fHRr.mjs").then((n) => n.c), import("./.setup/session-retirement-CU87AOg9.mjs")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({

package/dist/media-understanding-provider.js

@@ -6,7 +6,7 @@ import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime
 * structured extraction turns.
 */
 const CODEX_MEDIA_PROVIDER_ID = "codex";
-const DEFAULT_CODEX_IMAGE_MODEL = "gpt-5.6-sol";
+const DEFAULT_CODEX_IMAGE_MODEL = "gpt-6-astra";
 const DEFAULT_CODEX_IMAGE_PROMPT = "Describe the image.";
 /**
 * Builds the media-understanding provider that delegates image tasks to an
@@ -43,7 +43,7 @@ async function describeCodexImages(req, options) {
 	const model = req.model.trim();
 	if (!model) throw new Error("Codex image understanding requires model id.");
 	req.signal?.throwIfAborted();
-	const { runBoundedCodexAppServerTurn } = await import("./bounded-turn-C_Hneydj.js");
+	const { runBoundedCodexAppServerTurn } = await import("./.setup/bounded-turn-BtlZcivC.mjs");
 	req.signal?.throwIfAborted();
 	const { text } = await runBoundedCodexAppServerTurn({
 		config: req.cfg,
@@ -83,7 +83,7 @@ async function extractCodexStructured(req, options) {
 	if (req.input.length === 0) throw new Error("Codex structured extraction requires at least one input.");
 	if (!req.input.some((entry) => entry.type === "image")) throw new Error("Codex structured extraction requires at least one image input.");
 	req.signal?.throwIfAborted();
-	const { runBoundedCodexAppServerTurn } = await import("./bounded-turn-C_Hneydj.js");
+	const { runBoundedCodexAppServerTurn } = await import("./.setup/bounded-turn-BtlZcivC.mjs");
 	req.signal?.throwIfAborted();
 	const { text } = await runBoundedCodexAppServerTurn({
 		config: req.cfg,

package/dist/migration-provider-api.js

@@ -1,2 +1,2 @@
-import { t as buildCodexMigrationProvider } from "./provider-MQ8PVkuE.js";
+import { t as buildCodexMigrationProvider } from "./.setup/provider-fFh_-VR3.mjs";
 export { buildCodexMigrationProvider as buildMigrationProvider };

package/dist/native-tool-policy.js

@@ -0,0 +1,12 @@
+//#region extensions/codex/native-tool-policy.ts
+/** Capabilities exposed together by Codex native code mode. */
+const CODEX_NATIVE_TOOL_REQUIREMENTS = [
+	"exec",
+	"process",
+	"read",
+	"write",
+	"edit",
+	"apply_patch"
+];
+//#endregion
+export { CODEX_NATIVE_TOOL_REQUIREMENTS };

package/dist/provider-discovery.js

@@ -0,0 +1,18 @@
+//#region extensions/codex/provider-discovery.ts
+const codexProviderDiscovery = {
+	id: "codex",
+	label: "Codex",
+	auth: [],
+	prepareSyntheticAuth: async ({ config, provider, env, signal, pluginRoot }) => {
+		if (provider !== "codex") return;
+		const { probeCodexNativeAuth } = await import("./.setup/native-auth-BLZGqFjw.mjs");
+		return await probeCodexNativeAuth({
+			config,
+			env,
+			signal,
+			pluginRoot
+		});
+	}
+};
+//#endregion
+export { codexProviderDiscovery as default };

package/dist/session-history-worker-runtime.js

@@ -1,12 +1,30 @@
-import { n as codexHistoryRejectionReason } from "./history-rejection-B4nOXNXF.js";
-import { n as runCodexHistoryWorkerInput, t as codexHistoryWorkerUrl } from "./session-history.worker-BeK1YOyT.js";
-import { n as resolveCodexHistoryTarget } from "./session-history-Cz-tOOYj.js";
-import { WorkerTaskPool } from "openclaw/plugin-sdk/process-runtime";
+import { n as codexHistoryRejectionReason } from "./.setup/history-rejection-B4nOXNXF.mjs";
+import { t as runCodexHistoryWorkerInput } from "./.setup/session-history.worker-CpNj7H_P.mjs";
+import { n as resolveCodexHistoryTarget } from "./.setup/session-history-C--SrLI8.mjs";
+import { WorkerTaskPool, resolveRuntimeWorkerArgv, resolveRuntimeWorkerUrl } from "openclaw/plugin-sdk/process-runtime";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
+import { fileURLToPath } from "node:url";
 import { SessionTranscriptReadFenceError, captureCodexSessionTranscriptReadAdmission, validateCodexSessionTranscriptContextVersion, validateCodexSessionTranscriptReadAdmission } from "openclaw/plugin-sdk/codex-session-transcript-runtime";
 //#region extensions/codex/session-history-worker-runtime.ts
+const codexHistoryWorkerEntrypoint = {
+	currentModuleUrl: import.meta.url,
+	sourceWorkerName: "session-history.worker",
+	distWorkerPath: "extensions/codex/session-history.worker.js",
+	package: {
+		name: "@openclaw/codex",
+		distWorkerPath: "session-history.worker.js"
+	}
+};
+function resolveCodexHistoryWorkerUrl() {
+	const sourceUrl = resolveRuntimeWorkerUrl(codexHistoryWorkerEntrypoint);
+	if (!(/\.[cm]?ts$/u.test(sourceUrl.pathname) && (typeof process.versions.bun === "string" || resolveRuntimeWorkerArgv(sourceUrl).length === 1))) return sourceUrl;
+	return resolveRuntimeWorkerUrl({
+		...codexHistoryWorkerEntrypoint,
+		root: fileURLToPath(new URL("../..", import.meta.url))
+	});
+}
 const historyReads = new WorkerTaskPool({
-	workerUrl: codexHistoryWorkerUrl,
+	workerUrl: resolveCodexHistoryWorkerUrl(),
 	maxWorkers: 1
 });
 async function readHistory(target, operation, admission, signal) {

package/dist/session-history.worker.js

@@ -1,2 +1,2 @@
-import { n as runCodexHistoryWorkerInput, t as codexHistoryWorkerUrl } from "./session-history.worker-BeK1YOyT.js";
-export { codexHistoryWorkerUrl, runCodexHistoryWorkerInput };
+import { t as runCodexHistoryWorkerInput } from "./.setup/session-history.worker-CpNj7H_P.mjs";
+export { runCodexHistoryWorkerInput };

package/dist/web-search-contract-api.js

@@ -1,4 +1,4 @@
-import { t as createCodexWebSearchProviderBase } from "./web-search-provider.shared-BrZmlqyR.js";
+import { t as createCodexWebSearchProviderBase } from "./.setup/web-search-provider.shared-BrZmlqyR.mjs";
 //#region extensions/codex/web-search-contract-api.ts
 function createCodexWebSearchProvider() {
 	return {