@openclaw/codex 2026.9.3 → 2026.9.4

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

@@ -1,385 +1,18 @@
-import { o as isJsonObject } from "./protocol-CAAcVIKF.js";
+import { o as isJsonObject } from "./protocol-5bh1G-H7.js";
+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-5VhsECCO.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 { J as retainCodexAppServerLiveThread, L as claimCodexAppServerLiveThread, q as releaseCodexAppServerLiveThread } from "./shared-client-CscigXXL.js";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
-import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-DeW95wB5.js";
-import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { C as formatToolSummary, E as truncateToolTranscriptText, S as formatToolOutput, T as toolOutputRawEchoSignature, a as isNativePostToolUseRelayItem, b as ToolOutputAccumulator, c as itemToolArgs, d as itemTranscriptResultText, f as shouldSuppressChannelProgressForItem, g as sanitizeCodexToolArguments, h as resolveCodexToolProgressDetailMode, i as isCommandBearingToolItem, l as itemToolError, m as isCodexCommandBearingToolCall, n as CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX, o as itemMeta, r as CODEX_NATIVE_SUBAGENT_TASK_KIND, s as itemOutputText, t as CODEX_NATIVE_SUBAGENT_RUNTIME, u as itemToolResult, w as normalizeToolTranscriptArguments, x as collectDynamicToolContentText, y as TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS } from "./native-subagent-task-ids-BzTdT0Uw.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-Bz3FT8W5.js";
+import { asFiniteNumber, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 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, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
+import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage, inferToolMetaFromArgs, 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-output.ts
-const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 1e4;
-const TOOL_OUTPUT_TRUNCATION_NOTICE_PREFIX = "...(OpenClaw truncated Codex native tool output";
-var ToolOutputAccumulator = class {
-	constructor() {
-		this.prefixByItem = /* @__PURE__ */ new Map();
-		this.originalLengthByItem = /* @__PURE__ */ new Map();
-		this.trimStateByItem = /* @__PURE__ */ new Map();
-		this.truncatedItemIds = /* @__PURE__ */ new Set();
-		this.textByItem = /* @__PURE__ */ new Map();
-	}
-	append(itemId, delta) {
-		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);
-		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);
-		return {
-			text: next.text,
-			originalLength,
-			normalizedLength,
-			rawPrefix: next.rawPrefix
-		};
-	}
-};
-function updateToolOutputTrimState(trimStateByItem, itemId, delta) {
-	const state = trimStateByItem.get(itemId) ?? {
-		totalLength: 0,
-		leadingWhitespaceLength: 0,
-		trailingWhitespaceLength: 0,
-		sawNonWhitespace: false
-	};
-	state.totalLength += delta.length;
-	const firstNonWhitespace = delta.search(/\S/u);
-	if (firstNonWhitespace === -1) {
-		if (!state.sawNonWhitespace) state.leadingWhitespaceLength += delta.length;
-		state.trailingWhitespaceLength += delta.length;
-		trimStateByItem.set(itemId, state);
-		return state.sawNonWhitespace ? state.totalLength - state.leadingWhitespaceLength - state.trailingWhitespaceLength : 0;
-	}
-	if (!state.sawNonWhitespace) {
-		state.leadingWhitespaceLength += firstNonWhitespace;
-		state.sawNonWhitespace = true;
-	}
-	state.trailingWhitespaceLength = delta.match(/\s*$/u)?.[0].length ?? 0;
-	trimStateByItem.set(itemId, state);
-	return state.totalLength - state.leadingWhitespaceLength - state.trailingWhitespaceLength;
-}
-function toolOutputRawEchoSignature(text) {
-	const trimmed = text.trim();
-	if (!trimmed) return;
-	return {
-		rawLength: trimmed.length,
-		rawPrefix: trimmed.slice(0, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS)
-	};
-}
-function normalizeToolTranscriptArguments(value) {
-	return asNonArrayRecord(value);
-}
-function collectDynamicToolContentText(contentItems) {
-	if (!Array.isArray(contentItems)) return "";
-	return contentItems.flatMap((entry) => {
-		if (!isJsonObject(entry)) return [];
-		const text = readStringField(entry, "text");
-		return text ? [text] : [];
-	}).join("\n");
-}
-function appendBoundedToolTranscriptText(currentPrefix, delta, originalLength) {
-	if (originalLength <= 1e4) {
-		const rawPrefix = currentPrefix + delta;
-		return {
-			text: rawPrefix,
-			rawPrefix
-		};
-	}
-	const notice = toolTranscriptTruncationNotice(originalLength);
-	if (notice.length >= 1e4) return {
-		text: notice.slice(0, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS),
-		rawPrefix: ""
-	};
-	const textBudget = TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - notice.length;
-	const remaining = Math.max(0, textBudget - currentPrefix.length);
-	const prefix = remaining > 0 ? `${currentPrefix}${truncateUtf16Safe(delta, remaining)}` : currentPrefix;
-	const rawPrefix = truncateUtf16Safe(prefix, textBudget);
-	return {
-		text: `${rawPrefix}${notice}`,
-		rawPrefix
-	};
-}
-function toolTranscriptTruncationNotice(originalLength) {
-	return `\n${`${TOOL_OUTPUT_TRUNCATION_NOTICE_PREFIX}: original ${originalLength} chars, showing ${TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS}; rerun with narrower args.)`}`;
-}
-function truncateToolTranscriptText(text, originalLength = text.length) {
-	if (originalLength <= 1e4 && text.length <= 1e4) return text;
-	const notice = toolTranscriptTruncationNotice(originalLength);
-	if (notice.length >= 1e4) return notice.slice(1, 10001);
-	const textBudget = TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - notice.length;
-	return `${truncateUtf16Safe(text, textBudget)}${notice}`;
-}
-function formatToolSummary(toolName, meta) {
-	const trimmedMeta = meta?.trim();
-	return formatToolAggregate(toolName, trimmedMeta ? [trimmedMeta] : void 0, { markdown: true });
-}
-function formatToolOutput(toolName, meta, output) {
-	const formattedOutput = formatToolProgressOutput(output);
-	if (!formattedOutput) return formatToolSummary(toolName, meta);
-	const fence = markdownFenceForText(formattedOutput);
-	return `${formatToolSummary(toolName, meta)}\n${fence}txt\n${formattedOutput}\n${fence}`;
-}
-function markdownFenceForText(text) {
-	return "`".repeat(Math.max(3, longestBacktickRun(text) + 1));
-}
-function longestBacktickRun(value) {
-	let longest = 0;
-	let current = 0;
-	for (const char of value) {
-		if (char === "`") {
-			current += 1;
-			longest = Math.max(longest, current);
-			continue;
-		}
-		current = 0;
-	}
-	return longest;
-}
-//#endregion
-//#region extensions/codex/src/app-server/tool-progress-normalization.ts
-/**
-* Normalizes and sanitizes Codex dynamic-tool progress payloads before they are
-* emitted into OpenClaw events or logs.
-*/
-/** Maps OpenClaw tool-progress config to the mode used by Codex progress metadata. */
-function resolveCodexToolProgressDetailMode(value) {
-	return value === "raw" ? "raw" : "explain";
-}
-function isCodexCommandBearingToolCall(name, args) {
-	const normalizedName = name?.trim().toLowerCase();
-	return normalizedName === "exec" || normalizedName === "bash" || normalizedName === "shell" || typeof args?.command === "string" && args.command.trim().length > 0;
-}
-/** Recursively redacts sensitive strings and handles circular values in event payloads. */
-function sanitizeCodexAgentEventValue(value, seen = /* @__PURE__ */ new WeakSet()) {
-	if (typeof value === "string") return redactToolPayloadText(value);
-	if (Array.isArray(value)) {
-		if (seen.has(value)) return "[Circular]";
-		seen.add(value);
-		return value.map((entry) => sanitizeCodexAgentEventValue(entry, seen));
-	}
-	if (value && typeof value === "object") {
-		if (seen.has(value)) return "[Circular]";
-		seen.add(value);
-		const out = {};
-		for (const [key, child] of Object.entries(value)) out[key] = typeof child === "string" ? redactSensitiveFieldValue(key, child) : sanitizeCodexAgentEventValue(child, seen);
-		return out;
-	}
-	return value;
-}
-/** Sanitizes a record-shaped Codex agent event payload. */
-function sanitizeCodexAgentEventRecord(value) {
-	return sanitizeCodexAgentEventValue(value);
-}
-/** Sanitizes dynamic-tool arguments before diagnostic/event emission. */
-function sanitizeCodexToolArguments(value) {
-	if (!isJsonObject(value)) return;
-	return sanitizeCodexAgentEventRecord(value);
-}
-/** Sanitizes a Codex dynamic-tool response before diagnostic/event emission. */
-function sanitizeCodexToolResponse(response) {
-	return sanitizeCodexAgentEventRecord({ ...response });
-}
-/** Infers compact human-readable tool metadata from Codex dynamic-tool arguments. */
-function inferCodexDynamicToolMeta(call, detailMode) {
-	return inferToolMetaFromArgs(call.tool, call.arguments, { detailMode });
-}
-//#endregion
-//#region extensions/codex/src/app-server/event-projector-tool-items.ts
-function isNativePostToolUseRelayItem(item) {
-	switch (item.type) {
-		case "commandExecution":
-		case "fileChange":
-		case "mcpToolCall": return true;
-		default: return false;
-	}
-}
-function shouldSuppressChannelProgressForItem(item) {
-	if (shouldSynthesizeToolProgressForItem(item)) return true;
-	return item.type === "dynamicToolCall";
-}
-function itemToolArgs(item) {
-	if (item.type === "commandExecution") return sanitizeCodexAgentEventRecord({
-		command: item.command,
-		...typeof item.cwd === "string" ? { cwd: item.cwd } : {}
-	});
-	if (item.type === "fileChange") return sanitizeCodexAgentEventRecord({ changes: itemFileChangesForTranscript(item) });
-	if (item.type === "webSearch") return webSearchToolArgs(item);
-	if (item.type === "dynamicToolCall" || item.type === "mcpToolCall") return sanitizeCodexToolArguments(item.arguments);
-}
-function isCommandBearingToolItem(item, args) {
-	if (item.type === "commandExecution") return true;
-	return typeof args?.command === "string" && args.command.trim().length > 0;
-}
-function webSearchToolArgs(item) {
-	const action = isJsonObject(item.action) ? item.action : void 0;
-	const actionType = action ? readNonEmptyString(action, "type") : void 0;
-	const queries = action && actionType === "search" ? readNonEmptyStringArray(action, "queries") : [];
-	const query = normalizeOptionalString$1(item.query) ?? (action && actionType === "search" ? readNonEmptyString(action, "query") : void 0) ?? queries[0];
-	const url = action ? readNonEmptyString(action, "url") : void 0;
-	const pattern = action ? readNonEmptyString(action, "pattern") : void 0;
-	const args = {};
-	if (query) args.query = query;
-	if (queries.length > 0) args.queries = queries;
-	if (actionType && actionType !== "search") args.action = actionType;
-	if (url) args.url = url;
-	if (pattern) args.pattern = pattern;
-	if (!query && !url && !pattern) args.queryUnavailable = true;
-	return sanitizeCodexAgentEventRecord(args);
-}
-function itemToolResult(item) {
-	if (item.type === "commandExecution") return { result: sanitizeCodexAgentEventRecord({
-		status: item.status,
-		exitCode: item.exitCode,
-		durationMs: item.durationMs
-	}) };
-	if (item.type === "fileChange") return { result: sanitizeCodexAgentEventRecord({
-		status: item.status,
-		changes: itemFileChanges(item)
-	}) };
-	if (item.type === "mcpToolCall") return { result: sanitizeCodexAgentEventRecord({
-		status: item.status,
-		durationMs: item.durationMs,
-		...item.error ? { error: item.error } : {},
-		...item.result ? { result: item.result } : {}
-	}) };
-	if (item.type === "webSearch") return { result: webSearchToolResult(item) };
-	return {};
-}
-function webSearchToolResult(item) {
-	return sanitizeCodexAgentEventRecord({
-		status: itemStatus(item),
-		...typeof item.durationMs === "number" ? { durationMs: item.durationMs } : {},
-		...webSearchToolArgs(item)
-	});
-}
-function itemFileChangeRecords(item) {
-	const changes = item.changes;
-	return Array.isArray(changes) ? changes.filter(isJsonObject) : [];
-}
-function itemFileChanges(item) {
-	return itemFileChangeRecords(item).flatMap((change) => {
-		const path = normalizeOptionalString$1(change.path);
-		if (!path || change.kind === void 0) return [];
-		return [{
-			path,
-			kind: change.kind
-		}];
-	});
-}
-function fileChangeKindType(kind) {
-	if (typeof kind === "string") return kind;
-	return isJsonObject(kind) ? normalizeOptionalString$1(kind.type) : void 0;
-}
-function countFileContentLines(content) {
-	if (!content) return 0;
-	const lines = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
-	if (lines.length > 1 && lines.at(-1) === "") lines.pop();
-	return lines.length;
-}
-function fileChangeDiffStat(diff, kind) {
-	const kindType = fileChangeKindType(kind);
-	if (kindType === "add") return {
-		added: countFileContentLines(diff),
-		removed: 0
-	};
-	if (kindType === "delete") return {
-		added: 0,
-		removed: countFileContentLines(diff)
-	};
-	let added = 0;
-	let removed = 0;
-	let inHunk = false;
-	for (const line of diff.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n")) {
-		if (line.startsWith("@@")) {
-			inHunk = true;
-			continue;
-		}
-		if (!inHunk) continue;
-		if (line.startsWith("+")) added += 1;
-		else if (line.startsWith("-")) removed += 1;
-	}
-	return {
-		added,
-		removed
-	};
-}
-function truncateFileChangeDiffAtLineBoundary(diff, maxChars) {
-	if (diff.length <= maxChars) return { diff };
-	if (maxChars <= 0) return { diffTruncated: true };
-	const boundary = diff.lastIndexOf("\n", maxChars - 1);
-	return boundary >= 0 ? {
-		diff: diff.slice(0, boundary + 1),
-		diffTruncated: true
-	} : { diffTruncated: true };
-}
-function itemFileChangesForTranscript(item) {
-	let remainingDiffChars = 1e4;
-	return itemFileChangeRecords(item).flatMap((change) => {
-		const path = normalizeOptionalString$1(change.path);
-		if (!path || change.kind === void 0) return [];
-		const result = {
-			path,
-			kind: change.kind
-		};
-		if (typeof change.diff !== "string") return [result];
-		result.stat = fileChangeDiffStat(change.diff, change.kind);
-		const bounded = truncateFileChangeDiffAtLineBoundary(change.diff, remainingDiffChars);
-		if (bounded.diff !== void 0) {
-			result.diff = bounded.diff;
-			remainingDiffChars -= bounded.diff.length;
-		}
-		if (bounded.diffTruncated) result.diffTruncated = true;
-		return [result];
-	});
-}
-function itemToolError(item, status, outputTextByItem) {
-	if (status === "blocked") return "codex native tool blocked";
-	if (status !== "failed") return;
-	return itemOutputText(item, outputTextByItem) ?? "codex native tool failed";
-}
-function itemMeta(item, detailMode = "explain") {
-	if (item.type === "commandExecution" && typeof item.command === "string") return inferToolMetaFromArgs("exec", {
-		command: item.command,
-		cwd: typeof item.cwd === "string" ? item.cwd : void 0
-	}, { detailMode });
-	if (item.type === "webSearch") return inferToolMetaFromArgs("web_search", webSearchToolArgs(item), { detailMode });
-	const toolName = itemName(item);
-	if ((item.type === "dynamicToolCall" || item.type === "mcpToolCall") && toolName) return inferToolMetaFromArgs(toolName, item.arguments, { detailMode });
-}
-function itemOutputText(item, outputTextByItem) {
-	if (item.type === "commandExecution") {
-		const output = item.aggregatedOutput?.trim() || outputTextByItem?.get(item.id)?.trim();
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
-	if (item.type === "dynamicToolCall") {
-		const output = collectDynamicToolContentText(item.contentItems).trim();
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
-	if (item.type === "mcpToolCall") {
-		const output = item.error ? stringifyJsonValue(item.error) : item.result ? stringifyJsonValue(item.result) : void 0;
-		return output ? truncateToolTranscriptText(output) : void 0;
-	}
-}
-function itemTranscriptResultText(item, outputTextByItem) {
-	const output = itemOutputText(item, outputTextByItem);
-	if (output) return output;
-	const result = itemToolResult(item).result;
-	const resultText = result ? stringifyJsonValue(result) : void 0;
-	return resultText ? truncateToolTranscriptText(resultText) : itemStatus(item);
-}
-function stringifyJsonValue(value) {
-	try {
-		return JSON.stringify(value, null, 2);
-	} catch {
-		return;
-	}
-}
-//#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-progress.ts
 const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = /* @__PURE__ */ new Set([
 	"message",
@@ -1455,7 +1088,8 @@ var CodexEventProjection = class {
 		const kind = subagent ? "tool" : itemKind(item);
 		if (!kind) return;
 		const name = subagent ? "subagents" : itemName(item);
-		const commandBearing = isCommandBearingToolItem(item, itemToolArgs(item));
+		const args = itemToolArgs(item);
+		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);
@@ -1644,7 +1278,7 @@ function stringifyResult(value, status) {
 }
 function completedWithoutFinalAssistantMessage() {
 	return {
-		text: "Codex native subagent completed without a final assistant message.",
+		text: "Subagent completed without a final assistant message.",
 		kind: "no_final_assistant_message"
 	};
 }
@@ -1675,18 +1309,6 @@ function normalizeStatusKey(value) {
 	return value.replace(/[^a-z0-9]/giu, "").toLowerCase();
 }
 //#endregion
-//#region extensions/codex/src/app-server/native-subagent-task-ids.ts
-/**
-* Shared identifiers for representing Codex native subagents as OpenClaw task
-* runtime rows.
-*/
-/** Task runtime namespace for Codex native subagent task rows. */
-const CODEX_NATIVE_SUBAGENT_RUNTIME = "subagent";
-/** Task kind used to distinguish native Codex subagents from other subagent runtimes. */
-const CODEX_NATIVE_SUBAGENT_TASK_KIND = "codex-native";
-/** Run id prefix for task rows keyed by Codex child thread ids. */
-const CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX = "codex-thread:";
-//#endregion
 //#region extensions/codex/src/app-server/native-subagent-task-mirror.ts
 /** Projects Codex thread and collab-agent notifications into task lifecycle updates. */
 var CodexNativeSubagentTaskMirror = class {
@@ -1734,15 +1356,15 @@ var CodexNativeSubagentTaskMirror = class {
 		const spawn = readSubagentThreadSpawnSource(thread.source, this.params.parentThreadId);
 		if (!spawn) return;
 		const threadId = thread.id.trim();
-		const label = normalizeOptionalString(spawn.agent_nickname) ?? normalizeOptionalString(thread.agentNickname) ?? normalizeOptionalString(spawn.agent_role) ?? normalizeOptionalString(thread.agentRole) ?? "Codex subagent";
-		const task = normalizeOptionalString(thread.preview) ?? `Codex native subagent${label === "Codex subagent" ? "" : ` ${label}`}`;
+		const label = normalizeOptionalString(spawn.agent_nickname) ?? normalizeOptionalString(thread.agentNickname) ?? normalizeOptionalString(spawn.agent_role) ?? normalizeOptionalString(thread.agentRole) ?? "Subagent";
+		const task = normalizeOptionalString(thread.preview) ?? `Subagent${label === "Subagent" ? "" : ` ${label}`}`;
 		const createdAt = secondsToMillis(thread.createdAt) ?? this.now();
 		if (!this.createRunningTask({
 			threadId,
 			label,
 			task,
 			startedAt: createdAt,
-			progressSummary: "Codex native subagent started."
+			progressSummary: "Subagent started."
 		})) return;
 		this.applyStatus(threadId, thread.status);
 	}
@@ -1763,7 +1385,7 @@ var CodexNativeSubagentTaskMirror = class {
 			this.runtime.recordTaskRunProgressByRunId({
 				runId,
 				lastEventAt: eventAt,
-				progressSummary: "Codex native subagent is active."
+				progressSummary: "Subagent is active."
 			});
 			return;
 		}
@@ -1771,7 +1393,7 @@ var CodexNativeSubagentTaskMirror = class {
 			this.runtime.recordTaskRunProgressByRunId({
 				runId,
 				lastEventAt: eventAt,
-				progressSummary: "Codex native subagent is idle."
+				progressSummary: "Subagent is idle."
 			});
 			return;
 		}
@@ -1781,7 +1403,7 @@ var CodexNativeSubagentTaskMirror = class {
 				this.runtime.recordTaskRunProgressByRunId({
 					runId,
 					lastEventAt: eventAt,
-					progressSummary: "Codex native subagent hit a system error; awaiting recovery."
+					progressSummary: "Subagent hit a system error; awaiting recovery."
 				});
 				return;
 			}
@@ -1791,16 +1413,16 @@ var CodexNativeSubagentTaskMirror = class {
 				status: "failed",
 				endedAt: eventAt,
 				lastEventAt: eventAt,
-				error: "Codex app-server reported a system error for the native subagent thread.",
-				progressSummary: "Codex native subagent hit a system error.",
-				terminalSummary: "Codex native subagent failed."
+				error: "Subagent encountered a system error.",
+				progressSummary: "Subagent hit a system error.",
+				terminalSummary: "Subagent failed."
 			});
 			return;
 		}
 		if (statusType === "notLoaded") this.runtime.recordTaskRunProgressByRunId({
 			runId,
 			lastEventAt: eventAt,
-			progressSummary: "Codex native subagent is not loaded."
+			progressSummary: "Subagent is not loaded."
 		});
 	}
 	handleCollabAgentItem(params) {
@@ -1842,17 +1464,17 @@ var CodexNativeSubagentTaskMirror = class {
 			return;
 		}
 		if (this.mirrorStateByThreadId.get(threadId) !== "mirrored") return;
-		const message = kind === "interacted" ? "Codex native subagent received more input." : "Codex native subagent was interrupted.";
+		const message = kind === "interacted" ? "Subagent received more input." : "Subagent was interrupted.";
 		this.applyCollabAgentStatus(threadId, kind === "interacted" ? "running" : "interrupted", message);
 	}
 	createTaskFromSubagentActivity(threadId, agentPath) {
 		const eventAt = this.now();
 		this.createRunningTask({
 			threadId,
-			label: "Codex subagent",
-			task: agentPath ? `Codex native subagent ${agentPath}` : "Codex native subagent",
+			label: "Subagent",
+			task: agentPath ? `Subagent ${agentPath}` : "Subagent",
 			startedAt: eventAt,
-			progressSummary: "Codex native subagent started."
+			progressSummary: "Subagent started."
 		});
 	}
 	createTaskFromCollabSpawnItem(threadId, item) {
@@ -1860,10 +1482,10 @@ var CodexNativeSubagentTaskMirror = class {
 		const createdAt = this.now();
 		this.createRunningTask({
 			threadId,
-			label: "Codex subagent",
-			task: prompt ?? "Codex native subagent",
+			label: "Subagent",
+			task: prompt ?? "Subagent",
 			startedAt: createdAt,
-			progressSummary: "Codex native subagent spawned."
+			progressSummary: "Subagent spawned."
 		});
 	}
 	createRunningTask(params) {
@@ -1871,6 +1493,8 @@ var CodexNativeSubagentTaskMirror = class {
 		if (!threadId || this.mirrorStateByThreadId.get(threadId) === "mirrored") return false;
 		this.mirrorStateByThreadId.set(threadId, "mirrored");
 		const runId = codexNativeSubagentRunId(threadId);
+		const historyOwner = this.params.historyOwner;
+		const stampHistoryOwner = historyOwner && !this.runtime.listTaskRecords().some((task) => task.runId === runId);
 		if (!this.runtime.tryCreateRunningTaskRun({
 			sourceId: runId,
 			agentId: this.params.agentId,
@@ -1882,7 +1506,8 @@ var CodexNativeSubagentTaskMirror = class {
 			preferMetadata: true,
 			startedAt: params.startedAt,
 			lastEventAt: this.now(),
-			progressSummary: params.progressSummary
+			progressSummary: params.progressSummary,
+			...stampHistoryOwner ? { detail: { nativeHistory: { ...historyOwner } } } : {}
 		})) {
 			this.mirrorStateByThreadId.set(threadId, "failed");
 			return false;
@@ -1903,13 +1528,13 @@ var CodexNativeSubagentTaskMirror = class {
 			this.runtime.recordTaskRunProgressByRunId({
 				runId,
 				lastEventAt: eventAt,
-				progressSummary: normalizeOptionalString(message) ?? (normalizedStatus === "pendingInit" ? "Codex native subagent is initializing." : normalizedStatus === "interrupted" ? "Codex native subagent was interrupted." : "Codex native subagent is running.")
+				progressSummary: normalizeOptionalString(message) ?? (normalizedStatus === "pendingInit" ? "Subagent is initializing." : normalizedStatus === "interrupted" ? "Subagent was interrupted." : "Subagent is running.")
 			});
 			return;
 		}
 		if (normalizedStatus === "completed") {
 			this.terminalRunIds.add(runId);
-			const summary = normalizeOptionalString(message) ?? "Codex native subagent completed.";
+			const summary = normalizeOptionalString(message) ?? "Subagent completed.";
 			if (this.expectedAuthoritativeRunIds.has(runId)) this.runtime.recordTaskRunProgressByRunId({
 				runId,
 				lastEventAt: eventAt,
@@ -1932,8 +1557,8 @@ var CodexNativeSubagentTaskMirror = class {
 				status: "succeeded",
 				endedAt: eventAt,
 				lastEventAt: eventAt,
-				progressSummary: normalizeOptionalString(message) ?? "Codex native subagent blocked.",
-				terminalSummary: normalizeOptionalString(message) ?? "Codex native subagent blocked.",
+				progressSummary: normalizeOptionalString(message) ?? "Subagent blocked.",
+				terminalSummary: normalizeOptionalString(message) ?? "Subagent blocked.",
 				terminalOutcome: "blocked"
 			});
 			return;
@@ -1944,9 +1569,9 @@ var CodexNativeSubagentTaskMirror = class {
 			status: normalizedStatus === "shutdown" ? "cancelled" : "failed",
 			endedAt: eventAt,
 			lastEventAt: eventAt,
-			error: normalizeOptionalString(message) ?? `Codex native subagent status: ${normalizedStatus}`,
-			progressSummary: normalizeOptionalString(message) ?? `Codex native subagent ${normalizedStatus}.`,
-			terminalSummary: normalizeOptionalString(message) ?? "Codex native subagent did not complete."
+			error: normalizeOptionalString(message) ?? `Subagent status: ${normalizedStatus}`,
+			progressSummary: normalizeOptionalString(message) ?? `Subagent ${normalizedStatus}.`,
+			terminalSummary: normalizeOptionalString(message) ?? "Subagent did not complete."
 		});
 	}
 };
@@ -2129,6 +1754,7 @@ function registerMonitor(params) {
 		parentThreadId: params.parentThreadId,
 		requesterSessionKey: params.requesterSessionKey,
 		taskRuntimeScope: params.taskRuntimeScope,
+		historyOwner: params.historyOwner,
 		agentId: params.agentId,
 		claimDirectChild: params.claimDirectChild,
 		rejectPendingDirectChild: params.rejectPendingDirectChild,
@@ -2207,6 +1833,7 @@ var Monitor = class {
 		}
 		state.requesterSessionKey ??= params.requesterSessionKey;
 		state.taskRuntimeScope ??= params.taskRuntimeScope;
+		state.historyOwner ??= params.historyOwner;
 		state.agentId ??= params.agentId;
 		const owner = Symbol("codex-native-subagent-owner");
 		state.owners.set(owner, {
@@ -2261,7 +1888,7 @@ var Monitor = class {
 		this.retiredParentStates.add(state);
 		state.owners.clear();
 		this.clearPendingDirectSpawnEvidenceForParent(parentThreadId);
-		for (const childState of Array.from(this.childStates.values())) if (childState.parentThreadId === parentThreadId) this.retireChild(state, childState, "Codex native subagent parent session ended.");
+		for (const childState of Array.from(this.childStates.values())) if (childState.parentThreadId === parentThreadId) this.retireChild(state, childState, "Subagent parent session ended.");
 		if (this.parentStates.get(parentThreadId) === state) this.parentStates.delete(parentThreadId);
 	}
 	prepareParentTaskRuntime(state) {
@@ -2275,6 +1902,7 @@ var Monitor = class {
 		state.mirror ??= new CodexNativeSubagentTaskMirror({
 			parentThreadId: state.parentThreadId,
 			requesterSessionKey: state.requesterSessionKey,
+			historyOwner: state.historyOwner,
 			agentId: state.agentId
 		}, state.taskRuntime);
 	}
@@ -2539,7 +2167,7 @@ var Monitor = class {
 		for (const childThreadId of childThreadIds) {
 			const childState = this.childStates.get(childThreadId);
 			if (childState && childState.parentThreadId !== state.parentThreadId) continue;
-			if (childState) this.retireChild(state, childState, "Codex native subagent was closed.");
+			if (childState) this.retireChild(state, childState, "Subagent was closed.");
 			else this.updateChildThreadOwnership("release", childThreadId, this.releaseChildThread);
 		}
 	}
@@ -2745,8 +2373,8 @@ var Monitor = class {
 				childSessionKey: codexNativeSubagentRunId(completion.childThreadId),
 				childSessionId: completion.childThreadId,
 				announceId: `codex-native:${state.parentThreadId}:${completion.childThreadId}:${completion.status}`,
-				announceType: "Codex native subagent",
-				taskLabel: "Codex native subagent",
+				announceType: "Subagent",
+				taskLabel: "Subagent",
 				status: completion.status,
 				statusLabel: completion.statusLabel,
 				result: completion.result,
@@ -3088,7 +2716,7 @@ var Monitor = class {
 		const candidates = /* @__PURE__ */ new Map();
 		for (const task of state.taskRuntime.listTaskRecords()) {
 			if (task.requesterSessionKey !== state.requesterSessionKey || !this.shouldReconcileCodexNativeTask(task)) continue;
-			const childThreadId = task.runId.slice(13).trim();
+			const childThreadId = task.runId.slice(CODEX_NATIVE_SUBAGENT_RUN_ID_PREFIX.length).trim();
 			candidates.set(childThreadId, {
 				parentState: state,
 				nativeCompletionReceipts: state.nativeCompletionReceipts,
@@ -3249,14 +2877,14 @@ function toChildTurnCompletion(childState, turn) {
 			childThreadId: childState.childThreadId,
 			status: "succeeded",
 			statusLabel: result ? "turn_completed" : "completed_without_final_message",
-			result: result ?? "Codex native subagent completed without a final assistant message."
+			result: result ?? "Subagent completed without a final assistant message."
 		};
 	}
 	if (status === "failed") return {
 		childThreadId: childState.childThreadId,
 		status: "failed",
 		statusLabel: "turn_failed",
-		result: readTurnErrorMessage(turn) ?? "Codex native subagent failed."
+		result: readTurnErrorMessage(turn) ?? "Subagent failed."
 	};
 }
 function lastChildAssistantMessage(childState, turnId) {
@@ -3276,7 +2904,7 @@ function systemErrorFallbackCompletion(childThreadId) {
 		childThreadId,
 		status: "failed",
 		statusLabel: "system_error",
-		result: "Codex app-server reported a system error for the native subagent thread."
+		result: "Subagent runtime reported a system error."
 	};
 }
 function readTurnCompletion(turn, childThreadId) {
@@ -3289,7 +2917,7 @@ function readTurnCompletion(turn, childThreadId) {
 		childThreadId,
 		status: "succeeded",
 		statusLabel: result ? "task_complete" : "completed_without_final_message",
-		result: result ?? "Codex native subagent completed without a final assistant message.",
+		result: result ?? "Subagent completed without a final assistant message.",
 		completedAt
 	};
 	if (status === "interrupted") return;
@@ -3297,7 +2925,7 @@ function readTurnCompletion(turn, childThreadId) {
 		childThreadId,
 		status: "failed",
 		statusLabel: "task_failed",
-		result: readTurnErrorMessage(turn) ?? result ?? "Codex native subagent failed.",
+		result: readTurnErrorMessage(turn) ?? result ?? "Subagent failed.",
 		completedAt
 	};
 }
@@ -3347,4 +2975,4 @@ function unrefTimer(timer) {
 	if (typeof timer === "object" && timer && "unref" in timer) timer.unref();
 }
 //#endregion
-export { CodexToolProgressProjection as a, isCodexCommandBearingToolCall as c, sanitizeCodexToolResponse as d, CodexToolTranscriptProjection as i, resolveCodexToolProgressDetailMode as l, CodexEventProjection as n, shouldEmitTranscriptToolProgress as o, emitCodexAgentEvent as r, inferCodexDynamicToolMeta as s, codexNativeSubagentMonitorRuntime as t, sanitizeCodexToolArguments as u };
+export { CodexToolProgressProjection as a, CodexToolTranscriptProjection as i, CodexEventProjection as n, shouldEmitTranscriptToolProgress as o, emitCodexAgentEvent as r, codexNativeSubagentMonitorRuntime as t };