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

package/src/sdk.ts

@@ -25,31 +25,26 @@
  * });
  * ```
  */
-
-import { existsSync } from "node:fs";
-import { rename } from "node:fs/promises";
-import { join } from "node:path";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { Agent, type AgentEvent, type AgentMessage, type AgentTool, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { type Message, type Model, supportsXhigh } from "@oh-my-pi/pi-ai";
-// Import discovery to register all providers on startup
-import { loadCapability } from "@oh-my-pi/pi-coding-agent/capability";
-import { type Rule, ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import { getAgentDir, getConfigDirPaths } from "@oh-my-pi/pi-coding-agent/config";
-import { CursorExecHandlers } from "@oh-my-pi/pi-coding-agent/cursor";
-import { initializeWithSettings } from "@oh-my-pi/pi-coding-agent/discovery";
-import { TtsrManager } from "@oh-my-pi/pi-coding-agent/export/ttsr";
-import { disposeAllKernelSessions } from "@oh-my-pi/pi-coding-agent/ipy/executor";
-import { closeAllConnections } from "@oh-my-pi/pi-coding-agent/ssh/connection-manager";
-import { unmountAll } from "@oh-my-pi/pi-coding-agent/ssh/sshfs-mount";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { logger, postmortem } from "@oh-my-pi/pi-utils";
 import { YAML } from "bun";
 import chalk from "chalk";
+// Import discovery to register all providers on startup
+import { loadCapability } from "./capability";
+import { type Rule, ruleCapability } from "./capability/rule";
+import { getAgentDir, getConfigDirPaths } from "./config";
 import { ModelRegistry } from "./config/model-registry";
 import { formatModelString, parseModelString } from "./config/model-resolver";
 import { loadPromptTemplates as loadPromptTemplatesInternal, type PromptTemplate } from "./config/prompt-templates";
 import { type Settings, SettingsManager, type SkillsSettings } from "./config/settings-manager";
+import { CursorExecHandlers } from "./cursor";
 import "./discovery";
+import { initializeWithSettings } from "./discovery";
+import { TtsrManager } from "./export/ttsr";
 import {
 	type CustomCommandsLoadResult,
 	loadCustomCommands as loadCustomCommandsInternal,
@@ -77,12 +72,15 @@ import {
 	RuleProtocolHandler,
 	SkillProtocolHandler,
 } from "./internal-urls";
+import { disposeAllKernelSessions } from "./ipy/executor";
 import { discoverAndLoadMCPTools, type MCPManager, type MCPToolsLoadResult } from "./mcp";
 import { AgentSession } from "./session/agent-session";
 import { AuthStorage } from "./session/auth-storage";
 import { convertToLlm } from "./session/messages";
 import { SessionManager } from "./session/session-manager";
 import { migrateJsonStorage } from "./session/storage-migration";
+import { closeAllConnections } from "./ssh/connection-manager";
+import { unmountAll } from "./ssh/sshfs-mount";
 import {
 	buildSystemPrompt as buildSystemPromptInternal,
 	loadProjectContextFiles as loadContextFilesInternal,
@@ -205,22 +203,19 @@ export interface CreateAgentSessionResult {
 
 // Re-exports
 
-export type { PromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-export type { Settings, SkillsSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-export type {
-	CustomCommand,
-	CustomCommandFactory,
-} from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands/types";
-export type { CustomTool, CustomToolFactory } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
+export type { PromptTemplate } from "./config/prompt-templates";
+export type { Settings, SkillsSettings } from "./config/settings-manager";
+export type { CustomCommand, CustomCommandFactory } from "./extensibility/custom-commands/types";
+export type { CustomTool, CustomToolFactory } from "./extensibility/custom-tools/types";
 export type {
 	ExtensionAPI,
 	ExtensionCommandContext,
 	ExtensionContext,
 	ExtensionFactory,
 	ToolDefinition,
-} from "@oh-my-pi/pi-coding-agent/extensibility/extensions";
-export type { Skill } from "@oh-my-pi/pi-coding-agent/extensibility/skills";
-export type { FileSlashCommand } from "@oh-my-pi/pi-coding-agent/extensibility/slash-commands";
+} from "./extensibility/extensions";
+export type { Skill } from "./extensibility/skills";
+export type { FileSlashCommand } from "./extensibility/slash-commands";
 export type { MCPManager, MCPServerConfig, MCPServerConnection, MCPToolsLoadResult } from "./mcp";
 export type { Tool } from "./tools";
 
@@ -254,17 +249,17 @@ function getDefaultAgentDir(): string {
  * Reads from primary path first, then falls back to legacy paths (.pi, .claude).
  */
 export async function discoverAuthStorage(agentDir: string = getDefaultAgentDir()): Promise<AuthStorage> {
-	const primaryPath = join(agentDir, "auth.json");
+	const primaryPath = path.join(agentDir, "auth.json");
 	// Get all auth.json paths (user-level only), excluding the primary
 	const allPaths = getConfigDirPaths("auth.json", { project: false });
-	const fallbackPaths = allPaths.filter((p) => p !== primaryPath);
+	const fallbackPaths = allPaths.filter(p => p !== primaryPath);
 
 	logger.debug("discoverAuthStorage", { agentDir, primaryPath, allPaths, fallbackPaths });
 
 	// Migrate legacy JSON files (settings.json, auth.json) to SQLite before loading
 	await migrateJsonStorage({
 		agentDir,
-		settingsPath: join(agentDir, "settings.json"),
+		settingsPath: path.join(agentDir, "settings.json"),
 		authPaths: [primaryPath, ...fallbackPaths],
 	});
 
@@ -278,48 +273,52 @@ export async function discoverAuthStorage(agentDir: string = getDefaultAgentDir(
  * Prefers models.yml over models.json. Reads from primary path first,
  * then falls back to legacy paths (.pi, .claude).
  */
-export async function discoverModels(
-	authStorage: AuthStorage,
-	agentDir: string = getDefaultAgentDir(),
-): Promise<ModelRegistry> {
-	const yamlPath = join(agentDir, "models.yml");
-	const jsonPath = join(agentDir, "models.json");
+export function discoverModels(authStorage: AuthStorage, agentDir: string = getDefaultAgentDir()): ModelRegistry {
+	const yamlPath = path.join(agentDir, "models.yml");
+	const jsonPath = path.join(agentDir, "models.json");
+
+	// Check existence of yaml and json files
+	let yamlExists = fs.existsSync(yamlPath);
+	let jsonExists = fs.existsSync(jsonPath);
 
 	// Migrate models.json to models.yml if yaml doesn't exist but json does
-	if (!existsSync(yamlPath) && existsSync(jsonPath)) {
-		await migrateModelsJsonToYaml(jsonPath, yamlPath);
+	if (!yamlExists && jsonExists) {
+		migrateModelsJsonToYaml(jsonPath, yamlPath);
+		yamlExists = fs.existsSync(yamlPath);
+		jsonExists = fs.existsSync(jsonPath);
 	}
 
 	// Prefer models.yml, fall back to models.json
-	const primaryPath = existsSync(yamlPath) ? yamlPath : jsonPath;
+	const primaryPath = yamlExists ? yamlPath : jsonPath;
 
 	// Get all models config paths (user-level only), excluding the primary
 	const yamlPaths = getConfigDirPaths("models.yml", { project: false });
 	const jsonPaths = getConfigDirPaths("models.json", { project: false });
 	const allPaths = [...yamlPaths, ...jsonPaths];
-	const fallbackPaths = allPaths.filter((p) => p !== primaryPath && existsSync(p));
+	const existenceResults = allPaths.map(p => {
+		return { p, exists: fs.existsSync(p) };
+	});
+	const fallbackPaths = existenceResults.filter(({ p, exists }) => p !== primaryPath && exists).map(({ p }) => p);
 
 	logger.debug("discoverModels", { primaryPath, fallbackPaths });
-
-	const registry = new ModelRegistry(authStorage, primaryPath, fallbackPaths);
-	registry.refresh();
-	return registry;
+	return new ModelRegistry(authStorage, primaryPath, fallbackPaths);
 }
 
 /**
  * Migrate models.json to models.yml.
  * Creates models.yml from models.json and renames the json file to .bak.
  */
-async function migrateModelsJsonToYaml(jsonPath: string, yamlPath: string): Promise<void> {
+function migrateModelsJsonToYaml(jsonPath: string, yamlPath: string): void {
 	try {
-		const content = await Bun.file(jsonPath).text();
+		const content = fs.readFileSync(jsonPath, "utf-8");
 		const parsed = JSON.parse(content);
 		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
 			logger.warn("migrateModelsJsonToYaml: invalid models.json structure", { path: jsonPath });
 			return;
 		}
-		await Bun.write(yamlPath, YAML.stringify(parsed, null, 2));
-		await rename(jsonPath, `${jsonPath}.bak`);
+		fs.mkdirSync(path.dirname(yamlPath), { recursive: true });
+		fs.writeFileSync(yamlPath, YAML.stringify(parsed, null, 2));
+		fs.renameSync(jsonPath, `${jsonPath}.bak`);
 		logger.debug("migrateModelsJsonToYaml: migrated models.json to models.yml", { from: jsonPath, to: yamlPath });
 	} catch (error) {
 		logger.warn("migrateModelsJsonToYaml: migration failed", { error: String(error) });
@@ -524,7 +523,7 @@ function customToolToDefinition(tool: CustomTool): ToolDefinition {
 }
 
 function createCustomToolsExtension(tools: CustomTool[]): ExtensionFactory {
-	return (api) => {
+	return api => {
 		for (const tool of tools) {
 			api.registerTool(customToolToDefinition(tool));
 		}
@@ -601,7 +600,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 	// Use provided or create AuthStorage and ModelRegistry
 	const authStorage = options.authStorage ?? (await discoverAuthStorage(agentDir));
-	const modelRegistry = options.modelRegistry ?? (await discoverModels(authStorage, agentDir));
+	const modelRegistry = options.modelRegistry ?? discoverModels(authStorage, agentDir);
 	time("discoverModels");
 
 	const settingsManager = options.settingsManager ?? (await SettingsManager.create(cwd, agentDir));
@@ -659,9 +658,9 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (!model) {
 		const allModels = modelRegistry.getAll();
 		const keyResults = await Promise.all(
-			allModels.map(async (m) => ({ model: m, hasKey: !!(await modelRegistry.getApiKey(m, sessionId)) })),
+			allModels.map(async m => ({ model: m, hasKey: !!(await modelRegistry.getApiKey(m, sessionId)) })),
 		);
-		model = keyResults.find((r) => r.hasKey)?.model;
+		model = keyResults.find(r => r.hasKey)?.model;
 		time("findAvailableModel");
 		if (model) {
 			if (modelFallbackMessage) {
@@ -784,7 +783,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const customTools: CustomTool[] = [];
 	if (enableMCP) {
 		const mcpResult = await discoverAndLoadMCPTools(cwd, {
-			onConnecting: (serverNames) => {
+			onConnecting: serverNames => {
 				if (options.hasUI && serverNames.length > 0) {
 					process.stderr.write(
 						chalk.gray(`Connecting to MCP servers: ${serverNames.join(", ")}...
