@openclaw/codex 2026.5.16-beta.2 → 2026.5.16-beta.4

package/dist/{run-attempt-B6gN6CrO.js → run-attempt-DMKAwtUV.js}

@@ -1,16 +1,16 @@
-import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-3ATInASk.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CSY0BFBo.js";
+import { c as resolveCodexAppServerRuntimeOptions, d as withMcpElicitationsApprovalPolicy, i as isCodexAppServerApprovalPolicyAllowedByRequirements, s as readCodexPluginConfig, u as resolveCodexPluginsPolicy } from "./config-B5pq6hEz.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-BGBspNmF.js";
 import { t as isJsonObject } from "./protocol-C9UWI98H.js";
-import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-CA7amCZ8.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-Czoa60Nt.js";
+import { i as isCodexAppServerConnectionClosedError, r as isCodexAppServerApprovalRequest } from "./client-6FkrXfaz.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-XPjLayGw.js";
 import { d as resolveCodexUsageLimitResetAtMs, f as shouldRefreshCodexRateLimitsForUsageLimitMessage, r as formatCodexDisplayText, u as formatCodexUsageLimitErrorMessage } from "./command-formatters-BRW7_Nu7.js";
-import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, l as resolveCodexAppServerAuthProfileId, n as clearSharedCodexAppServerClientIfCurrent, s as refreshCodexAppServerAuthTokens, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-CnbrvEfV.js";
-import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DbdVqMzW.js";
-import { a as defaultCodexAppInventoryCache } from "./plugin-activation-BDU4e-NA.js";
-import { S as normalizeCodexDynamicToolName, _ as projectContextEngineAssemblyForCodex, b as createCodexDynamicToolBridge, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as shouldBuildCodexPluginThreadConfig, h as mergeCodexThreadConfigs, i as buildDeveloperInstructions, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfigInputFingerprint, p as buildCodexPluginThreadConfig, r as buildContextEngineBinding, s as buildTurnStartParams, t as areCodexDynamicToolFingerprintsCompatible, v as resolveCodexContextEngineProjectionMaxChars, x as filterCodexDynamicTools, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-BMK4m_PL.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-DwzPofwS.js";
+import { c as resolveCodexAppServerAuthAccountCacheKey, d as resolveCodexAppServerEnvApiKeyCacheKey, l as resolveCodexAppServerAuthProfileId, s as refreshCodexAppServerAuthTokens, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-DlvmoLBJ.js";
+import { i as readCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DqApZIgD.js";
+import { a as defaultCodexAppInventoryCache } from "./plugin-activation-B49xb7pI.js";
+import { S as normalizeCodexDynamicToolName, _ as projectContextEngineAssemblyForCodex, b as createCodexDynamicToolBridge, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as shouldBuildCodexPluginThreadConfig, h as mergeCodexThreadConfigs, i as buildDeveloperInstructions, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfigInputFingerprint, p as buildCodexPluginThreadConfig, r as buildContextEngineBinding, s as buildTurnStartParams, t as areCodexDynamicToolFingerprintsCompatible, v as resolveCodexContextEngineProjectionMaxChars, x as filterCodexDynamicTools, y as resolveCodexContextEngineProjectionReserveTokens } from "./thread-lifecycle-wcyYqwrl.js";
+import { t as defaultCodexAppServerClientFactory } from "./client-factory-9L6Ie1dC.js";
 import { n as handleCodexAppServerElicitationRequest, r as handleCodexAppServerApprovalRequest, t as filterToolsForVisionInputs } from "./vision-tools-Cm_YicZb.js";
-import { t as ensureCodexComputerUse } from "./computer-use-BX02ojP4.js";
+import { t as ensureCodexComputerUse } from "./computer-use-UJ3dxrXF.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-dvhq-4pi.js";
 import { createHash } from "node:crypto";
 import nodeFs from "node:fs";
@@ -23,6 +23,26 @@ import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugi
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { createRunningTaskRun, finalizeTaskRunByRunId, recordTaskRunProgressByRunId } from "openclaw/plugin-sdk/codex-native-task-runtime";
 import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "@earendil-works/pi-coding-agent";
+//#region extensions/codex/src/app-server/local-runtime-attribution.ts
+const OPENAI_PROVIDER_ID = "openai";
+const OPENAI_RESPONSES_API = "openai-responses";
+const OPENAI_CODEX_PROVIDER_ID = "openai-codex";
+const OPENAI_CODEX_RESPONSES_API = "openai-codex-responses";
+function normalizeRuntimeId(value) {
+	return value?.trim().toLowerCase() ?? "";
+}
+function resolveCodexLocalRuntimeAttribution(params) {
+	const authProfileProvider = normalizeRuntimeId(params.runtimePlan?.auth?.authProfileProviderForAuth);
+	if (normalizeRuntimeId(params.runtimePlan?.observability.harnessId) === "codex" && authProfileProvider !== OPENAI_PROVIDER_ID && normalizeRuntimeId(params.model.provider) === OPENAI_PROVIDER_ID && normalizeRuntimeId(params.model.api) === OPENAI_RESPONSES_API) return {
+		provider: OPENAI_CODEX_PROVIDER_ID,
+		api: OPENAI_CODEX_RESPONSES_API
+	};
+	return {
+		provider: params.provider,
+		api: params.model.api
+	};
+}
+//#endregion
 //#region extensions/codex/src/app-server/native-subagent-task-mirror.ts
 const CODEX_NATIVE_SUBAGENT_RUNTIME = "subagent";
 const CODEX_NATIVE_SUBAGENT_TASK_KIND = "codex-native";
@@ -860,6 +880,7 @@ var CodexAppServerEventProjector = class {
 				data: {
 					phase: "end",
 					backend: "codex-app-server",
+					completed: true,
 					threadId: this.threadId,
 					turnId: this.turnId,
 					itemId
@@ -1017,8 +1038,14 @@ var CodexAppServerEventProjector = class {
 		const text = extractRawAssistantText(item);
 		if (!text) return;
 		const itemId = readString$2(item, "id") ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
+		const phase = readString$2(item, "phase");
+		if (phase) this.assistantPhaseByItem.set(itemId, phase);
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
+		if (phase === "commentary") this.emitCommentaryProgress({
+			itemId,
+			text
+		});
 	}
 	recordNativeGeneratedMedia(item) {
 		if (item?.type !== "imageGeneration") return;
@@ -1327,6 +1354,7 @@ var CodexAppServerEventProjector = class {
 		return await readCodexMirroredSessionHistoryMessages(this.params.sessionFile) ?? [];
 	}
 	createAssistantMessage(text) {
+		const attribution = resolveCodexLocalRuntimeAttribution(this.params);
 		const usage = this.tokenUsage ? {
 			input: this.tokenUsage.input ?? 0,
 			output: this.tokenUsage.output ?? 0,
@@ -1341,8 +1369,8 @@ var CodexAppServerEventProjector = class {
 				type: "text",
 				text
 			}],
-			api: this.params.model.api ?? "openai-codex-responses",
-			provider: this.params.provider,
+			api: attribution.api ?? "openai-codex-responses",
+			provider: attribution.provider,
 			model: this.params.modelId,
 			usage,
 			stopReason: this.aborted ? "aborted" : this.promptError ? "error" : "stop",
@@ -1351,14 +1379,15 @@ var CodexAppServerEventProjector = class {
 		};
 	}
 	createAssistantMirrorMessage(title, text) {
+		const attribution = resolveCodexLocalRuntimeAttribution(this.params);
 		return {
 			role: "assistant",
 			content: [{
 				type: "text",
 				text: `${title}:\n${text}`
 			}],
-			api: this.params.model.api ?? "openai-codex-responses",
-			provider: this.params.provider,
+			api: attribution.api ?? "openai-codex-responses",
+			provider: attribution.provider,
 			model: this.params.modelId,
 			usage: ZERO_USAGE,
 			stopReason: "stop",
@@ -1367,6 +1396,7 @@ var CodexAppServerEventProjector = class {
 	}
 	createToolCallMessage(params) {
 		const args = normalizeToolTranscriptArguments(params.arguments);
+		const attribution = resolveCodexLocalRuntimeAttribution(this.params);
 		return {
 			role: "assistant",
 			content: [{
@@ -1376,8 +1406,8 @@ var CodexAppServerEventProjector = class {
 				arguments: args,
 				input: args
 			}],
-			api: this.params.model.api ?? "openai-codex-responses",
-			provider: this.params.provider,
+			api: attribution.api ?? "openai-codex-responses",
+			provider: attribution.provider,
 			model: this.params.modelId,
 			usage: ZERO_USAGE,
 			stopReason: "toolUse",
@@ -1882,6 +1912,7 @@ function createCodexTrajectoryRecorder(params) {
 	});
 	let queue = Promise.resolve();
 	let seq = 0;
+	const attribution = resolveCodexLocalRuntimeAttribution(params.attempt);
 	return {
 		filePath,
 		recordEvent: (type, data) => {
@@ -1898,9 +1929,9 @@ function createCodexTrajectoryRecorder(params) {
 				sessionKey: params.attempt.sessionKey,
 				runId: params.attempt.runId,
 				workspaceDir: params.cwd,
-				provider: params.attempt.provider,
+				provider: attribution.provider,
 				modelId: params.attempt.modelId,
-				modelApi: params.attempt.model.api,
+				modelApi: attribution.api,
 				data: data ? sanitizeValue(data) : void 0
 			});
 			if (!line) return;
@@ -2186,6 +2217,7 @@ const CODEX_TURN_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS = 1e4;
 const CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_MIN_TTL_MS = 30 * 6e4;
 const CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 5 * 6e4;
+const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 6e4;
 const CODEX_STEER_ALL_DEBOUNCE_MS = 500;
 const LOG_FIELD_MAX_LENGTH = 160;
 const CODEX_NATIVE_PROJECT_DOC_BASENAMES = new Set(["agents.md"]);
@@ -2612,7 +2644,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		prePromptMessageCount = projection.prePromptMessageCount;
 	}
 	const buildPromptFromCurrentInputs = () => resolveAgentHarnessBeforePromptBuildResult({
-		prompt: prependCurrentTurnContext(promptText, params.currentTurnContext),
+		prompt: prependCurrentInboundContext(promptText, params.currentInboundContext),
 		developerInstructions,
 		messages: historyMessages,
 		ctx: hookContext
@@ -2661,11 +2693,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnStartTimeoutMs: params.timeoutMs,
 			signal: runAbortController.signal
 		});
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelay ? buildCodexNativeHookRelayConfig({
+		const nativeHookRelayConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec
-		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0, bundleMcpThreadConfig?.configPatch);
+		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
+		const threadConfig = mergeCodexThreadConfigs(bundleMcpThreadConfig?.configPatch);
 		const pluginThreadConfigEnabled = shouldBuildCodexPluginThreadConfig(pluginConfig);
 		const pluginAppCacheKey = buildCodexPluginAppCacheKey({
 			appServer,
@@ -2708,6 +2741,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 						appServer: pluginAppServer,
 						developerInstructions: promptBuild.developerInstructions,
 						config: threadConfig,
+						finalConfigPatch: nativeHookRelayConfig,
 						mcpServersFingerprint: bundleMcpThreadConfig.fingerprint,
 						mcpServersFingerprintEvaluated: bundleMcpThreadConfig.evaluated,
 						contextEngineProjection,
@@ -2794,9 +2828,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let userInputBridge;
 	let steeringQueue;
 	let completed = false;
+	let terminalTurnNotificationQueued = false;
 	let timedOut = false;
 	let turnCompletionIdleTimedOut = false;
 	let turnCompletionIdleTimeoutMessage;
+	let clientClosedPromptError;
+	let clientClosedAbort = false;
 	let lifecycleStarted = false;
 	let lifecycleTerminalEmitted = false;
 	let resolveCompletion;
@@ -2810,18 +2847,27 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	let turnCompletionIdleTimer;
 	let turnCompletionIdleWatchArmed = false;
 	let turnCompletionIdleWatchPinnedByTerminalError = false;
+	let turnCompletionIdleTimeoutOverrideMs;
 	let turnAssistantCompletionIdleTimer;
 	let turnAssistantCompletionIdleWatchArmed = false;
 	let turnAssistantCompletionLastActivityAt = Date.now();
 	let turnAssistantCompletionLastActivityDetails;
+	const turnAttemptIdleTimeoutMs = Math.max(100, Math.floor(params.timeoutMs));
+	let turnAttemptIdleTimer;
+	let turnAttemptIdleWatchArmed = false;
 	let turnTerminalIdleTimer;
 	let turnTerminalIdleWatchArmed = false;
 	let turnCompletionLastActivityAt = Date.now();
 	let turnCompletionLastActivityReason = "startup";
 	let turnCompletionLastActivityDetails;
+	let turnAttemptLastProgressAt = Date.now();
+	let turnAttemptLastProgressReason = "startup";
+	let turnAttemptLastProgressDetails;
+	let nativeHookRelayLastRenewedAt = 0;
 	let activeAppServerTurnRequests = 0;
 	const activeOpenClawDynamicToolCallIds = /* @__PURE__ */ new Set();
 	const activeTurnItemIds = /* @__PURE__ */ new Set();
+	let turnCrossedToolHandoff = false;
 	const clearTurnCompletionIdleTimer = () => {
 		if (turnCompletionIdleTimer) {
 			clearTimeout(turnCompletionIdleTimer);
@@ -2840,6 +2886,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnAssistantCompletionIdleTimer = void 0;
 		}
 	};
+	const clearTurnAttemptIdleTimer = () => {
+		if (turnAttemptIdleTimer) {
+			clearTimeout(turnAttemptIdleTimer);
+			turnAttemptIdleTimer = void 0;
+		}
+	};
 	const fireTurnAssistantCompletionIdleRelease = () => {
 		if (completed || runAbortController.signal.aborted || !turnAssistantCompletionIdleWatchArmed) return;
 		if (activeAppServerTurnRequests > 0 || activeTurnItemIds.size > 0) {
@@ -2876,10 +2928,40 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		completed = true;
 		resolveCompletion?.();
 	};
+	const fireTurnAttemptIdleTimeout = () => {
+		if (completed || runAbortController.signal.aborted || !turnAttemptIdleWatchArmed) return;
+		const idleMs = Math.max(0, Date.now() - turnAttemptLastProgressAt);
+		if (idleMs < turnAttemptIdleTimeoutMs) {
+			scheduleTurnAttemptIdleWatch();
+			return;
+		}
+		timedOut = true;
+		turnCompletionIdleTimedOut = true;
+		turnCompletionIdleTimeoutMessage = "codex app-server turn idle timed out waiting for turn/completed";
+		projector?.markTimedOut();
+		trajectoryRecorder?.recordEvent("turn.progress_idle_timeout", {
+			threadId: thread.threadId,
+			turnId,
+			idleMs,
+			timeoutMs: turnAttemptIdleTimeoutMs,
+			lastActivityReason: turnAttemptLastProgressReason,
+			...turnAttemptLastProgressDetails
+		});
+		embeddedAgentLog.warn("codex app-server turn idle timed out waiting for progress", {
+			threadId: thread.threadId,
+			turnId,
+			idleMs,
+			timeoutMs: turnAttemptIdleTimeoutMs,
+			lastActivityReason: turnAttemptLastProgressReason,
+			...turnAttemptLastProgressDetails
+		});
+		runAbortController.abort("turn_progress_idle_timeout");
+	};
 	const fireTurnCompletionIdleTimeout = () => {
 		if (completed || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
+		const timeoutMs = turnCompletionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
-		if (idleMs < turnCompletionIdleTimeoutMs) {
+		if (idleMs < timeoutMs) {
 			scheduleTurnCompletionIdleWatch();
 			return;
 		}
@@ -2891,7 +2973,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: turnCompletionIdleTimeoutMs,
+			timeoutMs,
 			lastActivityReason: turnCompletionLastActivityReason,
 			...turnCompletionLastActivityDetails
 		});
@@ -2899,7 +2981,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId,
 			idleMs,
-			timeoutMs: turnCompletionIdleTimeoutMs,
+			timeoutMs,
 			lastActivityReason: turnCompletionLastActivityReason,
 			...turnCompletionLastActivityDetails
 		});
@@ -2938,7 +3020,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		clearTurnCompletionIdleTimer();
 		if (completed || runAbortController.signal.aborted || !turnCompletionIdleWatchArmed || activeAppServerTurnRequests > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - turnCompletionLastActivityAt);
-		const delayMs = Math.max(1, turnCompletionIdleTimeoutMs - elapsedMs);
+		const delayMs = Math.max(1, (turnCompletionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs) - elapsedMs);
 		turnCompletionIdleTimer = setTimeout(fireTurnCompletionIdleTimeout, delayMs);
 		turnCompletionIdleTimer.unref?.();
 	}
@@ -2950,6 +3032,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		turnAssistantCompletionIdleTimer = setTimeout(fireTurnAssistantCompletionIdleRelease, delayMs);
 		turnAssistantCompletionIdleTimer.unref?.();
 	}
+	function scheduleTurnAttemptIdleWatch() {
+		clearTurnAttemptIdleTimer();
+		if (completed || runAbortController.signal.aborted || !turnAttemptIdleWatchArmed) return;
+		const elapsedMs = Math.max(0, Date.now() - turnAttemptLastProgressAt);
+		const delayMs = Math.max(1, turnAttemptIdleTimeoutMs - elapsedMs);
+		turnAttemptIdleTimer = setTimeout(fireTurnAttemptIdleTimeout, delayMs);
+		turnAttemptIdleTimer.unref?.();
+	}
 	function scheduleTurnTerminalIdleWatch() {
 		clearTurnTerminalIdleTimer();
 		if (completed || runAbortController.signal.aborted || !turnTerminalIdleWatchArmed || activeAppServerTurnRequests > 0) return;
@@ -2958,10 +3048,42 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		turnTerminalIdleTimer = setTimeout(fireTurnTerminalIdleTimeout, delayMs);
 		turnTerminalIdleTimer.unref?.();
 	}
+	function scheduleTurnProgressWatches() {
+		scheduleTurnAttemptIdleWatch();
+		scheduleTurnCompletionIdleWatch();
+		scheduleTurnTerminalIdleWatch();
+	}
+	const renewNativeHookRelayForTurnProgress = () => {
+		if (!nativeHookRelay || options.nativeHookRelay?.ttlMs !== void 0) return;
+		const now = Date.now();
+		const renewsRecently = now - nativeHookRelayLastRenewedAt < CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS;
+		const expiresSoon = now >= nativeHookRelay.expiresAtMs - CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS;
+		if (renewsRecently && !expiresSoon) return;
+		nativeHookRelayLastRenewedAt = now;
+		nativeHookRelay.renew(resolveCodexNativeHookRelayTtlMs({
+			explicitTtlMs: void 0,
+			attemptTimeoutMs: turnAttemptIdleTimeoutMs,
+			startupTimeoutMs,
+			turnStartTimeoutMs: params.timeoutMs
+		}));
+	};
 	const touchTurnCompletionActivity = (reason, options) => {
 		turnCompletionLastActivityAt = Date.now();
 		turnCompletionLastActivityReason = reason;
 		turnCompletionLastActivityDetails = options?.details;
+		turnCompletionIdleTimeoutOverrideMs = void 0;
+		if (options?.attemptProgress) {
+			turnAttemptLastProgressAt = turnCompletionLastActivityAt;
+			turnAttemptLastProgressReason = reason;
+			turnAttemptLastProgressDetails = options.details;
+			renewNativeHookRelayForTurnProgress();
+			params.onRunProgress?.({
+				reason,
+				provider: params.provider,
+				model: params.modelId,
+				backend: "codex-app-server"
+			});
+		}
 		emitTrustedDiagnosticEvent({
 			type: "run.progress",
 			runId: params.runId,
@@ -2973,12 +3095,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			turnCompletionIdleWatchArmed = true;
 			turnCompletionIdleWatchPinnedByTerminalError = false;
 		}
-		scheduleTurnCompletionIdleWatch();
-		scheduleTurnTerminalIdleWatch();
+		scheduleTurnProgressWatches();
 	};
 	const disarmTurnCompletionIdleWatch = () => {
 		turnCompletionIdleWatchArmed = false;
 		turnCompletionIdleWatchPinnedByTerminalError = false;
+		turnCompletionIdleTimeoutOverrideMs = void 0;
 		clearTurnCompletionIdleTimer();
 	};
 	const disarmTurnAssistantCompletionIdleWatch = () => {
@@ -2995,6 +3117,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const armTurnCompletionIdleWatch = (options) => {
 		turnCompletionIdleWatchArmed = true;
 		turnCompletionIdleWatchPinnedByTerminalError = options?.pinnedByTerminalError === true;
+		turnCompletionIdleTimeoutOverrideMs = options?.timeoutMs !== void 0 ? Math.max(1, Math.floor(options.timeoutMs)) : void 0;
 		scheduleTurnCompletionIdleWatch();
 	};
 	const emitLifecycleStart = () => {
@@ -3049,6 +3172,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			itemId: item.id
 		});
 	};
+	const isTerminalTurnNotificationForTurn = (notification, notificationTurnId) => {
+		if (!isTurnNotification(notification.params, thread.threadId, notificationTurnId)) return false;
+		return notification.method === "turn/completed" || isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
+	};
 	const handleNotification = async (notification) => {
 		userInputBridge?.handleNotification(notification);
 		if (!projector || !turnId) {
@@ -3058,27 +3185,35 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		const isCurrentTurnNotification = isTurnNotification(notification.params, thread.threadId, turnId);
 		const isTurnCompletion = notification.method === "turn/completed" && isCurrentTurnNotification;
 		if (isCurrentTurnNotification) {
-			touchTurnCompletionActivity(`notification:${notification.method}`, { details: describeNotificationActivity(notification) });
+			touchTurnCompletionActivity(`notification:${notification.method}`, {
+				details: describeNotificationActivity(notification),
+				attemptProgress: true
+			});
 			reportCodexExecutionNotification(notification);
 		}
 		if (isCurrentTurnNotification) updateActiveTurnItemIds(notification, activeTurnItemIds);
 		const unblockedAssistantCompletionRelease = isCurrentTurnNotification && turnAssistantCompletionIdleWatchArmed && notification.method === "item/completed" && activeTurnItemIds.size === 0;
 		const trackedDynamicToolCompletion = isTrackedOpenClawDynamicToolCompletionNotification(notification, activeOpenClawDynamicToolCallIds);
 		const rawToolOutputCompletion = isRawToolOutputCompletionNotification(notification);
-		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !isCompletedAssistantNotification(notification);
+		if (isCurrentTurnNotification && (rawToolOutputCompletion || isNativeToolProgressNotification(notification))) turnCrossedToolHandoff = true;
+		const assistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff);
+		const postToolRawAssistantCompletionNeedsTerminalGuard = isCurrentTurnNotification && turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification) && activeTurnItemIds.size === 0;
+		const shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem = isCurrentTurnNotification && notification.method === "item/completed" && activeTurnItemIds.size === 0 && !trackedDynamicToolCompletion && !assistantCompletionCanRelease;
 		if (isCurrentTurnNotification && notification.method === "error") {
 			if (isRetryableErrorNotification(notification.params)) disarmTurnCompletionIdleWatch();
 			else armTurnCompletionIdleWatch({ pinnedByTerminalError: true });
 			disarmTurnAssistantCompletionIdleWatch();
 		} else if (isTurnCompletion) disarmTurnAssistantCompletionIdleWatch();
-		else if (isCurrentTurnNotification && isCompletedAssistantNotification(notification)) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+		else if (isCurrentTurnNotification && assistantCompletionCanRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+		else if (postToolRawAssistantCompletionNeedsTerminalGuard) armTurnCompletionIdleWatch({ timeoutMs: turnAssistantCompletionIdleTimeoutMs });
 		else if (unblockedAssistantCompletionRelease) armTurnAssistantCompletionIdleWatch(describeNotificationActivity(notification));
 		else if (shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && rawToolOutputCompletion) armTurnCompletionIdleWatch();
 		else if (isCurrentTurnNotification && shouldDisarmAssistantCompletionIdleWatch(notification)) disarmTurnAssistantCompletionIdleWatch();
-		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
+		if (turnCompletionIdleWatchArmed && !turnCompletionIdleWatchPinnedByTerminalError && notification.method !== "turn/completed" && isCurrentTurnNotification && !trackedDynamicToolCompletion && !rawToolOutputCompletion && !postToolRawAssistantCompletionNeedsTerminalGuard && !shouldRearmCompletionIdleWatchAfterLastCurrentTurnItem) disarmTurnCompletionIdleWatch();
 		const isTurnAbortMarker = isCurrentTurnNotification && isCodexTurnAbortMarkerNotification(notification, { currentPromptText: promptBuild.prompt });
-		const isTurnTerminal = isTurnCompletion || isTurnAbortMarker;
+		const isTurnTerminal = isTerminalTurnNotificationForTurn(notification, turnId);
+		if (isTurnTerminal) terminalTurnNotificationQueued = true;
 		try {
 			await waitForCodexNotificationDispatchTurn();
 			await projector.handleNotification(notification);
@@ -3105,16 +3240,21 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			pendingNotifications.push(notification);
 			return Promise.resolve();
 		}
+		if (isTerminalTurnNotificationForTurn(notification, turnId)) terminalTurnNotificationQueued = true;
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
 	const notificationCleanup = client.addNotificationHandler(enqueueNotification);
 	const requestCleanup = client.addRequestHandler(async (request) => {
-		activeAppServerTurnRequests += 1;
-		clearTurnCompletionIdleTimer();
-		disarmTurnAssistantCompletionIdleWatch();
-		touchTurnCompletionActivity(`request:${request.method}`);
 		let armCompletionWatchOnResponse = false;
+		let requestCountsAsTurnActivity = false;
+		const markCurrentTurnRequestProgress = () => {
+			activeAppServerTurnRequests += 1;
+			clearTurnCompletionIdleTimer();
+			disarmTurnAssistantCompletionIdleWatch();
+			requestCountsAsTurnActivity = true;
+			touchTurnCompletionActivity(`request:${request.method}:start`, { attemptProgress: true });
+		};
 		try {
 			if (request.method === "account/chatgptAuthTokens/refresh") return refreshCodexAppServerAuthTokens({
 				agentDir,
@@ -3123,7 +3263,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			});
 			if (!turnId) return;
 			if (request.method === "mcpServer/elicitation/request") {
-				armCompletionWatchOnResponse = true;
+				if (isCurrentThreadOptionalTurnRequestParams(request.params, thread.threadId, turnId)) {
+					armCompletionWatchOnResponse = true;
+					markCurrentTurnRequestProgress();
+				}
 				return handleCodexAppServerElicitationRequest({
 					requestParams: request.params,
 					paramsForRun: params,
@@ -3134,7 +3277,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				});
 			}
 			if (request.method === "item/tool/requestUserInput") {
-				armCompletionWatchOnResponse = true;
+				if (isCurrentThreadTurnRequestParams(request.params, thread.threadId, turnId)) {
+					armCompletionWatchOnResponse = true;
+					markCurrentTurnRequestProgress();
+				}
 				return userInputBridge?.handleRequest({
 					id: request.id,
 					params: request.params
@@ -3142,7 +3288,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 			if (request.method !== "item/tool/call") {
 				if (isCodexAppServerApprovalRequest(request.method)) {
-					armCompletionWatchOnResponse = true;
+					if (isCurrentApprovalTurnRequestParams(request.params, thread.threadId, turnId)) {
+						armCompletionWatchOnResponse = true;
+						markCurrentTurnRequestProgress();
+					}
 					return handleApprovalRequest({
 						method: request.method,
 						params: request.params,
@@ -3157,6 +3306,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			const call = readDynamicToolCallParams(request.params);
 			if (!call || call.threadId !== thread.threadId || call.turnId !== turnId) return;
 			armCompletionWatchOnResponse = true;
+			markCurrentTurnRequestProgress();
+			turnCrossedToolHandoff = true;
 			activeOpenClawDynamicToolCallIds.add(call.callId);
 			trajectoryRecorder?.recordEvent("tool.call", {
 				threadId: call.threadId,
@@ -3233,10 +3384,16 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			});
 			return response;
 		} finally {
-			activeAppServerTurnRequests = Math.max(0, activeAppServerTurnRequests - 1);
-			touchTurnCompletionActivity(`request:${request.method}:response`, { arm: armCompletionWatchOnResponse });
+			if (requestCountsAsTurnActivity) {
+				activeAppServerTurnRequests = Math.max(0, activeAppServerTurnRequests - 1);
+				touchTurnCompletionActivity(`request:${request.method}:response`, {
+					arm: armCompletionWatchOnResponse,
+					attemptProgress: true
+				});
+			} else scheduleTurnProgressWatches();
 		}
 	});
+	let closeCleanup;
 	const forceContextEngineCompactionForCodexOverflow = async (error) => {
 		if (!activeContextEngine?.info.ownsCompaction) return false;
 		embeddedAgentLog.warn("codex app-server context-engine turn overflowed; forcing context-engine compaction", {
@@ -3465,6 +3622,27 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		imagesCount: params.images?.length ?? 0
 	});
 	projector = new CodexAppServerEventProjector(params, thread.threadId, activeTurnId, { nativePostToolUseRelayEnabled: nativeHookRelay?.allowedEvents.includes("post_tool_use") === true });
+	if (isTerminalTurnStatus(turn.turn.status) || pendingNotifications.some((notification) => isTerminalTurnNotificationForTurn(notification, activeTurnId))) terminalTurnNotificationQueued = true;
+	closeCleanup = client.addCloseHandler?.(() => {
+		if (completed || terminalTurnNotificationQueued || runAbortController.signal.aborted) return;
+		clientClosedPromptError = "codex app-server client closed before turn completed";
+		trajectoryRecorder?.recordEvent("turn.client_closed", {
+			threadId: thread.threadId,
+			turnId: activeTurnId
+		});
+		embeddedAgentLog.warn("codex app-server client closed before turn completed", {
+			threadId: thread.threadId,
+			turnId: activeTurnId
+		});
+		clientClosedAbort = true;
+		runAbortController.abort("client_closed");
+		completed = true;
+		clearTurnAttemptIdleTimer();
+		clearTurnCompletionIdleTimer();
+		clearTurnAssistantCompletionIdleTimer();
+		clearTurnTerminalIdleTimer();
+		resolveCompletion?.();
+	});
 	emitLifecycleStart();
 	const activeProjector = projector;
 	turnTerminalIdleWatchArmed = true;
@@ -3495,11 +3673,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		abort: () => runAbortController.abort("aborted")
 	};
 	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
-	const timeout = setTimeout(() => {
-		timedOut = true;
-		projector?.markTimedOut();
-		runAbortController.abort("timeout");
-	}, Math.max(100, params.timeoutMs));
+	turnAttemptIdleWatchArmed = true;
+	turnTerminalIdleWatchArmed = true;
+	touchTurnCompletionActivity("turn:start", { attemptProgress: true });
 	const abortListener = () => {
 		const shouldRetireClient = timedOut;
 		interruptCodexTurnBestEffort(client, {
@@ -3519,8 +3695,8 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	try {
 		await completion;
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
-		const finalAborted = result.aborted || runAbortController.signal.aborted;
-		let finalPromptError = turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError;
+		const finalAborted = result.aborted || runAbortController.signal.aborted && !clientClosedAbort;
+		let finalPromptError = clientClosedPromptError ?? (turnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : timedOut ? "codex app-server attempt timed out" : result.promptError);
 		const finalPromptErrorMessage = typeof finalPromptError === "string" ? finalPromptError : finalPromptError ? formatErrorMessage(finalPromptError) : void 0;
 		if (shouldRefreshCodexRateLimitsForUsageLimitMessage(finalPromptErrorMessage)) finalPromptError = await refreshCodexUsageLimitErrorMessage({
 			client,
@@ -3532,7 +3708,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			timeoutMs: appServer.requestTimeoutMs,
 			signal: runAbortController.signal
 		});
-		const finalPromptErrorSource = timedOut ? "prompt" : result.promptErrorSource;
+		const finalPromptErrorSource = timedOut || clientClosedPromptError ? "prompt" : result.promptErrorSource;
 		recordCodexTrajectoryCompletion(trajectoryRecorder, {
 			attempt: params,
 			result,
@@ -3638,11 +3814,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			error: "codex app-server run completed without lifecycle terminal event"
 		});
 		if (trajectoryRecorder && !trajectoryEndRecorded) trajectoryRecorder.recordEvent("session.ended", {
-			status: timedOut || runAbortController.signal.aborted ? "interrupted" : "cleanup",
+			status: timedOut || runAbortController.signal.aborted && !clientClosedAbort ? "interrupted" : "cleanup",
 			threadId: thread.threadId,
 			turnId: activeTurnId,
 			timedOut,
-			aborted: runAbortController.signal.aborted
+			aborted: runAbortController.signal.aborted && !clientClosedAbort
 		});
 		await runAgentCleanupStep({
 			runId: params.runId,
@@ -3655,12 +3831,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		});
 		if (!timedOut && !runAbortController.signal.aborted) await steeringQueue?.flushPending();
 		userInputBridge?.cancelPending();
-		clearTimeout(timeout);
+		clearTurnAttemptIdleTimer();
 		clearTurnCompletionIdleTimer();
 		clearTurnAssistantCompletionIdleTimer();
 		clearTurnTerminalIdleTimer();
 		notificationCleanup();
 		requestCleanup();
+		closeCleanup?.();
 		nativeHookRelay?.unregister();
 		runAbortController.signal.removeEventListener("abort", abortListener);
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
@@ -4217,6 +4394,10 @@ function isCompletedAssistantNotification(notification) {
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	return Boolean(item && readString(item, "type") === "agentMessage" && readString(item, "phase") !== "commentary");
 }
+function isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff) {
+	if (isCompletedAssistantNotification(notification)) return true;
+	return !turnCrossedToolHandoff && isRawAssistantCompletionNotification(notification);
+}
 function shouldDisarmAssistantCompletionIdleWatch(notification) {
 	if (!isJsonObject(notification.params)) return false;
 	if (notification.method === "item/started") return true;
@@ -4241,6 +4422,23 @@ function isRawToolOutputCompletionNotification(notification) {
 	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
 	return item ? readString(item, "type") === "custom_tool_call_output" : false;
 }
+function isNativeToolProgressNotification(notification) {
+	if (notification.method !== "item/started" && notification.method !== "item/completed" && notification.method !== "item/updated") return false;
+	if (!isJsonObject(notification.params)) return false;
+	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
+	switch (item ? readString(item, "type") : void 0) {
+		case "commandExecution":
+		case "fileChange":
+		case "mcpToolCall":
+		case "webSearch": return true;
+		default: return false;
+	}
+}
+function isRawAssistantCompletionNotification(notification) {
+	if (notification.method !== "rawResponseItem/completed" || !isJsonObject(notification.params)) return false;
+	const item = isJsonObject(notification.params.item) ? notification.params.item : void 0;
+	return Boolean(item && readString(item, "type") === "message" && readString(item, "role") === "assistant" && readString(item, "phase") !== "commentary" && readRawAssistantTextPreview(item));
+}
 function readRawAssistantTextPreview(item) {
 	if (readString(item, "role") !== "assistant" || !Array.isArray(item.content)) return;
 	const text = item.content.flatMap((content) => {
@@ -4255,6 +4453,19 @@ function isTurnNotification(value, threadId, turnId) {
 	if (!isJsonObject(value)) return false;
 	return readString(value, "threadId") === threadId && readNotificationTurnId(value) === turnId;
 }
+function isCurrentThreadTurnRequestParams(value, threadId, turnId) {
+	if (!isJsonObject(value)) return false;
+	return readString(value, "threadId") === threadId && readString(value, "turnId") === turnId;
+}
+function isCurrentApprovalTurnRequestParams(value, threadId, turnId) {
+	if (!isJsonObject(value)) return false;
+	return (readString(value, "threadId") ?? readString(value, "conversationId")) === threadId && readString(value, "turnId") === turnId;
+}
+function isCurrentThreadOptionalTurnRequestParams(value, threadId, turnId) {
+	if (!isJsonObject(value) || readString(value, "threadId") !== threadId) return false;
+	const requestTurnId = value.turnId;
+	return requestTurnId === null || requestTurnId === void 0 || requestTurnId === turnId;
+}
 function isRetryableErrorNotification(value) {
 	if (!isJsonObject(value)) return false;
 	return readBoolean(value, "willRetry") === true || readBoolean(value, "will_retry") === true;
@@ -4522,7 +4733,7 @@ function codexExecutionToolName(item) {
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }
-function prependCurrentTurnContext(prompt, context) {
+function prependCurrentInboundContext(prompt, context) {
 	const text = context?.text.trim();
 	return text ? [text, prompt].filter(Boolean).join("\n\n") : prompt;
 }