@openclaw/codex 2026.9.5 → 2026.9.6

package/dist/.setup/{native-subagent-monitor-B1hxzIOy.mjs → native-subagent-monitor-D3filLY2.mjs}

@@ -1,12 +1,12 @@
-import { S as readCodexNativeSubagentHistoryOwner, v as assertHistoryOwnerMatchesRegistration, x as matchesCodexNativeSubagentHistoryOwner } from "./session-binding-record-TH3xA0zj.mjs";
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { E as readNullableString$1, a as isNonSuccessItemStatus, b as readHookOutputEntries, c as itemName, d as matchesCodexSnapshotTurn, i as isMutatingNativeToolItem, l as itemStatus, m as shouldSynthesizeToolProgressForItem, n as auditNativeToolTerminalStatus, o as isSideEffectingNativeToolItem, p as shouldRecordNativeToolTranscript, s as itemKind, u as itemTitle, x as readItem } from "./event-projector-items-DyTQ_XqL.mjs";
+import { C as readCodexNativeSubagentHistoryOwner, S as matchesCodexNativeSubagentHistoryOwner, y as assertHistoryOwnerMatchesRegistration } from "./session-binding-record-BGoz8wOK.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { D as readNullableString$1, S as readItem, a as isNonSuccessItemStatus, c as itemName, d as matchesCodexSnapshotTurn, h as unknownItemStatus, i as isMutatingNativeToolItem, l as itemStatus, m as shouldSynthesizeToolProgressForItem, n as auditNativeToolTerminalStatus, o as isSideEffectingNativeToolItem, p as shouldRecordNativeToolTranscript, s as itemKind, u as itemTitle, x as readHookOutputEntries } from "./event-projector-items-C6L_5ZiT.mjs";
 import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.mjs";
