pi-subagents 0.68.0 → 0.70.0

package/src/runs/shared/child-launch-plan.ts

@@ -1,163 +0,0 @@
-import * as path from "node:path";
-import type { AgentConfig } from "../../agents/agents.ts";
-import { resolveChildCwd } from "../../shared/utils.ts";
-import type { JsonSchemaObject, OutputMode } from "../../shared/types.ts";
-import { resolveSingleOutputPath } from "./single-output.ts";
-
-export interface ResolvedStepBehavior {
-	output: string | false;
-	outputMode: OutputMode;
-	reads: string[] | false;
-	progress: boolean;
-	skills: string[] | false;
-	model?: string;
-	fast?: boolean;
-	outputSchema?: JsonSchemaObject;
-}
-
-export type OutputOverrideInput = string | boolean;
-
-export interface StepOverrides {
-	output?: OutputOverrideInput;
-	outputMode?: OutputMode;
-	reads?: string[] | false;
-	progress?: boolean;
-	skills?: string[] | false;
-	model?: string;
-	fast?: boolean;
-	outputSchema?: JsonSchemaObject | false;
-}
-
-export interface ChildLaunchPlanInput {
-	agentConfig: AgentConfig;
-	stepOverrides: StepOverrides;
-	task?: string;
-	originalTask?: string;
-	runnerCwd: string;
-	runtimeCwd: string;
-	stepCwdInput?: string;
-	behaviorCwd?: string;
-	machineCwd?: string;
-	chainSkills?: string[];
-	outputBaseDir?: string;
-	parallelOutputNamespace?: { stepIndex: number; taskIndex?: number };
-	resolvedBehavior?: ResolvedStepBehavior;
-}
-
-export interface ChildLaunchPlan {
-	stepCwd: string;
-	instructionCwd: string;
-	readExistenceCwd: string;
-	behavior: ResolvedStepBehavior;
-	inheritedRelativeParallelOutput: boolean;
-	namespaceOutputPath: boolean;
-	outputPath?: string;
-	skillNames: string[];
-}
-
-export function normalizeOutputOverride(output: unknown): string | false | undefined {
-	if (output === false || output === "false") return false;
-	if (output === true || output === "true") return undefined;
-	return typeof output === "string" && output.length > 0 ? output : undefined;
-}
-
-export const resolveEffectiveOutputSchema = (agentConfig: AgentConfig, override?: JsonSchemaObject | false): JsonSchemaObject | undefined => override === false ? undefined : override !== undefined ? override : agentConfig.outputSchema;
-
-type OutputSchemaStep = { agent: string; outputSchema?: JsonSchemaObject | false };
-export function projectChainOutputSchemas<S extends OutputSchemaStep, R = S, G = { parallel: R[] | R }>(chain: readonly (S | { parallel: S[] | S })[], agents: AgentConfig[], projectStep?: (step: S, outputSchema: JsonSchemaObject | undefined) => R, projectGroup?: (step: { parallel: S[] | S }, parallel: R[] | R) => G): Array<R | G> {
-	const project = (step: S): R => { const agent = agents.find((candidate) => candidate.name === step.agent); if (!agent && !projectStep) return step as unknown as R; const outputSchema = agent && resolveEffectiveOutputSchema(agent, step.outputSchema); return projectStep ? projectStep(step, outputSchema) : { ...step, outputSchema } as unknown as R; };
-	return chain.map((step) => { if (!("parallel" in step)) return project(step as S); const parallel = Array.isArray(step.parallel) ? step.parallel.map(project) : project(step.parallel as S); return projectGroup ? projectGroup(step, parallel) : { ...step, parallel } as unknown as G; });
-}
-
-export function resolveStepBehavior(
-	agentConfig: AgentConfig,
-	stepOverrides: StepOverrides,
-	chainSkills?: string[],
-): ResolvedStepBehavior {
-	const stepOutput = normalizeOutputOverride(stepOverrides.output);
-	const output = stepOutput !== undefined
-		? stepOutput
-		: normalizeOutputOverride(agentConfig.output) ?? false;
-
-	const reads = stepOverrides.reads !== undefined
-		? stepOverrides.reads
-		: agentConfig.defaultReads ?? false;
-
-	const progress = stepOverrides.progress !== undefined
-		? stepOverrides.progress
-		: agentConfig.defaultProgress ?? false;
-
-	let skills: string[] | false;
-	if (stepOverrides.skills === false) {
-		skills = false;
-	} else if (stepOverrides.skills !== undefined) {
-		skills = [...stepOverrides.skills];
-		if (chainSkills && chainSkills.length > 0) {
-			skills = [...new Set([...skills, ...chainSkills])];
-		}
-	} else {
-		skills = agentConfig.skills ? [...agentConfig.skills] : [];
-		if (chainSkills && chainSkills.length > 0) {
-			skills = [...new Set([...skills, ...chainSkills])];
-		}
-	}
-
-	const outputMode = stepOverrides.outputMode ?? agentConfig.outputMode ?? "inline";
-	const model = stepOverrides.model ?? agentConfig.model;
-	const fast = stepOverrides.fast ?? agentConfig.fast;
-	const outputSchema = resolveEffectiveOutputSchema(agentConfig, stepOverrides.outputSchema);
-	return { output, outputMode, reads, progress, skills, model, fast, ...(outputSchema !== undefined ? { outputSchema } : {}) };
-}
-
-export function resolveTaskTextForFileUpdatePolicy(task: string | undefined, originalTask?: string): string | undefined {
-	if (!task) return originalTask;
-	return originalTask ? task.replaceAll("{task}", originalTask) : task;
-}
-
-export function taskDisallowsFileUpdates(task: string | undefined): boolean {
-	if (!task) return false;
-	return /\breview[- ]only\b/i.test(task)
-		|| /\bread[- ]only\s+(?:review|audit|inspection|pass)\b/i.test(task)
-		|| /\b(?:no|without)\s+(?:file\s+)?edits?\b/i.test(task)
-		|| /\b(?:do not|don't|must not)\s+(?:edit|modify|write|touch)\b/i.test(task)
-		|| /\bleave\s+files?\s+unchanged\b/i.test(task);
-}
-
-export function suppressProgressForReadOnlyTask(behavior: ResolvedStepBehavior, task: string | undefined, originalTask?: string): ResolvedStepBehavior {
-	const policyTask = resolveTaskTextForFileUpdatePolicy(task, originalTask);
-	return behavior.progress && taskDisallowsFileUpdates(policyTask) ? { ...behavior, progress: false } : behavior;
-}
-
-export function planChildLaunch(input: ChildLaunchPlanInput): ChildLaunchPlan {
-	const stepCwd = input.machineCwd ?? resolveChildCwd(input.runnerCwd, input.stepCwdInput);
-	const instructionCwd = input.behaviorCwd ?? stepCwd;
-	const readExistenceCwd = input.behaviorCwd ? stepCwd : instructionCwd;
-	let behavior = suppressProgressForReadOnlyTask(
-		input.resolvedBehavior ?? resolveStepBehavior(input.agentConfig, input.stepOverrides, input.chainSkills),
-		input.task,
-		input.originalTask,
-	);
-
-	const inheritedRelativeParallelOutput = Boolean(
-		input.parallelOutputNamespace
-		&& input.stepOverrides.output === undefined
-		&& typeof behavior.output === "string"
-		&& !path.isAbsolute(behavior.output),
-	);
-	if (inheritedRelativeParallelOutput && input.parallelOutputNamespace?.taskIndex !== undefined) {
-		behavior = {
-			...behavior,
-			output: path.join(
-				`parallel-${input.parallelOutputNamespace.stepIndex}`,
-				`${input.parallelOutputNamespace.taskIndex}-${input.agentConfig.name}`,
-				behavior.output as string,
-			),
-		};
-	}
-
-	const namespaceOutputPath = inheritedRelativeParallelOutput && input.parallelOutputNamespace?.taskIndex === undefined;
-	const skillNames = behavior.skills === false ? [] : behavior.skills;
-	const outputPath = resolveSingleOutputPath(behavior.output, input.runtimeCwd, instructionCwd, input.outputBaseDir);
-
-	return { stepCwd, instructionCwd, readExistenceCwd, behavior, inheritedRelativeParallelOutput, namespaceOutputPath, outputPath, skillNames };
-}

package/src/runs/shared/child-launch.ts

@@ -1,342 +0,0 @@
-/**
- * Builds the in-process launch for one child: the tool plan, the typed child
- * runtime config the hooks read, and the session launch input. Foreground
- * children are built in the parent process; background children are built in
- * the detached runner from the step it received in its config.
- */
-import * as fs from "node:fs";
-import * as path from "node:path";
-import type { ChildWatchdogConfig, ChildWatchdogStatusEvent } from "../../watchdog/child-status.ts";
-import type { ThinkingLevel } from "../../shared/model-info.ts";
-import { intersectThinkingCeilings } from "../../shared/thinking-ceiling.ts";
-import {
-	resolveChildDepth,
-	type LaunchResolvedChildExtensions,
-	type ResolvedToolBudget,
-	type RunFanoutBudgetDescriptor,
-	type HerdrMachineReference,
-} from "../../shared/types.ts";
-import type { NestedPathEntry } from "./nested-path.ts";
-import type { McpRuntimeSnapshotHost } from "./mcp-direct-tool-allowlist.ts";
-import type { PermissionRules } from "./permissions.ts";
-import type { StructuredOutputRuntime } from "./structured-output.ts";
-import type { ChildToolDiagnostic } from "./tool-availability.ts";
-import type { RuntimeAcknowledgedChildExtensions } from "../../shared/types.ts";
-import { encodeExtensionBindings, PI_SUBAGENT_EXTENSION_BINDINGS_ENV, type ExtensionBindings } from "./extension-bindings.ts";
-import type { ResolvedSubagentCapabilityCeiling, SubagentCapabilityAudit } from "./capability-ceiling.ts";
-import {
-	isSubagentRuntimeExtensionPath,
-	projectLaunchResolvedChildExtensions,
-	resolvePiLaunchToolPlan,
-	supervisorChannelDir,
-	type PiLaunchToolPlan,
-} from "./child-tool-plan.ts";
-import type { ChildRuntimeConfig } from "./child-runtime-config.ts";
-import { createCapturedChildHooks, withChildSessionErrorReporting } from "./child-hooks.ts";
-import type { ChildTranscriptWriter } from "../../shared/child-transcript.ts";
-import type { ChildSessionLaunch, ChildSessionStorage } from "./child-session.ts";
-import type { ArbiterModelContext } from "./llm-intent-arbiter.ts";
-import { resolveRequiredChildExtensions, type RequiredChildExtensionSnapshot } from "../../shared/required-child-extensions.ts";
-
-/** Environment variable pi-mcp-adapter reads for the tools a child may expose. */
-export const MCP_DIRECT_TOOLS_ENV = "MCP_DIRECT_TOOLS";
-
-/**
- * The parts of the launching executor's own child runtime that a child it
- * launches inherits. Serialized into the background runner config; the
- * foreground path passes the executor's full `ChildRuntimeConfig`.
- */
-export type InheritedChildRuntime = Pick<ChildRuntimeConfig, "depth" | "maxDepth" | "nestedRoute" | "nestedParent" | "capabilityCeiling" | "thinkingCeiling" | "runFanoutBudget" | "requiredExtensions">;
-
-export function inheritedChildRuntime(config: ChildRuntimeConfig | undefined): InheritedChildRuntime | undefined {
-	if (!config) return undefined;
-	return {
-		depth: config.depth,
-		...(config.maxDepth !== undefined ? { maxDepth: config.maxDepth } : {}),
-		...(config.nestedRoute ? { nestedRoute: config.nestedRoute } : {}),
-		...(config.nestedParent ? { nestedParent: config.nestedParent } : {}),
-		...(config.capabilityCeiling ? { capabilityCeiling: config.capabilityCeiling } : {}),
-		...(config.thinkingCeiling ? { thinkingCeiling: config.thinkingCeiling } : {}),
-		...(config.runFanoutBudget ? { runFanoutBudget: config.runFanoutBudget } : {}),
-		...(config.requiredExtensions ? { requiredExtensions: config.requiredExtensions } : {}),
-	};
-}
-
-export interface BuildInProcessChildLaunchInput {
-	machine?: HerdrMachineReference;
-	remoteSkillNames?: string[];
-	remoteReads?: string[] | false;
-	parentSessionId?: string;
-	forkCacheKey?: string;
-	sessionEnabled: boolean;
-	sessionDir?: string;
-	sessionFile?: string;
-	/** Model reference with the thinking suffix already applied. */
-	model?: string;
-	systemPromptMode?: "append" | "replace";
-	inheritProjectContext: boolean;
-	inheritGlobalContext: boolean;
-	inheritSkills: boolean;
-	requireReadTool?: boolean;
-	tools?: string[];
-	excludeTools?: string[];
-	extensions?: string[];
-	subagentOnlyExtensions?: string[];
-	/** Serialized launch snapshot; omitted only for a top-level parent-process lookup. */
-	requiredExtensions?: RequiredChildExtensionSnapshot;
-	systemPrompt?: string | null;
-	mcpDirectTools?: string[];
-	extensionBindings?: ExtensionBindings;
-	cwd: string;
-	intercomSessionName?: string;
-	sessionName?: string;
-	orchestratorIntercomTarget?: string;
-	runId?: string;
-	childAgentName: string;
-	childIndex: number;
-	nestedRoute?: { rootRunId: string; eventSink: string; controlInbox: string; capabilityToken: string };
-	runFanoutBudget?: RunFanoutBudgetDescriptor;
-	structuredOutput?: StructuredOutputRuntime;
-	fast?: boolean;
-	toolBudget?: ResolvedToolBudget;
-	permissionRules?: PermissionRules;
-	permissionAuditPath?: string;
-	childWatchdog?: ChildWatchdogConfig;
-	watchdogStatus?: (event: ChildWatchdogStatusEvent) => void;
-	waitToolEnabled?: boolean;
-	waitToolDefaultTimeoutMs?: number;
-	allowNestedSubagents?: boolean;
-	capabilityCeiling?: ResolvedSubagentCapabilityCeiling;
-	thinkingCeiling?: ThinkingLevel;
-	maxSubagentDepth?: number;
-	runtimeSnapshotHost?: McpRuntimeSnapshotHost;
-	/** The launching executor's own child runtime when it is itself an in-process child. */
-	inherited?: InheritedChildRuntime;
-	/**
-	 * Which process hosts the session. The parent never loads ambient extensions
-	 * or writes child environment values (it shares its process with the parent
-	 * session); the runner loads ambient extensions when the tool plan allows
-	 * them and exposes the child environment external extensions read.
-	 */
-	host: "parent" | "runner";
-	/**
-	 * Pi core tool names the host runtime provides. When set, child tool plans
-	 * intersect known core slots with this set; declared non-core names remain
-	 * for child startup validation. Review/scout lanes fail closed when a requested,
-	 * still-permitted repository inspection tool is missing from that set.
-	 */
-	hostAvailableBuiltins?: readonly string[];
-}
-
-export interface InProcessChildCapture {
-	completionIntentContext?(): ArbiterModelContext | undefined;
-	structuredOutput(): { called: boolean; value?: unknown; acceptanceReport?: unknown; acceptanceReportProvided: boolean };
-	toolDiagnostic(): ChildToolDiagnostic | undefined;
-	runtimeAcknowledgedExtensions(): RuntimeAcknowledgedChildExtensions | undefined;
-	finalDrainHeld(): boolean;
-}
-
-export interface InProcessChildLaunch {
-	toolPlan: PiLaunchToolPlan;
-	config: ChildRuntimeConfig;
-	session: Omit<ChildSessionLaunch, "onExtensionError">;
-	capture: InProcessChildCapture;
-	launchResolvedExtensions: LaunchResolvedChildExtensions;
-	warnings: string[];
-	capabilityAudit?: SubagentCapabilityAudit;
-}
-
-/** Actual host create-input boundary. Evidence remains explicitly opt-in and dormant in production. */
-export function createReportedChildSessionInput(launch: InProcessChildLaunch, transcriptWriter?: ChildTranscriptWriter): ChildSessionLaunch {
-	return withChildSessionErrorReporting(launch.session, transcriptWriter);
-}
-
-/** Escape XML-significant characters in a string for safe attribute interpolation. */
-function escapeXmlAttr(value: string): string {
-	return value
-		.replace(/&/g, "&amp;")
-		.replace(/"/g, "&quot;")
-		.replace(/</g, "&lt;")
-		.replace(/>/g, "&gt;");
-}
-
-function inheritedCapabilityCeiling(inherited: InheritedChildRuntime | undefined): ResolvedSubagentCapabilityCeiling | undefined {
-	return inherited?.capabilityCeiling;
-}
-
-/** Environment values external child extensions read; only the runner applies them. */
-function childProcessEnv(input: BuildInProcessChildLaunchInput, toolPlan: PiLaunchToolPlan): Record<string, string | undefined> {
-	const env: Record<string, string | undefined> = {};
-	env[PI_SUBAGENT_EXTENSION_BINDINGS_ENV] = encodeExtensionBindings(input.extensionBindings);
-	if (!toolPlan.capabilityCeiling && input.mcpDirectTools?.length) env[MCP_DIRECT_TOOLS_ENV] = input.mcpDirectTools.join(",");
-	else if (toolPlan.capabilityCeiling && toolPlan.effectiveMcpSelections.length && !toolPlan.capabilityCeiling.denyExtensions) {
-		env[MCP_DIRECT_TOOLS_ENV] = toolPlan.effectiveMcpSelections.map((selection) => selection.selector).join(",");
-	} else env[MCP_DIRECT_TOOLS_ENV] = "__none__";
-	return env;
-}
-
-function childStorage(input: BuildInProcessChildLaunchInput): ChildSessionStorage {
-	if (input.sessionFile) {
-		fs.mkdirSync(path.dirname(input.sessionFile), { recursive: true });
-		return { kind: "file", sessionFile: input.sessionFile };
-	}
-	if (!input.sessionEnabled) return { kind: "memory" };
-	if (input.sessionDir) {
-		fs.mkdirSync(input.sessionDir, { recursive: true });
-		return { kind: "dir", sessionDir: input.sessionDir };
-	}
-	return { kind: "default" };
-}
-
-export function buildInProcessChildLaunch(input: BuildInProcessChildLaunchInput): InProcessChildLaunch {
-	const requiredExtensions = input.requiredExtensions ?? input.inherited?.requiredExtensions ?? resolveRequiredChildExtensions(input.parentSessionId);
-	const toolPlan = resolvePiLaunchToolPlan({
-		tools: input.tools,
-		excludeTools: input.excludeTools,
-		allowNestedSubagents: input.allowNestedSubagents,
-		extensions: input.extensions,
-		subagentOnlyExtensions: input.subagentOnlyExtensions,
-		requiredExtensions,
-		mcpDirectTools: input.mcpDirectTools,
-		cwd: input.cwd,
-		requireReadTool: input.requireReadTool,
-		structuredOutput: Boolean(input.structuredOutput),
-		fast: input.fast,
-		model: input.model,
-		capabilityCeiling: input.capabilityCeiling,
-		inheritedCapabilityCeiling: inheritedCapabilityCeiling(input.inherited),
-		agentName: input.childAgentName,
-		permissionRules: input.permissionRules,
-		runtimeSnapshotHost: input.runtimeSnapshotHost,
-		hostAvailableBuiltins: input.hostAvailableBuiltins,
-	});
-
-	const inherited = input.inherited;
-	const fanout = toolPlan.fanoutAuthorized;
-	const inheritedRoute = inherited?.nestedRoute;
-	const parentRunId = input.runId ?? inherited?.nestedParent?.parentRunId ?? "";
-	const parentChildIndex = input.childIndex;
-	const parentDepth = inheritedRoute && inherited?.nestedParent ? inherited.nestedParent.depth + 1 : 1;
-	const parentPath: NestedPathEntry[] = [
-		...(inherited?.nestedParent?.path ?? []),
-		...(parentRunId ? [{ runId: parentRunId, stepIndex: parentChildIndex, agent: input.childAgentName }] : []),
-	];
-	const nestedRoute = fanout ? (input.nestedRoute ?? inheritedRoute) : undefined;
-	const childDepth = resolveChildDepth(input.maxSubagentDepth, inherited);
-	const permissions = input.permissionRules && Object.keys(input.permissionRules).length > 0
-		? { rules: input.permissionRules, ...(input.permissionAuditPath ? { auditPath: input.permissionAuditPath } : {}) }
-		: undefined;
-	let supervisorDir: string | undefined;
-	if (input.orchestratorIntercomTarget && input.parentSessionId && input.runId) {
-		supervisorDir = supervisorChannelDir(input.runId, input.childAgentName, input.childIndex);
-		fs.mkdirSync(path.join(supervisorDir, "requests"), { recursive: true });
-		fs.mkdirSync(path.join(supervisorDir, "replies"), { recursive: true });
-	}
-	const thinkingCeiling = intersectThinkingCeilings(input.thinkingCeiling, inherited?.thinkingCeiling);
-
-	let structuredValue: unknown;
-	let structuredAcceptanceReport: unknown;
-	let structuredCalled = false;
-	let structuredAcceptanceProvided = false;
-
-	const config: ChildRuntimeConfig = {
-		...(input.runId ? { runId: input.runId } : {}),
-		agent: input.childAgentName,
-		childIndex: input.childIndex,
-		fanoutChild: fanout,
-		...(input.sessionName?.trim() ? { sessionName: input.sessionName.trim() } : {}),
-		...(input.intercomSessionName ? { intercomSessionName: input.intercomSessionName } : {}),
-		...(input.orchestratorIntercomTarget ? { orchestratorTarget: input.orchestratorIntercomTarget } : {}),
-		...(input.parentSessionId ? { orchestratorSessionId: input.parentSessionId, parentSessionId: input.parentSessionId } : {}),
-		...(supervisorDir ? { supervisorChannelDir: supervisorDir } : {}),
-		...(nestedRoute ? { nestedRoute } : {}),
-		...(fanout && parentRunId ? { nestedParent: { parentRunId, parentChildIndex, depth: parentDepth, path: parentPath } } : {}),
-		...(fanout && (input.runFanoutBudget ?? inherited?.runFanoutBudget) ? { runFanoutBudget: input.runFanoutBudget ?? inherited?.runFanoutBudget } : {}),
-		depth: childDepth.depth,
-		maxDepth: childDepth.maxDepth,
-		...(toolPlan.capabilityCeiling ? { capabilityCeiling: toolPlan.capabilityCeiling } : {}),
-		...(thinkingCeiling ? { thinkingCeiling } : {}),
-		...(toolPlan.requiredExtensions.length > 0 ? { requiredExtensions: toolPlan.requiredExtensions } : {}),
-		inheritProjectContext: input.inheritProjectContext,
-		inheritGlobalContext: input.inheritGlobalContext,
-		inheritSkills: input.inheritSkills,
-		...(input.forkCacheKey?.trim() ? { forkCacheKey: input.forkCacheKey.trim() } : {}),
-		...(permissions ? { permissions } : {}),
-		...(input.toolBudget ? { toolBudget: input.toolBudget } : {}),
-		...(input.childWatchdog ? { childWatchdog: input.childWatchdog } : {}),
-		...(input.watchdogStatus ? { watchdogStatus: input.watchdogStatus } : {}),
-		waitTool: {
-			enabled: input.waitToolEnabled ?? true,
-			...(input.waitToolDefaultTimeoutMs !== undefined ? { defaultTimeoutMs: input.waitToolDefaultTimeoutMs } : {}),
-		},
-		...(input.structuredOutput
-			? {
-				structuredOutput: {
-					schema: input.structuredOutput.schema,
-					...(input.structuredOutput.acceptanceReportPath
-						? { acceptanceReport: input.structuredOutput.acceptanceReportRequired ? "required" as const : "optional" as const }
-						: {}),
-					capture: (value: unknown, acceptanceReport: unknown) => {
-						structuredCalled = true;
-						structuredValue = value;
-						structuredAcceptanceProvided = acceptanceReport !== undefined;
-						structuredAcceptanceReport = acceptanceReport;
-					},
-				},
-			}
-			: {}),
-		...(toolPlan.requiredChildTools.length > 0 ? { requiredTools: toolPlan.requiredChildTools } : {}),
-		...(toolPlan.effectiveMcpTools.length > 0 ? { mcpDirectTools: toolPlan.effectiveMcpTools } : {}),
-		fast: input.fast === true,
-	};
-	const capturedHooks = createCapturedChildHooks(config, input.host === "runner");
-
-	const extensionPaths = toolPlan.extensionArgs.filter((extensionPath) => !isSubagentRuntimeExtensionPath(extensionPath));
-	const ambientExtensions = input.host === "runner" && !toolPlan.disableAmbientExtensions;
-	const launchResolvedExtensions = projectLaunchResolvedChildExtensions({
-		runtimeExtensions: toolPlan.runtimeExtensions,
-		configuredExtensions: toolPlan.configuredExtensions,
-		extensionArgs: toolPlan.extensionArgs,
-		disableAmbientExtensions: !ambientExtensions,
-		requiredExtensions: toolPlan.requiredExtensions,
-	});
-	const taggedPrompt = input.systemPrompt !== undefined && input.systemPrompt !== null
-		? `<active_agent name="${escapeXmlAttr(input.childAgentName)}"/>\n\n${input.systemPrompt}`
-		: undefined;
-	const session: Omit<ChildSessionLaunch, "onExtensionError"> = {
-		cwd: input.cwd,
-		...(input.machine ? { machine: input.machine } : {}),
-		...(input.machine ? { remoteResources: { agent: input.childAgentName, ...(input.remoteSkillNames ? { skills: input.remoteSkillNames } : {}), ...(input.remoteReads !== undefined ? { reads: input.remoteReads } : {}), ...(toolPlan.explicitToolAllowlist ? { toolCeiling: [...toolPlan.effectiveToolAllowlist] } : toolPlan.capabilityCeiling?.allowedTools ? { toolCeiling: [...toolPlan.capabilityCeiling.allowedTools] } : {}) } } : {}),
-		storage: childStorage(input),
-		...(input.model ? { model: input.model } : {}),
-		...(toolPlan.explicitToolAllowlist ? { tools: toolPlan.effectiveToolAllowlist } : {}),
-		...(!toolPlan.explicitToolAllowlist && toolPlan.excludeTools.length > 0 ? { excludeTools: toolPlan.excludeTools } : {}),
-		extensionPaths,
-		requiredExtensions: toolPlan.requiredExtensions,
-		ambientExtensions,
-		hooks: capturedHooks.hooks,
-		...(input.host === "runner" ? { processEnv: childProcessEnv(input, toolPlan) } : {}),
-		runtime: config,
-		noSkills: !input.inheritSkills,
-		noContextFiles: !input.inheritProjectContext,
-		...(taggedPrompt !== undefined
-			? input.systemPromptMode === "replace" ? { systemPrompt: taggedPrompt } : { appendSystemPrompt: taggedPrompt }
-			: {}),
-	};
-
-	return {
-		toolPlan,
-		config,
-		session,
-		capture: {
-			completionIntentContext: capturedHooks.completionIntentContext,
-			structuredOutput: () => ({ called: structuredCalled, value: structuredValue, acceptanceReport: structuredAcceptanceReport, acceptanceReportProvided: structuredAcceptanceProvided }),
-			toolDiagnostic: capturedHooks.toolDiagnostic,
-			runtimeAcknowledgedExtensions: capturedHooks.runtimeAcknowledgedExtensions,
-			finalDrainHeld: capturedHooks.finalDrainHeld,
-		},
-		launchResolvedExtensions,
-		warnings: toolPlan.warnings,
-		...(toolPlan.capabilityAudit ? { capabilityAudit: toolPlan.capabilityAudit } : {}),
-	};
-}

package/src/runs/shared/child-lifecycle.ts

@@ -1,28 +0,0 @@
-/**
- * Child lifecycle projection: when the observed child session events mean
- * the run is settling and the observer may start (or must cancel) its final
- * drain window.
- */
-export type ChildLifecycleAction = "start-drain" | "cancel-drain" | "none";
-
-export interface ChildLifecycleState {
-	compactionRetryActive: boolean;
-}
-
-export function projectChildLifecycle(event: { type?: string; willRetry?: unknown }, terminalAssistantStop = false, state?: ChildLifecycleState): ChildLifecycleAction {
-	if (event.type === "compaction_end") {
-		if (state) state.compactionRetryActive = event.willRetry === true;
-		return event.willRetry === true ? "cancel-drain" : "none";
-	}
-	if (event.type === "agent_start" || event.type === "auto_retry_start" || event.type === "turn_start") {
-		if (state) state.compactionRetryActive = false;
-		return "cancel-drain";
-	}
-	if (event.type === "agent_end") {
-		if (event.willRetry !== true && state) state.compactionRetryActive = false;
-		return "cancel-drain";
-	}
-	if (event.type === "agent_settled") return state?.compactionRetryActive ? "none" : "start-drain";
-	if (terminalAssistantStop) return "start-drain";
-	return "none";
-}

package/src/runs/shared/child-runtime-config.ts

@@ -1,133 +0,0 @@
-import type { JsonSchemaObject, ResolvedToolBudget, RunFanoutBudgetDescriptor, SubagentState } from "../../shared/types.ts";
-import type { ThinkingLevel } from "../../shared/model-info.ts";
-import type { NestedPathEntry } from "./nested-path.ts";
-import type { PermissionRules } from "./permissions.ts";
-import type { ChildWatchdogConfig, ChildWatchdogStatusEvent } from "../../watchdog/child-status.ts";
-import type { ResolvedWaitToolConfig } from "../background/wait-config.ts";
-import type { ChildToolDiagnostic } from "./tool-availability.ts";
-import type { ResolvedSubagentCapabilityCeiling } from "./capability-ceiling.ts";
-import type { RequiredChildExtensionSnapshot } from "../../shared/required-child-extensions.ts";
-
-/**
- * Set in processes that host child sessions (the async runner). The extension
- * entry point registers nothing when it sees it, so an ambient copy of
- * pi-subagents loaded into a child session stays inert.
- */
-export const SUBAGENT_CHILD_ENV = "PI_SUBAGENT_CHILD";
-/** Root parent session id the parent publishes for pi-permission-system ask forwarding. */
-export const SUBAGENT_PARENT_SESSION_ENV = "PI_SUBAGENT_PARENT_SESSION";
-
-export interface ChildNestedRoute {
-	rootRunId: string;
-	eventSink: string;
-	controlInbox: string;
-	capabilityToken: string;
-}
-
-export interface ChildNestedParent {
-	parentRunId: string;
-	parentChildIndex?: number;
-	depth: number;
-	path: NestedPathEntry[];
-}
-
-export interface ChildPermissions {
-	rules: PermissionRules;
-	auditPath?: string;
-}
-
-export interface ChildStructuredOutput {
-	schema: JsonSchemaObject;
-	acceptanceReport?: "optional" | "required";
-	/** Receives the validated value; `acceptanceReport` is undefined when the child omitted it. */
-	capture: (value: unknown, acceptanceReport: unknown | undefined) => void;
-}
-
-export interface ChildSupervisorMetadata {
-	channelDir: string;
-	runId: string;
-	agent: string;
-	childIndex: number;
-	orchestratorTarget?: string;
-	orchestratorSessionId: string;
-	childTarget?: string;
-}
-
-/**
- * Everything the child-side hooks need to know about the launch. The process
- * that hosts the child session builds it and passes it to the hooks directly.
- */
-export interface ChildRuntimeConfig {
-	runId?: string;
-	agent?: string;
-	childIndex?: number;
-	fanoutChild: boolean;
-	sessionName?: string;
-	intercomSessionName?: string;
-	orchestratorTarget?: string;
-	orchestratorSessionId?: string;
-	parentSessionId?: string;
-	supervisorChannelDir?: string;
-	/** Route the child reports nested runs on; set only for fanout-authorized children. */
-	nestedRoute?: ChildNestedRoute;
-	nestedParent?: ChildNestedParent;
-	runFanoutBudget?: RunFanoutBudgetDescriptor;
-	/** Nesting depth of this child (1 for a top-level parent's child). */
-	depth: number;
-	maxDepth?: number;
-	capabilityCeiling?: ResolvedSubagentCapabilityCeiling;
-	/** Immutable root-parent host policy propagated to nested native launches. */
-	requiredExtensions?: RequiredChildExtensionSnapshot;
-	thinkingCeiling?: ThinkingLevel;
-	inheritProjectContext?: boolean;
-	inheritGlobalContext?: boolean;
-	inheritSkills?: boolean;
-	forkCacheKey?: string;
-	permissions?: ChildPermissions;
-	toolBudget?: ResolvedToolBudget;
-	childWatchdog?: ChildWatchdogConfig;
-	/** Receives child watchdog status events. */
-	watchdogStatus?: (event: ChildWatchdogStatusEvent) => void;
-	waitTool: ResolvedWaitToolConfig;
-	runtimeState?: SubagentState;
-	holdFinalDrain?: (held: boolean) => void;
-	/** Installation-local downward owner-channel barrier; never inherited or serialized into descendants. */
-	hasPendingSupervisorRequest?: () => boolean;
-	structuredOutput?: ChildStructuredOutput;
-	requiredTools?: string[];
-	mcpDirectTools?: string[];
-	/** Receives the tool-availability diagnostic at every agent start; undefined when every required tool is present. */
-	toolDiagnostic?: (diagnostic: ChildToolDiagnostic | undefined) => void;
-	/** Receives the runtime-acknowledged extension ids when the child run ends. */
-	runtimeAcknowledgements?: (ids: string[]) => void;
-	fast: boolean;
-}
-
-export function childSupervisorMetadata(config: ChildRuntimeConfig): ChildSupervisorMetadata | undefined {
-	if (!config.supervisorChannelDir || !config.runId || !config.agent || !config.orchestratorSessionId || config.childIndex === undefined) return undefined;
-	return {
-		channelDir: config.supervisorChannelDir,
-		runId: config.runId,
-		agent: config.agent,
-		childIndex: config.childIndex,
-		...(config.orchestratorTarget ? { orchestratorTarget: config.orchestratorTarget } : {}),
-		orchestratorSessionId: config.orchestratorSessionId,
-		...(config.intercomSessionName ? { childTarget: config.intercomSessionName } : {}),
-	};
-}
-
-/** Compute the child tool-availability diagnostic; undefined when every required tool is present. */
-export function evaluateChildToolDiagnostic(config: Pick<ChildRuntimeConfig, "agent" | "requiredTools" | "mcpDirectTools">, availableTools: string[]): ChildToolDiagnostic | undefined {
-	if (!config.requiredTools) return undefined;
-	const available = new Set(availableTools);
-	const missing = config.requiredTools.filter((name) => !available.has(name));
-	if (missing.length === 0) return undefined;
-	const missingMcpDirectTools = config.mcpDirectTools?.length ? missing.filter((name) => config.mcpDirectTools!.includes(name)) : [];
-	return {
-		...(config.agent ? { agent: config.agent } : {}),
-		required: config.requiredTools,
-		available: availableTools,
-		missing,
-		...(missingMcpDirectTools.length > 0 ? { missingMcpDirectTools } : {}),
-	};
-}