@openclaw/codex 2026.9.5 → 2026.9.7

package/dist/.setup/{command-rpc-DHFpn4le.mjs → command-rpc-CGJGUQ6Y.mjs}

@@ -1,16 +1,18 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-_vXcZGSx.mjs";
-import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
-import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-WqZtZfXN.mjs";
-import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-DhLWa_7K.mjs";
-import { Z as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-BpTtuLQ5.mjs";
-import { a as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-BpYKdTA0.mjs";
-import { n as listCodexAppServerModels } from "./models-BDFgm_G-.mjs";
-import { n as createCodexSessionGenerationSupersededError } from "./session-binding-_0W_fHRr.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-BkNpj9Pz.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { n as CodexAppServerRpcError } from "./rpc-error-BlD2vuzn.mjs";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-B3WEZl4e.mjs";
+import { i as requestCodexAppServerJson, o as withCodexAppServerJsonClient } from "./request-BHZ1nz8d.mjs";
+import "./config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-B0okYl2D.mjs";
+import { tt as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-DqyTMYug.mjs";
+import { c as isCodexAppServerIndeterminateTransportError, l as isCodexAppServerOverloadError, s as isCodexAppServerIndeterminateRequestCancellationError } from "./client-N0JpgSzF.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DOP-cW5j.mjs";
+import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-BLWz7stm.mjs";
+import { r as listCodexAppServerModels } from "./models-DHXZtVVk.mjs";
+import { n as createCodexSessionGenerationSupersededError } from "./session-binding-DGCYAfvD.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-CdDaoc7T.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.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,13 +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 }
 	};
@@ -148,7 +152,7 @@ async function codexControlRequest(pluginConfig, method, requestParams, options
 		sessionId: options.sessionId,
 		agentDir: options.agentDir,
 		isolated: options.isolated,
-		...options.catalogPreview && method === "thread/list" ? {
+		...options.catalogPreview ? {
 			catalogPreview: true,
 			catalogPreviewCache: options.catalogPreviewCache,
 			catalogRows: options.catalogRows
@@ -170,36 +174,44 @@ 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 = {}) {
 	return await safeValue(async () => await codexControlRequest(pluginConfig, method, requestParams, options));
 }
-async function safeCodexModelList(pluginConfig, limit, config, agentDir) {
-	return await safeValue(async () => await listCodexAppServerModels(requestOptions(pluginConfig, limit, config, agentDir)));
-}
 async function readCodexStatusProbes(pluginConfig, config, agentDir) {
 	const [models, account, limits, mcps, skills] = await Promise.all([
-		safeCodexModelList(pluginConfig, 20, config, agentDir),
+		safeValue(() => listCodexAppServerModels(requestOptions(pluginConfig, 20, config, agentDir))),
 		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }, {
 			config,
 			agentDir