@bacnh85/pi-subagent 0.10.1 → 0.12.2

package/extensions/model.ts

@@ -15,55 +15,55 @@ import type { Model } from "@earendil-works/pi-ai";
 import type { ModelRegistry } from "@earendil-works/pi-coding-agent";
 
 export interface ResolvedModel {
-	model: Model<any> | null;
-	attempted: string[];
-	/** The raw candidate name that matched, if a candidate resolved. Undefined for parent fallback. */
-	matchedCandidate?: string;
+  model: Model<any> | null;
+  attempted: string[];
+  /** The raw candidate name that matched, if a candidate resolved. Undefined for parent fallback. */
+  matchedCandidate?: string;
 }
 
 /** Known provider prefixes for unqualified model names. */
 const KNOWN_PROVIDERS: [string, RegExp][] = [
-	["openai", /^gpt-/i],
-	["anthropic", /^claude-/i],
-	["google", /^gemini-/i],
-	["cohere", /^command-/i],
-	["deepseek", /^(deepseek-|ds-)/i],
-	["mistral", /^mistral-/i],
-	["groq", /^(groq-|llama-)/i],
+  ["openai", /^gpt-/i],
+  ["anthropic", /^claude-/i],
+  ["google", /^gemini-/i],
+  ["cohere", /^command-/i],
+  ["deepseek", /^(deepseek-|ds-)/i],
+  ["mistral", /^mistral-/i],
+  ["groq", /^(groq-|llama-)/i],
 ];
 
 export async function resolveModel(
-	modelNames: readonly string[],
-	parentModel: Model<any> | undefined,
-	modelRegistry?: ModelRegistry,
+  modelNames: readonly string[],
+  parentModel: Model<any> | undefined,
+  modelRegistry?: ModelRegistry,
 ): Promise<ResolvedModel> {
-	const attempted: string[] = [];
-	const available = modelRegistry?.getAvailable() ?? [];
-	const byName = new Map(available.map((model) => [`${model.provider}/${model.id}`, model]));
-	const tryAvailable = (qualifiedName: string): Model<any> | undefined => {
-		if (!attempted.includes(qualifiedName)) attempted.push(qualifiedName);
-		return byName.get(qualifiedName);
-	};
+  const attempted: string[] = [];
+  const available = modelRegistry?.getAvailable() ?? [];
+  const byName = new Map(available.map((model) => [`${model.provider}/${model.id}`, model]));
+  const tryAvailable = (qualifiedName: string): Model<any> | undefined => {
+    if (!attempted.includes(qualifiedName)) attempted.push(qualifiedName);
+    return byName.get(qualifiedName);
+  };
 
-	for (const modelName of [...new Set(modelNames.map((name) => name.trim()).filter(Boolean))]) {
-		const idx = modelName.indexOf("/");
-		if (idx > 0) {
-			const found = tryAvailable(modelName);
-			if (found) return { model: found, attempted, matchedCandidate: modelName };
-			continue;
-		}
-		for (const [provider, pattern] of KNOWN_PROVIDERS) {
-			if (!pattern.test(modelName)) continue;
-			const found = tryAvailable(`${provider}/${modelName}`);
-			if (found) return { model: found, attempted, matchedCandidate: modelName };
-		}
-		const found = tryAvailable(`anthropic/${modelName}`);
-		if (found) return { model: found, attempted, matchedCandidate: modelName };
-	}
+  for (const modelName of [...new Set(modelNames.map((name) => name.trim()).filter(Boolean))]) {
+    const idx = modelName.indexOf("/");
+    if (idx > 0) {
+      const found = tryAvailable(modelName);
+      if (found) return { model: found, attempted, matchedCandidate: modelName };
+      continue;
+    }
+    for (const [provider, pattern] of KNOWN_PROVIDERS) {
+      if (!pattern.test(modelName)) continue;
+      const found = tryAvailable(`${provider}/${modelName}`);
+      if (found) return { model: found, attempted, matchedCandidate: modelName };
+    }
+    const found = tryAvailable(`anthropic/${modelName}`);
+    if (found) return { model: found, attempted, matchedCandidate: modelName };
+  }
 
-	if (parentModel) {
-		const found = tryAvailable(`${parentModel.provider}/${parentModel.id}`);
-		if (found) return { model: found, attempted };
-	}
-	return { model: null, attempted };
+  if (parentModel) {
+    const found = tryAvailable(`${parentModel.provider}/${parentModel.id}`);
+    if (found) return { model: found, attempted };
+  }
+  return { model: null, attempted };
 }

