@narumitw/pi-subagents 0.15.0 → 0.16.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-subagents",
-	"version": "0.15.0",
+	"version": "0.16.0",
 	"description": "Pi extension for delegating work to specialized isolated subagents.",
 	"type": "module",
 	"license": "MIT",

package/src/execution.ts

@@ -6,17 +6,19 @@ import {
 	type AgentScope,
 	type SubagentThinkingLevel,
 } from "./agents.js";
+import { DEFAULT_MAX_CONTEXT_BYTES, truncateUtf8 } from "./limits.js";
+import type { SubagentParams } from "./params.js";
 import {
 	buildFanInContext,
+	formatResultFailure,
 	getResultFinalOutput,
+	isResultError,
 	mapWithConcurrencyLimit,
-	runSingleAgent,
 	type OnUpdateCallback,
+	runSingleAgent,
 	type SingleResult,
 	type SubagentDetails,
 } from "./runner.js";
-import { DEFAULT_MAX_CONTEXT_BYTES, truncateUtf8 } from "./limits.js";
-import type { SubagentParams } from "./params.js";
 import { readSubagentSettings, resolveSubagentThinkingLevel } from "./settings.js";
 
 const MAX_PARALLEL_TASKS = 8;
@@ -225,10 +227,9 @@ export async function executeSubagent(
 						);
 						results.push(result);
 
