@oh-my-pi/pi-coding-agent 13.2.0 → 13.2.1

package/src/debug/index.ts

@@ -7,7 +7,7 @@ import * as fs from "node:fs/promises";
 import * as url from "node:url";
 import { getWorkProfile } from "@oh-my-pi/pi-natives";
 import { Container, Loader, type SelectItem, SelectList, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getSessionsDir } from "@oh-my-pi/pi-utils/dirs";
+import { getSessionsDir } from "@oh-my-pi/pi-utils";
 import { DynamicBorder } from "../modes/components/dynamic-border";
 import { getSelectListTheme, getSymbolTheme, theme } from "../modes/theme/theme";
 import type { InteractiveModeContext } from "../modes/types";

package/src/debug/report-bundle.ts

@@ -6,8 +6,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { WorkProfile } from "@oh-my-pi/pi-natives";
-import { isEnoent } from "@oh-my-pi/pi-utils";
-import { APP_NAME, getLogPath, getLogsDir, getReportsDir } from "@oh-my-pi/pi-utils/dirs";
+import { APP_NAME, getLogPath, getLogsDir, getReportsDir, isEnoent } from "@oh-my-pi/pi-utils";
 import type { CpuProfile, HeapSnapshot } from "./profiler";
 import { collectSystemInfo, sanitizeEnv } from "./system-info";
 

package/src/debug/system-info.ts

@@ -3,8 +3,7 @@
  */
 
 import * as os from "node:os";
