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

package/src/config.ts

@@ -1,7 +1,7 @@
-import { existsSync, readFileSync, statSync } from "node:fs";
-import { homedir } from "node:os";
-import { dirname, join, resolve } from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 // Embed package.json at build time for config
 import packageJson from "../package.json" with { type: "json" };
 
@@ -35,11 +35,11 @@ export const ENV_AGENT_DIR = `${APP_NAME.toUpperCase()}_CODING_AGENT_DIR`;
  */
 export function getPackageDir(): string {
 	let dir = import.meta.dir;
-	while (dir !== dirname(dir)) {
-		if (existsSync(join(dir, "package.json"))) {
+	while (dir !== path.dirname(dir)) {
+		if (fs.existsSync(path.join(dir, "package.json"))) {
 			return dir;
 		}
-		dir = dirname(dir);
+		dir = path.dirname(dir);
 	}
 	// Fallback to cwd (docs/examples won't be found, but that's fine)
 	return process.cwd();
@@ -47,7 +47,7 @@ export function getPackageDir(): string {
 
 /** Get path to CHANGELOG.md (optional, may not exist in binary) */
 export function getChangelogPath(): string {
-	return resolve(join(getPackageDir(), "CHANGELOG.md"));
+	return path.resolve(path.join(getPackageDir(), "CHANGELOG.md"));
 }
 
 // =============================================================================
@@ -56,27 +56,27 @@ export function getChangelogPath(): string {
 
 /** Get the agent config directory (e.g., ~/.omp/agent/) */
 export function getAgentDir(): string {
-	return process.env[ENV_AGENT_DIR] || join(homedir(), CONFIG_DIR_NAME, "agent");
+	return process.env[ENV_AGENT_DIR] || path.join(os.homedir(), CONFIG_DIR_NAME, "agent");
 }
 
 /** Get path to user's custom themes directory */
 export function getCustomThemesDir(): string {
-	return join(getAgentDir(), "themes");
+	return path.join(getAgentDir(), "themes");
 }
 
 /** Get path to models.json */
 export function getModelsPath(): string {
-	return join(getAgentDir(), "models.json");
+	return path.join(getAgentDir(), "models.json");
 }
 
-/** Get path to auth.json */
-export function getAuthPath(): string {
-	return join(getAgentDir(), "auth.json");
+/** Get path to models.yml (preferred over models.json) */
+export function getModelsYamlPath(): string {
+	return path.join(getAgentDir(), "models.yml");
 }
 
-/** Get path to settings.json */
-export function getSettingsPath(): string {
-	return join(getAgentDir(), "settings.json");
+/** Get path to auth.json */
+export function getAuthPath(): string {
+	return path.join(getAgentDir(), "auth.json");
 }
 
 /**
@@ -85,37 +85,37 @@ export function getSettingsPath(): string {
  * @returns Absolute path to the agent.db file
  */
 export function getAgentDbPath(agentDir: string = getAgentDir()): string {
-	return join(agentDir, "agent.db");
+	return path.join(agentDir, "agent.db");
 }
 
 /** Get path to tools directory */
 export function getToolsDir(): string {
-	return join(getAgentDir(), "tools");
+	return path.join(getAgentDir(), "tools");
 }
 
 /** Get path to managed binaries directory (fd, rg) */
 export function getBinDir(): string {
-	return join(getAgentDir(), "bin");
+	return path.join(getAgentDir(), "bin");
 }
 
 /** Get path to slash commands directory */
 export function getCommandsDir(): string {
-	return join(getAgentDir(), "commands");
+	return path.join(getAgentDir(), "commands");
 }
 
 /** Get path to prompts directory */
 export function getPromptsDir(): string {
-	return join(getAgentDir(), "prompts");
+	return path.join(getAgentDir(), "prompts");
 }
 
 /** Get path to sessions directory */
 export function getSessionsDir(): string {
-	return join(getAgentDir(), "sessions");
+	return path.join(getAgentDir(), "sessions");
 }
 
 /** Get path to debug log file */
 export function getDebugLogPath(): string {
-	return join(getAgentDir(), `${APP_NAME}-debug.log`);
+	return path.join(getAgentDir(), `${APP_NAME}-debug.log`);
 }
 
 // =============================================================================
@@ -128,7 +128,7 @@ export function getDebugLogPath(): string {
  * Project-level: .omp, .pi, .claude, .codex, .gemini
  */
 const USER_CONFIG_BASES = priorityList.map(({ dir, globalAgentDir }) => ({
-	base: () => join(homedir(), globalAgentDir ?? dir),
+	base: () => path.join(os.homedir(), globalAgentDir ?? dir),
 	name: dir,
 }));
 
@@ -177,9 +177,9 @@ export function getConfigDirs(subpath: string, options: GetConfigDirsOptions = {
 	// User-level directories (highest priority)
 	if (user) {
 		for (const { base, name } of USER_CONFIG_BASES) {
-			const path = join(base(), subpath);
-			if (!existingOnly || existsSync(path)) {
-				results.push({ path, source: name, level: "user" });
+			const resolvedPath = path.resolve(base(), subpath);
+			if (!existingOnly || fs.existsSync(resolvedPath)) {
+				results.push({ path: resolvedPath, source: name, level: "user" });
 			}
 		}
 	}
@@ -187,9 +187,9 @@ export function getConfigDirs(subpath: string, options: GetConfigDirsOptions = {
 	// Project-level directories
 	if (project) {
 		for (const { base, name } of PROJECT_CONFIG_BASES) {
-			const path = resolve(cwd, base, subpath);
-			if (!existingOnly || existsSync(path)) {
-				results.push({ path, source: name, level: "project" });
+			const resolvedPath = path.resolve(cwd, base, subpath);
+			if (!existingOnly || fs.existsSync(resolvedPath)) {
+				results.push({ path: resolvedPath, source: name, level: "project" });
 			}
 		}
 	}
@@ -202,7 +202,7 @@ export function getConfigDirs(subpath: string, options: GetConfigDirsOptions = {
  * Returns just the paths, highest priority first.
  */
 export function getConfigDirPaths(subpath: string, options: GetConfigDirsOptions = {}): string[] {
-	return getConfigDirs(subpath, options).map((e) => e.path);
+	return getConfigDirs(subpath, options).map(e => e.path);
 }
 
 export interface ConfigFileResult<T> {
@@ -226,25 +226,24 @@ export interface ConfigFileResult<T> {
  *   console.log(result.content);
  * }
  */
-export function readConfigFile<T = unknown>(
+export async function readConfigFile<T = unknown>(
 	subpath: string,
 	options: GetConfigDirsOptions = {},
-): ConfigFileResult<T> | undefined {
+): Promise<ConfigFileResult<T> | undefined> {
 	const dirs = getConfigDirs("", { ...options, existingOnly: false });
 
 	for (const { path: base, source, level } of dirs) {
-		const filePath = join(base, subpath);
+		const filePath = path.join(base, subpath);
 		try {
-			if (existsSync(filePath)) {
-				const content = readFileSync(filePath, "utf-8");
-				return {
-					path: filePath,
-					source,
-					level,
-					content: JSON.parse(content) as T,
-				};
-			}
+			const content = await Bun.file(filePath).text();
+			return {
+				path: filePath,
+				source,
+				level,
+				content: JSON.parse(content) as T,
+			};
 		} catch (error) {
+			if (isEnoent(error)) continue;
 			logger.warn("Failed to parse config file", { path: filePath, error: String(error) });
 		}
 	}
@@ -256,26 +255,25 @@ export function readConfigFile<T = unknown>(
  * Get all existing config files for a subpath (for merging scenarios).
  * Returns in priority order (highest first).
  */
-export function readAllConfigFiles<T = unknown>(
+export async function readAllConfigFiles<T = unknown>(
 	subpath: string,
 	options: GetConfigDirsOptions = {},
-): ConfigFileResult<T>[] {
+): Promise<ConfigFileResult<T>[]> {
 	const dirs = getConfigDirs("", { ...options, existingOnly: false });
 	const results: ConfigFileResult<T>[] = [];
 
 	for (const { path: base, source, level } of dirs) {
-		const filePath = join(base, subpath);
+		const filePath = path.join(base, subpath);
 		try {
-			if (existsSync(filePath)) {
-				const content = readFileSync(filePath, "utf-8");
-				results.push({
-					path: filePath,
-					source,
-					level,
-					content: JSON.parse(content) as T,
-				});
-			}
+			const content = await Bun.file(filePath).text();
+			results.push({
+				path: filePath,
+				source,
+				level,
+				content: JSON.parse(content) as T,
+			});
 		} catch (error) {
+			if (isEnoent(error)) continue;
 			logger.warn("Failed to parse config file", { path: filePath, error: String(error) });
 		}
 	}
@@ -291,8 +289,8 @@ export function findConfigFile(subpath: string, options: GetConfigDirsOptions =
 	const dirs = getConfigDirs("", { ...options, existingOnly: false });
 
 	for (const { path: base } of dirs) {
-		const filePath = join(base, subpath);
-		if (existsSync(filePath)) {
+		const filePath = path.join(base, subpath);
+		if (fs.existsSync(filePath)) {
 			return filePath;
 		}
 	}
@@ -310,8 +308,8 @@ export function findConfigFileWithMeta(
 	const dirs = getConfigDirs("", { ...options, existingOnly: false });
 
 	for (const { path: base, source, level } of dirs) {
-		const filePath = join(base, subpath);
-		if (existsSync(filePath)) {
+		const filePath = path.join(base, subpath);
+		if (fs.existsSync(filePath)) {
 			return { path: filePath, source, level };
 		}
 	}
@@ -325,7 +323,7 @@ export function findConfigFileWithMeta(
 
 async function isDirectory(p: string): Promise<boolean> {
 	try {
-		return existsSync(p) && statSync(p).isDirectory();
+		return (await fs.promises.stat(p)).isDirectory();
 	} catch {
 		return false;
 	}
@@ -348,14 +346,14 @@ export async function findNearestProjectConfigDir(
 	while (true) {
 		// Check all config bases at this level, in priority order
 		for (const { base, name } of PROJECT_CONFIG_BASES) {
-			const candidate = join(currentDir, base, subpath);
+			const candidate = path.join(currentDir, base, subpath);
 			if (await isDirectory(candidate)) {
 				return { path: candidate, source: name, level: "project" };
 			}
 		}
 
 		// Move up one directory
-		const parentDir = dirname(currentDir);
+		const parentDir = path.dirname(currentDir);
 		if (parentDir === currentDir) break; // Reached root
 		currentDir = parentDir;
 	}
@@ -381,20 +379,20 @@ export async function findAllNearestProjectConfigDirs(
 		for (const { base, name } of PROJECT_CONFIG_BASES) {
 			if (foundBases.has(name)) continue;
 
-			const candidate = join(currentDir, base, subpath);
+			const candidate = path.join(currentDir, base, subpath);
 			if (await isDirectory(candidate)) {
 				results.push({ path: candidate, source: name, level: "project" });
 				foundBases.add(name);
 			}
 		}
 
-		const parentDir = dirname(currentDir);
+		const parentDir = path.dirname(currentDir);
 		if (parentDir === currentDir) break;
 		currentDir = parentDir;
 	}
 
 	// Sort by priority order
-	const order = PROJECT_CONFIG_BASES.map((b) => b.name);
+	const order = PROJECT_CONFIG_BASES.map(b => b.name);
 	results.sort((a, b) => order.indexOf(a.source) - order.indexOf(b.source));
 
 	return results;

package/src/cursor.ts

@@ -1,5 +1,5 @@
 import { randomUUID } from "node:crypto";
-import { rmSync, statSync } from "node:fs";
+import * as fs from "node:fs/promises";
 import type {
 	AgentEvent,
 	AgentTool,
@@ -8,7 +8,7 @@ import type {
 	AgentToolUpdateCallback,
 } from "@oh-my-pi/pi-agent-core";
 import type { CursorMcpCall, CursorExecHandlers as ICursorExecHandlers, ToolResultMessage } from "@oh-my-pi/pi-ai";
-import { resolveToCwd } from "@oh-my-pi/pi-coding-agent/tools/path-utils";
+import { resolveToCwd } from "./tools/path-utils";
 
 interface CursorExecBridgeOptions {
 	cwd: string;
@@ -59,7 +59,7 @@ async function executeTool(
 	let isError = false;
 
 	const onUpdate: AgentToolUpdateCallback<unknown> | undefined = options.emitEvent
-		? (partialResult) => {
+		? partialResult => {
 				options.emitEvent?.({
 					type: "tool_execution_update",
 					toolCallId,
@@ -98,17 +98,19 @@ async function executeDelete(options: CursorExecBridgeOptions, pathArg: string,
 	let result: AgentToolResult<unknown>;
 
 	try {
-		const stat = statSync(absolutePath, { throwIfNoEntry: false });
-		if (!stat) {
+		let fileStat: Awaited<ReturnType<typeof fs.stat>> | undefined;
+		try {
+			fileStat = await fs.stat(absolutePath);
+		} catch {
 			throw new Error(`File not found: ${pathArg}`);
 		}
-		if (!stat.isFile()) {
+		if (!fileStat.isFile()) {
 			throw new Error(`Path is not a file: ${pathArg}`);
 		}
 
-		rmSync(absolutePath);
+		await fs.rm(absolutePath);
 
-		const sizeText = stat.size ? ` (${stat.size} bytes)` : "";
+		const sizeText = fileStat.size ? ` (${fileStat.size} bytes)` : "";
 		const message = `Deleted ${pathArg}${sizeText}`;
 		result = { content: [{ type: "text", text: message }], details: {} };
 	} catch (error) {
@@ -220,7 +222,7 @@ export class CursorExecHandlers implements ICursorExecHandlers {
 		const toolCallId = decodeToolCallId(call.toolCallId);
 		const tool = this.options.tools.get(toolName);
 		if (!tool) {
-			const availableTools = Array.from(this.options.tools.keys()).filter((name) => name.startsWith("mcp_"));
+			const availableTools = Array.from(this.options.tools.keys()).filter(name => name.startsWith("mcp_"));
 			const message = formatMcpToolErrorMessage(toolName, availableTools);
 			const toolResult: ToolResultMessage = {
 				role: "toolResult",

package/src/discovery/agents-md.ts

@@ -5,12 +5,11 @@
  * This handles AGENTS.md files that live in project root (not in config directories
  * like .codex/ or .gemini/, which are handled by their respective providers).
  */
-
-import { dirname, join, 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 { 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 { readFile } from "../capability/fs";
+import type { LoadContext, LoadResult } from "../capability/types";
 import { calculateDepth, createSourceMeta } from "./helpers";
 
 const PROVIDER_ID = "agents-md";
@@ -29,16 +28,16 @@ async function loadAgentsMd(ctx: LoadContext): Promise<LoadResult<ContextFile>>
 	let depth = 0;
 
 	while (depth < MAX_DEPTH) {
-		const candidate = join(current, "AGENTS.md");
+		const candidate = path.join(current, "AGENTS.md");
 		const content = await readFile(candidate);
 
 		if (content !== null) {
-			const parent = dirname(candidate);
-			const baseName = parent.split(sep).pop() ?? "";
+			const parent = path.dirname(candidate);
+			const baseName = parent.split(path.sep).pop() ?? "";
 
 			if (!baseName.startsWith(".")) {
-				const fileDir = dirname(candidate);
-				const calculatedDepth = calculateDepth(ctx.cwd, fileDir, sep);
+				const fileDir = path.dirname(candidate);
+				const calculatedDepth = calculateDepth(ctx.cwd, fileDir, path.sep);
 
 				items.push({
 					path: candidate,
@@ -51,7 +50,7 @@ async function loadAgentsMd(ctx: LoadContext): Promise<LoadResult<ContextFile>>
 		}
 
 		// Move to parent directory
-		const parent = dirname(current);
+		const parent = path.dirname(current);
 		if (parent === current) break; // Reached filesystem root
 		current = parent;
 		depth++;