@oh-my-pi/pi-coding-agent 8.0.16 → 8.1.0

package/src/modes/components/tool-execution.ts

@@ -379,12 +379,14 @@ export class ToolExecutionComponent extends Container {
 		// Check for custom tool rendering
 		if (this.tool && (this.tool.renderCall || this.tool.renderResult)) {
 			const tool = this.tool;
+			const mergeCallAndResult = Boolean((tool as { mergeCallAndResult?: boolean }).mergeCallAndResult);
 			// Custom tools use Box for flexible component rendering
 			this.contentBox.setBgFn(bgFn);
 			this.contentBox.clear();
 
 			// Render call component
-			if (tool.renderCall) {
+			const shouldRenderCall = !this.result || !mergeCallAndResult;
+			if (shouldRenderCall && tool.renderCall) {
 				try {
 					const callComponent = tool.renderCall(this.args, theme);
 					if (callComponent) {
@@ -552,13 +554,13 @@ export class ToolExecutionComponent extends Container {
 
 		if (this.toolName === "bash" && this.result) {
 			// Pass raw output and expanded state - renderer handles width-aware truncation
-			const output = this.getTextOutput().trim();
+			const output = this.getTextOutput().trimEnd();
 			context.output = output;
 			context.expanded = this.expanded;
 			context.previewLines = BASH_DEFAULT_PREVIEW_LINES;
 			context.timeout = typeof this.args?.timeout === "number" ? this.args.timeout : undefined;
 		} else if (this.toolName === "python" && this.result) {
-			const output = this.getTextOutput().trim();
+			const output = this.getTextOutput().trimEnd();
 			context.output = output;
 			context.expanded = this.expanded;
 			context.previewLines = PYTHON_DEFAULT_PREVIEW_LINES;

package/src/modes/components/tree-selector.ts

@@ -821,7 +821,7 @@ export class TreeSelectorComponent extends Container {
 			new TruncatedText(
 				theme.fg(
 					"muted",
-					"  Up/Down: move. Left/Right: page. Shift+L: label. Ctrl+O/Shift+Ctrl+O: filter. Alt+D/T/U/L/A: filter. Type to search",
+					"Up/Down: move. Left/Right: page. Shift+L: label. Ctrl+O/Shift+Ctrl+O: filter. Alt+D/T/U/L/A: filter. Type to search",
 				),
 				0,
 				0,

package/src/modes/controllers/extension-ui-controller.ts

@@ -5,7 +5,7 @@ import type {
 	ExtensionContextActions,
 	ExtensionError,
 	ExtensionUIContext,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+} from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
 import { HookEditorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-editor";
 import { HookInputComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-input";
 import { HookSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/hook-selector";

package/src/modes/controllers/selector-controller.ts

@@ -21,7 +21,7 @@ import {
 } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
 import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import { setPreferredImageProvider, setPreferredWebSearchProvider } from "@oh-my-pi/pi-coding-agent/tools/index";
+import { setPreferredImageProvider, setPreferredWebSearchProvider } from "@oh-my-pi/pi-coding-agent/tools";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
 

package/src/modes/interactive-mode.ts

@@ -8,7 +8,7 @@ import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
 import { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
 import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
 import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
 import { loadSlashCommands } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
 import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
@@ -44,6 +44,7 @@ import { EventController } from "./controllers/event-controller";
 import { ExtensionUiController } from "./controllers/extension-ui-controller";
 import { InputController } from "./controllers/input-controller";
 import { SelectorController } from "./controllers/selector-controller";
+import { setMermaidRenderCallback } from "./theme/mermaid-cache";
 import type { Theme } from "./theme/theme";
 import { getEditorTheme, getMarkdownTheme, onThemeChange, theme } from "./theme/theme";
 import type { CompactionQueuedMessage, InteractiveModeContext, TodoItem } from "./types";
@@ -124,7 +125,7 @@ export class InteractiveMode implements InteractiveModeContext {
 	private readonly changelogMarkdown: string | undefined;
 	public readonly lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined =
 		undefined;
-	public mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp/index").MCPManager;
+	public mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp").MCPManager;
 	private readonly toolUiContextSetter: (uiContext: ExtensionUIContext, hasUI: boolean) => void;
 
 	private readonly commandController: CommandController;
@@ -140,7 +141,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		changelogMarkdown: string | undefined = undefined,
 		setToolUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void = () => {},
 		lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined = undefined,
-		mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp/index").MCPManager,
+		mcpManager?: import("@oh-my-pi/pi-coding-agent/mcp").MCPManager,
 	) {
 		this.session = session;
 		this.sessionManager = session.sessionManager;
@@ -154,6 +155,7 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.mcpManager = mcpManager;
 
 		this.ui = new TUI(new ProcessTerminal(), this.settingsManager.getShowHardwareCursor());
+		setMermaidRenderCallback(() => this.ui.requestRender());
 		this.chatContainer = new Container();
 		this.pendingMessagesContainer = new Container();
 		this.statusContainer = new Container();

package/src/modes/rpc/rpc-client.ts

@@ -8,7 +8,7 @@ import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
 import type { SessionStats } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction/index";
+import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction";
 import { createSanitizerStream, createSplitterStream, createTextDecoderStream, ptree } from "@oh-my-pi/pi-utils";
 import type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc-types";
 

package/src/modes/rpc/rpc-mode.ts

@@ -11,10 +11,7 @@
  * - Extension UI: Extension UI requests are emitted, client responds with extension_ui_response
  */
 
-import type {
-	ExtensionUIContext,
-	ExtensionUIDialogOptions,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import type { ExtensionUIContext, ExtensionUIDialogOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
 import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 import { readLines } from "@oh-my-pi/pi-utils";

package/src/modes/rpc/rpc-types.ts

@@ -9,7 +9,7 @@ import type { AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
 import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
 import type { SessionStats } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction/index";
+import type { CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction";
 
 // ============================================================================
 // RPC Commands (stdin)

package/src/modes/theme/mermaid-cache.ts

@@ -0,0 +1,89 @@
+import {
+	extractMermaidBlocks,
+	type MermaidImage,
+	type MermaidRenderOptions,
+	renderMermaidToPng,
+} from "@oh-my-pi/pi-tui";
+
+const cache = new Map<string, MermaidImage>();
+const pending = new Map<string, Promise<MermaidImage | null>>();
+
+const defaultOptions: MermaidRenderOptions = {
+	theme: "dark",
+	backgroundColor: "transparent",
+};
+
+let onRenderNeeded: (() => void) | null = null;
+
+/**
+ * Set callback to trigger TUI re-render when mermaid images become available.
+ */
+export function setMermaidRenderCallback(callback: (() => void) | null): void {
+	onRenderNeeded = callback;
+}
+
+/**
+ * Get a pre-rendered mermaid image by hash.
+ * Returns null if not cached or rendering failed.
+ */
+export function getMermaidImage(hash: string): MermaidImage | null {
+	return cache.get(hash) ?? null;
+}
+
+/**
+ * Pre-render all mermaid blocks in markdown text.
+ * Renders in parallel, deduplicates concurrent requests.
+ * Calls render callback when new images are cached.
+ */
+export async function prerenderMermaid(
+	markdown: string,
+	options: MermaidRenderOptions = defaultOptions,
+): Promise<void> {
+	const blocks = extractMermaidBlocks(markdown);
+	if (blocks.length === 0) return;
+
+	const promises: Promise<boolean>[] = [];
+
+	for (const { source, hash } of blocks) {
+		if (cache.has(hash)) continue;
+
+		let promise = pending.get(hash);
+		if (!promise) {
+			promise = renderMermaidToPng(source, options);
+			pending.set(hash, promise);
+		}
+
+		promises.push(
+			promise.then((image) => {
+				pending.delete(hash);
+				if (image) {
+					cache.set(hash, image);
+					return true;
+				}
+				return false;
+			}),
+		);
+	}
+
+	const results = await Promise.all(promises);
+	const newImages = results.some((added) => added);
+
+	if (newImages && onRenderNeeded) {
+		onRenderNeeded();
+	}
+}
+
+/**
+ * Check if markdown contains mermaid blocks that aren't cached yet.
+ */
+export function hasPendingMermaid(markdown: string): boolean {
+	const blocks = extractMermaidBlocks(markdown);
+	return blocks.some(({ hash }) => !cache.has(hash));
+}
+
+/**
+ * Clear the mermaid cache.
+ */
+export function clearMermaidCache(): void {
+	cache.clear();
+}

package/src/modes/theme/theme.ts

@@ -11,6 +11,7 @@ import { highlight, supportsLanguage } from "cli-highlight";
 import darkThemeJson from "./dark.json" with { type: "json" };
 import { defaultThemes } from "./defaults";
 import lightThemeJson from "./light.json" with { type: "json" };
+import { getMermaidImage } from "./mermaid-cache";
 
 // ============================================================================
 // Symbol Presets
@@ -2224,6 +2225,7 @@ export function getMarkdownTheme(): MarkdownTheme {
 		underline: (text: string) => theme.underline(text),
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		symbols: getSymbolTheme(),
+		getMermaidImage,
 		highlightCode: (code: string, lang?: string): string[] => {
 			// Validate language before highlighting to avoid stderr spam from cli-highlight
 			const validLang = lang && supportsLanguage(lang) ? lang : undefined;

package/src/modes/types.ts

@@ -2,9 +2,9 @@ import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
 import type { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
 import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
 import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
-import type { MCPManager } from "@oh-my-pi/pi-coding-agent/mcp/index";
+import type { MCPManager } from "@oh-my-pi/pi-coding-agent/mcp";
 import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 import type { HistoryStorage } from "@oh-my-pi/pi-coding-agent/session/history-storage";
 import type { SessionContext, SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";

package/src/patch/index.ts

@@ -18,10 +18,10 @@ import {
 	flushLspWritethroughBatch,
 	type WritethroughCallback,
 	writethroughNoop,
-} from "@oh-my-pi/pi-coding-agent/lsp/index";
+} from "@oh-my-pi/pi-coding-agent/lsp";
 import patchDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/patch.md" with { type: "text" };
 import replaceDescription from "@oh-my-pi/pi-coding-agent/prompts/tools/replace.md" with { type: "text" };
-import type { ToolSession } from "@oh-my-pi/pi-coding-agent/tools/index";
+import type { ToolSession } from "@oh-my-pi/pi-coding-agent/tools";
 import { outputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
 import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
 import { Type } from "@sinclair/typebox";
@@ -48,13 +48,7 @@ export { computeEditDiff, computePatchDiff, generateDiffString, generateUnifiedD
 export { DEFAULT_FUZZY_THRESHOLD, findContextLine, findMatch as findEditMatch, findMatch, seekSequence } from "./fuzzy";
 
 // Normalization
-export {
-	adjustIndentation,
-	detectLineEnding,
-	normalizeToLF,
-	restoreLineEndings,
-	stripBom,
-} from "./normalize";
+export { adjustIndentation, detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "./normalize";
 
 // Parsing
 export { normalizeCreateContent, normalizeDiff, parseHunks as parseDiffHunks } from "./parser";

package/src/patch/shared.ts

@@ -4,7 +4,7 @@
 
 import type { ToolCallContext } from "@oh-my-pi/pi-agent-core";
 import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { FileDiagnosticsResult } from "@oh-my-pi/pi-coding-agent/lsp/index";
+import type { FileDiagnosticsResult } from "@oh-my-pi/pi-coding-agent/lsp";
 import { renderDiff as renderDiffColored } from "@oh-my-pi/pi-coding-agent/modes/components/diff";
 import { getLanguageFromPath, type Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { OutputMeta } from "@oh-my-pi/pi-coding-agent/tools/output-meta";
@@ -17,6 +17,7 @@ import {
 	truncateDiffByHunk,
 } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
 import type { RenderCallOptions } from "@oh-my-pi/pi-coding-agent/tools/renderers";
+import { renderStatusLine } from "@oh-my-pi/pi-coding-agent/tui";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import type { DiffError, DiffResult, Operation } from "./types";
@@ -178,9 +179,28 @@ export const editToolRenderer = {
 		let text = `${ui.title(opTitle)} ${spinner ? `${spinner} ` : ""}${editIcon} ${pathDisplay}`;
 
 		// Show streaming preview of diff/content
-		const streamingContent = args.diff ?? args.newText ?? args.patch;
-		if (streamingContent) {
-			text += formatStreamingDiff(streamingContent, rawPath, uiTheme);
+		if (args.diff && args.op) {
+			text += formatStreamingDiff(args.diff, rawPath, uiTheme);
+		} else if (args.diff) {
+			const previewLines = args.diff.split("\n");
+			const maxLines = 6;
+			text += "\n\n";
+			for (const line of previewLines.slice(0, maxLines)) {
+				text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+			}
+			if (previewLines.length > maxLines) {
+				text += uiTheme.fg("dim", `${uiTheme.format.ellipsis} ${previewLines.length - maxLines} more lines`);
+			}
+		} else if (args.newText || args.patch) {
+			const previewLines = (args.newText ?? args.patch ?? "").split("\n");
+			const maxLines = 6;
+			text += "\n\n";
+			for (const line of previewLines.slice(0, maxLines)) {
+				text += `${uiTheme.fg("toolOutput", ui.truncate(line, 80))}\n`;
+			}
+			if (previewLines.length > maxLines) {
+				text += uiTheme.fg("dim", `${uiTheme.format.ellipsis} ${previewLines.length - maxLines} more lines`);
+			}
 		}
 
 		return new Text(text, 0, 0);
@@ -221,7 +241,15 @@ export const editToolRenderer = {
 
 		// Show operation type for patch mode
 		const opTitle = op === "create" ? "Create" : op === "delete" ? "Delete" : "Edit";
-		let text = `${uiTheme.fg("toolTitle", uiTheme.bold(opTitle))} ${editIcon} ${pathDisplay}`;
+		const header = renderStatusLine(
+			{
+				icon: result.isError ? "error" : "success",
+				title: opTitle,
+				description: `${editIcon} ${pathDisplay}`,
+			},
+			uiTheme,
+		);
+		let text = header;
 
 		// Skip metadata line for delete operations
 		if (op !== "delete") {

package/src/prompts/tools/task.md

@@ -59,6 +59,8 @@ Results are keyed by task `id` (e.g., "AuthProvider", "AuthApi").
 If you discussed requirements, plans, schemas, or decisions with the user, you MUST include that information in `context`. Subagents cannot see prior messages—they start fresh with only what you explicitly pass them.
 
 **Never call Task multiple times in parallel.** Use a single Task call with multiple entries in the `tasks` array. Parallel Task calls waste resources and bypass coordination.
+
+**For code changes, subagents write files directly.** Never ask an agent to "return the changes" for you to apply—they have Edit and Write tools. Their context window holds the work; asking them to report back wastes it.
 </critical>
 
 <example>

package/src/sdk.ts

@@ -26,31 +26,34 @@
  * ```
  */
 
+import { existsSync } from "node:fs";
+import { rename } from "node:fs/promises";
 import { join } from "node:path";
 import { Agent, type AgentEvent, type AgentMessage, type AgentTool, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { type Message, type Model, supportsXhigh } from "@oh-my-pi/pi-ai";
-import { loadCapability } from "@oh-my-pi/pi-coding-agent/capability/index";
+// Import discovery to register all providers on startup
+import { loadCapability } from "@oh-my-pi/pi-coding-agent/capability";
 import { type Rule, ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";
 import { getAgentDir, getConfigDirPaths } from "@oh-my-pi/pi-coding-agent/config";
-import type { Component } from "@oh-my-pi/pi-tui";
-// Import discovery to register all providers on startup
-import { logger, postmortem } from "@oh-my-pi/pi-utils";
-import chalk from "chalk";
-import "./discovery";
 import { CursorExecHandlers } from "@oh-my-pi/pi-coding-agent/cursor";
 import { initializeWithSettings } from "@oh-my-pi/pi-coding-agent/discovery";
 import { TtsrManager } from "@oh-my-pi/pi-coding-agent/export/ttsr";
 import { disposeAllKernelSessions } from "@oh-my-pi/pi-coding-agent/ipy/executor";
 import { closeAllConnections } from "@oh-my-pi/pi-coding-agent/ssh/connection-manager";
 import { unmountAll } from "@oh-my-pi/pi-coding-agent/ssh/sshfs-mount";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { logger, postmortem } from "@oh-my-pi/pi-utils";
+import { YAML } from "bun";
+import chalk from "chalk";
 import { ModelRegistry } from "./config/model-registry";
 import { formatModelString, parseModelString } from "./config/model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
 import { type Settings, SettingsManager, type SkillsSettings } from "./config/settings-manager";
+import "./discovery";
 import {
 	type CustomCommandsLoadResult,
 	loadCustomCommands as loadCustomCommandsInternal,
-} from "./extensibility/custom-commands/index";
+} from "./extensibility/custom-commands";
 import type { CustomTool, CustomToolContext, CustomToolSessionEvent } from "./extensibility/custom-tools/types";
 import {
 	discoverAndLoadExtensions,
@@ -64,7 +67,7 @@ import {
 	loadExtensions,
 	type ToolDefinition,
 	wrapRegisteredTools,
-} from "./extensibility/extensions/index";
+} from "./extensibility/extensions";
 import { loadSkills as loadSkillsInternal, type Skill, type SkillWarning } from "./extensibility/skills";
 import { type FileSlashCommand, loadSlashCommands as loadSlashCommandsInternal } from "./extensibility/slash-commands";
 import {
@@ -74,7 +77,7 @@ import {
 	RuleProtocolHandler,
 	SkillProtocolHandler,
 } from "./internal-urls";
-import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
+import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp";
 import { AgentSession } from "./session/agent-session";
 import { AuthStorage } from "./session/auth-storage";
 import { convertToLlm } from "./session/messages";
@@ -84,8 +87,7 @@ import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	loadProjectContextFiles as loadContextFilesInternal,
 } from "./system-prompt";
-import { ToolContextStore } from "./tools/context";
-import { getGeminiImageTools } from "./tools/gemini-image";
+import { AgentOutputManager } from "./task/output-manager";
 import {
 	BashTool,
 	BUILTIN_TOOLS,
@@ -104,7 +106,9 @@ import {
 	type ToolSession,
 	WriteTool,
 	warmupLspServers,
-} from "./tools/index";
+} from "./tools";
+import { ToolContextStore } from "./tools/context";
+import { getGeminiImageTools } from "./tools/gemini-image";
 import { wrapToolsWithMetaNotice } from "./tools/output-meta";
 import { EventBus } from "./utils/event-bus";
 import { time } from "./utils/timings";
@@ -214,11 +218,11 @@ export type {
 	ExtensionContext,
 	ExtensionFactory,
 	ToolDefinition,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
+} from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
 export type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
 export type { FileSlashCommand } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
-export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp/index";
-export type { Tool } from "./tools/index";
+export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp";
+export type { Tool } from "./tools";
 
 export {
 	// Individual tool classes (for custom usage)
@@ -264,31 +268,64 @@ export async function discoverAuthStorage(agentDir: string = getDefaultAgentDir(
 		authPaths: [primaryPath, ...fallbackPaths],
 	});
 
-	const storage = new AuthStorage(primaryPath, fallbackPaths);
+	const storage = await AuthStorage.create(primaryPath, fallbackPaths);
 	await storage.reload();
 	return storage;
 }
 
 /**
  * Create a ModelRegistry with fallback support.
- * Reads from primary path first, then falls back to legacy paths (.pi, .claude).
+ * Prefers models.yml over models.json. Reads from primary path first,
+ * then falls back to legacy paths (.pi, .claude).
  */
 export async function discoverModels(
 	authStorage: AuthStorage,
 	agentDir: string = getDefaultAgentDir(),
 ): Promise<ModelRegistry> {
-	const primaryPath = join(agentDir, "models.json");
-	// Get all models.json paths (user-level only), excluding the primary
-	const allPaths = getConfigDirPaths("models.json", { project: false });
-	const fallbackPaths = allPaths.filter((p) => p !== primaryPath);
+	const yamlPath = join(agentDir, "models.yml");
+	const jsonPath = join(agentDir, "models.json");
+
+	// Migrate models.json to models.yml if yaml doesn't exist but json does
+	if (!existsSync(yamlPath) && existsSync(jsonPath)) {
+		await migrateModelsJsonToYaml(jsonPath, yamlPath);
+	}
+
+	// Prefer models.yml, fall back to models.json
+	const primaryPath = existsSync(yamlPath) ? yamlPath : jsonPath;
+
+	// Get all models config paths (user-level only), excluding the primary
+	const yamlPaths = getConfigDirPaths("models.yml", { project: false });
+	const jsonPaths = getConfigDirPaths("models.json", { project: false });
+	const allPaths = [...yamlPaths, ...jsonPaths];
+	const fallbackPaths = allPaths.filter((p) => p !== primaryPath && existsSync(p));
 
 	logger.debug("discoverModels", { primaryPath, fallbackPaths });
 
 	const registry = new ModelRegistry(authStorage, primaryPath, fallbackPaths);
-	await registry.refresh();
+	registry.refresh();
 	return registry;
 }
 
+/**
+ * Migrate models.json to models.yml.
+ * Creates models.yml from models.json and renames the json file to .bak.
+ */
+async function migrateModelsJsonToYaml(jsonPath: string, yamlPath: string): Promise<void> {
+	try {
+		const content = await Bun.file(jsonPath).text();
+		const parsed = JSON.parse(content);
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+			logger.warn("migrateModelsJsonToYaml: invalid models.json structure", { path: jsonPath });
+			return;
+		}
+		await Bun.write(yamlPath, YAML.stringify(parsed, null, 2));
+		await rename(jsonPath, `${jsonPath}.bak`);
+		logger.debug("migrateModelsJsonToYaml: migrated models.json to models.yml", { from: jsonPath, to: yamlPath });
+	} catch (error) {
+		logger.warn("migrateModelsJsonToYaml: migration failed", { error: String(error) });
+	}
+}
+
 /**
  * Discover extensions from cwd.
  */
@@ -734,6 +771,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	);
 	toolSession.internalRouter = internalRouter;
 	toolSession.getArtifactsDir = getArtifactsDir;
+	toolSession.agentOutputManager = new AgentOutputManager(getArtifactsDir);
 
 	// Create and wrap tools with meta notice formatting
 	const rawBuiltinTools = await createTools(toolSession, options.toolNames);

package/src/session/agent-session.ts

@@ -38,9 +38,9 @@ import {
 } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
 import type { SettingsManager, SkillsSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
 import { type BashResult, executeBash as executeBashCommand } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import { exportSessionToHtml } from "@oh-my-pi/pi-coding-agent/export/html/index";
+import { exportSessionToHtml } from "@oh-my-pi/pi-coding-agent/export/html";
 import type { TtsrManager } from "@oh-my-pi/pi-coding-agent/export/ttsr";
-import type { LoadedCustomCommand } from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands/index";
+import type { LoadedCustomCommand } from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands";
 import type {
 	ExtensionCommandContext,
 	ExtensionRunner,
@@ -78,7 +78,7 @@ import {
 	generateBranchSummary,
 	prepareCompaction,
 	shouldCompact,
-} from "./compaction/index";
+} from "./compaction";
 import {
 	type BashExecutionMessage,
 	type BranchSummaryMessage,