@oh-my-pi/pi-coding-agent 1.338.0 → 1.340.0

package/src/core/sdk.ts

@@ -596,10 +596,24 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	let mcpManager: MCPManager | undefined;
 	const enableMCP = options.enableMCP ?? true;
 	if (enableMCP) {
-		const mcpResult = await discoverAndLoadMCPTools(cwd);
+		const mcpResult = await discoverAndLoadMCPTools(cwd, {
+			onConnecting: (serverNames) => {
+				if (options.hasUI && serverNames.length > 0) {
+					process.stderr.write(`\x1b[90mConnecting to MCP servers: ${serverNames.join(", ")}...\x1b[0m\n`);
+				}
+			},
+			enableProjectConfig: settingsManager.getMCPProjectConfigEnabled(),
+			// Always filter Exa - we have native integration
+			filterExa: true,
+		});
 		time("discoverAndLoadMCPTools");
 		mcpManager = mcpResult.manager;
 
+		// If we extracted Exa API keys from MCP configs and EXA_API_KEY isn't set, use the first one
+		if (mcpResult.exaApiKeys.length > 0 && !process.env.EXA_API_KEY) {
+			process.env.EXA_API_KEY = mcpResult.exaApiKeys[0];
+		}
+
 		// Log MCP errors
 		for (const { path, error } of mcpResult.errors) {
 			console.error(`MCP "${path}": ${error}`);

package/src/core/settings-manager.ts

@@ -47,6 +47,10 @@ export interface BashInterceptorSettings {
 	enabled?: boolean; // default: false (blocks shell commands that have dedicated tools)
 }
 
+export interface MCPSettings {
+	enableProjectConfig?: boolean; // default: true (load .mcp.json from project root)
+}
+
 export interface Settings {
 	lastChangelogVersion?: string;
 	defaultProvider?: string;
@@ -67,6 +71,7 @@ export interface Settings {
 	enabledModels?: string[]; // Model patterns for cycling (same format as --models CLI flag)
 	exa?: ExaSettings;
 	bashInterceptor?: BashInterceptorSettings;
+	mcp?: MCPSettings;
 }
 
 /** Deep merge settings: project/overrides take precedence, nested objects merge recursively */
@@ -457,4 +462,16 @@ export class SettingsManager {
 		this.globalSettings.bashInterceptor.enabled = enabled;
 		this.save();
 	}
+
+	getMCPProjectConfigEnabled(): boolean {
+		return this.settings.mcp?.enableProjectConfig ?? true;
+	}
+
+	setMCPProjectConfigEnabled(enabled: boolean): void {
+		if (!this.globalSettings.mcp) {
+			this.globalSettings.mcp = {};
+		}
+		this.globalSettings.mcp.enableProjectConfig = enabled;
+		this.save();
+	}
 }

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

@@ -126,6 +126,15 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getBashInterceptorEnabled(),
 		set: (sm, v) => sm.setBashInterceptorEnabled(v),
 	},
+	{
+		id: "mcpProjectConfig",
+		tab: "config",
+		type: "boolean",
+		label: "MCP project config",
+		description: "Load .mcp.json/mcp.json from project root",
+		get: (sm) => sm.getMCPProjectConfigEnabled(),
+		set: (sm, v) => sm.setMCPProjectConfigEnabled(v),
+	},
 	{
 		id: "thinkingLevel",
 		tab: "config",

package/src/modes/interactive/interactive-mode.ts

@@ -2122,7 +2122,7 @@ export class InteractiveMode {
 			}
 
 			// Create the preview URL
-			const previewUrl = `https://shittycodingagent.ai/session?${gistId}`;
+			const previewUrl = `https://gistpreview.github.io/?${gistId}`;
 			this.showStatus(`Share URL: ${previewUrl}\nGist: ${gistUrl}`);
 		} catch (error: unknown) {
 			if (!loader.signal.aborted) {