@oh-my-pi/pi-coding-agent 2.3.1337 → 3.1.1337

package/src/core/plugins/paths.ts

@@ -1,32 +1,37 @@
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { CONFIG_DIR_NAME } from "../../config";
+import { CONFIG_DIR_NAME, getConfigDirPaths } from "../../config";
 
 // =============================================================================
 // Plugin Directory Paths
 // =============================================================================
 
-/** Root plugin directory: ~/.pi/plugins (not under agent/) */
+/** Root plugin directory: ~/.omp/plugins (not under agent/) */
 export function getPluginsDir(): string {
 	return join(homedir(), CONFIG_DIR_NAME, "plugins");
 }
 
-/** Where npm installs packages: ~/.pi/plugins/node_modules */
+/** Where npm installs packages: ~/.omp/plugins/node_modules */
 export function getPluginsNodeModules(): string {
 	return join(getPluginsDir(), "node_modules");
 }
 
-/** Plugin manifest: ~/.pi/plugins/package.json */
+/** Plugin manifest: ~/.omp/plugins/package.json */
 export function getPluginsPackageJson(): string {
 	return join(getPluginsDir(), "package.json");
 }
 
-/** Plugin lock file: ~/.pi/plugins/pi-plugins.lock.json */
+/** Plugin lock file: ~/.omp/plugins/omp-plugins.lock.json */
 export function getPluginsLockfile(): string {
-	return join(getPluginsDir(), "pi-plugins.lock.json");
+	return join(getPluginsDir(), "omp-plugins.lock.json");
 }
 
-/** Project-local plugin overrides: .pi/plugin-overrides.json */
+/** Project-local plugin overrides: .omp/plugin-overrides.json (primary) */
 export function getProjectPluginOverrides(cwd: string): string {
 	return join(cwd, CONFIG_DIR_NAME, "plugin-overrides.json");
 }
+
+/** All possible project plugin override paths (primary + legacy) */
+export function getAllProjectPluginOverridePaths(cwd: string): string[] {
+	return getConfigDirPaths("plugin-overrides.json", { user: false, cwd });
+}

package/src/core/plugins/types.ts

@@ -115,7 +115,7 @@ export interface InstalledPlugin {
 }
 
 // =============================================================================
