pi-subagents 0.3.0 → 0.3.2

package/index.ts

@@ -12,904 +12,41 @@
  *   { "asyncByDefault": true }
  */
 
-import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import * as fs from "node:fs";
-import { createRequire } from "node:module";
 import * as os from "node:os";
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
-import type { AgentToolResult } from "@mariozechner/pi-agent-core";
-import type { Message } from "@mariozechner/pi-ai";
-import { type ExtensionAPI, type ExtensionContext, type ToolDefinition, getMarkdownTheme } from "@mariozechner/pi-coding-agent";
-import { Container, Markdown, Spacer, Text } from "@mariozechner/pi-tui";
-import { Type } from "@sinclair/typebox";
+import { type ExtensionAPI, type ExtensionContext, type ToolDefinition } from "@mariozechner/pi-coding-agent";
+import { Text } from "@mariozechner/pi-tui";
 import { type AgentConfig, type AgentScope, discoverAgents } from "./agents.js";
-import {
-	loadSubagentSettings,
-	resolveChainTemplatesV2,
-	createChainDir,
-	removeChainDir,
-	cleanupOldChainDirs,
-	resolveStepBehavior,
-	resolveParallelBehaviors,
-	buildChainInstructions,
-	createParallelDirs,
-	aggregateParallelOutputs,
-	isParallelStep,
-	isSequentialStep,
-	getStepAgents,
-	type StepOverrides,
-	type ChainStep,
-	type SequentialStep,
-	type ParallelStep,
-	type ParallelTaskResult,
-	type ResolvedTemplates,
-} from "./settings.js";
-import { ChainClarifyComponent, type ChainClarifyResult, type BehaviorOverride } from "./chain-clarify.js";
-import {
-	appendJsonl,
-	cleanupOldArtifacts,
-	ensureArtifactsDir,
-	getArtifactPaths,
-	getArtifactsDir,
-	writeArtifact,
-	writeMetadata,
-} from "./artifacts.js";
+import { cleanupOldChainDirs, getStepAgents, isParallelStep, type ChainStep, type SequentialStep } from "./settings.js";
+import { cleanupOldArtifacts, getArtifactsDir } from "./artifacts.js";
 import {
 	type AgentProgress,
 	type ArtifactConfig,
 	type ArtifactPaths,
+	type AsyncJobState,
+	type Details,
+	type ExtensionConfig,
+	type SingleResult,
+	ASYNC_DIR,
 	DEFAULT_ARTIFACT_CONFIG,
 	DEFAULT_MAX_OUTPUT,
-	type MaxOutputConfig,
-	type ProgressSummary,
-	type TruncationResult,
-	truncateOutput,
+	MAX_CONCURRENCY,
+	MAX_PARALLEL,
+	POLL_INTERVAL_MS,
+	RESULTS_DIR,
+	WIDGET_KEY,
 } from "./types.js";
+import { formatDuration } from "./formatters.js";
+import { readStatus, findByPrefix, getFinalOutput, mapConcurrent } from "./utils.js";
+import { runSync } from "./execution.js";
+import { renderWidget, renderSubagentResult } from "./render.js";
+import { SubagentParams, StatusParams } from "./schemas.js";
+import { executeChain } from "./chain-execution.js";
+import { isAsyncAvailable, executeAsyncChain, executeAsyncSingle } from "./async-execution.js";
 
