@oh-my-pi/pi-coding-agent 12.3.0 → 12.5.0

package/src/extensibility/hooks/types.ts

@@ -7,6 +7,7 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
+import type { Rule } from "../../capability/rule";
 import type { ModelRegistry } from "../../config/model-registry";
 import type { ExecOptions, ExecResult } from "../../exec/exec";
 import type { Theme } from "../../modes/theme/theme";
@@ -21,6 +22,7 @@ import type {
 	SessionManager,
 } from "../../session/session-manager";
 import type { BashToolDetails, FindToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
+import type { TodoItem } from "../../tools/todo-write";
 
 // Re-export for backward compatibility
 export type { ExecOptions, ExecResult } from "../../exec/exec";
@@ -389,6 +391,52 @@ export interface TurnEndEvent {
 	toolResults: ToolResultMessage[];
 }
 
+/** Event data for auto_compaction_start event. */
+export interface AutoCompactionStartEvent {
+	type: "auto_compaction_start";
+	reason: "threshold" | "overflow";
+}
+
+/** Event data for auto_compaction_end event. */
+export interface AutoCompactionEndEvent {
+	type: "auto_compaction_end";
+	result: CompactionResult | undefined;
+	aborted: boolean;
+	willRetry: boolean;
+	errorMessage?: string;
+}
+
+/** Event data for auto_retry_start event. */
+export interface AutoRetryStartEvent {
+	type: "auto_retry_start";
+	attempt: number;
+	maxAttempts: number;
+	delayMs: number;
+	errorMessage: string;
+}
+
+/** Event data for auto_retry_end event. */
+export interface AutoRetryEndEvent {
+	type: "auto_retry_end";
+	success: boolean;
+	attempt: number;
+	finalError?: string;
+}
+
+/** Event data for ttsr_triggered event. */
+export interface TtsrTriggeredEvent {
+	type: "ttsr_triggered";
+	rules: Rule[];
+}
+
+/** Event data for todo_reminder event. */
+export interface TodoReminderEvent {
+	type: "todo_reminder";
+	todos: TodoItem[];
+	attempt: number;
+	maxAttempts: number;
+}
+
 /**
  * Event data for tool_call event.
  * Fired before a tool is executed. Hooks can block execution.
@@ -485,6 +533,12 @@ export type HookEvent =
 	| AgentEndEvent
 	| TurnStartEvent
 	| TurnEndEvent
+	| AutoCompactionStartEvent
+	| AutoCompactionEndEvent
+	| AutoRetryStartEvent
+	| AutoRetryEndEvent
+	| TtsrTriggeredEvent
+	| TodoReminderEvent
 	| ToolCallEvent
 	| ToolResultEvent;
 
@@ -658,6 +712,12 @@ export interface HookAPI {
 	on(event: "agent_end", handler: HookHandler<AgentEndEvent>): void;
 	on(event: "turn_start", handler: HookHandler<TurnStartEvent>): void;
 	on(event: "turn_end", handler: HookHandler<TurnEndEvent>): void;
+	on(event: "auto_compaction_start", handler: HookHandler<AutoCompactionStartEvent>): void;
+	on(event: "auto_compaction_end", handler: HookHandler<AutoCompactionEndEvent>): void;
+	on(event: "auto_retry_start", handler: HookHandler<AutoRetryStartEvent>): void;
+	on(event: "auto_retry_end", handler: HookHandler<AutoRetryEndEvent>): void;
+	on(event: "ttsr_triggered", handler: HookHandler<TtsrTriggeredEvent>): void;
+	on(event: "todo_reminder", handler: HookHandler<TodoReminderEvent>): void;
 	on(event: "tool_call", handler: HookHandler<ToolCallEvent, ToolCallEventResult>): void;
 	on(event: "tool_result", handler: HookHandler<ToolResultEvent, ToolResultEventResult>): void;
 

package/src/extensibility/skills.ts

@@ -235,6 +235,8 @@ export async function loadSkills(options: LoadSkillsOptions = {}): Promise<LoadS
 		return { skills: [], warnings: [] };
 	}
 
+	const anyBuiltInSkillSourceEnabled =
+		enableCodexUser || enableClaudeUser || enableClaudeProject || enablePiUser || enablePiProject;
 	// Helper to check if a source is enabled
 	function isSourceEnabled(source: SourceMeta): boolean {
 		const { provider, level } = source;
@@ -243,8 +245,8 @@ export async function loadSkills(options: LoadSkillsOptions = {}): Promise<LoadS
 		if (provider === "claude" && level === "project") return enableClaudeProject;
 		if (provider === "native" && level === "user") return enablePiUser;
 		if (provider === "native" && level === "project") return enablePiProject;
-		// For other providers (gemini, cursor, etc.) or custom, default to enabled
-		return true;
+		// For other providers (agents, claude-plugins, etc.), treat them as built-in skill sources.
+		return anyBuiltInSkillSourceEnabled;
 	}
 
 	// Use capability API to load all skills

package/src/lsp/render.ts

@@ -282,7 +282,7 @@ function renderHover(
 }
 
 /**
- * Syntax highlight code using native WASM highlighter.
+ * Syntax highlight code using native highlighter.
  */
 function highlightCode(codeText: string, language: string, theme: Theme): string[] {
 	const validLang = language && supportsLanguage(language) ? language : undefined;

package/src/main.ts

@@ -560,7 +560,13 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		});
 	}
 
