pi-subagents 0.69.0 → 0.70.0

package/src/agents/builtin-names.ts

@@ -1,16 +0,0 @@
-export const BUILTIN_AGENT_NAMES = [
-	"advisor",
-	"claude-code",
-	"claude-code-writer",
-	"codex-exec",
-	"codex-exec-writer",
-	"cursor-agent",
-	"cursor-agent-writer",
-	"delegate",
-	"evidence-auditor",
-	"oracle",
-	"researcher",
-	"reviewer",
-	"scout",
-	"worker",
-] as const;

package/src/agents/chain-serializer.ts

@@ -1,285 +0,0 @@
-import type { ChainConfig, ChainStepConfig } from "./agents.ts";
-import { buildRuntimeName, frontmatterNameForConfig, parsePackageName } from "./identity.ts";
-import { parseFrontmatter } from "./frontmatter.ts";
-import { ChainOutputValidationError, validateChainOutputBindings } from "../runs/shared/chain-outputs.ts";
-import { validateAcceptanceInput } from "../runs/shared/acceptance.ts";
-import { validateToolBudgetConfig } from "../runs/shared/tool-budget.ts";
-import type { ChainStep } from "../shared/settings.ts";
-import type { AgentSource } from "./agents.ts";
-
-function parseStepBody(agent: string, sectionBody: string): ChainStepConfig {
-	const lines = sectionBody.split("\n");
-	const blankIndex = lines.findIndex((line) => line.trim() === "");
-	const configLines = blankIndex === -1 ? lines : lines.slice(0, blankIndex);
-	const task = (blankIndex === -1 ? "" : lines.slice(blankIndex + 1).join("\n")).trim();
-
-	const step: ChainStepConfig = { agent, task };
-	for (const line of configLines) {
-		const match = line.match(/^([\w-]+):\s*(.*)$/);
-		if (!match) continue;
-		const [keyValue, rawValueValue] = match.slice(1);
-		if (keyValue === undefined || rawValueValue === undefined) continue;
-		const key = keyValue.trim().toLowerCase();
-		const rawValue = rawValueValue.trim();
-
-		if (key === "machine") {
-			if (rawValue) step.machine = rawValue;
-			continue;
-		}
-		if (key === "output") {
-			if (rawValue === "false") step.output = false;
-			else if (rawValue) step.output = rawValue;
-			continue;
-		}
-		if (key === "phase") {
-			if (rawValue) step.phase = rawValue;
-			continue;
-		}
-		if (key === "label") {
-			if (rawValue) step.label = rawValue;
-			continue;
-		}
-		if (key === "as") {
-			if (rawValue) step.as = rawValue;
-			continue;
-		}
-		if (key === "outputschema") {
-			if (rawValue.startsWith("{") || rawValue.startsWith("[")) {
-				throw new Error("Inline outputSchema values are not supported in .chain.md files; use a schema file path.");
-			}
-			if (rawValue) step.outputSchema = rawValue;
-			continue;
-		}
-		if (key === "outputmode") {
-			if (rawValue === "inline" || rawValue === "file-only") step.outputMode = rawValue;
-			continue;
-		}
-		if (key === "reads") {
-			if (rawValue === "false") {
-				step.reads = false;
-			} else {
-				const reads = rawValue
-					.split(",")
-					.map((v) => v.trim())
-					.filter(Boolean);
-				step.reads = reads.length > 0 ? reads : false;
-			}
-			continue;
-		}
-		if (key === "model") {
-			if (rawValue) step.model = rawValue;
-			continue;
-		}
-		if (key === "skills") {
-			if (rawValue === "false") {
-				step.skills = false;
-			} else {
-				const skills = rawValue
-					.split(",")
-					.map((v) => v.trim())
-					.filter(Boolean);
-				step.skills = skills.length > 0 ? skills : false;
-			}
-			continue;
-		}
-		if (key === "progress") {
-			if (rawValue === "true") step.progress = true;
-			else if (rawValue === "false") step.progress = false;
-			continue;
-		}
-		if (key === "toolbudget") {
-			let parsed: unknown;
-			try {
-				parsed = JSON.parse(rawValue);
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				throw new Error(`Invalid toolBudget in .chain.md step '${agent}': ${message}`);
-			}
-			const validation = validateToolBudgetConfig(parsed, `toolBudget for step '${agent}'`);
-			if (validation.error) throw new Error(validation.error);
-			const toolBudget = parsed as ChainStepConfig["toolBudget"];
-			if (toolBudget !== undefined) step.toolBudget = toolBudget;
-		}
-	}
-
-	return step;
-}
-
-export function parseChain(content: string, source: AgentSource, filePath: string): ChainConfig {
-	const { frontmatter, body } = parseFrontmatter(content);
-	if (!frontmatter.name || !frontmatter.description) {
-		throw new Error("Chain frontmatter must include name and description");
-	}
-
-	const matches = [...body.matchAll(/^##\s+(.+)[^\S\n]*$/gm)];
-	const steps: ChainStepConfig[] = [];
-
-	for (let i = 0; i < matches.length; i++) {
-		const match = matches[i]!;
-		const agent = match[1]!.trim();
-		const lineEndOffset = body[match.index! + match[0].length] === "\n" ? 1 : 0;
-		const sectionStart = match.index! + match[0].length + lineEndOffset;
-		const sectionEnd = i + 1 < matches.length ? matches[i + 1]!.index! : body.length;
-		const sectionBody = body.slice(sectionStart, sectionEnd).trimEnd();
-		steps.push(parseStepBody(agent, sectionBody));
-	}
-
-	const localName = frontmatter.name;
-	const parsedPackage = parsePackageName(frontmatter.package, `Chain '${localName}' package`);
-	if (parsedPackage.error) throw new Error(parsedPackage.error);
-	const packageName = parsedPackage.packageName;
-	const extraFields: Record<string, string> = {};
-	for (const [key, value] of Object.entries(frontmatter)) {
-		if (key === "name" || key === "package" || key === "description") continue;
-		extraFields[key] = value;
-	}
-
-	return {
-		name: buildRuntimeName(localName, packageName),
-		localName,
-		...(packageName !== undefined ? { packageName } : {}),
-		description: frontmatter.description,
-		source,
-		filePath,
-		steps,
-		...(Object.keys(extraFields).length > 0 ? { extraFields } : {}),
-	};
-}
-
-function validateJsonChainToolBudget(value: unknown, label: string): void {
-	const validation = validateToolBudgetConfig(value, label);
-	if (validation.error) throw new Error(validation.error);
-}
-
-export function parseJsonChain(content: string, source: AgentSource, filePath: string): ChainConfig {
-	let parsed: unknown;
-	try {
-		parsed = JSON.parse(content);
-	} catch (error) {
-		const message = error instanceof Error ? error.message : String(error);
-		throw new Error(`Invalid JSON chain '${filePath}': ${message}`);
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-		throw new Error(`JSON chain '${filePath}' must contain an object root.`);
-	}
-	const input = parsed as Record<string, unknown>;
-	if (typeof input.name !== "string" || !input.name.trim()) {
-		throw new Error(`JSON chain '${filePath}' must include string name.`);
-	}
-	if (typeof input.description !== "string" || !input.description.trim()) {
-		throw new Error(`JSON chain '${filePath}' must include string description.`);
-	}
-	if (!Array.isArray(input.chain)) {
-		throw new Error(`JSON chain '${filePath}' must include array chain.`);
-	}
-	for (let i = 0; i < input.chain.length; i++) {
-		const step = input.chain[i];
-		if (!step || typeof step !== "object" || Array.isArray(step)) {
-			throw new Error(`JSON chain '${filePath}' step ${i + 1} must be an object.`);
-		}
-		const stepRecord = step as Record<string, unknown>;
-		if (stepRecord.toolBudget !== undefined) validateJsonChainToolBudget(stepRecord.toolBudget, `step ${i + 1} toolBudget`);
-		const acceptanceErrors = validateAcceptanceInput(stepRecord.acceptance, `step ${i + 1} acceptance`);
-		if (acceptanceErrors.length > 0) {
-			throw new Error(`Invalid JSON chain '${filePath}': ${acceptanceErrors.join(" ")}`);
-		}
-		const parallel = stepRecord.parallel;
-		if (Array.isArray(parallel)) {
-			for (let taskIndex = 0; taskIndex < parallel.length; taskIndex++) {
-				const task = parallel[taskIndex];
-				if (!task || typeof task !== "object" || Array.isArray(task)) continue;
-				const taskRecord = task as Record<string, unknown>;
-				if (taskRecord.toolBudget !== undefined) validateJsonChainToolBudget(taskRecord.toolBudget, `step ${i + 1} parallel task ${taskIndex + 1} toolBudget`);
-				const taskErrors = validateAcceptanceInput(taskRecord.acceptance, `step ${i + 1} parallel task ${taskIndex + 1} acceptance`);
-				if (taskErrors.length > 0) {
-					throw new Error(`Invalid JSON chain '${filePath}': ${taskErrors.join(" ")}`);
-				}
-			}
-		} else if (parallel && typeof parallel === "object") {
-			const parallelRecord = parallel as Record<string, unknown>;
-			if (parallelRecord.toolBudget !== undefined) validateJsonChainToolBudget(parallelRecord.toolBudget, `step ${i + 1} dynamic template toolBudget`);
-			const templateErrors = validateAcceptanceInput(parallelRecord.acceptance, `step ${i + 1} dynamic template acceptance`);
-			if (templateErrors.length > 0) {
-				throw new Error(`Invalid JSON chain '${filePath}': ${templateErrors.join(" ")}`);
-			}
-		}
-	}
-	try {
-		validateChainOutputBindings(input.chain as ChainStep[], { maxItems: Number.MAX_SAFE_INTEGER });
-	} catch (error) {
-		if (error instanceof ChainOutputValidationError) throw new Error(`Invalid JSON chain '${filePath}': ${error.message}`);
-		throw error;
-	}
-	const parsedPackage = parsePackageName(typeof input.package === "string" ? input.package : undefined, `Chain '${input.name}' package`);
-	if (parsedPackage.error) throw new Error(parsedPackage.error);
-	const extraFields: Record<string, string> = {};
-	for (const [key, value] of Object.entries(input)) {
-		if (key === "name" || key === "package" || key === "description" || key === "chain") continue;
-		if (typeof value === "string") extraFields[key] = value;
-	}
-	return {
-		name: buildRuntimeName(input.name.trim(), parsedPackage.packageName),
-		localName: input.name.trim(),
-		...(parsedPackage.packageName !== undefined ? { packageName: parsedPackage.packageName } : {}),
-		description: input.description.trim(),
-		source,
-		filePath,
-		steps: input.chain as ChainStepConfig[],
-		...(Object.keys(extraFields).length > 0 ? { extraFields } : {}),
-	};
-}
-
-export function serializeJsonChain(config: ChainConfig): string {
-	const root: Record<string, unknown> = {
-		name: frontmatterNameForConfig(config),
-		description: config.description,
-		chain: config.steps,
-	};
-	if (config.packageName) root.package = config.packageName;
-	if (config.extraFields) {
-		for (const [key, value] of Object.entries(config.extraFields)) {
-			if (key !== "name" && key !== "description" && key !== "package" && key !== "chain") root[key] = value;
-		}
-	}
-	return `${JSON.stringify(root, null, 2)}\n`;
-}
-
-export function serializeChain(config: ChainConfig): string {
-	const lines: string[] = [];
-	lines.push("---");
-	lines.push(`name: ${frontmatterNameForConfig(config)}`);
-	if (config.packageName) lines.push(`package: ${config.packageName}`);
-	lines.push(`description: ${config.description}`);
-	if (config.extraFields) {
-		for (const [key, value] of Object.entries(config.extraFields)) {
-			lines.push(`${key}: ${value}`);
-		}
-	}
-	lines.push("---");
-	lines.push("");
-
-	for (let i = 0; i < config.steps.length; i++) {
-		const step = config.steps[i]!;
-		lines.push(`## ${step.agent}`);
-		if (step.machine) lines.push(`machine: ${step.machine}`);
-		if (step.output === false) lines.push("output: false");
-		else if (step.output) lines.push(`output: ${step.output}`);
-		if (step.phase) lines.push(`phase: ${step.phase}`);
-		if (step.label) lines.push(`label: ${step.label}`);
-		if (step.as) lines.push(`as: ${step.as}`);
-		if (step.outputSchema) lines.push(`outputSchema: ${step.outputSchema}`);
-		if (step.outputMode) lines.push(`outputMode: ${step.outputMode}`);
-		if (step.reads === false) lines.push("reads: false");
-		else if (Array.isArray(step.reads) && step.reads.length > 0) lines.push(`reads: ${step.reads.join(", ")}`);
-		if (step.model) lines.push(`model: ${step.model}`);
-		if (step.skills === false) lines.push("skills: false");
-		else if (Array.isArray(step.skills) && step.skills.length > 0) lines.push(`skills: ${step.skills.join(", ")}`);
-		if (step.progress !== undefined) lines.push(`progress: ${step.progress ? "true" : "false"}`);
-		if (step.toolBudget !== undefined) lines.push(`toolBudget: ${JSON.stringify(step.toolBudget)}`);
-		lines.push("");
-		lines.push(step.task ?? "");
-		if (i < config.steps.length - 1) lines.push("");
-	}
-
-	return `${lines.join("\n")}\n`;
-}

package/src/agents/frontmatter.ts

@@ -1,153 +0,0 @@
-/**
- * Escape regex special characters for use in a RegExp constructor.
- */
-function escapeRegex(s: string): string {
-	return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-/**
- * Fold a YAML folded block scalar while preserving more-indented lines and
- * every blank-line separator. Trailing whitespace is trimmed.
- */
-function foldBlock(block: string): string {
-	let folded = "";
-	let hasContent = false;
-	let previousIsMoreIndented = false;
-	let blankLines = 0;
-
-	for (const line of block.split("\n")) {
-		const current = line.trimEnd();
-		if (current.trim() === "") {
-			if (hasContent) blankLines++;
-			continue;
-		}
-
-		const currentIsMoreIndented = current.length > current.trimStart().length;
-		if (hasContent) {
-			if (blankLines > 0) {
-				folded += "\n".repeat(blankLines + (previousIsMoreIndented || currentIsMoreIndented ? 1 : 0));
-			} else {
-				folded += previousIsMoreIndented || currentIsMoreIndented ? "\n" : " ";
-			}
-		}
-		folded += current;
-		hasContent = true;
-		previousIsMoreIndented = currentIsMoreIndented;
-		blankLines = 0;
-	}
-
-	return folded.trim();
-}
-
-/**
- * Normalize a simple-scalar frontmatter list from comma-separated or block-list syntax.
- * Only the standard `- item` marker is removed; ordinary hyphenated values stay intact.
- */
-export function parseFrontmatterList(raw: string | undefined): string[] | undefined {
-	if (raw === undefined) return undefined;
-	return raw
-		.split("\n")
-		.flatMap((line) => {
-			const value = line.trim();
-			const listItem = value.match(/^-\s+(.+)$/);
-			return (listItem?.[1] ?? value).split(",");
-		})
-		.map((value) => value.trim())
-		.filter(Boolean);
-}
-
-/**
- * Parse YAML frontmatter from agent/chain files.
- * Handles both flat (key: value) and nested block (key: \n  sub: val) values.
- * Block values are stored as single strings with embedded newlines.
- * The indentation of the block content is preserved relative to the key.
- */
-export function parseFrontmatter(content: string): { frontmatter: Record<string, string>; body: string } {
-	const frontmatter: Record<string, string> = {};
-	const normalized = content.replace(/\r\n/g, "\n");
-
-	if (!normalized.startsWith("---")) {
-		return { frontmatter, body: normalized };
-	}
-
-	const endIndex = normalized.indexOf("\n---", 3);
-	if (endIndex === -1) {
-		return { frontmatter, body: normalized };
-	}
-
-	const frontmatterBlock = normalized.slice(4, endIndex);
-	const body = normalized.slice(endIndex + 4).trim();
-
-	const lines = frontmatterBlock.split("\n");
-	let currentKey: string | null = null;
-	let currentBlockLines: string[] | null = null;
-	let currentIndent: number | null = null;
-	let currentFolded = false;
-	let currentLiteral = false;
-
-	for (const line of lines) {
-		const indent = line.search(/\S|$/); // position of first non-whitespace char
-		const trimmed = line.trim();
-
-		if (currentKey !== null && currentBlockLines !== null && (indent > (currentIndent ?? 0) || ((currentFolded || currentLiteral) && trimmed === ""))) {
-			// This line is part of the current block value
-			currentBlockLines.push(line);
-			continue;
-		}
-
-		// Flush any pending block value
-		if (currentKey !== null && currentBlockLines !== null) {
-			// Strip the common leading whitespace from the block so the
-			// serializer can add its own indentation level.
-			const rawBlock = currentBlockLines.join("\n");
-			const leadingSpaces = rawBlock.match(/^[ \t]+(?=\S)/m);
-			const prefix = leadingSpaces?.[0] ?? "";
-			const stripped = prefix
-				? rawBlock.replace(new RegExp(`^${escapeRegex(prefix)}`, "gm"), "").replace(/^\n/, "")
-				: rawBlock;
-			frontmatter[currentKey] = currentFolded ? foldBlock(stripped) : stripped;
-			currentKey = null;
-			currentBlockLines = null;
-			currentIndent = null;
-			currentFolded = false;
-			currentLiteral = false;
-		}
-
-		const match = line.match(/^([\w-]+):\s*(.*)$/);
-		if (match) {
-			const [key, rawValueValue] = match.slice(1);
-			if (key === undefined || rawValueValue === undefined) continue;
-			const rawValue = rawValueValue.trim();
-			const isQuoted = (rawValue.startsWith('"') && rawValue.endsWith('"')) || (rawValue.startsWith("'") && rawValue.endsWith("'"));
-			const value = isQuoted ? rawValue.slice(1, -1) : rawValue;
-			const isFolded = !isQuoted && (rawValue === ">" || rawValue === ">-");
-			const isLiteral = !isQuoted && (rawValue === "|" || rawValue === "|-");
-
-			if (value === "" || isFolded || isLiteral) {
-				// Key with empty value or block scalar indicator — defer storing until we see indent
-				currentKey = key;
-				currentBlockLines = [];
-				currentIndent = indent;
-				currentFolded = isFolded;
-				currentLiteral = isLiteral;
-			} else {
-				// Simple key: value
-				frontmatter[key] = value;
-			}
-		}
-		// Lines that don't match a key pattern (e.g., comments, empty lines) are ignored
-	}
-
-	// Flush final block value
-	if (currentKey !== null && currentBlockLines !== null) {
-		const rawBlock = currentBlockLines.join("\n");
-		const leadingSpaces = rawBlock.match(/^[ \t]+(?=\S)/m);
-		const prefix = leadingSpaces?.[0] ?? "";
-		const stripped = prefix
-			? rawBlock.replace(new RegExp(`^${escapeRegex(prefix)}`, "gm"), "").replace(/^\n/, "")
-			: rawBlock;
-		frontmatter[currentKey] = currentFolded ? foldBlock(stripped) : stripped;
-	}
-
-	return { frontmatter, body };
-}

package/src/agents/identity.ts

@@ -1,30 +0,0 @@
-import type { AgentConfig, ChainConfig } from "./agents.ts";
-
-const IDENTIFIER_PATTERN = /^[a-z0-9][a-z0-9-]*(?:\.[a-z0-9][a-z0-9-]*)*$/;
-
-function normalizePackageName(value: string | undefined): string | undefined {
-	const trimmed = value?.trim();
-	if (!trimmed) return undefined;
-	return trimmed.toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9.-]/g, "").replace(/-+/g, "-").replace(/\.+/g, ".").replace(/(?:^[-.]+|[-.]+$)/g, "");
-}
-
-export function parsePackageName(value: unknown, label = "package"): { packageName?: string; error?: string } {
-	if (value === undefined || value === false || value === "") return {};
-	if (typeof value !== "string") return { error: `${label} must be a string or false when provided.` };
-	const packageName = normalizePackageName(value);
-	if (!packageName || !IDENTIFIER_PATTERN.test(packageName)) return { error: `${label} is invalid after sanitization.` };
-	return { packageName };
-}
-
-export function buildRuntimeName(localName: string, packageName?: string): string {
-	const trimmedPackage = packageName?.trim();
-	return trimmedPackage ? `${trimmedPackage}.${localName}` : localName;
-}
-
-export function frontmatterNameForConfig(config: Pick<AgentConfig | ChainConfig, "name" | "localName" | "packageName">): string {
-	if (config.localName) return config.localName;
-	if (config.packageName && config.name.startsWith(`${config.packageName}.`)) {
-		return config.name.slice(config.packageName.length + 1);
-	}
-	return config.name;
-}

package/src/agents/proactive-skills.ts

@@ -1,194 +0,0 @@
-import type { AgentConfig, ChainConfig, ChainStepConfig } from "./agents.ts";
-import type { ProactiveSkillSubagentsConfig } from "../shared/types.ts";
-
-const SUBAGENT_ORCHESTRATION_SKILL = "pi-subagents";
-const DEFAULT_MIN_REFERENCES = 2;
-const DEFAULT_MAX_RECOMMENDATIONS = 3;
-const DEFAULT_PREFERRED_AGENT = "reviewer";
-const FALLBACK_AGENT_ORDER = ["reviewer", "delegate"];
-const MAX_RECOMMENDATION_CAP = 5;
-
-export interface ResolvedProactiveSkillSubagentsConfig {
-	enabled: boolean;
-	minReferences: number;
-	maxRecommendations: number;
-	preferredAgent: string;
-}
-
-export interface ProactiveSkillSubagentRecommendation {
-	skill: string;
-	agent: string;
-	references: number;
-	sources: string[];
-	description?: string;
-	reason: string;
-}
-
-export interface AvailableSkill {
-	name: string;
-	description?: string;
-}
-
-function positiveInteger(value: unknown): number | undefined {
-	if (typeof value !== "number") return undefined;
-	if (!Number.isInteger(value) || !Number.isFinite(value) || value < 1) return undefined;
-	return value;
-}
-
-export function resolveProactiveSkillSubagentsConfig(
-	config?: ProactiveSkillSubagentsConfig | false,
-): ResolvedProactiveSkillSubagentsConfig {
-	if (config === false) {
-		return {
-			enabled: false,
-			minReferences: DEFAULT_MIN_REFERENCES,
-			maxRecommendations: DEFAULT_MAX_RECOMMENDATIONS,
-			preferredAgent: DEFAULT_PREFERRED_AGENT,
-		};
-	}
-
-	const maxRecommendations = positiveInteger(config?.maxRecommendations) ?? DEFAULT_MAX_RECOMMENDATIONS;
-	return {
-		enabled: config?.enabled ?? true,
-		minReferences: positiveInteger(config?.minReferences) ?? DEFAULT_MIN_REFERENCES,
-		maxRecommendations: Math.min(maxRecommendations, MAX_RECOMMENDATION_CAP),
-		preferredAgent: typeof config?.preferredAgent === "string" && config.preferredAgent.trim()
-			? config.preferredAgent.trim()
-			: DEFAULT_PREFERRED_AGENT,
-	};
-}
-
-function normalizeSkillNames(value: unknown): string[] {
-	if (value === false || value === true || value === undefined || value === null) return [];
-	if (Array.isArray(value)) {
-		return [...new Set(value.filter((entry): entry is string => typeof entry === "string").map((entry) => entry.trim()).filter(Boolean))];
-	}
-	if (typeof value === "string") {
-		return [...new Set(value.split(",").map((entry) => entry.trim()).filter(Boolean))];
-	}
-	return [];
-}
-
-function collectStepSkills(step: ChainStepConfig, out: Set<string>): void {
-	for (const skill of normalizeSkillNames(step.skills ?? (step as { skill?: unknown }).skill)) {
-		out.add(skill);
-	}
-
-	const parallel = step.parallel;
-	if (!parallel) return;
-	if (Array.isArray(parallel)) {
-		for (const child of parallel) {
-			if (child && typeof child === "object" && !Array.isArray(child)) {
-				collectStepSkills(child as ChainStepConfig, out);
-			}
-		}
-		return;
-	}
-	if (typeof parallel === "object") {
-		collectStepSkills(parallel as ChainStepConfig, out);
-	}
-}
-
-function chooseRecommendationAgent(agents: AgentConfig[], preferredAgent: string): string | undefined {
-	const enabled = agents.filter((agent) => !agent.disabled);
-	if (enabled.some((agent) => agent.name === preferredAgent)) return preferredAgent;
-	for (const name of FALLBACK_AGENT_ORDER) {
-		if (enabled.some((agent) => agent.name === name)) return name;
-	}
-	return enabled[0]?.name;
-}
-
-function addSource(counts: Map<string, Set<string>>, skill: string, source: string): void {
-	if (skill === SUBAGENT_ORCHESTRATION_SKILL) return;
-	const sources = counts.get(skill) ?? new Set<string>();
-	sources.add(source);
-	counts.set(skill, sources);
-}
-
-export function recommendProactiveSkillSubagents(input: {
-	agents: AgentConfig[];
-	chains?: ChainConfig[];
-	availableSkills?: AvailableSkill[];
-	config?: ProactiveSkillSubagentsConfig | false;
-}): ProactiveSkillSubagentRecommendation[] {
-	const config = resolveProactiveSkillSubagentsConfig(input.config);
-	if (!config.enabled) return [];
-
-	const agent = chooseRecommendationAgent(input.agents, config.preferredAgent);
-	if (!agent) return [];
-
-	const availableByName = input.availableSkills
-		? new Map(input.availableSkills.map((skill) => [skill.name, skill]))
-		: undefined;
-	const counts = new Map<string, Set<string>>();
-
-	for (const candidate of input.agents) {
-		if (candidate.disabled) continue;
-		for (const skill of candidate.skills ?? []) {
-			addSource(counts, skill, `agent:${candidate.name}`);
-		}
-	}
-
-	for (const chain of input.chains ?? []) {
-		const chainSkills = new Set<string>();
-		for (const step of chain.steps) {
-			collectStepSkills(step, chainSkills);
-		}
-		for (const skill of chainSkills) {
-			addSource(counts, skill, `chain:${chain.name}`);
-		}
-	}
-
-	return [...counts.entries()]
-		.filter(([skill, sources]) => sources.size >= config.minReferences && (!availableByName || availableByName.has(skill)))
-		.map(([skill, sources]) => {
-			const description = availableByName?.get(skill)?.description;
-			return {
-				skill,
-				agent,
-				references: sources.size,
-				sources: [...sources].sort((a, b) => a.localeCompare(b)),
-				...(description !== undefined ? { description } : {}),
-				reason: `referenced by ${sources.size} configured agents/chains`,
-			};
-		})
-		.sort((a, b) => b.references - a.references || a.skill.localeCompare(b.skill))
-		.slice(0, config.maxRecommendations);
-}
-
-export function formatProactiveSkillSubagentRecommendations(
-	recommendations: ProactiveSkillSubagentRecommendation[],
-): string[] {
-	if (recommendations.length === 0) return [];
-	return [
-		"Proactive skill subagent suggestions:",
-		...recommendations.map((recommendation) => {
-			const sampleSources = recommendation.sources.slice(0, 3).join(", ");
-			const extra = recommendation.sources.length > 3 ? `, +${recommendation.sources.length - 3} more` : "";
-			const description = recommendation.description ? ` - ${recommendation.description}` : "";
-			return `- ${recommendation.skill} via ${recommendation.agent} (${recommendation.reason}; ${sampleSources}${extra})${description}`;
-		}),
-		"Guardrails: use these for broad tasks where a skill-specialist pass is useful; keep fanout small, use fresh context unless private/session context is explicitly needed, and skip when the user asks for a direct answer.",
-	];
-}
-
-export function buildProactiveSkillSubagentRecommendationLines(input: {
-	agents: AgentConfig[];
-	chains?: ChainConfig[];
-	config?: ProactiveSkillSubagentsConfig | false;
-	discoverAvailableSkills: () => AvailableSkill[];
-}): string[] {
-	if (!resolveProactiveSkillSubagentsConfig(input.config).enabled) return [];
-	let availableSkills: AvailableSkill[];
-	try {
-		availableSkills = input.discoverAvailableSkills();
-	} catch {
-		availableSkills = [];
-	}
-	return formatProactiveSkillSubagentRecommendations(recommendProactiveSkillSubagents({
-		agents: input.agents,
-		...(input.chains !== undefined ? { chains: input.chains } : {}),
-		availableSkills,
-		...(input.config !== undefined ? { config: input.config } : {}),
-	}));
-}