package/extensions/render.ts

@@ -17,17 +17,17 @@ import { type SubAgentResult, isFailedResult, getResultOutput } from "./runner.t
 // ---------------------------------------------------------------------------
 
 export function asString(value: unknown, fallback = "..."): string {
-	return typeof value === "string" ? value : fallback;
+  return typeof value === "string" ? value : fallback;
 }
 
 export function asNumber(value: unknown): number | undefined {
-	return typeof value === "number" && Number.isFinite(value) ? value : undefined;
+  return typeof value === "number" && Number.isFinite(value) ? value : undefined;
 }
 
 export function asRecord(value: unknown): Record<string, unknown> {
-	return value && typeof value === "object" && !Array.isArray(value)
-		? (value as Record<string, unknown>)
-		: {};
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : {};
 }
 
 // ---------------------------------------------------------------------------
@@ -35,123 +35,123 @@ export function asRecord(value: unknown): Record<string, unknown> {
 // ---------------------------------------------------------------------------
 
 function formatTokens(count: number): string {
-	if (count < 1000) return count.toString();
-	if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
-	if (count < 1000000) return `${Math.round(count / 1000)}k`;
-	return `${(count / 1000000).toFixed(1)}M`;
+  if (count < 1000) return count.toString();
+  if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
+  if (count < 1000000) return `${Math.round(count / 1000)}k`;
+  return `${(count / 1000000).toFixed(1)}M`;
 }
 
 export function formatUsageStats(
-	usage: { input: number; output: number; cacheRead: number; cacheWrite: number; cost: number; contextTokens?: number; turns?: number },
-	model?: string,
+  usage: { input: number; output: number; cacheRead: number; cacheWrite: number; cost: number; contextTokens?: number; turns?: number },
+  model?: string,
 ): string {
-	const parts: string[] = [];
-	if (usage.turns) parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
-	if (usage.input) parts.push(`↑${formatTokens(usage.input)}`);
-	if (usage.output) parts.push(`↓${formatTokens(usage.output)}`);
-	if (usage.cacheRead) parts.push(`R${formatTokens(usage.cacheRead)}`);
-	if (usage.cacheWrite) parts.push(`W${formatTokens(usage.cacheWrite)}`);
-	if (usage.cost) parts.push(`$${usage.cost.toFixed(4)}`);
-	if (usage.contextTokens && usage.contextTokens > 0) {
-		parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
-	}
-	if (model) parts.push(model);
-	return parts.join(" ");
+  const parts: string[] = [];
+  if (usage.turns) parts.push(`${usage.turns} turn${usage.turns > 1 ? "s" : ""}`);
+  if (usage.input) parts.push(`↑${formatTokens(usage.input)}`);
+  if (usage.output) parts.push(`↓${formatTokens(usage.output)}`);
+  if (usage.cacheRead) parts.push(`R${formatTokens(usage.cacheRead)}`);
+  if (usage.cacheWrite) parts.push(`W${formatTokens(usage.cacheWrite)}`);
+  if (usage.cost) parts.push(`$${usage.cost.toFixed(4)}`);
+  if (usage.contextTokens && usage.contextTokens > 0) {
+    parts.push(`ctx:${formatTokens(usage.contextTokens)}`);
+  }
+  if (model) parts.push(model);
+  return parts.join(" ");
 }
 
 export function formatToolCall(
-	toolName: string,
-	args: Record<string, unknown>,
-	themeFg: (color: string, text: string) => string,
+  toolName: string,
+  args: Record<string, unknown>,
+  themeFg: (color: string, text: string) => string,
 ): string {
-	const shortenPath = (p: string) => {
-		const home = os.homedir();
-		return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
-	};
+  const shortenPath = (p: string) => {
+    const home = os.homedir();
+    return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
+  };
 
-	switch (toolName) {
-		case "bash": {
-			const command = asString(args.command);
-			const preview = command.length > 60 ? `${command.slice(0, 60)}...` : command;
-			return themeFg("muted", "$ ") + themeFg("toolOutput", preview);
-		}
-		case "read": {
-			const rawPath = asString(args.file_path ?? args.path);
-			const filePath = shortenPath(rawPath);
-			const offset = asNumber(args.offset);
-			const limit = asNumber(args.limit);
-			let text = themeFg("accent", filePath);
-			if (offset !== undefined || limit !== undefined) {
-				const startLine = offset ?? 1;
-				const endLine = limit !== undefined ? startLine + limit - 1 : "";
-				text += themeFg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
-			}
-			return themeFg("muted", "read ") + text;
-		}
-		case "write": {
-			const rawPath = asString(args.file_path ?? args.path);
-			const content = asString(args.content, "");
-			const lines = content.split("\n").length;
-			let text = themeFg("muted", "write ") + themeFg("accent", shortenPath(rawPath));
-			if (lines > 1) text += themeFg("dim", ` (${lines} lines)`);
-			return text;
-		}
-		case "edit": {
-			const rawPath = asString(args.file_path ?? args.path);
-			return themeFg("muted", "edit ") + themeFg("accent", shortenPath(rawPath));
-		}
-		case "ls": {
-			const rawPath = asString(args.path, ".");
-			return themeFg("muted", "ls ") + themeFg("accent", shortenPath(rawPath));
-		}
-		case "find": {
-			const pattern = asString(args.pattern, "*");
-			const rawPath = asString(args.path, ".");
-			return (
-				themeFg("muted", "find ") +
-				themeFg("accent", pattern) +
-				themeFg("dim", ` in ${shortenPath(rawPath)}`)
-			);
-		}
-		case "grep": {
-			const pattern = asString(args.pattern);
-			const rawPath = asString(args.path, ".");
-			return (
-				themeFg("muted", "grep ") +
-				themeFg("accent", `/${pattern}/`) +
-				themeFg("dim", ` in ${shortenPath(rawPath)}`)
-			);
-		}
-		default: {
-			const argsStr = JSON.stringify(args);
-			const preview = argsStr.length > 50 ? `${argsStr.slice(0, 50)}...` : argsStr;
-			return themeFg("accent", toolName) + themeFg("dim", ` ${preview}`);
-		}
-	}
+  switch (toolName) {
+    case "bash": {
+      const command = asString(args.command);
+      const preview = command.length > 60 ? `${command.slice(0, 60)}...` : command;
+      return themeFg("muted", "$ ") + themeFg("toolOutput", preview);
+    }
+    case "read": {
+      const rawPath = asString(args.file_path ?? args.path);
+      const filePath = shortenPath(rawPath);
+      const offset = asNumber(args.offset);
+      const limit = asNumber(args.limit);
+      let text = themeFg("accent", filePath);
+      if (offset !== undefined || limit !== undefined) {
+        const startLine = offset ?? 1;
+        const endLine = limit !== undefined ? startLine + limit - 1 : "";
+        text += themeFg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
+      }
+      return themeFg("muted", "read ") + text;
+    }
+    case "write": {
+      const rawPath = asString(args.file_path ?? args.path);
+      const content = asString(args.content, "");
+      const lines = content.split("\n").length;
+      let text = themeFg("muted", "write ") + themeFg("accent", shortenPath(rawPath));
+      if (lines > 1) text += themeFg("dim", ` (${lines} lines)`);
+      return text;
+    }
+    case "edit": {
+      const rawPath = asString(args.file_path ?? args.path);
+      return themeFg("muted", "edit ") + themeFg("accent", shortenPath(rawPath));
+    }
+    case "ls": {
+      const rawPath = asString(args.path, ".");
+      return themeFg("muted", "ls ") + themeFg("accent", shortenPath(rawPath));
+    }
+    case "find": {
+      const pattern = asString(args.pattern, "*");
+      const rawPath = asString(args.path, ".");
+      return (
+        themeFg("muted", "find ") +
+        themeFg("accent", pattern) +
+        themeFg("dim", ` in ${shortenPath(rawPath)}`)
+      );
+    }
+    case "grep": {
+      const pattern = asString(args.pattern);
+      const rawPath = asString(args.path, ".");
+      return (
+        themeFg("muted", "grep ") +
+        themeFg("accent", `/${pattern}/`) +
+        themeFg("dim", ` in ${shortenPath(rawPath)}`)
+      );
+    }
+    default: {
+      const argsStr = JSON.stringify(args);
+      const preview = argsStr.length > 50 ? `${argsStr.slice(0, 50)}...` : argsStr;
+      return themeFg("accent", toolName) + themeFg("dim", ` ${preview}`);
+    }
+  }
 }
 
 export type DisplayItem =
-	| { type: "text"; text: string }
-	| { type: "toolCall"; name: string; args: Record<string, unknown> };
+  | { type: "text"; text: string }
+  | { type: "toolCall"; name: string; args: Record<string, unknown> };
 
 export function getDisplayItems(messages: Message[]): DisplayItem[] {
-	const items: DisplayItem[] = [];
-	for (const msg of messages) {
-		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text" && part.text.trim()) {
-					items.push({ type: "text", text: part.text });
-				} else if (part.type === "toolCall") {
-					items.push({
-						type: "toolCall",
-						name: part.name,
-						args: asRecord(part.arguments),
-					});
-				}
-			}
-		}
-	}
-	return items;
+  const items: DisplayItem[] = [];
+  for (const msg of messages) {
+    if (msg.role === "assistant") {
+      for (const part of msg.content) {
+        if (part.type === "text" && part.text.trim()) {
+          items.push({ type: "text", text: part.text });
+        } else if (part.type === "toolCall") {
+          items.push({
+            type: "toolCall",
+            name: part.name,
+            args: asRecord(part.arguments),
+          });
+        }
+      }
+    }
+  }
+  return items;
 }
 
 // ---------------------------------------------------------------------------
