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

package/src/modes/theme/theme.ts

@@ -1,16 +1,17 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { getCustomThemesDir } from "@oh-my-pi/pi-coding-agent/config";
 import type { EditorTheme, MarkdownTheme, SelectListTheme, SymbolTheme } from "@oh-my-pi/pi-tui";
-import { logger } from "@oh-my-pi/pi-utils";
+import { adjustHsv, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
 import { highlight, supportsLanguage } from "cli-highlight";
+import { getCustomThemesDir } from "../../config";
 // Embed theme JSON files at build time
 import darkThemeJson from "./dark.json" with { type: "json" };
 import { defaultThemes } from "./defaults";
 import lightThemeJson from "./light.json" with { type: "json" };
+import { getMermaidImage } from "./mermaid-cache";
 
 // ============================================================================
 // Symbol Presets
@@ -1599,16 +1600,18 @@ function getBuiltinThemes(): Record<string, ThemeJson> {
 	return BUILTIN_THEMES;
 }
 
-export function getAvailableThemes(): string[] {
+export async function getAvailableThemes(): Promise<string[]> {
 	const themes = new Set<string>(Object.keys(getBuiltinThemes()));
 	const customThemesDir = getCustomThemesDir();
-	if (fs.existsSync(customThemesDir)) {
-		const files = fs.readdirSync(customThemesDir);
+	try {
+		const files = await fs.promises.readdir(customThemesDir);
 		for (const file of files) {
 			if (file.endsWith(".json")) {
 				themes.add(file.slice(0, -5));
 			}
 		}
+	} catch {
+		// Directory doesn't exist or isn't readable
 	}
 	return Array.from(themes).sort();
 }
@@ -1618,7 +1621,7 @@ export interface ThemeInfo {
 	path: string | undefined;
 }
 
-export function getAvailableThemesWithPaths(): ThemeInfo[] {
+export async function getAvailableThemesWithPaths(): Promise<ThemeInfo[]> {
 	const result: ThemeInfo[] = [];
 
 	// Built-in themes (embedded, no file path)
@@ -1628,31 +1631,37 @@ export function getAvailableThemesWithPaths(): ThemeInfo[] {
 
 	// Custom themes
 	const customThemesDir = getCustomThemesDir();
-	if (fs.existsSync(customThemesDir)) {
-		for (const file of fs.readdirSync(customThemesDir)) {
+	try {
+		const files = await fs.promises.readdir(customThemesDir);
+		for (const file of files) {
 			if (file.endsWith(".json")) {
 				const name = file.slice(0, -5);
-				if (!result.some((themeInfo) => themeInfo.name === name)) {
+				if (!result.some(themeInfo => themeInfo.name === name)) {
 					result.push({ name, path: path.join(customThemesDir, file) });
 				}
 			}
 		}
+	} catch {
+		// Directory doesn't exist or isn't readable
 	}
 
 	return result.sort((a, b) => a.name.localeCompare(b.name));
 }
 
-function loadThemeJson(name: string): ThemeJson {
+async function loadThemeJson(name: string): Promise<ThemeJson> {
 	const builtinThemes = getBuiltinThemes();
 	if (name in builtinThemes) {
 		return builtinThemes[name];
 	}
 	const customThemesDir = getCustomThemesDir();
 	const themePath = path.join(customThemesDir, `${name}.json`);
-	if (!fs.existsSync(themePath)) {
-		throw new Error(`Theme not found: ${name}`);
+	let content: string;
+	try {
+		content = await Bun.file(themePath).text();
+	} catch (err) {
+		if (isEnoent(err)) throw new Error(`Theme not found: ${name}`);
+		throw err;
 	}
-	const content = fs.readFileSync(themePath, "utf-8");
 	let json: unknown;
 	try {
 		json = JSON.parse(content);
@@ -1677,7 +1686,7 @@ function loadThemeJson(name: string): ThemeJson {
 		let errorMessage = `Invalid theme "${name}":\n`;
 		if (missingColors.length > 0) {
 			errorMessage += `\nMissing required color tokens:\n`;
-			errorMessage += missingColors.map((c) => `  - ${c}`).join("\n");
+			errorMessage += missingColors.map(c => `  - ${c}`).join("\n");
 			errorMessage += `\n\nPlease add these colors to your theme's "colors" object.`;
 			errorMessage += `\nSee the built-in themes (dark.json, light.json) for reference values.`;
 		}
@@ -1690,9 +1699,27 @@ function loadThemeJson(name: string): ThemeJson {
 	return json as ThemeJson;
 }
 
-function createTheme(themeJson: ThemeJson, mode?: ColorMode, symbolPresetOverride?: SymbolPreset): Theme {
+interface CreateThemeOptions {
+	mode?: ColorMode;
+	symbolPresetOverride?: SymbolPreset;
+	colorBlindMode?: boolean;
+}
+
+/** HSV adjustment to shift green toward blue for colorblind mode (red-green colorblindness) */
+const COLORBLIND_ADJUSTMENT = { h: 60, s: 0.71 };
+
+function createTheme(themeJson: ThemeJson, options: CreateThemeOptions = {}): Theme {
+	const { mode, symbolPresetOverride, colorBlindMode } = options;
 	const colorMode = mode ?? detectColorMode();
 	const resolvedColors = resolveThemeColors(themeJson.colors, themeJson.vars);
+
+	if (colorBlindMode) {
+		const added = resolvedColors.toolDiffAdded;
+		if (typeof added === "string" && added.startsWith("#")) {
+			resolvedColors.toolDiffAdded = adjustHsv(added, COLORBLIND_ADJUSTMENT);
+		}
+	}
+
 	const fgColors: Record<ThemeColor, string | number> = {} as Record<ThemeColor, string | number>;
 	const bgColors: Record<ThemeBg, string | number> = {} as Record<ThemeBg, string | number>;
 	const bgColorKeys: Set<string> = new Set([
@@ -1717,14 +1744,14 @@ function createTheme(themeJson: ThemeJson, mode?: ColorMode, symbolPresetOverrid
 	return new Theme(fgColors, bgColors, colorMode, symbolPreset, symbolOverrides);
 }
 
-function loadTheme(name: string, mode?: ColorMode, symbolPresetOverride?: SymbolPreset): Theme {
-	const themeJson = loadThemeJson(name);
-	return createTheme(themeJson, mode, symbolPresetOverride);
+async function loadTheme(name: string, options: CreateThemeOptions = {}): Promise<Theme> {
+	const themeJson = await loadThemeJson(name);
+	return createTheme(themeJson, options);
 }
 
-export function getThemeByName(name: string): Theme | undefined {
+export async function getThemeByName(name: string): Promise<Theme | undefined> {
 	try {
-		return loadTheme(name);
+		return await loadTheme(name);
 	} catch {
 		return undefined;
 	}
@@ -1756,32 +1783,49 @@ function getDefaultTheme(): string {
 export let theme: Theme;
 let currentThemeName: string | undefined;
 let currentSymbolPresetOverride: SymbolPreset | undefined;
+let currentColorBlindMode: boolean = false;
 let themeWatcher: fs.FSWatcher | undefined;
 let onThemeChangeCallback: (() => void) | undefined;
 
-export function initTheme(themeName?: string, enableWatcher: boolean = false, symbolPreset?: SymbolPreset): void {
+function getCurrentThemeOptions(): CreateThemeOptions {
+	return {
+		symbolPresetOverride: currentSymbolPresetOverride,
+		colorBlindMode: currentColorBlindMode,
+	};
+}
+
+export async function initTheme(
+	themeName?: string,
+	enableWatcher: boolean = false,
+	symbolPreset?: SymbolPreset,
+	colorBlindMode?: boolean,
+): Promise<void> {
 	const name = themeName ?? getDefaultTheme();
 	currentThemeName = name;
 	currentSymbolPresetOverride = symbolPreset;
+	currentColorBlindMode = colorBlindMode ?? false;
 	try {
-		theme = loadTheme(name, undefined, symbolPreset);
+		theme = await loadTheme(name, getCurrentThemeOptions());
 		if (enableWatcher) {
-			startThemeWatcher();
+			await startThemeWatcher();
 		}
 	} catch (err) {
 		logger.debug("Theme loading failed, falling back to dark theme", { error: String(err) });
 		currentThemeName = "dark";
-		theme = loadTheme("dark", undefined, symbolPreset);
+		theme = await loadTheme("dark", getCurrentThemeOptions());
 		// Don't start watcher for fallback theme
 	}
 }
 
-export function setTheme(name: string, enableWatcher: boolean = false): { success: boolean; error?: string } {
+export async function setTheme(
+	name: string,
+	enableWatcher: boolean = false,
+): Promise<{ success: boolean; error?: string }> {
 	currentThemeName = name;
 	try {
-		theme = loadTheme(name, undefined, currentSymbolPresetOverride);
+		theme = await loadTheme(name, getCurrentThemeOptions());
 		if (enableWatcher) {
-			startThemeWatcher();
+			await startThemeWatcher();
 		}
 		if (onThemeChangeCallback) {
 			onThemeChangeCallback();
@@ -1790,7 +1834,7 @@ export function setTheme(name: string, enableWatcher: boolean = false): { succes
 	} catch (error) {
 		// Theme is invalid - fall back to dark theme
 		currentThemeName = "dark";
-		theme = loadTheme("dark", undefined, currentSymbolPresetOverride);
+		theme = await loadTheme("dark", getCurrentThemeOptions());
 		// Don't start watcher for fallback theme
 		return {
 			success: false,
@@ -1811,14 +1855,14 @@ export function setThemeInstance(themeInstance: Theme): void {
 /**
  * Set the symbol preset override, recreating the theme with the new preset.
  */
-export function setSymbolPreset(preset: SymbolPreset): void {
+export async function setSymbolPreset(preset: SymbolPreset): Promise<void> {
 	currentSymbolPresetOverride = preset;
 	if (currentThemeName) {
 		try {
-			theme = loadTheme(currentThemeName, undefined, preset);
+			theme = await loadTheme(currentThemeName, getCurrentThemeOptions());
 		} catch {
 			// Fall back to dark theme with new preset
-			theme = loadTheme("dark", undefined, preset);
+			theme = await loadTheme("dark", getCurrentThemeOptions());
 		}
 		if (onThemeChangeCallback) {
 			onThemeChangeCallback();
@@ -1833,6 +1877,32 @@ export function getSymbolPresetOverride(): SymbolPreset | undefined {
 	return currentSymbolPresetOverride;
 }
 
+/**
+ * Set color blind mode, recreating the theme with the new setting.
+ * When enabled, uses blue instead of green for diff additions.
+ */
+export async function setColorBlindMode(enabled: boolean): Promise<void> {
+	currentColorBlindMode = enabled;
+	if (currentThemeName) {
+		try {
+			theme = await loadTheme(currentThemeName, getCurrentThemeOptions());
+		} catch {
+			// Fall back to dark theme
+			theme = await loadTheme("dark", getCurrentThemeOptions());
+		}
+		if (onThemeChangeCallback) {
+			onThemeChangeCallback();
+		}
+	}
+}
+
+/**
+ * Get the current color blind mode setting.
+ */
+export function getColorBlindMode(): boolean {
+	return currentColorBlindMode;
+}
+
 export function onThemeChange(callback: () => void): void {
 	onThemeChangeCallback = callback;
 }
@@ -1851,7 +1921,7 @@ export function isValidSymbolPreset(preset: string): preset is SymbolPreset {
 	return preset === "unicode" || preset === "nerd" || preset === "ascii";
 }
 
-function startThemeWatcher(): void {
+async function startThemeWatcher(): Promise<void> {
 	// Stop existing watcher if any
 	if (themeWatcher) {
 		themeWatcher.close();
@@ -1872,34 +1942,40 @@ function startThemeWatcher(): void {
 	}
 
 	try {
-		themeWatcher = fs.watch(themeFile, (eventType) => {
+		themeWatcher = fs.watch(themeFile, eventType => {
 			if (eventType === "change") {
 				// Debounce rapid changes
 				setTimeout(() => {
-					try {
-						// Reload the theme with current symbol preset override
-						theme = loadTheme(currentThemeName!, undefined, currentSymbolPresetOverride);
-						// Notify callback (to invalidate UI)
-						if (onThemeChangeCallback) {
-							onThemeChangeCallback();
-						}
-					} catch (err) {
-						logger.debug("Theme reload error during file change", { error: String(err) });
-					}
+					loadTheme(currentThemeName!, getCurrentThemeOptions())
+						.then(loadedTheme => {
+							theme = loadedTheme;
+							if (onThemeChangeCallback) {
+								onThemeChangeCallback();
+							}
+						})
+						.catch(err => {
+							logger.debug("Theme reload error during file change", { error: String(err) });
+						});
 				}, 100);
 			} else if (eventType === "rename") {
 				// File was deleted or renamed - fall back to default theme
 				setTimeout(() => {
 					if (!fs.existsSync(themeFile)) {
 						currentThemeName = "dark";
-						theme = loadTheme("dark");
+						loadTheme("dark", getCurrentThemeOptions())
+							.then(loadedTheme => {
+								theme = loadedTheme;
+								if (onThemeChangeCallback) {
+									onThemeChangeCallback();
+								}
+							})
+							.catch(err => {
+								logger.debug("Theme reload error during rename fallback", { error: String(err) });
+							});
 						if (themeWatcher) {
 							themeWatcher.close();
 							themeWatcher = undefined;
 						}
-						if (onThemeChangeCallback) {
-							onThemeChangeCallback();
-						}
 					}
 				}, 100);
 			}
@@ -1970,10 +2046,10 @@ function ansi256ToHex(index: number): string {
  * Get resolved theme colors as CSS-compatible hex strings.
  * Used by HTML export to generate CSS custom properties.
  */
-export function getResolvedThemeColors(themeName?: string): Record<string, string> {
+export async function getResolvedThemeColors(themeName?: string): Promise<Record<string, string>> {
 	const name = themeName ?? getDefaultTheme();
 	const isLight = name === "light";
-	const themeJson = loadThemeJson(name);
+	const themeJson = await loadThemeJson(name);
 	const resolved = resolveThemeColors(themeJson.colors, themeJson.vars);
 
 	// Default text color for empty values (terminal uses default fg color)
@@ -2005,14 +2081,14 @@ export function isLightTheme(themeName?: string): boolean {
  * Get explicit export colors from theme JSON, if specified.
  * Returns undefined for each color that isn't explicitly set.
  */
-export function getThemeExportColors(themeName?: string): {
+export async function getThemeExportColors(themeName?: string): Promise<{
 	pageBg?: string;
 	cardBg?: string;
 	infoBg?: string;
-} {
+}> {
 	const name = themeName ?? getDefaultTheme();
 	try {
-		const themeJson = loadThemeJson(name);
+		const themeJson = await loadThemeJson(name);
 		const exportSection = themeJson.export;
 		if (!exportSection) return {};
 
@@ -2224,6 +2300,7 @@ export function getMarkdownTheme(): MarkdownTheme {
 		underline: (text: string) => theme.underline(text),
 		strikethrough: (text: string) => chalk.strikethrough(text),
 		symbols: getSymbolTheme(),
+		getMermaidImage,
 		highlightCode: (code: string, lang?: string): string[] => {
 			// Validate language before highlighting to avoid stderr spam from cli-highlight
 			const validLang = lang && supportsLanguage(lang) ? lang : undefined;
@@ -2235,7 +2312,7 @@ export function getMarkdownTheme(): MarkdownTheme {
 			try {
 				return highlight(code, opts).split("\n");
 			} catch {
-				return code.split("\n").map((line) => theme.fg("mdCodeBlock", line));
+				return code.split("\n").map(line => theme.fg("mdCodeBlock", line));
 			}
 		},
 	};

package/src/modes/types.ts

@@ -1,14 +1,14 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, UsageReport } from "@oh-my-pi/pi-ai";
-import type { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
-import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { ExtensionUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/index";
-import type { CompactOptions } from "@oh-my-pi/pi-coding-agent/extensibility/extensions/types";
-import type { MCPManager } from "@oh-my-pi/pi-coding-agent/mcp/index";
-import type { AgentSession, AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import type { HistoryStorage } from "@oh-my-pi/pi-coding-agent/session/history-storage";
-import type { SessionContext, SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import type { Component, Container, Loader, Spacer, Text, TUI } from "@oh-my-pi/pi-tui";
+import type { KeybindingsManager } from "../config/keybindings";
+import type { SettingsManager } from "../config/settings-manager";
+import type { ExtensionUIContext } from "../extensibility/extensions";
+import type { CompactOptions } from "../extensibility/extensions/types";
+import type { MCPManager } from "../mcp";
+import type { AgentSession, AgentSessionEvent } from "../session/agent-session";
+import type { HistoryStorage } from "../session/history-storage";
+import type { SessionContext, SessionManager } from "../session/session-manager";
 import type { AssistantMessageComponent } from "./components/assistant-message";
 import type { BashExecutionComponent } from "./components/bash-execution";
 import type { CustomEditor } from "./components/custom-editor";
@@ -132,9 +132,9 @@ export interface InteractiveModeContext {
 	handleExportCommand(text: string): Promise<void>;
 	handleShareCommand(): Promise<void>;
 	handleCopyCommand(): Promise<void>;
-	handleSessionCommand(): void;
+	handleSessionCommand(): Promise<void>;
 	handleUsageCommand(reports?: UsageReport[] | null): Promise<void>;
-	handleChangelogCommand(): void;
+	handleChangelogCommand(): Promise<void>;
 	handleHotkeysCommand(): void;
 	handleDumpCommand(): Promise<void>;
 	handleClearCommand(): Promise<void>;

package/src/modes/utils/ui-helpers.ts

@@ -1,20 +1,20 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Message } from "@oh-my-pi/pi-ai";
-import { AssistantMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/assistant-message";
-import { BashExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/bash-execution";
-import { BranchSummaryMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/branch-summary-message";
-import { CompactionSummaryMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/compaction-summary-message";
-import { CustomMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/custom-message";
-import { DynamicBorder } from "@oh-my-pi/pi-coding-agent/modes/components/dynamic-border";
-import { PythonExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/python-execution";
-import { ReadToolGroupComponent } from "@oh-my-pi/pi-coding-agent/modes/components/read-tool-group";
-import { ToolExecutionComponent } from "@oh-my-pi/pi-coding-agent/modes/components/tool-execution";
-import { UserMessageComponent } from "@oh-my-pi/pi-coding-agent/modes/components/user-message";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { CompactionQueuedMessage, InteractiveModeContext } from "@oh-my-pi/pi-coding-agent/modes/types";
-import type { CustomMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
-import type { SessionContext } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import { Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
+import { AssistantMessageComponent } from "../../modes/components/assistant-message";
+import { BashExecutionComponent } from "../../modes/components/bash-execution";
+import { BranchSummaryMessageComponent } from "../../modes/components/branch-summary-message";
+import { CompactionSummaryMessageComponent } from "../../modes/components/compaction-summary-message";
+import { CustomMessageComponent } from "../../modes/components/custom-message";
+import { DynamicBorder } from "../../modes/components/dynamic-border";
+import { PythonExecutionComponent } from "../../modes/components/python-execution";
+import { ReadToolGroupComponent } from "../../modes/components/read-tool-group";
+import { ToolExecutionComponent } from "../../modes/components/tool-execution";
+import { UserMessageComponent } from "../../modes/components/user-message";
+import { theme } from "../../modes/theme/theme";
+import type { CompactionQueuedMessage, InteractiveModeContext } from "../../modes/types";
+import type { CustomMessage } from "../../session/messages";
+import type { SessionContext } from "../../session/session-manager";
 
 type TextBlock = { type: "text"; text: string };
 
@@ -33,7 +33,7 @@ export class UiHelpers {
 			typeof message.content === "string"
 				? [{ type: "text", text: message.content }]
 				: message.content.filter((content): content is TextBlock => content.type === "text");
-		return textBlocks.map((block) => block.text).join("");
+		return textBlocks.map(block => block.text).join("");
 	}
 
 	/**
@@ -306,7 +306,7 @@ export class UiHelpers {
 
 	showNewVersionNotification(newVersion: string): void {
 		this.ctx.chatContainer.addChild(new Spacer(1));
-		this.ctx.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
 		this.ctx.chatContainer.addChild(
 			new Text(
 				theme.bold(theme.fg("warning", "Update Available")) +
@@ -317,7 +317,7 @@ export class UiHelpers {
 				0,
 			),
 		);
-		this.ctx.chatContainer.addChild(new DynamicBorder((text) => theme.fg("warning", text)));
+		this.ctx.chatContainer.addChild(new DynamicBorder(text => theme.fg("warning", text)));
 		this.ctx.ui.requestRender();
 	}
 

package/src/patch/applicator.ts

@@ -4,10 +4,9 @@
  * Applies parsed diff hunks to file content using fuzzy matching
  * for robust handling of whitespace and formatting differences.
  */
-
-import { mkdirSync, unlinkSync } from "node:fs";
-import { dirname } from "node:path";
-import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { resolveToCwd } from "../tools/path-utils";
 import { DEFAULT_FUZZY_THRESHOLD, findContextLine, findMatch, seekSequence } from "./fuzzy";
 import {
 	adjustIndentation,
@@ -51,10 +50,10 @@ export const defaultFileSystem: FileSystem = {
 		await Bun.write(path, content);
 	},
 	async delete(path: string): Promise<void> {
-		unlinkSync(path);
+		await fs.unlink(path);
 	},
 	async mkdir(path: string): Promise<void> {
-		mkdirSync(path, { recursive: true });
+		await fs.mkdir(path, { recursive: true });
 	},
 };
 
@@ -204,14 +203,14 @@ function adjustLinesIndentation(patternLines: string[], actualLines: string[], n
 		deltas.push(aIndent - pIndent);
 	}
 
-	if (deltas.length > 0 && deltas.every((value) => value === deltas[0])) {
+	if (deltas.length > 0 && deltas.every(value => value === deltas[0])) {
 		delta = deltas[0];
 	}
 
 	// Track which actual lines we've used to handle duplicate content correctly
 	const usedActualLines = new Map<string, number>(); // trimmed content -> count used
 
-	return newLines.map((newLine) => {
+	return newLines.map(newLine => {
 		if (newLine.trim().length === 0) {
 			return newLine;
 		}
@@ -277,7 +276,7 @@ function trimCommonContext(oldLines: string[], newLines: string[]): HunkVariant
 }
 
 function collapseConsecutiveSharedLines(oldLines: string[], newLines: string[]): HunkVariant | undefined {
-	const shared = new Set(oldLines.filter((line) => newLines.includes(line)));
+	const shared = new Set(oldLines.filter(line => newLines.includes(line)));
 	const collapse = (lines: string[]): string[] => {
 		const out: string[] = [];
 		let i = 0;
@@ -302,7 +301,7 @@ function collapseConsecutiveSharedLines(oldLines: string[], newLines: string[]):
 }
 
 function collapseRepeatedBlocks(oldLines: string[], newLines: string[]): HunkVariant | undefined {
-	const shared = new Set(oldLines.filter((line) => newLines.includes(line)));
+	const shared = new Set(oldLines.filter(line => newLines.includes(line)));
 	const collapse = (lines: string[]): string[] => {
 		const output = [...lines];
 		let changed = false;
@@ -313,7 +312,7 @@ function collapseRepeatedBlocks(oldLines: string[], newLines: string[]): HunkVar
 				const first = output.slice(i, i + size);
 				const second = output.slice(i + size, i + size * 2);
 				if (first.length !== second.length || first.length === 0) continue;
-				if (!first.every((line) => shared.has(line))) continue;
+				if (!first.every(line => shared.has(line))) continue;
 				let same = true;
 				for (let idx = 0; idx < size; idx++) {
 					if (first[idx] !== second[idx]) {
@@ -379,7 +378,7 @@ function buildFallbackVariants(hunk: DiffHunk): HunkVariant[] {
 	if (singleLine) variants.push(singleLine);
 
 	const seen = new Set<string>();
-	return variants.filter((variant) => {
+	return variants.filter(variant => {
 		if (variant.oldLines.length === 0 && variant.newLines.length === 0) return false;
 		const key = `${variant.oldLines.join("\n")}||${variant.newLines.join("\n")}`;
 		if (seen.has(key)) return false;
@@ -443,8 +442,8 @@ function findHierarchicalContext(
 	if (context.includes("\n")) {
 		const parts = context
 			.split("\n")
-			.map((p) => p.trim())
-			.filter((p) => p.length > 0);
+			.map(p => p.trim())
+			.filter(p => p.length > 0);
 		let currentStart = startFrom;
 
 		for (let i = 0; i < parts.length; i++) {
@@ -488,7 +487,7 @@ function findHierarchicalContext(
 	}
 
 	// Try literal context first
-	const spaceParts = context.split(/\s+/).filter((p) => p.length > 0);
+	const spaceParts = context.split(/\s+/).filter(p => p.length > 0);
 	const hasSignatureChars = /[(){}[\]]/.test(context);
 	if (!hasSignatureChars && spaceParts.length > 2) {
 		const outer = spaceParts.slice(0, -1).join(" ");
@@ -899,7 +898,7 @@ function computeReplacements(
 			for (const variant of buildFallbackVariants(hunk)) {
 				if (variant.oldLines.length !== 1 || variant.newLines.length !== 1) continue;
 				const removedLine = variant.oldLines[0];
-				const hasSharedDuplicate = hunk.newLines.some((line) => line.trim() === removedLine.trim());
+				const hasSharedDuplicate = hunk.newLines.some(line => line.trim() === removedLine.trim());
 				const adjacentIndex = findContextRelativeMatch(
 					originalLines,
 					removedLine,
@@ -922,7 +921,7 @@ function computeReplacements(
 				if (line.trim() === trimmed) occurrenceCount++;
 			}
 			if (occurrenceCount > 1) {
-				const hasSharedDuplicate = hunk.newLines.some((line) => line.trim() === trimmed);
+				const hasSharedDuplicate = hunk.newLines.some(line => line.trim() === trimmed);
 				const contextMatch = findContextRelativeMatch(originalLines, pattern[0], contextIndex, hasSharedDuplicate);
 				if (contextMatch !== undefined) {
 					searchResult = { index: contextMatch, confidence: searchResult.confidence ?? 0.95 };
@@ -1113,7 +1112,7 @@ async function applyNormalizedPatch(
 		const content = normalizedContent.endsWith("\n") ? normalizedContent : `${normalizedContent}\n`;
 
 		if (!dryRun) {
-			const parentDir = dirname(absolutePath);
+			const parentDir = path.dirname(absolutePath);
 			if (parentDir && parentDir !== ".") {
 				await fs.mkdir(parentDir);
 			}
@@ -1182,7 +1181,7 @@ async function applyNormalizedPatch(
 
 	if (!dryRun) {
 		if (isMove) {
-			const parentDir = dirname(destPath);
+			const parentDir = path.dirname(destPath);
 			if (parentDir && parentDir !== ".") {
 				await fs.mkdir(parentDir);
 			}

package/src/patch/diff.ts

@@ -4,9 +4,8 @@
  * Provides diff string generation and the replace-mode edit logic
  * used when not in patch mode.
  */
-
-import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
 import * as Diff from "diff";
+import { resolveToCwd } from "../tools/path-utils";
 import { previewPatch } from "./applicator";
 import { DEFAULT_FUZZY_THRESHOLD, findMatch } from "./fuzzy";
 import { adjustIndentation, normalizeToLF, stripBom } from "./normalize";

package/src/patch/fuzzy.ts

@@ -4,7 +4,6 @@
  * Provides both character-level and line-level fuzzy matching with progressive
  * fallback strategies for finding text in files.
  */
-
 import { countLeadingWhitespace, normalizeForFuzzy, normalizeUnicode } from "./normalize";
 import type { ContextLineResult, FuzzyMatch, MatchOutcome, SequenceSearchResult } from "./types";
 
@@ -89,7 +88,7 @@ function computeRelativeIndentDepths(lines: string[]): number[] {
 		}
 	}
 	const minIndent = nonEmptyIndents.length > 0 ? Math.min(...nonEmptyIndents) : 0;
-	const indentSteps = nonEmptyIndents.map((indent) => indent - minIndent).filter((step) => step > 0);
+	const indentSteps = nonEmptyIndents.map(indent => indent - minIndent).filter(step => step > 0);
 	const indentUnit = indentSteps.length > 0 ? Math.min(...indentSteps) : 1;
 
 	return lines.map((line, index) => {