pi-ui-extend 1.0.41 → 1.0.45

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

@@ -3,15 +3,12 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { ignoreStaleExtensionContextError } from "../context-usage.js";
 import {
-	copySubagentConfigSample,
 	ensureSessionFileLink,
-	existingSubagentConfigFiles,
 	findSubagentSessionByFile,
 	getActiveSubagentPresetName,
-	getDefaultSubagentConfigPath,
+	getBuiltinSubagentPresetsPath,
+	getProjectSubagentPresetsPath,
 	getSessionSubagentPresetOverride,
-	getSubagentConfigInitTargetPath,
-	getSubagentConfigSamplePath,
 	getSubagentPresetSelectionPath,
 	getRunState,
 	listRunDirs,
@@ -49,11 +46,10 @@ type MessageSender = ExtensionAPI & {
 };
 
 const CLEAR_ACTIVE_PRESET_LABEL = "Use no active preset";
-const COPY_SAMPLE_CONFIG_LABEL = "Copy sample asyncSubagents config";
 
 export const ULTRAWORK_PROMPT = `Run ultrawork mode for the current objective.
 
-Use subagents when a lower-cost worker or isolation of noisy evidence helps, including one bounded sequential task. Pick subagentType from the effective catalog: research for reading/review, implement for code/docs/tests/UI changes, verify for running checks, browser-qa for real-browser testing, and oracle only for a deliberate strong independent opinion. Prefer an appropriate project-local specialist. Keep decisions and integration in the parent; do not create agents just to assign a discipline.
+Use subagents when a lower-cost worker or isolation of noisy evidence helps, including one bounded sequential task. Pick subagentType from the effective catalog: research for reading/review, implement for code/docs/tests/UI changes, verify for running checks, ui-qa for real UI testing across browsers, TUIs, and desktop GUIs, and oracle only for a deliberate strong independent opinion. Prefer an appropriate project-local specialist. Keep decisions and integration in the parent; do not create agents just to assign a discipline.
 
 Keep parent context lean: spawn for broad parallel work, read results only when needed, and finish unless genuinely blocked.`;
 
@@ -192,12 +188,10 @@ async function triggerOrchestrationPrompt(
 
 function registerPresetCommands(pi: ExtensionAPI): void {
 	pi.registerCommand("subagent-preset", {
-		description: "Select a sub-agent preset defined in asyncSubagents config, run session <name> for a process override, or init to copy the sample config",
+		description: "Select a sub-agent model-pool preset, or run session <name> for a process-only override",
 		getArgumentCompletions: (prefix: string) => {
-			const names = existingSubagentConfigFiles(process.cwd()).length > 0
-				? sortedPresetNames(loadSubagentConfig(process.cwd()).presets ?? {}, getActiveSubagentPresetName())
-				: [];
-			return [...names, ...names.map((name) => `session ${name}`), "list", "path", "config", "init", "clear", "session", "session-clear"]
+			const names = sortedPresetNames(loadSubagentConfig(process.cwd()).presets ?? {}, getActiveSubagentPresetName());
+			return [...names, ...names.map((name) => `session ${name}`), "list", "path", "clear", "session", "session-clear"]
 				.filter((name) => name.startsWith(prefix))
 				.map((name) => ({ value: name, label: name }));
 		},
@@ -209,28 +203,19 @@ function registerPresetCommands(pi: ExtensionAPI): void {
 			if (name === "session-clear") return clearSessionActiveSubagentPreset(ctx);
 			if (name === "list") return listSubagentPresets(ctx);
 			if (name === "path") return showSubagentPresetPaths(ctx);
-			if (name === "config") return showSubagentPresetConfigurator(ctx);
-			if (name === "init") return initSubagentConfigSample(ctx);
 			if (name === "clear") return clearActiveSubagentPreset(ctx);
-			if (existingSubagentConfigFiles(ctx.cwd).length === 0) return ctx.ui.notify(missingSubagentConfigMessage(ctx), "warning");
 
 			const config = loadSubagentConfig(ctx.cwd);
 			const preset = config.presets?.[name];
-			if (!preset) return ctx.ui.notify(`Unknown sub-agent preset "${name}". Define it in asyncSubagents config or run /subagent-preset list.`, "error");
+			if (!preset) return ctx.ui.notify(`Unknown sub-agent preset "${name}". Run /subagent-preset list to see available pools.`, "error");
 			setActiveSubagentPreset(name);
 			notifyActiveSubagentPreset(ctx, name, preset);
 		},
 	});
-
-	pi.registerCommand("subagent-preset-config", {
-		description: "Select sub-agent presets defined in asyncSubagents config",
-		handler: async (_args: string, ctx: CommandContext) => showSubagentPresetConfigurator(ctx),
-	});
 }
 
 async function showSubagentPresetSelector(ctx: CommandContext): Promise<void> {
 	if (!ctx.hasUI) return ctx.ui.notify("Sub-agent preset selector requires interactive UI. Use /subagent-preset <name>.", "warning");
-	if (existingSubagentConfigFiles(ctx.cwd).length === 0) return showMissingSubagentConfigSelector(ctx);
 
 	const config = loadSubagentConfig(ctx.cwd);
 	const activePreset = getActiveSubagentPresetName();
@@ -240,12 +225,12 @@ async function showSubagentPresetSelector(ctx: CommandContext): Promise<void> {
 	const labels = [...presetLabels];
 	if (activePreset) labels.push(CLEAR_ACTIVE_PRESET_LABEL);
 	if (labels.length === 0) {
-		ctx.ui.notify("No sub-agent presets are defined in asyncSubagents config.", "warning");
+		ctx.ui.notify("No sub-agent model-pool presets are available.", "warning");
 		showSubagentPresetPaths(ctx);
 		return;
 	}
 	const labelToName = new Map(presetLabels.map((label, index) => [label, names[index]]));
-	const selected = await ctx.ui.select(names.length > 0 ? "Select active sub-agent preset" : "No sub-agent presets in asyncSubagents config", labels);
+	const selected = await ctx.ui.select("Select active sub-agent preset", labels);
 	if (!selected) return;
 	if (selected === CLEAR_ACTIVE_PRESET_LABEL) return clearActiveSubagentPreset(ctx);
 
@@ -254,69 +239,29 @@ async function showSubagentPresetSelector(ctx: CommandContext): Promise<void> {
 	setActiveSubagentPreset(name);
 	notifyActiveSubagentPreset(ctx, name, presets[name]);
 }
-
-async function showSubagentPresetConfigurator(ctx: CommandContext): Promise<void> {
-	if (!ctx.hasUI) return ctx.ui.notify("Sub-agent preset selector requires interactive UI.", "warning");
-	return showSubagentPresetSelector(ctx);
-}
-
-async function showMissingSubagentConfigSelector(ctx: CommandContext): Promise<void> {
-	const selected = await ctx.ui.select("No asyncSubagents config found", [COPY_SAMPLE_CONFIG_LABEL]);
-	if (selected === COPY_SAMPLE_CONFIG_LABEL) initSubagentConfigSample(ctx);
-}
-
 function listSubagentPresets(ctx: CommandContext): void {
-	if (existingSubagentConfigFiles(ctx.cwd).length === 0) {
-		ctx.ui.notify(missingSubagentConfigMessage(ctx), "warning");
-		return;
-	}
 	const config = loadSubagentConfig(ctx.cwd);
 	const activePreset = getActiveSubagentPresetName();
 	const presets = config.presets ?? {};
 	const names = sortedPresetNames(presets, activePreset);
-	if (names.length === 0) return ctx.ui.notify("No sub-agent presets are defined in asyncSubagents config.", "warning");
+	if (names.length === 0) return ctx.ui.notify("No sub-agent model-pool presets are available.", "warning");
 	ctx.ui.notify([
-		"Sub-agent presets from asyncSubagents config:",
+		"Sub-agent model-pool presets:",
 		...names.map((name) => `- ${subagentPresetLabel(name, presets[name], activePreset)}`),
 	].join("\n"), "info");
 }
 
 function showSubagentPresetPaths(ctx: CommandContext): void {
 	ctx.ui.notify([
-		"Preset definitions: asyncSubagents in ~/.config/pi/pi-tools-suite.jsonc, $PI_CONFIG_DIR/pi-tools-suite.jsonc, or project .pi/pi-tools-suite.jsonc",
-		"Explicit override files are still supported via ASYNC_SUBAGENTS_CONFIG / PI_SUBAGENTS_CONFIG.",
-		`Default config target: ${getDefaultSubagentConfigPath()}`,
-		`Sample config: ${getSubagentConfigSamplePath()}`,
-		`Copy sample target: ${getSubagentConfigInitTargetPath(ctx.cwd)}`,
+		`Bundled presets: ${getBuiltinSubagentPresetsPath()}`,
+		`Project preset override: ${getProjectSubagentPresetsPath(ctx.cwd)}`,
+		"Project presets are defined as model pools in .pi/agents/presets.jsonc; agent behavior stays in .pi/agents/*.md.",
 		`Active selection state: ${getSubagentPresetSelectionPath()}`,
 		`Session override: ${formatSessionPresetOverride()}`,
 		"Use /subagent-preset session <name> to override only the current Pi process; use /subagent-preset session-clear to clear that runtime override.",
-		"Run /subagent-preset init to copy the bundled sample only when no config exists.",
 	].join("\n"), "info");
 }
 
-function initSubagentConfigSample(ctx: CommandContext): void {
-	try {
-		const result = copySubagentConfigSample(ctx.cwd);
-		if (result.copied) {
-			ctx.ui.notify(`Copied sample asyncSubagents config:\n${result.samplePath}\n→ ${result.targetPath}`, "info");
-			return;
-		}
-		ctx.ui.notify(`AsyncSubagents config already exists; not overwriting:\n${result.existingFiles.join("\n") || result.targetPath}`, "warning");
-	} catch (error) {
-		ctx.ui.notify(error instanceof Error ? error.message : String(error), "error");
-	}
-}
-
-function missingSubagentConfigMessage(ctx: CommandContext): string {
-	return [
-		"No asyncSubagents config found in pi-tools-suite config.",
-		`Sample config: ${getSubagentConfigSamplePath()}`,
-		`Copy target: ${getSubagentConfigInitTargetPath(ctx.cwd)}`,
-		"Run /subagent-preset init to copy the bundled sample into the shared config.",
-	].join("\n");
-}
-
 function clearActiveSubagentPreset(ctx: CommandContext): void {
 	setActiveSubagentPreset(undefined);
 	const override = getSessionSubagentPresetOverride();
@@ -327,10 +272,9 @@ function clearActiveSubagentPreset(ctx: CommandContext): void {
 
 function setSessionActiveSubagentPreset(ctx: CommandContext, name: string): void {
 	if (!name) return ctx.ui.notify("Usage: /subagent-preset session <name>", "warning");
-	if (existingSubagentConfigFiles(ctx.cwd).length === 0) return ctx.ui.notify(missingSubagentConfigMessage(ctx), "warning");
 	const config = loadSubagentConfig(ctx.cwd);
 	const preset = config.presets?.[name];
-	if (!preset) return ctx.ui.notify(`Unknown sub-agent preset "${name}". Define it in asyncSubagents config or run /subagent-preset list.`, "error");
+	if (!preset) return ctx.ui.notify(`Unknown sub-agent preset "${name}". Run /subagent-preset list to see available pools.`, "error");
 	setSessionSubagentPresetOverride(name);
 	ctx.ui.notify(`Session-only sub-agent preset "${name}": ${subagentPresetDescription(preset)}\nApplies to future sub-agent spawns only until this Pi process exits or /subagent-preset session-clear is run. Saved preset selection is unchanged.`, "info");
 }

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

@@ -0,0 +1,33 @@
+import type { AgentActivity, RpcEventRecord } from "./types.js";
+import { isRecord, isoNow } from "./utils.js";
+
+export function activityFromRpcEvent(event: RpcEventRecord, at = isoNow()): AgentActivity | undefined {
+	if (event.type === "tool_execution_start") {
+		const toolName = nonEmptyString(event.toolName);
+		return toolName ? { label: toolName, at } : undefined;
+	}
+	if ((event.type === "message_start" || event.type === "message_end") && rpcMessageRole(event) === "assistant") {
+		return { label: "Thinking", at };
+	}
+	return undefined;
+}
+
+export function activityFromProgressRecord(value: unknown): AgentActivity | undefined {
+	if (!isRecord(value) || value.stage !== "rpc_event") return undefined;
+	const at = nonEmptyString(value.at);
+	if (!at) return undefined;
+	const toolName = nonEmptyString(value.toolName);
+	if (toolName) return { label: toolName, at };
+	if (value.type === "message_start" || value.type === "message_end") return { label: "Thinking", at };
+	return undefined;
+}
+
+function rpcMessageRole(event: RpcEventRecord): string | undefined {
+	const directRole = nonEmptyString(event.role);
+	if (directRole) return directRole;
+	return isRecord(event.message) ? nonEmptyString(event.message.role) : undefined;
+}
+
+function nonEmptyString(value: unknown): string | undefined {
+	return typeof value === "string" && value.trim() ? value.trim() : undefined;
+}

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

@@ -1,7 +1,7 @@
-import type { SubagentConfig } from "./config.js";
+import { filterSubagentConfigForParentModel, type SubagentConfig } from "./config.js";
 import { SUBAGENT_DELEGATION_GUIDANCE } from "./agent-strategy.js";
 
-export const SUBAGENT_TYPE_SELECTION_GUIDANCE = "Choose and set subagentType from the available catalog when a role clearly matches, preferring a matching project-local specialist. Preserve a user-requested role. Omit subagentType only when unsure or when the user explicitly requests automatic routing; the LLM router handles omissions only. Model/thinking overrides are not substitutes for choosing a role.";
+export const SUBAGENT_TYPE_SELECTION_GUIDANCE = "Choose and set subagentType from the available catalog when a role clearly matches, preferring a matching project-local specialist. Preserve a user-requested role when it is available in the current catalog. Omit subagentType only when unsure or when the user explicitly requests automatic routing; the LLM router handles omissions only. Model/thinking overrides are not substitutes for choosing a role.";
 
 const MAX_DESCRIPTION_CHARS = 500;
 
@@ -10,8 +10,9 @@ const MAX_DESCRIPTION_CHARS = 500;
  * The config has already merged built-ins, config files, and project-local
  * `.pi/agents/*.md`, so this stays aligned with what spawn/routing can use.
  */
-export function buildSubagentCatalogPrompt(config: SubagentConfig): string | undefined {
-	const entries = Object.entries(config.types).sort(([left], [right]) => left.localeCompare(right));
+export function buildSubagentCatalogPrompt(config: SubagentConfig, parentModelRef?: string): string | undefined {
+	const effectiveConfig = filterSubagentConfigForParentModel(config, parentModelRef);
+	const entries = Object.entries(effectiveConfig.types).sort(([left], [right]) => left.localeCompare(right));
 	if (entries.length === 0) return undefined;
 
 	return [

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

@@ -7,7 +7,7 @@ export interface AgentStrategyOptions {
 }
 
 /** Shared by the strategy, tool description and role catalog. */
-export const SUBAGENT_DELEGATION_GUIDANCE = "Delegate bounded work when a lower-cost worker can do it or noisy intermediate evidence should stay out of the parent context; one sequential task can qualify. Keep planning, decisions, integration and the final answer in the parent. Use research for evidence/review, implement for code/docs/tests/UI changes, verify for running checks, browser-qa for browser testing. Reserve oracle for a deliberate strong independent opinion, not automatic escalation. Do trivial lookups/edits directly; redirect a noisy command to a log instead of spawning an LLM when no interpretation is needed.";
+export const SUBAGENT_DELEGATION_GUIDANCE = "Delegate bounded work when a lower-cost worker can do it or noisy intermediate evidence should stay out of the parent context; one sequential task can qualify. Keep planning, decisions, integration and the final answer in the parent. Use research for evidence/focused review questions, implement for code/docs/tests/UI changes, verify for running checks, ui-qa for real user-interface testing across browsers, TUIs, and desktop GUIs. When frontier-review is present in the current role catalog and substantive code changed, use it as the independent post-implementation review gate before finalizing; it is intentionally hidden for parent models excluded by its profile. Reserve oracle for a deliberate strong second opinion, not routine code review. Do trivial lookups/edits directly; redirect a noisy command to a log instead of spawning an LLM when no interpretation is needed.";
 
 export function agentStrategyPrompt(options: AgentStrategyOptions = {}): string | undefined {
 	const env = options.env ?? process.env;

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

@@ -46,9 +46,10 @@ const KNOWN_FRONTMATTER_KEYS = new Set([
 	"model",
 	"fallbackModels",
 	"modelByParent",
+	"forParentModels",
+	"notForParentModels",
 	"thinking",
 	"tools",
-	"isolatedSkills",
 	"extraArgs",
 	"promptAppend",
 	"promptOverride",
@@ -62,7 +63,8 @@ const COMMA_SEPARATED_ARRAY_KEYS = new Set([
 	"tools",
 	"models",
 	"fallbackModels",
-	"isolatedSkills",
+	"forParentModels",
+	"notForParentModels",
 	"extraArgs",
 	"retryableExitCodes",
 ]);
@@ -72,7 +74,7 @@ const NUMERIC_PATTERN = /^[+-]?(\d+\.?\d*|\.\d+)([eE][+-]?\d+)?$/;
 
 /** Discover and parse `.pi/agents/*.md` for the project containing `cwd`. */
 export function readProjectAgentDefinitions(cwd: string): Record<string, ProjectAgentDefinition> {
-	const dir = findProjectAgentsDir(cwd);
+	const dir = projectAgentsDir(cwd);
 	return dir ? readAgentDefinitionsFromDir(dir) : {};
 }
 
@@ -94,7 +96,7 @@ export function readAgentDefinitionsFromDir(dir: string): Record<string, AgentDe
  * deterministic merge order.
  */
 export function projectAgentDefinitionFiles(cwd: string): string[] {
-	const dir = findProjectAgentsDir(cwd);
+	const dir = projectAgentsDir(cwd);
 	return dir ? agentDefinitionFiles(dir) : [];
 }
 
@@ -108,7 +110,8 @@ export function agentDefinitionFiles(dir: string): string[] {
 		.sort();
 }
 
-function findProjectAgentsDir(startDir: string): string | undefined {
+/** First project `.pi/agents` directory found walking up from cwd. */
+export function projectAgentsDir(startDir: string): string | undefined {
 	let dir = path.resolve(startDir);
 	const root = path.parse(dir).root;
 	while (true) {

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

@@ -1,9 +1,23 @@
 import { fileURLToPath } from "node:url";
 
-/** Non-secret, launcher-owned path supplied only to browser-qa children. */
+/** Canonical UI-QA role plus the pre-rename compatibility alias. */
+export const UI_QA_TYPE = "ui-qa";
+export const LEGACY_BROWSER_QA_TYPE = "browser-qa";
+
+export function isUiQaType(value: string | undefined): boolean {
+	return value === UI_QA_TYPE || value === LEGACY_BROWSER_QA_TYPE;
+}
+
+/** Non-secret, launcher-owned path supplied only to UI-QA children. */
 export const BROWSER_QA_RUNNER_ENV = "PI_BROWSER_QA_RUNNER";
+export const UI_QA_RUNNER_ENV = "PI_UI_QA_RUNNER";
 
 /** Resolve against the installed package, never the delegated project's cwd. */
 export function getBrowserQaRunnerPath(): string {
-	return fileURLToPath(new URL("../agents/browser-qa/scripts/browser-qa-runner.mjs", import.meta.url));
+	return fileURLToPath(new URL("../agents/ui-qa/browser/scripts/browser-qa-runner.mjs", import.meta.url));
+}
+
+/** Resolve the capability-first UI-QA runner against the installed package. */
+export function getUiQaRunnerPath(): string {
+	return fileURLToPath(new URL("../agents/ui-qa/scripts/ui-qa-runner.mjs", import.meta.url));
 }