@@ -161,23 +161,23 @@ export function getDisplayItems(messages: Message[]): DisplayItem[] {
 const COLLAPSED_ITEM_COUNT = 10;
 
 function renderDisplayItems(
-	items: DisplayItem[],
-	theme: { fg: (c: string, t: string) => string },
-	limit?: number,
+  items: DisplayItem[],
+  theme: { fg: (c: string, t: string) => string },
+  limit?: number,
 ): string {
-	const toShow = limit ? items.slice(-limit) : items;
-	const skipped = limit && items.length > limit ? items.length - limit : 0;
-	let text = "";
-	if (skipped > 0) text += theme.fg("muted", `... ${skipped} earlier items\n`);
-	for (const item of toShow) {
-		if (item.type === "text") {
-			const preview = item.text.split("\n").slice(0, 3).join("\n");
-			text += `${theme.fg("toolOutput", preview)}\n`;
-		} else {
-			text += `${theme.fg("muted", "→ ")}${formatToolCall(item.name, item.args, theme.fg.bind(theme))}\n`;
-		}
-	}
-	return text.trimEnd();
+  const toShow = limit ? items.slice(-limit) : items;
+  const skipped = limit && items.length > limit ? items.length - limit : 0;
+  let text = "";
+  if (skipped > 0) text += theme.fg("muted", `... ${skipped} earlier items\n`);
+  for (const item of toShow) {
+    if (item.type === "text") {
+      const preview = item.text.split("\n").slice(0, 3).join("\n");
+      text += `${theme.fg("toolOutput", preview)}\n`;
+    } else {
+      text += `${theme.fg("muted", "→ ")}${formatToolCall(item.name, item.args, theme.fg.bind(theme))}\n`;
+    }
+  }
+  return text.trimEnd();
 }
 
 // ---------------------------------------------------------------------------
@@ -185,80 +185,80 @@ function renderDisplayItems(
 // ---------------------------------------------------------------------------
 
 export function renderSingleResult(
-	result: SubAgentResult,
-	expanded: boolean,
-	theme: { fg: (c: any, t: string) => string; bold: (t: string) => string },
-	agentColor?: string,
+  result: SubAgentResult,
+  expanded: boolean,
+  theme: { fg: (c: any, t: string) => string; bold: (t: string) => string },
+  agentColor?: string,
 ): Container | Text {
-	const isError = isFailedResult(result);
-	const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
-	const displayItems = getDisplayItems(result.messages);
-	const finalOutput = getResultOutput(result);
+  const isError = isFailedResult(result);
+  const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
+  const displayItems = getDisplayItems(result.messages);
+  const finalOutput = getResultOutput(result);
 
-	if (expanded) {
-		const mdTheme = getMarkdownTheme();
-		const container = new Container();
-		let header = `${icon} ${theme.fg(agentColor ?? "toolTitle", theme.bold(result.agent))}`;
-		if (isError && result.stopReason) {
-			const reasonColor = result.stopReason === "timeout" ? "warning" : "error";
-			header += ` ${theme.fg(reasonColor, `[${result.stopReason}]`)}`;
-		}
-		container.addChild(new Text(header, 0, 0));
-		if (isError && result.errorMessage) {
-			const messageColor = result.stopReason === "timeout" ? "warning" : "error";
-			container.addChild(new Text(theme.fg(messageColor, `Error: ${result.errorMessage}`), 0, 0));
-		}
-		container.addChild(new Spacer(1));
-		container.addChild(new Text(theme.fg("muted", "─── Task ───"), 0, 0));
-		container.addChild(new Text(theme.fg("dim", result.task), 0, 0));
-		container.addChild(new Spacer(1));
-		container.addChild(new Text(theme.fg("muted", "─── Output ───"), 0, 0));
-		if (displayItems.length === 0 && !finalOutput) {
-			container.addChild(new Text(theme.fg("muted", "(no output)"), 0, 0));
-		} else {
-			for (const item of displayItems) {
-				if (item.type === "toolCall") {
-					container.addChild(
-						new Text(
-							theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
-							0, 0,
-						),
-					);
-				}
-			}
-			if (finalOutput) {
-				container.addChild(new Spacer(1));
-				container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-			}
-		}
-		const usageStr = formatUsageStats(result.usage, result.model);
-		if (usageStr) {
-			container.addChild(new Spacer(1));
-			container.addChild(new Text(theme.fg("dim", usageStr), 0, 0));
-		}
-		return container;
-	}
+  if (expanded) {
+    const mdTheme = getMarkdownTheme();
+    const container = new Container();
+    let header = `${icon} ${theme.fg(agentColor ?? "toolTitle", theme.bold(result.agent))}`;
+    if (isError && result.stopReason) {
+      const reasonColor = result.stopReason === "timeout" ? "warning" : "error";
+      header += ` ${theme.fg(reasonColor, `[${result.stopReason}]`)}`;
+    }
+    container.addChild(new Text(header, 0, 0));
+    if (isError && result.errorMessage) {
+      const messageColor = result.stopReason === "timeout" ? "warning" : "error";
+      container.addChild(new Text(theme.fg(messageColor, `Error: ${result.errorMessage}`), 0, 0));
+    }
+    container.addChild(new Spacer(1));
+    container.addChild(new Text(theme.fg("muted", "─── Task ───"), 0, 0));
+    container.addChild(new Text(theme.fg("dim", result.task), 0, 0));
+    container.addChild(new Spacer(1));
+    container.addChild(new Text(theme.fg("muted", "─── Output ───"), 0, 0));
+    if (displayItems.length === 0 && !finalOutput) {
+      container.addChild(new Text(theme.fg("muted", "(no output)"), 0, 0));
+    } else {
+      for (const item of displayItems) {
+        if (item.type === "toolCall") {
+          container.addChild(
+            new Text(
+              theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme)),
+              0, 0,
+            ),
+          );
+        }
+      }
+      if (finalOutput) {
+        container.addChild(new Spacer(1));
+        container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
+      }
+    }
+    const usageStr = formatUsageStats(result.usage, result.model);
+    if (usageStr) {
+      container.addChild(new Spacer(1));
+      container.addChild(new Text(theme.fg("dim", usageStr), 0, 0));
+    }
+    return container;
+  }
 
-	// Collapsed
-	let text = `${icon} ${theme.fg(agentColor ?? "toolTitle", theme.bold(result.agent))}`;
-	if (isError && result.stopReason) {
-		const reasonColor = result.stopReason === "timeout" ? "warning" : "error";
-		text += ` ${theme.fg(reasonColor, `[${result.stopReason}]`)}`;
-	}
-	if (isError && result.errorMessage) {
-		const messageColor = result.stopReason === "timeout" ? "warning" : "error";
-		text += `\n${theme.fg(messageColor, `Error: ${result.errorMessage}`)}`;
-	}
-	else if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
-	else {
-		text += `\n${renderDisplayItems(displayItems, theme, COLLAPSED_ITEM_COUNT)}`;
-		if (displayItems.length > COLLAPSED_ITEM_COUNT) {
-			text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-		}
-	}
-	const usageStr = formatUsageStats(result.usage, result.model);
-	if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
-	return new Text(text, 0, 0);
+  // Collapsed
+  let text = `${icon} ${theme.fg(agentColor ?? "toolTitle", theme.bold(result.agent))}`;
+  if (isError && result.stopReason) {
+    const reasonColor = result.stopReason === "timeout" ? "warning" : "error";
+    text += ` ${theme.fg(reasonColor, `[${result.stopReason}]`)}`;
+  }
+  if (isError && result.errorMessage) {
+    const messageColor = result.stopReason === "timeout" ? "warning" : "error";
+    text += `\n${theme.fg(messageColor, `Error: ${result.errorMessage}`)}`;
+  }
+  else if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
+  else {
+    text += `\n${renderDisplayItems(displayItems, theme, COLLAPSED_ITEM_COUNT)}`;
+    if (displayItems.length > COLLAPSED_ITEM_COUNT) {
+      text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+    }
+  }
+  const usageStr = formatUsageStats(result.usage, result.model);
+  if (usageStr) text += `\n${theme.fg("dim", usageStr)}`;
+  return new Text(text, 0, 0);
 }
 
 // ---------------------------------------------------------------------------
@@ -266,14 +266,14 @@ export function renderSingleResult(
 // ---------------------------------------------------------------------------
 
 export function aggregateUsage(results: SubAgentResult[]) {
-	const total = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
-	for (const r of results) {
-		total.input += r.usage.input;
-		total.output += r.usage.output;
-		total.cacheRead += r.usage.cacheRead;
-		total.cacheWrite += r.usage.cacheWrite;
-		total.cost += r.usage.cost;
-		total.turns += r.usage.turns;
-	}
-	return total;
+  const total = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
+  for (const r of results) {
+    total.input += r.usage.input;
+    total.output += r.usage.output;
+    total.cacheRead += r.usage.cacheRead;
+    total.cacheWrite += r.usage.cacheWrite;
+    total.cost += r.usage.cost;
+    total.turns += r.usage.turns;
+  }
+  return total;
 }