@selesai/code 0.13.40 → 0.14.3

package/dist/extensions/pi-subagents/src/runs/background/process-terminal-candidate.ts

@@ -0,0 +1,98 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { writePrivateAtomicJson } from "../../shared/atomic-json.ts";
+import type { ProcessInstanceExit } from "../../shared/types.ts";
+
+export interface ProcessTerminalCandidate {
+	version: 1;
+	runId: string;
+	runnerProcessInstanceId: string;
+	writers: Record<string, ProcessInstanceExit[]>;
+	expectedWriters?: Record<string, number>;
+	sessionFile?: string;
+	revivalLeaseToken?: string;
+	revivalLeaseReleaseAcknowledged?: boolean;
+}
+
+export function isRecord(value: unknown): value is Record<string, unknown> {
+	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
+}
+
+export function validProcessInstance(value: unknown, kind?: "runner" | "pi-writer"): value is ProcessInstanceExit {
+	if (!isRecord(value)) return false;
+	if (typeof value.processInstanceId !== "string" || value.processInstanceId.length === 0) return false;
+	if (kind ? value.kind !== kind : (value.kind !== "runner" && value.kind !== "pi-writer")) return false;
+	if (typeof value.closeObservedAt !== "number" || !Number.isFinite(value.closeObservedAt)) return false;
+	if (typeof value.exitCode !== "number" && value.exitCode !== null) return false;
+	if (typeof value.signal !== "string" && value.signal !== null) return false;
+	if (value.kind === "runner") return value.attempt === undefined;
+	if (typeof value.attempt !== "number" || !Number.isInteger(value.attempt) || value.attempt < 0 || !isRecord(value.processTree)) return false;
+	if (value.processTree.state === "observed") {
+		return value.processTree.mechanism === "posix-process-group"
+			&& typeof value.processTree.processGroupId === "number"
+			&& Number.isInteger(value.processTree.processGroupId)
+			&& value.processTree.processGroupId > 0
+			&& typeof value.processTree.verifiedAt === "number"
+			&& Number.isFinite(value.processTree.verifiedAt);
+	}
+	return value.processTree.state === "unknown"
+		&& ["unsupported-platform", "signal-failed", "verification-failed"].includes(String(value.processTree.reason))
+		&& (value.processTree.diagnostic === undefined || typeof value.processTree.diagnostic === "string");
+}
+
+function validInstance(value: unknown): value is ProcessInstanceExit {
+	return validProcessInstance(value, "pi-writer");
+}
+
+export function processTerminalCandidatePath(asyncDir: string): string {
+	return path.join(asyncDir, "process-terminal-candidate.json");
+}
+
+export function readProcessTerminalCandidate(asyncDir: string): ProcessTerminalCandidate | undefined {
+	try {
+		const raw = JSON.parse(fs.readFileSync(processTerminalCandidatePath(asyncDir), "utf-8")) as unknown;
+		if (!isRecord(raw) || raw.version !== 1 || typeof raw.runId !== "string" || typeof raw.runnerProcessInstanceId !== "string" || !isRecord(raw.writers)) {
+			throw new Error(`Invalid process-terminal candidate in '${asyncDir}'.`);
+		}
+		const writers: Record<string, ProcessInstanceExit[]> = {};
+		for (const [index, entries] of Object.entries(raw.writers)) {
+			if (!Array.isArray(entries) || !entries.every(validInstance)) throw new Error(`Invalid writer process records for child '${index}'.`);
+			writers[index] = entries;
+		}
+		let expectedWriters: Record<string, number> | undefined;
+		if (raw.expectedWriters !== undefined) {
+			if (!isRecord(raw.expectedWriters)) throw new Error("Invalid expected writer process records.");
+			expectedWriters = {};
+			for (const [index, count] of Object.entries(raw.expectedWriters)) {
+				if (typeof count !== "number" || !Number.isInteger(count) || count < 0) throw new Error(`Invalid expected writer count for child '${index}'.`);
+				expectedWriters[index] = count;
+			}
+		}
+		if (raw.sessionFile !== undefined && typeof raw.sessionFile !== "string") throw new Error("Invalid process-terminal candidate sessionFile.");
+		if (raw.revivalLeaseToken !== undefined && typeof raw.revivalLeaseToken !== "string") throw new Error("Invalid process-terminal candidate lease token.");
+		if (raw.revivalLeaseReleaseAcknowledged !== undefined && typeof raw.revivalLeaseReleaseAcknowledged !== "boolean") throw new Error("Invalid process-terminal lease release acknowledgement.");
+		return {
+			version: 1,
+			runId: raw.runId,
+			runnerProcessInstanceId: raw.runnerProcessInstanceId,
+			writers,
+			...(expectedWriters ? { expectedWriters } : {}),
+			...(typeof raw.sessionFile === "string" && raw.sessionFile ? { sessionFile: raw.sessionFile } : {}),
+			...(typeof raw.revivalLeaseToken === "string" && raw.revivalLeaseToken ? { revivalLeaseToken: raw.revivalLeaseToken } : {}),
+			...(typeof raw.revivalLeaseReleaseAcknowledged === "boolean" ? { revivalLeaseReleaseAcknowledged: raw.revivalLeaseReleaseAcknowledged } : {}),
+		};
+	} catch (error) {
+		if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
+		throw error;
+	}
+}
+
+export function writeProcessTerminalCandidate(asyncDir: string, candidate: ProcessTerminalCandidate): void {
+	writePrivateAtomicJson(processTerminalCandidatePath(asyncDir), candidate);
+}
+
+export function markProcessTerminalCandidateLeaseRelease(asyncDir: string, token: string, acknowledged: boolean): void {
+	const candidate = readProcessTerminalCandidate(asyncDir);
+	if (!candidate || candidate.revivalLeaseToken !== token) return;
+	writeProcessTerminalCandidate(asyncDir, { ...candidate, revivalLeaseReleaseAcknowledged: acknowledged });
+}

