@openclaw/codex 2026.6.11 → 2026.7.1-beta.2

package/dist/{run-attempt-CXxtFC9d.js → run-attempt-DikbXia_.js}

@@ -1,17 +1,17 @@
 import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
-import { A as resolveCodexContextEngineProjectionReserveTokens, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, H as readCodexNotificationTurnId, M as buildCodexPluginThreadConfigInputFingerprint, N as mergeCodexThreadConfigs, O as projectContextEngineAssemblyForCodex, P as shouldBuildCodexPluginThreadConfig, R as defaultCodexAppInventoryCache, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, j as buildCodexPluginThreadConfig, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as describeCodexNotificationCorrelation } from "./thread-lifecycle-DtT3-ehU.js";
-import { C as readCodexNotificationItem, D as updateActiveTurnItemIds, E as shouldDisarmAssistantCompletionIdleWatch, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-BYnndyFl.js";
-import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-CszD0vP3.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-B19q5BIX.js";
-import { i as formatCodexUsageLimitErrorMessage, o as resolveCodexUsageLimitResetAtMs, s as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-B-OHpbD3.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-CLrtWgrD.js";
-import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-HOuPt-E0.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-C9ILt7bl.js";
-import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
-import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
-import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-Bm6HsGob.js";
-import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-D7hnTO76.js";
-import { t as ensureCodexComputerUse } from "./computer-use-ClrJwoFp.js";
+import { A as resolveCodexContextEngineProjectionReserveTokens, B as describeCodexNotificationCorrelation, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, F as shouldBuildCodexPluginThreadConfig, H as readCodexNotificationThreadId, M as buildCodexPluginThreadConfig, N as buildCodexPluginThreadConfigInputFingerprint, O as projectContextEngineAssemblyForCodex, P as mergeCodexThreadConfigs, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-D6R40plk.js";
+import { C as readCodexNotificationItem, D as updateActiveCompletionBlockerItemIds, E as shouldDisarmAssistantCompletionIdleWatch, O as updateActiveTurnItemIds, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-tqyQ_Tdn.js";
+import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CJiWigAJ.js";
+import { l as resolveCodexUsageLimitResetAtMs, s as formatCodexUsageLimitErrorMessage, u as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-nmtMDcGH.js";
+import { a as isCodexAppServerConnectionClosedError, c as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions } from "./client-IcTBKEqA.js";
+import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-Cm0Gg7Z1.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-BrZUG9jj.js";
+import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-B7hqD3Xj.js";
+import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-rR6TDJA3.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-DfFu9JH_.js";
+import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-wqedK49Z.js";
+import { t as ensureCodexComputerUse } from "./computer-use-CpurU-G9.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
@@ -947,6 +947,7 @@ function applyCodexTurnNotificationState(params) {
 		});
 		params.onReportExecutionNotification(notification);
 		updateActiveTurnItemIds(notification, params.activeTurnItemIds);
+		updateActiveCompletionBlockerItemIds(notification, params.activeCompletionBlockerItemIds);
 		if (notification.method === "item/completed" && params.activeTurnItemIds.size === 0) params.onScheduleTerminalDynamicToolReleaseCheck();
 	}
 	const unblockedAssistantCompletionRelease = isCurrentTurnNotification && turnWatches.isAssistantCompletionIdleWatchArmed() && notification.method === "item/completed" && params.activeTurnItemIds.size === 0;
@@ -2628,6 +2629,7 @@ async function startCodexAttemptThread(params) {
 										timeoutMs: params.appServer.requestTimeoutMs,
 										signal
 									}),
+									configCwd: startupExecutionCwd,
 									appCache: defaultCodexAppInventoryCache,
 									appCacheKey: pluginAppCacheKey
 								})
