@oh-my-pi/pi-coding-agent 9.3.1 → 9.6.0

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

@@ -12,13 +12,18 @@ import {
 	type TabBarTheme,
 	Text,
 } from "@oh-my-pi/pi-tui";
-import type { SettingsManager, StatusLineSettings } from "../../config/settings-manager";
+import { type SettingPath, settings } from "../../config/settings";
+import type {
+	SettingTab,
+	StatusLinePreset,
+	StatusLineSegmentId,
+	StatusLineSeparatorStyle,
+} from "../../config/settings-schema";
 import { getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 import { PluginSettingsComponent } from "./plugin-settings";
 import { getSettingsForTab, type SettingDef } from "./settings-defs";
 import { getPreset } from "./status-line/presets";
-import { StatusLineSegmentEditorComponent } from "./status-line-segment-editor";
 
 function getTabBarTheme(): TabBarTheme {
 	return {
@@ -111,11 +116,10 @@ class SelectSubmenu extends Container {
 	}
 }
 
-type TabId = string;
-
 const SETTINGS_TABS: Tab[] = [
 	{ id: "behavior", label: "Behavior" },
 	{ id: "tools", label: "Tools" },
+	{ id: "bash", label: "Bash" },
 	{ id: "display", label: "Display" },
 	{ id: "ttsr", label: "TTSR" },
 	{ id: "status", label: "Status" },
@@ -126,7 +130,7 @@ const SETTINGS_TABS: Tab[] = [
 
 /**
  * Dynamic context for settings that need runtime data.
- * Some settings (like thinking level) are managed by the session, not SettingsManager.
+ * Some settings (like thinking level) are managed by the session, not Settings.
  */
 export interface SettingsRuntimeContext {
 	/** Available thinking levels (from session) */
@@ -139,19 +143,21 @@ export interface SettingsRuntimeContext {
 	cwd: string;
 }
 
-/**
- * Callback when any setting changes.
- * The handler should dispatch based on settingId.
- */
-export type SettingChangeHandler = (settingId: string, newValue: string | boolean) => void;
+/** Status line settings subset for preview */
+export interface StatusLinePreviewSettings {
+	preset?: StatusLinePreset;
+	leftSegments?: StatusLineSegmentId[];
+	rightSegments?: StatusLineSegmentId[];
+	separator?: StatusLineSeparatorStyle;
+}
 
 export interface SettingsCallbacks {
 	/** Called when any setting value changes */
-	onChange: SettingChangeHandler;
+	onChange: (path: SettingPath, newValue: unknown) => void;
 	/** Called for theme preview while browsing */
 	onThemePreview?: (theme: string) => void;
-	/** Called for status line preview while configuring - updates actual status line */
-	onStatusLinePreview?: (settings: Partial<StatusLineSettings>) => void;
+	/** Called for status line preview while configuring */
+	onStatusLinePreview?: (settings: StatusLinePreviewSettings) => void;
 	/** Get current rendered status line for inline preview */
 	getStatusLinePreview?: () => string;
 	/** Called when plugins change */
@@ -171,16 +177,14 @@ export class SettingsSelectorComponent extends Container {
 	private pluginComponent: PluginSettingsComponent | null = null;
 	private statusPreviewContainer: Container | null = null;
 	private statusPreviewText: Text | null = null;
-	private currentTabId: TabId = "behavior";
+	private currentTabId: SettingTab | "plugins" = "behavior";
 
-	private settingsManager: SettingsManager;
 	private context: SettingsRuntimeContext;
 	private callbacks: SettingsCallbacks;
 
-	constructor(settingsManager: SettingsManager, context: SettingsRuntimeContext, callbacks: SettingsCallbacks) {
+	constructor(context: SettingsRuntimeContext, callbacks: SettingsCallbacks) {
 		super();
 
-		this.settingsManager = settingsManager;
 		this.context = context;
 		this.callbacks = callbacks;
 
@@ -190,7 +194,7 @@ export class SettingsSelectorComponent extends Container {
 		// Tab bar
 		this.tabBar = new TabBar("Settings", SETTINGS_TABS, getTabBarTheme());
 		this.tabBar.onTabChange = () => {
-			this.switchToTab(this.tabBar.getActiveTab().id as TabId);
+			this.switchToTab(this.tabBar.getActiveTab().id as SettingTab | "plugins");
 		};
 		this.addChild(this.tabBar);
 
@@ -204,7 +208,7 @@ export class SettingsSelectorComponent extends Container {
 		this.addChild(new DynamicBorder());
 	}
 
-	private switchToTab(tabId: TabId): void {
+	private switchToTab(tabId: SettingTab | "plugins"): void {
 		this.currentTabId = tabId;
 
 		// Remove current content
@@ -250,7 +254,7 @@ export class SettingsSelectorComponent extends Container {
 		switch (def.type) {
 			case "boolean":
 				return {
-					id: def.id,
+					id: def.path,
 					label: def.label,
 					description: def.description,
 					currentValue: currentValue ? "true" : "false",
@@ -259,7 +263,7 @@ export class SettingsSelectorComponent extends Container {
 
 			case "enum":
 				return {
-					id: def.id,
+					id: def.path,
 					label: def.label,
 					description: def.description,
 					currentValue: currentValue as string,
@@ -268,26 +272,24 @@ export class SettingsSelectorComponent extends Container {
 
 			case "submenu":
 				return {
-					id: def.id,
+					id: def.path,
 					label: def.label,
 					description: def.description,
-					currentValue: currentValue as string,
+					currentValue: String(currentValue ?? ""),
 					submenu: (cv, done) => this.createSubmenu(def, cv, done),
 				};
 		}
 	}
 
 	/**
-	 * Get the current value for a setting, using runtime context for special cases.
+	 * Get the current value for a setting.
 	 */
-	private getCurrentValue(def: SettingDef): string | boolean {
-		// Special cases that come from runtime context instead of SettingsManager
-		switch (def.id) {
-			case "thinkingLevel":
-				return this.context.thinkingLevel;
-			default:
-				return def.get(this.settingsManager);
+	private getCurrentValue(def: SettingDef): unknown {
+		// Special case: thinking level comes from runtime context
+		if (def.path === "defaultThinkingLevel") {
+			return this.context.thinkingLevel;
 		}
+		return settings.get(def.path);
 	}
 
 	/**
@@ -298,20 +300,15 @@ export class SettingsSelectorComponent extends Container {
 		currentValue: string,
 		done: (value?: string) => void,
 	): Container {
-		// Special case: segment editor
-		if (def.id === "statusLineSegments") {
-			return this.createSegmentEditor(done);
-		}
-
-		let options = def.getOptions(this.settingsManager);
+		let options = def.getOptions();
 
-		// Special case: inject runtime options
-		if (def.id === "thinkingLevel") {
+		// Special case: inject runtime options for thinking level
+		if (def.path === "defaultThinkingLevel") {
 			options = this.context.availableThinkingLevels.map(level => {
-				const baseOpt = def.getOptions(this.settingsManager).find(o => o.value === level);
+				const baseOpt = def.getOptions().find(o => o.value === level);
 				return baseOpt || { value: level, label: level };
 			});
-		} else if (def.id === "theme") {
+		} else if (def.path === "theme") {
 			options = this.context.availableThemes.map(t => ({ value: t, label: t }));
 		}
 
@@ -319,14 +316,16 @@ export class SettingsSelectorComponent extends Container {
 		let onPreview: ((value: string) => void) | undefined;
 		let onPreviewCancel: (() => void) | undefined;
 
-		if (def.id === "theme") {
+		if (def.path === "theme") {
 			onPreview = this.callbacks.onThemePreview;
 			onPreviewCancel = () => this.callbacks.onThemePreview?.(currentValue);
-		} else if (def.id === "statusLinePreset") {
+		} else if (def.path === "statusLine.preset") {
 			onPreview = value => {
-				const presetDef = getPreset((value as StatusLineSettings["preset"]) ?? "default");
+				const presetDef = getPreset(
+					value as "default" | "minimal" | "compact" | "full" | "nerd" | "ascii" | "custom",
+				);
 				this.callbacks.onStatusLinePreview?.({
-					preset: value as StatusLineSettings["preset"],
+					preset: value as StatusLinePreset,
 					leftSegments: presetDef.leftSegments,
 					rightSegments: presetDef.rightSegments,
 					separator: presetDef.separator,
@@ -334,7 +333,7 @@ export class SettingsSelectorComponent extends Container {
 				this.updateStatusPreview();
 			};
 			onPreviewCancel = () => {
-				const currentPreset = this.settingsManager.getStatusLinePreset();
+				const currentPreset = settings.get("statusLine.preset");
 				const presetDef = getPreset(currentPreset);
 				this.callbacks.onStatusLinePreview?.({
 					preset: currentPreset,
@@ -344,26 +343,20 @@ export class SettingsSelectorComponent extends Container {
 				});
 				this.updateStatusPreview();
 			};
-		} else if (def.id === "statusLineSeparator") {
+		} else if (def.path === "statusLine.separator") {
 			onPreview = value => {
-				this.callbacks.onStatusLinePreview?.({
-					separator: value as StatusLineSettings["separator"],
-				});
+				this.callbacks.onStatusLinePreview?.({ separator: value as StatusLineSeparatorStyle });
 				this.updateStatusPreview();
 			};
 			onPreviewCancel = () => {
-				const currentSettings = this.settingsManager.getStatusLineSettings();
-				const separator =
-					currentSettings.separator ?? getPreset(this.settingsManager.getStatusLinePreset()).separator;
-				this.callbacks.onStatusLinePreview?.({
-					separator,
-				});
+				const separator = settings.get("statusLine.separator");
+				this.callbacks.onStatusLinePreview?.({ separator });
 				this.updateStatusPreview();
 			};
 		}
 
 		// Provide status line preview for theme selection
-		const getPreview = def.id === "theme" ? this.callbacks.getStatusLinePreview : undefined;
+		const getPreview = def.path === "theme" ? this.callbacks.getStatusLinePreview : undefined;
 
 		return new SelectSubmenu(
 			def.label,
@@ -371,10 +364,10 @@ export class SettingsSelectorComponent extends Container {
 			options,
 			currentValue,
 			value => {
-				// Persist to SettingsManager
-				def.set(this.settingsManager, value);
-				// Notify for side effects
-				this.callbacks.onChange(def.id, value);
+				// Persist
+				this.setSettingValue(def.path, value);
+				// Notify
+				this.callbacks.onChange(def.path, value);
 				done(value);
 			},
 			() => {
@@ -387,47 +380,24 @@ export class SettingsSelectorComponent extends Container {
 	}
 
 	/**
-	 * Create the segment editor component.
+	 * Set a setting value, handling type conversion.
 	 */
-	private createSegmentEditor(done: (value?: string) => void): Container {
-		const currentSettings = this.settingsManager.getStatusLineSettings();
-		const preset = currentSettings.preset ?? "default";
-		const presetDef = getPreset(preset);
-
-		const leftSegments = currentSettings.leftSegments ?? presetDef.leftSegments;
-		const rightSegments = currentSettings.rightSegments ?? presetDef.rightSegments;
-
-		return new StatusLineSegmentEditorComponent(leftSegments, rightSegments, {
-			onSave: (left, right) => {
-				this.settingsManager.setStatusLineLeftSegments(left);
-				this.settingsManager.setStatusLineRightSegments(right);
-				this.callbacks.onChange("statusLineSegments", "saved");
-				this.callbacks.onStatusLinePreview?.({ leftSegments: left, rightSegments: right });
-				this.updateStatusPreview();
-				done("saved");
-			},
-			onCancel: () => {
-				// Restore preview to saved state
-				const saved = this.settingsManager.getStatusLineSettings();
-				const savedPreset = getPreset(saved.preset ?? "default");
-				this.callbacks.onStatusLinePreview?.({
-					leftSegments: saved.leftSegments ?? savedPreset.leftSegments,
-					rightSegments: saved.rightSegments ?? savedPreset.rightSegments,
-				});
-				this.updateStatusPreview();
-				done();
-			},
-			onPreview: (left, right) => {
-				this.callbacks.onStatusLinePreview?.({ leftSegments: left, rightSegments: right });
-				this.updateStatusPreview();
-			},
-		});
+	private setSettingValue(path: SettingPath, value: string): void {
+		// Handle number conversions
+		const currentValue = settings.get(path);
+		if (typeof currentValue === "number") {
+			settings.set(path, Number(value) as never);
+		} else if (typeof currentValue === "boolean") {
+			settings.set(path, (value === "true") as never);
+		} else {
+			settings.set(path, value as never);
+		}
 	}
 
 	/**
 	 * Show a settings tab using definitions.
 	 */
-	private showSettingsTab(tabId: string): void {
+	private showSettingsTab(tabId: SettingTab): void {
 		const defs = getSettingsForTab(tabId);
 		const items: SettingItem[] = [];
 
@@ -454,22 +424,22 @@ export class SettingsSelectorComponent extends Container {
 			10,
 			getSettingsListTheme(),
 			(id, newValue) => {
-				const def = defs.find(d => d.id === id);
+				const def = defs.find(d => d.path === id);
 				if (!def) return;
 
-				// Persist to SettingsManager based on type
+				const path = def.path;
+
 				if (def.type === "boolean") {
 					const boolValue = newValue === "true";
-					def.set(this.settingsManager, boolValue);
-					this.callbacks.onChange(id, boolValue);
+					settings.set(path, boolValue as never);
+					this.callbacks.onChange(path, boolValue);
 
-					// Trigger status line preview for status tab boolean settings
 					if (tabId === "status") {
 						this.triggerStatusLinePreview();
 					}
 				} else if (def.type === "enum") {
-					def.set(this.settingsManager, newValue);
-					this.callbacks.onChange(id, newValue);
+					settings.set(path, newValue as never);
+					this.callbacks.onChange(path, newValue);
 				}
 				// Submenu types are handled in createSubmenu
 			},
@@ -493,9 +463,13 @@ export class SettingsSelectorComponent extends Container {
 	 * Trigger status line preview with current settings.
 	 */
 	private triggerStatusLinePreview(): void {
-		const settings = this.settingsManager.getStatusLineSettings();
-		this.callbacks.onStatusLinePreview?.(settings);
-		// Update inline preview
+		const statusLineSettings: StatusLinePreviewSettings = {
+			preset: settings.get("statusLine.preset"),
+			leftSegments: settings.get("statusLine.leftSegments"),
+			rightSegments: settings.get("statusLine.rightSegments"),
+			separator: settings.get("statusLine.separator"),
+		};
+		this.callbacks.onStatusLinePreview?.(statusLineSettings);
 		this.updateStatusPreview();
 	}
 

package/src/modes/components/status-line/types.ts

@@ -1,13 +1,7 @@
-import type {
-	StatusLinePreset,
-	StatusLineSegmentId,
-	StatusLineSegmentOptions,
-	StatusLineSeparatorStyle,
-	StatusLineSettings,
-} from "../../../config/settings-manager";
+import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../../config/settings-schema";
 import type { AgentSession } from "../../../session/agent-session";
+import type { StatusLineSegmentOptions, StatusLineSettings } from "../status-line";
 
-// Re-export types from settings-manager (single source of truth)
 export type {
 	StatusLinePreset,
 	StatusLineSegmentId,

package/src/modes/components/status-line-segment-editor.ts

@@ -8,8 +8,8 @@
  * - Shift+J/K: Reorder segment within column
  * - Live preview shown in the actual status line above
  */
-import { Container, matchesKey } from "@oh-my-pi/pi-tui";
-import type { StatusLineSegmentId } from "../../config/settings-manager";
+import { Container, matchesKey, padding } from "@oh-my-pi/pi-tui";
+import type { StatusLineSegmentId } from "../../config/settings-schema";
 import { theme } from "../../modes/theme/theme";
 import { ALL_SEGMENT_IDS } from "./status-line/segments";
 
@@ -351,7 +351,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 		}
 
 		// Pad to column width (accounting for ANSI codes)
-		const padding = colWidth - label.length - 1;
-		return text + " ".repeat(Math.max(0, padding));
+		const padSize = colWidth - label.length - 1;
+		return text + padding(Math.max(0, padSize));
 	}
 }

package/src/modes/components/status-line.ts

@@ -1,15 +1,32 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
-import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
-import type { StatusLineSegmentOptions, StatusLineSettings } from "../../config/settings-manager";
+import { settings } from "../../config/settings";
+import type { StatusLinePreset, StatusLineSegmentId, StatusLineSeparatorStyle } from "../../config/settings-schema";
 import { theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
 import { getPreset } from "./status-line/presets";
 import { renderSegment, type SegmentContext } from "./status-line/segments";
 import { getSeparator } from "./status-line/separators";
 
+export interface StatusLineSegmentOptions {
+	model?: { showThinkingLevel?: boolean };
+	path?: { abbreviate?: boolean; maxLength?: number; stripWorkPrefix?: boolean };
+	git?: { showBranch?: boolean; showStaged?: boolean; showUnstaged?: boolean; showUntracked?: boolean };
+	time?: { format?: "12h" | "24h"; showSeconds?: boolean };
+}
+
+export interface StatusLineSettings {
+	preset?: StatusLinePreset;
+	leftSegments?: StatusLineSegmentId[];
+	rightSegments?: StatusLineSegmentId[];
+	separator?: StatusLineSeparatorStyle;
+	segmentOptions?: StatusLineSegmentOptions;
+	showHookStatus?: boolean;
+}
+
 // ═══════════════════════════════════════════════════════════════════════════
 // Rendering Helpers
 // ═══════════════════════════════════════════════════════════════════════════
@@ -60,8 +77,14 @@ export class StatusLineComponent implements Component {
 
 	constructor(session: AgentSession) {
 		this.session = session;
-		// Load initial settings
-		this.settings = session.settingsManager?.getStatusLineSettings() ?? {};
+		this.settings = {
+			preset: settings.get("statusLine.preset"),
+			leftSegments: settings.get("statusLine.leftSegments"),
+			rightSegments: settings.get("statusLine.rightSegments"),
+			separator: settings.get("statusLine.separator"),
+			showHookStatus: settings.get("statusLine.showHookStatus"),
+			segmentOptions: settings.getGroup("statusLine").segmentOptions,
+		};
 	}
 
 	updateSettings(settings: StatusLineSettings): void {
@@ -378,7 +401,7 @@ export class StatusLineComponent implements Component {
 		leftWidth = groupWidth(left, leftCapWidth, leftSepWidth);
 		rightWidth = groupWidth(right, rightCapWidth, rightSepWidth);
 		const gapWidth = Math.max(1, topFillWidth - leftWidth - rightWidth);
-		return leftGroup + " ".repeat(gapWidth) + rightGroup;
+		return leftGroup + padding(gapWidth) + rightGroup;
 	}
 
 	getTopBorder(width: number): { content: string; width: number } {

package/src/modes/components/welcome.ts

@@ -1,4 +1,4 @@
-import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { APP_NAME } from "../../config";
 import { theme } from "../../modes/theme/theme";
 
@@ -169,7 +169,7 @@ export class WelcomeComponent implements Component {
 		}
 		const leftPad = Math.floor((width - visLen) / 2);
 		const rightPad = width - visLen - leftPad;
-		return " ".repeat(leftPad) + text + " ".repeat(rightPad);
+		return padding(leftPad) + text + padding(rightPad);
 	}
 
 	/** Apply magenta→cyan gradient to a string */
@@ -224,6 +224,6 @@ export class WelcomeComponent implements Component {
 			}
 			return `${truncated}${ellipsis}`;
 		}
-		return str + " ".repeat(width - visLen);
+		return str + padding(width - visLen);
 	}
 }

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

@@ -2,7 +2,7 @@ import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import type { UsageLimit, UsageReport } from "@oh-my-pi/pi-ai";
-import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
+import { Loader, Markdown, padding, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
 import { nanoid } from "nanoid";
 import { loadCustomShare } from "../../export/custom-share";
@@ -773,7 +773,7 @@ function formatAccountHeader(limit: UsageLimit, report: UsageReport, index: numb
 function padColumn(text: string, width: number): string {
 	const visible = visibleWidth(text);
 	if (visible >= width) return text;
-	return `${text}${" ".repeat(width - visible)}`;
+	return `${text}${padding(width - visible)}`;
 }
 
 function resolveAggregateStatus(limits: UsageLimit[]): UsageLimit["status"] {

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

@@ -1,4 +1,5 @@
 import { Loader, Text } from "@oh-my-pi/pi-tui";
+import { settings } from "../../config/settings";
 import { AssistantMessageComponent } from "../../modes/components/assistant-message";
 import { ReadToolGroupComponent } from "../../modes/components/read-tool-group";
 import { TodoReminderComponent } from "../../modes/components/todo-reminder";
@@ -136,9 +137,9 @@ export class EventController {
 								content.name,
 								content.arguments,
 								{
-									showImages: this.ctx.settingsManager.getShowImages(),
-									editFuzzyThreshold: this.ctx.settingsManager.getEditFuzzyThreshold(),
-									editAllowFuzzy: this.ctx.settingsManager.getEditFuzzyMatch(),
+									showImages: settings.get("terminal.showImages"),
+									editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
+									editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 								},
 								tool,
 								this.ctx.ui,
@@ -210,9 +211,9 @@ export class EventController {
 						event.toolName,
 						event.args,
 						{
-							showImages: this.ctx.settingsManager.getShowImages(),
-							editFuzzyThreshold: this.ctx.settingsManager.getEditFuzzyThreshold(),
-							editAllowFuzzy: this.ctx.settingsManager.getEditFuzzyMatch(),
+							showImages: settings.get("terminal.showImages"),
+							editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
+							editAllowFuzzy: settings.get("edit.fuzzyMatch"),
 						},
 						tool,
 						this.ctx.ui,
@@ -383,10 +384,10 @@ export class EventController {
 	sendCompletionNotification(): void {
 		if (this.ctx.isBackgrounded === false) return;
 		if (isNotificationSuppressed()) return;
-		const method = this.ctx.settingsManager.getNotificationOnComplete();
+		const method = settings.get("notifications.onComplete");
 		if (method === "off") return;
 		const protocol = method === "auto" ? detectNotificationProtocol() : method;
-		const title = this.ctx.sessionManager.getSessionTitle();
+		const title = this.ctx.sessionManager.getSessionName();
 		const message = title ? `${title}: Complete` : "Complete";
 		sendNotification(protocol, message);
 	}

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

@@ -4,6 +4,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import { nanoid } from "nanoid";
+import { settings } from "../../config/settings";
 import { theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
 import type { AgentSessionEvent } from "../../session/agent-session";
@@ -40,17 +41,20 @@ export class InputController {
 				this.ctx.isPythonMode = false;
 				this.ctx.updateEditorBorderColor();
 			} else if (!this.ctx.editor.getText().trim()) {
-				// Double-escape with empty editor triggers /tree or /branch based on setting
-				const now = Date.now();
-				if (now - this.ctx.lastEscapeTime < 500) {
-					if (this.ctx.settingsManager.getDoubleEscapeAction() === "tree") {
-						this.ctx.showTreeSelector();
+				// Double-escape with empty editor triggers /tree, /branch, or nothing based on setting
+				const action = settings.get("doubleEscapeAction");
+				if (action !== "none") {
+					const now = Date.now();
+					if (now - this.ctx.lastEscapeTime < 500) {
+						if (action === "tree") {
+							this.ctx.showTreeSelector();
+						} else {
+							this.ctx.showUserMessageSelector();
+						}
+						this.ctx.lastEscapeTime = 0;
 					} else {
-						this.ctx.showUserMessageSelector();
+						this.ctx.lastEscapeTime = now;
 					}
-					this.ctx.lastEscapeTime = 0;
-				} else {
-					this.ctx.lastEscapeTime = now;
 				}
 			}
 		};
@@ -242,7 +246,7 @@ export class InputController {
 				return;
 			}
 			if (text === "/branch") {
-				if (this.ctx.settingsManager.getDoubleEscapeAction() === "tree") {
+				if (settings.get("doubleEscapeAction") === "tree") {
 					this.ctx.showTreeSelector();
 				} else {
 					this.ctx.showUserMessageSelector();
@@ -418,13 +422,13 @@ export class InputController {
 
 			// Generate session title on first message
 			const hasUserMessages = this.ctx.agent.state.messages.some((m: AgentMessage) => m.role === "user");
-			if (!hasUserMessages && !this.ctx.sessionManager.getSessionTitle() && !process.env.OMP_NO_TITLE) {
+			if (!hasUserMessages && !this.ctx.sessionManager.getSessionName() && !process.env.OMP_NO_TITLE) {
 				const registry = this.ctx.session.modelRegistry;
-				const smolModel = this.ctx.settingsManager.getModelRole("smol");
+				const smolModel = this.ctx.settings.getModelRole("smol");
 				generateSessionTitle(text, registry, smolModel, this.ctx.session.sessionId)
 					.then(async title => {
 						if (title) {
-							await this.ctx.sessionManager.setSessionTitle(title);
+							await this.ctx.sessionManager.setSessionName(title);
 							setTerminalTitle(`π: ${title}`);
 						}
 					})
@@ -560,7 +564,7 @@ export class InputController {
 			const image = await readImageFromClipboard();
 			if (image) {
 				let imageData = image;
-				if (this.ctx.settingsManager.getImageAutoResize()) {
+				if (settings.get("images.autoResize")) {
 					try {
 						const resized = await resizeImage({
 							type: "image",
@@ -651,7 +655,7 @@ export class InputController {
 
 	toggleThinkingBlockVisibility(): void {
 		this.ctx.hideThinkingBlock = !this.ctx.hideThinkingBlock;
-		this.ctx.settingsManager.setHideThinkingBlock(this.ctx.hideThinkingBlock);
+		settings.set("hideThinkingBlock", this.ctx.hideThinkingBlock);
 
 		// Rebuild chat from session messages
 		this.ctx.chatContainer.clear();