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

package/src/discovery/vscode.ts

@@ -0,0 +1,99 @@
+/**
+ * VS Code Provider
+ *
+ * Loads config from `.vscode` directory (project-only).
+ * Supports MCP server discovery from `mcp.json` with nested `mcp.servers` structure.
+ */
+
+import { registerProvider } from "../capability/index";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import type { LoadContext, LoadResult } from "../capability/types";
+import { createSourceMeta, expandEnvVarsDeep, getProjectPath, parseJSON } from "./helpers";
+
+const PROVIDER_ID = "vscode";
+const DISPLAY_NAME = "VS Code";
+const PRIORITY = 20;
+
+// =============================================================================
+// MCP Servers
+// =============================================================================
+
+registerProvider<MCPServer>(mcpCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load MCP servers from .vscode/mcp.json",
+	priority: PRIORITY,
+	load(ctx: LoadContext): LoadResult<MCPServer> {
+		const items: MCPServer[] = [];
+		const warnings: string[] = [];
+
+		// Project-only (VS Code doesn't support user-level MCP config)
+		const projectPath = getProjectPath(ctx, "vscode", "mcp.json");
+		if (projectPath && ctx.fs.isFile(projectPath)) {
+			const result = loadMCPConfig(ctx, projectPath, "project");
+			items.push(...result.items);
+			if (result.warnings) warnings.push(...result.warnings);
+		}
+
+		return { items, warnings };
+	},
+});
+
+/**
+ * Load MCP servers from a mcp.json file.
+ * VS Code uses nested structure: { "mcp": { "servers": { ... } } }
+ */
+function loadMCPConfig(ctx: LoadContext, path: string, level: "user" | "project"): LoadResult<MCPServer> {
+	const items: MCPServer[] = [];
+	const warnings: string[] = [];
+
+	const content = ctx.fs.readFile(path);
+	if (!content) {
+		warnings.push(`Failed to read ${path}`);
+		return { items, warnings };
+	}
+
+	const parsed = parseJSON<{ mcp?: { servers?: Record<string, unknown> } }>(content);
+	if (!parsed) {
+		warnings.push(`Invalid JSON in ${path}`);
+		return { items, warnings };
+	}
+
+	// VS Code uses nested structure: mcp.servers
+	const servers = parsed.mcp?.servers;
+	if (!servers || typeof servers !== "object") {
+		return { items, warnings };
+	}
+
+	for (const [name, config] of Object.entries(servers)) {
+		if (!config || typeof config !== "object") {
+			warnings.push(`Invalid config for server "${name}" in ${path}`);
+			continue;
+		}
+
+		const raw = config as Record<string, unknown>;
+
+		// Expand environment variables
+		const expanded = expandEnvVarsDeep(raw);
+
+		const server: MCPServer = {
+			name,
+			command: typeof expanded.command === "string" ? expanded.command : undefined,
+			args: Array.isArray(expanded.args) ? (expanded.args as string[]) : undefined,
+			env: expanded.env && typeof expanded.env === "object" ? (expanded.env as Record<string, string>) : undefined,
+			url: typeof expanded.url === "string" ? expanded.url : undefined,
+			headers:
+				expanded.headers && typeof expanded.headers === "object"
+					? (expanded.headers as Record<string, string>)
+					: undefined,
+			transport: ["stdio", "sse", "http"].includes(expanded.transport as string)
+				? (expanded.transport as "stdio" | "sse" | "http")
+				: undefined,
+			_source: createSourceMeta(PROVIDER_ID, path, level),
+		};
+
+		items.push(server);
+	}
+
+	return { items, warnings };
+}

package/src/discovery/windsurf.ts

