@oh-my-pi/pi-coding-agent 3.31.0 → 3.33.0

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 ## [Unreleased]
 
+## [3.33.0] - 2026-01-08
+
+### Added
+- Added `env` support in `settings.json` for automatically setting environment variables on startup
+- Added environment variable management methods to SettingsManager (get/set/clear)
+
+### Fixed
+- Fixed bash output previews to recompute on resize, preventing TUI line width overflow crashes
+- Fixed session title generation to retry alternate smol models when the primary model errors or is rate-limited
+- Fixed file mentions to resolve extensionless paths and directories, using read tool truncation limits for injected content
+- Fixed interactive UI to show auto-read file mention indicators
+- Fixed task tool tree rendering to use consistent tree connectors for progress, findings, and results
+- Fixed last-branch tree connector symbol in the TUI
+- Fixed output tool previews to use compact JSON when outputs are formatted with leading braces
+
+## [3.32.0] - 2026-01-08
+### Added
+
+- Added progress indicator when starting LSP servers at session startup
+- Added bundled `/init` slash command available by default
+
+### Changed
+
+- Changed LSP server warmup to use a 5-second timeout, falling back to lazy initialization for slow servers
+
+### Fixed
+
+- Fixed Task tool subagent model selection to inherit explicit CLI `--model` overrides
+
 ## [3.31.0] - 2026-01-08
 
 ### Added

package/README.md

@@ -338,10 +338,22 @@ When disabled, neither case triggers automatic compaction (use `/compact` manual
 		"enabled": true,
 		"reserveTokens": 16384,
 		"keepRecentTokens": 20000
+	},
+	"env": {
+		"ANTHROPIC_API_KEY": "sk-ant-...",
+		"OPENAI_API_KEY": "sk-proj-...",
+		"GEMINI_API_KEY": "AIzaSyD...",
+		"CUSTOM_VAR": "custom-value"
 	}
 }
 ```
 
+**Environment Variables (`env`):**
+- Automatically sets environment variables when the application starts
+- Only sets variables that aren't already present in `process.env`
+- Supports any environment variable, not just API keys
+- Order of precedence: existing env vars > settings.json env vars > auth.json env vars
+
 > **Note:** Compaction is lossy. The agent loses full conversation access afterward. Size tasks to avoid context limits when possible. For critical context, ask the agent to write a summary to a file, iterate on it until it covers everything, then start a new session with that file. The full session history is preserved in the JSONL file; use `/tree` to revisit any previous point.
 
 See [docs/compaction.md](docs/compaction.md) for how compaction works internally and how to customize it via hooks.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "3.31.0",
+	"version": "3.33.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -40,9 +40,9 @@
 	},
 	"dependencies": {
 		"@mariozechner/pi-ai": "^0.37.8",
-		"@oh-my-pi/pi-agent-core": "3.31.0",
-		"@oh-my-pi/pi-git-tool": "3.31.0",
-		"@oh-my-pi/pi-tui": "3.31.0",
+		"@oh-my-pi/pi-agent-core": "3.33.0",
+		"@oh-my-pi/pi-git-tool": "3.33.0",
+		"@oh-my-pi/pi-tui": "3.33.0",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/src/core/agent-session.ts

@@ -377,7 +377,8 @@ export class AgentSession {
 			} else if (
 				event.message.role === "user" ||
 				event.message.role === "assistant" ||
-				event.message.role === "toolResult"
+				event.message.role === "toolResult" ||
+				event.message.role === "fileMention"
 			) {
 				// Regular LLM message - persist as SessionMessageEntry
 				this.sessionManager.appendMessage(event.message);

package/src/core/custom-commands/bundled/review/index.ts

@@ -435,13 +435,11 @@ export function createReviewCommand(api: CustomCommandAPI): CustomCommand {
 					if (hasDiff) {
 						const stats = parseDiff(diffResult.stdout);
 						// Even if all files filtered, include the custom instructions
-						return (
-							buildReviewPrompt(
-								`Custom review: ${instructions.split("\n")[0].slice(0, 60)}...`,
-								stats,
-								diffResult.stdout,
-							) + `\n\n### Additional Instructions\n\n${instructions}`
-						);
+						return `${buildReviewPrompt(
+							`Custom review: ${instructions.split("\n")[0].slice(0, 60)}...`,
+							stats,
+							diffResult.stdout,
+						)}\n\n### Additional Instructions\n\n${instructions}`;
 					}
 
 					// No diff available, just pass instructions

package/src/core/file-mentions.ts

@@ -9,14 +9,148 @@
 import path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { FileMentionMessage } from "./messages";
+import { resolveReadPath } from "./tools/path-utils";
+import { formatAge } from "./tools/render-utils";
+import { DEFAULT_MAX_BYTES, formatSize, truncateHead, truncateStringToBytesFromStart } from "./tools/truncate";
 
 /** Regex to match @filepath patterns in text */
