@openclaw/codex 2026.10.5-beta.3 → 2026.10.10-beta.1

package/dist/index.js

@@ -1,44 +1,44 @@
 import { registerCodexCliMetadata } from "./cli-metadata.js";
-import { A as unwrapNodeInvokePayload, C as readGatewayParams, E as requireOnlyKeys, S as readControlCursor, _ as normalizeLimit, a as CODEX_LOCAL_SESSION_HOST_ID, b as parseTranscriptPage, f as catalogError, g as isInteractiveThreadSource, h as filterCatalogPageByTitle, i as CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, j as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, l as MAX_TRANSCRIPT_PAGE_BYTES, n as CODEX_APP_SERVER_THREADS_LIST_COMMAND, o as CatalogParamsError, r as CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, s as MAX_CURSOR_LENGTH, t as CODEX_APP_SERVER_THREADS_CAPABILITY, u as NODE_INVOKE_TIMEOUT_MS, v as parseCatalogPage, w as readPageParams, x as readBoundedOptionalString, y as parseJsonParams } from "./.setup/session-catalog-parsing-DkeoVn60.mjs";
-import { i as isJsonObject, n as assertCodexThreadForkParams } from "./.setup/protocol-CANUwXJ3.mjs";
-import { d as readCurrentCodexNativeSubagentSubmissions, f as readCurrentNativePendingAssignments, l as readCurrentCodexAppServerBinding, m as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, u as readCurrentCodexAppServerBindings } from "./.setup/session-binding-record-DU_0biMD.mjs";
-import { n as defineCodexBuildState } from "./.setup/build-state-sjOWPg_o.mjs";
+import { A as unwrapNodeInvokePayload, C as readGatewayParams, E as requireOnlyKeys, S as readControlCursor, _ as normalizeLimit, a as CODEX_LOCAL_SESSION_HOST_ID, b as parseTranscriptPage, f as catalogError, g as isInteractiveThreadSource, h as filterCatalogPageByTitle, i as CODEX_CATALOG_TRANSCRIPT_READ_COMMAND, j as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, l as MAX_TRANSCRIPT_PAGE_BYTES, n as CODEX_APP_SERVER_THREADS_LIST_COMMAND, o as CatalogParamsError, r as CODEX_APP_SERVER_THREAD_TURNS_LIST_COMMAND, s as MAX_CURSOR_LENGTH, t as CODEX_APP_SERVER_THREADS_CAPABILITY, u as NODE_INVOKE_TIMEOUT_MS, v as parseCatalogPage, w as readPageParams, x as readBoundedOptionalString, y as parseJsonParams } from "./.setup/session-catalog-parsing-V6jyFg9g.mjs";
+import { r as isJsonObject } from "./.setup/protocol-CaPAVwe9.mjs";
+import { d as readCurrentCodexAppServerBindingAsync, f as readCurrentCodexAppServerBindings, g as sessionBindingIdentity, m as readCurrentNativePendingAssignments, n as assertCodexBindingMayBeReplaced, p as readCurrentCodexNativeSubagentSubmissions, u as readCurrentCodexAppServerBinding } from "./.setup/session-binding-record-C_THntMe.mjs";
+import { n as defineCodexBuildState } from "./.setup/build-state-VcujMRqP.mjs";
 import { createCodexAppServerAgentHarness, createCodexAppServerNativeCompaction } from "./harness.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
 import codexProviderDiscovery from "./provider-discovery.js";
-import { n as createCodexAuthProfileSelection } from "./.setup/auth-profile-selection-hr8ocLtz.mjs";
+import { n as createCodexAuthProfileSelection } from "./.setup/auth-profile-selection-Bp5PDk3W.mjs";
 import { t as assertCodexAppServerConnectionSecurity } from "./.setup/config-security-clxAZYWX.mjs";
 import { d as readCodexPluginConfig } from "./.setup/config-parsing-DsWSCPHO.mjs";
 import { n as resolveCodexAppServerLocalHomeDir, r as resolveCodexAppServerUserHomeDir, t as resolveCodexAppServerHomeDir } from "./.setup/auth-start-options-BPIPeEX8.mjs";
-import { r as createCodexAppServerConfig, t as codexAppServerStartOptionsKey } from "./.setup/config-options-DDzeNQ8m.mjs";
-import { o as setManagedCodexPluginRoot } from "./.setup/managed-binary-BtIjV7yN.mjs";
-import { O as createCodexDesktopGenerationService, T as retireSharedCodexAppServerClientsBeforeDesktopGeneration, m as hasActiveSharedCodexAppServerWork, p as getSharedCodexAppServerClientState, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./.setup/auth-cache-key-BzYrcgwJ.mjs";
+import { r as createCodexAppServerConfig, t as codexAppServerStartOptionsKey } from "./.setup/config-options-DMFZkd3X.mjs";
+import { h as setManagedCodexPluginRoot } from "./.setup/managed-binary-DbKvGXKl.mjs";
+import { O as retireSharedCodexAppServerClientsBeforeDesktopGeneration, h as hasActiveSharedCodexAppServerWork, j as createCodexDesktopGenerationService, m as getSharedCodexAppServerClientState, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./.setup/auth-cache-key-CVcYw8HD.mjs";
 import { i as CODEX_APP_SERVER_BINDING_NAMESPACE, r as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./.setup/session-binding-meta-Lkm5Lpf4.mjs";
-import { c as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-CRWTkKOn.mjs";
-import { n as codexNativeProfileRecoveryService } from "./.setup/auth-profile-health-oHizqgye.mjs";
+import { c as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-Bq160Dhv.mjs";
+import { n as codexNativeProfileRecoveryService } from "./.setup/auth-profile-health-BVPZU9I8.mjs";
 import { n as withCodexConversationThreadActivity } from "./.setup/thread-ownership-queue-CeyYScUC.mjs";
 import { a as canMutateCodexHost, r as CODEX_NATIVE_EXECUTION_AUTH_ERROR } from "./.setup/command-authorization-AikPDtcc.mjs";
-import { o as formatCodexDisplayText } from "./.setup/command-formatters-xW9KpoSZ.mjs";
-import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir } from "./.setup/conversation-binding-data-UgLuTSQT.mjs";
-import { t as buildCodexMigrationProvider } from "./.setup/provider-BCXRBKEb.mjs";
-import { r as CodexAppServerRpcError, s as isCodexThreadReadMissingError } from "./.setup/rpc-error-C98SHchT.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./.setup/capabilities-DbOzOglY.mjs";
+import { o as formatCodexDisplayText } from "./.setup/command-formatters-B_7-QZ1c.mjs";
+import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir } from "./.setup/conversation-binding-data-khgW0n-o.mjs";
+import { t as buildCodexMigrationProvider } from "./.setup/provider-wj_LFJH3.mjs";
+import { r as CodexAppServerRpcError, s as isCodexThreadReadMissingError } from "./.setup/rpc-error-DemqqaxE.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./.setup/capabilities-DAS-JX1z.mjs";
 import { n as filterCodexMarketplacePlugins, t as discoverCodexMarketplacePlugins } from "./.setup/plugin-marketplace-discovery-BblHM3DU.mjs";
-import { t as assertCodexArchiveDescendantsUnowned } from "./.setup/thread-archive-guard-LKdwQKyr.mjs";
-import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, s as listCodexCliSessionsOnNode } from "./.setup/node-cli-sessions-CzKg2nGq.mjs";
+import { t as assertCodexArchiveDescendantsUnowned } from "./.setup/thread-archive-guard-BWjSsA92.mjs";
+import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, s as listCodexCliSessionsOnNode } from "./.setup/node-cli-sessions-BuJnBnEq.mjs";
 import { n as codexCatalogHomeIdFromCanonicalPath } from "./.setup/session-catalog-home-id-vlih0B_g.mjs";
-import { t as CODEX_CATALOG_MAX_ROWS } from "./.setup/session-catalog-limits-BynIoOYm.mjs";
-import { a as CodexCatalogLoadingError, n as currentCodexCatalogListRequest, o as withCodexCatalogLoadingTimeout, r as withCodexCatalogListRequest, s as CODEX_CATALOG_STATE_NAMESPACE, t as CodexCatalogListRequest } from "./.setup/session-catalog-list-request-D4MYNgDB.mjs";
+import { t as CODEX_CATALOG_MAX_ROWS } from "./.setup/session-catalog-limits-Dc6E0BZz.mjs";
+import { a as CodexCatalogLoadingError, n as currentCodexCatalogListRequest, o as withCodexCatalogLoadingTimeout, r as withCodexCatalogListRequest, s as CODEX_CATALOG_STATE_NAMESPACE, t as CodexCatalogListRequest } from "./.setup/session-catalog-list-request-CAjoWjaH.mjs";
 import { i as withTimeout$1 } from "./.setup/timeout-D0mEWSGG.mjs";
-import { t as lookupNodeCodexCatalogRecord } from "./.setup/session-catalog-node-lookup-BH_DBGa9.mjs";
-import { r as projectCodexUserItemText } from "./.setup/transcript-history-projection-DfKcoZCB.mjs";
+import { t as lookupNodeCodexCatalogRecord } from "./.setup/session-catalog-node-lookup-BrZfDkA8.mjs";
+import { r as projectCodexUserItemText } from "./.setup/transcript-history-projection-i-FVpyha.mjs";
 import { r as codexUpstreamContinueResult } from "./.setup/session-upstream-marker-D15C9NHp.mjs";
-import { t as buildCodexAppServerConnectionFingerprint } from "./.setup/plugin-app-cache-key-Bg9DbDI6.mjs";
-import { n as readCodexSessionMeta } from "./.setup/session-catalog-provenance-CmsOE5mh.mjs";
-import { t as codexCatalogResidentHomeKey } from "./.setup/session-catalog-events-DujfzcAY.mjs";
-import { a as setCodexCatalogConnectionHomeResolver } from "./.setup/binding-connection-B7HAAZSI.mjs";
+import { t as buildCodexAppServerConnectionFingerprint } from "./.setup/plugin-app-cache-key-DRb-niJc.mjs";
+import { n as readCodexSessionMeta } from "./.setup/session-catalog-provenance-Dg9s12z-.mjs";
+import { t as codexCatalogResidentHomeKey } from "./.setup/session-catalog-events-DK0opVp3.mjs";
+import { a as setCodexCatalogConnectionHomeResolver } from "./.setup/binding-connection-GTgUj9pi.mjs";
 import { n as findCodexAppServerSpawnError } from "./.setup/spawn-error-CL3n6MAa.mjs";
-import { r as requestCodexAppServerJson } from "./.setup/request-DInueZ2q.mjs";
+import { r as requestCodexAppServerJson } from "./.setup/request-ePeNJrOd.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";
@@ -52,6 +52,8 @@ import path from "node:path";
 import fs from "node:fs/promises";
 import { coerceErrorMessage, formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { canonicalPathFromExistingAncestor } from "openclaw/plugin-sdk/file-access-runtime";
+import { decodeNodePtyResumeParams, decodeNodePtyStartParams, resolveNodeHostExecutable, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
+import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { scheduler } from "node:timers/promises";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
@@ -64,13 +66,11 @@ import { isMainThread, threadId } from "node:worker_threads";
 import { areDiagnosticsEnabledForProcess, createSubsystemLogger } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { publishSessionCatalogHost, sessionCatalogPaging } from "openclaw/plugin-sdk/session-catalog-paging";
-import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
-import { decodeNodePtyResumeParams, decodeNodePtyStartParams, resolveNodeHostExecutable, runNodePtyCommand } from "openclaw/plugin-sdk/node-host";
 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-CBR8imwK.mjs");
+		const { handleCodexAccountUsage } = await import("./.setup/account-usage-runtime-DDCDkvtl.mjs");
 		await handleCodexAccountUsage(options);
 	}, { scope: "operator.admin" });
 }
