@arhen/pi-core-subagent 1.1.7 → 1.1.9

package/README.md

@@ -15,7 +15,7 @@ Built for one job: delegate work to isolated subagents **without bloating the pa
 - **In-process** — children are `AgentSession`s in the same runtime. No process spawn, no context bleed.
 - **Zero parent-context injection.** No catalog, no context hook. 6 slim tools total.
 - **Throttled updates** — widget/stream updates coalesce to ~6/s; no per-event deep clones.
-- **No silent hangs** — watchdog aborts children that produce no events for 90s; per-task timeout 10min.
+- **No silent hangs** — watchdog aborts children that produce no events for 3 minutes; per-task timeout 10min.
 
 ## Install
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arhen/pi-core-subagent",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "type": "module",
   "description": "pi extension: fast in-process subagents with single/parallel/chain, background runs, intercom and agent-to-agent mailbox. Leader defines agents inline.",
   "license": "MIT",

package/src/child.ts

@@ -98,8 +98,8 @@ export function createChildTools(taskId: string, handlers: ChildHandlers): ToolD
 				if (messages.length === 0) return { content: [{ type: "text" as const, text: "No messages." }], details: {} };
 				const body = messages
 					.map((m) => `from ${m.from}: ${m.text}`)
-					.join("\n")
-					.slice(0, 4000);
+					.join("\n");
+				const capped = body.length > 4000 ? body.slice(0, 4000).replace(/[\uD800-\uDBFF]$/, "") : body; // multibyte-safe
 				return { content: [{ type: "text" as const, text: body }], details: { messages } };
 			},
 		},

package/src/index.ts

