pi-ui-extend 1.0.41 → 1.0.42

package/external/pi-tools-suite/src/async-subagents/core/config.ts

@@ -1,10 +1,8 @@
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
-import { applyEdits, modify, parse as parseJsonc } from "jsonc-parser";
-import { readAgentDefinitionsFromDir, readProjectAgentDefinitions, type AgentDefinition } from "./agents-dir.js";
-import { ensurePiToolsSuiteUserConfig, getPiToolsSuiteUserConfigPath } from "../../config.js";
+import { parse as parseJsonc } from "jsonc-parser";
+import { projectAgentsDir, readAgentDefinitionsFromDir, readProjectAgentDefinitions, type AgentDefinition } from "./agents-dir.js";
 import type { AgentTask, RetryConfig } from "./types.js";
 
 export interface ModelByParentEntry {
@@ -36,6 +34,16 @@ export interface SubagentTypeConfig {
 	 * Oracle alone keeps parent-aware selection ahead of presets.
 	 */
 	modelByParent?: Record<string, ModelByParentEntry>;
+	/**
+	 * Optional parent-model allow-list. When present, this role is exposed only
+	 * when the current parent model matches at least one pattern.
+	 */
+	forParentModels?: string[];
+	/**
+	 * Optional parent-model deny-list. A match hides the role even when
+	 * forParentModels also matches.
+	 */
+	notForParentModels?: string[];
 	thinking?: string;
 	tools?: string[];
 	/** Explicit skill files loaded after disabling normal skill discovery. */
@@ -125,13 +133,6 @@ export interface SubagentConfig {
 	timeoutMs?: number;
 }
 
-export interface CopySubagentConfigSampleResult {
-	copied: boolean;
-	targetPath: string;
-	samplePath: string;
-	existingFiles: string[];
-}
-
 export interface ResolvedAgentTaskConfig {
 	task: AgentTask;
 	extraArgs: string[];
@@ -192,82 +193,51 @@ export const DEFAULT_ROUTING_CONFIG: ResolvedSubagentRoutingConfig = {
 	fallbackModels: ["openai-codex/gpt-5.6-luna"],
 	maxTaskChars: 1200,
 	maxTokens: 512,
-	maxRetries: 3,
-	timeoutMs: 10_000,
+	maxRetries: 1,
+	timeoutMs: 12_000,
 	debug: false,
 };
 
 const BUILTIN_AGENTS_DIR = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "agents");
+const BUILTIN_PRESETS_FILE = path.join(BUILTIN_AGENTS_DIR, "presets.jsonc");
+const DEFAULT_BLIND_MODEL_PATTERNS = [
+	"zai/glm-4.5*", "glm-4.5*", "*/glm-4.5*",
+	"zai/glm-5-turbo*", "glm-5-turbo*", "*/glm-5-turbo*",
+	"zai/glm-5.3", "glm-5.3", "*/glm-5.3",
+];
 
 const BUILTIN_CONFIG: SubagentConfig = {
 	defaultType: "research",
 	maxConcurrent: DEFAULT_MAX_CONCURRENT,
+	maxResultBytes: 100_000,
 	routing: { ...DEFAULT_ROUTING_CONFIG },
+	vision: { blindModelPatterns: DEFAULT_BLIND_MODEL_PATTERNS },
+	presets: readPresetConfigFile(BUILTIN_PRESETS_FILE).presets,
 	types: normalizeAgentDefinitions(readAgentDefinitionsFromDir(BUILTIN_AGENTS_DIR)),
 };
 
 export function loadSubagentConfig(cwd: string, env: NodeJS.ProcessEnv = process.env): SubagentConfig {
 	const config = cloneConfig(BUILTIN_CONFIG);
-	if (!explicitSubagentConfigPath(cwd, env)) {
-		for (const file of piToolsSuiteConfigFiles(cwd, env)) {
-			mergeConfig(config, readPiToolsSuiteSubagentConfig(file));
-		}
-		// Project-local agent definitions (.pi/agents/*.md) win name collisions
-		// over user/project JSONC config; loaded fresh on every call so edits and
-		// /reload are respected without a restart.
-		mergeConfig(config, projectAgentTypes(cwd));
-	}
-	for (const file of configFiles(cwd, env)) {
-		mergeConfig(config, readConfigFile(file));
-	}
+	mergeConfig(config, projectPresetConfig(cwd));
+	// Project-local agent definitions (.pi/agents/*.md) are the only project
+	// source of role/profile configuration and are loaded fresh on every call.
+	mergeConfig(config, projectAgentTypes(cwd));
 	applyEnvModelOverrides(config, env);
 	applyEnvRoutingOverrides(config, env);
+	applyEnvRuntimeOverrides(config, env);
 	return config;
 }
 
-export function configFiles(cwd: string, env: NodeJS.ProcessEnv = process.env): string[] {
-	const explicit = explicitSubagentConfigPath(cwd, env);
-	if (explicit) {
-		if (!fs.existsSync(explicit)) throw new Error(`Subagent config not found: ${explicit}`);
-		return [explicit];
-	}
-
-	return existingSubagentConfigFiles(cwd, env);
-}
-
-function explicitSubagentConfigPath(cwd: string, env: NodeJS.ProcessEnv): string | undefined {
-	const explicit = trimString(env.ASYNC_SUBAGENTS_CONFIG || env.PI_SUBAGENTS_CONFIG);
-	return explicit ? path.resolve(cwd, expandHome(explicit)) : undefined;
-}
-
-export function getDefaultSubagentConfigPath(): string {
-	return getPiToolsSuiteUserConfigPath();
-}
-
-export function getSubagentConfigSamplePath(): string {
-	return path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..", "async-subagents.sample.jsonc");
-}
-
 export function getBuiltinSubagentDefinitionsDir(): string {
 	return BUILTIN_AGENTS_DIR;
 }
 
-export function getSubagentConfigInitTargetPath(cwd: string, env: NodeJS.ProcessEnv = process.env): string {
-	return explicitSubagentConfigPath(cwd, env) ?? getDefaultSubagentConfigPath();
+export function getBuiltinSubagentPresetsPath(): string {
+	return BUILTIN_PRESETS_FILE;
 }
 
-export function existingSubagentConfigFiles(cwd: string, env: NodeJS.ProcessEnv = process.env): string[] {
-	const explicit = explicitSubagentConfigPath(cwd, env);
-	if (explicit) return fs.existsSync(explicit) ? [explicit] : [];
-	return piToolsSuiteConfigFiles(cwd, env).filter(hasPiToolsSuiteSubagentConfig);
-}
-
-function piToolsSuiteConfigFiles(cwd: string, env: NodeJS.ProcessEnv): string[] {
-	return [
-		getPiToolsSuiteUserConfigPath(),
-		env.PI_CONFIG_DIR ? path.join(env.PI_CONFIG_DIR, "pi-tools-suite.jsonc") : undefined,
-		findProjectPiToolsSuiteConfig(cwd),
-	].filter((file): file is string => typeof file === "string" && fs.existsSync(file));
+export function getProjectSubagentPresetsPath(cwd: string): string {
+	return path.join(projectAgentsDir(cwd) ?? path.join(path.resolve(cwd), ".pi", "agents"), "presets.jsonc");
 }
 
 /** Normalize `.pi/agents/*.md` definitions through the shared type-profile path. */
@@ -278,6 +248,13 @@ function projectAgentTypes(cwd: string): Partial<SubagentConfig> {
 	return { types };
 }
 
+function projectPresetConfig(cwd: string): Partial<SubagentConfig> {
+	const dir = projectAgentsDir(cwd);
+	if (!dir) return {};
+	const file = path.join(dir, "presets.jsonc");
+	return fs.existsSync(file) ? readPresetConfigFile(file) : {};
+}
+
 function normalizeAgentDefinitions(definitions: Record<string, AgentDefinition>): Record<string, SubagentTypeConfig> {
 	const types: Record<string, SubagentTypeConfig> = {};
 	for (const [name, definition] of Object.entries(definitions)) {
@@ -286,42 +263,6 @@ function normalizeAgentDefinitions(definitions: Record<string, AgentDefinition>)
 	return types;
 }
 
-function findProjectPiToolsSuiteConfig(startDir: string): string | undefined {
-	let dir = path.resolve(startDir);
-	const root = path.parse(dir).root;
-	while (true) {
-		const candidate = path.join(dir, ".pi", "pi-tools-suite.jsonc");
-		if (fs.existsSync(candidate)) return candidate;
-		if (dir === root) return undefined;
-		const parent = path.dirname(dir);
-		if (parent === dir) return undefined;
-		dir = parent;
-	}
-}
-
-export function copySubagentConfigSample(cwd: string, env: NodeJS.ProcessEnv = process.env): CopySubagentConfigSampleResult {
-	const samplePath = getSubagentConfigSamplePath();
-	const existingFiles = existingSubagentConfigFiles(cwd, env);
-	if (existingFiles.length > 0) return { copied: false, targetPath: existingFiles[0], samplePath, existingFiles };
-
-	const explicit = explicitSubagentConfigPath(cwd, env);
-	const targetPath = getSubagentConfigInitTargetPath(cwd, env);
-	if (explicit) {
-		fs.mkdirSync(path.dirname(targetPath), { recursive: true });
-		try {
-			fs.copyFileSync(samplePath, targetPath, fs.constants.COPYFILE_EXCL);
-		} catch (error) {
-			if (isNodeError(error) && error.code === "EEXIST") {
-				return { copied: false, targetPath, samplePath, existingFiles: [targetPath] };
-			}
-			throw error;
-		}
-	} else {
-		writePiToolsSuiteSubagentConfig(targetPath, readConfigFile(samplePath));
-	}
-	return { copied: true, targetPath, samplePath, existingFiles: [] };
-}
-
 export function resolveAgentTaskConfig(
 	task: AgentTask,
 	config: SubagentConfig,
@@ -445,10 +386,11 @@ export function shouldForceCurrentSubagentModel(env: NodeJS.ProcessEnv = process
 }
 
 export function currentModelRef(model: unknown): string | undefined {
+	if (typeof model === "string") return trimString(model);
 	if (!isRecord(model)) return undefined;
-	const id = trimString(model.id);
+	const id = trimString(model.modelId) || trimString(model.id) || trimString(model.model) || trimString(model.name);
 	if (!id) return undefined;
-	const provider = trimString(model.provider);
+	const provider = trimString(model.provider) || trimString(model.providerId);
 	return provider && !id.includes("/") ? `${provider}/${id}` : id;
 }
 
@@ -457,93 +399,67 @@ export function isBlindModelRef(modelRef: string | undefined, config: SubagentCo
 	return matchesAnyModelPattern(modelRef, config.vision?.blindModelPatterns ?? []);
 }
 
-export function selectSubagentType(task: AgentTask, config: SubagentConfig): string | undefined {
-	const explicit = trimString(task.subagentType);
-	if (explicit) return explicit;
-	return defaultSubagentType(config);
+/** Whether one role is available to the current parent model. Deny wins. */
+export function isSubagentTypeAvailableForParent(
+	profile: SubagentTypeConfig,
+	parentModelRef: string | undefined,
+): boolean {
+	const included = profile.forParentModels;
+	if (included !== undefined) {
+		if (!parentModelRef || !matchesAnyModelPattern(parentModelRef, included)) return false;
+	}
+	const excluded = profile.notForParentModels;
+	if (parentModelRef && excluded !== undefined && matchesAnyModelPattern(parentModelRef, excluded)) return false;
+	return true;
 }
 
-function readConfigFile(file: string): Partial<SubagentConfig> {
-	const raw = fs.readFileSync(file, "utf-8");
-	const parsed = JSON.parse(stripJsonComments(raw)) as unknown;
-	if (!isRecord(parsed)) throw new Error(`Subagent config must be an object: ${file}`);
-	return normalizeConfig(parsed, file);
+/**
+ * Return the effective config visible to a particular parent model. Only the
+ * role catalog is filtered; presets, routing policy, retry defaults, etc. are
+ * preserved unchanged.
+ */
+export function filterSubagentConfigForParentModel(
+	config: SubagentConfig,
+	parentModelRef: string | undefined,
+): SubagentConfig {
+	const types = Object.fromEntries(
+		Object.entries(config.types).filter(([, profile]) => isSubagentTypeAvailableForParent(profile, parentModelRef)),
+	);
+	return Object.keys(types).length === Object.keys(config.types).length ? config : { ...config, types };
 }
 
-function readPiToolsSuiteSubagentConfig(file: string): Partial<SubagentConfig> {
-	const raw = fs.readFileSync(file, "utf-8");
-	const parsed = parseJsonc(raw) as unknown;
-	if (!isRecord(parsed)) return {};
-	const section = parsed.asyncSubagents ?? parsed["async-subagents"] ?? parsed.subagents;
-	return isRecord(section) ? normalizeConfig(section, file) : {};
+export function selectSubagentType(task: AgentTask, config: SubagentConfig): string | undefined {
+	const explicit = trimString(task.subagentType);
+	if (explicit) return explicit;
+	return defaultSubagentType(config);
 }
 
-function hasPiToolsSuiteSubagentConfig(file: string): boolean {
+function readPresetConfigFile(file: string): Partial<SubagentConfig> {
 	const raw = fs.readFileSync(file, "utf-8");
 	const parsed = parseJsonc(raw) as unknown;
-	if (!isRecord(parsed)) return false;
-	return isRecord(parsed.asyncSubagents ?? parsed["async-subagents"] ?? parsed.subagents);
-}
-
-function writePiToolsSuiteSubagentConfig(file: string, config: Partial<SubagentConfig>): void {
-	ensurePiToolsSuiteUserConfig();
-	const original = fs.existsSync(file) ? fs.readFileSync(file, "utf-8") : "{}\n";
-	const edits = modify(original, ["asyncSubagents"], config, {
-		formattingOptions: { insertSpaces: true, tabSize: 2, eol: "\n" },
-	});
-	const updated = applyEdits(original, edits);
-	fs.mkdirSync(path.dirname(file), { recursive: true });
-	fs.writeFileSync(file, updated.endsWith("\n") ? updated : `${updated}\n`, "utf-8");
-}
-
-function normalizeConfig(value: Record<string, unknown>, file: string): Partial<SubagentConfig> {
-	const output: Partial<SubagentConfig> = {};
-	if (typeof value.defaultType === "string") output.defaultType = value.defaultType.trim();
-	if (typeof value.routing === "boolean") output.routing = { enabled: value.routing };
-	else if (isRecord(value.routing)) output.routing = normalizeRoutingConfig(value.routing);
-	const vision = normalizeVisionConfig(value);
-	if (vision) output.vision = vision;
-	const maxConcurrent = finiteNumber(value.maxConcurrent);
-	if (maxConcurrent !== undefined) output.maxConcurrent = Math.max(0, Math.round(maxConcurrent));
-	const maxResultBytes = finiteNumber(value.maxResultBytes);
-	if (maxResultBytes !== undefined) output.maxResultBytes = Math.max(0, Math.round(maxResultBytes));
-	const timeoutMs = positiveMilliseconds(value.timeoutMs);
-	if (timeoutMs !== undefined) output.timeoutMs = timeoutMs;
-	if (isRecord(value.retry)) output.retry = normalizeRetryConfig(value.retry);
-	if (value.presets !== undefined) {
-		if (!isRecord(value.presets)) throw new Error(`Subagent config "presets" must be an object: ${file}`);
-		const presets: Record<string, SubagentPreset> = {};
-		for (const [name, rawPreset] of Object.entries(value.presets)) {
-			if (!isRecord(rawPreset)) throw new Error(`Subagent preset "${name}" must be an object: ${file}`);
-			presets[name] = {
-				description: trimString(rawPreset.description),
-				models: normalizeModels(rawPreset.models, `preset "${name}"`, file),
-				model: trimString(rawPreset.model),
-				fallbackModels: modelList(rawPreset.fallbackModels, rawPreset.fallbackModel),
-				thinking: trimString(rawPreset.thinking),
-				extraArgs: arrayOfStrings(rawPreset.extraArgs),
-				timeoutMs: positiveMilliseconds(rawPreset.timeoutMs),
-				types: normalizePresetTypeOverrides(rawPreset.types, file, name),
-			};
-		}
-		output.presets = presets;
-	}
-	if (value.types === undefined) return output;
-	if (!isRecord(value.types)) throw new Error(`Subagent config "types" must be an object: ${file}`);
-
-	const types: Record<string, SubagentTypeConfig> = {};
-	for (const [name, rawProfile] of Object.entries(value.types)) {
-		if (!isRecord(rawProfile)) throw new Error(`Subagent type "${name}" must be an object: ${file}`);
-		types[name] = normalizeSubagentTypeProfile(rawProfile, name, file);
+	if (!isRecord(parsed)) throw new Error(`Subagent presets file must contain an object: ${file}`);
+	return { presets: normalizePresetMap(parsed, file, "preset file") };
+}
+
+function normalizePresetMap(value: unknown, file: string, owner: string): Record<string, SubagentPreset> {
+	if (!isRecord(value)) throw new Error(`Subagent ${owner} must be an object: ${file}`);
+	const presets: Record<string, SubagentPreset> = {};
+	for (const [name, rawPreset] of Object.entries(value)) {
+		if (!isRecord(rawPreset)) throw new Error(`Subagent preset "${name}" must be an object: ${file}`);
+		const models = normalizeModels(rawPreset.models, `preset "${name}"`, file);
+		if (models === undefined) throw new Error(`Subagent preset "${name}" must define models: ${file}`);
+		presets[name] = {
+			description: trimString(rawPreset.description),
+			models,
+		};
 	}
-	output.types = types;
-	return output;
+	return presets;
 }
 
 /**
  * Normalize one raw sub-agent type profile (`SubagentTypeConfig` shape) from
- * any source (JSONC config files or project agent definitions). Shared so all
- * sources apply identical field validation and trimming.
+ * an agent Markdown definition. Bundled and project files share the same
+ * validation and trimming path.
  */
 export function normalizeSubagentTypeProfile(
 	rawProfile: Record<string, unknown>,
@@ -558,6 +474,8 @@ export function normalizeSubagentTypeProfile(
 		model: models === undefined ? trimString(rawProfile.model) : undefined,
 		fallbackModels: models === undefined ? modelList(rawProfile.fallbackModels, rawProfile.fallbackModel) : undefined,
 		modelByParent: models === undefined ? normalizeModelByParent(rawProfile.modelByParent, name, file) : undefined,
+		forParentModels: normalizeParentModelPatterns(rawProfile.forParentModels, "forParentModels", name, file),
+		notForParentModels: normalizeParentModelPatterns(rawProfile.notForParentModels, "notForParentModels", name, file),
 		thinking: trimString(rawProfile.thinking),
 		tools: arrayOfStrings(rawProfile.tools),
 		isolatedSkills: arrayOfStrings(rawProfile.isolatedSkills),
@@ -571,13 +489,6 @@ export function normalizeSubagentTypeProfile(
 }
 
 function mergeConfig(target: SubagentConfig, source: Partial<SubagentConfig>): void {
-	if (source.defaultType) target.defaultType = source.defaultType;
-	if (source.routing) target.routing = { ...(target.routing ?? {}), ...source.routing };
-	if (source.vision) target.vision = { ...(target.vision ?? {}), ...compactVisionConfig(source.vision) };
-	if (source.maxConcurrent !== undefined) target.maxConcurrent = source.maxConcurrent;
-	if (source.maxResultBytes !== undefined) target.maxResultBytes = source.maxResultBytes;
-	if (source.timeoutMs !== undefined) target.timeoutMs = source.timeoutMs;
-	if (source.retry) target.retry = { ...(target.retry ?? {}), ...source.retry };
 	for (const [name, profile] of Object.entries(source.types ?? {})) {
 		target.types[name] = mergeTypeProfile(target.types[name] ?? {}, profile);
 	}
@@ -585,17 +496,12 @@ function mergeConfig(target: SubagentConfig, source: Partial<SubagentConfig>): v
 		target.presets = target.presets ?? {};
 		const previous = target.presets[name] ?? {};
 		const merged = { ...previous, ...compactPreset(preset) };
-		// The explicit selector form in the later config wins in both directions.
-		if (preset.models !== undefined) {
-			delete merged.model;
-			delete merged.fallbackModels;
-			delete merged.types;
-			delete merged.thinking;
-			delete merged.extraArgs;
-			delete merged.timeoutMs;
-		} else if (preset.model || preset.fallbackModels !== undefined || preset.types) {
-			delete merged.models;
-		}
+		delete merged.model;
+		delete merged.fallbackModels;
+		delete merged.types;
+		delete merged.thinking;
+		delete merged.extraArgs;
+		delete merged.timeoutMs;
 		target.presets[name] = merged;
 	}
 }
@@ -618,36 +524,6 @@ function mergeTypeProfile(base: SubagentTypeConfig, source: SubagentTypeConfig):
 	return merged;
 }
 
-function normalizeRoutingConfig(value: Record<string, unknown>): SubagentRoutingConfig {
-	const routing: SubagentRoutingConfig = {};
-	if (typeof value.enabled === "boolean") routing.enabled = value.enabled;
-	if (typeof value.model === "string" && value.model.trim()) routing.model = value.model.trim();
-	const fallbackModels = modelList(value.fallbackModels, value.fallbackModel);
-	if (fallbackModels) routing.fallbackModels = fallbackModels;
-	if (typeof value.debug === "boolean") routing.debug = value.debug;
-	const maxTaskChars = finiteNumber(value.maxTaskChars);
-	if (maxTaskChars !== undefined) routing.maxTaskChars = Math.max(100, Math.round(maxTaskChars));
-	const maxTokens = finiteNumber(value.maxTokens);
-	if (maxTokens !== undefined) routing.maxTokens = Math.max(8, Math.round(maxTokens));
-	const maxRetries = finiteNumber(value.maxRetries);
-	if (maxRetries !== undefined) routing.maxRetries = Math.max(0, Math.round(maxRetries));
-	const timeoutMs = finiteNumber(value.timeoutMs);
-	if (timeoutMs !== undefined) routing.timeoutMs = Math.max(1000, Math.round(timeoutMs));
-	return routing;
-}
-
-function normalizeVisionConfig(value: Record<string, unknown>): SubagentVisionConfig | undefined {
-	const rawVision = value.vision;
-	const output: SubagentVisionConfig = {};
-	if (isRecord(rawVision)) {
-		const patterns = patternList(rawVision.blindModelPatterns, rawVision.blindModelPattern, rawVision.blindModels, rawVision.blindModelMasks, rawVision.blindModelMask);
-		if (patterns) output.blindModelPatterns = patterns;
-	}
-	const topLevelPatterns = patternList(value.blindModelPatterns, value.blindModelPattern, value.blindModels, value.blindModelMasks, value.blindModelMask);
-	if (topLevelPatterns) output.blindModelPatterns = topLevelPatterns;
-	return output.blindModelPatterns !== undefined ? output : undefined;
-}
-
 function matchesAnyModelPattern(modelRef: string, patterns: string[]): boolean {
 	return patterns.some((pattern) => modelPatternRegExp(pattern).test(modelRef));
 }
@@ -665,6 +541,8 @@ function compactProfile(profile: SubagentTypeConfig): SubagentTypeConfig {
 	if (profile.model) compact.model = profile.model;
 	if (profile.fallbackModels) compact.fallbackModels = profile.fallbackModels;
 	if (profile.modelByParent) compact.modelByParent = profile.modelByParent;
+	if (profile.forParentModels !== undefined) compact.forParentModels = profile.forParentModels;
+	if (profile.notForParentModels !== undefined) compact.notForParentModels = profile.notForParentModels;
 	if (profile.thinking) compact.thinking = profile.thinking;
 	if (profile.tools && profile.tools.length > 0) compact.tools = profile.tools;
 	if (profile.isolatedSkills && profile.isolatedSkills.length > 0) compact.isolatedSkills = profile.isolatedSkills;
@@ -690,34 +568,6 @@ function compactPreset(preset: SubagentPreset): SubagentPreset {
 	return compact;
 }
 
-function compactVisionConfig(vision: SubagentVisionConfig): SubagentVisionConfig {
-	const compact: SubagentVisionConfig = {};
-	if (vision.blindModelPatterns) compact.blindModelPatterns = vision.blindModelPatterns;
-	return compact;
-}
-
-function normalizePresetTypeOverrides(value: unknown, file: string, presetName: string): Record<string, SubagentPresetTypeOverride> | undefined {
-	if (value === undefined) return undefined;
-	if (!isRecord(value)) throw new Error(`Subagent preset "${presetName}" types must be an object: ${file}`);
-	const types: Record<string, SubagentPresetTypeOverride> = {};
-	for (const [name, rawOverride] of Object.entries(value)) {
-		if (!isRecord(rawOverride)) throw new Error(`Subagent preset "${presetName}" type override "${name}" must be an object: ${file}`);
-		const override: SubagentPresetTypeOverride = {};
-		const model = trimString(rawOverride.model);
-		const fallbackModels = modelList(rawOverride.fallbackModels, rawOverride.fallbackModel);
-		const thinking = trimString(rawOverride.thinking);
-		const extraArgs = arrayOfStrings(rawOverride.extraArgs);
-		const timeoutMs = positiveMilliseconds(rawOverride.timeoutMs);
-		if (model) override.model = model;
-		if (fallbackModels) override.fallbackModels = fallbackModels;
-		if (thinking) override.thinking = thinking;
-		if (extraArgs && extraArgs.length > 0) override.extraArgs = extraArgs;
-		if (timeoutMs !== undefined) override.timeoutMs = timeoutMs;
-		if (override.model || override.fallbackModels || override.thinking || override.extraArgs || override.timeoutMs !== undefined) types[name] = override;
-	}
-	return Object.keys(types).length > 0 ? types : undefined;
-}
-
 function normalizeModels(value: unknown, owner: string, file: string): string[] | undefined {
 	if (value === undefined) return undefined;
 	if (!Array.isArray(value) || value.some((ref) => typeof ref !== "string" || !/^[^\s/*]+\/[^\s*]+$/.test(ref.trim()))) {
@@ -726,6 +576,19 @@ function normalizeModels(value: unknown, owner: string, file: string): string[]
 	return [...new Set(value.map((ref: string) => ref.trim()))];
 }
 
+function normalizeParentModelPatterns(
+	value: unknown,
+	field: "forParentModels" | "notForParentModels",
+	typeName: string,
+	file: string,
+): string[] | undefined {
+	if (value === undefined) return undefined;
+	if (!Array.isArray(value) || value.some((pattern) => typeof pattern !== "string" || !pattern.trim())) {
+		throw new Error(`Subagent type "${typeName}" ${field} must be an array of non-empty model patterns: ${file}`);
+	}
+	return [...new Set(value.map((pattern: string) => pattern.trim()))];
+}
+
 function normalizeModelByParent(value: unknown, typeName: string, file: string): Record<string, ModelByParentEntry> | undefined {
 	if (value === undefined || value === null) return undefined;
 	if (!isRecord(value)) throw new Error(`Subagent type "${typeName}" modelByParent must be an object: ${file}`);
@@ -806,55 +669,23 @@ function applyEnvRoutingOverrides(config: SubagentConfig, env: NodeJS.ProcessEnv
 	config.routing = routing;
 }
 
-function typeEnvKey(typeName: string): string {
-	return typeName.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
+function applyEnvRuntimeOverrides(config: SubagentConfig, env: NodeJS.ProcessEnv): void {
+	const maxConcurrent = finiteEnvNumber(env.PI_SUBAGENTS_MAX_CONCURRENT || env.ASYNC_SUBAGENTS_MAX_CONCURRENT);
+	if (maxConcurrent !== undefined) config.maxConcurrent = Math.max(0, Math.round(maxConcurrent));
+	const maxResultBytes = finiteEnvNumber(env.PI_SUBAGENTS_MAX_RESULT_BYTES || env.ASYNC_SUBAGENTS_MAX_RESULT_BYTES);
+	if (maxResultBytes !== undefined) config.maxResultBytes = Math.max(0, Math.round(maxResultBytes));
+	const timeoutMs = finiteEnvNumber(env.PI_SUBAGENTS_TIMEOUT_MS || env.ASYNC_SUBAGENTS_TIMEOUT_MS);
+	if (timeoutMs !== undefined) config.timeoutMs = Math.max(1, Math.round(timeoutMs));
 }
 
-function stripJsonComments(input: string): string {
-	let output = "";
-	let inString = false;
-	let quote = "";
-	let escaped = false;
-	for (let i = 0; i < input.length; i++) {
-		const ch = input[i];
-		const next = input[i + 1];
-		if (inString) {
-			output += ch;
-			if (escaped) escaped = false;
-			else if (ch === "\\") escaped = true;
-			else if (ch === quote) inString = false;
-			continue;
-		}
-		if (ch === '"' || ch === "'") {
-			inString = true;
-			quote = ch;
-			output += ch;
-			continue;
-		}
-		if (ch === "/" && next === "/") {
-			while (i < input.length && input[i] !== "\n") i++;
-			output += "\n";
-			continue;
-		}
-		if (ch === "/" && next === "*") {
-			i += 2;
-			while (i < input.length && !(input[i] === "*" && input[i + 1] === "/")) i++;
-			i++;
-			continue;
-		}
-		output += ch;
-	}
-	return output.replace(/,\s*([}\]])/g, "$1");
+function typeEnvKey(typeName: string): string {
+	return typeName.replace(/[^a-zA-Z0-9]+/g, "_").replace(/^_+|_+$/g, "").toUpperCase();
 }
 
 function cloneConfig(config: SubagentConfig): SubagentConfig {
 	return JSON.parse(JSON.stringify(config)) as SubagentConfig;
 }
 
-function expandHome(value: string): string {
-	return value === "~" || value.startsWith("~/") ? path.join(os.homedir(), value.slice(2)) : value;
-}
-
 function trimString(value: unknown): string | undefined {
 	return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
 }
@@ -874,10 +705,6 @@ function finiteEnvNumber(value: unknown): number | undefined {
 	return Number.isFinite(parsed) ? parsed : undefined;
 }
 
-function isNodeError(error: unknown): error is NodeJS.ErrnoException {
-	return error instanceof Error && "code" in error;
-}
-
 function arrayOfStrings(value: unknown): string[] | undefined {
 	if (!Array.isArray(value)) return undefined;
 	const items = value.filter((item): item is string => typeof item === "string" && item.trim().length > 0).map((item) => item.trim());
@@ -899,23 +726,6 @@ function modelList(...values: unknown[]): string[] | undefined {
 	return models.length > 0 || values.some(Array.isArray) ? models : undefined;
 }
 
-function patternList(...values: unknown[]): string[] | undefined {
-	let sawArray = false;
-	const seen = new Set<string>();
-	const patterns: string[] = [];
-	for (const value of values) {
-		if (Array.isArray(value)) sawArray = true;
-		const items = Array.isArray(value) ? value : [value];
-		for (const item of items) {
-			const pattern = trimString(item);
-			if (!pattern || seen.has(pattern)) continue;
-			seen.add(pattern);
-			patterns.push(pattern);
-		}
-	}
-	return sawArray || patterns.length > 0 ? patterns : undefined;
-}
-
 function textBlock(value: unknown): string | undefined {
 	if (typeof value === "string") return trimString(value);
 	const lines = arrayOfStrings(value);

package/external/pi-tools-suite/src/async-subagents/core/routing.ts

@@ -4,6 +4,7 @@ import type { AgentTask } from "./types.js";
 import {
 	currentModelRef,
 	defaultSubagentType,
+	filterSubagentConfigForParentModel,
 	resolveSubagentRoutingConfig,
 	type ResolvedSubagentRoutingConfig,
 	type SubagentConfig,
@@ -45,7 +46,7 @@ export class SubagentRoutingError extends Error {
 const ROUTER_SYSTEM_PROMPT = [
 	"You route Pi async sub-agent tasks to the best configured subagentType.",
 	"Choose exactly one allowed type for each task. Use the allowed type descriptions as the source of truth.",
-	"Prefer a matching project specialist. Otherwise use research for reading/review and evidence, implement for code/docs/tests/UI changes, verify for running checks, browser-qa for real-browser testing. Oracle is a deliberate strong second opinion, not the default for difficult work.",
+	"Prefer a matching project specialist. Otherwise use research for reading/evidence or focused review questions, implement for code/docs/tests/UI changes, verify for running checks, browser-qa for real-browser testing, and frontier-review for an independent post-implementation code review when that type is allowed. Oracle is a deliberate strong second opinion, not routine code review or the default for difficult work.",
 	"Return only strict JSON with this shape: {\"routes\":[{\"id\":\"task-id\",\"subagentType\":\"type\"}]}",
 	"Do not include markdown, comments, explanations, or unknown types.",
 ].join("\n");
@@ -61,11 +62,23 @@ export async function routeSubagentTasks(
 	tasks = tasks.map((task) => hasText(task.subagentType) && task.subagentType !== task.subagentType.trim()
 		? { ...task, subagentType: task.subagentType.trim() }
 		: task);
+	const parentModel = currentModelRef(ctx.model);
+	const effectiveConfig = filterSubagentConfigForParentModel(config, parentModel);
 	const invalidTasks = tasks.filter((task) => hasText(task.subagentType)
 		&& !Object.prototype.hasOwnProperty.call(config.types, task.subagentType));
 	if (invalidTasks.length > 0) {
-		throw routingError(`Unknown subagentType: ${invalidTasks.map((task) => `${task.id}=${JSON.stringify(task.subagentType)}`).join(", ")}.`, invalidTasks, config);
+		throw routingError(`Unknown subagentType: ${invalidTasks.map((task) => `${task.id}=${JSON.stringify(task.subagentType)}`).join(", ")}.`, invalidTasks, effectiveConfig);
+	}
+	const unavailableTasks = tasks.filter((task) => hasText(task.subagentType)
+		&& !Object.prototype.hasOwnProperty.call(effectiveConfig.types, task.subagentType));
+	if (unavailableTasks.length > 0) {
+		throw routingError(
+			`subagentType unavailable for parent model ${parentModel ?? "(unknown)"}: ${unavailableTasks.map((task) => `${task.id}=${JSON.stringify(task.subagentType)}`).join(", ")}.`,
+			unavailableTasks,
+			effectiveConfig,
+		);
 	}
+	config = effectiveConfig;
 	const autoTasks = tasks.filter((task) => !hasText(task.subagentType));
 	if (autoTasks.length === 0) return { tasks, usedLlm: false, routes: {}, warnings: [] };
 

package/external/pi-tools-suite/src/async-subagents/core/spawn.ts

@@ -696,10 +696,14 @@ function compactRpcEventForProgress(event: RpcEventRecord): Record<string, unkno
 			toolName: typeof event.toolName === "string" ? event.toolName : undefined,
 		});
 	}
-	if (event.type === "message_end") {
+	if (event.type === "message_start" || event.type === "message_end") {
 		return stripUndefined({
 			type: event.type,
-			role: isRecord(event.message) && typeof event.message.role === "string" ? event.message.role : undefined,
+			role: typeof event.role === "string"
+				? event.role
+				: isRecord(event.message) && typeof event.message.role === "string"
+					? event.message.role
+					: undefined,
 			stopReason: isRecord(event.message) && typeof event.message.stopReason === "string" ? event.message.stopReason : undefined,
 		});
 	}