-						const isError =
-							result.exitCode !== 0 || result.stopReason === "error" || result.stopReason === "aborted";
+						const isError = isResultError(result);
 						if (isError) {
-							const errorMsg = result.errorMessage || result.stderr || getResultFinalOutput(result) || "(no output)";
+							const errorMsg = formatResultFailure(result);
 							return {
 								content: [{ type: "text", text: `Chain stopped at step ${i + 1} (${step.agent}): ${errorMsg}` }],
 								details: { ...makeDetails("chain")(results), isError: true },
@@ -372,14 +373,16 @@ export async function executeSubagent(
 						);
 					}
 
-					const successCount = results.filter((r) => r.exitCode === 0).length;
-					const summaries = results.map((r) => {
-						const output = getResultFinalOutput(r);
-						const error = r.errorMessage || r.stderr.trim();
-						const summaryText = output || error;
-						const preview = summaryText.slice(0, 160) + (summaryText.length > 160 ? "..." : "");
-						return `[${r.agent}] ${r.exitCode === 0 ? "completed" : "failed"}: ${preview || "(no output)"}`;
+					const successCount = results.filter((result) => !isResultError(result)).length;
+					const summaries = results.map((result) => {
+						const failed = isResultError(result);
+						const output = getResultFinalOutput(result);
+						const error = result.errorMessage || result.stderr.trim();
+						const summaryText = failed ? formatResultFailure(result) : output || error;
+						const preview = truncateUtf8(summaryText, 160).text;
+						return `[${result.agent}] ${failed ? "failed" : "completed"}: ${preview || "(no output)"}`;
 					});
+					const aggregatorFailed = aggregatorResult ? isResultError(aggregatorResult) : false;
 					const aggregatorOutput = aggregatorResult ? getResultFinalOutput(aggregatorResult) : "";
 					const aggregatorError = aggregatorResult?.errorMessage || aggregatorResult?.stderr.trim() || "";
 					return {
@@ -387,23 +390,19 @@ export async function executeSubagent(
 							{
 								type: "text",
 								text: aggregatorResult
-									? aggregatorOutput || aggregatorError || `(aggregator ${aggregatorResult.agent} produced no output)`
+									? aggregatorFailed
+										? formatResultFailure(aggregatorResult)
+										: aggregatorOutput ||
+											aggregatorError ||
+											`(aggregator ${aggregatorResult.agent} produced no output)`
 									: `Parallel: ${successCount}/${results.length} succeeded\n\n${summaries.join("\n\n")}`,
 							},
 						],
 						details: {
 							...makeDetails("parallel")(results, aggregatorResult),
-							isError: aggregatorResult
-								? aggregatorResult.exitCode !== 0 ||
-									aggregatorResult.stopReason === "error" ||
-									aggregatorResult.stopReason === "aborted"
-								: false,
+							isError: aggregatorFailed,
 						},
-						isError: aggregatorResult
-							? aggregatorResult.exitCode !== 0 ||
-								aggregatorResult.stopReason === "error" ||
-								aggregatorResult.stopReason === "aborted"
-							: undefined,
+						isError: aggregatorResult ? aggregatorFailed : undefined,
 					};
 				} finally {
 					status.clear();
@@ -427,9 +426,9 @@ export async function executeSubagent(
 						onUpdate,
 						makeDetails("single"),
 					);
-					const isError = result.exitCode !== 0 || result.stopReason === "error" || result.stopReason === "aborted";
+					const isError = isResultError(result);
 					if (isError) {
-						const errorMsg = result.errorMessage || result.stderr || getResultFinalOutput(result) || "(no output)";
+						const errorMsg = formatResultFailure(result);
 						return {
 							content: [{ type: "text", text: `Agent ${result.stopReason || "failed"}: ${errorMsg}` }],
 							details: { ...makeDetails("single")([result]), isError: true },

package/src/render.ts

@@ -12,6 +12,7 @@ import type { AgentScope, SubagentThinkingLevel } from "./agents.js";
 import type { SubagentParams } from "./params.js";
 import {
 	getResultFinalOutput,
+	isResultError,
 	type SingleResult,
 	type SubagentDetails,
 } from "./runner.js";
@@ -221,7 +222,7 @@ export function renderSubagentResult(
 
 			if (details.mode === "single" && details.results.length === 1) {
 				const r = details.results[0];
-				const isError = r.exitCode !== 0 || r.stopReason === "error" || r.stopReason === "aborted";
+				const isError = isResultError(r);
 				const icon = isError ? theme.fg("error", "✗") : theme.fg("success", "✓");
 				const displayItems = getDisplayItems(r.messages);
 				const finalOutput = getResultFinalOutput(r);
@@ -291,7 +292,7 @@ export function renderSubagentResult(
 			};
 
 			if (details.mode === "chain") {
-				const successCount = details.results.filter((r) => r.exitCode === 0).length;
+				const successCount = details.results.filter((result) => !isResultError(result)).length;
 				const icon = successCount === details.results.length ? theme.fg("success", "✓") : theme.fg("error", "✗");
 
 				if (expanded) {
@@ -308,7 +309,7 @@ export function renderSubagentResult(
 					);
 
 					for (const r of details.results) {
-						const rIcon = r.exitCode === 0 ? theme.fg("success", "✓") : theme.fg("error", "✗");
+						const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
 						const displayItems = getDisplayItems(r.messages);
 						const finalOutput = getResultFinalOutput(r);
 
@@ -360,7 +361,7 @@ export function renderSubagentResult(
 					theme.fg("toolTitle", theme.bold("chain ")) +
 					theme.fg("accent", `${successCount}/${details.results.length} steps`);
 				for (const r of details.results) {
-					const rIcon = r.exitCode === 0 ? theme.fg("success", "✓") : theme.fg("error", "✗");
+					const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
 					const displayItems = getDisplayItems(r.messages);
 					text += `\n\n${theme.fg("muted", `─── Step ${r.step}: `)}${theme.fg("accent", r.agent)} ${rIcon}`;
 					if (displayItems.length === 0) text += `\n${theme.fg("muted", "(no output)")}`;
@@ -373,12 +374,18 @@ export function renderSubagentResult(
 			}
 
 			if (details.mode === "parallel") {
-				const running = details.results.filter((r) => r.exitCode === -1).length;
-				const successCount = details.results.filter((r) => r.exitCode === 0).length;
-				const failCount = details.results.filter((r) => r.exitCode > 0).length;
+				const running = details.results.filter((result) => result.exitCode === -1).length;
+				const successCount = details.results.filter(
+					(result) => result.exitCode !== -1 && !isResultError(result),
+				).length;
+				const failCount = details.results.filter(
+					(result) => result.exitCode !== -1 && isResultError(result),
+				).length;
 				const aggregator = details.aggregator;
 				const aggregatorRunning = aggregator?.exitCode === -1;
-				const aggregatorFailed = aggregator ? aggregator.exitCode > 0 || aggregator.stopReason === "error" : false;
+				const aggregatorFailed = aggregator
+					? aggregator.exitCode !== -1 && isResultError(aggregator)
+					: false;
 				const isRunning = running > 0 || aggregatorRunning;
 				const icon = isRunning
 					? theme.fg("warning", "⏳")
@@ -404,7 +411,7 @@ export function renderSubagentResult(
 					);
 
 					for (const r of details.results) {
-						const rIcon = r.exitCode === 0 ? theme.fg("success", "✓") : theme.fg("error", "✗");
+						const rIcon = !isResultError(r) ? theme.fg("success", "✓") : theme.fg("error", "✗");
 						const displayItems = getDisplayItems(r.messages);
 						const finalOutput = getResultFinalOutput(r);
 
@@ -438,7 +445,9 @@ export function renderSubagentResult(
 					}
 
 					if (aggregator) {
-						const rIcon = aggregator.exitCode === 0 ? theme.fg("success", "✓") : theme.fg("error", "✗");
+						const rIcon = !isResultError(aggregator)
+							? theme.fg("success", "✓")
+							: theme.fg("error", "✗");
 						const displayItems = getDisplayItems(aggregator.messages);
 						const finalOutput = getResultFinalOutput(aggregator);
 
@@ -485,7 +494,7 @@ export function renderSubagentResult(
 					const rIcon =
 						r.exitCode === -1
 							? theme.fg("warning", "⏳")
-							: r.exitCode === 0
+							: !isResultError(r)
 								? theme.fg("success", "✓")
 								: theme.fg("error", "✗");
 					const displayItems = getDisplayItems(r.messages);
@@ -498,7 +507,7 @@ export function renderSubagentResult(
 					const rIcon =
 						aggregator.exitCode === -1
 							? theme.fg("warning", "⏳")
-							: aggregator.exitCode === 0
+							: !isResultError(aggregator)
 								? theme.fg("success", "✓")
 								: theme.fg("error", "✗");
 					const displayItems = getDisplayItems(aggregator.messages);

package/src/runner.ts

@@ -72,9 +72,11 @@ function getFinalOutput(messages: Message[]): string {
 	for (let i = messages.length - 1; i >= 0; i--) {
 		const msg = messages[i];
 		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text") return part.text;
-			}
+			const text = msg.content
+				.filter((part) => part.type === "text")
+				.map((part) => part.text)
+				.join("\n");
+			if (text) return text;
 		}
 	}
 	return "";
@@ -84,6 +86,22 @@ export function getResultFinalOutput(result: SingleResult): string {
 	return result.finalOutput ?? getFinalOutput(result.messages);
 }
 
+export function isResultError(result: SingleResult): boolean {
+	return (
+		(result.exitCode !== 0 && result.exitCode !== -1) ||
+		result.stopReason === "error" ||
+		result.stopReason === "aborted"
+	);
+}
+
+export function formatResultFailure(result: SingleResult): string {
+	const error = result.errorMessage || result.stderr.trim();
+	const output = getResultFinalOutput(result);
+	const combined =
+		error && output ? `${error}\n\nPartial output:\n${output}` : error || output || "(no output)";
+	return truncateUtf8(combined, DEFAULT_MAX_CONTEXT_BYTES).text;
+}
+
 function boundMessageText(message: Message, maxBytes: number): { message: Message; bytes: number; truncated: boolean } {
 	const serializedBytes = Buffer.byteLength(JSON.stringify(message), "utf8");
 	if (serializedBytes <= maxBytes) return { message, bytes: serializedBytes, truncated: false };
@@ -107,13 +125,19 @@ function boundMessageText(message: Message, maxBytes: number): { message: Messag
 export function buildFanInContext(results: SingleResult[], maxBytes = DEFAULT_MAX_CONTEXT_BYTES): string {
 	const text = results
 		.map((result, index) => {
-			const status = result.exitCode === 0 ? "completed" : result.exitCode === -1 ? "running" : "failed";
+			const failed = isResultError(result);
+			const status = result.exitCode === -1 ? "running" : failed ? "failed" : "completed";
 			const output = getResultFinalOutput(result);
 			const error = result.errorMessage || result.stderr.trim();
+			const resultText = failed
+				? `${error ? "Error" : output ? "Partial output" : "Error"}:\n${formatResultFailure(result)}`
+				: output
+					? `Output:\n${output}`
+					: "Output: (no output)";
 			return [
 				`## Result ${index + 1}: ${result.agent} (${status})`,
 				`Task: ${result.task}`,
-				output ? `Output:\n${output}` : error ? `Error:\n${error}` : "Output: (no output)",
+				resultText,
 			].join("\n\n");
 		})
 		.join("\n\n---\n\n");
@@ -261,6 +285,9 @@ export async function runSingleAgent(
 	let tmpPromptDir: string | null = null;
 	let tmpPromptPath: string | null = null;
 
+	let latestAssistantOutput = "";
+	let terminalAssistantOutput: string | undefined;
+
 	const currentResult: SingleResult = {
 		agent: agentName,
 		agentSource: agent.source,
@@ -274,9 +301,21 @@ export async function runSingleAgent(
 		step,
 		timeoutMs,
 	};
+	const selectedAssistantOutput = () =>
+		terminalAssistantOutput !== undefined
+			? terminalAssistantOutput
+			: latestAssistantOutput || getFinalOutput(currentResult.messages);
+	const setErrorMessage = (message: string) => {
+		const bounded = truncateUtf8(message, DEFAULT_MAX_STDERR_BYTES);
+		currentResult.errorMessage = bounded.text;
+		currentResult.truncated ||= bounded.truncated;
+		return bounded.text;
+	};
 
 	const emitUpdate = () => {
-		currentResult.finalOutput = getFinalOutput(currentResult.messages);
+		const latest = truncateUtf8(selectedAssistantOutput(), DEFAULT_MAX_OUTPUT_BYTES);
+		currentResult.finalOutput = latest.text;
+		currentResult.truncated ||= latest.truncated;
 		if (onUpdate) {
 			onUpdate({
 				content: [{ type: "text", text: currentResult.finalOutput || "(running...)" }],
@@ -293,8 +332,7 @@ export async function runSingleAgent(
 			currentResult.exitCode = 1;
 			currentResult.stopReason = "error";
 			const reason = error instanceof Error ? error.message : String(error);
-			currentResult.errorMessage = `Invalid subagent cwd: ${effectiveCwd} (${reason})`;
-			currentResult.stderr = currentResult.errorMessage;
+			currentResult.stderr = setErrorMessage(`Invalid subagent cwd: ${effectiveCwd} (${reason})`);
 			return currentResult;
 		}
 
@@ -302,7 +340,7 @@ export async function runSingleAgent(
 			currentResult.exitCode = 130;
 			currentResult.aborted = true;
 			currentResult.stopReason = "aborted";
-			currentResult.errorMessage = "Subagent was aborted before start";
+			setErrorMessage("Subagent was aborted before start");
 			return currentResult;
 		}
 
@@ -356,8 +394,7 @@ export async function runSingleAgent(
 					},
 				});
 			} catch (error) {
-				currentResult.errorMessage = error instanceof Error ? error.message : String(error);
-				currentResult.stderr = currentResult.errorMessage;
+				currentResult.stderr = setErrorMessage(error instanceof Error ? error.message : String(error));
 				finish(1);
 				return;
 			}
@@ -379,6 +416,14 @@ export async function runSingleAgent(
 				const event = raw as { type?: string; message?: Message };
 				if (event.type === "message_end" && event.message) {
 					const msg = event.message;
+					if (msg.role === "assistant") {
+						const output = truncateUtf8(getFinalOutput([msg]), DEFAULT_MAX_OUTPUT_BYTES);
+						currentResult.truncated ||= output.truncated;
+						if (output.text) latestAssistantOutput = output.text;
+						if (msg.stopReason === "stop" || msg.stopReason === "length") {
+							terminalAssistantOutput = output.text;
+						}
+					}
 					addMessage(msg);
 					if (msg.role === "assistant") {
 						currentResult.usage.turns++;
@@ -393,7 +438,7 @@ export async function runSingleAgent(
 						}
 						if (!currentResult.model && msg.model) currentResult.model = msg.model;
 						if (msg.stopReason) currentResult.stopReason = msg.stopReason;
-						if (msg.errorMessage) currentResult.errorMessage = msg.errorMessage;
+						if (msg.errorMessage) setErrorMessage(msg.errorMessage);
 					}
 					emitUpdate();
 				} else if (event.type === "tool_result_end" && event.message) {
@@ -415,7 +460,7 @@ export async function runSingleAgent(
 				timedOut = true;
 				currentResult.timedOut = true;
 				currentResult.stopReason = "timeout";
-				currentResult.errorMessage = `Subagent timed out after ${timeoutMs}ms`;
+				setErrorMessage(`Subagent timed out after ${timeoutMs}ms`);
 				const bounded = appendBounded(
 					currentResult.stderr,
 					`\nSubagent timed out after ${timeoutMs}ms.`,
@@ -439,10 +484,10 @@ export async function runSingleAgent(
 				finish(timedOut ? 124 : wasAborted ? 130 : (code ?? 0));
 			});
 			proc.on("error", (error) => {
-				currentResult.errorMessage = error.message;
+				const message = setErrorMessage(error.message);
 				const bounded = appendBounded(
 					currentResult.stderr,
-					`${currentResult.stderr ? "\n" : ""}${error.message}`,
+					`${currentResult.stderr ? "\n" : ""}${message}`,
 					DEFAULT_MAX_STDERR_BYTES,
 				);
 				currentResult.stderr = bounded.text;
@@ -456,7 +501,7 @@ export async function runSingleAgent(
 					wasAborted = true;
 					currentResult.aborted = true;
 					currentResult.stopReason = "aborted";
-					currentResult.errorMessage = "Subagent was aborted";
+					setErrorMessage("Subagent was aborted");
 					cleanupTermination = terminateProcess(proc);
 				};
 				if (signal.aborted) abortHandler();
@@ -465,9 +510,18 @@ export async function runSingleAgent(
 		});
 
 		currentResult.exitCode = exitCode;
-		const final = truncateUtf8(getFinalOutput(currentResult.messages), DEFAULT_MAX_OUTPUT_BYTES);
+		const final = truncateUtf8(selectedAssistantOutput(), DEFAULT_MAX_OUTPUT_BYTES);
 		currentResult.finalOutput = final.text;
 		currentResult.truncated ||= final.truncated;
+		if (
+			currentResult.exitCode === 0 &&
+			currentResult.stopReason !== "error" &&
+			(currentResult.stopReason === "toolUse" || !currentResult.finalOutput.trim())
+		) {
+			currentResult.exitCode = 1;
+			currentResult.stopReason = "error";
+			setErrorMessage("Subagent completed without final text");
+		}
 		currentResult.policy = {
 			inherited: ["environment"],
 			overridden: [