@@ -253,8 +253,6 @@ function compactLines(run: RunSnapshot): string[] {
  *   └─ ✓ reviewer · 6 tools · 44s
  * Static icons (no animation); latest activity + tool count + runtime per agent.
  */
-const WIDGET_MAX_RUNS = 3;
-const WIDGET_MAX_TASKS_PER_RUN = 4;
 const WIDGET_MAX_LINES = 10;
 
 class SubagentsWidget implements Component {
@@ -268,38 +266,39 @@ class SubagentsWidget implements Component {
 	}
 
 	render(width: number): string[] {
-		const runs = this.getRuns();
+		// ONE flat tree: every run's tasks concatenated under a single heading.
+		// Whether the model spawned N runs or one tasks[] call, the pane reads the same.
+		const runs = this.getRuns().filter((r) => r.tasks.length > 0);
 		if (runs.length === 0) return [];
-		const lines: string[] = [];
-		let renderedRuns = 0;
-		for (const run of runs.slice(0, WIDGET_MAX_RUNS)) {
-			if (run.tasks.length === 0) continue;
-			if (lines.length > 0) lines.push("");
-			const done = run.tasks.filter((t) => TERMINAL.includes(t.status)).length;
-			const active = !TERMINAL.includes(run.status);
-			const head = active ? "accent" : "dim";
-			lines.push(truncateToWidth(`${this.theme.fg(head, active ? "●" : "○")} ${this.theme.fg(head, `Subagents (${done}/${run.tasks.length})`)}`, width, "…"));
+		const total = runs.reduce((n, r) => n + r.tasks.length, 0);
+		const done = runs.reduce((n, r) => n + r.tasks.filter((t) => TERMINAL.includes(t.status)).length, 0);
+		const live = total - done;
+		const head = live > 0 ? "accent" : "dim";
+		const lines = [truncateToWidth(`${this.theme.fg(head, live > 0 ? "●" : "○")} ${this.theme.fg(head, `Subagents (${done}/${total})`)}`, width, "…")];
+		const budget = WIDGET_MAX_LINES - 1;
+		let shown = 0;
+		outer: for (const run of runs) {
 			const allDone = TERMINAL.includes(run.status);
-			const visible = run.tasks.slice(0, WIDGET_MAX_TASKS_PER_RUN);
-			visible.forEach((task, i) => {
-				const last = i === visible.length - 1 && run.tasks.length <= WIDGET_MAX_TASKS_PER_RUN;
-				const conn = this.theme.fg("dim", last ? "└─" : "├─");
+			for (const task of run.tasks) {
+				if (shown >= budget) break outer;
+				shown += 1;
 				const activity =
 					!TERMINAL.includes(task.status) && task.lastActivity
 						? `${this.theme.fg("dim", `→ ${task.lastActivity}`)} · `
 						: "";
-				// Finished run: dim everything except the agent name.
+				// Tasks of a finished run: dim everything except the agent name.
 				const line = allDone
 					? `${this.theme.fg("dim", `${statusIcon(task.status)} `)}${task.agent} ${this.theme.fg("dim", `· ${taskStatsWithUsage(task)} · ${taskTimer(task)}`)}`
 					: `${statusIcon(task.status)} ${task.agent} · ${activity}${taskStatsWithUsage(task)} · ${taskTimer(task)}`;
-				lines.push(truncateToWidth(`${conn} ${line}`, width, "…"));
-			});
-			if (run.tasks.length > WIDGET_MAX_TASKS_PER_RUN) lines.push(`${this.theme.fg("dim", "└─")} ${this.theme.fg("dim", `+${run.tasks.length - WIDGET_MAX_TASKS_PER_RUN} more tasks`)}`);
-			renderedRuns += 1;
-			if (lines.length >= WIDGET_MAX_LINES) break; // keep the editor visible
+				lines.push(truncateToWidth(`${this.theme.fg("dim", "├─")} ${line}`, width, "…"));
+			}
+		}
+		const hidden = total - shown;
+		if (hidden > 0) {
+			lines.push(`${this.theme.fg("dim", "└─")} ${this.theme.fg("dim", `+${hidden} more`)}`);
+		} else if (lines.length > 1) {
+			lines[lines.length - 1] = lines[lines.length - 1]!.replace("├─", "└─");
 		}
-		const hiddenRuns = runs.length - renderedRuns;
-		if (hiddenRuns > 0) lines.push(`${this.theme.fg("dim", "└─")} ${this.theme.fg("dim", `+${hiddenRuns} more run${hiddenRuns > 1 ? "s" : ""}`)}`);
 		return lines;
 	}
 }
@@ -308,7 +307,8 @@ function makeSummary(run: RunSnapshot): string {
 	const succeeded = run.tasks.filter((t) => t.status === "completed").length;
 	const failed = run.tasks.filter((t) => t.status === "failed").length;
 	const aborted = run.tasks.filter((t) => t.status === "aborted").length;
-	const lines = [`Run ${run.id}: Subagents ${run.mode}${run.background ? " (background)" : ""} finished: ${succeeded}/${run.tasks.length} succeeded${failed ? `, ${failed} failed` : ""}${aborted ? `, ${aborted} aborted` : ""}.`];
+	const done = TERMINAL.includes(run.status) ? "finished" : "running";
+	const lines = [`Run ${run.id}: Subagents ${run.mode}${run.background ? " (background)" : ""} ${done}: ${succeeded}/${run.tasks.length} succeeded${failed ? `, ${failed} failed` : ""}${aborted ? `, ${aborted} aborted` : ""}.`];
 	const usage = formatUsage(run.aggregateUsage);
 	if (usage) lines.push(`Usage: ${usage}`);
 	for (const task of run.tasks) {
@@ -496,7 +496,9 @@ class SubagentManager {
 			const parentFile = getParentSessionFile(ctx);
 			if (!parentFile) return;
 			const sidecar = parentFile.replace(/\.jsonl$/, ".subagents.json");
-			import("fs").then(({ writeFileSync }) => writeFileSync(sidecar, JSON.stringify(this.listRuns().slice(0, 50).map(cloneRun), null, 2)));
+			import("fs")
+				.then(({ writeFileSync }) => writeFileSync(sidecar, JSON.stringify(this.listRuns().slice(0, 50).map(cloneRun), null, 2)))
+				.catch(() => {}); // never surface as an unhandled rejection
 		} catch {
 			/* ignore */
 		}
@@ -534,8 +536,7 @@ class SubagentManager {
 	}
 
 	// Widget: register-once + requestRender (todo-overlay pattern).
-	// The component self-animates the spinner via its own 100ms interval;
-	// scheduleWidget just throttles status changes into requestRender calls.
+	// scheduleWidget throttles status changes into requestRender calls.
 	private widgetTui: TUI | null = null;
 	/** Upsert a run into the widget's visible set (all runs, not just the latest). */
 	private upsertWidgetRun(run: RunSnapshot | undefined): void {
@@ -601,7 +602,6 @@ class SubagentManager {
 			onAskParent: async (_taskId, question) => {
 				this.updateTask(run, task, { status: "awaiting_parent" }, ctx);
 				this.liveChildren.get(`${run.id}:${task.id}`)?.touchWatchdog();
-				this.notifyParent(run, "asked", { taskId: task.id, question });
 				// A blocking run's parent can't reply mid-tool (followUp only fires after the
 				// tool returns) — only background runs can truly wait for the answer.
 				if (!run.background) {
@@ -609,10 +609,17 @@ class SubagentManager {
 					this.liveChildren.get(`${run.id}:${task.id}`)?.touchWatchdog();
 					return "Parent cannot answer while this run is blocking. Continue autonomously with your best judgment.";
 				}
-				const reply = await this.awaitParentReply(run.id, task.id);
-				this.updateTask(run, task, { status: "running" }, ctx);
-				this.liveChildren.get(`${run.id}:${task.id}`)?.touchWatchdog();
-				return reply;
+				this.notifyParent(run, "asked", { taskId: task.id, question });
+				// M3: a waiting child is not stalled — keep the watchdog fed until the reply.
+				const keepAlive = setInterval(() => this.liveChildren.get(`${run.id}:${task.id}`)?.touchWatchdog(), 30_000);
+				try {
+					const reply = await this.awaitParentReply(run.id, task.id);
+					this.updateTask(run, task, { status: "running" }, ctx);
+					this.liveChildren.get(`${run.id}:${task.id}`)?.touchWatchdog();
+					return reply;
+				} finally {
+					clearInterval(keepAlive);
+				}
 			},
 			onNotifyParent: (_taskId, message, level) => {
 				this.emit("subagent:intercom", { runId: run.id, taskId: task.id, kind: "notify", level, message });
@@ -794,7 +801,7 @@ class SubagentManager {
 				runController?.signal.removeEventListener("abort", abortChild);
 			};
 			// Cancel may have landed during session creation — honor it before prompting.
-			if (run.status === "aborted" || TERMINAL.includes(task.status)) {
+			if (run.status === "aborted" || TERMINAL.includes(task.status) || signal?.aborted) {
 				await child.abort();
 				throw new Error("Canceled by subagent_cancel");
 			}
@@ -929,7 +936,7 @@ class SubagentManager {
 				if (run.notifyPerTask && run.background && TERMINAL.includes(task.status)) {
 					this.notifyTask(run, task, task.status as "completed" | "failed" | "aborted");
 				}
-				if (task.status !== "completed") break;
+				if (task.status !== "completed") break; // aborted/failed link stops the chain
 				previous = task.finalText ?? "";
 			}
 		} else {
@@ -954,8 +961,11 @@ class SubagentManager {
 		} else {
 			this.clearWidget(ctx);
 		}
-		this.emit("subagent:run-completed", { runId: run.id, status: run.status, run: cloneRun(run), aggregateUsage: run.aggregateUsage });
-		this.settleRun(run.id, run);
+		// L7: cancelRun already emitted + settled — don't double-report.
+		if (this.settlers.has(run.id)) {
+			this.emit("subagent:run-completed", { runId: run.id, status: run.status, run: cloneRun(run), aggregateUsage: run.aggregateUsage });
+			this.settleRun(run.id, run);
+		}
 		this.runControllers.delete(run.id);
 		for (const task of run.tasks) this.mailboxes.close(`${run.id}:${task.id}`);
 		this.persist(ctx);
@@ -1139,7 +1149,7 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.on("agent_start", (_event, ctx) => {
-		if (!manager.turnActivity) manager.clearWidget(ctx);
+		if (!manager.turnActivity && !manager.hasActiveRun()) manager.clearWidget(ctx);
 		manager.turnActivity = false;
 	});
 
@@ -1164,7 +1174,7 @@ export default function (pi: ExtensionAPI) {
 		promptSnippet: "Define and delegate work to specialized subagents.",
 		promptGuidelines: [
 			"Use subagent when independent review, testing, research, or parallel analysis improves quality.",
-			"Decompose parallelizable work: if the request has 2+ independent sub-tasks (separate files, separate concerns, independent research/review), delegate each to its own subagent — in ONE call with tasks[] (single shot), not multiple parallel subagent calls.",
+			"Decompose parallelizable work: if the request has 2+ independent sub-tasks (separate files, separate concerns, independent research/review), spawn N agents with a SINGLE call: subagent({ tasks: [{agent, task}, ...] }). NEVER make multiple parallel subagent calls for parallel work — one call, one run, N tasks.",
 			"If independent sub-tasks are sequential (each builds on the previous one's output), use chain mode with {previous}.",
 			"Define each subagent yourself: an invented name, a focused system prompt (prompt:), and a toolset — read-only (default) or write (write:true).",
 			"Prefer read-only subagents unless the task explicitly needs edits.",