@oh-my-pi/pi-coding-agent 13.16.4 → 13.17.0

package/src/lsp/config.ts

@@ -4,6 +4,7 @@ import * as path from "node:path";
 import { isRecord, logger } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import { getConfigDirPaths } from "../config";
+import { getPreloadedPluginRoots } from "../discovery/helpers";
 import { BiomeClient } from "./clients/biome-client";
 import { SwiftLintClient } from "./clients/swiftlint-client";
 import DEFAULTS from "./defaults.json" with { type: "json" };
@@ -248,6 +249,14 @@ function getConfigPaths(cwd: string): string[] {
 		}
 	}
 
+	// Plugin LSP configs (from marketplace/--plugin-dir roots)
+	const pluginRoots = getPreloadedPluginRoots();
+	for (const root of pluginRoots) {
+		for (const filename of filenames) {
+			paths.push(path.join(root.path, filename));
+		}
+	}
+
 	// User home root files (lowest priority fallback)
 	for (const filename of filenames) {
 		paths.push(path.join(os.homedir(), filename));

package/src/main.ts

@@ -11,8 +11,9 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
-import { $env, getProjectDir, logger, postmortem, setProjectDir, VERSION } from "@oh-my-pi/pi-utils";
+import { $env, getConfigDirName, getProjectDir, logger, postmortem, setProjectDir, VERSION } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { invalidate as invalidateFsCache } from "./capability/fs";
 import type { Args } from "./cli/args";
 import { processFileArguments } from "./cli/file-processor";
 import { buildInitialMessage } from "./cli/initial-message";
@@ -23,8 +24,16 @@ import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { resolveCliModel, resolveModelRoleValue, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { Settings, settings } from "./config/settings";
 import { initializeWithSettings } from "./discovery";
+import { clearClaudePluginRootsCache, injectPluginDirRoots, preloadPluginRoots } from "./discovery/helpers";
 import { exportFromFile } from "./export/html";
 import type { ExtensionUIContext } from "./extensibility/extensions/types";
+import {
+	getInstalledPluginsRegistryPath,
+	getMarketplacesCacheDir,
+	getMarketplacesRegistryPath,
+	getPluginsCacheDir,
+	MarketplaceManager,
+} from "./extensibility/plugins/marketplace";
 import type { MCPManager } from "./mcp";
 import { InteractiveMode, runAcpMode, runPrintMode, runRpcMode } from "./modes";
 import { initTheme, stopThemeWatcher } from "./modes/theme/theme";
@@ -639,6 +648,46 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		sessionManager = await SessionManager.open(selectedPath);
 	}
 
+	// Wire --plugin-dir and preload plugin roots for sync consumers (LSP config)
+	const home = os.homedir();
+	if (parsedArgs.pluginDirs && parsedArgs.pluginDirs.length > 0) {
+		await logger.timeAsync("injectPluginDirRoots", () => injectPluginDirRoots(home, parsedArgs.pluginDirs!));
+	} else {
+		await logger.timeAsync("preloadPluginRoots", () => preloadPluginRoots(home));
+	}
+
+	// Background marketplace auto-update — never blocks startup.
+	const autoUpdate = settings.get("marketplace.autoUpdate");
+	if (autoUpdate !== "off") {
+		void (async () => {
+			try {
+				const mgr = new MarketplaceManager({
+					marketplacesRegistryPath: getMarketplacesRegistryPath(),
+					installedRegistryPath: getInstalledPluginsRegistryPath(),
+					marketplacesCacheDir: getMarketplacesCacheDir(),
+					pluginsCacheDir: getPluginsCacheDir(),
+					clearPluginRootsCache: () => {
+						const h = os.homedir();
+						invalidateFsCache(path.join(h, ".claude", "plugins", "installed_plugins.json"));
+						invalidateFsCache(path.join(h, getConfigDirName(), "plugins", "installed_plugins.json"));
+						clearClaudePluginRootsCache();
+					},
+				});
+				await mgr.refreshStaleMarketplaces();
+				const updates = await mgr.checkForUpdates();
+				if (updates.length === 0) return;
+				if (autoUpdate === "auto") {
+					await mgr.upgradeAllPlugins();
+					logger.debug(`Auto-upgraded ${updates.length} marketplace plugin(s)`);
+				} else {
+					logger.debug(`${updates.length} marketplace plugin update(s) available \u2014 /marketplace upgrade`);
+				}
+			} catch {
+				// Silently ignore — network failure, corrupt data, offline.
+			}
+		})();
+	}
+
 	const { options: sessionOptions } = await logger.timeAsync("buildSessionOptions", () =>
 		buildSessionOptions(parsedArgs, scopedModels, sessionManager, modelRegistry),
 	);

package/src/modes/components/plugin-selector.ts

@@ -0,0 +1,86 @@
+/**
+ * Interactive marketplace plugin selector.
+ *
+ * Shows available plugins from all configured marketplaces in a SelectList.
+ * Selecting a plugin triggers installation. Esc cancels.
+ */
+import { Container, type SelectItem, SelectList } from "@oh-my-pi/pi-tui";
+import { getSelectListTheme } from "../theme/theme";
+import { DynamicBorder } from "./dynamic-border";
+
+export interface PluginSelectorCallbacks {
+	onSelect: (pluginName: string, marketplace: string) => void;
+	onCancel: () => void;
+}
+
+export interface PluginItem {
+	plugin: { name: string; version?: string; description?: string };
+	marketplace: string;
+}
+
+export class PluginSelectorComponent extends Container {
+	#selectList: SelectList;
+
+	constructor(
+		marketplaceCount: number,
+		plugins: PluginItem[],
+		installedIds: Set<string>,
+		callbacks: PluginSelectorCallbacks,
+	) {
+		super();
+
+		const items: SelectItem[] = plugins.map(({ plugin, marketplace }) => {
+			const id = `${plugin.name}@${marketplace}`;
+			const installed = installedIds.has(id);
+			const version = plugin.version ? `@${plugin.version}` : "";
+			const status = installed ? " [installed]" : "";
+
+			return {
+				value: id,
+				label: `${plugin.name}${version}${status}`,
+				description: plugin.description,
+				hint: marketplace,
+			};
+		});
+
+		if (items.length === 0) {
+			items.push({
+				value: "__empty__",
+				label: "No plugins available",
+				description:
+					marketplaceCount === 0
+						? "Add a marketplace first: /marketplace add <source>"
+						: "Configured marketplaces have no plugins",
+			});
+		}
+
+		this.addChild(new DynamicBorder());
+
+		this.#selectList = new SelectList(items, Math.min(items.length, 20), getSelectListTheme());
+
+		this.#selectList.onSelect = item => {
+			if (item.value === "__empty__") return;
+			const [name, marketplace] = splitPluginId(item.value);
+			if (name && marketplace) {
+				callbacks.onSelect(name, marketplace);
+			}
+		};
+
+		this.#selectList.onCancel = () => {
+			callbacks.onCancel();
+		};
+
+		this.addChild(this.#selectList);
+		this.addChild(new DynamicBorder());
+	}
+
+	getSelectList(): SelectList {
+		return this.#selectList;
+	}
+}
+
+function splitPluginId(id: string): [string, string] | [null, null] {
+	const atIdx = id.lastIndexOf("@");
+	if (atIdx <= 0) return [null, null];
+	return [id.slice(0, atIdx), id.slice(atIdx + 1)];
+}

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

