@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/patch/index.ts

@@ -7,24 +7,23 @@
  *
  * The mode is determined by the `edit.patchMode` setting.
  */
-
-import { mkdir } from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import { Type } from "@sinclair/typebox";
+import { renderPromptTemplate } from "../config/prompt-templates";
 import {
 	createLspWritethrough,
 	type FileDiagnosticsResult,
 	flushLspWritethroughBatch,
 	type WritethroughCallback,
 	writethroughNoop,
-} from "@oh-my-pi/pi-coding-agent/lsp/index";
-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 { 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";
+} from "../lsp";
+import patchDescription from "../prompts/tools/patch.md" with { type: "text" };
+import replaceDescription from "../prompts/tools/replace.md" with { type: "text" };
+import type { ToolSession } from "../tools";
+import { outputMeta } from "../tools/output-meta";
+import { resolveToCwd } from "../tools/path-utils";
 import { applyPatch } from "./applicator";
 import { generateDiffString, generateUnifiedDiffString, replaceText } from "./diff";
 import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
@@ -48,13 +47,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";
@@ -166,7 +159,7 @@ class LspFileSystem implements FileSystem {
 	}
 
 	async mkdir(path: string): Promise<void> {
-		await mkdir(path, { recursive: true });
+		await fs.mkdir(path, { recursive: true });
 	}
 
 	getDiagnostics(): FileDiagnosticsResult | undefined {

package/src/patch/normalize.ts

@@ -189,7 +189,7 @@ export function convertLeadingTabsToSpaces(text: string, spacesPerTab: number):
 	if (spacesPerTab <= 0) return text;
 	return text
 		.split("\n")
-		.map((line) => {
+		.map(line => {
 			const trimmed = line.trimStart();
 			if (trimmed.length === 0) return line;
 			const leading = getLeadingWhitespace(line);
@@ -212,7 +212,7 @@ export function normalizeUnicode(s: string): string {
 	return s
 		.trim()
 		.split("")
-		.map((c) => {
+		.map(c => {
 			const code = c.charCodeAt(0);
 
 			// Various dash/hyphen code-points → ASCII '-'
@@ -367,7 +367,7 @@ export function adjustIndentation(oldText: string, actualText: string, newText:
 	}
 
 	const delta = deltas[0];
-	if (!deltas.every((value) => value === delta)) {
+	if (!deltas.every(value => value === delta)) {
 		return newText;
 	}
 
@@ -380,7 +380,7 @@ export function adjustIndentation(oldText: string, actualText: string, newText:
 	}
 
 	const indentChar = actualProfile.char ?? oldProfile.char ?? detectIndentChar(actualText);
-	const adjusted = newText.split("\n").map((line) => {
+	const adjusted = newText.split("\n").map(line => {
 		if (line.trim().length === 0) {
 			return line;
 		}

package/src/patch/normative.ts

@@ -1,7 +1,6 @@
 /**
  * Normalize applied patch output into a canonical edit tool payload.
  */
-
 import { generateUnifiedDiffString } from "./diff";
 import { normalizeToLF, stripBom } from "./normalize";
 import { parseHunks } from "./parser";
@@ -37,7 +36,7 @@ function applyAnchors(diff: string, anchors: Array<string | undefined> | undefin
 
 function deriveAnchors(diff: string): Array<string | undefined> {
 	const hunks = parseHunks(diff);
-	return hunks.map((hunk) => {
+	return hunks.map(hunk => {
 		if (hunk.oldLines.length === 0 || hunk.newLines.length === 0) {
 			return undefined;
 		}

package/src/patch/parser.ts

@@ -6,7 +6,6 @@
  * - Unified diff format (@@ -X,Y +A,B @@)
  * - Codex-style wrapped patches (*** Begin Patch / *** End Patch)
  */
-
 import type { DiffHunk } from "./types";
 import { ApplyPatchError, ParseError } from "./types";
 
@@ -90,7 +89,7 @@ export function normalizeDiff(diff: string): string {
 	// Layer 2: Strip Codex-style file operation markers and unified diff metadata
 	// NOTE: Do NOT strip "*** End of File" - that's a valid marker within hunks, not a wrapper
 	// IMPORTANT: Only strip actual metadata lines, NOT diff content lines (starting with space, +, or -)
-	lines = lines.filter((line) => {
+	lines = lines.filter(line => {
 		// Preserve diff content lines even if their content looks like metadata
 		// Note: `--- ` and `+++ ` are metadata, not content lines
 		if (isDiffContentLine(line)) {
@@ -130,12 +129,12 @@ export function normalizeDiff(diff: string): string {
  */
 export function normalizeCreateContent(content: string): string {
 	const lines = content.split("\n");
-	const nonEmptyLines = lines.filter((l) => l.length > 0);
+	const nonEmptyLines = lines.filter(l => l.length > 0);
 
 	// Check if all non-empty lines start with "+ " or "+"
-	if (nonEmptyLines.length > 0 && nonEmptyLines.every((l) => l.startsWith("+ ") || l.startsWith("+"))) {
+	if (nonEmptyLines.length > 0 && nonEmptyLines.every(l => l.startsWith("+ ") || l.startsWith("+"))) {
 		return lines
-			.map((l) => {
+			.map(l => {
 				if (l.startsWith("+ ")) return l.slice(2);
 				if (l.startsWith("+")) return l.slice(1);
 				return l;
@@ -390,18 +389,18 @@ function parseOneHunk(lines: string[], lineNumber: number, allowMissingContext:
 }
 
 function stripLineNumberPrefixes(hunk: DiffHunk): void {
-	const allLines = [...hunk.oldLines, ...hunk.newLines].filter((line) => line.trim().length > 0);
+	const allLines = [...hunk.oldLines, ...hunk.newLines].filter(line => line.trim().length > 0);
 	if (allLines.length < 2) return;
 
 	const numberMatches = allLines
-		.map((line) => line.match(/^\s*(\d{1,6})\s+(.+)$/u))
+		.map(line => line.match(/^\s*(\d{1,6})\s+(.+)$/u))
 		.filter((match): match is RegExpMatchArray => match !== null);
 
 	if (numberMatches.length < Math.max(2, Math.ceil(allLines.length * 0.6))) {
 		return;
 	}
 
-	const numbers = numberMatches.map((match) => Number(match[1]));
+	const numbers = numberMatches.map(match => Number(match[1]));
 	let sequential = 0;
 	for (let i = 1; i < numbers.length; i++) {
 		if (numbers[i] === numbers[i - 1] + 1) {
@@ -515,7 +514,7 @@ export function parseHunks(diff: string): DiffHunk[] {
 			continue;
 		}
 
-		if (trimmed.startsWith("@@") && lines.slice(i + 1).every((l) => l.trim() === "")) {
+		if (trimmed.startsWith("@@") && lines.slice(i + 1).every(l => l.trim() === "")) {
 			break;
 		}
 

package/src/patch/shared.ts

@@ -1,13 +1,14 @@
 /**
  * Shared utilities for edit tool TUI rendering.
  */
-
 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 { 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";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { FileDiagnosticsResult } from "../lsp";
+import { renderDiff as renderDiffColored } from "../modes/components/diff";
+import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
+import type { OutputMeta } from "../tools/output-meta";
 import {
 	formatExpandHint,
 	formatStatusIcon,
@@ -15,10 +16,9 @@ import {
 	shortenPath,
 	ToolUIKit,
 	truncateDiffByHunk,
-} from "@oh-my-pi/pi-coding-agent/tools/render-utils";
-import type { RenderCallOptions } from "@oh-my-pi/pi-coding-agent/tools/renderers";
-import type { Component } from "@oh-my-pi/pi-tui";
-import { Text } from "@oh-my-pi/pi-tui";
+} from "../tools/render-utils";
+import type { RenderCallOptions } from "../tools/renderers";
+import { renderStatusLine } from "../tui";
 import type { DiffError, DiffResult, Operation } from "./types";
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -37,7 +37,7 @@ export function getLspBatchRequest(toolCall: ToolCallContext | undefined): { id:
 	if (!hasOtherWrites) {
 		return undefined;
 	}
-	const hasLaterWrites = toolCall.toolCalls.slice(toolCall.index + 1).some((call) => LSP_BATCH_TOOLS.has(call.name));
+	const hasLaterWrites = toolCall.toolCalls.slice(toolCall.index + 1).some(call => LSP_BATCH_TOOLS.has(call.name));
 	return { id: toolCall.batchId, flush: !hasLaterWrites };
 }
 
@@ -178,9 +178,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 +240,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") {
@@ -231,7 +258,7 @@ export const editToolRenderer = {
 
 		if (result.isError) {
 			// Show error from result
-			const errorText = result.content?.find((c) => c.type === "text")?.text ?? "";
+			const errorText = result.content?.find(c => c.type === "text")?.text ?? "";
 			if (errorText) {
 				text += `\n\n${uiTheme.fg("error", errorText)}`;
 			}

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

@@ -25,32 +25,30 @@
  * });
  * ```
  */
-
-import { join } from "node:path";
+import * as fs from "node:fs";
+import * as path 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 { 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 { YAML } from "bun";
 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 discovery to register all providers on startup
+import { loadCapability } from "./capability";
+import { type Rule, ruleCapability } from "./capability/rule";
+import { getAgentDir, getConfigDirPaths } from "./config";
 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 { CursorExecHandlers } from "./cursor";
+import "./discovery";
+import { initializeWithSettings } from "./discovery";
+import { TtsrManager } from "./export/ttsr";
 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 +62,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,18 +72,20 @@ import {
 	RuleProtocolHandler,
 	SkillProtocolHandler,
 } from "./internal-urls";
-import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
+import { disposeAllKernelSessions } from "./ipy/executor";
+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";
 import { SessionManager } from "./session/session-manager";
 import { migrateJsonStorage } from "./session/storage-migration";
+import { closeAllConnections } from "./ssh/connection-manager";
+import { unmountAll } from "./ssh/sshfs-mount";
 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 +104,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";
@@ -201,24 +203,21 @@ export interface CreateAgentSessionResult {
 
 // Re-exports
 
-export type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-export type { Settings, SkillsSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-export type {
-	CustomCommand,
-	CustomCommandFactory,
-} from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands/types";
-export type { CustomTool, CustomToolFactory } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
+export type { PromptTemplate } from "./config/prompt-templates";
+export type { Settings, SkillsSettings } from "./config/settings-manager";
+export type { CustomCommand, CustomCommandFactory } from "./extensibility/custom-commands/types";
+export type { CustomTool, CustomToolFactory } from "./extensibility/custom-tools/types";
 export type {
 	ExtensionAPI,
 	ExtensionCommandContext,
 	ExtensionContext,
 	ExtensionFactory,
 	ToolDefinition,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
-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";
+} from "./extensibility/extensions";
+export type { Skill } from "./extensibility/skills";
+export type { FileSlashCommand } from "./extensibility/slash-commands";
+export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp";
+export type { Tool } from "./tools";
 
 export {
 	// Individual tool classes (for custom usage)
@@ -250,43 +249,80 @@ function getDefaultAgentDir(): string {
  * Reads from primary path first, then falls back to legacy paths (.pi, .claude).
  */
 export async function discoverAuthStorage(agentDir: string = getDefaultAgentDir()): Promise<AuthStorage> {
-	const primaryPath = join(agentDir, "auth.json");
+	const primaryPath = path.join(agentDir, "auth.json");
 	// Get all auth.json paths (user-level only), excluding the primary
 	const allPaths = getConfigDirPaths("auth.json", { project: false });
-	const fallbackPaths = allPaths.filter((p) => p !== primaryPath);
+	const fallbackPaths = allPaths.filter(p => p !== primaryPath);
 
 	logger.debug("discoverAuthStorage", { agentDir, primaryPath, allPaths, fallbackPaths });
 
 	// Migrate legacy JSON files (settings.json, auth.json) to SQLite before loading
 	await migrateJsonStorage({
 		agentDir,
-		settingsPath: join(agentDir, "settings.json"),
+		settingsPath: path.join(agentDir, "settings.json"),
 		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);
+export function discoverModels(authStorage: AuthStorage, agentDir: string = getDefaultAgentDir()): ModelRegistry {
+	const yamlPath = path.join(agentDir, "models.yml");
+	const jsonPath = path.join(agentDir, "models.json");
+
+	// Check existence of yaml and json files
+	let yamlExists = fs.existsSync(yamlPath);
+	let jsonExists = fs.existsSync(jsonPath);
+
+	// Migrate models.json to models.yml if yaml doesn't exist but json does
+	if (!yamlExists && jsonExists) {
+		migrateModelsJsonToYaml(jsonPath, yamlPath);
+		yamlExists = fs.existsSync(yamlPath);
+		jsonExists = fs.existsSync(jsonPath);
+	}
+
+	// Prefer models.yml, fall back to models.json
+	const primaryPath = yamlExists ? 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 existenceResults = allPaths.map(p => {
+		return { p, exists: fs.existsSync(p) };
+	});
+	const fallbackPaths = existenceResults.filter(({ p, exists }) => p !== primaryPath && exists).map(({ p }) => p);
 
 	logger.debug("discoverModels", { primaryPath, fallbackPaths });
+	return new ModelRegistry(authStorage, primaryPath, fallbackPaths);
+}
 
-	const registry = new ModelRegistry(authStorage, primaryPath, fallbackPaths);
-	await registry.refresh();
-	return registry;
+/**
+ * Migrate models.json to models.yml.
+ * Creates models.yml from models.json and renames the json file to .bak.
+ */
+function migrateModelsJsonToYaml(jsonPath: string, yamlPath: string): void {
+	try {
+		const content = fs.readFileSync(jsonPath, "utf-8");
+		const parsed = JSON.parse(content);
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+			logger.warn("migrateModelsJsonToYaml: invalid models.json structure", { path: jsonPath });
+			return;
+		}
+		fs.mkdirSync(path.dirname(yamlPath), { recursive: true });
+		fs.writeFileSync(yamlPath, YAML.stringify(parsed, null, 2));
+		fs.renameSync(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) });
+	}
 }
 
 /**
@@ -487,7 +523,7 @@ function customToolToDefinition(tool: CustomTool): ToolDefinition {
 }
 
 function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
-	return (api) => {
+	return api => {
 		for (const tool of tools) {
 			api.registerTool(customToolToDefinition(tool));
 		}
@@ -564,7 +600,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 	// Use provided or create AuthStorage and ModelRegistry
 	const authStorage = options.authStorage ?? (await discoverAuthStorage(agentDir));
-	const modelRegistry = options.modelRegistry ?? (await discoverModels(authStorage, agentDir));
+	const modelRegistry = options.modelRegistry ?? discoverModels(authStorage, agentDir);
 	time("discoverModels");
 
 	const settingsManager = options.settingsManager ?? (await SettingsManager.create(cwd, agentDir));
@@ -622,9 +658,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (!model) {
 		const allModels = modelRegistry.getAll();
 		const keyResults = await Promise.all(
-			allModels.map(async (m) => ({ model: m, hasKey: !!(await modelRegistry.getApiKey(m, sessionId)) })),
+			allModels.map(async m => ({ model: m, hasKey: !!(await modelRegistry.getApiKey(m, sessionId)) })),
 		);
-		model = keyResults.find((r) => r.hasKey)?.model;
+		model = keyResults.find(r => r.hasKey)?.model;
 		time("findAvailableModel");
 		if (model) {
 			if (modelFallbackMessage) {
@@ -734,6 +770,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);
@@ -746,7 +783,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const customTools: CustomTool[] = [];
 	if (enableMCP) {
 		const mcpResult = await discoverAndLoadMCPTools(cwd, {
-			onConnecting: (serverNames) => {
+			onConnecting: serverNames => {
 				if (options.hasUI && serverNames.length > 0) {
 					process.stderr.write(
 						chalk.gray(`Connecting to MCP servers: ${serverNames.join(", ")}...
@@ -775,7 +812,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 		if (mcpResult.tools.length > 0) {
 			// MCP tools are LoadedCustomTool, extract the tool property
-			customTools.push(...mcpResult.tools.map((loaded) => loaded.tool));
+			customTools.push(...mcpResult.tools.map(loaded => loaded.tool));
 		}
 	}
 
@@ -794,7 +831,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			enableCompany: exaSettings.enableCompany,
 		});
 		// Filter out the base web_search (already in built-in tools), add specialized Exa tools
-		const specializedTools = exaWebSearchTools.filter((t) => t.name !== "web_search");
+		const specializedTools = exaWebSearchTools.filter(t => t.name !== "web_search");
 		if (specializedTools.length > 0) {
 			customTools.push(...specializedTools);
 		}
@@ -884,7 +921,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const registeredTools = extensionRunner?.getAllRegisteredTools() ?? [];
 	const allCustomTools = [
 		...registeredTools,
-		...(options.customTools?.map((tool) => {
+		...(options.customTools?.map(tool => {
 			const definition = isCustomTool(tool) ? customToolToDefinition(tool) : tool;
 			return { definition, extensionPath: "<sdk>" };
 		}) ?? []),
@@ -914,7 +951,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		cwd,
 		tools: toolRegistry,
 		getToolContext: () => toolContextStore.getContext(),
-		emitEvent: (event) => cursorEventEmitter?.(event),
+		emitEvent: event => cursorEventEmitter?.(event),
 	});
 
 	const rebuildSystemPrompt = async (toolNames: string[], tools: Map<string, AgentTool>): Promise<string> => {
@@ -964,16 +1001,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			return converted;
 		}
 		// Filter out ImageContent from all messages, replacing with text placeholder
-		return converted.map((msg) => {
+		return converted.map(msg => {
 			if (msg.role === "user" || msg.role === "toolResult") {
 				const content = msg.content;
 				if (Array.isArray(content)) {
-					const hasImages = content.some((c) => c.type === "image");
+					const hasImages = content.some(c => c.type === "image");
 					if (hasImages) {
 						const filteredContent = content
-							.map((c) =>
-								c.type === "image" ? { type: "text" as const, text: "Image reading is disabled." } : c,
-							)
+							.map(c => (c.type === "image" ? { type: "text" as const, text: "Image reading is disabled." } : c))
 							.filter(
 								(c, i, arr) =>
 									// Dedupe consecutive "Image reading is disabled." texts
@@ -1007,7 +1042,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		convertToLlm: convertToLlmWithBlockImages,
 		sessionId: sessionManager.getSessionId(),
 		transformContext: extensionRunner
-			? async (messages) => {
+			? async messages => {
 					return extensionRunner.emitContext(messages);
 				}
 			: undefined,
@@ -1015,7 +1050,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		followUpMode: settingsManager.getFollowUpMode(),
 		interruptMode: settingsManager.getInterruptMode(),
 		thinkingBudgets: settingsManager.getThinkingBudgets(),
-		getToolContext: (tc) => toolContextStore.getContext(tc),
+		getToolContext: tc => toolContextStore.getContext(tc),
 		getApiKey: async () => {
 			const currentModel = agent.state.model;
 			if (!currentModel) {
@@ -1029,7 +1064,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		},
 		cursorExecHandlers,
 	});
-	cursorEventEmitter = (event) => agent.emitExternalEvent(event);
+	cursorEventEmitter = event => agent.emitExternalEvent(event);
 	time("createAgent");
 
 	// Restore messages if session has existing data
@@ -1067,7 +1102,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (enableLsp && settingsManager.getLspDiagnosticsOnWrite()) {
 		try {
 			const result = await warmupLspServers(cwd, {
-				onConnecting: (serverNames) => {
+				onConnecting: serverNames => {
 					if (options.hasUI && serverNames.length > 0) {
 						process.stderr.write(chalk.gray(`Starting LSP servers: ${serverNames.join(", ")}...\n`));
 					}