@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/discovery/codex.ts

@@ -6,31 +6,30 @@
  *
  * User directory: ~/.codex
  */
-
-import { join } from "node:path";
-import type { ContextFile } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-import { contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import type { Hook } from "@oh-my-pi/pi-coding-agent/capability/hook";
-import { hookCapability } from "@oh-my-pi/pi-coding-agent/capability/hook";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import type { MCPServer } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import { mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import type { Prompt } from "@oh-my-pi/pi-coding-agent/capability/prompt";
-import { promptCapability } from "@oh-my-pi/pi-coding-agent/capability/prompt";
-import type { Settings } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import { settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import type { Skill } from "@oh-my-pi/pi-coding-agent/capability/skill";
-import { skillCapability } from "@oh-my-pi/pi-coding-agent/capability/skill";
-import type { SlashCommand } from "@oh-my-pi/pi-coding-agent/capability/slash-command";
-import { slashCommandCapability } from "@oh-my-pi/pi-coding-agent/capability/slash-command";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/capability/tool";
-import { toolCapability } from "@oh-my-pi/pi-coding-agent/capability/tool";
-import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
 import { parse as parseToml } from "smol-toml";
+import { registerProvider } from "../capability";
+import type { ContextFile } from "../capability/context-file";
+import { contextFileCapability } from "../capability/context-file";
+import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
+import { readFile } from "../capability/fs";
+import type { Hook } from "../capability/hook";
+import { hookCapability } from "../capability/hook";
+import type { MCPServer } from "../capability/mcp";
+import { mcpCapability } from "../capability/mcp";
+import type { Prompt } from "../capability/prompt";
+import { promptCapability } from "../capability/prompt";
+import type { Settings } from "../capability/settings";
+import { settingsCapability } from "../capability/settings";
+import type { Skill } from "../capability/skill";
+import { skillCapability } from "../capability/skill";
+import type { SlashCommand } from "../capability/slash-command";
+import { slashCommandCapability } from "../capability/slash-command";
+import type { CustomTool } from "../capability/tool";
+import { toolCapability } from "../capability/tool";
+import type { LoadContext, LoadResult } from "../capability/types";
+import { parseFrontmatter } from "../utils/frontmatter";
 import {
 	createSourceMeta,
 	discoverExtensionModulePaths,
@@ -45,7 +44,7 @@ const DISPLAY_NAME = "OpenAI Codex";
 const PRIORITY = 70;
 
 function getProjectCodexDir(ctx: LoadContext): string {
-	return join(ctx.cwd, ".codex");
+	return path.join(ctx.cwd, ".codex");
 }
 
 // =============================================================================
@@ -57,7 +56,7 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 	const warnings: string[] = [];
 
 	// User level only: ~/.codex/AGENTS.md
-	const agentsMd = join(ctx.home, SOURCE_PATHS.codex.userBase, "AGENTS.md");
+	const agentsMd = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "AGENTS.md");
 	const agentsContent = await readFile(agentsMd);
 	if (agentsContent) {
 		items.push({
@@ -78,9 +77,9 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 async function loadMCPServers(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
 	const warnings: string[] = [];
 
-	const userConfigPath = join(ctx.home, SOURCE_PATHS.codex.userBase, "config.toml");
+	const userConfigPath = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "config.toml");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectConfigPath = join(codexDir, "config.toml");
+	const projectConfigPath = path.join(codexDir, "config.toml");
 
 	const [userConfig, projectConfig] = await Promise.all([
 		loadTomlConfig(ctx, userConfigPath),
@@ -210,9 +209,9 @@ function extractMCPServersFromToml(toml: Record<string, unknown>): Record<string
 // =============================================================================
 
 async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
-	const userSkillsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "skills");
+	const userSkillsDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "skills");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectSkillsDir = join(codexDir, "skills");
+	const projectSkillsDir = path.join(codexDir, "skills");
 
 	const results = await Promise.all([
 		loadSkillsFromDir(ctx, {
@@ -227,8 +226,8 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 		}),
 	]);
 
-	const items = results.flatMap((r) => r.items);
-	const warnings = results.flatMap((r) => r.warnings || []);
+	const items = results.flatMap(r => r.items);
+	const warnings = results.flatMap(r => r.warnings || []);
 
 	return { items, warnings };
 }
@@ -240,9 +239,9 @@ async function loadSkills(ctx: LoadContext): Promise<LoadResult<Skill>> {
 async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<ExtensionModule>> {
 	const warnings: string[] = [];
 
-	const userExtensionsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "extensions");
+	const userExtensionsDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "extensions");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectExtensionsDir = join(codexDir, "extensions");
+	const projectExtensionsDir = path.join(codexDir, "extensions");
 
 	const [userPaths, projectPaths] = await Promise.all([
 		discoverExtensionModulePaths(ctx, userExtensionsDir),
@@ -250,13 +249,13 @@ async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<Extens
 	]);
 
 	const items: ExtensionModule[] = [
-		...userPaths.map((extPath) => ({
+		...userPaths.map(extPath => ({
 			name: getExtensionNameFromPath(extPath),
 			path: extPath,
 			level: "user" as const,
 			_source: createSourceMeta(PROVIDER_ID, extPath, "user"),
 		})),
-		...projectPaths.map((extPath) => ({
+		...projectPaths.map(extPath => ({
 			name: getExtensionNameFromPath(extPath),
 			path: extPath,
 			level: "project" as const,
@@ -272,9 +271,9 @@ async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<Extens
 // =============================================================================
 
 async function loadSlashCommands(ctx: LoadContext): Promise<LoadResult<SlashCommand>> {
-	const userCommandsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "commands");
+	const userCommandsDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "commands");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectCommandsDir = join(codexDir, "commands");
+	const projectCommandsDir = path.join(codexDir, "commands");
 
 	const transformCommand =
 		(level: "user" | "project") =>
@@ -301,8 +300,8 @@ async function loadSlashCommands(ctx: LoadContext): Promise<LoadResult<SlashComm
 		}),
 	]);
 
-	const items = results.flatMap((r) => r.items);
-	const warnings = results.flatMap((r) => r.warnings || []);
+	const items = results.flatMap(r => r.items);
+	const warnings = results.flatMap(r => r.warnings || []);
 
 	return { items, warnings };
 }
@@ -312,9 +311,9 @@ async function loadSlashCommands(ctx: LoadContext): Promise<LoadResult<SlashComm
 // =============================================================================
 
 async function loadPrompts(ctx: LoadContext): Promise<LoadResult<Prompt>> {
-	const userPromptsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "prompts");
+	const userPromptsDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "prompts");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectPromptsDir = join(codexDir, "prompts");
+	const projectPromptsDir = path.join(codexDir, "prompts");
 
 	const transformPrompt = (
 		name: string,
@@ -344,8 +343,8 @@ async function loadPrompts(ctx: LoadContext): Promise<LoadResult<Prompt>> {
 		}),
 	]);
 
-	const items = results.flatMap((r) => r.items);
-	const warnings = results.flatMap((r) => r.warnings || []);
+	const items = results.flatMap(r => r.items);
+	const warnings = results.flatMap(r => r.warnings || []);
 
 	return { items, warnings };
 }
@@ -355,9 +354,9 @@ async function loadPrompts(ctx: LoadContext): Promise<LoadResult<Prompt>> {
 // =============================================================================
 
 async function loadHooks(ctx: LoadContext): Promise<LoadResult<Hook>> {
-	const userHooksDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "hooks");
+	const userHooksDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "hooks");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectHooksDir = join(codexDir, "hooks");
+	const projectHooksDir = path.join(codexDir, "hooks");
 
 	const transformHook =
 		(level: "user" | "project") =>
@@ -387,8 +386,8 @@ async function loadHooks(ctx: LoadContext): Promise<LoadResult<Hook>> {
 		}),
 	]);
 
-	const items = results.flatMap((r) => r.items);
-	const warnings = results.flatMap((r) => r.warnings || []);
+	const items = results.flatMap(r => r.items);
+	const warnings = results.flatMap(r => r.warnings || []);
 
 	return { items, warnings };
 }
@@ -398,9 +397,9 @@ async function loadHooks(ctx: LoadContext): Promise<LoadResult<Hook>> {
 // =============================================================================
 
 async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
-	const userToolsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "tools");
+	const userToolsDir = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "tools");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectToolsDir = join(codexDir, "tools");
+	const projectToolsDir = path.join(codexDir, "tools");
 
 	const transformTool =
 		(level: "user" | "project") =>
