@narumitw/pi-subagents 2.0.6 → 2.1.1

package/src/spawn-idempotency.ts

@@ -1,5 +1,6 @@
 import { createHash } from "node:crypto";
 import type { AgentScope, SubagentThinkingLevel } from "./agents/types.js";
+import type { CompletionRequirementMode } from "./completion-requirement.js";
 import type { DelegationContract } from "./delegation-contract.js";
 import type { SubagentResultFormat } from "./result-contract.js";
 
@@ -23,6 +24,7 @@ export interface CanonicalSpawnRequest {
 	allowConcurrentWrites: boolean;
 	contract?: DelegationContract;
 	resultFormat: SubagentResultFormat;
+	completionRequirement?: CompletionRequirementMode;
 }
 
 export function hashSpawnRequest(request: CanonicalSpawnRequest): string {
@@ -48,6 +50,9 @@ export function hashSpawnRequest(request: CanonicalSpawnRequest): string {
 				allowConcurrentWrites: request.allowConcurrentWrites,
 				...(request.contract === undefined ? {} : { contract: request.contract }),
 				resultFormat: request.resultFormat,
+				...(request.completionRequirement === "required"
+					? { completionRequirement: "required" }
+					: {}),
 			}),
 		)
 		.digest("hex");

package/src/stateful-agent-view.ts

@@ -3,28 +3,10 @@ import type { ManagedAgent } from "./registry.js";
 
 export function formatStatefulAgentLine(agent: ManagedAgent, now = Date.now()): string {
 	const elapsedSeconds = Math.max(0, Math.floor((now - agent.updatedAt) / 1000));
-	const actions =
-		agent.state === "running" || agent.state === "starting"
-			? "interrupt, close"
-			: agent.state === "closed"
-				? "inspect"
-				: "send, close";
 	const task = agent.currentTask ? ` — ${sanitizeStatusLine(agent.currentTask, 80)}` : "";
 	const unread = agent.mailbox.filter((message) => !message.readAt).length;
 	const indent = "  ".repeat(agent.depth);
-	const thinking = agent.thinkingLevel ? ` thinking:${agent.thinkingLevel}` : "";
-	const timeout = agent.currentTimeoutMs ?? agent.timeoutMs;
-	const timeoutText = timeout ? ` timeout:${timeout}ms` : "";
-	const idleTimeout = agent.currentIdleTimeoutMs ?? agent.idleTimeoutMs;
-	const idleText = idleTimeout ? ` idle:${idleTimeout}ms` : "";
-	const maxTurns = agent.currentMaxTurns ?? agent.maxTurns;
-	const turnsText = maxTurns ? ` turns:${maxTurns}` : "";
-	const maxToolCalls = agent.currentMaxToolCalls ?? agent.maxToolCalls;
-	const toolsText = maxToolCalls ? ` tools:${maxToolCalls}` : "";
-	const transport = agent.telemetry?.transport ? ` transport:${agent.telemetry.transport}` : "";
-	const phase = agent.telemetry?.phase ? ` phase:${agent.telemetry.phase}` : "";
-	const queued = agent.telemetry?.queuePosition ? ` queue:${agent.telemetry.queuePosition}` : "";
-	return `${indent}${sanitizeStatusLine(agent.taskPath ?? agent.id, 256)} (${sanitizeStatusLine(agent.id, 128)}) ${sanitizeStatusLine(agent.agent, 128)} ${agent.state} ${elapsedSeconds}s${thinking}${timeoutText}${idleText}${turnsText}${toolsText}${transport}${phase}${queued} unread:${unread} [${actions}]${task}`;
+	return `${indent}${sanitizeStatusLine(agent.taskPath ?? agent.id, 256)} · ${sanitizeStatusLine(agent.agent, 128)} · ${agentStateLabel(agent.state)} · updated ${elapsedSeconds}s ago · ${unread} unread${task}`;
 }
 
 export function summarizeStatefulAgent(agent: ManagedAgent) {
@@ -63,6 +45,9 @@ export function summarizeStatefulAgent(agent: ManagedAgent) {
 			truncated: agent.contextTruncated === true,
 		},
 		resultFormat: agent.resultFormat ?? "text",
+		completionRequirements: (agent.completionRequirements ?? []).map((record) => ({
+			...record,
+		})),
 		structuredResult: agent.structuredResult,
 		termination: agent.termination,
 		outcome: agent.outcome,
@@ -77,6 +62,17 @@ export function summarizeStatefulAgent(agent: ManagedAgent) {
 	};
 }
 
