@oh-my-pi/pi-coding-agent 8.1.0 → 8.2.0

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

@@ -1,6 +1,4 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { SettingsManager, StatusLineSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { getSelectListTheme, getSettingsListTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import {
 	Container,
 	matchesKey,
@@ -14,6 +12,8 @@ import {
 	type TabBarTheme,
 	Text,
 } from "@oh-my-pi/pi-tui";
+import type { SettingsManager, StatusLineSettings } from "../../config/settings-manager";
+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";
@@ -22,10 +22,10 @@ import { StatusLineSegmentEditorComponent } from "./status-line-segment-editor";
 
 function getTabBarTheme(): TabBarTheme {
 	return {
-		label: (text) => theme.bold(theme.fg("accent", text)),
-		activeTab: (text) => theme.bold(theme.bg("selectedBg", theme.fg("text", text))),
-		inactiveTab: (text) => theme.fg("muted", text),
-		hint: (text) => theme.fg("dim", text),
+		label: text => theme.bold(theme.fg("accent", text)),
+		activeTab: text => theme.bold(theme.bg("selectedBg", theme.fg("text", text))),
+		inactiveTab: text => theme.fg("muted", text),
+		hint: text => theme.fg("dim", text),
 	};
 }
 
@@ -74,19 +74,19 @@ class SelectSubmenu extends Container {
 		this.selectList = new SelectList(options, Math.min(options.length, 10), getSelectListTheme());
 
 		// Pre-select current value
-		const currentIndex = options.findIndex((o) => o.value === currentValue);
+		const currentIndex = options.findIndex(o => o.value === currentValue);
 		if (currentIndex !== -1) {
 			this.selectList.setSelectedIndex(currentIndex);
 		}
 
-		this.selectList.onSelect = (item) => {
+		this.selectList.onSelect = item => {
 			onSelect(item.value);
 		};
 
 		this.selectList.onCancel = onCancel;
 
 		if (onSelectionChange) {
-			this.selectList.onSelectionChange = (item) => {
+			this.selectList.onSelectionChange = item => {
 				onSelectionChange(item.value);
 				// Update preview after the preview callback has applied changes
 				this.updatePreview();
@@ -307,12 +307,12 @@ export class SettingsSelectorComponent extends Container {
 
 		// Special case: inject runtime options
 		if (def.id === "thinkingLevel") {
-			options = this.context.availableThinkingLevels.map((level) => {
-				const baseOpt = def.getOptions(this.settingsManager).find((o) => o.value === level);
+			options = this.context.availableThinkingLevels.map(level => {
+				const baseOpt = def.getOptions(this.settingsManager).find(o => o.value === level);
 				return baseOpt || { value: level, label: level };
 			});
 		} else if (def.id === "theme") {
-			options = this.context.availableThemes.map((t) => ({ value: t, label: t }));
+			options = this.context.availableThemes.map(t => ({ value: t, label: t }));
 		}
 
 		// Preview handlers
@@ -323,7 +323,7 @@ export class SettingsSelectorComponent extends Container {
 			onPreview = this.callbacks.onThemePreview;
 			onPreviewCancel = () => this.callbacks.onThemePreview?.(currentValue);
 		} else if (def.id === "statusLinePreset") {
-			onPreview = (value) => {
+			onPreview = value => {
 				const presetDef = getPreset((value as StatusLineSettings["preset"]) ?? "default");
 				this.callbacks.onStatusLinePreview?.({
 					preset: value as StatusLineSettings["preset"],
@@ -345,7 +345,7 @@ export class SettingsSelectorComponent extends Container {
 				this.updateStatusPreview();
 			};
 		} else if (def.id === "statusLineSeparator") {
-			onPreview = (value) => {
+			onPreview = value => {
 				this.callbacks.onStatusLinePreview?.({
 					separator: value as StatusLineSettings["separator"],
 				});
@@ -370,7 +370,7 @@ export class SettingsSelectorComponent extends Container {
 			def.description,
 			options,
 			currentValue,
-			(value) => {
+			value => {
 				// Persist to SettingsManager
 				def.set(this.settingsManager, value);
 				// Notify for side effects
@@ -454,7 +454,7 @@ export class SettingsSelectorComponent extends Container {
 			10,
 			getSettingsListTheme(),
 			(id, newValue) => {
-				const def = defs.find((d) => d.id === id);
+				const def = defs.find(d => d.id === id);
 				if (!def) return;
 
 				// Persist to SettingsManager based on type

package/src/modes/components/show-images-selector.ts

@@ -1,5 +1,5 @@
-import { getSelectListTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
+import { getSelectListTheme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**
@@ -25,7 +25,7 @@ export class ShowImagesSelectorComponent extends Container {
 		// Preselect current value
 		this.selectList.setSelectedIndex(currentValue ? 0 : 1);
 
-		this.selectList.onSelect = (item) => {
+		this.selectList.onSelect = item => {
 			onSelect(item.value === "yes");
 		};
 

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

@@ -1,6 +1,6 @@
-import { hostname as osHostname } from "node:os";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { shortenPath } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
+import * as os from "node:os";
+import { theme } from "../../../modes/theme/theme";
+import { shortenPath } from "../../../tools/render-utils";
 import type { RenderedSegment, SegmentContext, StatusLineSegment, StatusLineSegmentId } from "./types";
 
 export type { SegmentContext } from "./types";
@@ -286,7 +286,7 @@ const sessionSegment: StatusLineSegment = {
 const hostnameSegment: StatusLineSegment = {
 	id: "hostname",
 	render(_ctx) {
-		const name = osHostname().split(".")[0];
+		const name = os.hostname().split(".")[0];
 		return { content: withIcon(theme.icon.host, name), visible: true };
 	},
 };

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

@@ -1,4 +1,4 @@
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { Theme } from "../../../modes/theme/theme";
 import type { SeparatorDef, StatusLineSeparatorStyle } from "./types";
 
 function trimSep(value: string): string {

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

@@ -4,8 +4,8 @@ import type {
 	StatusLineSegmentOptions,
 	StatusLineSeparatorStyle,
 	StatusLineSettings,
-} from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+} from "../../../config/settings-manager";
+import type { AgentSession } from "../../../session/agent-session";
 
 // Re-export types from settings-manager (single source of truth)
 export type {

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

@@ -8,10 +8,9 @@
  * - Shift+J/K: Reorder segment within column
  * - Live preview shown in the actual status line above
  */
-
-import type { StatusLineSegmentId } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, matchesKey } from "@oh-my-pi/pi-tui";
+import type { StatusLineSegmentId } from "../../config/settings-manager";
+import { theme } from "../../modes/theme/theme";
 import { ALL_SEGMENT_IDS } from "./status-line/segments";
 
 // Segment display names and short descriptions
@@ -93,7 +92,7 @@ export class StatusLineSegmentEditorComponent extends Container {
 	}
 
 	private getSegmentsForColumn(column: Column): SegmentState[] {
-		return this.segments.filter((s) => s.column === column).sort((a, b) => a.order - b.order);
+		return this.segments.filter(s => s.column === column).sort((a, b) => a.order - b.order);
 	}
 
 	private getCurrentColumnSegments(): SegmentState[] {
@@ -101,8 +100,8 @@ export class StatusLineSegmentEditorComponent extends Container {
 	}
 
 	private triggerPreview(): void {
-		const left = this.getSegmentsForColumn("left").map((s) => s.id);
-		const right = this.getSegmentsForColumn("right").map((s) => s.id);
+		const left = this.getSegmentsForColumn("left").map(s => s.id);
+		const right = this.getSegmentsForColumn("right").map(s => s.id);
 		this.callbacks.onPreview?.(left, right);
 	}
 
@@ -236,8 +235,8 @@ export class StatusLineSegmentEditorComponent extends Container {
 				this.triggerPreview();
 			}
 		} else if (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n") {
-			const left = this.getSegmentsForColumn("left").map((s) => s.id);
-			const right = this.getSegmentsForColumn("right").map((s) => s.id);
+			const left = this.getSegmentsForColumn("left").map(s => s.id);
+			const right = this.getSegmentsForColumn("right").map(s => s.id);
 			this.callbacks.onSave(left, right);
 		} else if (matchesKey(data, "escape") || matchesKey(data, "esc")) {
 			this.callbacks.onCancel();

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

@@ -1,11 +1,11 @@
+import * as fs from "node:fs";
+import * as path from "node:path";
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
-import type { StatusLineSegmentOptions, StatusLineSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { AgentSession } from "@oh-my-pi/pi-coding-agent/session/agent-session";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { $ } from "bun";
-import { type FSWatcher, watch } from "fs";
-import { dirname, join } from "path";
+import type { StatusLineSegmentOptions, StatusLineSettings } from "../../config/settings-manager";
+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";
@@ -26,11 +26,11 @@ function sanitizeStatusText(text: string): string {
 async function findGitHeadPath(): Promise<string | null> {
 	let dir = process.cwd();
 	while (true) {
-		const gitHeadPath = join(dir, ".git", "HEAD");
+		const gitHeadPath = path.join(dir, ".git", "HEAD");
 		if (await Bun.file(gitHeadPath).exists()) {
 			return gitHeadPath;
 		}
-		const parent = dirname(dir);
+		const parent = path.dirname(dir);
 		if (parent === dir) {
 			return null;
 		}
@@ -46,7 +46,7 @@ export class StatusLineComponent implements Component {
 	private session: AgentSession;
 	private settings: StatusLineSettings = {};
 	private cachedBranch: string | null | undefined = undefined;
-	private gitWatcher: FSWatcher | null = null;
+	private gitWatcher: fs.FSWatcher | null = null;
 	private onBranchChange: (() => void) | null = null;
 	private autoCompactEnabled: boolean = true;
 	private hookStatuses: Map<string, string> = new Map();
@@ -98,11 +98,11 @@ export class StatusLineComponent implements Component {
 			this.gitWatcher = null;
 		}
 
-		findGitHeadPath().then((gitHeadPath) => {
+		findGitHeadPath().then(gitHeadPath => {
 			if (!gitHeadPath) return;
 
 			try {
-				this.gitWatcher = watch(gitHeadPath, () => {
+				this.gitWatcher = fs.watch(gitHeadPath, () => {
 					this.cachedBranch = undefined;
 					if (this.onBranchChange) {
 						this.onBranchChange();
@@ -132,7 +132,7 @@ export class StatusLineComponent implements Component {
 
 		// Note: synchronous call to async function - will return undefined on first call
 		// This is acceptable since it's a cached value that will update on next render
-		findGitHeadPath().then(async (gitHeadPath) => {
+		findGitHeadPath().then(async gitHeadPath => {
 			if (!gitHeadPath) {
 				this.cachedBranch = null;
 				return;
@@ -222,7 +222,7 @@ export class StatusLineComponent implements Component {
 		const lastAssistantMessage = state.messages
 			.slice()
 			.reverse()
-			.find((m) => m.role === "assistant" && m.stopReason !== "aborted") as AssistantMessage | undefined;
+			.find(m => m.role === "assistant" && m.stopReason !== "aborted") as AssistantMessage | undefined;
 
 		const contextTokens = lastAssistantMessage
 			? lastAssistantMessage.usage.input +

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

@@ -1,9 +1,10 @@
-import { getAvailableThemes, getSelectListTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
+import { getSelectListTheme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 /**
- * Component that renders a theme selector
+ * Component that renders a theme selector.
+ * Themes must be pre-loaded and passed to the constructor.
  */
 export class ThemeSelectorComponent extends Container {
 	private selectList: SelectList;
@@ -11,6 +12,7 @@ export class ThemeSelectorComponent extends Container {
 
 	constructor(
 		currentTheme: string,
+		themes: string[],
 		onSelect: (themeName: string) => void,
 		onCancel: () => void,
 		onPreview: (themeName: string) => void,
@@ -18,9 +20,8 @@ export class ThemeSelectorComponent extends Container {
 		super();
 		this.onPreview = onPreview;
 
-		// Get available themes and create select items
-		const themes = getAvailableThemes();
-		const themeItems: SelectItem[] = themes.map((name) => ({
+		// Create select items from provided themes
+		const themeItems: SelectItem[] = themes.map(name => ({
 			value: name,
 			label: name,
 			description: name === currentTheme ? "(current)" : undefined,
@@ -38,7 +39,7 @@ export class ThemeSelectorComponent extends Container {
 			this.selectList.setSelectedIndex(currentIndex);
 		}
 
-		this.selectList.onSelect = (item) => {
+		this.selectList.onSelect = item => {
 			onSelect(item.value);
 		};
 
@@ -46,7 +47,7 @@ export class ThemeSelectorComponent extends Container {
 			onCancel();
 		};
 
-		this.selectList.onSelectionChange = (item) => {
+		this.selectList.onSelectionChange = item => {
 			this.onPreview(item.value);
 		};
 

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

@@ -1,6 +1,6 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { getSelectListTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
+import { getSelectListTheme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 const LEVEL_DESCRIPTIONS: Record<ThinkingLevel, string> = {
@@ -26,7 +26,7 @@ export class ThinkingSelectorComponent extends Container {
 	) {
 		super();
 
-		const thinkingLevels: SelectItem[] = availableLevels.map((level) => ({
+		const thinkingLevels: SelectItem[] = availableLevels.map(level => ({
 			value: level,
 			label: level,
 			description: LEVEL_DESCRIPTIONS[level],
@@ -39,12 +39,12 @@ export class ThinkingSelectorComponent extends Container {
 		this.selectList = new SelectList(thinkingLevels, thinkingLevels.length, getSelectListTheme());
 
 		// Preselect current level
-		const currentIndex = thinkingLevels.findIndex((item) => item.value === currentLevel);
+		const currentIndex = thinkingLevels.findIndex(item => item.value === currentLevel);
 		if (currentIndex !== -1) {
 			this.selectList.setSelectedIndex(currentIndex);
 		}
 
-		this.selectList.onSelect = (item) => {
+		this.selectList.onSelect = item => {
 			onSelect(item.value as ThinkingLevel);
 		};
 

package/src/modes/components/todo-display.ts

@@ -1,8 +1,8 @@
 import * as path from "node:path";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { TodoItem } from "@oh-my-pi/pi-coding-agent/modes/types";
 import { Text } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
+import { theme } from "../../modes/theme/theme";
+import type { TodoItem } from "../../modes/types";
 
 const TODO_FILE_NAME = "todos.json";
 

package/src/modes/components/todo-reminder.ts

@@ -1,6 +1,6 @@
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { TodoItem } from "@oh-my-pi/pi-coding-agent/tools/todo-write";
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
+import { theme } from "../../modes/theme/theme";
+import type { TodoItem } from "../../tools/todo-write";
 
 /**
  * Component that renders a todo completion reminder notification.
@@ -20,7 +20,7 @@ export class TodoReminderComponent extends Container {
 
 		this.addChild(new Spacer(1));
 
-		this.box = new Box(1, 1, (t) => theme.inverse(theme.fg("warning", t)));
+		this.box = new Box(1, 1, t => theme.inverse(theme.fg("warning", t)));
 		this.addChild(this.box);
 
 		this.rebuild();
@@ -36,7 +36,7 @@ export class TodoReminderComponent extends Container {
 		this.box.addChild(new Text(header, 0, 0));
 		this.box.addChild(new Spacer(1));
 
-		const todoList = this.todos.map((t) => `  ${theme.checkbox.unchecked} ${t.content}`).join("\n");
+		const todoList = this.todos.map(t => `  ${theme.checkbox.unchecked} ${t.content}`).join("\n");
 		this.box.addChild(new Text(theme.italic(todoList), 0, 0));
 	}
 }

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

@@ -1,15 +1,4 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import {
-	computeEditDiff,
-	computePatchDiff,
-	type EditDiffError,
-	type EditDiffResult,
-} from "@oh-my-pi/pi-coding-agent/patch";
-import { BASH_DEFAULT_PREVIEW_LINES } from "@oh-my-pi/pi-coding-agent/tools/bash";
-import { PYTHON_DEFAULT_PREVIEW_LINES } from "@oh-my-pi/pi-coding-agent/tools/python";
-import { toolRenderers } from "@oh-my-pi/pi-coding-agent/tools/renderers";
-import { convertToPng } from "@oh-my-pi/pi-coding-agent/utils/image-convert";
 import {
 	Box,
 	Container,
@@ -22,6 +11,12 @@ import {
 	type TUI,
 } from "@oh-my-pi/pi-tui";
 import { sanitizeText } from "@oh-my-pi/pi-utils";
+import { theme } from "../../modes/theme/theme";
+import { computeEditDiff, computePatchDiff, type EditDiffError, type EditDiffResult } from "../../patch";
+import { BASH_DEFAULT_PREVIEW_LINES } from "../../tools/bash";
+import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../tools/python";
+import { toolRenderers } from "../../tools/renderers";
+import { convertToPng } from "../../utils/image-convert";
 import { renderDiff } from "./diff";
 
 // Preview line limit for bash when not expanded
@@ -41,7 +36,7 @@ function formatCompactValue(value: unknown, maxLength: number): string {
 	} else if (typeof value === "number" || typeof value === "boolean" || typeof value === "bigint") {
 		rendered = String(value);
 	} else if (Array.isArray(value)) {
-		const previewItems = value.slice(0, 3).map((item) => formatCompactValue(item, maxLength));
+		const previewItems = value.slice(0, 3).map(item => formatCompactValue(item, maxLength));
 		rendered = `[${previewItems.join(", ")}${value.length > 3 ? ", ..." : ""}]`;
 	} else if (typeof value === "object") {
 		try {
@@ -218,7 +213,7 @@ export class ToolExecutionComponent extends Container {
 			computePatchDiff({ path, op, rename, diff }, this.cwd, {
 				fuzzyThreshold: this.editFuzzyThreshold,
 				allowFuzzy: this.editAllowFuzzy,
-			}).then((result) => {
+			}).then(result => {
 				if (this.editDiffArgsKey === argsKey) {
 					this.editDiffPreview = result;
 					this.updateDisplay();
@@ -244,7 +239,7 @@ export class ToolExecutionComponent extends Container {
 		this.editDiffArgsKey = argsKey;
 
 		// Compute diff async
-		computeEditDiff(path, oldText, newText, this.cwd, true, all, this.editFuzzyThreshold).then((result) => {
+		computeEditDiff(path, oldText, newText, this.cwd, true, all, this.editFuzzyThreshold).then(result => {
 			// Only update if args haven't changed since we started
 			if (this.editDiffArgsKey === argsKey) {
 				this.editDiffPreview = result;
@@ -308,7 +303,7 @@ export class ToolExecutionComponent extends Container {
 			// Convert async - catch errors from WASM processing
 			const index = i;
 			convertToPng(img.data, img.mimeType)
-				.then((converted) => {
+				.then(converted => {
 					if (converted) {
 						this.convertedImages.set(index, converted);
 						this.updateDisplay();
@@ -634,7 +629,7 @@ export class ToolExecutionComponent extends Container {
 			const displayLines = lines.slice(-maxLines);
 			const remaining = lines.length - displayLines.length;
 			text += ` ${theme.fg("dim", `(${lines.length} lines)`)}`;
-			text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+			text += `\n${displayLines.map(line => theme.fg("toolOutput", line)).join("\n")}`;
 			if (remaining > 0) {
 				text += theme.fg("dim", `\n${theme.format.ellipsis} (${remaining} earlier lines) (ctrl+o to expand)`);
 			}

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

@@ -1,6 +1,3 @@
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { SessionTreeNode } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import { shortenPath } from "@oh-my-pi/pi-coding-agent/tools/render-utils";
 import {
 	type Component,
 	Container,
@@ -11,6 +8,9 @@ import {
 	TruncatedText,
 	truncateToWidth,
 } from "@oh-my-pi/pi-tui";
+import { theme } from "../../modes/theme/theme";
+import type { SessionTreeNode } from "../../session/session-manager";
+import { shortenPath } from "../../tools/render-utils";
 import { DynamicBorder } from "./dynamic-border";
 
 /** Gutter info: position (displayIndent where connector was) and whether to show │ */
@@ -71,7 +71,7 @@ class TreeList implements Component {
 		this.applyFilter();
 
 		// Start with current leaf selected
-		const leafIndex = this.filteredNodes.findIndex((n) => n.node.entry.id === currentLeafId);
+		const leafIndex = this.filteredNodes.findIndex(n => n.node.entry.id === currentLeafId);
 		if (leafIndex !== -1) {
 			this.selectedIndex = leafIndex;
 		} else {
@@ -236,7 +236,7 @@ class TreeList implements Component {
 
 		const searchTokens = this.searchQuery.toLowerCase().split(/\s+/).filter(Boolean);
 
-		this.filteredNodes = this.flatNodes.filter((flatNode) => {
+		this.filteredNodes = this.flatNodes.filter(flatNode => {
 			const entry = flatNode.node.entry;
 			const isCurrentLeaf = entry.id === this.currentLeafId;
 
@@ -289,7 +289,7 @@ class TreeList implements Component {
 			// Apply search filter
 			if (searchTokens.length > 0) {
 				const nodeText = this.getSearchableText(flatNode.node).toLowerCase();
-				return searchTokens.every((token) => nodeText.includes(token));
+				return searchTokens.every(token => nodeText.includes(token));
 			}
 
 			return true;
@@ -297,7 +297,7 @@ class TreeList implements Component {
 
 		// Try to preserve cursor on the same node after filtering
 		if (previouslySelectedId) {
-			const newIndex = this.filteredNodes.findIndex((n) => n.node.entry.id === previouslySelectedId);
+			const newIndex = this.filteredNodes.findIndex(n => n.node.entry.id === previouslySelectedId);
 			if (newIndex !== -1) {
 				this.selectedIndex = newIndex;
 				return;
@@ -442,7 +442,7 @@ class TreeList implements Component {
 				const posInLevel = i % 3;
 
 				// Check if there's a gutter at this level
-				const gutter = flatNode.gutters.find((g) => g.position === level);
+				const gutter = flatNode.gutters.find(g => g.position === level);
 				if (gutter) {
 					if (posInLevel === 0) {
 						prefixChars.push(gutter.show ? theme.tree.vertical : " ");
@@ -537,7 +537,7 @@ class TreeList implements Component {
 						? entry.content
 						: entry.content
 								.filter((c): c is { type: "text"; text: string } => c.type === "text")
-								.map((c) => c.text)
+								.map(c => c.text)
 								.join("");
 				result = theme.fg("customMessageLabel", `[${entry.customType}]: `) + normalize(content);
 				break;
@@ -713,7 +713,7 @@ class TreeList implements Component {
 				this.onLabelEdit(selected.node.entry.id, selected.node.label);
 			}
 		} else {
-			const hasControlChars = [...keyData].some((ch) => {
+			const hasControlChars = [...keyData].some(ch => {
 				const code = ch.charCodeAt(0);
 				return code < 32 || code === 0x7f || (code >= 0x80 && code <= 0x9f);
 			});
@@ -764,7 +764,7 @@ class LabelInput implements Component {
 		const indent = "  ";
 		const availableWidth = width - indent.length;
 		lines.push(truncateToWidth(`${indent}${theme.fg("muted", "Label (empty to remove):")}`, width));
-		lines.push(...this.input.render(availableWidth).map((line) => truncateToWidth(`${indent}${line}`, width)));
+		lines.push(...this.input.render(availableWidth).map(line => truncateToWidth(`${indent}${line}`, width)));
 		lines.push(truncateToWidth(`${indent}${theme.fg("dim", "enter: save  esc: cancel")}`, width));
 		return lines;
 	}

package/src/modes/components/ttsr-notification.ts

@@ -1,6 +1,6 @@
-import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Box, Container, Spacer, Text } from "@oh-my-pi/pi-tui";
+import type { Rule } from "../../capability/rule";
+import { theme } from "../../modes/theme/theme";
 
 /**
  * Component that renders a TTSR (Time Traveling Stream Rules) notification.
@@ -18,7 +18,7 @@ export class TtsrNotificationComponent extends Container {
 		this.addChild(new Spacer(1));
 
 		// Use inverse warning color for yellow background effect
-		this.box = new Box(1, 1, (t) => theme.inverse(theme.fg("warning", t)));
+		this.box = new Box(1, 1, t => theme.inverse(theme.fg("warning", t)));
 		this.addChild(this.box);
 
 		this.rebuild();
@@ -39,7 +39,7 @@ export class TtsrNotificationComponent extends Container {
 		this.box.clear();
 
 		// Build header: warning symbol + rule name + rewind icon
-		const ruleNames = this.rules.map((r) => theme.bold(r.name)).join(", ");
+		const ruleNames = this.rules.map(r => theme.bold(r.name)).join(", ");
 		const label = this.rules.length === 1 ? "rule" : "rules";
 		const header = `${theme.icon.warning} Injecting ${label}: ${ruleNames}`;
 
@@ -70,7 +70,7 @@ export class TtsrNotificationComponent extends Container {
 
 		// Show expand hint if collapsed and there's more content
 		if (!this._expanded) {
-			const hasMoreContent = this.rules.some((r) => {
+			const hasMoreContent = this.rules.some(r => {
 				const desc = r.description || r.content;
 				return desc && desc.split("\n").length > 2;
 			});

package/src/modes/components/user-message-selector.ts

@@ -1,5 +1,5 @@
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { type Component, Container, matchesKey, Spacer, Text, truncateToWidth } from "@oh-my-pi/pi-tui";
+import { theme } from "../../modes/theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
 interface UserMessageItem {

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

@@ -1,5 +1,5 @@
-import { getMarkdownTheme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { Container, Markdown, Spacer } from "@oh-my-pi/pi-tui";
+import { getMarkdownTheme, theme } from "../../modes/theme/theme";
 
 /**
  * Component that renders a user message

package/src/modes/components/visual-truncate.ts

@@ -2,7 +2,6 @@
  * Shared utility for truncating text to visual lines (accounting for line wrapping).
  * Used by both tool-execution.ts and bash-execution.ts for consistent behavior.
  */
-
 import { Text } from "@oh-my-pi/pi-tui";
 
 export interface VisualTruncateResult {

package/src/modes/components/welcome.ts

@@ -1,6 +1,6 @@
-import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { APP_NAME } from "../../config";
+import { theme } from "../../modes/theme/theme";
 
 export interface RecentSession {
 	name: string;
@@ -65,14 +65,14 @@ export class WelcomeComponent implements Component {
 		const piLogo = ["▀████████████▀", " ╘███    ███  ", "  ███    ███  ", "  ███    ███  ", " ▄███▄  ▄███▄ "];
 
 		// Apply gradient to logo
-		const logoColored = piLogo.map((line) => this.gradientLine(line));
+		const logoColored = piLogo.map(line => this.gradientLine(line));
 
 		// Left column - centered content
 		const leftLines = [
 			"",
 			this.centerText(theme.bold("Welcome back!"), leftCol),
 			"",
-			...logoColored.map((l) => this.centerText(l, leftCol)),
+			...logoColored.map(l => this.centerText(l, leftCol)),
 			"",
 			this.centerText(theme.fg("muted", this.modelName), leftCol),
 			this.centerText(theme.fg("borderMuted", this.providerName), leftCol),