@@ -425,8 +424,8 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 		}),
 	]);
 
-	const items = results.flatMap((r) => r.items);
-	const warnings = results.flatMap((r) => r.warnings || []);
+	const items = results.flatMap(r => r.items);
+	const warnings = results.flatMap(r => r.warnings || []);
 
 	return { items, warnings };
 }
@@ -438,9 +437,9 @@ async function loadTools(ctx: LoadContext): Promise<LoadResult<CustomTool>> {
 async function loadSettings(ctx: LoadContext): Promise<LoadResult<Settings>> {
 	const warnings: string[] = [];
 
-	const userConfigPath = join(ctx.home, SOURCE_PATHS.codex.userBase, "config.toml");
+	const userConfigPath = path.join(ctx.home, SOURCE_PATHS.codex.userBase, "config.toml");
 	const codexDir = getProjectCodexDir(ctx);
-	const projectConfigPath = join(codexDir, "config.toml");
+	const projectConfigPath = path.join(codexDir, "config.toml");
 
 	const [userConfig, projectConfig] = await Promise.all([
 		loadTomlConfig(ctx, userConfigPath),

package/src/discovery/cursor.ts

@@ -13,16 +13,15 @@
  * - rules: From rules/*.mdc files with MDC frontmatter (description, globs, alwaysApply)
  * - settings: From settings.json if present
  */
-
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import { ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import type { Settings } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import { settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import { registerProvider } from "../capability";
+import { readFile } from "../capability/fs";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import type { Rule } from "../capability/rule";
+import { ruleCapability } from "../capability/rule";
+import type { Settings } from "../capability/settings";
+import { settingsCapability } from "../capability/settings";
+import type { LoadContext, LoadResult } from "../capability/types";
+import { parseFrontmatter } from "../utils/frontmatter";
 import {
 	createSourceMeta,
 	expandEnvVarsDeep,

package/src/discovery/gemini.ts

@@ -15,21 +15,16 @@
  * - extensions: From extensions/STAR/gemini-extension.json manifests (STAR = wildcard)
  * - settings: From settings.json
  */
-
-import { join, sep } from "node:path";
-import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-import {
-	type Extension,
-	type ExtensionManifest,
-	extensionCapability,
-} from "@oh-my-pi/pi-coding-agent/capability/extension";
-import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
-import { readDirEntries, readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import { type Settings, settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
-import { type SystemPrompt, systemPromptCapability } from "@oh-my-pi/pi-coding-agent/capability/system-prompt";
-import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
+import * as path from "node:path";
+import { registerProvider } from "../capability";
+import { type ContextFile, contextFileCapability } from "../capability/context-file";
+import { type Extension, type ExtensionManifest, extensionCapability } from "../capability/extension";
+import { type ExtensionModule, extensionModuleCapability } from "../capability/extension-module";
+import { readDirEntries, readFile } from "../capability/fs";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import { type Settings, settingsCapability } from "../capability/settings";
+import { type SystemPrompt, systemPromptCapability } from "../capability/system-prompt";
+import type { LoadContext, LoadResult } from "../capability/types";
 import {
 	calculateDepth,
 	createSourceMeta,
@@ -150,7 +145,7 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 		const content = await readFile(projectGeminiMd);
 		if (content) {
 			const projectBase = getProjectPath(ctx, "gemini", "");
-			const depth = projectBase ? calculateDepth(ctx.cwd, projectBase, sep) : 0;
+			const depth = projectBase ? calculateDepth(ctx.cwd, projectBase, path.sep) : 0;
 
 			items.push({
 				path: projectGeminiMd,
@@ -194,12 +189,12 @@ async function loadExtensions(ctx: LoadContext): Promise<LoadResult<Extension>>
 
 async function loadExtensionsFromDir(extensionsDir: string, level: "user" | "project"): Promise<LoadResult<Extension>> {
 	const entries = await readDirEntries(extensionsDir);
-	const dirEntries = entries.filter((entry) => entry.isDirectory());
+	const dirEntries = entries.filter(entry => entry.isDirectory());
 
 	const results = await Promise.all(
-		dirEntries.map(async (entry) => {
-			const extPath = join(extensionsDir, entry.name);
-			const manifestPath = join(extPath, "gemini-extension.json");
+		dirEntries.map(async entry => {
+			const extPath = path.join(extensionsDir, entry.name);
+			const manifestPath = path.join(extPath, "gemini-extension.json");
 			const content = await readFile(manifestPath);
 			return { entry, extPath, manifestPath, content };
 		}),
@@ -243,13 +238,13 @@ async function loadExtensionModules(ctx: LoadContext): Promise<LoadResult<Extens
 	]);
 
 	const items: ExtensionModule[] = [
-		...userPaths.map((extPath) => ({
+		...userPaths.map(extPath => ({
 			name: getExtensionNameFromPath(extPath),
 			path: extPath,
 			level: "user" as const,
 			_source: createSourceMeta(PROVIDER_ID, extPath, "user"),
 		})),
-		...projectPaths.map((extPath) => ({
+		...projectPaths.map(extPath => ({
 			name: getExtensionNameFromPath(extPath),
 			path: extPath,
 			level: "project" as const,

package/src/discovery/github.ts

@@ -11,14 +11,13 @@
  * - context-files: copilot-instructions.md in .github/
  * - instructions: *.instructions.md in .github/instructions/ with applyTo frontmatter
  */
-
-import { basename, dirname, sep } from "node:path";
-import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type Instruction, instructionCapability } from "@oh-my-pi/pi-coding-agent/capability/instruction";
-import type { LoadContext, LoadResult, SourceMeta } from "@oh-my-pi/pi-coding-agent/capability/types";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import * as path from "node:path";
+import { registerProvider } from "../capability";
+import { type ContextFile, contextFileCapability } from "../capability/context-file";
+import { readFile } from "../capability/fs";
+import { type Instruction, instructionCapability } from "../capability/instruction";
+import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
+import { parseFrontmatter } from "../utils/frontmatter";
 import { calculateDepth, createSourceMeta, getProjectPath, loadFilesFromDir } from "./helpers";
 
 const PROVIDER_ID = "github";
@@ -37,8 +36,8 @@ async function loadContextFiles(ctx: LoadContext): Promise<LoadResult<ContextFil
 	if (copilotInstructionsPath) {
 		const content = await readFile(copilotInstructionsPath);
 		if (content) {
-			const fileDir = dirname(copilotInstructionsPath);
-			const depth = calculateDepth(ctx.cwd, fileDir, sep);
+			const fileDir = path.dirname(copilotInstructionsPath);
+			const depth = calculateDepth(ctx.cwd, fileDir, path.sep);
 
 			items.push({
 				path: copilotInstructionsPath,
@@ -74,23 +73,23 @@ async function loadInstructions(ctx: LoadContext): Promise<LoadResult<Instructio
 	return { items, warnings };
 }
 
-function transformInstruction(name: string, content: string, path: string, source: SourceMeta): Instruction | null {
+function transformInstruction(name: string, content: string, filePath: string, source: SourceMeta): Instruction | null {
 	// Only process .instructions.md files
 	if (!name.endsWith(".instructions.md")) {
 		return null;
 	}
 
-	const { frontmatter, body } = parseFrontmatter(content, { source: path });
+	const { frontmatter, body } = parseFrontmatter(content, { source: filePath });
 
 	// Extract applyTo glob pattern from frontmatter
 	const applyTo = typeof frontmatter.applyTo === "string" ? frontmatter.applyTo : undefined;
 
 	// Derive name from filename (strip .instructions.md suffix)
-	const instructionName = basename(name, ".instructions.md");
+	const instructionName = path.basename(name, ".instructions.md");
 
 	return {
 		name: instructionName,
-		path,
+		path: filePath,
 		content: body,
 		applyTo,
 		_source: source,

package/src/discovery/helpers.ts

@@ -1,14 +1,13 @@
 /**
  * Shared helpers for discovery providers.
  */
-
-import { homedir } from "node:os";
-import { join, resolve } from "node:path";
+import * as os from "node:os";
+import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import { readDirEntries, readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import type { Skill, SkillFrontmatter } from "@oh-my-pi/pi-coding-agent/capability/skill";
-import type { LoadContext, LoadResult, SourceMeta } from "@oh-my-pi/pi-coding-agent/capability/types";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import { readDirEntries, readFile } from "../capability/fs";
+import type { Skill, SkillFrontmatter } from "../capability/skill";
+import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
+import { parseFrontmatter } from "../utils/frontmatter";
 
 const VALID_THINKING_LEVELS: readonly string[] = ["off", "minimal", "low", "medium", "high", "xhigh"];
 const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
@@ -26,10 +25,10 @@ export function normalizeUnicodeSpaces(str: string): string {
 export function expandPath(p: string): string {
 	const normalized = normalizeUnicodeSpaces(p);
 	if (normalized.startsWith("~/")) {
-		return join(homedir(), normalized.slice(2));
+		return path.join(os.homedir(), normalized.slice(2));
 	}
 	if (normalized.startsWith("~")) {
-		return join(homedir(), normalized.slice(1));
+		return path.join(os.homedir(), normalized.slice(1));
 	}
 	return normalized;
 }
@@ -94,7 +93,7 @@ export type SourceId = keyof typeof SOURCE_PATHS;
 export function getUserPath(ctx: LoadContext, source: SourceId, subpath: string): string | null {
 	const paths = SOURCE_PATHS[source];
 	if (!paths.userAgent) return null;
-	return join(ctx.home, paths.userAgent, subpath);
+	return path.join(ctx.home, paths.userAgent, subpath);
 }
 
 /**
@@ -104,17 +103,17 @@ export function getProjectPath(ctx: LoadContext, source: SourceId, subpath: stri
 	const paths = SOURCE_PATHS[source];
 	if (!paths.projectDir) return null;
 
-	return join(ctx.cwd, paths.projectDir, subpath);
+	return path.join(ctx.cwd, paths.projectDir, subpath);
 }
 
 /**
  * Create source metadata for an item.
  */
-export function createSourceMeta(provider: string, path: string, level: "user" | "project"): SourceMeta {
+export function createSourceMeta(provider: string, filePath: string, level: "user" | "project"): SourceMeta {
 	return {
 		provider,
 		providerName: "", // Filled in by registry
-		path: resolve(path),
+		path: path.resolve(filePath),
 		level,
 	};
 }
@@ -137,7 +136,7 @@ export function parseThinkingLevel(frontmatter: Record<string, unknown>): Thinki
 export function parseCSV(value: string): string[] {
 	return value
 		.split(",")
-		.map((s) => s.trim())
+		.map(s => s.trim())
 		.filter(Boolean);
 }
 
@@ -224,12 +223,12 @@ export async function loadSkillsFromDir(
 
 	const entries = await readDirEntries(dir);
 	const skillDirs = entries.filter(
-		(entry) => entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules",
+		entry => entry.isDirectory() && !entry.name.startsWith(".") && entry.name !== "node_modules",
 	);
 
 	const results = await Promise.all(
-		skillDirs.map(async (entry) => {
-			const skillFile = join(dir, entry.name, "SKILL.md");
+		skillDirs.map(async entry => {
+			const skillFile = path.join(dir, entry.name, "SKILL.md");
 			const content = await readFile(skillFile);
 			if (!content) {
 				return { item: null as Skill | null, warning: null as string | null };
@@ -283,7 +282,7 @@ export function expandEnvVarsDeep<T>(obj: T, extraEnv?: Record<string, string>):
 		return expandEnvVars(obj, extraEnv) as T;
 	}
 	if (Array.isArray(obj)) {
-		return obj.map((item) => expandEnvVarsDeep(item, extraEnv)) as T;
+		return obj.map(item => expandEnvVarsDeep(item, extraEnv)) as T;
 	}
 	if (obj !== null && typeof obj === "object") {
 		const result: Record<string, unknown> = {};
@@ -314,24 +313,26 @@ export async function loadFilesFromDir<T>(
 ): Promise<LoadResult<T>> {
 	const entries = await readDirEntries(dir);
 
-	const visibleEntries = entries.filter((entry) => !entry.name.startsWith("."));
+	const visibleEntries = entries.filter(entry => !entry.name.startsWith("."));
 
-	const directories = options.recursive ? visibleEntries.filter((entry) => entry.isDirectory()) : [];
+	const directories = options.recursive ? visibleEntries.filter(entry => entry.isDirectory()) : [];
 
 	const files = visibleEntries
-		.filter((entry) => entry.isFile())
-		.filter((entry) => {
+		.filter(entry => entry.isFile())
+		.filter(entry => {
 			if (!options.extensions) return true;
-			return options.extensions.some((ext) => entry.name.endsWith(`.${ext}`));
+			return options.extensions.some(ext => entry.name.endsWith(`.${ext}`));
 		});
 
 	const [subResults, fileResults] = await Promise.all([
-		Promise.all(directories.map((entry) => loadFilesFromDir(_ctx, join(dir, entry.name), provider, level, options))),
 		Promise.all(
-			files.map(async (entry) => {
-				const path = join(dir, entry.name);
-				const content = await readFile(path);
-				return { entry, path, content };
+			directories.map(entry => loadFilesFromDir(_ctx, path.join(dir, entry.name), provider, level, options)),
+		),
+		Promise.all(
+			files.map(async entry => {
+				const filePath = path.join(dir, entry.name);
+				const content = await readFile(filePath);
+				return { entry, path: filePath, content };
 			}),
 		),
 	]);
@@ -427,7 +428,7 @@ export async function discoverExtensionModulePaths(ctx: LoadContext, dir: string
 	for (const entry of entries) {
 		if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
 
-		const entryPath = join(dir, entry.name);
+		const entryPath = path.join(dir, entry.name);
 
 		// 1. Direct files: *.ts or *.js
 		if (entry.isFile() && isExtensionModuleFile(entry.name)) {
@@ -438,15 +439,15 @@ export async function discoverExtensionModulePaths(ctx: LoadContext, dir: string
 		// 2 & 3. Subdirectories
 		if (entry.isDirectory()) {
 			const subEntries = await readDirEntries(entryPath);
-			const subFileNames = new Set(subEntries.filter((e) => e.isFile()).map((e) => e.name));
+			const subFileNames = new Set(subEntries.filter(e => e.isFile()).map(e => e.name));
 
 			// Check for package.json with "omp"/"pi" field first
 			if (subFileNames.has("package.json")) {
-				const packageJsonPath = join(entryPath, "package.json");
+				const packageJsonPath = path.join(entryPath, "package.json");
 				const manifest = await readExtensionModuleManifest(ctx, packageJsonPath);
 				if (manifest?.extensions && Array.isArray(manifest.extensions)) {
 					for (const extPath of manifest.extensions) {
-						const resolvedExtPath = resolve(entryPath, extPath);
+						const resolvedExtPath = path.resolve(entryPath, extPath);
 						const content = await readFile(resolvedExtPath);
 						if (content !== null) {
 							discovered.push(resolvedExtPath);
@@ -458,9 +459,9 @@ export async function discoverExtensionModulePaths(ctx: LoadContext, dir: string
 
 			// Check for index.ts or index.js
 			if (subFileNames.has("index.ts")) {
-				discovered.push(join(entryPath, "index.ts"));
+				discovered.push(path.join(entryPath, "index.ts"));
 			} else if (subFileNames.has("index.js")) {
-				discovered.push(join(entryPath, "index.js"));
+				discovered.push(path.join(entryPath, "index.js"));
 			}
 		}
 	}

package/src/discovery/index.ts

@@ -4,7 +4,6 @@
  * Auto-registers all providers by importing them.
  * Import this module to ensure all providers are registered with the capability registry.
  */
-
 // Import capability definitions (ensures capabilities are defined before providers register)
 import "../capability/context-file";
 import "../capability/extension";
@@ -17,28 +16,23 @@ import "../capability/rule";
 import "../capability/settings";
 import "../capability/skill";
 import "../capability/slash-command";
-import "../capability/system-prompt";
 import "../capability/ssh";
+import "../capability/system-prompt";
 import "../capability/tool";
-
 // Import providers (each registers itself on import)
+import "./agents-md";
 import "./builtin";
 import "./claude";
+import "./cline";
 import "./codex";
-import "./gemini";
 import "./cursor";
-import "./windsurf";
-import "./cline";
+import "./gemini";
 import "./github";
-import "./vscode";
-import "./agents-md";
 import "./mcp-json";
 import "./ssh";
+import "./vscode";
+import "./windsurf";
 
-export type { ContextFile } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-export type { Extension, ExtensionManifest } from "@oh-my-pi/pi-coding-agent/capability/extension";
-export type { ExtensionModule } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
-export type { Hook } from "@oh-my-pi/pi-coding-agent/capability/hook";
 // Re-export the main API from capability registry
 export {
 	cacheStats,
@@ -62,18 +56,22 @@ export {
 	// Cache management
 	reset,
 	setDisabledProviders,
-} from "@oh-my-pi/pi-coding-agent/capability/index";
-export type { Instruction } from "@oh-my-pi/pi-coding-agent/capability/instruction";
+} from "../capability";
+export type { ContextFile } from "../capability/context-file";
+export type { Extension, ExtensionManifest } from "../capability/extension";
+export type { ExtensionModule } from "../capability/extension-module";
+export type { Hook } from "../capability/hook";
+export type { Instruction } from "../capability/instruction";
 // Re-export capability item types
-export type { MCPServer } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-export type { Prompt } from "@oh-my-pi/pi-coding-agent/capability/prompt";
-export type { Rule, RuleFrontmatter } from "@oh-my-pi/pi-coding-agent/capability/rule";
-export type { Settings } from "@oh-my-pi/pi-coding-agent/capability/settings";
-export type { Skill, SkillFrontmatter } from "@oh-my-pi/pi-coding-agent/capability/skill";
-export type { SlashCommand } from "@oh-my-pi/pi-coding-agent/capability/slash-command";
-export type { SSHHost } from "@oh-my-pi/pi-coding-agent/capability/ssh";
-export type { SystemPrompt } from "@oh-my-pi/pi-coding-agent/capability/system-prompt";
-export type { CustomTool } from "@oh-my-pi/pi-coding-agent/capability/tool";
+export type { MCPServer } from "../capability/mcp";
+export type { Prompt } from "../capability/prompt";
+export type { Rule, RuleFrontmatter } from "../capability/rule";
+export type { Settings } from "../capability/settings";
+export type { Skill, SkillFrontmatter } from "../capability/skill";
+export type { SlashCommand } from "../capability/slash-command";
+export type { SSHHost } from "../capability/ssh";
+export type { SystemPrompt } from "../capability/system-prompt";
+export type { CustomTool } from "../capability/tool";
 // Re-export types
 export type {
 	Capability,
@@ -85,4 +83,4 @@ export type {
 	Provider,
 	ProviderInfo,
 	SourceMeta,
-} from "@oh-my-pi/pi-coding-agent/capability/types";
+} from "../capability/types";