@@ -2902,7 +2904,7 @@ function createCodexAttemptTurnWatchController(params) {
 	};
 	function scheduleCompletionIdleWatch() {
 		clearCompletionIdleTimer();
-		if (params.isCompleted() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
+		if (params.isCompleted() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - completionLastActivityAt);
 		const delayMs = Math.max(1, (completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs) - elapsedMs);
 		completionIdleTimer = setTimeout(fireCompletionIdleTimeout, delayMs);
@@ -2910,7 +2912,7 @@ function createCodexAttemptTurnWatchController(params) {
 	}
 	function scheduleAssistantCompletionIdleWatch() {
 		clearAssistantCompletionIdleTimer();
-		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed) return;
+		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed || params.getActiveFinalizationHookCount() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
 		const delayMs = Math.max(1, turnAssistantCompletionIdleTimeoutMs - elapsedMs);
 		assistantCompletionIdleTimer = setTimeout(fireAssistantCompletionIdleRelease, delayMs);
@@ -2938,7 +2940,7 @@ function createCodexAttemptTurnWatchController(params) {
 		scheduleTerminalIdleWatch();
 	}
 	function isCompletionIdleTimeoutDueBeforeAttempt(timeoutMs) {
-		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return false;
+		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return false;
 		const completionTimeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		if (completionTimeoutMs > timeoutMs) return false;
 		return Math.max(0, Date.now() - completionLastActivityAt) >= completionTimeoutMs;
@@ -2953,10 +2955,16 @@ function createCodexAttemptTurnWatchController(params) {
 	}
 	function fireAssistantCompletionIdleRelease() {
 		if (params.isCompleted() || params.signal.aborted || !assistantCompletionIdleWatchArmed) return;
-		if (params.getActiveAppServerTurnRequests() > 0 || params.getActiveTurnItemCount() > 0) {
+		if (params.getActiveAppServerTurnRequests() > 0 || params.getActiveTurnItemCount() > 0 || params.getActiveFinalizationHookCount() > 0) {
 			scheduleAssistantCompletionIdleWatch();
 			return;
 		}
+		if (!params.canReleaseAssistantCompletionIdle()) {
+			assistantCompletionIdleWatchArmed = false;
+			assistantCompletionLastActivityDetails = void 0;
+			clearAssistantCompletionIdleTimer();
+			return;
+		}
 		const idleMs = Math.max(0, Date.now() - assistantCompletionLastActivityAt);
 		if (idleMs < turnAssistantCompletionIdleTimeoutMs) {
 			scheduleAssistantCompletionIdleWatch();
@@ -3028,7 +3036,7 @@ function createCodexAttemptTurnWatchController(params) {
 		params.onAbort("turn_progress_idle_timeout");
 	}
 	function fireCompletionIdleTimeout() {
-		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
+		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return;
 		const timeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - completionLastActivityAt);
 		if (idleMs < timeoutMs) {
@@ -3805,6 +3813,9 @@ var CodexAppServerEventProjector = class {
 		this.assistantTextByItem = /* @__PURE__ */ new Map();
 		this.assistantItemOrder = [];
 		this.assistantPhaseByItem = /* @__PURE__ */ new Map();
+		this.latestTerminalAssistantCandidateSuperseded = false;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = false;
+		this.terminalAssistantCandidateEarlierActiveItemIds = /* @__PURE__ */ new Set();
 		this.lastCommentaryProgressTextByItem = /* @__PURE__ */ new Map();
 		this.pendingRawCommentaryEchoes = 0;
 		this.reasoningTextByGroup = /* @__PURE__ */ new Map();
@@ -3853,8 +3864,33 @@ var CodexAppServerEventProjector = class {
 		return this.completedTurn?.status;
 	}
 	hasCompletedTerminalAssistantText() {
+		const latestCompletedItemId = this.latestCompletedTerminalAssistantItemId;
+		if (!latestCompletedItemId) return false;
 		const finalItem = this.resolveFinalAssistantTextItem();
-		return finalItem !== void 0 && this.completedItemIds.has(finalItem.itemId);
+		return this.latestCompletedItemId === latestCompletedItemId && finalItem?.itemId === latestCompletedItemId && this.completedItemIds.has(latestCompletedItemId);
+	}
+	getLatestTerminalAssistantCandidate() {
+		const itemId = this.latestTerminalAssistantCandidateItemId;
+		if (!itemId) return;
+		const text = this.assistantTextByItem.get(itemId)?.trim();
+		return {
+			itemId,
+			hasText: Boolean(text && !this.toolProgressTexts.has(text))
+		};
+	}
+	hasLatestTerminalAssistantCandidateText() {
+		return !this.latestTerminalAssistantCandidateSuperseded && this.getLatestTerminalAssistantCandidate()?.hasText === true;
+	}
+	canReleaseLatestTerminalAssistantAfterToolHandoff() {
+		return this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff && this.hasLatestTerminalAssistantCandidateText();
+	}
+	/** Restores a completed final item after only the enclosing turn timeout fired. */
+	recoverCompletedTerminalAssistantAfterTurnWatchTimeout() {
+		if (!this.aborted || this.promptError !== "codex app-server attempt timed out" || !this.hasCompletedTerminalAssistantText()) return false;
+		this.aborted = false;
+		this.promptError = void 0;
+		this.promptErrorSource = null;
+		return true;
 	}
 	/** Resolves the shared model-order position for a native tool item. */
 	recordNativeToolOutcome(item) {
@@ -3974,6 +4010,7 @@ var CodexAppServerEventProjector = class {
 			currentAttemptAssistant,
 			...this.lastNativeToolError ? { lastToolError: this.lastNativeToolError } : {},
 			didSendViaMessagingTool: toolTelemetry.didSendViaMessagingTool,
+			didDeliverSourceReplyViaMessageTool: toolTelemetry.didDeliverSourceReplyViaMessageTool === true,
 			messagingToolSentTexts: toolTelemetry.messagingToolSentTexts,
 			messagingToolSentMediaUrls: toolTelemetry.messagingToolSentMediaUrls,
 			messagingToolSentTargets: toolTelemetry.messagingToolSentTargets,
@@ -4044,9 +4081,12 @@ var CodexAppServerEventProjector = class {
 		const itemId = readString$5(params, "itemId") ?? readString$5(params, "id") ?? "assistant";
 		const delta = readString$5(params, "delta") ?? "";
 		if (!delta) return;
+		if (itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		this.rememberAssistantPhase(readItem(params.item));
 		const phase = readString$5(params, "phase");
 		if (phase) this.assistantPhaseByItem.set(itemId, phase);
+		const isCommentary = this.isCommentaryAssistantItem(itemId);
+		if (!isCommentary && itemId !== this.latestTerminalAssistantCandidateItemId) this.markTerminalAssistantCandidateSupersededBy();
 		if (!this.assistantStarted) {
 			this.assistantStarted = true;
 			await this.params.onAssistantMessageStart?.();
@@ -4054,7 +4094,7 @@ var CodexAppServerEventProjector = class {
 		this.rememberAssistantItem(itemId);
 		const text = `${this.assistantTextByItem.get(itemId) ?? ""}${delta}`;
 		this.assistantTextByItem.set(itemId, text);
-		if (this.isCommentaryAssistantItem(itemId)) this.emitCommentaryProgress({
+		if (isCommentary) this.emitCommentaryProgress({
 			itemId,
 			text
 		});
@@ -4128,8 +4168,15 @@ var CodexAppServerEventProjector = class {
 	async handleItemStarted(params) {
 		const item = readItem(params.item);
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
+		if (item?.type === "agentMessage" && itemId && itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		this.rememberAssistantPhase(item);
-		if (itemId) this.activeItemIds.add(itemId);
+		if (itemId) {
+			this.activeItemIds.add(itemId);
+			if (itemId !== this.latestTerminalAssistantCandidateItemId) {
+				this.markTerminalAssistantCandidateSupersededBy(itemId, { preserveEarlierActiveItem: true });
+				if (this.latestTerminalAssistantCandidateSuperseded) this.pendingRawTerminalAssistantEchoItemId = void 0;
+			}
+		}
 		this.recordNativeToolOutcome(item);
 		if (item?.type === "contextCompaction" && itemId) {
 			this.activeCompactionItemIds.add(itemId);
@@ -4183,11 +4230,21 @@ var CodexAppServerEventProjector = class {
 		this.recordNativeToolOutcome(item);
 		this.clearTerminalPresentationForNativeItem(item);
 		const itemId = item?.id ?? readString$5(params, "itemId") ?? readString$5(params, "id");
+		if (item?.type === "agentMessage" && itemId && itemId !== this.pendingRawTerminalAssistantEchoItemId) this.pendingRawTerminalAssistantEchoItemId = void 0;
 		if (itemId) {
 			this.activeItemIds.delete(itemId);
 			this.completedItemIds.add(itemId);
+			this.latestCompletedItemId = itemId;
 		}
 		this.rememberAssistantPhase(item);
+		if (item?.type === "agentMessage" && !this.isCommentaryAssistantItem(item.id)) {
+			this.latestCompletedTerminalAssistantItemId = item.id;
+			this.markLatestTerminalAssistantCandidate(item.id);
+			this.pendingRawTerminalAssistantEchoItemId = item.id;
+		} else if (itemId) {
+			this.markTerminalAssistantCandidateSupersededBy(itemId, { preserveEarlierActiveItem: true });
+			if (this.latestTerminalAssistantCandidateSuperseded) this.pendingRawTerminalAssistantEchoItemId = void 0;
+		}
 		if (item?.type === "agentMessage" && typeof item.text === "string") {
 			this.rememberAssistantItem(item.id);
 			this.assistantTextByItem.set(item.id, item.text);
@@ -4425,16 +4482,36 @@ var CodexAppServerEventProjector = class {
 	async handleRawResponseItemCompleted(params) {
 		const item = isJsonObject(params.item) ? params.item : void 0;
 		if (!item) return;
-		await this.recordRawGeneratedImageMedia(item);
-		if (readString$5(item, "role") !== "assistant") return;
+		const role = readString$5(item, "role");
 		const phase = readString$5(item, "phase");
+		const rawItemId = readString$5(item, "id");
+		const candidateWasSupersededBeforeRaw = this.latestTerminalAssistantCandidateSuperseded;
+		const pendingTerminalAssistantEchoItemId = this.pendingRawTerminalAssistantEchoItemId;
+		const isPendingTerminalAssistantEcho = role === "assistant" && phase !== "commentary" && pendingTerminalAssistantEchoItemId !== void 0 && (rawItemId === void 0 || rawItemId === pendingTerminalAssistantEchoItemId);
+		if (pendingTerminalAssistantEchoItemId !== void 0 && !isPendingTerminalAssistantEcho) this.pendingRawTerminalAssistantEchoItemId = void 0;
+		if (!isPendingTerminalAssistantEcho) {
+			this.latestCompletedItemId = void 0;
+			this.markTerminalAssistantCandidateSupersededBy(rawItemId);
+		}
+		await this.recordRawGeneratedImageMedia(item);
+		if (role !== "assistant") return;
 		if (phase === "commentary" && this.pendingRawCommentaryEchoes > 0) {
 			this.pendingRawCommentaryEchoes -= 1;
 			return;
 		}
 		const text = extractRawAssistantText(item);
+		if (isPendingTerminalAssistantEcho) {
+			const typedItemId = pendingTerminalAssistantEchoItemId;
+			this.pendingRawTerminalAssistantEchoItemId = void 0;
+			if (this.assistantTextByItem.get(typedItemId)?.trim() || !text) return;
+			this.rememberAssistantItem(typedItemId);
+			this.assistantTextByItem.set(typedItemId, text);
+			return;
+		}
 		if (!text) return;
-		const itemId = readString$5(item, "id") ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
+		const itemId = rawItemId ?? `raw-assistant-${this.assistantItemOrder.length + 1}`;
+		const isIdlessTerminalAssistantAfterCompletedWork = candidateWasSupersededBeforeRaw && rawItemId === void 0 && pendingTerminalAssistantEchoItemId === void 0 && this.activeItemIds.size === 0;
+		if (phase !== "commentary" && candidateWasSupersededBeforeRaw && itemId !== this.streamedPartialAssistantItemId && !isIdlessTerminalAssistantAfterCompletedWork) return;
 		if (phase) this.assistantPhaseByItem.set(itemId, phase);
 		this.rememberAssistantItem(itemId);
 		this.assistantTextByItem.set(itemId, text);
@@ -4442,6 +4519,23 @@ var CodexAppServerEventProjector = class {
 			itemId,
 			text
 		});
+		else this.markLatestTerminalAssistantCandidate(itemId, { canReleaseAfterToolHandoff: isIdlessTerminalAssistantAfterCompletedWork });
+	}
+	markLatestTerminalAssistantCandidate(itemId, options) {
+		this.latestTerminalAssistantCandidateItemId = itemId;
+		this.latestTerminalAssistantCandidateSuperseded = false;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = options?.canReleaseAfterToolHandoff === true;
+		this.terminalAssistantCandidateEarlierActiveItemIds = new Set(this.activeItemIds);
+	}
+	markTerminalAssistantCandidateSupersededBy(itemId, options) {
+		if (!this.latestTerminalAssistantCandidateItemId) return;
+		if (itemId && this.terminalAssistantCandidateEarlierActiveItemIds.has(itemId)) {
+			if (!options?.preserveEarlierActiveItem) this.terminalAssistantCandidateEarlierActiveItemIds.delete(itemId);
+			return;
+		}
+		this.latestTerminalAssistantCandidateSuperseded = true;
+		this.latestTerminalAssistantCandidateCanReleaseAfterToolHandoff = false;
+		this.terminalAssistantCandidateEarlierActiveItemIds.clear();
 	}
 	recordNativeGeneratedMedia(item) {
 		if (item?.type !== "imageGeneration") return;
@@ -7112,6 +7206,7 @@ const JWT_VALUE_RE = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]
 const COOKIE_PAIR_RE = /\b([A-Za-z][A-Za-z0-9_.-]{1,64})=([A-Za-z0-9+/._~%=-]{16,})(?=;|\s|$)/gu;
 const TRAJECTORY_RUNTIME_FILE_MAX_BYTES = 50 * 1024 * 1024;
 const TRAJECTORY_RUNTIME_EVENT_MAX_BYTES = 256 * 1024;
+const TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS = ["usage", "promptCache"];
 /** Resolves secure create/truncate flags for trajectory pointer files. */
 function resolveCodexTrajectoryPointerFlags(constants = fsSync.constants) {
 	const noFollow = constants.O_NOFOLLOW;
@@ -7129,16 +7224,41 @@ function boundedTrajectoryLine(event) {
 	const line = JSON.stringify(event);
 	const bytes = Buffer.byteLength(line, "utf8");
 	if (bytes <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${line}\n`;
-	const truncated = JSON.stringify({
-		...event,
-		data: {
-			truncated: true,
-			originalBytes: bytes,
-			limitBytes: TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
-			reason: "trajectory-event-size-limit"
+	const originalData = event.data && typeof event.data === "object" && !Array.isArray(event.data) ? event.data : {};
+	const originalDataKeys = Object.keys(originalData);
+	const preservedDataKeys = /* @__PURE__ */ new Set();
+	const baseData = {
+		truncated: true,
+		originalBytes: bytes,
+		limitBytes: TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
+		reason: "trajectory-event-size-limit"
+	};
+	const buildTruncatedLine = (includeDroppedFields) => {
+		const data = { ...baseData };
+		for (const key of TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS) if (preservedDataKeys.has(key)) data[key] = originalData[key];
+		if (includeDroppedFields) {
+			const droppedFields = originalDataKeys.filter((key) => !preservedDataKeys.has(key));
+			if (droppedFields.length > 0) data.droppedFields = droppedFields;
+		}
+		const truncated = JSON.stringify({
+			...event,
+			data
+		});
+		if (Buffer.byteLength(truncated, "utf8") <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${truncated}\n`;
+	};
+	let best = buildTruncatedLine(true) ?? buildTruncatedLine(false);
+	if (!best) return;
+	for (const key of TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS) {
+		if (!Object.hasOwn(originalData, key)) continue;
+		preservedDataKeys.add(key);
+		const next = buildTruncatedLine(true) ?? buildTruncatedLine(false);
+		if (next) {
+			best = next;
+			continue;
 		}
-	});
-	if (Buffer.byteLength(truncated, "utf8") <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${truncated}\n`;
+		preservedDataKeys.delete(key);
+	}
+	return best;
 }
 function resolveTrajectoryPointerFilePath(sessionFile) {
 	return sessionFile.endsWith(".jsonl") ? `${sessionFile.slice(0, -6)}.trajectory-path.json` : `${sessionFile}.trajectory-path.json`;
@@ -7585,6 +7705,10 @@ function readRequestId(record) {
 const CODEX_NATIVE_HOOK_RELAY_RENEW_INTERVAL_MS = 6e4;
 const CODEX_APP_SERVER_PROJECTED_CHARS_PER_TOKEN = 4;
 const CODEX_APP_SERVER_ACTIVE_NATIVE_TURN_WAIT_TIMEOUT_MS = 3e4;
+function shouldKeepCodexSharedAbortOpen(params) {
+	if (params.explicitCancellationObserved || params.result.aborted || params.result.externalAbort) return false;
+	return params.trigger === "memory" || !params.attemptSucceeded;
+}
 const ensuredCodexWorkspaceDirs = /* @__PURE__ */ new Set();
 function withCodexAppServerFastModeServiceTier(appServer, params) {
 	const fastMode = typeof params.fastMode === "function" ? params.fastMode() : params.fastMode;
@@ -7802,8 +7926,28 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	});
 	preDynamicStartupStages.mark("native-hook-relay");
 	const runAbortController = new AbortController();
+	let explicitCancellationObserved = false;
+	let explicitCancellationReason;
+	let terminalOutcomeFrozen = false;
+	let sharedAbortAllowedAfterTerminalOutcome = false;
+	let attemptAbortNotified = false;
+	const notifyAttemptAbort = () => {
+		if (attemptAbortNotified) return;
+		attemptAbortNotified = true;
+		params.onAttemptAbort?.();
+	};
+	const abortExplicitly = (reason) => {
+		if (terminalOutcomeFrozen) {
+			if (sharedAbortAllowedAfterTerminalOutcome) notifyAttemptAbort();
+			return;
+		}
+		notifyAttemptAbort();
+		explicitCancellationObserved = true;
+		explicitCancellationReason ??= reason;
+		runAbortController.abort(reason);
+	};
 	const abortFromUpstream = () => {
-		runAbortController.abort(params.abortSignal?.reason ?? "upstream_abort");
+		abortExplicitly(params.abortSignal?.reason ?? "upstream_abort");
 	};
 	if (params.abortSignal?.aborted) abortFromUpstream();
 	else params.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
@@ -8021,9 +8165,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			currentChannelProvider: resolveCodexMessageToolProvider(params),
 			currentChannelId: params.currentChannelId,
 			currentMessagingTarget: params.currentMessagingTarget,
+			currentMessageId: params.currentMessageId,
 			currentThreadId: params.currentThreadTs,
 			replyToMode: params.replyToMode,
 			hasRepliedRef: params.hasRepliedRef,
+			sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 			onToolOutcome: onCodexToolOutcome,
 			allocateToolOutcomeOrdinal: allocateCodexToolOutcomeOrdinal
 		}
@@ -8193,6 +8339,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		developerInstructions,
 		messages: codexModelInputHistoryMessages,
 		ctx: hookContext,
+		bootstrapContextRunKind: params.bootstrapContextRunKind,
 		..."beforeAgentStartResult" in params ? { beforeAgentStartResult: params.beforeAgentStartResult } : {}
 	});
 	const resolveShiftedPromptInputRange = (prompt, promptInputRange, turnPromptText) => {
@@ -8488,6 +8635,46 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		client = startupResult.client;
 		thread = startupResult.thread;
 		pluginAppServer = startupResult.pluginAppServer;
+		if (thread.lifecycle.action === "started") {
+			const activeThreadReviewerPolicyContext = resolveCodexModelBackedReviewerPolicyContext({
+				provider: params.provider,
+				model: params.modelId,
+				bindingModelProvider: thread.modelProvider,
+				bindingModel: thread.model,
+				nativeAuthProfile: isCodexAppServerNativeAuthProfile({
+					authProfileId: startupAuthProfileId,
+					authProfileStore: params.authProfileStore,
+					agentDir,
+					config: params.config
+				})
+			});
+			const activeThreadAppServer = resolveCodexAppServerForModelProvider({
+				appServer: resolveCodexAppServerRuntimeOptions({
+					pluginConfig,
+					execPolicy,
+					modelProvider: activeThreadReviewerPolicyContext.modelProvider,
+					model: activeThreadReviewerPolicyContext.model,
+					config: params.config,
+					agentDir,
+					openClawSandboxActive: sandbox?.enabled === true
+				}),
+				provider: activeThreadReviewerPolicyContext.modelProvider,
+				model: activeThreadReviewerPolicyContext.model,
+				config: params.config,
+				env: process.env,
+				agentDir
+			});
+			const previousApprovalsReviewer = pluginAppServer.approvalsReviewer;
+			pluginAppServer = {
+				...pluginAppServer,
+				approvalsReviewer: activeThreadAppServer.approvalsReviewer
+			};
+			if (pluginAppServer.approvalsReviewer !== previousApprovalsReviewer) embeddedAgentLog.info("codex app-server approval reviewer updated from active thread model provider", {
+				from: previousApprovalsReviewer,
+				to: pluginAppServer.approvalsReviewer,
+				modelProvider: activeThreadReviewerPolicyContext.modelProvider
+			});
+		}
 		sandboxExecEnvironmentAcquired = Boolean(startupResult.sandboxEnvironment);
 		codexEnvironmentSelection = startupResult.environmentSelection;
 		codexExecutionCwd = startupResult.executionCwd;
@@ -8546,12 +8733,17 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const turnCompletionIdleTimeoutMs = resolveCodexTurnCompletionIdleTimeoutMs(options.turnCompletionIdleTimeoutMs ?? appServer.turnCompletionIdleTimeoutMs);
 	const turnAssistantCompletionIdleTimeoutMs = resolveCodexTurnAssistantCompletionIdleTimeoutMs(options.turnAssistantCompletionIdleTimeoutMs);
 	const postToolRawAssistantCompletionIdleTimeoutMs = resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(options.postToolRawAssistantCompletionIdleTimeoutMs ?? appServer.postToolRawAssistantCompletionIdleTimeoutMs, turnAssistantCompletionIdleTimeoutMs);
-	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs);
+	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs, params.runTimeoutOverrideMs);
 	const turnAttemptIdleTimeoutMs = Math.max(100, Math.floor(params.timeoutMs));
 	let nativeHookRelayLastRenewedAt = 0;
 	let activeAppServerTurnRequests = 0;
 	const pendingOpenClawDynamicToolCompletionIds = /* @__PURE__ */ new Set();
 	const activeTurnItemIds = /* @__PURE__ */ new Set();
+	const activeCompletionBlockerItemIds = /* @__PURE__ */ new Set();
+	const activeFinalizationHookRunIds = /* @__PURE__ */ new Set();
+	const finalizationHookBatchStatuses = /* @__PURE__ */ new Map();
+	let unsettledFinalizationHookCount = 0;
+	let rejectedFinalizationHookAssistant;
 	let turnCrossedToolHandoff = false;
 	let pendingTerminalDynamicToolRelease;
 	let terminalDynamicToolReleaseCheckScheduled = false;
@@ -8582,6 +8774,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		isTerminalTurnNotificationQueued: () => terminalTurnNotificationQueued,
 		getActiveAppServerTurnRequests: () => activeAppServerTurnRequests,
 		getActiveTurnItemCount: () => activeTurnItemIds.size,
+		getActiveCompletionBlockerItemCount: () => activeCompletionBlockerItemIds.size,
+		getActiveFinalizationHookCount: () => unsettledFinalizationHookCount,
+		canReleaseAssistantCompletionIdle: () => projectorRef.current?.hasLatestTerminalAssistantCandidateText() === true,
 		turnCompletionIdleTimeoutMs,
 		turnAssistantCompletionIdleTimeoutMs,
 		turnAttemptIdleTimeoutMs,
@@ -8793,6 +8988,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			currentPromptTexts: [codexTurnPromptText],
 			turnWatches,
 			activeTurnItemIds,
+			activeCompletionBlockerItemIds,
 			activeAppServerTurnRequests,
 			pendingOpenClawDynamicToolCompletionIds,
 			turnCrossedToolHandoff,
@@ -8801,10 +8997,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			onReportExecutionNotification: reportExecutionNotification
 		});
 		turnCrossedToolHandoff = notificationState.turnCrossedToolHandoff;
+		const finalizationHookNotification = readCodexFinalizationHookNotification(notification, thread.threadId, turnId);
+		if (finalizationHookNotification?.phase === "started") {
+			if (activeFinalizationHookRunIds.size === 0) finalizationHookBatchStatuses.clear();
+			activeFinalizationHookRunIds.add(finalizationHookNotification.runId);
+			turnWatches.disarmAssistantCompletionIdleWatch();
+		}
 		if (notificationState.isTurnTerminal) terminalTurnNotificationQueued = true;
 		try {
 			await waitForCodexNotificationDispatchTurn();
 			await projector.handleNotification(notification);
+			const projectedAssistantCompletionCanRelease = isAssistantCompletionReleaseNotification(notification, turnCrossedToolHandoff) || notificationState.isCurrentTurnNotification && turnCrossedToolHandoff && notification.method === "rawResponseItem/completed" && projector.canReleaseLatestTerminalAssistantAfterToolHandoff();
+			if (notificationState.isCurrentTurnNotification && projectedAssistantCompletionCanRelease) {
+				const completedAssistantItemId = projector.getLatestTerminalAssistantCandidate()?.itemId;
+				if (rejectedFinalizationHookAssistant !== void 0 && completedAssistantItemId !== void 0 && completedAssistantItemId !== rejectedFinalizationHookAssistant.itemId) rejectedFinalizationHookAssistant = void 0;
+				else if (rejectedFinalizationHookAssistant !== void 0) turnWatches.disarmAssistantCompletionIdleWatch();
+				else if (activeFinalizationHookRunIds.size === 0 && !terminalTurnNotificationQueued && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && projector.hasLatestTerminalAssistantCandidateText()) turnWatches.armAssistantCompletionIdleWatch(describeNotificationActivity(notification));
+			}
 			if (notificationState.isCurrentTurnNotification && activeTurnItemIds.size === 0 && isRawFunctionToolOutputCompletionNotification(notification)) await maybeAnnounceFastModeAutoOff();
 		} catch (error) {
 			embeddedAgentLog.debug("codex app-server projector notification threw", {
@@ -8812,6 +9021,24 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				error
 			});
 		} finally {
+			if (finalizationHookNotification?.phase === "completed") {
+				unsettledFinalizationHookCount = Math.max(0, unsettledFinalizationHookCount - 1);
+				activeFinalizationHookRunIds.delete(finalizationHookNotification.runId);
+				finalizationHookBatchStatuses.set(finalizationHookNotification.runId, finalizationHookNotification.status);
+				if (activeFinalizationHookRunIds.size === 0) {
+					const statuses = new Set(finalizationHookBatchStatuses.values());
+					if (statuses.has("blocked") && !statuses.has("stopped")) {
+						const itemId = projector.getLatestTerminalAssistantCandidate()?.itemId;
+						rejectedFinalizationHookAssistant = itemId ? { itemId } : {};
+						turnWatches.disarmAssistantCompletionIdleWatch();
+					} else rejectedFinalizationHookAssistant = void 0;
+				}
+				if (activeFinalizationHookRunIds.size === 0 && rejectedFinalizationHookAssistant === void 0 && !terminalTurnNotificationQueued && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && projector.hasLatestTerminalAssistantCandidateText()) turnWatches.armAssistantCompletionIdleWatch({
+					lastNotificationMethod: notification.method,
+					hookRunId: finalizationHookNotification.runId,
+					hookStatus: finalizationHookNotification.status
+				});
+			}
 			if (notificationState.isTurnTerminal) {
 				if (notificationState.isTurnAbortMarker) projector.markAborted();
 				if (!timedOut && !runAbortController.signal.aborted) await steeringQueue?.flushPending();
@@ -8879,14 +9106,27 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			const nativeItem = readCodexNotificationItem(notification.params);
 			if (nativeItem?.type === "webSearch") projector.recordNativeToolOutcome(nativeItem);
 		}
-		if (notificationMatchesActiveTurn) turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
-			attemptProgress: true,
-			...turnCrossedToolHandoff ? { attemptTimeoutMs: postToolRawAssistantCompletionIdleTimeoutMs } : {},
-			details: { lastNotificationMethod: notification.method }
-		} : void 0);
+		if (notificationMatchesActiveTurn) {
+			if (readCodexFinalizationHookNotification(notification, thread.threadId, turnId)?.phase === "started") {
+				unsettledFinalizationHookCount += 1;
+				turnWatches.disarmAssistantCompletionIdleWatch();
+			}
+			turnWatches.noteNotificationReceived(notification.method, isNativeResponseStreamDelta ? {
+				attemptProgress: true,
+				...turnCrossedToolHandoff ? { attemptTimeoutMs: postToolRawAssistantCompletionIdleTimeoutMs } : {},
+				details: { lastNotificationMethod: notification.method }
+			} : void 0);
+		}
 		notificationQueue = notificationQueue.then(() => handleNotification(notification), () => handleNotification(notification));
 		return notificationQueue;
 	};
+	const drainNotificationQueue = async () => {
+		while (true) {
+			const queued = notificationQueue;
+			await queued;
+			if (queued === notificationQueue) return;
+		}
+	};
 	const nativeSubagentCodexHome = appServer.start.transport === "stdio" ? appServer.start.env?.CODEX_HOME ?? resolveCodexAppServerHomeDir(agentDir) : void 0;
 	registerCodexNativeSubagentMonitor({
 		client,
@@ -9504,14 +9744,23 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	steeringQueueRef.current = activeSteeringQueue;
 	const handle = {
 		kind: "embedded",
+		runId: params.runId,
 		queueMessage: async (text, optionsLocal) => activeSteeringQueue.queue(text, optionsLocal),
 		isStreaming: () => !completed && !runAbortController.signal.aborted,
+		isStopped: () => completed || timedOut || runAbortController.signal.aborted,
+		isAbortable: () => !terminalOutcomeFrozen || sharedAbortAllowedAfterTerminalOutcome,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
-		cancel: () => runAbortController.abort("cancelled"),
-		abort: () => runAbortController.abort("aborted")
+		cancel: () => abortExplicitly("cancelled"),
+		abort: () => abortExplicitly("aborted")
+	};
+	params.replyOperation?.attachBackend(handle);
+	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
+	const freezeRunTerminalOutcome = () => {
+		if (terminalOutcomeFrozen) return;
+		terminalOutcomeFrozen = true;
+		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
 	};
-	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
 	const notifyUserMessagePersisted = createCodexAppServerUserMessagePersistenceNotifier(params);
 	mirrorPromptAtTurnStartBestEffort({
 		params,
@@ -9546,12 +9795,32 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	if (runAbortController.signal.aborted) abortListener();
 	try {
 		await completion;
-		await notificationQueue;
+		await drainNotificationQueue();
+		const hasQuiescentCompletedAssistant = activeProjector.hasCompletedTerminalAssistantText() && activeAppServerTurnRequests === 0 && activeTurnItemIds.size === 0 && activeCompletionBlockerItemIds.size === 0 && pendingOpenClawDynamicToolCompletionIds.size === 0 && activeFinalizationHookRunIds.size === 0 && unsettledFinalizationHookCount === 0 && rejectedFinalizationHookAssistant === void 0;
+		const hasRecoverableCompletedAssistant = !turnWatches.isCompletionIdleWatchPinnedByTerminalError() && turnWatches.isAssistantCompletionIdleWatchArmed() && hasQuiescentCompletedAssistant;
+		const recoveredTurnWatchTimeout = turnCompletionIdleTimedOut && !explicitCancellationObserved && !terminalTurnNotificationQueued && hasRecoverableCompletedAssistant && activeProjector.recoverCompletedTerminalAssistantAfterTurnWatchTimeout();
+		if (recoveredTurnWatchTimeout) {
+			embeddedAgentLog.warn("codex app-server recovered completed assistant output after missing turn completion", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				timeoutKind: turnWatchTimeoutKind,
+				idleMs: turnWatchTimeoutIdleMs,
+				timeoutMs: turnWatchTimeoutMs
+			});
+			trajectoryRecorder?.recordEvent("turn.watch_timeout_recovered", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				timeoutKind: turnWatchTimeoutKind,
+				idleMs: turnWatchTimeoutIdleMs,
+				timeoutMs: turnWatchTimeoutMs
+			});
+		}
 		const result = activeProjector.buildResult(toolBridge.telemetry, { yieldDetected });
-		const finalAborted = result.aborted || runAbortController.signal.aborted && !clientClosedAbort;
-		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 effectiveTimedOut = timedOut && !recoveredTurnWatchTimeout;
+		const effectiveTurnCompletionIdleTimedOut = turnCompletionIdleTimedOut && !recoveredTurnWatchTimeout;
+		const isFinalAborted = () => result.aborted || explicitCancellationObserved || runAbortController.signal.aborted && !clientClosedAbort && !recoveredTurnWatchTimeout;
+		const clientClosedPromptErrorForFinal = clientClosedPromptError && hasRecoverableCompletedAssistant ? void 0 : clientClosedPromptError;
+		let finalPromptError = clientClosedPromptErrorForFinal ?? (effectiveTurnCompletionIdleTimedOut ? turnCompletionIdleTimeoutMessage : effectiveTimedOut ? "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",
@@ -9580,12 +9849,12 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			signal: runAbortController.signal
 		});
 		if (refreshedUsageLimitPromptError) finalPromptError = refreshedUsageLimitPromptError;
-		const finalPromptErrorSource = timedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
-		const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : turnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
+		const finalPromptErrorSource = effectiveTimedOut || clientClosedPromptErrorForFinal ? "prompt" : result.promptErrorSource;
+		const codexAppServerFailureKind = clientClosedPromptErrorForFinal ? "client_closed_before_turn_completed" : effectiveTurnCompletionIdleTimedOut ? "turn_completion_idle_timeout" : void 0;
 		const codexAppServerReplayBlockedReason = codexAppServerFailureKind ? resolveCodexAppServerReplayBlockedReason(result) : void 0;
 		const promptTimeoutOutcome = buildCodexAppServerPromptTimeoutOutcome({
 			result,
-			turnCompletionIdleTimedOut,
+			turnCompletionIdleTimedOut: effectiveTurnCompletionIdleTimedOut,
 			turnWatchTimeoutKind
 		});
 		const codexAppServerFailureDiagnostics = codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind === "completion" ? buildCodexAppServerTimeoutDiagnostics({
@@ -9594,35 +9863,39 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			lastActivityReason: turnWatchTimeoutLastActivityReason,
 			details: turnWatchTimeoutDetails
 		}) : void 0;
+		const codexAppServerFailure = codexAppServerFailureKind ? {
+			kind: codexAppServerFailureKind,
+			...codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind ? { turnWatchTimeoutKind } : {},
+			transport: appServer.start.transport,
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			replaySafe: codexAppServerReplayBlockedReason === void 0,
+			...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {},
+			...codexAppServerFailureDiagnostics ? { diagnostics: codexAppServerFailureDiagnostics } : {}
+		} : void 0;
+		const finalAborted = isFinalAborted();
+		const completedTurnStatus = activeProjector.getCompletedTurnStatus();
+		const completedWithoutTerminalNotification = completed && !terminalTurnNotificationQueued && !timedOut && clientClosedPromptErrorForFinal === void 0;
+		const attemptSucceeded = !finalAborted && !effectiveTimedOut && (finalPromptError === null || finalPromptError === void 0) && result.agentHarnessResultClassification === void 0 && (completedTurnStatus === "completed" || recoveredTurnWatchTimeout || completedWithoutTerminalNotification);
+		sharedAbortAllowedAfterTerminalOutcome = shouldKeepCodexSharedAbortOpen({
+			trigger: params.trigger,
+			result,
+			attemptSucceeded,
+			explicitCancellationObserved
+		});
+		freezeRunTerminalOutcome();
 		const modelCallFailureKind = classifyCodexModelCallFailureKind({
 			error: finalPromptError,
-			timedOut,
-			turnCompletionIdleTimedOut,
-			runAborted: runAbortController.signal.aborted,
-			abortReason: runAbortController.signal.reason,
+			timedOut: effectiveTimedOut,
+			turnCompletionIdleTimedOut: effectiveTurnCompletionIdleTimedOut,
+			runAborted: finalAborted,
+			abortReason: explicitCancellationReason ?? runAbortController.signal.reason,
 			clientClosedAbort,
 			formatError: formatErrorMessage
 		}) ?? (finalAborted ? "aborted" : void 0);
 		if (modelCallFailureKind) codexModelCallDiagnostics.emitError(finalPromptError ?? "codex app-server attempt interrupted", { failureKind: modelCallFailureKind });
 		else if (finalPromptError) codexModelCallDiagnostics.emitError(finalPromptError);
 		else codexModelCallDiagnostics.emitCompleted(result);
-		recordCodexTrajectoryCompletion(trajectoryRecorder, {
-			attempt: params,
-			result,
-			threadId: thread.threadId,
-			turnId: activeTurnId,
-			timedOut,
-			yieldDetected
-		});
-		trajectoryRecorder?.recordEvent("session.ended", {
-			status: finalPromptError ? "error" : finalAborted || timedOut ? "interrupted" : "success",
-			threadId: thread.threadId,
-			turnId: activeTurnId,
-			timedOut,
-			yieldDetected,
-			promptError: normalizeCodexTrajectoryError(finalPromptError)
-		});
-		markTrajectoryEndRecorded();
 		await mirrorTranscriptBestEffort({
 			params,
 			agentId: sessionAgentId,
@@ -9633,21 +9906,9 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			threadId: thread.threadId,
 			turnId: activeTurnId
 		});
-		const terminalAssistantText = collectTerminalAssistantText(result);
-		if (terminalAssistantText && (!assistantStreamEventEmitted || assistantStreamNeedsTerminalSnapshot) && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
-			stream: "assistant",
-			data: { text: terminalAssistantText }
-		});
-		if (finalPromptError) emitLifecycleTerminal({
-			phase: "error",
-			error: formatErrorMessage(finalPromptError)
-		});
-		else emitLifecycleTerminal({
-			phase: "end",
-			...finalAborted ? { aborted: true } : {}
-		});
 		if (activeContextEngine) {
 			const activeContextEnginePluginIdLocal = resolveContextEngineOwnerPluginId(activeContextEngine);
+			const isHeartbeatLifecycleRun = params.bootstrapContextRunKind === "heartbeat" || params.bootstrapContextRunKind === "commitment-only";
 			const finalMessages = await readMirroredSessionHistoryMessages(activeTranscriptTarget) ?? historyMessages.concat(result.messagesSnapshot);
 			await finalizeHarnessContextEngineTurn({
 				contextEngine: activeContextEngine,
@@ -9680,7 +9941,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				runMaintenance: runHarnessContextEngineMaintenance,
 				config: params.config,
 				warn: (message) => embeddedAgentLog.warn(message),
-				isHeartbeat: params.bootstrapContextRunKind === "heartbeat"
+				isHeartbeat: isHeartbeatLifecycleRun
 			});
 		}
 		runAgentHarnessLlmOutputHook({
@@ -9709,30 +9970,64 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			ctx: hookContext,
 			hookRunner
 		});
-		shouldDelayNativeHookRelayUnregister = activeProjector.getCompletedTurnStatus() === "completed" && !timedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
-		if (shouldDelayNativeHookRelayUnregister) await markCodexAppServerBindingCoveredThroughTurn({
-			sessionFile: params.sessionFile,
+		shouldDelayNativeHookRelayUnregister = completedTurnStatus === "completed" && !effectiveTimedOut && !runAbortController.signal.aborted && !finalAborted && !finalPromptError;
+		if (shouldDelayNativeHookRelayUnregister) try {
+			await markCodexAppServerBindingCoveredThroughTurn({
+				sessionFile: params.sessionFile,
+				threadId: thread.threadId,
+				authProfileStore: params.authProfileStore,
+				agentDir: params.agentDir,
+				config: params.config
+			});
+		} catch (error) {
+			if (!await clearCodexAppServerBindingForThread(params.sessionFile, thread.threadId, {
+				authProfileStore: params.authProfileStore,
+				agentDir: params.agentDir,
+				config: params.config
+			})) throw error;
+			embeddedAgentLog.warn("codex app-server binding coverage update failed after completed turn; cleared stale binding", {
+				threadId: thread.threadId,
+				turnId: activeTurnId,
+				error
+			});
+		}
+		recordCodexTrajectoryCompletion(trajectoryRecorder, {
+			attempt: params,
+			result,
 			threadId: thread.threadId,
-			authProfileStore: params.authProfileStore,
-			agentDir: params.agentDir,
-			config: params.config
+			turnId: activeTurnId,
+			timedOut: effectiveTimedOut,
+			yieldDetected
+		});
+		trajectoryRecorder?.recordEvent("session.ended", {
+			status: finalPromptError ? "error" : finalAborted || effectiveTimedOut ? "interrupted" : "success",
+			threadId: thread.threadId,
+			turnId: activeTurnId,
+			timedOut: effectiveTimedOut,
+			yieldDetected,
+			promptError: normalizeCodexTrajectoryError(finalPromptError)
+		});
+		markTrajectoryEndRecorded();
+		const terminalAssistantText = collectTerminalAssistantText(result);
+		if (terminalAssistantText && (!assistantStreamEventEmitted || assistantStreamNeedsTerminalSnapshot) && !finalAborted && !finalPromptError) emitCodexAppServerEvent(params, {
+			stream: "assistant",
+			data: { text: terminalAssistantText }
+		});
+		if (finalPromptError) emitLifecycleTerminal({
+			phase: "error",
+			error: formatErrorMessage(finalPromptError)
+		});
+		else emitLifecycleTerminal({
+			phase: "end",
+			...finalAborted ? { aborted: true } : {}
 		});
 		return {
 			...result,
-			timedOut,
+			timedOut: effectiveTimedOut,
 			aborted: finalAborted,
 			promptError: finalPromptError,
 			promptErrorSource: finalPromptErrorSource,
-			...codexAppServerFailureKind ? { codexAppServerFailure: {
-				kind: codexAppServerFailureKind,
-				...codexAppServerFailureKind === "turn_completion_idle_timeout" && turnWatchTimeoutKind ? { turnWatchTimeoutKind } : {},
-				transport: appServer.start.transport,
-				threadId: thread.threadId,
-				turnId: activeTurnId,
-				replaySafe: codexAppServerReplayBlockedReason === void 0,
-				...codexAppServerReplayBlockedReason ? { replayBlockedReason: codexAppServerReplayBlockedReason } : {},
-				...codexAppServerFailureDiagnostics ? { diagnostics: codexAppServerFailureDiagnostics } : {}
-			} } : {},
+			...codexAppServerFailure ? { codexAppServerFailure } : {},
 			...promptTimeoutOutcome ? { promptTimeoutOutcome } : {},
 			systemPromptReport
 		};
@@ -9777,9 +10072,10 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		else nativeHookRelay.unregister();
 		await releaseSandboxExecEnvironment();
 		runAbortController.signal.removeEventListener("abort", abortListener);
-		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
 		steeringQueueRef.current?.cancel();
-		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
+		freezeRunTerminalOutcome();
+		params.replyOperation?.detachBackend(handle);
+		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
 	}
 }
 function readDynamicToolCallParams(value) {
@@ -9842,6 +10138,21 @@ function isCodexThreadTurnCompletedNotification(notification, threadId, turnIds)
 	const turnId = correlation.turnId ?? correlation.nestedTurnId;
 	return !turnIds || turnId !== void 0 && turnIds.has(turnId);
 }
+function readCodexFinalizationHookNotification(notification, threadId, turnId) {
+	if (notification.method !== "hook/started" && notification.method !== "hook/completed") return;
+	const params = isJsonObject(notification.params) ? notification.params : void 0;
+	const run = params && isJsonObject(params.run) ? params.run : void 0;
+	if (params?.threadId !== threadId || params.turnId !== turnId || run?.eventName !== "stop" && run?.eventName !== "subagentStop" || typeof run.id !== "string" || !run.id) return;
+	if (notification.method === "hook/started") return {
+		phase: "started",
+		runId: run.id
+	};
+	return {
+		phase: "completed",
+		runId: run.id,
+		status: typeof run.status === "string" ? run.status : void 0
+	};
+}
 function joinPresentSections(...sections) {
 	return sections.filter((section) => Boolean(section?.trim())).join("\n\n");
 }