@oh-my-pi/pi-coding-agent 4.1.0 → 4.2.1

package/src/core/tools/web-search/providers/anthropic.ts

@@ -22,6 +22,12 @@ const DEFAULT_MAX_TOKENS = 4096;
 const WEB_SEARCH_TOOL_NAME = "web_search";
 const WEB_SEARCH_TOOL_TYPE = "web_search_20250305";
 
+/**
+ * Applies OAuth-specific tool prefix to search tool name.
+ * @param name - The base tool name
+ * @param isOAuth - Whether OAuth authentication is being used
+ * @returns Tool name with prefix if OAuth, otherwise unchanged
+ */
 const applySearchToolPrefix = (name: string, isOAuth: boolean): string => {
 	return isOAuth ? applyClaudeToolPrefix(name) : name;
 };
@@ -33,11 +39,21 @@ export interface AnthropicSearchParams {
 	num_results?: number;
 }
 
-/** Get model from env or use default */
+/**
+ * Gets the model to use for web search from environment or default.
+ * @returns Model identifier string
+ */
 async function getModel(): Promise<string> {
 	return (await getEnv("ANTHROPIC_SEARCH_MODEL")) ?? DEFAULT_MODEL;
 }
 
+/**
+ * Builds system instruction blocks for the Anthropic API request.
+ * @param auth - Authentication configuration
+ * @param model - Model identifier (affects whether Claude Code instruction is included)
+ * @param systemPrompt - Optional custom system prompt
+ * @returns Array of system blocks for the API request
+ */
 function buildSystemBlocks(
 	auth: AnthropicAuthConfig,
 	model: string,
@@ -53,7 +69,16 @@ function buildSystemBlocks(
 	});
 }
 
