@aexol/spectral 0.7.0 → 0.7.3

package/dist/agent/index.js

@@ -2,10 +2,10 @@
  * Subagent Delegation Extension for Spectral
  *
  * Registers a `subagent` tool that allows the coding agent to delegate tasks
- * to specialized sub-agents running in isolated `pi` / `spectral` processes.
+ * to specialized sub-agents running in-process via `agentLoop()`.
  *
- * Each subagent invocation spawns a separate process with its own context
- * window, keeping the main conversation lean and focused.
+ * Each subagent invocation runs with its own fresh AgentContext (isolated
+ * context window), keeping the main conversation lean and focused.
  *
  * Three execution modes:
  *   - Single:   { agent: "name", task: "..." }
@@ -16,25 +16,29 @@
  *   - ~/.pi/agent/agents/*.md    (user-level, always loaded)
  *   - .pi/agents/*.md            (project-level, opt-in via agentScope)
  *
- * The subagent binary is auto-detected:
- *   - If running via `spectral`, uses the same invocation path
- *   - Falls back to `pi` otherwise
+ * Subagents use an in-process `agentLoop()` for:
+ *   - Clean context isolation (fresh messages array)
+ *   - Combined system prompt (main agent + subagent-specific instructions)
+ *   - Tool filtering (only the tools specified in agent config)
+ *   - Model selection (session model preferred, agent-configured as fallback)
+ *   - Signal propagation (abort passthrough)
+ *   - Access to observational memory via the recall tool
  */
-import { spawn } from "node:child_process";
-import * as fs from "node:fs";
-import * as os from "node:os";
-import * as path from "node:path";
-import { StringEnum } from "@mariozechner/pi-ai";
-import { getMarkdownTheme, withFileMutationQueue, } from "@mariozechner/pi-coding-agent";
-import { Container, Markdown, Spacer, Text } from "@mariozechner/pi-tui";
+import { agentLoop } from "../pi/agent-core/index.js";
+import { StringEnum } from "../pi/ai/index.js";
+import { Text } from "../pi/tui/index.js";
 import { Type } from "typebox";
 import { discoverAgents } from "./agents.js";
 // ---------------------------------------------------------------------------
+// Built-in tool resolution (no spawn needed — tools are registered in-process)
+// ---------------------------------------------------------------------------
+import { createTool, allToolNames } from "../pi/coding-agent/core/tools/index.js";
+import { wrapToolDefinition } from "../pi/coding-agent/core/tools/tool-definition-wrapper.js";
+// ---------------------------------------------------------------------------
 // Constants
 // ---------------------------------------------------------------------------
 const MAX_PARALLEL_TASKS = 8;
 const MAX_CONCURRENCY = 4;
-const COLLAPSED_ITEM_COUNT = 10;
 // ---------------------------------------------------------------------------
 // Helpers — formatting
 // ---------------------------------------------------------------------------
@@ -68,69 +72,6 @@ function formatUsageStats(usage, model) {
         parts.push(model);
     return parts.join(" ");
 }
-function formatToolCall(toolName, args, themeFg) {
-    const shortenPath = (p) => {
-        const home = os.homedir();
-        return p.startsWith(home) ? `~${p.slice(home.length)}` : p;
-    };
-    switch (toolName) {
-        case "bash": {
-            const command = args.command || "...";
-            const preview = command.length > 60 ? `${command.slice(0, 60)}...` : command;
-            return themeFg("muted", "$ ") + themeFg("toolOutput", preview);
-        }
-        case "read": {
-            const rawPath = (args.file_path || args.path || "...");
-            const filePath = shortenPath(rawPath);
-            const offset = args.offset;
-            const limit = args.limit;
-            let text = themeFg("accent", filePath);
-            if (offset !== undefined || limit !== undefined) {
-                const startLine = offset ?? 1;
-                const endLine = limit !== undefined ? startLine + limit - 1 : "";
-                text += themeFg("warning", `:${startLine}${endLine ? `-${endLine}` : ""}`);
-            }
-            return themeFg("muted", "read ") + text;
-        }
-        case "write": {
-            const rawPath = (args.file_path || args.path || "...");
-            const filePath = shortenPath(rawPath);
-            const content = (args.content || "");
-            const lines = content.split("\n").length;
-            let text = themeFg("muted", "write ") + themeFg("accent", filePath);
-            if (lines > 1)
-                text += themeFg("dim", ` (${lines} lines)`);
-            return text;
-        }
-        case "edit": {
-            const rawPath = (args.file_path || args.path || "...");
-            return themeFg("muted", "edit ") + themeFg("accent", shortenPath(rawPath));
-        }
-        case "ls": {
-            const rawPath = (args.path || ".");
-            return themeFg("muted", "ls ") + themeFg("accent", shortenPath(rawPath));
-        }
-        case "find": {
-            const pattern = (args.pattern || "*");
-            const rawPath = (args.path || ".");
-            return (themeFg("muted", "find ") +
-                themeFg("accent", pattern) +
-                themeFg("dim", ` in ${shortenPath(rawPath)}`));
-        }
-        case "grep": {
-            const pattern = (args.pattern || "");
-            const rawPath = (args.path || ".");
-            return (themeFg("muted", "grep ") +
-                themeFg("accent", `/${pattern}/`) +
-                themeFg("dim", ` in ${shortenPath(rawPath)}`));
-        }
-        default: {
-            const argsStr = JSON.stringify(args);
-            const preview = argsStr.length > 50 ? `${argsStr.slice(0, 50)}...` : argsStr;
-            return themeFg("accent", toolName) + themeFg("dim", ` ${preview}`);
-        }
-    }
-}
 // ---------------------------------------------------------------------------
 // Helpers — message extraction
 // ---------------------------------------------------------------------------
