@yandy0725/pi-subagents 0.2.1 → 0.2.2

package/package.json

@@ -3,7 +3,7 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"description": "Focused, in-process sub-agent core for pi — autonomous agents plus a typed API and lifecycle events",
 	"license": "MIT",
 	"repository": {
@@ -35,10 +35,8 @@
 	"peerDependencies": {
 		"@earendil-works/pi-ai": ">=0.80.2",
 		"@earendil-works/pi-coding-agent": ">=0.80.2",
-		"@earendil-works/pi-tui": ">=0.80.2"
-	},
-	"dependencies": {
-		"@sinclair/typebox": "^0.34.49"
+		"@earendil-works/pi-tui": ">=0.80.2",
+		"@sinclair/typebox": "*"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^2.5.0",

package/src/lifecycle/subagent-manager.ts

@@ -134,7 +134,7 @@ export class SubagentManager {
 				this.observer?.onSubagentStarted(agent);
 			},
 			onSessionCreated: options.observer?.onSessionCreated
-				? (agent) => options.observer!.onSessionCreated!(agent)
+				? (agent) => options.observer?.onSessionCreated?.(agent)
 				: undefined,
 			onRunFinished: (agent) => {
 				if (options.isBackground) {

package/src/lifecycle/subagent-state.ts

@@ -122,7 +122,7 @@ export class SubagentState {
 
 	/** Record a tool starting. Called by record-observer on tool_execution_start. */
 	addActiveTool(toolName: string): void {
-		this._activeTools.set(toolName + "_" + ++this._toolKeySeq, toolName);
+		this._activeTools.set(`${toolName}_${++this._toolKeySeq}`, toolName);
 	}
 
 	/** Remove one active tool by name (first match). Called by record-observer on tool_execution_end. */

package/src/observation/notification.ts

@@ -53,7 +53,7 @@ export function formatTaskNotification(record: Subagent, resultMaxLen: number):
 
 	const resultPreview = record.result
 		? record.result.length > resultMaxLen
-			? record.result.slice(0, resultMaxLen) + "\n...(truncated, use get_subagent_result for full output)"
+			? `${record.result.slice(0, resultMaxLen)}\n...(truncated, use get_subagent_result for full output)`
 			: record.result
 		: "No output.";
 
@@ -92,7 +92,7 @@ export function buildNotificationDetails(record: Subagent, resultMaxLen: number)
 		modelName: record.modelName,
 		resultPreview: record.result
 			? record.result.length > resultMaxLen
-				? record.result.slice(0, resultMaxLen) + "…"
+				? `${record.result.slice(0, resultMaxLen)}…`
 				: record.result
 			: "No output.",
 	};

package/src/observation/renderer.ts

@@ -42,21 +42,21 @@ export function createNotificationRenderer() {
 		if (d.totalTokens > 0) parts.push(formatTokens(d.totalTokens));
 		if (d.durationMs > 0) parts.push(formatMs(d.durationMs));
 		if (parts.length) {
-			line += "\n  " + parts.map((p) => theme.fg("dim", p)).join(" " + theme.fg("dim", "·") + " ");
+			line += `\n  ${parts.map((p) => theme.fg("dim", p)).join(` ${theme.fg("dim", "·")} `)}`;
 		}
 
 		// Line 3: result preview (collapsed) or full (expanded)
 		if (expanded) {
 			const lines = d.resultPreview.split("\n").slice(0, 30);
-			for (const l of lines) line += "\n" + theme.fg("dim", `  ${l}`);
+			for (const l of lines) line += `\n${theme.fg("dim", `  ${l}`)}`;
 		} else {
 			const preview = d.resultPreview.split("\n")[0]?.slice(0, 80) ?? "";
-			line += "\n  " + theme.fg("dim", `⎿  ${preview}`);
+			line += `\n  ${theme.fg("dim", `⎿  ${preview}`)}`;
 		}
 
 		// Line 4: output file link (if present)
 		if (d.outputFile) {
-			line += "\n  " + theme.fg("muted", `transcript: ${d.outputFile}`);
+			line += `\n  ${theme.fg("muted", `transcript: ${d.outputFile}`)}`;
 		}
 
 		return new Text(line, 0, 0);

package/src/service/service-adapter.ts

@@ -46,7 +46,6 @@ export class SubagentsServiceAdapter implements SubagentsService {
 		}
 
 		let model: unknown;
-		let modelName: string | undefined;
 		if (options?.model) {
 			const registry = this.runtime.currentCtx.modelRegistry;
 			if (!registry) {
@@ -59,9 +58,9 @@ export class SubagentsServiceAdapter implements SubagentsService {
 			model = resolved;
 		}
 		// Always compute display model name, even when same as parent
-		modelName = resolveModelName(
-			(model as { id?: string; name?: string } | undefined) ??
-				(this.runtime.currentCtx.model as { id?: string; name?: string } | undefined),
+		const modelName = resolveModelName(
+			(model as { id?: string; name?: string; provider?: string } | undefined) ??
+				(this.runtime.currentCtx.model as { id?: string; name?: string; provider?: string } | undefined),
 		);
 
 		const description = options?.description ?? prompt.slice(0, 80);

package/src/session/conversation.ts

@@ -27,7 +27,7 @@ export function getAgentConversation(session: AgentSession): string {
 			if (toolNames.length > 0) parts.push(`[Tool Calls]:\n${toolNames.map((n) => `  Tool: ${n}`).join("\n")}`);
 		} else if (msg.role === "toolResult") {
 			const text = extractText(msg.content);
-			const truncated = text.length > 200 ? text.slice(0, 200) + "..." : text;
+			const truncated = text.length > 200 ? `${text.slice(0, 200)}...` : text;
 			parts.push(`[Tool Result (${msg.toolName})]: ${truncated}`);
 		}
 	}

package/src/session/prompts.ts

@@ -66,14 +66,14 @@ You are operating as a sub-agent invoked to handle a specific task.
 		// placed verbatim (no wrapper tag) so it forms an identical byte prefix
 		// with the parent session, maximising KV cache hits. The <active_agent>
 		// tag and env block vary per call and are placed after the cached prefix.
-		return identity + "\n\n" + bridge + "\n\n" + activeAgentTag + envBlock + customSection;
+		return `${identity}\n\n${bridge}\n\n${activeAgentTag}${envBlock}${customSection}`;
 	}
 
 	// "replace" mode — parent/genericBase prefix first for KV cache reuse, then
 	// the active_agent tag, env block, and the config's full system prompt.
 	// Unlike append mode, no <sub_agent_context> bridge or <agent_instructions>
 	// wrapper is injected — the custom prompt retains full control.
-	return identity + "\n\n" + activeAgentTag + envBlock + "\n\n" + config.systemPrompt;
+	return `${identity}\n\n${activeAgentTag}${envBlock}\n\n${config.systemPrompt}`;
 }
 
 /** Fallback base prompt when parent system prompt is unavailable (both modes). */

package/src/tools/agent-tool.ts

@@ -192,7 +192,7 @@ Guidelines:
 				const displayName = args.subagent_type ? getDisplayName(args.subagent_type as string, registry) : "Subagent";
 				const desc = (args.description as string | undefined) ?? "";
 				return new Text(
-					"▸ " + theme.fg("toolTitle", theme.bold(displayName)) + (desc ? "  " + theme.fg("muted", desc) : ""),
+					`▸ ${theme.fg("toolTitle", theme.bold(displayName))}${desc ? `  ${theme.fg("muted", desc)}` : ""}`,
 					0,
 					0,
 				);

package/src/tools/result-renderer.ts

@@ -33,8 +33,8 @@ export function renderAgentResult(
 export function renderRunning(details: AgentDetails, theme: Theme): string {
 	const frame = SPINNER[details.spinnerFrame ?? 0];
 	const s = renderStats(details, theme);
-	let line = theme.fg("accent", frame) + (s ? " " + s : "");
-	line += "\n" + theme.fg("dim", `  ⎿  ${details.activity ?? "thinking\u2026"}`);
+	let line = theme.fg("accent", frame) + (s ? ` ${s}` : "");
+	line += `\n${theme.fg("dim", `  ⎿  ${details.activity ?? "thinking\u2026"}`)}`;
 	return line;
 }
 
@@ -49,22 +49,22 @@ export function renderCompleted(details: AgentDetails, resultText: string, expan
 	const isSteered = details.status === "steered";
 	const icon = isSteered ? theme.fg("warning", "\u2713") : theme.fg("success", "\u2713");
 	const s = renderStats(details, theme);
-	let line = icon + (s ? " " + s : "");
-	line += " " + theme.fg("dim", "\u00B7") + " " + theme.fg("dim", duration);
+	let line = icon + (s ? ` ${s}` : "");
+	line += ` ${theme.fg("dim", "\u00B7")} ${theme.fg("dim", duration)}`;
 
 	if (expanded) {
 		if (resultText) {
 			const lines = resultText.split("\n").slice(0, 50);
 			for (const l of lines) {
-				line += "\n" + theme.fg("dim", `  ${l}`);
+				line += `\n${theme.fg("dim", `  ${l}`)}`;
 			}
 			if (resultText.split("\n").length > 50) {
-				line += "\n" + theme.fg("muted", "  ... (use get_subagent_result with verbose for full output)");
+				line += `\n${theme.fg("muted", "  ... (use get_subagent_result with verbose for full output)")}`;
 			}
 		}
 	} else {
 		const doneText = isSteered ? "Wrapped up (turn limit)" : "Done";
-		line += "\n" + theme.fg("dim", `  \u23BF  ${doneText}`);
+		line += `\n${theme.fg("dim", `  \u23BF  ${doneText}`)}`;
 	}
 	return line;
 }
@@ -72,20 +72,20 @@ export function renderCompleted(details: AgentDetails, resultText: string, expan
 /** Render stopped status: dim stop icon + stats + "Stopped". */
 export function renderStopped(details: AgentDetails, theme: Theme): string {
 	const s = renderStats(details, theme);
-	let line = theme.fg("dim", "\u25A0") + (s ? " " + s : "");
-	line += "\n" + theme.fg("dim", "  \u23BF  Stopped");
+	let line = theme.fg("dim", "\u25A0") + (s ? ` ${s}` : "");
+	line += `\n${theme.fg("dim", "  \u23BF  Stopped")}`;
 	return line;
 }
 
 /** Render error or aborted status: error icon + stats + status message. */
 export function renderFailed(details: AgentDetails, theme: Theme): string {
 	const s = renderStats(details, theme);
-	let line = theme.fg("error", "\u2717") + (s ? " " + s : "");
+	let line = theme.fg("error", "\u2717") + (s ? ` ${s}` : "");
 
 	if (details.status === "error") {
-		line += "\n" + theme.fg("error", `  \u23BF  Error: ${details.error ?? "unknown"}`);
+		line += `\n${theme.fg("error", `  \u23BF  Error: ${details.error ?? "unknown"}`)}`;
 	} else {
-		line += "\n" + theme.fg("warning", "  \u23BF  Aborted (max turns exceeded)");
+		line += `\n${theme.fg("warning", "  \u23BF  Aborted (max turns exceeded)")}`;
 	}
 	return line;
 }
@@ -105,5 +105,5 @@ export function renderStats(details: AgentDetails, theme: Theme): string {
 	}
 	if (details.toolUses > 0) parts.push(`${details.toolUses} tool use${details.toolUses === 1 ? "" : "s"}`);
 	if (details.tokens) parts.push(details.tokens);
-	return parts.map((p) => theme.fg("dim", p)).join(" " + theme.fg("dim", "\u00B7") + " ");
+	return parts.map((p) => theme.fg("dim", p)).join(` ${theme.fg("dim", "\u00B7")} `);
 }

package/src/tools/spawn-config.ts

@@ -16,16 +16,19 @@ import type { AgentInvocation, SubagentType, ThinkingLevel } from "../types";
 import { type AgentDetails, buildInvocationTags, getDisplayName, getPromptModeLabel } from "../ui/display";
 
 /** Derive a short display model name from a model object (or undefined). */
-export function resolveModelName(model: { id?: string; name?: string } | undefined): string | undefined {
+export function resolveModelName(
+	model: { id?: string; name?: string; provider?: string } | undefined,
+): string | undefined {
 	if (!model) return undefined;
-	const raw = model.name ?? model.id;
-	if (!raw) return undefined;
-	return raw.replace(/^Claude\s+/i, "").toLowerCase();
+	// Primary: provider/id complete format
+	if (model.provider && model.id) return `${model.provider}/${model.id}`;
+	// Fallback: raw name or id, no transformation
+	return model.name ?? model.id ?? undefined;
 }
 
 /** Model info extracted from the parent session context. */
 export interface ModelInfo {
-	parentModel: { id: string; name?: string } | undefined;
+	parentModel: { id: string; name?: string; provider?: string } | undefined;
 	modelRegistry: unknown;
 }
 

package/src/ui/agent-widget.ts

@@ -203,12 +203,12 @@ export class AgentWidget implements SubagentManagerObserver {
 	 */
 	private clearWidget(backgroundAgents: readonly AgentSummary[]): void {
 		if (this.widgetRegistered) {
-			this.uiCtx!.setWidget("agents", undefined);
+			this.uiCtx?.setWidget("agents", undefined);
 			this.widgetRegistered = false;
 			this.tui = undefined;
 		}
 		if (this.lastStatusText !== undefined) {
-			this.uiCtx!.setStatus("subagents", undefined);
+			this.uiCtx?.setStatus("subagents", undefined);
 			this.lastStatusText = undefined;
 		}
 		if (this.widgetInterval) {
@@ -234,7 +234,7 @@ export class AgentWidget implements SubagentManagerObserver {
 			newStatusText = `${statusParts.join(", ")} agent${total === 1 ? "" : "s"}`;
 		}
 		if (newStatusText !== this.lastStatusText) {
-			this.uiCtx!.setStatus("subagents", newStatusText);
+			this.uiCtx?.setStatus("subagents", newStatusText);
 			this.lastStatusText = newStatusText;
 		}
 	}

package/src/ui/display.ts

@@ -142,7 +142,7 @@ function truncateLine(text: string, len = 60): string {
 			.find((l) => l.trim())
 			?.trim() ?? "";
 	if (line.length <= len) return line;
-	return line.slice(0, len) + "…";
+	return `${line.slice(0, len)}…`;
 }
 
 /** Build a human-readable activity string from currently-running tools or response text. */
@@ -162,7 +162,7 @@ export function describeActivity(activeTools: ReadonlyMap<string, string>, respo
 				parts.push(action);
 			}
 		}
-		return parts.join(", ") + "…";
+		return `${parts.join(", ")}…`;
 	}
 
 	// No tools active — show truncated response text if available

package/src/ui/session-navigator.ts

@@ -270,7 +270,7 @@ export class TranscriptOverlay implements Component {
 
 		const pad = (s: string, len: number): string => s + " ".repeat(Math.max(0, len - visibleWidth(s)));
 		const row = (content: string): string =>
-			th.fg("border", "│") + " " + truncateToWidth(pad(content, innerW), innerW) + " " + th.fg("border", "│");
+			`${th.fg("border", "│")} ${truncateToWidth(pad(content, innerW), innerW)} ${th.fg("border", "│")}`;
 		const hrTop = th.fg("border", `╭${"─".repeat(width - 2)}╮`);
 		const hrBot = th.fg("border", `╰${"─".repeat(width - 2)}╯`);
 		const hrMid = row(th.fg("dim", "─".repeat(innerW)));

package/src/ui/widget-renderer.ts

@@ -159,14 +159,14 @@ function buildSections(
 ): WidgetSections {
 	const finishedLines: string[] = [];
 	for (const a of categories.finished) {
-		finishedLines.push(truncate(theme.fg("dim", "\u251C\u2500") + " " + renderFinishedLine(a, registry, theme)));
+		finishedLines.push(truncate(`${theme.fg("dim", "\u251C\u2500")} ${renderFinishedLine(a, registry, theme)}`));
 	}
 
 	const runningLines: [string, string][] = [];
 	for (const a of categories.running) {
 		const [header, act] = renderRunningLines(a, registry, spinnerFrame, theme);
 		runningLines.push([
-			truncate(theme.fg("dim", "\u251C\u2500") + ` ${header}`),
+			truncate(`${theme.fg("dim", "\u251C\u2500")} ${header}`),
 			truncate(theme.fg("dim", "\u2502  ") + act),
 		]);
 	}
@@ -252,7 +252,7 @@ function assembleOverflow(
 	const overflowText = overflowParts.join(", ");
 	lines.push(
 		truncate(
-			theme.fg("dim", "\u2514\u2500") + ` ${theme.fg("dim", `+${hiddenRunning + hiddenFinished} more (${overflowText})`)}`,
+			`${theme.fg("dim", "\u2514\u2500")} ${theme.fg("dim", `+${hiddenRunning + hiddenFinished} more (${overflowText})`)}`,
 		),
 	);
 	return lines;
@@ -291,7 +291,7 @@ export function renderWidgetLines(params: {
 	// Assemble with overflow cap (heading takes 1 line).
 	const maxBody = MAX_WIDGET_LINES - 1;
 	const totalBody = finishedLines.length + runningLines.length * 2 + (queuedLine ? 1 : 0);
-	const heading = truncate(theme.fg(headingColor, headingIcon) + " " + theme.fg(headingColor, "Agents"));
+	const heading = truncate(`${theme.fg(headingColor, headingIcon)} ${theme.fg(headingColor, "Agents")}`);
 
 	if (totalBody <= maxBody) {
 		return assembleWithinBudget(heading, { finishedLines, runningLines, queuedLine });