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

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,

package/src/commit/agentic/tools/analyze-file.ts

@@ -4,7 +4,7 @@ import type { CommitAgentState } from "../../../commit/agentic/state";
 import type { NumstatEntry } from "../../../commit/types";
 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 type { CustomTool, CustomToolContext } from "../../../extensibility/custom-tools/types";
 import type { AuthStorage } from "../../../session/auth-storage";
 import { TaskTool } from "../../../task";
@@ -31,18 +31,16 @@ function buildToolSession(
 		cwd: string;
 		authStorage: AuthStorage;
 		modelRegistry: ModelRegistry;
-		settingsManager: SettingsManager;
+		settings: Settings;
 		spawns: string;
 	},
 ): ToolSession {
-	const sessionFile = () => ctx.sessionManager.getSessionFile() ?? null;
 	return {
 		cwd: options.cwd,
 		hasUI: false,
-		getSessionFile: sessionFile,
+		getSessionFile: () => ctx.sessionManager.getSessionFile() ?? null,
 		getSessionSpawns: () => options.spawns,
-		settings: options.settingsManager,
-		settingsManager: options.settingsManager,
+		settings: options.settings,
 		authStorage: options.authStorage,
 		modelRegistry: options.modelRegistry,
 	};
@@ -52,7 +50,7 @@ export function createAnalyzeFileTool(options: {
 	cwd: string;
 	authStorage: AuthStorage;
 	modelRegistry: ModelRegistry;
-	settingsManager: SettingsManager;
+	settings: Settings;
 	spawns: string;
 	state: CommitAgentState;
 }): CustomTool<typeof analyzeFileSchema> {

package/src/commit/agentic/tools/index.ts

@@ -1,7 +1,7 @@
 import type { CommitAgentState } from "../../../commit/agentic/state";
 import type { ControlledGit } from "../../../commit/git";
 import type { ModelRegistry } from "../../../config/model-registry";
-import type { SettingsManager } from "../../../config/settings-manager";
+import type { Settings } from "../../../config/settings";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
 import type { AuthStorage } from "../../../session/auth-storage";
 import { createAnalyzeFileTool } from "./analyze-file";
@@ -18,7 +18,7 @@ export interface CommitToolOptions {
 	git: ControlledGit;
 	authStorage: AuthStorage;
 	modelRegistry: ModelRegistry;
-	settingsManager: SettingsManager;
+	settings: Settings;
 	spawns: string;
 	state: CommitAgentState;
 	changelogTargets: string[];
@@ -39,7 +39,7 @@ export function createCommitTools(options: CommitToolOptions): Array<CustomTool<
 				cwd: options.cwd,
 				authStorage: options.authStorage,
 				modelRegistry: options.modelRegistry,
-				settingsManager: options.settingsManager,
+				settings: options.settings,
 				spawns: options.spawns,
 				state: options.state,
 			}),

package/src/commit/model-selection.ts

@@ -1,20 +1,20 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { parseModelPattern, parseModelString, SMOL_MODEL_PRIORITY } from "../config/model-resolver";
-import type { SettingsManager } from "../config/settings-manager";
+import type { Settings } from "../config/settings";
 
 export async function resolvePrimaryModel(
 	override: string | undefined,
-	settingsManager: SettingsManager,
+	settings: Settings,
 	modelRegistry: {
 		getAvailable: () => Model<Api>[];
 		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
 	},
 ): Promise<{ model: Model<Api>; apiKey: string }> {
 	const available = modelRegistry.getAvailable();
-	const matchPreferences = { usageOrder: settingsManager.getStorage()?.getModelUsageOrder() };
+	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
 	const model = override
-		? resolveModelFromString(expandRoleAlias(override, settingsManager), available, matchPreferences)
-		: resolveModelFromSettings(settingsManager, available, matchPreferences);
+		? resolveModelFromString(expandRoleAlias(override, settings), available, matchPreferences)
+		: resolveModelFromSettings(settings, available, matchPreferences);
 	if (!model) {
 		throw new Error("No model available for commit generation");
 	}
@@ -26,7 +26,7 @@ export async function resolvePrimaryModel(
 }
 
 export async function resolveSmolModel(
-	settingsManager: SettingsManager,
+	settings: Settings,
 	modelRegistry: {
 		getAvailable: () => Model<Api>[];
 		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
@@ -35,8 +35,8 @@ export async function resolveSmolModel(
 	fallbackApiKey: string,
 ): Promise<{ model: Model<Api>; apiKey: string }> {
 	const available = modelRegistry.getAvailable();
-	const matchPreferences = { usageOrder: settingsManager.getStorage()?.getModelUsageOrder() };
-	const role = settingsManager.getModelRole("smol");
+	const matchPreferences = { usageOrder: settings.getStorage()?.getModelUsageOrder() };
+	const role = settings.getModelRole("smol");
 	const roleModel = role ? resolveModelFromString(role, available, matchPreferences) : undefined;
 	if (roleModel) {
 		const apiKey = await modelRegistry.getApiKey(roleModel);
@@ -54,19 +54,15 @@ export async function resolveSmolModel(
 }
 
 function resolveModelFromSettings(
-	settingsManager: SettingsManager,
+	settings: Settings,
 	available: Model<Api>[],
 	matchPreferences: { usageOrder?: string[] },
 ): Model<Api> | undefined {
 	const roles = ["commit", "smol", "default"];
 	for (const role of roles) {
-		const configured = settingsManager.getModelRole(role);
+		const configured = settings.getModelRole(role);
 		if (!configured) continue;
-		const resolved = resolveModelFromString(
-			expandRoleAlias(configured, settingsManager),
-			available,
-			matchPreferences,
-		);
+		const resolved = resolveModelFromString(expandRoleAlias(configured, settings), available, matchPreferences);
 		if (resolved) return resolved;
 	}
 	return available[0];
@@ -84,11 +80,11 @@ function resolveModelFromString(
 	return parseModelPattern(value, available, matchPreferences).model;
 }
 
-function expandRoleAlias(value: string, settingsManager: SettingsManager): string {
+function expandRoleAlias(value: string, settings: Settings): string {
 	const lower = value.toLowerCase();
 	if (lower.startsWith("pi/") || lower.startsWith("omp/")) {
 		const role = lower.startsWith("pi/") ? value.slice(3) : value.slice(4);
-		return settingsManager.getModelRole(role) ?? value;
+		return settings.getModelRole(role) ?? value;
 	}
 	return value;
 }

package/src/commit/pipeline.ts

@@ -2,7 +2,7 @@ import * as path from "node:path";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { logger } from "@oh-my-pi/pi-utils";
 import { renderPromptTemplate } from "../config/prompt-templates";
-import { SettingsManager } from "../config/settings-manager";
+import { Settings } from "../config/settings";
 import { discoverAuthStorage, discoverModels } from "../sdk";
 import { loadProjectContextFiles } from "../system-prompt";
 import { runAgenticCommit } from "./agentic";
@@ -38,18 +38,18 @@ export async function runCommitCommand(args: CommitCommandArgs): Promise<void> {
 
 async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 	const cwd = process.cwd();
-	const settingsManager = await SettingsManager.create(cwd);
-	const commitSettings = settingsManager.getCommitSettings();
+	const settingsInstance = await Settings.init();
+	const commitSettings = settingsInstance.getGroup("commit");
 	const authStorage = await discoverAuthStorage();
 	const modelRegistry = discoverModels(authStorage);
 
 	const { model: primaryModel, apiKey: primaryApiKey } = await resolvePrimaryModel(
 		args.model,
-		settingsManager,
+		settingsInstance,
 		modelRegistry,
 	);
 	const { model: smolModel, apiKey: smolApiKey } = await resolveSmolModel(
-		settingsManager,
+		settingsInstance,
 		modelRegistry,
 		primaryModel,
 		primaryApiKey,

package/src/config/model-registry.ts

@@ -24,6 +24,12 @@ const OpenRouterRoutingSchema = Type.Object({
 	order: Type.Optional(Type.Array(Type.String())),
 });
 
+// Schema for Vercel AI Gateway routing preferences
+const VercelGatewayRoutingSchema = Type.Object({
+	only: Type.Optional(Type.Array(Type.String())),
+	order: Type.Optional(Type.Array(Type.String())),
+});
+
 // Schema for OpenAI compatibility settings
 const OpenAICompatSchema = Type.Object({
 	supportsStore: Type.Optional(Type.Boolean()),
@@ -31,6 +37,7 @@ const OpenAICompatSchema = Type.Object({
 	supportsReasoningEffort: Type.Optional(Type.Boolean()),
 	maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")])),
 	openRouterRouting: Type.Optional(OpenRouterRoutingSchema),
+	vercelGatewayRouting: Type.Optional(VercelGatewayRoutingSchema),
 });
 
 // Schema for custom model definition