pi-subagents 0.49.0 → 0.50.0

package/src/runs/shared/nested-events.ts

@@ -34,6 +34,7 @@ import { THINKING_LEVELS } from "../../shared/model-info.ts";
 export const NESTED_EVENTS_DIR = path.join(TEMP_ROOT_DIR, "nested-subagent-events");
 const ROUTE_FILE = "route.json";
 const REGISTRY_FILE = "registry.json";
+const ROUTE_INDEX_DIR = ".route-index";
 const MAX_EVENT_BYTES = 64 * 1024;
 const MAX_STEPS = 12;
 const MAX_CHILDREN = 16;
@@ -105,6 +106,18 @@ function commonRouteRoot(route: Pick<NestedRoute, "eventSink" | "controlInbox">)
 	return path.dirname(path.resolve(route.eventSink));
 }
 
+function routeIndexRoot(): string {
+	return path.join(NESTED_EVENTS_DIR, ROUTE_INDEX_DIR, "roots");
+}
+
+function routeIndexDir(rootRunId: string): string {
+	return path.join(routeIndexRoot(), encodeURIComponent(rootRunId));
+}
+
+function routeIndexPath(rootRunId: string, capabilityToken: string): string {
+	return path.join(routeIndexDir(rootRunId), `${encodeURIComponent(capabilityToken)}.json`);
+}
+
 function validateRouteShape(route: NestedRoute): void {
 	assertSafeId("rootRunId", route.rootRunId);
 	assertSafeId("capabilityToken", route.capabilityToken);
@@ -121,7 +134,10 @@ export function createNestedRoute(rootRunId: string): NestedRoute {
 	const controlInbox = path.join(routeRoot, "controls");
 	fs.mkdirSync(eventSink, { recursive: true, mode: 0o700 });
 	fs.mkdirSync(controlInbox, { recursive: true, mode: 0o700 });
-	fs.writeFileSync(path.join(routeRoot, ROUTE_FILE), `${JSON.stringify({ rootRunId, capabilityToken, createdAt: Date.now() })}\n`, { mode: 0o600 });
+	const createdAt = Date.now();
+	fs.mkdirSync(routeIndexDir(rootRunId), { recursive: true, mode: 0o700 });
+	writeAtomicJson(routeIndexPath(rootRunId, capabilityToken), { rootRunId, capabilityToken, routeRoot: path.basename(routeRoot), createdAt });
+	writeAtomicJson(path.join(routeRoot, ROUTE_FILE), { rootRunId, capabilityToken, createdAt });
 	return { rootRunId, eventSink, controlInbox, capabilityToken };
 }
 
@@ -515,68 +531,57 @@ function registryPath(route: NestedRoute): string {
 	return path.join(commonRouteRoot(route), REGISTRY_FILE);
 }
 
+function routeFromIndexEntry(rootRunId: string, filePath: string): NestedRoute | undefined {
+	try {
+		const metadata = JSON.parse(fs.readFileSync(filePath, "utf-8")) as { rootRunId?: unknown; capabilityToken?: unknown; routeRoot?: unknown; createdAt?: unknown };
+		if (metadata.rootRunId !== rootRunId || typeof metadata.capabilityToken !== "string" || typeof metadata.routeRoot !== "string") return undefined;
+		const routeRoot = path.join(NESTED_EVENTS_DIR, path.basename(metadata.routeRoot));
+		const route = {
+			rootRunId,
+			eventSink: path.join(routeRoot, "events"),
+			controlInbox: path.join(routeRoot, "controls"),
+			capabilityToken: metadata.capabilityToken,
+		};
+		validateRouteShape(route);
+		if (!fs.statSync(route.eventSink).isDirectory() || !fs.statSync(route.controlInbox).isDirectory()) return undefined;
+		const routeFilePath = path.join(routeRoot, ROUTE_FILE);
+		try {
+			const routeFile = JSON.parse(fs.readFileSync(routeFilePath, "utf-8")) as { rootRunId?: unknown; capabilityToken?: unknown };
+			if (routeFile.rootRunId !== rootRunId || routeFile.capabilityToken !== metadata.capabilityToken) return undefined;
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code !== "ENOENT") return undefined;
+			try {
+				writeAtomicJson(routeFilePath, { rootRunId, capabilityToken: metadata.capabilityToken, createdAt: typeof metadata.createdAt === "number" ? metadata.createdAt : Date.now() });
+			} catch {
+				// The route index already carries enough data for reload lookup.
+			}
+		}
+		return route;
+	} catch {
+		return undefined;
+	}
+}
+
 export function findNestedRouteForRootId(rootRunId: string): NestedRoute | undefined {
 	assertSafeId("rootRunId", rootRunId);
 	let entries: string[];
 	try {
-		entries = fs.readdirSync(NESTED_EVENTS_DIR);
+		entries = fs.readdirSync(routeIndexDir(rootRunId));
 	} catch (error) {
 		if ((error as NodeJS.ErrnoException).code === "ENOENT") return undefined;
 		throw error;
 	}
 	for (const entry of entries) {
-		if (!entry.startsWith(`${rootRunId}-`)) continue;
-		const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
-		try {
-			const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8")) as { rootRunId?: unknown; capabilityToken?: unknown };
-			if (metadata.rootRunId !== rootRunId || typeof metadata.capabilityToken !== "string") continue;
-			const route = {
-				rootRunId,
-				eventSink: path.join(routeRoot, "events"),
-				controlInbox: path.join(routeRoot, "controls"),
-				capabilityToken: metadata.capabilityToken,
-			};
-			validateRouteShape(route);
-			return route;
-		} catch {
-			continue;
-		}
+		const route = routeFromIndexEntry(rootRunId, path.join(routeIndexDir(rootRunId), entry));
+		if (route) return route;
 	}
 	return undefined;
 }
 
