@openclaw/codex 2026.9.1 → 2026.9.3

package/dist/{native-subagent-monitor-CnH147jH.js → native-subagent-monitor-BbCUKRwC.js}

@@ -1,16 +1,17 @@
-import { $t as isJsonObject, At as retainCodexAppServerLiveThread, kt as releaseCodexAppServerLiveThread, xt as claimCodexAppServerLiveThread } from "./shared-client-DxcfF9KX.js";
-import { A as shouldRecordNativeToolTranscript, C as isSideEffectingNativeToolItem, D as itemTitle, E as itemStatus, F as readHookOutputEntries, I as readItem, N as normalizeOptionalString$1, R as readNonEmptyString, S as isNonSuccessItemStatus, T as itemName, V as readNullableString$1, j as shouldSynthesizeToolProgressForItem, w as itemKind, x as isMutatingNativeToolItem, y as auditNativeToolTerminalStatus, z as readNonEmptyStringArray } from "./attempt-client-cleanup-DYHcRQAa.js";
+import { o as isJsonObject } from "./protocol-CAAcVIKF.js";
 import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.js";
+import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-Cz-tOOYj.js";
+import { N as claimCodexAppServerLiveThread, U as releaseCodexAppServerLiveThread, W as retainCodexAppServerLiveThread } from "./shared-client-CVhez2Uo.js";
+import { A as shouldRecordNativeToolTranscript, B as readNonEmptyStringArray, C as isSideEffectingNativeToolItem, D as itemTitle, E as itemStatus, H as readNullableString$1, I as readHookOutputEntries, L as readItem, N as normalizeOptionalString$1, O as matchesCodexSnapshotTurn, S as isNonSuccessItemStatus, T as itemName, j as shouldSynthesizeToolProgressForItem, w as itemKind, x as isMutatingNativeToolItem, y as auditNativeToolTerminalStatus, z as readNonEmptyString } from "./attempt-client-cleanup-D6cR54TV.js";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
-import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-CNe-Xrjx.js";
-import { n as readCodexMirroredSessionHistoryMessages } from "./session-history-C5J1AKzG.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-DeW95wB5.js";
 import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import path from "node:path";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
