@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-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-B-qWJh2x.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-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-BZB8RgcF.mjs";
-import { n as defineCodexBuildState } from "./.setup/build-state-CqQnsg7T.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-CzLMy1S9.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 { t as assertCodexAppServerConnectionSecurity } from "./.setup/config-security-KAPScztc.mjs";
-import { d as readCodexPluginConfig } from "./.setup/config-parsing-BQq-CHTF.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-HG_Rr3W_.mjs";
-import { o as setManagedCodexPluginRoot } from "./.setup/managed-binary-C1VFoVPf.mjs";
-import { O as createCodexDesktopGenerationService, T as retireSharedCodexAppServerClientsBeforeDesktopGeneration, m as hasActiveSharedCodexAppServerWork, p as getSharedCodexAppServerClientState, s as resolveCodexAppServerFallbackApiKeyCacheKey } from "./.setup/auth-cache-key-CGm0UJOr.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-DyfUvsSa.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 { s as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-a0HDa2Mj.mjs";
+import { c as createCodexAppServerProcessReaperService } from "./.setup/transport-stdio-CRWTkKOn.mjs";
 import { n as codexNativeProfileRecoveryService } from "./.setup/auth-profile-health-oHizqgye.mjs";
-import { n as withCodexConversationThreadActivity } from "./.setup/thread-ownership-queue-Dp24d7-F.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-DV3DHhdr.mjs";
-import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir } from "./.setup/conversation-binding-data-DJ4ix-W5.mjs";
-import { t as buildCodexMigrationProvider } from "./.setup/provider-BnwHVD_z.mjs";
-import { r as CodexAppServerRpcError, s as isCodexThreadReadMissingError } from "./.setup/rpc-error-hmWM21RB.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./.setup/capabilities-kQntafj_.mjs";
-import { n as filterCodexMarketplacePlugins, t as discoverCodexMarketplacePlugins } from "./.setup/plugin-marketplace-discovery-SQPhSuic.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-B5oNDkUS.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-BJ4xhaGX.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 { 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 { n as codexCatalogHomeIdFromCanonicalPath } from "./.setup/session-catalog-home-id-vlih0B_g.mjs";
-import { t as CODEX_CATALOG_MAX_ROWS } from "./.setup/session-catalog-limits-DEU36Qlo.mjs";
-import { a as CodexCatalogLoadingError, n as currentCodexCatalogListRequest, o as CODEX_CATALOG_STATE_NAMESPACE, r as withCodexCatalogListRequest, t as CodexCatalogListRequest } from "./.setup/session-catalog-list-request-tXephOB4.mjs";
-import { i as withTimeout$1 } from "./.setup/timeout-CXOfNoaX.mjs";
-import { t as lookupNodeCodexCatalogRecord } from "./.setup/session-catalog-node-lookup-Uufckwcm.mjs";
-import { r as projectCodexUserItemText } from "./.setup/transcript-history-projection-B9a7HwUV.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 { 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 { r as codexUpstreamContinueResult } from "./.setup/session-upstream-marker-D15C9NHp.mjs";
-import { t as buildCodexAppServerConnectionFingerprint } from "./.setup/plugin-app-cache-key-BW8rd98k.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-Bdjw9HEn.mjs";
-import { a as setCodexCatalogConnectionHomeResolver } from "./.setup/binding-connection-C-08ez1w.mjs";
+import { t as codexCatalogResidentHomeKey } from "./.setup/session-catalog-events-DzFlXNUe.mjs";
+import { a as setCodexCatalogConnectionHomeResolver } from "./.setup/binding-connection-B7HAAZSI.mjs";
 import { n as findCodexAppServerSpawnError } from "./.setup/spawn-error-CL3n6MAa.mjs";
-import { r as requestCodexAppServerJson } from "./.setup/request-jSbhc1sg.mjs";
+import { r as requestCodexAppServerJson } from "./.setup/request-Y8dmbqZ3.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";
@@ -70,7 +70,7 @@ 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-DGqFpAud.mjs");
+		const { handleCodexAccountUsage } = await import("./.setup/account-usage-runtime-QBZsvZS8.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-cUYrqu_a.mjs").then((n) => n.t);
+		const { resolveCodexAppServerRuntimeOptions } = await import("./.setup/config-runtime-DWzK-k0n.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-qhyYWbew.mjs").then((n) => n.v);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./.setup/shared-client-ByIwuAC-.mjs").then((n) => n.v);
 			const { sleepWithAbort } = await import("openclaw/plugin-sdk/runtime-env");
-			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-C8lgBOoO.mjs").then((n) => n.n);
+			const { isUnsupportedCodexAppServerVersionError } = await import("./.setup/client-y7nO6X9c.mjs").then((n) => n.n);
 			if (signal.aborted) return;
 			let leasedClient;
 			try {
@@ -206,11 +206,8 @@ function createCodexManagedThreadStore(state) {
 			sourceHomeId,
 			threadId
 		});
