@openclaw/codex 2026.9.4 → 2026.9.6

package/dist/{command-rpc-CR5EOEZX.js → .setup/command-rpc-DixIj3HW.mjs}

@@ -1,16 +1,18 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-8vx68WLH.js";
-import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-B7hEkBGq.js";
-import "./config-oIORaQ5T.js";
-import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-D0zGNIHu.js";
-import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-CWlKVccJ.js";
-import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-CwzO4_RG.js";
-import { tt as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-CscigXXL.js";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DKHzbwt5.js";
-import { n as listCodexAppServerModels } from "./models-PCKOim-h.js";
-import { n as createCodexSessionGenerationSupersededError } from "./session-binding-CI8UuilT.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-DsDOZpFg.js";
+import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-CDXOOFdZ.mjs";
+import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
+import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-C8Rw1m1m.mjs";
+import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-WqZtZfXN.mjs";
+import { Z as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-DA4VR4Eb.mjs";
+import { c as isCodexAppServerIndeterminateTransportError, l as isCodexAppServerOverloadError, s as isCodexAppServerIndeterminateRequestCancellationError } from "./client-Cs08OXVQ.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
+import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-DhLWa_7K.mjs";
+import { n as listCodexAppServerModels } from "./models-KnqBv0hE.mjs";
+import { n as createCodexSessionGenerationSupersededError } from "./session-binding-Cm0apEbd.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-DIBXwOpE.mjs";
 import { resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { prepareAgentRuntimeAuth } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -129,10 +131,15 @@ function requestOptions(pluginConfig, limit, config, agentDir) {
 		agentDir
 	};
 }
-async function codexControlRequest(pluginConfig, method, requestParams, options = {}) {
+async function codexControlRequest(pluginConfig, method, requestParams, inputOptions = {}) {
+	const options = { ...inputOptions };
+	try {
+		options.controlObservation?.phase("prepare");
+	} catch {}
 	const runtime = options.startOptions ? resolveCodexSupervisionAppServerRuntimeOptions({ pluginConfig }) : resolveCodexAppServerRuntimeOptions({ pluginConfig });
 	const startOptions = options.startOptions ?? runtime.start;
-	const auth = options.onResponse ? await prepareCodexControlSessionAuth(options, startOptions) : {
+	const nativeAuthFork = method === "thread/fork" && options.startOptions !== void 0 && options.authProfileId === null;
+	const auth = options.onResponse && !nativeAuthFork ? await prepareCodexControlSessionAuth(options, startOptions) : {
 		authProfileId: options.authProfileId ?? void 0,
 		clientOptions: { authProfileId: options.authProfileId }
 	};
@@ -145,6 +152,12 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 		sessionId: options.sessionId,
 		agentDir: options.agentDir,
 		isolated: options.isolated,
+		...options.catalogPreview ? {
+			catalogPreview: true,
+			catalogPreviewCache: options.catalogPreviewCache,
+			catalogRows: options.catalogRows
+		} : {},
+		...options.controlObservation ? { controlObservation: options.controlObservation } : {},
 		...auth.clientOptions
 	};
 	if (options.onResponse || options.beforeRequest) return await withCodexAppServerJsonClient(controlRequestOptions, async (request, client, scope) => {
@@ -161,25 +174,36 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 				},
 				requestResume: () => request({
 					method,
-					requestParams
+					requestParams,
+					assertCurrent: options.assertOwnerCurrent
 				}),
 				abandonClient: () => closeCodexStartupClientBestEffort(client)
 			});
-		} else response = await request({
-			method,
-			requestParams
-		});
-		await options.onResponse?.(response, client, {
+		} else try {
+			response = await request({
+				method,
+				requestParams,
+				assertCurrent: options.assertOwnerCurrent
+			});
+		} catch (error) {
+			if (nativeAuthFork && (isCodexAppServerIndeterminateRequestCancellationError(error) || isCodexAppServerIndeterminateTransportError(error) || error instanceof CodexAppServerRpcError && !isCodexAppServerOverloadError(error))) await closeCodexStartupClientBestEffort(client);
+			throw error;
+		}
+		if (options.onResponse) await options.onResponse(response, client, {
 			authProfileId: auth.authProfileId,
 			assertCurrent: scope.assertCurrent
 		});
-		scope.assertCurrent();
+		else scope.assertCurrent();
 		return response;
 	});
 	return await requestCodexAppServerJson({
 		method,
 		requestParams,
-		...controlRequestOptions
+		...controlRequestOptions,
+		...options.assertOwnerCurrent ? { assertCurrent: () => {
+			options.assertOwnerCurrent?.();
+			options.assertCurrent?.();
+		} } : {}
 	});
 }
 async function safeCodexControlRequest(pluginConfig, method, requestParams, options = {}) {

package/dist/{compact-B_H3AOd7.js → .setup/compact-Du5UvtxA.mjs}

@@ -1,26 +1,24 @@
-import { l as sessionBindingIdentity } from "./session-binding-record-Bcvslnhf.js";
-import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
-import { u as isCodexAppServerPrewriteRequestCancellationError } from "./client-B57KWPQx.js";
-import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.js";
-import { t as CodexAppServerRpcError } from "./rpc-error-ttN_QjEm.js";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-D3udKbIE.js";
-import { J as retainCodexAppServerLiveThread, R as consumeCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-CscigXXL.js";
-import { _ as readCodexNotificationTurnId, a as closeCodexStartupClientBestEffort, c as isCodexNoActiveTurnInterruptError, d as unsubscribeCodexThreadBestEffort, g as readCodexNotificationThreadId, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DKHzbwt5.js";
-import { s as readCodexNotificationItem } from "./attempt-notifications-C9XufG6l.js";
-import { n as readCodexThreadContextSnapshot } from "./event-projector-usage-BfXmpOec.js";
-import { o as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-CI8UuilT.js";
-import { r as assertCodexSupervisionThreadLineage } from "./thread-policy-BuEQfE0g.js";
-import { t as resumeCodexAppServerThread } from "./thread-resume-DsDOZpFg.js";
-import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-BsDRTsyp.js";
-import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.js";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-BxgyoM8M.js";
+import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { n as withCodexAppServerThreadMutation, t as isIncognitoSessionKey } from "./incognito-session-uhrBF6wJ.mjs";
+import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-ThoatDcb.mjs";
+import { N as consumeCodexAppServerLiveThread, W as retainCodexAppServerLiveThread, c as getLeasedSharedCodexAppServerClient, h as releaseLeasedSharedCodexAppServerClient } from "./shared-client-DA4VR4Eb.mjs";
+import { u as isCodexAppServerPrewriteRequestCancellationError } from "./client-Cs08OXVQ.mjs";
+import { b as readCodexNotificationTurnId, l as isCodexNoActiveTurnInterruptError, o as closeCodexStartupClientBestEffort, p as unsubscribeCodexThreadBestEffort, r as CodexAppServerUnsafeSubscriptionError, y as readCodexNotificationThreadId } from "./attempt-client-cleanup-CEv1cKwF.mjs";
+import { c as readCodexNotificationItem, n as readCodexThreadContextSnapshot } from "./event-projector-usage-CnBS8Wa3.mjs";
+import { o as resolveCodexSessionBinding, t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-Cm0apEbd.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-DGuQsuFC.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-DIBXwOpE.mjs";
+import { t as isSameCodexAppServerThreadOwner } from "./thread-ownership-DcTtAcXj.mjs";
+import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.mjs";
+import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C2sRMOEY.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { resolveDefaultAgentId } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
+import { AsyncLocalStorage } from "node:async_hooks";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
-import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
+import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
 import { embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { AsyncLocalStorage } from "node:async_hooks";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const warnedIgnoredCompactionOverrides = createDedupeCache({
@@ -83,14 +81,7 @@ function watchCodexNativeCompactionCompletion(params) {
 			threadId: params.threadId,
 			turnId: compactionTurnId
 		}, { timeoutMs: Math.max(1, params.interruptGraceMs) }).catch((error) => {
-			if (isCodexNoActiveTurnInterruptError(error)) {
-				if (compactionItemCompleted) {
-					complete();
-					return;
-				}
-				fail("codex app-server compaction reached terminal state without a completed compaction item");
-				return;
-			}
+			if (isCodexNoActiveTurnInterruptError(error)) return;
 			embeddedAgentLog.warn("codex app-server compaction interrupt request failed", {
 				threadId: params.threadId,
 				turnId: compactionTurnId,
@@ -237,28 +228,15 @@ function warnIfIgnoringOpenClawCompactionOverrides(params) {
 	});
 }
 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() : "";
-		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 (localProvider) ignored.add(`${entry.path}.compaction.provider`);
-	}
-	return [...ignored];
-}
-function readCompactionOverrideEntries(params) {
-	const entries = [];
-	const defaultRecord = asOptionalRecord(params.config?.agents?.defaults?.compaction);
-	if (defaultRecord) entries.push({
-		path: "agents.defaults",
-		record: defaultRecord
+	const compaction = asOptionalRecord(params.config?.agents?.defaults?.compaction);
+	return [
+		"model",
+		"thinkingLevel",
+		"provider"
+	].flatMap((field) => {
+		const value = compaction?.[field];
+		return typeof value === "string" && value.trim() ? [`agents.defaults.compaction.${field}`] : [];
 	});
-	return entries;
-}
-function readAgentIdFromSessionKey(sessionKey) {
-	const parts = sessionKey?.trim().toLowerCase().split(":").filter(Boolean) ?? [];
-	if (parts.length < 3 || parts[0] !== "agent") return;
-	return parts[1]?.trim() || void 0;
 }
 async function compactCodexNativeThread(params, options) {
 	if (params.trigger !== "manual" && !options.allowNonManualNativeRequest) {
@@ -344,13 +322,13 @@ async function compactCodexNativeThread(params, options) {
 	let connection;
 	try {
 		const config = params.config ?? {};
-		const agentId = params.agentId ?? readAgentIdFromSessionKey(params.sessionKey) ?? resolveDefaultAgentId(config);
-		connection = resolveCodexBindingAppServerConnection({
+		connection = await resolveCodexBindingAppServerConnection({
 			binding,
 			authProfileId: requestedAuthProfileId ?? binding.authProfileId,
 			pluginConfig: options.pluginConfig,
 			config,
-			agentDir: resolveAgentDir$1(config, agentId)
+			assertCurrent,
+			agentDir: resolveAgentDir(config, bindingIdentity.agentId)
 		});
 	} catch (error) {
 		return {

package/dist/{config-oIORaQ5T.js → .setup/config-BoTP_mrL.mjs}

@@ -1,7 +1,8 @@
-import { c as readExecAsk, f as readRecord, l as readExecSecurity } from "./config-utils-DujwEnhg.js";
-import { p as canUseCodexModelBackedApprovalsReviewerForModel$1 } from "./config-options-CXMq1T-C.js";
-import "./protocol-5bh1G-H7.js";
-import "./config-runtime-D0zGNIHu.js";
+import { c as readExecAsk, f as readRecord, l as readExecSecurity } from "./config-utils-DujwEnhg.mjs";
+import "./config-security-BEReZ6go.mjs";
+import "./config-parsing-CcB9iPoq.mjs";
+import { c as canUseCodexModelBackedApprovalsReviewerForModel$1 } from "./config-options-BvaRs51b.mjs";
+import "./config-runtime-C8Rw1m1m.mjs";
 import { resolveAgentConfig } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { execPolicy } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { resolveExecApprovalsFromFile } from "openclaw/plugin-sdk/exec-approvals-runtime";