@@ -813,7 +812,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 
 		if (mcpResult.tools.length > 0) {
 			// MCP tools are LoadedCustomTool, extract the tool property
-			customTools.push(...mcpResult.tools.map((loaded) => loaded.tool));
+			customTools.push(...mcpResult.tools.map(loaded => loaded.tool));
 		}
 	}
 
@@ -832,7 +831,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			enableCompany: exaSettings.enableCompany,
 		});
 		// Filter out the base web_search (already in built-in tools), add specialized Exa tools
-		const specializedTools = exaWebSearchTools.filter((t) => t.name !== "web_search");
+		const specializedTools = exaWebSearchTools.filter(t => t.name !== "web_search");
 		if (specializedTools.length > 0) {
 			customTools.push(...specializedTools);
 		}
@@ -922,7 +921,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	const registeredTools = extensionRunner?.getAllRegisteredTools() ?? [];
 	const allCustomTools = [
 		...registeredTools,
-		...(options.customTools?.map((tool) => {
+		...(options.customTools?.map(tool => {
 			const definition = isCustomTool(tool) ? customToolToDefinition(tool) : tool;
 			return { definition, extensionPath: "<sdk>" };
 		}) ?? []),
@@ -952,7 +951,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		cwd,
 		tools: toolRegistry,
 		getToolContext: () => toolContextStore.getContext(),
-		emitEvent: (event) => cursorEventEmitter?.(event),
+		emitEvent: event => cursorEventEmitter?.(event),
 	});
 
 	const rebuildSystemPrompt = async (toolNames: string[], tools: Map<string, AgentTool>): Promise<string> => {
@@ -1002,16 +1001,14 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 			return converted;
 		}
 		// Filter out ImageContent from all messages, replacing with text placeholder
-		return converted.map((msg) => {
+		return converted.map(msg => {
 			if (msg.role === "user" || msg.role === "toolResult") {
 				const content = msg.content;
 				if (Array.isArray(content)) {
-					const hasImages = content.some((c) => c.type === "image");
+					const hasImages = content.some(c => c.type === "image");
 					if (hasImages) {
 						const filteredContent = content
-							.map((c) =>
-								c.type === "image" ? { type: "text" as const, text: "Image reading is disabled." } : c,
-							)
+							.map(c => (c.type === "image" ? { type: "text" as const, text: "Image reading is disabled." } : c))
 							.filter(
 								(c, i, arr) =>
 									// Dedupe consecutive "Image reading is disabled." texts
@@ -1045,7 +1042,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		convertToLlm: convertToLlmWithBlockImages,
 		sessionId: sessionManager.getSessionId(),
 		transformContext: extensionRunner
-			? async (messages) => {
+			? async messages => {
 					return extensionRunner.emitContext(messages);
 				}
 			: undefined,
@@ -1053,7 +1050,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		followUpMode: settingsManager.getFollowUpMode(),
 		interruptMode: settingsManager.getInterruptMode(),
 		thinkingBudgets: settingsManager.getThinkingBudgets(),
-		getToolContext: (tc) => toolContextStore.getContext(tc),
+		getToolContext: tc => toolContextStore.getContext(tc),
 		getApiKey: async () => {
 			const currentModel = agent.state.model;
 			if (!currentModel) {
@@ -1067,7 +1064,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		},
 		cursorExecHandlers,
 	});
-	cursorEventEmitter = (event) => agent.emitExternalEvent(event);
+	cursorEventEmitter = event => agent.emitExternalEvent(event);
 	time("createAgent");
 
 	// Restore messages if session has existing data
@@ -1105,7 +1102,7 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 	if (enableLsp && settingsManager.getLspDiagnosticsOnWrite()) {
 		try {
 			const result = await warmupLspServers(cwd, {
-				onConnecting: (serverNames) => {
+				onConnecting: serverNames => {
 					if (options.hasUI && serverNames.length > 0) {
 						process.stderr.write(chalk.gray(`Starting LSP servers: ${serverNames.join(", ")}...\n`));
 					}