@oh-my-pi/pi-coding-agent 12.0.0 → 12.1.1

package/src/discovery/claude-plugins.ts

@@ -0,0 +1,205 @@
+/**
+ * Claude Code Marketplace Plugin Provider
+ *
+ * Loads configuration from ~/.claude/plugins/cache/ based on installed_plugins.json registry.
+ * Priority: 70 (below claude.ts at 80, so user overrides in .claude/ take precedence)
+ */
+import * as path from "node:path";
+import { registerProvider } from "../capability";
+import { type Hook, hookCapability } from "../capability/hook";
+import { type Skill, skillCapability } from "../capability/skill";
+import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
+import { type CustomTool, toolCapability } from "../capability/tool";
+import type { LoadContext, LoadResult } from "../capability/types";
+import { type ClaudePluginRoot, listClaudePluginRoots, loadFilesFromDir, loadSkillsFromDir } from "./helpers";
+
+const PROVIDER_ID = "claude-plugins";
+const DISPLAY_NAME = "Claude Code Marketplace";
+const PRIORITY = 70; // Below claude.ts (80) so user .claude/ overrides win
+
+// =============================================================================
+// Skills
+// =============================================================================
+
+async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
+	const items: Skill[] = [];
+	const warnings: string[] = [];
+
+	const { roots, warnings: rootWarnings } = await listClaudePluginRoots(ctx.home);
+	warnings.push(...rootWarnings);
+
+	const results = await Promise.all(
+		roots.map(async root => {
+			const skillsDir = path.join(root.path, "skills");
+			return loadSkillsFromDir(ctx, {
+				dir: skillsDir,
+				providerId: PROVIDER_ID,
+				level: root.scope,
+			});
+		}),
+	);
+
+	for (const result of results) {
+		items.push(...result.items);
+		if (result.warnings) warnings.push(...result.warnings);
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Slash Commands
+// =============================================================================
+
+async function loadSlashCommands(ctx: LoadContext): Promise<LoadResult<SlashCommand>> {
+	const items: SlashCommand[] = [];
+	const warnings: string[] = [];
+
+	const { roots, warnings: rootWarnings } = await listClaudePluginRoots(ctx.home);
+	warnings.push(...rootWarnings);
+
+	const results = await Promise.all(
+		roots.map(async root => {
+			const commandsDir = path.join(root.path, "commands");
+			return loadFilesFromDir<SlashCommand>(ctx, commandsDir, PROVIDER_ID, root.scope, {
+				extensions: ["md"],
+				transform: (name, content, filePath, source) => {
+					const cmdName = name.replace(/\.md$/, "");
+					return {
+						name: cmdName,
+						path: filePath,
+						content,
+						level: root.scope,
+						_source: source,
+					};
+				},
+			});
+		}),
+	);
+
+	for (const result of results) {
+		items.push(...result.items);
+		if (result.warnings) warnings.push(...result.warnings);
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Hooks
+// =============================================================================
+
+async function loadHooks(ctx: LoadContext): Promise<LoadResult<Hook>> {
+	const items: Hook[] = [];
+	const warnings: string[] = [];
+
+	const { roots, warnings: rootWarnings } = await listClaudePluginRoots(ctx.home);
+	warnings.push(...rootWarnings);
+
+	const hookTypes = ["pre", "post"] as const;
+
+	const loadTasks: { root: ClaudePluginRoot; hookType: "pre" | "post" }[] = [];
+	for (const root of roots) {
+		for (const hookType of hookTypes) {
+			loadTasks.push({ root, hookType });
+		}
+	}
+
+	const results = await Promise.all(
+		loadTasks.map(async ({ root, hookType }) => {
+			const hooksDir = path.join(root.path, "hooks", hookType);
+			return loadFilesFromDir<Hook>(ctx, hooksDir, PROVIDER_ID, root.scope, {
+				transform: (name, _content, filePath, source) => {
+					const toolName = name.replace(/\.(sh|bash|zsh|fish)$/, "");
+					return {
+						name,
+						path: filePath,
+						type: hookType,
+						tool: toolName,
+						level: root.scope,
+						_source: source,
+					};
+				},
+			});
+		}),
+	);
+
+	for (const result of results) {
+		items.push(...result.items);
+		if (result.warnings) warnings.push(...result.warnings);
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Custom Tools
+// =============================================================================
+
+async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
+	const items: CustomTool[] = [];
+	const warnings: string[] = [];
+
+	const { roots, warnings: rootWarnings } = await listClaudePluginRoots(ctx.home);
+	warnings.push(...rootWarnings);
+
+	const results = await Promise.all(
+		roots.map(async root => {
+			const toolsDir = path.join(root.path, "tools");
+			return loadFilesFromDir<CustomTool>(ctx, toolsDir, PROVIDER_ID, root.scope, {
+				transform: (name, _content, filePath, source) => {
+					const toolName = name.replace(/\.(ts|js|sh|bash|py)$/, "");
+					return {
+						name: toolName,
+						path: filePath,
+						level: root.scope,
+						_source: source,
+					};
+				},
+			});
+		}),
+	);
+
+	for (const result of results) {
+		items.push(...result.items);
+		if (result.warnings) warnings.push(...result.warnings);
+	}
+
+	return { items, warnings };
+}
+
+// =============================================================================
+// Provider Registration
+// =============================================================================
+
+registerProvider<Skill>(skillCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load skills from Claude Code marketplace plugins (~/.claude/plugins/cache/)",
+	priority: PRIORITY,
+	load: loadSkills,
+});
+
+registerProvider<SlashCommand>(slashCommandCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load slash commands from Claude Code marketplace plugins",
+	priority: PRIORITY,
+	load: loadSlashCommands,
+});
+
+registerProvider<Hook>(hookCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load hooks from Claude Code marketplace plugins",
+	priority: PRIORITY,
+	load: loadHooks,
+});
+
+registerProvider<CustomTool>(toolCapability.id, {
+	id: PROVIDER_ID,
+	displayName: DISPLAY_NAME,
+	description: "Load custom tools from Claude Code marketplace plugins",
+	priority: PRIORITY,
+	load: loadTools,
+});

package/src/discovery/helpers.ts

@@ -4,6 +4,7 @@
 import * as os from "node:os";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
+import { CONFIG_DIR_NAME } from "@oh-my-pi/pi-utils/dirs";
 import { readDirEntries, readFile } from "../capability/fs";
 import type { Skill, SkillFrontmatter } from "../capability/skill";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
@@ -39,9 +40,9 @@ export function expandPath(p: string): string {
  */
 export const SOURCE_PATHS = {
 	native: {
-		userBase: ".omp",
-		userAgent: ".omp/agent",
-		projectDir: ".omp",
+		userBase: CONFIG_DIR_NAME,
+		userAgent: `${CONFIG_DIR_NAME}/agent`,
+		projectDir: CONFIG_DIR_NAME,
 	},
 	claude: {
 		userBase: ".claude",
@@ -546,3 +547,138 @@ export function getExtensionNameFromPath(extensionPath: string): string {
 
 	return base;
 }
+
+// =============================================================================
+// Claude Code Plugin Cache Helpers
+// =============================================================================
+
+/**
+ * Entry for an installed Claude Code plugin.
+ */
+export interface ClaudePluginEntry {
+	scope: "user" | "project";
+	installPath: string;
+	version: string;
+	installedAt: string;
+	lastUpdated: string;
+	gitCommitSha?: string;
+}
+
+/**
+ * Claude Code installed_plugins.json registry format.
+ */
+export interface ClaudePluginsRegistry {
+	version: number;
+	plugins: Record<string, ClaudePluginEntry[]>;
+}
+
+/**
+ * Resolved plugin root for loading.
+ */
+export interface ClaudePluginRoot {
+	/** Plugin ID (e.g., "simpleclaude-core@simpleclaude") */
+	id: string;
+	/** Marketplace name */
+	marketplace: string;
+	/** Plugin name */
+	plugin: string;
+	/** Version string */
+	version: string;
+	/** Absolute path to plugin root */
+	path: string;
+	/** Whether this is a user or project scope plugin */
+	scope: "user" | "project";
+}
+
+/**
+ * Parse Claude Code installed_plugins.json content.
+ */
+export function parseClaudePluginsRegistry(content: string): ClaudePluginsRegistry | null {
+	const data = parseJSON<ClaudePluginsRegistry>(content);
+	if (!data || typeof data !== "object") return null;
+	if (
+		typeof data.version !== "number" ||
+		!data.plugins ||
+		typeof data.plugins !== "object" ||
+		Array.isArray(data.plugins)
+	)
+		return null;
+	return data;
+}
+
+/**
+ * List all installed Claude Code plugin roots from the plugin cache.
+ * Reads ~/.claude/plugins/installed_plugins.json and resolves plugin paths.
+ *
+ * Results are cached per home directory to avoid repeated parsing.
+ */
+const pluginRootsCache = new Map<string, { roots: ClaudePluginRoot[]; warnings: string[] }>();
+
+export async function listClaudePluginRoots(home: string): Promise<{ roots: ClaudePluginRoot[]; warnings: string[] }> {
+	const cached = pluginRootsCache.get(home);
+	if (cached) return cached;
+
+	const roots: ClaudePluginRoot[] = [];
+	const warnings: string[] = [];
+
+	const registryPath = path.join(home, ".claude", "plugins", "installed_plugins.json");
+	const content = await readFile(registryPath);
+
+	if (!content) {
+		// No registry file - not an error, just no plugins
+		const result = { roots, warnings };
+		pluginRootsCache.set(home, result);
+		return result;
+	}
+
+	const registry = parseClaudePluginsRegistry(content);
+	if (!registry) {
+		warnings.push(`Failed to parse Claude Code plugin registry: ${registryPath}`);
+		const result = { roots, warnings };
+		pluginRootsCache.set(home, result);
+		return result;
+	}
+
+	for (const [pluginId, entries] of Object.entries(registry.plugins)) {
+		if (!Array.isArray(entries) || entries.length === 0) continue;
+
+		// Parse plugin ID format: "plugin-name@marketplace"
+		const atIndex = pluginId.lastIndexOf("@");
+		if (atIndex === -1) {
+			warnings.push(`Invalid plugin ID format (missing @marketplace): ${pluginId}`);
+			continue;
+		}
+
+		const pluginName = pluginId.slice(0, atIndex);
+		const marketplace = pluginId.slice(atIndex + 1);
+
+		// Process all valid entries, not just the first one.
+		// This handles plugins with multiple installs (different scopes/versions).
+		for (const entry of entries) {
+			if (!entry.installPath || typeof entry.installPath !== "string") {
+				warnings.push(`Plugin ${pluginId} entry has no installPath`);
+				continue;
+			}
+
+			roots.push({
+				id: pluginId,
+				marketplace,
+				plugin: pluginName,
+				version: entry.version || "unknown",
+				path: entry.installPath,
+				scope: entry.scope || "user",
+			});
+		}
+	}
+
+	const result = { roots, warnings };
+	pluginRootsCache.set(home, result);
+	return result;
+}
+
+/**
+ * Clear the plugin roots cache (useful for testing or when plugins change).
+ */
+export function clearClaudePluginRootsCache(): void {
+	pluginRootsCache.clear();
+}

package/src/discovery/index.ts

@@ -23,6 +23,7 @@ import "../capability/tool";
 import "./agents-md";
 import "./builtin";
 import "./claude";
+import "./claude-plugins";
 import "./cline";
 import "./agents";
 import "./codex";

package/src/export/custom-share.ts

@@ -6,7 +6,7 @@
  */
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { getAgentDir } from "../config";
+import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
 
 export interface CustomShareResult {
 	/** URL to display/open (optional - script may handle everything itself) */

package/src/export/html/index.ts

@@ -1,7 +1,7 @@
 import * as path from "node:path";
 import type { AgentState } from "@oh-my-pi/pi-agent-core";
 import { isEnoent } from "@oh-my-pi/pi-utils";
-import { APP_NAME } from "../../config";
+import { APP_NAME } from "@oh-my-pi/pi-utils/dirs";
 import { getResolvedThemeColors, getThemeExportColors } from "../../modes/theme/theme";
 import { type SessionEntry, type SessionHeader, SessionManager } from "../../session/session-manager";
 // Pre-generated template (created by scripts/generate-template.ts at publish time)

package/src/extensibility/custom-commands/loader.ts

@@ -8,8 +8,9 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import { isEnoent, logger } from "@oh-my-pi/pi-utils";
+import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
 import * as typebox from "@sinclair/typebox";
-import { getAgentDir, getConfigDirs } from "../../config";
+import { getConfigDirs } from "../../config";
 import { execCommand } from "../../exec/exec";
 import { ReviewCommand } from "./bundled/review";
 import type {

package/src/extensibility/plugins/index.ts

@@ -14,13 +14,6 @@ export {
 } from "./loader";
 export { PluginManager, parseSettingValue, validateSetting } from "./manager";
 export { extractPackageName, formatPluginSpec, parsePluginSpec } from "./parser";
-export {
-	getPluginsDir,
-	getPluginsLockfile,
-	getPluginsNodeModules,
-	getPluginsPackageJson,
-	getProjectPluginOverrides,
-} from "./paths";
 export type {
 	BooleanSetting,
 	DoctorCheck,

package/src/extensibility/plugins/installer.ts

@@ -1,7 +1,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
-import { getAgentDir } from "../../config";
+import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
 import type { InstalledPlugin } from "./types";
 
 const PLUGINS_DIR = path.join(getAgentDir(), "plugins");

package/src/extensibility/plugins/loader.ts

@@ -7,12 +7,8 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
-import {
-	getAllProjectPluginOverridePaths,
-	getPluginsLockfile,
-	getPluginsNodeModules,
-	getPluginsPackageJson,
-} from "./paths";
+import { getPluginsLockfile, getPluginsNodeModules, getPluginsPackageJson } from "@oh-my-pi/pi-utils/dirs";
+import { getConfigDirPaths } from "../../config";
 import type { InstalledPlugin, PluginManifest, PluginRuntimeConfig, ProjectPluginOverrides } from "./types";
 
 // =============================================================================
@@ -36,7 +32,7 @@ async function loadRuntimeConfig(): Promise<PluginRuntimeConfig> {
  * Load project-local plugin overrides (checks .omp and .pi directories).
  */
 async function loadProjectOverrides(cwd: string): Promise<ProjectPluginOverrides> {
-	for (const overridesPath of getAllProjectPluginOverridePaths(cwd)) {
+	for (const overridesPath of getConfigDirPaths("plugin-overrides.json", { user: false, cwd })) {
 		try {
 			return await Bun.file(overridesPath).json();
 		} catch (err) {

package/src/extensibility/plugins/manager.ts

@@ -1,14 +1,14 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { extractPackageName, parsePluginSpec } from "./parser";
 import {
 	getPluginsDir,
 	getPluginsLockfile,
 	getPluginsNodeModules,
 	getPluginsPackageJson,
-	getProjectPluginOverrides,
-} from "./paths";
+	getProjectPluginOverridesPath,
+} from "@oh-my-pi/pi-utils/dirs";
+import { extractPackageName, parsePluginSpec } from "./parser";
 import type {
 	DoctorCheck,
 	DoctorOptions,
@@ -82,7 +82,7 @@ export class PluginManager {
 	}
 
 	async #loadProjectOverrides(): Promise<ProjectPluginOverrides> {
-		const overridesPath = getProjectPluginOverrides(this.#cwd);
+		const overridesPath = getProjectPluginOverridesPath(this.#cwd);
 		try {
 			return await Bun.file(overridesPath).json();
 		} catch (err) {

package/src/index.ts

@@ -7,7 +7,7 @@ export { StringEnum } from "@oh-my-pi/pi-ai";
 export { Container, Markdown, Spacer, Text } from "@oh-my-pi/pi-tui";
 // Logging
 export { logger } from "@oh-my-pi/pi-utils";
-export { getAgentDir, VERSION } from "./config";
+export { getAgentDir, VERSION } from "@oh-my-pi/pi-utils/dirs";
 export { formatKeyHint, formatKeyHints } from "./config/keybindings";
 export { ModelRegistry } from "./config/model-registry";
 // Prompt templates

package/src/ipy/executor.ts

@@ -1,6 +1,6 @@
 import * as path from "node:path";
 import { $env, isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { getAgentDir } from "../config";
+import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
 import { OutputSink } from "../session/streaming-output";
 import { time } from "../utils/timings";
 import { shutdownSharedGateway } from "./gateway-coordinator";

package/src/ipy/gateway-coordinator.ts

@@ -2,8 +2,8 @@ import * as fs from "node:fs";
 import { createServer } from "node:net";
 import * as path from "node:path";
 import { isEnoent, logger, procmgr } from "@oh-my-pi/pi-utils";
+import { getAgentDir } from "@oh-my-pi/pi-utils/dirs";
 import type { Subprocess } from "bun";
-import { getAgentDir } from "../config";
 import { Settings } from "../config/settings";
 import { getOrCreateSnapshot } from "../utils/shell-snapshot";
 import { time } from "../utils/timings";

package/src/ipy/modules.ts

@@ -1,6 +1,6 @@
 import * as fs from "node:fs/promises";
-import * as os from "node:os";
 import * as path from "node:path";
+import { getAgentModulesDir, getProjectModulesDir } from "@oh-my-pi/pi-utils/dirs";
 
 export type PythonModuleSource = "user" | "project";
 
@@ -26,8 +26,8 @@ export interface PythonModuleExecutor {
 export interface DiscoverPythonModulesOptions {
 	/** Working directory for project-level modules. Default: process.cwd() */
 	cwd?: string;
-	/** Home directory for user-level modules. Default: os.homedir() */
-	homeDir?: string;
+	/** Agent directory for user-level modules. Default: from getAgentDir() */
+	agentDir?: string;
 }
 
 interface ModuleCandidate {
@@ -66,10 +66,9 @@ async function readModuleContent(candidate: ModuleCandidate): Promise<PythonModu
  */
 export async function discoverPythonModules(options: DiscoverPythonModulesOptions = {}): Promise<PythonModuleEntry[]> {
 	const cwd = options.cwd ?? process.cwd();
-	const homeDir = options.homeDir ?? os.homedir();
 
-	const userDir = path.join(homeDir, ".omp", "agent", "modules");
-	const projectDir = path.resolve(cwd, ".omp", "modules");
+	const userDir = getAgentModulesDir(options.agentDir);
+	const projectDir = getProjectModulesDir(cwd);
 
 	const userCandidates = await listModuleCandidates(userDir, "user");
 	const projectCandidates = await listModuleCandidates(projectDir, "project");

package/src/ipy/runtime.ts

@@ -8,6 +8,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 
 import { $env } from "@oh-my-pi/pi-utils";
+import { getPythonEnvDir } from "@oh-my-pi/pi-utils/dirs";
 
 const DEFAULT_ENV_ALLOWLIST = new Set([
 	"PATH",
@@ -103,6 +104,17 @@ function resolvePathKey(env: Record<string, string | undefined>): string {
 	return match ?? "PATH";
 }
 
+function resolveManagedPythonEnv(): string {
+	return getPythonEnvDir();
+}
+
+function resolveManagedPythonCandidate(): { venvPath: string; pythonPath: string } {
+	const venvPath = resolveManagedPythonEnv();
+	const binDir = process.platform === "win32" ? path.join(venvPath, "Scripts") : path.join(venvPath, "bin");
+	const pythonPath = path.join(binDir, process.platform === "win32" ? "python.exe" : "python");
+	return { venvPath, pythonPath };
+}
+
 export interface PythonRuntime {
 	/** Path to python executable */
 	pythonPath: string;
@@ -184,6 +196,21 @@ export function resolvePythonRuntime(cwd: string, baseEnv: Record<string, string
 		}
 	}
 
+	const managed = resolveManagedPythonCandidate();
+	if (fs.existsSync(managed.pythonPath)) {
+		env.VIRTUAL_ENV = managed.venvPath;
+		const pathKey = resolvePathKey(env);
+		const currentPath = env[pathKey];
+		const managedBin =
+			process.platform === "win32" ? path.join(managed.venvPath, "Scripts") : path.join(managed.venvPath, "bin");
+		env[pathKey] = currentPath ? `${managedBin}${path.delimiter}${currentPath}` : managedBin;
+		return {
+			pythonPath: resolveWindowlessPython(managed.pythonPath),
+			env,
+			venvPath: managed.venvPath,
+		};
+	}
+
 	const pythonPath = Bun.which("python") ?? Bun.which("python3");
 	if (!pythonPath) {
 		throw new Error("Python executable not found on PATH");

package/src/main.ts

@@ -10,12 +10,13 @@ import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
 import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
 import { $env, postmortem } from "@oh-my-pi/pi-utils";
+import { VERSION } from "@oh-my-pi/pi-utils/dirs";
 import chalk from "chalk";
 import type { Args } from "./cli/args";
 import { processFileArguments } from "./cli/file-processor";
 import { listModels } from "./cli/list-models";
 import { selectSession } from "./cli/session-picker";
-import { findConfigFile, VERSION } from "./config";
+import { findConfigFile } from "./config";
 import { ModelRegistry, ModelsConfigFile } from "./config/model-registry";
 import { parseModelPattern, parseModelString, resolveModelScope, type ScopedModel } from "./config/model-resolver";
 import { Settings, settings } from "./config/settings";
@@ -489,6 +490,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 	// Create AuthStorage and ModelRegistry upfront
 	const authStorage = await discoverAuthStorage();
 	const modelRegistry = new ModelRegistry(authStorage);
+	await modelRegistry.refresh();
 	debugStartup("main:discoverModels");
 	time("discoverModels");
 

package/src/mcp/config-writer.ts

@@ -4,24 +4,12 @@
  * Utilities for reading/writing .omp/mcp.json files at user or project level.
  */
 import * as fs from "node:fs";
-import * as os from "node:os";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
+
 import { validateServerConfig } from "./config";
 import type { MCPConfigFile, MCPServerConfig } from "./types";
 
-/**
- * Get the path to the MCP config file.
- * @param scope - "user" for ~/.omp/mcp.json or "project" for .omp/mcp.json
- * @param cwd - Current working directory (used for project scope)
- */
-export function getMCPConfigPath(scope: "user" | "project", cwd: string): string {
-	if (scope === "user") {
-		return path.join(os.homedir(), ".omp", "mcp.json");
-	}
-	return path.join(cwd, ".omp", "mcp.json");
-}
-
 /**
  * Read an MCP config file.
  * Returns empty config if file doesn't exist.

package/src/modes/components/welcome.ts

@@ -1,5 +1,5 @@
 import { type Component, padding, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
-import { APP_NAME } from "../../config";
+import { APP_NAME } from "@oh-my-pi/pi-utils/dirs";
 import { theme } from "../../modes/theme/theme";
 
 export interface RecentSession {

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

@@ -4,16 +4,11 @@
  * Handles /mcp subcommands for managing MCP servers.
  */
 import { Spacer, Text } from "@oh-my-pi/pi-tui";
+import { getMCPConfigPath } from "@oh-my-pi/pi-utils/dirs";
 import type { SourceMeta } from "../../capability/types";
 import { analyzeAuthError, discoverOAuthEndpoints, MCPManager } from "../../mcp";
 import { connectToServer, disconnectServer, listTools } from "../../mcp/client";
-import {
-	addMCPServer,
-	getMCPConfigPath,
-	readMCPConfigFile,
-	removeMCPServer,
-	updateMCPServer,
-} from "../../mcp/config-writer";
+import { addMCPServer, readMCPConfigFile, removeMCPServer, updateMCPServer } from "../../mcp/config-writer";
 import { MCPOAuthFlow } from "../../mcp/oauth-flow";
 import type { MCPServerConfig, MCPServerConnection } from "../../mcp/types";
 import type { OAuthCredential } from "../../session/auth-storage";