-import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-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, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { createAgentHarnessTaskRuntime, deliverAgentHarnessTaskCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-task-runtime";
 //#region extensions/codex/src/app-server/event-projector-tool-output.ts
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 1e4;
@@ -19,7 +20,6 @@ var ToolOutputAccumulator = class {
 	constructor() {
 		this.prefixByItem = /* @__PURE__ */ new Map();
 		this.originalLengthByItem = /* @__PURE__ */ new Map();
-		this.normalizedLengthByItem = /* @__PURE__ */ new Map();
 		this.trimStateByItem = /* @__PURE__ */ new Map();
 		this.truncatedItemIds = /* @__PURE__ */ new Set();
 		this.textByItem = /* @__PURE__ */ new Map();
@@ -28,19 +28,7 @@ var ToolOutputAccumulator = class {
 		const originalLength = (this.originalLengthByItem.get(itemId) ?? this.textByItem.get(itemId)?.length ?? 0) + delta.length;
 		this.originalLengthByItem.set(itemId, originalLength);
 		const normalizedLength = updateToolOutputTrimState(this.trimStateByItem, itemId, delta);
-		this.normalizedLengthByItem.set(itemId, normalizedLength);
-		if (this.truncatedItemIds.has(itemId)) {
-			const next = appendBoundedToolTranscriptText(this.prefixByItem.get(itemId) ?? this.textByItem.get(itemId) ?? "", "", originalLength);
-			this.prefixByItem.set(itemId, next.rawPrefix);
-			this.textByItem.set(itemId, next.text);
-			return {
-				text: next.text,
-				originalLength,
-				normalizedLength,
-				rawPrefix: next.rawPrefix
-			};
-		}
-		const next = appendBoundedToolTranscriptText(this.prefixByItem.get(itemId) ?? this.textByItem.get(itemId) ?? "", delta, originalLength);
+		const next = appendBoundedToolTranscriptText(this.prefixByItem.get(itemId) ?? this.textByItem.get(itemId) ?? "", this.truncatedItemIds.has(itemId) ? "" : delta, originalLength);
 		this.prefixByItem.set(itemId, next.rawPrefix);
 		this.textByItem.set(itemId, next.text);
 		if (originalLength > 1e4) this.truncatedItemIds.add(itemId);
@@ -561,7 +549,8 @@ var CodexToolProgressProjection = class {
 		else if (this.lastNativeToolError?.mutatingAction !== true) this.lastNativeToolError = void 0;
 	}
 	emitToolResultSummary(item) {
-		if (!item || !this.params.onToolResult || !this.shouldEmitToolResult()) return;
+		if (!item || item.type === "dynamicToolCall") return;
+		if (!this.params.onToolResult || !this.shouldEmitToolResult()) return;
 		if (this.resultSummaryItemIds.has(item.id)) return;
 		const toolName = itemName(item);
 		const args = itemToolArgs(item);
@@ -574,7 +563,8 @@ var CodexToolProgressProjection = class {
 		});
 	}
 	emitToolResultOutput(item) {
-		if (!item || !this.params.onToolResult || !this.shouldEmitToolOutput()) return;
+		if (!item || item.type === "dynamicToolCall") return;
+		if (!this.params.onToolResult || !this.shouldEmitToolOutput()) return;
 		if (this.resultOutputItemIds.has(item.id) || this.resultOutputStreamedItemIds.has(item.id)) return;
 		const toolName = itemName(item);
 		const output = itemOutputText(item, this.output.textByItem);
@@ -657,7 +647,7 @@ var CodexToolProgressProjection = class {
 		return !commandBearing || !channel && this.shouldEmitToolOutput();
 	}
 	emitTranscriptToolCallProgress(params) {
-		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) return;
+		if (params.name === "progress_card" || !shouldEmitTranscriptToolProgress(params.name, params.arguments)) 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;
@@ -669,7 +659,12 @@ var CodexToolProgressProjection = class {
 		});
 	}
 	emitTranscriptToolResultProgress(params) {
-		if (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, this.transcriptArgumentsById.get(params.id))) return;
+		if (params.name === "progress_card" && this.shouldEmitToolResult()) this.emitToolResultMessage({
+			itemId: params.id,
+			text: formatToolSummary(params.name),
+			isError: true
+		});
 		if (!this.transcriptProgressCallIds.has(params.id)) this.emitTranscriptToolCallProgress({
 			id: params.id,
 			name: params.name,
@@ -947,21 +942,20 @@ var CodexToolTranscriptProjection = class {
 			isError: result.isError
 		}).content;
 	}
-	async recordNativeToolResultWithDetails(item) {
+	async prepareNativeToolResultDetails(item) {
 		const preparedDetails = await this.prepareNativeMcpAppResultDetails(item);
 		const approvalReviewState = item ? this.approvalReviewsByCallId.get(item.id) : void 0;
 		const reviewDetails = approvalReviewState ? {
 			approvalReviews: approvalReviewState.reviews,
 			approvalReviewOutcome: toolApprovalReviewOutcome(approvalReviewState)
 		} : void 0;
-		const details = reviewDetails ? isJsonObject(preparedDetails) ? {
+		return reviewDetails ? isJsonObject(preparedDetails) ? {
 			...preparedDetails,
 			...reviewDetails
 		} : {
 			...preparedDetails !== void 0 ? { toolDetails: preparedDetails } : {},
 			...reviewDetails
 		} : preparedDetails;
-		this.recordNativeToolResult(item, details);
 	}
 	async prepareNativeMcpAppResultDetails(item) {
 		if (!item || item.type !== "mcpToolCall" || itemStatus(item) === "running") return;
@@ -1084,13 +1078,14 @@ var CodexToolTranscriptProjection = class {
 		const missingCount = (/* @__PURE__ */ new Set([...missingTranscriptIds, ...missingTrajectoryIds])).size;
 		return missingCount === 1 ? MISSING_TOOL_RESULT_ERROR : `${MISSING_TOOL_RESULT_ERROR} missingToolResultCount=${missingCount}`;
 	}
-	async readMirroredSessionMessages() {
+	async readMirroredSessionMessages(signal) {
 		return await readCodexMirroredSessionHistoryMessages({
 			agentId: this.params.agentId,
 			sessionFile: this.params.sessionFile,
 			sessionId: this.params.sessionId,
-			sessionKey: this.params.sessionKey
-		}) ?? [];
+			sessionKey: this.params.sessionKey,
+			sessionTarget: this.params.sessionTarget
+		}, void 0, "native-evidence", signal) ?? [];
 	}
 	recordToolCall(params) {
 		if (!params.id || !params.name || this.callIds.has(params.id)) return;
@@ -1388,6 +1383,16 @@ var CodexEventProjection = class {
 			}
 		});
 	}
+	handleRetry(params) {
+		const rateLimited = isJsonObject(params.error) && params.error.codexErrorInfo === "rateLimitExceeded";
+		this.emitAgentEvent({
+			stream: "run_status",
+			data: {
+				phase: "retrying",
+				message: rateLimited ? "Rate limited. The provider is retrying." : "Connection interrupted. The provider is retrying."
+			}
+		});
+	}
 	flushPendingGuardianWarning() {
 		const pending = this.pendingGuardianWarning;
 		if (!pending) return;
@@ -1444,20 +1449,26 @@ var CodexEventProjection = class {
 	emitStandardItemEvent(params) {
 		const { item } = params;
 		if (!item) return;
-		const kind = itemKind(item);
+		const activity = item.type === "subAgentActivity";
+		if (activity && params.phase === "start") return;
+		const subagent = activity || item.type === "collabAgentToolCall";
+		const kind = subagent ? "tool" : itemKind(item);
 		if (!kind) return;
-		const name = itemName(item);
+		const name = subagent ? "subagents" : itemName(item);
 		const commandBearing = isCommandBearingToolItem(item, itemToolArgs(item));
-		const meta = itemMeta(item, this.toolProgress.toolProgressDetailMode());
+		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 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: {
-				itemId: item.id,
+				itemId: activity && !interaction ? `subagent:${readStringField(item, "agentThreadId") ?? item.id}` : item.id,
 				phase: params.phase,
 				kind,
 				title: itemTitle(item),
-				status: params.phase === "start" ? "running" : itemStatus(item),
+				status,
 				...name ? { name } : {},
 				...meta ? { meta } : {},
 				...commandBearing ? { commandBearing: true } : {},
@@ -1465,6 +1476,31 @@ var CodexEventProjection = class {
 			}
 		});
 	}
+	async emitSnapshotOnlyNativeToolProgress(params) {
+		const { item, activeItemIds, completedItemIds, isActive } = params;
+		if (!shouldSynthesizeToolProgressForItem(item) || !matchesCodexSnapshotTurn(item, this.turnId) || completedItemIds.has(item.id) || itemStatus(item) === "running") return;
+		if (!activeItemIds.has(item.id)) {
+			this.emitStandardItemEvent({
+				phase: "start",
+				item
+			});
+			await this.emitNormalizedToolItemEvent({
+				phase: "start",
+				item
+			});
+		}
+		if (!isActive()) return;
+		activeItemIds.delete(item.id);
+		this.emitStandardItemEvent({
+			phase: "end",
+			item
+		});
+		await this.emitNormalizedToolItemEvent({
+			phase: "result",
+			item
+		});
+		completedItemIds.add(item.id);
+	}
 	async emitNormalizedToolItemEvent(params) {
 		const projection = projectNormalizedToolItem({
 			...params,
@@ -1516,10 +1552,10 @@ function extractCodexNativeSubagentCompletions(notification) {
 	if (!params) return [];
 	const item = isJsonObject(params.item) ? params.item : void 0;
 	if (!item) return [];
-	const text = readTrustedInterAgentCommunicationContent(item);
-	if (!text) return [];
-	const author = readTrustedInterAgentCommunicationAuthor(item);
-	return extractCodexNativeSubagentCompletionsFromText(text).filter((completion) => completion.agentPath === author);
+	const communication = readTrustedInterAgentCommunication(item);
+	const text = communication?.content;
+	if (typeof text !== "string" || !text) return [];
+	return extractCodexNativeSubagentCompletionsFromText(text).filter((completion) => completion.agentPath === communication?.author);
 }
 /** Parses one or more tagged subagent completion payloads from commentary text. */
 function extractCodexNativeSubagentCompletionsFromText(text) {
@@ -1612,14 +1648,6 @@ function completedWithoutFinalAssistantMessage() {
 		kind: "no_final_assistant_message"
 	};
 }
-function readTrustedInterAgentCommunicationContent(item) {
-	const communication = readTrustedInterAgentCommunication(item);
-	return typeof communication?.content === "string" ? communication.content : void 0;
-}
-function readTrustedInterAgentCommunicationAuthor(item) {
-	const communication = readTrustedInterAgentCommunication(item);
-	return typeof communication?.author === "string" ? communication.author : void 0;
-}
 function readTrustedInterAgentCommunication(item) {
 	if (readStringField(item, "type") !== "message" || readStringField(item, "role") !== "assistant" || readStringField(item, "phase") !== "commentary") return;
 	const text = extractSingleTextPart(item);