@openclaw/codex 2026.9.1-beta.1 → 2026.9.1

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

@@ -1,13 +1,13 @@
-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 { $t as isJsonObject, At as retainCodexAppServerLiveThread, St as consumeCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient, q as CodexAppServerRpcError } from "./shared-client-DxcfF9KX.js";
+import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BHuTCRZQ.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-DYHcRQAa.js";
+import { f as readCodexNotificationItem, i as readCodexThreadContextSnapshot } from "./event-projector-usage-C5mcrGjp.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-C7pyVKeW.js";
+import { l as isIncognitoSessionKey, o as withCodexAppServerThreadMutation, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-zGokd8i1.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-DYAI5FQE.js";
+import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-g4KbJPzp.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-E6uDsPlx.js";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.js";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -15,17 +15,12 @@ import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-
 import { resolveDefaultAgentId as resolveDefaultAgentId$1 } from "openclaw/plugin-sdk/agent-scope-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();
@@ -196,7 +191,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 +277,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"
 	});
@@ -400,17 +395,29 @@ async function compactCodexNativeThread(params, options) {
 			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,
+							...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
+						});
+						retainedThreadOwnership.assertCurrent();
+						assertCodexSupervisionThreadLineage(binding, thread);
+					}
+					releaseThreadSubscription ??= async () => releaseCompactionThread(binding.threadId);
 				}
 			};
 			try {
@@ -534,8 +541,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 = await options.bindingStore.read(bindingIdentity);
+						if (!(isSameCodexAppServerThreadOwner(currentBinding, binding) && await options.bindingStore.withLease(bindingIdentity, async () => {
+							const leasedBinding = await 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?.();