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

package/src/config/keybindings.ts

@@ -1,6 +1,4 @@
-import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
-import { getAgentDir } from "@oh-my-pi/pi-coding-agent/config";
+import * as path from "node:path";
 import {
 	DEFAULT_EDITOR_KEYBINDINGS,
 	type EditorAction,
@@ -11,6 +9,7 @@ import {
 	setEditorKeybindings,
 } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
+import { getAgentDir } from "../config";
 
 /**
  * Application-level actions (coding agent specific).
@@ -162,7 +161,7 @@ export class KeybindingsManager {
 	 * Create from config file and set up editor keybindings.
 	 */
 	static async create(agentDir: string = getAgentDir()): Promise<KeybindingsManager> {
-		const configPath = join(agentDir, "keybindings.json");
+		const configPath = path.join(agentDir, "keybindings.json");
 		const config = await KeybindingsManager.loadFromFile(configPath);
 		const manager = new KeybindingsManager(config);
 
@@ -186,9 +185,8 @@ export class KeybindingsManager {
 	}
 
 	private static async loadFromFile(path: string): Promise<KeybindingsConfig> {
-		if (!existsSync(path)) return {};
 		try {
-			return JSON.parse(readFileSync(path, "utf-8"));
+			return await Bun.file(path).json();
 		} catch (error) {
 			logger.warn("Failed to parse keybindings config", { path, error: String(error) });
 			return {};
@@ -203,7 +201,7 @@ export class KeybindingsManager {
 			const keyArray = Array.isArray(keys) ? keys : [keys];
 			this.appActionToKeys.set(
 				action as AppAction,
-				keyArray.map((key) => normalizeKeyId(key as KeyId)),
+				keyArray.map(key => normalizeKeyId(key as KeyId)),
 			);
 		}
 
@@ -213,7 +211,7 @@ export class KeybindingsManager {
 			const keyArray = Array.isArray(keys) ? keys : [keys];
 			this.appActionToKeys.set(
 				action,
-				keyArray.map((key) => normalizeKeyId(key as KeyId)),
+				keyArray.map(key => normalizeKeyId(key as KeyId)),
 			);
 		}
 	}

package/src/config/model-registry.ts

@@ -1,9 +1,8 @@
 /**
  * Model registry - manages built-in and custom models, provides API key resolution.
  */
-
-import { existsSync, readFileSync } from "node:fs";
-import { extname } from "node:path";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import {
 	type Api,
 	getGitHubCopilotBaseUrl,
@@ -12,11 +11,11 @@ import {
 	type Model,
 	normalizeDomain,
 } from "@oh-my-pi/pi-ai";
-import type { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
-import { logger } from "@oh-my-pi/pi-utils";
+import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import AjvModule from "ajv";
 import { YAML } from "bun";
+import type { AuthStorage } from "../session/auth-storage";
 
 const Ajv = (AjvModule as any).default || AjvModule;
 
@@ -104,10 +103,12 @@ interface CustomModelsResult {
 	/** Providers with only baseUrl/headers override (no custom models) */
 	overrides: Map<string, ProviderOverride>;
 	error: string | undefined;
+	/** Whether the file was found (true) or didn't exist (false) */
+	found: boolean;
 }
 
 function emptyCustomModelsResult(error?: string): CustomModelsResult {
-	return { models: [], replacedProviders: new Set(), overrides: new Map(), error };
+	return { models: [], replacedProviders: new Set(), overrides: new Map(), error, found: false };
 }
 
 /**
@@ -139,7 +140,7 @@ export class ModelRegistry {
 		private fallbackPaths: string[] = [],
 	) {
 		// Set up fallback resolver for custom provider API keys
-		this.authStorage.setFallbackResolver((provider) => {
+		this.authStorage.setFallbackResolver(provider => {
 			const keyConfig = this.customProviderApiKeys.get(provider);
 			if (keyConfig) {
 				return resolveApiKeyConfig(keyConfig);
@@ -161,7 +162,7 @@ export class ModelRegistry {
 		instance.customProviderApiKeys = new Map(Object.entries(data.customProviderApiKeys ?? {}));
 		instance.loadError = data.loadError;
 
-		authStorage.setFallbackResolver((provider) => {
+		authStorage.setFallbackResolver(provider => {
 			const keyConfig = instance.customProviderApiKeys.get(provider);
 			if (keyConfig) {
 				return resolveApiKeyConfig(keyConfig);
@@ -203,7 +204,7 @@ export class ModelRegistry {
 		return this.loadError;
 	}
 
-	private loadModels(): void {
+	private loadModels() {
 		// Load custom models from models.json first (to know which providers to skip/override)
 		let customModels: Model<Api>[] = [];
 		let replacedProviders: Set<string> = new Set();
@@ -215,19 +216,20 @@ export class ModelRegistry {
 		}
 
 		for (const modelsPath of pathsToCheck) {
-			if (existsSync(modelsPath)) {
-				logger.debug("ModelRegistry.loadModels loading", { path: modelsPath });
-				const result = this.loadCustomModels(modelsPath);
-				if (result.error) {
-					this.loadError = result.error;
-					// Keep built-in models even if custom models failed to load
-				} else {
-					customModels = result.models;
-					replacedProviders = result.replacedProviders;
-					overrides = result.overrides;
-				}
-				break; // Use first existing file
+			const result = this.loadCustomModels(modelsPath);
+			if (!result.found) {
+				continue; // File doesn't exist, try next path
+			}
+			logger.debug("ModelRegistry.loadModels loading", { path: modelsPath });
+			if (result.error) {
+				this.loadError = result.error;
+				// Keep built-in models even if custom models failed to load
+			} else {
+				customModels = result.models;
+				replacedProviders = result.replacedProviders;
+				overrides = result.overrides;
 			}
+			break; // Use first existing file
 		}
 
 		const builtInModels = this.loadBuiltInModels(replacedProviders, overrides);
@@ -240,7 +242,7 @@ export class ModelRegistry {
 				? (normalizeDomain(copilotCred.enterpriseUrl) ?? undefined)
 				: undefined;
 			const baseUrl = getGitHubCopilotBaseUrl(copilotCred.access, domain);
-			this.models = combined.map((m) => (m.provider === "github-copilot" ? { ...m, baseUrl } : m));
+			this.models = combined.map(m => (m.provider === "github-copilot" ? { ...m, baseUrl } : m));
 		} else {
 			this.models = combined;
 		}
@@ -249,14 +251,14 @@ export class ModelRegistry {
 	/** Load built-in models, skipping replaced providers and applying overrides */
 	private loadBuiltInModels(replacedProviders: Set<string>, overrides: Map<string, ProviderOverride>): Model<Api>[] {
 		return getProviders()
-			.filter((provider) => !replacedProviders.has(provider))
-			.flatMap((provider) => {
+			.filter(provider => !replacedProviders.has(provider))
+			.flatMap(provider => {
 				const models = getModels(provider as any) as Model<Api>[];
 				const override = overrides.get(provider);
 				if (!override) return models;
 
 				// Apply baseUrl/headers override to all models of this provider
-				return models.map((m) => ({
+				return models.map(m => ({
 					...m,
 					baseUrl: override.baseUrl ?? m.baseUrl,
 					headers: override.headers ? { ...m.headers, ...override.headers } : m.headers,
@@ -265,13 +267,23 @@ export class ModelRegistry {
 	}
 
 	private loadCustomModels(modelsPath: string): CustomModelsResult {
-		if (!existsSync(modelsPath)) {
-			return emptyCustomModelsResult();
+		let content: string;
+		try {
+			content = fs.readFileSync(modelsPath, "utf-8");
+		} catch (error) {
+			if (isEnoent(error)) {
+				return emptyCustomModelsResult();
+			}
+			return {
+				...emptyCustomModelsResult(
+					`Failed to load models config: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsPath}`,
+				),
+				found: true,
+			};
 		}
 
 		try {
-			const content = readFileSync(modelsPath, "utf-8");
-			const ext = extname(modelsPath).toLowerCase();
+			const ext = path.extname(modelsPath).toLowerCase();
 			let config: ModelsConfig;
 
 			if (ext === ".yaml" || ext === ".yml") {
@@ -315,14 +327,20 @@ export class ModelRegistry {
 				}
 			}
 
-			return { models: this.parseModels(config), replacedProviders, overrides, error: undefined };
+			return { models: this.parseModels(config), replacedProviders, overrides, error: undefined, found: true };
 		} catch (error) {
 			if (error instanceof SyntaxError) {
-				return emptyCustomModelsResult(`Failed to parse models config: ${error.message}\n\nFile: ${modelsPath}`);
+				return {
+					...emptyCustomModelsResult(`Failed to parse models config: ${error.message}\n\nFile: ${modelsPath}`),
+					found: true,
+				};
 			}
-			return emptyCustomModelsResult(
-				`Failed to load models config: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsPath}`,
-			);
+			return {
+				...emptyCustomModelsResult(
+					`Failed to load models config: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsPath}`,
+				),
+				found: true,
+			};
 		}
 	}
 
@@ -431,21 +449,21 @@ export class ModelRegistry {
 	 * This is a fast check that doesn't refresh OAuth tokens.
 	 */
 	getAvailable(): Model<Api>[] {
-		return this.models.filter((m) => this.authStorage.hasAuth(m.provider));
+		return this.models.filter(m => this.authStorage.hasAuth(m.provider));
 	}
 
 	/**
 	 * Find a model by provider and ID.
 	 */
 	find(provider: string, modelId: string): Model<Api> | undefined {
-		return this.models.find((m) => m.provider === provider && m.id === modelId);
+		return this.models.find(m => m.provider === provider && m.id === modelId);
 	}
 
 	/**
 	 * Get the base URL associated with a provider, if any model defines one.
 	 */
 	getProviderBaseUrl(provider: string): string | undefined {
-		return this.models.find((m) => m.provider === provider && m.baseUrl)?.baseUrl;
+		return this.models.find(m => m.provider === provider && m.baseUrl)?.baseUrl;
 	}
 
 	/**

package/src/config/model-resolver.ts

@@ -1,11 +1,10 @@
 /**
  * Model resolution, scoping, and initial selection
  */
-
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { type Api, type KnownProvider, type Model, modelsAreEqual } from "@oh-my-pi/pi-ai";
-import { isValidThinkingLevel } from "@oh-my-pi/pi-coding-agent/cli/args";
 import chalk from "chalk";
+import { isValidThinkingLevel } from "../cli/args";
 import type { ModelRegistry } from "./model-registry";
 
 /** Default model IDs for each known provider */
@@ -84,7 +83,7 @@ function tryMatchModel(modelPattern: string, availableModels: Model<Api>[]): Mod
 		const provider = modelPattern.substring(0, slashIndex);
 		const modelId = modelPattern.substring(slashIndex + 1);
 		const providerMatch = availableModels.find(
-			(m) => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === modelId.toLowerCase(),
+			m => m.provider.toLowerCase() === provider.toLowerCase() && m.id.toLowerCase() === modelId.toLowerCase(),
 		);
 		if (providerMatch) {
 			return providerMatch;
@@ -93,14 +92,14 @@ function tryMatchModel(modelPattern: string, availableModels: Model<Api>[]): Mod
 	}
 
 	// Check for exact ID match (case-insensitive)
-	const exactMatch = availableModels.find((m) => m.id.toLowerCase() === modelPattern.toLowerCase());
+	const exactMatch = availableModels.find(m => m.id.toLowerCase() === modelPattern.toLowerCase());
 	if (exactMatch) {
 		return exactMatch;
 	}
 
 	// No exact match - fall back to partial matching
 	const matches = availableModels.filter(
-		(m) =>
+		m =>
 			m.id.toLowerCase().includes(modelPattern.toLowerCase()) ||
 			m.name?.toLowerCase().includes(modelPattern.toLowerCase()),
 	);
@@ -110,8 +109,8 @@ function tryMatchModel(modelPattern: string, availableModels: Model<Api>[]): Mod
 	}
 
 	// Separate into aliases and dated versions
-	const aliases = matches.filter((m) => isAlias(m.id));
-	const datedVersions = matches.filter((m) => !isAlias(m.id));
+	const aliases = matches.filter(m => isAlias(m.id));
+	const datedVersions = matches.filter(m => !isAlias(m.id));
 
 	if (aliases.length > 0) {
 		// Prefer alias - if multiple aliases, pick the one that sorts highest
@@ -226,7 +225,7 @@ export async function resolveModelScope(patterns: string[], modelRegistry: Model
 
 			// Match against "provider/modelId" format OR just model ID
 			// This allows "*sonnet*" to match without requiring "anthropic/*sonnet*"
-			const matchingModels = availableModels.filter((m) => {
+			const matchingModels = availableModels.filter(m => {
 				const fullId = `${m.provider}/${m.id}`;
 				const glob = new Bun.Glob(globPattern.toLowerCase());
 				return glob.match(fullId.toLowerCase()) || glob.match(m.id.toLowerCase());
@@ -238,7 +237,7 @@ export async function resolveModelScope(patterns: string[], modelRegistry: Model
 			}
 
 			for (const model of matchingModels) {
-				if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {
+				if (!scopedModels.find(sm => modelsAreEqual(sm.model, model))) {
 					scopedModels.push({ model, thinkingLevel, explicitThinkingLevel });
 				}
 			}
@@ -257,7 +256,7 @@ export async function resolveModelScope(patterns: string[], modelRegistry: Model
 		}
 
 		// Avoid duplicates
-		if (!scopedModels.find((sm) => modelsAreEqual(sm.model, model))) {
+		if (!scopedModels.find(sm => modelsAreEqual(sm.model, model))) {
 			scopedModels.push({ model, thinkingLevel, explicitThinkingLevel });
 		}
 	}
@@ -343,7 +342,7 @@ export async function findInitialModel(options: {
 		// Try to find a default model from known providers
 		for (const provider of Object.keys(defaultModelPerProvider) as KnownProvider[]) {
 			const defaultId = defaultModelPerProvider[provider];
-			const match = availableModels.find((m) => m.provider === provider && m.id === defaultId);
+			const match = availableModels.find(m => m.provider === provider && m.id === defaultId);
 			if (match) {
 				return { model: match, thinkingLevel: "off", fallbackMessage: undefined };
 			}
@@ -405,7 +404,7 @@ export async function restoreModelFromSession(
 		let fallbackModel: Model<Api> | undefined;
 		for (const provider of Object.keys(defaultModelPerProvider) as KnownProvider[]) {
 			const defaultId = defaultModelPerProvider[provider];
-			const match = availableModels.find((m) => m.provider === provider && m.id === defaultId);
+			const match = availableModels.find(m => m.provider === provider && m.id === defaultId);
 			if (match) {
 				fallbackModel = match;
 				break;
@@ -450,7 +449,7 @@ export async function findSmolModel(
 	if (savedModel) {
 		const parsed = parseModelString(savedModel);
 		if (parsed) {
-			const match = availableModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			const match = availableModels.find(m => m.provider === parsed.provider && m.id === parsed.id);
 			if (match) return match;
 		}
 	}
@@ -458,15 +457,15 @@ export async function findSmolModel(
 	// 2. Try priority chain
 	for (const pattern of SMOL_MODEL_PRIORITY) {
 		// Try exact match with provider prefix
-		const providerMatch = availableModels.find((m) => `${m.provider}/${m.id}`.toLowerCase() === pattern);
+		const providerMatch = availableModels.find(m => `${m.provider}/${m.id}`.toLowerCase() === pattern);
 		if (providerMatch) return providerMatch;
 
 		// Try exact match first
-		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern);
+		const exactMatch = availableModels.find(m => m.id.toLowerCase() === pattern);
 		if (exactMatch) return exactMatch;
 
 		// Try fuzzy match (substring)
-		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern));
+		const fuzzyMatch = availableModels.find(m => m.id.toLowerCase().includes(pattern));
 		if (fuzzyMatch) return fuzzyMatch;
 	}
 
@@ -493,7 +492,7 @@ export async function findSlowModel(
 	if (savedModel) {
 		const parsed = parseModelString(savedModel);
 		if (parsed) {
-			const match = availableModels.find((m) => m.provider === parsed.provider && m.id === parsed.id);
+			const match = availableModels.find(m => m.provider === parsed.provider && m.id === parsed.id);
 			if (match) return match;
 		}
 	}
@@ -501,11 +500,11 @@ export async function findSlowModel(
 	// 2. Try priority chain
 	for (const pattern of SLOW_MODEL_PRIORITY) {
 		// Try exact match first
-		const exactMatch = availableModels.find((m) => m.id.toLowerCase() === pattern.toLowerCase());
+		const exactMatch = availableModels.find(m => m.id.toLowerCase() === pattern.toLowerCase());
 		if (exactMatch) return exactMatch;
 
 		// Try fuzzy match (substring)
-		const fuzzyMatch = availableModels.find((m) => m.id.toLowerCase().includes(pattern.toLowerCase()));
+		const fuzzyMatch = availableModels.find(m => m.id.toLowerCase().includes(pattern.toLowerCase()));
 		if (fuzzyMatch) return fuzzyMatch;
 	}
 

package/src/config/prompt-templates.ts

@@ -1,8 +1,8 @@
-import { join, resolve } from "node:path";
-import { CONFIG_DIR_NAME, getPromptsDir } from "@oh-my-pi/pi-coding-agent/config";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import Handlebars from "handlebars";
+import { CONFIG_DIR_NAME, getPromptsDir } from "../config";
+import { parseFrontmatter } from "../utils/frontmatter";
 
 /**
  * Represents a prompt template loaded from a markdown file
@@ -44,7 +44,7 @@ handlebars.registerHelper(
 		const suffix = (options.hash.suffix as string) ?? "";
 		const rawSeparator = (options.hash.join as string) ?? "\n";
 		const separator = rawSeparator.replace(/\\n/g, "\n").replace(/\\t/g, "\t");
-		return context.map((item) => `${prefix}${options.fn(item)}${suffix}`).join(separator);
+		return context.map(item => `${prefix}${options.fn(item)}${suffix}`).join(separator);
 	},
 );
 
@@ -126,7 +126,7 @@ handlebars.registerHelper(
 		const headers = headersStr?.split("|") ?? [];
 		const separator = headers.map(() => "---").join(" | ");
 		const headerRow = headers.length > 0 ? `| ${headers.join(" | ")} |\n| ${separator} |\n` : "";
-		const rows = context.map((item) => `| ${options.fn(item).trim()} |`).join("\n");
+		const rows = context.map(item => `| ${options.fn(item).trim()} |`).join("\n");
 		return headerRow + rows;
 	},
 );
@@ -235,7 +235,7 @@ function optimizePromptLayout(input: string): string {
 	// normalize NBSP -> space
 	s = s.replace(/\u00A0/g, " ");
 
-	const lines = s.split("\n").map((line) => {
+	const lines = s.split("\n").map(line => {
 		// 2) remove trailing whitespace (spaces/tabs) per line
 		let l = line.replace(/[ \t]+$/g, "");
 
@@ -382,7 +382,7 @@ async function loadTemplatesFromDir(
 		entries.sort((a, b) => a.split("/").length - b.split("/").length);
 
 		for (const entry of entries) {
-			const fullPath = join(dir, entry);
+			const fullPath = path.join(dir, entry);
 			const file = Bun.file(fullPath);
 
 			try {
@@ -409,7 +409,7 @@ async function loadTemplatesFromDir(
 					// Get description from frontmatter or first non-empty line
 					let description = String(frontmatter.description || "");
 					if (!description) {
-						const firstLine = body.split("\n").find((line) => line.trim());
+						const firstLine = body.split("\n").find(line => line.trim());
 						if (firstLine) {
 							// Truncate if too long
 							description = firstLine.slice(0, 60);
@@ -461,11 +461,11 @@ export async function loadPromptTemplates(options: LoadPromptTemplatesOptions =
 
 	// 1. Load global templates from agentDir/prompts/
 	// Note: if agentDir is provided, it should be the agent dir, not the prompts dir
-	const globalPromptsDir = options.agentDir ? join(options.agentDir, "prompts") : resolvedAgentDir;
+	const globalPromptsDir = options.agentDir ? path.join(options.agentDir, "prompts") : resolvedAgentDir;
 	templates.push(...(await loadTemplatesFromDir(globalPromptsDir, "user")));
 
 	// 2. Load project templates from cwd/{CONFIG_DIR_NAME}/prompts/
-	const projectPromptsDir = resolve(resolvedCwd, CONFIG_DIR_NAME, "prompts");
+	const projectPromptsDir = path.resolve(resolvedCwd, CONFIG_DIR_NAME, "prompts");
 	templates.push(...(await loadTemplatesFromDir(projectPromptsDir, "project")));
 
 	return templates;
@@ -482,7 +482,7 @@ export function expandPromptTemplate(text: string, templates: PromptTemplate[]):
 	const templateName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
 	const argsString = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
 
-	const template = templates.find((t) => t.name === templateName);
+	const template = templates.find(t => t.name === templateName);
 	if (template) {
 		const args = parseCommandArgs(argsString);
 		const argsText = args.join(" ");

package/src/config/settings-manager.ts

@@ -1,14 +1,13 @@
-import { existsSync, readFileSync } from "node:fs";
-import { rename } from "node:fs/promises";
-import { join } from "node:path";
-import { type Settings as SettingsItem, settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import { getAgentDbPath, getAgentDir } from "@oh-my-pi/pi-coding-agent/config";
-import { withFileLock } from "@oh-my-pi/pi-coding-agent/config/file-lock";
-import { loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
-import type { SymbolPreset } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { AgentStorage } from "@oh-my-pi/pi-coding-agent/session/agent-storage";
-import { logger } from "@oh-my-pi/pi-utils";
+import * as fs from "node:fs/promises";
+import * as path from "node:path";
+import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
+import { type Settings as SettingsItem, settingsCapability } from "../capability/settings";
+import { getAgentDbPath, getAgentDir } from "../config";
+import { loadCapability } from "../discovery";
+import type { SymbolPreset } from "../modes/theme/theme";
+import { AgentStorage } from "../session/agent-storage";
+import { withFileLock } from "./file-lock";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
@@ -203,6 +202,7 @@ export interface Settings {
 	interruptMode?: "immediate" | "wait";
 	theme?: string;
 	symbolPreset?: SymbolPreset; // default: uses theme's preset or "unicode"
+	colorBlindMode?: boolean; // default: false (use blue instead of green for diff additions)
 	compaction?: CompactionSettings;
 	branchSummary?: BranchSummarySettings;
 	retry?: RetrySettings;
@@ -343,7 +343,7 @@ function normalizeBashInterceptorSettings(
 		patterns = DEFAULT_BASH_INTERCEPTOR_RULES;
 	} else if (Array.isArray(rawPatterns)) {
 		patterns = rawPatterns
-			.map((rule) => normalizeBashInterceptorRule(rule))
+			.map(rule => normalizeBashInterceptorRule(rule))
 			.filter((rule): rule is BashInterceptorRule => rule !== null);
 	} else {
 		patterns = DEFAULT_BASH_INTERCEPTOR_RULES;
@@ -372,7 +372,7 @@ function hasNerdFonts(): boolean {
 	const termProgram = (process.env.TERM_PROGRAM || "").toLowerCase();
 	const term = (process.env.TERM || "").toLowerCase();
 	const nerdTerms = ["iterm", "wezterm", "kitty", "ghostty", "alacritty"];
-	cachedNerdFonts = nerdTerms.some((candidate) => termProgram.includes(candidate) || term.includes(candidate));
+	cachedNerdFonts = nerdTerms.some(candidate => termProgram.includes(candidate) || term.includes(candidate));
 	return cachedNerdFonts;
 }
 
@@ -503,7 +503,7 @@ export class SettingsManager {
 	 * @returns Configured SettingsManager with merged global and user settings
 	 */
 	static async create(cwd: string = process.cwd(), agentDir: string = getAgentDir()): Promise<SettingsManager> {
-		const configPath = join(agentDir, "config.yml");
+		const configPath = path.join(agentDir, "config.yml");
 		const storage = await AgentStorage.open(getAgentDbPath(agentDir));
 
 		// Migrate from legacy storage if config.yml doesn't exist
@@ -521,7 +521,7 @@ export class SettingsManager {
 		}
 
 		// Load persisted settings from config.yml
-		const storedSettings = SettingsManager.loadFromYaml(configPath);
+		const storedSettings = await SettingsManager.loadFromYaml(configPath);
 		globalSettings = deepMergeSettings(globalSettings, storedSettings);
 
 		// Load project settings before construction (constructor is sync)
@@ -559,18 +559,19 @@ export class SettingsManager {
 	 * @param configPath - Path to config.yml, or null for in-memory mode
 	 * @returns Parsed and migrated settings, or empty object if file doesn't exist
 	 */
-	private static loadFromYaml(configPath: string | null): Settings {
-		if (!configPath || !existsSync(configPath)) {
+	private static async loadFromYaml(configPath: string | null): Promise<Settings> {
+		if (!configPath) {
 			return {};
 		}
 		try {
-			const content = readFileSync(configPath, "utf-8");
+			const content = await Bun.file(configPath).text();
 			const parsed = YAML.parse(content);
 			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
 				return {};
 			}
 			return SettingsManager.migrateSettings(parsed as Record<string, unknown>);
 		} catch (error) {
+			if (isEnoent(error)) return {};
 			logger.warn("SettingsManager failed to load config.yml", { path: configPath, error: String(error) });
 			return {};
 		}
@@ -582,31 +583,37 @@ export class SettingsManager {
 	 * Only migrates if config.yml doesn't exist.
 	 */
 	private static async migrateToYaml(storage: AgentStorage, agentDir: string, configPath: string): Promise<void> {
-		// Skip if config.yml already exists
-		if (existsSync(configPath)) return;
+		try {
+			await Bun.file(configPath).text();
+			return;
+		} catch (err) {
+			if (!isEnoent(err)) {
+				logger.warn("SettingsManager failed to check config.yml", { path: configPath, error: String(err) });
+				return;
+			}
+		}
 
 		let settings: Settings = {};
 		let migrated = false;
 
 		// 1. Try to migrate from settings.json (oldest legacy format)
-		const settingsJsonPath = join(agentDir, "settings.json");
+		const settingsJsonPath = path.join(agentDir, "settings.json");
 		try {
-			const settingsFile = Bun.file(settingsJsonPath);
-			if (await settingsFile.exists()) {
-				const parsed = JSON.parse(await settingsFile.text());
-				if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-					settings = deepMergeSettings(settings, SettingsManager.migrateSettings(parsed));
-					migrated = true;
-					// Backup settings.json
-					try {
-						await rename(settingsJsonPath, `${settingsJsonPath}.bak`);
-					} catch (error) {
-						logger.warn("SettingsManager failed to backup settings.json", { error: String(error) });
-					}
+			const parsed = JSON.parse(await Bun.file(settingsJsonPath).text());
+			if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+				settings = deepMergeSettings(settings, SettingsManager.migrateSettings(parsed));
+				migrated = true;
+				// Backup settings.json
+				try {
+					await fs.rename(settingsJsonPath, `${settingsJsonPath}.bak`);
+				} catch (error) {
+					logger.warn("SettingsManager failed to backup settings.json", { error: String(error) });
 				}
 			}
 		} catch (error) {
-			logger.warn("SettingsManager failed to read settings.json", { error: String(error) });
+			if (!isEnoent(error)) {
+				logger.warn("SettingsManager failed to read settings.json", { error: String(error) });
+			}
 		}
 
 		// 2. Migrate from agent.db settings table
@@ -690,7 +697,7 @@ export class SettingsManager {
 			const configPath = this.configPath;
 			try {
 				await withFileLock(configPath, async () => {
-					const currentSettings = SettingsManager.loadFromYaml(configPath);
+					const currentSettings = await SettingsManager.loadFromYaml(configPath);
 					const mergedSettings = deepMergeSettings(currentSettings, this.globalSettings);
 					this.globalSettings = mergedSettings;
 					await Bun.write(configPath, YAML.stringify(this.globalSettings, null, 2));
@@ -788,6 +795,15 @@ export class SettingsManager {
 		await this.save();
 	}
 
+	getColorBlindMode(): boolean {
+		return this.settings.colorBlindMode ?? false;
+	}
+
+	async setColorBlindMode(enabled: boolean): Promise<void> {
+		this.globalSettings.colorBlindMode = enabled;
+		await this.save();
+	}
+
 	getDefaultThinkingLevel(): "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | undefined {
 		return this.settings.defaultThinkingLevel;
 	}