@oh-my-pi/pi-coding-agent 11.0.3 → 11.2.0

package/src/modes/components/compaction-summary-message.ts

@@ -8,11 +8,9 @@ import type { CompactionSummaryMessage } from "../../session/messages";
  */
 export class CompactionSummaryMessageComponent extends Box {
 	private expanded = false;
-	private message: CompactionSummaryMessage;
 
-	constructor(message: CompactionSummaryMessage) {
+	constructor(private readonly message: CompactionSummaryMessage) {
 		super(1, 1, t => theme.bg("customMessageBg", t));
-		this.message = message;
 		this.updateDisplay();
 	}
 

package/src/modes/components/custom-message.ts

@@ -10,16 +10,15 @@ import type { CustomMessage } from "../../session/messages";
  * Uses distinct styling to differentiate from user messages.
  */
 export class CustomMessageComponent extends Container {
-	private message: CustomMessage<unknown>;
-	private customRenderer?: MessageRenderer;
 	private box: Box;
 	private customComponent?: Component;
 	private _expanded = false;
 
-	constructor(message: CustomMessage<unknown>, customRenderer?: MessageRenderer) {
+	constructor(
+		private readonly message: CustomMessage<unknown>,
+		private readonly customRenderer?: MessageRenderer,
+	) {
 		super();
-		this.message = message;
-		this.customRenderer = customRenderer;
 
 		this.addChild(new Spacer(1));
 

package/src/modes/components/extensions/extension-dashboard.ts

@@ -33,17 +33,15 @@ export class ExtensionDashboard extends Container {
 	private state!: DashboardState;
 	private mainList!: ExtensionList;
 	private inspector!: InspectorPanel;
-	private settingsInstance: Settings | null;
-	private cwd: string;
-	private terminalHeight: number;
 
 	public onClose?: () => void;
 
-	private constructor(cwd: string, settingsInstance: Settings | null, terminalHeight: number) {
+	private constructor(
+		private readonly cwd: string,
+		private readonly settingsInstance: Settings | null,
+		private readonly terminalHeight: number,
+	) {
 		super();
-		this.cwd = cwd;
-		this.settingsInstance = settingsInstance;
-		this.terminalHeight = terminalHeight;
 	}
 
 	static async create(
@@ -292,15 +290,11 @@ export class ExtensionDashboard extends Container {
  * Two-column body component for side-by-side rendering.
  */
 class TwoColumnBody implements Component {
-	private leftPane: ExtensionList;
-	private rightPane: InspectorPanel;
-	private maxHeight: number;
-
-	constructor(left: ExtensionList, right: InspectorPanel, maxHeight: number) {
-		this.leftPane = left;
-		this.rightPane = right;
-		this.maxHeight = maxHeight;
-	}
+	constructor(
+		private readonly leftPane: ExtensionList,
+		private readonly rightPane: InspectorPanel,
+		private readonly maxHeight: number,
+	) {}
 
 	render(width: number): string[] {
 		const leftWidth = Math.floor(width * 0.5);

package/src/modes/components/extensions/extension-list.ts

@@ -31,19 +31,19 @@ type ListItem =
 	| { type: "extension"; item: Extension };
 
 export class ExtensionList implements Component {
-	private extensions: Extension[] = [];
 	private listItems: ListItem[] = [];
 	private selectedIndex = 0;
 	private scrollOffset = 0;
 	private searchQuery = "";
 	private focused = false;
-	private callbacks: ExtensionListCallbacks;
 	private masterSwitchProvider: string | null = null;
 	private maxVisible: number;
 
-	constructor(extensions: Extension[], callbacks: ExtensionListCallbacks = {}, maxVisible?: number) {
-		this.extensions = extensions;
-		this.callbacks = callbacks;
+	constructor(
+		private extensions: Extension[],
+		private readonly callbacks: ExtensionListCallbacks = {},
+		maxVisible?: number,
+	) {
 		this.masterSwitchProvider = callbacks.masterSwitchProvider ?? null;
 		this.maxVisible = maxVisible ?? DEFAULT_MAX_VISIBLE;
 		this.rebuildList();

package/src/modes/components/footer.ts

@@ -42,16 +42,13 @@ async function findGitHeadPath(): Promise<{ path: string; content: string } | nu
  * Footer component that shows pwd, token stats, and context usage
  */
 export class FooterComponent implements Component {
-	private session: AgentSession;
 	private cachedBranch: string | null | undefined = undefined; // undefined = not checked yet, null = not in git repo, string = branch name
 	private gitWatcher: fs.FSWatcher | null = null;
 	private onBranchChange: (() => void) | null = null;
 	private autoCompactEnabled: boolean = true;
 	private extensionStatuses: Map<string, string> = new Map();
 
-	constructor(session: AgentSession) {
-		this.session = session;
-	}
+	constructor(private readonly session: AgentSession) {}
 
 	setAutoCompactEnabled(enabled: boolean): void {
 		this.autoCompactEnabled = enabled;

package/src/modes/components/hook-editor.ts

@@ -2,12 +2,9 @@
  * Multi-line editor component for hooks.
  * Supports Ctrl+G for external editor.
  */
-import * as fs from "node:fs/promises";
-import * as os from "node:os";
-import * as path from "node:path";
 import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
-import { $env, Snowflake } from "@oh-my-pi/pi-utils";
 import { getEditorTheme, theme } from "../../modes/theme/theme";
+import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { DynamicBorder } from "./dynamic-border";
 
 export class HookEditorComponent extends Container {
@@ -47,10 +44,7 @@ export class HookEditorComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Add hint
-		const hasExternalEditor = !!($env.VISUAL || $env.EDITOR);
-		const hint = hasExternalEditor
-			? "ctrl+enter submit  esc cancel  ctrl+g external editor"
-			: "ctrl+enter submit  esc cancel";
+		const hint = "ctrl+enter submit  esc cancel  ctrl+g external editor";
 		this.addChild(new Text(theme.fg("dim", hint), 1, 0));
 
 		this.addChild(new Spacer(1));
@@ -83,36 +77,17 @@ export class HookEditorComponent extends Container {
 	}
 
 	private async openExternalEditor(): Promise<void> {
-		const editorCmd = $env.VISUAL || $env.EDITOR;
-		if (!editorCmd) {
-			return;
-		}
+		const editorCmd = getEditorCommand();
+		if (!editorCmd) return;
 
 		const currentText = this.editor.getText();
-		const tmpFile = path.join(os.tmpdir(), `omp-hook-editor-${Snowflake.next()}.md`);
-
 		try {
-			await Bun.write(tmpFile, currentText);
 			this.tui.stop();
-
-			const [editor, ...editorArgs] = editorCmd.split(" ");
-			const child = Bun.spawn([editor, ...editorArgs, tmpFile], {
-				stdin: "inherit",
-				stdout: "inherit",
-				stderr: "inherit",
-			});
-			const exitCode = await child.exited;
-
-			if (exitCode === 0) {
-				const newContent = (await Bun.file(tmpFile).text()).replace(/\n$/, "");
-				this.editor.setText(newContent);
+			const result = await openInEditor(editorCmd, currentText);
+			if (result !== null) {
+				this.editor.setText(result);
 			}
 		} finally {
-			try {
-				await fs.rm(tmpFile, { force: true });
-			} catch {
-				// Ignore cleanup errors
-			}
 			this.tui.start();
 			this.tui.requestRender(true);
 		}

package/src/modes/components/hook-message.ts

@@ -10,16 +10,15 @@ import type { HookMessage } from "../../session/messages";
  * Uses distinct styling to differentiate from user messages.
  */
 export class HookMessageComponent extends Container {
-	private message: HookMessage<unknown>;
-	private customRenderer?: HookMessageRenderer;
 	private box: Box;
 	private customComponent?: Component;
 	private _expanded = false;
 
-	constructor(message: HookMessage<unknown>, customRenderer?: HookMessageRenderer) {
+	constructor(
+		private readonly message: HookMessage<unknown>,
+		private readonly customRenderer?: HookMessageRenderer,
+	) {
 		super();
-		this.message = message;
-		this.customRenderer = customRenderer;
 
 		this.addChild(new Spacer(1));
 

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

@@ -74,7 +74,7 @@ export class ModelSelectorComponent extends Container {
 	private modelRegistry: ModelRegistry;
 	private onSelectCallback: (model: Model, role: ModelRole | null) => void;
 	private onCancelCallback: () => void;
-	private errorMessage?: string;
+	private errorMessage?: unknown;
 	private tui: TUI;
 	private scopedModels: ReadonlyArray<ScopedModelItem>;
 	private temporaryOnly: boolean;
@@ -392,7 +392,7 @@ export class ModelSelectorComponent extends Container {
 
 		// Show error message or "no results" if empty
 		if (this.errorMessage) {
-			const errorLines = this.errorMessage.split("\n");
+			const errorLines = String(this.errorMessage).split("\n");
 			for (const line of errorLines) {
 				this.listContainer.addChild(new Text(theme.fg("error", line), 0, 0));
 			}

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

@@ -36,12 +36,13 @@ export interface PluginListCallbacks {
  * Selecting a plugin opens its detail view.
  */
 export class PluginListComponent extends Container {
-	private selectList: SelectList;
-	private plugins: InstalledPlugin[];
+	private readonly selectList: SelectList;
 
-	constructor(plugins: InstalledPlugin[], callbacks: PluginListCallbacks) {
+	constructor(
+		private readonly plugins: InstalledPlugin[],
+		callbacks: PluginListCallbacks,
+	) {
 		super();
-		this.plugins = plugins;
 
 		// Title
 		this.addChild(new DynamicBorder());
@@ -121,15 +122,13 @@ export interface PluginDetailCallbacks {
  */
 export class PluginDetailComponent extends Container {
 	private settingsList!: SettingsList;
-	private plugin: InstalledPlugin;
-	private manager: PluginManager;
-	private callbacks: PluginDetailCallbacks;
 
-	constructor(plugin: InstalledPlugin, manager: PluginManager, callbacks: PluginDetailCallbacks) {
+	constructor(
+		private plugin: InstalledPlugin,
+		private readonly manager: PluginManager,
+		private readonly callbacks: PluginDetailCallbacks,
+	) {
 		super();
-		this.plugin = plugin;
-		this.manager = manager;
-		this.callbacks = callbacks;
 
 		void this.rebuild();
 	}
@@ -335,19 +334,15 @@ class ConfigEnumSubmenu extends Container {
  */
 class ConfigInputSubmenu extends Container {
 	private input: Input;
-	private onSubmit: (value: string) => void;
-	private onCancel: () => void;
 
 	constructor(
 		key: string,
 		schema: PluginSettingSchema,
 		currentValue: string,
-		onSubmit: (value: string) => void,
-		onCancel: () => void,
+		private readonly onSubmit: (value: string) => void,
+		private readonly onCancel: () => void,
 	) {
 		super();
-		this.onSubmit = onSubmit;
-		this.onCancel = onCancel;
 
 		this.addChild(new Text(theme.bold(theme.fg("accent", key)), 0, 0));
 		if (schema.description) {
@@ -416,17 +411,18 @@ interface InputHandler {
  */
 export class PluginSettingsComponent extends Container {
 	private manager: PluginManager;
-	private callbacks: PluginSettingsCallbacks;
 	private viewComponent: (Container & InputHandler) | null = null;
 	// biome-ignore lint/correctness/noUnusedPrivateClassMembers: state tracking for view management
 	private currentView: "list" | "detail" = "list";
 	// biome-ignore lint/correctness/noUnusedPrivateClassMembers: state tracking for view management
 	private currentPlugin: InstalledPlugin | null = null;
 
-	constructor(cwd: string, callbacks: PluginSettingsCallbacks) {
+	constructor(
+		cwd: string,
+		private readonly callbacks: PluginSettingsCallbacks,
+	) {
 		super();
 		this.manager = new PluginManager(cwd);
-		this.callbacks = callbacks;
 		this.showPluginList();
 	}
 

package/src/modes/components/python-execution.ts

@@ -12,7 +12,6 @@ import { truncateToVisualLines } from "./visual-truncate";
 const PREVIEW_LINES = 20;
 
 export class PythonExecutionComponent extends Container {
-	private code: string;
 	private outputLines: string[] = [];
 	private status: "running" | "complete" | "cancelled" | "error" = "running";
 	private exitCode: number | undefined = undefined;
@@ -20,7 +19,6 @@ export class PythonExecutionComponent extends Container {
 	private truncation?: TruncationMeta;
 	private expanded = false;
 	private contentContainer: Container;
-	private excludeFromContext: boolean;
 
 	private formatHeader(colorKey: "dim" | "pythonMode"): Text {
 		const prompt = theme.fg(colorKey, theme.bold(">>>"));
@@ -32,10 +30,12 @@ export class PythonExecutionComponent extends Container {
 		return new Text(headerLines.join("\n"), 1, 0);
 	}
 
-	constructor(code: string, ui: TUI, excludeFromContext = false) {
+	constructor(
+		private readonly code: string,
+		ui: TUI,
+		private readonly excludeFromContext = false,
+	) {
 		super();
-		this.code = code;
-		this.excludeFromContext = excludeFromContext;
 
 		const colorKey = this.excludeFromContext ? "dim" : "pythonMode";
 		const borderColor = (str: string) => theme.fg(colorKey, str);

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

@@ -18,20 +18,19 @@ import { DynamicBorder } from "./dynamic-border";
  * Custom session list component with multi-line items and search
  */
 class SessionList implements Component {
-	private allSessions: SessionInfo[] = [];
 	private filteredSessions: SessionInfo[] = [];
 	private selectedIndex: number = 0;
-	private searchInput: Input;
-	private showCwd = false;
+	private readonly searchInput: Input;
 	public onSelect?: (sessionPath: string) => void;
 	public onCancel?: () => void;
 	public onExit: () => void = () => {};
 	private maxVisible: number = 5; // Max sessions visible (each session is 3 lines: msg + metadata + blank)
 
-	constructor(sessions: SessionInfo[], showCwd = false) {
-		this.allSessions = sessions;
-		this.filteredSessions = sessions;
-		this.showCwd = showCwd;
+	constructor(
+		private readonly allSessions: SessionInfo[],
+		private readonly showCwd = false,
+	) {
+		this.filteredSessions = allSessions;
 		this.searchInput = new Input();
 
 		// Handle Enter in search input - select current item

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

@@ -43,7 +43,7 @@ export interface EnumSettingDef extends BaseSettingDef {
 
 export interface SubmenuSettingDef extends BaseSettingDef {
 	type: "submenu";
-	getOptions: () => Array<{ value: string; label: string; description?: string }>;
+	get options(): OptionList;
 	onPreview?: (value: string) => void;
 	onPreviewCancel?: (originalValue: string) => void;
 }
@@ -62,11 +62,12 @@ const CONDITIONS: Record<string, () => boolean> = {
 // Submenu Option Providers
 // ═══════════════════════════════════════════════════════════════════════════
 
-type OptionProvider = () => Array<{ value: string; label: string; description?: string }>;
+type OptionList = ReadonlyArray<{ value: string; label: string; description?: string }>;
+type OptionProvider = (() => OptionList) | OptionList;
 
 const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 	// Retry max retries
-	"retry.maxRetries": () => [
+	"retry.maxRetries": [
 		{ value: "1", label: "1 retry" },
 		{ value: "2", label: "2 retries" },
 		{ value: "3", label: "3 retries" },
@@ -74,7 +75,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "10", label: "10 retries" },
 	],
 	// Task max concurrency
-	"task.maxConcurrency": () => [
+	"task.maxConcurrency": [
 		{ value: "0", label: "Unlimited" },
 		{ value: "1", label: "1 task" },
 		{ value: "2", label: "2 tasks" },
@@ -85,7 +86,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "64", label: "64 tasks" },
 	],
 	// Task max recursion depth
-	"task.maxRecursionDepth": () => [
+	"task.maxRecursionDepth": [
 		{ value: "-1", label: "Unlimited" },
 		{ value: "0", label: "None" },
 		{ value: "1", label: "Single" },
@@ -93,21 +94,21 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "3", label: "Triple" },
 	],
 	// Todo max reminders
-	"todo.reminders.max": () => [
+	"todo.reminders.max": [
 		{ value: "1", label: "1 reminder" },
 		{ value: "2", label: "2 reminders" },
 		{ value: "3", label: "3 reminders" },
 		{ value: "5", label: "5 reminders" },
 	],
 	// Grep context
-	"grep.contextBefore": () => [
+	"grep.contextBefore": [
 		{ value: "0", label: "0 lines" },
 		{ value: "1", label: "1 line" },
 		{ value: "2", label: "2 lines" },
 		{ value: "3", label: "3 lines" },
 		{ value: "5", label: "5 lines" },
 	],
-	"grep.contextAfter": () => [
+	"grep.contextAfter": [
 		{ value: "0", label: "0 lines" },
 		{ value: "1", label: "1 line" },
 		{ value: "2", label: "2 lines" },
@@ -116,7 +117,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "10", label: "10 lines" },
 	],
 	// Ask timeout
-	"ask.timeout": () => [
+	"ask.timeout": [
 		{ value: "0", label: "Disabled" },
 		{ value: "15", label: "15 seconds" },
 		{ value: "30", label: "30 seconds" },
@@ -124,14 +125,14 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "120", label: "120 seconds" },
 	],
 	// Edit fuzzy threshold
-	"edit.fuzzyThreshold": () => [
+	"edit.fuzzyThreshold": [
 		{ value: "0.85", label: "0.85", description: "Lenient" },
 		{ value: "0.90", label: "0.90", description: "Moderate" },
 		{ value: "0.95", label: "0.95", description: "Default" },
 		{ value: "0.98", label: "0.98", description: "Strict" },
 	],
 	// TTSR repeat gap
-	"ttsr.repeatGap": () => [
+	"ttsr.repeatGap": [
 		{ value: "5", label: "5 messages" },
 		{ value: "10", label: "10 messages" },
 		{ value: "15", label: "15 messages" },
@@ -139,29 +140,38 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "30", label: "30 messages" },
 	],
 	// Provider options
-	"providers.webSearch": () => [
+	"providers.webSearch": [
 		{ value: "auto", label: "Auto", description: "Priority: Exa > Perplexity > Anthropic" },
 		{ value: "exa", label: "Exa", description: "Requires EXA_API_KEY" },
 		{ value: "perplexity", label: "Perplexity", description: "Requires PERPLEXITY_API_KEY" },
 		{ value: "anthropic", label: "Anthropic", description: "Uses Anthropic web search" },
 	],
-	"providers.image": () => [
+	"providers.image": [
 		{ value: "auto", label: "Auto", description: "Priority: OpenRouter > Gemini" },
 		{ value: "gemini", label: "Gemini", description: "Requires GEMINI_API_KEY" },
 		{ value: "openrouter", label: "OpenRouter", description: "Requires OPENROUTER_API_KEY" },
 	],
-	"providers.kimiApiFormat": () => [
+	"providers.kimiApiFormat": [
 		{ value: "openai", label: "OpenAI", description: "api.kimi.com" },
 		{ value: "anthropic", label: "Anthropic", description: "api.moonshot.ai" },
 	],
+	// Default thinking level
+	defaultThinkingLevel: [
+		{ value: "off", label: "off", description: "No reasoning" },
+		{ value: "minimal", label: "minimal", description: "Very brief (~1k tokens)" },
+		{ value: "low", label: "low", description: "Light (~2k tokens)" },
+		{ value: "medium", label: "medium", description: "Moderate (~8k tokens)" },
+		{ value: "high", label: "high", description: "Deep (~16k tokens)" },
+		{ value: "xhigh", label: "xhigh", description: "Maximum (~32k tokens)" },
+	],
 	// Symbol preset
-	symbolPreset: () => [
+	symbolPreset: [
 		{ value: "unicode", label: "Unicode", description: "Standard symbols (default)" },
 		{ value: "nerd", label: "Nerd Font", description: "Requires Nerd Font" },
 		{ value: "ascii", label: "ASCII", description: "Maximum compatibility" },
 	],
 	// Status line preset
-	"statusLine.preset": () => [
+	"statusLine.preset": [
 		{ value: "default", label: "Default", description: "Model, path, git, context, tokens, cost" },
 		{ value: "minimal", label: "Minimal", description: "Path and git only" },
 		{ value: "compact", label: "Compact", description: "Model, git, cost, context" },
@@ -171,7 +181,7 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "custom", label: "Custom", description: "User-defined segments" },
 	],
 	// Status line separator
-	"statusLine.separator": () => [
+	"statusLine.separator": [
 		{ value: "powerline", label: "Powerline", description: "Solid arrows (Nerd Font)" },
 		{ value: "powerline-thin", label: "Thin chevron", description: "Thin arrows (Nerd Font)" },
 		{ value: "slash", label: "Slash", description: "Forward slashes" },
@@ -182,14 +192,23 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 	],
 };
 
-const THINKING_DESCRIPTIONS: Record<string, string> = {
-	off: "No reasoning",
-	minimal: "Very brief (~1k tokens)",
-	low: "Light (~2k tokens)",
-	medium: "Moderate (~8k tokens)",
-	high: "Deep (~16k tokens)",
-	xhigh: "Maximum (~32k tokens)",
-};
+function createSubmenuSettingDef(base: Omit<SettingDef, "type" | "options">, provider: OptionProvider): SettingDef {
+	if (typeof provider === "function") {
+		return {
+			...base,
+			type: "submenu",
+			get options() {
+				return provider();
+			},
+		};
+	} else {
+		return {
+			...base,
+			type: "submenu",
+			options: provider,
+		};
+	}
+}
 
 // ═══════════════════════════════════════════════════════════════════════════
 // Schema to UI Conversion
@@ -215,18 +234,8 @@ function pathToSettingDef(path: SettingPath): SettingDef | null {
 		// If marked as submenu, use submenu type
 		if (ui.submenu) {
 			const provider = OPTION_PROVIDERS[path];
-			return {
-				...base,
-				type: "submenu",
-				getOptions:
-					provider ??
-					(() =>
-						values.map(v => ({
-							value: v,
-							label: v,
-							description: path === "defaultThinkingLevel" ? THINKING_DESCRIPTIONS[v] : undefined,
-						}))),
-			};
+			if (!provider) return null;
+			return createSubmenuSettingDef(base, provider);
 		}
 
 		return { ...base, type: "enum", values };
@@ -235,17 +244,17 @@ function pathToSettingDef(path: SettingPath): SettingDef | null {
 	if (schemaType === "number" && ui.submenu) {
 		const provider = OPTION_PROVIDERS[path];
 		if (provider) {
-			return { ...base, type: "submenu", getOptions: provider };
+			return createSubmenuSettingDef(base, provider);
 		}
 	}
 
 	if (schemaType === "string" && ui.submenu) {
 		const provider = OPTION_PROVIDERS[path];
 		if (provider) {
-			return { ...base, type: "submenu", getOptions: provider };
+			return createSubmenuSettingDef(base, provider);
 		}
 		// For theme etc, options will be injected at runtime
-		return { ...base, type: "submenu", getOptions: () => [] };
+		return createSubmenuSettingDef(base, []);
 	}
 
 	return null;

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

@@ -41,20 +41,18 @@ function getTabBarTheme(): TabBarTheme {
 class SelectSubmenu extends Container {
 	private selectList: SelectList;
 	private previewText: Text | null = null;
-	private getPreview: (() => string) | undefined;
 
 	constructor(
 		title: string,
 		description: string,
-		options: SelectItem[],
+		options: ReadonlyArray<SelectItem>,
 		currentValue: string,
 		onSelect: (value: string) => void,
 		onCancel: () => void,
 		onSelectionChange?: (value: string) => void,
-		getPreview?: () => string,
+		private readonly getPreview?: () => string,
 	) {
 		super();
-		this.getPreview = getPreview;
 
 		// Title
 		this.addChild(new Text(theme.bold(theme.fg("accent", title)), 0, 0));
@@ -179,15 +177,12 @@ export class SettingsSelectorComponent extends Container {
 	private statusPreviewText: Text | null = null;
 	private currentTabId: SettingTab | "plugins" = "display";
 
-	private context: SettingsRuntimeContext;
-	private callbacks: SettingsCallbacks;
-
-	constructor(context: SettingsRuntimeContext, callbacks: SettingsCallbacks) {
+	constructor(
+		private readonly context: SettingsRuntimeContext,
+		private readonly callbacks: SettingsCallbacks,
+	) {
 		super();
 
-		this.context = context;
-		this.callbacks = callbacks;
-
 		// Add top border
 		this.addChild(new DynamicBorder());
 
@@ -285,10 +280,6 @@ export class SettingsSelectorComponent extends Container {
 	 * Get the current value for a setting.
 	 */
 	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);
 	}
 
@@ -300,12 +291,12 @@ export class SettingsSelectorComponent extends Container {
 		currentValue: string,
 		done: (value?: string) => void,
 	): Container {
-		let options = def.getOptions();
+		let options = def.options;
 
 		// Special case: inject runtime options for thinking level
 		if (def.path === "defaultThinkingLevel") {
 			options = this.context.availableThinkingLevels.map(level => {
-				const baseOpt = def.getOptions().find(o => o.value === level);
+				const baseOpt = options.find(o => o.value === level);
 				return baseOpt || { value: level, label: level };
 			});
 		} else if (def.path === "theme") {