@@ -82,7 +82,7 @@ function createCodexAppServerConnectionHealthService(options) {
 	let abortController;
 	let monitor;
 	const run = async (ctx, signal) => {
-		const { resolveCodexAppServerRuntimeOptions } = await import("./.setup/config-runtime-DWzK-k0n.mjs").then((n) => n.t);
+		const { resolveCodexAppServerRuntimeOptions } = await import("./.setup/config-runtime-BZRizyuG.mjs").then((n) => n.t);
 		let consecutiveFailures = 0;
 		while (!signal.aborted) {
 			let pluginConfig;
@@ -98,9 +98,9 @@ function createCodexAppServerConnectionHealthService(options) {
 				return;
 			}
 			if (runtime.start.transport !== "websocket") return;
-			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./.setup/shared-client-CCz9ldpr.mjs").then((n) => n.v);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./.setup/shared-client-CE_uY0A1.mjs").then((n) => n.m);
 			const { sleepWithAbort } = await import("openclaw/plugin-sdk/runtime-env");
-			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-aPKNc4Ii.mjs").then((n) => n.n);
+			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-BS8X7HmG.mjs").then((n) => n.n);
 			if (signal.aborted) return;
 			let leasedClient;
 			try {
@@ -267,14 +267,15 @@ function createCodexManagedThreadStore(state) {
 /** Keeps lifecycle/auth loading behind mutations while sharing the canonical read codec. */
 function createLazyCodexAppServerBindingStore(state, managedThreadState) {
 	let resolved;
-	const store = () => resolved ??= import("./.setup/session-binding-JEHNMPsr.mjs").then((n) => n.a).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
+	const store = () => resolved ??= import("./.setup/session-binding-BgsWcbdY.mjs").then((n) => n.a).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
 		read: (identity) => readCurrentCodexAppServerBinding(state, identity),
+		readAsync: (identity) => readCurrentCodexAppServerBindingAsync(state.asyncReads, identity),
 		readMany: (identities) => readCurrentCodexAppServerBindings(state.asyncReads, identities),
-		readNativeSubagentAssignments: (identity, owner) => readCurrentNativePendingAssignments(state, identity, owner),
-		readNativeSubagentSubmissions: (identity, owner) => readCurrentCodexNativeSubagentSubmissions(state, identity, owner),
+		readNativeSubagentAssignments: (identity, owner) => readCurrentNativePendingAssignments(state.asyncReads, identity, owner),
+		readNativeSubagentSubmissions: (identity, owner) => readCurrentCodexNativeSubagentSubmissions(state.asyncReads, identity, owner),
 		hasOtherThreadOwner: async (threadId, currentIdentity) => (await store()).hasOtherThreadOwner(threadId, currentIdentity),
 		mutate: async (identity, mutation, assertCurrent, authority) => (await store()).mutate(identity, mutation, assertCurrent, authority),
 		prepareSessionGenerationReclaim: async (identity) => (await store()).prepareSessionGenerationReclaim(identity),
@@ -314,7 +315,7 @@ function createCodexCommand(options) {
 				...ctx,
 				gatewayClientScopes: ctx.gatewayClientScopes?.slice()
 			};
-			const { handleCodexCommand } = await import("./.setup/command-dispatch-CF6mgl3u.mjs");
+			const { handleCodexCommand } = await import("./.setup/command-dispatch-DzXbHqCn.mjs");
 			return handleCodexCommand(commandContext, options);
 		}
 	};
@@ -322,13 +323,14 @@ function createCodexCommand(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({
+function isCurrentPublicBinding(binding, inspect) {
+	const inspection = inspect({
 		channel: binding.channel,
 		accountId: binding.accountId,
 		conversationId: binding.conversationId,
 		...binding.parentConversationId ? { parentConversationId: binding.parentConversationId } : {}
-	})?.bindingId === binding.bindingId;
+	});
+	return inspection.status === "available" && inspection.binding?.bindingId === binding.bindingId;
 }
 async function handleCodexConversationInboundClaim(event, ctx, options) {
 	const publicBinding = ctx.pluginBinding;
@@ -346,17 +348,19 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 		if (data.kind === "codex-cli-node-session") return {
 			handled: true,
 			reply: { text: await getNodeConversationState().queue.enqueue(`${data.nodeId}:${data.sessionId}`, async () => {
-				const { resolveCodexNativeSandboxBlock } = await import("./.setup/sandbox-guard-DIImwCy1.mjs").then((n) => n.r);
-				const blocked = resolveCodexNativeSandboxBlock({
+				const { prepareCodexNativeSandboxBlock } = await import("./.setup/sandbox-guard-DneAfNye.mjs").then((n) => n.a);
+				const sandbox = await prepareCodexNativeSandboxBlock({
 					config: options.config,
 					sessionKey,
 					surface: "Codex CLI node conversation binding"
 				});
-				if (blocked) return blocked;
+				using cleanup = { [Symbol.dispose]: sandbox.release };
+				if (sandbox.block) return sandbox.block;
 				const resume = options.resumeCodexCliSessionOnNode;
 				if (!resume) return "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 "This Codex conversation was detached or changed before its message could run.";
+				const { inspectConversationBinding } = await import("openclaw/plugin-sdk/conversation-binding-inspection-runtime");
+				await sandbox.assertCurrent();
+				if (!isCurrentPublicBinding(publicBinding, inspectConversationBinding)) return "This Codex conversation was detached or changed before its message could run.";
 				return (await resume({
 					nodeId: data.nodeId,
 					sessionId: data.sessionId,
@@ -372,22 +376,16 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 			kind: "conversation",
 			bindingId: data.bindingId
 		};
-		const expected = options.bindingStore.read(identity);
+		const pendingExpected = options.bindingStore.readAsync(identity);
+		pendingExpected.catch(() => {});
 		return {
 			handled: true,
 			reply: await withCodexConversationThreadActivity(data.bindingId, async () => {
-				const { resolveCodexNativeExecutionBlock } = await import("./.setup/sandbox-guard-DIImwCy1.mjs").then((n) => n.r);
-				const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
-					config: options.config,
-					sessionKey,
-					agentId: data.agentId,
-					surface: "Codex app-server conversation binding"
-				});
-				if (nativeExecutionBlock) return { text: nativeExecutionBlock };
-				const { getSessionBindingService } = await import("openclaw/plugin-sdk/conversation-binding-runtime");
-				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-CP_mK17t.mjs");
-				const current = options.bindingStore.read(identity);
-				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 { text: "This Codex conversation was detached or changed before its message could run." };
+				const expected = await pendingExpected;
+				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-C7MZy-Cx.mjs");
+				const { inspectConversationBinding } = await import("openclaw/plugin-sdk/conversation-binding-inspection-runtime");
+				const current = await options.bindingStore.readAsync(identity);
+				if (!isCurrentPublicBinding(publicBinding, inspectConversationBinding) || expected && (!current || current.threadId !== expected.threadId || current.conversationStartId !== expected.conversationStartId) || !expected && current && data.start?.id && current.conversationStartId !== data.start.id) return { text: "This Codex conversation was detached or changed before its message could run." };
 				return await runBoundTurnWithMissingThreadRecovery({
 					bindingStore: options.bindingStore,
 					data,
@@ -416,10 +414,10 @@ async function handleCodexConversationBindingResolved(event, options) {
 		kind: "conversation",
 		bindingId: data.bindingId
 	};
-	const binding = options.bindingStore.read(identity);
+	const binding = await options.bindingStore.readAsync(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("./.setup/thread-ownership-_2e1sjfi.mjs").then((n) => n.o);
+		const { retireCodexConversationThreadBinding } = await import("./.setup/thread-ownership-t6Y9fLQS.mjs").then((n) => n.o);
 		return retireCodexConversationThreadBinding({
 			bindingStore: options.bindingStore,
 			identity,
@@ -454,7 +452,7 @@ 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-B7HAAZSI.mjs").then((n) => n.n);
+			const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-GTgUj9pi.mjs").then((n) => n.n);
 			const pluginConfig = options.getPluginConfig();
 			const config = runtimeConfig();
 			const identity = options.context.sessionId ? sessionBindingIdentity({
@@ -464,14 +462,14 @@ function createCodexPluginsTool(options) {
 				config
 			}) : void 0;
 			const readBinding = () => identity ? options.bindingStore.read(identity) : void 0;
-			const binding = readBinding();
+			const binding = identity ? await options.bindingStore.readAsync(identity) : void 0;
 			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("./.setup/command-rpc-CUy4Bo-0.mjs").then((n) => n.n)).codexControlRequest;
+			const request = options.request ?? (await import("./.setup/command-rpc-SXqLQukR.mjs").then((n) => n.n)).codexControlRequest;
 			const connection = await resolveCodexBindingAppServerConnection({
 				binding,
 				pluginConfig,
@@ -599,15 +597,20 @@ function createCodexThreadsTool(options) {
 		description: "Manage native Codex threads: list, read, fork, rename, archive (confirm:true), unarchive. When supervision is enabled, raw transcript reads and every mutation require their matching supervision policy option.",
 		parameters: CodexThreadsParamsSchema,
 		async execute(_toolCallId, rawParams) {
+			const runtimeConfig = () => options.context.getRuntimeConfig?.() ?? options.context.runtimeConfig ?? options.context.config;
+			const context = options.context;
+			const sessionKey = context.sessionKey?.trim();
+			const config = runtimeConfig();
+			const agentId = sessionKey ? resolveSessionAgentIdsStrict({
+				config: config ?? {},
+				sessionKey,
+				agentId: context.agentId
+			}).sessionAgentId : void 0;
+			const storePath = agentId ? options.runtime.agent.session.resolveStorePath(config?.session?.store, { agentId }) : void 0;
+			let prepared;
 			const currentSession = () => {
-				const context = options.context;
-				const sessionKey = context.sessionKey?.trim();
 				if (!sessionKey) return;
-				const entry = options.runtime.agent.session.getSessionEntry({
-					agentId: context.agentId,
-					sessionKey,
-					readConsistency: "latest"
-				});
+				const entry = prepared?.entry;
 				const sessionId = context.sessionId?.trim() || entry?.sessionId?.trim();
 				if (!sessionId) return;
 				return {
@@ -615,7 +618,6 @@ function createCodexThreadsTool(options) {
 					entry: entry ? { ...entry } : void 0
 				};
 			};
-			const runtimeConfig = () => options.context.getRuntimeConfig?.() ?? options.context.runtimeConfig ?? options.context.config;
 			const currentIdentity = (sessionId) => sessionBindingIdentity({
 				sessionId,
 				sessionKey: options.context.sessionKey,
@@ -634,27 +636,46 @@ function createCodexThreadsTool(options) {
 			const mayReadRawTranscripts = supervision?.enabled !== true || supervision.allowRawTranscripts === true;
 			const threadResult = (response) => jsonResult(mayReadRawTranscripts ? response : redactNativeThreadResponse(response));
 			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("./.setup/command-rpc-CUy4Bo-0.mjs").then((n) => n.n)).codexControlRequest;
+			const run = async (archiveThreadId) => {
+				const { captureSessionEntryCurrentCheckAsync, composeSessionEntryCommitGuards } = await import("openclaw/plugin-sdk/session-binding-runtime");
+				prepared = sessionKey && agentId ? await captureSessionEntryCurrentCheckAsync({
+					agentId,
+					sessionKey,
+					storePath,
+					fields: ["modelSelectionLocked"],
+					errorMessage: "Codex native thread ownership changed; retry the request."
+				}) : void 0;
+				using _ = { [Symbol.dispose]: () => prepared?.release() };
+				options.context.assertInvocationCurrent?.();
+				const archiveSession = archiveThreadId ? currentSession() : void 0;
+				if (archiveThreadId && !archiveSession) throw new Error("cannot safely archive a native Codex thread without a session identity");
+				const archiveAdmission = archiveThreadId && archiveSession ? {
+					threadId: archiveThreadId,
+					session: archiveSession,
+					identity: currentIdentity(archiveSession.sessionId)
+				} : void 0;
+				const request = options.request ?? (await import("./.setup/command-rpc-SXqLQukR.mjs").then((n) => n.n)).codexControlRequest;
 				const { isModelSelectionLocked, ModelSelectionLockedError } = await import("openclaw/plugin-sdk/model-session-runtime");
-				const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-B7HAAZSI.mjs").then((n) => n.n);
-				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./.setup/config-runtime-DWzK-k0n.mjs").then((n) => n.t);
+				const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-GTgUj9pi.mjs").then((n) => n.n);
+				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./.setup/config-runtime-BZRizyuG.mjs").then((n) => n.t);
 				const requestOptions = async () => {
 					const base = {
+						agentId,
 						agentDir: options.context.agentDir,
 						config: runtimeConfig(),
 						sessionId: options.context.sessionId,
-						sessionKey: options.context.sessionKey
+						sessionKey: options.context.sessionKey,
+						storePath
 					};
 					const session = currentSession();
 					const identity = session ? currentIdentity(session.sessionId) : void 0;
 					const readBinding = () => identity ? options.bindingStore.read(identity) : void 0;
-					const binding = readBinding();
+					const binding = identity ? await options.bindingStore.readAsync(identity) : void 0;
 					const selection = codexBindingConnectionSelection(binding);
 					const assertCurrent = () => {
 						options.context.assertInvocationCurrent?.();
 						const current = currentSession();
-						if (runtimeConfig() !== base.config || !isDeepStrictEqual(options.getPluginConfig(), admissionConfig) || 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 (runtimeConfig() !== base.config || !isDeepStrictEqual(options.getPluginConfig(), admissionConfig) || current?.sessionId !== session?.sessionId || !isDeepStrictEqual(codexBindingConnectionSelection(readBinding()), selection)) throw new Error("Codex native thread ownership changed; retry the request.");
 					};
 					if (binding?.connectionScope === "supervision" || admissionPlugin.appServer?.homeScope === "user") {
 						const connection = await resolveCodexBindingAppServerConnection({
@@ -668,7 +689,8 @@ function createCodexThreadsTool(options) {
 							...base,
 							startOptions: connection.appServer.start,
 							authProfileId: connection.usesSupervisionConnection ? connection.clientAuthProfileId : null,
-							assertCurrent
+							assertCurrent,
+							assertCurrentAsync: prepared?.assertCurrent
 						};
 					}
 					if (supervision?.enabled !== true) throw new Error("Codex native thread access is disabled for this run.");
@@ -676,7 +698,8 @@ function createCodexThreadsTool(options) {
 						...base,
 						startOptions: resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig: admissionConfig }).start,
 						authProfileId: null,
-						assertCurrent
+						assertCurrent,
+						assertCurrentAsync: prepared?.assertCurrent
 					};
 				};
 				const scopedRequest = async (method, requestParams) => request(admissionConfig, method, requestParams, await requestOptions());
@@ -729,10 +752,10 @@ function createCodexThreadsTool(options) {
 					return threadResult(response);
 				}
 				const session = archiveAdmission?.session ?? currentSession();
-				const binding = currentBinding(session);
+				const binding = session ? await options.bindingStore.readAsync(currentIdentity(session.sessionId)) : void 0;
 				if (archiveAdmission) {
 					const { identity, session: admittedSession } = archiveAdmission;
-					const archivedBinding = currentBinding(admittedSession);
+					const archivedBinding = binding;
 					if (archivedBinding?.threadId === threadId) {
 						if (isModelSelectionLocked(admittedSession.entry)) throw new ModelSelectionLockedError();
 						assertCodexBindingMayBeReplaced(archivedBinding, "archiving its bound native thread");
@@ -755,7 +778,7 @@ function createCodexThreadsTool(options) {
 					if (archivedBinding?.threadId === threadId) await options.bindingStore.mutate(identity, {
 						kind: "clear",
 						threadId
-					}, options.context.assertInvocationCurrent);
+					}, composeSessionEntryCommitGuards([options.context.assertInvocationCurrent, prepared?.source]));
 					return jsonResult({
 						action,
 						threadId
@@ -768,8 +791,8 @@ function createCodexThreadsTool(options) {
 				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();
-				const { retainCodexAppServerBindingSubscription, rollbackCodexAppServerBindingSubscription } = await import("./.setup/thread-ownership-_2e1sjfi.mjs").then((n) => n.o);
-				const { closeCodexStartupClientBestEffort } = await import("./.setup/attempt-client-cleanup-D3YvP0N7.mjs").then((n) => n.a);
+				const { retainCodexAppServerBindingSubscription, rollbackCodexAppServerBindingSubscription } = await import("./.setup/thread-ownership-t6Y9fLQS.mjs").then((n) => n.o);
+				const { closeCodexStartupClientBestEffort } = await import("./.setup/attempt-client-cleanup-6OcbMH46.mjs").then((n) => n.a);
 				if (attach) {
 					assertCodexBindingMayBeReplaced(binding, "attaching a different native fork");
 					assertThreadIdle(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
@@ -783,7 +806,7 @@ function createCodexThreadsTool(options) {
 					excludeTurns: true
 				}, {
 					...forkOptions,
-					onResponse: async (value, client, { assertCurrent }) => {
+					onResponse: async (value, client, { assertCurrent, assertCurrentAsync, source }) => {
 						if (!isJsonObject(value) || !isJsonObject(value.thread)) {
 							await closeCodexStartupClientBestEffort(client);
 							throw new Error("Codex app-server returned an invalid thread/fork response");
@@ -797,12 +820,13 @@ function createCodexThreadsTool(options) {
 						let retained = false;
 						let attached = false;
 						try {
+							await assertCurrentAsync?.();
 							assertCurrent();
 							if (attach && session) {
 								const identity = currentIdentity(session.sessionId);
 								await options.bindingStore.withLease(identity, async () => {
+									await assertCurrentAsync?.();
 									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.");
@@ -817,7 +841,11 @@ function createCodexThreadsTool(options) {
 									attached = await options.bindingStore.mutate(identity, {
 										kind: "set",
 										binding: nextBinding
-									}, assertCurrent);
+									}, composeSessionEntryCommitGuards([
+										assertCurrent,
+										source,
+										prepared?.source
+									]));
 									if (!attached) throw new Error("Codex session binding changed before the fork could be attached");
 								});
 							}
@@ -837,14 +865,7 @@ function createCodexThreadsTool(options) {
 			if (action === "archive") {
 				const threadId = readThreadId(params);
 				if (params.confirm !== true) throw new Error("confirm=true is required to archive a native Codex thread");
-				const session = currentSession();
-				if (!session) throw new Error("cannot safely archive a native Codex thread without a session identity");
-				const identity = currentIdentity(session.sessionId);
-				return options.bindingStore.withThreadArchiveFence(() => run({
-					threadId,
-					session,
-					identity
-				}));
+				return options.bindingStore.withThreadArchiveFence(() => run(threadId));
 			}
 			return run();
 		}
@@ -893,7 +914,7 @@ function createCodexNodeExecServerCommand() {
 				signal: AbortSignal.any([io.signal, context.signal])
 			} : io;
 			const assertExecAuthorized = context.prepareExecAuthorization(request.authorization);
-			const { runCodexNodeExecServer } = await import("./.setup/node-exec-server.runtime-BWkULhBM.mjs");
+			const { runCodexNodeExecServer } = await import("./.setup/node-exec-server.runtime-CP7RC1Nd.mjs");
 			runtimeIo.signal.throwIfAborted();
 			const workspace = await context.acquireManagedWorkspaceAsync(workspaceRequest);
 			try {
@@ -1261,56 +1282,36 @@ function startCodexCatalogControlRequestDiagnostics(page) {
 /** One query-compatible native page per node, owned by the registered catalog provider. */
 var CodexCatalogNodeSnapshots = class {
 	constructor() {
-		this.generation = 0;
-		this.inventoryGeneration = 0;
-		this.configGeneration = 0;
 		this.nodes = /* @__PURE__ */ new Map();
 	}
 	start(config) {
 		if (this.config !== config) {
 			this.nodes.clear();
 			this.config = config;
-			this.configGeneration = this.generation + 1;
-			this.inventoryGeneration = this.configGeneration;
 		}
-		return ++this.generation;
 	}
-	observe(generation, nodes) {
-		if (generation < this.inventoryGeneration) return;
-		this.inventoryGeneration = generation;
+	observe(nodes) {
 		const connected = new Map(nodes.filter((node) => node.connected).map((node) => [node.nodeId, node]));
 		for (const [nodeId, publication] of this.nodes) {
 			const node = connected.get(nodeId);
 			if (!node || node.connectedAtMs !== publication.connection) this.nodes.delete(nodeId);
 		}
-		for (const node of connected.values()) if (!this.nodes.has(node.nodeId)) this.nodes.set(node.nodeId, {
-			connection: node.connectedAtMs,
-			generation: 0
-		});
+		for (const node of connected.values()) if (!this.nodes.has(node.nodeId)) this.nodes.set(node.nodeId, { connection: node.connectedAtMs });
 	}
-	forNode(node, generation, key) {
+	forNode(node, key) {
 		let publication = this.nodes.get(node.nodeId);
 		if (!publication) {
-			publication = {
-				connection: node.connectedAtMs,
-				generation: 0
-			};
-			if (generation >= this.inventoryGeneration) this.nodes.set(node.nodeId, publication);
+			publication = { connection: node.connectedAtMs };
+			this.nodes.set(node.nodeId, publication);
 		}
-		const valid = () => generation >= this.configGeneration && this.nodes.get(node.nodeId) === publication && publication.connection === node.connectedAtMs;
 		return {
-			read: () => valid() && publication.snapshot?.key === key ? publication.snapshot : void 0,
+			read: () => publication.snapshot?.key === key ? publication.snapshot : void 0,
 			publish: (host) => {
-				if (!valid() || generation < publication.generation) return false;
-				publication.generation = generation;
 				publication.snapshot = node.connected && host.connected ? {
 					key,
 					host
 				} : void 0;
-				return true;
-			},
-			isCurrent: (snapshot) => valid() && publication.snapshot === snapshot,
-			valid
+			}
 		};
 	}
 };
@@ -1336,16 +1337,12 @@ function createNodeHostPublication(publication, adopted, sourceKey, onHost, sign
 		readPublished: () => publishedHost,
 		publish: (host) => {
 			if (signal?.aborted) return partial ? void 0 : onHost?.(project(host));
-			if (!publication.valid()) return;
-			if (publication.publish(host)) {
-				publishedSnapshot = publication.read();
-				return emit(host);
-			}
-			const latest = publication.read();
-			return emit(latest?.host ?? host);
+			publication.publish(host);
+			publishedSnapshot = publication.read();
+			return emit(host);
 		},
 		publishCached: (snapshot) => {
-			if (signal?.aborted || snapshot === publishedSnapshot || !publication.isCurrent(snapshot)) return;
+			if (signal?.aborted || snapshot === publishedSnapshot) return;
 			const completion = createDeferred();
 			completion.promise.catch(() => void 0);
 			try {
@@ -1537,7 +1534,6 @@ var CodexCatalogVisiblePage = class {
 		this.sessions = [];
 		this.seenCursors = /* @__PURE__ */ new Set();
 		this.pages = 0;
-		this.complete = false;
 		this.request = new CodexCatalogListRequest();
 		this.cursor = params.cursor;
 	}
@@ -1553,11 +1549,9 @@ var CodexCatalogVisiblePage = class {
 		}
 	}
 	close() {
-		this.complete = true;
 		this.request.close();
 	}
 	async nextPage() {
-		if (this.complete) throw new Error("Codex catalog page is already complete");
 		const params = this.params;
 		params.signal?.throwIfAborted();
 		const finishTiming = startCodexCatalogListTiming("controlWaitSumMs", "controlPageCalls");
@@ -1592,21 +1586,20 @@ var CodexCatalogVisiblePage = class {
 			await params.onExcludedThread?.({ threadId: session.threadId });
 		}
 		const nextCursor = page.nextCursor;
-		if (!nextCursor || this.sessions.length >= params.limit || !excludedFromPage) this.complete = true;
-		else {
+		if (nextCursor && this.sessions.length < params.limit && excludedFromPage) {
 			if (this.seenCursors.has(nextCursor)) throw new Error("Codex session catalog returned a repeated exclusion cursor");
 			this.seenCursors.add(nextCursor);
 			this.cursor = nextCursor;
-			this.complete = this.pages >= 20 || !this.request.hasPages;
+			if (this.pages < 20 && this.request.hasPages) return { done: false };
 		}
-		return this.complete ? {
+		return {
 			done: true,
 			page: {
 				sessions: this.sessions.slice(0, params.limit),
 				...nextCursor ? { nextCursor } : {},
 				...this.backwardsCursor ? { backwardsCursor: this.backwardsCursor } : {}
 			}
-		} : { done: false };
+		};
 	}
 };
 /** Node and direct callers finish the same bounded outer algorithm inline. */
@@ -1649,7 +1642,7 @@ function hostFailure(source, error) {
 }
 async function projectLocalHost(params, agentId, source, page) {
 	params.signal?.throwIfAborted();
-	const { listAdoptedSessionEntries } = await import("./.setup/session-catalog-adoption-Ca3OYGYM.mjs");
+	const { listAdoptedSessionEntries } = await import("./.setup/session-catalog-adoption-ppsLlVLB.mjs");
 	const { sessionCatalogAdoptedSourceKey } = await import("openclaw/plugin-sdk/session-catalog");
 	params.signal?.throwIfAborted();
 	const finishTiming = startCodexCatalogListTiming("adoptionSumMs", "adoptionCalls");
@@ -1738,7 +1731,7 @@ var CodexCatalogListDriver = class {
 		this.complete = false;
 		this.params = params;
 		this.nodeSnapshots = params.nodeSnapshots ?? new CodexCatalogNodeSnapshots();
-		this.nodeGeneration = this.nodeSnapshots.start(params.config);
+		this.nodeSnapshots.start(params.config);
 	}
 	request() {
 		if (!this.params) throw new Error("Codex catalog list operation is closed");
@@ -1870,9 +1863,9 @@ var CodexCatalogListDriver = class {
 			return [host];
 		}
 		params.signal?.throwIfAborted();
-		this.nodeSnapshots.observe(this.nodeGeneration, inventory);
-		const { listNodeAdoptedSessionEntries, nodeAdoptedSourceKey } = await import("./.setup/session-catalog-node-adoption-BdP9Zjqo.mjs");
-		const { compareNodeLabels, listPairedNode, nodeLabel } = await import("./.setup/session-catalog-node-continue-CNJibO4_.mjs");
+		this.nodeSnapshots.observe(inventory);
+		const { listNodeAdoptedSessionEntries, nodeAdoptedSourceKey } = await import("./.setup/session-catalog-node-adoption-e9v8mGgx.mjs");
+		const { compareNodeLabels, listPairedNode, nodeLabel } = await import("./.setup/session-catalog-node-continue-H7nrzcUD.mjs");
 		params.signal?.throwIfAborted();
 		const adopted = listNodeAdoptedSessionEntries({
 			agentId,
@@ -1898,7 +1891,7 @@ var CodexCatalogListDriver = class {
 				node.commands,
 				node.invocableCommands
 			]);
-			const publication = this.nodeSnapshots.forNode(node, this.nodeGeneration, key);
+			const publication = this.nodeSnapshots.forNode(node, key);
 			const { project, publish, publishCached, readPublished } = createNodeHostPublication(publication, adopted, nodeAdoptedSourceKey, params.onHost, params.signal, partial, trackPublication);
 			const cached = partial ? publication.read() : void 0;
 			let result;
@@ -1908,7 +1901,7 @@ var CodexCatalogListDriver = class {
 					publishCached(latest);
 					return project(latest.host);
 				}
-				return !partial ? result : publication.valid() ? readPublished() ?? result : void 0;
+				return partial ? readPublished() ?? result : result;
 			});
 			if (cached) publishCached(cached);
 			const nodeStarted = diagnostics ? performance.now() : 0;
@@ -2031,11 +2024,6 @@ async function runCatalogListInline(operation) {
 }
 //#endregion
 //#region extensions/codex/src/session-catalog-transcript-item.ts
-const CODEX_MESSAGE_TYPES = /* @__PURE__ */ new Map([
-	["userMessage", "userMessage"],
-	["agentMessage", "agentMessage"],
-	["reasoning", "reasoning"]
-]);
 const CODEX_TOOL_TYPES = /* @__PURE__ */ new Set([
 	"commandExecution",
 	"fileChange",
@@ -2047,9 +2035,9 @@ const CODEX_TOOL_TYPES = /* @__PURE__ */ new Set([
 	"imageGeneration"
 ]);
 function toGenericTranscriptItem(item) {
-	let type = CODEX_MESSAGE_TYPES.get(item.type);
-	if (!type && CODEX_TOOL_TYPES.has(item.type)) type = item.result !== void 0 || Boolean(item.aggregatedOutput) ? "toolResult" : "toolCall";
-	type ??= "other";
+	let type = "other";
+	if (item.type === "userMessage" || item.type === "agentMessage" || item.type === "reasoning") type = item.type;
+	else if (CODEX_TOOL_TYPES.has(item.type)) type = item.result !== void 0 || item.aggregatedOutput ? "toolResult" : "toolCall";
 	const fallback = item.title ?? item.name ?? item.tool ?? item.command ?? item.query ?? void 0;
 	const resultText = item.aggregatedOutput || (item.result === void 0 ? void 0 : JSON.stringify(item.result, null, 2));
 	const changesText = Array.isArray(item.changes) ? item.changes.map((change) => `${change.kind}: ${change.path}`).join("\n") || void 0 : void 0;
@@ -2315,7 +2303,7 @@ async function readCodexSessionTranscript(params) {
 		cursor,
 		limit
 	});
-	const { nodeLabel } = await import("./.setup/session-catalog-node-continue-CNJibO4_.mjs");
+	const { nodeLabel } = await import("./.setup/session-catalog-node-continue-H7nrzcUD.mjs");
 	return {
 		hostId: params.hostId,
 		label: nodeLabel(node),
@@ -2392,7 +2380,7 @@ async function checkCodexUpstreamActivity(probes, control, resolveThreadId) {
 			const fingerprint = upstreamConnectionFingerprint(probe);
 			if (probe.upstreamKind !== "codex-app-server" || !fingerprint || fingerprint !== pinned.connectionFingerprint) continue;
 			try {
-				const threadId = resolveThreadId(probe);
+				const threadId = await resolveThreadId(probe);
 				const page = await pinned.listTurnPage({
 					threadId,
 					limit: CODEX_UPSTREAM_TURN_LIMIT,
@@ -2424,15 +2412,17 @@ async function checkCodexUpstreamActivity(probes, control, resolveThreadId) {
 	});
 }
 function createChecker(params) {
-	const resolveThreadId = (probe) => {
+	const resolveThreadId = async (probe) => {
 		const config = params.getRuntimeConfig();
-		const sessionId = params.api.runtime.agent.session.getSessionEntry({
+		const storePath = params.api.runtime.agent.session.resolveStorePath(config?.session?.store, { agentId: probe.agentId });
+		const sessionId = (await params.api.runtime.agent.session.getSessionEntryAsync({
 			agentId: probe.agentId,
+			storePath,
 			sessionKey: probe.sessionKey,
 			readConsistency: "latest"
-		})?.sessionId?.trim();
+		}))?.sessionId?.trim();
 		if (!sessionId) return probe.threadId;
-		const binding = params.bindingStore.read(sessionBindingIdentity({
+		const binding = await params.bindingStore.readAsync(sessionBindingIdentity({
 			sessionId,
 			sessionKey: probe.sessionKey,
 			config
@@ -2479,8 +2469,8 @@ async function requireEligibleCodexThread(params) {
 		remaining();
 		if (thread.id !== threadId || thread.ephemeral === true || !isInteractiveThreadSource(thread.source)) throw unverified();
 		if (!root) {
-			const { CODEX_CATALOG_NATIVE_PAGE_LIMIT } = await import("./.setup/session-catalog-native-projection-BY2zMkMO.mjs").then((n) => n.a);
-			const { CODEX_CATALOG_MAX_ROWS } = await import("./.setup/session-catalog-limits-BynIoOYm.mjs").then((n) => n.r);
+			const { CODEX_CATALOG_NATIVE_PAGE_LIMIT } = await import("./.setup/session-catalog-native-projection-G3lSDYYG.mjs").then((n) => n.a);
+			const { CODEX_CATALOG_MAX_ROWS } = await import("./.setup/session-catalog-limits-Dc6E0BZz.mjs").then((n) => n.r);
 			let cursor;
 			const seenCursors = /* @__PURE__ */ new Set();
 			for (;;) {
@@ -2542,7 +2532,7 @@ function createCodexCatalogRequestSnapshot(requestTimeoutMs, request, index, beg
 		listThreads: (params, timeoutMs, observation) => read(CODEX_CONTROL_METHODS.listThreads, params, timeoutMs, observation),
 		listThreadTurns: (params) => read(CODEX_CONTROL_METHODS.listThreadTurns, params),
 		listThreadItems: (params) => read(CODEX_CONTROL_METHODS.listThreadItems, params),
-		forkThread: (params, assertCurrent) => request(CODEX_CONTROL_METHODS.forkThread, assertCodexThreadForkParams(params), void 0, assertCurrent),
+		forkThread: (params, assertCurrent) => request(CODEX_CONTROL_METHODS.forkThread, params, void 0, assertCurrent),
 		readThread: async (threadId, includeTurns, timeoutMs) => (await read(CODEX_CONTROL_METHODS.readThread, {
 			threadId,
 			includeTurns
@@ -2684,7 +2674,6 @@ function createCodexCatalogHomeResolver(params) {
 	});
 	const prepareAgentHomes = async (snapshot, agentId, fleet) => {
 		await scheduler.yield();
-		snapshot.assertCurrent();
 		if (!agentIds(snapshot).includes(agentId)) return [];
 		const ownerAgentDir = await homePath(snapshot, agentDir(snapshot, agentId));
 		const base = params.resolveRuntimeOptions({
@@ -2713,7 +2702,6 @@ function createCodexCatalogHomeResolver(params) {
 			});
 			candidates.push(...await sharedCandidates(snapshot));
 		}
-		snapshot.assertCurrent();
 		const homes = [];
 		const seen = /* @__PURE__ */ new Set();
 		for (const candidate of candidates) {
@@ -2754,7 +2742,6 @@ function createCodexCatalogHomeResolver(params) {
 			await scheduler.yield();
 			if (agentDir(snapshot, id) === directory) return prepareAgentHomes(snapshot, id, true);
 		}
-		snapshot.assertCurrent();
 		return [];
 	});
 	return {
@@ -2776,7 +2763,6 @@ function createCodexCatalogHomeResolver(params) {
 				};
 			}
 			const codexHome = await homePath(snapshot, resolveCodexAppServerUserHomeDir(env));
-			snapshot.assertCurrent();
 			const appServer = params.resolveRuntimeOptions({
 				pluginConfig: snapshot.pluginConfig,
 				config: snapshot.config,
@@ -2833,10 +2819,9 @@ var CodexCatalogSourceBackoff = class {
 		return {
 			allowed: true,
 			resolved: () => {
-				if (sources.get(key) === state) sources.set(key, {});
+				sources.set(key, {});
 			},
 			rejected: (error) => {
-				if (sources.get(key) !== state) return;
 				if (error instanceof CatalogParamsError || error instanceof Error && error.name === "AbortError" || error instanceof CodexAppServerRpcError && (error.code === -32600 || error.code === -32602)) {
 					if (failure) failure.probing = false;
 					return;
@@ -2850,7 +2835,7 @@ var CodexCatalogSourceBackoff = class {
 				} });
 			},
 			abandoned: () => {
-				if (sources.get(key) === state && failure) failure.probing = false;
+				if (failure) failure.probing = false;
 			}
 		};
 	}
@@ -2881,24 +2866,15 @@ function createCodexSessionCatalogControl(params) {
 	});
 	const requestOptionsByConfig = /* @__PURE__ */ new WeakMap();
 	const indexes = /* @__PURE__ */ new Map();
-	const retiringState = /* @__PURE__ */ new Map();
 	const directHomes = /* @__PURE__ */ new Map();
 	const residentRequests = /* @__PURE__ */ new Set();
 	let generation = params.getRuntimeConfig();
-	let residentEpoch = 0;
 	let closed = false;
 	let runBackground = (run) => run();
 	let retiring;
 	const retireIndexes = () => {
-		residentEpoch++;
 		const closing = [];
-		for (const [homeId, index] of indexes) {
-			const writes = index.retire().finally(() => {
-				if (retiringState.get(homeId) === writes) retiringState.delete(homeId);
-			});
-			retiringState.set(homeId, writes);
-			closing.push(writes, index.close());
-		}
+		for (const index of indexes.values()) closing.push(index.close());
 		indexes.clear();
 		directHomes.clear();
 		const drain = Promise.allSettled([retiring, ...closing]).then(() => {
@@ -2914,7 +2890,6 @@ function createCodexSessionCatalogControl(params) {
 			generation = config;
 			retireIndexes();
 		}
-		const epoch = residentEpoch;
 		const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig: params.getPluginConfig() });
 		const requestOptions = resolveRequestOptions(runtime.start, agentId, source);
 		const key = source?.sourceHomeId ?? agentId ?? "";
@@ -2928,13 +2903,10 @@ function createCodexSessionCatalogControl(params) {
 			directHomes.set(key, home);
 		}
 		const homeId = await home;
-		await retiringState.get(homeId);
-		if (closed || generation !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
 		let index = indexes.get(homeId);
 		if (!index) {
-			const [{ CodexCatalogIndex }, { canReuseCodexCatalogPreview, projectCodexCatalogDeltaPage, projectCodexCatalogPage }] = await Promise.all([import("./.setup/session-catalog-index-DQ9_sj42.mjs"), import("./.setup/session-catalog-projection-BTXOyzl_.mjs")]);
-			source?.assertCurrent();
-			if (closed || generation !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
+			const [{ CodexCatalogIndex }, { canReuseCodexCatalogPreview, projectCodexCatalogDeltaPage, projectCodexCatalogPage }] = await Promise.all([import("./.setup/session-catalog-index-BfzfdtH7.mjs"), import("./.setup/session-catalog-projection-BjWE414G.mjs")]);
+			if (closed) throw new Error("Codex resident catalog is closed");
 			index = indexes.get(homeId);
 			if (index) return index;
 			const root = source?.localSessionsRoot ?? (runtime.connectionClass !== "remote" ? path.join(resolveCodexAppServerLocalHomeDir(requestOptions.startOptions, requestOptions.agentDir, params.env), "sessions") : void 0);
@@ -2958,8 +2930,7 @@ function createCodexSessionCatalogControl(params) {
 					}
 				},
 				assertCurrent: () => {
-					source?.assertCurrent();
-					if (closed || params.getRuntimeConfig() !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
+					if (closed) throw new Error("Codex resident catalog is closed");
 				},
 				readNative: async (query, remainingRows, foreground) => {
 					const requests = createRequestSnapshot(agentId, source, true, query.useStateDbOnly ? (thread) => {
@@ -3057,7 +3028,7 @@ function createCodexSessionCatalogControl(params) {
 		const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig });
 		const requestOptions = resolveRequestOptions(runtime.start, agentId, source);
 		return createCodexCatalogRequestSnapshot(runtime.requestTimeoutMs, async (method, requestParams, timeoutMs, assertCurrent, observation) => {
-			const { codexControlRequest } = await import("./.setup/command-rpc-CUy4Bo-0.mjs").then((n) => n.n);
+			const { codexControlRequest } = await import("./.setup/command-rpc-SXqLQukR.mjs").then((n) => n.n);
 			return await codexControlRequest(pluginConfig, method, requestParams, {
 				...requestOptions,
 				authProfileId: null,
@@ -3079,9 +3050,9 @@ function createCodexSessionCatalogControl(params) {
 			const runtime = source?.appServer ?? resolveRuntimeOptions({ pluginConfig });
 			const { agentDir, config: runtimeConfig, startOptions } = resolveRequestOptions(runtime.start, agentId, source);
 			let catalogIndex;
-			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./.setup/shared-client-CCz9ldpr.mjs").then((n) => n.v);
-			const { resolveCodexAppServerClientInstanceId } = await import("./.setup/client-aPKNc4Ii.mjs").then((n) => n.n);
-			const { requestCodexAppServerClientJson } = await import("./.setup/request-DInueZ2q.mjs").then((n) => n.i);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./.setup/shared-client-CE_uY0A1.mjs").then((n) => n.m);
+			const { resolveCodexAppServerClientInstanceId } = await import("./.setup/client-BS8X7HmG.mjs").then((n) => n.n);
+			const { requestCodexAppServerClientJson } = await import("./.setup/request-ePeNJrOd.mjs").then((n) => n.i);
 			const client = await getLeasedSharedCodexAppServerClient({
 				agentDir,
 				config: runtimeConfig,
@@ -3150,7 +3121,7 @@ function createCodexSessionCatalogControl(params) {
 			await Promise.allSettled(residentRequests);
 			const clients = getSharedCodexAppServerClientState();
 			if (clients.liveClients.size > 0 || clients.startup.pending.size > 0) {
-				const { clearSharedCodexAppServerClientAndWait } = await import("./.setup/shared-client-CCz9ldpr.mjs").then((n) => n.v);
+				const { clearSharedCodexAppServerClientAndWait } = await import("./.setup/shared-client-CE_uY0A1.mjs").then((n) => n.m);
 				await clearSharedCodexAppServerClientAndWait();
 			}
 		},
@@ -3214,47 +3185,27 @@ function resolveLocalCatalogHomeForThread(params) {
 	return exact;
 }
 function withCatalogListScope(initialize) {
-	let create = initialize;
+	let initialization;
 	let operation;
 	let scope;
-	let running = false;
 	let closed = false;
 	let completed = false;
 	return {
 		async next() {
-			if (closed || running) throw new Error("Codex catalog list operation cannot advance");
-			running = true;
-			try {
-				scope ??= createCodexCatalogListScope();
-				return await scope.run(async () => {
-					if (create) {
-						const initializeOnce = create;
-						create = void 0;
-						operation = await initializeOnce();
-					}
-					if (!operation) throw new Error("Codex catalog list operation did not initialize");
-					const step = await operation.next();
-					completed ||= step.done;
-					return step;
-				});
-			} finally {
-				running = false;
-			}
+			if (closed) throw new Error("Codex catalog list operation cannot advance");
+			scope ??= createCodexCatalogListScope();
+			return scope.run(async () => {
+				operation ??= await (initialization ??= initialize());
+				const step = await operation.next();
+				completed ||= step.done;
+				return step;
+			});
 		},
 		close() {
 			if (closed) return;
-			if (running) throw new Error("Cannot close an active Codex catalog list step");
+			scope?.run(() => operation?.close());
 			closed = true;
-			create = void 0;
-			const current = operation;
-			operation = void 0;
-			const currentScope = scope;
-			scope = void 0;
-			try {
-				if (currentScope) currentScope.run(() => current?.close());
-			} finally {
-				currentScope?.finish(completed ? "resolved" : "rejected");
-			}
+			scope?.finish(completed ? "resolved" : "rejected");
 		}
 	};
 }
@@ -3395,7 +3346,7 @@ function registerCodexSessionCatalog(params) {
 			if (!config) throw new Error("OpenClaw runtime config is unavailable");
 			if (request.hostId.startsWith("node:")) {
 				const agentId = resolveRequestAgentId(request.agentId);
-				const { continueNodeCodexSession } = await import("./.setup/session-catalog-node-continue-CNJibO4_.mjs");
+				const { continueNodeCodexSession } = await import("./.setup/session-catalog-node-continue-H7nrzcUD.mjs");
 				return await continueNodeCodexSession({
 					agentId,
 					api: params.api,
@@ -3410,7 +3361,7 @@ function registerCodexSessionCatalog(params) {
 			const { agentId, source, control } = await bindLocalRequest(request);
 			source.assertCurrent();
 			let upstreamBaseline;
-			const { continueLocalCodexSession } = await import("./.setup/session-catalog-adoption-Ca3OYGYM.mjs");
+			const { continueLocalCodexSession } = await import("./.setup/session-catalog-adoption-ppsLlVLB.mjs");
 			const continued = await continueLocalCodexSession({
 				agentId,
 				api: params.api,
@@ -3439,7 +3390,7 @@ function registerCodexSessionCatalog(params) {
 			if (!config) throw new Error("OpenClaw runtime config is unavailable");
 			const { agentId, source, control } = await bindLocalRequest(request);
 			source.assertCurrent();
-			const { archiveLocalCodexSession } = await import("./.setup/session-catalog-archive-Bv6gV7x9.mjs");
+			const { archiveLocalCodexSession } = await import("./.setup/session-catalog-archive-CqLRHJ6z.mjs");
 			await archiveLocalCodexSession({
 				agentId,
 				bindingStore: params.bindingStore,
@@ -3641,10 +3592,8 @@ function readLegacyEnvEndpoints(env) {
 	}
 	return raw.split(",").map(endpointFromToken).filter((entry) => Boolean(entry));
 }
-function resolveEndpoints(pluginConfig, options) {
+function normalizeEndpoints(pluginConfig, options) {
 	const env = options.env ?? process.env;
-	const runtimeConfig = options.getRuntimeConfig?.();
-	const { resolveAuthProfileId, resolveRuntimeOptions } = options;
 	const configured = readCodexPluginConfig(pluginConfig).supervision?.endpoints;
 	const endpoints = configured?.length ? configured : readLegacyEnvEndpoints(env);
 	const normalized = endpoints ? endpoints.map((endpoint, index) => {
@@ -3661,14 +3610,20 @@ function resolveEndpoints(pluginConfig, options) {
 		if (seen.has(endpoint.id)) throw new Error(`duplicate Codex supervisor endpoint id: ${endpoint.id}`);
 		seen.add(endpoint.id);
 	}
-	return normalized.map((endpoint) => Object.assign({}, endpoint, { connectionKey: supervisionEndpointConnectionKey({
+	return normalized;
+}
+async function resolveEndpoints(pluginConfig, options) {
+	const env = options.env ?? process.env;
+	const runtimeConfig = options.getRuntimeConfig?.();
+	const { resolveAuthProfileId, resolveRuntimeOptions } = options;
+	return await Promise.all(normalizeEndpoints(pluginConfig, options).map(async (endpoint) => Object.assign({}, endpoint, { connectionKey: await supervisionEndpointConnectionKey({
 		endpoint,
 		pluginConfig,
 		env,
 		runtimeConfig,
 		resolveAuthProfileId,
 		resolveRuntimeOptions
-	}) }));
+	}) })));
 }
 function resolveEndpointStartOptions(params) {
 	const base = params.resolveRuntimeOptions({
@@ -3706,17 +3661,26 @@ function resolveEndpointStartOptions(params) {
 	if (params.validateSecurity !== false) assertCodexAppServerConnectionSecurity(startOptions);
 	return startOptions;
 }
-function supervisionEndpointConnectionKey(params) {
+function endpointConnectionContext(params) {
 	const startOptions = resolveEndpointStartOptions({
 		...params,
 		validateSecurity: false
 	});
 	const usesNativeAuth = params.endpoint.configured !== void 0 || startOptions.homeScope === "user";
-	const agentDir = usesNativeAuth ? void 0 : resolveDefaultAgentDir(params.runtimeConfig ?? {});
-	const authProfileId = usesNativeAuth ? void 0 : params.resolveAuthProfileId({
+	return {
+		startOptions,
+		usesNativeAuth,
+		agentDir: usesNativeAuth ? void 0 : resolveDefaultAgentDir(params.runtimeConfig ?? {})
+	};
+}
+async function supervisionEndpointConnectionKey(params) {
+	const { startOptions, usesNativeAuth, agentDir } = endpointConnectionContext(params);
+	return encodeEndpointConnectionKey(startOptions, agentDir, usesNativeAuth ? void 0 : await params.resolveAuthProfileId({
 		agentDir,
 		config: params.runtimeConfig
-	});
+	}));
+}
+function encodeEndpointConnectionKey(startOptions, agentDir, authProfileId) {
 	const fallbackApiKeyCacheKey = authProfileId ? void 0 : resolveCodexAppServerFallbackApiKeyCacheKey({ startOptions });
 	return JSON.stringify({
 		homeScope: startOptions.homeScope ?? null,
@@ -3729,7 +3693,7 @@ function supervisionEndpointConnectionKey(params) {
 }
 function createPolicyGuardedRequest(options, policy) {
 	return async (endpoint, method, requestParams) => {
-		const currentEndpoint = requireCurrentEndpoint(options, policy, endpoint);
+		const currentEndpoint = await requireCurrentEndpoint(options, policy, endpoint);
 		if (options.request) return await options.request(currentEndpoint, method, requestParams);
 		const pluginConfig = options.getPluginConfig();
 		const env = options.env ?? process.env;
@@ -3750,7 +3714,7 @@ function createPolicyGuardedRequest(options, policy) {
 			timeoutMs: runtime.requestTimeoutMs,
 			startOptions,
 			assertCurrent: () => {
-				requireCurrentEndpoint(options, policy, currentEndpoint);
+				assertCurrentEndpointAtEffect(options, policy, currentEndpoint);
 			},
 			...endpoint.configured || startOptions.homeScope === "user" ? { authProfileId: null } : {},
 			...config ? { config } : {}
@@ -3916,16 +3880,6 @@ async function resolveInProgressTurnId(params) {
 		return;
 	}
 }
-function redactString(value) {
-	return value.replace(/\b(?:sk|glpat|xox[baprs])-[-_a-zA-Z0-9]{12,}\b/g, "[redacted]").replace(/\b(?:ghp|gho|ghu|ghs)_[-_a-zA-Z0-9]{12,}\b/g, "[redacted]").replace(/\bBearer\s+[-._~+/a-zA-Z0-9]+=*/g, "Bearer [redacted]");
-}
-/** Redacts secret-bearing fields before legacy tool results leave the plugin. */
-function redactCodexSupervisionValue(value, key = "") {
-	if (typeof value === "string") return /authorization|password|secret|token|api[-_]?key/i.test(key) ? "[redacted]" : redactString(value);
-	if (Array.isArray(value)) return value.map((entry) => redactCodexSupervisionValue(entry));
-	if (!isRecord(value)) return value;
-	return Object.fromEntries(Object.entries(value).map(([entryKey, entryValue]) => [entryKey, redactCodexSupervisionValue(entryValue, entryKey)]));
-}
 function redactEndpointUrl(value) {
 	if (value.startsWith("unix://")) return "unix://";
 	const url = URL.parse(value);
@@ -3948,47 +3902,65 @@ function endpointResult(endpoint, pluginConfig, env, resolveRuntimeOptions) {
 		...remote
 	};
 }
-function sanitizeSessionListResult(result, includeTranscriptDerivedFields) {
+function projectSessionListResult(result, includeTranscriptDerivedFields) {
+	if (includeTranscriptDerivedFields) return result;
 	return {
-		sessions: result.sessions.map((session) => {
-			const sanitized = redactCodexSupervisionValue(session);
-			if (!includeTranscriptDerivedFields) {
-				delete sanitized.preview;
-				delete sanitized.name;
-			}
-			return sanitized;
-		}),
-		errors: includeTranscriptDerivedFields ? redactCodexSupervisionValue(result.errors) : result.errors.map(({ endpointId, ok }) => ({
+		sessions: result.sessions.map(({ preview: _preview, name: _name, ...session }) => session),
+		errors: result.errors.map(({ endpointId, ok }) => ({
 			endpointId,
 			ok
 		}))
 	};
 }
-function requireLiveToolPolicy(options, policy) {
+async function requireLiveToolPolicy(options, policy) {
+	const pluginConfig = requireLiveToolPolicyConfig(options, policy);
+	return {
+		pluginConfig,
+		endpoints: await resolveEndpoints(pluginConfig, options)
+	};
+}
+function requireLiveToolPolicyConfig(options, policy) {
 	options.assertInvocationCurrent?.();
 	if (!options.senderIsOwner) throw new CodexSupervisionPolicyError("Codex supervision compatibility tools require an owner-authorized sender.");
 	const pluginConfig = options.getPluginConfig();
 	requireToolPolicy(pluginConfig, policy);
-	return {
-		pluginConfig,
-		endpoints: resolveEndpoints(pluginConfig, options)
-	};
+	return pluginConfig;
 }
 function requireToolPolicy(pluginConfig, policy) {
 	const config = readCodexPluginConfig(pluginConfig).supervision;
 	const error = config?.enabled !== true ? "Codex supervision is disabled in the codex plugin config." : policy === "raw-transcripts" && config.allowRawTranscripts !== true ? "Codex session reads are disabled for this codex plugin supervision config." : policy === "write-controls" && config.allowWriteControls !== true ? "Codex write controls are disabled for this codex plugin supervision config." : void 0;
 	if (error) throw new CodexSupervisionPolicyError(error);
 }
-function requireCurrentEndpoint(options, policy, endpoint) {
-	const { endpoints } = requireLiveToolPolicy(options, policy);
+async function requireCurrentEndpoint(options, policy, endpoint) {
+	const { endpoints } = await requireLiveToolPolicy(options, policy);
 	const currentEndpoint = endpoints.find((candidate) => candidate.id === endpoint.id);
 	if (!currentEndpoint || currentEndpoint.connectionKey !== endpoint.connectionKey) throw new CodexSupervisionPolicyError(`Codex supervision endpoint ${endpoint.id} was removed or changed during the request.`);
 	return currentEndpoint;
 }
+function assertCurrentEndpointAtEffect(options, policy, endpoint) {
+	const pluginConfig = requireLiveToolPolicyConfig(options, policy);
+	const current = normalizeEndpoints(pluginConfig, options).find((candidate) => candidate.id === endpoint.id);
+	if (!current) throw new CodexSupervisionPolicyError(`Codex supervision endpoint ${endpoint.id} was removed or changed during the request.`);
+	const runtimeConfig = options.getRuntimeConfig?.();
+	const { startOptions, usesNativeAuth, agentDir } = endpointConnectionContext({
+		endpoint: current,
+		pluginConfig,
+		env: options.env ?? process.env,
+		runtimeConfig,
+		resolveAuthProfileId: options.resolveAuthProfileId,
+		resolveRuntimeOptions: options.resolveRuntimeOptions
+	});
+	if (encodeEndpointConnectionKey(startOptions, agentDir, usesNativeAuth ? void 0 : options.resolveAuthProfileIdAtEffect({
+		agentDir,
+		config: runtimeConfig
+	})) !== endpoint.connectionKey) throw new CodexSupervisionPolicyError(`Codex supervision endpoint ${endpoint.id} was removed or changed during the request.`);
+}
 function requireCurrentEndpointSet(options, expected) {
-	const current = requireLiveToolPolicy(options, "enabled");
-	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 };
+	const pluginConfig = requireLiveToolPolicyConfig(options, "enabled");
+	const current = normalizeEndpoints(pluginConfig, options);
+	if (!(current.length === expected.length && expected.every((endpoint) => current.some((candidate) => candidate.id === endpoint.id)))) throw new CodexSupervisionPolicyError("Codex supervision endpoint configuration changed during the request.");
+	for (const endpoint of expected) assertCurrentEndpointAtEffect(options, "enabled", endpoint);
+	return { pluginConfig };
 }
 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.`);
@@ -3999,7 +3971,7 @@ function createCodexSupervisionTools(options) {
 	const writeRequest = createPolicyGuardedRequest(options, "write-controls");
 	const current = () => requireLiveToolPolicy(options, "enabled");
 	const controlActiveTurn = async (rawParams, action) => {
-		const { endpoints, pluginConfig } = current();
+		const { endpoints, pluginConfig } = await current();
 		requireToolPolicy(pluginConfig, "write-controls");
 		const params = isRecord(rawParams) ? rawParams : {};
 		const threadId = readStringParam(params, "thread_id", { required: true });
@@ -4024,7 +3996,7 @@ function createCodexSupervisionTools(options) {
 			threadId,
 			includeTurns: true
 		});
-		requireCurrentEndpoint(options, "write-controls", endpoint);
+		await requireCurrentEndpoint(options, "write-controls", endpoint);
 		if (statusType(thread) !== "active") throw action === "steer" ? idleContinuationError(threadId) : /* @__PURE__ */ new Error(`Codex thread ${threadId} has no active turn to interrupt`);
 		const turnId = (action === "interrupt" ? readStringParam(params, "turn_id") : void 0) ?? await resolveInProgressTurnId({
 			request: writeRequest,
@@ -4059,7 +4031,7 @@ function createCodexSupervisionTools(options) {
 			description: "Check configured Codex app-server endpoints.",
 			parameters: EmptyParamsSchema,
 			execute: async () => {
-				const { pluginConfig, endpoints } = current();
+				const { endpoints } = await current();
 				const health = [];
 				for (const endpoint of endpoints) try {
 					await request(endpoint, "thread/loaded/list", { limit: 1 });
@@ -4074,7 +4046,7 @@ function createCodexSupervisionTools(options) {
 						ok: false
 					});
 				}
-				requireCurrentEndpointSet(options, endpoints);
+				const { pluginConfig } = requireCurrentEndpointSet(options, endpoints);
 				return jsonResult({
 					summary: `codex endpoints: ${health.filter((entry) => entry.ok).length}/${health.length} ok`,
 					endpoints: endpoints.map((endpoint) => endpointResult(endpoint, pluginConfig, options.env ?? process.env, options.resolveRuntimeOptions)),
@@ -4089,7 +4061,7 @@ function createCodexSupervisionTools(options) {
 			parameters: SessionsListParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
 				const params = isRecord(rawParams) ? rawParams : {};
-				const { endpoints } = current();
+				const { endpoints } = await current();
 				const result = await listSessionSnapshot({
 					endpoints,
 					request,
@@ -4099,7 +4071,7 @@ function createCodexSupervisionTools(options) {
 				const { pluginConfig } = requireCurrentEndpointSet(options, endpoints);
 				return jsonResult({
 					summary: `codex sessions: ${result.sessions.length}`,
-					...sanitizeSessionListResult(result, readCodexPluginConfig(pluginConfig).supervision?.allowRawTranscripts === true)
+					...projectSessionListResult(result, readCodexPluginConfig(pluginConfig).supervision?.allowRawTranscripts === true)
 				});
 			}
 		},
@@ -4109,7 +4081,7 @@ function createCodexSupervisionTools(options) {
 			description: "Read one Codex session transcript from app-server.",
 			parameters: SessionReadParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
-				const { endpoints, pluginConfig } = current();
+				const { endpoints, pluginConfig } = await current();
 				requireToolPolicy(pluginConfig, "raw-transcripts");
 				const params = isRecord(rawParams) ? rawParams : {};
 				const threadId = readStringParam(params, "thread_id", { required: true });
@@ -4125,10 +4097,10 @@ function createCodexSupervisionTools(options) {
 					threadId,
 					includeTurns: params.include_turns === true
 				});
-				requireCurrentEndpoint(options, "raw-transcripts", endpoint);
+				assertCurrentEndpointAtEffect(options, "raw-transcripts", endpoint);
 				return jsonResult({
 					summary: `codex session: ${threadId}`,
-					response: redactCodexSupervisionValue({ thread })
+					response: { thread }
 				});
 			}
 		},
@@ -4150,7 +4122,7 @@ function createCodexSupervisionTools(options) {
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./.setup/web-search-provider.runtime-Qq_wUrvv.mjs"));
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./.setup/web-search-provider.runtime-DMHxve5v.mjs"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -4227,26 +4199,17 @@ var codex_default = definePluginEntry({
 			overflowPolicy: "reject-new"
 		};
 		const openBindingStateStore = () => bindingStateStore ??= api.runtime.state.openSyncKeyedStore(bindingStateOptions);
-		const openBindingMutationStore = () => bindingMutationStore ??= api.runtime.state.openKeyedStore(bindingStateOptions);
+		const openBindingMutationStore = () => bindingMutationStore ??= api.runtime.state.openKeyedStoreV2(bindingStateOptions);
 		const lazyBindingStateStore = {
-			deleteIf: (key, predicate) => openBindingStateStore().deleteIf(key, predicate),
-			entries: () => openBindingStateStore().entries(),
 			lookup: (key) => openBindingStateStore().lookup(key),
 			asyncReads: {
 				lookup: (key) => openBindingMutationStore().lookup(key),
-				get lookupMany() {
-					const store = openBindingMutationStore();
-					return store.lookupMany?.bind(store);
-				}
+				lookupMany: (keys) => openBindingMutationStore().lookupMany(keys),
+				entries: () => openBindingMutationStore().entries()
 			},
-			registerIfAbsent: (key, value, options) => openBindingStateStore().registerIfAbsent(key, value, options),
-			withCurrent: (authority) => {
-				const store = openBindingMutationStore();
-				if (!store.withCurrent) throw new Error("Codex bindings require action-bound plugin-state mutations");
-				return store.withCurrent(authority);
-			}
+			withCurrent: (authority) => api.runtime.state.openKeyedStoreV2(bindingStateOptions, authority)
 		};
-		const openManagedThreadStateStore = () => managedThreadStateStore ??= api.runtime.state.openKeyedStore({
+		const openManagedThreadStateStore = () => managedThreadStateStore ??= api.runtime.state.openKeyedStoreV2({
 			namespace: CODEX_MANAGED_THREAD_NAMESPACE,
 			maxEntries: CODEX_MANAGED_THREAD_MAX_ENTRIES,
 			overflowPolicy: "evict-oldest"
@@ -4263,7 +4226,7 @@ var codex_default = definePluginEntry({
 			config: api.config,
 			getPluginConfig: resolveCurrentPluginConfig,
 			getRuntimeConfig: resolveCurrentConfig,
-			openResidentState: (homeId) => api.runtime.state.openKeyedStore({
+			openResidentState: (homeId) => api.runtime.state.openKeyedStoreV2({
 				namespace: `${CODEX_CATALOG_STATE_NAMESPACE}.${homeId.replaceAll(":", "-")}`,
 				maxEntries: CODEX_CATALOG_MAX_ROWS + 1,
 				overflowPolicy: "reject-new"
@@ -4288,7 +4251,7 @@ var codex_default = definePluginEntry({
 		}
 		for (const policy of createCodexSessionCatalogNodeInvokePolicies()) api.registerNodeInvokePolicy(policy);
 		if (readCodexPluginConfig(resolveCurrentPluginConfig()).supervision?.enabled === true) {
-			const { resolveCodexAppServerAuthProfileIdForAgent } = createCodexAuthProfileSelection(api.runtime.modelAuth);
+			const { resolveCodexAppServerAuthProfileIdForAgent, resolveCodexAppServerAuthProfileIdAtEffect } = createCodexAuthProfileSelection(api.runtime.modelAuth);
 			api.registerTool({
 				contextVersion: 2,
 				create: (context) => {
@@ -4298,6 +4261,7 @@ var codex_default = definePluginEntry({
 						getPluginConfig: () => resolvePluginConfig(resolveToolRuntimeConfig),
 						getRuntimeConfig: resolveToolRuntimeConfig,
 						resolveAuthProfileId: resolveCodexAppServerAuthProfileIdForAgent,
+						resolveAuthProfileIdAtEffect: resolveCodexAppServerAuthProfileIdAtEffect,
 						resolveRuntimeOptions: resolveCodexSupervisionAppServerRuntimeOptions,
 						senderIsOwner: context.senderIsOwner,
 						assertInvocationCurrent: context.assertInvocationCurrent
@@ -4415,7 +4379,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("./.setup/session-binding-JEHNMPsr.mjs").then((n) => n.a), import("./.setup/session-retirement-CIDqLMII.mjs")]);
+			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./.setup/session-binding-BgsWcbdY.mjs").then((n) => n.a), import("./.setup/session-retirement-Ci_JvOfH.mjs")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({