@oh-my-pi/pi-coding-agent 1.338.0 → 1.341.0

package/src/core/tools/write.ts

@@ -2,6 +2,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { Type } from "@sinclair/typebox";
 import { mkdir, writeFile } from "fs/promises";
 import { dirname } from "path";
+import type { FileDiagnosticsResult, FileFormatResult } from "./lsp/index.js";
 import { resolveToCwd } from "./path-utils.js";
 
 const writeSchema = Type.Object({
@@ -9,7 +10,30 @@ const writeSchema = Type.Object({
 	content: Type.String({ description: "Content to write to the file" }),
 });
 
-export function createWriteTool(cwd: string): AgentTool<typeof writeSchema> {
+/** Options for creating the write tool */
+export interface WriteToolOptions {
+	/** Callback to format file using LSP after writing */
+	formatOnWrite?: (absolutePath: string) => Promise<FileFormatResult>;
+	/** Callback to get LSP diagnostics after writing a file */
+	getDiagnostics?: (absolutePath: string) => Promise<FileDiagnosticsResult>;
+}
+
+/** Details returned by the write tool for TUI rendering */
+export interface WriteToolDetails {
+	/** Whether the file was formatted */
+	wasFormatted: boolean;
+	/** Format result (if available) */
+	formatResult?: FileFormatResult;
+	/** Whether LSP diagnostics were retrieved */
+	hasDiagnostics: boolean;
+	/** Diagnostic result (if available) */
+	diagnostics?: FileDiagnosticsResult;
+}
+
+export function createWriteTool(
+	cwd: string,
+	options: WriteToolOptions = {},
+): AgentTool<typeof writeSchema, WriteToolDetails> {
 	return {
 		name: "write",
 		label: "Write",
@@ -30,7 +54,7 @@ Usage:
 			const absolutePath = resolveToCwd(path, cwd);
 			const dir = dirname(absolutePath);
 
-			return new Promise<{ content: Array<{ type: "text"; text: string }>; details: undefined }>(
+			return new Promise<{ content: Array<{ type: "text"; text: string }>; details: WriteToolDetails }>(
 				(resolve, reject) => {
 					// Check if already aborted
 					if (signal?.aborted) {
@@ -74,9 +98,48 @@ Usage:
 								signal.removeEventListener("abort", onAbort);
 							}
 
+							// Format file if callback provided (before diagnostics)
+							let formatResult: FileFormatResult | undefined;
+							if (options.formatOnWrite) {
+								try {
+									formatResult = await options.formatOnWrite(absolutePath);
+								} catch {
+									// Ignore formatting errors - don't fail the write
+								}
+							}
+
+							// Get LSP diagnostics if callback provided (after formatting)
+							let diagnosticsResult: FileDiagnosticsResult | undefined;
+							if (options.getDiagnostics) {
+								try {
+									diagnosticsResult = await options.getDiagnostics(absolutePath);
+								} catch {
+									// Ignore diagnostics errors - don't fail the write
+								}
+							}
+
+							// Build result text
+							let resultText = `Successfully wrote ${content.length} bytes to ${path}`;
+
+							// Note if file was formatted
+							if (formatResult?.formatted) {
+								resultText += ` (formatted by ${formatResult.serverName})`;
+							}
+
+							// Append diagnostics if available and there are issues
+							if (diagnosticsResult?.available && diagnosticsResult.diagnostics.length > 0) {
+								resultText += `\n\nLSP Diagnostics (${diagnosticsResult.summary}):\n`;
+								resultText += diagnosticsResult.diagnostics.map((d) => `  ${d}`).join("\n");
+							}
+
 							resolve({
-								content: [{ type: "text", text: `Successfully wrote ${content.length} bytes to ${path}` }],
-								details: undefined,
+								content: [{ type: "text", text: resultText }],
+								details: {
+									wasFormatted: formatResult?.formatted ?? false,
+									formatResult,
+									hasDiagnostics: diagnosticsResult?.available ?? false,
+									diagnostics: diagnosticsResult,
+								},
 							});
 						} catch (error: any) {
 							// Clean up abort handler

package/src/index.ts

@@ -123,6 +123,7 @@ export {
 } from "./core/session-manager.js";
 export {
 	type CompactionSettings,
+	type LspSettings,
 	type RetrySettings,
 	type Settings,
 	SettingsManager,
@@ -143,6 +144,7 @@ export {
 export {
 	type BashToolDetails,
 	bashTool,
+	type CodingToolsOptions,
 	codingTools,
 	editTool,
 	type FindToolDetails,
@@ -154,8 +156,11 @@ export {
 	type ReadToolDetails,
 	readTool,
 	type TruncationResult,
+	type WriteToolDetails,
+	type WriteToolOptions,
 	writeTool,
 } from "./core/tools/index.js";
+export type { FileDiagnosticsResult } from "./core/tools/lsp/index.js";
 // Main entry point
 export { main } from "./main.js";
 // UI components for hooks and custom tools

package/src/main.ts

@@ -62,11 +62,20 @@ async function runInteractiveMode(
 	initialMessages: string[],
 	customTools: LoadedCustomTool[],
 	setToolUIContext: (uiContext: HookUIContext, hasUI: boolean) => void,
+	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 	fdPath: string | undefined = undefined,
 ): Promise<void> {
-	const mode = new InteractiveMode(session, version, changelogMarkdown, customTools, setToolUIContext, fdPath);
+	const mode = new InteractiveMode(
+		session,
+		version,
+		changelogMarkdown,
+		customTools,
+		setToolUIContext,
+		lspServers,
+		fdPath,
+	);
 
 	await mode.init();
 
@@ -347,6 +356,17 @@ export async function main(args: string[]) {
 
 	const settingsManager = SettingsManager.create(cwd);
 	time("SettingsManager.create");
+
+	// Apply model role overrides from CLI args or env vars (ephemeral, not persisted)
+	const smolModel = parsed.smol ?? process.env.PI_SMOL_MODEL;
+	const slowModel = parsed.slow ?? process.env.PI_SLOW_MODEL;
+	if (smolModel || slowModel) {
+		const roleOverrides: Record<string, string> = {};
+		if (smolModel) roleOverrides.smol = smolModel;
+		if (slowModel) roleOverrides.slow = slowModel;
+		settingsManager.applyOverrides({ modelRoles: roleOverrides });
+	}
+
 	initTheme(settingsManager.getTheme(), isInteractive);
 	time("initTheme");
 
@@ -393,7 +413,7 @@ export async function main(args: string[]) {
 	}
 
 	time("buildSessionOptions");
-	const { session, customToolsResult, modelFallbackMessage } = await createAgentSession(sessionOptions);
+	const { session, customToolsResult, modelFallbackMessage, lspServers } = await createAgentSession(sessionOptions);
 	time("createAgentSession");
 
 	if (!isInteractive && !session.model) {
@@ -449,6 +469,7 @@ export async function main(args: string[]) {
 			parsed.messages,
 			customToolsResult.tools,
 			customToolsResult.setUIContext,
+			lspServers,
 			initialMessage,
 			initialImages,
 			fdPath,

package/src/modes/interactive/components/model-selector.ts

@@ -1,6 +1,7 @@
 import { type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
 import { Container, Input, isArrowDown, isArrowUp, isEnter, isEscape, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import type { ModelRegistry } from "../../../core/model-registry.js";
+import { parseModelString } from "../../../core/model-resolver.js";
 import type { SettingsManager } from "../../../core/settings-manager.js";
 import { fuzzyFilter } from "../../../utils/fuzzy.js";
 import { theme } from "../theme/theme.js";
@@ -18,7 +19,11 @@ interface ScopedModelItem {
 }
 
 /**
- * Component that renders a model selector with search
+ * Component that renders a model selector with search.
+ * - Enter: Set selected model as default
+ * - S: Set selected model as smol
+ * - L: Set selected model as slow
+ * - Escape: Close selector
  */
 export class ModelSelectorComponent extends Container {
 	private searchInput: Input;
@@ -27,9 +32,12 @@ export class ModelSelectorComponent extends Container {
 	private filteredModels: ModelItem[] = [];
 	private selectedIndex: number = 0;
 	private currentModel?: Model<any>;
+	private defaultModel?: Model<any>;
+	private smolModel?: Model<any>;
+	private slowModel?: Model<any>;
 	private settingsManager: SettingsManager;
 	private modelRegistry: ModelRegistry;
-	private onSelectCallback: (model: Model<any>) => void;
+	private onSelectCallback: (model: Model<any>, role: string) => void;
 	private onCancelCallback: () => void;
 	private errorMessage?: string;
 	private tui: TUI;
@@ -41,7 +49,7 @@ export class ModelSelectorComponent extends Container {
 		settingsManager: SettingsManager,
 		modelRegistry: ModelRegistry,
 		scopedModels: ReadonlyArray<ScopedModelItem>,
-		onSelect: (model: Model<any>) => void,
+		onSelect: (model: Model<any>, role: string) => void,
 		onCancel: () => void,
 	) {
 		super();
@@ -54,24 +62,28 @@ export class ModelSelectorComponent extends Container {
 		this.onSelectCallback = onSelect;
 		this.onCancelCallback = onCancel;
 
+		// Load current role assignments from settings
+		this._loadRoleModels();
+
 		// Add top border
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 
-		// Add hint about model filtering
+		// Add hint about model filtering and key bindings
 		const hintText =
 			scopedModels.length > 0
 				? "Showing models from --models scope"
 				: "Only showing models with configured API keys (see README for details)";
 		this.addChild(new Text(theme.fg("warning", hintText), 0, 0));
+		this.addChild(new Text(theme.fg("muted", "Enter: default  S: smol  L: slow  Esc: close"), 0, 0));
 		this.addChild(new Spacer(1));
 
 		// Create search input
 		this.searchInput = new Input();
 		this.searchInput.onSubmit = () => {
-			// Enter on search input selects the first filtered item
+			// Enter on search input sets as default
 			if (this.filteredModels[this.selectedIndex]) {
-				this.handleSelect(this.filteredModels[this.selectedIndex].model);
+				this.handleSelect(this.filteredModels[this.selectedIndex].model, "default");
 			}
 		};
 		this.addChild(this.searchInput);
@@ -95,6 +107,38 @@ export class ModelSelectorComponent extends Container {
 		});
 	}
 
+	private _loadRoleModels(): void {
+		const roles = this.settingsManager.getModelRoles();
+		const allModels = this.modelRegistry.getAll();
+
+		// Load default model
+		const defaultStr = roles.default;
+		if (defaultStr) {
+			const parsed = parseModelString(defaultStr);
+			if (parsed) {
+				this.defaultModel = allModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			}
+		}
+
+		// Load smol model
+		const smolStr = roles.smol;
+		if (smolStr) {
+			const parsed = parseModelString(smolStr);
+			if (parsed) {
+				this.smolModel = allModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			}
+		}
+
+		// Load slow model
+		const slowStr = roles.slow;
+		if (slowStr) {
+			const parsed = parseModelString(slowStr);
+			if (parsed) {
+				this.slowModel = allModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			}
+		}
+	}
+
 	private async loadModels(): Promise<void> {
 		let models: ModelItem[];
 
@@ -167,20 +211,26 @@ export class ModelSelectorComponent extends Container {
 			if (!item) continue;
 
 			const isSelected = i === this.selectedIndex;
-			const isCurrent = modelsAreEqual(this.currentModel, item.model);
+			const isDefault = modelsAreEqual(this.defaultModel, item.model);
+			const isSmol = modelsAreEqual(this.smolModel, item.model);
+			const isSlow = modelsAreEqual(this.slowModel, item.model);
+
+			// Build role markers: ✓ for default, ⚡ for smol, 🧠 for slow
+			let markers = "";
+			if (isDefault) markers += theme.fg("success", " ✓");
+			if (isSmol) markers += theme.fg("warning", " ⚡");
+			if (isSlow) markers += theme.fg("accent", " 🧠");
 
 			let line = "";
 			if (isSelected) {
 				const prefix = theme.fg("accent", "→ ");
 				const modelText = `${item.id}`;
 				const providerBadge = theme.fg("muted", `[${item.provider}]`);
-				const checkmark = isCurrent ? theme.fg("success", " ✓") : "";
-				line = `${prefix + theme.fg("accent", modelText)} ${providerBadge}${checkmark}`;
+				line = `${prefix + theme.fg("accent", modelText)} ${providerBadge}${markers}`;
 			} else {
 				const modelText = `  ${item.id}`;
 				const providerBadge = theme.fg("muted", `[${item.provider}]`);
-				const checkmark = isCurrent ? theme.fg("success", " ✓") : "";
-				line = `${modelText} ${providerBadge}${checkmark}`;
+				line = `${modelText} ${providerBadge}${markers}`;
 			}
 
 			this.listContainer.addChild(new Text(line, 0, 0));
@@ -217,14 +267,28 @@ export class ModelSelectorComponent extends Container {
 			this.selectedIndex = this.selectedIndex === this.filteredModels.length - 1 ? 0 : this.selectedIndex + 1;
 			this.updateList();
 		}
-		// Enter
+		// Enter - set as default model (don't close)
 		else if (isEnter(keyData)) {
 			const selectedModel = this.filteredModels[this.selectedIndex];
 			if (selectedModel) {
-				this.handleSelect(selectedModel.model);
+				this.handleSelect(selectedModel.model, "default");
 			}
 		}
-		// Escape
+		// S key - set as smol model (don't close)
+		else if (keyData === "s" || keyData === "S") {
+			const selectedModel = this.filteredModels[this.selectedIndex];
+			if (selectedModel) {
+				this.handleSelect(selectedModel.model, "smol");
+			}
+		}
+		// L key - set as slow model (don't close)
+		else if (keyData === "l" || keyData === "L") {
+			const selectedModel = this.filteredModels[this.selectedIndex];
+			if (selectedModel) {
+				this.handleSelect(selectedModel.model, "slow");
+			}
+		}
+		// Escape - close
 		else if (isEscape(keyData)) {
 			this.onCancelCallback();
 		}
@@ -235,10 +299,24 @@ export class ModelSelectorComponent extends Container {
 		}
 	}
 
-	private handleSelect(model: Model<any>): void {
-		// Save as new default
-		this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
-		this.onSelectCallback(model);
+	private handleSelect(model: Model<any>, role: string): void {
+		// Save to settings
+		this.settingsManager.setModelRole(role, `${model.provider}/${model.id}`);
+
+		// Update local state for UI
+		if (role === "default") {
+			this.defaultModel = model;
+		} else if (role === "smol") {
+			this.smolModel = model;
+		} else if (role === "slow") {
+			this.slowModel = model;
+		}
+
+		// Notify caller (for updating agent state if needed)
+		this.onSelectCallback(model, role);
+
+		// Update list to show new markers
+		this.updateList();
 	}
 
 	getSearchInput(): Input {

package/src/modes/interactive/components/session-selector.ts

@@ -90,7 +90,7 @@ class SessionList implements Component {
 		);
 		const endIndex = Math.min(startIndex + this.maxVisible, this.filteredSessions.length);
 
-		// Render visible sessions (2 lines per session + blank line)
+		// Render visible sessions (2-3 lines per session + blank line)
 		for (let i = startIndex; i < endIndex; i++) {
 			const session = this.filteredSessions[i];
 			const isSelected = i === this.selectedIndex;
@@ -98,19 +98,32 @@ class SessionList implements Component {
 			// Normalize first message to single line
 			const normalizedMessage = session.firstMessage.replace(/\n/g, " ").trim();
 
-			// First line: cursor + message (truncate to visible width)
+			// First line: cursor + title (or first message if no title)
 			const cursor = isSelected ? theme.fg("accent", "› ") : "  ";
-			const maxMsgWidth = width - 2; // Account for cursor (2 visible chars)
-			const truncatedMsg = truncateToWidth(normalizedMessage, maxMsgWidth, "...");
-			const messageLine = cursor + (isSelected ? theme.bold(truncatedMsg) : truncatedMsg);
+			const maxWidth = width - 2; // Account for cursor (2 visible chars)
+
+			if (session.title) {
+				// Has title: show title on first line, dimmed first message on second line
+				const truncatedTitle = truncateToWidth(session.title, maxWidth, "...");
+				const titleLine = cursor + (isSelected ? theme.bold(truncatedTitle) : truncatedTitle);
+				lines.push(titleLine);
+
+				// Second line: dimmed first message preview
+				const truncatedPreview = truncateToWidth(normalizedMessage, maxWidth, "...");
+				lines.push(`  ${theme.fg("dim", truncatedPreview)}`);
+			} else {
+				// No title: show first message as main line
+				const truncatedMsg = truncateToWidth(normalizedMessage, maxWidth, "...");
+				const messageLine = cursor + (isSelected ? theme.bold(truncatedMsg) : truncatedMsg);
+				lines.push(messageLine);
+			}
 
-			// Second line: metadata (dimmed) - also truncate for safety
+			// Metadata line: date + message count
 			const modified = formatDate(session.modified);
 			const msgCount = `${session.messageCount} message${session.messageCount !== 1 ? "s" : ""}`;
 			const metadata = `  ${modified} · ${msgCount}`;
 			const metadataLine = theme.fg("dim", truncateToWidth(metadata, width, ""));
 
-			lines.push(messageLine);
 			lines.push(metadataLine);
 			lines.push(""); // Blank line between sessions
 		}

package/src/modes/interactive/components/settings-defs.ts

@@ -20,7 +20,7 @@ interface BaseSettingDef {
 	id: string;
 	label: string;
 	description: string;
-	tab: "config" | "exa";
+	tab: string;
 }
 
 // Boolean toggle setting
@@ -99,6 +99,16 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getQueueMode(),
 		set: (sm, v) => sm.setQueueMode(v as "all" | "one-at-a-time"), // Also handled in session
 	},
+	{
+		id: "interruptMode",
+		tab: "config",
+		type: "enum",
+		label: "Interrupt mode",
+		description: "When to process queued messages: immediately (interrupt tools) or wait for turn to complete",
+		values: ["immediate", "wait"],
+		get: (sm) => sm.getInterruptMode(),
+		set: (sm, v) => sm.setInterruptMode(v as "immediate" | "wait"), // Also handled in session
+	},
 	{
 		id: "hideThinking",
 		tab: "config",
@@ -126,6 +136,24 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getBashInterceptorEnabled(),
 		set: (sm, v) => sm.setBashInterceptorEnabled(v),
 	},
+	{
+		id: "mcpProjectConfig",
+		tab: "config",
+		type: "boolean",
+		label: "MCP project config",
+		description: "Load .mcp.json/mcp.json from project root",
+		get: (sm) => sm.getMCPProjectConfigEnabled(),
+		set: (sm, v) => sm.setMCPProjectConfigEnabled(v),
+	},
+	{
+		id: "editFuzzyMatch",
+		tab: "config",
+		type: "boolean",
+		label: "Edit fuzzy match",
+		description: "Accept high-confidence fuzzy matches for whitespace/indentation differences",
+		get: (sm) => sm.getEditFuzzyMatch(),
+		set: (sm, v) => sm.setEditFuzzyMatch(v),
+	},
 	{
 		id: "thinkingLevel",
 		tab: "config",
@@ -152,6 +180,35 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		getOptions: () => [], // Filled dynamically from context
 	},
 
+	// LSP tab
+	{
+		id: "lspFormatOnWrite",
+		tab: "lsp",
+		type: "boolean",
+		label: "Format on write",
+		description: "Automatically format code files using LSP after writing",
+		get: (sm) => sm.getLspFormatOnWrite(),
+		set: (sm, v) => sm.setLspFormatOnWrite(v),
+	},
+	{
+		id: "lspDiagnosticsOnWrite",
+		tab: "lsp",
+		type: "boolean",
+		label: "Diagnostics on write",
+		description: "Return LSP diagnostics (errors/warnings) after writing code files",
+		get: (sm) => sm.getLspDiagnosticsOnWrite(),
+		set: (sm, v) => sm.setLspDiagnosticsOnWrite(v),
+	},
+	{
+		id: "lspDiagnosticsOnEdit",
+		tab: "lsp",
+		type: "boolean",
+		label: "Diagnostics on edit",
+		description: "Return LSP diagnostics (errors/warnings) after editing code files",
+		get: (sm) => sm.getLspDiagnosticsOnEdit(),
+		set: (sm, v) => sm.setLspDiagnosticsOnEdit(v),
+	},
+
 	// Exa tab
 	{
 		id: "exaEnabled",
@@ -210,7 +267,7 @@ export const SETTINGS_DEFS: SettingDef[] = [
 ];
 
 /** Get settings for a specific tab */
-export function getSettingsForTab(tab: "config" | "exa"): SettingDef[] {
+export function getSettingsForTab(tab: string): SettingDef[] {
 	return SETTINGS_DEFS.filter((def) => def.tab === tab);
 }
 

package/src/modes/interactive/components/settings-selector.ts

@@ -93,10 +93,11 @@ class SelectSubmenu extends Container {
 	}
 }
 
-type TabId = "config" | "exa" | "plugins";
+type TabId = string;
 
 const SETTINGS_TABS: Tab[] = [
 	{ id: "config", label: "Config" },
+	{ id: "lsp", label: "LSP" },
 	{ id: "exa", label: "Exa" },
 	{ id: "plugins", label: "Plugins" },
 ];
@@ -189,14 +190,10 @@ export class SettingsSelectorComponent extends Container {
 		const bottomBorder = this.children[this.children.length - 1];
 		this.removeChild(bottomBorder);
 
-		switch (tabId) {
-			case "config":
-			case "exa":
-				this.showSettingsTab(tabId);
-				break;
-			case "plugins":
-				this.showPluginsTab();
-				break;
+		if (tabId === "plugins") {
+			this.showPluginsTab();
+		} else {
+			this.showSettingsTab(tabId);
 		}
 
 		// Re-add bottom border
@@ -301,9 +298,9 @@ export class SettingsSelectorComponent extends Container {
 	}
 
 	/**
-	 * Show a settings tab (config or exa) using definitions.
+	 * Show a settings tab using definitions.
 	 */
-	private showSettingsTab(tabId: "config" | "exa"): void {
+	private showSettingsTab(tabId: string): void {
 		const defs = getSettingsForTab(tabId);
 		const items: SettingItem[] = [];
 

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

@@ -501,6 +501,24 @@ export class ToolExecutionComponent extends Container {
 					text += theme.fg("toolOutput", `\n... (${remaining} more lines, ${totalLines} total)`);
 				}
 			}
+
+			// Show LSP diagnostics if available
+			if (this.result?.details?.diagnostics?.available) {
+				const diag = this.result.details.diagnostics;
+				if (diag.diagnostics.length > 0) {
+					const icon = diag.hasErrors ? theme.fg("error", "●") : theme.fg("warning", "●");
+					text += `\n\n${icon} ${theme.fg("toolTitle", "LSP Diagnostics")} ${theme.fg("dim", `(${diag.summary})`)}`;
+					const maxDiags = this.expanded ? diag.diagnostics.length : 5;
+					const displayDiags = diag.diagnostics.slice(0, maxDiags);
+					for (const d of displayDiags) {
+						const color = d.includes("[error]") ? "error" : d.includes("[warning]") ? "warning" : "dim";
+						text += `\n  ${theme.fg(color, d)}`;
+					}
+					if (diag.diagnostics.length > maxDiags) {
+						text += theme.fg("dim", `\n  ... (${diag.diagnostics.length - maxDiags} more)`);
+					}
+				}
+			}
 		} else if (this.toolName === "edit") {
 			const rawPath = this.args?.file_path || this.args?.path || "";
 			const path = shortenPath(rawPath);

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

@@ -356,7 +356,7 @@ class TreeList implements Component {
 				parts.push("branch summary", entry.summary);
 				break;
 			case "model_change":
-				parts.push("model", entry.modelId);
+				parts.push("model", entry.model);
 				break;
 			case "thinking_level_change":
 				parts.push("thinking", entry.thinkingLevel);
@@ -558,7 +558,7 @@ class TreeList implements Component {
 				result = theme.fg("warning", `[branch summary]: `) + normalize(entry.summary);
 				break;
 			case "model_change":
-				result = theme.fg("dim", `[model: ${entry.modelId}]`);
+				result = theme.fg("dim", `[model: ${entry.model}]`);
 				break;
 			case "thinking_level_change":
 				result = theme.fg("dim", `[thinking: ${entry.thinkingLevel}]`);