@narumitw/pi-subagents 0.15.1 → 0.17.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-subagents",
-	"version": "0.15.1",
+	"version": "0.17.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 },
@@ -285,6 +286,34 @@ export async function executeSubagent(
 					const emitParallelUpdate = () => {
 						status.update(parallelStatus(doneCount, allResults.length, runningCount));
 						if (onUpdate) {
+							const aggregator = params.aggregator;
+							const pendingAggregator: SingleResult | undefined =
+								aggregator && !signal?.aborted && doneCount === allResults.length
+									? {
+											agent: aggregator.agent,
+											agentSource:
+												agents.find((agent) => agent.name === aggregator.agent)?.source ?? "unknown",
+											task: aggregator.task,
+											exitCode: -1,
+											messages: [],
+											stderr: "",
+											usage: {
+												input: 0,
+												output: 0,
+												cacheRead: 0,
+												cacheWrite: 0,
+												cost: 0,
+												contextTokens: 0,
+												turns: 0,
+											},
+											thinkingLevel: resolveThinkingLevel(
+												aggregator.agent,
+												aggregator.thinkingLevel,
+											),
+											timeoutMs: resolveTimeoutMs(aggregator.agent, aggregator.timeoutMs),
+											finalOutput: "",
+										}
+									: undefined;
 							onUpdate({
 								content: [
 									{
@@ -292,7 +321,7 @@ export async function executeSubagent(
 										text: `Parallel: ${doneCount}/${allResults.length} done, ${runningCount} running...`,
 									},
 								],
-								details: makeDetails("parallel")([...allResults]),
+								details: makeDetails("parallel")([...allResults], pendingAggregator),
 							});
 						}
 					};
@@ -372,14 +401,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 +418,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 +454,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 },