@arhen/pi-core-subagent 1.1.8 → 1.1.10

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.8",
+  "version": "1.1.10",
   "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

@@ -12,12 +12,13 @@
  */
 
 import type { AgentSessionEvent, ExtensionAPI, ExtensionContext, Theme, ToolDefinition } from "@earendil-works/pi-coding-agent";
-import { createAgentSession, DefaultResourceLoader, getAgentDir, SessionManager } from "@earendil-works/pi-coding-agent";
+import { createAgentSession, DefaultResourceLoader, getAgentDir, ModelRuntime, SessionManager } from "@earendil-works/pi-coding-agent";
 import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
 import { StringEnum, type Api, type AssistantMessage, type Model } from "@earendil-works/pi-ai";
 import { Text, truncateToWidth } from "@earendil-works/pi-tui";
 import type { Component, TUI } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { join } from "node:path";
 import { CHILD_TALK_TOOLS, createChildTools, createWatchdog, type ChildHandlers } from "./child.ts";
 import { createMailbox, type Mailbox } from "./mailbox.ts";
 
@@ -307,7 +308,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) {
@@ -340,20 +342,40 @@ function cloneRun(run: RunSnapshot): RunSnapshot {
  *  Order: explicit "provider/model-id" or bare id (searched across available
  *  models) → agent file model → parent's current model (ctx.model) → undefined
  *  (createAgentSession falls back to settings). */
-function resolveChildModel(ctx: ExtensionContext, explicit: string | undefined) {
-	if (explicit?.trim()) {
-		const ref = explicit.trim();
-		const slash = ref.indexOf("/");
-		if (slash > 0 && slash < ref.length - 1) {
-			const model = ctx.modelRegistry.find(ref.slice(0, slash), ref.slice(slash + 1));
-			if (!model) throw new Error(`Model not found: ${ref}`);
-			return model;
+export function resolveChildModel(ctx: ExtensionContext, explicit: string | undefined) {
+	if (!explicit?.trim()) return ctx.model; // inherit the parent's active model
+	const ref = explicit.trim();
+	const available = ctx.modelRegistry.getAvailable();
+	// Model ids can contain slashes (e.g. 9router/cc/claude-opus-5), so a bare id
+	// match and every provider/id split point must be tried, not just the first.
+	const byId = available.find((m) => m.id === ref);
+	if (byId) return byId;
+	for (let slash = ref.indexOf("/"); slash > 0; slash = ref.indexOf("/", slash + 1)) {
+		const model = ctx.modelRegistry.find(ref.slice(0, slash), ref.slice(slash + 1));
+		if (model) return model;
+	}
+	throw new Error(`Model not found: ${ref}`);
+}
+
+/** Extension-registered providers (e.g. 9router) live only in the parent's
+ *  in-memory runtime. A child builds its runtime from disk and would lose them,
+ *  so replay the parent's registrations before the child resolves auth. */
+async function createChildModelRuntime(ctx: ExtensionContext) {
+	const ids = ctx.modelRegistry.getRegisteredProviderIds?.() ?? [];
+	if (ids.length === 0) return undefined; // no extension providers: disk runtime is enough
+	const agentDir = getAgentDir();
+	const runtime = await ModelRuntime.create({ authPath: join(agentDir, "auth.json"), modelsPath: join(agentDir, "models.json") });
+	for (const id of ids) {
+		const native = ctx.modelRegistry.getRegisteredNativeProvider?.(id);
+		if (native) {
+			runtime.registerNativeProvider(native);
+			continue;
 		}
-		const byId = ctx.modelRegistry.getAvailable().find((m) => m.id === ref);
-		if (!byId) throw new Error(`Model not found: ${ref}`);
-		return byId;
+		const config = ctx.modelRegistry.getRegisteredProviderConfig?.(id);
+		if (config) runtime.registerProvider(id, config);
 	}
-	return ctx.model; // inherit the parent's active model
+	await runtime.refresh({ allowNetwork: false });
+	return runtime;
 }
 
 /** Validate a thinking level against the RESOLVED model's registry entry.
@@ -495,7 +517,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 */
 		}
@@ -533,8 +557,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 {
@@ -600,7 +623,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) {
@@ -608,10 +630,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 });
@@ -723,6 +752,7 @@ class SubagentManager {
 			const created = await createAgentSession({
 				cwd: task.cwd,
 				agentDir: getAgentDir(),
+				modelRuntime: await createChildModelRuntime(ctx),
 				resourceLoader: loader,
 				sessionManager: SessionManager.create(task.cwd, undefined, { parentSession: getParentSessionFile(ctx) }),
 				model,
@@ -793,7 +823,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");
 			}
@@ -928,7 +958,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 {
@@ -953,8 +983,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);
@@ -1138,7 +1171,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;
 	});