@openclaw/codex 2026.8.1-beta.2 → 2026.8.1-beta.3

package/dist/model-catalog-CmGoqVKB.js

@@ -0,0 +1,48 @@
+import { r as buildCodexRuntimeModelParams } from "./harness-DoKQcF8n.js";
+import { h as readCodexPluginConfig } from "./config-CpNeo5AE.js";
+import { t as listAllCodexAppServerModels } from "./models-CZw1wClT.js";
+import { r as requestOptions } from "./command-rpc-xUIIonsO.js";
+//#region extensions/codex/src/app-server/model-catalog.ts
+const OPENAI_CODEX_BASE_URL = "https://chatgpt.com/backend-api/codex";
+const DEFAULT_MODEL_DISCOVERY_TIMEOUT_MS = 2500;
+const INPUT_TYPES = /* @__PURE__ */ new Set([
+	"text",
+	"image",
+	"audio",
+	"video",
+	"document"
+]);
+function isModelInputType(value) {
+	return INPUT_TYPES.has(value);
+}
+function codexAppServerModelsToCatalogEntries(models) {
+	return models.map((model, providerOrder) => {
+		const input = model.inputModalities.filter(isModelInputType);
+		const runtimeParams = buildCodexRuntimeModelParams(model.id, model.model);
+		return {
+			provider: "openai",
+			id: model.id,
+			name: model.displayName ?? model.id,
+			providerOrder,
+			api: "openai-chatgpt-responses",
+			baseUrl: OPENAI_CODEX_BASE_URL,
+			reasoning: model.supportedReasoningEfforts.length > 0,
+			...input.length > 0 ? { input } : {},
+			...runtimeParams ? { params: runtimeParams } : {},
+			compat: {
+				supportsReasoningEffort: model.supportedReasoningEfforts.length > 0,
+				supportedReasoningEfforts: model.supportedReasoningEfforts
+			}
+		};
+	});
+}
+async function loadCodexAppServerModelCatalog(params, pluginConfig) {
+	const discovery = readCodexPluginConfig(pluginConfig).discovery;
+	if (discovery?.enabled === false) return [];
+	return codexAppServerModelsToCatalogEntries((await listAllCodexAppServerModels({
+		...requestOptions(pluginConfig, 100, params.config, params.agentDir),
+		timeoutMs: discovery?.timeoutMs ?? DEFAULT_MODEL_DISCOVERY_TIMEOUT_MS
+	})).models);
+}
+//#endregion
+export { loadCodexAppServerModelCatalog };

package/dist/{models-BFlpn1Ex.js → models-CZw1wClT.js}