@@ -0,0 +1,216 @@
+/**
+ * Windsurf (Codeium) Provider
+ *
+ * Loads configuration from Windsurf's config locations:
+ * - User: ~/.codeium/windsurf
+ * - Project: .windsurf
+ *
+ * Supports:
+ * - MCP servers from mcp_config.json
+ * - Rules from .windsurf/rules/*.md and ~/.codeium/windsurf/memories/global_rules.md
+ * - Legacy .windsurfrules file
+ */
+
+import { registerProvider } from "../capability/index";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import { type Rule, ruleCapability } from "../capability/rule";
+import type { LoadContext, LoadResult } from "../capability/types";
+import {
+	createSourceMeta,
+	expandEnvVarsDeep,
+	getProjectPath,
+	getUserPath,
+	loadFilesFromDir,
+	parseFrontmatter,
+	parseJSON,
+} from "./helpers";
+
+const PROVIDER_ID = "windsurf";
+const DISPLAY_NAME = "Windsurf";
+const PRIORITY = 50;
+
+// =============================================================================
+// MCP Servers
+// =============================================================================
+
+function loadMCPServers(ctx: LoadContext): LoadResult<MCPServer> {
+	const items: MCPServer[] = [];
+	const warnings: string[] = [];
+
+	// User-level: ~/.codeium/windsurf/mcp_config.json
+	const userPath = getUserPath(ctx, "windsurf", "mcp_config.json");
+	if (userPath && ctx.fs.isFile(userPath)) {
+		const content = ctx.fs.readFile(userPath);
+		if (content) {
+			const config = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+			if (config?.mcpServers) {
+				for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
+					if (typeof serverConfig !== "object" || serverConfig === null) {
+						warnings.push(`Invalid server config for "${name}" in ${userPath}`);
+						continue;
+					}
+
+					const server = expandEnvVarsDeep(serverConfig as Record<string, unknown>);
+					items.push({
+						name,
+						command: server.command as string | undefined,
+						args: server.args as string[] | undefined,
+						env: server.env as Record<string, string> | undefined,
+						url: server.url as string | undefined,
+						headers: server.headers as Record<string, string> | undefined,
+						transport: server.type as "stdio" | "sse" | "http" | undefined,
+						_source: createSourceMeta(PROVIDER_ID, userPath, "user"),
+					});
+				}
+			}
+		}
+	}
+
+	// Project-level: .windsurf/mcp_config.json
+	const projectPath = getProjectPath(ctx, "windsurf", "mcp_config.json");
+	if (projectPath && ctx.fs.isFile(projectPath)) {
+		const content = ctx.fs.readFile(projectPath);
+		if (content) {
+			const config = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+			if (config?.mcpServers) {
+				for (const [name, serverConfig] of Object.entries(config.mcpServers)) {
+					if (typeof serverConfig !== "object" || serverConfig === null) {
+						warnings.push(`Invalid server config for "${name}" in ${projectPath}`);
+						continue;
+					}
+
+					const server = expandEnvVarsDeep(serverConfig as Record<string, unknown>);
+					items.push({
+						name,
+						command: server.command as string | undefined,
+						args: server.args as string[] | undefined,
+						env: server.env as Record<string, string> | undefined,
+						url: server.url as string | undefined,
+						headers: server.headers as Record<string, string> | undefined,
+						transport: server.type as "stdio" | "sse" | "http" | undefined,
+						_source: createSourceMeta(PROVIDER_ID, projectPath, "project"),
+					});
+				}
+			}
+		}
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Rules
+// =============================================================================
+
+function loadRules(ctx: LoadContext): LoadResult<Rule> {
+	const items: Rule[] = [];
+	const warnings: string[] = [];
+
+	// User-level: ~/.codeium/windsurf/memories/global_rules.md
+	const userPath = getUserPath(ctx, "windsurf", "memories/global_rules.md");
+	if (userPath && ctx.fs.isFile(userPath)) {
+		const content = ctx.fs.readFile(userPath);
+		if (content) {
+			const { frontmatter, body } = parseFrontmatter(content);
+
+			// Validate and normalize globs
+			let globs: string[] | undefined;
+			if (Array.isArray(frontmatter.globs)) {
+				globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
+			} else if (typeof frontmatter.globs === "string") {
+				globs = [frontmatter.globs];
+			}
+
+			items.push({
+				name: "global_rules",
+				path: userPath,
+				content: body,
+				globs,
+				alwaysApply: frontmatter.alwaysApply as boolean | undefined,
+				description: frontmatter.description as string | undefined,
+				_source: createSourceMeta(PROVIDER_ID, userPath, "user"),
+			});
+		}
+	}
+
+	// Project-level: .windsurf/rules/*.md
+	const projectRulesDir = getProjectPath(ctx, "windsurf", "rules");
+	if (projectRulesDir) {
+		const result = loadFilesFromDir<Rule>(ctx, projectRulesDir, PROVIDER_ID, "project", {
+			extensions: ["md"],
+			transform: (name, content, path, source) => {
+				const { frontmatter, body } = parseFrontmatter(content);
+				const ruleName = name.replace(/\.md$/, "");
+
+				// Validate and normalize globs
+				let globs: string[] | undefined;
+				if (Array.isArray(frontmatter.globs)) {
+					globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
+				} else if (typeof frontmatter.globs === "string") {
+					globs = [frontmatter.globs];
+				}
+
+				return {
+					name: ruleName,
+					path,
+					content: body,
+					globs,
+					alwaysApply: frontmatter.alwaysApply as boolean | undefined,
+					description: frontmatter.description as string | undefined,
+					_source: source,
+				};
+			},
+		});
+		items.push(...result.items);
+		if (result.warnings) warnings.push(...result.warnings);
+	}
+
+	// Legacy: .windsurfrules in project root
+	const legacyPath = ctx.fs.walkUp(".windsurfrules", { file: true });
+	if (legacyPath) {
+		const content = ctx.fs.readFile(legacyPath);
+		if (content) {
+			const { frontmatter, body } = parseFrontmatter(content);
+
+			// Validate and normalize globs
+			let globs: string[] | undefined;
+			if (Array.isArray(frontmatter.globs)) {
+				globs = frontmatter.globs.filter((g): g is string => typeof g === "string");
+			} else if (typeof frontmatter.globs === "string") {
+				globs = [frontmatter.globs];
+			}
+
+			items.push({
+				name: "windsurfrules",
+				path: legacyPath,
+				content: body,
+				globs,
+				alwaysApply: frontmatter.alwaysApply as boolean | undefined,
+				description: frontmatter.description as string | undefined,
+				_source: createSourceMeta(PROVIDER_ID, legacyPath, "project"),
+			});
+		}
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Provider Registration
+// =============================================================================
+
+registerProvider<MCPServer>(mcpCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load MCP servers from Windsurf config (mcp_config.json)",
+	priority: PRIORITY,
+	load: loadMCPServers,
+});
+
+registerProvider<Rule>(ruleCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load rules from Windsurf (.windsurf/rules/*.md, memories/global_rules.md, .windsurfrules)",
+	priority: PRIORITY,
+	load: loadRules,
+});

package/src/main.ts

@@ -5,8 +5,6 @@
  * createAgentSession() options. The SDK does the heavy lifting.
  */
 
-import { existsSync } from "node:fs";
-import { join } from "node:path";
 import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
 import { type Args, parseArgs, printHelp } from "./cli/args";
@@ -15,7 +13,7 @@ import { listModels } from "./cli/list-models";
 import { parsePluginArgs, printPluginHelp, runPluginCommand } from "./cli/plugin-cli";
 import { selectSession } from "./cli/session-picker";
 import { parseUpdateArgs, printUpdateHelp, runUpdateCommand } from "./cli/update-cli";
-import { CONFIG_DIR_NAME, getAgentDir, getModelsPath, VERSION } from "./config";
+import { findConfigFile, getModelsPath, VERSION } from "./config";
 import type { AgentSession } from "./core/agent-session";
 import type { LoadedCustomTool } from "./core/custom-tools/index";
 import { exportFromFile } from "./core/export-html/index";
@@ -199,18 +197,16 @@ function createSessionManager(parsed: Args, cwd: string): SessionManager | undef
 
 /** Discover SYSTEM.md file if no CLI system prompt was provided */
 function discoverSystemPromptFile(): string | undefined {
-	// Check project-local first: .pi/SYSTEM.md
-	const projectPath = join(process.cwd(), CONFIG_DIR_NAME, "SYSTEM.md");
-	if (existsSync(projectPath)) {
+	// Check project-local first (.omp/SYSTEM.md, .pi/SYSTEM.md legacy)
+	const projectPath = findConfigFile("SYSTEM.md", { user: false });
+	if (projectPath) {
 		return projectPath;
 	}
-
-	// Fall back to global: ~/.pi/agent/SYSTEM.md
-	const globalPath = join(getAgentDir(), "SYSTEM.md");
-	if (existsSync(globalPath)) {
+	// If not found, check SYSTEM.md file in the global directory.
+	const globalPath = findConfigFile("SYSTEM.md", { user: true });
+	if (globalPath) {
 		return globalPath;
 	}
-
 	return undefined;
 }
 
@@ -374,9 +370,14 @@ export async function main(args: string[]) {
 	const settingsManager = SettingsManager.create(cwd);
 	time("SettingsManager.create");
 
+	// Initialize discovery system with settings for provider persistence
+	const { initializeWithSettings } = await import("./discovery");
+	initializeWithSettings(settingsManager);
+	time("initializeWithSettings");
+
 	// Apply model role overrides from CLI args or env vars (ephemeral, not persisted)
-	const smolModel = parsed.smol ?? process.env.PI_SMOL_MODEL;
-	const slowModel = parsed.slow ?? process.env.PI_SLOW_MODEL;
+	const smolModel = parsed.smol ?? process.env.OMP_SMOL_MODEL;
+	const slowModel = parsed.slow ?? process.env.OMP_SLOW_MODEL;
 	if (smolModel || slowModel) {
 		const roleOverrides: Record<string, string> = {};
 		if (smolModel) roleOverrides.smol = smolModel;

package/src/migrations.ts

@@ -6,6 +6,22 @@ import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, writeFile
 import { dirname, join } from "node:path";
 import { getAgentDir } from "./config";
 
+/**
+ * Migrate PI_* environment variables to OMP_* equivalents.
+ * If PI_XX is set and OMP_XX is not, set OMP_XX to PI_XX's value.
+ * This provides backwards compatibility for users with existing PI_* env vars.
+ */
+export function migrateEnvVars(): void {
+	for (const [key, value] of Object.entries(process.env)) {
+		if (key.startsWith("PI_") && value !== undefined) {
+			const ompKey = `OMP_${key.slice(3)}`; // PI_FOO -> OMP_FOO
+			if (process.env[ompKey] === undefined) {
+				process.env[ompKey] = value;
+			}
+		}
+	}
+}
+
 /**
  * Migrate legacy oauth.json and settings.json apiKeys to auth.json.
  *
@@ -66,10 +82,10 @@ export function migrateAuthToAuthJson(): string[] {
 }
 
 /**
- * Migrate sessions from ~/.pi/agent/*.jsonl to proper session directories.
+ * Migrate sessions from ~/.omp/agent/*.jsonl to proper session directories.
  *
- * Bug in v0.30.0: Sessions were saved to ~/.pi/agent/ instead of
- * ~/.pi/agent/sessions/<encoded-cwd>/. This migration moves them
+ * Bug in v0.30.0: Sessions were saved to ~/.omp/agent/ instead of
+ * ~/.omp/agent/sessions/<encoded-cwd>/. This migration moves them
  * to the correct location based on the cwd in their session header.
  *
  * See: https://github.com/badlogic/pi-mono/issues/320
@@ -129,7 +145,12 @@ export function migrateSessionsFromAgentRoot(): void {
  * @returns Object with migration results
  */
 export function runMigrations(): { migratedAuthProviders: string[] } {
+	// First: migrate env vars (before anything else reads them)
+	migrateEnvVars();
+
+	// Then: run data migrations
 	const migratedAuthProviders = migrateAuthToAuthJson();
 	migrateSessionsFromAgentRoot();
+
 	return { migratedAuthProviders };
 }

package/src/modes/interactive/components/hook-editor.ts

@@ -89,7 +89,7 @@ export class HookEditorComponent extends Container {
 		}
 
 		const currentText = this.editor.getText();
-		const tmpFile = path.join(os.tmpdir(), `pi-hook-editor-${Date.now()}.md`);
+		const tmpFile = path.join(os.tmpdir(), `omp-hook-editor-${Date.now()}.md`);
 
 		try {
 			fs.writeFileSync(tmpFile, currentText, "utf-8");

package/src/modes/interactive/components/plugin-settings.ts

@@ -52,7 +52,7 @@ export class PluginListComponent extends Container {
 		if (plugins.length === 0) {
 			this.addChild(new Text(theme.fg("muted", "  No plugins installed"), 0, 0));
 			this.addChild(new Spacer(1));
-			this.addChild(new Text(theme.fg("dim", "  Install with: pi plugin install <package>"), 0, 0));
+			this.addChild(new Text(theme.fg("dim", "  Install with: omp plugin install <package>"), 0, 0));
 			this.addChild(new Spacer(1));
 			this.addChild(new DynamicBorder());
 

package/src/modes/interactive/components/settings-defs.ts

@@ -11,6 +11,7 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { getCapabilities } from "@oh-my-pi/pi-tui";
 import type { SettingsManager } from "../../../core/settings-manager";
+import { getAllProvidersInfo, isProviderEnabled } from "../../../discovery";
 
 // Setting value types
 export type SettingValue = boolean | string;
@@ -266,12 +267,47 @@ export const SETTINGS_DEFS: SettingDef[] = [
 	},
 ];
 
+/**
+ * Get discovery provider settings dynamically.
+ * These are generated at runtime from getAllProvidersInfo().
+ */
+function getDiscoverySettings(): SettingDef[] {
+	const providers = getAllProvidersInfo();
+	const settings: SettingDef[] = [];
+
+	for (const provider of providers) {
+		// Skip native provider - it can't be disabled
+		if (provider.id === "native") {
+			continue;
+		}
+
+		settings.push({
+			id: `discovery.${provider.id}`,
+			tab: "discovery",
+			type: "boolean",
+			label: provider.displayName,
+			description: provider.description,
+			get: () => isProviderEnabled(provider.id),
+			set: () => {}, // Handled in interactive-mode.ts
+		});
+	}
+
+	return settings;
+}
+
+/**
+ * All settings with dynamic discovery settings merged in.
+ */
+function getAllSettings(): SettingDef[] {
+	return [...SETTINGS_DEFS, ...getDiscoverySettings()];
+}
+
 /** Get settings for a specific tab */
 export function getSettingsForTab(tab: string): SettingDef[] {
-	return SETTINGS_DEFS.filter((def) => def.tab === tab);
+	return getAllSettings().filter((def) => def.tab === tab);
 }
 
 /** Get a setting definition by id */
 export function getSettingDef(id: string): SettingDef | undefined {
-	return SETTINGS_DEFS.find((def) => def.id === id);
+	return getAllSettings().find((def) => def.id === id);
 }

package/src/modes/interactive/components/settings-selector.ts

@@ -99,6 +99,7 @@ const SETTINGS_TABS: Tab[] = [
 	{ id: "config", label: "Config" },
 	{ id: "lsp", label: "LSP" },
 	{ id: "exa", label: "Exa" },
+	{ id: "discovery", label: "Discovery" },
 	{ id: "plugins", label: "Plugins" },
 ];
 

package/src/modes/interactive/components/welcome.ts

@@ -14,7 +14,7 @@ export interface LspServerInfo {
 }
 
 /**
- * Premium welcome screen with block-based Pi logo and two-column layout.
+ * Premium welcome screen with block-based OMP logo and two-column layout.
  */
 export class WelcomeComponent implements Component {
 	private version: string;
@@ -60,7 +60,7 @@ export class WelcomeComponent implements Component {
 		const leftCol = 26;
 		const rightCol = boxWidth - leftCol - 3; // 3 = │ + │ + │
 
-		// Block-based Pi logo (gradient: magenta → cyan)
+		// Block-based OMP logo (gradient: magenta → cyan)
 		// biome-ignore format: preserve ASCII art layout
 		const piLogo = ["▀████████████▀", " ╘███    ███  ", "  ███    ███  ", "  ███    ███  ", " ▄███▄  ▄███▄ "];