@arhen/pi-core-subagent 1.1.4 → 1.1.6

package/README.md

@@ -1,6 +1,6 @@
-# @arhen/pi-subagent
+# @arhen/pi-core-subagent
 
-[![npm version](https://img.shields.io/npm/v/%40arhen%2Fpi-subagent?color=cb3837&logo=npm)](https://www.npmjs.com/package/@arhen/pi-subagent)
+[![npm version](https://img.shields.io/npm/v/%40arhen%2Fpi-core-subagent?color=cb3837&logo=npm)](https://www.npmjs.com/package/@arhen/pi-core-subagent)
 [![license](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
 [![pi extension](https://img.shields.io/badge/pi-extension-7c3aed)](https://github.com/earendil-works/pi)
 
@@ -20,7 +20,7 @@ Built for one job: delegate work to isolated subagents **without bloating the pa
 ## Install
 
 ```sh
-pi install npm:@arhen/pi-subagent
+pi install npm:@arhen/pi-core-subagent
 # or locally: pi install /path/to/pi-subagents
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arhen/pi-core-subagent",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "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",
@@ -36,7 +36,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/arhen/pi-subagent.git"
+    "url": "git+https://github.com/arhen/pi-core-subagent.git"
   },
   "publishConfig": {
     "access": "public",

package/src/index.ts

@@ -396,7 +396,7 @@ class SubagentManager {
 	private liveChildren = new Map<string, { abort: () => void; dispose: () => void; touchWatchdog: () => void }>();
 	private mailboxes: Mailbox = createMailbox();
 	private runControllers = new Map<string, AbortController>();
-	private widgetTimer: ReturnType<typeof setTimeout> | undefined;
+	private widgetTimers = new Map<string, ReturnType<typeof setTimeout>>(); // per-run stream throttle
 	private widgetRuns: RunSnapshot[] = [];
 
 	turnActivity = false;
@@ -431,14 +431,19 @@ class SubagentManager {
 		return runId ? this.runs.get(runId) : undefined;
 	}
 	clearRuns(): void {
+		for (const child of this.liveChildren.values()) {
+			child.abort();
+			child.dispose();
+		}
+		this.liveChildren.clear();
 		this.runs.clear();
 		this.settlers.clear();
 		this.pendingReplies.clear();
 		this.runControllers.clear();
 		this.mailboxes = createMailbox();
 		this.widgetTui = null; // force re-registration on the next session
-		if (this.widgetTimer) clearTimeout(this.widgetTimer);
-		this.widgetTimer = undefined;
+		for (const t of this.widgetTimers.values()) clearTimeout(t);
+		this.widgetTimers.clear();
 		this.widgetRuns = [];
 	}
 
@@ -531,29 +536,30 @@ class SubagentManager {
 	}
 	private scheduleWidget(run: RunSnapshot | undefined, ctx?: ExtensionContext, onUpdate?: (partial: any) => void): void {
 		this.upsertWidgetRun(run);
-		if (this.widgetTimer || this.widgetRuns.length === 0) return;
-		this.widgetTimer = setTimeout(() => {
-			this.widgetTimer = undefined;
-			if (this.widgetRuns.length === 0) return;
-			const targets = [...this.widgetRuns]; // read at fire: never render stale runs
+		if (!run || this.widgetTimers.has(run.id)) return;
+		this.widgetTimers.set(run.id, setTimeout(() => {
+			this.widgetTimers.delete(run.id);
 			if (ctx?.hasUI) {
 				this.ensureWidget(ctx);
 				this.widgetTui?.requestRender();
 			}
-			onUpdate?.({ content: [{ type: "text", text: targets.flatMap(compactLines).join("\n") }] });
-		}, WIDGET_THROTTLE_MS);
+			onUpdate?.({ content: [{ type: "text", text: compactLines(run).join("\n") }] });
+		}, WIDGET_THROTTLE_MS));
 	}
-	private flushWidget(ctx?: ExtensionContext, onUpdate?: (partial: any) => void): void {
-		if (this.widgetTimer) {
-			clearTimeout(this.widgetTimer);
-			this.widgetTimer = undefined;
+	private flushWidget(run: RunSnapshot | undefined, ctx?: ExtensionContext, onUpdate?: (partial: any) => void): void {
+		if (run) {
+			const t = this.widgetTimers.get(run.id);
+			if (t) {
+				clearTimeout(t);
+				this.widgetTimers.delete(run.id);
+			}
 		}
-		if (this.widgetRuns.length === 0) return;
+		if (!run || this.widgetRuns.length === 0) return;
 		if (ctx?.hasUI) {
 			this.ensureWidget(ctx);
 			this.widgetTui?.requestRender();
 		}
-		onUpdate?.({ content: [{ type: "text", text: this.widgetRuns.flatMap(compactLines).join("\n") }] });
+		onUpdate?.({ content: [{ type: "text", text: compactLines(run).join("\n") }] });
 	}
 	private ensureWidget(ctx: ExtensionContext): void {
 		if (this.widgetTui !== null || !ctx.hasUI) return;
@@ -586,6 +592,13 @@ class SubagentManager {
 				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) {
+					this.updateTask(run, task, { status: "running" }, ctx);
+					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();
@@ -593,10 +606,24 @@ class SubagentManager {
 			},
 			onNotifyParent: (_taskId, message, level) => {
 				this.emit("subagent:intercom", { runId: run.id, taskId: task.id, kind: "notify", level, message });
+				if (!run.awaited) {
+					try {
+						this.pi.sendUserMessage(`[Subagent ${task.agent}] ${message}`, { deliverAs: "followUp" });
+					} catch {
+						/* parent mid-stream */
+					}
+				}
 			},
 			onSendMessage: (_taskId, to, text) => {
 				if (to === "leader") {
 					this.emit("subagent:intercom", { runId: run.id, taskId: task.id, kind: "notify", level: "info", message: text });
+					if (!run.awaited) {
+						try {
+							this.pi.sendUserMessage(`[Subagent ${task.agent}] ${text}`, { deliverAs: "followUp" });
+						} catch {
+							/* parent mid-stream */
+						}
+					}
 					return true;
 				}
 				// Run-scoped keys: sibling ids are run-local; cross-run task_1 can never collide.
@@ -706,7 +733,7 @@ class SubagentManager {
 			});
 
 			unsubscribe = child.subscribe((event: AgentSessionEvent) => {
-				const active = event.type === "message_update" || event.type === "message_end" || event.type === "tool_execution_start" || event.type === "tool_execution_end" || event.type === "agent_settled";
+				const active = event.type === "message_update" || event.type === "message_end" || event.type === "tool_execution_start" || event.type === "tool_execution_update" || event.type === "tool_execution_end" || event.type === "bash_execution_update" || event.type === "agent_settled";
 				if (active) {
 					watchdog.touch();
 					this.emit("subagent:session-event", { runId: run.id, taskId: task.id, seq: eventSeq++, event: { type: event.type } });
@@ -745,7 +772,10 @@ class SubagentManager {
 				}
 			});
 
-			const abortChild = () => void child?.abort();
+			const abortChild = () => {
+				void child?.abort();
+				this.runControllers.get(run.id)?.abort(); // parent abort kills ALL siblings, not just this child
+			};
 			const runController = this.runControllers.get(run.id);
 			if (signal) signal.addEventListener("abort", abortChild, { once: true });
 			if (runController) runController.signal.addEventListener("abort", abortChild, { once: true });
@@ -899,7 +929,7 @@ class SubagentManager {
 		const aborted = run.tasks.some((t) => t.status === "aborted") || Boolean(signal?.aborted);
 		run.status = aborted ? "aborted" : failed ? "failed" : "completed";
 		run.endedAt = Date.now();
-		this.flushWidget(ctx, onUpdate);
+		this.flushWidget(run, ctx, onUpdate);
 		// Run done: keep the widget only while another run is still live.
 		const live = this.listRuns().find((r) => !TERMINAL.includes(r.status));
 		if (live) {
@@ -947,6 +977,7 @@ class SubagentManager {
 	cancelRun(runId: string): { aborted: number } {
 		const run = this.runs.get(runId);
 		if (!run) return { aborted: 0 };
+		if (TERMINAL.includes(run.status)) return { aborted: 0 }; // never corrupt a finished run
 		let aborted = 0;
 		this.runControllers.get(runId)?.abort();
 		for (const [key, child] of this.liveChildren) {
@@ -1113,7 +1144,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 parallel call instead of handling them inline.",
+			"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.",
 			"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.",