@openclaw/codex 2026.9.4 → 2026.9.6

package/dist/index.js

@@ -1,38 +1,54 @@
 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-a_MsE4-_.mjs";
+import { d as readCurrentCodexNativeSubagentSubmissions, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, u as readCurrentCodexAppServerBindings } from "./.setup/session-binding-record-BGoz8wOK.mjs";
+import { n as defineCodexBuildState } from "./.setup/build-state-C7EnDVgr.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 { t as assertCodexAppServerConnectionSecurity } from "./.setup/config-security-BEReZ6go.mjs";
+import { d as readCodexPluginConfig } from "./.setup/config-parsing-CcB9iPoq.mjs";
+import { K as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, U as CODEX_CATALOG_MAX_ROWS } from "./.setup/session-catalog-native-projection-DowriLid.mjs";
+import { i as isJsonObject } from "./.setup/protocol-CANUwXJ3.mjs";
+import { r as createCodexAppServerConfig, t as codexAppServerStartOptionsKey } from "./.setup/config-options-BvaRs51b.mjs";
+import { o as setManagedCodexPluginRoot } from "./.setup/managed-binary-BnshlFag.mjs";
+import { l as createCodexDesktopGenerationService, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./.setup/auth-cache-key-B2mpaI9D.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 { g as retireSharedCodexAppServerClientsBeforeDesktopGeneration } from "./.setup/session-catalog-events-Bj6j94E_.mjs";
+import { s as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-h2VHOskC.mjs";
+import { n as codexNativeProfileRecoveryService } from "./.setup/auth-profile-health-oHizqgye.mjs";
+import { r as withCodexConversationThreadActivity, t as isIncognitoSessionKey } from "./.setup/incognito-session-uhrBF6wJ.mjs";
+import { c as canMutateCodexHost, n as filterCodexMarketplacePlugins, o as CODEX_NATIVE_EXECUTION_AUTH_ERROR, t as discoverCodexMarketplacePlugins } from "./.setup/plugin-marketplace-discovery-CDOi8IFs.mjs";
+import { o as formatCodexDisplayText } from "./.setup/command-formatters-Bmqvr9tO.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-BOsxQHOM.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./.setup/capabilities-CDXOOFdZ.mjs";
+import { t as assertCodexArchiveDescendantsUnowned } from "./.setup/thread-archive-guard-C9frICzX.mjs";
+import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, s as listCodexCliSessionsOnNode } from "./.setup/node-cli-sessions-r3avj02l.mjs";
+import { t as CODEX_CATALOG_STATE_NAMESPACE } from "./.setup/session-catalog-index-state-Dgh8ORJm.mjs";
+import { i as createCodexSessionCatalogNodeHostCommands, n as createCodexSessionCatalogNodeInvokePolicies, r as createCodexSessionCatalogControl, t as codexSessionCatalogRuntime } from "./.setup/session-catalog-Pno1xGcl.mjs";
+import { i as requestCodexAppServerJson } from "./.setup/request-D2L0zMrq.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";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 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-Eem_WGqY.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 +56,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-C8Rw1m1m.mjs").then((n) => n.t);
 		let consecutiveFailures = 0;
 		while (!signal.aborted) {
 			let pluginConfig;
@@ -56,8 +72,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-DA4VR4Eb.mjs").then((n) => n.y);
+			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-Cs08OXVQ.mjs").then((n) => n.n);
 			if (signal.aborted) return;
 			let leasedClient;
 			try {
@@ -158,11 +174,15 @@ 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-Cm0apEbd.mjs").then((n) => n.s).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
 		read: (identity) => readCurrentCodexAppServerBinding(state, identity),
+		get readMany() {
+			return state.lookupMany ? (identities) => readCurrentCodexAppServerBindings(state, identities) : void 0;
+		},
+		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,14 +219,26 @@ function createCodexCommand(options) {
 		acceptsArgs: true,
 		requireAuth: true,
 		handler: async (ctx) => {
-			const { handleCodexCommand } = await import("./command-dispatch-BpduNGVf.js");
-			return handleCodexCommand(ctx, options);
+			const commandContext = {
+				...ctx,
+				gatewayClientScopes: ctx.gatewayClientScopes?.slice()
+			};
+			const { handleCodexCommand } = await import("./.setup/command-dispatch-B4JuOsOk.mjs");
+			return handleCodexCommand(commandContext, options);
 		}
 	};
 }
 //#endregion
 //#region extensions/codex/src/conversation-binding-hooks.ts
 const getNodeConversationState = defineCodexBuildState("openclaw.codex.conversationBinding", () => ({ queue: new KeyedAsyncQueue() }));
+function isCurrentPublicBinding(binding, service) {
+	return service.resolveByConversation({
+		channel: binding.channel,
+		accountId: binding.accountId,
+		conversationId: binding.conversationId,
+		...binding.parentConversationId ? { parentConversationId: binding.parentConversationId } : {}
+	})?.bindingId === binding.bindingId;
+}
 async function handleCodexConversationInboundClaim(event, ctx, options) {
 	const publicBinding = ctx.pluginBinding;
 	const data = readCodexConversationBindingData(publicBinding);
@@ -223,7 +255,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-C2sRMOEY.mjs").then((n) => n.r);
 				const blocked = resolveCodexNativeSandboxBlock({
 					config: options.config,
 					sessionKey,
@@ -232,9 +264,13 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 				if (blocked) return { reply: { text: blocked } };
 				const resume = options.resumeCodexCliSessionOnNode;
 				if (!resume) return { reply: { text: "Codex CLI node binding is unavailable because Gateway node runtime is not attached." } };
+				const { getSessionBindingService } = await import("openclaw/plugin-sdk/conversation-binding-runtime");
+				if (!isCurrentPublicBinding(publicBinding, getSessionBindingService())) return { reply: { text: "This Codex conversation was detached or changed before its message could run." } };
 				return { reply: { text: (await resume({
 					nodeId: data.nodeId,
 					sessionId: data.sessionId,
+					agentId: data.agentId,
+					sessionKey,
 					prompt,
 					cwd: data.cwd,
 					timeoutMs: options.timeoutMs
@@ -256,7 +292,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-C2sRMOEY.mjs").then((n) => n.r);
 				const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
 					config: options.config,
 					sessionKey,
@@ -265,15 +301,9 @@ 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 currentPublicBinding = getSessionBindingService().resolveByConversation({
-					channel: publicBinding.channel,
-					accountId: publicBinding.accountId,
-					conversationId: publicBinding.conversationId,
-					...publicBinding.parentConversationId ? { parentConversationId: publicBinding.parentConversationId } : {}
-				});
+				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-DP-gMrBP.mjs");
 				const current = options.bindingStore.read(identity);
-				if (currentPublicBinding?.bindingId !== publicBinding.bindingId || expected && (!current || current.threadId !== expected.threadId || current.conversationStartId !== expected.conversationStartId) || !expected && current && data.start?.id && current.conversationStartId !== data.start.id) return { reply: { text: "This Codex conversation was detached or changed before its message could run." } };
+				if (!isCurrentPublicBinding(publicBinding, getSessionBindingService()) || expected && (!current || current.threadId !== expected.threadId || current.conversationStartId !== expected.conversationStartId) || !expected && current && data.start?.id && current.conversationStartId !== data.start.id) return { reply: { text: "This Codex conversation was detached or changed before its message could run." } };
 				return await runBoundTurnWithMissingThreadRecovery({
 					bindingStore: options.bindingStore,
 					data,
@@ -305,7 +335,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-DcTtAcXj.mjs").then((n) => n.o);
 		return retireCodexConversationThreadBinding({
 			bindingStore: options.bindingStore,
 			identity,
@@ -317,6 +347,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 +370,37 @@ 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-ThoatDcb.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 = () => {
+				options.context.assertInvocationCurrent?.();
+				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-DixIj3HW.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 +438,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 +575,44 @@ 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-DixIj3HW.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-ThoatDcb.mjs").then((n) => n.n);
+				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./.setup/config-runtime-C8Rw1m1m.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 = () => {
+						options.context.assertInvocationCurrent?.();
+						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 +631,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 +641,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 +652,7 @@ function createCodexThreadsTool(options) {
 					await request(admissionConfig, CODEX_CONTROL_METHODS.renameThread, {
 						threadId,
 						name
-					}, requestOptions(admissionConfig));
+					}, await requestOptions(admissionConfig));
 					return jsonResult({
 						action,
 						threadId,
@@ -611,7 +660,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,24 +675,24 @@ 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
-					});
+					}, options.context.assertInvocationCurrent);
 					return jsonResult({
 						action,
 						threadId
@@ -655,33 +704,65 @@ function createCodexThreadsTool(options) {
 				if (attach && isModelSelectionLocked(session?.entry)) throw new ModelSelectionLockedError();
 				const usesSupervisionConnection = binding?.connectionScope === "supervision" || admissionPlugin.appServer?.homeScope !== "user" && supervision?.enabled === true;
 				if (attach && usesSupervisionConnection) throw new Error("Supervised Codex forks must stay detached; set attach=false.");
+				const forkOptions = await requestOptions(admissionConfig);
+				const { retainCodexAppServerBindingSubscription, rollbackCodexAppServerBindingSubscription } = await import("./.setup/thread-ownership-DcTtAcXj.mjs").then((n) => n.o);
+				const { closeCodexStartupClientBestEffort } = await import("./.setup/attempt-client-cleanup-CEv1cKwF.mjs").then((n) => n.a);
 				if (attach) {
 					assertCodexBindingMayBeReplaced(binding, "attaching a different native fork");
 					assertThreadMayBeForked(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
 						threadId,
 						includeTurns: false
-					}, requestOptions(admissionConfig)), threadId);
+					}, forkOptions), threadId);
 				}
 				const response = await request(admissionConfig, CODEX_CONTROL_METHODS.forkThread, {
 					threadId,
 					threadSource: "user",
 					excludeTurns: true
-				}, 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");
-				if (attach && session) {
-					if (!await options.bindingStore.mutate(currentIdentity(session.sessionId), {
-						kind: "set",
-						binding: {
-							threadId: forkThreadId,
-							cwd: typeof response.thread.cwd === "string" ? response.thread.cwd : options.context.workspaceDir ?? "",
-							model: typeof response.model === "string" ? response.model : void 0,
-							modelProvider: typeof response.modelProvider === "string" ? response.modelProvider : void 0,
-							historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
+				}, {
+					...forkOptions,
+					onResponse: async (value, client, { assertCurrent }) => {
+						if (!isJsonObject(value) || !isJsonObject(value.thread)) {
+							await closeCodexStartupClientBestEffort(client);
+							throw new Error("Codex app-server returned an invalid thread/fork response");
 						}
-					})) throw new Error("Codex session binding changed before the fork could be attached");
-				}
+						const forkThread = value.thread;
+						const forkThreadId = typeof forkThread.id === "string" && forkThread.id.trim() ? forkThread.id : void 0;
+						if (!forkThreadId) {
+							await closeCodexStartupClientBestEffort(client);
+							throw new Error("Codex app-server thread/fork response did not include a thread id");
+						}
+						let retained = false;
+						let attached = false;
+						try {
+							assertCurrent();
+							if (attach && session) {
+								const identity = currentIdentity(session.sessionId);
+								await options.bindingStore.withLease(identity, async () => {
+									assertCurrent();
+									if (currentSession()?.entry?.sessionId !== session.sessionId) throw new Error("Codex native thread ownership changed; retry the request.");
+									assertCodexBindingMayBeReplaced(currentBinding(session), "attaching a different native fork");
+									retained = await retainCodexAppServerBindingSubscription(client, forkThreadId);
+									if (!retained) throw new Error("Codex fork lost its native subscription owner.");
+									const nextBinding = {
+										threadId: forkThreadId,
+										clientId: client.getInstanceId(),
+										cwd: typeof forkThread.cwd === "string" ? forkThread.cwd : options.context.workspaceDir ?? "",
+										model: typeof value.model === "string" ? value.model : void 0,
+										modelProvider: typeof value.modelProvider === "string" ? value.modelProvider : void 0,
+										historyCoveredThrough: (/* @__PURE__ */ new Date()).toISOString()
+									};
+									attached = await options.bindingStore.mutate(identity, {
+										kind: "set",
+										binding: nextBinding
+									}, assertCurrent);
+									if (!attached) throw new Error("Codex session binding changed before the fork could be attached");
+								});
+							}
+						} finally {
+							if (!attached) await rollbackCodexAppServerBindingSubscription(client, forkThreadId, retained);
+						}
+					}
+				});
 				const result = {
 					action,
 					sourceThreadId: threadId,
@@ -728,6 +809,7 @@ function createCodexNodeExecServerCommand() {
 		cap: CODEX_NODE_EXEC_SERVER_CAPABILITY,
 		dangerous: true,
 		duplex: true,
+		hasActiveWork: () => activeProcesses.size > 0,
 		onDisconnect: async () => {
 			await Promise.all([...activeProcesses].map(async (terminate) => await terminate()));
 		},
@@ -742,36 +824,21 @@ function createCodexNodeExecServerCommand() {
 			if (!isRecord(request) || Object.keys(request).length !== 2 || request.authorization !== "human-approved" && request.authorization !== "session-full") throw new Error("Codex node exec-server requires an authorized managed placement workspace launch.");
 			const placement = parseCodexNodePlacementWorkspace(request.placement);
 			if (!context?.acquireManagedWorkspace || context.sessionKey !== placement.sessionKey || io.signal.aborted) throw new Error("Codex node exec-server requires active managed placement authority.");
-			const workspace = context.acquireManagedWorkspace({
-				workspaceDir: placement.cwd,
-				environmentId: placement.environmentId,
-				sessionId: placement.sessionId,
-				ownerEpoch: placement.ownerEpoch,
-				sessionKey: placement.sessionKey
+			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("./.setup/node-exec-server.runtime-BDwWXVpK.mjs");
+			return await runCodexNodeExecServer({
+				workspace: context.acquireManagedWorkspace({
+					workspaceDir: placement.cwd,
+					environmentId: placement.environmentId,
+					sessionId: placement.sessionId,
+					ownerEpoch: placement.ownerEpoch,
+					sessionKey: placement.sessionKey
+				}),
+				io,
+				activeProcesses,
+				assertExecAuthorized
 			});
-			const frames = io.frames;
-			let unsubscribe;
-			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");
-				return await runCodexNodeExecServer({
-					workspaceDir: workspace.workspaceDir,
-					homeDir: workspace.homeDir,
-					io,
-					activeProcesses,
-					assertExecAuthorized,
-					onFrameReceiver: (receiver) => {
-						unsubscribe = frames.onMessage(receiver);
-					}
-				});
-			} finally {
-				try {
-					unsubscribe?.();
-				} finally {
-					workspace.release();
-				}
-			}
 		}
 	};
 }
@@ -854,6 +921,29 @@ function createCodexNodeExecServerInvokePolicy() {
 	};
 }
 //#endregion
+//#region extensions/codex/src/supervision-tool-policy.ts
+var CodexSupervisionPolicyError = class extends Error {};
+function requireSupervisionEnabled(pluginConfig) {
+	if (readCodexPluginConfig(pluginConfig).supervision?.enabled !== true) throw new CodexSupervisionPolicyError("Codex supervision is disabled in the codex plugin config.");
+}
+function requireOwnerAccess(options) {
+	options.assertInvocationCurrent?.();
+	if (!options.senderIsOwner) throw new CodexSupervisionPolicyError("Codex supervision compatibility tools require an owner-authorized sender.");
+}
+function resolveToolPolicy(pluginConfig) {
+	const config = readCodexPluginConfig(pluginConfig).supervision;
+	return {
+		allowRawTranscripts: config?.allowRawTranscripts === true,
+		allowWriteControls: config?.allowWriteControls === true
+	};
+}
+function requireRawTranscriptAccess(pluginConfig) {
+	if (!resolveToolPolicy(pluginConfig).allowRawTranscripts) throw new CodexSupervisionPolicyError("Codex session reads are disabled for this codex plugin supervision config.");
+}
+function requireWriteAccess(pluginConfig) {
+	if (!resolveToolPolicy(pluginConfig).allowWriteControls) throw new CodexSupervisionPolicyError("Codex write controls are disabled for this codex plugin supervision config.");
+}
+//#endregion
 //#region extensions/codex/src/supervision-tools.ts
 /**
 * Compatibility tools for the retired Codex Supervisor plugin.
@@ -865,10 +955,6 @@ function createCodexNodeExecServerInvokePolicy() {
 */
 /** Legacy endpoint env retained for the shipped Supervisor tool contract. */
 const LEGACY_CODEX_SUPERVISOR_ENDPOINTS_ENV = "OPENCLAW_CODEX_SUPERVISOR_ENDPOINTS";
-/** Legacy standalone-MCP transcript gate. Agent tools use canonical config. */
-const LEGACY_CODEX_SUPERVISOR_RAW_TRANSCRIPTS_ENV = "OPENCLAW_CODEX_SUPERVISOR_ALLOW_RAW_TRANSCRIPTS";
-/** Legacy standalone-MCP write gate. Agent tools use canonical config. */
-const LEGACY_CODEX_SUPERVISOR_WRITE_CONTROLS_ENV = "OPENCLAW_CODEX_SUPERVISOR_ALLOW_WRITE_CONTROLS";
 const CODEX_SUPERVISION_COMPAT_TOOL_NAMES = [
 	"codex_endpoint_probe",
 	"codex_sessions_list",
@@ -921,7 +1007,6 @@ const PAGE_LIMIT = 100;
 const MAX_COMPAT_PAGINATION_PAGES = 100;
 const MAX_COMPAT_CURSOR_LENGTH = 4096;
 const MAX_COMPAT_THREAD_ID_LENGTH = 4096;
-var CodexSupervisionPolicyError = class extends Error {};
 function asRecordArray(value) {
 	return Array.isArray(value) ? value.filter(isRecord) : [];
 }
@@ -1117,8 +1202,10 @@ function supervisionEndpointConnectionKey(params) {
 		})
 	});
 }
-function createCanonicalEndpointRequest(options) {
+function createPolicyGuardedRequest(options, policy) {
 	return async (endpoint, method, requestParams) => {
+		const currentEndpoint = requireCurrentEndpoint(options, policy, endpoint);
+		if (options.request) return await options.request(currentEndpoint, method, requestParams);
 		const pluginConfig = options.getPluginConfig();
 		const env = options.env ?? process.env;
 		const runtime = options.resolveRuntimeOptions({
@@ -1127,7 +1214,7 @@ function createCanonicalEndpointRequest(options) {
 		});
 		const config = options.getRuntimeConfig?.();
 		const startOptions = resolveEndpointStartOptions({
-			endpoint,
+			endpoint: currentEndpoint,
 			pluginConfig,
 			env,
 			resolveRuntimeOptions: options.resolveRuntimeOptions
@@ -1137,6 +1224,9 @@ function createCanonicalEndpointRequest(options) {
 			requestParams,
 			timeoutMs: runtime.requestTimeoutMs,
 			startOptions,
+			assertCurrent: () => {
+				requireCurrentEndpoint(options, policy, currentEndpoint);
+			},
 			...endpoint.configured || startOptions.homeScope === "user" ? { authProfileId: null } : {},
 			...config ? { config } : {}
 		});
@@ -1392,32 +1482,12 @@ function sanitizeSessionListResult(result, includeTranscriptDerivedFields) {
 		}))
 	};
 }
-function requireSupervisionEnabled(pluginConfig) {
-	if (readCodexPluginConfig(pluginConfig).supervision?.enabled !== true) throw new CodexSupervisionPolicyError("Codex supervision is disabled in the codex plugin config.");
-}
-function requireOwnerAccess(options) {
-	if (!options.senderIsOwner) throw new CodexSupervisionPolicyError("Codex supervision compatibility tools require an owner-authorized sender.");
-}
-function resolveToolPolicy(options, pluginConfig) {
-	const config = readCodexPluginConfig(pluginConfig).supervision;
-	const env = options.env ?? process.env;
-	return {
-		allowRawTranscripts: config?.allowRawTranscripts === true || options.useLegacyMcpPolicyEnv === true && env[LEGACY_CODEX_SUPERVISOR_RAW_TRANSCRIPTS_ENV] === "1",
-		allowWriteControls: config?.allowWriteControls === true || options.useLegacyMcpPolicyEnv === true && env[LEGACY_CODEX_SUPERVISOR_WRITE_CONTROLS_ENV] === "1"
-	};
-}
-function requireRawTranscriptAccess(options, pluginConfig) {
-	if (!resolveToolPolicy(options, pluginConfig).allowRawTranscripts) throw new CodexSupervisionPolicyError("Codex session reads are disabled for this codex plugin supervision config.");
-}
-function requireWriteAccess(options, pluginConfig) {
-	if (!resolveToolPolicy(options, pluginConfig).allowWriteControls) throw new CodexSupervisionPolicyError("Codex write controls are disabled for this codex plugin supervision config.");
-}
 function requireLiveToolPolicy(options, policy) {
 	requireOwnerAccess(options);
 	const pluginConfig = options.getPluginConfig();
 	requireSupervisionEnabled(pluginConfig);
-	if (policy === "raw-transcripts") requireRawTranscriptAccess(options, pluginConfig);
-	else if (policy === "write-controls") requireWriteAccess(options, pluginConfig);
+	if (policy === "raw-transcripts") requireRawTranscriptAccess(pluginConfig);
+	else if (policy === "write-controls") requireWriteAccess(pluginConfig);
 	return {
 		pluginConfig,
 		endpoints: resolveEndpoints(pluginConfig, options.env ?? process.env, options.getRuntimeConfig?.(), options.resolveAuthProfileId, options.resolveRuntimeOptions)
@@ -1434,20 +1504,14 @@ function requireCurrentEndpointSet(options, expected) {
 	if (!(current.endpoints.length === expected.length && expected.every((endpoint) => current.endpoints.some((candidate) => candidate.id === endpoint.id && candidate.connectionKey === endpoint.connectionKey)))) throw new CodexSupervisionPolicyError("Codex supervision endpoint configuration changed during the request.");
 	return { pluginConfig: current.pluginConfig };
 }
-function createPolicyGuardedRequest(options, request, policy) {
-	return async (endpoint, method, params) => {
-		return await request(requireCurrentEndpoint(options, policy, endpoint), method, params);
-	};
-}
 function idleContinuationError(threadId) {
 	return /* @__PURE__ */ new Error(`Codex thread ${threadId} is idle. Continue it from Codex Sessions so OpenClaw can install the Codex harness approval and tool handlers before resume.`);
 }
 /** Builds the five shipped Codex Supervisor compatibility tools. */
 function createCodexSupervisionTools(options) {
-	const baseRequest = options.request ?? createCanonicalEndpointRequest(options);
-	const request = createPolicyGuardedRequest(options, baseRequest, "enabled");
-	const rawTranscriptRequest = createPolicyGuardedRequest(options, baseRequest, "raw-transcripts");
-	const writeRequest = createPolicyGuardedRequest(options, baseRequest, "write-controls");
+	const request = createPolicyGuardedRequest(options, "enabled");
+	const rawTranscriptRequest = createPolicyGuardedRequest(options, "raw-transcripts");
+	const writeRequest = createPolicyGuardedRequest(options, "write-controls");
 	const current = () => {
 		return requireLiveToolPolicy(options, "enabled");
 	};
@@ -1498,7 +1562,7 @@ function createCodexSupervisionTools(options) {
 				const { pluginConfig } = requireCurrentEndpointSet(options, endpoints);
 				return jsonResult({
 					summary: `codex sessions: ${result.sessions.length}`,
-					...sanitizeSessionListResult(result, resolveToolPolicy(options, pluginConfig).allowRawTranscripts)
+					...sanitizeSessionListResult(result, resolveToolPolicy(pluginConfig).allowRawTranscripts)
 				});
 			}
 		},
@@ -1509,7 +1573,7 @@ function createCodexSupervisionTools(options) {
 			parameters: SessionReadParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
 				const { endpoints, pluginConfig } = current();
-				requireRawTranscriptAccess(options, pluginConfig);
+				requireRawTranscriptAccess(pluginConfig);
 				const params = isRecord(rawParams) ? rawParams : {};
 				const threadId = readStringParam(params, "thread_id", { required: true });
 				const endpoint = await resolveEndpointForThread({
@@ -1538,7 +1602,7 @@ function createCodexSupervisionTools(options) {
 			parameters: SessionSendParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
 				const { endpoints, pluginConfig } = current();
-				requireWriteAccess(options, pluginConfig);
+				requireWriteAccess(pluginConfig);
 				const params = isRecord(rawParams) ? rawParams : {};
 				const threadId = readStringParam(params, "thread_id", { required: true });
 				const text = readStringParam(params, "text", {
@@ -1595,7 +1659,7 @@ function createCodexSupervisionTools(options) {
 			parameters: SessionInterruptParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
 				const { endpoints, pluginConfig } = current();
-				requireWriteAccess(options, pluginConfig);
+				requireWriteAccess(pluginConfig);
 				const params = isRecord(rawParams) ? rawParams : {};
 				const threadId = readStringParam(params, "thread_id", { required: true });
 				const endpoint = await resolveEndpointForThread({
@@ -1638,7 +1702,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-CDKlN-Rv.mjs"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -1682,7 +1746,10 @@ var codex_default = definePluginEntry({
 	description: "Codex app-server harness and native session supervision.",
 	reload: { noopPrefixes: ["plugins.entries.codex.config.codexPlugins"] },
 	register(api) {
+		registerCodexAccountUsage(api);
+		api.registerService(codexNativeProfileRecoveryService);
 		setManagedCodexPluginRoot(api.rootDir);
+		api.registerProvider(codexProviderDiscovery);
 		const resolveCurrentConfig = () => api.runtime.config?.current ? api.runtime.config.current() : void 0;
 		const resolvePluginConfig = (resolveConfig) => {
 			const liveConfig = resolveConfig();
@@ -1716,13 +1783,17 @@ var codex_default = definePluginEntry({
 			deleteIf: (key, predicate) => openBindingStateStore().deleteIf(key, predicate),
 			entries: () => openBindingStateStore().entries(),
 			lookup: (key) => openBindingStateStore().lookup(key),
+			get lookupMany() {
+				const store = openBindingStateStore();
+				return store.lookupMany?.bind(store);
+			},
 			registerIfAbsent: (key, value, options) => openBindingStateStore().registerIfAbsent(key, value, options),
 			get update() {
 				const store = openBindingStateStore();
 				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 +1810,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,25 +1832,25 @@ 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) {
 			const { resolveCodexAppServerAuthProfileIdForAgent } = createCodexAuthProfileSelection(api.runtime.modelAuth);
-			api.registerTool((context) => {
-				if (context.senderIsOwner !== true) return [];
-				const resolveToolRuntimeConfig = () => context.getRuntimeConfig?.() ?? context.runtimeConfig ?? context.config ?? resolveCurrentConfig();
-				return createCodexSupervisionTools({
-					getPluginConfig: () => resolvePluginConfig(resolveToolRuntimeConfig),
-					getRuntimeConfig: resolveToolRuntimeConfig,
-					resolveAuthProfileId: resolveCodexAppServerAuthProfileIdForAgent,
-					resolveRuntimeOptions: resolveCodexSupervisionAppServerRuntimeOptions,
-					senderIsOwner: context.senderIsOwner
-				});
+			api.registerTool({
+				contextVersion: 2,
+				create: (context) => {
+					if (context.senderIsOwner !== true) return [];
+					const resolveToolRuntimeConfig = () => context.getRuntimeConfig?.() ?? context.runtimeConfig ?? context.config ?? resolveCurrentConfig();
+					return createCodexSupervisionTools({
+						getPluginConfig: () => resolvePluginConfig(resolveToolRuntimeConfig),
+						getRuntimeConfig: resolveToolRuntimeConfig,
+						resolveAuthProfileId: resolveCodexAppServerAuthProfileIdForAgent,
+						resolveRuntimeOptions: resolveCodexSupervisionAppServerRuntimeOptions,
+						senderIsOwner: context.senderIsOwner,
+						assertInvocationCurrent: context.assertInvocationCurrent
+					});
+				}
 			}, { names: [...CODEX_SUPERVISION_COMPAT_TOOL_NAMES] });
 		}
 		const agentHarnessOptions = {
@@ -1782,12 +1864,15 @@ var codex_default = definePluginEntry({
 		api.registerMediaUnderstandingProvider(buildCodexMediaUnderstandingProvider({ pluginConfig: api.pluginConfig }));
 		api.registerWebSearchProvider(createCodexWebSearchProvider({ resolvePluginConfig: resolveCurrentPluginConfig }));
 		api.registerMigrationProvider(buildCodexMigrationProvider({ runtime: api.runtime }));
-		api.registerTool((context) => createCodexThreadsTool({
-			bindingStore,
-			context,
-			runtime: api.runtime,
-			getPluginConfig: resolveCurrentPluginConfig
-		}), { name: "codex_threads" });
+		api.registerTool({
+			contextVersion: 2,
+			create: (context) => createCodexThreadsTool({
+				bindingStore,
+				context,
+				runtime: api.runtime,
+				getPluginConfig: resolveCurrentPluginConfig
+			})
+		}, { name: "codex_threads" });
 		api.registerToolMetadata({
 			toolName: "codex_threads",
 			displayName: "Codex Threads",
@@ -1795,11 +1880,14 @@ var codex_default = definePluginEntry({
 			risk: "high",
 			tags: ["codex", "sessions"]
 		});
-		api.registerTool((context) => createCodexPluginsTool({
-			bindingStore,
-			context,
-			getPluginConfig: resolveCurrentPluginConfig
-		}), { name: "codex_plugins" });
+		api.registerTool({
+			contextVersion: 2,
+			create: (context) => createCodexPluginsTool({
+				bindingStore,
+				context,
+				getPluginConfig: resolveCurrentPluginConfig
+			})
+		}, { name: "codex_plugins" });
 		api.registerToolMetadata({
 			toolName: "codex_plugins",
 			displayName: "Codex Plugins",
@@ -1811,7 +1899,7 @@ var codex_default = definePluginEntry({
 				"discovery"
 			]
 		});
-		for (const command of createCodexCliSessionNodeHostCommands()) api.registerNodeHostCommand(command);
+		for (const command of createCodexCliSessionNodeHostCommands((agentId) => sessionCatalogControlFactory.forNode(agentId))) api.registerNodeHostCommand(command);
 		for (const policy of createCodexCliSessionNodeInvokePolicies()) api.registerNodeInvokePolicy(policy);
 		api.registerNodeHostCommand(createCodexNodeExecServerCommand());
 		api.registerNodeInvokePolicy(createCodexNodeExecServerInvokePolicy());
@@ -1847,23 +1935,26 @@ var codex_default = definePluginEntry({
 							plugins: declared
 						});
 					},
-					mutate: async (update) => {
+					mutate: async (update, assertCurrent) => {
 						const { mutateConfigFile } = await import("openclaw/plugin-sdk/config-mutation");
-						await mutateConfigFile({ mutate: (draft) => {
-							const root = draft;
-							root.plugins = root.plugins ?? {};
-							const pluginsBlock = root.plugins;
-							pluginsBlock.entries = pluginsBlock.entries ?? {};
-							const entries = pluginsBlock.entries;
-							entries.codex = entries.codex ?? {};
-							const codexEntry = entries.codex;
-							codexEntry.config = codexEntry.config ?? {};
-							const config = codexEntry.config;
-							config.codexPlugins = config.codexPlugins ?? {};
-							const codexPlugins = config.codexPlugins;
-							codexPlugins.plugins = codexPlugins.plugins ?? {};
-							update(codexPlugins);
-						} });
+						await mutateConfigFile({
+							writeOptions: { assertCurrent },
+							mutate: (draft) => {
+								const root = draft;
+								root.plugins = root.plugins ?? {};
+								const pluginsBlock = root.plugins;
+								pluginsBlock.entries = pluginsBlock.entries ?? {};
+								const entries = pluginsBlock.entries;
+								entries.codex = entries.codex ?? {};
+								const codexEntry = entries.codex;
+								codexEntry.config = codexEntry.config ?? {};
+								const config = codexEntry.config;
+								config.codexPlugins = config.codexPlugins ?? {};
+								const codexPlugins = config.codexPlugins;
+								codexPlugins.plugins = codexPlugins.plugins ?? {};
+								update(codexPlugins);
+							}
+						});
 					}
 				}
 			}
@@ -1886,7 +1977,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-Cm0apEbd.mjs").then((n) => n.s), import("./.setup/session-retirement-BH-S6qkJ.mjs")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({