-		let ids = byHome.get(sourceHomeId);
-		if (!ids) {
-			ids = /* @__PURE__ */ new Set();
-			byHome.set(sourceHomeId, ids);
-		}
+		const ids = byHome.get(sourceHomeId) ?? /* @__PURE__ */ new Set();
+		byHome.set(sourceHomeId, ids);
 		ids.add(threadId);
 		if (memberships.size > 2e4) {
 			const oldest = memberships.entries().next().value;
@@ -270,7 +267,7 @@ 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-Ce7BqiPN.mjs").then((n) => n.i).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
+	const store = () => resolved ??= import("./.setup/session-binding-JEHNMPsr.mjs").then((n) => n.a).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	const managedThreads = managedThreadState ? createCodexManagedThreadStore(managedThreadState) : void 0;
 	return {
 		...managedThreads ? { managedThreads } : {},
@@ -291,7 +288,6 @@ function createLazyCodexAppServerBindingStore(state, managedThreadState) {
 }
 //#endregion
 //#region extensions/codex/src/commands.ts
-/** Creates the reserved `/codex` command definition exposed by the plugin. */
 function createCodexCommand(options) {
 	return {
 		name: "codex",
@@ -318,7 +314,7 @@ function createCodexCommand(options) {
 				...ctx,
 				gatewayClientScopes: ctx.gatewayClientScopes?.slice()
 			};
-			const { handleCodexCommand } = await import("./.setup/command-dispatch-DhBbFIQ5.mjs");
+			const { handleCodexCommand } = await import("./.setup/command-dispatch-uA9lz2Kf.mjs");
 			return handleCodexCommand(commandContext, options);
 		}
 	};
@@ -346,22 +342,22 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 		reply: { text: CODEX_NATIVE_EXECUTION_AUTH_ERROR }
 	};
 	const sessionKey = event.sessionKey ?? ctx.sessionKey;
-	if (data.kind === "codex-cli-node-session") try {
-		return {
+	try {
+		if (data.kind === "codex-cli-node-session") return {
 			handled: true,
-			reply: (await getNodeConversationState().queue.enqueue(`${data.nodeId}:${data.sessionId}`, async () => {
-				const { resolveCodexNativeSandboxBlock } = await import("./.setup/sandbox-guard-WqE8yPge.mjs").then((n) => n.r);
+			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({
 					config: options.config,
 					sessionKey,
 					surface: "Codex CLI node conversation binding"
 				});
-				if (blocked) return { reply: { text: blocked } };
+				if (blocked) return blocked;
 				const resume = options.resumeCodexCliSessionOnNode;
-				if (!resume) return { reply: { text: "Codex CLI node binding is unavailable because Gateway node runtime is not attached." } };
+				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 { reply: { text: "This Codex conversation was detached or changed before its message could run." } };
-				return { reply: { text: (await resume({
+				if (!isCurrentPublicBinding(publicBinding, getSessionBindingService())) return "This Codex conversation was detached or changed before its message could run.";
+				return (await resume({
 					nodeId: data.nodeId,
 					sessionId: data.sessionId,
 					agentId: data.agentId,
@@ -369,16 +365,9 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 					prompt,
 					cwd: data.cwd,
 					timeoutMs: options.timeoutMs
-				})).text.trim() || "Codex completed without a text reply." } };
-			})).reply
-		};
-	} catch (error) {
-		return {
-			handled: true,
-			reply: { text: `Codex CLI node turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
+				})).text.trim() || "Codex completed without a text reply.";
+			}) }
 		};
-	}
-	try {
 		const identity = {
 			kind: "conversation",
 			bindingId: data.bindingId
@@ -386,19 +375,19 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 		const expected = options.bindingStore.read(identity);
 		return {
 			handled: true,
-			reply: (await withCodexConversationThreadActivity(data.bindingId, async () => {
-				const { resolveCodexNativeExecutionBlock } = await import("./.setup/sandbox-guard-WqE8yPge.mjs").then((n) => n.r);
+			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 { reply: { text: nativeExecutionBlock } };
+				if (nativeExecutionBlock) return { text: nativeExecutionBlock };
 				const { getSessionBindingService } = await import("openclaw/plugin-sdk/conversation-binding-runtime");
-				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-B3MNMVzb.mjs");
+				const { runBoundTurnWithMissingThreadRecovery } = await import("./.setup/conversation-binding-CTSLDM9S.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 { 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 { text: "This Codex conversation was detached or changed before its message could run." };
 				return await runBoundTurnWithMissingThreadRecovery({
 					bindingStore: options.bindingStore,
 					data,
@@ -410,12 +399,12 @@ async function handleCodexConversationInboundClaim(event, ctx, options) {
 					pluginConfig: options.pluginConfig,
 					timeoutMs: options.timeoutMs
 				});
-			})).reply
+			})
 		};
 	} catch (error) {
 		return {
 			handled: true,
-			reply: { text: `Codex app-server turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
+			reply: { text: `${data.kind === "codex-cli-node-session" ? "Codex CLI node" : "Codex app-server"} turn failed: ${formatCodexDisplayText(formatErrorMessage(error))}` }
 		};
 	}
 }
@@ -430,7 +419,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("./.setup/thread-ownership-DwuSrt3s.mjs").then((n) => n.o);
+		const { retireCodexConversationThreadBinding } = await import("./.setup/thread-ownership-Be53aiaG.mjs").then((n) => n.o);
 		return retireCodexConversationThreadBinding({
 			bindingStore: options.bindingStore,
 			identity,
@@ -465,7 +454,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-C-08ez1w.mjs").then((n) => n.n);
+			const { codexBindingConnectionSelection, resolveCodexBindingAppServerConnection } = await import("./.setup/binding-connection-B7HAAZSI.mjs").then((n) => n.n);
 			const pluginConfig = options.getPluginConfig();
 			const config = runtimeConfig();
 			const identity = options.context.sessionId ? sessionBindingIdentity({
@@ -482,7 +471,7 @@ function createCodexPluginsTool(options) {
 				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-CuC5fPom.mjs").then((n) => n.n)).codexControlRequest;
+			const request = options.request ?? (await import("./.setup/command-rpc-C9VxOLuG.mjs").then((n) => n.n)).codexControlRequest;
 			const connection = await resolveCodexBindingAppServerConnection({
 				binding,
 				pluginConfig,
@@ -535,50 +524,42 @@ function projectAvailablePlugin(plugin) {
 /**
 * 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()),
-	cursor: Type.Optional(Type.String()),
-	limit: Type.Optional(Type.Integer({
-		minimum: 1,
-		maximum: 100
-	})),
-	search: Type.Optional(Type.String())
-}, { additionalProperties: false });
-const ReadParamsSchema = Type.Object({
-	action: Type.Literal("read"),
-	thread_id: Type.String(),
-	include_turns: Type.Optional(Type.Boolean())
-}, { additionalProperties: false });
-const ForkParamsSchema = Type.Object({
-	action: Type.Literal("fork"),
-	thread_id: Type.String(),
-	attach: Type.Optional(Type.Boolean({
-		default: true,
-		description: "Attach the fork to this OpenClaw session for its next turn."
-	}))
-}, { additionalProperties: false });
-const RenameParamsSchema = Type.Object({
-	action: Type.Literal("rename"),
-	thread_id: Type.String(),
-	name: Type.String()
-}, { additionalProperties: false });
-const ArchiveParamsSchema = Type.Object({
-	action: Type.Literal("archive"),
-	thread_id: Type.String(),
-	confirm: Type.Literal(true, { description: "Required acknowledgement that the thread is closed in other Codex clients." })
-}, { additionalProperties: false });
-const UnarchiveParamsSchema = Type.Object({
-	action: Type.Literal("unarchive"),
-	thread_id: Type.String()
-}, { additionalProperties: false });
+function threadActionSchema(action, properties) {
+	return Type.Object({
+		action: Type.Literal(action),
+		...properties
+	}, { additionalProperties: false });
+}
 const CodexThreadsParamsSchema = Type.Union([
-	ListParamsSchema,
-	ReadParamsSchema,
-	ForkParamsSchema,
-	RenameParamsSchema,
-	ArchiveParamsSchema,
-	UnarchiveParamsSchema
+	threadActionSchema("list", {
+		archived: Type.Optional(Type.Boolean()),
+		cursor: Type.Optional(Type.String()),
+		limit: Type.Optional(Type.Integer({
+			minimum: 1,
+			maximum: 100
+		})),
+		search: Type.Optional(Type.String())
+	}),
+	threadActionSchema("read", {
+		thread_id: Type.String(),
+		include_turns: Type.Optional(Type.Boolean())
+	}),
+	threadActionSchema("fork", {
+		thread_id: Type.String(),
+		attach: Type.Optional(Type.Boolean({
+			default: true,
+			description: "Attach the fork to this OpenClaw session for its next turn."
+		}))
+	}),
+	threadActionSchema("rename", {
+		thread_id: Type.String(),
+		name: Type.String()
+	}),
+	threadActionSchema("archive", {
+		thread_id: Type.String(),
+		confirm: Type.Literal(true, { description: "Required acknowledgement that the thread is closed in other Codex clients." })
+	}),
+	threadActionSchema("unarchive", { thread_id: Type.String() })
 ]);
 function readThreadId(params) {
 	return readStringParam(params, "thread_id", {
@@ -635,12 +616,6 @@ function createCodexThreadsTool(options) {
 				};
 			};
 			const runtimeConfig = () => options.context.getRuntimeConfig?.() ?? options.context.runtimeConfig ?? options.context.config;
-			const baseRequestOptions = () => ({
-				agentDir: options.context.agentDir,
-				config: runtimeConfig(),
-				sessionId: options.context.sessionId,
-				sessionKey: options.context.sessionKey
-			});
 			const currentIdentity = (sessionId) => sessionBindingIdentity({
 				sessionId,
 				sessionKey: options.context.sessionKey,
@@ -660,14 +635,17 @@ function createCodexThreadsTool(options) {
 			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-CuC5fPom.mjs").then((n) => n.n)).codexControlRequest;
+				const request = options.request ?? (await import("./.setup/command-rpc-C9VxOLuG.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-C-08ez1w.mjs").then((n) => n.n);
-				const { resolveCodexSupervisionAppServerRuntimeOptions } = await import("./.setup/config-runtime-cUYrqu_a.mjs").then((n) => n.t);
+				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 requestOptions = async () => {
-					const pluginConfig = admissionConfig;
-					const plugin = admissionPlugin;
-					const base = baseRequestOptions();
+					const base = {
+						agentDir: options.context.agentDir,
+						config: runtimeConfig(),
+						sessionId: options.context.sessionId,
+						sessionKey: options.context.sessionKey
+					};
 					const session = currentSession();
 					const identity = session ? currentIdentity(session.sessionId) : void 0;
 					const readBinding = () => identity ? options.bindingStore.read(identity) : void 0;
@@ -676,12 +654,12 @@ function createCodexThreadsTool(options) {
 					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 (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 (binding?.connectionScope === "supervision" || plugin.appServer?.homeScope === "user") {
+					if (binding?.connectionScope === "supervision" || admissionPlugin.appServer?.homeScope === "user") {
 						const connection = await resolveCodexBindingAppServerConnection({
 							binding,
-							pluginConfig,
+							pluginConfig: admissionConfig,
 							config: base.config,
 							agentDir: base.agentDir,
 							assertCurrent
@@ -693,10 +671,10 @@ function createCodexThreadsTool(options) {
 							assertCurrent
 						};
 					}
-					if (plugin.supervision?.enabled !== true) throw new Error("Codex native thread access is disabled for this run.");
+					if (supervision?.enabled !== true) throw new Error("Codex native thread access is disabled for this run.");
 					return {
 						...base,
-						startOptions: resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig }).start,
+						startOptions: resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig: admissionConfig }).start,
 						authProfileId: null,
 						assertCurrent
 					};
@@ -759,21 +737,19 @@ function createCodexThreadsTool(options) {
 						if (isModelSelectionLocked(admittedSession.entry)) throw new ModelSelectionLockedError();
 						assertCodexBindingMayBeReplaced(archivedBinding, "archiving its bound native thread");
 					}
-					assertThreadIdle(await scopedRequest(CODEX_CONTROL_METHODS.readThread, {
-						threadId,
-						includeTurns: false
-					}), threadId, "archive");
+					const assertArchiveThreadIdle = async (targetThreadId) => {
+						assertThreadIdle(await scopedRequest(CODEX_CONTROL_METHODS.readThread, {
+							threadId: targetThreadId,
+							includeTurns: false
+						}), targetThreadId, "archive");
+					};
+					await assertArchiveThreadIdle(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 scopedRequest(CODEX_CONTROL_METHODS.listThreads, listParams),
-						assertDescendantIdle: async (descendantThreadId) => {
-							assertThreadIdle(await scopedRequest(CODEX_CONTROL_METHODS.readThread, {
-								threadId: descendantThreadId,
-								includeTurns: false
-							}), descendantThreadId, "archive");
-						}
+						assertDescendantIdle: assertArchiveThreadIdle
 					});
 					await scopedRequest(CODEX_CONTROL_METHODS.archiveThread, { threadId });
 					if (archivedBinding?.threadId === threadId) await options.bindingStore.mutate(identity, {
@@ -792,8 +768,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-DwuSrt3s.mjs").then((n) => n.o);
-				const { closeCodexStartupClientBestEffort } = await import("./.setup/attempt-client-cleanup-BH0hW2xU.mjs").then((n) => n.a);
+				const { retainCodexAppServerBindingSubscription, rollbackCodexAppServerBindingSubscription } = await import("./.setup/thread-ownership-Be53aiaG.mjs").then((n) => n.o);
+				const { closeCodexStartupClientBestEffort } = await import("./.setup/attempt-client-cleanup-t-kd_1ys.mjs").then((n) => n.a);
 				if (attach) {
 					assertCodexBindingMayBeReplaced(binding, "attaching a different native fork");
 					assertThreadIdle(await request(admissionConfig, CODEX_CONTROL_METHODS.readThread, {
@@ -881,7 +857,7 @@ const CODEX_NODE_EXEC_SERVER_CAPABILITY = "codex.exec-server";
 function parseCodexNodePlacementWorkspace(value) {
 	if (!isRecord(value) || Object.keys(value).length !== 5 || typeof value.cwd !== "string" || !value.cwd.trim() || value.cwd.includes("\0") || typeof value.environmentId !== "string" || typeof value.sessionId !== "string" || ![value.environmentId, value.sessionId].every((identifier) => identifier.length > 0 && identifier.length <= 256 && identifier.trim() === identifier && !identifier.includes("\0")) || typeof value.sessionKey !== "string" || !value.sessionKey || value.sessionKey.trim() !== value.sessionKey || value.sessionKey.includes("\0") || typeof value.ownerEpoch !== "number" || !Number.isSafeInteger(value.ownerEpoch) || value.ownerEpoch < 1) throw new Error("Codex node exec-server requires an exact managed placement workspace.");
 	return {
-		cwd: value.cwd,
+		workspaceDir: value.cwd,
 		environmentId: value.environmentId,
 		sessionId: value.sessionId,
 		ownerEpoch: value.ownerEpoch,
@@ -909,23 +885,17 @@ function createCodexNodeExecServerCommand() {
 				throw new Error("Codex node exec-server requires a valid workspace request.");
 			}
 			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?.acquireManagedWorkspaceAsync || context.sessionKey !== placement.sessionKey || io.signal.aborted) throw new Error("Codex node exec-server requires active managed placement authority.");
+			const workspaceRequest = parseCodexNodePlacementWorkspace(request.placement);
+			if (!context?.acquireManagedWorkspaceAsync || context.sessionKey !== workspaceRequest.sessionKey || io.signal.aborted) throw new Error("Codex node exec-server requires active managed placement authority.");
 			if (!context.prepareExecAuthorization) throw new Error("Codex node execution requires node-local exec policy support; update the node.");
 			const runtimeIo = context.signal ? {
 				...io,
 				signal: AbortSignal.any([io.signal, context.signal])
 			} : io;
 			const assertExecAuthorized = context.prepareExecAuthorization(request.authorization);
-			const { runCodexNodeExecServer } = await import("./.setup/node-exec-server.runtime-0xSEjKYt.mjs");
+			const { runCodexNodeExecServer } = await import("./.setup/node-exec-server.runtime-BWkULhBM.mjs");
 			runtimeIo.signal.throwIfAborted();
-			const workspace = await context.acquireManagedWorkspaceAsync({
-				workspaceDir: placement.cwd,
-				environmentId: placement.environmentId,
-				sessionId: placement.sessionId,
-				ownerEpoch: placement.ownerEpoch,
-				sessionKey: placement.sessionKey
-			});
+			const workspace = await context.acquireManagedWorkspaceAsync(workspaceRequest);
 			try {
 				runtimeIo.signal.throwIfAborted();
 			} catch (error) {
@@ -960,9 +930,9 @@ function createCodexNodeExecServerInvokePolicy() {
 				code: "CODEX_NODE_EXEC_APPROVAL_REQUIRED",
 				message: "Codex node execution requires an available approval reviewer."
 			};
-			let placement;
+			let workspace;
 			try {
-				placement = parseCodexNodePlacementWorkspace(context.params);
+				workspace = parseCodexNodePlacementWorkspace(context.params);
 			} catch {
 				return {
 					ok: false,
@@ -970,12 +940,12 @@ function createCodexNodeExecServerInvokePolicy() {
 					message: "Codex node execution requires an exact managed placement workspace."
 				};
 			}
-			const workspace = {
-				workspaceDir: placement.cwd,
-				environmentId: placement.environmentId,
-				sessionId: placement.sessionId,
-				ownerEpoch: placement.ownerEpoch,
-				sessionKey: placement.sessionKey
+			const placement = {
+				cwd: workspace.workspaceDir,
+				environmentId: workspace.environmentId,
+				sessionId: workspace.sessionId,
+				ownerEpoch: workspace.ownerEpoch,
+				sessionKey: workspace.sessionKey
 			};
 			const fullLaunch = await context.invokeNodeWithSessionFull?.({
 				workspace,
@@ -1252,13 +1222,10 @@ function startCodexCatalogControlRequestDiagnostics(page) {
 			const kept = page.fields.controlWaitersV1 ??= [];
 			page.fields.controlWaitersOmitted ??= 0;
 			const tuple = controlWaiterTuple(controlCallOrdinal, summary);
-			if (!tuple) {
+			if (!tuple || kept.length === 4) {
 				page.fields.controlWaitersOmitted = Math.min(Number.MAX_SAFE_INTEGER, page.fields.controlWaitersOmitted + 1);
-				return;
-			}
-			if (kept.length === 4) {
+				if (!tuple) return;
 				kept.splice(2, 1);
-				page.fields.controlWaitersOmitted = Math.min(Number.MAX_SAFE_INTEGER, page.fields.controlWaitersOmitted + 1);
 			}
 			kept.push(tuple);
 		},
@@ -1682,7 +1649,7 @@ function hostFailure(source, error) {
 }
 async function projectLocalHost(params, agentId, source, page) {
 	params.signal?.throwIfAborted();
-	const { listAdoptedSessionEntries } = await import("./.setup/session-catalog-adoption-CPIP4S_y.mjs");
+	const { listAdoptedSessionEntries } = await import("./.setup/session-catalog-adoption-Ca3OYGYM.mjs");
 	const { sessionCatalogAdoptedSourceKey } = await import("openclaw/plugin-sdk/session-catalog");
 	params.signal?.throwIfAborted();
 	const finishTiming = startCodexCatalogListTiming("adoptionSumMs", "adoptionCalls");
@@ -1761,7 +1728,6 @@ function createNodePublicationTracker(publications, waitUntil) {
 var CodexCatalogListDriver = class {
 	constructor(params) {
 		this.locals = [];
-		this.nodeActive = false;
 		this.nodeResults = [];
 		this.nodeDiscoveryFailed = false;
 		this.nodePublications = { pending: 0 };
@@ -1790,7 +1756,7 @@ var CodexCatalogListDriver = class {
 		}).sessionAgentId;
 		const query = readGatewayParams(params.query);
 		const requestedHostIds = query.hostIds ? new Set(query.hostIds) : void 0;
-		const localSources = params.localHomes?.filter((source) => !requestedHostIds || requestedHostIds.has(source.hostId)) ?? (params.includeLocal !== false && (!requestedHostIds || requestedHostIds.has("gateway:local")) ? [void 0] : []);
+		const localSources = params.localHomes.filter((source) => !requestedHostIds || requestedHostIds.has(source?.hostId ?? "gateway:local"));
 		const diagnostics = currentCodexCatalogListDiagnostics();
 		if (diagnostics) diagnostics.fields.localHostCount = localSources.length;
 		const store = params.bindingStore.managedThreads;
@@ -1831,7 +1797,7 @@ var CodexCatalogListDriver = class {
 		}
 	}
 	canPause() {
-		return !this.localFailed && this.nodeHosts !== void 0 && !this.nodeDiscoveryFailed && !this.nodeActive && this.nodePublications.pending === 0;
+		return !this.localFailed && this.nodeHosts !== void 0 && !this.nodeDiscoveryFailed && this.nodePublications.pending === 0;
 	}
 	async readHost(host) {
 		const params = this.request();
@@ -1905,8 +1871,8 @@ var CodexCatalogListDriver = class {
 		}
 		params.signal?.throwIfAborted();
 		this.nodeSnapshots.observe(this.nodeGeneration, inventory);
-		const { listNodeAdoptedSessionEntries, nodeAdoptedSourceKey } = await import("./.setup/session-catalog-node-adoption-7-WEQTB1.mjs");
-		const { compareNodeLabels, listPairedNode, nodeLabel } = await import("./.setup/session-catalog-node-continue-DLWBwAAO.mjs");
+		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");
 		params.signal?.throwIfAborted();
 		const adopted = listNodeAdoptedSessionEntries({
 			agentId,
@@ -1985,13 +1951,11 @@ var CodexCatalogListDriver = class {
 	startNodes() {
 		if (this.nodeHosts !== void 0 || this.nodesStarted) return;
 		this.nodesStarted = true;
-		this.nodeActive = true;
 		this.readNodes().then((hosts) => {
 			this.nodeHosts = hosts;
-			this.nodeActive = false;
 			this.checkpoint();
 		}, (error) => {
-			this.nodeActive = false;
+			this.nodeHosts = [];
 			this.failure ??= { error };
 			this.checkpoint();
 		});
@@ -1999,7 +1963,7 @@ var CodexCatalogListDriver = class {
 	checkpoint() {
 		if (this.active > 0 || !this.step) return;
 		if (this.failure) {
-			if (!this.nodeActive) this.step.reject(this.failure.error);
+			if (this.nodeHosts !== void 0) this.step.reject(this.failure.error);
 		} else if (this.nodeHosts && this.locals.every((host) => host.value !== void 0)) try {
 			this.complete = true;
 			this.step.resolve({
@@ -2066,87 +2030,6 @@ async function runCatalogListInline(operation) {
 	}
 }
 //#endregion
-//#region extensions/codex/src/app-server/thread-history-page.ts
-const TURN_ITEM_CURSOR_PREFIX = "turn-item:";
-function encodeTurnItemCursor(turnCursor, itemId) {
-	return TURN_ITEM_CURSOR_PREFIX + Buffer.from(JSON.stringify([turnCursor, itemId])).toString("base64url");
-}
-function decodeTurnItemCursor(cursor) {
-	if (!cursor?.startsWith(TURN_ITEM_CURSOR_PREFIX)) return { turnCursor: cursor };
-	let value;
-	try {
-		value = JSON.parse(Buffer.from(cursor.slice(10), "base64url").toString());
-	} catch {
-		throw new CatalogParamsError("invalid Codex transcript item cursor");
-	}
-	if (!Array.isArray(value) || value.length !== 2 || typeof value[0] !== "string" || !value[0] || typeof value[1] !== "string" || !value[1]) throw new CatalogParamsError("invalid Codex transcript item cursor");
-	return {
-		turnCursor: value[0],
-		itemId: value[1]
-	};
-}
-/** Legacy stores expose only turn cursors; an item identity preserves paging across appends. */
-async function readLegacyCodexHistoryPage(readTurns, request, projection) {
-	const { turnCursor, itemId } = decodeTurnItemCursor(request.cursor);
-	const page = parseTranscriptPage(await readTurns({
-		threadId: request.threadId,
-		limit: 1,
-		sortDirection: "desc",
-		itemsView: "full",
-		...turnCursor ? { cursor: turnCursor } : {}
-	}));
-	const source = page.data.flatMap(({ items, ...turn }) => items.toReversed().map((item) => ({
-		turnId: turn.id,
-		item,
-		turn
-	})));
-	const anchorIndex = itemId ? source.findIndex(({ item }) => item.id === itemId) : -1;
-	if (itemId && anchorIndex < 0) throw new CatalogParamsError("Codex transcript changed; refresh the session before loading older items");
-	const remaining = source.slice(anchorIndex + 1);
-	const items = projection.project(remaining.slice(0, request.limit), request.limit);
-	const result = () => {
-		const lastSource = remaining[items.length - 1];
-		const partial = lastSource !== void 0 && items.length < remaining.length;
-		const nativeCursor = partial ? page.backwardsCursor : page.nextCursor;
-		const cursor = nativeCursor ? partial ? encodeTurnItemCursor(nativeCursor, lastSource.item.id) : nativeCursor : void 0;
-		if (partial && !cursor) throw new Error("Codex app-server did not provide a transcript continuation anchor");
-		return {
-			items,
-			...cursor ? { nextCursor: cursor } : {}
-		};
-	};
-	let bounded = result();
-	while (!projection.fits(bounded)) {
-		if (items.length <= 1) throw new Error("Codex transcript item exceeds the safe response size");
-		items.pop();
-		bounded = result();
-	}
-	return bounded;
-}
-/** Callers authorize the thread; this reader owns native cursor and response-size semantics. */
-async function readCodexThreadHistoryPage(control, thread, request, projection) {
-	if (thread.historyMode !== "paginated") return readLegacyCodexHistoryPage((params) => control.listTurnPage(params), request, projection);
-	let limit = request.limit;
-	for (;;) {
-		const page = await control.listItemPage({
-			threadId: request.threadId,
-			limit,
-			sortDirection: "desc",
-			...request.cursor ? { cursor: request.cursor } : {}
-		});
-		const nextCursor = readControlCursor(page.nextCursor, "transcript next response");
-		const items = projection.project(page.data, limit);
-		const result = {
-			items,
-			...nextCursor ? { nextCursor } : {}
-		};
-		const fittingCount = items.length - (projection.fits(result) ? 0 : 1);
-		if (fittingCount === page.data.length) return result;
-		if (fittingCount < 1) throw new Error("Codex transcript item exceeds the safe response size");
-		limit = fittingCount;
-	}
-}
-//#endregion
 //#region extensions/codex/src/session-catalog-transcript-item.ts
 const CODEX_MESSAGE_TYPES = /* @__PURE__ */ new Map([
 	["userMessage", "userMessage"],
@@ -2180,6 +2063,7 @@ function toGenericTranscriptItem(item) {
 }
 //#endregion
 //#region extensions/codex/src/session-catalog-transcript.ts
+const TURN_ITEM_CURSOR_PREFIX = "turn-item:";
 const transcriptPageSchema = z.strictObject({
 	items: z.array(z.strictObject({
 		id: z.string(),
@@ -2209,23 +2093,82 @@ function projectTranscriptPage(entries, limit) {
 function pageFitsNodeTransport(page) {
 	return Buffer.byteLength(JSON.stringify({ payloadJSON: JSON.stringify(page) }), "utf8") <= MAX_TRANSCRIPT_PAGE_BYTES;
 }
-/** The legacy API can anchor a turn, but cannot continue within that turn. */
+function encodeTurnItemCursor(turnCursor, itemId) {
+	return TURN_ITEM_CURSOR_PREFIX + Buffer.from(JSON.stringify([turnCursor, itemId])).toString("base64url");
+}
+function decodeTurnItemCursor(cursor) {
+	if (!cursor?.startsWith(TURN_ITEM_CURSOR_PREFIX)) return { turnCursor: cursor };
+	let value;
+	try {
+		value = JSON.parse(Buffer.from(cursor.slice(10), "base64url").toString());
+	} catch {
+		throw new CatalogParamsError("invalid Codex transcript item cursor");
+	}
+	if (!Array.isArray(value) || value.length !== 2 || typeof value[0] !== "string" || !value[0] || typeof value[1] !== "string" || !value[1]) throw new CatalogParamsError("invalid Codex transcript item cursor");
+	return {
+		turnCursor: value[0],
+		itemId: value[1]
+	};
+}
+/** Legacy stores expose only turn cursors; an item identity preserves paging across appends. */
 async function readLegacyCodexTranscriptPage(readTurns, request) {
-	return readLegacyCodexHistoryPage(readTurns, request, {
-		project: projectTranscriptPage,
-		fits: pageFitsNodeTransport
-	});
+	const { turnCursor, itemId } = decodeTurnItemCursor(request.cursor);
+	const page = parseTranscriptPage(await readTurns({
+		threadId: request.threadId,
+		limit: 1,
+		sortDirection: "desc",
+		itemsView: "full",
+		...turnCursor ? { cursor: turnCursor } : {}
+	}));
+	const source = page.data.flatMap(({ items }) => items.toReversed().map((item) => ({ item })));
+	const anchorIndex = itemId ? source.findIndex(({ item }) => item.id === itemId) : -1;
+	if (itemId && anchorIndex < 0) throw new CatalogParamsError("Codex transcript changed; refresh the session before loading older items");
+	const remaining = source.slice(anchorIndex + 1);
+	const items = projectTranscriptPage(remaining.slice(0, request.limit), request.limit);
+	const result = () => {
+		const lastSource = remaining[items.length - 1];
+		const partial = lastSource !== void 0 && items.length < remaining.length;
+		const nativeCursor = partial ? page.backwardsCursor : page.nextCursor;
+		const cursor = nativeCursor ? partial ? encodeTurnItemCursor(nativeCursor, lastSource.item.id) : nativeCursor : void 0;
+		if (partial && !cursor) throw new Error("Codex app-server did not provide a transcript continuation anchor");
+		return {
+			items,
+			...cursor ? { nextCursor: cursor } : {}
+		};
+	};
+	let bounded = result();
+	while (!pageFitsNodeTransport(bounded)) {
+		if (items.length <= 1) throw new Error("Codex transcript item exceeds the safe response size");
+		items.pop();
+		bounded = result();
+	}
+	return bounded;
 }
 /** Uses the native store's item cursor whenever that store supports item history. */
 async function readCodexCatalogTranscriptPage(control, request) {
-	return readCodexThreadHistoryPage(control, await control.requireEligibleThread(request.threadId), request, {
-		project: projectTranscriptPage,
-		fits: pageFitsNodeTransport
-	});
+	if ((await control.requireEligibleThread(request.threadId)).historyMode !== "paginated") return readLegacyCodexTranscriptPage((params) => control.listTurnPage(params), request);
+	let limit = request.limit;
+	for (;;) {
+		const page = await control.listItemPage({
+			threadId: request.threadId,
+			limit,
+			sortDirection: "desc",
+			...request.cursor ? { cursor: request.cursor } : {}
+		});
+		const nextCursor = readControlCursor(page.nextCursor, "transcript next response");
+		const items = projectTranscriptPage(page.data, limit);
+		const result = {
+			items,
+			...nextCursor ? { nextCursor } : {}
+		};
+		const fittingCount = items.length - (pageFitsNodeTransport(result) ? 0 : 1);
+		if (fittingCount === page.data.length) return result;
+		if (fittingCount < 1) throw new Error("Codex transcript item exceeds the safe response size");
+		limit = fittingCount;
+	}
 }
 //#endregion
 //#region extensions/codex/src/session-catalog-listing.ts
-/** Builds the node-local read-only Codex app-server catalog command. */
 function createCodexSessionCatalogNodeHostCommands(controlFactory, bindingStore) {
 	const bindRequest = async (paramsJSON) => {
 		const parsed = parseJsonParams(paramsJSON);
@@ -2330,7 +2273,6 @@ function readNodeTranscriptParams(value) {
 		...cursor ? { cursor } : {}
 	};
 }
-/** Reads the persisted transcript for a Gateway-local or paired-node Codex session. */
 async function readCodexSessionTranscript(params) {
 	const cursor = readControlCursor(params.cursor, "transcript request");
 	const limit = normalizeLimit(params.limit, "limit", 20, 50);
@@ -2373,7 +2315,7 @@ async function readCodexSessionTranscript(params) {
 		cursor,
 		limit
 	});
-	const { nodeLabel } = await import("./.setup/session-catalog-node-continue-DLWBwAAO.mjs");
+	const { nodeLabel } = await import("./.setup/session-catalog-node-continue-CNJibO4_.mjs");
 	return {
 		hostId: params.hostId,
 		label: nodeLabel(node),
@@ -2419,7 +2361,7 @@ function classifyCodexUpstreamTurns(params) {
 			humanTurns += 1;
 			if (occurredAt === void 0) {
 				const timestampSeconds = turn.completedAt ?? turn.startedAt;
-				occurredAt = typeof timestampSeconds === "number" && Number.isFinite(timestampSeconds) ? timestampSeconds * 1e3 : params.now ?? Date.now();
+				occurredAt = typeof timestampSeconds === "number" && Number.isFinite(timestampSeconds) ? timestampSeconds * 1e3 : Date.now();
 			}
 		}
 	}
@@ -2433,7 +2375,7 @@ function classifyCodexUpstreamTurns(params) {
 			userMessageCount: newestUserMessageCount
 		},
 		...humanTurns > 0 ? {
-			occurredAt: occurredAt ?? params.now ?? Date.now(),
+			occurredAt: occurredAt ?? Date.now(),
 			dedupeId: activityId
 		} : {}
 	};
@@ -2443,7 +2385,7 @@ function normalizeUserMessageTexts(item) {
 	const contentTexts = typed.content?.filter((input) => input.type === "text").map((input) => input.text.trim().replace(/\s+/g, " ")).filter(Boolean);
 	return contentTexts?.length ? contentTexts : [(typed.text ?? "").trim().replace(/\s+/g, " ")];
 }
-async function checkCodexUpstreamActivity(probes, control, resolveThreadId = (probe) => probe.threadId) {
+async function checkCodexUpstreamActivity(probes, control, resolveThreadId) {
 	return await control.withPinnedConnection(async (pinned) => {
 		const activities = [];
 		for (const probe of probes) {
@@ -2537,8 +2479,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-D6IiLtMb.mjs").then((n) => n.a);
-			const { CODEX_CATALOG_MAX_ROWS } = await import("./.setup/session-catalog-limits-DEU36Qlo.mjs").then((n) => n.r);
+			const { CODEX_CATALOG_NATIVE_PAGE_LIMIT } = await import("./.setup/session-catalog-native-projection-rCKnZud1.mjs").then((n) => n.a);
+			const { CODEX_CATALOG_MAX_ROWS } = await import("./.setup/session-catalog-limits-BynIoOYm.mjs").then((n) => n.r);
 			let cursor;
 			const seenCursors = /* @__PURE__ */ new Set();
 			for (;;) {
@@ -2635,7 +2577,7 @@ function createCodexSessionCatalogControlFromRequests(params) {
 				const requests = params.createRequestSnapshot();
 				const timeoutMs = Math.min(requests.requestTimeoutMs, 5e3);
 				const deadline = request.constrainDeadline(performance.now() + timeoutMs);
-				return await (await withTimeout$1(requests.index(), request.remaining(timeoutMs), "Codex session catalog is still loading", () => new CodexCatalogLoadingError())).list(query, deadline);
+				return await (await withCodexCatalogLoadingTimeout(requests.index(), request.remaining(timeoutMs))).list(query, deadline);
 			});
 		},
 		async listDescendantPage(listParams) {
@@ -2990,7 +2932,7 @@ function createCodexSessionCatalogControl(params) {
 		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-DufISKJ6.mjs"), import("./.setup/session-catalog-projection-8aHNwzWD.mjs")]);
+			const [{ CodexCatalogIndex }, { canReuseCodexCatalogPreview, projectCodexCatalogDeltaPage, projectCodexCatalogPage }] = await Promise.all([import("./.setup/session-catalog-index-DozvkUPd.mjs"), import("./.setup/session-catalog-projection-DDVmALHj.mjs")]);
 			source?.assertCurrent();
 			if (closed || generation !== config || residentEpoch !== epoch) throw new Error("Codex catalog configuration changed");
 			index = indexes.get(homeId);
@@ -3115,7 +3057,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-CuC5fPom.mjs").then((n) => n.n);
+			const { codexControlRequest } = await import("./.setup/command-rpc-C9VxOLuG.mjs").then((n) => n.n);
 			return await codexControlRequest(pluginConfig, method, requestParams, {
 				...requestOptions,
 				authProfileId: null,
@@ -3137,9 +3079,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-qhyYWbew.mjs").then((n) => n.v);
-			const { resolveCodexAppServerClientInstanceId } = await import("./.setup/client-C8lgBOoO.mjs").then((n) => n.n);
-			const { requestCodexAppServerClientJson } = await import("./.setup/request-jSbhc1sg.mjs").then((n) => n.i);
+			const { getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./.setup/shared-client-ByIwuAC-.mjs").then((n) => n.v);
+			const { resolveCodexAppServerClientInstanceId } = await import("./.setup/client-y7nO6X9c.mjs").then((n) => n.n);
+			const { requestCodexAppServerClientJson } = await import("./.setup/request-Y8dmbqZ3.mjs").then((n) => n.i);
 			const client = await getLeasedSharedCodexAppServerClient({
 				agentDir,
 				config: runtimeConfig,
@@ -3208,7 +3150,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-qhyYWbew.mjs").then((n) => n.v);
+				const { clearSharedCodexAppServerClientAndWait } = await import("./.setup/shared-client-ByIwuAC-.mjs").then((n) => n.v);
 				await clearSharedCodexAppServerClientAndWait();
 			}
 		},
@@ -3453,7 +3395,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-DLWBwAAO.mjs");
+				const { continueNodeCodexSession } = await import("./.setup/session-catalog-node-continue-CNJibO4_.mjs");
 				return await continueNodeCodexSession({
 					agentId,
 					api: params.api,
@@ -3468,7 +3410,7 @@ function registerCodexSessionCatalog(params) {
 			const { agentId, source, control } = await bindLocalRequest(request);
 			source.assertCurrent();
 			let upstreamBaseline;
-			const { continueLocalCodexSession } = await import("./.setup/session-catalog-adoption-CPIP4S_y.mjs");
+			const { continueLocalCodexSession } = await import("./.setup/session-catalog-adoption-Ca3OYGYM.mjs");
 			const continued = await continueLocalCodexSession({
 				agentId,
 				api: params.api,
@@ -3497,7 +3439,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-DcgwvSbF.mjs");
+			const { archiveLocalCodexSession } = await import("./.setup/session-catalog-archive-Bv6gV7x9.mjs");
 			await archiveLocalCodexSession({
 				agentId,
 				bindingStore: params.bindingStore,
@@ -3543,29 +3485,6 @@ function registerCodexSessionCatalog(params) {
 	params.api.registerSessionCatalog(provider);
 }
 //#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.
@@ -3575,6 +3494,7 @@ function requireWriteAccess(pluginConfig) {
 * continuation belongs to the Codex harness, which installs approval and tool
 * handlers before it starts or resumes the harness-owned Codex thread.
 */
+var CodexSupervisionPolicyError = class extends Error {};
 /** Legacy endpoint env retained for the shipped Supervisor tool contract. */
 const LEGACY_CODEX_SUPERVISOR_ENDPOINTS_ENV = "OPENCLAW_CODEX_SUPERVISOR_ENDPOINTS";
 const CODEX_SUPERVISION_COMPAT_TOOL_NAMES = [
@@ -3629,6 +3549,7 @@ const PAGE_LIMIT = 100;
 const MAX_COMPAT_PAGINATION_PAGES = 100;
 const MAX_COMPAT_CURSOR_LENGTH = 4096;
 const MAX_COMPAT_THREAD_ID_LENGTH = 4096;
+const ENDPOINT_URL_PREFIX = /^(?:wss?|unix):\/\//;
 function asRecordArray(value) {
 	return Array.isArray(value) ? value.filter(isRecord) : [];
 }
@@ -3670,13 +3591,6 @@ function normalizeEndpointId(value, index) {
 	const trimmed = value.trim();
 	return trimmed ? trimmed.replace(/[^a-zA-Z0-9_.:-]/g, "-") : `endpoint-${index + 1}`;
 }
-function normalizeConfiguredEndpoint(endpoint, index) {
-	return {
-		id: normalizeEndpointId(endpoint.id ?? endpoint.label ?? "", index),
-		...endpoint.label?.trim() ? { label: endpoint.label.trim() } : {},
-		configured: endpoint
-	};
-}
 function parseEndpointRecord(value) {
 	if (!isRecord(value)) return;
 	const transport = typeof value.transport === "string" ? value.transport : void 0;
@@ -3703,34 +3617,20 @@ function parseEndpointRecord(value) {
 }
 function endpointFromToken(token, index) {
 	const trimmed = token.trim();
-	if (!trimmed) return;
-	if (trimmed.startsWith("ws://") || trimmed.startsWith("wss://") || trimmed.startsWith("unix://")) return {
-		id: normalizeEndpointId("", index),
-		transport: "websocket",
-		url: trimmed
-	};
 	if (trimmed === "local" || trimmed === "proxy" || trimmed === "stdio") return {
 		id: "local",
 		label: "local Codex app-server",
 		transport: "stdio-proxy"
 	};
-	const separatorIndex = trimmed.indexOf("=");
-	const id = separatorIndex >= 0 ? trimmed.slice(0, separatorIndex) : trimmed;
-	const url = separatorIndex >= 0 ? trimmed.slice(separatorIndex + 1) : void 0;
-	if (url?.startsWith("ws://") || url?.startsWith("wss://") || url?.startsWith("unix://")) return {
+	const separatorIndex = ENDPOINT_URL_PREFIX.test(trimmed) ? -1 : trimmed.indexOf("=");
+	const id = separatorIndex >= 0 ? trimmed.slice(0, separatorIndex) : "";
+	const url = separatorIndex >= 0 ? trimmed.slice(separatorIndex + 1) : trimmed;
+	if (ENDPOINT_URL_PREFIX.test(url)) return {
 		id: normalizeEndpointId(id, index),
 		transport: "websocket",
 		url
 	};
 }
-function requireUniqueEndpointIds(endpoints) {
-	const seen = /* @__PURE__ */ new Set();
-	for (const endpoint of endpoints) {
-		if (seen.has(endpoint.id)) throw new Error(`duplicate Codex supervisor endpoint id: ${endpoint.id}`);
-		seen.add(endpoint.id);
-	}
-	return endpoints;
-}
 function readLegacyEnvEndpoints(env) {
 	const raw = env[LEGACY_CODEX_SUPERVISOR_ENDPOINTS_ENV]?.trim();
 	if (!raw) return;
@@ -3741,13 +3641,27 @@ function readLegacyEnvEndpoints(env) {
 	}
 	return raw.split(",").map(endpointFromToken).filter((entry) => Boolean(entry));
 }
-function resolveEndpoints(pluginConfig, env, runtimeConfig, resolveAuthProfileId, resolveRuntimeOptions) {
+function resolveEndpoints(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);
-	return (endpoints ? requireUniqueEndpointIds(endpoints.map(normalizeConfiguredEndpoint)) : [{
+	const normalized = endpoints ? endpoints.map((endpoint, index) => {
+		const entry = { id: normalizeEndpointId(endpoint.id ?? endpoint.label ?? "", index) };
+		if (endpoint.label?.trim()) entry.label = endpoint.label.trim();
+		entry.configured = endpoint;
+		return entry;
+	}) : [{
 		id: "local",
 		label: "local Codex app-server"
-	}]).map((endpoint) => Object.assign({}, endpoint, { connectionKey: supervisionEndpointConnectionKey({
+	}];
+	const seen = /* @__PURE__ */ new Set();
+	for (const endpoint of normalized) {
+		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({
 		endpoint,
 		pluginConfig,
 		env,
@@ -4051,16 +3965,20 @@ function sanitizeSessionListResult(result, includeTranscriptDerivedFields) {
 	};
 }
 function requireLiveToolPolicy(options, policy) {
-	requireOwnerAccess(options);
+	options.assertInvocationCurrent?.();
+	if (!options.senderIsOwner) throw new CodexSupervisionPolicyError("Codex supervision compatibility tools require an owner-authorized sender.");
 	const pluginConfig = options.getPluginConfig();
-	requireSupervisionEnabled(pluginConfig);
-	if (policy === "raw-transcripts") requireRawTranscriptAccess(pluginConfig);
-	else if (policy === "write-controls") requireWriteAccess(pluginConfig);
+	requireToolPolicy(pluginConfig, policy);
 	return {
 		pluginConfig,
-		endpoints: resolveEndpoints(pluginConfig, options.env ?? process.env, options.getRuntimeConfig?.(), options.resolveAuthProfileId, options.resolveRuntimeOptions)
+		endpoints: resolveEndpoints(pluginConfig, options)
 	};
 }
+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);
 	const currentEndpoint = endpoints.find((candidate) => candidate.id === endpoint.id);
@@ -4075,13 +3993,25 @@ function requireCurrentEndpointSet(options, expected) {
 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 request = createPolicyGuardedRequest(options, "enabled");
 	const rawTranscriptRequest = createPolicyGuardedRequest(options, "raw-transcripts");
 	const writeRequest = createPolicyGuardedRequest(options, "write-controls");
 	const current = () => requireLiveToolPolicy(options, "enabled");
-	const readActiveThread = async (endpoints, params, threadId, idleError) => {
+	const controlActiveTurn = async (rawParams, action) => {
+		const { endpoints, pluginConfig } = current();
+		requireToolPolicy(pluginConfig, "write-controls");
+		const params = isRecord(rawParams) ? rawParams : {};
+		const threadId = readStringParam(params, "thread_id", { required: true });
+		const input = action === "steer" ? [{
+			type: "text",
+			text: readStringParam(params, "text", {
+				required: true,
+				allowEmpty: false
+			}),
+			text_elements: []
+		}] : void 0;
+		if (input && (readModeParam(params) ?? "auto") === "start") throw idleContinuationError(threadId);
 		const endpoint = await resolveEndpointForThread({
 			endpoints,
 			request: writeRequest,
@@ -4095,16 +4025,37 @@ function createCodexSupervisionTools(options) {
 			includeTurns: true
 		});
 		requireCurrentEndpoint(options, "write-controls", endpoint);
-		if (statusType(thread) !== "active") throw idleError();
-		return {
+		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,
 			endpoint,
-			thread
+			thread,
+			threadId
+		});
+		if (!turnId) throw new Error(action === "steer" ? `Codex thread ${threadId} is active but no in-progress turn is readable` : `Codex thread ${threadId} has no readable in-progress turn`);
+		await writeRequest(endpoint, `turn/${action}`, input ? {
+			threadId,
+			expectedTurnId: turnId,
+			input
+		} : {
+			threadId,
+			turnId
+		});
+		const result = {
+			endpointId: endpoint.id,
+			threadId,
+			...input ? { mode: "steer" } : {},
+			turnId
 		};
+		return jsonResult({
+			summary: `codex ${input ? "steer" : "interrupted"}: ${turnId}`,
+			result
+		});
 	};
 	return [
 		{
 			name: "codex_endpoint_probe",
-			label: "Codex Endpoint Probe",
+			label: "Codex Endpoint Check",
 			description: "Check configured Codex app-server endpoints.",
 			parameters: EmptyParamsSchema,
 			execute: async () => {
@@ -4148,7 +4099,7 @@ function createCodexSupervisionTools(options) {
 				const { pluginConfig } = requireCurrentEndpointSet(options, endpoints);
 				return jsonResult({
 					summary: `codex sessions: ${result.sessions.length}`,
-					...sanitizeSessionListResult(result, resolveToolPolicy(pluginConfig).allowRawTranscripts)
+					...sanitizeSessionListResult(result, readCodexPluginConfig(pluginConfig).supervision?.allowRawTranscripts === true)
 				});
 			}
 		},
@@ -4159,7 +4110,7 @@ function createCodexSupervisionTools(options) {
 			parameters: SessionReadParamsSchema,
 			execute: async (_toolCallId, rawParams) => {
 				const { endpoints, pluginConfig } = current();
-				requireRawTranscriptAccess(pluginConfig);
+				requireToolPolicy(pluginConfig, "raw-transcripts");
 				const params = isRecord(rawParams) ? rawParams : {};
 				const threadId = readStringParam(params, "thread_id", { required: true });
 				const endpoint = await resolveEndpointForThread({
@@ -4186,83 +4137,20 @@ function createCodexSupervisionTools(options) {
 			label: "Codex Session Send",
 			description: "Steer an active Codex turn. Idle sessions must be continued through Codex Sessions.",
 			parameters: SessionSendParamsSchema,
-			execute: async (_toolCallId, rawParams) => {
-				const { endpoints, pluginConfig } = current();
-				requireWriteAccess(pluginConfig);
-				const params = isRecord(rawParams) ? rawParams : {};
-				const threadId = readStringParam(params, "thread_id", { required: true });
-				const text = readStringParam(params, "text", {
-					required: true,
-					allowEmpty: false
-				});
-				if ((readModeParam(params) ?? "auto") === "start") throw idleContinuationError(threadId);
-				const { endpoint, thread } = await readActiveThread(endpoints, params, threadId, () => idleContinuationError(threadId));
-				const turnId = await resolveInProgressTurnId({
-					request: writeRequest,
-					endpoint,
-					thread,
-					threadId
-				});
-				if (!turnId) throw new Error(`Codex thread ${threadId} is active but no in-progress turn is readable`);
-				await writeRequest(endpoint, "turn/steer", {
-					threadId,
-					expectedTurnId: turnId,
-					input: [{
-						type: "text",
-						text,
-						text_elements: []
-					}]
-				});
-				const result = {
-					endpointId: endpoint.id,
-					threadId,
-					mode: "steer",
-					turnId
-				};
-				return jsonResult({
-					summary: `codex steer: ${turnId}`,
-					result
-				});
-			}
+			execute: (_toolCallId, rawParams) => controlActiveTurn(rawParams, "steer")
 		},
 		{
 			name: "codex_session_interrupt",
 			label: "Codex Session Interrupt",
 			description: "Interrupt an active Codex turn.",
 			parameters: SessionInterruptParamsSchema,
-			execute: async (_toolCallId, rawParams) => {
-				const { endpoints, pluginConfig } = current();
-				requireWriteAccess(pluginConfig);
-				const params = isRecord(rawParams) ? rawParams : {};
-				const threadId = readStringParam(params, "thread_id", { required: true });
-				const { endpoint, thread } = await readActiveThread(endpoints, params, threadId, () => /* @__PURE__ */ new Error(`Codex thread ${threadId} has no active turn to interrupt`));
-				const turnId = readStringParam(params, "turn_id") ?? await resolveInProgressTurnId({
-					request: writeRequest,
-					endpoint,
-					thread,
-					threadId
-				});
-				if (!turnId) throw new Error(`Codex thread ${threadId} has no readable in-progress turn`);
-				await writeRequest(endpoint, "turn/interrupt", {
-					threadId,
-					turnId
-				});
-				const result = {
-					endpointId: endpoint.id,
-					threadId,
-					turnId
-				};
-				return jsonResult({
-					summary: `codex interrupted: ${turnId}`,
-					result
-				});
-			}
+			execute: (_toolCallId, rawParams) => controlActiveTurn(rawParams, "interrupt")
 		}
 	];
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./.setup/web-search-provider.runtime-dL2GD1Kl.mjs"));
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./.setup/web-search-provider.runtime-BsuCMNix.mjs"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -4276,8 +4164,7 @@ function createCodexWebSearchProvider(options = {}) {
 	return {
 		...createCodexWebSearchProviderBase(),
 		createTool: (ctx) => {
-			const nativeConfig = ctx.searchConfig?.openaiCodex;
-			if (nativeConfig && typeof nativeConfig === "object" && !Array.isArray(nativeConfig) && nativeConfig.enabled === false) return null;
+			if (asOptionalRecord(ctx.searchConfig?.openaiCodex)?.enabled === false) return null;
 			return {
 				description: "Search the current web through Codex hosted search and return a grounded answer with source URLs.",
 				parameters: CodexWebSearchSchema,
@@ -4315,14 +4202,13 @@ var codex_default = definePluginEntry({
 			const liveConfig = resolveConfig();
 			if (!liveConfig) return api.pluginConfig;
 			const livePluginConfig = resolveLivePluginConfigObject(() => liveConfig, "codex", api.pluginConfig);
-			if (!resolveEffectiveEnableState({
+			return resolveEffectiveEnableState({
 				id: "codex",
 				origin: "bundled",
 				config: normalizePluginsConfig(liveConfig.plugins),
 				rootConfig: liveConfig,
 				enabledByDefault: livePluginConfig !== void 0
-			}).enabled) return;
-			return livePluginConfig;
+			}).enabled ? livePluginConfig : void 0;
 		};
 		const resolveCurrentPluginConfig = () => resolvePluginConfig(resolveCurrentConfig);
 		const appServerConfig = readCodexPluginConfig(resolveCurrentPluginConfig()).appServer;
@@ -4529,7 +4415,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-Ce7BqiPN.mjs").then((n) => n.i), import("./.setup/session-retirement-Czbchv_O.mjs")]);
+			const [{ sessionBindingIdentity }, { retireCodexAppServerSessionGeneration }] = await Promise.all([import("./.setup/session-binding-JEHNMPsr.mjs").then((n) => n.a), import("./.setup/session-retirement-IoS3zr17.mjs")]);
 			await retireCodexAppServerSessionGeneration({
 				bindingStore,
 				identity: sessionBindingIdentity({