-const FILE_MENTION_REGEX = /@((?:[^\s@]+\/)*[^\s@]+\.[a-zA-Z0-9]+)/g;
+const FILE_MENTION_REGEX = /@([^\s@]+)/g;
+const LEADING_PUNCTUATION_REGEX = /^[`"'([{<]+/;
+const TRAILING_PUNCTUATION_REGEX = /[)\]}>.,;:!?"'`]+$/;
+const MENTION_BOUNDARY_REGEX = /[\s([{<"'`]/;
+const DEFAULT_DIR_LIMIT = 500;
+
+function isMentionBoundary(text: string, index: number): boolean {
+	if (index === 0) return true;
+	return MENTION_BOUNDARY_REGEX.test(text[index - 1]);
+}
+
+function sanitizeMentionPath(rawPath: string): string | null {
+	let cleaned = rawPath.trim();
+	cleaned = cleaned.replace(LEADING_PUNCTUATION_REGEX, "");
+	cleaned = cleaned.replace(TRAILING_PUNCTUATION_REGEX, "");
+	cleaned = cleaned.trim();
+	return cleaned.length > 0 ? cleaned : null;
+}
+
+function buildTextOutput(textContent: string): { output: string; lineCount: number } {
+	const allLines = textContent.split("\n");
+	const totalFileLines = allLines.length;
+	const truncation = truncateHead(textContent);
+
+	if (truncation.firstLineExceedsLimit) {
+		const firstLine = allLines[0] ?? "";
+		const firstLineBytes = Buffer.byteLength(firstLine, "utf-8");
+		const snippet = truncateStringToBytesFromStart(firstLine, DEFAULT_MAX_BYTES);
+		let outputText = snippet.text;
+
+		if (outputText.length > 0) {
+			outputText += `\n\n[Line 1 is ${formatSize(firstLineBytes)}, exceeds ${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit. Showing first ${formatSize(snippet.bytes)} of the line.]`;
+		} else {
+			outputText = `[Line 1 is ${formatSize(firstLineBytes)}, exceeds ${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit. Unable to display a valid UTF-8 snippet.]`;
+		}
+
+		return { output: outputText, lineCount: totalFileLines };
+	}
+
+	let outputText = truncation.content;
+
+	if (truncation.truncated) {
+		const endLineDisplay = truncation.outputLines;
+		const nextOffset = endLineDisplay + 1;
+
+		if (truncation.truncatedBy === "lines") {
+			outputText += `\n\n[Showing lines 1-${endLineDisplay} of ${totalFileLines}. Use offset=${nextOffset} to continue]`;
+		} else {
+			outputText += `\n\n[Showing lines 1-${endLineDisplay} of ${totalFileLines} (${formatSize(
+				DEFAULT_MAX_BYTES,
+			)} limit). Use offset=${nextOffset} to continue]`;
+		}
+	}
+
+	return { output: outputText, lineCount: totalFileLines };
+}
+
+async function buildDirectoryListing(absolutePath: string): Promise<{ output: string; lineCount: number }> {
+	let entries: string[];
+	try {
+		entries = await Array.fromAsync(new Bun.Glob("*").scan({ cwd: absolutePath, dot: true, onlyFiles: false }));
+	} catch {
+		return { output: "(empty directory)", lineCount: 1 };
+	}
+
+	entries.sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+
+	const results: string[] = [];
+	let entryLimitReached = false;
+
+	for (const entry of entries) {
+		if (results.length >= DEFAULT_DIR_LIMIT) {
+			entryLimitReached = true;
+			break;
+		}
+
+		const fullPath = path.join(absolutePath, entry);
+		let suffix = "";
+		let age = "";
+
+		try {
+			const stat = await Bun.file(fullPath).stat();
+			if (stat.isDirectory()) {
+				suffix = "/";
+			}
+			const ageSeconds = Math.floor((Date.now() - stat.mtimeMs) / 1000);
+			age = formatAge(ageSeconds);
+		} catch {
+			continue;
+		}
+
+		const line = age ? `${entry}${suffix} (${age})` : `${entry}${suffix}`;
+		results.push(line);
+	}
+
+	if (results.length === 0) {
+		return { output: "(empty directory)", lineCount: 1 };
+	}
+
+	const rawOutput = results.join("\n");
+	const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
+	let output = truncation.content;
+
+	const notices: string[] = [];
+	if (entryLimitReached) {
+		notices.push(`${DEFAULT_DIR_LIMIT} entries limit reached. Use limit=${DEFAULT_DIR_LIMIT * 2} for more`);
+	}
+	if (truncation.truncated) {
+		notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
+	}
+	if (notices.length > 0) {
+		output += `\n\n[${notices.join(". ")}]`;
+	}
+
+	return { output, lineCount: output.split("\n").length };
+}
 
 /** Extract all @filepath mentions from text */
 export function extractFileMentions(text: string): string[] {
 	const matches = [...text.matchAll(FILE_MENTION_REGEX)];
-	return [...new Set(matches.map((m) => m[1]))];
+	const mentions: string[] = [];
+
+	for (const match of matches) {
+		const index = match.index ?? 0;
+		if (!isMentionBoundary(text, index)) continue;
+
+		const cleaned = sanitizeMentionPath(match[1]);
+		if (!cleaned) continue;
+
+		mentions.push(cleaned);
+	}
+
+	return [...new Set(mentions)];
 }
 
 /**
@@ -29,11 +163,19 @@ export async function generateFileMentionMessages(filePaths: string[], cwd: stri
 	const files: FileMentionMessage["files"] = [];
 
 	for (const filePath of filePaths) {
+		const absolutePath = resolveReadPath(filePath, cwd);
+
 		try {
-			const absolutePath = path.resolve(cwd, filePath);
+			const stat = await Bun.file(absolutePath).stat();
+			if (stat.isDirectory()) {
+				const { output, lineCount } = await buildDirectoryListing(absolutePath);
+				files.push({ path: filePath, content: output, lineCount });
+				continue;
+			}
+
 			const content = await Bun.file(absolutePath).text();
-			const lineCount = content.split("\n").length;
-			files.push({ path: filePath, content, lineCount });
+			const { output, lineCount } = buildTextOutput(content);
+			files.push({ path: filePath, content: output, lineCount });
 		} catch {
 			// File doesn't exist or isn't readable - skip silently
 		}

package/src/core/model-resolver.ts

@@ -33,7 +33,7 @@ export interface ScopedModel {
 }
 
 /** Priority chain for auto-discovering smol/fast models */
-export const SMOL_MODEL_PRIORITY = ["claude-haiku-4-5", "haiku", "flash", "mini"];
+export const SMOL_MODEL_PRIORITY = ["cerebras/zai-glm-4.6", "claude-haiku-4-5", "haiku", "flash", "mini"];
 
 /** Priority chain for auto-discovering slow/comprehensive models (reasoning, codex) */
 export const SLOW_MODEL_PRIORITY = ["gpt-5.2-codex", "gpt-5.2", "codex", "gpt", "opus", "pro"];
@@ -79,7 +79,7 @@ function tryMatchModel(modelPattern: string, availableModels: Model<Api>[]): Mod
 		const provider = modelPattern.substring(0, slashIndex);
 		const modelId = modelPattern.substring(slashIndex + 1);
 		const providerMatch = availableModels.find(
-			(m) => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === modelId.toLowerCase(),
+			(m) => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === modelId.toLowerCase()
 		);
 		if (providerMatch) {
 			return providerMatch;
@@ -97,7 +97,7 @@ function tryMatchModel(modelPattern: string, availableModels: Model<Api>[]): Mod
 	const matches = availableModels.filter(
 		(m) =>
 			m.id.toLowerCase().includes(modelPattern.toLowerCase()) ||
-			m.name?.toLowerCase().includes(modelPattern.toLowerCase()),
+			m.name?.toLowerCase().includes(modelPattern.toLowerCase())
 	);
 
 	if (matches.length === 0) {
@@ -351,7 +351,7 @@ export async function restoreModelFromSession(
 	savedModelId: string,
 	currentModel: Model<Api> | undefined,
 	shouldPrintMessages: boolean,
-	modelRegistry: ModelRegistry,
+	modelRegistry: ModelRegistry
 ): Promise<{ model: Model<Api> | undefined; fallbackMessage: string | undefined }> {
 	const restoredModel = modelRegistry.find(savedProvider, savedModelId);
 
@@ -427,7 +427,7 @@ export async function restoreModelFromSession(
  */
 export async function findSmolModel(
 	modelRegistry: ModelRegistry,
-	savedModel?: string,
+	savedModel?: string
 ): Promise<Model<Api> | undefined> {
 	const availableModels = modelRegistry.getAvailable();
 	if (availableModels.length === 0) return undefined;
@@ -443,12 +443,16 @@ export async function findSmolModel(
 
 	// 2. Try priority chain
 	for (const pattern of SMOL_MODEL_PRIORITY) {
+		// Try exact match with provider prefix
+		const providerMatch = availableModels.find((m) => `${m.provider}/${m.id}`.toLowerCase() === pattern);
+		if (providerMatch) return providerMatch;
+
 		// Try exact match first
-		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern.toLowerCase());
+		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern);
 		if (exactMatch) return exactMatch;
 
 		// Try fuzzy match (substring)
-		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern.toLowerCase()));
+		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern));
 		if (fuzzyMatch) return fuzzyMatch;
 	}
 
@@ -466,7 +470,7 @@ export async function findSmolModel(
  */
 export async function findSlowModel(
 	modelRegistry: ModelRegistry,
-	savedModel?: string,
+	savedModel?: string
 ): Promise<Model<Api> | undefined> {
 	const availableModels = modelRegistry.getAvailable();
 	if (availableModels.length === 0) return undefined;

package/src/core/sdk.ts

@@ -61,7 +61,7 @@ import { logger } from "./logger";
 import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
 import { convertToLlm } from "./messages";
 import { ModelRegistry } from "./model-registry";
-import { parseModelString } from "./model-resolver";
+import { formatModelString, parseModelString } from "./model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./prompt-templates";
 import { SessionManager } from "./session-manager";
 import { type Settings, SettingsManager, type SkillsSettings } from "./settings-manager";
@@ -520,6 +520,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	time("loadSession");
 	const hasExistingSession = existingSession.messages.length > 0;
 
+	const hasExplicitModel = options.model !== undefined;
 	let model = options.model;
 	let modelFallbackMessage: string | undefined;
 
@@ -617,6 +618,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		requireCompleteTool: options.requireCompleteTool,
 		getSessionFile: () => sessionManager.getSessionFile() ?? null,
 		getSessionSpawns: () => options.spawns ?? "*",
+		getModelString: () => (hasExplicitModel && model ? formatModelString(model) : undefined),
 		settings: settingsManager,
 	};
 
@@ -931,7 +933,13 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	let lspServers: CreateAgentSessionResult["lspServers"];
 	if (settingsManager.getLspDiagnosticsOnWrite()) {
 		try {
-			const result = await warmupLspServers(cwd);
+			const result = await warmupLspServers(cwd, {
+				onConnecting: (serverNames) => {
+					if (options.hasUI && serverNames.length > 0) {
+						process.stderr.write(chalk.gray(`Starting LSP servers: ${serverNames.join(", ")}...\n`));
+					}
+				},
+			});
 			lspServers = result.servers;
 			time("warmupLspServers");
 		} catch {

package/src/core/session-manager.ts

@@ -11,6 +11,7 @@ import {
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createCustomMessage,
+	type FileMentionMessage,
 	type HookMessage,
 } from "./messages";
 import type { SessionStorage, SessionStorageWriter } from "./session-storage";
@@ -1179,7 +1180,7 @@ export class SessionManager {
 	 * so it is easier to find them.
 	 * These need to be appended via appendCompaction() and appendBranchSummary() methods.
 	 */
-	appendMessage(message: Message | CustomMessage | HookMessage | BashExecutionMessage): string {
+	appendMessage(message: Message | CustomMessage | HookMessage | BashExecutionMessage | FileMentionMessage): string {
 		const entry: SessionMessageEntry = {
 			type: "message",
 			id: generateId(this.byId),

package/src/core/settings-manager.ts

@@ -179,6 +179,8 @@ export interface Settings {
 	shellPath?: string; // Custom shell path (e.g., for Cygwin users on Windows)
 	collapseChangelog?: boolean; // Show condensed changelog after update (use /changelog for full)
 	doubleEscapeAction?: "branch" | "tree"; // Action for double-escape with empty editor (default: "tree")
+	/** Environment variables to set automatically on startup */
+	env?: Record<string, string>;
 	extensions?: string[]; // Array of extension file paths
 	skills?: SkillsSettings;
 	commands?: CommandsSettings;
@@ -379,6 +381,29 @@ export class SettingsManager {
 		this.globalSettings = initialSettings;
 		const projectSettings = this.loadProjectSettings();
 		this.settings = normalizeSettings(deepMergeSettings(this.globalSettings, projectSettings));
+
+		// Apply environment variables from settings
+		this.applyEnvironmentVariables();
+	}
+
+	/**
+	 * Apply environment variables from settings to process.env
+	 * Only sets variables that are not already set in the environment
+	 */
+	applyEnvironmentVariables(): void {
+		const envVars = this.settings.env;
+		if (!envVars || typeof envVars !== "object") {
+			return;
+		}
+
+		for (const [key, value] of Object.entries(envVars)) {
+			if (typeof key === "string" && typeof value === "string") {
+				// Only set if not already present in environment (allow override with env vars)
+				if (!(key in process.env)) {
+					process.env[key] = value;
+				}
+			}
+		}
 	}
 
 	/** Create a SettingsManager that loads from files */
@@ -1169,4 +1194,49 @@ export class SettingsManager {
 		this.globalSettings.doubleEscapeAction = action;
 		this.save();
 	}
+
+	/**
+	 * Get environment variables from settings
+	 */
+	getEnvironmentVariables(): Record<string, string> {
+		return { ...(this.settings.env ?? {}) };
+	}
+
+	/**
+	 * Set environment variables in settings (not process.env)
+	 * This will be applied on next startup or reload
+	 */
+	setEnvironmentVariables(envVars: Record<string, string>): void {
+		this.globalSettings.env = { ...envVars };
+		this.save();
+	}
+
+	/**
+	 * Clear all environment variables from settings
+	 */
+	clearEnvironmentVariables(): void {
+		delete this.globalSettings.env;
+		this.save();
+	}
+
+	/**
+	 * Set a single environment variable in settings
+	 */
+	setEnvironmentVariable(key: string, value: string): void {
+		if (!this.globalSettings.env) {
+			this.globalSettings.env = {};
+		}
+		this.globalSettings.env[key] = value;
+		this.save();
+	}
+
+	/**
+	 * Remove a single environment variable from settings
+	 */
+	removeEnvironmentVariable(key: string): void {
+		if (this.globalSettings.env) {
+			delete this.globalSettings.env[key];
+			this.save();
+		}
+	}
 }

package/src/core/slash-commands.ts

@@ -2,6 +2,7 @@ import { slashCommandCapability } from "../capability/slash-command";
 import type { SlashCommand } from "../discovery";
 import { loadSync } from "../discovery";
 import { parseFrontmatter } from "../discovery/helpers";
+import { EMBEDDED_COMMAND_TEMPLATES } from "./tools/task/commands";
 
 /**
  * Represents a custom slash command loaded from a file
@@ -15,6 +16,25 @@ export interface FileSlashCommand {
 	_source?: { providerName: string; level: "user" | "project" | "native" };
 }
 
+const EMBEDDED_SLASH_COMMANDS = EMBEDDED_COMMAND_TEMPLATES;
+
+function parseCommandTemplate(content: string): { description: string; body: string } {
+	const { frontmatter, body } = parseFrontmatter(content);
+	const frontmatterDesc = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
+
+	// Get description from frontmatter or first non-empty line
+	let description = frontmatterDesc;
+	if (!description) {
+		const firstLine = body.split("\n").find((line) => line.trim());
+		if (firstLine) {
+			description = firstLine.slice(0, 60);
+			if (firstLine.length > 60) description += "...";
+		}
+	}
+
+	return { description, body };
+}
+
 /**
  * Parse command arguments respecting quoted strings (bash-style)
  * Returns array of arguments
@@ -90,19 +110,8 @@ export interface LoadSlashCommandsOptions {
 export function loadSlashCommands(options: LoadSlashCommandsOptions = {}): FileSlashCommand[] {
 	const result = loadSync<SlashCommand>(slashCommandCapability.id, { cwd: options.cwd });
 
-	return result.items.map((cmd) => {
-		const { frontmatter, body } = parseFrontmatter(cmd.content);
-		const frontmatterDesc = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
-
-		// Get description from frontmatter or first non-empty line
-		let description = frontmatterDesc;
-		if (!description) {
-			const firstLine = body.split("\n").find((line) => line.trim());
-			if (firstLine) {
-				description = firstLine.slice(0, 60);
-				if (firstLine.length > 60) description += "...";
-			}
-		}
+	const fileCommands: FileSlashCommand[] = result.items.map((cmd) => {
+		const { description, body } = parseCommandTemplate(cmd.content);
 
 		// Format source label: "via ProviderName Level"
 		const capitalizedLevel = cmd.level.charAt(0).toUpperCase() + cmd.level.slice(1);
@@ -116,6 +125,23 @@ export function loadSlashCommands(options: LoadSlashCommandsOptions = {}): FileS
 			_source: { providerName: cmd._source.providerName, level: cmd.level },
 		};
 	});
+
+	const seenNames = new Set(fileCommands.map((cmd) => cmd.name));
+	for (const cmd of EMBEDDED_SLASH_COMMANDS) {
+		const name = cmd.name.replace(/\.md$/, "");
+		if (seenNames.has(name)) continue;
+
+		const { description, body } = parseCommandTemplate(cmd.content);
+		fileCommands.push({
+			name,
+			description,
+			content: body,
+			source: "bundled",
+		});
+		seenNames.add(name);
+	}
+
+	return fileCommands;
 }
 
 /**

package/src/core/title-generator.ts

@@ -2,17 +2,54 @@
  * Generate session titles using a smol, fast model.
  */
 
-import type { Model } from "@mariozechner/pi-ai";
+import type { Api, Model } from "@mariozechner/pi-ai";
 import { completeSimple } from "@mariozechner/pi-ai";
 import titleSystemPrompt from "../prompts/title-system.md" with { type: "text" };
 import { logger } from "./logger";
 import type { ModelRegistry } from "./model-registry";
-import { findSmolModel } from "./model-resolver";
+import { parseModelString, SMOL_MODEL_PRIORITY } from "./model-resolver";
 
 const TITLE_SYSTEM_PROMPT = titleSystemPrompt;
 
 const MAX_INPUT_CHARS = 2000;
 
+function getTitleModelCandidates(registry: ModelRegistry, savedSmolModel?: string): Model<Api>[] {
+	const availableModels = registry.getAvailable();
+	if (availableModels.length === 0) return [];
+
+	const candidates: Model<Api>[] = [];
+	const addCandidate = (model?: Model<Api>): void => {
+		if (!model) return;
+		const exists = candidates.some((candidate) => candidate.provider === model.provider && candidate.id === model.id);
+		if (!exists) {
+			candidates.push(model);
+		}
+	};
+
+	if (savedSmolModel) {
+		const parsed = parseModelString(savedSmolModel);
+		if (parsed) {
+			const match = availableModels.find((model) => model.provider === parsed.provider && model.id === parsed.id);
+			addCandidate(match);
+		}
+	}
+
+	for (const pattern of SMOL_MODEL_PRIORITY) {
+		const needle = pattern.toLowerCase();
+		const exactMatch = availableModels.find((model) => model.id.toLowerCase() === needle);
+		addCandidate(exactMatch);
+
+		const fuzzyMatch = availableModels.find((model) => model.id.toLowerCase().includes(needle));
+		addCandidate(fuzzyMatch);
+	}
+
+	for (const model of availableModels) {
+		addCandidate(model);
+	}
+
+	return candidates;
+}
+
 /**
  * Find the best available model for title generation.
  * Uses the configured smol model if set, otherwise auto-discovers using priority chain.
@@ -20,9 +57,9 @@ const MAX_INPUT_CHARS = 2000;
  * @param registry Model registry
  * @param savedSmolModel Optional saved smol model from settings (provider/modelId format)
  */
-export async function findTitleModel(registry: ModelRegistry, savedSmolModel?: string): Promise<Model<any> | null> {
-	const model = await findSmolModel(registry, savedSmolModel);
-	return model ?? null;
+export async function findTitleModel(registry: ModelRegistry, savedSmolModel?: string): Promise<Model<Api> | null> {
+	const candidates = getTitleModelCandidates(registry, savedSmolModel);
+	return candidates[0] ?? null;
 }
 
 /**
@@ -37,68 +74,85 @@ export async function generateSessionTitle(
 	registry: ModelRegistry,
 	savedSmolModel?: string,
 ): Promise<string | null> {
-	const model = await findTitleModel(registry, savedSmolModel);
-	if (!model) {
+	const candidates = getTitleModelCandidates(registry, savedSmolModel);
+	if (candidates.length === 0) {
 		logger.debug("title-generator: no smol model found");
 		return null;
 	}
 
-	const apiKey = await registry.getApiKey(model);
-	if (!apiKey) {
-		logger.debug("title-generator: no API key for model", { provider: model.provider, id: model.id });
-		return null;
-	}
-
 	// Truncate message if too long
 	const truncatedMessage =
 		firstMessage.length > MAX_INPUT_CHARS ? `${firstMessage.slice(0, MAX_INPUT_CHARS)}...` : firstMessage;
+	const userMessage = `<user-message>\n${truncatedMessage}\n</user-message>`;
 
-	const request = {
-		model: `${model.provider}/${model.id}`,
-		systemPrompt: TITLE_SYSTEM_PROMPT,
-		userMessage: `<user-message>\n${truncatedMessage}\n</user-message>`,
-		maxTokens: 30,
-	};
-	logger.debug("title-generator: request", request);
-
-	try {
-		const response = await completeSimple(
-			model,
-			{
-				systemPrompt: request.systemPrompt,
-				messages: [{ role: "user", content: request.userMessage, timestamp: Date.now() }],
-			},
-			{
-				apiKey,
-				maxTokens: 30,
-			},
-		);
-
-		// Extract title from response text content
-		let title = "";
-		for (const content of response.content) {
-			if (content.type === "text") {
-				title += content.text;
-			}
+	for (const model of candidates) {
+		const apiKey = await registry.getApiKey(model);
+		if (!apiKey) {
+			logger.debug("title-generator: no API key for model", { provider: model.provider, id: model.id });
+			continue;
 		}
-		title = title.trim();
 
-		logger.debug("title-generator: response", {
-			title,
-			usage: response.usage,
-			stopReason: response.stopReason,
-		});
+		const request = {
+			model: `${model.provider}/${model.id}`,
+			systemPrompt: TITLE_SYSTEM_PROMPT,
+			userMessage,
+			maxTokens: 30,
+		};
+		logger.debug("title-generator: request", request);
 
-		if (!title) {
-			return null;
-		}
+		try {
+			const response = await completeSimple(
+				model,
+				{
+					systemPrompt: request.systemPrompt,
+					messages: [{ role: "user", content: request.userMessage, timestamp: Date.now() }],
+				},
+				{
+					apiKey,
+					maxTokens: 30,
+				},
+			);
 
-		// Clean up: remove quotes, trailing punctuation
-		return title.replace(/^["']|["']$/g, "").replace(/[.!?]$/, "");
-	} catch (err) {
-		logger.debug("title-generator: error", { error: err instanceof Error ? err.message : String(err) });
-		return null;
+			if (response.stopReason === "error") {
+				logger.debug("title-generator: response error", {
+					model: request.model,
+					stopReason: response.stopReason,
+					errorMessage: response.errorMessage,
+				});
+				continue;
+			}
+
+			// Extract title from response text content
+			let title = "";
+			for (const content of response.content) {
+				if (content.type === "text") {
+					title += content.text;
+				}
+			}
+			title = title.trim();
+
+			logger.debug("title-generator: response", {
+				model: request.model,
+				title,
+				usage: response.usage,
+				stopReason: response.stopReason,
+			});
+
+			if (!title) {
+				continue;
+			}
+
+			// Clean up: remove quotes, trailing punctuation
+			return title.replace(/^["']|["']$/g, "").replace(/[.!?]$/, "");
+		} catch (err) {
+			logger.debug("title-generator: error", {
+				model: request.model,
+				error: err instanceof Error ? err.message : String(err),
+			});
+		}
 	}
+
+	return null;
 }
 
 /**

package/src/core/tools/index.ts

@@ -17,6 +17,7 @@ export {
 	getLspStatus,
 	type LspServerStatus,
 	type LspToolDetails,
+	type LspWarmupOptions,
 	type LspWarmupResult,
 	warmupLspServers,
 } from "./lsp/index";
@@ -93,6 +94,8 @@ export interface ToolSession {
 	getSessionFile: () => string | null;
 	/** Get session spawns */
 	getSessionSpawns: () => string | null;
+	/** Get resolved model string if explicitly set for this session */
+	getModelString?: () => string | undefined;
 	/** Settings manager (optional) */
 	settings?: {
 		getImageAutoResize(): boolean;
@@ -148,7 +151,10 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 
 	const entries = requestedTools
 		? requestedTools.filter((name) => name in allTools).map((name) => [name, allTools[name]] as const)
-		: [...Object.entries(BUILTIN_TOOLS), ...(includeComplete ? ([["complete", HIDDEN_TOOLS.complete]] as const) : [])];
+		: [
+				...Object.entries(BUILTIN_TOOLS),
+				...(includeComplete ? ([["complete", HIDDEN_TOOLS.complete]] as const) : []),
+			];
 	const results = await Promise.all(entries.map(([, factory]) => factory(session)));
 	const tools = results.filter((t): t is Tool => t !== null);
 

package/src/core/tools/lsp/client.ts

@@ -373,10 +373,16 @@ async function sendResponse(
 // Client Management
 // =============================================================================
 
+/** Timeout for warmup initialize requests (5 seconds) */
+export const WARMUP_TIMEOUT_MS = 5000;
+
 /**
  * Get or create an LSP client for the given server configuration and working directory.
+ * @param config - Server configuration
+ * @param cwd - Working directory
+ * @param initTimeoutMs - Optional timeout for the initialize request (defaults to 30s)
  */
-export async function getOrCreateClient(config: ServerConfig, cwd: string): Promise<LspClient> {
+export async function getOrCreateClient(config: ServerConfig, cwd: string, initTimeoutMs?: number): Promise<LspClient> {
 	const key = `${config.command}:${cwd}`;
 
 	// Check if client already exists
@@ -430,14 +436,20 @@ export async function getOrCreateClient(config: ServerConfig, cwd: string): Prom
 
 		try {
 			// Send initialize request
-			const initResult = (await sendRequest(client, "initialize", {
-				processId: process.pid,
-				rootUri: fileToUri(cwd),
-				rootPath: cwd,
-				capabilities: CLIENT_CAPABILITIES,
-				initializationOptions: config.initOptions ?? {},
-				workspaceFolders: [{ uri: fileToUri(cwd), name: cwd.split("/").pop() ?? "workspace" }],
-			})) as { capabilities?: unknown };
+			const initResult = (await sendRequest(
+				client,
+				"initialize",
+				{
+					processId: process.pid,
+					rootUri: fileToUri(cwd),
+					rootPath: cwd,
+					capabilities: CLIENT_CAPABILITIES,
+					initializationOptions: config.initOptions ?? {},
+					workspaceFolders: [{ uri: fileToUri(cwd), name: cwd.split("/").pop() ?? "workspace" }],
+				},
+				undefined, // signal
+				initTimeoutMs,
+			)) as { capabilities?: unknown };
 
 			if (!initResult) {
 				throw new Error("Failed to initialize LSP: no response");
@@ -662,6 +674,9 @@ export function shutdownClient(key: string): void {
 // LSP Protocol Methods
 // =============================================================================
 
+/** Default timeout for LSP requests (30 seconds) */
+const DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+
 /**
  * Send an LSP request and wait for response.
  */
@@ -670,6 +685,7 @@ export async function sendRequest(
 	method: string,
 	params: unknown,
 	signal?: AbortSignal,
+	timeoutMs: number = DEFAULT_REQUEST_TIMEOUT_MS,
 ): Promise<unknown> {
 	// Atomically increment and capture request ID
 	const id = ++client.requestId;
@@ -712,7 +728,7 @@ export async function sendRequest(
 				cleanup();
 				reject(err);
 			}
-		}, 30000);
+		}, timeoutMs);
 		if (signal) {
 			signal.addEventListener("abort", abortHandler, { once: true });
 			if (signal.aborted) {

package/src/core/tools/lsp/index.ts

@@ -19,6 +19,7 @@ import {
 	sendRequest,
 	setIdleTimeout,
 	syncContent,
+	WARMUP_TIMEOUT_MS,
 } from "./client";
 import { getLinterClient } from "./clients";
 import { getServersForFile, hasCapability, type LspConfig, loadConfig } from "./config";
@@ -72,23 +73,36 @@ export interface LspWarmupResult {
 	}>;
 }
 
+/** Options for warming up LSP servers */
+export interface LspWarmupOptions {
+	/** Called when starting to connect to servers */
+	onConnecting?: (serverNames: string[]) => void;
+}
+
 /**
  * Warm up LSP servers for a directory by connecting to all detected servers.
  * This should be called at startup to avoid cold-start delays.
  *
  * @param cwd - Working directory to detect and start servers for
+ * @param options - Optional callbacks for progress reporting
  * @returns Status of each server that was started
  */
-export async function warmupLspServers(cwd: string): Promise<LspWarmupResult> {
+export async function warmupLspServers(cwd: string, options?: LspWarmupOptions): Promise<LspWarmupResult> {
 	const config = await loadConfig(cwd);
 	setIdleTimeout(config.idleTimeoutMs);
 	const servers: LspWarmupResult["servers"] = [];
 	const lspServers = getLspServers(config);
 
-	// Start all detected servers in parallel
+	// Notify caller which servers we're connecting to
+	if (lspServers.length > 0 && options?.onConnecting) {
+		options.onConnecting(lspServers.map(([name]) => name));
+	}
+
+	// Start all detected servers in parallel with a short timeout
+	// Servers that don't respond quickly will be initialized lazily on first use
 	const results = await Promise.allSettled(
 		lspServers.map(async ([name, serverConfig]) => {
-			const client = await getOrCreateClient(serverConfig, cwd);
+			const client = await getOrCreateClient(serverConfig, cwd, WARMUP_TIMEOUT_MS);
 			return { name, client, fileTypes: serverConfig.fileTypes };
 		}),
 	);

package/src/core/tools/output.ts

@@ -189,11 +189,46 @@ function parseOutputProvenance(id: string): OutputProvenance | undefined {
 function extractPreviewLines(content: string, maxLines: number): string[] {
 	const lines = content.split("\n");
 	const preview: string[] = [];
+	const structuralTokens = new Set(["{", "}", "[", "]"]);
+
+	const isStructuralLine = (line: string): boolean => {
+		const trimmed = line.trim();
+		if (!trimmed) return true;
+		const cleaned = trimmed.replace(/,+$/, "");
+		return structuralTokens.has(cleaned);
+	};
+
+	const trimmedContent = content.trim();
+	const firstMeaningful = lines.find((line) => line.trim());
+	if (
+		firstMeaningful &&
+		isStructuralLine(firstMeaningful) &&
+		(trimmedContent.startsWith("{") || trimmedContent.startsWith("[")) &&
+		trimmedContent.length <= 200_000
+	) {
+		try {
+			const parsed = JSON.parse(trimmedContent);
+			const minified = JSON.stringify(parsed);
+			if (minified) return [minified];
+		} catch {
+			// Fall back to line-based previews.
+		}
+	}
+
 	for (const line of lines) {
-		if (!line.trim()) continue;
+		if (isStructuralLine(line)) continue;
 		preview.push(line);
 		if (preview.length >= maxLines) break;
 	}
+
+	if (preview.length === 0) {
+		for (const line of lines) {
+			if (!line.trim()) continue;
+			preview.push(line);
+			if (preview.length >= maxLines) break;
+		}
+	}
+
 	return preview;
 }
 

package/src/core/tools/task/commands.ts

@@ -12,13 +12,17 @@ import { loadSync } from "../../../discovery";
 import architectPlanMd from "../../../prompts/architect-plan.md" with { type: "text" };
 import implementMd from "../../../prompts/implement.md" with { type: "text" };
 import implementWithCriticMd from "../../../prompts/implement-with-critic.md" with { type: "text" };
+import initMd from "../../../prompts/init.md" with { type: "text" };
 
 const EMBEDDED_COMMANDS: { name: string; content: string }[] = [
 	{ name: "architect-plan.md", content: architectPlanMd },
 	{ name: "implement-with-critic.md", content: implementWithCriticMd },
 	{ name: "implement.md", content: implementMd },
+	{ name: "init.md", content: initMd },
 ];
 
+export const EMBEDDED_COMMAND_TEMPLATES: ReadonlyArray<{ name: string; content: string }> = EMBEDDED_COMMANDS;
+
 /** Workflow command definition */
 export interface WorkflowCommand {
 	name: string;

package/src/core/tools/task/index.ts

@@ -135,6 +135,7 @@ export async function createTaskTool(
 			const startTime = Date.now();
 			const { agents, projectAgentsDir } = await discoverAgents(session.cwd);
 			const { agent: agentName, context, model, output: outputSchema } = params;
+			const modelOverride = model ?? session.getModelString?.();
 
 			// Validate agent exists
 			const agent = getAgent(agents, agentName);
@@ -323,7 +324,7 @@ export async function createTaskTool(
 						toolCount: 0,
 						tokens: 0,
 						durationMs: 0,
-						modelOverride: model,
+						modelOverride,
 						description: t.description,
 					});
 				}
@@ -342,7 +343,7 @@ export async function createTaskTool(
 							index,
 							taskId: task.taskId,
 							context: undefined, // Already prepended above
-							modelOverride: model,
+							modelOverride,
 							outputSchema,
 							sessionFile,
 							persistArtifacts: !!artifactsDir,

package/src/core/tools/task/render.ts

@@ -131,7 +131,7 @@ function renderJsonTreeLines(
 			pushLine(`${prefix}${iconArray} ${header}`);
 			if (val.length === 0) {
 				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg(
 						"dim",
 						"[]",
 					)}`,
@@ -140,7 +140,7 @@ function renderJsonTreeLines(
 			}
 			if (depth >= maxDepth) {
 				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg(
 						"dim",
 						theme.format.ellipsis,
 					)}`,
@@ -164,7 +164,7 @@ function renderJsonTreeLines(
 			const entries = Object.entries(val as Record<string, unknown>);
 			if (entries.length === 0) {
 				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg(
 						"dim",
 						"{}",
 					)}`,
@@ -173,7 +173,7 @@ function renderJsonTreeLines(
 			}
 			if (depth >= maxDepth) {
 				pushLine(
-					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.hook)} ${theme.fg(
+					`${buildTreePrefix([...ancestors, !isLast], theme)}${theme.fg("dim", theme.tree.last)} ${theme.fg(
 						"dim",
 						theme.format.ellipsis,
 					)}`,
@@ -288,10 +288,8 @@ function renderAgentProgress(
 	spinnerFrame?: number,
 ): string[] {
 	const lines: string[] = [];
-	const prefix = isLast
-		? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
-		: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
-	const continuePrefix = isLast ? "   " : `${theme.boxSharp.vertical}  `;
+	const prefix = isLast ? theme.tree.last : theme.tree.branch;
+	const continuePrefix = isLast ? "   " : `${theme.tree.vertical}  `;
 
 	const icon = getStatusIcon(progress.status, theme, spinnerFrame);
 	const iconColor =
@@ -460,10 +458,8 @@ function renderFindings(
 	for (let i = 0; i < displayCount; i++) {
 		const finding = findings[i];
 		const isLastFinding = i === displayCount - 1 && (expanded || findings.length <= 3);
-		const findingPrefix = isLastFinding
-			? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
-			: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
-		const findingContinue = isLastFinding ? "   " : `${theme.boxSharp.vertical}  `;
+		const findingPrefix = isLastFinding ? theme.tree.last : theme.tree.branch;
+		const findingContinue = isLastFinding ? "   " : `${theme.tree.vertical}  `;
 
 		const priority = PRIORITY_LABELS[finding.priority] ?? "P?";
 		const color = finding.priority === 0 ? "error" : finding.priority === 1 ? "warning" : "muted";
@@ -496,10 +492,8 @@ function renderFindings(
  */
 function renderAgentResult(result: SingleResult, isLast: boolean, expanded: boolean, theme: Theme): string[] {
 	const lines: string[] = [];
-	const prefix = isLast
-		? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal}`
-		: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal}`;
-	const continuePrefix = isLast ? "   " : `${theme.boxSharp.vertical}  `;
+	const prefix = isLast ? theme.tree.last : theme.tree.branch;
+	const continuePrefix = isLast ? "   " : `${theme.tree.vertical}  `;
 
 	const aborted = result.aborted ?? false;
 	const success = !aborted && result.exitCode === 0;

package/src/main.ts

@@ -5,10 +5,10 @@
  * createAgentSession() options. The SDK does the heavy lifting.
  */
 
-import { type ImageContent, supportsXhigh } from "@mariozechner/pi-ai";
-import chalk from "chalk";
 import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
+import { type ImageContent, supportsXhigh } from "@mariozechner/pi-ai";
+import chalk from "chalk";
 import { type Args, parseArgs, printHelp } from "./cli/args";
 import { processFileArguments } from "./cli/file-processor";
 import { listModels } from "./cli/list-models";
@@ -421,6 +421,7 @@ export async function main(args: string[]) {
 
 	const cwd = process.cwd();
 	const settingsManager = SettingsManager.create(cwd);
+	settingsManager.applyEnvironmentVariables();
 	time("SettingsManager.create");
 	const { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize());
 	time("prepareInitialMessage");

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

@@ -27,12 +27,10 @@ export class BashExecutionComponent extends Container {
 	private fullOutputPath?: string;
 	private expanded = false;
 	private contentContainer: Container;
-	private ui: TUI;
 
 	constructor(command: string, ui: TUI, excludeFromContext = false) {
 		super();
 		this.command = command;
-		this.ui = ui;
 
 		// Use dim border for excluded-from-context commands (!! prefix)
 		const colorKey = excludeFromContext ? "dim" : "bashMode";
@@ -142,15 +140,16 @@ export class BashExecutionComponent extends Container {
 				const displayText = availableLines.map((line) => theme.fg("muted", line)).join("\n");
 				this.contentContainer.addChild(new Text(`\n${displayText}`, 1, 0));
 			} else {
-				// Use shared visual truncation utility
+				// Use shared visual truncation utility, recomputed per render width
 				const styledOutput = previewLogicalLines.map((line) => theme.fg("muted", line)).join("\n");
-				const { visualLines } = truncateToVisualLines(
-					`\n${styledOutput}`,
-					PREVIEW_LINES,
-					this.ui.terminal.columns,
-					1, // padding
-				);
-				this.contentContainer.addChild({ render: () => visualLines, invalidate: () => {} });
+				const previewText = `\n${styledOutput}`;
+				this.contentContainer.addChild({
+					render: (width: number) => {
+						const { visualLines } = truncateToVisualLines(previewText, PREVIEW_LINES, width, 1);
+						return visualLines;
+					},
+					invalidate: () => {},
+				});
 			}
 		}
 

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

@@ -437,13 +437,10 @@ class TreeList implements Component {
 
 			// Build prefix with gutters at their correct positions
 			// Each gutter has a position (displayIndent where its connector was shown)
-			const connector =
-				flatNode.showConnector && !flatNode.isVirtualRootChild
-					? flatNode.isLast
-						? `${theme.boxSharp.bottomLeft}${theme.boxSharp.horizontal} `
-						: `${theme.boxSharp.teeRight}${theme.boxSharp.horizontal} `
-					: "";
-			const connectorPosition = connector ? displayIndent - 1 : -1;
+			const hasConnector = flatNode.showConnector && !flatNode.isVirtualRootChild;
+			const connectorSymbol = hasConnector ? (flatNode.isLast ? theme.tree.last : theme.tree.branch) : "";
+			const connectorChars = hasConnector ? Array.from(connectorSymbol) : [];
+			const connectorPosition = hasConnector ? displayIndent - 1 : -1;
 
 			// Build prefix char by char, placing gutters and connector at their positions
 			const totalChars = displayIndent * 3;
@@ -456,18 +453,18 @@ class TreeList implements Component {
 				const gutter = flatNode.gutters.find((g) => g.position === level);
 				if (gutter) {
 					if (posInLevel === 0) {
-						prefixChars.push(gutter.show ? theme.boxSharp.vertical : " ");
+						prefixChars.push(gutter.show ? theme.tree.vertical : " ");
 					} else {
 						prefixChars.push(" ");
 					}
-				} else if (connector && level === connectorPosition) {
+				} else if (hasConnector && level === connectorPosition) {
 					// Connector at this level
 					if (posInLevel === 0) {
-						prefixChars.push(flatNode.isLast ? theme.boxSharp.bottomLeft : theme.boxSharp.teeRight);
+						prefixChars.push(connectorChars[0] ?? " ");
 					} else if (posInLevel === 1) {
-						prefixChars.push(theme.boxSharp.horizontal);
+						prefixChars.push(connectorChars[1] ?? theme.tree.horizontal);
 					} else {
-						prefixChars.push(" ");
+						prefixChars.push(connectorChars[2] ?? " ");
 					}
 				} else {
 					prefixChars.push(" ");

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

@@ -1215,6 +1215,9 @@ export class InteractiveMode {
 					this.editor.setText("");
 					this.updatePendingMessagesDisplay();
 					this.ui.requestRender();
+				} else if (event.message.role === "fileMention") {
+					this.addMessageToChat(event.message);
+					this.ui.requestRender();
 				} else if (event.message.role === "assistant") {
 					this.streamingComponent = new AssistantMessageComponent(undefined, this.hideThinkingBlock);
 					this.streamingMessage = event.message;
@@ -1566,7 +1569,7 @@ export class InteractiveMode {
 			case "fileMention": {
 				// Render compact file mention display
 				for (const file of message.files) {
-					const text = `${theme.fg("dim", `${theme.tree.hook} `)}${theme.fg("muted", "Read")} ${theme.fg(
+					const text = `${theme.fg("dim", `${theme.tree.last} `)}${theme.fg("muted", "Read")} ${theme.fg(
 						"accent",
 						file.path,
 					)} ${theme.fg("dim", `(${file.lineCount} lines)`)}`;
@@ -1906,31 +1909,6 @@ export class InteractiveMode {
 		this.voiceSupervisor.notifyProgress(text);
 	}
 
-	private async toggleVoiceListening(): Promise<void> {
-		if (!this.settingsManager.getVoiceEnabled()) {
-			this.settingsManager.setVoiceEnabled(true);
-			this.showStatus("Voice mode enabled.");
-		}
-
-		if (this.voiceAutoModeEnabled) {
-			this.voiceAutoModeEnabled = false;
-			this.stopVoiceProgressTimer();
-			await this.voiceSupervisor.stop();
-			this.setVoiceStatus(undefined);
-			this.showStatus("Voice mode disabled.");
-			return;
-		}
-
-		this.voiceAutoModeEnabled = true;
-		try {
-			await this.voiceSupervisor.start();
-		} catch (error) {
-			this.voiceAutoModeEnabled = false;
-			this.setVoiceStatus(undefined);
-			this.showError(error instanceof Error ? error.message : String(error));
-		}
-	}
-
 	private async submitVoiceText(text: string): Promise<void> {
 		const cleaned = text.trim();
 		if (!cleaned) {

package/src/modes/interactive/theme/theme.ts

@@ -209,8 +209,8 @@ const UNICODE_SYMBOLS: SymbolMap = {
 	"tree.vertical": "│",
 	// pick: ─ | alt: ━ ═ ╌ ┄
 	"tree.horizontal": "─",
-	// pick: ⎿ | alt: └ ╰ ↳
-	"tree.hook": "⎿",
+	// pick: └ | alt: ⎿ ╰ ↳
+	"tree.hook": "\u2514",
 	// Box Drawing - Rounded
 	// pick: ╭ | alt: ┌ ┏ ╔
 	"boxRound.topLeft": "╭",