-import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-C--SrLI8.mjs";
-import { I as hasCodexAppServerLiveThread, M as claimCodexAppServerLiveThread, W as retainCodexAppServerLiveThread } from "./shared-client-BpTtuLQ5.mjs";
+import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-BrqhSCf9.mjs";
+import { I as hasCodexAppServerLiveThread, M as claimCodexAppServerLiveThread, W as retainCodexAppServerLiveThread } from "./shared-client-DA4VR4Eb.mjs";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.mjs";
-import { A as truncateToolTranscriptText, C as TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS, D as formatToolSummary, E as formatToolOutput, O as normalizeToolTranscriptArguments, T as collectDynamicToolContentText, a as readCodexNativeSubagentRunId, b as sanitizeCodexToolArguments, c as isCommandBearingToolItem, d as itemOutputText, f as itemToolArgs, g as shouldSuppressChannelProgressForItem, h as itemTranscriptResultText, i as codexNativeSubagentRunId, k as toolOutputRawEchoSignature, l as isNativePostToolUseRelayItem, m as itemToolResult, n as CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX, o as readNativeSubagentThreadIds, p as itemToolError, r as CODEX_NATIVE_SUBAGENT_TASK_KIND, s as readNativeTaskAssignment, t as CODEX_NATIVE_SUBAGENT_RUNTIME, u as itemMeta, v as isCodexCommandBearingToolCall, w as ToolOutputAccumulator, y as resolveCodexToolProgressDetailMode } from "./native-subagent-task-ids-DsuOonKv.mjs";
-import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-CjfzafAZ.mjs";
+import { A as formatToolSummary, C as sanitizeCodexToolArguments, D as ToolOutputAccumulator, E as TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS, M as readCodexResponseOutput, N as toolOutputRawEchoSignature, O as collectDynamicToolContentText, P as truncateToolTranscriptText, S as resolveCodexToolProgressDetailMode, _ as readCodeModeNativePatchInput, a as readCodexNativeSubagentRunId, c as isCommandBearingToolItem, d as itemOutputText, f as itemToolArgs, g as projectCodexToolActivity, h as itemTranscriptResultText, i as codexNativeSubagentRunId, j as normalizeToolTranscriptArguments, k as formatToolOutput, l as isNativePostToolUseRelayItem, m as itemToolResult, n as CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX, o as readNativeSubagentThreadIds, p as itemToolError, r as CODEX_NATIVE_SUBAGENT_TASK_KIND, s as readNativeTaskAssignment, t as CODEX_NATIVE_SUBAGENT_RUNTIME, u as itemMeta, v as readInterceptedNativePatchInput, x as isCodexCommandBearingToolCall, y as shouldSuppressChannelProgressForItem } from "./native-subagent-task-ids-wb8CKZGN.mjs";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-C0MZzCuP.mjs";
 import { asFiniteNumber, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -14,7 +14,7 @@ import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
-import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage, inferToolMetaFromArgs, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage, inferToolMetaFromArgs, projectAgentActivityItem, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createAgentHarnessTaskRuntime, deliverAgentHarnessTaskCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-task-runtime";
 //#region extensions/codex/src/app-server/event-projector-tool-progress.ts
 const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = /* @__PURE__ */ new Set([
@@ -26,7 +26,7 @@ const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = /* @__PURE__ */ new Set([
 	"react",
 	"typing"
 ]);
-function shouldEmitTranscriptToolProgress(toolName, _args) {
+function shouldEmitTranscriptToolProgress(toolName) {
 	const normalized = typeof toolName === "string" ? toolName.trim().toLowerCase() : "";
 	return Boolean(normalized && !TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES.has(normalized));
 }
@@ -38,7 +38,6 @@ var CodexToolProgressProjection = class {
 		this.resultOutputItemIds = /* @__PURE__ */ new Set();
 		this.resultOutputStreamedItemIds = /* @__PURE__ */ new Set();
 		this.transcriptProgressSuppressedIds = /* @__PURE__ */ new Set();
-		this.transcriptArgumentsById = /* @__PURE__ */ new Map();
 		this.resultOutputDeltaState = /* @__PURE__ */ new Map();
 		this.output = new ToolOutputAccumulator();
 		this.metas = /* @__PURE__ */ new Map();
@@ -50,6 +49,9 @@ var CodexToolProgressProjection = class {
 	get outputTextByItem() {
 		return this.output.textByItem;
 	}
+	isOutputTruncated(itemId) {
+		return this.output.isTruncated(itemId);
+	}
 	get toolMetas() {
 		return [...this.metas.values()];
 	}
@@ -118,7 +120,7 @@ var CodexToolProgressProjection = class {
 			streamedDisplay: true
 		});
 		if (!this.shouldEmitToolOutput()) return;
-		if (this.transcriptProgressSuppressedIds.has(itemId) || !shouldEmitTranscriptToolProgress(toolName, this.transcriptArgumentsById.get(itemId))) return;
+		if (this.transcriptProgressSuppressedIds.has(itemId) || !shouldEmitTranscriptToolProgress(toolName)) return;
 		const state = this.resultOutputDeltaState.get(itemId) ?? {
 			chars: 0,
 			messages: 0,
@@ -126,16 +128,6 @@ var CodexToolProgressProjection = class {
 		};
 		if (state.truncated) return;
 		const remainingChars = Math.max(0, TOOL_PROGRESS_OUTPUT_MAX_CHARS - state.chars);
-		const remainingMessages = Math.max(0, 20 - state.messages);
-		if (remainingChars === 0 || remainingMessages === 0) {
-			state.truncated = true;
-			this.resultOutputDeltaState.set(itemId, state);
-			this.emitToolResultMessage({
-				itemId,
-				text: formatToolOutput(toolName, void 0, "(output truncated)")
-			});
-			return;
-		}
 		const chunk = delta.length > remainingChars ? truncateUtf16Safe(delta, remainingChars) : delta;
 		state.chars += chunk.length;
 		state.messages += 1;
@@ -190,7 +182,7 @@ var CodexToolProgressProjection = class {
 		if (this.resultSummaryItemIds.has(item.id)) return;
 		const toolName = itemName(item);
 		const args = itemToolArgs(item);
-		if (!toolName || !shouldEmitTranscriptToolProgress(toolName, args)) return;
+		if (!toolName || !shouldEmitTranscriptToolProgress(toolName)) return;
 		this.resultSummaryItemIds.add(item.id);
 		const meta = this.shouldIncludeFormattedMeta(isCommandBearingToolItem(item, args)) ? itemMeta(item, this.toolProgressDetailMode()) : void 0;
 		this.emitToolResultMessage({
@@ -204,7 +196,7 @@ var CodexToolProgressProjection = class {
 		if (this.resultOutputItemIds.has(item.id) || this.resultOutputStreamedItemIds.has(item.id)) return;
 		const toolName = itemName(item);
 		const output = itemOutputText(item, this.output.textByItem);
-		if (!toolName || !output || !shouldEmitTranscriptToolProgress(toolName, itemToolArgs(item))) return;
+		if (!toolName || !output || !shouldEmitTranscriptToolProgress(toolName)) return;
 		const meta = this.shouldIncludeFormattedMeta(isCommandBearingToolItem(item, itemToolArgs(item))) ? itemMeta(item, this.toolProgressDetailMode()) : void 0;
 		this.emitToolResultMessage({
 			itemId: item.id,
@@ -231,8 +223,7 @@ var CodexToolProgressProjection = class {
 		});
 	}
 	recordTranscriptCall(params) {
-		this.transcriptArgumentsById.set(params.id, params.arguments);
-		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) this.transcriptProgressSuppressedIds.add(params.id);
+		if (!shouldEmitTranscriptToolProgress(params.name)) this.transcriptProgressSuppressedIds.add(params.id);
 		else this.transcriptProgressSuppressedIds.delete(params.id);
 		this.emitTranscriptToolCallProgress(params);
 	}
@@ -267,7 +258,7 @@ var CodexToolProgressProjection = class {
 		try {
 			Promise.resolve(this.params.onToolResult?.({
 				text,
-				...(this.params.messageChannel || this.params.messageProvider) && { channelData: { openclawToolProgressId: params.itemId } },
+				...(this.params.messageChannel || this.params.messageProvider) && { channelData: { openclawToolProgressId: `tool:${params.itemId}` } },
 				...params.isError === true ? { isError: true } : {}
 			})).catch(() => {});
 		} catch {}
@@ -283,7 +274,7 @@ var CodexToolProgressProjection = class {
 		return !commandBearing || !channel && this.shouldEmitToolOutput();
 	}
 	emitTranscriptToolCallProgress(params) {
-		if (params.name === "progress_card" || !shouldEmitTranscriptToolProgress(params.name, params.arguments)) return;
+		if (params.name === "progress_card" || !shouldEmitTranscriptToolProgress(params.name)) return;
 		this.transcriptProgressCallIds.add(params.id);
 		const args = normalizeToolTranscriptArguments(params.arguments);
 		const meta = this.shouldIncludeFormattedMeta(isCodexCommandBearingToolCall(params.name, args)) ? inferToolMetaFromArgs(params.name, args, { detailMode: this.toolProgressDetailMode() }) : void 0;
@@ -295,7 +286,7 @@ var CodexToolProgressProjection = class {
 		});
 	}
 	emitTranscriptToolResultProgress(params) {
-		if (params.name === "progress_card" && !params.isError || this.transcriptProgressSuppressedIds.has(params.id) || !shouldEmitTranscriptToolProgress(params.name, this.transcriptArgumentsById.get(params.id))) return;
+		if (params.name === "progress_card" && !params.isError || this.transcriptProgressSuppressedIds.has(params.id) || !shouldEmitTranscriptToolProgress(params.name)) return;
 		if (params.name === "progress_card" && this.shouldEmitToolResult()) this.emitToolResultMessage({
 			itemId: params.id,
 			text: formatToolSummary(params.name),
@@ -368,38 +359,11 @@ const ZERO_USAGE = {
 };
 const MISSING_TOOL_RESULT_ERROR = "OpenClaw recorded a native Codex tool.call without a matching tool.result before the turn completed.";
 const NATIVE_PATCH_REJECTION_RE = /^\s*patch rejected:\s*writing outside of the project;\s*rejected by user approval settings\s*$/iu;
-const CODE_MODE_NATIVE_PATCH_SOURCE_RE = /^\s*(?:\/\/[^\r\n]*\r?\n\s*)?(?:const|let)\s+([A-Za-z_$][\w$]*)\s*=\s*await\s+tools\.apply_patch\(\s*("(?:\\[\s\S]|[^"\\])*")\s*\)\s*;?\s*text\(\s*\1\s*\)\s*;?\s*$/u;
-const CODE_MODE_NATIVE_PATCH_RESULT_RE = /^\s*Script (completed|failed)\s*\r?\nWall time\s+\d+(?:\.\d+)?\s+seconds\s*\r?\nOutput:\s*([\s\S]*?)\s*$/iu;
+const CODE_MODE_RESULT_RE = /^\s*Script (completed|failed)\s*\r?\nWall time\s+\d+(?:\.\d+)?\s+seconds\s*\r?\nOutput:\s*([\s\S]*?)\s*$/iu;
 const MAX_TOOL_APPROVAL_REVIEWS = 16;
 function toolApprovalReviewOutcome(state) {
 	return state.denied ? "denied" : state.unresolvedReviewIds === null || state.unresolvedReviewIds.size > 0 ? "reviewing" : "approved";
 }
-function readCodeModeNativePatchInput(source) {
-	if (typeof source !== "string") return;
-	const match = CODE_MODE_NATIVE_PATCH_SOURCE_RE.exec(source);
-	if (!match?.[2]) return;
-	try {
-		const patch = JSON.parse(match[2]);
-		return typeof patch === "string" && /^\*\*\* Begin Patch\r?\n[\s\S]*\r?\n\*\*\* End Patch(?:\r?\n)?$/u.test(patch) ? patch : void 0;
-	} catch {
-		return;
-	}
-}
-function readInterceptedNativePatchInput(command) {
-	if (typeof command !== "string") return;
-	const lines = command.replace(/\r\n?/gu, "\n").split("\n");
-	const patchStart = lines.indexOf("*** Begin Patch");
-	const invocation = /^[\t ]*(?:cd[\t ]+(?:'([^'\n]+)'|([A-Za-z0-9_./-]+))[\t ]+&&[\t ]+)?apply_patch[\t ]*<<-?[\t ]*'([^'\n]+)'[\t ]*$/u.exec(lines[0] ?? "");
-	if (!invocation || patchStart !== 1) return;
-	const patchEnd = lines.indexOf("*** End Patch", patchStart + 1);
-	const cwd = invocation[1] ?? invocation[2];
-	const delimiter = invocation[3];
-	if (patchEnd < 0 || lines[patchEnd + 1] !== delimiter || lines.slice(patchEnd + 2).some((line) => line.trim().length > 0)) return;
-	return {
-		input: `${lines.slice(patchStart, patchEnd + 1).join("\n")}\n`,
-		...cwd ? { cwd } : {}
-	};
-}
 var CodexToolTranscriptProjection = class {
 	constructor(params, threadId, turnId, progress, nextTranscriptTimestamp, options = {}) {
 		this.params = params;
@@ -421,7 +385,8 @@ var CodexToolTranscriptProjection = class {
 		this.nativeMcpAppResultDetailsAttempted = /* @__PURE__ */ new Set();
 		this.approvalReviewsByCallId = /* @__PURE__ */ new Map();
 		this.rawNativeToolOutputByCallId = /* @__PURE__ */ new Map();
-		this.pendingRawPatchOutputIds = /* @__PURE__ */ new Set();
+		this.pendingRawOutputIds = /* @__PURE__ */ new Set();
+		this.rawCallsById = /* @__PURE__ */ new Map();
 		this.codeModeNativePatchInputsByCallId = /* @__PURE__ */ new Map();
 	}
 	get transcriptMessages() {
@@ -488,6 +453,7 @@ var CodexToolTranscriptProjection = class {
 				name,
 				text: approvalTimeoutExplanation ?? this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
 				isError: isNonSuccessItemStatus(status),
+				...item.type === "commandExecution" && item.aggregatedOutput == null && this.progress.isOutputTruncated(item.id) ? { captureTruncated: true } : {},
 				details,
 				...item.type === "webSearch" ? { resultContentSource: "network" } : {}
 			});
@@ -498,6 +464,14 @@ var CodexToolTranscriptProjection = class {
 		const type = typeof item.type === "string" ? item.type : void 0;
 		const callId = typeof item.call_id === "string" ? item.call_id : typeof item.callId === "string" ? item.callId : void 0;
 		if (!callId) return;
+		if ((type === "custom_tool_call" || type === "function_call") && typeof item.name === "string") {
+			this.rawCallsById.set(callId, {
+				id: callId,
+				name: item.name,
+				arguments: type === "custom_tool_call" ? { input: item.input } : { arguments: item.arguments }
+			});
+			this.pendingRawOutputIds.add(callId);
+		}
 		if ((type === "custom_tool_call" || type === "function_call") && (item.name === "apply_patch" || item.name === "exec_command" || item.name === "exec")) {
 			let args;
 			if (type === "custom_tool_call" && item.name === "apply_patch" && typeof item.input === "string") args = { input: item.input };
@@ -511,7 +485,8 @@ var CodexToolTranscriptProjection = class {
 					const parsedArguments = parsed;
 					if (item.name === "apply_patch") args = parsedArguments;
 					else {
-						const patch = readInterceptedNativePatchInput(typeof parsedArguments.cmd === "string" ? parsedArguments.cmd : typeof parsedArguments.command === "string" ? parsedArguments.command : void 0);
+						const command = typeof parsedArguments.cmd === "string" ? parsedArguments.cmd : typeof parsedArguments.command === "string" ? parsedArguments.command : void 0;
+						const patch = readInterceptedNativePatchInput(command);
 						if (patch) {
 							const workdir = typeof parsedArguments.workdir === "string" ? parsedArguments.workdir : typeof parsedArguments.cwd === "string" ? parsedArguments.cwd : void 0;
 							const cwd = patch.cwd ? workdir && !path.isAbsolute(patch.cwd) ? path.join(workdir, patch.cwd) : patch.cwd : workdir;
@@ -526,7 +501,7 @@ var CodexToolTranscriptProjection = class {
 				return;
 			}
 			if (args) {
-				this.pendingRawPatchOutputIds.add(callId);
+				this.pendingRawOutputIds.add(callId);
 				this.recordToolCall({
 					id: callId,
 					name: "apply_patch",
@@ -535,15 +510,17 @@ var CodexToolTranscriptProjection = class {
 			}
 			return;
 		}
-		if (type !== "custom_tool_call_output" && type !== "function_call_output" || this.namesById.get(callId) !== "apply_patch" && !this.codeModeNativePatchInputsByCallId.has(callId)) return;
-		this.pendingRawPatchOutputIds.delete(callId);
-		const text = typeof item.output === "string" ? item.output : Array.isArray(item.output) ? collectDynamicToolContentText(item.output) : "";
-		if (!text.trim()) return;
+		if (type !== "custom_tool_call_output" && type !== "function_call_output") return;
+		this.pendingRawOutputIds.delete(callId);
+		const text = readCodexResponseOutput(item);
+		if (text === void 0) return;
+		this.rawNativeToolOutputByCallId.set(callId, text);
+		const rawCall = this.rawCallsById.get(callId);
+		const responseText = typeof item.output === "string" ? item.output : collectDynamicToolContentText(item.output);
+		const execution = rawCall?.name === "exec" ? CODE_MODE_RESULT_RE.exec(responseText) : null;
 		const codeModePatchInput = this.codeModeNativePatchInputsByCallId.get(callId);
 		if (codeModePatchInput) {
 			this.codeModeNativePatchInputsByCallId.delete(callId);
-			const execution = CODE_MODE_NATIVE_PATCH_RESULT_RE.exec(text);
-			if (execution?.[1]?.toLowerCase() === "completed" && execution[2]?.trim() === "{}") return;
 			if (execution?.[1]?.toLowerCase() === "failed") {
 				const failure = execution[2]?.replace(/^Script error:\s*/iu, "").trim() || text;
 				this.recordToolCall({
@@ -557,13 +534,21 @@ var CodexToolTranscriptProjection = class {
 					text: failure,
 					isError: true
 				});
+				return;
 			}
-			return;
 		}
-		this.rawNativeToolOutputByCallId.set(callId, text);
 		const result = this.messages.find((message) => message.role === "toolResult" && message.toolCallId === callId);
 		if (!result) {
-			if (NATIVE_PATCH_REJECTION_RE.test(text)) this.recordToolResult({
+			if (!this.callIds.has(callId) && rawCall) {
+				this.recordToolCall(rawCall);
+				this.recordToolResult({
+					id: callId,
+					name: rawCall.name,
+					text,
+					isError: execution?.[1]?.toLowerCase() === "failed",
+					...!execution ? { outcomeUnknown: true } : {}
+				});
+			} else if (this.namesById.get(callId) === "apply_patch" && NATIVE_PATCH_REJECTION_RE.test(text)) this.recordToolResult({
 				id: callId,
 				name: "apply_patch",
 				text,
@@ -573,10 +558,18 @@ var CodexToolTranscriptProjection = class {
 		}
 		result.content = this.createToolResultMessage({
 			id: callId,
-			name: "apply_patch",
+			name: result.toolName,
 			text,
 			isError: result.isError
 		}).content;
+		const metadata = Reflect.get(result, "__openclaw");
+		Reflect.set(result, "__openclaw", {
+			...isJsonObject(metadata) ? metadata : {},
+			toolOutput: {
+				source: "provider-response",
+				modelInput: "unverified"
+			}
+		});
 	}
 	async prepareNativeToolResultDetails(item) {
 		const preparedDetails = await this.prepareNativeMcpAppResultDetails(item);
@@ -721,7 +714,7 @@ var CodexToolTranscriptProjection = class {
 			sessionId: this.params.sessionId,
 			sessionKey: this.params.sessionKey,
 			sessionTarget: this.params.sessionTarget
-		}, void 0, "model-context", signal, this.params.contextTokenBudget) ?? [];
+		}, void 0, signal, this.params.contextTokenBudget) ?? [];
 	}
 	recordToolCall(params) {
 		if (!params.id || !params.name || this.callIds.has(params.id)) return;
@@ -740,7 +733,7 @@ var CodexToolTranscriptProjection = class {
 		this.messages.push(message);
 		this.options.checkpointMessage?.({
 			read: () => message,
-			ready: () => !this.pendingRawPatchOutputIds.has(params.id)
+			ready: () => !this.pendingRawOutputIds.has(params.id)
 		});
 	}
 	recordMissingToolError(missingTranscriptIds, missingTrajectoryIds) {
@@ -773,8 +766,7 @@ var CodexToolTranscriptProjection = class {
 				type: "toolCall",
 				id: params.id,
 				name: params.name,
-				arguments: args,
-				input: args
+				arguments: args
 			}],
 			api: attribution.api ?? "openai-chatgpt-responses",
 			provider: attribution.provider,
@@ -785,26 +777,28 @@ var CodexToolTranscriptProjection = class {
 		};
 	}
 	createToolResultMessage(params) {
-		const text = truncateToolTranscriptText(params.text?.trim() || toolResultStatusText(params));
+		const response = this.rawNativeToolOutputByCallId.get(params.id);
+		const text = response ?? params.text ?? toolResultStatusText(params);
 		return {
 			role: "toolResult",
 			toolCallId: params.id,
 			toolName: params.name,
 			isError: params.isError,
 			content: [{
-				type: "toolResult",
-				id: params.id,
-				name: params.name,
-				toolName: params.name,
-				toolCallId: params.id,
-				toolUseId: params.id,
-				tool_use_id: params.id,
-				content: text,
+				type: "text",
 				text
 			}],
 			...params.details !== void 0 ? { details: params.details } : {},
-			...params.resultContentSource ? { __openclaw: { resultContentSource: params.resultContentSource } } : {},
-			timestamp: this.nextTranscriptTimestamp()
+			timestamp: this.nextTranscriptTimestamp(),
+			__openclaw: {
+				...params.resultContentSource ? { resultContentSource: params.resultContentSource } : {},
+				toolOutput: {
+					source: response === void 0 ? "execution" : "provider-response",
+					modelInput: "unverified",
+					...params.outcomeUnknown ? { outcome: "unknown" } : {},
+					...response === void 0 && params.captureTruncated ? { captureTruncated: true } : {}
+				}
+			}
 		};
 	}
 };
@@ -870,7 +864,7 @@ function projectNormalizedToolItem(params) {
 		status,
 		args,
 		meta,
-		event: shouldEmitTranscriptToolProgress(name, args) ? {
+		event: shouldEmitTranscriptToolProgress(name) ? {
 			stream: "tool",
 			data: {
 				phase: params.phase,
@@ -1159,22 +1153,30 @@ var CodexEventProjection = class {
 		const commandBearing = isCommandBearingToolItem(item, args);
 		const subagentStatus = readStringField(item, activity ? "kind" : "status");
 		const interaction = activity && subagentStatus === "interacted";
-		const status = subagent && subagentStatus === "interrupted" ? "failed" : activity ? subagentStatus === "completed" || interaction ? "completed" : "running" : params.phase === "start" ? "running" : itemStatus(item);
+		const status = subagent && subagentStatus === "interrupted" ? "failed" : activity ? subagentStatus === "completed" || interaction ? "completed" : "running" : params.phase === "start" ? "running" : kind === "analysis" ? "completed" : unknownItemStatus(item) ? void 0 : itemStatus(item);
 		const meta = subagent ? [interaction ? "message sent" : activity ? subagentStatus : status, readStringField(item, activity ? "agentPath" : "tool")].filter(Boolean).join(": ") : itemMeta(item, this.toolProgress.toolProgressDetailMode());
 		const suppressChannelProgress = shouldSuppressChannelProgressForItem(item);
 		this.emitAgentEvent({
 			stream: "item",
-			data: {
+			data: projectAgentActivityItem({
 				itemId: activity && !interaction ? `subagent:${readStringField(item, "agentThreadId") ?? item.id}` : item.id,
 				phase: params.phase,
 				kind,
 				title: itemTitle(item),
-				status,
+				...status ? { status } : {},
+				...status === void 0 ? {
+					summary: "Outcome unknown",
+					title: `${itemTitle(item)} — outcome unknown`
+				} : {},
+				toolCallId: item.id,
 				...name ? { name } : {},
 				...meta ? { meta } : {},
 				...commandBearing ? { commandBearing: true } : {},
 				...suppressChannelProgress ? { suppressChannelProgress: true } : {}
-			}
+			}, {
+				args: itemToolArgs(item),
+				...item.type === "collabAgentToolCall" && item.tool === "wait" ? { nativeOperation: "wait" } : {}
+			})
 		});
 	}
 	async emitSnapshotOnlyNativeToolProgress(params) {
@@ -1232,7 +1234,16 @@ var CodexEventProjection = class {
 			}
 			return;
 		}
+		const activity = projectCodexToolActivity(item, params.phase, meta);
+		if (activity && params.phase === "start") this.emitAgentEvent({
+			stream: "item",
+			data: activity
+		});
 		this.emitAgentEvent(event);
+		if (activity && params.phase !== "start") this.emitAgentEvent({
+			stream: "item",
+			data: activity
+		});
 		if (params.phase === "result") {
 			this.toolTranscript.emitAfterToolCallObservation(item);
 			await this.onNativeToolResultRecorded?.();
@@ -1987,7 +1998,7 @@ var CodexNativeSubagentCloseOwner = class {
 				const childState = this.callbacks.currentChild(target.childThreadId);
 				if (loaded.data.includes(target.childThreadId) || !isTargetCurrent(target)) continue;
 				const forget = forgetters[index];
-				if (childState) this.retireChild(state, childState, "Subagent was closed.", () => forget?.());
+				if (childState) this.retireChild(state, childState, "Subagent was closed.", forget);
 				else forget?.();
 			}
 		} catch (error) {
@@ -2260,10 +2271,7 @@ function extractCodexNativeSubagentCompletions(notification) {
 	const item = isJsonObject(params.item) ? params.item : void 0;
 	if (!item) return [];
 	if (notification.method === "rawResponseItem/completed" && item.role === "user") return readTrustedContextualCompletions(item);
-	const communication = readTrustedInterAgentCommunication(item);
-	const text = communication?.content;
-	if (typeof text !== "string" || !text) return [];
-	return extractCodexNativeSubagentCompletionsFromText(text).filter((completion) => completion.agentPath === communication?.author);
+	return [];
 }
 function readTrustedContextualCompletions(item) {
 	const content = item.content;
@@ -2278,25 +2286,8 @@ function readTrustedContextualCompletions(item) {
 		return completion ? [completion] : [];
 	});
 }
-/** Parses one or more tagged subagent completion payloads from commentary text. */
-function extractCodexNativeSubagentCompletionsFromText(text) {
-	const completions = [];
-	let cursor = 0;
-	while (cursor < text.length) {
-		const start = text.indexOf(CODEX_SUBAGENT_NOTIFICATION_START, cursor);
-		if (start < 0) break;
-		const bodyStart = start + 23;
-		const end = text.indexOf(CODEX_SUBAGENT_NOTIFICATION_END, bodyStart);
-		if (end < 0) break;
-		const parsed = parseCodexNativeSubagentNotificationBody(text.slice(bodyStart, end));
-		if (parsed) completions.push(parsed);
-		cursor = end + 24;
-	}
-	return completions;
-}
 const codexNativeSubagentNotifications = {
 	fromNotification: extractCodexNativeSubagentCompletions,
-	fromText: extractCodexNativeSubagentCompletionsFromText,
 	deliveredAgentPaths: readDeliveredNativeCompletionPaths
 };
 /** Reads native delivery receipts, leaving status and result ownership with the child lifecycle. */
@@ -2331,79 +2322,35 @@ function parseCodexNativeSubagentNotificationBody(body) {
 	}
 	if (!isJsonObject(payload)) return;
 	const agentPath = readStringField(payload, "agent_path")?.trim();
-	const status = isJsonObject(payload.status) ? payload.status : void 0;
-	if (!agentPath || !status) return;
-	const statusEntry = readCompletionStatus(status);
-	if (!statusEntry) return;
-	return {
+	const completion = readCompletionStatus(payload.status);
+	return agentPath && completion ? {
 		agentPath,
-		status: statusEntry.status,
-		statusLabel: statusEntry.label,
-		result: statusEntry.result
-	};
+		...completion
+	} : void 0;
 }
 function readCompletionStatus(status) {
-	for (const [rawKey, value] of Object.entries(status)) {
-		const mappedStatus = mapCompletionStatus(normalizeStatusKey(rawKey));
-		if (!mappedStatus) continue;
-		const result = stringifyResult(value, mappedStatus);
+	if (status === "shutdown" || status === "not_found") return {
+		status: status === "shutdown" ? "cancelled" : "failed",
+		statusLabel: status,
+		result: "(no output)"
+	};
+	if (!isJsonObject(status)) return;
+	const completed = status.completed;
+	if (completed === null || typeof completed === "string") {
+		const result = completed?.trim();
 		return {
-			status: mappedStatus,
-			label: mappedStatus === "succeeded" && result.kind === "no_final_assistant_message" ? "completed_without_final_message" : rawKey,
-			result: result.text
+			status: "succeeded",
+			statusLabel: result ? "completed" : "completed_without_final_message",
+			result: result || "Subagent completed without a final assistant message."
 		};
 	}
-}
-function mapCompletionStatus(value) {
-	if (value === "completed" || value === "succeeded" || value === "success") return "succeeded";
-	if (value === "cancelled" || value === "canceled" || value === "interrupted" || value === "shutdown") return "cancelled";
-	if (value === "failed" || value === "error" || value === "errored" || value === "systemerror" || value === "notfound") return "failed";
-}
-function stringifyResult(value, status) {
-	if (typeof value === "string") {
-		const text = value.trim();
-		if (text) return { text };
-		return status === "succeeded" ? completedWithoutFinalAssistantMessage() : { text: "(no output)" };
-	}
-	if (value === null || value === void 0) return status === "succeeded" ? completedWithoutFinalAssistantMessage() : { text: "(no output)" };
-	try {
-		return { text: JSON.stringify(value) };
-	} catch {
-		return { text: "(unserializable output)" };
-	}
-}
-function completedWithoutFinalAssistantMessage() {
-	return {
-		text: "Subagent completed without a final assistant message.",
-		kind: "no_final_assistant_message"
+	const error = readStringField(status, "errored");
+	return error === void 0 ? void 0 : {
+		status: "failed",
+		statusLabel: "errored",
+		result: error.trim() || "(no output)"
 	};
 }
-function readTrustedInterAgentCommunication(item) {
-	if (readStringField(item, "type") !== "message" || readStringField(item, "role") !== "assistant" || readStringField(item, "phase") !== "commentary") return;
-	const text = extractSingleTextPart(item);
-	if (!text) return;
-	let parsed;
-	try {
-		parsed = JSON.parse(text);
-	} catch {
-		return;
-	}
-	if (!isJsonObject(parsed)) return;
-	if (typeof parsed.author !== "string" || typeof parsed.recipient !== "string" || typeof parsed.content !== "string" || parsed.trigger_turn !== false) return;
-	return parsed;
-}
-function extractSingleTextPart(item) {
-	const content = item.content;
-	if (!Array.isArray(content) || content.length !== 1) return;
-	const [entry] = content;
-	if (!isJsonObject(entry)) return;
-	const type = readStringField(entry, "type");
-	if (type !== "output_text" && type !== "text") return;
-	return readStringField(entry, "text")?.trim();
-}
-function normalizeStatusKey(value) {
-	return value.replace(/[^a-z0-9]/giu, "").toLowerCase();
-}
 //#endregion
 //#region extensions/codex/src/app-server/native-subagent-delivery-receipts.ts
 function buildCodexNativeSubagentAgentPathKey(parentThreadId, agentPath) {
@@ -2458,7 +2405,6 @@ var CodexNativeSubagentDeliveryReceipts = class {
 				result = isJsonObject(child) ? readStringField(child, "message") : result;
 			}
 			this.pending.push({
-				id,
 				agentPath,
 				result: receiptResultKey(result)
 			});
@@ -2500,8 +2446,7 @@ var CodexNativeSubagentDeliveryReceipts = class {
 			restored.set(assignment.runId, outcome);
 		}
 		for (const [runId, outcome] of this.outcomes) if (!restored.has(runId)) restored.set(runId, outcome);
-		this.outcomes.clear();
-		for (const [runId, outcome] of restored) this.outcomes.set(runId, outcome);
+		this.outcomes = restored;
 		const matched = this.match();
 		return [.../* @__PURE__ */ new Set([...matched, ...[...restored].filter(([, value]) => value.received).map(([id]) => id)])];
 	}
@@ -3071,7 +3016,6 @@ var CodexNativeSubagentTaskMirror = class {
 		this.mirrorStateByThreadId = /* @__PURE__ */ new Map();
 		this.terminalRunIds = /* @__PURE__ */ new Set();
 		this.authoritativeRunIds = /* @__PURE__ */ new Set();
-		this.expectedAuthoritativeRunIds = /* @__PURE__ */ new Set();
 		this.runIdsByThreadId = /* @__PURE__ */ new Map();
 		this.now = params.now ?? Date.now;
 	}
@@ -3079,21 +3023,16 @@ var CodexNativeSubagentTaskMirror = class {
 		this.authoritativeRunIds.add(runId);
 		this.terminalRunIds.add(runId);
 	}
-	markAuthoritativeCompletionExpected(childThreadId) {
-		this.expectedAuthoritativeRunIds.add(this.runId(childThreadId));
-	}
 	restoreCurrentTaskRun(threadId, runId) {
 		this.runIdsByThreadId.set(threadId, runId);
 		this.mirrorStateByThreadId.set(threadId, "mirrored");
-		this.expectedAuthoritativeRunIds.add(runId);
 	}
-	startFollowupTurn(threadId, turnId, nativeParentThreadId = this.params.parentThreadId) {
+	startFollowupTurn(threadId, turnId, nativeParentThreadId) {
 		const previousRunId = this.runId(threadId);
 		const previous = this.runtime.listTaskRecords().find((task) => task.runId === previousRunId);
 		const runId = codexNativeSubagentRunId(threadId, turnId);
 		this.runIdsByThreadId.set(threadId, runId);
 		this.mirrorStateByThreadId.delete(threadId);
-		this.expectedAuthoritativeRunIds.add(runId);
 		this.createRunningTask({
 			threadId,
 			turnId,
@@ -3103,7 +3042,6 @@ var CodexNativeSubagentTaskMirror = class {
 			startedAt: this.now(),
 			progressSummary: "Subagent started follow-up work."
 		});
-		return runId;
 	}
 	recordNativeTurn(runId, turnId) {
 		const task = this.runtime.listTaskRecords().find((record) => record.runId === runId);
@@ -3194,24 +3132,11 @@ var CodexNativeSubagentTaskMirror = class {
 			return;
 		}
 		if (statusType === "systemError") {
-			if (this.expectedAuthoritativeRunIds.has(runId)) {
-				this.terminalRunIds.delete(runId);
-				this.runtime.recordTaskRunProgressByRunId({
-					runId,
-					lastEventAt: eventAt,
-					progressSummary: "Subagent hit a system error; awaiting recovery."
-				});
-				return;
-			}
-			this.terminalRunIds.add(runId);
-			this.runtime.finalizeTaskRunByRunId({
+			this.terminalRunIds.delete(runId);
+			this.runtime.recordTaskRunProgressByRunId({
 				runId,
-				status: "failed",
-				endedAt: eventAt,
 				lastEventAt: eventAt,
-				error: "Subagent encountered a system error.",
-				progressSummary: "Subagent hit a system error.",
-				terminalSummary: "Subagent failed."
+				progressSummary: "Subagent hit a system error; awaiting recovery."
 			});
 			return;
 		}
@@ -3340,19 +3265,11 @@ var CodexNativeSubagentTaskMirror = class {
 		if (normalizedStatus === "completed") {
 			this.terminalRunIds.add(runId);
 			const summary = normalizeOptionalString(message) ?? "Subagent completed.";
-			if (this.expectedAuthoritativeRunIds.has(runId)) this.runtime.recordTaskRunProgressByRunId({
+			this.runtime.recordTaskRunProgressByRunId({
 				runId,
 				lastEventAt: eventAt,
 				progressSummary: summary
 			});
-			else this.runtime.finalizeTaskRunByRunId({
-				runId,
-				status: "succeeded",
-				endedAt: eventAt,
-				lastEventAt: eventAt,
-				progressSummary: summary,
-				terminalSummary: summary
-			});
 			return;
 		}
 		if (normalizedStatus === "blocked") {
@@ -3583,25 +3500,13 @@ var CodexNativeSubagentTurnObservation = class {
 			}
 			return;
 		}
-		if (notification.method === "item/agentMessage/delta") {
-			const delta = readStringField(params, "delta");
-			if (delta) {
-				if (!childState.activityObserved) observe("running");
-				emitAgentEvent({
-					...owner,
-					stream: "assistant",
-					data: { delta }
-				});
-			}
-			return;
-		}
-		if (notification.method === "item/reasoning/summaryTextDelta") {
+		if (notification.method === "item/agentMessage/delta" || notification.method === "item/reasoning/summaryTextDelta") {
 			const delta = readStringField(params, "delta");
 			if (delta) {
 				if (!childState.activityObserved) observe("running");
 				emitAgentEvent({
 					...owner,
-					stream: "thinking",
+					stream: notification.method === "item/agentMessage/delta" ? "assistant" : "thinking",
 					data: { delta }
 				});
 			}
@@ -3648,31 +3553,10 @@ var CodexNativeSubagentTurnObservation = class {
 			});
 		}
 	}
-	captureChildAssistantMessage(notification) {
-		const params = isJsonObject(notification.params) ? notification.params : void 0;
-		const childThreadId = readStringField(params, "threadId")?.trim();
-		const childState = childThreadId ? this.callbacks.currentChild(childThreadId) : void 0;
-		if (!childState || childState.terminal) return;
-		if (notification.method === "item/agentMessage/delta") {
-			const turnId = readStringField(params, "turnId");
-			const itemId = readStringField(params, "itemId");
-			const delta = readStringField(params, "delta");
-			if (turnId && itemId && delta) this.recordChildAssistantMessage(childState, turnId, itemId, delta);
-			return;
-		}
-		if (notification.method !== "item/started" && notification.method !== "item/completed") return;
-		this.captureChildAssistantMessageItem(childState, readStringField(params, "turnId"), isJsonObject(params?.item) ? params.item : void 0);
-	}
-	captureChildTurnAssistantMessages(childState, turn) {
-		const turnId = readStringField(turn, "id");
-		if (!turnId || !Array.isArray(turn.items)) return;
-		for (const item of turn.items) this.captureChildAssistantMessageItem(childState, turnId, isJsonObject(item) ? item : void 0);
-	}
 	toChildTurnCompletion(childState, turn) {
 		const status = normalizeIdentifier(readStringField(turn, "status"));
 		if (status === "completed") {
-			const turnId = readStringField(turn, "id");
-			const result = turnId ? lastChildAssistantMessage(childState, turnId) : void 0;
+			const result = readLastAgentMessage(turn);
 			return {
 				childThreadId: childState.childThreadId,
 				status: "succeeded",
@@ -3687,44 +3571,7 @@ var CodexNativeSubagentTurnObservation = class {
 			result: readTurnErrorMessage(turn) ?? "Subagent failed."
 		};
 	}
-	captureChildAssistantMessageItem(childState, turnId, item) {
-		if (readStringField(item, "type") !== "agentMessage" || !turnId) return;
-		const itemId = readStringField(item, "id");
-		if (!itemId) return;
-		const messages = this.getChildAssistantMessages(childState, turnId);
-		if (readStringField(item, "phase") === "commentary") messages.commentaryIds.add(itemId);
-		else messages.finalMessageIds.add(itemId);
-		const text = readStringField(item, "text");
-		if (text) this.recordChildAssistantMessage(childState, turnId, itemId, text, { replace: true });
-	}
-	recordChildAssistantMessage(childState, turnId, itemId, text, options = {}) {
-		const messages = this.getChildAssistantMessages(childState, turnId);
-		if (!messages.texts.has(itemId)) messages.order.push(itemId);
-		const existing = messages.texts.get(itemId) ?? "";
-		messages.texts.set(itemId, options.replace ? text : `${existing}${text}`);
-	}
-	getChildAssistantMessages(childState, turnId) {
-		let messages = childState.assistantMessagesByTurn.get(turnId);
-		if (!messages) {
-			messages = {
-				texts: /* @__PURE__ */ new Map(),
-				order: [],
-				commentaryIds: /* @__PURE__ */ new Set(),
-				finalMessageIds: /* @__PURE__ */ new Set()
-			};
-			childState.assistantMessagesByTurn.set(turnId, messages);
-		}
-		return messages;
-	}
 };
-function lastChildAssistantMessage(childState, turnId) {
-	const messages = childState.assistantMessagesByTurn.get(turnId);
-	if (!messages) return;
-	for (const itemId of messages.order.toReversed()) if (messages.finalMessageIds.has(itemId) && !messages.commentaryIds.has(itemId)) {
-		const text = normalizeOptionalString(messages.texts.get(itemId));
-		if (text) return text;
-	}
-}
 //#endregion
 //#region extensions/codex/src/app-server/native-subagent-monitor.ts
 const NATIVE_SUBAGENT_NOTIFICATION_METHODS = /* @__PURE__ */ new Set([
@@ -4074,10 +3921,7 @@ var Monitor = class {
 			applyReceipts: (runIds) => this.applyNativeReceipts(parent, runIds)
 		});
 		if (childState && !childState.terminal && (!pendingTurns?.length || notification.method === "turn/completed")) this.turnObservation.emitChildTaskActivity(notification, childState);
-		if (!pendingNativeTurn) {
-			this.turnObservation.captureChildAssistantMessage(notification);
-			await this.handleChildTurnCompletion(notification, childState);
-		}
+		if (!pendingNativeTurn) await this.handleChildTurnCompletion(notification, childState);
 		if (!pendingNativeTurn && notification.method === "thread/status/changed" && threadId && threadStatus) {
 			if (threadStatus !== "systemerror") {
 				if (childState) this.recovery.clearSystemErrorFallback(childState);
@@ -4129,7 +3973,6 @@ var Monitor = class {
 		if (status === "interrupted") {
 			this.removePendingSpawnAdmissionEvidenceForChild(childState.childThreadId);
 			this.rejectPendingDirectChild(state, childState.childThreadId, "Codex child turn interrupted");
-			if (turnId) childState.assistantMessagesByTurn.delete(turnId);
 			this.settleResumableChild(childState);
 			return;
 		}
@@ -4142,7 +3985,6 @@ var Monitor = class {
 			}
 			this.releaseDirectChild(childState);
 		}
-		this.turnObservation.captureChildTurnAssistantMessages(childState, turn);
 		const completion = this.turnObservation.toChildTurnCompletion(childState, turn);
 		if (!completion) return;
 		await this.processObservedCompletion(state, childState, completion);
@@ -4280,21 +4122,20 @@ var Monitor = class {
 				this.settleResumableChild(childState);
 				return false;
 			}
-			const completion = recovery.completion;
-			if (!completion) {
-				if (recovery.fallbackCompletion) this.recovery.setRecoveryFallback(childState, recovery.fallbackCompletion, recovery.fallbackCompletion.completedAt ?? this.now());
-				return false;
-			}
-			if (isNoFinalCompletion(completion)) {
-				this.recovery.setRecoveryFallback(childState, completion, completion.completedAt ?? this.now());
-				return false;
-			}
-			await this.processCompletion(state, childState, completion, completion.completedAt);
+			const completion = this.processRecoveredCompletion(state, childState, recovery);
+			if (!completion) return false;
+			await completion;
 			return true;
 		} finally {
 			statusRead.release();
 		}
 	}
+	processRecoveredCompletion(state, child, recovery) {
+		const completion = recovery.completion;
+		if (completion && !isNoFinalCompletion(completion)) return this.processCompletion(state, child, completion, completion.completedAt);
+		const fallback = completion ?? recovery.fallbackCompletion;
+		if (fallback) this.recovery.setRecoveryFallback(child, fallback, fallback.completedAt ?? this.now());
+	}
 	recordRecoveredChildTurn(state, child, recovery) {
 		if (recovery.assignmentUnresolved) child.fallbackCompletion = void 0;
 		const known = this.knownChildren.get(child.childThreadId);
@@ -4456,7 +4297,6 @@ var Monitor = class {
 				parentThreadId,
 				nativeParentThreadId: known?.nativeParentThreadId ?? parentThreadId,
 				agentId: state.agentId,
-				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
 				terminal: false,
 				nativeCompletionDelivered: false,
@@ -4490,7 +4330,6 @@ var Monitor = class {
 			childState.releaseDirectChild = claimDirectChild(childThreadId);
 		}
 		this.registerAgentPath(state, childThreadId, childThreadId);
-		state.mirror?.markAuthoritativeCompletionExpected(childThreadId);
 		const agentPath = normalizeOptionalString(options.agentPath);
 		if (agentPath) this.registerAgentPath(state, childThreadId, agentPath);
 		for (const path of this.knownChildren.get(childThreadId)?.agentPaths ?? []) this.registerAgentPath(state, childThreadId, path);
@@ -5007,20 +4846,9 @@ var Monitor = class {
 				this.settleResumableChild(childState);
 				return;
 			}
-			const completion = recovery.completion;
-			if (!completion) {
-				if (recovery.fallbackCompletion) {
-					this.recovery.setRecoveryFallback(childState, recovery.fallbackCompletion, recovery.fallbackCompletion.completedAt ?? this.now());
-					return;
-				}
-				this.recovery.scheduleRecoveryPoll(childState);
-				return;
-			}
-			if (isNoFinalCompletion(completion)) {
-				this.recovery.setRecoveryFallback(childState, completion, completion.completedAt ?? this.now());
-				return;
-			}
-			await this.processCompletion(state, childState, completion, completion.completedAt);
+			const completion = this.processRecoveredCompletion(state, childState, recovery);
+			if (completion) await completion;
+			else if (!recovery.completion && !recovery.fallbackCompletion) this.recovery.scheduleRecoveryPoll(childState);
 		} finally {
 			statusRead.release();
 		}