@openclaw/codex 2026.8.1-beta.2 → 2026.8.1-beta.3

package/dist/{compact-LspQaGfl.js → compact-COqgBRny.js}

@@ -1,16 +1,18 @@
-import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-DPxIvMgE.js";
-import { V as consumeCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, ct as isJsonObject, l as releaseLeasedSharedCodexAppServerClient, q as retainCodexAppServerLiveThread, z as CodexAppServerRpcError } from "./shared-client-kIBbGjk4.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-DMLXUfa8.js";
-import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-e5huIQWu.js";
+import { B as CodexAppServerRpcError, U as consumeCodexAppServerLiveThread, Y as retainCodexAppServerLiveThread, a as getLeasedSharedCodexAppServerClient, l as releaseLeasedSharedCodexAppServerClient, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
+import { d as sessionBindingIdentity, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-BTrLf9Qm.js";
+import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-URjUlCHg.js";
+import { i as readCodexThreadContextSnapshot, x as readCodexNotificationItem } from "./event-projector-usage-CLwNEJqW.js";
 import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-CPrJNQVM.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-Cmwc9eIk.js";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-6kOQHlyC.js";
-import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-I5Bo-AsX.js";
+import { t as resumeCodexAppServerThread } from "./thread-resume-CdJk2Ehf.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C1qEeZ5C.js";
+import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-i2NBwDUL.js";
+import { n as resolveCodexBindingAppServerConnection } from "./binding-connection-DAvZwp96.js";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-BOeJf7yo.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";
-import { resolveAgentDir as resolveAgentDir$1, resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-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 { AsyncLocalStorage } from "node:async_hooks";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
@@ -54,6 +56,8 @@ function watchCodexNativeCompactionCompletion(params) {
 	};
 	const complete = () => finish({
 		completed: true,
+		...compactionTurnId ? { turnId: compactionTurnId } : {},
+		...compactionItemId ? { itemId: compactionItemId } : {},
 		...tokensAfter !== void 0 ? { tokensAfter } : {}
 	});
 	const fail = (reason) => finish({
@@ -235,11 +239,9 @@ function readIgnoredCompactionOverridePaths(params) {
 	const ignored = /* @__PURE__ */ new Set();
 	for (const entry of readCompactionOverrideEntries(params)) {
 		const localProvider = typeof entry.record.provider === "string" ? entry.record.provider.trim() : "";
-		const inheritedProvider = !localProvider && typeof entry.inheritedRecord?.provider === "string" ? entry.inheritedRecord.provider.trim() : "";
-		const providerPath = localProvider ? `${entry.path}.compaction.provider` : inheritedProvider && entry.inheritedPath ? `${entry.inheritedPath}.compaction.provider` : void 0;
 		if (typeof entry.record.model === "string" && entry.record.model.trim()) ignored.add(`${entry.path}.compaction.model`);
 		if (typeof entry.record.thinkingLevel === "string" && entry.record.thinkingLevel.trim()) ignored.add(`${entry.path}.compaction.thinkingLevel`);
-		if (providerPath) ignored.add(providerPath);
+		if (localProvider) ignored.add(`${entry.path}.compaction.provider`);
 	}
 	return [...ignored];
 }
@@ -250,17 +252,6 @@ function readCompactionOverrideEntries(params) {
 		path: "agents.defaults",
 		record: defaultRecord
 	});
-	const agentId = readAgentIdFromSessionKey(params.sessionKey ?? params.sandboxSessionKey);
-	if (!agentId) return entries;
-	const agentRecord = asOptionalRecord((Array.isArray(params.config?.agents?.list) ? params.config.agents.list : []).find((agent) => {
-		return (typeof agent?.id === "string" ? agent.id.trim().toLowerCase() : "") === agentId;
-	})?.compaction);
-	if (agentRecord) entries.push({
-		path: `agents.list.${agentId}`,
-		record: agentRecord,
-		inheritedRecord: defaultRecord,
-		inheritedPath: "agents.defaults"
-	});
 	return entries;
 }
 function readAgentIdFromSessionKey(sessionKey) {
@@ -291,6 +282,7 @@ async function compactCodexNativeThread(params, options) {
 		config: params.config,
 		sessionKey: params.sandboxSessionKey ?? params.sessionKey,
 		sessionId: params.sessionId,
+		agentId: params.agentId,
 		sandbox,
 		surface: "native compaction"
 	});
@@ -325,7 +317,7 @@ async function compactCodexNativeThread(params, options) {
 	let connection;
 	try {
 		const config = params.config ?? {};
-		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId(config);
+		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId$1(config);
 		connection = resolveCodexBindingAppServerConnection({
 			binding,
 			authProfileId: requestedAuthProfileId ?? binding.authProfileId,
@@ -431,27 +423,30 @@ async function compactCodexNativeThread(params, options) {
 							result: skippedCodexNativeCompactionResult(params, {
 								reason: "codex app-server compaction aborted before native compaction",
 								code: "aborted_before_native_compaction",
+								request: options.nativeCompactionRequest ?? "after_context_engine",
 								expectedThreadId: binding.threadId,
 								currentThreadId: currentBinding?.threadId
 							})
 						};
 					}
 					if (!currentBinding || !isSameNativeCompactionBinding(currentBinding, binding)) {
-						embeddedAgentLog.warn("skipping codex app-server compaction because the thread binding changed", {
+						embeddedAgentLog.warn("codex app-server compaction could not use the thread binding because it changed", {
 							sessionId: params.sessionId,
 							sessionKey: params.sessionKey,
 							expectedThreadId: binding.threadId,
 							currentThreadId: currentBinding?.threadId
 						});
+						const isRequiredPreflight = options.nativeCompactionRequest === "required_preflight";
 						return {
 							started: false,
-							result: options.allowNonManualNativeRequest ? skippedCodexNativeCompactionResult(params, {
+							result: options.allowNonManualNativeRequest && !isRequiredPreflight ? skippedCodexNativeCompactionResult(params, {
 								reason: "codex app-server binding changed before native compaction",
 								code: "binding_changed_before_native_compaction",
+								request: options.nativeCompactionRequest ?? "after_context_engine",
 								expectedThreadId: binding.threadId,
 								currentThreadId: currentBinding?.threadId
 							}) : failedCodexThreadBindingCompactionResult(params, {
-								threadId: binding.threadId,
+								threadId: currentBinding?.threadId ?? binding.threadId,
 								reason: "codex app-server binding changed before native compaction",
 								recovery: "stale_thread_binding"
 							})
@@ -502,6 +497,16 @@ async function compactCodexNativeThread(params, options) {
 				const completion = await completionWatch.completion;
 				if (!completion.completed) throw new Error(completion.reason);
 				tokensAfter = completion.tokensAfter;
+				if (completion.turnId && completion.itemId) await persistCodexContextCompactionActivity({
+					sessionTarget: params.sessionTarget,
+					config: params.config,
+					cwd: params.workspaceDir,
+					runId: params.runId,
+					threadId: binding.threadId,
+					turnId: completion.turnId,
+					itemId: completion.itemId,
+					timestamp: Date.now()
+				});
 				embeddedAgentLog.info("completed codex app-server compaction", {
 					sessionId: params.sessionId,
 					threadId: binding.threadId
@@ -545,7 +550,7 @@ async function compactCodexNativeThread(params, options) {
 				pending: false,
 				completed: true,
 				...options.allowNonManualNativeRequest ? {
-					request: "after_context_engine",
+					request: options.nativeCompactionRequest ?? "after_context_engine",
 					trigger: params.trigger ?? "unknown"
 				} : {}
 			};
@@ -560,6 +565,7 @@ async function compactCodexNativeThread(params, options) {
 			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
 			});
@@ -594,7 +600,7 @@ function skippedCodexNativeCompactionResult(params, skipped) {
 			backend: "codex-app-server",
 			skipped: true,
 			reason: skipped.code,
-			request: "after_context_engine",
+			request: skipped.request ?? "after_context_engine",
 			trigger: params.trigger ?? "unknown",
 			...skipped.expectedThreadId ? { expectedThreadId: skipped.expectedThreadId } : {},
 			...skipped.currentThreadId ? { currentThreadId: skipped.currentThreadId } : {}