+function agentStateLabel(state: ManagedAgent["state"]): string {
+	switch (state) {
+		case "running":
+			return "working";
+		case "completed":
+			return "finished";
+		default:
+			return state;
+	}
+}
+
 function sanitizeStatusLine(value: string, maxLength: number): string {
 	return (
 		value

package/src/stateful-guidance.ts

@@ -1,35 +1,28 @@
-import type { CompletionDelivery } from "./agents/types.js";
-
-export function createSpawnPromptGuidelines(
-	completionDelivery: CompletionDelivery,
-	blockingEnabled = true,
-): string[] {
-	const deliveryGuidance =
-		completionDelivery === "auto-resume"
-			? blockingEnabled
-				? "With subagent_spawn completion delivery set to auto-resume, prefer one subagent_spawn for broad asynchronous research or consequential independent review that covers related branches even when the final answer depends on its result; do not choose blocking parallel fan-out merely to keep delegation in the same turn."
-				: "With subagent_spawn completion delivery set to auto-resume, prefer one subagent_spawn for broad asynchronous research or consequential independent review that covers related branches even when the final answer depends on its result."
-			: blockingEnabled
-				? "With subagent_spawn completion delivery set to next-turn (the default), prefer one subagent_spawn for broad asynchronous research or consequential independent review only when the current response does not depend on its result; use the blocking subagent when the final answer depends on the detached result."
-				: "With subagent_spawn completion delivery set to next-turn (the default), use subagent_spawn only when the current response does not depend on its result; complete final-answer-dependent work directly because an idle root is not awakened.";
+export function createSpawnPromptGuidelines(blockingEnabled = true): string[] {
 	return [
 		"Do not use subagent_spawn for simple or critical-path work that the main agent can perform directly. The main agent retains overall planning, immediate critical-path work, integration, final verification, and the final answer.",
 		"Before one ordinary subagent_spawn, identify concrete useful non-overlapping main-agent work you can start immediately and a supported completion integration path. If none exists, perform the task directly instead of calling subagent_spawn.",
 		"Give subagent_spawn a concise unique taskName using lowercase letters, digits, and underscores so the retained agent has a stable canonical task path.",
 		"Set subagent_spawn thinkingLevel to the lowest sufficient thinking level for the delegated task: use off or minimal for extraction, formatting, or mechanical work; low for straightforward bounded work; medium for ordinary multi-step research or implementation; high for complex debugging, design, review, or cross-file analysis; xhigh for highly ambiguous, cross-system, or high-risk analysis; and max only for the hardest tasks when quality clearly outweighs latency and cost. Omit subagent_spawn thinkingLevel only to preserve the agent or child default.",
-		"Set subagent_spawn timeoutMs to the shortest realistic work deadline for the task difficulty; use idleTimeoutMs for stalled work and maxTurns or maxToolCalls to stop repeated work without progress. Split oversized tasks instead of extending budgets merely to compensate for broad scope. Omit these fields only to preserve the retained agent or configured defaults.",
-		deliveryGuidance,
+		"Set subagent_spawn timeoutMs to the shortest realistic work deadline for the task difficulty; use idleTimeoutMs for stalled work and maxTurns or maxToolCalls to stop repeated work without progress. Scope the task to the smallest named files or questions. When setting subagent_spawn maxTurns or maxToolCalls, leave sufficient headroom for discovery, evidence reads, and final synthesis; otherwise omit them instead of guessing speculative tight values. Split oversized tasks instead of extending budgets merely to compensate for broad scope.",
+		"For an ordinary subagent_spawn, omit contract; use a delegation contract only when explicit acceptance, authority, evidence, or admission semantics are required.",
+		"Do not set subagent_spawn contract enforcement to enforce with requestedAuthority readPaths, writePaths, network, or secrets; those guarantees are unsupported and reject before child launch, while capabilities and tools remain enforceable.",
+		"If subagent_spawn rejects an unsupported guarantee, retry once with those fields removed or enforcement set to audit only when they were advisory; when any field is a required security boundary, stop instead of weakening it.",
+		"Read the current pi-subagents session-guidance message before choosing detached completion behavior. With next-turn delivery, use subagent_spawn only when the current response does not depend on its result unless useful overlap ends with an intentional subagent_await. With auto-resume delivery, final-answer-dependent detached work may continue asynchronously.",
+		'Track every final-answer-dependent subagent_spawn by setting completionRequirement to "required" and retaining its returned agentId or taskPath; treat interim output as progress, and synthesize only after every corresponding completion message is visible or terminal.',
 		"Keep ordinary review in the main agent with a review skill and deterministic checks; use subagent_spawn for detached review only when consequential independent verification has concrete parallel value.",
 		"Use a single subagent_spawn for a bounded implementation slice with clear ownership only when it can run beside the identified main-agent work.",
 		"Use a single subagent_spawn without concurrent main-agent work only for an explicit user-requested specialist model, tool profile, or isolation boundary.",
 		...(blockingEnabled
 			? [
-					"Use the blocking subagent instead of subagent_spawn when synchronous output is required before the main agent can continue and waiting is intentional; queued steering cannot be processed until that blocking call returns.",
-					"When subagent_spawn fits the completion-delivery policy, do not choose a blocking parallel subagent merely to keep delegation in the same turn.",
+					"The subagent tool is deprecated; do not select it merely because synchronous output is required. Prefer subagent_spawn with supported completion delivery, and use subagent_await only after useful overlapping main-agent work is complete and an intentional join is required.",
+					"Use deprecated subagent instead of subagent_spawn only for an existing caller or an explicit user request whose blocking chain, fan-in, panel, or workflow semantics do not yet have a detached replacement; queued steering cannot be processed until it returns.",
 				]
 			: []),
 		"Add another subagent_spawn only for truly independent work with safe workspace concurrency and disjoint write ownership; shared workspaces permit concurrent writes by default, so use workspaceMode worktree when repository isolation is required. The main agent still owns integration.",
 		"After subagent_spawn returns, immediately continue the identified local task; do not merely announce the spawn, wait, poll, or end the response while useful local work remains.",
+		"When completionRequirement required subagent_spawn work remains active after local work is exhausted, emit at most one brief progress sentence and end the turn; do not repeat waiting updates or use the requested final format, verdict, or conclusion until every required completion is visible or terminal. Current Pi versions do not enforce a hard pre-display barrier.",
+		"Do not duplicate assigned work from subagent_spawn while its retained agent is running; use a bounded parent fallback only after its completion reports failure or insufficient evidence.",
 		'Consume and synthesize available subagent_spawn completion messages; use subagent_manage with action "interrupt" or "close" for agents that are no longer needed.',
 		'Completion from subagent_spawn is delivered automatically. Do not poll with subagent_inspect or subagent_mailbox action "read", repeatedly check progress, or duplicate the delegated work.',
 	];

package/src/stateful-limit-ui.ts

@@ -28,10 +28,10 @@ export function statefulLimitListScreen(runtime: StatefulLimitRuntime) {
 	const current = runtime.getRuntimeStatus().limits;
 	return {
 		kind: "actions" as const,
-		title: "Detached Agent Limits",
+		title: "Background Agent Limits",
 		lines: [
-			"These limits apply after /reload or the next Pi session.",
-			"Reloading can interrupt retained detached work.",
+			"These advanced limits apply after /reload or the next Pi session.",
+			"Reloading can interrupt subagents saved for follow-up.",
 			...(inspected.error
 				? [
 						`Settings cannot be edited: ${safeTerminalText(inspected.error)}`,
@@ -46,7 +46,7 @@ export function statefulLimitListScreen(runtime: StatefulLimitRuntime) {
 						return {
 							id: definition.field,
 							label: definition.label,
-							description: `Current ${current[definition.field]} · configured ${configured?.value ?? "unavailable"} (${configured?.source ?? "unknown"})`,
+							description: `Current: ${current[definition.field]} · after reload: ${configured?.value ?? "unavailable"} (${configured?.source ?? "unknown"})`,
 							action: "pick-stateful-limit" as const,
 						};
 					})
@@ -67,7 +67,7 @@ export function statefulLimitInputScreen(field: StatefulLimitField, runtime: Sta
 		lines: [
 			definition.description,
 			`Current session: ${runtime.getRuntimeStatus().limits[field]}`,
-			`Configured after reload: ${configured?.value ?? "unavailable"} (${configured?.source ?? "unknown"})`,
+			`After reload: ${configured?.value ?? "unavailable"} (${configured?.source ?? "unknown"})`,
 			`Allowed: whole numbers ${definition.minimum === 0 ? "0 or greater" : "1 or greater"}`,
 			`Read from: ${safeTerminalText(inspected.path)}`,
 			...(inspected.writePath !== inspected.path
@@ -114,9 +114,9 @@ export async function applyStatefulLimitSetting(
 		const confirmed = await ctx.ui.confirm(
 			`Lower ${statefulLimitDefinition(field).label}?`,
 			[
-				`This configured value would omit ${affectedBefore.length} currently retained agent record${affectedBefore.length === 1 ? "" : "s"} from projected recovery after reload.`,
-				"No agent is closed now, and this menu will not reload Pi.",
-				"A later state rewrite can make omitted records unavailable for recovery.",
+				`After reload, this value could exclude ${affectedBefore.length} saved subagent record${affectedBefore.length === 1 ? "" : "s"} from recovery.`,
+				"No subagent is removed now, and this menu will not reload Pi.",
+				"A later state save can make excluded records unavailable for recovery.",
 			].join("\n\n"),
 			{ signal: options.signal },
 		);
@@ -127,7 +127,10 @@ export async function applyStatefulLimitSetting(
 			[field]: next,
 		});
 		if (!sameIds(affectedBefore, affectedAfter)) {
-			ctx.ui.notify("Detached agents changed while confirming; review the limit again.", "warning");
+			ctx.ui.notify(
+				"Current subagents changed while confirming; review the limit again.",
+				"warning",
+			);
 			return { kind: "rejected" as const };
 		}
 	}
@@ -138,7 +141,7 @@ export async function applyStatefulLimitSetting(
 	} catch (error) {
 		if (options.isCurrent() && !options.signal.aborted) {
 			ctx.ui.notify(
-				`Detached limit was not saved; the previous setting is unchanged: ${formatError(error)}`,
+				`Background-agent limit was not saved; the previous setting is unchanged: ${formatError(error)}`,
 				"error",
 			);
 		}
@@ -146,7 +149,7 @@ export async function applyStatefulLimitSetting(
 	}
 	if (options.signal.aborted || !options.isCurrent()) return { kind: "close" as const };
 	ctx.ui.notify(
-		`Saved ${statefulLimitDefinition(field).label.toLowerCase()}: ${next}. Applies after /reload; clear retained agents before reloading if their work must not be interrupted.`,
+		`Saved ${statefulLimitDefinition(field).label.toLowerCase()}: ${next}. Applies after /reload; clear current subagents first if their work must not be interrupted.`,
 		"info",
 	);
 	return { kind: "back" as const };
@@ -154,11 +157,11 @@ export async function applyStatefulLimitSetting(
 
 export function formatDetachedLimitSummary(status: StatefulSubagentRuntimeStatus): string {
 	return [
-		`${status.limits.maxAgents} retained`,
-		`${status.limits.maxActiveTurns} active turns`,
-		`${status.limits.maxChildrenPerAgent} children`,
-		`depth ${status.limits.maxDepth}`,
-		`${status.limits.maxStoredAgents} stored`,
+		`${status.limits.maxAgents} saved`,
+		`${status.limits.maxActiveTurns} working at once`,
+		`${status.limits.maxChildrenPerAgent} children each`,
+		`${status.limits.maxDepth} nested levels`,
+		`${status.limits.maxStoredAgents} stored records`,
 	].join(" · ");
 }
 
@@ -172,7 +175,7 @@ export function formatConfiguredDetachedLimitDivergence(
 			? []
 			: [`${definition.label.toLowerCase()} ${configured}`];
 	});
-	return changed.length > 0 ? `Configured after reload: ${changed.join(" · ")}` : undefined;
+	return changed.length > 0 ? `After /reload: ${changed.join(" · ")}` : undefined;
 }
 
 export function formatConfiguredDetachedLimits(
@@ -185,9 +188,9 @@ export function formatConfiguredDetachedLimits(
 }
 
 export function formatEmptyStatefulRuntime(status: StatefulSubagentRuntimeStatus): string {
-	if (!status.enabled) return "Stateful subagents are disabled in user settings.";
-	if (!status.initialized) return "Stateful subagents are not initialized for this session.";
-	return "No current-session subagents.";
+	if (!status.enabled) return "Background subagents are disabled in How subagents run.";
+	if (!status.initialized) return "Background subagents have not started in this session.";
+	return "No subagents are working or saved for follow-up in this session.";
 }
 
 function parseStatefulLimit(

package/src/stateful-limits.ts

@@ -29,36 +29,36 @@ export interface StatefulLimitDefinition {
 export const STATEFUL_LIMIT_DEFINITIONS: readonly StatefulLimitDefinition[] = [
 	{
 		field: "maxAgents",
-		label: "Retained agents",
-		description: "Running, queued, and reusable idle detached agents",
+		label: "Subagents saved for follow-up",
+		description: "Working, queued, and reusable background subagents kept in one session",
 		defaultValue: 16,
 		minimum: 1,
 	},
 	{
 		field: "maxActiveTurns",
-		label: "Active turns",
-		description: "Detached agent turns that may run at the same time",
+		label: "Subagents working at once",
+		description: "Background subagent turns that may run at the same time",
 		defaultValue: 4,
 		minimum: 1,
 	},
 	{
 		field: "maxChildrenPerAgent",
-		label: "Children per agent",
-		description: "Direct child agents retained beneath one parent",
+		label: "Direct children per subagent",
+		description: "Subagents that one parent subagent may keep for follow-up",
 		defaultValue: 8,
 		minimum: 1,
 	},
 	{
 		field: "maxDepth",
-		label: "Agent tree depth",
-		description: "Nested child levels below a root agent",
+		label: "Nested subagent levels",
+		description: "Child levels allowed below a top-level subagent",
 		defaultValue: 3,
 		minimum: 0,
 	},
 	{
 		field: "maxStoredAgents",
-		label: "Stored agents",
-		description: "Detached agent records kept per session on disk",
+		label: "Stored subagent records",
+		description: "Background subagent records kept on disk for each session",
 		defaultValue: 50,
 		minimum: 1,
 	},

package/src/stateful-registration.ts

@@ -17,6 +17,10 @@ import {
 	THINKING_LEVELS,
 } from "./agents/types.js";
 import type { CompletionDeliveryBroker } from "./completion-delivery.js";
+import {
+	CompletionRequirementModeSchema,
+	completionRequirementsFromBranch,
+} from "./completion-requirement.js";
 import type { ContextMode } from "./context.js";
 import type { CreateStatefulTransportOptions } from "./create-stateful-transport.js";
 import { DelegationContractSchema } from "./delegation-contract.js";
@@ -55,7 +59,9 @@ import {
 	validateManageParams,
 } from "./stateful-tool-params.js";
 import { MAX_TASK_NAME_LENGTH } from "./task-path.js";
+import { grammarSafeToolObject } from "./tool-schema-compatibility.js";
 import { MAX_SUBAGENT_TOOL_CALLS, MAX_SUBAGENT_TURNS } from "./turn-budget.js";
+import type { UsageRecordingController } from "./usage-recording.js";
 import type { WorkspaceManager } from "./workspace.js";
 
 type CwdPolicyModule = typeof import("./cwd-policy.js");
@@ -196,6 +202,21 @@ const StatefulTimeoutSchema = Type.Integer({
 	description:
 		"Work deadline in milliseconds selected for the task difficulty. On expiry, Pi aborts the work and makes one separately bounded summary attempt. Retained as the agent default.",
 });
+const DEFAULT_SUBAGENT_AWAIT_TIMEOUT_MS = 30_000;
+const SubagentAwaitParams = Type.Object({
+	agentId: Type.String({
+		minLength: 1,
+		description: "Retained agent ID or canonical task path.",
+	}),
+	timeoutMs: Type.Optional(
+		Type.Integer({
+			minimum: 1,
+			maximum: MAX_SUBAGENT_TIMEOUT_MS,
+			description:
+				"Maximum time to wait in milliseconds. A wait timeout stops only this tool call and does not interrupt or close the subagent. Defaults to 30000.",
+		}),
+	),
+});
 const StatefulTurnLimitFields = {
 	idleTimeoutMs: Type.Optional(
 		Type.Integer({
@@ -209,14 +230,16 @@ const StatefulTurnLimitFields = {
 		Type.Integer({
 			minimum: 1,
 			maximum: MAX_SUBAGENT_TURNS,
-			description: "Maximum unfinished assistant turns; retained as the agent default.",
+			description:
+				"Maximum unfinished assistant turns; retained as the agent default. Omit rather than guessing a tight bound.",
 		}),
 	),
 	maxToolCalls: Type.Optional(
 		Type.Integer({
 			minimum: 1,
 			maximum: MAX_SUBAGENT_TOOL_CALLS,
-			description: "Maximum tool calls; retained as the agent default.",
+			description:
+				"Maximum tool calls; retained as the agent default. Omit rather than guessing a tight bound.",
 		}),
 	),
 };
@@ -227,6 +250,7 @@ export interface StatefulSubagentDependencies {
 	settings?: SubagentRuntimeSettings;
 	getSettings?: () => SubagentSettings | undefined;
 	loadTransport?: CreateStatefulTransportOptions["loadTransport"];
+	usageRecording?: UsageRecordingController;
 }
 
 export interface StatefulSubagentRuntimeStatus {
@@ -242,8 +266,6 @@ export interface StatefulSubagentRuntimeStatus {
 export interface StatefulSubagentController {
 	getCompletionDelivery(): CompletionDelivery;
 	setCompletionDelivery(value: CompletionDelivery): void;
-	setAgentCatalog(value: string): void;
-	refreshSettingsGuidance(): void;
 	getRuntimeStatus(): StatefulSubagentRuntimeStatus;
 	listAgents(includeClosed?: boolean): ManagedAgent[];
 	listRunInspection(includeClosed?: boolean): AgentRunInspectionSummary[];
@@ -268,10 +290,8 @@ export function registerStatefulSubagents(
 	const transportKind = resolveStatefulTransportKind(settings.transport);
 	let completionDelivery = resolveCompletionDelivery(settings.completionDelivery);
 	let runtimeLimits = resolveStatefulLimits(settings);
-	let agentCatalog = "";
 	let completionBroker: CompletionDeliveryBroker | undefined;
 	let peerBroker: import("./peer-communication.js").PeerCommunicationBroker | undefined;
-	let refreshSpawnToolRegistration: (() => void) | undefined;
 	let registry: AgentRegistry | undefined;
 	let persistence: AgentPersistence | undefined;
 	let sweepTimer: NodeJS.Timeout | undefined;
@@ -325,14 +345,6 @@ export function registerStatefulSubagents(
 		setCompletionDelivery(value) {
 			completionDelivery = value;
 			completionBroker?.setDelivery(value);
-			refreshSpawnToolRegistration?.();
-		},
-		setAgentCatalog(value) {
-			agentCatalog = value;
-			refreshSpawnToolRegistration?.();
-		},
-		refreshSettingsGuidance() {
-			refreshSpawnToolRegistration?.();
 		},
 		getRuntimeStatus() {
 			const counts = registry?.inspectionCounts() ?? { activeAgents: 0, retainedAgents: 0 };
@@ -362,7 +374,7 @@ export function registerStatefulSubagents(
 		if (!registry) throw new Error("Stateful subagents are not initialized for this session");
 		return registry;
 	};
-	pi.on("session_start", async (_event, ctx) => {
+	pi.on("session_start", async (event, ctx) => {
 		const generation = ++runtimeGeneration;
 		completionBroker?.close();
 		completionBroker = undefined;
@@ -415,9 +427,16 @@ export function registerStatefulSubagents(
 						const reason = error instanceof Error ? error.message : String(error);
 						ctx.ui.notify(`Subagent completion delivery failed: ${reason}`, "warning");
 					},
+					onDeliveryAttempt: (completions, input) => {
+						if (generation !== runtimeGeneration) return;
+						for (const completion of completions) {
+							dependencies.usageRecording?.recordCompletionDeliveryAttempt(completion, input);
+						}
+					},
 					onAcknowledged: (completions, deliveredAt) => {
 						if (generation !== runtimeGeneration) return;
 						for (const completion of completions) {
+							dependencies.usageRecording?.recordCompletionVisible(completion);
 							void nextRegistry
 								.markCompletionDelivered(completion.completionId, deliveredAt)
 								.catch((error: unknown) => {
@@ -479,6 +498,7 @@ export function registerStatefulSubagents(
 					if (generation !== runtimeGeneration) return;
 					await sessionPersistence.save(agents);
 					if (generation !== runtimeGeneration) return;
+					dependencies.usageRecording?.observeAgents(agents);
 					for (const agent of agents) {
 						for (const message of agent.mailbox) {
 							if (seenMessageIds.has(message.id)) continue;
@@ -506,9 +526,9 @@ export function registerStatefulSubagents(
 					}
 				},
 				onTurnComplete: (completion) => {
-					if (generation === runtimeGeneration && completion.recipientId === "root") {
-						sessionBroker.enqueue(completion);
-					}
+					if (generation !== runtimeGeneration) return;
+					dependencies.usageRecording?.recordChildCompletion(completion);
+					if (completion.recipientId === "root") sessionBroker.enqueue(completion);
 				},
 			});
 			const persisted = sessionPersistence.load();
@@ -550,6 +570,26 @@ export function registerStatefulSubagents(
 				for (const message of agent.mailbox) seenMessageIds.add(message.id);
 			}
 			nextRegistry.restore(restored);
+			const branchRequirements = completionRequirementsFromBranch(ctx.sessionManager.getBranch());
+			const branchOwnsRequirementState =
+				branchRequirements.observedState || event.reason === "fork" || event.reason === "new";
+			nextRegistry.reconcileCompletionRequirements(
+				branchRequirements.records,
+				branchOwnsRequirementState,
+			);
+			if (branchOwnsRequirementState) {
+				try {
+					await sessionPersistence.save(nextRegistry.list(true));
+				} catch (error) {
+					if (generation === runtimeGeneration && ctx.hasUI) {
+						const reason = error instanceof Error ? error.message : String(error);
+						ctx.ui.notify(
+							`Subagent requirement reconciliation could not be persisted yet: ${reason}`,
+							"warning",
+						);
+					}
+				}
+			}
 			if (generation !== runtimeGeneration) {
 				sessionBroker.close();
 				await sessionPeerBroker.close();
@@ -564,7 +604,6 @@ export function registerStatefulSubagents(
 				if (completion.recipientId === "root") sessionBroker.enqueue(completion);
 			}
 			runtimeLimits = nextLimits;
-			refreshSpawnToolRegistration?.();
 			const sweepEveryMs = Math.max(
 				1_000,
 				Math.min(sessionSettings.idleTtlMs ?? 60 * 60 * 1000, 60_000),
@@ -631,15 +670,14 @@ export function registerStatefulSubagents(
 		await transition;
 	});
 
-	const baseSpawnDescription = () =>
-		`Start an addressable background subagent with an opaque agentId and canonical taskPath, plus an optional thinking level and execution budgets chosen for the task difficulty, return immediately with an agentId, and receive its completion asynchronously. Detached capacity: ${runtimeLimits.maxAgents} retained agents, ${runtimeLimits.maxActiveTurns} active turns, ${runtimeLimits.maxChildrenPerAgent} direct children per agent, and depth ${runtimeLimits.maxDepth}. Working-directory target policy: ${dependencies.getSettings?.()?.cwdPolicy?.delegation ?? DEFAULT_DELEGATION_CWD_POLICY}. This controls launch targets and protected project resources, not filesystem access or sandboxing.`;
 	const spawnTool = defineTool({
 		name: "subagent_spawn",
 		label: "Spawn Subagent",
-		description: appendAgentCatalog(baseSpawnDescription(), agentCatalog),
+		description:
+			"Start an addressable background subagent with an opaque agentId and canonical taskPath, an optional thinking level and execution budgets chosen for the task difficulty, and asynchronous completion delivery. The current bounded capacity, completion policy, working-directory policy, and available agent definitions are published in the pi-subagents session-guidance message. Working-directory policy controls launch targets and protected project resources, not filesystem access or sandboxing.",
 		promptSnippet: "Start a reusable detached subagent; completion is delivered asynchronously",
-		promptGuidelines: createSpawnPromptGuidelines(completionDelivery, blockingEnabled),
-		parameters: Type.Object({
+		promptGuidelines: createSpawnPromptGuidelines(blockingEnabled),
+		parameters: grammarSafeToolObject({
 			agent: Type.String({ minLength: 1 }),
 			taskName: Type.Optional(
 				Type.String({
@@ -689,6 +727,7 @@ export function registerStatefulSubagents(
 						"Use text (default), structured-v1, or the evidence-preserving structured-v2 completion contract.",
 				}),
 			),
+			completionRequirement: Type.Optional(CompletionRequirementModeSchema),
 		}),
 		...createStatefulToolRenderer("spawn"),
 		async execute(_id, params, signal, _update, ctx) {
@@ -780,6 +819,7 @@ export function registerStatefulSubagents(
 				allowConcurrentWrites: params.allowConcurrentWrites ?? false,
 				contract,
 				resultFormat,
+				completionRequirement: params.completionRequirement ?? "background",
 			});
 			if (!capturedRegistry) {
 				throw new Error("Stateful subagents are not initialized for this session");
@@ -873,6 +913,7 @@ export function registerStatefulSubagents(
 						spawnRequestHash: params.idempotencyKey ? requestHash : undefined,
 						contract,
 						resultFormat: resultFormat === "text" ? undefined : resultFormat,
+						completionRequirement: params.completionRequirement ?? "background",
 						executionPlan,
 						capabilityGrant,
 						semanticSnapshot,
@@ -892,11 +933,15 @@ export function registerStatefulSubagents(
 				resolvePending?.(agent);
 				const deliveryNote =
 					completionDelivery === "auto-resume"
-						? "Auto-resume will request synthesis after completion."
+						? "Auto-resume steers completions into active parent work or requests synthesis when idle. Treat this response as progress, not final synthesis, until every final-answer-required completion message is visible. If local work is exhausted while required children remain active, emit at most one brief progress sentence and end the turn; do not repeat waiting updates or use the requested final format, verdict, or conclusion. Do not redo a running child's assigned work."
 						: "The current response must not depend on the result because next-turn delivery will not wake an idle root.";
+				const requirementNote =
+					params.completionRequirement === "required"
+						? "This exact run is runtime-tracked as required until its completion becomes visible or reaches an explicit terminal state. Current Pi versions still cannot prevent already-streamed premature output."
+						: "This run is background work and does not block the parent final answer.";
 				return result(
 					agent,
-					`Spawned ${agent.agent} as ${agent.taskPath ?? agent.id} (${agent.id}). Continue the identified non-overlapping local work immediately; do not merely announce the spawn or end while useful local work remains. Only an explicit user-requested specialist model, tool-profile, or isolation exception may lack concurrent local work. ${deliveryNote} Do not poll for progress.`,
+					`Spawned ${agent.agent} as ${agent.taskPath ?? agent.id} (${agent.id}). ${requirementNote} Continue the identified non-overlapping local work immediately; do not merely announce the spawn or end while useful local work remains. Only an explicit user-requested specialist model, tool-profile, or isolation exception may lack concurrent local work. ${deliveryNote} Do not poll for progress.`,
 				);
 			} catch (error) {
 				rejectPending?.(error);
@@ -912,12 +957,7 @@ export function registerStatefulSubagents(
 			}
 		},
 	});
-	refreshSpawnToolRegistration = () => {
-		spawnTool.description = appendAgentCatalog(baseSpawnDescription(), agentCatalog);
-		spawnTool.promptGuidelines = createSpawnPromptGuidelines(completionDelivery, blockingEnabled);
-		pi.registerTool(spawnTool);
-	};
-	refreshSpawnToolRegistration();
+	pi.registerTool(spawnTool);
 
 	pi.registerTool({
 		name: "subagent_send",
@@ -937,6 +977,7 @@ export function registerStatefulSubagents(
 				}),
 			),
 			...StatefulTurnLimitFields,
+			completionRequirement: Type.Optional(CompletionRequirementModeSchema),
 			revalidate: Type.Optional(
 				Type.Boolean({
 					description:
@@ -1055,12 +1096,37 @@ export function registerStatefulSubagents(
 				idleTimeoutMs: params.idleTimeoutMs,
 				maxTurns: params.maxTurns,
 				maxToolCalls: params.maxToolCalls,
+				completionRequirement: params.completionRequirement ?? "background",
 			});
 			assertCurrentSpawn(signal, generation, runtimeGeneration);
 			return result(agent, `Started follow-up for ${agent.id}.`);
 		},
 	});
 
+	if (blockingEnabled) {
+		pi.registerTool({
+			name: "subagent_await",
+			label: "Await Subagent",
+			description:
+				"Wait for one retained subagent's current turn to settle and return its latest bounded output. This blocks Pi from processing queued steering until the wait finishes. A wait timeout or caller cancellation stops only the wait and never interrupts or closes the subagent; use subagent_manage for lifecycle changes. Automatic completion delivery remains active and may later repeat the same at-least-once completion.",
+			promptSnippet:
+				"Intentionally block until one retained subagent settles or the wait times out",
+			promptGuidelines: [
+				"Use subagent_await only when the retained result is required before the next action, useful overlapping main-agent work is complete, and blocking Pi is intentional.",
+				"Do not repeatedly call subagent_await after a timeout; the subagent keeps running and completion delivery remains active. Use subagent_manage only when the user wants to interrupt or close it.",
+			],
+			parameters: SubagentAwaitParams,
+			...createStatefulToolRenderer("await"),
+			async execute(_id, params, signal): Promise<StatefulActionToolResult> {
+				const generation = runtimeGeneration;
+				const timeoutMs = params.timeoutMs ?? DEFAULT_SUBAGENT_AWAIT_TIMEOUT_MS;
+				const waited = await requireRegistry().wait(params.agentId, timeoutMs, signal);
+				assertCurrentSpawn(signal, generation, runtimeGeneration);
+				return awaitResult(waited.agent, waited.timedOut, timeoutMs);
+			},
+		});
+	}
+
 	pi.registerTool({
 		name: "subagent_manage",
 		label: "Manage Subagents",
@@ -1214,10 +1280,6 @@ async function cleanupClosedWorkspaces(
 	}
 }
 
-function appendAgentCatalog(baseDescription: string, catalog: string): string {
-	return catalog ? `${baseDescription}\n\n${catalog}` : baseDescription;
-}
-
 function result(agent: ManagedAgent, text: string) {
 	return {
 		content: [{ type: "text" as const, text }],
@@ -1225,6 +1287,34 @@ function result(agent: ManagedAgent, text: string) {
 	};
 }
 
+function awaitResult(agent: ManagedAgent, timedOut: boolean, timeoutMs: number) {
+	const latestTurn = agent.history.at(-1);
+	const output = timedOut
+		? ""
+		: truncateUtf8(latestTurn?.output ?? "", DEFAULT_MAX_CONTEXT_BYTES).text;
+	const error = timedOut ? "" : truncateUtf8(agent.error ?? "", MAX_TOOL_MESSAGE_BYTES).text;
+	const text = timedOut
+		? `Stopped waiting for ${agent.taskPath ?? agent.id} after ${timeoutMs}ms; it remains ${agent.state}. The wait did not interrupt or close the subagent.`
+		: [`Subagent ${agent.taskPath ?? agent.id} settled as ${agent.state}.`, output || error]
+				.filter(Boolean)
+				.join("\n\n");
+	return {
+		content: [
+			{
+				type: "text" as const,
+				text: truncateUtf8(text, DEFAULT_MAX_CONTEXT_BYTES).text,
+			},
+		],
+		details: {
+			agent: summarizeStatefulAgent(agent),
+			timedOut,
+			timeoutMs,
+			...(output ? { output } : {}),
+			...(error ? { error } : {}),
+		},
+	};
+}
+
 function normalizeRuntimeThinkingLevel(value: string): ParentRuntimeSnapshot["thinkingLevel"] {
 	return isThinkingLevel(value) ? value : "off";
 }