@openclaw/codex 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{request-CZkKkN6c.mjs → request-6piO0U_P.mjs}

@@ -1,7 +1,7 @@
-import { i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-kQntafj_.mjs";
-import { i as withTimeout$1, r as withAbortableTimeout } from "./timeout-CXOfNoaX.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-DbOzOglY.mjs";
+import { i as withTimeout$1, r as withAbortableTimeout } from "./timeout-D0mEWSGG.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
 import { areDiagnosticsEnabledForProcess } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { raceWithTimeout } from "openclaw/plugin-sdk/time-runtime";
@@ -35,17 +35,7 @@ function createCodexRequestTimeoutDiagnostics(timeoutMs) {
 		return {
 			ordinal,
 			phase: "prepare",
-			clientInstanceId: void 0,
-			acquireLastObservedBoundary: void 0,
-			acquireBoundaryBeforeCleanup: void 0,
-			acquireStartup: void 0,
-			lastStartedClientInstanceId: void 0,
-			lastStartedTransportIdentity: void 0,
-			initializeSnapshot: void 0,
-			initializeBeforeCleanup: void 0,
-			initializeBeforeCleanupSource: void 0,
 			started: 0,
-			pending: 0,
 			methods: /* @__PURE__ */ new Map()
 		};
 	}
@@ -103,10 +93,8 @@ function createCodexRequestTimeoutDiagnostics(timeoutMs) {
 			const current = attempt;
 			const label = DIAGNOSTIC_METHODS.has(method) ? method : "other";
 			current.started++;
-			current.pending++;
 			current.methods.set(label, (current.methods.get(label) ?? 0) + 1);
 			return () => {
-				current.pending--;
 				const remaining = (current.methods.get(label) ?? 1) - 1;
 				if (remaining === 0) current.methods.delete(label);
 				else current.methods.set(label, remaining);
@@ -119,9 +107,10 @@ function createCodexRequestTimeoutDiagnostics(timeoutMs) {
 			try {
 				if (!areDiagnosticsEnabledForProcess() || !embeddedAgentLog.isEnabled("warn")) return;
 				const methods = [...attempt.methods].toSorted(([a], [b]) => a.localeCompare(b));
+				const pending = methods.reduce((count, [, active]) => count + active, 0);
 				const initialize = readInitializeSnapshot(attempt.initializeSnapshot);
 				embeddedAgentLog.warn("codex app-server scope timed out", {
-					phase: attempt.phase === "callback" && attempt.pending > 0 ? "client-request" : attempt.phase,
+					phase: attempt.phase === "callback" && pending > 0 ? "client-request" : attempt.phase,
 					timeoutMs,
 					elapsedMs: Math.round(performance.now() - startedAt),
 					scopeAttemptOrdinal: attempt.ordinal,
@@ -139,7 +128,7 @@ function createCodexRequestTimeoutDiagnostics(timeoutMs) {
 						initializeBeforeCleanupSource: attempt.initializeBeforeCleanupSource
 					} : {},
 					requestStartedCount: attempt.started,
-					currentRequestCount: attempt.pending,
+					currentRequestCount: pending,
 					currentMethods: JSON.stringify(methods.slice(0, MAX_METHODS)),
 					omittedMethodCount: Math.max(0, methods.length - MAX_METHODS)
 				});
@@ -155,14 +144,14 @@ var request_exports = /* @__PURE__ */ __exportAll({
 	requestCodexAppServerJson: () => requestCodexAppServerJson,
 	withCodexAppServerJsonClient: () => withCodexAppServerJsonClient
 });
-function observeControlPhase(observation, phase) {
-	try {
-		observation?.phase(phase);
-	} catch {}
-}
-function observeControlFailure(observation, phase, error, deadlineObserved = false) {
+function observeControl(observation, phase, failure) {
 	if (!observation) return;
 	try {
+		if (!failure) {
+			observation.phase(phase);
+			return;
+		}
+		const { error, deadlineObserved } = failure;
 		const category = deadlineObserved ? "deadline-observed" : error instanceof CodexAppServerScopedRequestRejectedError ? "scoped-rejection" : error instanceof CodexAppServerRpcError ? error.code === -32601 ? "rpc-method-unavailable" : "rpc-error" : "other";
 		observation.failed({
 			phase,
@@ -173,16 +162,10 @@ function observeControlFailure(observation, phase, error, deadlineObserved = fal
 /** Sends one guarded request over a client lease owned by the caller. */
 async function requestCodexAppServerClientJson(params) {
 	let phase = "prepare";
-	observeControlPhase(params.controlObservation, phase);
+	observeControl(params.controlObservation, phase);
 	try {
-		const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-WqE8yPge.mjs").then((n) => n.r);
-		const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock({
-			method: params.method,
-			requestParams: params.requestParams,
-			config: params.config,
-			sessionKey: params.sessionKey,
-			sessionId: params.sessionId
-		});
+		const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-DIImwCy1.mjs").then((n) => n.r);
+		const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock(params);
 		if (sandboxBlock) throw new Error(sandboxBlock);
 		const timeoutMs = params.timeoutMs ?? 6e4;
 		const method = params.method;
@@ -196,23 +179,17 @@ async function requestCodexAppServerClientJson(params) {
 			...attemptWaiterFinished ? { attemptWaiterFinished } : {}
 		};
 		phase = "client-request";
-		observeControlPhase(params.controlObservation, phase);
+		observeControl(params.controlObservation, phase);
 		return await withTimeout$1(params.client.request(method, requestParams, options), timeoutMs, `codex app-server ${params.method} timed out`);
 	} catch (error) {
-		observeControlFailure(params.controlObservation, phase, error);
+		observeControl(params.controlObservation, phase, { error });
 		throw error;
 	}
 }
 async function requestCodexAppServerJson(params) {
-	observeControlPhase(params.controlObservation, "prepare");
-	const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-WqE8yPge.mjs").then((n) => n.r);
-	const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock({
-		method: params.method,
-		requestParams: params.requestParams,
-		config: params.config,
-		sessionKey: params.sessionKey,
-		sessionId: params.sessionId
-	});
+	observeControl(params.controlObservation, "prepare");
+	const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-DIImwCy1.mjs").then((n) => n.r);
+	const sandboxBlock = resolveCodexAppServerDirectSandboxBypassBlock(params);
 	if (sandboxBlock) throw new Error(sandboxBlock);
 	return await withCodexAppServerJsonClient({
 		...params,
@@ -291,7 +268,7 @@ async function withCodexAppServerJsonClient(params, run) {
 	let errorPhase;
 	const setPhase = (phase) => {
 		activePhase = phase;
-		observeControlPhase(params.controlObservation, phase);
+		observeControl(params.controlObservation, phase);
 	};
 	setPhase("prepare");
 	const timeoutController = new AbortController();
@@ -315,8 +292,8 @@ async function withCodexAppServerJsonClient(params, run) {
 			timeoutMs,
 			timeoutMessage,
 			promise: (async () => {
-				const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-WqE8yPge.mjs").then((n) => n.r);
-				const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, isCodexAppServerStartSelectionChangedError, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-5NUq43f3.mjs").then((n) => n.v);
+				const { resolveCodexAppServerDirectSandboxBypassBlock } = await import("./sandbox-guard-DIImwCy1.mjs").then((n) => n.r);
+				const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, isCodexAppServerStartSelectionChangedError, releaseLeasedSharedCodexAppServerClient, retireSharedCodexAppServerClientIfCurrent } = await import("./shared-client-BjiqpbC5.mjs").then((n) => n.v);
 				for (let attempt = 0; attempt < 2; attempt += 1) {
 					errorPhase = void 0;
 					setPhase("prepare");
@@ -426,7 +403,10 @@ async function withCodexAppServerJsonClient(params, run) {
 		});
 	} catch (error) {
 		const deadlineObserved = isPastDeadline();
-		observeControlFailure(params.controlObservation, deadlineObserved ? activePhase : errorPhase ?? activePhase, error, deadlineObserved);
+		observeControl(params.controlObservation, deadlineObserved ? activePhase : errorPhase ?? activePhase, {
+			error,
+			deadlineObserved
+		});
 		if (deadlineObserved) {
 			timeoutDiagnostics?.timeout();
 			throw new Error(timeoutMessage, { cause: error });

package/dist/.setup/{rpc-error-hmWM21RB.mjs → rpc-error-C98SHchT.mjs}

@@ -16,7 +16,9 @@ function codexPrewriteRejectionCause(error) {
 /** RPC error wrapper that preserves app-server error code and data. */
 var CodexAppServerRpcError = class extends Error {
 	constructor(error, method) {
-		super(formatCodexAppServerRpcErrorMessage(error, method));
+		const message = error.message || `${method} failed`;
+		const detail = readCodexAppServerRpcReloginDetail(error.data);
+		super(detail && !message.includes(detail) ? `${message}: ${detail}` : message);
 		this.name = "CodexAppServerRpcError";
 		this.code = error.code;
 		this.data = error.data;
@@ -26,11 +28,6 @@ var CodexAppServerRpcError = class extends Error {
 function isCodexThreadReadMissingError(error, threadId) {
 	return error instanceof CodexAppServerRpcError && error.method === "thread/read" && error.code === -32600 && error.message === `thread not loaded: ${threadId}`;
 }
-function formatCodexAppServerRpcErrorMessage(error, method) {
-	const message = error.message || `${method} failed`;
-	const detail = readCodexAppServerRpcReloginDetail(error.data);
-	return detail && !message.includes(detail) ? `${message}: ${detail}` : message;
-}
 function readCodexAppServerRpcReloginDetail(data) {
 	const record = isJsonObject(data) ? data : void 0;
 	const nested = isJsonObject(record?.error) ? record.error : record;