@oh-my-pi/pi-coding-agent 9.4.0 → 9.6.0

package/CHANGELOG.md

@@ -1,6 +1,90 @@
 # Changelog
 
 ## [Unreleased]
+### Fixed
+
+- Fixed bash command normalization to preserve newlines in heredocs and multiline commands
+
+## [9.6.0] - 2026-02-01
+### Breaking Changes
+
+- Replaced `SettingsManager` class with new `Settings` singleton providing sync get/set API with background persistence
+- Changed settings access from method calls (e.g., `getTheme()`) to path-based access (e.g., `settings.get("theme")`)
+- Removed `settingsManager` parameter from `CreateAgentSessionOptions` in favor of `settingsInstance`
+- Removed `loadSettings()` export from public API
+- Removed example file `examples/sdk/10-settings.ts` demonstrating old SettingsManager API
+
+### Added
+
+- New `Settings` singleton class with sync get/set operations and background persistence
+- Added `Settings.isolated()` factory for creating isolated settings instances in tests
+- Added `Settings.init()` for initializing global settings instance
+- Added `settings` global export for convenient access to settings singleton
+- New `settings-schema.ts` providing unified, type-safe settings definitions with UI metadata
+- Added "none" option to `doubleEscapeAction` setting to disable double-escape behavior entirely ([#973](https://github.com/badlogic/pi-mono/issues/973) by [@juanibiapina](https://github.com/juanibiapina))
+
+### Changed
+
+- Unified settings schema into single source of truth with `settings-schema.ts` replacing scattered definitions
+- Refactored settings CLI to use new schema-based path resolution instead of SETTINGS_DEFS
+- Updated config command examples to use new nested path syntax (e.g., `compaction.enabled` instead of `autoCompact`)
+- Changed `InteractiveModeContext.settingsManager` to `InteractiveModeContext.settings`
+- Updated all internal settings access throughout codebase to use new `settings.get()` and `settings.set()` API
+- Moved `DEFAULT_BASH_INTERCEPTOR_RULES` from settings-manager to bash-interceptor module
+
+### Removed
+
+- Deleted `settings-manager.ts` (2035 lines) - functionality replaced by new Settings singleton
+- Removed `SettingsManager.create()`, `SettingsManager.acquire()`, and `SettingsManager.inMemory()` factory methods
+- Removed individual getter/setter methods from settings API (e.g., `getTheme()`, `setTheme()`, `getCompactionSettings()`)
+
+### Fixed
+
+- Respect .gitignore, .ignore, and .fdignore files when scanning package resources for skills, prompts, themes, and extensions
+
+## [9.5.1] - 2026-02-01
+
+### Changed
+
+- Changed persistent shell from opt-out to opt-in (default: off) for improved reliability; enable via Settings > Bash > Persistent shell or `OMP_SHELL_PERSIST=1`
+- Added new "Bash" settings tab grouping shell-related settings (force basic shell, persistent shell, interceptor, intercept ls)
+
+## [9.5.0] - 2026-02-01
+### Added
+
+- Added `head` and `tail` parameters to bash tool to limit output lines without breaking streaming
+- Added automatic normalization of bash commands to extract `| head -n N` and `| tail -n N` patterns into native parameters
+- Added `maxResults` parameter to find tool to limit result set at the native layer
+- Added context-structure template showing required sections (Goal, Constraints, Existing Code, API Contract) with examples of good vs bad context
+- Added explicit dependency test: 'Can agent B write correct code without seeing agent A's output?' to determine sequencing
+- Added detailed phased execution pattern with four phases (Foundation, Parallel Implementation, Integration, Dependent Layer) and WASM-to-N-API migration example
+- Added table of dependency patterns that must be sequential (API creation before bindings, interface definition before implementation, etc.)
+- Added phased execution guidance for migrations and refactors to prevent parallel work on dependent layers
+- Added example demonstrating phased execution pattern for porting WASM to N-API with sequential foundation, parallel implementation, integration, and dependent layer phases
+
+### Changed
+
+- Improved find tool performance by delegating mtime-based sorting to native layer instead of post-processing results in JavaScript
+- Simplified find tool result processing by removing redundant filesystem stat calls when native metadata is available
+- Updated bash tool documentation to recommend using `head` and `tail` parameters instead of piping through head/tail commands
+- Updated binary build process to exclude worker files from compilation, reducing binary size
+- Modified update mechanism to download and install native addon alongside CLI binary for platform-specific functionality
+- Updated find tool to emit streaming match updates via callback, allowing real-time progress feedback during file searches
+- Modified find tool to use native match metadata (mtime, fileType) from WASM layer instead of redundant filesystem stats, improving performance
+- Restructured Task tool documentation to emphasize context quality and explicit API contracts for subagent success
+- Updated task execution guidance to require structured context with Goal, Constraints, Existing Code, and API Contract sections
+- Reorganized parallelization rules with explicit dependency patterns and phased execution guidance for migrations
+- Clarified that response format requirements must go in schema parameter, never in context descriptions
+- Centralized Python runtime resolution into shared `ipy/runtime.ts` module, removing duplicate code from kernel and gateway coordinator
+
+### Removed
+
+- Removed Nushell language server configuration from LSP defaults
+
+### Fixed
+
+- Fixed race condition in shell session where command completion could occur before stream data was fully processed
+- Fixed Python gateway spawning console window on Windows by using windowless Python interpreter (pythonw.exe)
 
 ## [9.4.0] - 2026-01-31
 ### Changed

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "9.4.0",
+	"version": "9.6.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -74,17 +74,17 @@
 	"scripts": {
 		"check": "tsgo -p tsconfig.json",
 		"format-prompts": "bun scripts/format-prompts.ts",
-		"build:binary": "cd ../.. && bun build --compile --define OMP_COMPILED=true --root . ./packages/coding-agent/src/cli.ts ./packages/natives/src/grep/worker.ts ./packages/natives/src/html/worker.ts ./packages/natives/src/image/worker.ts --outfile packages/coding-agent/dist/omp",
+		"build:binary": "cd ../.. && bun build --compile --define OMP_COMPILED=true --root . ./packages/coding-agent/src/cli.ts --outfile packages/coding-agent/dist/omp",
 		"generate-template": "bun scripts/generate-template.ts",
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "9.4.0",
-		"@oh-my-pi/pi-agent-core": "9.4.0",
-		"@oh-my-pi/pi-ai": "9.4.0",
-		"@oh-my-pi/pi-natives": "9.4.0",
-		"@oh-my-pi/pi-tui": "9.4.0",
-		"@oh-my-pi/pi-utils": "9.4.0",
+		"@oh-my-pi/omp-stats": "9.6.0",
+		"@oh-my-pi/pi-agent-core": "9.6.0",
+		"@oh-my-pi/pi-ai": "9.6.0",
+		"@oh-my-pi/pi-natives": "9.6.0",
+		"@oh-my-pi/pi-tui": "9.6.0",
+		"@oh-my-pi/pi-utils": "9.6.0",
 		"@openai/agents": "^0.4.4",
 		"@sinclair/typebox": "^0.34.48",
 		"ajv": "^8.17.1",
@@ -93,6 +93,7 @@
 		"file-type": "^21.3.0",
 		"glob": "^13.0.0",
 		"handlebars": "^4.7.8",
+		"ignore": "^7.0.5",
 		"marked": "^17.0.1",
 		"nanoid": "^5.1.6",
 		"node-html-parser": "^7.0.2",

package/src/capability/index.ts

@@ -8,6 +8,7 @@
  */
 import * as os from "node:os";
 import * as path from "node:path";
+import type { Settings } from "../config/settings";
 import { clearCache as clearFsCache, cacheStats as fsCacheStats, invalidate as invalidateFs } from "./fs";
 import type {
 	Capability,
@@ -37,7 +38,7 @@ const providerMeta = new Map<string, { displayName: string; description: string
 const disabledProviders = new Set<string>();
 
 /** Settings manager for persistence (if set) */
-let settingsManager: { getDisabledProviders(): string[]; setDisabledProviders(ids: string[]): void } | null = null;
+let settings: Settings | null = null;
 
 // =============================================================================
 // Registration API
@@ -228,13 +229,10 @@ export async function loadCapability<T>(capabilityId: string, options: LoadOptio
  * Initialize capability system with settings manager for persistence.
  * Call this once on startup to enable persistent provider state.
  */
-export function initializeWithSettings(manager: {
-	getDisabledProviders(): string[];
-	setDisabledProviders(ids: string[]): void;
-}): void {
-	settingsManager = manager;
+export function initializeWithSettings(settingsInstance: Settings): void {
+	settings = settingsInstance;
 	// Load disabled providers from settings
-	const disabled = manager.getDisabledProviders();
+	const disabled = settings.get("disabledProviders");
 	disabledProviders.clear();
 	for (const id of disabled) {
 		disabledProviders.add(id);
@@ -245,8 +243,8 @@ export function initializeWithSettings(manager: {
  * Persist current disabled providers to settings.
  */
 function persistDisabledProviders(): void {
-	if (settingsManager) {
-		settingsManager.setDisabledProviders(Array.from(disabledProviders));
+	if (settings) {
+		settings.set("disabledProviders", Array.from(disabledProviders));
 	}
 }
 

package/src/cli/config-cli.ts

@@ -2,12 +2,20 @@
  * Config CLI command handlers.
  *
  * Handles `omp config <command>` subcommands for managing settings.
- * Uses SETTINGS_DEFS as the source of truth for available settings.
+ * Uses settings-defs as the source of truth for available settings.
  */
 import chalk from "chalk";
 import { APP_NAME, getAgentDir } from "../config";
-import { SettingsManager } from "../config/settings-manager";
-import { SETTINGS_DEFS, type SettingDef } from "../modes/components/settings-defs";
+import {
+	getDefault,
+	getEnumValues,
+	getType,
+	type SettingPath,
+	Settings,
+	type SettingValue,
+	settings,
+} from "../config/settings";
+import { getAllSettingDefs, type SettingDef } from "../modes/components/settings-defs";
 import { theme } from "../modes/theme/theme";
 
 // =============================================================================
@@ -29,18 +37,18 @@ export interface ConfigCommandArgs {
 // Setting Filtering
 // =============================================================================
 
-/** Find setting definition by ID */
-function findSettingDef(id: string): SettingDef | undefined {
-	return SETTINGS_DEFS.find(def => def.id === id);
+/** Find setting definition by path */
+function findSettingDef(path: string): SettingDef | undefined {
+	return getAllSettingDefs().find(def => def.path === path);
 }
 
 /** Get available values for a setting */
-function getSettingValues(def: SettingDef, sm: SettingsManager): readonly string[] | undefined {
+function getSettingValues(def: SettingDef): readonly string[] | undefined {
 	if (def.type === "enum") {
 		return def.values;
 	}
 	if (def.type === "submenu") {
-		const options = def.getOptions(sm);
+		const options = def.getOptions();
 		if (options.length > 0) {
 			return options.map(o => o.value);
 		}
@@ -100,29 +108,9 @@ export function parseConfigArgs(args: string[]): ConfigCommandArgs | undefined {
 }
 
 // =============================================================================
-// Value Parsing
+// Value Formatting
 // =============================================================================
 
-function parseValue(value: string, def: SettingDef, sm: SettingsManager): unknown {
-	if (def.type === "boolean") {
-		const lower = value.toLowerCase();
-		if (lower === "true" || lower === "1" || lower === "yes" || lower === "on") {
-			return true;
-		}
-		if (lower === "false" || lower === "0" || lower === "no" || lower === "off") {
-			return false;
-		}
-		throw new Error(`Invalid boolean value: ${value}. Use true/false, yes/no, on/off, or 1/0`);
-	}
-
-	const validValues = getSettingValues(def, sm);
-	if (validValues && validValues.length > 0 && !validValues.includes(value)) {
-		throw new Error(`Invalid value: ${value}. Valid values: ${validValues.join(", ")}`);
-	}
-
-	return value;
-}
-
 function formatValue(value: unknown): string {
 	if (value === undefined || value === null) {
 		return chalk.dim("(not set)");
@@ -136,36 +124,72 @@ function formatValue(value: unknown): string {
 	return chalk.yellow(String(value));
 }
 
-function getTypeDisplay(def: SettingDef, sm: SettingsManager): string {
+function getTypeDisplay(def: SettingDef): string {
 	if (def.type === "boolean") {
 		return "(boolean)";
 	}
-	const values = getSettingValues(def, sm);
+	const values = getSettingValues(def);
 	if (values && values.length > 0) {
 		return `(${values.join("|")})`;
 	}
 	return "(string)";
 }
 
+// =============================================================================
+// Schema-Driven Value Parsing
+// =============================================================================
+
+function parseAndSetValue(path: SettingPath, rawValue: string): void {
+	const schemaType = getType(path);
+	let parsedValue: unknown;
+
+	const trimmed = rawValue.trim();
+	switch (schemaType) {
+		case "boolean": {
+			const lower = trimmed.toLowerCase();
+			if (["true", "1", "yes", "on"].includes(lower)) parsedValue = true;
+			else if (["false", "0", "no", "off"].includes(lower)) parsedValue = false;
+			else throw new Error(`Invalid boolean value: ${rawValue}. Use true/false, yes/no, on/off, or 1/0`);
+			break;
+		}
+		case "number":
+			parsedValue = Number(trimmed);
+			if (!Number.isFinite(parsedValue)) throw new Error(`Invalid number: ${rawValue}`);
+			break;
+		case "enum": {
+			const valid = getEnumValues(path);
+			if (valid && !valid.includes(trimmed)) {
+				throw new Error(`Invalid value: ${rawValue}. Valid values: ${valid.join(", ")}`);
+			}
+			parsedValue = trimmed;
+			break;
+		}
+		default:
+			parsedValue = trimmed;
+	}
+
+	settings.set(path, parsedValue as SettingValue<typeof path>);
+}
+
 // =============================================================================
 // Command Handlers
 // =============================================================================
 
 export async function runConfigCommand(cmd: ConfigCommandArgs): Promise<void> {
-	const settingsManager = await SettingsManager.create();
+	await Settings.init();
 
 	switch (cmd.action) {
 		case "list":
-			handleList(settingsManager, cmd.flags);
+			handleList(cmd.flags);
 			break;
 		case "get":
-			handleGet(settingsManager, cmd.key, cmd.flags);
+			handleGet(cmd.key, cmd.flags);
 			break;
 		case "set":
-			await handleSet(settingsManager, cmd.key, cmd.value, cmd.flags);
+			await handleSet(cmd.key, cmd.value, cmd.flags);
 			break;
 		case "reset":
-			await handleReset(settingsManager, cmd.key, cmd.flags);
+			await handleReset(cmd.key, cmd.flags);
 			break;
 		case "path":
 			handlePath();
@@ -173,12 +197,14 @@ export async function runConfigCommand(cmd: ConfigCommandArgs): Promise<void> {
 	}
 }
 
-function handleList(settingsManager: SettingsManager, flags: { json?: boolean }): void {
+function handleList(flags: { json?: boolean }): void {
+	const defs = getAllSettingDefs();
+
 	if (flags.json) {
 		const result: Record<string, { value: unknown; type: string; description: string }> = {};
-		for (const def of SETTINGS_DEFS) {
-			result[def.id] = {
-				value: def.get(settingsManager),
+		for (const def of defs) {
+			result[def.path] = {
+				value: settings.get(def.path as SettingPath),
 				type: def.type,
 				description: def.description,
 			};
@@ -189,9 +215,8 @@ function handleList(settingsManager: SettingsManager, flags: { json?: boolean })
 
 	console.log(chalk.bold("Settings:\n"));
 
-	// Group by tab
 	const groups: Record<string, SettingDef[]> = {};
-	for (const def of SETTINGS_DEFS) {
+	for (const def of defs) {
 		if (!groups[def.tab]) {
 			groups[def.tab] = [];
 		}
@@ -207,16 +232,16 @@ function handleList(settingsManager: SettingsManager, flags: { json?: boolean })
 	for (const group of sortedGroups) {
 		console.log(chalk.bold.blue(`[${group}]`));
 		for (const def of groups[group]) {
-			const value = def.get(settingsManager);
+			const value = settings.get(def.path as SettingPath);
 			const valueStr = formatValue(value);
-			const typeStr = getTypeDisplay(def, settingsManager);
-			console.log(`  ${chalk.white(def.id)} = ${valueStr} ${chalk.dim(typeStr)}`);
+			const typeStr = getTypeDisplay(def);
+			console.log(`  ${chalk.white(def.path)} = ${valueStr} ${chalk.dim(typeStr)}`);
 		}
 		console.log("");
 	}
 }
 
-function handleGet(settingsManager: SettingsManager, key: string | undefined, flags: { json?: boolean }): void {
+function handleGet(key: string | undefined, flags: { json?: boolean }): void {
 	if (!key) {
 		console.error(chalk.red(`Usage: ${APP_NAME} config get <key>`));
 		console.error(chalk.dim(`\nRun '${APP_NAME} config list' to see available keys`));
@@ -230,22 +255,17 @@ function handleGet(settingsManager: SettingsManager, key: string | undefined, fl
 		process.exit(1);
 	}
 
-	const value = def.get(settingsManager);
+	const value = settings.get(def.path as SettingPath);
 
 	if (flags.json) {
-		console.log(JSON.stringify({ key: def.id, value, type: def.type, description: def.description }, null, 2));
+		console.log(JSON.stringify({ key: def.path, value, type: def.type, description: def.description }, null, 2));
 		return;
 	}
 
 	console.log(formatValue(value));
 }
 
-async function handleSet(
-	settingsManager: SettingsManager,
-	key: string | undefined,
-	value: string | undefined,
-	flags: { json?: boolean },
-): Promise<void> {
+async function handleSet(key: string | undefined, value: string | undefined, flags: { json?: boolean }): Promise<void> {
 	if (!key || value === undefined) {
 		console.error(chalk.red(`Usage: ${APP_NAME} config set <key> <value>`));
 		console.error(chalk.dim(`\nRun '${APP_NAME} config list' to see available keys`));
@@ -259,28 +279,23 @@ async function handleSet(
 		process.exit(1);
 	}
 
-	let parsedValue: unknown;
 	try {
-		parsedValue = parseValue(value, def, settingsManager);
+		parseAndSetValue(def.path as SettingPath, value);
 	} catch (err) {
 		console.error(chalk.red(String(err)));
 		process.exit(1);
 	}
 
-	def.set(settingsManager, parsedValue as never);
+	const newValue = settings.get(def.path as SettingPath);
 
 	if (flags.json) {
-		console.log(JSON.stringify({ key: def.id, value: parsedValue }));
+		console.log(JSON.stringify({ key: def.path, value: newValue }));
 	} else {
-		console.log(chalk.green(`${theme.status.success} Set ${def.id} = ${formatValue(parsedValue)}`));
+		console.log(chalk.green(`${theme.status.success} Set ${def.path} = ${formatValue(newValue)}`));
 	}
 }
 
-async function handleReset(
-	settingsManager: SettingsManager,
-	key: string | undefined,
-	flags: { json?: boolean },
-): Promise<void> {
+async function handleReset(key: string | undefined, flags: { json?: boolean }): Promise<void> {
 	if (!key) {
 		console.error(chalk.red(`Usage: ${APP_NAME} config reset <key>`));
 		console.error(chalk.dim(`\nRun '${APP_NAME} config list' to see available keys`));
@@ -294,16 +309,14 @@ async function handleReset(
 		process.exit(1);
 	}
 
-	// Get default value from a fresh in-memory settings manager
-	const defaults = SettingsManager.inMemory();
-	const defaultValue = def.get(defaults);
-
-	def.set(settingsManager, defaultValue as never);
+	const path = def.path as SettingPath;
+	const defaultValue = getDefault(path);
+	settings.set(path, defaultValue as SettingValue<typeof path>);
 
 	if (flags.json) {
-		console.log(JSON.stringify({ key: def.id, value: defaultValue }));
+		console.log(JSON.stringify({ key: def.path, value: defaultValue }));
 	} else {
-		console.log(chalk.green(`${theme.status.success} Reset ${def.id} to ${formatValue(defaultValue)}`));
+		console.log(chalk.green(`${theme.status.success} Reset ${def.path} to ${formatValue(defaultValue)}`));
 	}
 }
 
@@ -332,8 +345,8 @@ ${chalk.bold("Examples:")}
   ${APP_NAME} config list
   ${APP_NAME} config get theme
   ${APP_NAME} config set theme catppuccin-mocha
-  ${APP_NAME} config set autoCompact false
-  ${APP_NAME} config set thinkingLevel medium
+  ${APP_NAME} config set compaction.enabled false
+  ${APP_NAME} config set defaultThinkingLevel medium
   ${APP_NAME} config reset steeringMode
   ${APP_NAME} config list --json
 

package/src/cli/update-cli.ts

@@ -135,6 +135,24 @@ function getBinaryName(): string {
 	return `${APP_NAME}-${os}-${archName}`;
 }
 
+/**
+ * Get the appropriate native addon name for this platform.
+ * Uses process.platform directly (linux, darwin, win32).
+ */
+function getNativeAddonName(): string {
+	const platform = process.platform;
+	const arch = process.arch;
+
+	if (!["linux", "darwin", "win32"].includes(platform)) {
+		throw new Error(`Unsupported platform: ${platform}`);
+	}
+	if (!["x64", "arm64"].includes(arch)) {
+		throw new Error(`Unsupported architecture: ${arch}`);
+	}
+
+	return `pi_natives.${platform}-${arch}.node`;
+}
+
 /**
  * Update via bun package manager.
  */
@@ -154,16 +172,24 @@ async function updateViaBun(): Promise<void> {
  */
 async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 	const binaryName = getBinaryName();
+	const nativeAddonName = getNativeAddonName();
+
 	const asset = release.assets.find(a => a.name === binaryName);
+	const nativeAsset = release.assets.find(a => a.name === nativeAddonName);
 
 	if (!asset) {
 		throw new Error(`No binary found for ${binaryName}`);
 	}
+	if (!nativeAsset) {
+		throw new Error(`No native addon found for ${nativeAddonName}`);
+	}
 
 	const execPath = process.execPath;
-	const _execDir = path.dirname(execPath);
+	const execDir = path.dirname(execPath);
 	const tempPath = `${execPath}.new`;
 	const backupPath = `${execPath}.bak`;
+	const nativePath = path.join(execDir, nativeAddonName);
+	const nativeTempPath = `${nativePath}.new`;
 
 	console.log(chalk.dim(`Downloading ${binaryName}...`));
 
@@ -177,6 +203,18 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 	const nodeStream = Readable.fromWeb(response.body as import("stream/web").ReadableStream);
 	await pipeline(nodeStream, fileStream);
 
+	// Download native addon
+	console.log(chalk.dim(`Downloading ${nativeAddonName}...`));
+
+	const nativeResponse = await fetch(nativeAsset.url, { redirect: "follow" });
+	if (!nativeResponse.ok || !nativeResponse.body) {
+		throw new Error(`Native addon download failed: ${nativeResponse.statusText}`);
+	}
+
+	const nativeFileStream = fs.createWriteStream(nativeTempPath, { mode: 0o755 });
+	const nativeNodeStream = Readable.fromWeb(nativeResponse.body as import("stream/web").ReadableStream);
+	await pipeline(nativeNodeStream, nativeFileStream);
+
 	// Replace current binary
 	console.log(chalk.dim("Installing update..."));
 
@@ -187,11 +225,12 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 			if (!isEnoent(err)) throw err;
 		}
 		await fs.promises.rename(execPath, backupPath);
-
 		await fs.promises.rename(tempPath, execPath);
-
 		await fs.promises.unlink(backupPath);
 
+		// Replace native addon (no backup needed, just overwrite)
+		await fs.promises.rename(nativeTempPath, nativePath);
+
 		console.log(chalk.green(`\n${theme.status.success} Updated to ${release.version}`));
 		console.log(chalk.dim(`Restart ${APP_NAME} to use the new version`));
 	} catch (err) {
@@ -201,6 +240,9 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 		if (fs.existsSync(tempPath)) {
 			await fs.promises.unlink(tempPath);
 		}
+		if (fs.existsSync(nativeTempPath)) {
+			await fs.promises.unlink(nativeTempPath);
+		}
 		throw err;
 	}
 }

package/src/commit/agentic/agent.ts

@@ -5,7 +5,7 @@ import type { ControlledGit } from "../../commit/git";
 import typesDescriptionPrompt from "../../commit/prompts/types-description.md" with { type: "text" };
 import type { ModelRegistry } from "../../config/model-registry";
 import { renderPromptTemplate } from "../../config/prompt-templates";
-import type { SettingsManager } from "../../config/settings-manager";
+import type { Settings } from "../../config/settings";
 import { getMarkdownTheme } from "../../modes/theme/theme";
 import { createAgentSession } from "../../sdk";
 import type { AgentSessionEvent } from "../../session/agent-session";
@@ -19,7 +19,7 @@ export interface CommitAgentInput {
 	cwd: string;
 	git: ControlledGit;
 	model: Model<Api>;
-	settingsManager: SettingsManager;
+	settings: Settings;
 	modelRegistry: ModelRegistry;
 	authStorage: AuthStorage;
 	userContext?: string;
@@ -47,7 +47,7 @@ export async function runCommitAgentSession(input: CommitAgentInput): Promise<Co
 		git: input.git,
 		authStorage: input.authStorage,
 		modelRegistry: input.modelRegistry,
-		settingsManager: input.settingsManager,
+		settings: input.settings,
 		spawns,
 		state,
 		changelogTargets: input.changelogTargets,
@@ -58,7 +58,7 @@ export async function runCommitAgentSession(input: CommitAgentInput): Promise<Co
 		cwd: input.cwd,
 		authStorage: input.authStorage,
 		modelRegistry: input.modelRegistry,
-		settingsManager: input.settingsManager,
+		settingsInstance: input.settings,
 		model: input.model,
 		systemPrompt,
 		customTools: tools,

package/src/commit/agentic/index.ts

@@ -8,7 +8,7 @@ import { formatCommitMessage } from "../../commit/message";
 import { resolvePrimaryModel, resolveSmolModel } from "../../commit/model-selection";
 import type { CommitCommandArgs, ConventionalAnalysis } from "../../commit/types";
 import { renderPromptTemplate } from "../../config/prompt-templates";
-import { SettingsManager } from "../../config/settings-manager";
+import { Settings } from "../../config/settings";
 import { discoverAuthStorage, discoverContextFiles, discoverModels } from "../../sdk";
 import { type ExistingChangelogEntries, runCommitAgentSession } from "./agent";
 import { generateFallbackProposal } from "./fallback";
@@ -26,7 +26,8 @@ interface CommitExecutionContext {
 export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 	const cwd = process.cwd();
 	const git = new ControlledGit(cwd);
-	const [settingsManager, authStorage] = await Promise.all([SettingsManager.create(cwd), discoverAuthStorage()]);
+	const [settingsInstance, authStorage] = await Promise.all([Settings.init({ cwd }), discoverAuthStorage()]);
+	const settings = settingsInstance;
 
 	writeStdout("● Resolving model...");
 	const modelRegistry = discoverModels(authStorage);
@@ -40,12 +41,12 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 		return stagedFiles;
 	})();
 
-	const primaryModelPromise = resolvePrimaryModel(args.model, settingsManager, modelRegistry);
+	const primaryModelPromise = resolvePrimaryModel(args.model, settings, modelRegistry);
 	const [primaryModelResult, stagedFiles] = await Promise.all([primaryModelPromise, stagedFilesPromise]);
 	const { model: primaryModel, apiKey: primaryApiKey } = primaryModelResult;
 	writeStdout(`  └─ ${primaryModel.name}`);
 
-	const { model: agentModel } = await resolveSmolModel(settingsManager, modelRegistry, primaryModel, primaryApiKey);
+	const { model: agentModel } = await resolveSmolModel(settings, modelRegistry, primaryModel, primaryApiKey);
 
 	if (stagedFiles.length === 0) {
 		writeStderr("No changes to commit.");
@@ -123,7 +124,7 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 			cwd,
 			git,
 			model: agentModel,
-			settingsManager,
+			settings,
 			modelRegistry,
 			authStorage,
 			userContext: args.context,