-// Runtime Config Types (stored in pi-plugins.lock.json)
+// Runtime Config Types (stored in omp-plugins.lock.json)
 // =============================================================================
 
 /**
@@ -131,7 +131,7 @@ export interface PluginRuntimeState {
 }
 
 /**
- * Runtime configuration persisted to pi-plugins.lock.json.
+ * Runtime configuration persisted to omp-plugins.lock.json.
  * Tracks plugin states and settings across sessions.
  */
 export interface PluginRuntimeConfig {
@@ -146,7 +146,7 @@ export interface PluginRuntimeConfig {
 // =============================================================================
 
 /**
- * Project-local plugin overrides (stored in .pi/plugin-overrides.json).
+ * Project-local plugin overrides (stored in .omp/plugin-overrides.json).
  * Allows per-project plugin configuration without modifying global state.
  */
 export interface ProjectPluginOverrides {

package/src/core/sdk.ts

@@ -32,7 +32,9 @@
 import { join } from "node:path";
 import { Agent, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import { getAgentDir } from "../config";
+// Import discovery to register all providers on startup
+import "../discovery";
+import { getAgentDir, getConfigDirPaths } from "../config";
 import { AgentSession } from "./agent-session";
 import { AuthStorage } from "./auth-storage";
 import {
@@ -48,6 +50,7 @@ import {
 import type { CustomTool } from "./custom-tools/types";
 import { discoverAndLoadHooks, HookRunner, type LoadedHook, wrapToolsWithHooks } from "./hooks/index";
 import type { HookFactory } from "./hooks/types";
+import { logger } from "./logger";
 import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp/index";
 import { convertToLlm } from "./messages";
 import { ModelRegistry } from "./model-registry";
@@ -91,7 +94,7 @@ import {
 export interface CreateAgentSessionOptions {
 	/** Working directory for project-local discovery. Default: process.cwd() */
 	cwd?: string;
-	/** Global config directory. Default: ~/.pi/agent */
+	/** Global config directory. Default: ~/.omp/agent */
 	agentDir?: string;
 
 	/** Auth storage for credentials. Default: discoverAuthStorage(agentDir) */
@@ -125,7 +128,7 @@ export interface CreateAgentSessionOptions {
 	skills?: Skill[];
 	/** Context files (AGENTS.md content). Default: discovered walking up from cwd */
 	contextFiles?: Array<{ path: string; content: string }>;
-	/** Slash commands. Default: discovered from cwd/.pi/commands/ + agentDir/commands/ */
+	/** Slash commands. Default: discovered from cwd/.omp/commands/ + agentDir/commands/ */
 	slashCommands?: FileSlashCommand[];
 
 	/** Enable MCP server discovery from .mcp.json files. Default: true */
@@ -202,17 +205,33 @@ function getDefaultAgentDir(): string {
 // Discovery Functions
 
 /**
- * Create an AuthStorage instance for the given agent directory.
+ * Create an AuthStorage instance with fallback support.
+ * Reads from primary path first, then falls back to legacy paths (.pi, .claude).
  */
 export function discoverAuthStorage(agentDir: string = getDefaultAgentDir()): AuthStorage {
-	return new AuthStorage(join(agentDir, "auth.json"));
+	const primaryPath = join(agentDir, "auth.json");
+	// Get all auth.json paths (user-level only), excluding the primary
+	const allPaths = getConfigDirPaths("auth.json", { project: false });
+	const fallbackPaths = allPaths.filter((p) => p !== primaryPath);
+
+	logger.debug("discoverAuthStorage", { agentDir, primaryPath, allPaths, fallbackPaths });
+
+	return new AuthStorage(primaryPath, fallbackPaths);
 }
 
 /**
- * Create a ModelRegistry for the given agent directory.
+ * Create a ModelRegistry with fallback support.
+ * Reads from primary path first, then falls back to legacy paths (.pi, .claude).
  */
 export function discoverModels(authStorage: AuthStorage, agentDir: string = getDefaultAgentDir()): ModelRegistry {
-	return new ModelRegistry(authStorage, join(agentDir, "models.json"));
+	const primaryPath = join(agentDir, "models.json");
+	// Get all models.json paths (user-level only), excluding the primary
+	const allPaths = getConfigDirPaths("models.json", { project: false });
+	const fallbackPaths = allPaths.filter((p) => p !== primaryPath);
+
+	logger.debug("discoverModels", { primaryPath, fallbackPaths });
+
+	return new ModelRegistry(authStorage, primaryPath, fallbackPaths);
 }
 
 /**
@@ -220,12 +239,11 @@ export function discoverModels(authStorage: AuthStorage, agentDir: string = getD
  */
 export async function discoverHooks(
 	cwd?: string,
-	agentDir?: string,
+	_agentDir?: string,
 ): Promise<Array<{ path: string; factory: HookFactory }>> {
 	const resolvedCwd = cwd ?? process.cwd();
-	const resolvedAgentDir = agentDir ?? getDefaultAgentDir();
 
-	const { hooks, errors } = await discoverAndLoadHooks([], resolvedCwd, resolvedAgentDir);
+	const { hooks, errors } = await discoverAndLoadHooks([], resolvedCwd);
 
 	// Log errors but don't fail
 	for (const { path, error } of errors) {
@@ -243,12 +261,11 @@ export async function discoverHooks(
  */
 export async function discoverCustomTools(
 	cwd?: string,
-	agentDir?: string,
+	_agentDir?: string,
 ): Promise<Array<{ path: string; tool: CustomTool }>> {
 	const resolvedCwd = cwd ?? process.cwd();
-	const resolvedAgentDir = agentDir ?? getDefaultAgentDir();
 
-	const { tools, errors } = await discoverAndLoadCustomTools([], resolvedCwd, Object.keys(allTools), resolvedAgentDir);
+	const { tools, errors } = await discoverAndLoadCustomTools([], resolvedCwd, Object.keys(allTools));
 
 	// Log errors but don't fail
 	for (const { path, error } of errors) {
@@ -264,22 +281,24 @@ export async function discoverCustomTools(
 /**
  * Discover skills from cwd and agentDir.
  */
-export function discoverSkills(cwd?: string, agentDir?: string, settings?: SkillsSettings): Skill[] {
+export function discoverSkills(cwd?: string, _agentDir?: string, settings?: SkillsSettings): Skill[] {
 	const { skills } = loadSkillsInternal({
 		...settings,
 		cwd: cwd ?? process.cwd(),
-		agentDir: agentDir ?? getDefaultAgentDir(),
 	});
 	return skills;
 }
 
 /**
  * Discover context files (AGENTS.md) walking up from cwd.
+ * Returns files sorted by depth (farther from cwd first, so closer files appear last/more prominent).
  */
-export function discoverContextFiles(cwd?: string, agentDir?: string): Array<{ path: string; content: string }> {
+export function discoverContextFiles(
+	cwd?: string,
+	_agentDir?: string,
+): Array<{ path: string; content: string; depth?: number }> {
 	return loadContextFilesInternal({
 		cwd: cwd ?? process.cwd(),
-		agentDir: agentDir ?? getDefaultAgentDir(),
 	});
 }
 
@@ -288,14 +307,11 @@ export function discoverContextFiles(cwd?: string, agentDir?: string): Array<{ p
  */
 export function discoverSlashCommands(
 	cwd?: string,
-	agentDir?: string,
-	settings?: CommandsSettings,
+	_agentDir?: string,
+	_settings?: CommandsSettings,
 ): FileSlashCommand[] {
 	return loadSlashCommandsInternal({
 		cwd: cwd ?? process.cwd(),
-		agentDir: agentDir ?? getDefaultAgentDir(),
-		enableClaudeUser: settings?.enableClaudeUser,
-		enableClaudeProject: settings?.enableClaudeProject,
 	});
 }
 
@@ -348,7 +364,7 @@ export function buildSystemPrompt(options: BuildSystemPromptOptions = {}): strin
 // Settings
 
 /**
- * Load settings from agentDir/settings.json merged with cwd/.pi/settings.json.
+ * Load settings from agentDir/settings.json merged with cwd/.omp/settings.json.
  */
 export function loadSettings(cwd?: string, agentDir?: string): Settings {
 	const manager = SettingsManager.create(cwd ?? process.cwd(), agentDir ?? getDefaultAgentDir());
@@ -496,6 +512,12 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 	const settingsManager = options.settingsManager ?? SettingsManager.create(cwd, agentDir);
 	time("settingsManager");
+
+	// Initialize discovery system with settings for provider persistence
+	const { initializeWithSettings } = await import("../discovery");
+	initializeWithSettings(settingsManager);
+	time("initializeWithSettings");
+
 	const sessionManager = options.sessionManager ?? SessionManager.create(cwd);
 	time("sessionManager");
 
@@ -591,7 +613,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	} else {
 		// Discover hooks, merging with additional paths
 		const configuredPaths = [...settingsManager.getHookPaths(), ...(options.additionalHookPaths ?? [])];
-		const { hooks, errors } = await discoverAndLoadHooks(configuredPaths, cwd, agentDir);
+		const { hooks, errors } = await discoverAndLoadHooks(configuredPaths, cwd);
 		time("discoverAndLoadHooks");
 		for (const { path, error } of errors) {
 			console.error(`Failed to load hook "${path}": ${error}`);
@@ -629,7 +651,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	} else {
 		// Discover custom tools, merging with additional paths
 		const configuredPaths = [...settingsManager.getCustomToolPaths(), ...(options.additionalCustomToolPaths ?? [])];
-		customToolsResult = await discoverAndLoadCustomTools(configuredPaths, cwd, Object.keys(allTools), agentDir);
+		customToolsResult = await discoverAndLoadCustomTools(configuredPaths, cwd, Object.keys(allTools));
 		time("discoverAndLoadCustomTools");
 		for (const { path, error } of customToolsResult.errors) {
 			console.error(`Failed to load custom tool "${path}": ${error}`);
@@ -687,6 +709,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 				path: "<exa>",
 				resolvedPath: "<exa>",
 				tool,
+				source: { provider: "builtin", providerName: "builtin", level: "user" },
 			}));
 			customToolsResult = {
 				...customToolsResult,
@@ -743,7 +766,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	let systemPrompt: string;
 	const defaultPrompt = buildSystemPromptInternal({
 		cwd,
-		agentDir,
 		skills,
 		contextFiles,
 	});
@@ -754,7 +776,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	} else if (typeof options.systemPrompt === "string") {
 		systemPrompt = buildSystemPromptInternal({
 			cwd,
-			agentDir,
 			skills,
 			contextFiles,
 			customPrompt: options.systemPrompt,

package/src/core/session-manager.ts

@@ -394,7 +394,7 @@ export function buildSessionContext(
 
 /**
  * Compute the default session directory for a cwd.
- * Encodes cwd into a safe directory name under ~/.pi/agent/sessions/.
+ * Encodes cwd into a safe directory name under ~/.omp/agent/sessions/.
  */
 function getDefaultSessionDir(cwd: string): string {
 	const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
@@ -1101,7 +1101,7 @@ export class SessionManager {
 	/**
 	 * Create a new session.
 	 * @param cwd Working directory (stored in session header)
-	 * @param sessionDir Optional session directory. If omitted, uses default (~/.pi/agent/sessions/<encoded-cwd>/).
+	 * @param sessionDir Optional session directory. If omitted, uses default (~/.omp/agent/sessions/<encoded-cwd>/).
 	 */
 	static create(cwd: string, sessionDir?: string): SessionManager {
 		const dir = sessionDir ?? getDefaultSessionDir(cwd);
@@ -1126,7 +1126,7 @@ export class SessionManager {
 	/**
 	 * Continue the most recent session, or create new if none.
 	 * @param cwd Working directory
-	 * @param sessionDir Optional session directory. If omitted, uses default (~/.pi/agent/sessions/<encoded-cwd>/).
+	 * @param sessionDir Optional session directory. If omitted, uses default (~/.omp/agent/sessions/<encoded-cwd>/).
 	 */
 	static continueRecent(cwd: string, sessionDir?: string): SessionManager {
 		const dir = sessionDir ?? getDefaultSessionDir(cwd);
@@ -1145,7 +1145,7 @@ export class SessionManager {
 	/**
 	 * List all sessions.
 	 * @param cwd Working directory (used to compute default session directory)
-	 * @param sessionDir Optional session directory. If omitted, uses default (~/.pi/agent/sessions/<encoded-cwd>/).
+	 * @param sessionDir Optional session directory. If omitted, uses default (~/.omp/agent/sessions/<encoded-cwd>/).
 	 */
 	static list(cwd: string, sessionDir?: string): SessionInfo[] {
 		const dir = sessionDir ?? getDefaultSessionDir(cwd);

package/src/core/settings-manager.ts

@@ -1,6 +1,8 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { CONFIG_DIR_NAME, getAgentDir } from "../config";
+import { type Settings as SettingsItem, settingsCapability } from "../capability/settings";
+import { getAgentDir } from "../config";
+import { loadSync } from "../discovery";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
@@ -91,6 +93,7 @@ export interface Settings {
 	mcp?: MCPSettings;
 	lsp?: LspSettings;
 	edit?: EditSettings;
+	disabledProviders?: string[]; // Discovery provider IDs that are disabled
 }
 
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
@@ -126,19 +129,14 @@ function deepMergeSettings(base: Settings, overrides: Settings): Settings {
 
 export class SettingsManager {
 	private settingsPath: string | null;
-	private projectSettingsPath: string | null;
+	private cwd: string | null;
 	private globalSettings: Settings;
 	private settings: Settings;
 	private persist: boolean;
 
-	private constructor(
-		settingsPath: string | null,
-		projectSettingsPath: string | null,
-		initialSettings: Settings,
-		persist: boolean,
-	) {
+	private constructor(settingsPath: string | null, cwd: string | null, initialSettings: Settings, persist: boolean) {
 		this.settingsPath = settingsPath;
-		this.projectSettingsPath = projectSettingsPath;
+		this.cwd = cwd;
 		this.persist = persist;
 		this.globalSettings = initialSettings;
 		const projectSettings = this.loadProjectSettings();
@@ -148,9 +146,23 @@ export class SettingsManager {
 	/** Create a SettingsManager that loads from files */
 	static create(cwd: string = process.cwd(), agentDir: string = getAgentDir()): SettingsManager {
 		const settingsPath = join(agentDir, "settings.json");
-		const projectSettingsPath = join(cwd, CONFIG_DIR_NAME, "settings.json");
-		const globalSettings = SettingsManager.loadFromFile(settingsPath);
-		return new SettingsManager(settingsPath, projectSettingsPath, globalSettings, true);
+
+		// Use capability API to load user-level settings from all providers
+		const result = loadSync(settingsCapability.id, { cwd });
+
+		// Merge all user-level settings
+		let globalSettings: Settings = {};
+		for (const item of result.items as SettingsItem[]) {
+			if (item.level === "user") {
+				globalSettings = deepMergeSettings(globalSettings, item.data as Settings);
+			}
+		}
+
+		// Also load from agentDir for backward compatibility (if not covered by providers)
+		const legacySettings = SettingsManager.loadFromFile(settingsPath);
+		globalSettings = deepMergeSettings(globalSettings, legacySettings);
+
+		return new SettingsManager(settingsPath, cwd, globalSettings, true);
 	}
 
 	/** Create an in-memory SettingsManager (no file I/O) */
@@ -172,17 +184,20 @@ export class SettingsManager {
 	}
 
 	private loadProjectSettings(): Settings {
-		if (!this.projectSettingsPath || !existsSync(this.projectSettingsPath)) {
-			return {};
-		}
+		if (!this.cwd) return {};
 
-		try {
-			const content = readFileSync(this.projectSettingsPath, "utf-8");
-			return JSON.parse(content);
-		} catch (error) {
-			console.error(`Warning: Could not read project settings file: ${error}`);
-			return {};
+		// Use capability API to discover settings from all providers
+		const result = loadSync(settingsCapability.id, { cwd: this.cwd });
+
+		// Merge only project-level settings (user-level settings are handled separately via globalSettings)
+		let merged: Settings = {};
+		for (const item of result.items as SettingsItem[]) {
+			if (item.level === "project") {
+				merged = deepMergeSettings(merged, item.data as Settings);
+			}
 		}
+
+		return merged;
 	}
 
 	/** Apply additional overrides on top of current settings */
@@ -558,4 +573,13 @@ export class SettingsManager {
 		this.globalSettings.edit.fuzzyMatch = enabled;
 		this.save();
 	}
+
+	getDisabledProviders(): string[] {
+		return [...(this.settings.disabledProviders ?? [])];
+	}
+
+	setDisabledProviders(providerIds: string[]): void {
+		this.globalSettings.disabledProviders = providerIds;
+		this.save();
+	}
 }