-const MAX_PARALLEL = 8;
-const MAX_CONCURRENCY = 4;
-const COLLAPSED_ITEMS = 8;
-const RESULTS_DIR = "/tmp/pi-async-subagent-results";
-const ASYNC_DIR = "/tmp/pi-async-subagent-runs";
-const WIDGET_KEY = "subagent-async";
-const POLL_INTERVAL_MS = 1000;
-const MAX_WIDGET_JOBS = 4;
-
-const require = createRequire(import.meta.url);
-const jitiCliPath: string | undefined = (() => {
-	try {
-		return path.join(path.dirname(require.resolve("jiti/package.json")), "lib/jiti-cli.mjs");
-	} catch {
-		return undefined;
-	}
-})();
-
-interface Usage {
-	input: number;
-	output: number;
-	cacheRead: number;
-	cacheWrite: number;
-	cost: number;
-	turns: number;
-}
-
-interface SingleResult {
-	agent: string;
-	task: string;
-	exitCode: number;
-	messages: Message[];
-	usage: Usage;
-	model?: string;
-	error?: string;
-	sessionFile?: string;
-	// Sharing disabled - module resolution issues
-	// shareUrl?: string;
-	// gistUrl?: string;
-	// shareError?: string;
-	progress?: AgentProgress;
-	progressSummary?: ProgressSummary;
-	artifactPaths?: ArtifactPaths;
-	truncation?: TruncationResult;
-}
-
-interface Details {
-	mode: "single" | "parallel" | "chain";
-	results: SingleResult[];
-	asyncId?: string;
-	asyncDir?: string;
-	progress?: AgentProgress[];
-	progressSummary?: ProgressSummary;
-	artifacts?: {
-		dir: string;
-		files: ArtifactPaths[];
-	};
-	truncation?: {
-		truncated: boolean;
-		originalBytes?: number;
-		originalLines?: number;
-		artifactPath?: string;
-	};
-	// Chain metadata for observability
-	chainAgents?: string[];      // Agent names in order, e.g., ["scout", "planner"]
-	totalSteps?: number;         // Total steps in chain
-	currentStepIndex?: number;   // 0-indexed current step (for running chains)
-}
-
-type DisplayItem = { type: "text"; text: string } | { type: "tool"; name: string; args: Record<string, unknown> };
-
-interface TokenUsage {
-	input: number;
-	output: number;
-	total: number;
-}
-
-interface AsyncStatus {
-	runId: string;
-	mode: "single" | "chain";
-	state: "queued" | "running" | "complete" | "failed";
-	startedAt: number;
-	endedAt?: number;
-	lastUpdate?: number;
-	currentStep?: number;
-	steps?: Array<{ agent: string; status: string; durationMs?: number; tokens?: TokenUsage }>;
-	sessionDir?: string;
-	outputFile?: string;
-	totalTokens?: TokenUsage;
-	sessionFile?: string;
-	// Sharing disabled
-	// shareUrl?: string;
-	// shareError?: string;
-}
-
-interface AsyncJobState {
-	asyncId: string;
-	asyncDir: string;
-	status: "queued" | "running" | "complete" | "failed";
-	mode?: "single" | "chain";
-	agents?: string[];
-	currentStep?: number;
-	stepsTotal?: number;
-	startedAt?: number;
-	updatedAt?: number;
-	sessionDir?: string;
-	outputFile?: string;
-	totalTokens?: TokenUsage;
-	sessionFile?: string;
-	// shareUrl?: string;
-}
-
-function formatTokens(n: number): string {
-	return n < 1000 ? String(n) : n < 10000 ? `${(n / 1000).toFixed(1)}k` : `${Math.round(n / 1000)}k`;
-}
-
-function formatUsage(u: Usage, model?: string): string {
-	const parts: string[] = [];
-	if (u.turns) parts.push(`${u.turns} turn${u.turns > 1 ? "s" : ""}`);
-	if (u.input) parts.push(`in:${formatTokens(u.input)}`);
-	if (u.output) parts.push(`out:${formatTokens(u.output)}`);
-	if (u.cacheRead) parts.push(`R${formatTokens(u.cacheRead)}`);
-	if (u.cacheWrite) parts.push(`W${formatTokens(u.cacheWrite)}`);
-	if (u.cost) parts.push(`$${u.cost.toFixed(4)}`);
-	if (model) parts.push(model);
-	return parts.join(" ");
-}
-
-function formatDuration(ms: number): string {
-	if (ms < 1000) return `${ms}ms`;
-	if (ms < 60000) return `${(ms / 1000).toFixed(1)}s`;
-	return `${Math.floor(ms / 60000)}m${Math.floor((ms % 60000) / 1000)}s`;
-}
-
-function buildChainSummary(
-	steps: ChainStep[],
-	results: SingleResult[],
-	chainDir: string,
-	status: "completed" | "failed",
-	failedStep?: { index: number; error: string },
-): string {
-	// Build step names for display
-	const stepNames = steps
-		.map((s) => (isParallelStep(s) ? `parallel[${s.parallel.length}]` : (s as SequentialStep).agent))
-		.join(" → ");
-
-	// Calculate total duration from results
-	const totalDuration = results.reduce((sum, r) => sum + (r.progress?.durationMs || 0), 0);
-	const durationStr = formatDuration(totalDuration);
-
-	// Check for progress.md
-	const progressPath = path.join(chainDir, "progress.md");
-	const hasProgress = fs.existsSync(progressPath);
-
-	if (status === "completed") {
-		const stepWord = results.length === 1 ? "step" : "steps";
-		return `✅ Chain completed: ${stepNames} (${results.length} ${stepWord}, ${durationStr})
-
-📋 Progress: ${hasProgress ? progressPath : "(none)"}
-📁 Artifacts: ${chainDir}`;
-	} else {
-		const stepInfo = failedStep ? ` at step ${failedStep.index + 1}` : "";
-		const errorInfo = failedStep?.error ? `: ${failedStep.error}` : "";
-		return `❌ Chain failed${stepInfo}${errorInfo}
-
-📋 Progress: ${hasProgress ? progressPath : "(none)"}
-📁 Artifacts: ${chainDir}`;
-	}
-}
-
-function readStatus(asyncDir: string): AsyncStatus | null {
-	const statusPath = path.join(asyncDir, "status.json");
-	if (!fs.existsSync(statusPath)) return null;
-	try {
-		const content = fs.readFileSync(statusPath, "utf-8");
-		return JSON.parse(content) as AsyncStatus;
-	} catch {
-		return null;
-	}
-}
-
-function getOutputTail(outputFile: string | undefined, maxLines: number = 3): string[] {
-	if (!outputFile || !fs.existsSync(outputFile)) return [];
-	let fd: number | null = null;
-	try {
-		const stat = fs.statSync(outputFile);
-		if (stat.size === 0) return [];
-		const tailBytes = 4096;
-		const start = Math.max(0, stat.size - tailBytes);
-		fd = fs.openSync(outputFile, "r");
-		const buffer = Buffer.alloc(Math.min(tailBytes, stat.size));
-		fs.readSync(fd, buffer, 0, buffer.length, start);
-		const content = buffer.toString("utf-8");
-		const lines = content.split("\n").filter((l) => l.trim());
-		return lines.slice(-maxLines).map((l) => l.slice(0, 80) + (l.length > 80 ? "..." : ""));
-	} catch {
-		return [];
-	} finally {
-		if (fd !== null) {
-			try {
-				fs.closeSync(fd);
-			} catch {}
-		}
-	}
-}
-
-function getLastActivity(outputFile: string | undefined): string {
-	if (!outputFile || !fs.existsSync(outputFile)) return "";
-	try {
-		const stat = fs.statSync(outputFile);
-		const ago = Date.now() - stat.mtimeMs;
-		if (ago < 1000) return "active now";
-		if (ago < 60000) return `active ${Math.floor(ago / 1000)}s ago`;
-		return `active ${Math.floor(ago / 60000)}m ago`;
-	} catch {
-		return "";
-	}
-}
-
-function renderWidget(ctx: ExtensionContext, jobs: AsyncJobState[]): void {
-	if (!ctx.hasUI) return;
-	if (jobs.length === 0) {
-		ctx.ui.setWidget(WIDGET_KEY, undefined);
-		return;
-	}
-
-	const theme = ctx.ui.theme;
-	const lines: string[] = [];
-	lines.push(theme.fg("accent", "Async subagents"));
-
-	for (const job of jobs.slice(0, MAX_WIDGET_JOBS)) {
-		const id = job.asyncId.slice(0, 6);
-		const status =
-			job.status === "complete"
-				? theme.fg("success", "complete")
-				: job.status === "failed"
-					? theme.fg("error", "failed")
-					: theme.fg("warning", "running");
-
-		const stepsTotal = job.stepsTotal ?? (job.agents?.length ?? 1);
-		const stepIndex = job.currentStep !== undefined ? job.currentStep + 1 : undefined;
-		const stepText = stepIndex !== undefined ? `step ${stepIndex}/${stepsTotal}` : `steps ${stepsTotal}`;
-		const endTime = (job.status === "complete" || job.status === "failed") ? (job.updatedAt ?? Date.now()) : Date.now();
-		const elapsed = job.startedAt ? formatDuration(endTime - job.startedAt) : "";
-		const agentLabel = job.agents ? job.agents.join(" -> ") : (job.mode ?? "single");
-
-		const tokenText = job.totalTokens ? ` | ${formatTokens(job.totalTokens.total)} tok` : "";
-		const activityText = job.status === "running" ? getLastActivity(job.outputFile) : "";
-		const activitySuffix = activityText ? ` | ${theme.fg("dim", activityText)}` : "";
-
-		lines.push(`- ${id} ${status} | ${agentLabel} | ${stepText}${elapsed ? ` | ${elapsed}` : ""}${tokenText}${activitySuffix}`);
-
-		if (job.status === "running" && job.outputFile) {
-			const tail = getOutputTail(job.outputFile, 3);
-			for (const line of tail) {
-				lines.push(theme.fg("dim", `  > ${line}`));
-			}
-		}
-	}
-
-	ctx.ui.setWidget(WIDGET_KEY, lines);
-}
-
-function findByPrefix(dir: string, prefix: string, suffix?: string): string | null {
-	if (!fs.existsSync(dir)) return null;
-	const entries = fs.readdirSync(dir).filter((entry) => entry.startsWith(prefix));
-	if (suffix) {
-		const withSuffix = entries.filter((entry) => entry.endsWith(suffix));
-		if (withSuffix.length > 0) return path.join(dir, withSuffix.sort()[0]);
-	}
-	if (entries.length === 0) return null;
-	return path.join(dir, entries.sort()[0]);
-}
-
-function getFinalOutput(messages: Message[]): string {
-	for (let i = messages.length - 1; i >= 0; i--) {
-		const msg = messages[i];
-		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text") return part.text;
-			}
-		}
-	}
-	return "";
-}
-
-interface ErrorInfo {
-	hasError: boolean;
-	exitCode?: number;
-	errorType?: string;
-	details?: string;
-}
-
-function detectSubagentError(messages: Message[]): ErrorInfo {
-	for (const msg of messages) {
-		if (msg.role === "toolResult" && (msg as any).isError) {
-			const text = msg.content.find((c) => c.type === "text");
-			const details = text && "text" in text ? text.text : undefined;
-			const exitMatch = details?.match(/exit(?:ed)?\s*(?:with\s*)?(?:code|status)?\s*[:\s]?\s*(\d+)/i);
-			return {
-				hasError: true,
-				exitCode: exitMatch ? parseInt(exitMatch[1], 10) : 1,
-				errorType: (msg as any).toolName || "tool",
-				details: details?.slice(0, 200),
-			};
-		}
-	}
-
-	for (const msg of messages) {
-		if (msg.role !== "toolResult") continue;
-		const toolName = (msg as any).toolName;
-		if (toolName !== "bash") continue;
-
-		const text = msg.content.find((c) => c.type === "text");
-		if (!text || !("text" in text)) continue;
-		const output = text.text;
-
-		const exitMatch = output.match(/exit(?:ed)?\s*(?:with\s*)?(?:code|status)?\s*[:\s]?\s*(\d+)/i);
-		if (exitMatch) {
-			const code = parseInt(exitMatch[1], 10);
-			if (code !== 0) {
-				return { hasError: true, exitCode: code, errorType: "bash", details: output.slice(0, 200) };
-			}
-		}
-
-		const errorPatterns = [
-			/command not found/i,
-			/permission denied/i,
-			/no such file or directory/i,
-			/segmentation fault/i,
-			/killed|terminated/i,
-			/out of memory/i,
-			/connection refused/i,
-			/timeout/i,
-		];
-		for (const pattern of errorPatterns) {
-			if (pattern.test(output)) {
-				return { hasError: true, exitCode: 1, errorType: "bash", details: output.slice(0, 200) };
-			}
-		}
-	}
-
-	return { hasError: false };
-}
-
-function getDisplayItems(messages: Message[]): DisplayItem[] {
-	const items: DisplayItem[] = [];
-	for (const msg of messages) {
-		if (msg.role === "assistant") {
-			for (const part of msg.content) {
-				if (part.type === "text") items.push({ type: "text", text: part.text });
-				else if (part.type === "toolCall") items.push({ type: "tool", name: part.name, args: part.arguments });
-			}
-		}
-	}
-	return items;
-}
-
-function shortenPath(p: string): string {
-	const home = os.homedir();
-	return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
-}
-
-function formatToolCall(name: string, args: Record<string, unknown>): string {
-	switch (name) {
-		case "bash":
-			return `$ ${((args.command as string) || "").slice(0, 60)}${(args.command as string)?.length > 60 ? "..." : ""}`;
-		case "read":
-			return `read ${shortenPath((args.path || args.file_path || "") as string)}`;
-		case "write":
-			return `write ${shortenPath((args.path || args.file_path || "") as string)}`;
-		case "edit":
-			return `edit ${shortenPath((args.path || args.file_path || "") as string)}`;
-		default: {
-			const s = JSON.stringify(args);
-			return `${name} ${s.slice(0, 40)}${s.length > 40 ? "..." : ""}`;
-		}
-	}
-}
-
-function extractToolArgsPreview(args: Record<string, unknown>): string {
-	const previewKeys = ["command", "path", "file_path", "pattern", "query", "url", "task"];
-	for (const key of previewKeys) {
-		if (args[key] && typeof args[key] === "string") {
-			const value = args[key] as string;
-			return value.length > 60 ? `${value.slice(0, 57)}...` : value;
-		}
-	}
-	return "";
-}
-
-function extractTextFromContent(content: unknown): string {
-	if (!Array.isArray(content)) return "";
-	for (const part of content) {
-		if (part && typeof part === "object" && "type" in part && part.type === "text" && "text" in part) {
-			return String(part.text);
-		}
-	}
-	return "";
-}
-
-function writePrompt(agent: string, prompt: string): { dir: string; path: string } {
-	const dir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-subagent-"));
-	const p = path.join(dir, `${agent.replace(/[^\w.-]/g, "_")}.md`);
-	fs.writeFileSync(p, prompt, { mode: 0o600 });
-	return { dir, path: p };
-}
-
-function findLatestSessionFile(sessionDir: string): string | null {
-	try {
-		const files = fs
-			.readdirSync(sessionDir)
-			.filter((f) => f.endsWith(".jsonl"))
-			.map((f) => path.join(sessionDir, f));
-		if (files.length === 0) return null;
-		files.sort((a, b) => fs.statSync(b).mtimeMs - fs.statSync(a).mtimeMs);
-		return files[0] ?? null;
-	} catch {
-		return null;
-	}
-}
-
-// HTML export and sharing removed - module resolution issues with global pi installation
-// The session files are still available at the paths shown in the output
-
-interface RunSyncOptions {
-	cwd?: string;
-	signal?: AbortSignal;
-	onUpdate?: (r: AgentToolResult<Details>) => void;
-	maxOutput?: MaxOutputConfig;
-	artifactsDir?: string;
-	artifactConfig?: ArtifactConfig;
-	runId: string;
-	index?: number;
-	sessionDir?: string;
-	share?: boolean;
-}
-
-async function runSync(
-	runtimeCwd: string,
-	agents: AgentConfig[],
-	agentName: string,
-	task: string,
-	options: RunSyncOptions,
-): Promise<SingleResult> {
-	const { cwd, signal, onUpdate, maxOutput, artifactsDir, artifactConfig, runId, index } = options;
-	const agent = agents.find((a) => a.name === agentName);
-	if (!agent) {
-		return {
-			agent: agentName,
-			task,
-			exitCode: 1,
-			messages: [],
-			usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
-			error: `Unknown agent: ${agentName}`,
-		};
-	}
-
-	const args = ["--mode", "json", "-p"];
-	const shareEnabled = options.share === true;
-	const sessionEnabled = Boolean(options.sessionDir) || shareEnabled;
-	if (!sessionEnabled) {
-		args.push("--no-session");
-	}
-	if (options.sessionDir) {
-		try {
-			fs.mkdirSync(options.sessionDir, { recursive: true });
-		} catch {}
-		args.push("--session-dir", options.sessionDir);
-	}
-	if (agent.model) args.push("--model", agent.model);
-	if (agent.tools?.length) {
-		const builtinTools: string[] = [];
-		const extensionPaths: string[] = [];
-		for (const tool of agent.tools) {
-			if (tool.includes("/") || tool.endsWith(".ts") || tool.endsWith(".js")) {
-				extensionPaths.push(tool);
-			} else {
-				builtinTools.push(tool);
-			}
-		}
-		if (builtinTools.length > 0) {
-			args.push("--tools", builtinTools.join(","));
-		}
-		for (const extPath of extensionPaths) {
-			args.push("--extension", extPath);
-		}
-	}
-
-	let tmpDir: string | null = null;
-	if (agent.systemPrompt?.trim()) {
-		const tmp = writePrompt(agent.name, agent.systemPrompt);
-		tmpDir = tmp.dir;
-		args.push("--append-system-prompt", tmp.path);
-	}
-	args.push(`Task: ${task}`);
-
-	const result: SingleResult = {
-		agent: agentName,
-		task,
-		exitCode: 0,
-		messages: [],
-		usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
-	};
-
-	const progress: AgentProgress = {
-		index: index ?? 0,
-		agent: agentName,
-		status: "running",
-		task,
-		recentTools: [],
-		recentOutput: [],
-		toolCount: 0,
-		tokens: 0,
-		durationMs: 0,
-	};
-	result.progress = progress;
-
-	const startTime = Date.now();
-	const jsonlLines: string[] = [];
-
-	let artifactPathsResult: ArtifactPaths | undefined;
-	if (artifactsDir && artifactConfig?.enabled !== false) {
-		artifactPathsResult = getArtifactPaths(artifactsDir, runId, agentName, index);
-		ensureArtifactsDir(artifactsDir);
-		if (artifactConfig?.includeInput !== false) {
-			writeArtifact(artifactPathsResult.inputPath, `# Task for ${agentName}\n\n${task}`);
-		}
-	}
-
-	const exitCode = await new Promise<number>((resolve) => {
-		const proc = spawn("pi", args, { cwd: cwd ?? runtimeCwd, stdio: ["ignore", "pipe", "pipe"] });
-		let buf = "";
-
-		const processLine = (line: string) => {
-			if (!line.trim()) return;
-			jsonlLines.push(line);
-			try {
-				const evt = JSON.parse(line) as { type?: string; message?: Message; toolName?: string; args?: unknown };
-				const now = Date.now();
-				progress.durationMs = now - startTime;
-
-				if (evt.type === "tool_execution_start") {
-					progress.toolCount++;
-					progress.currentTool = evt.toolName;
-					progress.currentToolArgs = extractToolArgsPreview((evt.args || {}) as Record<string, unknown>);
-					if (onUpdate)
-						onUpdate({
-							content: [{ type: "text", text: getFinalOutput(result.messages) || "(running...)" }],
-							details: { mode: "single", results: [result], progress: [progress] },
-						});
-				}
-
-				if (evt.type === "tool_execution_end") {
-					if (progress.currentTool) {
-						progress.recentTools.unshift({
-							tool: progress.currentTool,
-							args: progress.currentToolArgs || "",
-							endMs: now,
-						});
-						if (progress.recentTools.length > 5) {
-							progress.recentTools.pop();
-						}
-					}
-					progress.currentTool = undefined;
-					progress.currentToolArgs = undefined;
-					if (onUpdate)
-						onUpdate({
-							content: [{ type: "text", text: getFinalOutput(result.messages) || "(running...)" }],
-							details: { mode: "single", results: [result], progress: [progress] },
-						});
-				}
-
-				if (evt.type === "message_end" && evt.message) {
-					result.messages.push(evt.message);
-					if (evt.message.role === "assistant") {
-						result.usage.turns++;
-						const u = evt.message.usage;
-						if (u) {
-							result.usage.input += u.input || 0;
-							result.usage.output += u.output || 0;
-							result.usage.cacheRead += u.cacheRead || 0;
-							result.usage.cacheWrite += u.cacheWrite || 0;
-							result.usage.cost += u.cost?.total || 0;
-							progress.tokens = result.usage.input + result.usage.output;
-						}
-						if (!result.model && evt.message.model) result.model = evt.message.model;
-						if (evt.message.errorMessage) result.error = evt.message.errorMessage;
-
-						const text = extractTextFromContent(evt.message.content);
-						if (text) {
-							const lines = text
-								.split("\n")
-								.filter((l) => l.trim())
-								.slice(-8);
-							progress.recentOutput = lines;
-						}
-					}
-					if (onUpdate)
-						onUpdate({
-							content: [{ type: "text", text: getFinalOutput(result.messages) || "(running...)" }],
-							details: { mode: "single", results: [result], progress: [progress] },
-						});
-				}
-				if (evt.type === "tool_result_end" && evt.message) {
-					result.messages.push(evt.message);
-					if (onUpdate)
-						onUpdate({
-							content: [{ type: "text", text: getFinalOutput(result.messages) || "(running...)" }],
-							details: { mode: "single", results: [result], progress: [progress] },
-						});
-				}
-			} catch {}
-		};
-
-		let stderrBuf = "";
-		let lastUpdateTime = 0;
-		const UPDATE_THROTTLE_MS = 150;
-
-		proc.stdout.on("data", (d) => {
-			buf += d.toString();
-			const lines = buf.split("\n");
-			buf = lines.pop() || "";
-			lines.forEach(processLine);
-
-			// Throttled periodic update for smoother progress display
-			const now = Date.now();
-			if (onUpdate && now - lastUpdateTime > UPDATE_THROTTLE_MS) {
-				lastUpdateTime = now;
-				progress.durationMs = now - startTime;
-				onUpdate({
-					content: [{ type: "text", text: getFinalOutput(result.messages) || "(running...)" }],
-					details: { mode: "single", results: [result], progress: [progress] },
-				});
-			}
-		});
-		proc.stderr.on("data", (d) => {
-			stderrBuf += d.toString();
-		});
-		proc.on("close", (code) => {
-			if (buf.trim()) processLine(buf);
-			if (code !== 0 && stderrBuf.trim() && !result.error) {
-				result.error = stderrBuf.trim();
-			}
-			resolve(code ?? 0);
-		});
-		proc.on("error", () => resolve(1));
-
-		if (signal) {
-			const kill = () => {
-				proc.kill("SIGTERM");
-				setTimeout(() => !proc.killed && proc.kill("SIGKILL"), 3000);
-			};
-			if (signal.aborted) kill();
-			else signal.addEventListener("abort", kill, { once: true });
-		}
-	});
-
-	if (tmpDir) fs.rmSync(tmpDir, { recursive: true, force: true });
-	result.exitCode = exitCode;
-
-	if (exitCode === 0 && !result.error) {
-		const errInfo = detectSubagentError(result.messages);
-		if (errInfo.hasError) {
-			result.exitCode = errInfo.exitCode ?? 1;
-			result.error = errInfo.details
-				? `${errInfo.errorType} failed (exit ${errInfo.exitCode}): ${errInfo.details}`
-				: `${errInfo.errorType} failed with exit code ${errInfo.exitCode}`;
-		}
-	}
-
-	progress.status = result.exitCode === 0 ? "completed" : "failed";
-	progress.durationMs = Date.now() - startTime;
-	if (result.error) {
-		progress.error = result.error;
-		if (progress.currentTool) {
-			progress.failedTool = progress.currentTool;
-		}
-	}
-
-	result.progress = progress;
-	result.progressSummary = {
-		toolCount: progress.toolCount,
-		tokens: progress.tokens,
-		durationMs: progress.durationMs,
-	};
-
-	if (artifactPathsResult && artifactConfig?.enabled !== false) {
-		result.artifactPaths = artifactPathsResult;
-		const fullOutput = getFinalOutput(result.messages);
-
-		if (artifactConfig?.includeOutput !== false) {
-			writeArtifact(artifactPathsResult.outputPath, fullOutput);
-		}
-		if (artifactConfig?.includeJsonl !== false) {
-			for (const line of jsonlLines) {
-				appendJsonl(artifactPathsResult.jsonlPath, line);
-			}
-		}
-		if (artifactConfig?.includeMetadata !== false) {
-			writeMetadata(artifactPathsResult.metadataPath, {
-				runId,
-				agent: agentName,
-				task,
-				exitCode: result.exitCode,
-				usage: result.usage,
-				model: result.model,
-				durationMs: progress.durationMs,
-				toolCount: progress.toolCount,
-				error: result.error,
-				timestamp: Date.now(),
-			});
-		}
-
-		if (maxOutput) {
-			const config = { ...DEFAULT_MAX_OUTPUT, ...maxOutput };
-			const truncationResult = truncateOutput(fullOutput, config, artifactPathsResult.outputPath);
-			if (truncationResult.truncated) {
-				result.truncation = truncationResult;
-			}
-		}
-	} else if (maxOutput) {
-		const config = { ...DEFAULT_MAX_OUTPUT, ...maxOutput };
-		const fullOutput = getFinalOutput(result.messages);
-		const truncationResult = truncateOutput(fullOutput, config);
-		if (truncationResult.truncated) {
-			result.truncation = truncationResult;
-		}
-	}
-
-	if (shareEnabled && options.sessionDir) {
-		const sessionFile = findLatestSessionFile(options.sessionDir);
-		if (sessionFile) {
-			result.sessionFile = sessionFile;
-			// HTML export disabled - module resolution issues with global pi installation
-			// Users can still access the session file directly
-		}
-	}
-
-	return result;
-}
-
-async function mapConcurrent<T, R>(items: T[], limit: number, fn: (item: T, i: number) => Promise<R>): Promise<R[]> {
-	const results: R[] = new Array(items.length);
-	let next = 0;
-	await Promise.all(
-		Array(Math.min(limit, items.length))
-			.fill(0)
-			.map(async () => {
-				while (next < items.length) {
-					const i = next++;
-					results[i] = await fn(items[i], i);
-				}
-			}),
-	);
-	return results;
-}
-
-const TaskItem = Type.Object({ agent: Type.String(), task: Type.String(), cwd: Type.Optional(Type.String()) });
-
-// Sequential chain step (single agent)
-const SequentialStepSchema = Type.Object({
-	agent: Type.String(),
-	task: Type.Optional(Type.String({ description: "Task template. Use {task}, {previous}, {chain_dir}. Required for first step." })),
-	cwd: Type.Optional(Type.String()),
-	// Chain behavior overrides
-	output: Type.Optional(Type.Union([
-		Type.String(),
-		Type.Boolean(),
-	], { description: "Override output filename (string), or false for text-only" })),
-	reads: Type.Optional(Type.Union([
-		Type.Array(Type.String()),
-		Type.Boolean(),
-	], { description: "Override files to read from {chain_dir} (array), or false to disable" })),
-	progress: Type.Optional(Type.Boolean({ description: "Override progress tracking" })),
-});
-
-// Parallel task item (within a parallel step)
-const ParallelTaskSchema = Type.Object({
-	agent: Type.String(),
-	task: Type.Optional(Type.String({ description: "Task template. Defaults to {previous}." })),
-	cwd: Type.Optional(Type.String()),
-	output: Type.Optional(Type.Union([
-		Type.String(),
-		Type.Boolean(),
-	], { description: "Override output filename (string), or false for text-only" })),
-	reads: Type.Optional(Type.Union([
-		Type.Array(Type.String()),
-		Type.Boolean(),
-	], { description: "Override files to read from {chain_dir} (array), or false to disable" })),
-	progress: Type.Optional(Type.Boolean({ description: "Override progress tracking" })),
-});
-
-// Parallel chain step (multiple agents running concurrently)
-const ParallelStepSchema = Type.Object({
-	parallel: Type.Array(ParallelTaskSchema, { minItems: 1, description: "Tasks to run in parallel" }),
-	concurrency: Type.Optional(Type.Number({ description: "Max concurrent tasks (default: 4)" })),
-	failFast: Type.Optional(Type.Boolean({ description: "Stop on first failure (default: false)" })),
-});
-
-// Chain item can be either sequential or parallel
-const ChainItem = Type.Union([SequentialStepSchema, ParallelStepSchema]);
-
-const MaxOutputSchema = Type.Optional(
-	Type.Object({
-		bytes: Type.Optional(Type.Number({ description: "Max bytes (default: 204800)" })),
-		lines: Type.Optional(Type.Number({ description: "Max lines (default: 5000)" })),
-	}),
-);
-
-const Params = Type.Object({
-	agent: Type.Optional(Type.String({ description: "Agent name (SINGLE mode)" })),
-	task: Type.Optional(Type.String({ description: "Task (SINGLE mode)" })),
-	tasks: Type.Optional(Type.Array(TaskItem, { description: "PARALLEL mode: [{agent, task}, ...]" })),
-	chain: Type.Optional(Type.Array(ChainItem, { description: "CHAIN mode: [{agent}, {agent, task:'{previous}'}] - sequential pipeline" })),
-	async: Type.Optional(Type.Boolean({ description: "Run in background (default: false, or per config)" })),
-	agentScope: Type.Optional(Type.String({ description: "Agent discovery scope: 'user', 'project', or 'both' (default: 'user')" })),
-	cwd: Type.Optional(Type.String()),
-	maxOutput: MaxOutputSchema,
-	artifacts: Type.Optional(Type.Boolean({ description: "Write debug artifacts (default: true)" })),
-	includeProgress: Type.Optional(Type.Boolean({ description: "Include full progress in result (default: false)" })),
-	share: Type.Optional(Type.Boolean({ description: "Create shareable session log (default: true)", default: true })),
-	sessionDir: Type.Optional(
-		Type.String({ description: "Directory to store session logs (default: temp; enables sessions even if share=false)" }),
-	),
-	// Chain clarification TUI
-	clarify: Type.Optional(Type.Boolean({ description: "Show TUI to clarify chain templates (default: true for chains). Implies sync mode." })),
-	// Solo agent output override
-	output: Type.Optional(Type.Union([
-		Type.String(),
-		Type.Boolean(),
-	], { description: "Override output file for single agent (string), or false to disable (uses agent default if omitted)" })),
-});
-
-const StatusParams = Type.Object({
-	id: Type.Optional(Type.String({ description: "Async run id or prefix" })),
-	dir: Type.Optional(Type.String({ description: "Async run directory (overrides id search)" })),
-});
-
-interface ExtensionConfig {
-	asyncByDefault?: boolean;
-}
+// ExtensionConfig is now imported from ./types.js
 
 function loadConfig(): ExtensionConfig {
 	const configPath = path.join(os.homedir(), ".pi", "agent", "extensions", "subagent", "config.json");
@@ -936,6 +73,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 	let baseCwd = process.cwd();
 	let currentSessionId: string | null = null;
 	const asyncJobs = new Map<string, AsyncJobState>();
+	const cleanupTimers = new Map<string, ReturnType<typeof setTimeout>>(); // Track cleanup timeouts
 	let lastUiContext: ExtensionContext | null = null;
 	let poller: NodeJS.Timeout | null = null;
 
@@ -951,6 +89,10 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 			}
 
 			for (const job of asyncJobs.values()) {
+				// Skip status reads for finished jobs - they won't change
+				if (job.status === "complete" || job.status === "failed") {
+					continue;
+				}
 				const status = readStatus(job.asyncDir);
 				if (status) {
 					job.status = status.state;
@@ -997,7 +139,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 		.filter((f) => f.endsWith(".json"))
 		.forEach(handleResult);
 
-	const tool: ToolDefinition<typeof Params, Details> = {
+	const tool: ToolDefinition<typeof SubagentParams, Details> = {
 		name: "subagent",
 		label: "Subagent",
 		description: `Delegate to subagents. Use exactly ONE mode:
@@ -1005,7 +147,7 @@ export default function registerSubagentExtension(pi: ExtensionAPI): void {
 • CHAIN: { chain: [{agent:"scout"}, {agent:"planner"}] } - sequential, {previous} passes output
 • PARALLEL: { tasks: [{agent,task}, ...] } - concurrent
 For "scout → planner" or multi-step flows, use chain (not multiple single calls).`,
-		parameters: Params,
+		parameters: SubagentParams,
 
 		async execute(_id, params, onUpdate, ctx, signal) {
 			const scope: AgentScope = params.agentScope ?? "user";
@@ -1071,9 +213,11 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 				// First step must have a task
 				const firstStep = params.chain[0] as ChainStep;
 				if (isParallelStep(firstStep)) {
-					if (!firstStep.parallel[0]?.task) {
+					// All tasks in the first parallel step must have tasks (no {previous} to reference)
+					const missingTaskIndex = firstStep.parallel.findIndex((t) => !t.task);
+					if (missingTaskIndex !== -1) {
 						return {
-							content: [{ type: "text", text: "First parallel task must have a task" }],
+							content: [{ type: "text", text: `First parallel step: task ${missingTaskIndex + 1} must have a task (no previous output to reference)` }],
 							isError: true,
 							details: { mode: "chain" as const, results: [] },
 						};
@@ -1110,169 +254,51 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 			}
 
 			if (effectiveAsync) {
-				if (!jitiCliPath)
+				if (!isAsyncAvailable()) {
 					return {
 						content: [{ type: "text", text: "jiti not found" }],
 						isError: true,
 						details: { mode: "single" as const, results: [] },
 					};
+				}
 				const id = randomUUID();
-				const asyncDir = path.join(ASYNC_DIR, id);
-				try {
-					fs.mkdirSync(asyncDir, { recursive: true });
-				} catch {}
-				const runner = path.join(path.dirname(fileURLToPath(import.meta.url)), "subagent-runner.ts");
-
-				const spawnRunner = (cfg: object, suffix: string): number | undefined => {
-					const cfgPath = path.join(os.tmpdir(), `pi-async-cfg-${suffix}.json`);
-					fs.writeFileSync(cfgPath, JSON.stringify(cfg));
-					const proc = spawn("node", [jitiCliPath!, runner, cfgPath], {
-						cwd: (cfg as any).cwd ?? ctx.cwd,
-						detached: true,
-						stdio: "ignore",
-					});
-					proc.unref();
-					return proc.pid;
-				};
+				const asyncCtx = { pi, cwd: ctx.cwd, currentSessionId: currentSessionId! };
 
 				if (hasChain && params.chain) {
-					// Async mode doesn't support parallel steps (v1 limitation)
-					const chainStepsForAsync = params.chain as ChainStep[];
-					const hasParallelInChain = chainStepsForAsync.some(isParallelStep);
-					if (hasParallelInChain) {
-						return {
-							content: [{ type: "text", text: "Async mode doesn't support chains with parallel steps. Use clarify: true (sync mode) for parallel-in-chain." }],
-							isError: true,
-							details: { mode: "chain" as const, results: [] },
-						};
-					}
-
-					// At this point, all steps are sequential
-					const seqSteps = chainStepsForAsync as SequentialStep[];
-
-					// Validate all agents exist before building steps
-					for (const s of seqSteps) {
-						if (!agents.find((x) => x.name === s.agent)) {
-							return {
-								content: [{ type: "text", text: `Unknown agent: ${s.agent}` }],
-								isError: true,
-								details: { mode: "chain" as const, results: [] },
-							};
-						}
-					}
-					const steps = seqSteps.map((s, i) => {
-						const a = agents.find((x) => x.name === s.agent)!;
-						return {
-							agent: s.agent,
-							// For async, use simple defaults: first step uses inline task, others use {previous}
-							task: s.task ?? (i === 0 ? "{task}" : "{previous}"),
-							cwd: s.cwd,
-							model: a.model,
-							tools: a.tools,
-							systemPrompt: a.systemPrompt?.trim() || null,
-						};
+					return executeAsyncChain(id, {
+						chain: params.chain as ChainStep[],
+						agents,
+						ctx: asyncCtx,
+						cwd: params.cwd,
+						maxOutput: params.maxOutput,
+						artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
+						artifactConfig,
+						shareEnabled,
+						sessionRoot,
 					});
-					const pid = spawnRunner(
-						{
-							id,
-							steps,
-							resultPath: path.join(RESULTS_DIR, `${id}.json`),
-							cwd: params.cwd ?? ctx.cwd,
-							placeholder: "{previous}",
-							maxOutput: params.maxOutput,
-							artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
-							artifactConfig,
-							share: shareEnabled,
-							sessionDir: sessionRoot ? path.join(sessionRoot, `async-${id}`) : undefined,
-							asyncDir,
-							sessionId: currentSessionId,
-						},
-						id,
-					);
-					if (pid) {
-						pi.events.emit("subagent_enhanced:started", {
-							id,
-							pid,
-							agent: params.chain[0].agent,
-							task: params.chain[0].task?.slice(0, 50),
-							chain: params.chain.map((s) => s.agent),
-							cwd: params.cwd ?? ctx.cwd,
-							asyncDir,
-						});
-						pi.events.emit("subagent:started", {
-							id,
-							pid,
-							agent: params.chain[0].agent,
-							task: params.chain[0].task?.slice(0, 50),
-							chain: params.chain.map((s) => s.agent),
-							cwd: params.cwd ?? ctx.cwd,
-							asyncDir,
-						});
-					}
-					return {
-						content: [
-							{ type: "text", text: `Async chain: ${params.chain.map((s) => s.agent).join(" -> ")} [${id}]` },
-						],
-						details: { mode: "chain", results: [], asyncId: id, asyncDir },
-					};
 				}
 
 				if (hasSingle) {
 					const a = agents.find((x) => x.name === params.agent);
-					if (!a)
+					if (!a) {
 						return {
 							content: [{ type: "text", text: `Unknown: ${params.agent}` }],
 							isError: true,
 							details: { mode: "single" as const, results: [] },
 						};
-					const pid = spawnRunner(
-						{
-							id,
-							steps: [
-								{
-									agent: params.agent,
-									task: params.task,
-									cwd: params.cwd,
-									model: a.model,
-									tools: a.tools,
-									systemPrompt: a.systemPrompt?.trim() || null,
-								},
-							],
-							resultPath: path.join(RESULTS_DIR, `${id}.json`),
-							cwd: params.cwd ?? ctx.cwd,
-							placeholder: "{previous}",
-							maxOutput: params.maxOutput,
-							artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
-							artifactConfig,
-							share: shareEnabled,
-							sessionDir: sessionRoot ? path.join(sessionRoot, `async-${id}`) : undefined,
-							asyncDir,
-							sessionId: currentSessionId,
-						},
-						id,
-					);
-					if (pid) {
-						pi.events.emit("subagent_enhanced:started", {
-							id,
-							pid,
-							agent: params.agent,
-							task: params.task?.slice(0, 50),
-							cwd: params.cwd ?? ctx.cwd,
-							asyncDir,
-						});
-						pi.events.emit("subagent:started", {
-							id,
-							pid,
-							agent: params.agent,
-							task: params.task?.slice(0, 50),
-							cwd: params.cwd ?? ctx.cwd,
-							asyncDir,
-						});
 					}
-					return {
-						content: [{ type: "text", text: `Async: ${params.agent} [${id}]` }],
-						details: { mode: "single", results: [], asyncId: id, asyncDir },
-					};
+					return executeAsyncSingle(id, {
+						agent: params.agent!,
+						task: params.task!,
+						agentConfig: a,
+						ctx: asyncCtx,
+						cwd: params.cwd,
+						maxOutput: params.maxOutput,
+						artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
+						artifactConfig,
+						shareEnabled,
+						sessionRoot,
+					});
 				}
 			}
 
@@ -1280,363 +306,22 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 			const allArtifactPaths: ArtifactPaths[] = [];
 
 			if (hasChain && params.chain) {
-				// Cast chain to typed steps
-				const chainSteps = params.chain as ChainStep[];
-
-				// Compute chain metadata for observability
-				const chainAgents: string[] = chainSteps.map((step) =>
-					isParallelStep(step)
-						? `[${step.parallel.map((t) => t.agent).join("+")}]`
-						: (step as SequentialStep).agent,
-				);
-				const totalSteps = chainSteps.length;
-
-				// Get original task from first step
-				const firstStep = chainSteps[0]!;
-				const originalTask = isParallelStep(firstStep)
-					? firstStep.parallel[0]!.task!
-					: (firstStep as SequentialStep).task!;
-
-				// Create chain directory
-				const chainDir = createChainDir(runId);
-
-				// Check if chain has any parallel steps
-				const hasParallelSteps = chainSteps.some(isParallelStep);
-
-				// Resolve templates using V2 (parallel-aware)
-				const settings = loadSubagentSettings();
-				let templates: ResolvedTemplates = resolveChainTemplatesV2(chainSteps, settings);
-
-				// For TUI: only show if no parallel steps (TUI v1 doesn't support parallel display)
-				// TODO: Update TUI to support parallel steps
-				const shouldClarify = params.clarify !== false && ctx.hasUI && !hasParallelSteps;
-
-				// Behavior overrides from TUI (set if TUI is shown, undefined otherwise)
-				let tuiBehaviorOverrides: (BehaviorOverride | undefined)[] | undefined;
-
-				if (shouldClarify) {
-					// Sequential-only chain: use existing TUI
-					const seqSteps = chainSteps as SequentialStep[];
-
-					// Load agent configs for sequential steps
-					const agentConfigs: AgentConfig[] = [];
-					for (const step of seqSteps) {
-						const config = agents.find((a) => a.name === step.agent);
-						if (!config) {
-							removeChainDir(chainDir);
-							return {
-								content: [{ type: "text", text: `Unknown agent: ${step.agent}` }],
-								isError: true,
-								details: { mode: "chain" as const, results: [] },
-							};
-						}
-						agentConfigs.push(config);
-					}
-
-					// Build step overrides
-					const stepOverrides: StepOverrides[] = seqSteps.map((step) => ({
-						output: step.output,
-						reads: step.reads,
-						progress: step.progress,
-					}));
-
-					// Pre-resolve behaviors for TUI display
-					const resolvedBehaviors = agentConfigs.map((config, i) =>
-						resolveStepBehavior(config, stepOverrides[i]!),
-					);
-
-					// Flatten templates for TUI (all strings for sequential)
-					const flatTemplates = templates as string[];
-
-					const result = await ctx.ui.custom<ChainClarifyResult>(
-						(tui, theme, _kb, done) =>
-							new ChainClarifyComponent(
-								tui,
-								theme,
-								agentConfigs,
-								flatTemplates,
-								originalTask,
-								chainDir,
-								resolvedBehaviors,
-								done,
-							),
-						{
-							overlay: true,
-							overlayOptions: { anchor: "center", width: 84, maxHeight: "80%" },
-						},
-					);
-
-					if (!result || !result.confirmed) {
-						removeChainDir(chainDir);
-						return {
-							content: [{ type: "text", text: "Chain cancelled" }],
-							details: { mode: "chain", results: [] },
-						};
-					}
-					// Update templates from TUI result
-					templates = result.templates;
-					// Store behavior overrides from TUI (used below in sequential step execution)
-					tuiBehaviorOverrides = result.behaviorOverrides;
-				}
-
-				// Execute chain (handles both sequential and parallel steps)
-				const results: SingleResult[] = [];
-				let prev = "";
-				let globalTaskIndex = 0; // For unique artifact naming
-				let progressCreated = false; // Track if progress.md has been created
-
-				for (let stepIndex = 0; stepIndex < chainSteps.length; stepIndex++) {
-					const step = chainSteps[stepIndex]!;
-					const stepTemplates = templates[stepIndex]!;
-
-					if (isParallelStep(step)) {
-						// === PARALLEL STEP EXECUTION ===
-						const parallelTemplates = stepTemplates as string[];
-						const concurrency = step.concurrency ?? MAX_CONCURRENCY;
-						const failFast = step.failFast ?? false;
-
-						// Create subdirectories for parallel outputs
-						const agentNames = step.parallel.map((t) => t.agent);
-						createParallelDirs(chainDir, stepIndex, step.parallel.length, agentNames);
-
-						// Resolve behaviors for parallel tasks
-						const parallelBehaviors = resolveParallelBehaviors(step.parallel, agents, stepIndex);
-
-						// If any parallel task has progress enabled and progress.md hasn't been created,
-						// create it now to avoid race conditions
-						const anyNeedsProgress = parallelBehaviors.some((b) => b.progress);
-						if (anyNeedsProgress && !progressCreated) {
-							const progressPath = path.join(chainDir, "progress.md");
-							fs.writeFileSync(progressPath, "# Progress\n\n## Status\nIn Progress\n\n## Tasks\n\n## Files Changed\n\n## Notes\n");
-							progressCreated = true;
-						}
-
-						// Track if we should abort remaining tasks (for fail-fast)
-						let aborted = false;
-
-						// Execute parallel tasks
-						const parallelResults = await mapConcurrent(
-							step.parallel,
-							concurrency,
-							async (task, taskIndex) => {
-								if (aborted && failFast) {
-									// Return a placeholder for skipped tasks
-									return {
-										agent: task.agent,
-										task: "(skipped)",
-										exitCode: -1,
-										messages: [],
-										usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 },
-										error: "Skipped due to fail-fast",
-									} as SingleResult;
-								}
-
-								// Build task string
-								const taskTemplate = parallelTemplates[taskIndex] ?? "{previous}";
-								const templateHasPrevious = taskTemplate.includes("{previous}");
-								let taskStr = taskTemplate;
-								taskStr = taskStr.replace(/\{task\}/g, originalTask);
-								taskStr = taskStr.replace(/\{previous\}/g, prev);
-								taskStr = taskStr.replace(/\{chain_dir\}/g, chainDir);
-
-								// Add chain instructions (include previous summary only if not already in template)
-								const behavior = parallelBehaviors[taskIndex]!;
-								// For parallel, no single "first progress" - each manages independently
-								taskStr += buildChainInstructions(behavior, chainDir, false, templateHasPrevious ? undefined : prev);
-
-								const r = await runSync(ctx.cwd, agents, task.agent, taskStr, {
-									cwd: task.cwd ?? params.cwd,
-									signal,
-									runId,
-									index: globalTaskIndex + taskIndex,
-									sessionDir: sessionDirForIndex(globalTaskIndex + taskIndex),
-									share: shareEnabled,
-									artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
-									artifactConfig,
-									onUpdate: onUpdate
-										? (p) =>
-												onUpdate({
-													...p,
-													details: {
-														mode: "chain",
-														results: [...results, ...(p.details?.results || [])],
-														progress: [...allProgress, ...(p.details?.progress || [])],
-														chainAgents,
-														totalSteps,
-														currentStepIndex: stepIndex,
-													},
-												})
-										: undefined,
-								});
-
-								if (r.exitCode !== 0 && failFast) {
-									aborted = true;
-								}
-
-								return r;
-							},
-						);
-
-						// Update global task index
-						globalTaskIndex += step.parallel.length;
-
-						// Collect results and progress
-						for (const r of parallelResults) {
-							results.push(r);
-							if (r.progress) allProgress.push(r.progress);
-							if (r.artifactPaths) allArtifactPaths.push(r.artifactPaths);
-						}
-
-						// Check for failures (track original task index for better error messages)
-						const failures = parallelResults
-							.map((r, originalIndex) => ({ ...r, originalIndex }))
-							.filter((r) => r.exitCode !== 0 && r.exitCode !== -1);
-						if (failures.length > 0) {
-							const failureSummary = failures
-								.map((f) => `- Task ${f.originalIndex + 1} (${f.agent}): ${f.error || "failed"}`)
-								.join("\n");
-							const errorMsg = `Parallel step ${stepIndex + 1} failed:\n${failureSummary}`;
-							const summary = buildChainSummary(chainSteps, results, chainDir, "failed", {
-								index: stepIndex,
-								error: errorMsg,
-							});
-							return {
-								content: [{ type: "text", text: summary }],
-								details: {
-									mode: "chain",
-									results,
-									progress: params.includeProgress ? allProgress : undefined,
-									artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
-									chainAgents,
-									totalSteps,
-									currentStepIndex: stepIndex,
-								},
-								isError: true,
-							};
-						}
-
-						// Aggregate outputs for {previous}
-						const taskResults: ParallelTaskResult[] = parallelResults.map((r, i) => ({
-							agent: r.agent,
-							taskIndex: i,
-							output: getFinalOutput(r.messages),
-							exitCode: r.exitCode,
-							error: r.error,
-						}));
-						prev = aggregateParallelOutputs(taskResults);
-					} else {
-						// === SEQUENTIAL STEP EXECUTION ===
-						const seqStep = step as SequentialStep;
-						const stepTemplate = stepTemplates as string;
-
-						// Get agent config
-						const agentConfig = agents.find((a) => a.name === seqStep.agent);
-						if (!agentConfig) {
-							removeChainDir(chainDir);
-							return {
-								content: [{ type: "text", text: `Unknown agent: ${seqStep.agent}` }],
-								isError: true,
-								details: { mode: "chain" as const, results: [] },
-							};
-						}
-
-						// Build task string (check if template has {previous} before replacement)
-						const templateHasPrevious = stepTemplate.includes("{previous}");
-						let stepTask = stepTemplate;
-						stepTask = stepTask.replace(/\{task\}/g, originalTask);
-						stepTask = stepTask.replace(/\{previous\}/g, prev);
-						stepTask = stepTask.replace(/\{chain_dir\}/g, chainDir);
-
-						// Resolve behavior (TUI overrides take precedence over step config)
-						const tuiOverride = tuiBehaviorOverrides?.[stepIndex];
-						const stepOverride: StepOverrides = {
-							output: tuiOverride?.output !== undefined ? tuiOverride.output : seqStep.output,
-							reads: tuiOverride?.reads !== undefined ? tuiOverride.reads : seqStep.reads,
-							progress: tuiOverride?.progress !== undefined ? tuiOverride.progress : seqStep.progress,
-						};
-						const behavior = resolveStepBehavior(agentConfig, stepOverride);
-
-						// Determine if this is the first agent to create progress.md
-						const isFirstProgress = behavior.progress && !progressCreated;
-						if (isFirstProgress) {
-							progressCreated = true;
-						}
-
-						// Add chain instructions (include previous summary only if not already in template)
-						stepTask += buildChainInstructions(behavior, chainDir, isFirstProgress, templateHasPrevious ? undefined : prev);
-
-						// Run step
-						const r = await runSync(ctx.cwd, agents, seqStep.agent, stepTask, {
-							cwd: seqStep.cwd ?? params.cwd,
-							signal,
-							runId,
-							index: globalTaskIndex,
-							sessionDir: sessionDirForIndex(globalTaskIndex),
-							share: shareEnabled,
-							artifactsDir: artifactConfig.enabled ? artifactsDir : undefined,
-							artifactConfig,
-							onUpdate: onUpdate
-								? (p) =>
-										onUpdate({
-											...p,
-											details: {
-												mode: "chain",
-												results: [...results, ...(p.details?.results || [])],
-												progress: [...allProgress, ...(p.details?.progress || [])],
-												chainAgents,
-												totalSteps,
-												currentStepIndex: stepIndex,
-											},
-										})
-								: undefined,
-						});
-
-						globalTaskIndex++;
-						results.push(r);
-						if (r.progress) allProgress.push(r.progress);
-						if (r.artifactPaths) allArtifactPaths.push(r.artifactPaths);
-
-						// On failure, leave chain_dir for debugging
-						if (r.exitCode !== 0) {
-							const summary = buildChainSummary(chainSteps, results, chainDir, "failed", {
-								index: stepIndex,
-								error: r.error || "Chain failed",
-							});
-							return {
-								content: [{ type: "text", text: summary }],
-								details: {
-									mode: "chain",
-									results,
-									progress: params.includeProgress ? allProgress : undefined,
-									artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
-									chainAgents,
-									totalSteps,
-									currentStepIndex: stepIndex,
-								},
-								isError: true,
-							};
-						}
-
-						prev = getFinalOutput(r.messages);
-					}
-				}
-
-				// Chain complete - return summary with paths
-				// Chain dir left for inspection (cleaned up after 24h)
-				const summary = buildChainSummary(chainSteps, results, chainDir, "completed");
-
-				return {
-					content: [{ type: "text", text: summary }],
-					details: {
-						mode: "chain",
-						results,
-						progress: params.includeProgress ? allProgress : undefined,
-						artifacts: allArtifactPaths.length ? { dir: artifactsDir, files: allArtifactPaths } : undefined,
-						chainAgents,
-						totalSteps,
-						// currentStepIndex omitted for completed chains
-					},
-				};
+				// Use extracted chain execution module
+				return executeChain({
+					chain: params.chain as ChainStep[],
+					agents,
+					ctx,
+					signal,
+					runId,
+					cwd: params.cwd,
+					shareEnabled,
+					sessionDirForIndex,
+					artifactsDir,
+					artifactConfig,
+					includeProgress: params.includeProgress,
+					clarify: params.clarify,
+					onUpdate,
+				});
 			}
 
 			if (hasTasks && params.tasks) {
@@ -1775,230 +460,8 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 			);
 		},
 
-		renderResult(result, { expanded }, theme) {
-			const d = result.details;
-			if (!d || !d.results.length) {
-				const t = result.content[0];
-				return new Text(t?.type === "text" ? t.text : "(no output)", 0, 0);
-			}
-
-			const mdTheme = getMarkdownTheme();
-
-			if (d.mode === "single" && d.results.length === 1) {
-				const r = d.results[0];
-				const isRunning = r.progress?.status === "running";
-				const icon = isRunning
-					? theme.fg("warning", "...")
-					: r.exitCode === 0
-						? theme.fg("success", "ok")
-						: theme.fg("error", "X");
-				const output = r.truncation?.text || getFinalOutput(r.messages);
-
-				const progressInfo = isRunning && r.progress
-					? ` | ${r.progress.toolCount} tools, ${formatTokens(r.progress.tokens)} tok, ${formatDuration(r.progress.durationMs)}`
-					: r.progressSummary
-						? ` | ${r.progressSummary.toolCount} tools, ${formatTokens(r.progressSummary.tokens)} tokens, ${formatDuration(r.progressSummary.durationMs)}`
-						: "";
-
-				if (expanded) {
-					const c = new Container();
-					c.addChild(new Text(`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${progressInfo}`, 0, 0));
-					c.addChild(new Spacer(1));
-					c.addChild(
-						new Text(theme.fg("dim", `Task: ${r.task.slice(0, 100)}${r.task.length > 100 ? "..." : ""}`), 0, 0),
-					);
-					c.addChild(new Spacer(1));
-
-					const items = getDisplayItems(r.messages);
-					for (const item of items) {
-						if (item.type === "tool")
-							c.addChild(new Text(theme.fg("muted", formatToolCall(item.name, item.args)), 0, 0));
-					}
-					if (items.length) c.addChild(new Spacer(1));
-
-					if (output) c.addChild(new Markdown(output, 0, 0, mdTheme));
-					c.addChild(new Spacer(1));
-					c.addChild(new Text(theme.fg("dim", formatUsage(r.usage, r.model)), 0, 0));
-					if (r.sessionFile) {
-						c.addChild(new Text(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`), 0, 0));
-					}
-					// Sharing disabled - session file path shown above
-
-					if (r.artifactPaths) {
-						c.addChild(new Spacer(1));
-						c.addChild(new Text(theme.fg("dim", `Artifacts: ${shortenPath(r.artifactPaths.outputPath)}`), 0, 0));
-					}
-					return c;
-				}
-
-				const lines = [`${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${progressInfo}`];
-
-				if (isRunning && r.progress) {
-					if (r.progress.currentTool) {
-						const toolLine = r.progress.currentToolArgs
-							? `${r.progress.currentTool}: ${r.progress.currentToolArgs.slice(0, 60)}${r.progress.currentToolArgs.length > 60 ? "..." : ""}`
-							: r.progress.currentTool;
-						lines.push(theme.fg("warning", `> ${toolLine}`));
-					}
-					for (const line of r.progress.recentOutput.slice(-3)) {
-						lines.push(theme.fg("dim", `  ${line.slice(0, 80)}${line.length > 80 ? "..." : ""}`));
-					}
-					lines.push(theme.fg("dim", "(ctrl+o to expand)"));
-				} else {
-					const items = getDisplayItems(r.messages).slice(-COLLAPSED_ITEMS);
-					for (const item of items) {
-						if (item.type === "tool") lines.push(theme.fg("muted", formatToolCall(item.name, item.args)));
-						else lines.push(item.text.slice(0, 80) + (item.text.length > 80 ? "..." : ""));
-					}
-					lines.push(theme.fg("dim", formatUsage(r.usage, r.model)));
-				}
-				return new Text(lines.join("\n"), 0, 0);
-			}
-
-			const hasRunning = d.progress?.some((p) => p.status === "running") 
-				|| d.results.some((r) => r.progress?.status === "running");
-			const ok = d.results.filter((r) => r.progress?.status === "completed" || (r.exitCode === 0 && r.progress?.status !== "running")).length;
-			const icon = hasRunning
-				? theme.fg("warning", "...")
-				: ok === d.results.length
-					? theme.fg("success", "ok")
-					: theme.fg("error", "X");
-
-			const totalSummary =
-				d.progressSummary ||
-				d.results.reduce(
-					(acc, r) => {
-						const prog = r.progress || r.progressSummary;
-						if (prog) {
-							acc.toolCount += prog.toolCount;
-							acc.tokens += prog.tokens;
-							acc.durationMs =
-								d.mode === "chain"
-									? acc.durationMs + prog.durationMs
-									: Math.max(acc.durationMs, prog.durationMs);
-						}
-						return acc;
-					},
-					{ toolCount: 0, tokens: 0, durationMs: 0 },
-				);
-
-			const summaryStr =
-				totalSummary.toolCount || totalSummary.tokens
-					? ` | ${totalSummary.toolCount} tools, ${formatTokens(totalSummary.tokens)} tok, ${formatDuration(totalSummary.durationMs)}`
-					: "";
-
-			const modeLabel = d.mode === "parallel" ? "parallel (no live progress)" : d.mode;
-			// Use chain metadata for accurate step counts
-			const totalStepsCount = d.totalSteps ?? d.results.length;
-			const currentStep = d.currentStepIndex !== undefined ? d.currentStepIndex + 1 : ok + 1;
-			const stepInfo = hasRunning ? ` ${currentStep}/${totalStepsCount}` : ` ${ok}/${totalStepsCount}`;
-			
-			// Build chain visualization: "scout → planner" with status icons
-			// Note: Only works correctly for sequential chains. Chains with parallel steps
-			// (indicated by "[agent1+agent2]" format) have multiple results per step,
-			// breaking the 1:1 mapping between chainAgents and results.
-			const hasParallelInChain = d.chainAgents?.some((a) => a.startsWith("["));
-			const chainVis = d.chainAgents?.length && !hasParallelInChain
-				? d.chainAgents
-						.map((agent, i) => {
-							const result = d.results[i];
-							const isFailed = result && result.exitCode !== 0 && result.progress?.status !== "running";
-							const isComplete = result && result.exitCode === 0 && result.progress?.status !== "running";
-							const isCurrent = i === (d.currentStepIndex ?? d.results.length);
-							const icon = isFailed
-								? theme.fg("error", "✗")
-								: isComplete
-									? theme.fg("success", "✓")
-									: isCurrent && hasRunning
-										? theme.fg("warning", "●")
-										: theme.fg("dim", "○");
-							return `${icon}${agent}`;
-						})
-						.join(theme.fg("dim", " → "))
-				: null;
-
-			if (expanded) {
-				const c = new Container();
-				c.addChild(
-					new Text(
-						`${icon} ${theme.fg("toolTitle", theme.bold(modeLabel))}${stepInfo}${summaryStr}`,
-						0,
-						0,
-					),
-				);
-				// Show chain visualization in expanded view
-				if (chainVis) {
-					c.addChild(new Text(`  ${chainVis}`, 0, 0));
-				}
-				for (let i = 0; i < d.results.length; i++) {
-					const r = d.results[i];
-					c.addChild(new Spacer(1));
-					// Check both r.progress and d.progress array for running status
-					const progressFromArray = d.progress?.find((p) => p.index === i);
-					const rProg = r.progress || progressFromArray || r.progressSummary;
-					const rRunning = rProg?.status === "running";
-					const rIcon = rRunning
-						? theme.fg("warning", "...")
-						: r.exitCode === 0
-							? theme.fg("success", "ok")
-							: theme.fg("error", "X");
-					const rProgress = rProg
-						? ` | ${rProg.toolCount} tools, ${formatDuration(rProg.durationMs)}`
-						: "";
-					c.addChild(new Text(`${rIcon} ${theme.bold(r.agent)}${rProgress}`, 0, 0));
-
-					if (rRunning && rProg) {
-						if (rProg.currentTool) {
-							const toolLine = rProg.currentToolArgs
-								? `${rProg.currentTool}: ${rProg.currentToolArgs.slice(0, 50)}${rProg.currentToolArgs.length > 50 ? "..." : ""}`
-								: rProg.currentTool;
-							c.addChild(new Text(theme.fg("warning", `  > ${toolLine}`), 0, 0));
-						}
-						for (const line of rProg.recentOutput.slice(-2)) {
-							c.addChild(new Text(theme.fg("dim", `    ${line.slice(0, 70)}${line.length > 70 ? "..." : ""}`), 0, 0));
-						}
-					} else {
-						const out = r.truncation?.text || getFinalOutput(r.messages);
-						if (out) c.addChild(new Markdown(out, 0, 0, mdTheme));
-						c.addChild(new Text(theme.fg("dim", formatUsage(r.usage, r.model)), 0, 0));
-						if (r.sessionFile) {
-							c.addChild(new Text(theme.fg("dim", `Session: ${shortenPath(r.sessionFile)}`), 0, 0));
-						}
-						// Sharing disabled - session file path shown above
-					}
-				}
-
-				if (d.artifacts) {
-					c.addChild(new Spacer(1));
-					c.addChild(new Text(theme.fg("dim", `Artifacts dir: ${shortenPath(d.artifacts.dir)}`), 0, 0));
-				}
-				return c;
-			}
-
-			const lines = [`${icon} ${theme.fg("toolTitle", theme.bold(modeLabel))}${stepInfo}${summaryStr}`];
-			// Show chain visualization if available
-			if (chainVis) {
-				lines.push(`  ${chainVis}`);
-			}
-			// Find running progress from d.progress array (more reliable) or d.results
-			const runningProgress = d.progress?.find((p) => p.status === "running") 
-				|| d.results.find((r) => r.progress?.status === "running")?.progress;
-			if (runningProgress) {
-				if (runningProgress.currentTool) {
-					const toolLine = runningProgress.currentToolArgs
-						? `${runningProgress.currentTool}: ${runningProgress.currentToolArgs.slice(0, 50)}${runningProgress.currentToolArgs.length > 50 ? "..." : ""}`
-						: runningProgress.currentTool;
-					lines.push(theme.fg("warning", `  > ${toolLine}`));
-				}
-				for (const line of runningProgress.recentOutput.slice(-2)) {
-					lines.push(theme.fg("dim", `    ${line.slice(0, 70)}${line.length > 70 ? "..." : ""}`));
-				}
-				lines.push(theme.fg("dim", "(ctrl+o to expand)"));
-			} else if (hasRunning) {
-				// Fallback: we know something is running but can't find details
-				lines.push(theme.fg("dim", "(ctrl+o to expand)"));
-			}
-			return new Text(lines.join("\n"), 0, 0);
+		renderResult(result, options, theme) {
+			return renderSubagentResult(result, options, theme);
 		},
 
 	};
@@ -2131,10 +594,13 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 		if (lastUiContext) {
 			renderWidget(lastUiContext, Array.from(asyncJobs.values()));
 		}
-		setTimeout(() => {
+		// Schedule cleanup after 10 seconds (track timer for cleanup on shutdown)
+		const timer = setTimeout(() => {
+			cleanupTimers.delete(asyncId);
 			asyncJobs.delete(asyncId);
 			if (lastUiContext) renderWidget(lastUiContext, Array.from(asyncJobs.values()));
 		}, 10000);
+		cleanupTimers.set(asyncId, timer);
 	});
 
 	pi.on("tool_result", (event, ctx) => {
@@ -2150,6 +616,8 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 	pi.on("session_start", (_event, ctx) => {
 		baseCwd = ctx.cwd;
 		currentSessionId = ctx.sessionManager.getSessionFile() ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+		for (const timer of cleanupTimers.values()) clearTimeout(timer);
+		cleanupTimers.clear();
 		asyncJobs.clear();
 		if (ctx.hasUI) {
 			lastUiContext = ctx;
@@ -2159,6 +627,8 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 	pi.on("session_switch", (_event, ctx) => {
 		baseCwd = ctx.cwd;
 		currentSessionId = ctx.sessionManager.getSessionFile() ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+		for (const timer of cleanupTimers.values()) clearTimeout(timer);
+		cleanupTimers.clear();
 		asyncJobs.clear();
 		if (ctx.hasUI) {
 			lastUiContext = ctx;
@@ -2168,6 +638,8 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 	pi.on("session_branch", (_event, ctx) => {
 		baseCwd = ctx.cwd;
 		currentSessionId = ctx.sessionManager.getSessionFile() ?? `session-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
+		for (const timer of cleanupTimers.values()) clearTimeout(timer);
+		cleanupTimers.clear();
 		asyncJobs.clear();
 		if (ctx.hasUI) {
 			lastUiContext = ctx;
@@ -2178,6 +650,11 @@ For "scout → planner" or multi-step flows, use chain (not multiple single call
 		watcher.close();
 		if (poller) clearInterval(poller);
 		poller = null;
+		// Clear all pending cleanup timers
+		for (const timer of cleanupTimers.values()) {
+			clearTimeout(timer);
+		}
+		cleanupTimers.clear();
 		asyncJobs.clear();
 		if (lastUiContext?.hasUI) {
 			lastUiContext.ui.setWidget(WIDGET_KEY, undefined);