@esso0428/pi-subagents 0.15.4 → 0.15.6

package/dist/index.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * pi-agents — A pi extension providing Claude Code-style autonomous sub-agents.
  *
@@ -10,34 +9,31 @@
  * Commands:
  *   /agents                 — Interactive agent management menu
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.renderRunningAgentStatus = renderRunningAgentStatus;
-exports.default = default_1;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const pi_coding_agent_1 = require("@earendil-works/pi-coding-agent");
-const pi_tui_1 = require("@earendil-works/pi-tui");
-const typebox_1 = require("@sinclair/typebox");
-const agent_manager_js_1 = require("./agent-manager.js");
-const agent_runner_js_1 = require("./agent-runner.js");
-const agent_types_js_1 = require("./agent-types.js");
-const cross_extension_rpc_js_1 = require("./cross-extension-rpc.js");
-const custom_agents_js_1 = require("./custom-agents.js");
-const enabled_models_js_1 = require("./enabled-models.js");
-const group_join_js_1 = require("./group-join.js");
-const invocation_config_js_1 = require("./invocation-config.js");
-const model_resolver_js_1 = require("./model-resolver.js");
-const agent_history_js_1 = require("./agent-history.js");
-const output_file_js_1 = require("./output-file.js");
-const schedule_js_1 = require("./schedule.js");
-const schedule_store_js_1 = require("./schedule-store.js");
-const settings_js_1 = require("./settings.js");
-const status_note_js_1 = require("./status-note.js");
-const agent_widget_js_1 = require("./ui/agent-widget.js");
-const fleet_list_js_1 = require("./ui/fleet-list.js");
-const markdown_result_js_1 = require("./ui/markdown-result.js");
-const schedule_menu_js_1 = require("./ui/schedule-menu.js");
-const usage_js_1 = require("./usage.js");
+import { existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
+import { join } from "node:path";
+import { defineTool, getAgentDir, getSettingsListTheme } from "@earendil-works/pi-coding-agent";
+import { Container, Key, matchesKey, SettingsList, Spacer, Text } from "@earendil-works/pi-tui";
+import { Type } from "@sinclair/typebox";
+import { AgentManager } from "./agent-manager.js";
+import { getAgentConversation, getDefaultMaxTurns, getGraceTurns, normalizeMaxTurns, SUBAGENT_TOOL_NAMES, setDefaultMaxTurns, setGraceTurns, steerAgent } from "./agent-runner.js";
+import { applyNicoOverrides, BUILTIN_TOOL_NAMES, getAgentConfig, getAllTypes, getAvailableTypes, isDefaultsDisabled, registerAgents, resolveType, setDefaultsDisabled } from "./agent-types.js";
+import { registerRpcHandlers } from "./cross-extension-rpc.js";
+import { loadCustomAgents } from "./custom-agents.js";
+import { isModelInScope, readEnabledModels, resolveEnabledModels } from "./enabled-models.js";
+import { GroupJoinManager } from "./group-join.js";
+import { resolveAgentInvocationConfig, resolveJoinMode } from "./invocation-config.js";
+import { resolveModel } from "./model-resolver.js";
+import { agentHistoryLocator, createAgentHistoryPath, readAgentHistory } from "./agent-history.js";
+import { buildAgentStatusMenuEntries, canOpenActiveAgent, canOpenAgentHistory, formatAgentHistoryOption, splitAgentRecords } from "./agent-history-list.js";
+import { createOutputFilePath, streamToOutputFile, writeInitialEntry } from "./output-file.js";
+import { SubagentScheduler } from "./schedule.js";
+import { resolveStorePath, ScheduleStore } from "./schedule-store.js";
+import { applyAndEmitLoaded, saveAndEmitChanged } from "./settings.js";
+import { getStatusNote } from "./status-note.js";
+import { AgentWidget, buildInvocationTags, describeActivity, fgPreservingNestedStyles, formatDuration, formatMs, formatTokens, formatTurns, getDisplayName, getPromptModeLabel, SPINNER, } from "./ui/agent-widget.js";
+import { FleetList } from "./ui/fleet-list.js";
+import { showSchedulesMenu } from "./ui/schedule-menu.js";
+import { addUsage, getLifetimeTotal, getSessionContextPercent } from "./usage.js";
 // ---- Shared helpers ----
 /** Tool execute return value for a text response. */
 function textResult(msg, details) {
@@ -75,16 +71,16 @@ function abortable(promise, signal) {
         });
     });
 }