-import { formatBytes } from "@oh-my-pi/pi-utils";
-import { getProjectDir, VERSION } from "@oh-my-pi/pi-utils/dirs";
+import { formatBytes, getProjectDir, VERSION } from "@oh-my-pi/pi-utils";
 
 export interface SystemInfo {
 	os: string;

package/src/discovery/agents.ts

@@ -13,7 +13,7 @@ import { type Skill, skillCapability } from "../capability/skill";
 import { type SlashCommand, slashCommandCapability } from "../capability/slash-command";
 import { type SystemPrompt, systemPromptCapability } from "../capability/system-prompt";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { buildRuleFromMarkdown, createSourceMeta, loadFilesFromDir, loadSkillsFromDir } from "./helpers";
+import { buildRuleFromMarkdown, createSourceMeta, loadFilesFromDir, scanSkillsFromDir } from "./helpers";
 
 const PROVIDER_ID = "agents";
 const DISPLAY_NAME = "Agents (standard)";
@@ -28,7 +28,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 	for (const userSkillsDir of getUserAgentPathCandidates(ctx, "skills")) {
-		const result = await loadSkillsFromDir(ctx, {
+		const result = await scanSkillsFromDir(ctx, {
 			dir: userSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "user",

package/src/discovery/builtin.ts

@@ -4,7 +4,7 @@
  * Primary provider for OMP native configs. Supports all capabilities.
  */
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
@@ -30,9 +30,8 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
-	parseJSON,
 	SOURCE_PATHS,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "native";
@@ -98,7 +97,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 
 	const parseMcpServers = (content: string, path: string, level: "user" | "project"): MCPServer[] => {
 		const result: MCPServer[] = [];
-		const data = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+		const data = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 		if (!data?.mcpServers) return result;
 
 		const expanded = expandEnvVarsDeep(data.mcpServers);
@@ -245,7 +244,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const configDirs = await getConfigDirs(ctx);
 	const results = await Promise.all(
 		configDirs.map(({ dir, level }) =>
-			loadSkillsFromDir(ctx, {
+			scanSkillsFromDir(ctx, {
 				dir: path.join(dir, "skills"),
 				providerId: PROVIDER_ID,
 				level,
@@ -404,7 +403,7 @@ async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<Extens
 		if (!settingsContent) continue;
 
 		const settingsPath = path.join(dir, "settings.json");
-		const settingsData = parseJSON<{ extensions?: unknown }>(settingsContent);
+		const settingsData = tryParseJson<{ extensions?: unknown }>(settingsContent);
 		const extensions = settingsData?.extensions;
 		if (!Array.isArray(extensions)) continue;
 
@@ -508,7 +507,7 @@ async function loadExtensions(ctx: LoadContext): Promise<LoadResult<Extension>>
 		if (!content) continue;
 
 		const { extDir, manifestPath, entryName, level } = manifestCandidates[i];
-		const manifest = parseJSON<ExtensionManifest>(content);
+		const manifest = tryParseJson<ExtensionManifest>(content);
 		if (!manifest) {
 			warnings.push(`Failed to parse ${manifestPath}`);
 			continue;
@@ -655,7 +654,7 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 				extensions: ["json", "md", "ts", "js", "sh", "bash", "py"],
 				transform: (name, content, path, source) => {
 					if (name.endsWith(".json")) {
-						const data = parseJSON<{ name?: string; description?: string }>(content);
+						const data = tryParseJson<{ name?: string; description?: string }>(content);
 						const toolName = data?.name || name.replace(/\.json$/, "");
 						const description =
 							typeof data?.description === "string" && data.description.trim()
@@ -754,7 +753,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 		const content = await readFile(settingsPath);
 		if (!content) continue;
 
-		const data = parseJSON<Record<string, unknown>>(content);
+		const data = tryParseJson<Record<string, unknown>>(content);
 		if (!data) {
 			warnings.push(`Failed to parse ${settingsPath}`);
 			continue;

package/src/discovery/claude-plugins.ts

@@ -11,7 +11,7 @@ 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";
+import { type ClaudePluginRoot, listClaudePluginRoots, loadFilesFromDir, scanSkillsFromDir } from "./helpers";
 
 const PROVIDER_ID = "claude-plugins";
 const DISPLAY_NAME = "Claude Code Marketplace";
@@ -31,7 +31,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const results = await Promise.all(
 		roots.map(async root => {
 			const skillsDir = path.join(root.path, "skills");
-			return loadSkillsFromDir(ctx, {
+			return scanSkillsFromDir(ctx, {
 				dir: skillsDir,
 				providerId: PROVIDER_ID,
 				level: root.scope,

package/src/discovery/claude.ts

@@ -5,6 +5,7 @@
  * Priority: 80 (tool-specific, below builtin but above shared standards)
  */
 import * as path from "node:path";
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
@@ -24,8 +25,7 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
-	parseJSON,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "claude";
@@ -77,7 +77,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 
 	const parseMcpServers = (content: string | null, path: string, level: "user" | "project"): MCPServer[] => {
 		if (!content) return [];
-		const json = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+		const json = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 		if (!json?.mcpServers) return [];
 
 		const mcpServers = expandEnvVarsDeep(json.mcpServers);
@@ -163,8 +163,8 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const projectSkillsDir = path.join(getProjectClaude(ctx), "skills");
 
 	const results = await Promise.all([
-		loadSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
-		loadSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
+		scanSkillsFromDir(ctx, { dir: userSkillsDir, providerId: PROVIDER_ID, level: "user" }),
+		scanSkillsFromDir(ctx, { dir: projectSkillsDir, providerId: PROVIDER_ID, level: "project" }),
 	]);
 
 	return {
@@ -396,7 +396,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 
 	const userContent = await readFile(userSettingsJson);
 	if (userContent) {
-		const data = parseJSON<Record<string, unknown>>(userContent);
+		const data = tryParseJson<Record<string, unknown>>(userContent);
 		if (data) {
 			items.push({
 				path: userSettingsJson,
@@ -413,7 +413,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const projectSettingsJson = path.join(projectBase, "settings.json");
 	const projectContent = await readFile(projectSettingsJson);
 	if (projectContent) {
-		const data = parseJSON<Record<string, unknown>>(projectContent);
+		const data = tryParseJson<Record<string, unknown>>(projectContent);
 		if (data) {
 			items.push({
 				path: projectSettingsJson,

package/src/discovery/codex.ts

@@ -35,8 +35,8 @@ import {
 	discoverExtensionModulePaths,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
 	SOURCE_PATHS,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "codex";
@@ -214,12 +214,12 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 	const projectSkillsDir = path.join(codexDir, "skills");
 
 	const results = await Promise.all([
-		loadSkillsFromDir(ctx, {
+		scanSkillsFromDir(ctx, {
 			dir: userSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "user",
 		}),
-		loadSkillsFromDir(ctx, {
+		scanSkillsFromDir(ctx, {
 			dir: projectSkillsDir,
 			providerId: PROVIDER_ID,
 			level: "project",

package/src/discovery/cursor.ts

@@ -13,6 +13,8 @@
  * - rules: From rules/*.mdc files with MDC frontmatter (description, globs, alwaysApply)
  * - settings: From settings.json if present
  */
+
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
@@ -28,7 +30,6 @@ import {
 	getProjectPath,
 	getUserPath,
 	loadFilesFromDir,
-	parseJSON,
 } from "./helpers";
 
 const PROVIDER_ID = "cursor";
@@ -46,7 +47,7 @@ function parseMCPServers(
 ): { items: MCPServer[]; warning?: string } {
 	const items: MCPServer[] = [];
 
-	const parsed = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+	const parsed = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 	if (!parsed?.mcpServers) {
 		return { items, warning: `${path}: missing or invalid 'mcpServers' key` };
 	}
@@ -158,7 +159,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const projectContentPromise = projectPath ? readFile(projectPath) : Promise.resolve(null);
 
 	if (userContent && userPath) {
-		const parsed = parseJSON<Record<string, unknown>>(userContent);
+		const parsed = tryParseJson<Record<string, unknown>>(userContent);
 		if (parsed) {
 			items.push({
 				path: userPath,
@@ -173,7 +174,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 
 	const projectContent = await projectContentPromise;
 	if (projectContent && projectPath) {
-		const parsed = parseJSON<Record<string, unknown>>(projectContent);
+		const parsed = tryParseJson<Record<string, unknown>>(projectContent);
 		if (parsed) {
 			items.push({
 				path: projectPath,

package/src/discovery/gemini.ts

@@ -16,6 +16,7 @@
  * - settings: From settings.json
  */
 import * as path from "node:path";
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
@@ -33,7 +34,6 @@ import {
 	getExtensionNameFromPath,
 	getProjectPath,
 	getUserPath,
-	parseJSON,
 } from "./helpers";
 
 const PROVIDER_ID = "gemini";
@@ -80,7 +80,7 @@ async function loadMCPFromSettings(
 		return { items, warnings };
 	}
 
-	const parsed = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+	const parsed = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 	if (!parsed) {
 		warnings.push(`Invalid JSON in ${path}`);
 		return { items, warnings };
@@ -206,7 +206,7 @@ async function loadExtensionsFromDir(extensionsDir: string, level: "user" | "pro
 	for (const { entry, extPath, manifestPath, content } of results) {
 		if (!content) continue;
 
-		const manifest = parseJSON<ExtensionManifest>(content);
+		const manifest = tryParseJson<ExtensionManifest>(content);
 		if (!manifest) {
 			warnings.push(`Invalid JSON in ${manifestPath}`);
 			continue;
@@ -268,7 +268,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	if (userPath) {
 		const content = await readFile(userPath);
 		if (content) {
-			const parsed = parseJSON<Record<string, unknown>>(content);
+			const parsed = tryParseJson<Record<string, unknown>>(content);
 			if (parsed) {
 				items.push({
 					path: userPath,
@@ -287,7 +287,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	if (projectPath) {
 		const content = await readFile(projectPath);
 		if (content) {
-			const parsed = parseJSON<Record<string, unknown>>(content);
+			const parsed = tryParseJson<Record<string, unknown>>(content);
 			if (parsed) {
 				items.push({
 					path: projectPath,

package/src/discovery/helpers.ts

@@ -1,7 +1,8 @@
+import * as fs from "node:fs";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { FileType, glob } from "@oh-my-pi/pi-natives";
-import { CONFIG_DIR_NAME } from "@oh-my-pi/pi-utils/dirs";
+import { CONFIG_DIR_NAME, tryParseJson } from "@oh-my-pi/pi-utils";
 import { readFile } from "../capability/fs";
 import { parseRuleConditionAndScope, type Rule, type RuleFrontmatter } from "../capability/rule";
 import type { Skill, SkillFrontmatter } from "../capability/skill";
@@ -268,68 +269,56 @@ async function globIf(
 	}
 }
 
-export async function loadSkillsFromDir(
+export interface ScanSkillsFromDirOptions {
+	dir: string;
+	providerId: string;
+	level: "user" | "project";
+	requireDescription?: boolean;
+}
+
+export async function scanSkillsFromDir(
 	_ctx: LoadContext,
-	options: {
-		dir: string;
-		providerId: string;
-		level: "user" | "project";
-		requireDescription?: boolean;
-	},
+	options: ScanSkillsFromDirOptions,
 ): Promise<LoadResult<Skill>> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 	const { dir, level, providerId, requireDescription = false } = options;
-	// Use native glob to find all SKILL.md files one level deep
-	// Pattern */SKILL.md matches <dir>/<subdir>/SKILL.md
-	const discoveredMatches = new Set<string>();
-	for (const match of await globIf(dir, "*/SKILL.md", FileType.File)) {
-		discoveredMatches.add(match.path);
-	}
-	for (const match of await globIf(dir, "*", FileType.Dir, false)) {
-		const skillRelPath = `${match.path}/SKILL.md`;
-		const content = await readFile(path.join(dir, skillRelPath));
-		if (content !== null) {
-			discoveredMatches.add(skillRelPath);
-		}
-	}
-	const matches = [...discoveredMatches].map(path => ({ path }));
-	if (matches.length === 0) {
-		return { items, warnings };
-	}
 
-	// Read all skill files in parallel
-	const results = await Promise.all(
-		matches.map(async match => {
-			const skillFile = path.join(dir, match.path);
-			const content = await readFile(skillFile);
-			if (!content) {
-				return { item: null as Skill | null, warning: null as string | null };
-			}
-			const { frontmatter, body } = parseFrontmatter(content, { source: skillFile });
+	const entries = await fs.promises.readdir(dir, { withFileTypes: true });
+
+	const loadSkill = async (skillPath: string) => {
+		try {
+			const content = await readFile(skillPath);
+			if (!content) return;
+			const { frontmatter, body } = parseFrontmatter(content, { source: skillPath });
 			if (requireDescription && !frontmatter.description) {
-				return { item: null as Skill | null, warning: null as string | null };
+				return;
 			}
+			const skillDirName = path.basename(path.dirname(skillPath));
+			items.push({
+				name: (frontmatter.name as string) || skillDirName,
+				path: skillPath,
+				content: body,
+				frontmatter: frontmatter as SkillFrontmatter,
+				level,
+				_source: createSourceMeta(providerId, skillPath, level),
+			});
+		} catch {
+			warnings.push(`Failed to read skill file: ${skillPath}`);
+		}
+	};
 
-			// Extract skill name from path: "<skilldir>/SKILL.md" -> "<skilldir>"
-			const skillDirName = path.basename(path.dirname(skillFile));
-			return {
-				item: {
-					name: (frontmatter.name as string) || skillDirName,
-					path: skillFile,
-					content: body,
-					frontmatter: frontmatter as SkillFrontmatter,
-					level,
-					_source: createSourceMeta(providerId, skillFile, level),
-				},
-				warning: null as string | null,
-			};
-		}),
-	);
-	for (const result of results) {
-		if (result.warning) warnings.push(result.warning);
-		if (result.item) items.push(result.item);
+	const work = [];
+	for (const entry of entries) {
+		if (entry.name.startsWith(".")) continue;
+		if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+		const skillPath = path.join(dir, entry.name, "SKILL.md");
+		if (fs.existsSync(skillPath)) {
+			work.push(loadSkill(skillPath));
+		}
 	}
+	await Promise.all(work);
+
 	return { items, warnings };
 }
 
@@ -337,7 +326,7 @@ export async function loadSkillsFromDir(
  * Expand environment variables in a string.
  * Supports ${VAR} and ${VAR:-default} syntax.
  */
-export function expandEnvVars(value: string, extraEnv?: Record<string, string>): string {
+function expandEnvVars(value: string, extraEnv?: Record<string, string>): string {
 	return value.replace(/\$\{([^}:]+)(?::-([^}]*))?\}/g, (_, varName: string, defaultValue?: string) => {
 		const envValue = extraEnv?.[varName] ?? Bun.env[varName];
 		if (envValue !== undefined) return envValue;
@@ -447,17 +436,6 @@ export async function loadFilesFromDir<T>(
 	return { items, warnings };
 }
 
-/**
- * Parse JSON safely.
- */
-export function parseJSON<T>(content: string): T | null {
-	try {
-		return JSON.parse(content) as T;
-	} catch {
-		return null;
-	}
-}
-
 /**
  * Calculate depth of target directory relative to current working directory.
  * Depth is the number of directory levels from cwd to target.
@@ -480,7 +458,7 @@ async function readExtensionModuleManifest(
 	const content = await readFile(packageJsonPath);
 	if (!content) return null;
 
-	const pkg = parseJSON<{ omp?: ExtensionModuleManifest; pi?: ExtensionModuleManifest }>(content);
+	const pkg = tryParseJson<{ omp?: ExtensionModuleManifest; pi?: ExtensionModuleManifest }>(content);
 	const manifest = pkg?.omp ?? pkg?.pi;
 	if (manifest && typeof manifest === "object") {
 		return manifest;
@@ -506,9 +484,9 @@ export async function discoverExtensionModulePaths(_ctx: LoadContext, dir: strin
 		// 1. Direct *.ts or *.js files
 		globIf(dir, "*.{ts,js}", FileType.File, false),
 		// 2. Subdirectory index files
-		globIf(dir, "*/index.{ts,js}", FileType.File),
+		globIf(dir, "*/index.{ts,js}", FileType.File, false),
 		// 3. Subdirectory package.json files
-		globIf(dir, "*/package.json", FileType.File),
+		globIf(dir, "*/package.json", FileType.File, false),
 	]);
 
 	// Process direct files
@@ -617,7 +595,7 @@ export interface ClaudePluginRoot {
  * Parse Claude Code installed_plugins.json content.
  */
 export function parseClaudePluginsRegistry(content: string): ClaudePluginsRegistry | null {
-	const data = parseJSON<ClaudePluginsRegistry>(content);
+	const data = tryParseJson<ClaudePluginsRegistry>(content);
 	if (!data || typeof data !== "object") return null;
 	if (
 		typeof data.version !== "number" ||

package/src/discovery/mcp-json.ts

@@ -7,12 +7,12 @@
  * Priority: 5 (low, as this is a fallback after tool-specific providers)
  */
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
-import { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";
+import { createSourceMeta, expandEnvVarsDeep } from "./helpers";
 
 const PROVIDER_ID = "mcp-json";
 const DISPLAY_NAME = "MCP Config";
@@ -115,7 +115,7 @@ async function loadMCPJsonFile(
 		return { items, warnings };
 	}
 
-	const config = parseJSON<MCPConfigFile>(content);
+	const config = tryParseJson<MCPConfigFile>(content);
 	if (!config) {
 		warnings.push(`Failed to parse JSON in ${path}`);
 		return { items, warnings };

package/src/discovery/opencode.ts

@@ -16,7 +16,7 @@
  * Priority: 55 (tool-specific provider)
  */
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
+import { logger, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { type ContextFile, contextFileCapability } from "../capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
@@ -35,8 +35,7 @@ import {
 	getProjectPath,
 	getUserPath,
 	loadFilesFromDir,
-	loadSkillsFromDir,
-	parseJSON,
+	scanSkillsFromDir,
 } from "./helpers";
 
 const PROVIDER_ID = "opencode";
@@ -51,7 +50,7 @@ async function loadJsonConfig(configPath: string): Promise<Record<string, unknow
 	const content = await readFile(configPath);
 	if (!content) return null;
 
-	const parsed = parseJSON<Record<string, unknown>>(content);
+	const parsed = tryParseJson<Record<string, unknown>>(content);
 	if (!parsed) {
 		logger.warn("Failed to parse OpenCode JSON config", { path: configPath });
 		return null;
@@ -190,7 +189,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 
 	if (userSkillsDir) {
 		promises.push(
-			loadSkillsFromDir(ctx, {
+			scanSkillsFromDir(ctx, {
 				dir: userSkillsDir,
 				providerId: PROVIDER_ID,
 				level: "user",
@@ -200,7 +199,7 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 
 	if (projectSkillsDir) {
 		promises.push(
-			loadSkillsFromDir(ctx, {
+			scanSkillsFromDir(ctx, {
 				dir: projectSkillsDir,
 				providerId: PROVIDER_ID,
 				level: "project",
@@ -307,7 +306,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	if (userConfigPath) {
 		const content = await readFile(userConfigPath);
 		if (content) {
-			const parsed = parseJSON<Record<string, unknown>>(content);
+			const parsed = tryParseJson<Record<string, unknown>>(content);
 			if (parsed) {
 				items.push({
 					path: userConfigPath,
@@ -325,7 +324,7 @@ async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const projectConfigPath = path.join(ctx.cwd, "opencode.json");
 	const content = await readFile(projectConfigPath);
 	if (content) {
-		const parsed = parseJSON<Record<string, unknown>>(content);
+		const parsed = tryParseJson<Record<string, unknown>>(content);
 		if (parsed) {
 			items.push({
 				path: projectConfigPath,

package/src/discovery/ssh.ts

@@ -5,13 +5,13 @@
  * Priority: 5 (low, project/user config discovery)
  */
 import * as path from "node:path";
-import { getSSHConfigPath } from "@oh-my-pi/pi-utils/dirs";
+import { getSSHConfigPath, tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type SSHHost, sshCapability } from "../capability/ssh";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { expandTilde } from "../tools/path-utils";
-import { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";
+import { createSourceMeta, expandEnvVarsDeep } from "./helpers";
 
 const PROVIDER_ID = "ssh-json";
 const DISPLAY_NAME = "SSH Config";
@@ -95,7 +95,7 @@ async function loadSshJsonFile(
 	if (content === null) {
 		return { items, warnings };
 	}
-	const parsed = parseJSON<SSHConfigFile>(content);
+	const parsed = tryParseJson<SSHConfigFile>(content);
 	if (!parsed) {
 		warnings.push(`Failed to parse JSON in ${filePath}`);
 		return { items, warnings };

package/src/discovery/vscode.ts

@@ -4,11 +4,12 @@
  * Loads config from `.vscode` directory (project-only).
  * Supports MCP server discovery from `mcp.json` with nested `mcp.servers` structure.
  */
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
 import type { LoadContext, LoadResult } from "../capability/types";
-import { createSourceMeta, expandEnvVarsDeep, getProjectPath, parseJSON } from "./helpers";
+import { createSourceMeta, expandEnvVarsDeep, getProjectPath } from "./helpers";
 
 const PROVIDER_ID = "vscode";
 const DISPLAY_NAME = "VS Code";
@@ -57,7 +58,7 @@ async function loadMCPConfig(
 		return { items, warnings };
 	}
 
-	const parsed = parseJSON<{ mcp?: { servers?: Record<string, unknown> } }>(content);
+	const parsed = tryParseJson<{ mcp?: { servers?: Record<string, unknown> } }>(content);
 	if (!parsed) {
 		warnings.push(`Invalid JSON in ${path}`);
 		return { items, warnings };

package/src/discovery/windsurf.ts

@@ -10,6 +10,8 @@
  * - Rules from .windsurf/rules/*.md and ~/.codeium/windsurf/memories/global_rules.md
  * - Legacy .windsurfrules file
  */
+
+import { tryParseJson } from "@oh-my-pi/pi-utils";
 import { registerProvider } from "../capability";
 import { readFile } from "../capability/fs";
 import { type MCPServer, mcpCapability } from "../capability/mcp";
@@ -22,7 +24,6 @@ import {
 	getProjectPath,
 	getUserPath,
 	loadFilesFromDir,
-	parseJSON,
 } from "./helpers";
 
 const PROVIDER_ID = "windsurf";
@@ -78,7 +79,7 @@ async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>>
 	for (const { content, path, scope } of configs) {
 		if (!content || !path) continue;
 
-		const config = parseJSON<{ mcpServers?: Record<string, unknown> }>(content);
+		const config = tryParseJson<{ mcpServers?: Record<string, unknown> }>(content);
 		if (!config?.mcpServers) continue;
 
 		for (const [name, serverConfig] of Object.entries(config.mcpServers)) {

package/src/exa/company.ts

@@ -22,5 +22,5 @@ Parameters:
 	Type.Object({
 		company_name: Type.String({ description: "Name of the company to research" }),
 	}),
-	"company_research",
+	"company_research_exa",
 );