@openclaw/codex 2026.6.5-beta.1 → 2026.6.5-beta.2

package/dist/harness.js

@@ -32,7 +32,7 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-B_6VkFQN.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-CWfXFq9Q.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }

package/dist/{run-attempt-B_6VkFQN.js → run-attempt-CWfXFq9Q.js}

@@ -1174,21 +1174,17 @@ const CODEX_APP_SERVER_MISSING_TERMINAL_EVENT_SIDE_EFFECT_USER_MESSAGE = "Codex
 function collectTerminalAssistantText(result) {
 	return result.assistantTexts.join("\n\n").trim();
 }
-/** Returns whether attempt metadata saw potential side effects. */
-function hasCodexAppServerPotentialSideEffectEvidence(result) {
-	return result.replayMetadata.hadPotentialSideEffects;
-}
 /**
 * Builds the user-facing timeout outcome when Codex stops without a terminal
 * turn event.
 */
 function buildCodexAppServerPromptTimeoutOutcome(params) {
-	const completionIdleTimeoutHadPotentialSideEffects = hasCodexAppServerPotentialSideEffectEvidence(params.result);
+	if (!params.turnCompletionIdleTimedOut) return;
+	if (params.turnWatchTimeoutKind !== void 0 && params.turnWatchTimeoutKind !== "completion") return;
 	const replayBlockedReason = resolveCodexAppServerReplayBlockedReason(params.result);
-	if (!params.turnCompletionIdleTimedOut || params.result.itemLifecycle.completedCount === 0 && !completionIdleTimeoutHadPotentialSideEffects && replayBlockedReason === void 0) return;
 	return {
-		message: completionIdleTimeoutHadPotentialSideEffects ? CODEX_APP_SERVER_MISSING_TERMINAL_EVENT_SIDE_EFFECT_USER_MESSAGE : CODEX_APP_SERVER_MISSING_TERMINAL_EVENT_USER_MESSAGE,
-		...completionIdleTimeoutHadPotentialSideEffects ? {
+		message: replayBlockedReason === "tool_activity" || replayBlockedReason === "potential_side_effect" || replayBlockedReason === "active_item" ? CODEX_APP_SERVER_MISSING_TERMINAL_EVENT_SIDE_EFFECT_USER_MESSAGE : CODEX_APP_SERVER_MISSING_TERMINAL_EVENT_USER_MESSAGE,
+		...replayBlockedReason ? {
 			replayInvalid: true,
 			livenessState: "abandoned"
 		} : {}
@@ -3484,12 +3480,21 @@ function createCodexAttemptTurnWatchController(params) {
 			scheduleCompletionIdleWatch();
 			return;
 		}
+		const details = {
+			...completionLastActivityDetails,
+			activeAppServerTurnRequests: params.getActiveAppServerTurnRequests(),
+			activeTurnItemCount: params.getActiveTurnItemCount(),
+			terminalTurnNotificationQueued: params.isTerminalTurnNotificationQueued(),
+			completionIdleWatchArmed,
+			assistantCompletionIdleWatchArmed,
+			terminalIdleWatchArmed
+		};
 		const timeout = {
 			kind: "completion",
 			idleMs,
 			timeoutMs,
 			lastActivityReason: completionLastActivityReason,
-			details: completionLastActivityDetails
+			details
 		};
 		params.onTimeout(timeout);
 		params.onMarkTimedOut();
@@ -4246,6 +4251,10 @@ var CodexAppServerEventProjector = class {
 	getCompletedTurnStatus() {
 		return this.completedTurn?.status;
 	}
+	hasCompletedTerminalAssistantText() {
+		const finalItem = this.resolveFinalAssistantTextItem();
+		return finalItem !== void 0 && this.completedItemIds.has(finalItem.itemId);
+	}
 	async handleNotification(notification) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
@@ -5275,12 +5284,18 @@ var CodexAppServerEventProjector = class {
 		return finalText ? [finalText] : [];
 	}
 	resolveFinalAssistantText() {
+		return this.resolveFinalAssistantTextItem()?.text;
+	}
+	resolveFinalAssistantTextItem() {
 		for (let i = this.assistantItemOrder.length - 1; i >= 0; i -= 1) {
 			const itemId = this.assistantItemOrder[i];
 			if (!itemId) continue;
 			const text = this.assistantTextByItem.get(itemId)?.trim();
 			if (this.assistantPhaseByItem.get(itemId) === "commentary") continue;
-			if (text && !this.toolProgressTexts.has(text)) return text;
+			if (text && !this.toolProgressTexts.has(text)) return {
+				itemId,
+				text
+			};
 		}
 	}
 	rememberAssistantItem(itemId) {
@@ -8343,6 +8358,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let timedOut = false;
 	let turnCompletionIdleTimedOut = false;
 	let turnWatchTimeoutKind;
+	let turnWatchTimeoutIdleMs;
+	let turnWatchTimeoutMs;
+	let turnWatchTimeoutLastActivityReason;
+	let turnWatchTimeoutDetails;
 	let turnCompletionIdleTimeoutMessage;
 	let clientClosedPromptError;
 	let clientClosedAbort = false;
@@ -8403,6 +8422,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			timedOut = true;
 			turnCompletionIdleTimedOut = true;
 			turnWatchTimeoutKind = timeout.kind;
+			turnWatchTimeoutIdleMs = timeout.idleMs;
+			turnWatchTimeoutMs = timeout.timeoutMs;
+			turnWatchTimeoutLastActivityReason = timeout.lastActivityReason;
+			turnWatchTimeoutDetails = timeout.details;
 			turnCompletionIdleTimeoutMessage = "codex app-server turn idle timed out waiting for turn/completed";
 		},
 		onMarkTimedOut: () => projectorRef.current?.markTimedOut(),
@@ -9197,7 +9220,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		await notificationQueue;
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
 		const finalAborted = result.aborted || runAbortController.signal.aborted && !clientClosedAbort;
-		let finalPromptError = clientClosedPromptError ?? (turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError);
+		const canUseCompletedAssistantTextAfterClientClose = activeProjector.hasCompletedTerminalAssistantText() && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0;
+		const clientClosedPromptErrorForFinal = clientClosedPromptError && canUseCompletedAssistantTextAfterClientClose ? void 0 : clientClosedPromptError;
+		let finalPromptError = clientClosedPromptErrorForFinal ?? (turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError);
 		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
 		if (isInvalidCodexImagePayloadError(finalPromptErrorMessage)) await clearCodexBindingAfterInvalidImagePayload(activeSessionFile, {
 			phase: "turn_completed",
@@ -9226,13 +9251,20 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		});
 		if (refreshedUsageLimitPromptError) finalPromptError = refreshedUsageLimitPromptError;
-		const finalPromptErrorSource = timedOut || clientClosedPromptError ? "prompt" : result.promptErrorSource;
-		const codexAppServerFailureKind = clientClosedPromptError ? "client_closed_before_turn_completed" : turnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
+		const finalPromptErrorSource = timedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
+		const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : turnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
 		const codexAppServerReplayBlockedReason = codexAppServerFailureKind ? resolveCodexAppServerReplayBlockedReason(result) : void 0;
 		const promptTimeoutOutcome = buildCodexAppServerPromptTimeoutOutcome({
 			result,
-			turnCompletionIdleTimedOut
+			turnCompletionIdleTimedOut,
+			turnWatchTimeoutKind
 		});
+		const codexAppServerFailureDiagnostics = codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind === "completion" ? buildCodexAppServerTimeoutDiagnostics({
+			idleMs: turnWatchTimeoutIdleMs,
+			timeoutMs: turnWatchTimeoutMs,
+			lastActivityReason: turnWatchTimeoutLastActivityReason,
+			details: turnWatchTimeoutDetails
+		}) : void 0;
 		const modelCallFailureKind = classifyCodexModelCallFailureKind({
 			error: finalPromptError,
 			timedOut,
@@ -9363,7 +9395,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				threadId: thread.threadId,
 				turnId: activeTurnId,
 				replaySafe: codexAppServerReplayBlockedReason === void 0,
-				...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {}
+				...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {},
+				...codexAppServerFailureDiagnostics ? { diagnostics: codexAppServerFailureDiagnostics } : {}
 			} } : {},
 			...promptTimeoutOutcome ? { promptTimeoutOutcome } : {},
 			systemPromptReport
@@ -9472,6 +9505,36 @@ function waitForCodexNotificationDispatchTurn() {
 		setImmediate(resolve);
 	});
 }
+function buildCodexAppServerTimeoutDiagnostics(params) {
+	const readString = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "string" && value.trim() ? value : void 0;
+	};
+	const readNumber = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+	};
+	const readBoolean = (key) => {
+		const value = params.details?.[key];
+		return typeof value === "boolean" ? value : void 0;
+	};
+	return {
+		...params.idleMs !== void 0 ? { idleMs: params.idleMs } : {},
+		...params.timeoutMs !== void 0 ? { timeoutMs: params.timeoutMs } : {},
+		...params.lastActivityReason ? { lastActivityReason: params.lastActivityReason } : {},
+		...readString("lastNotificationMethod") ? { lastNotificationMethod: readString("lastNotificationMethod") } : {},
+		...readString("lastNotificationItemId") ? { lastNotificationItemId: readString("lastNotificationItemId") } : {},
+		...readString("lastNotificationItemType") ? { lastNotificationItemType: readString("lastNotificationItemType") } : {},
+		...readString("lastNotificationItemRole") ? { lastNotificationItemRole: readString("lastNotificationItemRole") } : {},
+		...readString("lastAssistantTextPreview") ? { lastAssistantTextPreview: readString("lastAssistantTextPreview") } : {},
+		...readNumber("activeAppServerTurnRequests") !== void 0 ? { activeAppServerTurnRequests: readNumber("activeAppServerTurnRequests") } : {},
+		...readNumber("activeTurnItemCount") !== void 0 ? { activeTurnItemCount: readNumber("activeTurnItemCount") } : {},
+		...readBoolean("terminalTurnNotificationQueued") !== void 0 ? { terminalTurnNotificationQueued: readBoolean("terminalTurnNotificationQueued") } : {},
+		...readBoolean("completionIdleWatchArmed") !== void 0 ? { completionIdleWatchArmed: readBoolean("completionIdleWatchArmed") } : {},
+		...readBoolean("assistantCompletionIdleWatchArmed") !== void 0 ? { assistantCompletionIdleWatchArmed: readBoolean("assistantCompletionIdleWatchArmed") } : {},
+		...readBoolean("terminalIdleWatchArmed") !== void 0 ? { terminalIdleWatchArmed: readBoolean("terminalIdleWatchArmed") } : {}
+	};
+}
 function handleApprovalRequest(params) {
 	return handleCodexAppServerApprovalRequest({
 		method: params.method,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.5-beta.1",
+  "version": "2026.6.5-beta.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.6.5-beta.1",
+      "version": "2026.6.5-beta.2",
       "dependencies": {
         "@openai/codex": "0.135.0",
         "typebox": "1.1.39",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.5-beta.1",
+  "version": "2026.6.5-beta.2",
   "description": "OpenClaw Codex app-server harness and model provider plugin with a Codex-managed GPT catalog.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.6.5-beta.1"
+      "pluginApi": ">=2026.6.5-beta.2"
     },
     "build": {
-      "openclawVersion": "2026.6.5-beta.1"
+      "openclawVersion": "2026.6.5-beta.2"
     },
     "release": {
       "publishToClawHub": true,
@@ -47,7 +47,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.6.5-beta.1"
+    "openclaw": ">=2026.6.5-beta.2"
   },
   "peerDependenciesMeta": {
     "openclaw": {