gsd-pi 2.34.0 → 2.35.0-dev.39eee32

package/packages/pi-coding-agent/src/core/settings-manager.ts

@@ -195,7 +195,7 @@ export interface SettingsError {
 	error: Error;
 }
 
-export class FileSettingsStorage implements SettingsStorage {
+class FileSettingsStorage implements SettingsStorage {
 	private globalSettingsPath: string;
 	private projectSettingsPath: string;
 
@@ -262,7 +262,7 @@ export class FileSettingsStorage implements SettingsStorage {
 	}
 }
 
-export class InMemorySettingsStorage implements SettingsStorage {
+class InMemorySettingsStorage implements SettingsStorage {
 	private global: string | undefined;
 	private project: string | undefined;
 
@@ -595,14 +595,56 @@ export class SettingsManager {
 		return drained;
 	}
 
+	// ── Generic setter helpers ──────────────────────────────────────────
+
+	/** Set a top-level global setting field, mark modified, and save. */
+	private setGlobalSetting<K extends keyof Settings>(key: K, value: Settings[K]): void {
+		this.globalSettings[key] = value;
+		this.markModified(key);
+		this.save();
+	}
+
+	/** Set a top-level setting, scoped to project when project settings are active. */
+	private setScopedSetting<K extends keyof Settings>(key: K, value: Settings[K]): void {
+		if (this.hasProjectSettings()) {
+			this.projectSettings[key] = value;
+			this.markProjectModified(key);
+			this.saveProjectSettings(this.projectSettings);
+		} else {
+			this.setGlobalSetting(key, value);
+		}
+	}
+
+	/** Set a nested field within a global settings object (e.g. compaction.enabled). */
+	private setNestedGlobalSetting<K extends keyof Settings, NK extends string & keyof NonNullable<Settings[K]>>(
+		key: K,
+		nestedKey: NK,
+		value: NonNullable<Settings[K]>[NK],
+	): void {
+		if (!this.globalSettings[key]) {
+			(this.globalSettings as Record<string, unknown>)[key] = {};
+		}
+		(this.globalSettings[key] as Record<string, unknown>)[nestedKey] = value;
+		this.markModified(key, nestedKey);
+		this.save();
+	}
+
+	/** Set a field on project settings (clone, set, mark modified, save). */
+	private setProjectSetting<K extends keyof Settings>(key: K, value: Settings[K]): void {
+		const projectSettings = structuredClone(this.projectSettings);
+		projectSettings[key] = value;
+		this.markProjectModified(key);
+		this.saveProjectSettings(projectSettings);
+	}
+
+	// ── Public getters and setters ──────────────────────────────────────
+
 	getLastChangelogVersion(): string | undefined {
 		return this.settings.lastChangelogVersion;
 	}
 
 	setLastChangelogVersion(version: string): void {
-		this.globalSettings.lastChangelogVersion = version;
-		this.markModified("lastChangelogVersion");
-		this.save();
+		this.setGlobalSetting("lastChangelogVersion", version);
 	}
 
 	getDefaultProvider(): string | undefined {
@@ -614,27 +656,11 @@ export class SettingsManager {
 	}
 
 	setDefaultProvider(provider: string): void {
-		if (this.hasProjectSettings()) {
-			this.projectSettings.defaultProvider = provider;
-			this.markProjectModified("defaultProvider");
-			this.saveProjectSettings(this.projectSettings);
-		} else {
-			this.globalSettings.defaultProvider = provider;
-			this.markModified("defaultProvider");
-			this.save();
-		}
+		this.setScopedSetting("defaultProvider", provider);
 	}
 
 	setDefaultModel(modelId: string): void {
-		if (this.hasProjectSettings()) {
-			this.projectSettings.defaultModel = modelId;
-			this.markProjectModified("defaultModel");
-			this.saveProjectSettings(this.projectSettings);
-		} else {
-			this.globalSettings.defaultModel = modelId;
-			this.markModified("defaultModel");
-			this.save();
-		}
+		this.setScopedSetting("defaultModel", modelId);
 	}
 
 	setDefaultModelAndProvider(provider: string, modelId: string): void {
@@ -658,9 +684,7 @@ export class SettingsManager {
 	}
 
 	setSteeringMode(mode: "all" | "one-at-a-time"): void {
-		this.globalSettings.steeringMode = mode;
-		this.markModified("steeringMode");
-		this.save();
+		this.setGlobalSetting("steeringMode", mode);
 	}
 
 	getFollowUpMode(): "all" | "one-at-a-time" {
@@ -668,9 +692,7 @@ export class SettingsManager {
 	}
 
 	setFollowUpMode(mode: "all" | "one-at-a-time"): void {
-		this.globalSettings.followUpMode = mode;
-		this.markModified("followUpMode");
-		this.save();
+		this.setGlobalSetting("followUpMode", mode);
 	}
 
 	getTheme(): string | undefined {
@@ -678,9 +700,7 @@ export class SettingsManager {
 	}
 
 	setTheme(theme: string): void {
-		this.globalSettings.theme = theme;
-		this.markModified("theme");
-		this.save();
+		this.setGlobalSetting("theme", theme);
 	}
 
 	getDefaultThinkingLevel(): "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | undefined {
@@ -688,9 +708,7 @@ export class SettingsManager {
 	}
 
 	setDefaultThinkingLevel(level: "off" | "minimal" | "low" | "medium" | "high" | "xhigh"): void {
-		this.globalSettings.defaultThinkingLevel = level;
-		this.markModified("defaultThinkingLevel");
-		this.save();
+		this.setGlobalSetting("defaultThinkingLevel", level);
 	}
 
 	getTransport(): TransportSetting {
@@ -698,9 +716,7 @@ export class SettingsManager {
 	}
 
 	setTransport(transport: TransportSetting): void {
-		this.globalSettings.transport = transport;
-		this.markModified("transport");
-		this.save();
+		this.setGlobalSetting("transport", transport);
 	}
 
 	getCompactionEnabled(): boolean {
@@ -708,12 +724,7 @@ export class SettingsManager {
 	}
 
 	setCompactionEnabled(enabled: boolean): void {
-		if (!this.globalSettings.compaction) {
-			this.globalSettings.compaction = {};
-		}
-		this.globalSettings.compaction.enabled = enabled;
-		this.markModified("compaction", "enabled");
-		this.save();
+		this.setNestedGlobalSetting("compaction", "enabled", enabled);
 	}
 
 	getCompactionReserveTokens(): number {
@@ -748,12 +759,7 @@ export class SettingsManager {
 	}
 
 	setRetryEnabled(enabled: boolean): void {
-		if (!this.globalSettings.retry) {
-			this.globalSettings.retry = {};
-		}
-		this.globalSettings.retry.enabled = enabled;
-		this.markModified("retry", "enabled");
-		this.save();
+		this.setNestedGlobalSetting("retry", "enabled", enabled);
 	}
 
 	getRetrySettings(): { enabled: boolean; maxRetries: number; baseDelayMs: number; maxDelayMs: number } {
@@ -770,9 +776,7 @@ export class SettingsManager {
 	}
 
 	setHideThinkingBlock(hide: boolean): void {
-		this.globalSettings.hideThinkingBlock = hide;
-		this.markModified("hideThinkingBlock");
-		this.save();
+		this.setGlobalSetting("hideThinkingBlock", hide);
 	}
 
 	getShellPath(): string | undefined {
@@ -780,9 +784,7 @@ export class SettingsManager {
 	}
 
 	setShellPath(path: string | undefined): void {
-		this.globalSettings.shellPath = path;
-		this.markModified("shellPath");
-		this.save();
+		this.setGlobalSetting("shellPath", path);
 	}
 
 	getQuietStartup(): boolean {
@@ -790,9 +792,7 @@ export class SettingsManager {
 	}
 
 	setQuietStartup(quiet: boolean): void {
-		this.globalSettings.quietStartup = quiet;
-		this.markModified("quietStartup");
-		this.save();
+		this.setGlobalSetting("quietStartup", quiet);
 	}
 
 	getShellCommandPrefix(): string | undefined {
@@ -800,9 +800,7 @@ export class SettingsManager {
 	}
 
 	setShellCommandPrefix(prefix: string | undefined): void {
-		this.globalSettings.shellCommandPrefix = prefix;
-		this.markModified("shellCommandPrefix");
-		this.save();
+		this.setGlobalSetting("shellCommandPrefix", prefix);
 	}
 
 	getCollapseChangelog(): boolean {
@@ -810,9 +808,7 @@ export class SettingsManager {
 	}
 
 	setCollapseChangelog(collapse: boolean): void {
-		this.globalSettings.collapseChangelog = collapse;
-		this.markModified("collapseChangelog");
-		this.save();
+		this.setGlobalSetting("collapseChangelog", collapse);
 	}
 
 	getPackages(): PackageSource[] {
@@ -820,16 +816,11 @@ export class SettingsManager {
 	}
 
 	setPackages(packages: PackageSource[]): void {
-		this.globalSettings.packages = packages;
-		this.markModified("packages");
-		this.save();
+		this.setGlobalSetting("packages", packages);
 	}
 
 	setProjectPackages(packages: PackageSource[]): void {
-		const projectSettings = structuredClone(this.projectSettings);
-		projectSettings.packages = packages;
-		this.markProjectModified("packages");
-		this.saveProjectSettings(projectSettings);
+		this.setProjectSetting("packages", packages);
 	}
 
 	getExtensionPaths(): string[] {
@@ -837,16 +828,11 @@ export class SettingsManager {
 	}
 
 	setExtensionPaths(paths: string[]): void {
-		this.globalSettings.extensions = paths;
-		this.markModified("extensions");
-		this.save();
+		this.setGlobalSetting("extensions", paths);
 	}
 
 	setProjectExtensionPaths(paths: string[]): void {
-		const projectSettings = structuredClone(this.projectSettings);
-		projectSettings.extensions = paths;
-		this.markProjectModified("extensions");
-		this.saveProjectSettings(projectSettings);
+		this.setProjectSetting("extensions", paths);
 	}
 
 	getSkillPaths(): string[] {
@@ -854,16 +840,11 @@ export class SettingsManager {
 	}
 
 	setSkillPaths(paths: string[]): void {
-		this.globalSettings.skills = paths;
-		this.markModified("skills");
-		this.save();
+		this.setGlobalSetting("skills", paths);
 	}
 
 	setProjectSkillPaths(paths: string[]): void {
-		const projectSettings = structuredClone(this.projectSettings);
-		projectSettings.skills = paths;
-		this.markProjectModified("skills");
-		this.saveProjectSettings(projectSettings);
+		this.setProjectSetting("skills", paths);
 	}
 
 	getPromptTemplatePaths(): string[] {
@@ -871,16 +852,11 @@ export class SettingsManager {
 	}
 
 	setPromptTemplatePaths(paths: string[]): void {
-		this.globalSettings.prompts = paths;
-		this.markModified("prompts");
-		this.save();
+		this.setGlobalSetting("prompts", paths);
 	}
 
 	setProjectPromptTemplatePaths(paths: string[]): void {
-		const projectSettings = structuredClone(this.projectSettings);
-		projectSettings.prompts = paths;
-		this.markProjectModified("prompts");
-		this.saveProjectSettings(projectSettings);
+		this.setProjectSetting("prompts", paths);
 	}
 
 	getThemePaths(): string[] {
@@ -888,16 +864,11 @@ export class SettingsManager {
 	}
 
 	setThemePaths(paths: string[]): void {
-		this.globalSettings.themes = paths;
-		this.markModified("themes");
-		this.save();
+		this.setGlobalSetting("themes", paths);
 	}
 
 	setProjectThemePaths(paths: string[]): void {
-		const projectSettings = structuredClone(this.projectSettings);
-		projectSettings.themes = paths;
-		this.markProjectModified("themes");
-		this.saveProjectSettings(projectSettings);
+		this.setProjectSetting("themes", paths);
 	}
 
 	getEnableSkillCommands(): boolean {
@@ -905,9 +876,7 @@ export class SettingsManager {
 	}
 
 	setEnableSkillCommands(enabled: boolean): void {
-		this.globalSettings.enableSkillCommands = enabled;
-		this.markModified("enableSkillCommands");
-		this.save();
+		this.setGlobalSetting("enableSkillCommands", enabled);
 	}
 
 	getThinkingBudgets(): ThinkingBudgetsSettings | undefined {
@@ -919,12 +888,7 @@ export class SettingsManager {
 	}
 
 	setShowImages(show: boolean): void {
-		if (!this.globalSettings.terminal) {
-			this.globalSettings.terminal = {};
-		}
-		this.globalSettings.terminal.showImages = show;
-		this.markModified("terminal", "showImages");
-		this.save();
+		this.setNestedGlobalSetting("terminal", "showImages", show);
 	}
 
 	getClearOnShrink(): boolean {
@@ -936,12 +900,7 @@ export class SettingsManager {
 	}
 
 	setClearOnShrink(enabled: boolean): void {
-		if (!this.globalSettings.terminal) {
-			this.globalSettings.terminal = {};
-		}
-		this.globalSettings.terminal.clearOnShrink = enabled;
-		this.markModified("terminal", "clearOnShrink");
-		this.save();
+		this.setNestedGlobalSetting("terminal", "clearOnShrink", enabled);
 	}
 
 	getImageAutoResize(): boolean {
@@ -949,12 +908,7 @@ export class SettingsManager {
 	}
 
 	setImageAutoResize(enabled: boolean): void {
-		if (!this.globalSettings.images) {
-			this.globalSettings.images = {};
-		}
-		this.globalSettings.images.autoResize = enabled;
-		this.markModified("images", "autoResize");
-		this.save();
+		this.setNestedGlobalSetting("images", "autoResize", enabled);
 	}
 
 	getBlockImages(): boolean {
@@ -962,12 +916,7 @@ export class SettingsManager {
 	}
 
 	setBlockImages(blocked: boolean): void {
-		if (!this.globalSettings.images) {
-			this.globalSettings.images = {};
-		}
-		this.globalSettings.images.blockImages = blocked;
-		this.markModified("images", "blockImages");
-		this.save();
+		this.setNestedGlobalSetting("images", "blockImages", blocked);
 	}
 
 	getEnabledModels(): string[] | undefined {
@@ -975,9 +924,7 @@ export class SettingsManager {
 	}
 
 	setEnabledModels(patterns: string[] | undefined): void {
-		this.globalSettings.enabledModels = patterns;
-		this.markModified("enabledModels");
-		this.save();
+		this.setGlobalSetting("enabledModels", patterns);
 	}
 
 	getDoubleEscapeAction(): "fork" | "tree" | "none" {
@@ -985,9 +932,7 @@ export class SettingsManager {
 	}
 
 	setDoubleEscapeAction(action: "fork" | "tree" | "none"): void {
-		this.globalSettings.doubleEscapeAction = action;
-		this.markModified("doubleEscapeAction");
-		this.save();
+		this.setGlobalSetting("doubleEscapeAction", action);
 	}
 
 	getTreeFilterMode(): "default" | "no-tools" | "user-only" | "labeled-only" | "all" {
@@ -997,9 +942,7 @@ export class SettingsManager {
 	}
 
 	setTreeFilterMode(mode: "default" | "no-tools" | "user-only" | "labeled-only" | "all"): void {
-		this.globalSettings.treeFilterMode = mode;
-		this.markModified("treeFilterMode");
-		this.save();
+		this.setGlobalSetting("treeFilterMode", mode);
 	}
 
 	getShowHardwareCursor(): boolean {
@@ -1007,9 +950,7 @@ export class SettingsManager {
 	}
 
 	setShowHardwareCursor(enabled: boolean): void {
-		this.globalSettings.showHardwareCursor = enabled;
-		this.markModified("showHardwareCursor");
-		this.save();
+		this.setGlobalSetting("showHardwareCursor", enabled);
 	}
 
 	getEditorPaddingX(): number {
@@ -1017,9 +958,7 @@ export class SettingsManager {
 	}
 
 	setEditorPaddingX(padding: number): void {
-		this.globalSettings.editorPaddingX = Math.max(0, Math.min(3, Math.floor(padding)));
-		this.markModified("editorPaddingX");
-		this.save();
+		this.setGlobalSetting("editorPaddingX", Math.max(0, Math.min(3, Math.floor(padding))));
 	}
 
 	getAutocompleteMaxVisible(): number {
@@ -1027,9 +966,7 @@ export class SettingsManager {
 	}
 
 	setAutocompleteMaxVisible(maxVisible: number): void {
-		this.globalSettings.autocompleteMaxVisible = Math.max(3, Math.min(20, Math.floor(maxVisible)));
-		this.markModified("autocompleteMaxVisible");
-		this.save();
+		this.setGlobalSetting("autocompleteMaxVisible", Math.max(3, Math.min(20, Math.floor(maxVisible))));
 	}
 
 	getRespectGitignoreInPicker(): boolean {
@@ -1037,9 +974,7 @@ export class SettingsManager {
 	}
 
 	setRespectGitignoreInPicker(value: boolean): void {
-		this.globalSettings.respectGitignoreInPicker = value;
-		this.markModified("respectGitignoreInPicker");
-		this.save();
+		this.setGlobalSetting("respectGitignoreInPicker", value);
 	}
 
 	getSearchExcludeDirs(): string[] {
@@ -1047,9 +982,7 @@ export class SettingsManager {
 	}
 
 	setSearchExcludeDirs(dirs: string[]): void {
-		this.globalSettings.searchExcludeDirs = dirs.filter(Boolean);
-		this.markModified("searchExcludeDirs");
-		this.save();
+		this.setGlobalSetting("searchExcludeDirs", dirs.filter(Boolean));
 	}
 
 	getCodeBlockIndent(): string {
@@ -1095,12 +1028,7 @@ export class SettingsManager {
 	}
 
 	setFallbackEnabled(enabled: boolean): void {
-		if (!this.globalSettings.fallback) {
-			this.globalSettings.fallback = {};
-		}
-		this.globalSettings.fallback.enabled = enabled;
-		this.markModified("fallback", "enabled");
-		this.save();
+		this.setNestedGlobalSetting("fallback", "enabled", enabled);
 	}
 
 	getFallbackChains(): Record<string, FallbackChainEntry[]> {
@@ -1149,12 +1077,7 @@ export class SettingsManager {
 	}
 
 	setModelDiscoveryEnabled(enabled: boolean): void {
-		if (!this.globalSettings.modelDiscovery) {
-			this.globalSettings.modelDiscovery = {};
-		}
-		this.globalSettings.modelDiscovery.enabled = enabled;
-		this.markModified("modelDiscovery", "enabled");
-		this.save();
+		this.setNestedGlobalSetting("modelDiscovery", "enabled", enabled);
 	}
 
 	getEditMode(): "standard" | "hashline" {
@@ -1162,8 +1085,6 @@ export class SettingsManager {
 	}
 
 	setEditMode(mode: "standard" | "hashline"): void {
-		this.globalSettings.editMode = mode;
-		this.markModified("editMode");
-		this.save();
+		this.setGlobalSetting("editMode", mode);
 	}
 }

package/packages/pi-coding-agent/src/core/skills.ts

@@ -4,6 +4,7 @@ import { homedir } from "os";
 import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "path";
 import { CONFIG_DIR_NAME, getAgentDir } from "../config.js";
 import { parseFrontmatter } from "../utils/frontmatter.js";
+import { toPosixPath } from "../utils/path-display.js";
 import type { ResourceDiagnostic } from "./diagnostics.js";
 
 /** Max name length per spec */
@@ -16,10 +17,6 @@ const IGNORE_FILE_NAMES = [".gitignore", ".ignore", ".fdignore"];
 
 type IgnoreMatcher = ReturnType<typeof ignore>;
 
-function toPosixPath(p: string): string {
-	return p.split(sep).join("/");
-}
-
 function prefixIgnorePattern(line: string, prefix: string): string | null {
 	const trimmed = line.trim();
 	if (!trimmed) return null;

package/packages/pi-coding-agent/src/index.ts

@@ -128,14 +128,8 @@ export {
 	discoverAndLoadExtensions,
 	ExtensionRunner,
 	importExtensionModule,
-	isBashToolResult,
-	isEditToolResult,
-	isFindToolResult,
-	isGrepToolResult,
-	isLsToolResult,
-	isReadToolResult,
 	isToolCallEventType,
-	isWriteToolResult,
+	isToolResultEventType,
 	wrapRegisteredTool,
 	wrapRegisteredTools,
 	wrapToolsWithExtensions,

package/packages/pi-coding-agent/src/migrations.ts

@@ -16,7 +16,7 @@ const EXTENSIONS_DOC_URL = "https://github.com/badlogic/pi-mono/blob/main/packag
  *
  * @returns Array of provider names that were migrated
  */
-export function migrateAuthToAuthJson(): string[] {
+function migrateAuthToAuthJson(): string[] {
 	const agentDir = getAgentDir();
 	const authPath = join(agentDir, "auth.json");
 	const oauthPath = join(agentDir, "oauth.json");
@@ -79,7 +79,7 @@ export function migrateAuthToAuthJson(): string[] {
  *
  * See: https://github.com/badlogic/pi-mono/issues/320
  */
-export function migrateSessionsFromAgentRoot(): void {
+function migrateSessionsFromAgentRoot(): void {
 	const agentDir = getAgentDir();
 
 	// Find all .jsonl files directly in agentDir (not in subdirectories)

package/packages/pi-coding-agent/src/modes/interactive/components/session-selector-search.ts

@@ -36,7 +36,7 @@ function matchesNameFilter(session: SessionInfo, filter: NameFilter): boolean {
 	return hasSessionName(session);
 }
 
-export function parseSearchQuery(query: string): ParsedSearchQuery {
+function parseSearchQuery(query: string): ParsedSearchQuery {
 	const trimmed = query.trim();
 	if (!trimmed) {
 		return { mode: "tokens", tokens: [], regex: null };
@@ -113,7 +113,7 @@ export function parseSearchQuery(query: string): ParsedSearchQuery {
 	return { mode: "tokens", tokens, regex: null };
 }
 
-export function matchSession(session: SessionInfo, parsed: ParsedSearchQuery): MatchResult {
+function matchSession(session: SessionInfo, parsed: ParsedSearchQuery): MatchResult {
 	const text = getSessionSearchText(session);
 
 	if (parsed.mode === "regex") {

package/packages/pi-coding-agent/src/modes/interactive/components/session-selector.ts

@@ -1,7 +1,6 @@
 import { spawnSync } from "node:child_process";
 import { existsSync } from "node:fs";
 import { unlink } from "node:fs/promises";
-import * as os from "node:os";
 import {
 	type Component,
 	Container,
@@ -17,21 +16,19 @@ import {
 import { KeybindingsManager } from "../../../core/keybindings.js";
 import type { SessionInfo, SessionListProgress } from "../../../core/session-manager.js";
 import { theme } from "../theme/theme.js";
+import { shortenPath } from "../utils/shorten-path.js";
 import { DynamicBorder } from "./dynamic-border.js";
 import { appKey, appKeyHint, keyHint } from "./keybinding-hints.js";
 import { filterAndSortSessions, hasSessionName, type NameFilter, type SortMode } from "./session-selector-search.js";
+import {
+	applyRowHighlight,
+	buildTreePrefix,
+	computeScrollWindow,
+	renderCursor,
+} from "./tree-render-utils.js";
 
 type SessionScope = "current" | "all";
 
-function shortenPath(path: string): string {
-	const home = os.homedir();
-	if (!path) return path;
-	if (path.startsWith(home)) {
-		return `~${path.slice(home.length)}`;
-	}
-	return path;
-}
-
 function formatSessionDate(date: Date): string {
 	const now = new Date();
 	const diffMs = now.getTime() - date.getTime();
@@ -420,11 +417,11 @@ class SessionList implements Component, Focusable {
 		}
 
 		// Calculate visible range with scrolling
-		const startIndex = Math.max(
-			0,
-			Math.min(this.selectedIndex - Math.floor(this.maxVisible / 2), this.filteredSessions.length - this.maxVisible),
+		const { startIndex, endIndex } = computeScrollWindow(
+			this.selectedIndex,
+			this.filteredSessions.length,
+			this.maxVisible,
 		);
-		const endIndex = Math.min(startIndex + this.maxVisible, this.filteredSessions.length);
 
 		// Render visible sessions (one line each with tree structure)
 		for (let i = startIndex; i < endIndex; i++) {
@@ -435,7 +432,7 @@ class SessionList implements Component, Focusable {
 			const isCurrent = this.currentSessionFilePath === session.path;
 
 			// Build tree prefix
-			const prefix = this.buildTreePrefix(node);
+			const prefix = this.buildNodeTreePrefix(node);
 
 			// Session display text (name or first message)
 			const hasName = !!session.name;
@@ -454,7 +451,7 @@ class SessionList implements Component, Focusable {
 			}
 
 			// Cursor
-			const cursor = isSelected ? theme.fg("accent", "› ") : "  ";
+			const cursor = renderCursor(isSelected);
 
 			// Calculate available width for message
 			const prefixWidth = visibleWidth(prefix);
@@ -483,11 +480,8 @@ class SessionList implements Component, Focusable {
 			const spacing = Math.max(1, width - leftWidth - visibleWidth(rightPart));
 			const styledRight = theme.fg(isConfirmingDelete ? "error" : "dim", rightPart);
 
-			let line = leftPart + " ".repeat(spacing) + styledRight;
-			if (isSelected) {
-				line = theme.bg("selectedBg", line);
-			}
-			lines.push(truncateToWidth(line, width));
+			const line = leftPart + " ".repeat(spacing) + styledRight;
+			lines.push(applyRowHighlight(line, isSelected, width));
 		}
 
 		// Add scroll indicator if needed
@@ -500,14 +494,8 @@ class SessionList implements Component, Focusable {
 		return lines;
 	}
 
-	private buildTreePrefix(node: FlatSessionNode): string {
-		if (node.depth === 0) {
-			return "";
-		}
-
-		const parts = node.ancestorContinues.map((continues) => (continues ? "│  " : "   "));
-		const branch = node.isLast ? "└─ " : "├─ ";
-		return parts.join("") + branch;
+	private buildNodeTreePrefix(node: FlatSessionNode): string {
+		return buildTreePrefix(node.ancestorContinues, node.isLast, node.depth);
 	}
 
 	handleInput(keyData: string): void {