@@ -146,22 +87,73 @@ function getFinalOutput(messages) {
     }
     return "";
 }
-function getDisplayItems(messages) {
-    const items = [];
-    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: "toolCall", name: part.name, args: part.arguments });
+// ---------------------------------------------------------------------------
+// Helpers — model resolution
+// ---------------------------------------------------------------------------
+/**
+ * Resolve a model string (e.g. "claude-sonnet-4-5" or "anthropic/claude-sonnet-4-5")
+ * to a Model object from the registry.
+ */
+function resolveModelString(modelStr, modelRegistry) {
+    if (!modelStr)
+        return undefined;
+    const allModels = modelRegistry.getAll();
+    // Try "provider/modelId" format
+    const slashIdx = modelStr.indexOf("/");
+    if (slashIdx !== -1) {
+        const provider = modelStr.substring(0, slashIdx);
+        const modelId = modelStr.substring(slashIdx + 1);
+        const match = allModels.find((m) => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === modelId.toLowerCase());
+        if (match)
+            return match;
+    }
+    // Try exact model ID match
+    const idMatch = allModels.find((m) => m.id.toLowerCase() === modelStr.toLowerCase());
+    if (idMatch)
+        return idMatch;
+    // Try fuzzy match (model ID contains the string)
+    const fuzzy = allModels.find((m) => m.id.toLowerCase().includes(modelStr.toLowerCase()));
+    return fuzzy;
+}
+// ---------------------------------------------------------------------------
+// Helpers — tool resolution
+// ---------------------------------------------------------------------------
+/**
+ * Resolve tool names from an agent definition into AgentTool objects.
+ *
+ * Built-in tools (read, bash, edit, write, grep, find, ls) are created via
+ * `createTool()`. Extension-registered tools (e.g., recall) are resolved
+ * via the ExtensionAPI and wrapped.
+ */
+function resolveSubagentTools(toolNames, cwd, pi, ctx) {
+    if (!toolNames || toolNames.length === 0)
+        return [];
+    const tools = [];
+    for (const name of toolNames) {
+        // Built-in tools
+        if (allToolNames.has(name)) {
+            try {
+                const tool = createTool(name, cwd);
+                tools.push(tool);
+            }
+            catch {
+                // Tool creation failed — skip
             }
+            continue;
+        }
+        // Extension-registered tools (recall, designer_*, etc.)
+        // pi at runtime is the embedded ExtensionAPI which has getToolDefinition;
+        // the npm types don't expose it, so we cast.
+        const richPi = pi;
+        const toolDef = richPi.getToolDefinition(name);
+        if (toolDef) {
+            tools.push(wrapToolDefinition(toolDef, () => ctx));
         }
     }
-    return items;
+    return tools;
 }
 // ---------------------------------------------------------------------------