-function renderRunningAgentStatus(frame, statsText, activity, theme) {
-    const container = new pi_tui_1.Container();
-    container.addChild(new pi_tui_1.Text(theme.fg("accent", frame) + (statsText ? " " + statsText : ""), 0, 0));
-    container.addChild(new pi_tui_1.Text(theme.fg("dim", `  ⎿  ${activity}`), 0, 0));
+export function renderRunningAgentStatus(frame, statsText, activity, theme) {
+    const container = new Container();
+    container.addChild(new Text(theme.fg("accent", frame) + (statsText ? " " + statsText : ""), 0, 0));
+    container.addChild(new Text(theme.fg("dim", `  ⎿  ${activity}`), 0, 0));
     return container;
 }
 /** Format an agent's lifetime token total, or "" when zero. */
 function formatLifetimeTokens(o) {
-    const t = (0, usage_js_1.getLifetimeTotal)(o.lifetimeUsage);
-    return t > 0 ? (0, agent_widget_js_1.formatTokens)(t) : "";
+    const t = getLifetimeTotal(o.lifetimeUsage);
+    return t > 0 ? formatTokens(t) : "";
 }
 /**
  * Create an AgentActivity state and spawn callbacks for tracking tool usage.
@@ -128,7 +124,7 @@ function createActivityTracker(maxTurns, onStreamUpdate) {
             state.session = session;
         },
         onAssistantUsage: (usage) => {
-            (0, usage_js_1.addUsage)(state.lifetimeUsage, usage);
+            addUsage(state.lifetimeUsage, usage);
             onStreamUpdate?.();
         },
     };
@@ -169,8 +165,8 @@ function escapeXml(s) {
 function formatTaskNotification(record, resultMaxLen) {
     const status = getStatusLabel(record.status, record.error);
     const durationMs = record.completedAt ? record.completedAt - record.startedAt : 0;
-    const totalTokens = (0, usage_js_1.getLifetimeTotal)(record.lifetimeUsage);
-    const contextPercent = (0, usage_js_1.getSessionContextPercent)(record.session);
+    const totalTokens = getLifetimeTotal(record.lifetimeUsage);
+    const contextPercent = getSessionContextPercent(record.session);
     const ctxXml = contextPercent !== null ? `<context_percent>${Math.round(contextPercent)}</context_percent>` : "";
     const compactXml = record.compactionCount ? `<compactions>${record.compactionCount}</compactions>` : "";
     const resultPreview = record.result
@@ -184,7 +180,7 @@ function formatTaskNotification(record, resultMaxLen) {
         record.toolCallId ? `<tool-use-id>${escapeXml(record.toolCallId)}</tool-use-id>` : null,
         record.outputFile ? `<output-file>${escapeXml(record.outputFile)}</output-file>` : null,
         `<status>${escapeXml(status)}</status>`,
-        `<summary>Agent "${escapeXml(record.description)}" ${record.status}${(0, status_note_js_1.getStatusNote)(record.status)}</summary>`,
+        `<summary>Agent "${escapeXml(record.description)}" ${record.status}${getStatusNote(record.status)}</summary>`,
         `<result>${escapeXml(resultPreview)}</result>`,
         `<usage><total_tokens>${totalTokens}</total_tokens><tool_uses>${record.toolUses}</tool_uses>${ctxXml}${compactXml}<duration_ms>${durationMs}</duration_ms></usage>`,
         `</task-notification>`,
@@ -205,11 +201,9 @@ function buildDetails(base, record, activity, overrides) {
         ...overrides,
     };
 }
-/** Maximum expanded notification body retained in message details. */
-const MAX_NOTIFICATION_RESULT_TEXT_LENGTH = 20_000;
 /** Build notification details for the custom message renderer. */
 function buildNotificationDetails(record, resultMaxLen, activity) {
-    const totalTokens = (0, usage_js_1.getLifetimeTotal)(record.lifetimeUsage);
+    const totalTokens = getLifetimeTotal(record.lifetimeUsage);
     return {
         id: record.id,
         description: record.description,
@@ -221,11 +215,6 @@ function buildNotificationDetails(record, resultMaxLen, activity) {
         durationMs: record.completedAt ? record.completedAt - record.startedAt : 0,
         outputFile: record.outputFile,
         error: record.error,
-        resultText: record.result
-            ? record.result.length > MAX_NOTIFICATION_RESULT_TEXT_LENGTH
-                ? record.result.slice(0, MAX_NOTIFICATION_RESULT_TEXT_LENGTH) + "…"
-                : record.result
-            : undefined,
         resultPreview: record.result
             ? record.result.length > resultMaxLen
                 ? record.result.slice(0, resultMaxLen) + "…"
@@ -233,7 +222,7 @@ function buildNotificationDetails(record, resultMaxLen, activity) {
             : "No output.",
     };
 }
-function default_1(pi) {
+export default function (pi) {
     // ---- Register custom notification renderer ----
     pi.registerMessageRenderer("subagent-notification", (message, { expanded }, theme) => {
         const d = message.details;
@@ -250,49 +239,40 @@ function default_1(pi) {
             // Line 2: stats
             const parts = [];
             if (d.turnCount > 0)
-                parts.push((0, agent_widget_js_1.formatTurns)(d.turnCount, d.maxTurns));
+                parts.push(formatTurns(d.turnCount, d.maxTurns));
             if (d.toolUses > 0)
                 parts.push(`${d.toolUses} tool use${d.toolUses === 1 ? "" : "s"}`);
             if (d.totalTokens > 0)
-                parts.push((0, agent_widget_js_1.formatTokens)(d.totalTokens));
+                parts.push(formatTokens(d.totalTokens));
             if (d.durationMs > 0)
-                parts.push((0, agent_widget_js_1.formatMs)(d.durationMs));
+                parts.push(formatMs(d.durationMs));
             if (parts.length) {
                 line += "\n  " + parts.map(p => theme.fg("dim", p)).join(" " + theme.fg("dim", "·") + " ");
             }
-            if (!expanded) {
-                // Collapsed previews intentionally remain compact plain text.
+            // Line 3: result preview (collapsed) or full (expanded)
+            if (expanded) {
+                const lines = d.resultPreview.split("\n").slice(0, 30);
+                for (const l of lines)
+                    line += "\n" + theme.fg("dim", `  ${l}`);
+            }
+            else {
                 const preview = d.resultPreview.split("\n")[0]?.slice(0, 80) ?? "";
                 line += "\n  " + theme.fg("dim", `⎿  ${preview}`);
-                if (d.outputFile) {
-                    line += "\n  " + theme.fg("muted", `transcript: ${d.outputFile}`);
-                }
-                return line;
             }
-            const container = new pi_tui_1.Container();
-            container.addChild(new pi_tui_1.Text(line, 0, 0));
-            container.addChild((0, markdown_result_js_1.createMarkdownResult)(d.resultText ?? d.resultPreview, theme, 30));
+            // Line 4: output file link (if present)
             if (d.outputFile) {
-                container.addChild(new pi_tui_1.Text(theme.fg("muted", `  transcript: ${d.outputFile}`), 0, 0));
+                line += "\n  " + theme.fg("muted", `transcript: ${d.outputFile}`);
             }
-            return container;
+            return line;
         }
         const all = [d, ...(d.others ?? [])];
-        if (!expanded)
-            return new pi_tui_1.Text(all.map(renderOne).join("\n"), 0, 0);
-        const container = new pi_tui_1.Container();
-        all.forEach((item, index) => {
-            if (index > 0)
-                container.addChild(new pi_tui_1.Spacer(1));
-            container.addChild(renderOne(item));
-        });
-        return container;
+        return new Text(all.map(renderOne).join("\n"), 0, 0);
     });
     /** Reload agents from project/global custom agent dirs and merge with defaults (called on init and each Agent invocation). */
     const reloadCustomAgents = () => {
-        const userAgents = (0, custom_agents_js_1.loadCustomAgents)(process.cwd());
-        (0, agent_types_js_1.registerAgents)(userAgents);
-        (0, agent_types_js_1.applyNicoOverrides)();
+        const userAgents = loadCustomAgents(process.cwd());
+        registerAgents(userAgents);
+        applyNicoOverrides();
     };
     // Initial load
     reloadCustomAgents();
@@ -344,7 +324,7 @@ function default_1(pi) {
         widget.update();
     }
     // ---- Group join manager ----
-    const groupJoin = new group_join_js_1.GroupJoinManager((records, partial) => {
+    const groupJoin = new GroupJoinManager((records, partial) => {
         for (const r of records) {
             agentActivity.delete(r.id);
             widget.markFinished(r.id);
@@ -384,7 +364,7 @@ function default_1(pi) {
         // tokens is omitted when nothing was ever produced (e.g. agent errored before
         // any message_end fired), preserving prior payload shape.
         const u = record.lifetimeUsage;
-        const total = (0, usage_js_1.getLifetimeTotal)(u);
+        const total = getLifetimeTotal(u);
         const tokens = total > 0
             ? { input: u.input, output: u.output, total }
             : undefined;
@@ -401,7 +381,7 @@ function default_1(pi) {
         };
     }
     // Background completion: route through group join or send individual nudge
-    const manager = new agent_manager_js_1.AgentManager((record) => {
+    const manager = new AgentManager((record) => {
         // Emit lifecycle event based on terminal status
         const isError = record.status === "error" || record.status === "stopped" || record.status === "aborted";
         const eventData = buildEventData(record);
@@ -411,9 +391,7 @@ function default_1(pi) {
         else {
             pi.events.emit("subagents:completed", eventData);
         }
-        // Persist final record for cross-extension history reconstruction. Keep
-        // the transcript body in a project-local file rather than inflating the
-        // parent session JSONL; only its project-relative locator is persisted.
+        // Persist final record for cross-extension history reconstruction
         pi.appendEntry("subagents:record", {
             id: record.id, type: record.type, description: record.description,
             status: record.status, result: record.result, error: record.error,
@@ -493,14 +471,14 @@ function default_1(pi) {
     // Session-scoped: store is constructed inside session_start once sessionId
     // is available. Mirrors pi-chonky-tasks's session-scoped task store —
     // schedules reset on /new, restore on /resume.
-    const scheduler = new schedule_js_1.SubagentScheduler();
+    const scheduler = new SubagentScheduler();
     function startScheduler(ctx) {
         try {
             const sessionId = ctx.sessionManager?.getSessionId?.();
             if (!sessionId)
                 return; // sessionId not yet available — try again on next event
-            const path = (0, schedule_store_js_1.resolveStorePath)(ctx.cwd, sessionId);
-            const store = new schedule_store_js_1.ScheduleStore(path);
+            const path = resolveStorePath(ctx.cwd, sessionId);
+            const store = new ScheduleStore(path);
             scheduler.start(pi, ctx, manager, store);
             pi.events.emit("subagents:scheduler_ready", { sessionId, jobCount: store.list().length });
         }
@@ -515,27 +493,15 @@ function default_1(pi) {
     // bound session_start, so a filtered-out activation never advertises (#142).
     pi.on("session_start", async (_event, ctx) => {
         currentCtx = ctx;
-        try {
-            (0, agent_history_js_1.ensureSubagentsGitignore)(ctx.cwd);
-        }
-        catch (err) {
-            console.warn("[pi-subagents] Failed to protect project-local history:", err);
-        }
         manager.clearCompleted(true);
-        const historicalRecords = ctx.sessionManager
-            .getBranch()
-            .filter((entry) => entry?.type === "custom" && entry.customType === "subagents:record")
-            .map((entry) => entry.data);
-        manager.restoreCompleted(historicalRecords);
-        // Bind the UI here as well as on tool execution so rehydrated terminal
-        // records are immediately visible and openable from FleetView after reload.
-        widget.setUICtx(ctx.ui);
-        fleet.setUICtx(ctx.ui);
-        fleet.update();
+        const branch = ctx.sessionManager?.getBranch?.() ?? [];
+        manager.restoreCompleted(branch
+            .filter((entry) => entry?.type === "custom" && entry?.customType === "subagents:record")
+            .map((entry) => entry.data));
         // Guard mirrors the `!scheduler.isActive()` pattern below: session_start
         // fires once per activation, but a double-bind must not leak listeners.
         if (!rpcHandle) {
-            rpcHandle = (0, cross_extension_rpc_js_1.registerRpcHandlers)({
+            rpcHandle = registerRpcHandlers({
                 events: pi.events,
                 pi,
                 getCtx: () => currentCtx,
@@ -581,10 +547,10 @@ function default_1(pi) {
     // everything else; "off" = hide the widget entirely. Read live at render time.
     let widgetMode = "background";
     function getWidgetMode() { return widgetMode; }
-    const widget = new agent_widget_js_1.AgentWidget(manager, agentActivity, getWidgetMode, () => currentCtx?.cwd);
+    const widget = new AgentWidget(manager, agentActivity, getWidgetMode);
     function setWidgetMode(m) { widgetMode = m; widget.update(); }
     // Claude Code-style FleetView: navigable list of main + subagents below the editor.
-    const fleet = new fleet_list_js_1.FleetList(manager, agentActivity, () => currentCtx?.cwd);
+    const fleet = new FleetList(manager, agentActivity, () => currentCtx?.cwd, pi, () => currentCtx);
     let fleetViewEnabled = true;
     function isFleetViewEnabled() { return fleetViewEnabled; }
     function setFleetViewEnabled(b) { fleetViewEnabled = b; fleet.setEnabled(b); }
@@ -625,7 +591,7 @@ function default_1(pi) {
     // State lives in agent-types.ts (isDefaultsDisabled) because registerAgents
     // needs it; this wrapper just re-registers after flipping it.
     function setDisableDefaultAgents(b) {
-        (0, agent_types_js_1.setDefaultsDisabled)(b);
+        setDefaultsDisabled(b);
         reloadCustomAgents(); // re-register with new setting
     }
     // ---- Agent tool description mode ----
@@ -688,15 +654,15 @@ function default_1(pi) {
         const tools = cfg?.builtinToolNames;
         if (!tools || tools.length === 0)
             return "*";
-        const isFullSet = tools.length === agent_types_js_1.BUILTIN_TOOL_NAMES.length
-            && agent_types_js_1.BUILTIN_TOOL_NAMES.every((t) => tools.includes(t));
+        const isFullSet = tools.length === BUILTIN_TOOL_NAMES.length
+            && BUILTIN_TOOL_NAMES.every((t) => tools.includes(t));
         return isFullSet ? "*" : tools.join(", ");
     };
     /** Build the full type list text dynamically from available agents only. */
     const buildTypeListText = () => {
-        const available = (0, agent_types_js_1.getAvailableTypes)();
+        const available = getAvailableTypes();
         return available.map((name) => {
-            const cfg = (0, agent_types_js_1.getAgentConfig)(name);
+            const cfg = getAgentConfig(name);
             const modelSuffix = cfg?.model ? ` (${getModelLabelFromConfig(cfg.model)})` : "";
             const toolsSuffix = ` (Tools: ${formatToolsSuffix(cfg)})`;
             return `- ${name}: ${cfg?.description ?? name}${modelSuffix}${toolsSuffix}`;
@@ -708,8 +674,8 @@ function default_1(pi) {
         return (match ? match[0] : text).replace(/\s+/g, " ").trim();
     };
     /** Compact type list: one line per agent, first sentence only. */
-    const buildCompactTypeListText = () => (0, agent_types_js_1.getAvailableTypes)().map((name) => {
-        const cfg = (0, agent_types_js_1.getAgentConfig)(name);
+    const buildCompactTypeListText = () => getAvailableTypes().map((name) => {
+        const cfg = getAgentConfig(name);
         return `- ${name}: ${firstSentence(cfg?.description ?? name)} (Tools: ${formatToolsSuffix(cfg)})`;
     }).join("\n");
     /** Derive a short model label from a model string. */
@@ -722,10 +688,10 @@ function default_1(pi) {
     // Apply persisted settings on startup and emit `subagents:settings_loaded`.
     // Global + project merged; missing → defaults; corrupt file emits a warning
     // to stderr and falls back to defaults.
-    (0, settings_js_1.applyAndEmitLoaded)({
+    applyAndEmitLoaded({
         setMaxConcurrent: (n) => manager.setMaxConcurrent(n),
-        setDefaultMaxTurns: agent_runner_js_1.setDefaultMaxTurns,
-        setGraceTurns: agent_runner_js_1.setGraceTurns,
+        setDefaultMaxTurns,
+        setGraceTurns,
         setDefaultJoinMode,
         setSchedulingEnabled,
         setScopeModels: setScopeModelsEnabled,
@@ -742,7 +708,7 @@ function default_1(pi) {
     // preserves Type.Object's inference when present and produces a
     // `schedule`-free schema when absent — zero LLM-context cost in disabled mode.
     const scheduleParamShape = {
-        schedule: typebox_1.Type.Optional(typebox_1.Type.String({
+        schedule: Type.Optional(Type.String({
             description: 'Opt-in only — fire later instead of now. Omit to run immediately (the default, almost always correct). ' +
                 'Formats: 6-field cron ("0 0 9 * * 1" = 9am Mon), interval ("5m"/"1h"), one-shot ("+10m" or ISO). ' +
                 'Forces run_in_background; incompatible with inherit_context and resume. Returns job ID.',
@@ -758,7 +724,7 @@ function default_1(pi) {
     const compactAgentToolDescription = `Launch an autonomous agent for complex, multi-step tasks. Agent types:
 ${buildCompactTypeListText()}
 
-Custom agents: .pi/agents/<name>.md (project) or ${(0, pi_coding_agent_1.getAgentDir)()}/agents/<name>.md (global).
+Custom agents: .pi/agents/<name>.md (project) or ${getAgentDir()}/agents/<name>.md (global).
 
 Notes:
 - description: 3-5 words (shown in UI). Prompts must be self-contained — the agent has not seen this conversation.
@@ -771,7 +737,7 @@ Notes:
 Available agent types and the tools they have access to:
 ${buildTypeListText()}
 
-Custom agents can be defined in .pi/agents/<name>.md (project) or ${(0, pi_coding_agent_1.getAgentDir)()}/agents/<name>.md (global) — they are picked up automatically. Project-level agents override global ones. Creating a .md file with the same name as a default agent overrides it.
+Custom agents can be defined in .pi/agents/<name>.md (project) or ${getAgentDir()}/agents/<name>.md (global) — they are picked up automatically. Project-level agents override global ones. Creating a .md file with the same name as a default agent overrides it.
 
 When using the Agent tool, specify a subagent_type parameter to select which agent type to use.
 
@@ -816,7 +782,7 @@ Terse command-style prompts produce shallow, generic work.
         const vars = {
             typeList: buildTypeListText,
             compactTypeList: buildCompactTypeListText,
-            agentDir: pi_coding_agent_1.getAgentDir,
+            agentDir: getAgentDir,
             scheduleGuideline: () => scheduleGuideline,
         };
         // Replacement callback (not a string) — agent descriptions may contain `$&` etc.
@@ -829,13 +795,13 @@ Terse command-style prompts produce shallow, generic work.
     };
     const loadCustomToolDescription = () => {
         for (const path of [
-            (0, node_path_1.join)(process.cwd(), ".pi", "agent-tool-description.md"),
-            (0, node_path_1.join)((0, pi_coding_agent_1.getAgentDir)(), "agent-tool-description.md"),
+            join(process.cwd(), ".pi", "agent-tool-description.md"),
+            join(getAgentDir(), "agent-tool-description.md"),
         ]) {
             try {
-                if (!(0, node_fs_1.existsSync)(path))
+                if (!existsSync(path))
                     continue;
-                const text = (0, node_fs_1.readFileSync)(path, "utf-8").trim();
+                const text = readFileSync(path, "utf-8").trim();
                 if (text)
                     return renderToolDescriptionTemplate(text);
                 console.warn(`[pi-subagents] ${path} is empty — ignoring`);
@@ -858,8 +824,8 @@ Terse command-style prompts produce shallow, generic work.
         }
         return fullAgentToolDescription;
     })();
-    pi.registerTool((0, pi_coding_agent_1.defineTool)({
-        name: agent_runner_js_1.SUBAGENT_TOOL_NAMES.AGENT,
+    pi.registerTool(defineTool({
+        name: SUBAGENT_TOOL_NAMES.AGENT,
         label: "Agent",
         description: agentToolDescription,
         promptSnippet: "Launch autonomous sub-agents for complex multi-step tasks",
@@ -869,54 +835,54 @@ Terse command-style prompts produce shallow, generic work.
             "When an agent runs in the background, you will be notified on completion — do not poll or sleep waiting for it. Continue with other work instead.",
             "Trust but verify: an agent's summary describes intent, not outcome. When an agent writes or edits code, check the actual changes before reporting work as done.",
         ],
-        parameters: typebox_1.Type.Object({
-            prompt: typebox_1.Type.String({
+        parameters: Type.Object({
+            prompt: Type.String({
                 description: "The task for the agent to perform.",
             }),
-            description: typebox_1.Type.String({
+            description: Type.String({
                 description: "A short (3-5 word) description of the task (shown in UI).",
             }),
-            subagent_type: typebox_1.Type.String({
-                description: `The type of specialized agent to use. Available types: ${(0, agent_types_js_1.getAvailableTypes)().join(", ")}. Custom agents from .pi/agents/*.md (project) or ${(0, pi_coding_agent_1.getAgentDir)()}/agents/*.md (global) are also available.`,
+            subagent_type: Type.String({
+                description: `The type of specialized agent to use. Available types: ${getAvailableTypes().join(", ")}. Custom agents from .pi/agents/*.md (project) or ${getAgentDir()}/agents/*.md (global) are also available.`,
             }),
-            model: typebox_1.Type.Optional(typebox_1.Type.String({
+            model: Type.Optional(Type.String({
                 description: 'Optional model override. Accepts "provider/modelId" or fuzzy name (e.g. "haiku", "sonnet"). Omit to use the agent type\'s default.',
             })),
-            thinking: typebox_1.Type.Optional(typebox_1.Type.String({
+            thinking: Type.Optional(Type.String({
                 description: `Thinking level: ${THINKING_LEVELS.join(", ")}. Overrides agent default.`,
             })),
-            max_turns: typebox_1.Type.Optional(typebox_1.Type.Number({
+            max_turns: Type.Optional(Type.Number({
                 description: "Maximum number of agentic turns before stopping. Omit for unlimited (default).",
                 minimum: 1,
             })),
-            run_in_background: typebox_1.Type.Optional(typebox_1.Type.Boolean({
+            run_in_background: Type.Optional(Type.Boolean({
                 description: "Set to true to run in background. Returns agent ID immediately. You will be notified on completion.",
             })),
-            resume: typebox_1.Type.Optional(typebox_1.Type.String({
+            resume: Type.Optional(Type.String({
                 description: "Optional agent ID to resume from. Continues from previous context.",
             })),
-            isolated: typebox_1.Type.Optional(typebox_1.Type.Boolean({
+            isolated: Type.Optional(Type.Boolean({
                 description: "If true, agent gets no extension/MCP tools — only built-in tools.",
             })),
-            inherit_context: typebox_1.Type.Optional(typebox_1.Type.Boolean({
+            inherit_context: Type.Optional(Type.Boolean({
                 description: "If true, fork parent conversation into the agent. Default: false (fresh context).",
             })),
-            isolation: typebox_1.Type.Optional(typebox_1.Type.Literal("worktree", {
+            isolation: Type.Optional(Type.Literal("worktree", {
                 description: 'Set to "worktree" to run the agent in a temporary git worktree (isolated copy of the repo). Changes are saved to a branch on completion.',
             })),
             ...scheduleParam,
         }),
         // ---- Custom rendering: Claude Code style ----
         renderCall(args, theme) {
-            const displayName = args.subagent_type ? (0, agent_widget_js_1.getDisplayName)(args.subagent_type) : "Agent";
+            const displayName = args.subagent_type ? getDisplayName(args.subagent_type) : "Agent";
             const desc = args.description ?? "";
-            return new pi_tui_1.Text("▸ " + theme.fg("toolTitle", theme.bold(displayName)) + (desc ? "  " + theme.fg("muted", desc) : ""), 0, 0);
+            return new Text("▸ " + theme.fg("toolTitle", theme.bold(displayName)) + (desc ? "  " + theme.fg("muted", desc) : ""), 0, 0);
         },
         renderResult(result, { expanded, isPartial }, theme) {
             const details = result.details;
             if (!details) {
                 const text = result.content[0]?.type === "text" ? result.content[0].text : "";
-                return new pi_tui_1.Text(text, 0, 0);
+                return new Text(text, 0, 0);
             }
             // Helper: build "haiku · thinking: high · ↻5≤30 · 3 tool uses · 33.8k tokens" stats string
             const stats = (d) => {
@@ -926,27 +892,27 @@ Terse command-style prompts produce shallow, generic work.
                 if (d.tags)
                     parts.push(...d.tags);
                 if (d.turnCount != null && d.turnCount > 0) {
-                    parts.push((0, agent_widget_js_1.formatTurns)(d.turnCount, d.maxTurns));
+                    parts.push(formatTurns(d.turnCount, d.maxTurns));
                 }
                 if (d.toolUses > 0)
                     parts.push(`${d.toolUses} tool use${d.toolUses === 1 ? "" : "s"}`);
                 if (d.tokens)
                     parts.push(d.tokens);
-                return parts.map(p => (0, agent_widget_js_1.fgPreservingNestedStyles)(theme, "dim", p)).join(" " + theme.fg("dim", "·") + " ");
+                return parts.map(p => fgPreservingNestedStyles(theme, "dim", p)).join(" " + theme.fg("dim", "·") + " ");
             };
             // ---- While running (streaming) ----
             if (isPartial || details.status === "running") {
-                const frame = agent_widget_js_1.SPINNER[details.spinnerFrame ?? 0];
+                const frame = SPINNER[details.spinnerFrame ?? 0];
                 const s = stats(details);
                 return renderRunningAgentStatus(frame, s, details.activity ?? "thinking…", theme);
             }
             // ---- Background agent launched ----
             if (details.status === "background") {
-                return new pi_tui_1.Text(theme.fg("dim", `  ⎿  Running in background (ID: ${details.agentId})`), 0, 0);
+                return new Text(theme.fg("dim", `  ⎿  Running in background (ID: ${details.agentId})`), 0, 0);
             }
             // ---- Completed / Steered ----
             if (details.status === "completed" || details.status === "steered") {
-                const duration = (0, agent_widget_js_1.formatMs)(details.durationMs);
+                const duration = formatMs(details.durationMs);
                 const isSteered = details.status === "steered";
                 const icon = isSteered ? theme.fg("warning", "✓") : theme.fg("success", "✓");
                 const s = stats(details);
@@ -954,28 +920,28 @@ Terse command-style prompts produce shallow, generic work.
                 line += " " + theme.fg("dim", "·") + " " + theme.fg("dim", duration);
                 if (expanded) {
                     const resultText = result.content[0]?.type === "text" ? result.content[0].text : "";
-                    const container = new pi_tui_1.Container();
-                    container.addChild(new pi_tui_1.Text(line, 0, 0));
                     if (resultText) {
-                        container.addChild((0, markdown_result_js_1.createMarkdownResult)(resultText, theme, 50));
+                        const lines = resultText.split("\n").slice(0, 50);
+                        for (const l of lines) {
+                            line += "\n" + theme.fg("dim", `  ${l}`);
+                        }
                         if (resultText.split("\n").length > 50) {
-                            container.addChild(new pi_tui_1.Text(theme.fg("muted", "  ... (use get_subagent_result with verbose for full output)"), 0, 0));
+                            line += "\n" + theme.fg("muted", "  ... (use get_subagent_result with verbose for full output)");
                         }
                     }
-                    return container;
                 }
                 else {
                     const doneText = isSteered ? "Wrapped up (turn limit)" : "Done";
                     line += "\n" + theme.fg("dim", `  ⎿  ${doneText}`);
                 }
-                return new pi_tui_1.Text(line, 0, 0);
+                return new Text(line, 0, 0);
             }
             // ---- Stopped (user-initiated abort) ----
             if (details.status === "stopped") {
                 const s = stats(details);
                 let line = theme.fg("dim", "■") + (s ? " " + s : "");
                 line += "\n" + theme.fg("dim", "  ⎿  Stopped");
-                return new pi_tui_1.Text(line, 0, 0);
+                return new Text(line, 0, 0);
             }
             // ---- Error / Aborted (hard max_turns) ----
             const s = stats(details);
@@ -986,7 +952,7 @@ Terse command-style prompts produce shallow, generic work.
             else {
                 line += "\n" + theme.fg("warning", "  ⎿  Aborted (max turns exceeded)");
             }
-            return new pi_tui_1.Text(line, 0, 0);
+            return new Text(line, 0, 0);
         },
         // ---- Execute ----
         execute: async (toolCallId, params, signal, onUpdate, ctx) => {
@@ -995,17 +961,17 @@ Terse command-style prompts produce shallow, generic work.
             // Reload custom agents so new project/global .md files are picked up without restart
             reloadCustomAgents();
             const rawType = params.subagent_type;
-            const resolved = (0, agent_types_js_1.resolveType)(rawType);
+            const resolved = resolveType(rawType);
             const subagentType = resolved ?? "general-purpose";
             const fellBack = resolved === undefined;
-            const displayName = (0, agent_widget_js_1.getDisplayName)(subagentType);
+            const displayName = getDisplayName(subagentType);
             // Get agent config (if any)
-            const customConfig = (0, agent_types_js_1.getAgentConfig)(subagentType);
-            const resolvedConfig = (0, invocation_config_js_1.resolveAgentInvocationConfig)(customConfig, params);
+            const customConfig = getAgentConfig(subagentType);
+            const resolvedConfig = resolveAgentInvocationConfig(customConfig, params);
             // Resolve model from agent config first; tool-call params only fill gaps.
             let model = ctx.model;
             if (resolvedConfig.modelInput) {
-                const resolved = (0, model_resolver_js_1.resolveModel)(resolvedConfig.modelInput, ctx.modelRegistry);
+                const resolved = resolveModel(resolvedConfig.modelInput, ctx.modelRegistry);
                 if (typeof resolved === "string") {
                     if (resolvedConfig.modelFromParams)
                         return textResult(resolved);
@@ -1025,8 +991,8 @@ Terse command-style prompts produce shallow, generic work.
             //     user authored/installed this agent or chose the parent's model; trust it).
             // See SubagentsSettings.scopeModels docstring for the full policy.
             if (isScopeModelsEnabled() && model) {
-                const allowed = (0, enabled_models_js_1.resolveEnabledModels)((0, enabled_models_js_1.readEnabledModels)(ctx.cwd), ctx.modelRegistry, ctx.cwd);
-                if (allowed && !(0, enabled_models_js_1.isModelInScope)(model, allowed)) {
+                const allowed = resolveEnabledModels(readEnabledModels(ctx.cwd), ctx.modelRegistry, ctx.cwd);
+                if (allowed && !isModelInScope(model, allowed)) {
                     if (resolvedConfig.modelFromParams) {
                         const list = [...allowed].sort().map(m => `  ${m}`).join("\n");
                         return textResult(`Model not in scope: "${resolvedConfig.modelInput}".\n\n` +
@@ -1052,20 +1018,17 @@ Terse command-style prompts produce shallow, generic work.
             const attachTranscript = (rec, agentId) => {
                 if (!rec || !outputTranscript)
                     return;
-                rec.outputFile = (0, output_file_js_1.createOutputFilePath)(ctx.cwd, agentId, ctx.sessionManager.getSessionId());
-                (0, output_file_js_1.writeInitialEntry)(rec.outputFile, agentId, params.prompt, ctx.cwd);
-                // Keep the existing /tmp output for compatibility, while also writing a
-                // durable project-local copy for reload-safe, read-only history viewing.
+                rec.outputFile = createOutputFilePath(ctx.cwd, agentId, ctx.sessionManager.getSessionId());
+                writeInitialEntry(rec.outputFile, agentId, params.prompt, ctx.cwd);
                 try {
-                    rec.historyFile = (0, agent_history_js_1.createAgentHistoryPath)(ctx.cwd, agentId, subagentType);
-                    rec.transcriptPath = (0, agent_history_js_1.agentHistoryLocator)(ctx.cwd, rec.historyFile);
-                    (0, output_file_js_1.writeInitialEntry)(rec.historyFile, agentId, params.prompt, ctx.cwd);
+                    rec.historyFile = createAgentHistoryPath(ctx.cwd, agentId);
+                    rec.transcriptPath = agentHistoryLocator(ctx.cwd, rec.historyFile);
+                    writeInitialEntry(rec.historyFile, agentId, params.prompt, ctx.cwd);
                 }
                 catch (err) {
-                    // History is best effort; never disable the existing output transcript.
                     rec.historyFile = undefined;
                     rec.transcriptPath = undefined;
-                    console.warn("[pi-subagents] Failed to create durable transcript:", err);
+                    ctx.ui.notify(`Could not create durable transcript for agent ${agentId}: ${err instanceof Error ? err.message : String(err)}`, "warning");
                 }
             };
             const parentModelId = ctx.model?.id;
@@ -1073,21 +1036,21 @@ Terse command-style prompts produce shallow, generic work.
             const modelName = effectiveModelId && effectiveModelId !== parentModelId
                 ? (model?.name ?? effectiveModelId).replace(/^Claude\s+/i, "").toLowerCase()
                 : undefined;
-            const effectiveMaxTurns = (0, agent_runner_js_1.normalizeMaxTurns)(resolvedConfig.maxTurns ?? (0, agent_runner_js_1.getDefaultMaxTurns)());
+            const effectiveMaxTurns = normalizeMaxTurns(resolvedConfig.maxTurns ?? getDefaultMaxTurns());
             const agentInvocation = {
                 modelName,
                 thinking,
                 // Explicit value only — the default fallback would just add noise.
                 // Normalize so `0` (unlimited) doesn't surface as a misleading "max turns: 0".
-                maxTurns: (0, agent_runner_js_1.normalizeMaxTurns)(resolvedConfig.maxTurns),
+                maxTurns: normalizeMaxTurns(resolvedConfig.maxTurns),
                 isolated,
                 inheritContext,
                 runInBackground,
                 isolation,
             };
             // Tool-result render shows the mode label too; viewer's header already does.
-            const modeLabel = (0, agent_widget_js_1.getPromptModeLabel)(subagentType);
-            const { tags: invocationTags } = (0, agent_widget_js_1.buildInvocationTags)(agentInvocation);
+            const modeLabel = getPromptModeLabel(subagentType);
+            const { tags: invocationTags } = buildInvocationTags(agentInvocation);
             const agentTags = modeLabel ? [modeLabel, ...invocationTags] : invocationTags;
             const detailBase = {
                 displayName,
@@ -1167,7 +1130,7 @@ Terse command-style prompts produce shallow, generic work.
                     origBgOnSession(session);
                     const rec = manager.getRecord(id);
                     if (rec?.outputFile) {
-                        rec.outputCleanup = (0, output_file_js_1.streamToOutputFile)(session, rec.outputFile, id, ctx.cwd, rec.historyFile);
+                        rec.outputCleanup = streamToOutputFile(session, rec.outputFile, id, ctx.cwd, rec.historyFile);
                     }
                 };
                 try {
@@ -1189,7 +1152,7 @@ Terse command-style prompts produce shallow, generic work.
                 }
                 // Set output file + join mode synchronously after spawn, before the
                 // event loop yields — onSessionCreated is async so this is safe.
-                const joinMode = (0, invocation_config_js_1.resolveJoinMode)(defaultJoinMode, true);
+                const joinMode = resolveJoinMode(defaultJoinMode, true);
                 const record = manager.getRecord(id);
                 if (record && joinMode) {
                     record.joinMode = joinMode;
@@ -1244,8 +1207,8 @@ Terse command-style prompts produce shallow, generic work.
                     maxTurns: fgState.maxTurns,
                     durationMs: Date.now() - startedAt,
                     status: "running",
-                    activity: (0, agent_widget_js_1.describeActivity)(fgState.activeTools, fgState.responseText),
-                    spinnerFrame: spinnerFrame % agent_widget_js_1.SPINNER.length,
+                    activity: describeActivity(fgState.activeTools, fgState.responseText),
+                    spinnerFrame: spinnerFrame % SPINNER.length,
                 };
                 onUpdate?.({
                     content: [{ type: "text", text: `${fgState.toolUses} tool uses...` }],
@@ -1273,7 +1236,7 @@ Terse command-style prompts produce shallow, generic work.
                 if (fgId) {
                     const rec = manager.getRecord(fgId);
                     if (rec?.outputFile) {
-                        rec.outputCleanup = (0, output_file_js_1.streamToOutputFile)(session, rec.outputFile, fgId, ctx.cwd, rec.historyFile);
+                        rec.outputCleanup = streamToOutputFile(session, rec.outputFile, fgId, ctx.cwd, rec.historyFile);
                     }
                 }
             };
@@ -1321,7 +1284,7 @@ Terse command-style prompts produce shallow, generic work.
             // "general-purpose" may itself be unregistered (defaults disabled, no
             // user override) — getConfig then uses the hardcoded fallback config.
             const fallbackNote = fellBack
-                ? `Note: Unknown agent type "${rawType}" — using ${(0, agent_types_js_1.resolveType)("general-purpose") ? "general-purpose" : "the fallback agent config"}.\n\n`
+                ? `Note: Unknown agent type "${rawType}" — using ${resolveType("general-purpose") ? "general-purpose" : "the fallback agent config"}.\n\n`
                 : "";
             if (record.status === "error") {
                 // Error headline + any partial output the run produced before failing.
@@ -1331,24 +1294,24 @@ Terse command-style prompts produce shallow, generic work.
             const statsParts = [`${record.toolUses} tool uses`];
             if (tokenText)
                 statsParts.push(tokenText);
-            return textResult(`${fallbackNote}Agent completed in ${(0, agent_widget_js_1.formatMs)(durationMs)} (${statsParts.join(", ")})${(0, status_note_js_1.getStatusNote)(record.status)}.\n\n` +
+            return textResult(`${fallbackNote}Agent completed in ${formatMs(durationMs)} (${statsParts.join(", ")})${getStatusNote(record.status)}.\n\n` +
                 (record.result?.trim() || "No output."), details);
         },
     }));
     // ---- get_subagent_result tool ----
-    pi.registerTool((0, pi_coding_agent_1.defineTool)({
-        name: agent_runner_js_1.SUBAGENT_TOOL_NAMES.GET_RESULT,
+    pi.registerTool(defineTool({
+        name: SUBAGENT_TOOL_NAMES.GET_RESULT,
         label: "Get Agent Result",
         description: "Check status and retrieve results from a background agent. Use the agent ID returned by Agent with run_in_background.",
         promptSnippet: "Check status and retrieve results from a background agent",
-        parameters: typebox_1.Type.Object({
-            agent_id: typebox_1.Type.String({
+        parameters: Type.Object({
+            agent_id: Type.String({
                 description: "The agent ID to check.",
             }),
-            wait: typebox_1.Type.Optional(typebox_1.Type.Boolean({
+            wait: Type.Optional(Type.Boolean({
                 description: "If true, wait for the agent to complete before returning. Default: false.",
             })),
-            verbose: typebox_1.Type.Optional(typebox_1.Type.Boolean({
+            verbose: Type.Optional(Type.Boolean({
                 description: "If true, include the agent's full conversation (messages + tool calls). Default: false.",
             })),
         }),
@@ -1369,10 +1332,10 @@ Terse command-style prompts produce shallow, generic work.
                 if (record.promise)
                     await abortable(record.promise, signal);
             }
-            const displayName = (0, agent_widget_js_1.getDisplayName)(record.type);
-            const duration = (0, agent_widget_js_1.formatDuration)(record.startedAt, record.completedAt);
+            const displayName = getDisplayName(record.type);
+            const duration = formatDuration(record.startedAt, record.completedAt);
             const tokens = formatLifetimeTokens(record);
-            const contextPercent = (0, usage_js_1.getSessionContextPercent)(record.session);
+            const contextPercent = getSessionContextPercent(record.session);
             const statsParts = [`Tool uses: ${record.toolUses}`];
             if (tokens)
                 statsParts.push(tokens);
@@ -1382,7 +1345,7 @@ Terse command-style prompts produce shallow, generic work.
                 statsParts.push(`Compactions: ${record.compactionCount}`);
             statsParts.push(`Duration: ${duration}`);
             let output = `Agent: ${record.id}\n` +
-                `Type: ${displayName} | Status: ${record.status}${(0, status_note_js_1.getStatusNote)(record.status)} | ${statsParts.join(" | ")}\n` +
+                `Type: ${displayName} | Status: ${record.status}${getStatusNote(record.status)} | ${statsParts.join(" | ")}\n` +
                 `Description: ${record.description}\n\n`;
             if (record.status === "running") {
                 output += "Agent is still running. Use wait: true or check back later.";
@@ -1400,7 +1363,7 @@ Terse command-style prompts produce shallow, generic work.
             }
             // Verbose: include full conversation
             if (params.verbose && record.session) {
-                const conversation = (0, agent_runner_js_1.getAgentConversation)(record.session);
+                const conversation = getAgentConversation(record.session);
                 if (conversation) {
                     output += `\n\n--- Agent Conversation ---\n${conversation}`;
                 }
@@ -1409,17 +1372,17 @@ Terse command-style prompts produce shallow, generic work.
         },
     }));
     // ---- steer_subagent tool ----
-    pi.registerTool((0, pi_coding_agent_1.defineTool)({
-        name: agent_runner_js_1.SUBAGENT_TOOL_NAMES.STEER,
+    pi.registerTool(defineTool({
+        name: SUBAGENT_TOOL_NAMES.STEER,
         label: "Steer Agent",
         description: "Send a steering message to a running agent. The message will interrupt the agent after its current tool execution " +
             "and be injected into its conversation, allowing you to redirect its work mid-run. Only works on running agents.",
         promptSnippet: "Send a steering message to redirect a running background agent",
-        parameters: typebox_1.Type.Object({
-            agent_id: typebox_1.Type.String({
+        parameters: Type.Object({
+            agent_id: Type.String({
                 description: "The agent ID to steer (must be currently running).",
             }),
-            message: typebox_1.Type.String({
+            message: Type.String({
                 description: "The steering message to send. This will appear as a user message in the agent's conversation.",
             }),
         }),
@@ -1440,10 +1403,10 @@ Terse command-style prompts produce shallow, generic work.
                 return textResult(`Steering message queued for agent ${record.id}. It will be delivered once the session initializes.`);
             }
             try {
-                await (0, agent_runner_js_1.steerAgent)(record.session, params.message);
+                await steerAgent(record.session, params.message);
                 pi.events.emit("subagents:steered", { id: record.id, message: params.message });
                 const tokens = formatLifetimeTokens(record);
-                const contextPercent = (0, usage_js_1.getSessionContextPercent)(record.session);
+                const contextPercent = getSessionContextPercent(record.session);
                 const stateParts = [];
                 if (tokens)
                     stateParts.push(tokens);
@@ -1461,30 +1424,30 @@ Terse command-style prompts produce shallow, generic work.
         },
     }));
     // ---- /agents interactive menu ----
-    const projectAgentsDir = () => (0, node_path_1.join)(process.cwd(), ".pi", "agents");
-    const workspaceAgentsDir = () => (0, node_path_1.join)(process.cwd(), ".agents", "agents");
-    const personalAgentsDir = () => (0, node_path_1.join)((0, pi_coding_agent_1.getAgentDir)(), "agents");
+    const projectAgentsDir = () => join(process.cwd(), ".pi", "agents");
+    const workspaceAgentsDir = () => join(process.cwd(), ".agents", "agents");
+    const personalAgentsDir = () => join(getAgentDir(), "agents");
     /** Find the file path of a custom agent by name, in discovery-precedence order (project, workspace, then global). */
     function findAgentFile(name) {
-        const projectPath = (0, node_path_1.join)(projectAgentsDir(), `${name}.md`);
-        if ((0, node_fs_1.existsSync)(projectPath))
+        const projectPath = join(projectAgentsDir(), `${name}.md`);
+        if (existsSync(projectPath))
             return { path: projectPath, location: "project" };
-        const workspacePath = (0, node_path_1.join)(workspaceAgentsDir(), `${name}.md`);
-        if ((0, node_fs_1.existsSync)(workspacePath))
+        const workspacePath = join(workspaceAgentsDir(), `${name}.md`);
+        if (existsSync(workspacePath))
             return { path: workspacePath, location: "workspace" };
-        const personalPath = (0, node_path_1.join)(personalAgentsDir(), `${name}.md`);
-        if ((0, node_fs_1.existsSync)(personalPath))
+        const personalPath = join(personalAgentsDir(), `${name}.md`);
+        if (existsSync(personalPath))
             return { path: personalPath, location: "personal" };
         return undefined;
     }
     function getModelLabel(type, registry) {
-        const cfg = (0, agent_types_js_1.getAgentConfig)(type);
+        const cfg = getAgentConfig(type);
         if (!cfg?.model)
             return "inherit"; // no model configured → really inherits parent
         const label = getModelLabelFromConfig(cfg.model);
         if (!registry)
             return label;
-        const resolved = (0, model_resolver_js_1.resolveModel)(cfg.model, registry);
+        const resolved = resolveModel(cfg.model, registry);
         // Configured but unresolvable: the runtime silently falls back to the parent
         // model, so flag it (and the fallback) rather than hiding the config.
         if (typeof resolved === "string")
@@ -1500,16 +1463,13 @@ Terse command-style prompts produce shallow, generic work.
     }
     async function showAgentsMenu(ctx) {
         reloadCustomAgents();
-        const allNames = (0, agent_types_js_1.getAllTypes)();
+        const allNames = getAllTypes();
         // Build select options
         const options = [];
-        // Running agents entry (only if there are active agents)
-        const agents = manager.listAgents();
-        if (agents.length > 0) {
-            const running = agents.filter(a => a.status === "running" || a.status === "queued").length;
-            const done = agents.filter(a => a.status === "completed" || a.status === "steered").length;
-            options.push(`Running agents (${agents.length}) — ${running} running, ${done} done`);
-        }
+        // Keep active agents and terminal history in separate menu entries.
+        const records = manager.listAgents();
+        const { active, history } = splitAgentRecords(records, ctx.cwd);
+        options.push(...buildAgentStatusMenuEntries(records, ctx.cwd));
         // Agent types list
         if (allNames.length > 0) {
             options.push(`Agent types (${allNames.length})`);
@@ -1522,7 +1482,7 @@ Terse command-style prompts produce shallow, generic work.
         // Actions
         options.push("Create new agent");
         options.push("Settings");
-        const noAgentsMsg = allNames.length === 0 && agents.length === 0
+        const noAgentsMsg = allNames.length === 0 && active.length === 0 && history.length === 0
             ? "No agents found. Create specialized subagents that can be delegated to.\n\n" +
                 "Each subagent has its own context window, custom system prompt, and specific tools.\n\n" +
                 "Try creating: Code Reviewer, Security Auditor, Test Writer, or Documentation Writer.\n\n"
@@ -1537,12 +1497,16 @@ Terse command-style prompts produce shallow, generic work.
             await showRunningAgents(ctx);
             await showAgentsMenu(ctx);
         }
+        else if (choice.startsWith("Agent history (")) {
+            await showAgentHistory(ctx);
+            await showAgentsMenu(ctx);
+        }
         else if (choice.startsWith("Agent types (")) {
             await showAllAgentsList(ctx);
             await showAgentsMenu(ctx);
         }
         else if (choice.startsWith("Scheduled jobs (")) {
-            await (0, schedule_menu_js_1.showSchedulesMenu)(ctx, scheduler);
+            await showSchedulesMenu(ctx, scheduler);
             await showAgentsMenu(ctx);
         }
         else if (choice === "Create new agent") {
@@ -1554,7 +1518,7 @@ Terse command-style prompts produce shallow, generic work.
         }
     }
     async function showAllAgentsList(ctx) {
-        const allNames = (0, agent_types_js_1.getAllTypes)();
+        const allNames = getAllTypes();
         if (allNames.length === 0) {
             ctx.ui.notify("No agents.", "info");
             return;
@@ -1575,7 +1539,7 @@ Terse command-style prompts produce shallow, generic work.
         // full description renders below the highlighted row via SettingsList,
         // exactly like the Settings menu — so long descriptions never wrap the list.
         const items = allNames.map(name => {
-            const cfg = (0, agent_types_js_1.getAgentConfig)(name);
+            const cfg = getAgentConfig(name);
             const disabled = cfg?.enabled === false;
             const model = getModelLabel(name, ctx.modelRegistry);
             return {
@@ -1588,22 +1552,22 @@ Terse command-style prompts produce shallow, generic work.
                 values: [model],
             };
         });
-        const hasCustom = allNames.some(n => { const c = (0, agent_types_js_1.getAgentConfig)(n); return c && !c.isDefault && c.enabled !== false; });
-        const hasDisabled = allNames.some(n => (0, agent_types_js_1.getAgentConfig)(n)?.enabled === false);
+        const hasCustom = allNames.some(n => { const c = getAgentConfig(n); return c && !c.isDefault && c.enabled !== false; });
+        const hasDisabled = allNames.some(n => getAgentConfig(n)?.enabled === false);
         const legendParts = [];
         if (hasCustom)
             legendParts.push("• = project  ◦ = global");
         if (hasDisabled)
             legendParts.push("✕ = disabled");
         const selected = await ctx.ui.custom((_tui, _theme, _kb, done) => {
-            const slTheme = (0, pi_coding_agent_1.getSettingsListTheme)();
-            const list = new pi_tui_1.SettingsList(items, Math.min(items.length, 12), slTheme, id => done(id), // Enter/Space on a row → return that agent's name
+            const slTheme = getSettingsListTheme();
+            const list = new SettingsList(items, Math.min(items.length, 12), slTheme, id => done(id), // Enter/Space on a row → return that agent's name
             () => done(undefined));
-            const container = new pi_tui_1.Container();
-            container.addChild(new pi_tui_1.Text("Agent types", 0, 0));
+            const container = new Container();
+            container.addChild(new Text("Agent types", 0, 0));
             if (legendParts.length)
-                container.addChild(new pi_tui_1.Text(slTheme.hint(legendParts.join("  ")), 0, 0));
-            container.addChild(new pi_tui_1.Spacer(1));
+                container.addChild(new Text(slTheme.hint(legendParts.join("  ")), 0, 0));
+            container.addChild(new Spacer(1));
             container.addChild(list);
             return {
                 render: (w) => container.render(w),
@@ -1611,20 +1575,20 @@ Terse command-style prompts produce shallow, generic work.
                 handleInput: (data) => list.handleInput?.(data),
             };
         });
-        if (selected && (0, agent_types_js_1.getAgentConfig)(selected)) {
+        if (selected && getAgentConfig(selected)) {
             await showAgentDetail(ctx, selected);
             await showAllAgentsList(ctx);
         }
     }
     async function showRunningAgents(ctx) {
-        const agents = manager.listAgents().filter((record) => record.session !== undefined || (0, agent_history_js_1.hasAgentHistory)(ctx.cwd, record.transcriptPath));
+        const { active: agents } = splitAgentRecords(manager.listAgents(), ctx.cwd);
         if (agents.length === 0) {
             ctx.ui.notify("No agents.", "info");
             return;
         }
         const options = agents.map(a => {
-            const dn = (0, agent_widget_js_1.getDisplayName)(a.type);
-            const dur = (0, agent_widget_js_1.formatDuration)(a.startedAt, a.completedAt);
+            const dn = getDisplayName(a.type);
+            const dur = formatDuration(a.startedAt, a.completedAt);
             return `${dn} (${a.description}) · ${a.toolUses} tools · ${a.status} · ${dur}`;
         });
         const choice = await ctx.ui.select("Running agents", options);
@@ -1635,41 +1599,66 @@ Terse command-style prompts produce shallow, generic work.
         if (idx < 0)
             return;
         const record = agents[idx];
-        await viewAgentConversation(ctx, record);
+        await viewAgentConversation(ctx, record, "live");
         // Back-navigation: re-show the list
         await showRunningAgents(ctx);
     }
-    async function viewAgentConversation(ctx, record) {
-        if (!record.session) {
-            ctx.ui.notify(`Agent is ${record.status === "queued" ? "queued" : "expired"} — no session available.`, "info");
+    async function showAgentHistory(ctx) {
+        const { history } = splitAgentRecords(manager.listAgents(), ctx.cwd);
+        if (history.length === 0) {
+            ctx.ui.notify("No agent history.", "info");
+            return;
+        }
+        const options = history.map(record => formatAgentHistoryOption(record, Date.now()));
+        const choice = await ctx.ui.select("Agent history", options);
+        if (!choice)
+            return;
+        const record = history[options.indexOf(choice)];
+        if (!record)
+            return;
+        await viewAgentConversation(ctx, record, "history");
+    }
+    async function viewAgentConversation(ctx, record, mode) {
+        if (mode === "live" && !canOpenActiveAgent(record)) {
+            ctx.ui.notify(`Agent is ${record.status === "queued" ? "queued" : "expired"} — no history available.`, "info");
+            return;
+        }
+        if (mode === "history" && !canOpenAgentHistory(record, ctx.cwd)) {
+            ctx.ui.notify("No agent history.", "info");
             return;
         }
         const { ConversationViewer, VIEWPORT_HEIGHT_PCT, createStaticConversationSource } = await import("./ui/conversation-viewer.js");
-        const session = record.session ?? (record.transcriptPath
-            ? (() => {
-                const messages = (0, agent_history_js_1.readAgentHistory)(ctx.cwd, record.transcriptPath);
-                return messages ? createStaticConversationSource(messages) : undefined;
-            })()
-            : undefined);
+        const session = mode === "live"
+            ? record.session
+            : (() => {
+                const messages = record.transcriptPath
+                    ? readAgentHistory(ctx.cwd, record.transcriptPath)
+                    : undefined;
+                return messages
+                    ? createStaticConversationSource(messages)
+                    : record.session
+                        ? createStaticConversationSource(record.session.messages)
+                        : undefined;
+            })();
         if (!session) {
-            ctx.ui.notify(`Agent is ${record.status === "queued" ? "queued" : "expired"} — no history available.`, "info");
+            ctx.ui.notify("No agent history.", "info");
             return;
         }
         const activity = agentActivity.get(record.id);
-        const isLive = record.session !== undefined;
+        const isLive = mode === "live";
         await ctx.ui.custom((tui, theme, keybindings, done) => {
             return new ConversationViewer(tui, session, record, activity, theme, done, isLive ? () => {
                 if (manager.abort(record.id)) {
                     ctx.ui.notify(`Stopped "${record.description}".`, "info");
                 }
-            } : undefined, keybindings, isLive ? (message) => manager.steer(record.id, message) : undefined);
+            } : undefined, keybindings, isLive ? (message) => manager.steer(record.id, message) : undefined, mode === "history" ? { pi, ctx, readOnly: true } : { pi, ctx });
         }, {
             overlay: true,
             overlayOptions: { anchor: "center", width: "90%", maxHeight: `${VIEWPORT_HEIGHT_PCT}%` },
         });
     }
     async function showAgentDetail(ctx, name) {
-        const cfg = (0, agent_types_js_1.getAgentConfig)(name);
+        const cfg = getAgentConfig(name);
         if (!cfg) {
             ctx.ui.notify(`Agent config not found for "${name}".`, "warning");
             return;
@@ -1700,7 +1689,7 @@ Terse command-style prompts produce shallow, generic work.
         if (!choice || choice === "Back")
             return;
         if (choice === "Edit" && file) {
-            const content = (0, node_fs_1.readFileSync)(file.path, "utf-8");
+            const content = readFileSync(file.path, "utf-8");
             const edited = await ctx.ui.editor(`Edit ${name}`, content);
             if (edited !== undefined && edited !== content) {
                 const { writeFileSync } = await import("node:fs");
@@ -1713,7 +1702,7 @@ Terse command-style prompts produce shallow, generic work.
             if (file) {
                 const confirmed = await ctx.ui.confirm("Delete agent", `Delete ${name} from ${file.location} (${file.path})?`);
                 if (confirmed) {
-                    (0, node_fs_1.unlinkSync)(file.path);
+                    unlinkSync(file.path);
                     reloadCustomAgents();
                     ctx.ui.notify(`Deleted ${file.path}`, "info");
                 }
@@ -1722,7 +1711,7 @@ Terse command-style prompts produce shallow, generic work.
         else if (choice === "Reset to default" && file) {
             const confirmed = await ctx.ui.confirm("Reset to default", `Delete override ${file.path} and restore embedded default?`);
             if (confirmed) {
-                (0, node_fs_1.unlinkSync)(file.path);
+                unlinkSync(file.path);
                 reloadCustomAgents();
                 ctx.ui.notify(`Restored default ${name}`, "info");
             }
@@ -1746,9 +1735,9 @@ Terse command-style prompts produce shallow, generic work.
         if (!location)
             return;
         const targetDir = location.startsWith("Project") ? projectAgentsDir() : personalAgentsDir();
-        (0, node_fs_1.mkdirSync)(targetDir, { recursive: true });
-        const targetPath = (0, node_path_1.join)(targetDir, `${name}.md`);
-        if ((0, node_fs_1.existsSync)(targetPath)) {
+        mkdirSync(targetDir, { recursive: true });
+        const targetPath = join(targetDir, `${name}.md`);
+        if (existsSync(targetPath)) {
             const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
             if (!overwrite)
                 return;
@@ -1801,7 +1790,7 @@ Terse command-style prompts produce shallow, generic work.
         const file = findAgentFile(name);
         if (file) {
             // Existing file — set enabled: false in frontmatter (idempotent)
-            const content = (0, node_fs_1.readFileSync)(file.path, "utf-8");
+            const content = readFileSync(file.path, "utf-8");
             if (content.includes("\nenabled: false\n")) {
                 ctx.ui.notify(`${name} is already disabled.`, "info");
                 return;
@@ -1821,8 +1810,8 @@ Terse command-style prompts produce shallow, generic work.
         if (!location)
             return;
         const targetDir = location.startsWith("Project") ? projectAgentsDir() : personalAgentsDir();
-        (0, node_fs_1.mkdirSync)(targetDir, { recursive: true });
-        const targetPath = (0, node_path_1.join)(targetDir, `${name}.md`);
+        mkdirSync(targetDir, { recursive: true });
+        const targetPath = join(targetDir, `${name}.md`);
         const { writeFileSync } = await import("node:fs");
         writeFileSync(targetPath, "---\nenabled: false\n---\n", "utf-8");
         reloadCustomAgents();
@@ -1833,12 +1822,12 @@ Terse command-style prompts produce shallow, generic work.
         const file = findAgentFile(name);
         if (!file)
             return;
-        const content = (0, node_fs_1.readFileSync)(file.path, "utf-8");
+        const content = readFileSync(file.path, "utf-8");
         const updated = content.replace(/^(---\n)enabled: false\n/, "$1");
         const { writeFileSync } = await import("node:fs");
         // If the file was just a stub ("---\n---\n"), delete it to restore the built-in default
         if (updated.trim() === "---\n---" || updated.trim() === "---\n---\n") {
-            (0, node_fs_1.unlinkSync)(file.path);
+            unlinkSync(file.path);
             reloadCustomAgents();
             ctx.ui.notify(`Enabled ${name} (removed ${file.path})`, "info");
         }
@@ -1876,9 +1865,9 @@ Terse command-style prompts produce shallow, generic work.
         const name = await ctx.ui.input("Agent name (filename, no spaces)");
         if (!name)
             return;
-        (0, node_fs_1.mkdirSync)(targetDir, { recursive: true });
-        const targetPath = (0, node_path_1.join)(targetDir, `${name}.md`);
-        if ((0, node_fs_1.existsSync)(targetPath)) {
+        mkdirSync(targetDir, { recursive: true });
+        const targetPath = join(targetDir, `${name}.md`);
+        if (existsSync(targetPath)) {
             const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
             if (!overwrite)
                 return;
@@ -1932,7 +1921,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
             return;
         }
         reloadCustomAgents();
-        if ((0, node_fs_1.existsSync)(targetPath)) {
+        if (existsSync(targetPath)) {
             ctx.ui.notify(`Created ${targetPath}`, "info");
         }
         else {
@@ -1954,7 +1943,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
             return;
         let tools;
         if (toolChoice === "all") {
-            tools = agent_types_js_1.BUILTIN_TOOL_NAMES.join(", ");
+            tools = BUILTIN_TOOL_NAMES.join(", ");
         }
         else if (toolChoice === "none") {
             tools = "none";
@@ -1963,7 +1952,7 @@ Write the file using the write tool. Only write the file, nothing else.`;
             tools = "read, bash, grep, find, ls";
         }
         else {
-            const customTools = await ctx.ui.input("Tools (comma-separated)", agent_types_js_1.BUILTIN_TOOL_NAMES.join(", "));
+            const customTools = await ctx.ui.input("Tools (comma-separated)", BUILTIN_TOOL_NAMES.join(", "));
             if (!customTools)
                 return;
             tools = customTools;
@@ -2011,9 +2000,9 @@ prompt_mode: replace
 
 ${systemPrompt}
 `;
-        (0, node_fs_1.mkdirSync)(targetDir, { recursive: true });
-        const targetPath = (0, node_path_1.join)(targetDir, `${name}.md`);
-        if ((0, node_fs_1.existsSync)(targetPath)) {
+        mkdirSync(targetDir, { recursive: true });
+        const targetPath = join(targetDir, `${name}.md`);
+        if (existsSync(targetPath)) {
             const overwrite = await ctx.ui.confirm("Overwrite", `${targetPath} already exists. Overwrite?`);
             if (!overwrite)
                 return;
@@ -2028,12 +2017,12 @@ ${systemPrompt}
             maxConcurrent: manager.getMaxConcurrent(),
             // 0 = unlimited — per SubagentsSettings.defaultMaxTurns docstring and
             // normalizeMaxTurns() in agent-runner.ts (which maps 0 → undefined).
-            defaultMaxTurns: (0, agent_runner_js_1.getDefaultMaxTurns)() ?? 0,
-            graceTurns: (0, agent_runner_js_1.getGraceTurns)(),
+            defaultMaxTurns: getDefaultMaxTurns() ?? 0,
+            graceTurns: getGraceTurns(),
             defaultJoinMode: getDefaultJoinMode(),
             schedulingEnabled: isSchedulingEnabled(),
             scopeModels: isScopeModelsEnabled(),
-            disableDefaultAgents: (0, agent_types_js_1.isDefaultsDisabled)(),
+            disableDefaultAgents: isDefaultsDisabled(),
             toolDescriptionMode: getToolDescriptionMode(),
             fleetView: isFleetViewEnabled(),
             widgetMode: getWidgetMode(),
@@ -2044,8 +2033,8 @@ ${systemPrompt}
     async function showSettings(ctx) {
         function buildItems() {
             const mc = manager.getMaxConcurrent();
-            const dmt = (0, agent_runner_js_1.getDefaultMaxTurns)() ?? 0;
-            const gt = (0, agent_runner_js_1.getGraceTurns)();
+            const dmt = getDefaultMaxTurns() ?? 0;
+            const gt = getGraceTurns();
             return [
                 {
                     id: "maxConcurrent",
@@ -2093,7 +2082,7 @@ ${systemPrompt}
                     id: "disableDefaultAgents",
                     label: "Disable defaults",
                     description: "Hide built-in agents (general-purpose, Explore, Plan) — custom agents are unaffected",
-                    currentValue: (0, agent_types_js_1.isDefaultsDisabled)() ? "on" : "off",
+                    currentValue: isDefaultsDisabled() ? "on" : "off",
                     values: ["on", "off"],
                 },
                 {
@@ -2137,18 +2126,18 @@ ${systemPrompt}
             else if (id === "defaultMaxTurns") {
                 const n = parseInt(value, 10);
                 if (n === 0) {
-                    (0, agent_runner_js_1.setDefaultMaxTurns)(undefined);
+                    setDefaultMaxTurns(undefined);
                     notifyApplied(ctx, "Default max turns set to unlimited");
                 }
                 else if (n >= 1) {
-                    (0, agent_runner_js_1.setDefaultMaxTurns)(n);
+                    setDefaultMaxTurns(n);
                     notifyApplied(ctx, `Default max turns set to ${n}`);
                 }
             }
             else if (id === "graceTurns") {
                 const n = parseInt(value, 10);
                 if (n >= 1) {
-                    (0, agent_runner_js_1.setGraceTurns)(n);
+                    setGraceTurns(n);
                     notifyApplied(ctx, `Grace turns set to ${n}`);
                 }
             }
@@ -2203,26 +2192,26 @@ ${systemPrompt}
         let currentIndex = 0;
         const result = await ctx.ui.custom((_tui, _theme, _kb, done) => {
             const items = buildItems();
-            list = new pi_tui_1.SettingsList(items, items.length + 2, (0, pi_coding_agent_1.getSettingsListTheme)(), (id, newValue) => {
+            list = new SettingsList(items, items.length + 2, getSettingsListTheme(), (id, newValue) => {
                 applyValue(id, newValue);
             }, () => done(undefined));
-            const container = new pi_tui_1.Container();
-            container.addChild(new pi_tui_1.Text("⚙  Subagent Settings", 0, 0));
-            container.addChild(new pi_tui_1.Spacer(1));
+            const container = new Container();
+            container.addChild(new Text("⚙  Subagent Settings", 0, 0));
+            container.addChild(new Spacer(1));
             container.addChild(list);
             return {
                 render: (w) => container.render(w),
                 invalidate: () => container.invalidate(),
                 handleInput: (data) => {
                     // Track navigation so Enter knows the current field
-                    if ((0, pi_tui_1.matchesKey)(data, "up")) {
+                    if (matchesKey(data, "up")) {
                         currentIndex = Math.max(0, currentIndex - 1);
                     }
-                    else if ((0, pi_tui_1.matchesKey)(data, "down")) {
+                    else if (matchesKey(data, "down")) {
                         currentIndex = Math.min(items.length - 1, currentIndex + 1);
                     }
                     // Enter on numeric field → close and prompt for typed input
-                    if ((0, pi_tui_1.matchesKey)(data, pi_tui_1.Key.enter) && NUMERIC_IDS.has(items[currentIndex].id)) {
+                    if (matchesKey(data, Key.enter) && NUMERIC_IDS.has(items[currentIndex].id)) {
                         done(items[currentIndex].id);
                         return;
                     }
@@ -2235,8 +2224,8 @@ ${systemPrompt}
             const current = result === "maxConcurrent"
                 ? String(manager.getMaxConcurrent())
                 : result === "defaultMaxTurns"
-                    ? String((0, agent_runner_js_1.getDefaultMaxTurns)() ?? 0)
-                    : String((0, agent_runner_js_1.getGraceTurns)());
+                    ? String(getDefaultMaxTurns() ?? 0)
+                    : String(getGraceTurns());
             const label = result === "maxConcurrent"
                 ? "Max concurrency (1+)"
                 : result === "defaultMaxTurns"
@@ -2263,7 +2252,7 @@ ${systemPrompt}
     // to warning so users aren't silently reverted on restart. Event fires regardless
     // of outcome so listeners see the in-memory change.
     function notifyApplied(ctx, successMsg) {
-        const { message, level } = (0, settings_js_1.saveAndEmitChanged)(snapshotSettings(), successMsg, (event, payload) => pi.events.emit(event, payload));
+        const { message, level } = saveAndEmitChanged(snapshotSettings(), successMsg, (event, payload) => pi.events.emit(event, payload));
         ctx.ui.notify(message, level);
     }
     pi.registerCommand("agents", {