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

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,11 +1,13 @@
-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 { 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
@@ -117,6 +119,15 @@ export interface PythonSettings {
 	sharedGateway?: boolean;
 }
 
+export interface CommitSettings {
+	mapReduceEnabled?: boolean;
+	mapReduceMinFiles?: number;
+	mapReduceMaxFileTokens?: number;
+	mapReduceTimeoutMs?: number;
+	mapReduceMaxConcurrency?: number;
+	changelogMaxDiffChars?: number;
+}
+
 export interface EditSettings {
 	fuzzyMatch?: boolean; // default: true (accept high-confidence fuzzy matches for whitespace/indentation)
 	fuzzyThreshold?: number; // default: 0.95 (similarity threshold for fuzzy matching)
@@ -191,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;
@@ -214,6 +226,7 @@ export interface Settings {
 	mcp?: MCPSettings;
 	lsp?: LspSettings;
 	python?: PythonSettings;
+	commit?: CommitSettings;
 	edit?: EditSettings;
 	ttsr?: TtsrSettings;
 	todoCompletion?: TodoCompletionSettings;
@@ -330,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;
@@ -359,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;
 }
 
@@ -424,8 +437,10 @@ function deepMergeSettings(base: Settings, overrides: Settings): Settings {
 }
 
 export class SettingsManager {
-	/** SQLite storage for persisted settings (null for in-memory mode) */
+	/** SQLite storage for auth/cache (null for in-memory mode) */
 	private storage: AgentStorage | null;
+	/** Path to config.yml (null for in-memory mode) */
+	private configPath: string | null;
 	private cwd: string | null;
 	private globalSettings: Settings;
 	private overrides: Settings;
@@ -434,7 +449,8 @@ export class SettingsManager {
 
 	/**
 	 * Private constructor - use static factory methods instead.
-	 * @param storage - SQLite storage instance for persistence, or null for in-memory mode
+	 * @param storage - SQLite storage instance for auth/cache, or null for in-memory mode
+	 * @param configPath - Path to config.yml for persistence, or null for in-memory mode
 	 * @param cwd - Current working directory for project settings discovery
 	 * @param initialSettings - Initial global settings to use
 	 * @param persist - Whether to persist settings changes to storage
@@ -442,12 +458,14 @@ export class SettingsManager {
 	 */
 	private constructor(
 		storage: AgentStorage | null,
+		configPath: string | null,
 		cwd: string | null,
 		initialSettings: Settings,
 		persist: boolean,
 		projectSettings: Settings,
 	) {
 		this.storage = storage;
+		this.configPath = configPath;
 		this.cwd = cwd;
 		this.persist = persist;
 		this.globalSettings = initialSettings;
@@ -479,14 +497,17 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Create a SettingsManager that loads from persistent SQLite storage.
+	 * Create a SettingsManager that loads from persistent config.yml.
 	 * @param cwd - Current working directory for project settings discovery
-	 * @param agentDir - Agent directory containing agent.db
+	 * @param agentDir - Agent directory containing config.yml
 	 * @returns Configured SettingsManager with merged global and user settings
 	 */
 	static async create(cwd: string = process.cwd(), agentDir: string = getAgentDir()): Promise<SettingsManager> {
-		const storage = AgentStorage.open(getAgentDbPath(agentDir));
-		await SettingsManager.migrateLegacySettingsFile(storage, agentDir);
+		const configPath = path.join(agentDir, "config.yml");
+		const storage = await AgentStorage.open(getAgentDbPath(agentDir));
+
+		// Migrate from legacy storage if config.yml doesn't exist
+		await SettingsManager.migrateToYaml(storage, agentDir, configPath);
 
 		// Use capability API to load user-level settings from all providers
 		const result = await loadCapability(settingsCapability.id, { cwd });
@@ -499,14 +520,14 @@ export class SettingsManager {
 			}
 		}
 
-		// Load persisted settings from agent.db (legacy settings.json is migrated separately)
-		const storedSettings = SettingsManager.loadFromStorage(storage);
+		// Load persisted settings from config.yml
+		const storedSettings = await SettingsManager.loadFromYaml(configPath);
 		globalSettings = deepMergeSettings(globalSettings, storedSettings);
 
 		// Load project settings before construction (constructor is sync)
 		const projectSettings = await SettingsManager.loadProjectSettingsStatic(cwd);
 
-		return new SettingsManager(storage, cwd, globalSettings, true, projectSettings);
+		return new SettingsManager(storage, configPath, cwd, globalSettings, true, projectSettings);
 	}
 
 	/**
@@ -515,7 +536,7 @@ export class SettingsManager {
 	 * @returns SettingsManager that won't persist changes to disk
 	 */
 	static inMemory(settings: Partial<Settings> = {}): SettingsManager {
-		return new SettingsManager(null, null, settings, false, {});
+		return new SettingsManager(null, null, null, settings, false, {});
 	}
 
 	/**
@@ -534,41 +555,89 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Load settings from SQLite storage, applying any schema migrations.
-	 * @param storage - AgentStorage instance, or null for in-memory mode
-	 * @returns Parsed and migrated settings, or empty object if storage is null/empty
+	 * Load settings from config.yml, applying any schema migrations.
+	 * @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 loadFromStorage(storage: AgentStorage | null): Settings {
-		if (!storage) {
+	private static async loadFromYaml(configPath: string | null): Promise<Settings> {
+		if (!configPath) {
 			return {};
 		}
-		const settings = storage.getSettings();
-		if (!settings) {
+		try {
+			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 {};
 		}
-		return SettingsManager.migrateSettings(settings as Record<string, unknown>);
 	}
 
-	private static async migrateLegacySettingsFile(storage: AgentStorage, agentDir: string): Promise<void> {
-		const settingsPath = join(agentDir, "settings.json");
-		const settingsFile = Bun.file(settingsPath);
-		if (!(await settingsFile.exists())) return;
-		if (storage.getSettings() !== null) return;
-
+	/**
+	 * Migrate settings from legacy sources to config.yml.
+	 * Migration order: settings.json -> agent.db -> config.yml
+	 * Only migrates if config.yml doesn't exist.
+	 */
+	private static async migrateToYaml(storage: AgentStorage, agentDir: string, configPath: string): Promise<void> {
 		try {
-			const parsed = JSON.parse(await settingsFile.text());
-			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+			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;
 			}
-			const migrated = SettingsManager.migrateSettings(parsed as Record<string, unknown>);
-			storage.saveSettings(migrated);
+		}
+
+		let settings: Settings = {};
+		let migrated = false;
+
+		// 1. Try to migrate from settings.json (oldest legacy format)
+		const settingsJsonPath = path.join(agentDir, "settings.json");
+		try {
+			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) {
+			if (!isEnoent(error)) {
+				logger.warn("SettingsManager failed to read settings.json", { error: String(error) });
+			}
+		}
+
+		// 2. Migrate from agent.db settings table
+		try {
+			const dbSettings = storage.getSettings();
+			if (dbSettings) {
+				settings = deepMergeSettings(
+					settings,
+					SettingsManager.migrateSettings(dbSettings as Record<string, unknown>),
+				);
+				migrated = true;
+			}
+		} catch (error) {
+			logger.warn("SettingsManager failed to read agent.db settings", { error: String(error) });
+		}
+
+		// 3. Write merged settings to config.yml if we found any
+		if (migrated && Object.keys(settings).length > 0) {
 			try {
-				await rename(settingsPath, `${settingsPath}.bak`);
+				await Bun.write(configPath, YAML.stringify(settings, null, 2));
+				logger.debug("SettingsManager migrated settings to config.yml", { path: configPath });
 			} catch (error) {
-				logger.warn("SettingsManager failed to backup settings.json", { error: String(error) });
+				logger.warn("SettingsManager failed to write config.yml", { path: configPath, error: String(error) });
 			}
-		} catch (error) {
-			logger.warn("SettingsManager failed to migrate settings.json", { error: String(error) });
 		}
 	}
 
@@ -620,22 +689,24 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Persist current global settings to SQLite storage and rebuild merged settings.
-	 * Merges with any concurrent changes in storage before saving.
+	 * Persist current global settings to config.yml and rebuild merged settings.
+	 * Uses file locking to prevent concurrent write races.
 	 */
 	private async save(): Promise<void> {
-		if (this.persist && this.storage) {
+		if (this.persist && this.configPath) {
+			const configPath = this.configPath;
 			try {
-				const currentSettings = this.storage.getSettings() ?? {};
-				const mergedSettings = deepMergeSettings(currentSettings, this.globalSettings);
-				this.globalSettings = mergedSettings;
-				this.storage.saveSettings(this.globalSettings);
+				await withFileLock(configPath, async () => {
+					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));
+				});
 			} catch (error) {
 				logger.warn("SettingsManager save failed", { error: String(error) });
 			}
 		}
 
-		// Always re-merge to update active settings (needed for both file and inMemory modes)
 		const projectSettings = await this.loadProjectSettings();
 		this.rebuildSettings(projectSettings);
 	}
@@ -724,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;
 	}
@@ -800,6 +880,17 @@ export class SettingsManager {
 		};
 	}
 
+	getCommitSettings(): Required<CommitSettings> {
+		return {
+			mapReduceEnabled: this.settings.commit?.mapReduceEnabled ?? true,
+			mapReduceMinFiles: this.settings.commit?.mapReduceMinFiles ?? 4,
+			mapReduceMaxFileTokens: this.settings.commit?.mapReduceMaxFileTokens ?? 50_000,
+			mapReduceTimeoutMs: this.settings.commit?.mapReduceTimeoutMs ?? 120_000,
+			mapReduceMaxConcurrency: this.settings.commit?.mapReduceMaxConcurrency ?? 5,
+			changelogMaxDiffChars: this.settings.commit?.changelogMaxDiffChars ?? 120_000,
+		};
+	}
+
 	getRetryMaxRetries(): number {
 		return this.settings.retry?.maxRetries ?? 3;
 	}