-// Helpers — concurrency, temp files, binary detection
+// Helpers — concurrency
 // ---------------------------------------------------------------------------
 async function mapWithConcurrencyLimit(items, concurrency, fn) {
     if (items.length === 0)
@@ -180,65 +172,10 @@ async function mapWithConcurrencyLimit(items, concurrency, fn) {
     await Promise.all(workers);
     return results;
 }
-async function writePromptToTempFile(agentName, prompt) {
-    const tmpDir = await fs.promises.mkdtemp(path.join(os.tmpdir(), "spectral-subagent-"));
-    const safeName = agentName.replace(/[^\w.-]+/g, "_");
-    const filePath = path.join(tmpDir, `prompt-${safeName}.md`);
-    await withFileMutationQueue(filePath, async () => {
-        await fs.promises.writeFile(filePath, prompt, { encoding: "utf-8", mode: 0o600 });
-    });
-    return { dir: tmpDir, filePath };
-}
-/**
- * Detect the correct binary for spawning subagent processes.
- *
- * Strategy:
- *   1. If `process.argv[1]` points to an existing script (unlikely in bundled
- *      env but possible during dev with tsx), use that script with node.
- *   2. If the executor is named `spectral` or `aexol`, use it directly (the
- *      wrapper ensures MCP + memory extensions are auto-loaded).
- *   3. Otherwise fall back to `pi`.
- */
-function getPiInvocation(subagentArgs) {
-    const currentScript = process.argv[1];
-    // Case 1: running via tsx with an existing script file
-    if (currentScript && fs.existsSync(currentScript)) {
-        return { command: process.execPath, args: [currentScript, ...subagentArgs] };
-    }
-    // Case 2: check if this is the spectral/aexol wrapper binary
-    const execName = path.basename(process.execPath).toLowerCase();
-    if (execName === "spectral" || execName === "aexol") {
-        return { command: process.execPath, args: subagentArgs };
-    }
-    // Case 3: generic node — try spectral first, then pi
-    function hasBin(name) {
-        const PATH = process.env.PATH || "";
-        const envPathSep = process.platform === "win32" ? ";" : ":";
-        for (const dir of PATH.split(envPathSep)) {
-            const candidate = path.join(dir, name);
-            try {
-                if (fs.existsSync(candidate))
-                    return true;
-            }
-            catch {
-                /* skip */
-            }
-        }
-        return false;
-    }
-    if (hasBin("spectral")) {
-        return { command: "spectral", args: subagentArgs };
-    }
-    if (hasBin("pi")) {
-        return { command: "pi", args: subagentArgs };
-    }
-    // Last resort: use node with pi from node_modules (matches pi's own fallback)
-    return { command: "pi", args: subagentArgs };
-}
 // ---------------------------------------------------------------------------
-// Core — run a single subagent
+// Core — run a single subagent in-process via agentLoop
 // ---------------------------------------------------------------------------
-async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails) {
+async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, signal, onUpdate, makeDetails, pi, ctx) {
     const agent = agents.find((a) => a.name === agentName);
     if (!agent) {
         const available = agents.map((a) => `"${a.name}"`).join(", ") || "none";
@@ -253,13 +190,47 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
             step,
         };
     }
-    const args = ["--mode", "json", "-p", "--no-session"];
-    if (agent.model)
-        args.push("--model", agent.model);
-    if (agent.tools && agent.tools.length > 0)
-        args.push("--tools", agent.tools.join(","));
-    let tmpPromptDir = null;
-    let tmpPromptPath = null;
+    // Build combined system prompt: main agent's + subagent's
+    const mainSystemPrompt = ctx.getSystemPrompt();
+    const combinedPrompt = mainSystemPrompt
+        ? `${mainSystemPrompt}\n\n---\n\nSubagent: ${agent.name}\n${agent.systemPrompt}`
+        : agent.systemPrompt;
+    // Resolve model — session model preferred, agent-configured as fallback
+    const sessionModel = ctx.model && ctx.modelRegistry.hasConfiguredAuth(ctx.model) ? ctx.model : undefined;
+    const model = sessionModel ?? resolveModelString(agent.model, ctx.modelRegistry);
+    if (!model) {
+        return {
+            agent: agentName,
+            agentSource: agent.source,
+            task,
+            exitCode: 1,
+            messages: [],
+            stderr: `Cannot resolve model "${agent.model ?? "(none specified)"}". Make sure the model is configured.`,
+            usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+            model: agent.model,
+            step,
+            errorMessage: `Model not found: ${agent.model ?? "unspecified"}`,
+        };
+    }
+    // Resolve auth for the model
+    const auth = await ctx.modelRegistry.getApiKeyAndHeaders(model);
+    if (!auth.ok || !auth.apiKey) {
+        return {
+            agent: agentName,
+            agentSource: agent.source,
+            task,
+            exitCode: 1,
+            messages: [],
+            stderr: `No API key configured for model "${model.provider}/${model.id}".`,
+            usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
+            model: agent.model,
+            step,
+            errorMessage: `No API key for ${model.provider}/${model.id}`,
+        };
+    }
+    // Resolve tools
+    const effectiveCwd = cwd ?? defaultCwd;
+    const tools = resolveSubagentTools(agent.tools, effectiveCwd, pi, ctx);
     const currentResult = {
         agent: agentName,
         agentSource: agent.source,
@@ -268,7 +239,7 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
         messages: [],
         stderr: "",
         usage: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, contextTokens: 0, turns: 0 },
