@openclaw/codex 2026.9.1-beta.1 → 2026.9.2

package/dist/{compact-BglNFZrQ.js → compact-Y_xBqrHN.js}

@@ -1,31 +1,27 @@
-import { G as CodexAppServerRpcError, J as consumeCodexAppServerLiveThread, et as retainCodexAppServerLiveThread, o as getLeasedSharedCodexAppServerClient, p as releaseLeasedSharedCodexAppServerClient, vt as isJsonObject } from "./shared-client-DKz23hHY.js";
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-Bcynfd-_.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-bfsmcQ6m.js";
-import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-Bk1I90Bg.js";
-import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BE9qNEW0.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-kuWTn9C5.js";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DZeuKH1j.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-BMvPX73o.js";
-import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.js";
+import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
+import { B as isJsonObject } from "./config-CyapYSji.js";
+import { Mt as retainCodexAppServerLiveThread, U as isCodexAppServerPrewriteRequestCancellationError, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError, wt as consumeCodexAppServerLiveThread } from "./shared-client-CKhX2kFt.js";
+import { l as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-4Ki04sW-.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, c as isCodexNoActiveTurnInterruptError, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { n as readCodexThreadContextSnapshot, u as readCodexNotificationItem } from "./event-projector-usage-ZqEVbAEY.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BLgqkUc1.js";
+import { l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-CbucAmmp.js";
+import { r as assertCodexSupervisionThreadLineage, s as resolveCodexBindingAppServerConnection } from "./thread-policy-CTalhWFy.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-C8H22rPi.js";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
-import { resolveDefaultAgentId as resolveDefaultAgentId$1 } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { resolveAgentDir as resolveAgentDir$2 } from "openclaw/plugin-sdk/agent-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 //#region extensions/codex/src/app-server/compact.ts
-/**
-* Native Codex app-server compaction bridge for bound OpenClaw sessions.
-*/
 const warnedIgnoredCompactionOverrides = createDedupeCache({
 	ttlMs: 0,
 	maxSize: 4096
 });
-const codexNativeCompactionQueue = new KeyedAsyncQueue();
 const CODEX_NATIVE_COMPACTION_INTERRUPT_GRACE_MS = 3e4;
 function watchCodexNativeCompactionCompletion(params) {
 	const runOutsideBindingLease = AsyncLocalStorage.snapshot();
@@ -82,7 +78,7 @@ function watchCodexNativeCompactionCompletion(params) {
 			threadId: params.threadId,
 			turnId: compactionTurnId
 		}, { timeoutMs: Math.max(1, params.interruptGraceMs) }).catch((error) => {
-			if (isCodexAlreadyTerminalInterruptError(error)) {
+			if (isCodexNoActiveTurnInterruptError(error)) {
 				if (compactionItemCompleted) {
 					complete();
 					return;
@@ -196,7 +192,7 @@ function watchCodexNativeCompactionCompletion(params) {
 async function runExclusiveCodexNativeCompaction(threadId, signal, run) {
 	signal?.throwIfAborted();
 	let started = false;
-	const queued = codexNativeCompactionQueue.enqueue(threadId, async () => {
+	const queued = withCodexAppServerThreadMutation(threadId, async () => {
 		started = true;
 		signal?.throwIfAborted();
 		return run();
@@ -282,7 +278,7 @@ async function compactCodexNativeThread(params, options) {
 		config: params.config,
 		sessionKey: params.sandboxSessionKey ?? params.sessionKey,
 		sessionId: params.sessionId,
-		agentId: params.agentId,
+		agentId: params.sandboxAgentId ?? params.agentId,
 		sandbox,
 		surface: "native compaction"
 	});
@@ -297,7 +293,33 @@ async function compactCodexNativeThread(params, options) {
 		agentId: params.agentId,
 		config: params.config
 	});
-	const initialBinding = await options.bindingStore.read(bindingIdentity);
+	const abortedResult = (expectedThreadId, currentThreadId = expectedThreadId) => options.allowNonManualNativeRequest ? skippedCodexNativeCompactionResult(params, {
+		reason: "codex app-server compaction aborted before native compaction",
+		code: "aborted_before_native_compaction",
+		request: options.nativeCompactionRequest ?? "after_context_engine",
+		...expectedThreadId ? {
+			expectedThreadId,
+			currentThreadId
+		} : {}
+	}) : {
+		ok: false,
+		compacted: false,
+		reason: "codex app-server compaction aborted while waiting to start"
+	};
+	let resolvedBinding;
+	try {
+		resolvedBinding = await resolveCodexSessionBinding({
+			bindingStore: options.bindingStore,
+			identity: bindingIdentity,
+			config: params.config,
+			storePath: params.sessionTarget?.storePath,
+			signal: params.abortSignal
+		});
+	} catch (error) {
+		if (!params.abortSignal?.aborted) throw error;
+		return abortedResult(options.bindingStore.read(bindingIdentity)?.threadId);
+	}
+	const { binding: initialBinding, assertCurrent } = resolvedBinding;
 	if (!initialBinding?.threadId) return failedCodexThreadBindingCompactionResult(params, {
 		reason: "no codex app-server thread binding",
 		recovery: "missing_thread_binding"
@@ -317,13 +339,13 @@ async function compactCodexNativeThread(params, options) {
 	let connection;
 	try {
 		const config = params.config ?? {};
-		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId$1(config);
+		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId(config);
 		connection = resolveCodexBindingAppServerConnection({
 			binding,
 			authProfileId: requestedAuthProfileId ?? binding.authProfileId,
 			pluginConfig: options.pluginConfig,
 			config,
-			agentDir: resolveAgentDir$1(config, agentId)
+			agentDir: resolveAgentDir$2(config, agentId)
 		});
 	} catch (error) {
 		return {
@@ -350,6 +372,7 @@ async function compactCodexNativeThread(params, options) {
 	};
 	try {
 		return await runExclusiveCodexNativeCompaction(binding.threadId, params.abortSignal, async () => {
+			assertCurrent();
 			const client = await clientFactory({
 				startOptions: appServer.start,
 				...preparedApiKey ? { preparedAuth: {
@@ -357,7 +380,8 @@ async function compactCodexNativeThread(params, options) {
 					apiKey: preparedApiKey
 				} } : { authProfileId: connection.clientAuthProfileId },
 				agentDir: params.agentDir,
-				config: params.config
+				config: params.config,
+				assertCurrent
 			});
 			let releaseThreadSubscription;
 			let retainedThreadOwnership;
@@ -392,30 +416,44 @@ async function compactCodexNativeThread(params, options) {
 					if (await options.bindingStore.mutate(bindingIdentity, {
 						kind: "clear",
 						threadId: binding.threadId
-					})) return;
-					if ((await options.bindingStore.read(bindingIdentity))?.threadId !== binding.threadId) return;
+					}, assertCurrent)) return;
+					if (options.bindingStore.read(bindingIdentity)?.threadId !== binding.threadId) return;
 					throw new Error("failed to detach unconfirmed codex app-server thread binding");
 				}
 			});
 			const acquireThreadSubscription = async (timeoutMs) => {
 				if (!isIncognitoSessionKey(params.sessionKey)) {
 					retainedThreadOwnership = await consumeCodexAppServerLiveThread(client, binding.threadId);
-					if (!retainedThreadOwnership) await resumeCodexAppServerThread({
-						client,
-						abandonClient: async () => closeCodexStartupClientBestEffort(client),
-						request: {
+					if (!retainedThreadOwnership) {
+						const resumed = await resumeCodexAppServerThread({
+							client,
+							abandonClient: async () => closeCodexStartupClientBestEffort(client),
+							request: {
+								threadId: binding.threadId,
+								excludeTurns: true
+							},
+							timeoutMs: timeoutMs ?? appServer.requestTimeoutMs,
+							assertCurrent,
+							...params.abortSignal ? { signal: params.abortSignal } : {}
+						});
+						releaseThreadSubscription = async () => releaseCompactionThread(binding.threadId);
+						assertCodexSupervisionThreadLineage(binding, resumed.thread);
+					} else if (binding.connectionScope === "supervision") {
+						releaseThreadSubscription = async () => retainedThreadOwnership?.release(binding.threadId);
+						const { thread } = await client.request("thread/read", {
 							threadId: binding.threadId,
-							excludeTurns: true
-						},
-						timeoutMs: timeoutMs ?? appServer.requestTimeoutMs,
-						...params.abortSignal ? { signal: params.abortSignal } : {}
-					});
-					releaseThreadSubscription = async () => releaseCompactionThread(binding.threadId);
+							includeTurns: false
+						}, { assertCurrent });
+						assertCurrent();
+						retainedThreadOwnership.assertCurrent();
+						assertCodexSupervisionThreadLineage(binding, thread);
+					}
+					releaseThreadSubscription ??= async () => releaseCompactionThread(binding.threadId);
 				}
 			};
 			try {
 				const guardedResult = await options.bindingStore.withLease(bindingIdentity, async () => {
-					const currentBinding = await options.bindingStore.read(bindingIdentity);
+					const currentBinding = options.bindingStore.read(bindingIdentity);
 					if (params.abortSignal?.aborted) {
 						if (!options.allowNonManualNativeRequest) params.abortSignal.throwIfAborted();
 						return {
@@ -429,6 +467,7 @@ async function compactCodexNativeThread(params, options) {
 							})
 						};
 					}
+					assertCurrent();
 					if (!currentBinding || !isSameNativeCompactionBinding(currentBinding, binding)) {
 						embeddedAgentLog.warn("codex app-server compaction could not use the thread binding because it changed", {
 							sessionId: params.sessionId,
@@ -459,23 +498,38 @@ async function compactCodexNativeThread(params, options) {
 						sessionId: params.sessionId,
 						bindingStore: options.bindingStore,
 						identity: bindingIdentity,
-						binding
+						binding,
+						assertCurrent
 					});
+					assertCurrent();
 					try {
 						completionWatch.beginRequest();
-						if (guardedRequestTimeoutMs === void 0) await client.request("thread/compact/start", { threadId: binding.threadId });
-						else await client.request("thread/compact/start", { threadId: binding.threadId }, { timeoutMs: guardedRequestTimeoutMs });
+						await client.request("thread/compact/start", { threadId: binding.threadId }, {
+							...guardedRequestTimeoutMs === void 0 ? {} : { timeoutMs: guardedRequestTimeoutMs },
+							assertCurrent: () => {
+								try {
+									assertCurrent();
+								} catch (error) {
+									compactionRequestDefinitelyRejected = true;
+									throw error;
+								}
+							}
+						});
 						return {
 							started: true,
 							accepted: true
 						};
 					} catch (error) {
-						if (error instanceof CodexAppServerRpcError) {
-							await options.bindingStore.mutate(bindingIdentity, {
-								kind: "set",
-								binding
-							});
-							compactionRequestDefinitelyRejected = !isCodexThreadNotFoundError(error);
+						compactionRequestDefinitelyRejected ||= isCodexAppServerPrewriteRequestCancellationError(error);
+						if (compactionRequestDefinitelyRejected || error instanceof CodexAppServerRpcError) {
+							completionWatch.confirmRequestRejected();
+							if (!compactionRequestDefinitelyRejected) {
+								await options.bindingStore.mutate(bindingIdentity, {
+									kind: "set",
+									binding
+								}, assertCurrent);
+								compactionRequestDefinitelyRejected = !isCodexThreadNotFoundError(error);
+							}
 						}
 						return {
 							started: true,
@@ -486,8 +540,7 @@ async function compactCodexNativeThread(params, options) {
 				});
 				if (!guardedResult.started) return guardedResult.result;
 				if (!guardedResult.accepted) {
-					if (guardedResult.error instanceof CodexAppServerRpcError) completionWatch.confirmRequestRejected();
-					else await completionWatch.retireUnconfirmedRequest(`codex app-server compaction start was unconfirmed: ${coerceErrorMessage(guardedResult.error)}`);
+					if (!compactionRequestDefinitelyRejected && !(guardedResult.error instanceof CodexAppServerRpcError)) await completionWatch.retireUnconfirmedRequest(`codex app-server compaction start was unconfirmed: ${coerceErrorMessage(guardedResult.error)}`);
 					throw guardedResult.error;
 				}
 				embeddedAgentLog.info("started codex app-server compaction", {
@@ -495,6 +548,7 @@ async function compactCodexNativeThread(params, options) {
 					threadId: binding.threadId
 				});
 				const completion = await completionWatch.completion;
+				assertCurrent();
 				if (!completion.completed) throw new Error(completion.reason);
 				tokensAfter = completion.tokensAfter;
 				if (completion.turnId && completion.itemId) await persistCodexContextCompactionActivity({
@@ -507,6 +561,7 @@ async function compactCodexNativeThread(params, options) {
 					itemId: completion.itemId,
 					timestamp: Date.now()
 				});
+				assertCurrent();
 				embeddedAgentLog.info("completed codex app-server compaction", {
 					sessionId: params.sessionId,
 					threadId: binding.threadId
@@ -534,8 +589,10 @@ async function compactCodexNativeThread(params, options) {
 				try {
 					if ((compactionSucceeded || compactionRequestDefinitelyRejected) && retainedThreadOwnership) {
 						const ownership = retainedThreadOwnership;
-						if (!(isSameCodexAppServerThreadOwner(await options.bindingStore.read(bindingIdentity), binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
-							if (!isSameCodexAppServerThreadOwner(await options.bindingStore.read(bindingIdentity), binding)) return false;
+						const currentBinding = options.bindingStore.read(bindingIdentity);
+						if (!(isSameCodexAppServerThreadOwner(currentBinding, binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
+							const leasedBinding = options.bindingStore.read(bindingIdentity);
+							if (!isSameCodexAppServerThreadOwner(leasedBinding, binding)) return false;
 							return await retainCodexAppServerLiveThread(client, binding.threadId, ownership.release, ownership.configFingerprint, ownership.serviceTier);
 						}))) await releaseThreadSubscription?.();
 					} else await releaseThreadSubscription?.();
@@ -561,20 +618,7 @@ async function compactCodexNativeThread(params, options) {
 			});
 		});
 	} catch (error) {
-		if (params.abortSignal?.aborted) {
-			if (options.allowNonManualNativeRequest) return skippedCodexNativeCompactionResult(params, {
-				reason: "codex app-server compaction aborted before native compaction",
-				code: "aborted_before_native_compaction",
-				request: options.nativeCompactionRequest ?? "after_context_engine",
-				expectedThreadId: initialBinding.threadId,
-				currentThreadId: binding.threadId
-			});
-			return {
-				ok: false,
-				compacted: false,
-				reason: "codex app-server compaction aborted while waiting to start"
-			};
-		}
+		if (params.abortSignal?.aborted) return abortedResult(initialBinding.threadId, binding.threadId);
 		throw error;
 	}
 }
@@ -635,7 +679,7 @@ async function clearContextEngineProjectionBeforeNativeCompaction(params) {
 			...contextEngineBinding,
 			projection: void 0
 		} }
-	});
+	}, params.assertCurrent);
 	embeddedAgentLog.info("cleared codex context-engine projection before native compaction", {
 		sessionId: params.sessionId,
 		threadId: params.binding.threadId,