@@ -1,4 +1,4 @@
-import { t as assertCodexModelListResponse } from "./protocol-validators-B4F7L8Rf.js";
+import { t as assertCodexModelListResponse } from "./protocol-validators-VAVyEnDp.js";
 import { normalizeOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/models.ts
 /**
@@ -40,7 +40,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-kIBbGjk4.js").then((n) => n.m);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-Dw-rzii0.js").then((n) => n.m);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,

package/dist/{native-subagent-monitor-DyTGmTUx.js → native-subagent-monitor-GGq3RnOo.js}

@@ -1,8 +1,9 @@
-import { B as claimCodexAppServerLiveThread, K as releaseCodexAppServerLiveThread, ct as isJsonObject, q as retainCodexAppServerLiveThread } from "./shared-client-kIBbGjk4.js";
-import { A as shouldSynthesizeToolProgressForItem, B as readNullableString$1, C as isSideEffectingNativeToolItem, D as itemTitle, E as itemStatus, F as readItem, L as readNonEmptyString, M as normalizeOptionalString$1, P as readHookOutputEntries, R as readNonEmptyStringArray, S as isNonSuccessItemStatus, T as itemName, k as shouldRecordNativeToolTranscript, w as itemKind, x as isMutatingNativeToolItem, y as auditNativeToolTerminalStatus } from "./attempt-client-cleanup-DMLXUfa8.js";
-import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-ClRBije0.js";
+import { H as claimCodexAppServerLiveThread, J as releaseCodexAppServerLiveThread, Y as retainCodexAppServerLiveThread, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
+import { A as shouldSynthesizeToolProgressForItem, B as readNullableString$1, C as isSideEffectingNativeToolItem, D as itemTitle, E as itemStatus, F as readItem, L as readNonEmptyString, M as normalizeOptionalString$1, P as readHookOutputEntries, R as readNonEmptyStringArray, S as isNonSuccessItemStatus, T as itemName, k as shouldRecordNativeToolTranscript, w as itemKind, x as isMutatingNativeToolItem, y as auditNativeToolTerminalStatus } from "./attempt-client-cleanup-URjUlCHg.js";
+import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
 import { n as sanitizeCodexHistoryImagePayloads } from "./image-payload-sanitizer-CnfoUPCE.js";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-C75Yiiwc.js";
 import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -196,7 +197,7 @@ function sanitizeCodexToolArguments(value) {
 }
 /** Sanitizes a Codex dynamic-tool response before diagnostic/event emission. */
 function sanitizeCodexToolResponse(response) {
-	return sanitizeCodexAgentEventRecord(response);
+	return sanitizeCodexAgentEventRecord({ ...response });
 }
 /** Infers compact human-readable tool metadata from Codex dynamic-tool arguments. */
 function inferCodexDynamicToolMeta(call, detailMode) {
@@ -204,17 +205,6 @@ function inferCodexDynamicToolMeta(call, detailMode) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-items.ts
-function nativeToolActionFingerprint(item) {
-	if (item.type === "commandExecution" && typeof item.command === "string") return JSON.stringify({
-		type: item.type,
-		command: item.command,
-		cwd: typeof item.cwd === "string" ? item.cwd : ""
-	});
-	if (item.type === "fileChange") return JSON.stringify({
-		type: item.type,
-		changes: itemFileChanges(item)
-	});
-}
 function isNativePostToolUseRelayItem(item) {
 	switch (item.type) {
 		case "commandExecution":
@@ -434,6 +424,7 @@ var CodexToolProgressProjection = class {
 		this.sideEffectingNativeIds = /* @__PURE__ */ new Set();
 		this.sideEffectingDynamicIds = /* @__PURE__ */ new Set();
 		this.transcriptProgressCallIds = /* @__PURE__ */ new Set();
+		this.approvalTimeoutKinds = /* @__PURE__ */ new Map();
 	}
 	get outputTextByItem() {
 		return this.output.textByItem;
@@ -450,6 +441,10 @@ var CodexToolProgressProjection = class {
 	get hasPotentialSideEffects() {
 		return this.sideEffectingNativeIds.size > 0 || this.sideEffectingDynamicIds.size > 0;
 	}
+	approvalTimeoutExplanation(itemId, status) {
+		const kind = isNonSuccessItemStatus(status) && this.approvalTimeoutKinds.get(itemId);
+		return kind ? codexApprovalTimeoutText(kind) : void 0;
+	}
 	setLastToolError(error) {
 		if (!error) {
 			this.lastNativeToolError = void 0;
@@ -468,9 +463,7 @@ var CodexToolProgressProjection = class {
 			},
 			nativeMutation: {
 				mutatingAction: error.mutatingAction === true,
-				replaySafe: error.mutatingAction !== true,
-				...error.actionFingerprint ? { actionFingerprint: error.actionFingerprint } : {},
-				...error.fileTarget ? { fileTarget: error.fileTarget } : {}
+				replaySafe: error.mutatingAction !== true
 			}
 		});
 		this.lastNativeToolError = terminalResolution?.lastToolError ?? (this.lastNativeToolError?.mutatingAction && error.mutatingAction !== true ? this.lastNativeToolError : error);
@@ -537,9 +530,14 @@ var CodexToolProgressProjection = class {
 	recordNativeToolError(params) {
 		const executionStarted = params.status !== "blocked";
 		const mutatingAction = executionStarted && isMutatingNativeToolItem(params.item);
-		const actionFingerprint = mutatingAction ? nativeToolActionFingerprint(params.item) : void 0;
 		const isFailure = isNonSuccessItemStatus(params.status);
-		const error = isFailure ? itemToolError(params.item, params.status, this.output.textByItem) : void 0;
+		const approvalTimeoutExplanation = this.approvalTimeoutExplanation(params.item.id, params.status);
+		const error = isFailure ? approvalTimeoutExplanation ?? itemToolError(params.item, params.status, this.output.textByItem) : void 0;
+		const failure = error ? {
+			...approvalTimeoutExplanation ? { errorCode: "approval_timeout" } : {},
+			error,
+			...approvalTimeoutExplanation ? { timedOut: true } : {}
+		} : {};
 		const terminalResolution = this.params.observeToolTerminal?.({
 			toolCallId: params.item.id,
 			toolName: params.name,
@@ -547,11 +545,10 @@ var CodexToolProgressProjection = class {
 			...params.meta ? { meta: params.meta } : {},
 			executionStarted,
 			outcome: isFailure ? "failure" : "success",
-			...isFailure ? { failure: error ? { error } : {} } : {},
+			...isFailure ? { failure } : {},
 			nativeMutation: {
 				mutatingAction,
-				replaySafe: !mutatingAction,
-				...actionFingerprint ? { actionFingerprint } : {}
+				replaySafe: !mutatingAction
 			}
 		});
 		if (terminalResolution) {
@@ -561,9 +558,8 @@ var CodexToolProgressProjection = class {
 		if (isFailure) this.lastNativeToolError = {
 			toolName: params.name,
 			...params.meta ? { meta: params.meta } : {},
-			...error ? { error } : {},
-			...mutatingAction ? { mutatingAction: true } : {},
-			...actionFingerprint ? { actionFingerprint } : {}
+			...failure,
+			...mutatingAction ? { mutatingAction: true } : {}
 		};
 		else if (this.lastNativeToolError?.mutatingAction !== true) this.lastNativeToolError = void 0;
 	}
@@ -819,6 +815,10 @@ const MISSING_TOOL_RESULT_ERROR = "OpenClaw recorded a native Codex tool.call wi
 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 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);
@@ -864,12 +864,37 @@ var CodexToolTranscriptProjection = class {
 		this.afterToolCallObservedItemIds = /* @__PURE__ */ new Set();
 		this.nativeMcpAppResultDetails = /* @__PURE__ */ new Map();
 		this.nativeMcpAppResultDetailsAttempted = /* @__PURE__ */ new Set();
+		this.approvalReviewsByCallId = /* @__PURE__ */ new Map();
 		this.rawNativeToolOutputByCallId = /* @__PURE__ */ new Map();
 		this.codeModeNativePatchInputsByCallId = /* @__PURE__ */ new Map();
 	}
 	get transcriptMessages() {
 		return this.messages;
 	}
+	recordToolApprovalReview(toolCallId, reviewId, status, review) {
+		const state = this.approvalReviewsByCallId.get(toolCallId) ?? {
+			reviews: [],
+			denied: false,
+			unresolvedReviewIds: /* @__PURE__ */ new Set()
+		};
+		state.reviews = [...state.reviews.filter((candidate) => candidate.id !== reviewId), review].slice(-16);
+		state.denied ||= [
+			"denied",
+			"timed_out",
+			"aborted"
+		].includes(status);
+		const unresolved = state.unresolvedReviewIds;
+		if (status === "in_progress") state.unresolvedReviewIds = unresolved && (unresolved.size < MAX_TOOL_APPROVAL_REVIEWS || unresolved.has(reviewId)) ? unresolved.add(reviewId) : null;
+		else unresolved?.delete(reviewId);
+		this.approvalReviewsByCallId.set(toolCallId, state);
+		return toolApprovalReviewOutcome(state);
+	}
+	finalizeToolApprovalReviews(toolCallId) {
+		const state = this.approvalReviewsByCallId.get(toolCallId);
+		if (!state) return;
+		state.unresolvedReviewIds = /* @__PURE__ */ new Set();
+		return toolApprovalReviewOutcome(state);
+	}
 	recordDynamicToolCall(params) {
 		this.recordToolCall({
 			id: params.callId,
@@ -897,16 +922,21 @@ var CodexToolTranscriptProjection = class {
 		});
 	}
 	recordNativeToolResult(item, details) {
-		if (!item || !shouldRecordNativeToolTranscript(item)) return;
+		if (!item || !shouldRecordNativeToolTranscript(item) || this.resultIds.has(item.id)) return;
 		const name = itemName(item);
-		if (name) this.recordToolResult({
-			id: item.id,
-			name,
-			text: this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
-			isError: isNonSuccessItemStatus(itemStatus(item)),
-			details,
-			...item.type === "webSearch" ? { resultContentSource: "network" } : {}
-		});
+		if (name) {
+			const status = itemStatus(item);
+			const approvalTimeoutExplanation = this.progress.approvalTimeoutExplanation(item.id, status);
+			this.recordToolResult({
+				id: item.id,
+				name,
+				text: approvalTimeoutExplanation ?? this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
+				isError: isNonSuccessItemStatus(status),
+				details,
+				...item.type === "webSearch" ? { resultContentSource: "network" } : {}
+			});
+			this.progress.approvalTimeoutKinds.delete(item.id);
+		}
 	}
 	recordRawNativeToolItem(item) {
 		const type = typeof item.type === "string" ? item.type : void 0;
@@ -985,11 +1015,24 @@ var CodexToolTranscriptProjection = class {
 			id: callId,
 			name: "apply_patch",
 			text,
-			isError: result.isError === true
+			isError: result.isError
 		}).content;
 	}
 	async recordNativeToolResultWithDetails(item) {
-		this.recordNativeToolResult(item, await this.prepareNativeMcpAppResultDetails(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) ? {
+			...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;
@@ -1025,7 +1068,7 @@ var CodexToolTranscriptProjection = class {
 		}
 		this.trajectoryResultIds.add(params.item.id);
 		const toolResult = itemToolResult(params.item).result;
-		const output = itemOutputText(params.item, this.progress.outputTextByItem);
+		const output = this.progress.approvalTimeoutExplanation(params.item.id, params.status) ?? itemOutputText(params.item, this.progress.outputTextByItem);
 		this.options.trajectoryRecorder?.recordEvent("tool.result", {
 			threadId: this.threadId,
 			turnId: this.turnId,
@@ -1045,7 +1088,7 @@ var CodexToolTranscriptProjection = class {
 		if (!name || status === "running") return;
 		this.afterToolCallObservedItemIds.add(item.id);
 		const result = itemToolResult(item).result;
-		const error = itemToolError(item, status, this.progress.outputTextByItem);
+		const error = this.progress.approvalTimeoutExplanation(item.id, status) ?? itemToolError(item, status, this.progress.outputTextByItem);
 		const startedAt = resolveStartedAtFromDurationMs(item.durationMs);
 		const hookParams = {
 			toolName: name,
@@ -1077,7 +1120,8 @@ var CodexToolTranscriptProjection = class {
 					id,
 					name
 				}),
-				isError: true
+				isError: true,
+				details: { reason: "missing_tool_result" }
 			});
 		}
 		for (const id of missingTrajectoryIds) {
@@ -1139,7 +1183,6 @@ var CodexToolTranscriptProjection = class {
 		if (!name) return;
 		const item = this.trajectoryItemsById.get(firstMissingId);
 		const meta = item ? itemMeta(item, this.progress.toolProgressDetailMode()) : this.progress.getToolMeta(firstMissingId)?.meta;
-		const actionFingerprint = item ? nativeToolActionFingerprint(item) : void 0;
 		this.progress.setLastToolError({
 			toolName: name,
 			...meta ? { meta } : {},
@@ -1147,8 +1190,7 @@ var CodexToolTranscriptProjection = class {
 				id: firstMissingId,
 				name
 			}),
-			...item && isMutatingNativeToolItem(item) ? { mutatingAction: true } : {},
-			...actionFingerprint ? { actionFingerprint } : {}
+			...item && isMutatingNativeToolItem(item) ? { mutatingAction: true } : {}
 		});
 	}
 	shouldEmitAfterToolCallObservation(item) {
@@ -1211,6 +1253,17 @@ function resolveStartedAtFromDurationMs(durationMs) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-events.ts
+function guardianActionCommand(action) {
+	if (!action) return;
+	const command = readStringField(action, "command");
+	if (command) return command;
+	const argv = Array.isArray(action.argv) ? action.argv.filter((value) => typeof value === "string") : [];
+	return argv.length > 0 ? argv.join(" ") : readStringField(action, "program");
+}
+function normalizeApprovalReviewStatus(status) {
+	return status === "inProgress" ? "in_progress" : status === "timedOut" ? "timed_out" : status;
+}
+const GUARDIAN_TIMEOUT_WARNING = "Automatic approval review timed out while evaluating the requested approval.";
 function projectNormalizedToolItem(params) {
 	const { item } = params;
 	if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
@@ -1261,28 +1314,78 @@ var CodexEventProjection = class {
 		this.reviewCount += 1;
 		const review = isJsonObject(params.review) ? params.review : void 0;
 		const action = isJsonObject(params.action) ? params.action : void 0;
+		const reviewId = readStringField(params, "reviewId");
+		const targetItemId = readNullableString$1(params, "targetItemId");
+		const reviewStatus = review ? readStringField(review, "status") : void 0;
+		const status = normalizeApprovalReviewStatus(reviewStatus);
+		const riskLevel = review ? readStringField(review, "riskLevel") : void 0;
+		const userAuthorization = review ? readStringField(review, "userAuthorization") : void 0;
+		const rationale = review ? readNullableString$1(review, "rationale") : void 0;
+		const expectedWarning = status === "timed_out" ? GUARDIAN_TIMEOUT_WARNING : rationale && riskLevel && userAuthorization && (status === "approved" || status === "denied") ? `Automatic approval review ${status} (risk: ${riskLevel}, authorization: ${userAuthorization}): ${rationale}` : void 0;
+		if (Boolean(targetItemId) && Boolean(reviewId) && this.pendingGuardianWarning === expectedWarning) this.pendingGuardianWarning = void 0;
+		else this.flushPendingGuardianWarning();
 		this.emitAgentEvent({
 			stream: "codex_app_server.guardian",
 			data: {
 				method,
 				phase: method.endsWith("/started") ? "started" : "completed",
-				reviewId: readStringField(params, "reviewId"),
-				targetItemId: readNullableString$1(params, "targetItemId"),
+				reviewId,
+				targetItemId,
 				decisionSource: readStringField(params, "decisionSource"),
-				status: review ? readStringField(review, "status") : void 0,
-				riskLevel: review ? readStringField(review, "riskLevel") : void 0,
-				userAuthorization: review ? readStringField(review, "userAuthorization") : void 0,
-				rationale: review ? readNullableString$1(review, "rationale") : void 0,
-				actionType: action ? readStringField(action, "type") : void 0
+				status: reviewStatus,
+				riskLevel,
+				userAuthorization,
+				rationale,
+				actionType: action ? readStringField(action, "type") : void 0,
+				command: guardianActionCommand(action)
 			}
 		});
+		if (reviewId && targetItemId && status) {
+			const approvalReview = {
+				id: reviewId,
+				label: "Guardian",
+				status,
+				...riskLevel ? { riskLevel } : {},
+				...userAuthorization ? { userAuthorization } : {},
+				...rationale ? { rationale } : {}
+			};
+			const approvalReviewOutcome = this.toolTranscript.recordToolApprovalReview(targetItemId, reviewId, status, approvalReview);
+			this.emitAgentEvent({
+				stream: "tool",
+				data: {
+					phase: "review",
+					toolCallId: targetItemId,
+					hideFromChannelProgress: true,
+					approvalReviewOutcome,
+					review: approvalReview
+				}
+			});
+		}
 	}
 	handleGuardianWarning(params) {
+		this.flushPendingGuardianWarning();
+		const message = readStringField(params, "message");
+		if (message) {
+			this.pendingGuardianWarning = message;
+			return;
+		}
+		this.emitAgentEvent({
+			stream: "codex_app_server.guardian",
+			data: {
+				phase: "warning",
+				message
+			}
+		});
+	}
+	flushPendingGuardianWarning() {
+		const pending = this.pendingGuardianWarning;
+		if (!pending) return;
+		this.pendingGuardianWarning = void 0;
 		this.emitAgentEvent({
 			stream: "codex_app_server.guardian",
 			data: {
 				phase: "warning",
-				message: readStringField(params, "message")
+				message: pending
 			}
 		});
 	}
@@ -1344,6 +1447,8 @@ var CodexEventProjection = class {
 		if (!projection || !params.item) return;
 		const { item } = params;
 		const { name, status, args, meta, event } = projection;
+		const approvalReviewOutcome = params.phase === "result" ? this.toolTranscript.finalizeToolApprovalReviews(item.id) : void 0;
+		if (event && approvalReviewOutcome) event.data.approvalReviewOutcome = approvalReviewOutcome;
 		this.toolTranscript.recordTrajectoryEvent({
 			phase: params.phase,
 			item,
@@ -1957,7 +2062,8 @@ function registerMonitor(params) {
 		taskRuntimeScope: params.taskRuntimeScope,
 		agentId: params.agentId,
 		claimDirectChild: params.claimDirectChild,
-		rejectPendingDirectChild: params.rejectPendingDirectChild
+		rejectPendingDirectChild: params.rejectPendingDirectChild,
+		onDirectChildAccepted: params.onDirectChildAccepted
 	});
 }
 var Monitor = class {
@@ -2030,7 +2136,8 @@ var Monitor = class {
 		const owner = Symbol("codex-native-subagent-owner");
 		state.owners.set(owner, {
 			claimDirectChild: params.claimDirectChild,
-			rejectPendingDirectChild: params.rejectPendingDirectChild
+			rejectPendingDirectChild: params.rejectPendingDirectChild,
+			onDirectChildAccepted: params.onDirectChildAccepted
 		});
 		this.prepareParentTaskRuntime(state);
 		for (const childState of this.childStates.values()) if (childState.parentThreadId === parentThreadId && childState.pendingCompletion) this.deliverPendingCompletion(state, childState);
@@ -2110,7 +2217,7 @@ var Monitor = class {
 		if (state) this.handleClosedChild(notification, state);
 		const childState = threadId ? this.childStates.get(threadId) : void 0;
 		if (notification.method === "turn/started" && childState) this.resumeChild(childState);
-		if (childState && !childState.terminal) this.emitChildTaskActivity(notification, childState.childThreadId);
+		if (childState && !childState.terminal) this.emitChildTaskActivity(notification, childState);
 		this.captureChildAssistantMessage(notification);
 		await this.handleChildTurnCompletion(notification);
 		if (notification.method === "thread/status/changed" && threadId && threadStatus) if (threadStatus !== "systemerror") {
@@ -2129,14 +2236,17 @@ var Monitor = class {
 		}
 		await this.handleCompletionNotification(notification);
 	}
-	emitChildTaskActivity(notification, childThreadId) {
+	emitChildTaskActivity(notification, childState) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
-		const runId = codexNativeSubagentRunId(childThreadId);
+		const owner = {
+			runId: codexNativeSubagentRunId(childState.childThreadId),
+			...childState.agentId ? { agentId: childState.agentId } : {}
+		};
 		if (notification.method === "item/agentMessage/delta") {
 			const delta = readStringField(params, "delta");
 			if (delta) emitAgentEvent({
-				runId,
+				...owner,
 				stream: "assistant",
 				data: { delta }
 			});
@@ -2145,7 +2255,7 @@ var Monitor = class {
 		if (notification.method === "item/reasoning/summaryTextDelta") {
 			const delta = readStringField(params, "delta");
 			if (delta) emitAgentEvent({
-				runId,
+				...owner,
 				stream: "thinking",
 				data: { delta }
 			});
@@ -2154,7 +2264,7 @@ var Monitor = class {
 		if (notification.method !== "item/started" && notification.method !== "item/completed") return;
 		const item = readItem(params.item);
 		if (item?.type === "agentMessage" && notification.method === "item/completed" && item.text) emitAgentEvent({
-			runId,
+			...owner,
 			stream: "assistant",
 			data: { text: item.text }
 		});
@@ -2163,7 +2273,7 @@ var Monitor = class {
 			item
 		});
 		if (projection?.event) emitAgentEvent({
-			runId,
+			...owner,
 			...projection.event
 		});
 	}
@@ -2287,7 +2397,7 @@ var Monitor = class {
 			const childThreadId = thread ? readStringField(thread, "id")?.trim() : void 0;
 			const agentPath = readStringField(readThreadSpawnSource(thread), "agent_path")?.trim();
 			const state = parentThreadId ? this.parentStates.get(parentThreadId) : void 0;
-			if (state && childThreadId && parentThreadId) return this.registerChildThread(parentThreadId, childThreadId, agentPath === void 0 ? {} : { agentPath }) ? state : void 0;
+			if (state && childThreadId && parentThreadId) return this.registerChildThread(state, childThreadId, agentPath === void 0 ? {} : { agentPath }) ? state : void 0;
 			return state;
 		}
 		if (notification.method === "thread/status/changed" || notification.method === "turn/started" || notification.method === "turn/completed" || notification.method === "item/agentMessage/delta") {
@@ -2319,7 +2429,7 @@ var Monitor = class {
 				for (const childThreadId of childThreadIds) accepted = Boolean(isCompletedSpawnAgentTool ? this.registerDirectSpawnChild(state, turnId, {
 					parentThreadId,
 					childThreadId
-				}, owner) : this.registerChildThread(parentThreadId, childThreadId)) && accepted;
+				}, owner) : this.registerChildThread(state, childThreadId)) && accepted;
 				if (!accepted) return;
 			}
 			return state;
@@ -2596,8 +2706,8 @@ var Monitor = class {
 		}, delayMs);
 		unrefTimer(childState.completionDeliveryTimer);
 	}
-	registerChildThread(parentThreadIdInput, childThreadIdInput, options = {}) {
-		const parentThreadId = parentThreadIdInput.trim();
+	registerChildThread(state, childThreadIdInput, options = {}) {
+		const parentThreadId = state.parentThreadId;
 		const childThreadId = childThreadIdInput.trim();
 		if (!parentThreadId || !childThreadId || this.disposed) return;
 		if (options.claimDirectChild && this.threadStatusRevisions.get(childThreadId)?.terminal) return;
@@ -2620,6 +2730,7 @@ var Monitor = class {
 			childState = {
 				childThreadId,
 				parentThreadId,
+				agentId: state.agentId,
 				agentPathKeys: /* @__PURE__ */ new Set(),
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
@@ -2637,7 +2748,7 @@ var Monitor = class {
 		}
 		if (options.claimDirectChild && !childState.terminal && !childState.settledWithoutCompletion && !childState.releaseDirectChild) childState.releaseDirectChild = options.claimDirectChild(childThreadId);
 		this.registerAgentPath(childState, childThreadId);
-		this.parentStates.get(parentThreadId)?.mirror?.markAuthoritativeCompletionExpected(childThreadId);
+		state.mirror?.markAuthoritativeCompletionExpected(childThreadId);
 		const agentPath = normalizeOptionalString(options.agentPath);
 		if (agentPath) this.registerAgentPath(childState, agentPath);
 		this.scheduleRecoveryPoll(childState);
@@ -2650,11 +2761,12 @@ var Monitor = class {
 		return owners.length === 1 ? owners[0] : void 0;
 	}
 	registerDirectSpawnChild(state, turnIdInput, evidence, owner) {
-		const childState = this.registerChildThread(state.parentThreadId, evidence.childThreadId, {
+		const childState = this.registerChildThread(state, evidence.childThreadId, {
 			...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
 			...owner?.claimDirectChild ? { claimDirectChild: owner.claimDirectChild } : {}
 		});
 		if (!owner) this.bufferPendingDirectSpawnEvidence(turnIdInput, evidence);
+		else if (childState) owner.onDirectChildAccepted?.();
 		return childState;
 	}
 	bufferPendingDirectSpawnEvidence(turnIdInput, evidence) {
@@ -2669,10 +2781,12 @@ var Monitor = class {
 		const pending = this.pendingDirectSpawnEvidence.get(turnId);
 		this.pendingDirectSpawnEvidence.delete(turnId);
 		if (!pending || !owner.claimDirectChild) return;
-		for (const evidence of pending) if (evidence.parentThreadId === state.parentThreadId) this.registerChildThread(state.parentThreadId, evidence.childThreadId, {
-			...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
-			claimDirectChild: owner.claimDirectChild
-		});
+		for (const evidence of pending) if (evidence.parentThreadId === state.parentThreadId) {
+			if (this.registerChildThread(state, evidence.childThreadId, {
+				...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
+				claimDirectChild: owner.claimDirectChild
+			})) owner.onDirectChildAccepted?.();
+		}
 	}
 	hasUnboundParentOwner(parentThreadId) {
 		return [...parentThreadId ? [this.parentStates.get(parentThreadId)].filter((state) => Boolean(state)) : this.parentStates.values()].some((state) => [...state.owners.values()].some((owner) => owner.turnId === void 0));
@@ -2940,7 +3054,7 @@ var Monitor = class {
 				this.prepareParentTaskRuntime(state);
 				this.parentStates.set(parentThreadId, state);
 			}
-			const childState = this.registerChildThread(parentThreadId, candidate.childThreadId);
+			const childState = this.registerChildThread(state, candidate.childThreadId);
 			if (!childState) {
 				this.pruneParentIfUnused(state);
 				return;