-        model: agent.model,
+        model: model.id,
         step,
     };
     const emitUpdate = () => {
@@ -280,113 +251,79 @@ async function runSingleAgent(defaultCwd, agents, agentName, task, cwd, step, si
         }
     };
     try {
-        if (agent.systemPrompt.trim()) {
-            const tmp = await writePromptToTempFile(agent.name, agent.systemPrompt);
-            tmpPromptDir = tmp.dir;
-            tmpPromptPath = tmp.filePath;
-            args.push("--append-system-prompt", tmpPromptPath);
-        }
-        args.push(`Task: ${task}`);
-        let wasAborted = false;
-        const exitCode = await new Promise((resolve) => {
-            const invocation = getPiInvocation(args);
-            const proc = spawn(invocation.command, invocation.args, {
-                cwd: cwd ?? defaultCwd,
-                shell: false,
-                stdio: ["ignore", "pipe", "pipe"],
-            });
-            let buffer = "";
-            const processLine = (line) => {
-                if (!line.trim())
-                    return;
-                let event;
-                try {
-                    event = JSON.parse(line);
-                }
-                catch {
-                    return;
-                }
-                if (event.type === "message_end" && event.message) {
-                    const msg = event.message;
-                    currentResult.messages.push(msg);
-                    if (msg.role === "assistant") {
-                        currentResult.usage.turns++;
-                        const usage = msg.usage;
-                        if (usage) {
-                            currentResult.usage.input += usage.input || 0;
-                            currentResult.usage.output += usage.output || 0;
-                            currentResult.usage.cacheRead += usage.cacheRead || 0;
-                            currentResult.usage.cacheWrite += usage.cacheWrite || 0;
-                            currentResult.usage.cost += usage.cost?.total || 0;
-                            currentResult.usage.contextTokens = usage.totalTokens || 0;
-                        }
-                        if (!currentResult.model && msg.model)
-                            currentResult.model = msg.model;
-                        if (msg.stopReason)
-                            currentResult.stopReason = msg.stopReason;
-                        if (msg.errorMessage)
-                            currentResult.errorMessage = msg.errorMessage;
+        const config = {
+            model,
+            apiKey: auth.apiKey,
+            headers: auth.headers,
+            convertToLlm: (msgs) => msgs.filter((m) => m.role === "user" || m.role === "assistant" || m.role === "toolResult"),
+            toolExecution: "parallel",
+        };
+        const stream = agentLoop([{ role: "user", content: [{ type: "text", text: task }], timestamp: Date.now() }], {
+            systemPrompt: combinedPrompt,
+            messages: [],
+            tools,
+        }, config, signal);
+        // Collect messages from the stream
+        const collectedMessages = [];
+        let hadError = false;
+        for await (const event of stream) {
+            if (signal?.aborted) {
+                hadError = true;
+                break;
+            }
+            if (event.type === "message_end" && event.message) {
+                const msg = event.message;
+                collectedMessages.push(msg);
+                if (msg.role === "assistant") {
+                    currentResult.usage.turns++;
+                    const usage = msg.usage;
+                    if (usage) {
+                        currentResult.usage.input += usage.input || 0;
+                        currentResult.usage.output += usage.output || 0;
+                        currentResult.usage.cacheRead += usage.cacheRead || 0;
+                        currentResult.usage.cacheWrite += usage.cacheWrite || 0;
+                        currentResult.usage.cost += usage.cost?.total || 0;
+                        currentResult.usage.contextTokens = usage.totalTokens || 0;
+                    }
+                    if (!currentResult.model && msg.model)
+                        currentResult.model = msg.model;
+                    if (msg.stopReason)
+                        currentResult.stopReason = msg.stopReason;
+                    if (msg.errorMessage)
+                        currentResult.errorMessage = msg.errorMessage;
+                    if (msg.stopReason === "error" || msg.stopReason === "aborted") {
+                        hadError = true;
                     }
-                    emitUpdate();
-                }
-                if (event.type === "tool_result_end" && event.message) {
-                    currentResult.messages.push(event.message);
-                    emitUpdate();
                 }
-            };
-            proc.stdout.on("data", (data) => {
-                buffer += data.toString();
-                const lines = buffer.split("\n");
-                buffer = lines.pop() || "";
-                for (const line of lines)
-                    processLine(line);
-            });
-            proc.stderr.on("data", (data) => {
-                currentResult.stderr += data.toString();
-            });
-            proc.on("close", (code) => {
-                if (buffer.trim())
-                    processLine(buffer);
-                resolve(code ?? 0);
-            });
-            proc.on("error", () => {
-                resolve(1);
-            });
-            if (signal) {
-                const killProc = () => {
-                    wasAborted = true;
-                    proc.kill("SIGTERM");
-                    setTimeout(() => {
-                        if (!proc.killed)
-                            proc.kill("SIGKILL");
-                    }, 5000);
-                };
-                if (signal.aborted)
-                    killProc();
-                else
-                    signal.addEventListener("abort", killProc, { once: true });
+                currentResult.messages = [...collectedMessages];
+                emitUpdate();
+            }
+            if (event.type === "tool_execution_end" && event.isError) {
+                emitUpdate();
             }
-        });
-        currentResult.exitCode = exitCode;
-        if (wasAborted)
-            throw new Error("Subagent was aborted");
+        }
+        // Drain the stream result (already consumed by iteration, but ensure cleanup)
+        try {
+            await stream.result();
+        }
+        catch {
+            // Stream result error — already handled by message events
+        }
+        currentResult.exitCode = hadError ? 1 : 0;
+        if (signal?.aborted) {
+            currentResult.exitCode = 1;
+            currentResult.stopReason = "aborted";
+            currentResult.errorMessage = "Subagent was aborted";
+        }
         return currentResult;
     }
-    finally {
-        if (tmpPromptPath)
-            try {
-                fs.unlinkSync(tmpPromptPath);
-            }
-            catch {
-                /* ignore */
-            }
-        if (tmpPromptDir)
-            try {
-                fs.rmdirSync(tmpPromptDir);
-            }
-            catch {
-                /* ignore */
-            }
+    catch (err) {
+        const errorMsg = err instanceof Error ? err.message : String(err);
+        currentResult.exitCode = 1;
+        currentResult.stopReason = "error";
+        currentResult.errorMessage = errorMsg;
+        currentResult.stderr = errorMsg;
+        return currentResult;
     }
 }
 // ---------------------------------------------------------------------------
@@ -471,7 +408,9 @@ export default function subagentExtension(pi) {
                     details: makeDetails("single")([]),
                 };
             }
-            // Security: if project-local agents are enabled, confirm with user
+            // Security: if project-local agents are enabled, confirm with user.
+            // In headless mode (no TUI), project-local agents are silently allowed —
+            // the caller is already trusted (it's the coding agent itself).
             if ((agentScope === "project" || agentScope === "both") &&
                 confirmProjectAgents &&
                 ctx.hasUI) {
@@ -519,7 +458,7 @@ export default function subagentExtension(pi) {
                             }
                         }
                         : undefined;
-                    const result = await runSingleAgent(ctx.cwd, agents, step.agent, taskWithContext, step.cwd, i + 1, signal, chainUpdate, makeDetails("chain"));
+                    const result = await runSingleAgent(ctx.cwd, agents, step.agent, taskWithContext, step.cwd, i + 1, signal, chainUpdate, makeDetails("chain"), pi, ctx);
                     results.push(result);
                     const isError = result.exitCode !== 0 ||
                         result.stopReason === "error" ||
@@ -597,7 +536,7 @@ export default function subagentExtension(pi) {
                             allResults[index] = partial.details.results[0];
                             emitParallelUpdate();
                         }
-                    }, makeDetails("parallel"));
+                    }, makeDetails("parallel"), pi, ctx);
                     allResults[index] = result;
                     emitParallelUpdate();
                     return result;