-/**
- * Scan the nested-events directory once and index every route by its root run
- * id. Use this when resolving routes for many runs (e.g. listAsyncRuns) so the
- * cost is O(routes) total instead of O(runs * routes) from calling
- * findNestedRouteForRootId per run.
- */
 export function buildNestedRouteIndex(): Map<string, NestedRoute> {
-	let entries: string[];
-	try {
-		entries = fs.readdirSync(NESTED_EVENTS_DIR);
-	} catch (error) {
-		if ((error as NodeJS.ErrnoException).code === "ENOENT") return new Map();
-		throw error;
-	}
 	const index = new Map<string, NestedRoute>();
-	for (const entry of entries) {
-		const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
-		try {
-			const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8")) as { rootRunId?: unknown; capabilityToken?: unknown };
-			if (typeof metadata.rootRunId !== "string" || typeof metadata.capabilityToken !== "string") continue;
-			if (index.has(metadata.rootRunId)) continue;
-			const route: NestedRoute = {
-				rootRunId: metadata.rootRunId,
-				eventSink: path.join(routeRoot, "events"),
-				controlInbox: path.join(routeRoot, "controls"),
-				capabilityToken: metadata.capabilityToken,
-			};
-			validateRouteShape(route);
-			index.set(metadata.rootRunId, route);
-		} catch {
-			continue;
-		}
+	for (const route of listNestedRoutes()) {
+		if (!index.has(route.rootRunId)) index.set(route.rootRunId, route);
 	}
 	return index;
 }
@@ -630,27 +635,26 @@ function collectScopedNestedRuns(children: NestedRunSummary[] | undefined, scope
 }
 
 function listNestedRoutes(): NestedRoute[] {
-	let entries: string[];
+	let rootEntries: string[];
 	try {
-		entries = fs.readdirSync(NESTED_EVENTS_DIR);
+		rootEntries = fs.readdirSync(routeIndexRoot());
 	} catch (error) {
 		if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
 		throw error;
 	}
 	const routes: NestedRoute[] = [];
-	for (const entry of entries) {
-		const routeRoot = path.join(NESTED_EVENTS_DIR, entry);
+	for (const rootEntry of rootEntries) {
+		let rootRunId: string;
 		try {
-			const metadata = JSON.parse(fs.readFileSync(path.join(routeRoot, ROUTE_FILE), "utf-8")) as { rootRunId?: unknown; capabilityToken?: unknown };
-			if (typeof metadata.rootRunId !== "string" || typeof metadata.capabilityToken !== "string") continue;
-			const route = {
-				rootRunId: metadata.rootRunId,
-				eventSink: path.join(routeRoot, "events"),
-				controlInbox: path.join(routeRoot, "controls"),
-				capabilityToken: metadata.capabilityToken,
-			};
-			validateRouteShape(route);
-			routes.push(route);
+			rootRunId = decodeURIComponent(rootEntry);
+		} catch {
+			continue;
+		}
+		try {
+			for (const entry of fs.readdirSync(path.join(routeIndexRoot(), rootEntry))) {
+				const route = routeFromIndexEntry(rootRunId, path.join(routeIndexRoot(), rootEntry, entry));
+				if (route) routes.push(route);
+			}
 		} catch {
 			continue;
 		}

package/src/runs/shared/orca-progress-tabs.ts

@@ -0,0 +1,375 @@
+import { spawn } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { createHash, randomUUID } from "node:crypto";
+import type { Message } from "@earendil-works/pi-ai";
+import { resolveNodeExecutable } from "../../shared/node-executable.ts";
+import { TEMP_ROOT_DIR, type OrcaProgressTabsConfig } from "../../shared/types.ts";
+import { extractTextFromContent, extractToolArgsPreview, getAgentDir } from "../../shared/utils.ts";
+
+const ORCA_CREATE_TIMEOUT_MS = 20_000;
+const ORCA_KILL_GRACE_MS = 2_000;
+const CLEANUP_DELAY_MS = 5 * 60_000;
+const STALE_PROGRESS_MAX_AGE_MS = 24 * 60 * 60_000;
+const VIEWER_POLL_MS = 150;
+const MAX_MIRROR_BYTES = 1024 * 1024;
+const MIRROR_FOOTER_RESERVE_BYTES = 16 * 1024;
+const COUNTER_LOCK_STALE_MS = 30_000;
+const COUNTER_LOCK_RETRIES = 200;
+const COUNTER_LOCK_RETRY_MS = 10;
+
+const ORCA_CREATE_WATCHDOG_SCRIPT = [
+	"const {spawn}=require('node:child_process');",
+	"const timeout=Number(process.argv[1]),grace=Number(process.argv[2]),command=process.argv[3],args=process.argv.slice(4);",
+	"const child=spawn(command,args,{stdio:'ignore',windowsHide:true});",
+	"let hardKill;",
+	"const timer=setTimeout(()=>{child.kill('SIGTERM');hardKill=setTimeout(()=>child.kill('SIGKILL'),grace)},timeout);",
+	"const clear=()=>{clearTimeout(timer);if(hardKill)clearTimeout(hardKill)};",
+	"child.once('error',()=>{clear();process.exitCode=1});",
+	"child.once('close',code=>{clear();process.exitCode=code===0?0:1});",
+].join("");
+
+const ORCA_CLEANUP_WATCHDOG_SCRIPT = [
+	"const fs=require('node:fs');",
+	"const deadline=Date.now()+Number(process.argv[1]),files=process.argv.slice(2);",
+	"function check(){if(!files.some(file=>fs.existsSync(file)))process.exit(0);if(Date.now()<deadline)return;for(const file of files){try{fs.rmSync(file,{force:true})}catch{}}process.exit(0)}",
+	"setInterval(check,1000);check();",
+].join("");
+
+export interface OrcaProgressTab {
+	append(text: string): void;
+	event(event: { type?: string; message?: Message; toolName?: string; args?: unknown }): void;
+	finish(status: "completed" | "failed" | "stopped", sessionFile?: string): void;
+}
+
+function executableFile(candidate: string): boolean {
+	try {
+		const stats = fs.statSync(candidate);
+		if (!stats.isFile()) return false;
+		if (process.platform === "win32") return true;
+		fs.accessSync(candidate, fs.constants.X_OK);
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+function executableNames(command: string, env: NodeJS.ProcessEnv): string[] {
+	if (process.platform !== "win32") return [command];
+	const extensions = (env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";").filter(Boolean);
+	return [command, ...extensions.map((extension) => `${command}${extension.toLowerCase()}`), ...extensions.map((extension) => `${command}${extension.toUpperCase()}`)];
+}
+
+export function resolveOrcaCommand(env: NodeJS.ProcessEnv = process.env): string | undefined {
+	const override = env.PI_SUBAGENT_ORCA_BINARY?.trim();
+	if (override) return executableFile(override) ? override : undefined;
+	for (const directory of (env.PATH ?? "").split(path.delimiter).filter(Boolean)) {
+		for (const name of executableNames("orca", env)) {
+			const candidate = path.join(directory, name);
+			if (executableFile(candidate)) return candidate;
+		}
+	}
+	return undefined;
+}
+
+function shellQuote(value: string): string {
+	return `'${value.replace(/'/g, `'"'"'`)}'`;
+}
+
+const VIEWER_SCRIPT = [
+	"const fs=require('fs'),{StringDecoder}=require('string_decoder');",
+	"const log=process.argv[1],done=process.argv[2],decoder=new StringDecoder('utf8');",
+	"let offset=0,finishing=false,state='text';",
+	"function sanitize(input){let output='';for(const char of input){const code=char.charCodeAt(0);",
+	"if(state==='text'){if(code===27){state='escape';continue}if(code===155){state='csi';continue}if(code===157){state='osc';continue}if(code===144||code===152||code===158||code===159){state='string';continue}if(code===10||(code>=32&&code!==127&&(code<128||code>159)))output+=char;continue}",
+	"if(state==='escape'){if(char==='[')state='csi';else if(char===']')state='osc';else if(char==='P'||char==='X'||char==='^'||char==='_')state='string';else if(code<32||code>47)state='text';continue}",
+	"if(state==='csi'){if(code>=64&&code<=126)state='text';continue}",
+	"if(state==='osc'){if(code===7)state='text';else if(code===27)state='osc-escape';continue}",
+	"if(state==='osc-escape'){state=char==='\\\\'?'text':code===27?'osc-escape':'osc';continue}",
+	"if(state==='string'){if(code===27)state='string-escape';continue}",
+	"if(state==='string-escape')state=char==='\\\\'?'text':code===27?'string-escape':'string';",
+	"}return output}",
+	"function write(buffer){const output=sanitize(decoder.write(buffer));if(output)process.stdout.write(output)}",
+	"function pump(){",
+	" try{const size=fs.statSync(log).size;if(size<offset)offset=0;if(size>offset){const fd=fs.openSync(log,'r');const b=Buffer.alloc(size-offset);fs.readSync(fd,b,0,b.length,offset);fs.closeSync(fd);offset=size;write(b);}}catch{}",
+	" if(!finishing&&fs.existsSync(done)){finishing=true;pump();setTimeout(()=>{const output=sanitize(decoder.end());if(output)process.stdout.write(output);try{fs.unlinkSync(done)}catch{}try{fs.unlinkSync(log)}catch{}process.exit(0)},250);}",
+	"}",
+	`const timer=setInterval(pump,${VIEWER_POLL_MS});`,
+	"pump();",
+	"process.on('exit',()=>clearInterval(timer));",
+].join("");
+
+function viewerCommand(nodeExecutable: string, logPath: string, donePath: string): string {
+	const invocation = [nodeExecutable, "-e", VIEWER_SCRIPT, logPath, donePath].map(shellQuote).join(" ");
+	// Do not replace or exit Orca's interactive shell. The short-lived viewer may
+	// finish and delete its mirror files, while the completed tab remains open at
+	// the shell prompt until the user closes it.
+	return invocation;
+}
+
+function progressRoot(): string {
+	return path.join(TEMP_ROOT_DIR, "orca-progress");
+}
+
+function pruneStaleProgressFiles(root: string, now = Date.now()): void {
+	try {
+		for (const entry of fs.readdirSync(root, { withFileTypes: true })) {
+			if (!entry.isFile() || (!entry.name.endsWith(".log") && !entry.name.endsWith(".done"))) continue;
+			const file = path.join(root, entry.name);
+			try {
+				if (now - fs.statSync(file).mtimeMs > STALE_PROGRESS_MAX_AGE_MS) fs.rmSync(file, { force: true });
+			} catch { /* best-effort stale cleanup */ }
+		}
+	} catch {
+		// The observer remains optional when temp cleanup is unavailable.
+	}
+}
+
+function safeSegment(value: unknown, fallback = "subagent"): string {
+	if (typeof value !== "string") return fallback;
+	return value.replace(/[^A-Za-z0-9._-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 48) || fallback;
+}
+
+function sleepSync(ms: number): void {
+	const signal = new Int32Array(new SharedArrayBuffer(4));
+	Atomics.wait(signal, 0, 0, ms);
+}
+
+function resolveSequenceScope(cwd: string): string {
+	let current = path.resolve(cwd);
+	try { current = fs.realpathSync(current); } catch { /* use the lexical cwd */ }
+	while (true) {
+		try {
+			if (fs.existsSync(path.join(current, ".git"))) return current;
+		} catch { /* keep walking */ }
+		const parent = path.dirname(current);
+		if (parent === current) return path.resolve(cwd);
+		current = parent;
+	}
+}
+
+function reserveTabSequence(root: string, cwd: string): number | undefined {
+	const key = createHash("sha256").update(resolveSequenceScope(cwd)).digest("hex").slice(0, 20);
+	const counterPath = path.join(root, `counter-${key}`);
+	const lockPath = `${counterPath}.lock`;
+	let locked = false;
+	for (let attempt = 0; attempt < COUNTER_LOCK_RETRIES; attempt++) {
+		try {
+			fs.mkdirSync(lockPath, { mode: 0o700 });
+			locked = true;
+			break;
+		} catch (error) {
+			if ((error as NodeJS.ErrnoException).code !== "EEXIST") break;
+			try {
+				if (Date.now() - fs.statSync(lockPath).mtimeMs > COUNTER_LOCK_STALE_MS) {
+					fs.rmSync(lockPath, { recursive: true, force: true });
+					continue;
+				}
+			} catch { /* another process released the lock */ }
+			sleepSync(COUNTER_LOCK_RETRY_MS);
+		}
+	}
+	if (!locked) return undefined;
+	try {
+		let current = 0;
+		try {
+			const parsed = Number.parseInt(fs.readFileSync(counterPath, "utf-8"), 10);
+			if (Number.isSafeInteger(parsed) && parsed >= 0) current = parsed;
+		} catch { /* first tab for this worktree */ }
+		const next = current + 1;
+		try {
+			fs.writeFileSync(counterPath, `${next}\n`, { encoding: "utf-8", mode: 0o600 });
+			return next;
+		} catch {
+			return undefined;
+		}
+	} finally {
+		try { fs.rmSync(lockPath, { recursive: true, force: true }); } catch { /* stale lock cleanup handles crashes */ }
+	}
+}
+
+export function resolvePiSessionId(sessionFile: string | undefined): string | undefined {
+	if (!sessionFile) return undefined;
+	try {
+		const fd = fs.openSync(sessionFile, "r");
+		try {
+			const buffer = Buffer.alloc(16 * 1024);
+			const bytes = fs.readSync(fd, buffer, 0, buffer.length, 0);
+			const line = buffer.toString("utf-8", 0, bytes).split("\n", 1)[0];
+			if (!line) return undefined;
+			const header = JSON.parse(line) as { type?: unknown; id?: unknown };
+			if (header.type === "session" && typeof header.id === "string" && /^[A-Za-z0-9-]{8,}$/.test(header.id)) return header.id;
+			return undefined;
+		} finally {
+			fs.closeSync(fd);
+		}
+	} catch {
+		return undefined;
+	}
+}
+
+function scheduleCleanup(nodeExecutable: string, paths: string[]): void {
+	try {
+		const watchdog = spawn(nodeExecutable, ["-e", ORCA_CLEANUP_WATCHDOG_SCRIPT, String(CLEANUP_DELAY_MS), ...paths], {
+			detached: true,
+			stdio: "ignore",
+			windowsHide: true,
+		});
+		watchdog.once("error", () => {});
+		watchdog.unref();
+	} catch {
+		// Cleanup remains best effort for this optional observer.
+	}
+}
+
+function loadOrcaProgressTabsConfig(): OrcaProgressTabsConfig | undefined {
+	try {
+		const configPath = path.join(getAgentDir(), "extensions", "subagent", "config.json");
+		const parsed = JSON.parse(fs.readFileSync(configPath, "utf-8")) as unknown;
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return undefined;
+		const value = (parsed as Record<string, unknown>).orcaProgressTabs;
+		if (!value || typeof value !== "object" || Array.isArray(value)) return undefined;
+		const config = value as Record<string, unknown>;
+		if (Object.keys(config).some((key) => key !== "enabled") || typeof config.enabled !== "boolean") return undefined;
+		return { enabled: config.enabled };
+	} catch {
+		return undefined;
+	}
+}
+
+export function createOrcaProgressTab(input: {
+	cwd: string;
+	runId: string;
+	agent: string;
+	index: number;
+	config?: OrcaProgressTabsConfig;
+	env?: NodeJS.ProcessEnv;
+	command?: string;
+}): OrcaProgressTab | undefined {
+	const config = input.config ?? loadOrcaProgressTabsConfig();
+	if (config?.enabled !== true || process.platform === "win32") return undefined;
+	const command = input.command ?? resolveOrcaCommand(input.env);
+	if (!command) return undefined;
+	const nodeExecutable = resolveNodeExecutable();
+
+	const root = progressRoot();
+	try {
+		fs.mkdirSync(root, { recursive: true, mode: 0o700 });
+	} catch {
+		return undefined;
+	}
+	pruneStaleProgressFiles(root);
+	const runId = safeSegment(input.runId, "run");
+	const agent = safeSegment(input.agent, "subagent");
+	const index = typeof input.index === "number" && Number.isInteger(input.index) && input.index >= 0 ? input.index : 0;
+	const cwd = typeof input.cwd === "string" && input.cwd ? input.cwd : process.cwd();
+	const tabSequence = reserveTabSequence(root, cwd);
+	if (tabSequence === undefined) return undefined;
+	const stem = `${runId}-${index}-${randomUUID()}`;
+	const logPath = path.join(root, `${stem}.log`);
+	const donePath = path.join(root, `${stem}.done`);
+	const title = `subagent · ${agent} · ${tabSequence}`;
+	try {
+		fs.writeFileSync(logPath, `pi-subagents / ${agent}\nrun ${runId} · child ${index + 1}\n${"─".repeat(48)}\n`, { encoding: "utf-8", mode: 0o600 });
+		fs.rmSync(donePath, { force: true });
+	} catch {
+		return undefined;
+	}
+
+	let available = true;
+	let truncated = false;
+	let scheduledBytes = fs.statSync(logPath).size;
+	const progressByteLimit = MAX_MIRROR_BYTES - MIRROR_FOOTER_RESERVE_BYTES;
+	const logStream = fs.createWriteStream(logPath, { flags: "a", mode: 0o600 });
+	const failObserver = () => {
+		if (!available) return;
+		available = false;
+		logStream.destroy();
+		try { fs.rmSync(logPath, { force: true }); } catch { /* best effort */ }
+		try { fs.rmSync(donePath, { force: true }); } catch { /* best effort */ }
+	};
+	logStream.once("error", failObserver);
+	const writeProgress = (text: string) => {
+		if (!available || !text || truncated) return;
+		const bytes = Buffer.byteLength(text);
+		if (scheduledBytes + bytes > progressByteLimit) {
+			truncated = true;
+			return;
+		}
+		scheduledBytes += bytes;
+		try {
+			logStream.write(text);
+		} catch {
+			failObserver();
+		}
+	};
+	try {
+		const watchdog = spawn(nodeExecutable, [
+			"-e", ORCA_CREATE_WATCHDOG_SCRIPT,
+			String(ORCA_CREATE_TIMEOUT_MS),
+			String(ORCA_KILL_GRACE_MS),
+			command,
+			"terminal", "create",
+			"--worktree", `path:${path.resolve(cwd)}`,
+			"--title", title,
+			"--command", viewerCommand(nodeExecutable, logPath, donePath),
+			"--json",
+		], {
+			cwd,
+			detached: true,
+			stdio: "ignore",
+			windowsHide: true,
+			env: input.env ?? process.env,
+		});
+		watchdog.once("close", (code) => {
+			if (code !== 0) failObserver();
+		});
+		watchdog.once("error", failObserver);
+		watchdog.unref();
+	} catch {
+		failObserver();
+		return undefined;
+	}
+
+	let finished = false;
+	return {
+		append(text) {
+			if (finished) return;
+			writeProgress(text);
+		},
+		event(event) {
+			if (!available || finished) return;
+			if (event.type === "tool_execution_start" && event.toolName) {
+				const args = event.args && typeof event.args === "object" && !Array.isArray(event.args)
+					? extractToolArgsPreview(event.args as Record<string, unknown>)
+					: "";
+				writeProgress(`\n› ${event.toolName}${args ? `: ${args}` : ""}\n`);
+				return;
+			}
+			if ((event.type === "message_end" || event.type === "tool_result_end") && event.message) {
+				const text = extractTextFromContent(event.message.content);
+				if (text.trim()) writeProgress(`${text}${text.endsWith("\n") ? "" : "\n"}`);
+			}
+		},
+		finish(status, sessionFile) {
+			if (!available || finished) return;
+			finished = true;
+			const sessionId = status === "completed" ? resolvePiSessionId(sessionFile) : undefined;
+			let verifiedSessionFile: string | undefined;
+			if (sessionId && sessionFile) {
+				try { verifiedSessionFile = fs.realpathSync(sessionFile); } catch { /* the session is no longer available */ }
+			}
+			const terminalMessage = verifiedSessionFile
+				? `completed. To remove the Pi session of this subagent, run rm -- ${shellQuote(verifiedSessionFile)}`
+				: status;
+			const truncation = truncated ? `\n[progress mirror truncated at ${MAX_MIRROR_BYTES} bytes]\n` : "";
+			let footer = `${truncation}\n${"─".repeat(48)}\n${terminalMessage}\n`;
+			if (scheduledBytes + Buffer.byteLength(footer) > MAX_MIRROR_BYTES) footer = `\n${status}\n`;
+			logStream.end(footer, () => {
+				if (!available) return;
+				try { fs.writeFileSync(donePath, `${status}\n`, { encoding: "utf-8", mode: 0o600 }); } catch { /* best effort */ }
+				scheduleCleanup(nodeExecutable, [logPath, donePath]);
+			});
+		},
+	};
+}

package/src/runs/shared/parallel-utils.ts

@@ -41,6 +41,8 @@ export interface RunnerSubagentStep {
 	sessionFile?: string;
 	maxSubagentDepth?: number;
 	timeoutMs?: number;
+	/** Resolved configured hard per-tool-call timeout (ms); fast tools still have a default when undefined. */
+	toolTimeoutMs?: number;
 	waitToolEnabled?: boolean;
 	structuredOutput?: {
 		schema: import("../../shared/types.ts").JsonSchemaObject;

package/src/runs/shared/subagent-control.ts

@@ -6,6 +6,7 @@ import {
 	type ControlNotificationChannel,
 	type ResolvedControlConfig,
 } from "../../shared/types.ts";
+import { isToolTimeoutExempt } from "./tool-timeout.ts";
 
 const CONTROL_EVENT_TYPES: ControlEventType[] = ["active_long_running", "needs_attention"];
 const CONTROL_NOTIFICATION_CHANNELS: ControlNotificationChannel[] = ["event", "async", "intercom"];
@@ -84,6 +85,18 @@ export function deriveActivityState(input: {
 	return ageMs > input.config.needsAttentionAfterMs ? "needs_attention" : undefined;
 }
 
+export function shouldEmitOpenToolAttention(input: {
+	config: ResolvedControlConfig;
+	currentTool?: string;
+	currentToolStartedAt?: number;
+	now?: number;
+}): boolean {
+	if (!input.config.enabled || !input.currentTool || input.currentToolStartedAt === undefined) return false;
+	if (isToolTimeoutExempt(input.currentTool)) return false;
+	const now = input.now ?? Date.now();
+	return Math.max(0, now - input.currentToolStartedAt) >= input.config.activeNoticeAfterMs;
+}
+
 export function buildControlEvent(input: {
 	type?: ControlEventType;
 	from?: ActivityState;
@@ -196,10 +209,12 @@ export function formatControlNoticeMessage(event: ControlEvent, childIntercomTar
 	const supervisorHint = event.reason === "supervisor_request"
 		? "Supervisor request: reply to the pending request. If subagent_supervisor pending is empty, check intercom pending because an external intercom tool may own the request."
 		: undefined;
+	const facts = formatLongRunningFacts(event);
 	return [
 		`Subagent needs attention: ${event.agent}`,
 		`Run: ${runTarget}${event.index !== undefined ? ` step ${event.index + 1}` : ""}`,
 		`Signal: ${event.message}`,
+		facts ? `Facts: ${facts}` : undefined,
 		event.recentFailureSummary ? `Recent failures: ${event.recentFailureSummary}` : undefined,
 		supervisorHint,
 		"Hint: Inspect status first unless the run is clearly blocked. Use steer for a top-level live async child, routed resume for a live nested child, or resume to revive a paused/completed/failed child.",

package/src/runs/shared/subagent-prompt-runtime.ts

@@ -580,16 +580,9 @@ export default function registerSubagentPromptRuntime(pi: ExtensionAPI): void {
 	} as unknown as SubagentState;
 	if (typeof pi.registerTool === "function") registerWaitTool(pi, waitState, waitToolEnabled);
 	let nativeSupervisorClientRegistered = false;
-	let nativeSupervisorFallbackRegistered = false;
 	const registerNativeSupervisorClientOnce = (): void => {
 		if (nativeSupervisorClientRegistered) return;
 		nativeSupervisorClientRegistered = true;
-		registerNativeSupervisorClient(pi, { includeIntercomFallback: false });
-	};
-	const registerNativeSupervisorFallbackOnce = (): void => {
-		registerNativeSupervisorClientOnce();
-		if (nativeSupervisorFallbackRegistered) return;
-		nativeSupervisorFallbackRegistered = true;
 		registerNativeSupervisorClient(pi);
 	};
 	const onRuntimeEvent = pi.on as unknown as (event: string, handler: (event: unknown, ctx?: ExtensionContext) => unknown) => void;
@@ -597,7 +590,6 @@ export default function registerSubagentPromptRuntime(pi: ExtensionAPI): void {
 		const sessionManager = (ctx as { sessionManager?: Parameters<typeof resolveCurrentSessionId>[0] } | undefined)?.sessionManager;
 		waitState.currentSessionId = sessionManager ? resolveCurrentSessionId(sessionManager) : null;
 		registerNativeSupervisorClientOnce();
-		if (readRequiredChildTools()?.includes("intercom")) registerNativeSupervisorFallbackOnce();
 	});
 	onRuntimeEvent("agent_start", () => {
 		refreshChildToolDiagnostic(pi);
@@ -650,7 +642,7 @@ export default function registerSubagentPromptRuntime(pi: ExtensionAPI): void {
 
 	onRuntimeEvent("before_agent_start", async (event: unknown) => {
 		if (!event || typeof event !== "object" || !("systemPrompt" in event) || typeof event.systemPrompt !== "string") return undefined;
-		registerNativeSupervisorFallbackOnce();
+		registerNativeSupervisorClientOnce();
 		const intercomSessionName = process.env[SUBAGENT_INTERCOM_SESSION_NAME_ENV]?.trim();
 		if (intercomSessionName && typeof pi.setSessionName === "function") {
 			pi.setSessionName(intercomSessionName);

package/src/runs/shared/subagent-startup-retry.ts

@@ -12,6 +12,7 @@ export const SUBAGENT_STARTUP_RETRY_DELAYS_MS = [250, 750, 1500] as const;
 export const MAX_SUBAGENT_STARTUP_FAILURE_DURATION_MS = 2000;
 
 const SIGKILL_PROCESS_SIGNAL_ERROR = formatProcessSignalError("SIGKILL");
+const EXTENSION_REGISTRATION_CONFLICT_PATTERN = /Failed to load extension\b[^\n]*:\s*(?:Tool|Flag)\s+"[^"]+"\s+conflicts with\b/i;
 
 export interface SubagentStartupFailureEvidence {
 	exitCode: number | null | undefined;
@@ -31,6 +32,17 @@ export interface SubagentStartupFailureEvidence {
 	turnBudgetExceeded?: boolean;
 }
 
+export function formatSubagentExtensionConflictError(
+	error: string | undefined,
+	input: { agent: string; ambientExtensionsEnabled: boolean },
+): string | undefined {
+	if (!error || !input.ambientExtensionsEnabled || !EXTENSION_REGISTRATION_CONFLICT_PATTERN.test(error)) return error;
+	const settings = JSON.stringify({
+		subagents: { agentOverrides: { [input.agent]: { extensions: [] } } },
+	});
+	return `${error}\n\nSubagent startup loaded conflicting ambient Pi extensions. Retry this run after disabling ambient extension discovery for agent ${JSON.stringify(input.agent)} in project .pi/settings.json: ${settings}. Replace the empty array with only the required extension entry paths when this agent needs extension tools.`;
+}
+
 function hasUsage(usage: Usage): boolean {
 	return usage.input !== 0
 		|| usage.output !== 0