-/** Call Anthropic API with web search */
+/**
+ * Calls the Anthropic API with web search tool enabled.
+ * @param auth - Authentication configuration (API key or OAuth)
+ * @param model - Model identifier to use
+ * @param query - Search query from the user
+ * @param systemPrompt - Optional custom system prompt
+ * @param maxTokens - Maximum tokens for the response
+ * @returns Raw API response from Anthropic
+ * @throws {WebSearchProviderError} If the API request fails
+ */
 async function callWebSearch(
 	auth: AnthropicAuthConfig,
 	model: string,
@@ -100,7 +125,11 @@ async function callWebSearch(
 	return response.json() as Promise<AnthropicApiResponse>;
 }
 
-/** Parse page_age string into seconds (e.g., "2 days ago", "3h ago", "1 week ago") */
+/**
+ * Parses a human-readable page age string into seconds.
+ * @param pageAge - Age string like "2 days ago", "3h ago", "1 week ago"
+ * @returns Age in seconds, or undefined if parsing fails
+ */
 function parsePageAge(pageAge: string | null | undefined): number | undefined {
 	if (!pageAge) return undefined;
 
@@ -132,7 +161,11 @@ function parsePageAge(pageAge: string | null | undefined): number | undefined {
 	return value * (multipliers[unit] ?? 86400);
 }
 
-/** Parse API response into unified WebSearchResponse */
+/**
+ * Parses the Anthropic API response into a unified WebSearchResponse.
+ * @param response - Raw API response containing content blocks
+ * @returns Normalized response with answer, sources, citations, and usage
+ */
 function parseResponse(response: AnthropicApiResponse): WebSearchResponse {
 	const answerParts: string[] = [];
 	const searchQueries: string[] = [];
@@ -193,12 +226,17 @@ function parseResponse(response: AnthropicApiResponse): WebSearchResponse {
 	};
 }
 
-/** Execute Anthropic web search */
+/**
+ * Executes a web search using Anthropic's Claude with built-in web search tool.
+ * @param params - Search parameters including query and optional settings
+ * @returns Search response with synthesized answer, sources, and citations
+ * @throws {Error} If no Anthropic credentials are configured
+ */
 export async function searchAnthropic(params: AnthropicSearchParams): Promise<WebSearchResponse> {
 	const auth = await findAnthropicAuth();
 	if (!auth) {
 		throw new Error(
-			"No Anthropic credentials found. Set ANTHROPIC_API_KEY or configure OAuth in ~/.omp/agent/auth.json",
+			"No Anthropic credentials found. Set ANTHROPIC_API_KEY or configure OAuth in ~/.omp/agent/agent.db",
 		);
 	}
 

package/src/core/tools/write.ts

@@ -5,6 +5,7 @@ import { Type } from "@sinclair/typebox";
 import { getLanguageFromPath, highlightCode, type Theme } from "../../modes/interactive/theme/theme";
 import writeDescription from "../../prompts/tools/write.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "../sdk";
 import { untilAborted } from "../utils";
 import { createLspWritethrough, type FileDiagnosticsResult } from "./lsp/index";
@@ -28,7 +29,7 @@ export function createWriteTool(session: ToolSession): AgentTool<typeof writeSch
 	return {
 		name: "write",
 		label: "Write",
-		description: writeDescription,
+		description: renderPromptTemplate(writeDescription),
 		parameters: writeSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/voice.ts

@@ -7,12 +7,14 @@ import voiceSummaryPrompt from "../prompts/voice-summary.md" with { type: "text"
 import { logger } from "./logger";
 import type { ModelRegistry } from "./model-registry";
 import { findSmolModel } from "./model-resolver";
+import { renderPromptTemplate } from "./prompt-templates";
 import type { VoiceSettings } from "./settings-manager";
 
 const DEFAULT_SAMPLE_RATE = 16000;
 const DEFAULT_CHANNELS = 1;
 const DEFAULT_BITS = 16;
 const SUMMARY_MAX_CHARS = 6000;
+const VOICE_SUMMARY_PROMPT = renderPromptTemplate(voiceSummaryPrompt);
 
 export interface VoiceRecordingHandle {
 	filePath: string;
@@ -286,7 +288,7 @@ export async function summarizeForVoice(
 	const truncated = text.length > SUMMARY_MAX_CHARS ? `${text.slice(0, SUMMARY_MAX_CHARS)}...` : text;
 	const request = {
 		model: `${model.provider}/${model.id}`,
-		systemPrompt: voiceSummaryPrompt,
+		systemPrompt: VOICE_SUMMARY_PROMPT,
 		userMessage: `<assistant_response>\n${truncated}\n</assistant_response>`,
 	};
 	logger.debug("voice: summary request", request);

package/src/discovery/builtin.ts

@@ -5,7 +5,7 @@
  * .pi is an alias for backwards compatibility.
  */
 
-import { basename, dirname, isAbsolute, join, resolve } from "path";
+import { dirname, isAbsolute, join, resolve } from "path";
 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";
@@ -16,7 +16,7 @@ import { type MCPServer, mcpCapability } from "../capability/mcp";
 import { type Prompt, promptCapability } from "../capability/prompt";
 import { type Rule, ruleCapability } from "../capability/rule";
 import { type Settings, settingsCapability } from "../capability/settings";
-import { type Skill, type SkillFrontmatter, skillCapability } from "../capability/skill";
+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 CustomTool, toolCapability } from "../capability/tool";
@@ -27,6 +27,7 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
+	loadSkillsFromDir,
 	parseFrontmatter,
 	parseJSON,
 	SOURCE_PATHS,
@@ -190,64 +191,18 @@ registerProvider<SystemPrompt>(systemPromptCapability.id, {
 });
 
 // Skills
-function loadSkillFromFile(ctx: LoadContext, path: string, level: "user" | "project"): Skill | null {
-	const content = ctx.fs.readFile(path);
-	if (!content) return null;
-
-	const { frontmatter, body } = parseFrontmatter(content);
-	const skillDir = dirname(path);
-	const parentDirName = basename(skillDir);
-	const name = (frontmatter.name as string) || parentDirName;
-
-	if (!frontmatter.description) return null;
-
-	return {
-		name,
-		path,
-		content: body,
-		frontmatter: frontmatter as SkillFrontmatter,
-		level,
-		_source: createSourceMeta(PROVIDER_ID, path, level),
-	};
-}
-
-function loadSkillsRecursive(ctx: LoadContext, dir: string, level: "user" | "project"): LoadResult<Skill> {
-	const items: Skill[] = [];
-	const warnings: string[] = [];
-
-	if (!ctx.fs.isDir(dir)) return { items, warnings };
-
-	for (const name of ctx.fs.readDir(dir)) {
-		if (name.startsWith(".") || name === "node_modules") continue;
-
-		const path = join(dir, name);
-
-		if (ctx.fs.isDir(path)) {
-			const skillFile = join(path, "SKILL.md");
-			if (ctx.fs.isFile(skillFile)) {
-				const skill = loadSkillFromFile(ctx, skillFile, level);
-				if (skill) items.push(skill);
-			}
-
-			const sub = loadSkillsRecursive(ctx, path, level);
-			items.push(...sub.items);
-			if (sub.warnings) warnings.push(...sub.warnings);
-		} else if (name === "SKILL.md") {
-			const skill = loadSkillFromFile(ctx, path, level);
-			if (skill) items.push(skill);
-		}
-	}
-
-	return { items, warnings };
-}
-
 function loadSkills(ctx: LoadContext): LoadResult<Skill> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 
 	for (const { dir, level } of getConfigDirs(ctx)) {
 		const skillsDir = join(dir, "skills");
-		const result = loadSkillsRecursive(ctx, skillsDir, level);
+		const result = loadSkillsFromDir(ctx, {
+			dir: skillsDir,
+			providerId: PROVIDER_ID,
+			level,
+			requireDescription: true,
+		});
 		items.push(...result.items);
 		if (result.warnings) warnings.push(...result.warnings);
 	}

package/src/discovery/claude.ts

@@ -24,7 +24,7 @@ import {
 	expandEnvVarsDeep,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
-	parseFrontmatter,
+	loadSkillsFromDir,
 	parseJSON,
 } from "./helpers";
 
@@ -218,78 +218,25 @@ function loadSkills(ctx: LoadContext): LoadResult<Skill> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 
-	// User-level: ~/.claude/skills/*/SKILL.md
-	const userBase = getUserClaude(ctx);
-	const userSkillsDir = join(userBase, "skills");
-
-	if (ctx.fs.isDir(userSkillsDir)) {
-		const skillDirs = ctx.fs.readDir(userSkillsDir);
-
-		for (const dirName of skillDirs) {
-			if (dirName.startsWith(".")) continue;
-
-			const skillDir = join(userSkillsDir, dirName);
-			if (!ctx.fs.isDir(skillDir)) continue;
-
-			const skillFile = join(skillDir, "SKILL.md");
-			if (!ctx.fs.isFile(skillFile)) continue;
-
-			const content = ctx.fs.readFile(skillFile);
-			if (!content) {
-				warnings.push(`Failed to read ${skillFile}`);
-				continue;
-			}
-
-			const { frontmatter, body } = parseFrontmatter(content);
-			const name = (frontmatter.name as string) || dirName;
-
-			items.push({
-				name,
-				path: skillFile,
-				content: body,
-				frontmatter,
-				level: "user",
-				_source: createSourceMeta(PROVIDER_ID, skillFile, "user"),
-			});
-		}
-	}
+	const userSkillsDir = join(getUserClaude(ctx), "skills");
+	const userResult = loadSkillsFromDir(ctx, {
+		dir: userSkillsDir,
+		providerId: PROVIDER_ID,
+		level: "user",
+	});
+	items.push(...userResult.items);
+	if (userResult.warnings) warnings.push(...userResult.warnings);
 
-	// Project-level: <project>/.claude/skills/*/SKILL.md
 	const projectBase = getProjectClaude(ctx);
 	if (projectBase) {
 		const projectSkillsDir = join(projectBase, "skills");
-
-		if (ctx.fs.isDir(projectSkillsDir)) {
-			const skillDirs = ctx.fs.readDir(projectSkillsDir);
-
-			for (const dirName of skillDirs) {
-				if (dirName.startsWith(".")) continue;
-
-				const skillDir = join(projectSkillsDir, dirName);
-				if (!ctx.fs.isDir(skillDir)) continue;
-
-				const skillFile = join(skillDir, "SKILL.md");
-				if (!ctx.fs.isFile(skillFile)) continue;
-
-				const content = ctx.fs.readFile(skillFile);
-				if (!content) {
-					warnings.push(`Failed to read ${skillFile}`);
-					continue;
-				}
-
-				const { frontmatter, body } = parseFrontmatter(content);
-				const name = (frontmatter.name as string) || dirName;
-
-				items.push({
-					name,
-					path: skillFile,
-					content: body,
-					frontmatter,
-					level: "project",
-					_source: createSourceMeta(PROVIDER_ID, skillFile, "project"),
-				});
-			}
-		}
+		const projectResult = loadSkillsFromDir(ctx, {
+			dir: projectSkillsDir,
+			providerId: PROVIDER_ID,
+			level: "project",
+		});
+		items.push(...projectResult.items);
+		if (projectResult.warnings) warnings.push(...projectResult.warnings);
 	}
 
 	return { items, warnings };

package/src/discovery/codex.ts

@@ -33,6 +33,7 @@ import {
 	discoverExtensionModulePaths,
 	getExtensionNameFromPath,
 	loadFilesFromDir,
+	loadSkillsFromDir,
 	parseFrontmatter,
 	SOURCE_PATHS,
 } from "./helpers";
@@ -209,51 +210,25 @@ function loadSkills(ctx: LoadContext): LoadResult<Skill> {
 	const items: Skill[] = [];
 	const warnings: string[] = [];
 
-	// User level: ~/.codex/skills/
 	const userSkillsDir = join(ctx.home, SOURCE_PATHS.codex.userBase, "skills");
-	const userResult = loadFilesFromDir(ctx, userSkillsDir, PROVIDER_ID, "user", {
-		extensions: ["md"],
-		recursive: true,
-		transform: (name, content, path, source) => {
-			const { frontmatter, body } = parseFrontmatter(content);
-			const skillName = frontmatter.name || name.replace(/\.md$/, "");
-
-			return {
-				name: String(skillName),
-				path,
-				content: body,
-				frontmatter,
-				level: "user" as const,
-				_source: source,
-			};
-		},
+	const userResult = loadSkillsFromDir(ctx, {
+		dir: userSkillsDir,
+		providerId: PROVIDER_ID,
+		level: "user",
 	});
 	items.push(...userResult.items);
-	warnings.push(...(userResult.warnings || []));
+	if (userResult.warnings) warnings.push(...userResult.warnings);
 
-	// Project level: .codex/skills/
 	const codexDir = ctx.fs.walkUp(".codex", { dir: true });
 	if (codexDir) {
 		const projectSkillsDir = join(codexDir, "skills");
-		const projectResult = loadFilesFromDir(ctx, projectSkillsDir, PROVIDER_ID, "project", {
-			extensions: ["md"],
-			recursive: true,
-			transform: (name, content, path, source) => {
-				const { frontmatter, body } = parseFrontmatter(content);
-				const skillName = frontmatter.name || name.replace(/\.md$/, "");
-
-				return {
-					name: String(skillName),
-					path,
-					content: body,
-					frontmatter,
-					level: "project" as const,
-					_source: source,
-				};
-			},
+		const projectResult = loadSkillsFromDir(ctx, {
+			dir: projectSkillsDir,
+			providerId: PROVIDER_ID,
+			level: "project",
 		});
 		items.push(...projectResult.items);
-		warnings.push(...(projectResult.warnings || []));
+		if (projectResult.warnings) warnings.push(...projectResult.warnings);
 	}
 
 	return { items, warnings };

package/src/discovery/helpers.ts

@@ -4,6 +4,7 @@
 
 import { join, resolve } from "path";
 import { parse as parseYAML } from "yaml";
+import type { Skill, SkillFrontmatter } from "../capability/skill";
 import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 
 /**
@@ -126,6 +127,56 @@ export function parseFrontmatter(content: string): {
 	}
 }
 
+export function loadSkillsFromDir(
+	ctx: LoadContext,
+	options: {
+		dir: string;
+		providerId: string;
+		level: "user" | "project";
+		requireDescription?: boolean;
+	},
+): LoadResult<Skill> {
+	const items: Skill[] = [];
+	const warnings: string[] = [];
+	const { dir, level, providerId, requireDescription = false } = options;
+
+	if (!ctx.fs.isDir(dir)) {
+		return { items, warnings };
+	}
+
+	for (const name of ctx.fs.readDir(dir)) {
+		if (name.startsWith(".") || name === "node_modules") continue;
+
+		const skillDir = join(dir, name);
+		if (!ctx.fs.isDir(skillDir)) continue;
+
+		const skillFile = join(skillDir, "SKILL.md");
+		if (!ctx.fs.isFile(skillFile)) continue;
+
+		const content = ctx.fs.readFile(skillFile);
+		if (!content) {
+			warnings.push(`Failed to read ${skillFile}`);
+			continue;
+		}
+
+		const { frontmatter, body } = parseFrontmatter(content);
+		if (requireDescription && !frontmatter.description) {
+			continue;
+		}
+
+		items.push({
+			name: (frontmatter.name as string) || name,
+			path: skillFile,
+			content: body,
+			frontmatter: frontmatter as SkillFrontmatter,
+			level,
+			_source: createSourceMeta(providerId, skillFile, level),
+		});
+	}
+
+	return { items, warnings };
+}
+
 /**
  * Expand environment variables in a string.
  * Supports ${VAR} and ${VAR:-default} syntax.
@@ -286,7 +337,7 @@ export function discoverExtensionModulePaths(ctx: LoadContext, dir: string): str
 	const discovered: string[] = [];
 
 	for (const name of ctx.fs.readDir(dir)) {
-		if (name.startsWith(".")) continue;
+		if (name.startsWith(".") || name === "node_modules") continue;
 
 		const entryPath = join(dir, name);
 

package/src/main.ts

@@ -76,7 +76,7 @@ async function runInteractiveMode(
 	mode.renderInitialMessages();
 
 	if (migratedProviders.length > 0) {
-		mode.showWarning(`Migrated credentials to auth.json: ${migratedProviders.join(", ")}`);
+		mode.showWarning(`Migrated credentials to agent.db: ${migratedProviders.join(", ")}`);
 	}
 
 	if (modelsJsonError) {

package/src/migrations.ts

@@ -3,9 +3,11 @@
  */
 
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import chalk from "chalk";
-import { getAgentDir, getBinDir } from "./config";
+import { getAgentDbPath, getAgentDir, getBinDir } from "./config";
+import { AgentStorage } from "./core/agent-storage";
+import type { AuthCredential } from "./core/auth-storage";
 
 /**
  * Migrate PI_* environment variables to OMP_* equivalents.
@@ -29,28 +31,27 @@ export function migrateEnvVars(): string[] {
 }
 
 /**
- * Migrate legacy oauth.json and settings.json apiKeys to auth.json.
+ * Migrate legacy oauth.json and settings.json apiKeys to agent.db.
  *
  * @returns Array of provider names that were migrated
  */
-export function migrateAuthToAuthJson(): string[] {
+export function migrateAuthToAgentDb(): string[] {
 	const agentDir = getAgentDir();
-	const authPath = join(agentDir, "auth.json");
 	const oauthPath = join(agentDir, "oauth.json");
 	const settingsPath = join(agentDir, "settings.json");
+	const storage = AgentStorage.open(getAgentDbPath(agentDir));
 
-	// Skip if auth.json already exists
-	if (existsSync(authPath)) return [];
-
-	const migrated: Record<string, unknown> = {};
+	const migrated: Record<string, AuthCredential[]> = {};
 	const providers: string[] = [];
 
-	// Migrate oauth.json
 	if (existsSync(oauthPath)) {
 		try {
 			const oauth = JSON.parse(readFileSync(oauthPath, "utf-8"));
 			for (const [provider, cred] of Object.entries(oauth)) {
-				migrated[provider] = { type: "oauth", ...(cred as object) };
+				if (storage.listAuthCredentials(provider).length > 0) {
+					continue;
+				}
+				migrated[provider] = [{ type: "oauth", ...(cred as object) } as AuthCredential];
 				providers.push(provider);
 			}
 			renameSync(oauthPath, `${oauthPath}.migrated`);
@@ -59,17 +60,17 @@ export function migrateAuthToAuthJson(): string[] {
 		}
 	}
 
-	// Migrate settings.json apiKeys
 	if (existsSync(settingsPath)) {
 		try {
 			const content = readFileSync(settingsPath, "utf-8");
 			const settings = JSON.parse(content);
 			if (settings.apiKeys && typeof settings.apiKeys === "object") {
 				for (const [provider, key] of Object.entries(settings.apiKeys)) {
-					if (!migrated[provider] && typeof key === "string") {
-						migrated[provider] = { type: "api_key", key };
-						providers.push(provider);
-					}
+					if (typeof key !== "string") continue;
+					if (migrated[provider]) continue;
+					if (storage.listAuthCredentials(provider).length > 0) continue;
+					migrated[provider] = [{ type: "api_key", key }];
+					providers.push(provider);
 				}
 				delete settings.apiKeys;
 				writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
@@ -79,9 +80,8 @@ export function migrateAuthToAuthJson(): string[] {
 		}
 	}
 
-	if (Object.keys(migrated).length > 0) {
-		mkdirSync(dirname(authPath), { recursive: true });
-		writeFileSync(authPath, JSON.stringify(migrated, null, 2), { mode: 0o600 });
+	for (const [provider, credentials] of Object.entries(migrated)) {
+		storage.replaceAuthCredentialsForProvider(provider, credentials);
 	}
 
 	return providers;
@@ -201,7 +201,7 @@ export async function runMigrations(_cwd: string): Promise<{
 	const migratedEnvVars = migrateEnvVars();
 
 	// Then: run data migrations
-	const migratedAuthProviders = migrateAuthToAuthJson();
+	const migratedAuthProviders = migrateAuthToAgentDb();
 	migrateSessionsFromAgentRoot();
 	migrateToolsToBin();