@@ -620,7 +559,7 @@ export default function subagentExtension(pi) {
             }
             // ── Single mode ─────────────────────────────────────────────
             if (params.agent && params.task) {
-                const result = await runSingleAgent(ctx.cwd, agents, params.agent, params.task, params.cwd, undefined, signal, onUpdate, makeDetails("single"));
+                const result = await runSingleAgent(ctx.cwd, agents, params.agent, params.task, params.cwd, undefined, signal, onUpdate, makeDetails("single"), pi, ctx);
                 const isError = result.exitCode !== 0 ||
                     result.stopReason === "error" ||
                     result.stopReason === "aborted";
@@ -661,148 +600,72 @@ export default function subagentExtension(pi) {
                 details: makeDetails("single")([]),
             };
         },
-        // ── Rendering ─────────────────────────────────────────────────
-        renderCall(args, theme, _context) {
+        // ── Rendering (headless-compatible: plain text strings, no TUI imports) ──
+        renderCall(args, _theme, _context) {
             const scope = args.agentScope ?? "user";
             if (args.chain && args.chain.length > 0) {
-                let text = theme.fg("toolTitle", theme.bold("subagent ")) +
-                    theme.fg("accent", `chain (${args.chain.length} steps)`) +
-                    theme.fg("muted", ` [${scope}]`);
+                let text = `subagent chain (${args.chain.length} steps) [${scope}]`;
                 for (let i = 0; i < Math.min(args.chain.length, 3); i++) {
                     const step = args.chain[i];
                     const cleanTask = step.task.replace(/\{previous\}/g, "").trim();
                     const preview = cleanTask.length > 40 ? `${cleanTask.slice(0, 40)}...` : cleanTask;
-                    text +=
-                        "\n  " +
-                            theme.fg("muted", `${i + 1}.`) +
-                            " " +
-                            theme.fg("accent", step.agent) +
-                            theme.fg("dim", ` ${preview}`);
+                    text += `\n  ${i + 1}. ${step.agent} ${preview}`;
                 }
                 if (args.chain.length > 3)
-                    text += `\n  ${theme.fg("muted", `... +${args.chain.length - 3} more`)}`;
-                return new Text(text, 0, 0);
+                    text += `\n  ... +${args.chain.length - 3} more`;
+                return new Text(text);
             }
             if (args.tasks && args.tasks.length > 0) {
-                let text = theme.fg("toolTitle", theme.bold("subagent ")) +
-                    theme.fg("accent", `parallel (${args.tasks.length} tasks)`) +
-                    theme.fg("muted", ` [${scope}]`);
+                let text = `subagent parallel (${args.tasks.length} tasks) [${scope}]`;
                 for (const t of args.tasks.slice(0, 3)) {
                     const preview = t.task.length > 40 ? `${t.task.slice(0, 40)}...` : t.task;
-                    text += `\n  ${theme.fg("accent", t.agent)}${theme.fg("dim", ` ${preview}`)}`;
+                    text += `\n  ${t.agent} ${preview}`;
                 }
                 if (args.tasks.length > 3)
-                    text += `\n  ${theme.fg("muted", `... +${args.tasks.length - 3} more`)}`;
-                return new Text(text, 0, 0);
+                    text += `\n  ... +${args.tasks.length - 3} more`;
+                return new Text(text);
             }
             const agentName = args.agent || "...";
             const preview = args.task
-                ? args.task.length > 60
-                    ? `${args.task.slice(0, 60)}...`
-                    : args.task
+                ? args.task.length > 60 ? `${args.task.slice(0, 60)}...` : args.task
                 : "...";
-            let text = theme.fg("toolTitle", theme.bold("subagent ")) +
-                theme.fg("accent", agentName) +
-                theme.fg("muted", ` [${scope}]`);
-            text += `\n  ${theme.fg("dim", preview)}`;
-            return new Text(text, 0, 0);
+            return new Text(`subagent ${agentName} [${scope}]\n  ${preview}`);
         },
-        renderResult(result, { expanded }, theme, _context) {
+        renderResult(result, _opts, _theme, _context) {
             const details = result.details;
             if (!details || details.results.length === 0) {
                 const text = result.content[0];
-                return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
+                return new Text(text?.type === "text" ? text.text : "(no output)");
             }
-            const mdTheme = getMarkdownTheme();
-            const renderDisplayItems = (items, limit) => {
-                const toShow = limit ? items.slice(-limit) : items;
-                const skipped = limit && items.length > limit ? items.length - limit : 0;
-                let text = "";
-                if (skipped > 0)
-                    text += theme.fg("muted", `... ${skipped} earlier items\n`);
-                for (const item of toShow) {
-                    if (item.type === "text") {
-                        const preview = expanded
-                            ? item.text
-                            : item.text.split("\n").slice(0, 3).join("\n");
-                        text += `${theme.fg("toolOutput", preview)}\n`;
-                    }
-                    else {
-                        text += `${theme.fg("muted", "→ ") + formatToolCall(item.name, item.args, theme.fg.bind(theme))}\n`;
-                    }
-                }
-                return text.trimEnd();
-            };
+            const lines = [];
             if (details.mode === "single" && details.results.length === 1) {
                 const r = details.results[0];
-                const isError = r.exitCode !== 0 ||
-                    r.stopReason === "error" ||
-                    r.stopReason === "aborted";
-                const icon = isError
-                    ? theme.fg("error", "✗")
-                    : theme.fg("success", "✓");
-                const displayItems = getDisplayItems(r.messages);
+                const isError = r.exitCode !== 0 || r.stopReason === "error" || r.stopReason === "aborted";
+                const icon = isError ? "✗" : "✓";
                 const finalOutput = getFinalOutput(r.messages);
-                if (expanded) {
-                    const container = new Container();
-                    let header = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
-                    if (isError && r.stopReason)
-                        header += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
-                    container.addChild(new Text(header, 0, 0));
-                    if (isError && r.errorMessage)
-                        container.addChild(new Text(theme.fg("error", `Error: ${r.errorMessage}`), 0, 0));
-                    container.addChild(new Spacer(1));
-                    container.addChild(new Text(theme.fg("muted", "─── Task ───"), 0, 0));
-                    container.addChild(new Text(theme.fg("dim", r.task), 0, 0));
-                    container.addChild(new Spacer(1));
-                    container.addChild(new Text(theme.fg("muted", "─── Output ───"), 0, 0));
-                    if (displayItems.length === 0 && !finalOutput) {
-                        container.addChild(new Text(theme.fg("muted", "(no output)"), 0, 0));
-                    }
-                    else {
-                        for (const item of displayItems) {
-                            if (item.type === "toolCall")
-                                container.addChild(new Text(theme.fg("muted", "→ ") +
-                                    formatToolCall(item.name, item.args, theme.fg.bind(theme)), 0, 0));
-                        }
-                        if (finalOutput) {
-                            container.addChild(new Spacer(1));
-                            container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-                        }
-                    }
-                    const usageStr = formatUsageStats(r.usage, r.model);
-                    if (usageStr) {
-                        container.addChild(new Spacer(1));
-                        container.addChild(new Text(theme.fg("dim", usageStr), 0, 0));
-                    }
-                    return container;
-                }
-                let text = `${icon} ${theme.fg("toolTitle", theme.bold(r.agent))}${theme.fg("muted", ` (${r.agentSource})`)}`;
-                if (isError && r.stopReason)
-                    text += ` ${theme.fg("error", `[${r.stopReason}]`)}`;
+                lines.push(`${icon} ${r.agent} (${r.agentSource})${isError && r.stopReason ? ` [${r.stopReason}]` : ""}`);
                 if (isError && r.errorMessage)
-                    text += `\n${theme.fg("error", `Error: ${r.errorMessage}`)}`;
-                else if (displayItems.length === 0)
-                    text += `\n${theme.fg("muted", "(no output)")}`;
+                    lines.push(`Error: ${r.errorMessage}`);
+                lines.push("");
+                lines.push("─── Task ───");
+                lines.push(r.task);
+                lines.push("");
+                lines.push("─── Output ───");
+                if (!finalOutput) {
+                    lines.push("(no output)");
+                }
                 else {
-                    text += `\n${renderDisplayItems(displayItems, COLLAPSED_ITEM_COUNT)}`;
-                    if (displayItems.length > COLLAPSED_ITEM_COUNT)
-                        text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
+                    lines.push(finalOutput.trim());
                 }
                 const usageStr = formatUsageStats(r.usage, r.model);
-                if (usageStr)
-                    text += `\n${theme.fg("dim", usageStr)}`;
-                return new Text(text, 0, 0);
+                if (usageStr) {
+                    lines.push("");
+                    lines.push(usageStr);
+                }
+                return new Text(lines.join("\n"));
             }
             const aggregateUsage = (results) => {
-                const total = {
-                    input: 0,
-                    output: 0,
-                    cacheRead: 0,
-                    cacheWrite: 0,
-                    cost: 0,
-                    turns: 0,
-                };
+                const total = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
                 for (const r of results) {
                     total.input += r.usage.input;
                     total.output += r.usage.output;
@@ -815,137 +678,64 @@ export default function subagentExtension(pi) {
             };
             if (details.mode === "chain") {
                 const successCount = details.results.filter((r) => r.exitCode === 0).length;
-                const icon = successCount === details.results.length
-                    ? theme.fg("success", "✓")
-                    : theme.fg("error", "✗");
-                if (expanded) {
-                    const container = new Container();
-                    container.addChild(new Text(icon +
-                        " " +
-                        theme.fg("toolTitle", theme.bold("chain ")) +
-                        theme.fg("accent", `${successCount}/${details.results.length} steps`), 0, 0));
-                    for (const r of details.results) {
-                        const rIcon = r.exitCode === 0
-                            ? theme.fg("success", "✓")
-                            : theme.fg("error", "✗");
-                        const displayItems = getDisplayItems(r.messages);
-                        const finalOutput = getFinalOutput(r.messages);
-                        container.addChild(new Spacer(1));
-                        container.addChild(new Text(`${theme.fg("muted", `─── Step ${r.step}: `) + theme.fg("accent", r.agent)} ${rIcon}`, 0, 0));
-                        container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
-                        for (const item of displayItems) {
-                            if (item.type === "toolCall") {
-                                container.addChild(new Text(theme.fg("muted", "→ ") +
-                                    formatToolCall(item.name, item.args, theme.fg.bind(theme)), 0, 0));
-                            }
-                        }
-                        if (finalOutput) {
-                            container.addChild(new Spacer(1));
-                            container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-                        }
-                        const stepUsage = formatUsageStats(r.usage, r.model);
-                        if (stepUsage)
-                            container.addChild(new Text(theme.fg("dim", stepUsage), 0, 0));
-                    }
-                    const usageStr = formatUsageStats(aggregateUsage(details.results));
-                    if (usageStr) {
-                        container.addChild(new Spacer(1));
-                        container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
-                    }
-                    return container;
-                }
-                let text = icon +
-                    " " +
-                    theme.fg("toolTitle", theme.bold("chain ")) +
-                    theme.fg("accent", `${successCount}/${details.results.length} steps`);
+                const icon = successCount === details.results.length ? "✓" : "✗";
+                lines.push(`${icon} chain ${successCount}/${details.results.length} steps`);
                 for (const r of details.results) {
-                    const rIcon = r.exitCode === 0
-                        ? theme.fg("success", "✓")
-                        : theme.fg("error", "✗");
-                    const displayItems = getDisplayItems(r.messages);
-                    text += `\n\n${theme.fg("muted", `─── Step ${r.step}: `)}${theme.fg("accent", r.agent)} ${rIcon}`;
-                    if (displayItems.length === 0)
-                        text += `\n${theme.fg("muted", "(no output)")}`;
+                    const rIcon = r.exitCode === 0 ? "✓" : "✗";
+                    const finalOutput = getFinalOutput(r.messages);
+                    lines.push("");
+                    lines.push(`─── Step ${r.step}: ${r.agent} ${rIcon}`);
+                    lines.push(`Task: ${r.task}`);
+                    if (finalOutput)
+                        lines.push(finalOutput.trim());
                     else
-                        text += `\n${renderDisplayItems(displayItems, 5)}`;
+                        lines.push("(no output)");
+                    const stepUsage = formatUsageStats(r.usage, r.model);
+                    if (stepUsage)
+                        lines.push(stepUsage);
                 }
                 const usageStr = formatUsageStats(aggregateUsage(details.results));
-                if (usageStr)
-                    text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
-                text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-                return new Text(text, 0, 0);
+                if (usageStr) {
+                    lines.push("");
+                    lines.push(`Total: ${usageStr}`);
+                }
+                return new Text(lines.join("\n"));
             }
             if (details.mode === "parallel") {
                 const running = details.results.filter((r) => r.exitCode === -1).length;
                 const successCount = details.results.filter((r) => r.exitCode === 0).length;
                 const failCount = details.results.filter((r) => r.exitCode > 0).length;
                 const isRunning = running > 0;
-                const icon = isRunning
-                    ? theme.fg("warning", "⏳")
-                    : failCount > 0
-                        ? theme.fg("warning", "◐")
-                        : theme.fg("success", "✓");
+                const icon = isRunning ? "⏳" : failCount > 0 ? "◐" : "✓";
                 const status = isRunning
                     ? `${successCount + failCount}/${details.results.length} done, ${running} running`
                     : `${successCount}/${details.results.length} tasks`;
-                if (expanded && !isRunning) {
-                    const container = new Container();
-                    container.addChild(new Text(`${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`, 0, 0));
-                    for (const r of details.results) {
-                        const rIcon = r.exitCode === 0
-                            ? theme.fg("success", "✓")
-                            : theme.fg("error", "✗");
-                        const displayItems = getDisplayItems(r.messages);
-                        const finalOutput = getFinalOutput(r.messages);
-                        container.addChild(new Spacer(1));
-                        container.addChild(new Text(`${theme.fg("muted", "─── ") + theme.fg("accent", r.agent)} ${rIcon}`, 0, 0));
-                        container.addChild(new Text(theme.fg("muted", "Task: ") + theme.fg("dim", r.task), 0, 0));
-                        for (const item of displayItems) {
-                            if (item.type === "toolCall") {
-                                container.addChild(new Text(theme.fg("muted", "→ ") +
-                                    formatToolCall(item.name, item.args, theme.fg.bind(theme)), 0, 0));
-                            }
-                        }
-                        if (finalOutput) {
-                            container.addChild(new Spacer(1));
-                            container.addChild(new Markdown(finalOutput.trim(), 0, 0, mdTheme));
-                        }
-                        const taskUsage = formatUsageStats(r.usage, r.model);
-                        if (taskUsage)
-                            container.addChild(new Text(theme.fg("dim", taskUsage), 0, 0));
-                    }
-                    const usageStr = formatUsageStats(aggregateUsage(details.results));
-                    if (usageStr) {
-                        container.addChild(new Spacer(1));
-                        container.addChild(new Text(theme.fg("dim", `Total: ${usageStr}`), 0, 0));
-                    }
-                    return container;
-                }
-                let text = `${icon} ${theme.fg("toolTitle", theme.bold("parallel "))}${theme.fg("accent", status)}`;
+                lines.push(`${icon} parallel ${status}`);
                 for (const r of details.results) {
-                    const rIcon = r.exitCode === -1
-                        ? theme.fg("warning", "⏳")
-                        : r.exitCode === 0
-                            ? theme.fg("success", "✓")
-                            : theme.fg("error", "✗");
-                    const displayItems = getDisplayItems(r.messages);
-                    text += `\n\n${theme.fg("muted", "─── ")}${theme.fg("accent", r.agent)} ${rIcon}`;
-                    if (displayItems.length === 0)
-                        text += `\n${theme.fg("muted", r.exitCode === -1 ? "(running...)" : "(no output)")}`;
+                    const rIcon = r.exitCode === -1 ? "⏳" : r.exitCode === 0 ? "✓" : "✗";
+                    const finalOutput = getFinalOutput(r.messages);
+                    lines.push("");
+                    lines.push(`─── ${r.agent} ${rIcon}`);
+                    lines.push(`Task: ${r.task}`);
+                    if (finalOutput)
+                        lines.push(finalOutput.trim());
                     else
-                        text += `\n${renderDisplayItems(displayItems, 5)}`;
+                        lines.push(r.exitCode === -1 ? "(running...)" : "(no output)");
+                    const taskUsage = formatUsageStats(r.usage, r.model);
+                    if (taskUsage)
+                        lines.push(taskUsage);
                 }
                 if (!isRunning) {
                     const usageStr = formatUsageStats(aggregateUsage(details.results));
-                    if (usageStr)
-                        text += `\n\n${theme.fg("dim", `Total: ${usageStr}`)}`;
+                    if (usageStr) {
+                        lines.push("");
+                        lines.push(`Total: ${usageStr}`);
+                    }
                 }
-                if (!expanded)
-                    text += `\n${theme.fg("muted", "(Ctrl+O to expand)")}`;
-                return new Text(text, 0, 0);
+                return new Text(lines.join("\n"));
             }
             const text = result.content[0];
-            return new Text(text?.type === "text" ? text.text : "(no output)", 0, 0);
+            return new Text(text?.type === "text" ? text.text : "(no output)");
         },
     });
 }