-	await initTheme(settings.get("theme"), isInteractive, settings.get("symbolPreset"), settings.get("colorBlindMode"));
+	await initTheme(
+		isInteractive,
+		settings.get("symbolPreset"),
+		settings.get("colorBlindMode"),
+		settings.get("theme.dark"),
+		settings.get("theme.light"),
+	);
 	debugStartup("main:initTheme2");
 	time("initTheme");
 

package/src/memories/index.ts

@@ -152,7 +152,7 @@ export async function buildMemoryToolDeveloperInstructions(
 ): Promise<string | undefined> {
 	const cfg = loadMemoryConfig(settings);
 	if (!cfg.enabled) return undefined;
-	const memoryRoot = getMemoryRoot(agentDir);
+	const memoryRoot = getMemoryRoot(agentDir, settings.getCwd());
 	const summaryPath = path.join(memoryRoot, "memory_summary.md");
 
 	let text: string;
@@ -176,14 +176,14 @@ export async function buildMemoryToolDeveloperInstructions(
 /**
  * Clear all persisted memory state and generated artifacts.
  */
-export async function clearMemoryData(agentDir: string): Promise<void> {
+export async function clearMemoryData(agentDir: string, cwd: string): Promise<void> {
 	const db = openMemoryDb(getAgentDbPath(agentDir));
 	try {
 		clearMemoryDataInDb(db);
 	} finally {
 		closeMemoryDb(db);
 	}
-	await fs.rm(getMemoryRoot(agentDir), { recursive: true, force: true });
+	await fs.rm(getMemoryRoot(agentDir, cwd), { recursive: true, force: true });
 }
 
 /**
@@ -221,7 +221,7 @@ async function runPhase1(options: {
 	const db = openMemoryDb(getAgentDbPath(agentDir));
 	const nowSec = unixNow();
 	const workerId = `memory-${process.pid}`;
-	const memoryRoot = getMemoryRoot(agentDir);
+	const memoryRoot = getMemoryRoot(agentDir, session.sessionManager.getCwd());
 	const currentThreadId = session.sessionManager.getSessionId();
 
 	try {
@@ -345,7 +345,7 @@ async function runPhase2(options: {
 	const db = openMemoryDb(getAgentDbPath(agentDir));
 	const nowSec = unixNow();
 	const workerId = `memory-${process.pid}`;
-	const memoryRoot = getMemoryRoot(agentDir);
+	const memoryRoot = getMemoryRoot(agentDir, session.sessionManager.getCwd());
 
 	try {
 		const claimResult = tryClaimGlobalPhase2Job(db, {
@@ -1077,8 +1077,12 @@ function loadMemoryConfig(settings: Settings): MemoryRuntimeConfig {
 	};
 }
 
-function getMemoryRoot(agentDir: string): string {
-	return path.join(agentDir, "memories");
+function getMemoryRoot(agentDir: string, cwd: string): string {
+	return path.join(agentDir, "memories", encodeProjectPath(cwd));
+}
+
+function encodeProjectPath(cwd: string): string {
+	return `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
 }
 
 function unixNow(): number {

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

@@ -1,6 +1,8 @@
 /**
  * Component for displaying bash command execution with streaming output.
  */
+
+import { sanitizeText } from "@oh-my-pi/pi-natives";
 import { Container, Loader, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { TruncationMeta } from "../../tools/output-meta";
@@ -10,6 +12,7 @@ import { truncateToVisualLines } from "./visual-truncate";
 
 // Preview line limit when not expanded (matches tool execution behavior)
 const PREVIEW_LINES = 20;
+const MAX_DISPLAY_LINE_CHARS = 4000;
 
 export class BashExecutionComponent extends Container {
 	#outputLines: string[] = [];
@@ -73,13 +76,15 @@ export class BashExecutionComponent extends Container {
 	}
 
 	appendOutput(chunk: string): void {
-		const clean = this.#normalizeOutput(chunk);
+		const clean = sanitizeText(chunk);
 
 		// Append to output lines
-		const newLines = clean.split("\n");
+		const newLines = clean.split("\n").map(line => this.#clampDisplayLine(line));
 		if (this.#outputLines.length > 0 && newLines.length > 0) {
 			// Append first chunk to last line (incomplete line continuation)
-			this.#outputLines[this.#outputLines.length - 1] += newLines[0];
+			this.#outputLines[this.#outputLines.length - 1] = this.#clampDisplayLine(
+				`${this.#outputLines[this.#outputLines.length - 1]}${newLines[0]}`,
+			);
 			this.#outputLines.push(...newLines.slice(1));
 		} else {
 			this.#outputLines.push(...newLines);
@@ -184,15 +189,17 @@ export class BashExecutionComponent extends Container {
 		}
 	}
 
-	#normalizeOutput(text: string): string {
-		// Strip ANSI codes and normalize line endings
-		// Note: binary data is already sanitized in tui-renderer.ts executeBashCommand
-		return Bun.stripANSI(text).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+	#clampDisplayLine(line: string): string {
+		if (line.length <= MAX_DISPLAY_LINE_CHARS) {
+			return line;
+		}
+		const omitted = line.length - MAX_DISPLAY_LINE_CHARS;
+		return `${line.slice(0, MAX_DISPLAY_LINE_CHARS)}… [${omitted} chars omitted]`;
 	}
 
 	#setOutput(output: string): void {
-		const clean = this.#normalizeOutput(output);
-		this.#outputLines = clean ? clean.split("\n") : [];
+		const clean = sanitizeText(output);
+		this.#outputLines = clean ? clean.split("\n").map(line => this.#clampDisplayLine(line)) : [];
 	}
 
 	/**

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

@@ -19,6 +19,8 @@ export class CustomEditor extends Editor {
 	onQuestionMark?: () => void;
 	onCapsLock?: () => void;
 	onAltP?: () => void;
+	/** Called when Alt+Shift+C is pressed to copy prompt to clipboard. */
+	onCopyPrompt?: () => void;
 	/** Called when Ctrl+V is pressed. Returns true if handled (image found), false to fall through to text paste. */
 	onCtrlV?: () => Promise<boolean>;
 	/** Called when Alt+Up is pressed (dequeue keybinding). */
@@ -150,6 +152,12 @@ export class CustomEditor extends Editor {
 			return;
 		}
 
+		// Intercept Alt+Shift+C to copy prompt to clipboard
+		if (matchesKey(data, "alt+shift+c") && this.onCopyPrompt) {
+			this.onCopyPrompt();
+			return;
+		}
+
 		// Intercept ? when editor is empty to show hotkeys
 		if (data === "?" && this.getText().length === 0 && this.onQuestionMark) {
 			this.onQuestionMark();

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

@@ -2,6 +2,8 @@
  * Component for displaying user-initiated Python execution with streaming output.
  * Shares the same kernel session as the agent's Python tool.
  */
+
+import { sanitizeText } from "@oh-my-pi/pi-natives";
 import { Container, Loader, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { getSymbolTheme, highlightCode, theme } from "../../modes/theme/theme";
 import type { TruncationMeta } from "../../tools/output-meta";
@@ -10,6 +12,7 @@ import { DynamicBorder } from "./dynamic-border";
 import { truncateToVisualLines } from "./visual-truncate";
 
 const PREVIEW_LINES = 20;
+const MAX_DISPLAY_LINE_CHARS = 4000;
 
 export class PythonExecutionComponent extends Container {
 	#outputLines: string[] = [];
@@ -70,11 +73,13 @@ export class PythonExecutionComponent extends Container {
 	}
 
 	appendOutput(chunk: string): void {
-		const clean = this.#normalizeOutput(chunk);
+		const clean = sanitizeText(chunk);
 
-		const newLines = clean.split("\n");
+		const newLines = clean.split("\n").map(line => this.#clampDisplayLine(line));
 		if (this.#outputLines.length > 0 && newLines.length > 0) {
-			this.#outputLines[this.#outputLines.length - 1] += newLines[0];
+			this.#outputLines[this.#outputLines.length - 1] = this.#clampDisplayLine(
+				`${this.#outputLines[this.#outputLines.length - 1]}${newLines[0]}`,
+			);
 			this.#outputLines.push(...newLines.slice(1));
 		} else {
 			this.#outputLines.push(...newLines);
@@ -168,13 +173,17 @@ export class PythonExecutionComponent extends Container {
 		}
 	}
 
-	#normalizeOutput(text: string): string {
-		return Bun.stripANSI(text).replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+	#clampDisplayLine(line: string): string {
+		if (line.length <= MAX_DISPLAY_LINE_CHARS) {
+			return line;
+		}
+		const omitted = line.length - MAX_DISPLAY_LINE_CHARS;
+		return `${line.slice(0, MAX_DISPLAY_LINE_CHARS)}… [${omitted} chars omitted]`;
 	}
 
 	#setOutput(output: string): void {
-		const clean = this.#normalizeOutput(output);
-		this.#outputLines = clean ? clean.split("\n") : [];
+		const clean = sanitizeText(output);
+		this.#outputLines = clean ? clean.split("\n").map(line => this.#clampDisplayLine(line)) : [];
 	}
 
 	getOutput(): string {

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

@@ -20,7 +20,7 @@ import type {
 	StatusLineSeparatorStyle,
 } from "../../config/settings-schema";
 import { SETTING_TABS, TAB_METADATA } from "../../config/settings-schema";
-import { getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
+import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 import { PluginSettingsComponent } from "./plugin-settings";
 import { getSettingsForTab, type SettingDef } from "./settings-defs";
@@ -41,6 +41,7 @@ function getTabBarTheme(): TabBarTheme {
 class SelectSubmenu extends Container {
 	#selectList: SelectList;
 	#previewText: Text | null = null;
+	#previewUpdateRequestId: number = 0;
 
 	constructor(
 		title: string,
@@ -49,7 +50,7 @@ class SelectSubmenu extends Container {
 		currentValue: string,
 		onSelect: (value: string) => void,
 		onCancel: () => void,
-		onSelectionChange?: (value: string) => void,
+		onSelectionChange?: (value: string) => void | Promise<void>,
 		private readonly getPreview?: () => string,
 	) {
 		super();
@@ -91,9 +92,19 @@ class SelectSubmenu extends Container {
 
 		if (onSelectionChange) {
 			this.#selectList.onSelectionChange = item => {
-				onSelectionChange(item.value);
-				// Update preview after the preview callback has applied changes
-				this.#updatePreview();
+				const requestId = ++this.#previewUpdateRequestId;
+				const result = onSelectionChange(item.value);
+				if (result && typeof (result as Promise<void>).then === "function") {
+					void (result as Promise<void>).finally(() => {
+						if (requestId === this.#previewUpdateRequestId) {
+							this.#updatePreview();
+						}
+					});
+					return;
+				}
+				if (requestId === this.#previewUpdateRequestId) {
+					this.#updatePreview();
+				}
 			};
 		}
 
@@ -153,7 +164,7 @@ export interface SettingsCallbacks {
 	/** Called when any setting value changes */
 	onChange: (path: SettingPath, newValue: unknown) => void;
 	/** Called for theme preview while browsing */
-	onThemePreview?: (theme: string) => void;
+	onThemePreview?: (theme: string) => void | Promise<void>;
 	/** Called for status line preview while configuring */
 	onStatusLinePreview?: (settings: StatusLinePreviewSettings) => void;
 	/** Get current rendered status line for inline preview */
@@ -299,17 +310,22 @@ export class SettingsSelectorComponent extends Container {
 				const baseOpt = options.find(o => o.value === level);
 				return baseOpt || { value: level, label: level };
 			});
-		} else if (def.path === "theme") {
+		} else if (def.path === "theme.dark" || def.path === "theme.light") {
 			options = this.context.availableThemes.map(t => ({ value: t, label: t }));
 		}
 
 		// Preview handlers
-		let onPreview: ((value: string) => void) | undefined;
+		let onPreview: ((value: string) => void | Promise<void>) | undefined;
 		let onPreviewCancel: (() => void) | undefined;
 
-		if (def.path === "theme") {
-			onPreview = this.callbacks.onThemePreview;
-			onPreviewCancel = () => this.callbacks.onThemePreview?.(currentValue);
+		const activeThemeBeforePreview = getCurrentThemeName() ?? currentValue;
+		if (def.path === "theme.dark" || def.path === "theme.light") {
+			onPreview = value => {
+				return this.callbacks.onThemePreview?.(value);
+			};
+			onPreviewCancel = () => {
+				this.callbacks.onThemePreview?.(activeThemeBeforePreview);
+			};
 		} else if (def.path === "statusLine.preset") {
 			onPreview = value => {
 				const presetDef = getPreset(
@@ -347,7 +363,8 @@ export class SettingsSelectorComponent extends Container {
 		}
 
 		// Provide status line preview for theme selection
-		const getPreview = def.path === "theme" ? this.callbacks.getStatusLinePreview : undefined;
+		const isThemeSetting = def.path === "theme.dark" || def.path === "theme.light";
+		const getPreview = isThemeSetting ? this.callbacks.getStatusLinePreview : undefined;
 
 		return new SelectSubmenu(
 			def.label,
@@ -355,9 +372,7 @@ export class SettingsSelectorComponent extends Container {
 			options,
 			currentValue,
 			value => {
-				// Persist
 				this.#setSettingValue(def.path, value);
-				// Notify
 				this.callbacks.onChange(def.path, value);
 				done(value);
 			},

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

@@ -1,4 +1,5 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import { sanitizeText } from "@oh-my-pi/pi-natives";
 import {
 	Box,
 	type Component,
@@ -12,7 +13,7 @@ import {
 	Text,
 	type TUI,
 } from "@oh-my-pi/pi-tui";
-import { logger, sanitizeText } from "@oh-my-pi/pi-utils";
+import { logger } from "@oh-my-pi/pi-utils";
 import { getProjectDir } from "@oh-my-pi/pi-utils/dirs";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";

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

@@ -358,6 +358,7 @@ export class CommandController {
 	handleHotkeysCommand(): void {
 		const expandToolsKey = this.ctx.keybindings.getDisplayString("expandTools") || "Ctrl+O";
 		const planModeKey = this.ctx.keybindings.getDisplayString("togglePlanMode") || "Alt+Shift+P";
+		const sttKey = this.ctx.keybindings.getDisplayString("toggleSTT") || "Alt+H";
 		const hotkeys = `
 **Navigation**
 | Key | Action |
@@ -394,6 +395,7 @@ export class CommandController {
 | \`${expandToolsKey}\` | Toggle tool output expansion |
 | \`Ctrl+T\` | Toggle todo list expansion |
 | \`Ctrl+G\` | Edit message in external editor |
+| \`${sttKey}\` | Toggle speech-to-text recording |
 | \`/\` | Slash commands |
 | \`!\` | Run bash command |
 | \`!!\` | Run bash command (excluded from context) |
@@ -432,7 +434,7 @@ export class CommandController {
 
 		if (action === "reset" || action === "clear") {
 			try {
-				await clearMemoryData(agentDir);
+				await clearMemoryData(agentDir, this.ctx.sessionManager.getCwd());
 				await this.ctx.session.refreshBaseSystemPrompt();
 				this.ctx.showStatus("Memory data cleared and system prompt refreshed.");
 			} catch (error) {

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

@@ -249,6 +249,13 @@ export class EventController {
 					if (details?.todos) {
 						this.ctx.setTodos(details.todos);
 					}
+				} else if (event.toolName === "todo_write" && event.isError) {
+					const textContent = event.result.content.find(
+						(content: { type: string; text?: string }) => content.type === "text",
+					)?.text;
+					this.ctx.showWarning(
+						`Todo update failed${textContent ? `: ${textContent}` : ". Progress may be stale until todo_write succeeds."}`,
+					);
 				}
 				if (event.toolName === "exit_plan_mode" && !event.isError) {
 					const details = event.result.details as ExitPlanModeDetails | undefined;

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

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
-import { readImageFromClipboard } from "@oh-my-pi/pi-natives";
+import { copyToClipboard, readImageFromClipboard, sanitizeText } from "@oh-my-pi/pi-natives";
 import { $env } from "@oh-my-pi/pi-utils";
 import type { SettingPath, SettingValue } from "../../config/settings";
 import { settings } from "../../config/settings";
@@ -74,6 +74,7 @@ export class InputController {
 		this.ctx.editor.onCtrlG = () => void this.openExternalEditor();
 		this.ctx.editor.onQuestionMark = () => this.ctx.handleHotkeysCommand();
 		this.ctx.editor.onCtrlV = () => this.handleImagePaste();
+		this.ctx.editor.onCopyPrompt = () => this.handleCopyPrompt();
 
 		// Wire up extension shortcuts
 		this.registerExtensionShortcuts();
@@ -112,6 +113,9 @@ export class InputController {
 		for (const key of this.ctx.keybindings.getKeys("followUp")) {
 			this.ctx.editor.setCustomKeyHandler(key, () => void this.handleFollowUp());
 		}
+		for (const key of this.ctx.keybindings.getKeys("toggleSTT")) {
+			this.ctx.editor.setCustomKeyHandler(key, () => void this.ctx.handleSTTToggle());
+		}
 
 		this.ctx.editor.onChange = (text: string) => {
 			const wasBashMode = this.ctx.isBashMode;
@@ -348,7 +352,6 @@ export class InputController {
 				void this.ctx.shutdown();
 				return;
 			}
-
 			// Handle MCP server management commands
 			if (text === "/mcp" || text.startsWith("/mcp ")) {
 				this.ctx.editor.addToHistory(text);
@@ -664,6 +667,24 @@ export class InputController {
 		}
 	}
 
+	/** Copy current prompt text to system clipboard. */
+	handleCopyPrompt(): void {
+		const text = this.ctx.editor.getText();
+		if (!text) {
+			this.ctx.showStatus("Nothing to copy");
+			return;
+		}
+		copyToClipboard(text)
+			.then(() => {
+				const sanitized = sanitizeText(text);
+				const preview = sanitized.length > 30 ? `${sanitized.slice(0, 30)}...` : sanitized;
+				this.ctx.showStatus(`Copied: ${preview}`);
+			})
+			.catch(() => {
+				this.ctx.showWarning("Failed to copy to clipboard");
+			});
+	}
+
 	cycleThinkingLevel(): void {
 		const newLevel = this.ctx.session.cycleThinkingLevel();
 		if (newLevel === undefined) {

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

@@ -20,6 +20,7 @@ import { UserMessageSelectorComponent } from "../../modes/components/user-messag
 import {
 	getAvailableThemes,
 	getSymbolTheme,
+	previewTheme,
 	setColorBlindMode,
 	setSymbolPreset,
 	setTheme,
@@ -71,13 +72,14 @@ export class SelectorController {
 					},
 					{
 						onChange: (id, value) => this.handleSettingChange(id, value),
-						onThemePreview: themeName => {
-							setTheme(themeName, true).then(result => {
-								if (result.success) {
-									this.ctx.ui.invalidate();
-									this.ctx.ui.requestRender();
-								}
-							});
+						onThemePreview: async themeName => {
+							const result = await previewTheme(themeName);
+							if (result.success) {
+								this.ctx.statusLine.invalidate();
+								this.ctx.updateEditorTopBorder();
+								this.ctx.ui.invalidate();
+								this.ctx.ui.requestRender();
+							}
 						},
 						onStatusLinePreview: previewSettings => {
 							// Update status line with preview settings