@@ -117,6 +117,15 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "5", label: "5 retries" },
 		{ value: "10", label: "10 retries" },
 	],
+	// Retry fallback revert policy
+	"retry.fallbackRevertPolicy": [
+		{
+			value: "cooldown-expiry",
+			label: "Cooldown expiry",
+			description: "Return to the primary model after its suppression window ends",
+		},
+		{ value: "never", label: "Never", description: "Stay on the fallback model until manually changed" },
+	],
 	// Task max concurrency
 	"task.maxConcurrency": [
 		{ value: "0", label: "Unlimited" },
@@ -303,10 +312,6 @@ const OPTION_PROVIDERS: Partial<Record<SettingPath, OptionProvider>> = {
 		{ value: "synthetic", label: "Synthetic", description: "Requires SYNTHETIC_API_KEY" },
 		{ value: "parallel", label: "Parallel", description: "Requires PARALLEL_API_KEY" },
 	],
-	"providers.codeSearch": [
-		{ value: "exa", label: "Exa", description: "Uses Exa public MCP code search" },
-		{ value: "grep", label: "grep.app", description: "Uses Vercel grep.app public code search" },
-	],
 	"providers.image": [
 		{ value: "auto", label: "Auto", description: "Priority: OpenRouter > Gemini" },
 		{ value: "gemini", label: "Gemini", description: "Requires GEMINI_API_KEY" },

package/src/modes/controllers/event-controller.ts

@@ -534,6 +534,16 @@ export class EventController {
 				break;
 			}
 
+			case "retry_fallback_applied": {
+				this.ctx.showWarning(`Fallback: ${event.from} -> ${event.to}`);
+				break;
+			}
+
+			case "retry_fallback_succeeded": {
+				this.ctx.showStatus(`Fallback succeeded on ${event.model}`);
+				break;
+			}
+
 			case "ttsr_triggered": {
 				const component = new TtsrNotificationComponent(event.rules);
 				component.setExpanded(this.ctx.toolOutputExpanded);

package/src/modes/controllers/mcp-command-controller.ts

@@ -793,6 +793,20 @@ export class MCPCommandController {
 				}
 			}
 
+			// refreshMCPTools preserves the prior MCP tool selection, so tools from
+			// brand-new servers are registered in the registry but never activated.
+			// Explicitly activate the newly added server's tools now.
+			if (isConnected && this.ctx.mcpManager) {
+				const serverTools = this.ctx.mcpManager.getTools().filter(t => t.mcpServerName === name);
+				if (serverTools.length > 0) {
+					const currentActive = this.ctx.session.getActiveToolNames();
+					const toActivate = serverTools.map(t => t.name).filter(n => this.ctx.session.getToolByName(n));
+					if (toActivate.length > 0) {
+						await this.ctx.session.setActiveToolsByName([...new Set([...currentActive, ...toActivate])]);
+					}
+				}
+			}
+
 			// Show success message
 			const scopeLabel = scope === "user" ? "user" : "project";
 			const lines = ["", theme.fg("success", `✓ Added server "${name}" to ${scopeLabel} config`), ""];

package/src/modes/controllers/selector-controller.ts

@@ -1,12 +1,23 @@
+import * as os from "node:os";
+import * as path from "node:path";
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { getOAuthProviders, type OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils";
+import { getAgentDbPath, getConfigDirName, getProjectDir } from "@oh-my-pi/pi-utils";
+import { invalidate as invalidateFsCache } from "../../capability/fs";
 import { getRoleInfo } from "../../config/model-registry";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
+import { clearClaudePluginRootsCache } from "../../discovery/helpers";
+import {
+	getInstalledPluginsRegistryPath,
+	getMarketplacesCacheDir,
+	getMarketplacesRegistryPath,
+	getPluginsCacheDir,
+	MarketplaceManager,
+} from "../../extensibility/plugins/marketplace";
 import {
 	getAvailableThemes,
 	getSymbolTheme,
@@ -19,13 +30,7 @@ import {
 import type { InteractiveModeContext } from "../../modes/types";
 import { type SessionInfo, SessionManager } from "../../session/session-manager";
 import { FileSessionStorage } from "../../session/session-storage";
-import {
-	isCodeSearchProviderId,
-	isSearchProviderPreference,
-	setPreferredCodeSearchProvider,
-	setPreferredImageProvider,
-	setPreferredSearchProvider,
-} from "../../tools";
+import { isSearchProviderPreference, setPreferredImageProvider, setPreferredSearchProvider } from "../../tools";
 import { setSessionTerminalTitle } from "../../utils/title-generator";
 import { AgentDashboard } from "../components/agent-dashboard";
 import { AssistantMessageComponent } from "../components/assistant-message";
@@ -33,6 +38,7 @@ import { ExtensionDashboard } from "../components/extensions";
 import { HistorySearchComponent } from "../components/history-search";
 import { ModelSelectorComponent } from "../components/model-selector";
 import { OAuthSelectorComponent } from "../components/oauth-selector";
+import { PluginSelectorComponent } from "../components/plugin-selector";
 import { SessionSelectorComponent } from "../components/session-selector";
 import { SettingsSelectorComponent } from "../components/settings-selector";
 import { ToolExecutionComponent } from "../components/tool-execution";
@@ -355,11 +361,6 @@ export class SelectorController {
 					setPreferredSearchProvider(value);
 				}
 				break;
-			case "providers.codeSearch":
-				if (typeof value === "string" && isCodeSearchProviderId(value)) {
-					setPreferredCodeSearchProvider(value);
-				}
-				break;
 			case "providers.image":
 				if (value === "auto" || value === "gemini" || value === "openrouter") {
 					setPreferredImageProvider(value);
@@ -425,6 +426,96 @@ export class SelectorController {
 		});
 	}
 
+	async showPluginSelector(mode: "install" | "uninstall" = "install"): Promise<void> {
+		const mgr = new MarketplaceManager({
+			marketplacesRegistryPath: getMarketplacesRegistryPath(),
+			installedRegistryPath: getInstalledPluginsRegistryPath(),
+			marketplacesCacheDir: getMarketplacesCacheDir(),
+			pluginsCacheDir: getPluginsCacheDir(),
+			clearPluginRootsCache: () => {
+				const home = os.homedir();
+				invalidateFsCache(path.join(home, ".claude", "plugins", "installed_plugins.json"));
+				invalidateFsCache(path.join(home, getConfigDirName(), "plugins", "installed_plugins.json"));
+				clearClaudePluginRootsCache();
+			},
+		});
+
+		const [marketplaces, installed] = await Promise.all([mgr.listMarketplaces(), mgr.listInstalledPlugins()]);
+		const installedIds = new Set(installed.map(p => p.id));
+
+		if (mode === "uninstall") {
+			// Show only installed plugins for uninstall
+			const items = installed.map(p => {
+				const entry = p.entries[0];
+				const atIdx = p.id.lastIndexOf("@");
+				const pluginName = atIdx > 0 ? p.id.slice(0, atIdx) : p.id;
+				const mkt = atIdx > 0 ? p.id.slice(atIdx + 1) : "unknown";
+				return {
+					plugin: { name: pluginName, version: entry?.version, description: undefined as string | undefined },
+					marketplace: mkt,
+				};
+			});
+			this.showSelector(done => {
+				const selector = new PluginSelectorComponent(marketplaces.length, items, new Set(), {
+					onSelect: async (name, marketplace) => {
+						done();
+						const pluginId = `${name}@${marketplace}`;
+						this.ctx.showStatus(`Uninstalling ${pluginId}...`);
+						this.ctx.ui.requestRender();
+						try {
+							await mgr.uninstallPlugin(pluginId);
+							this.ctx.showStatus(`Uninstalled ${pluginId}`);
+						} catch (err) {
+							this.ctx.showStatus(`Uninstall failed: ${err}`);
+						}
+						this.ctx.ui.requestRender();
+					},
+					onCancel: () => {
+						done();
+						this.ctx.ui.requestRender();
+					},
+				});
+				return { component: selector, focus: selector.getSelectList() };
+			});
+			return;
+		}
+
+		// Install mode: show all available plugins from all marketplaces
+		const allPlugins: Array<{
+			plugin: { name: string; version?: string; description?: string };
+			marketplace: string;
+		}> = [];
+		for (const mkt of marketplaces) {
+			const plugins = await mgr.listAvailablePlugins(mkt.name);
+			for (const plugin of plugins) {
+				allPlugins.push({ plugin, marketplace: mkt.name });
+			}
+		}
+
+		this.showSelector(done => {
+			const selector = new PluginSelectorComponent(marketplaces.length, allPlugins, installedIds, {
+				onSelect: async (name, marketplace) => {
+					done();
+					this.ctx.showStatus(`Installing ${name} from ${marketplace}...`);
+					this.ctx.ui.requestRender();
+					try {
+						const force = installedIds.has(`${name}@${marketplace}`);
+						await mgr.installPlugin(name, marketplace, { force });
+						this.ctx.showStatus(`Installed ${name} from ${marketplace}`);
+					} catch (err) {
+						this.ctx.showStatus(`Install failed: ${err}`);
+					}
+					this.ctx.ui.requestRender();
+				},
+				onCancel: () => {
+					done();
+					this.ctx.ui.requestRender();
+				},
+			});
+			return { component: selector, focus: selector.getSelectList() };
+		});
+	}
+
 	showUserMessageSelector(): void {
 		const userMessages = this.ctx.session.getUserMessagesForBranching();
 

package/src/modes/interactive-mode.ts

@@ -306,6 +306,11 @@ export class InteractiveMode implements InteractiveModeContext {
 
 		const startupQuiet = settings.get("startup.quiet");
 
+		for (const warning of this.session.configWarnings) {
+			this.ui.addChild(new Text(theme.fg("warning", `Warning: ${warning}`), 1, 0));
+			this.ui.addChild(new Spacer(1));
+		}
+
 		if (!startupQuiet) {
 			// Add welcome header
 			const welcome = new WelcomeComponent(this.#version, modelName, providerName, recentSessions, lspServerInfo);
@@ -1238,6 +1243,10 @@ export class InteractiveMode implements InteractiveModeContext {
 		this.#selectorController.showModelSelector(options);
 	}
 
+	showPluginSelector(mode?: "install" | "uninstall"): void {
+		void this.#selectorController.showPluginSelector(mode);
+	}
+
 	showUserMessageSelector(): void {
 		this.#selectorController.showUserMessageSelector();
 	}

package/src/modes/types.ts

@@ -198,6 +198,7 @@ export interface InteractiveModeContext {
 	showExtensionsDashboard(): void;
 	showAgentsDashboard(): void;
 	showModelSelector(options?: { temporaryOnly?: boolean }): void;
+	showPluginSelector(mode?: "install" | "uninstall"): void;
 	showUserMessageSelector(): void;
 	showTreeSelector(): void;
 	showSessionSelector(): void;

package/src/prompts/agents/reviewer.md

@@ -2,7 +2,7 @@
 name: reviewer
 description: "Code review specialist for quality/security analysis"
 tools: read, grep, find, bash, lsp, fetch, web_search, ast_grep, report_finding
-spawns: explore, task
+spawns: explore
 model: pi/slow
 thinking-level: high
 blocking: true
@@ -62,9 +62,8 @@ Your goal is to identify bugs the author would want fixed before merge.
 <procedure>
 1. Run `git diff` (or `gh pr diff <number>`) to view patch
 2. Read modified files for full context
-3. For large changes, spawn parallel `task` agents (per module/concern)
-4. Call `report_finding` per issue
-5. Call `submit_result` with verdict
+3. Call `report_finding` per issue
+4. Call `submit_result` with verdict
 
 Bash is read-only: `git diff`, `git log`, `git show`, `gh pr diff`. You **MUST NOT** make file edits or trigger builds.
 </procedure>

package/src/prompts/tools/bash.md

@@ -30,10 +30,10 @@ You **MUST** use specialized tools instead of bash for ALL file operations:
 |---|---|
 |`cat file`, `head -n N file`|`read(path="file", limit=N)`|
 |`cat -n file \|sed -n '50,150p'`|`read(path="file", offset=50, limit=100)`|
-|`grep -A 20 'pat' file`|`grep(pattern="pat", path="file", post=20)`|
+{{#if hasGrep}}|`grep -A 20 'pat' file`|`grep(pattern="pat", path="file", post=20)`|
 |`grep -rn 'pat' dir/`|`grep(pattern="pat", path="dir/")`|
-|`rg 'pattern' dir/`|`grep(pattern="pattern", path="dir/")`|
-|`find dir -name '*.ts'`|`find(pattern="dir/**/*.ts")`|
+|`rg 'pattern' dir/`|`grep(pattern="pattern", path="dir/")`|{{/if}}
+{{#if hasFind}}|`find dir -name '*.ts'`|`find(pattern="dir/**/*.ts")`|{{/if}}
 |`ls dir/`|`read(path="dir/")`|
 |`cat <<'EOF' > file`|`write(path="file", content="…")`|
 |`sed -i 's/old/new/' file`|`edit(path="file", edits=[…])`|

package/src/sdk.ts

@@ -106,14 +106,12 @@ import {
 	GrepTool,
 	getSearchTools,
 	HIDDEN_TOOLS,
-	isCodeSearchProviderId,
 	isSearchProviderPreference,
 	loadSshTool,
 	PythonTool,
 	ReadTool,
 	ResolveTool,
 	renderSearchToolBm25Description,
-	setPreferredCodeSearchProvider,
 	setPreferredImageProvider,
 	setPreferredSearchProvider,
 	type Tool,
@@ -667,11 +665,6 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		setPreferredSearchProvider(webSearchProvider);
 	}
 
-	const codeSearchProvider = settings.get("providers.codeSearch");
-	if (typeof codeSearchProvider === "string" && isCodeSearchProviderId(codeSearchProvider)) {
-		setPreferredCodeSearchProvider(codeSearchProvider);
-	}
-
 	const imageProvider = settings.get("providers.image");
 	if (imageProvider === "auto" || imageProvider === "gemini" || imageProvider === "openrouter") {
 		setPreferredImageProvider(imageProvider);