package/dist/extensions/pi-subagents/src/runs/background/process-terminal.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { writeAtomicJson, writePrivateAtomicJson } from "../../shared/atomic-json.ts";
+import { writeAtomicJson } from "../../shared/atomic-json.ts";
 import {
 	SUBAGENT_LIFECYCLE_ARTIFACT_VERSION,
 	type AsyncStatus,
@@ -11,17 +11,9 @@ import {
 } from "../../shared/types.ts";
 import { canonicalSessionId, inspectSessionLease } from "../shared/session-lease.ts";
 import { releaseActiveRunIndex } from "./active-run-index.ts";
-
-export interface ProcessTerminalCandidate {
-	version: 1;
-	runId: string;
-	runnerProcessInstanceId: string;
-	writers: Record<string, ProcessInstanceExit[]>;
-	expectedWriters?: Record<string, number>;
-	sessionFile?: string;
-	revivalLeaseToken?: string;
-	revivalLeaseReleaseAcknowledged?: boolean;
-}
+import { isRecord, validProcessInstance, readProcessTerminalCandidate, writeProcessTerminalCandidate, type ProcessTerminalCandidate } from "./process-terminal-candidate.ts";
+export { processTerminalCandidatePath, readProcessTerminalCandidate, writeProcessTerminalCandidate, markProcessTerminalCandidateLeaseRelease } from "./process-terminal-candidate.ts";
+export type { ProcessTerminalCandidate } from "./process-terminal-candidate.ts";
 
 export interface RunnerCloseObservation {
 	processInstanceId: string;
@@ -30,40 +22,6 @@ export interface RunnerCloseObservation {
 	signal: string | null;
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-	return Boolean(value) && typeof value === "object" && !Array.isArray(value);
-}
-
-function validProcessInstance(value: unknown, kind?: "runner" | "pi-writer"): value is ProcessInstanceExit {
-	if (!isRecord(value)) return false;
-	if (typeof value.processInstanceId !== "string" || value.processInstanceId.length === 0) return false;
-	if (kind ? value.kind !== kind : (value.kind !== "runner" && value.kind !== "pi-writer")) return false;
-	if (typeof value.closeObservedAt !== "number" || !Number.isFinite(value.closeObservedAt)) return false;
-	if (typeof value.exitCode !== "number" && value.exitCode !== null) return false;
-	if (typeof value.signal !== "string" && value.signal !== null) return false;
-	if (value.kind === "runner") return value.attempt === undefined;
-	if (typeof value.attempt !== "number" || !Number.isInteger(value.attempt) || value.attempt < 0 || !isRecord(value.processTree)) return false;
-	if (value.processTree.state === "observed") {
-		return value.processTree.mechanism === "posix-process-group"
-			&& typeof value.processTree.processGroupId === "number"
-			&& Number.isInteger(value.processTree.processGroupId)
-			&& value.processTree.processGroupId > 0
-			&& typeof value.processTree.verifiedAt === "number"
-			&& Number.isFinite(value.processTree.verifiedAt);
-	}
-	return value.processTree.state === "unknown"
-		&& ["unsupported-platform", "signal-failed", "verification-failed"].includes(String(value.processTree.reason))
-		&& (value.processTree.diagnostic === undefined || typeof value.processTree.diagnostic === "string");
-}
-
-function validInstance(value: unknown): value is ProcessInstanceExit {
-	return validProcessInstance(value, "pi-writer");
-}
-
-export function processTerminalCandidatePath(asyncDir: string): string {
-	return path.join(asyncDir, "process-terminal-candidate.json");
-}
-
 export function processTerminalPath(asyncDir: string): string {
 	return path.join(asyncDir, "process-terminal.json");
 }
@@ -72,49 +30,6 @@ function errorMessage(error: unknown): string {
 	return error instanceof Error ? error.message : String(error);
 }
 
-export function readProcessTerminalCandidate(asyncDir: string): ProcessTerminalCandidate | undefined {
-	try {
-		const raw = JSON.parse(fs.readFileSync(processTerminalCandidatePath(asyncDir), "utf-8")) as unknown;
-		if (!isRecord(raw) || raw.version !== 1 || typeof raw.runId !== "string" || typeof raw.runnerProcessInstanceId !== "string" || !isRecord(raw.writers)) {
-			throw new Error(`Invalid process-terminal candidate in '${asyncDir}'.`);
-		}
-		const writers: Record<string, ProcessInstanceExit[]> = {};
-		for (const [index, entries] of Object.entries(raw.writers)) {
-			if (!Array.isArray(entries) || !entries.every(validInstance)) throw new Error(`Invalid writer process records for child '${index}'.`);
-			writers[index] = entries;
-		}
-		let expectedWriters: Record<string, number> | undefined;
-		if (raw.expectedWriters !== undefined) {
-			if (!isRecord(raw.expectedWriters)) throw new Error("Invalid expected writer process records.");
-			expectedWriters = {};
-			for (const [index, count] of Object.entries(raw.expectedWriters)) {
-				if (typeof count !== "number" || !Number.isInteger(count) || count < 0) throw new Error(`Invalid expected writer count for child '${index}'.`);
-				expectedWriters[index] = count;
-			}
-		}
-		if (raw.sessionFile !== undefined && typeof raw.sessionFile !== "string") throw new Error("Invalid process-terminal candidate sessionFile.");
-		if (raw.revivalLeaseToken !== undefined && typeof raw.revivalLeaseToken !== "string") throw new Error("Invalid process-terminal candidate lease token.");
-		if (raw.revivalLeaseReleaseAcknowledged !== undefined && typeof raw.revivalLeaseReleaseAcknowledged !== "boolean") throw new Error("Invalid process-terminal lease release acknowledgement.");
-		return {
-			version: 1,
-			runId: raw.runId,
-			runnerProcessInstanceId: raw.runnerProcessInstanceId,
-			writers,
-			...(expectedWriters ? { expectedWriters } : {}),
-			...(typeof raw.sessionFile === "string" && raw.sessionFile ? { sessionFile: raw.sessionFile } : {}),
-			...(typeof raw.revivalLeaseToken === "string" && raw.revivalLeaseToken ? { revivalLeaseToken: raw.revivalLeaseToken } : {}),
-			...(typeof raw.revivalLeaseReleaseAcknowledged === "boolean" ? { revivalLeaseReleaseAcknowledged: raw.revivalLeaseReleaseAcknowledged } : {}),
-		};
-	} catch (error) {
-		if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
-		throw error;
-	}
-}
-
-export function writeProcessTerminalCandidate(asyncDir: string, candidate: ProcessTerminalCandidate): void {
-	writePrivateAtomicJson(processTerminalCandidatePath(asyncDir), candidate);
-}
-
 /** Establish ownership before authorizing a runner to start any child session. */
 export function initializeProcessTerminal(asyncDir: string, runId: string, runnerProcessInstanceId: string): void {
 	writeProcessTerminalCandidate(asyncDir, {
@@ -131,12 +46,6 @@ export function initializeProcessTerminal(asyncDir: string, runId: string, runne
 	});
 }
 
-export function markProcessTerminalCandidateLeaseRelease(asyncDir: string, token: string, acknowledged: boolean): void {
-	const candidate = readProcessTerminalCandidate(asyncDir);
-	if (!candidate || candidate.revivalLeaseToken !== token) return;
-	writeProcessTerminalCandidate(asyncDir, { ...candidate, revivalLeaseReleaseAcknowledged: acknowledged });
-}
-
 function unknownProof(runId: string, runnerProcessInstanceId: string, reason: ProcessTerminalReason, diagnostic?: string): ProcessTerminal {
 	return { version: 1, state: "unknown", runId, runnerProcessInstanceId, reason, ...(diagnostic ? { diagnostic } : {}) };
 }
@@ -248,7 +157,17 @@ export function finalizeProcessTerminal(
 	const existing = readProcessTerminal(asyncDir, { runId, runnerProcessInstanceId: runnerClose.processInstanceId });
 	if (existing && fs.existsSync(processTerminalPath(asyncDir))) {
 		if (existing.state === "observed" && existing.runId === runId && existing.runnerProcessInstanceId === runnerClose.processInstanceId) return existing;
-		if (existing.state === "unknown") return existing;
+		if (existing.state === "unknown") {
+			// A sticky runner-published unknown proof keeps its reason; only add the observed exit. Unreadable or mismatched sidecars read back as proof-write-failed and stay untouched.
+			if (existing.instances?.length || existing.reason === "proof-write-failed") return existing;
+			const withExit: ProcessTerminal = { ...existing, instances: [{ kind: "runner", ...runnerClose }] };
+			try {
+				writeAtomicJson(processTerminalPath(asyncDir), withExit);
+				return withExit;
+			} catch {
+				return existing;
+			}
+		}
 	}
 	let proof: ProcessTerminal;
 	let candidateForOverlay: ProcessTerminalCandidate | undefined;
@@ -296,6 +215,8 @@ export function finalizeProcessTerminal(
 	} catch (error) {
 		proof = unknownProof(runId, runnerClose.processInstanceId, "proof-write-failed", errorMessage(error));
 	}
+	// An unverified process tree still has a directly observed runner exit; keep it for failure reports.
+	if (proof.state === "unknown") proof = { ...proof, instances: [{ kind: "runner", ...runnerClose }] };
 	let durable = false;
 	try {
 		writeAtomicJson(processTerminalPath(asyncDir), proof);
@@ -307,4 +228,4 @@ export function finalizeProcessTerminal(
 		// Do not emit a process-terminal event when the proof sidecar was not durable.
 	}
 	return durable ? proof : unknownProof(runId, runnerClose.processInstanceId, "proof-write-failed", "Failed to persist process-terminal proof.");
-}
+}

package/dist/extensions/pi-subagents/src/runs/background/result-files.ts

@@ -241,10 +241,15 @@ function pendingResultExists(resultsDir: string, sessionId: string, runId: strin
 	return firstExistingResultFile(resultPendingPaths(resultsDir, sessionId, runId)) !== undefined;
 }
 
+export function resultPayloadMatchesSessionRun(data: unknown, sessionId: string, runId: string): boolean {
+	if (!data || typeof data !== "object" || Array.isArray(data)) return false;
+	const record = data as Record<string, unknown>;
+	return (nonEmptyString(record.runId) ?? nonEmptyString(record.id)) === runId && nonEmptyString(record.sessionId) === sessionId;
+}
+
 function pendingResultPayloadMatches(filePath: string, sessionId: string, runId: string): boolean {
 	try {
-		const data = JSON.parse(fs.readFileSync(filePath, "utf-8")) as Record<string, unknown>;
-		return (nonEmptyString(data.runId) ?? nonEmptyString(data.id)) === runId && nonEmptyString(data.sessionId) === sessionId;
+		return resultPayloadMatchesSessionRun(JSON.parse(fs.readFileSync(filePath, "utf-8")), sessionId, runId);
 	} catch (error) {
 		if ((error as NodeJS.ErrnoException).code !== "ENOENT" && !isUnaddressableResultCandidate(error)) console.error(`Ignoring invalid pending async result '${filePath}':`, error);
 		return false;
@@ -252,8 +257,7 @@ function pendingResultPayloadMatches(filePath: string, sessionId: string, runId:
 }
 
 function assertPendingResultPayloadMatches(filePath: string, sessionId: string, runId: string): boolean {
-	const data = JSON.parse(fs.readFileSync(filePath, "utf-8")) as Record<string, unknown>;
-	return (nonEmptyString(data.runId) ?? nonEmptyString(data.id)) === runId && nonEmptyString(data.sessionId) === sessionId;
+	return resultPayloadMatchesSessionRun(JSON.parse(fs.readFileSync(filePath, "utf-8")), sessionId, runId);
 }
 
 export function promotePendingResultFile(resultsDir: string, sessionId: string, runId: string, file = resultFileName(runId), options: { logFailure?: boolean } = {}): "none" | "promoted" | "pending" {
@@ -303,6 +307,11 @@ export function fallbackResultPayloadPathForSessionRun(resultsDir: string, sessi
 	return pendingPath;
 }
 
+/** Any pending or public result file for the run, without validating its contents. */
+export function resultPayloadFileForSessionRun(resultsDir: string, sessionId: string, runId: string): string | undefined {
+	return firstExistingResultFile([...resultPendingPaths(resultsDir, sessionId, runId), resultFilePath(resultsDir, runId)]);
+}
+
 function resultPayloadLocationFromIndex(resultsDir: string, entry: ResultIndexEntry): ResultPayloadLocation | undefined {
 	if (entry.file !== path.basename(entry.file) || !entry.file.endsWith(".json")) return undefined;
 	const pendingState = promotePendingResultFile(resultsDir, entry.sessionId, entry.runId, entry.file);
@@ -516,4 +525,4 @@ export function cleanupResultIndexes(resultsDir: string, now = Date.now(), maxAg
 	};
 	visit(root);
 	return removed;
-}
+}

package/dist/extensions/pi-subagents/src/runs/background/result-watcher.ts

@@ -45,7 +45,7 @@ type ResultWatcherTimers = {
 type ResultWatcherDeps = {
 	fs?: ResultWatcherFs;
 	timers?: ResultWatcherTimers;
-	notifier?: Pick<CompletionNotifier, "deliver">;
+	notifier?: Pick<CompletionNotifier, "deliver"> & Partial<Pick<CompletionNotifier, "flush">>;
 	/** Receives persisted completions before active-session delivery filtering. */
 	observeCompletion?: (result: CompletionNotification & { runId: string }) => void;
 	/** Returns cross-session run ids that the completion observer currently owns. */
@@ -63,6 +63,8 @@ type ResultWatcherDeps = {
 	platform?: NodeJS.Platform;
 	/** Shared current/predecessor session ownership used by the notifier. */
 	ownership?: Pick<ResultDeliveryOwnership, "owns" | "claimedSessionIds">;
+	/** Called once the parent has this run's result: the notifier accepted it, or an earlier delivery already did. */
+	onResultDelivered?: (runId: string) => void;
 };
 
 type ResultFileChild = {
@@ -70,7 +72,9 @@ type ResultFileChild = {
 	sessionName?: string;
 	output?: string;
 	structuredOutput?: unknown;
+	structuredOutputPath?: string;
 	outputState?: SubagentOutputState;
+	outputPartial?: boolean;
 	error?: string;
 	success?: boolean;
 	state?: string;
@@ -81,6 +85,8 @@ type ResultFileChild = {
 	processSignal?: string | null;
 	sessionFile?: string;
 	artifactPaths?: { outputPath?: string };
+	outputSaveError?: string;
+	artifactOutputSaveFailed?: true;
 	intercomTarget?: string;
 	children?: unknown;
 };
@@ -206,6 +212,7 @@ export function createResultWatcher(
 	startResultWatcher: () => void;
 	transitionResultDelivery: () => void;
 	primeExistingResults: (options?: { triggerTurn?: boolean }) => void;
+	deliverPendingResults: () => Promise<void>;
 	refreshResultDelivery: () => void;
 	stopResultWatcher: () => void;
 } {
@@ -216,6 +223,9 @@ export function createResultWatcher(
 	const deliverIntercomResults = deps.deliverIntercomResults !== false;
 	const pendingTriggerTurn = new Map<string, boolean>();
 	const processing = new Set<string>();
+	const handling = new Set<Promise<void>>();
+	// While deliverPendingResults runs, completions skip the batch delay.
+	let deliveringPending = 0;
 	const identityCache = new Map<string, { signature: string; identity: ResultFileIdentity }>();
 	let deliveryActive = true;
 	let deliveryEpoch = 0;
@@ -409,7 +419,9 @@ export function createResultWatcher(
 			if (typeof data.sessionId !== "string" || !data.sessionId) return;
 			const sessionId = data.sessionId;
 			const completionOwnerId = data.completionOwnerId;
-			const runId = data.runId ?? data.id ?? file.replace(/\.json$/i, "");
+			const runId = typeof data.runId === "string" && data.runId
+				? data.runId
+				: typeof data.id === "string" && data.id ? data.id : file.replace(/\.json$/i, "");
 			const toolCallId = typeof data.toolCallId === "string" ? data.toolCallId : undefined;
 			let observerSucceeded = true;
 			try {
@@ -429,7 +441,7 @@ export function createResultWatcher(
 			if (!ownsCompletion(sessionId, completionOwnerId, epoch, runId)) return;
 			// Recorded before dedupe and before the unlink below so bg_wait can
 			// use the in-memory record or its bounded durable replay after cleanup.
-			recordWaitCompletion(state, runId, data, Date.now(), completionTtlMs, {
+			const completionPersisted = recordWaitCompletion(state, runId, data, Date.now(), completionTtlMs, {
 				resultsDir,
 				sessionId,
 			});
@@ -457,6 +469,11 @@ export function createResultWatcher(
 				}
 				if (!ownsCompletion(sessionId, completionOwnerId, epoch, runId)) return;
 				if (markReplacedPayload()) return;
+				deps.onResultDelivered?.(runId);
+				if (!completionPersisted) {
+					scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+					return;
+				}
 				if (!removeDeliveredResult(file, sessionId, runId, toolCallId)) scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
 				return;
 			}
@@ -475,7 +492,7 @@ export function createResultWatcher(
 					: output;
 				const sessionPath = result.sessionFile ?? (resultChildren.length === 1 ? data.sessionFile : undefined);
 				const childNestedChildren = sanitizeNestedResultChildren(result.children, resultPath, `results[${index}].children`);
-				const childState = result.state === "paused" || result.state === "stopped"
+				const childState = result.state === "running" || result.state === "queued" || result.state === "paused" || result.state === "stopped"
 					? result.state
 					: result.stopped === true
 						? "stopped"
@@ -497,6 +514,7 @@ export function createResultWatcher(
 					outputState: result.outputState === "present" || result.outputState === "absent" || result.outputState === "unknown"
 						? result.outputState
 						: "unknown",
+					...(result.outputPartial === true ? { outputPartial: true } : {}),
 					summary,
 					index,
 					artifactPath: result.artifactPaths?.outputPath,
@@ -514,6 +532,11 @@ export function createResultWatcher(
 				}
 				if (!ownsCompletion(sessionId, completionOwnerId, epoch, runId)) return;
 				if (markReplacedPayload()) return;
+				deps.onResultDelivered?.(runId);
+				if (!completionPersisted) {
+					scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+					return;
+				}
 				if (!removeDeliveredResult(file, sessionId, runId, toolCallId)) scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
 				return;
 			}
@@ -538,7 +561,7 @@ export function createResultWatcher(
 				if (!intercomDelivered) console.error(`Subagent async grouped result intercom delivery was not acknowledged for '${resultPath}'.`);
 			}
 
-			const accepted = await notifier.deliver({
+			const delivery = notifier.deliver({
 				...data,
 				id: data.id ?? runId,
 				runId,
@@ -558,12 +581,16 @@ export function createResultWatcher(
 					})) : [],
 				} : {}),
 			});
+			if (deliveringPending > 0) notifier.flush?.();
+			const accepted = await delivery;
 			if (!ownsCompletion(sessionId, completionOwnerId, epoch, runId)) return;
 			if (!accepted) {
 				scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
 				return;
 			}
+			// A newer payload replaced this one; keep the hold until that one is delivered.
 			if (markReplacedPayload()) return;
+			deps.onResultDelivered?.(runId);
 			try {
 				data = markDeliveredNotification(publicResultPath(file), data, runId, Date.now());
 				identityCache.delete(file);
@@ -601,6 +628,10 @@ export function createResultWatcher(
 				return;
 			}
 			if (!ownsCompletion(sessionId, completionOwnerId, epoch, runId)) return;
+			if (!completionPersisted) {
+				scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
+				return;
+			}
 			if (!removeDeliveredResult(file, sessionId, runId, toolCallId)) scheduleResult(file, triggerTurn, RETRY_DELAY_MS);
 		} catch (error) {
 			if (isAccessDenied(error)) {
@@ -613,11 +644,14 @@ export function createResultWatcher(
 		}
 	};
 
-	state.resultFileCoalescer = createFileCoalescer((file) => {
+	const resultFileCoalescer = createFileCoalescer((file) => {
 		const triggerTurn = pendingTriggerTurn.get(file) !== false;
 		pendingTriggerTurn.delete(file);
-		void handleResult(file, triggerTurn);
+		const run = handleResult(file, triggerTurn);
+		handling.add(run);
+		void run.finally(() => handling.delete(run));
 	}, deps.coalesceDelayMs ?? 50);
+	state.resultFileCoalescer = resultFileCoalescer;
 
 	const logScanStats = (stats: ResultScanStats) => {
 		const elapsed = Date.now() - stats.startedAt;
@@ -642,9 +676,9 @@ export function createResultWatcher(
 		for (const runId of observed) files.add(`${runId}.json`);
 		return [...files];
 	};
-	const primeExistingResults = (options: { triggerTurn?: boolean } = {}) => {
+	const eligibleResultFiles = (): string[] => {
+		const files: string[] = [];
 		try {
-			const triggerTurn = options.triggerTurn !== false;
 			const stats: ResultScanStats = { files: 0, scheduled: 0, startedAt: Date.now() };
 			const observed = observedRunIds();
 			for (const file of indexedResultCandidates(observed)) {
@@ -653,12 +687,32 @@ export function createResultWatcher(
 				if (!signature) continue;
 				if (!shouldProcessResult(file, observed, signature)) continue;
 				stats.scheduled += 1;
-				scheduleResult(file, triggerTurn);
+				files.push(file);
 			}
 			logScanStats(stats);
 		} catch (error) {
 			if (!isNotFound(error)) console.error(`Failed to scan subagent result index in '${resultsDir}':`, error);
 		}
+		return files;
+	};
+	const primeExistingResults = (options: { triggerTurn?: boolean } = {}) => {
+		const triggerTurn = options.triggerTurn !== false;
+		for (const file of eligibleResultFiles()) scheduleResult(file, triggerTurn);
+	};
+	/** Hand every result that is already on disk to the notifier now, without coalescing or batch delays. */
+	const deliverPendingResults = async (): Promise<void> => {
+		if (!deliveryActive) return;
+		deliveringPending += 1;
+		try {
+			notifier.flush?.();
+			for (const file of eligibleResultFiles()) {
+				scheduleResult(file, true);
+				resultFileCoalescer.flush(file);
+			}
+			await Promise.allSettled([...handling]);
+		} finally {
+			deliveringPending -= 1;
+		}
 	};
 
 	const clearResultScan = () => {
@@ -789,5 +843,5 @@ export function createResultWatcher(
 		identityCache.clear();
 	};
 
-	return { startResultWatcher, transitionResultDelivery, primeExistingResults, stopResultWatcher, refreshResultDelivery: () => { primeExistingResults(); startDemandPolling(); } };
-}
+	return { startResultWatcher, transitionResultDelivery, primeExistingResults, deliverPendingResults, stopResultWatcher, refreshResultDelivery: () => { primeExistingResults(); startDemandPolling(); } };
+}

package/dist/extensions/pi-subagents/src/runs/background/retained-children.ts

@@ -108,7 +108,8 @@ export function listRetainedChildren(asyncDirRoot: string, sessionId: string): R
 }
 
 export function formatRetainedChildren(children: RetainedChild[]): string {
-	if (children.length === 0) return "No retained workflow children in the active parent session. If a retained-writer challenge is required, launch a same-role fallback challenge and label it as fallback.";
+	const noKnownEligibleTargetGuidance = 'children.list is workflow-only and is not an exhaustive list of direct native children. If the exact run id of the intended child is known, inspect it with subagent({ action: "status", id: "..." }); if status identifies the candidate, attempt subagent({ action: "resume", id: "...", message: "..." }), which authoritatively checks eligibility and may reject it. Launch a same-role fallback challenge, labeled as fallback, only when there is no known candidate or resume rejects eligibility.';
+	if (children.length === 0) return `No retained workflow children in the active parent session. ${noKnownEligibleTargetGuidance}`;
 	const retained = children.slice(0, MAX_RETAINED_CHILDREN);
 	if (!retained.some((child) => child.resumability.state === "resumable")) {
 		const resumable = children.slice(MAX_RETAINED_CHILDREN).find((child) => child.resumability.state === "resumable");
@@ -130,6 +131,6 @@ export function formatRetainedChildren(children: RetainedChild[]): string {
 			] : []),
 			...(child.tokenTotals ? [`  tokens: input ${child.tokenTotals.input}, output ${child.tokenTotals.output}, total ${child.tokenTotals.total}`] : []),
 		]),
-		...(hasResumableChild ? [] : ["No resumable retained child is listed. Launch a same-role fallback challenge and label it as fallback."]),
+		...(hasResumableChild ? [] : [`No resumable retained workflow child is listed. ${noKnownEligibleTargetGuidance}`]),
 	].join("\n");
-}
+}