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

package/src/core/tools/git.ts

@@ -2,6 +2,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import { type GitParams, gitTool as gitToolCore, type ToolResponse } from "@oh-my-pi/pi-git-tool";
 import { type Static, Type } from "@sinclair/typebox";
 import gitDescription from "../../prompts/tools/git.md" with { type: "text" };
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 
 const gitSchema = Type.Object({
@@ -200,7 +201,7 @@ export function createGitTool(session: ToolSession): AgentTool<typeof gitSchema,
 	return {
 		name: "git",
 		label: "Git",
-		description: gitDescription,
+		description: renderPromptTemplate(gitDescription),
 		parameters: gitSchema,
 		execute: async (_toolCallId, params: Static<typeof gitSchema>, _signal?: AbortSignal) => {
 			if (params.operation === "commit" && !params.message) {
@@ -224,7 +225,6 @@ export function createGitTool(session: ToolSession): AgentTool<typeof gitSchema,
 export const gitTool = createGitTool({
 	cwd: process.cwd(),
 	hasUI: false,
-	rulebookRules: [],
 	getSessionFile: () => null,
 	getSessionSpawns: () => null,
 })!;

package/src/core/tools/grep.ts

@@ -8,6 +8,7 @@ import { getLanguageFromPath, type Theme } from "../../modes/interactive/theme/t
 import grepDescription from "../../prompts/tools/grep.md" with { type: "text" };
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import { ScopeSignal, untilAborted } from "../utils";
 import type { ToolSession } from "./index";
 import { resolveToCwd } from "./path-utils";
@@ -96,7 +97,7 @@ export function createGrepTool(session: ToolSession, options?: GrepToolOptions):
 	return {
 		name: "grep",
 		label: "Grep",
-		description: grepDescription,
+		description: renderPromptTemplate(grepDescription),
 		parameters: grepSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/index.test.ts

@@ -5,7 +5,6 @@ function createTestSession(overrides: Partial<ToolSession> = {}): ToolSession {
 	return {
 		cwd: "/tmp/test",
 		hasUI: false,
-		rulebookRules: [],
 		getSessionFile: () => null,
 		getSessionSpawns: () => "*",
 		...overrides,
@@ -75,32 +74,6 @@ describe("createTools", () => {
 		expect(names).toContain("ask");
 	});
 
-	it("excludes rulebook tool when no rules provided", async () => {
-		const session = createTestSession({ rulebookRules: [] });
-		const tools = await createTools(session);
-		const names = tools.map((t) => t.name);
-
-		expect(names).not.toContain("rulebook");
-	});
-
-	it("includes rulebook tool when rules provided", async () => {
-		const session = createTestSession({
-			rulebookRules: [
-				{
-					path: "/test/rule.md",
-					name: "Test Rule",
-					content: "Test content",
-					description: "A test rule",
-					_source: { provider: "test", providerName: "Test", path: "/test", level: "project" },
-				},
-			],
-		});
-		const tools = await createTools(session);
-		const names = tools.map((t) => t.name);
-
-		expect(names).toContain("rulebook");
-	});
-
 	it("excludes git tool when disabled in settings", async () => {
 		const session = createTestSession({
 			settings: {
@@ -174,7 +147,6 @@ describe("createTools", () => {
 			"notebook",
 			"output",
 			"read",
-			"rulebook",
 			"task",
 			"web_fetch",
 			"web_search",

package/src/core/tools/index.ts

@@ -26,7 +26,6 @@ export { createNotebookTool, type NotebookToolDetails } from "./notebook";
 export { createOutputTool, type OutputToolDetails } from "./output";
 export { createReadTool, type ReadToolDetails } from "./read";
 export { reportFindingTool, type SubmitReviewDetails } from "./review";
-export { filterRulebookRules, formatRulesForPrompt, type RulebookToolDetails } from "./rulebook";
 export { createSshTool, type SSHToolDetails } from "./ssh";
 export { BUNDLED_AGENTS, createTaskTool, taskTool } from "./task/index";
 export {
@@ -62,7 +61,6 @@ export {
 export { createWriteTool, type WriteToolDetails } from "./write";
 
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
-import type { Rule } from "../../capability/rule";
 import type { EventBus } from "../event-bus";
 import type { BashInterceptorRule } from "../settings-manager";
 import { createAskTool } from "./ask";
@@ -79,7 +77,6 @@ import { createNotebookTool } from "./notebook";
 import { createOutputTool } from "./output";
 import { createReadTool } from "./read";
 import { reportFindingTool } from "./review";
-import { createRulebookTool } from "./rulebook";
 import { createSshTool } from "./ssh";
 import { createTaskTool } from "./task/index";
 import { createWebFetchTool } from "./web-fetch";
@@ -95,8 +92,6 @@ export interface ToolSession {
 	cwd: string;
 	/** Whether UI is available */
 	hasUI: boolean;
-	/** Rulebook rules */
-	rulebookRules: Rule[];
 	/** Event bus for tool/extension communication */
 	eventBus?: EventBus;
 	/** Output schema for structured completion (subagents) */
@@ -141,7 +136,6 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	notebook: createNotebookTool,
 	output: createOutputTool,
 	read: createReadTool,
-	rulebook: createRulebookTool,
 	task: createTaskTool,
 	web_fetch: createWebFetchTool,
 	web_search: createWebSearchTool,

package/src/core/tools/lsp/index.ts

@@ -6,6 +6,7 @@ import type { BunFile } from "bun";
 import { type Theme, theme } from "../../../modes/interactive/theme/theme";
 import lspDescription from "../../../prompts/tools/lsp.md" with { type: "text" };
 import { logger } from "../../logger";
+import { renderPromptTemplate } from "../../prompt-templates";
 import { once, untilAborted } from "../../utils";
 import type { ToolSession } from "../index";
 import { resolveToCwd } from "../path-utils";
@@ -737,7 +738,7 @@ export function createLspTool(session: ToolSession): AgentTool<typeof lspSchema,
 	return {
 		name: "lsp",
 		label: "LSP",
-		description: lspDescription,
+		description: renderPromptTemplate(lspDescription),
 		parameters: lspSchema,
 		renderCall,
 		renderResult,

package/src/core/tools/output.ts

@@ -14,6 +14,7 @@ import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import outputDescription from "../../prompts/tools/output.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 import {
 	formatCount,
@@ -236,7 +237,7 @@ export function createOutputTool(session: ToolSession): AgentTool<typeof outputS
 	return {
 		name: "output",
 		label: "Output",
-		description: outputDescription,
+		description: renderPromptTemplate(outputDescription),
 		parameters: outputSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/read.ts

@@ -12,6 +12,7 @@ import { formatDimensionNote, resizeImage } from "../../utils/image-resize";
 import { detectSupportedImageMimeTypeFromFile } from "../../utils/mime";
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "../sdk";
 import { ScopeSignal, untilAborted } from "../utils";
 import { createLsTool } from "./ls";
@@ -429,7 +430,9 @@ export function createReadTool(session: ToolSession): AgentTool<typeof readSchem
 	return {
 		name: "read",
 		label: "Read",
-		description: readDescription.replace("{{DEFAULT_MAX_LINES}}", String(DEFAULT_MAX_LINES)),
+		description: renderPromptTemplate(readDescription, {
+			DEFAULT_MAX_LINES: String(DEFAULT_MAX_LINES),
+		}),
 		parameters: readSchema,
 		execute: async (
 			toolCallId: string,

package/src/core/tools/ssh.ts

@@ -8,6 +8,7 @@ import { loadSync } from "../../discovery/index";
 import type { Theme } from "../../modes/interactive/theme/theme";
 import sshDescriptionBase from "../../prompts/tools/ssh.md" with { type: "text" };
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { SSHHostInfo } from "../ssh/connection-manager";
 import { ensureHostInfo, getHostInfoForHost } from "../ssh/connection-manager";
 import { executeSSH } from "../ssh/ssh-executor";
@@ -54,11 +55,12 @@ function formatHostEntry(host: SSHHost): string {
 }
 
 function formatDescription(hosts: SSHHost[]): string {
+	const baseDescription = renderPromptTemplate(sshDescriptionBase);
 	if (hosts.length === 0) {
-		return sshDescriptionBase;
+		return baseDescription;
 	}
 	const hostList = hosts.map(formatHostEntry).join("\n");
-	return `${sshDescriptionBase}\n\nAvailable hosts:\n${hostList}`;
+	return `${baseDescription}\n\nAvailable hosts:\n${hostList}`;
 }
 
 function quoteRemotePath(value: string): string {

package/src/core/tools/task/agents.ts

@@ -4,47 +4,73 @@
  * Agents are embedded at build time via Bun's import with { type: "text" }.
  */
 
+import exploreMd from "../../../prompts/agents/explore.md" with { type: "text" };
 // Embed agent markdown files at build time
-import exploreMd from "../../../prompts/explore.md" with { type: "text" };
-import planMd from "../../../prompts/plan.md" with { type: "text" };
-import reviewerMd from "../../../prompts/reviewer.md" with { type: "text" };
-import taskMd from "../../../prompts/task.md" with { type: "text" };
+import agentFrontmatterTemplate from "../../../prompts/agents/frontmatter.md" with { type: "text" };
+import planMd from "../../../prompts/agents/plan.md" with { type: "text" };
+import reviewerMd from "../../../prompts/agents/reviewer.md" with { type: "text" };
+import taskMd from "../../../prompts/agents/task.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 import type { AgentDefinition, AgentSource } from "./types";
 
-const EMBEDDED_AGENTS: { name: string; content: string }[] = [
-	{ name: "explore.md", content: exploreMd },
-	{ name: "plan.md", content: planMd },
-	{ name: "reviewer.md", content: reviewerMd },
+interface AgentFrontmatter {
+	name: string;
+	description: string;
+	spawns?: string;
+	model?: string;
+}
+
+interface EmbeddedAgentDef {
+	fileName: string;
+	frontmatter?: AgentFrontmatter;
+	template: string;
+}
+
+function buildAgentContent(def: EmbeddedAgentDef): string {
+	const body = renderPromptTemplate(def.template);
+	if (!def.frontmatter) return body;
+	return renderPromptTemplate(agentFrontmatterTemplate, { ...def.frontmatter, body });
+}
+
+const EMBEDDED_AGENT_DEFS: EmbeddedAgentDef[] = [
+	{ fileName: "explore.md", template: exploreMd },
+	{ fileName: "plan.md", template: planMd },
+	{ fileName: "reviewer.md", template: reviewerMd },
 	{
-		name: "task.md",
-		content: `---
-name: task
-description: General-purpose subagent with full capabilities for delegated multi-step tasks
-spawns: explore
-model: default
----
-${taskMd}`,
+		fileName: "task.md",
+		frontmatter: {
+			name: "task",
+			description: "General-purpose subagent with full capabilities for delegated multi-step tasks",
+			spawns: "explore",
+			model: "default",
+		},
+		template: taskMd,
 	},
 	{
-		name: "quick_task.md",
-		content: `---
-name: quick_task
-description: Quick task for fast execution
-model: pi/smol
----
-${taskMd}`,
+		fileName: "quick_task.md",
+		frontmatter: {
+			name: "quick_task",
+			description: "Quick task for fast execution",
+			model: "pi/smol",
+		},
+		template: taskMd,
 	},
 	{
-		name: "deep_task.md",
-		content: `---
-name: deep_task
-description: Deep task for comprehensive reasoning
-model: pi/slow
----
-${taskMd}`,
+		fileName: "deep_task.md",
+		frontmatter: {
+			name: "deep_task",
+			description: "Deep task for comprehensive reasoning",
+			model: "pi/slow",
+		},
+		template: taskMd,
 	},
 ];
 
+const EMBEDDED_AGENTS: { name: string; content: string }[] = EMBEDDED_AGENT_DEFS.map((def) => ({
+	name: def.fileName,
+	content: buildAgentContent(def),
+}));
+
 /**
  * Parse YAML frontmatter from markdown content.
  */

package/src/core/tools/task/commands.ts

@@ -9,16 +9,13 @@ import { type SlashCommand, slashCommandCapability } from "../../../capability/s
 import { loadSync } from "../../../discovery";
 
 // Embed command markdown files at build time
-import architectPlanMd from "../../../prompts/architect-plan.md" with { type: "text" };
-import implementMd from "../../../prompts/implement.md" with { type: "text" };
-import implementWithCriticMd from "../../../prompts/implement-with-critic.md" with { type: "text" };
-import initMd from "../../../prompts/init.md" with { type: "text" };
+import initMd from "../../../prompts/agents/init.md" with { type: "text" };
+import plannerMd from "../../../prompts/agents/planner.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 
 const EMBEDDED_COMMANDS: { name: string; content: string }[] = [
-	{ name: "architect-plan.md", content: architectPlanMd },
-	{ name: "implement-with-critic.md", content: implementWithCriticMd },
-	{ name: "implement.md", content: implementMd },
-	{ name: "init.md", content: initMd },
+	{ name: "init.md", content: renderPromptTemplate(initMd) },
+	{ name: "planner.md", content: renderPromptTemplate(plannerMd) },
 ];
 
 export const EMBEDDED_COMMAND_TEMPLATES: ReadonlyArray<{ name: string; content: string }> = EMBEDDED_COMMANDS;

package/src/core/tools/task/index.ts

@@ -17,6 +17,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { Usage } from "@oh-my-pi/pi-ai";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import taskDescriptionTemplate from "../../../prompts/tools/task.md" with { type: "text" };
+import { renderPromptTemplate } from "../../prompt-templates";
 import { formatDuration } from "../render-utils";
 import { cleanupTempDir, createTempArtifactsDir, getArtifactsDir } from "./artifacts";
 import { discoverAgents, getAgent } from "./discovery";
@@ -95,21 +96,12 @@ export { taskSchema } from "./types";
 async function buildDescription(cwd: string): Promise<string> {
 	const { agents } = await discoverAgents(cwd);
 
-	// Build agents list
-	const agentLines: string[] = [];
-	for (const agent of agents.slice(0, MAX_AGENTS_IN_DESCRIPTION)) {
-		const tools = agent.tools?.join(", ") || "All tools";
-		agentLines.push(`- ${agent.name}: ${agent.description} (Tools: ${tools})`);
-	}
-	if (agents.length > MAX_AGENTS_IN_DESCRIPTION) {
-		agentLines.push(`  ...and ${agents.length - MAX_AGENTS_IN_DESCRIPTION} more agents`);
-	}
-
-	// Fill template placeholders
-	return taskDescriptionTemplate
-		.replace("{{AGENTS_LIST}}", agentLines.join("\n"))
-		.replace("{{MAX_PARALLEL_TASKS}}", String(MAX_PARALLEL_TASKS))
-		.replace("{{MAX_CONCURRENCY}}", String(MAX_CONCURRENCY));
+	return renderPromptTemplate(taskDescriptionTemplate, {
+		agents: agents.slice(0, MAX_AGENTS_IN_DESCRIPTION),
+		moreAgents: agents.length > MAX_AGENTS_IN_DESCRIPTION ? agents.length - MAX_AGENTS_IN_DESCRIPTION : 0,
+		MAX_PARALLEL_TASKS,
+		MAX_CONCURRENCY,
+	});
 }
 
 /**

package/src/core/tools/web-fetch.ts

@@ -10,6 +10,7 @@ import { type Theme, theme } from "../../modes/interactive/theme/theme";
 import webFetchDescription from "../../prompts/tools/web-fetch.md" with { type: "text" };
 import { ensureTool } from "../../utils/tools-manager";
 import type { RenderResultOptions } from "../custom-tools/types";
+import { renderPromptTemplate } from "../prompt-templates";
 import type { ToolSession } from "./index";
 import { specialHandlers } from "./web-scrapers/index";
 import type { RenderResult } from "./web-scrapers/types";
@@ -836,7 +837,7 @@ export function createWebFetchTool(_session: ToolSession): AgentTool<typeof webF
 	return {
 		name: "web_fetch",
 		label: "Web Fetch",
-		description: webFetchDescription,
+		description: renderPromptTemplate(webFetchDescription),
 		parameters: webFetchSchema,
 		execute: async (
 			_toolCallId: string,

package/src/core/tools/web-search/auth.ts

@@ -4,19 +4,26 @@
  * 4-tier auth resolution:
  *   1. ANTHROPIC_SEARCH_API_KEY / ANTHROPIC_SEARCH_BASE_URL env vars
  *   2. Provider with api="anthropic-messages" in ~/.omp/agent/models.json
- *   3. OAuth credentials in ~/.omp/agent/auth.json (with expiry check)
+ *   3. OAuth credentials in ~/.omp/agent/agent.db (with expiry check)
  *   4. ANTHROPIC_API_KEY / ANTHROPIC_BASE_URL fallback
  */
 
 import * as os from "node:os";
 import * as path from "node:path";
 import { buildBetaHeader, claudeCodeHeaders, claudeCodeVersion } from "@oh-my-pi/pi-ai";
-import { getConfigDirPaths } from "../../../config";
-import type { AnthropicAuthConfig, AnthropicOAuthCredential, AuthJson, ModelsJson } from "./types";
+import { getAgentDbPath, getConfigDirPaths } from "../../../config";
+import { AgentStorage } from "../../agent-storage";
+import type { AuthCredential, AuthCredentialEntry, AuthStorageData } from "../../auth-storage";
+import { migrateJsonStorage } from "../../storage-migration";
+import type { AnthropicAuthConfig, AnthropicOAuthCredential, ModelsJson } from "./types";
 
 const DEFAULT_BASE_URL = "https://api.anthropic.com";
 
-/** Parse a .env file and return key-value pairs */
+/**
+ * Parses a .env file and extracts key-value pairs.
+ * @param filePath - Path to the .env file
+ * @returns Object containing parsed environment variables
+ */
 async function parseEnvFile(filePath: string): Promise<Record<string, string>> {
 	const result: Record<string, string> = {};
 	try {
@@ -47,7 +54,11 @@ async function parseEnvFile(filePath: string): Promise<Record<string, string>> {
 	return result;
 }
 
-/** Get env var from process.env or .env files */
+/**
+ * Gets an environment variable from process.env or .env files.
+ * @param key - The environment variable name to look up
+ * @returns The value if found, undefined otherwise
+ */
 export async function getEnv(key: string): Promise<string | undefined> {
 	if (process.env[key]) return process.env[key];
 
@@ -60,7 +71,11 @@ export async function getEnv(key: string): Promise<string | undefined> {
 	return undefined;
 }
 
-/** Read JSON file safely */
+/**
+ * Reads and parses a JSON file safely.
+ * @param filePath - Path to the JSON file
+ * @returns Parsed JSON content, or null if file doesn't exist or parsing fails
+ */
 async function readJson<T>(filePath: string): Promise<T | null> {
 	try {
 		const file = Bun.file(filePath);
@@ -72,22 +87,85 @@ async function readJson<T>(filePath: string): Promise<T | null> {
 	}
 }
 
-/** Check if a token is an OAuth token (sk-ant-oat* prefix) */
+/**
+ * Checks if a token is an OAuth token by looking for sk-ant-oat prefix.
+ * @param apiKey - The API key to check
+ * @returns True if the token is an OAuth token
+ */
 export function isOAuthToken(apiKey: string): boolean {
 	return apiKey.includes("sk-ant-oat");
 }
 
-function normalizeAnthropicOAuthCredentials(entry: AuthJson["anthropic"] | undefined): AnthropicOAuthCredential[] {
+/**
+ * Converts a generic AuthCredential to AnthropicOAuthCredential if it's a valid OAuth entry.
+ * @param credential - The credential to convert
+ * @returns The converted OAuth credential, or null if not a valid OAuth type
+ */
+function toAnthropicOAuthCredential(credential: AuthCredential): AnthropicOAuthCredential | null {
+	if (credential.type !== "oauth") return null;
+	if (typeof credential.access !== "string" || typeof credential.expires !== "number") return null;
+	return {
+		type: "oauth",
+		access: credential.access,
+		refresh: credential.refresh,
+		expires: credential.expires,
+	};
+}
+
+function normalizeAuthEntry(entry: AuthCredentialEntry | undefined): AuthCredential[] {
 	if (!entry) return [];
 	return Array.isArray(entry) ? entry : [entry];
 }
 
+async function readLegacyAnthropicOAuthCredentials(configDir: string): Promise<AnthropicOAuthCredential[]> {
+	const authJson = await readJson<AuthStorageData>(path.join(configDir, "auth.json"));
+	if (!authJson) return [];
+	const entry = authJson.anthropic as AuthCredentialEntry | undefined;
+	const credentials = normalizeAuthEntry(entry);
+	const results: AnthropicOAuthCredential[] = [];
+	for (const credential of credentials) {
+		const mapped = toAnthropicOAuthCredential(credential);
+		if (mapped) results.push(mapped);
+	}
+	return results;
+}
+
 /**
- * Find Anthropic auth config using 4-tier priority:
+ * Reads Anthropic OAuth credentials from agent.db, migrating from legacy auth.json if needed.
+ * @param configDir - Path to the config directory containing agent.db
+ * @returns Array of valid Anthropic OAuth credentials
+ */
+async function readAnthropicOAuthCredentials(configDir: string): Promise<AnthropicOAuthCredential[]> {
+	await migrateJsonStorage({
+		agentDir: configDir,
+		settingsPath: path.join(configDir, "settings.json"),
+		authPaths: [path.join(configDir, "auth.json")],
+	});
+
+	const storage = AgentStorage.open(getAgentDbPath(configDir));
+	const records = storage.listAuthCredentials("anthropic");
+	const credentials: AnthropicOAuthCredential[] = [];
+	for (const record of records) {
+		const mapped = toAnthropicOAuthCredential(record.credential);
+		if (mapped) {
+			credentials.push(mapped);
+		}
+	}
+
+	if (credentials.length === 0) {
+		return readLegacyAnthropicOAuthCredentials(configDir);
+	}
+
+	return credentials;
+}
+
+/**
+ * Finds Anthropic auth config using 4-tier priority:
  *   1. ANTHROPIC_SEARCH_API_KEY / ANTHROPIC_SEARCH_BASE_URL
  *   2. Provider with api="anthropic-messages" in models.json
- *   3. OAuth in auth.json (with 5-minute expiry buffer)
+ *   3. OAuth in agent.db (with 5-minute expiry buffer)
  *   4. ANTHROPIC_API_KEY / ANTHROPIC_BASE_URL fallback
+ * @returns The first valid auth configuration found, or null if none available
  */
 export async function findAnthropicAuth(): Promise<AnthropicAuthConfig | null> {
 	// Get all config directories (user-level only) for fallback support
@@ -131,14 +209,13 @@ export async function findAnthropicAuth(): Promise<AnthropicAuthConfig | null> {
 		}
 	}
 
-	// 3. OAuth credentials in auth.json (with 5-minute expiry buffer, check all config dirs)
+	// 3. OAuth credentials in agent.db (with 5-minute expiry buffer, check all config dirs)
 	const expiryBuffer = 5 * 60 * 1000; // 5 minutes
 	const now = Date.now();
 	for (const configDir of configDirs) {
-		const authJson = await readJson<AuthJson>(path.join(configDir, "auth.json"));
-		const credentials = normalizeAnthropicOAuthCredentials(authJson?.anthropic);
+		const credentials = await readAnthropicOAuthCredentials(configDir);
 		for (const credential of credentials) {
-			if (credential.type !== "oauth" || !credential.access) continue;
+			if (!credential.access) continue;
 			if (credential.expires > now + expiryBuffer) {
 				return {
 					apiKey: credential.access,
@@ -163,6 +240,11 @@ export async function findAnthropicAuth(): Promise<AnthropicAuthConfig | null> {
 	return null;
 }
 
+/**
+ * Checks if a base URL points to the official Anthropic API.
+ * @param baseUrl - The base URL to check
+ * @returns True if the URL is for api.anthropic.com over HTTPS
+ */
 function isAnthropicBaseUrl(baseUrl: string): boolean {
 	try {
 		const url = new URL(baseUrl);
@@ -172,7 +254,11 @@ function isAnthropicBaseUrl(baseUrl: string): boolean {
 	}
 }
 
-/** Build headers for Anthropic API request */
+/**
+ * Builds HTTP headers for Anthropic API requests.
+ * @param auth - The authentication configuration
+ * @returns Headers object ready for use in fetch requests
+ */
 export function buildAnthropicHeaders(auth: AnthropicAuthConfig): Record<string, string> {
 	const baseBetas = auth.isOAuth
 		? [
@@ -205,7 +291,11 @@ export function buildAnthropicHeaders(auth: AnthropicAuthConfig): Record<string,
 	return headers;
 }
 
-/** Build API URL (OAuth requires ?beta=true) */
+/**
+ * Builds the full API URL for Anthropic messages endpoint.
+ * @param auth - The authentication configuration
+ * @returns The complete API URL with beta query parameter
+ */
 export function buildAnthropicUrl(auth: AnthropicAuthConfig): string {
 	const base = `${auth.baseUrl}/v1/messages`;
 	return `${base}?beta=true`;

package/src/core/tools/web-search/index.ts

@@ -17,6 +17,7 @@ import { Type } from "@sinclair/typebox";
 import type { Theme } from "../../../modes/interactive/theme/theme";
 import webSearchDescription from "../../../prompts/tools/web-search.md" with { type: "text" };
 import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../custom-tools/types";
+import { renderPromptTemplate } from "../../prompt-templates";
 import { callExaTool, findApiKey as findExaKey, formatSearchResults, isSearchResponse } from "../exa/mcp-client";
 import { renderExaCall, renderExaResult } from "../exa/render";
 import type { ExaRenderDetails } from "../exa/types";
@@ -332,7 +333,7 @@ async function executeWebSearch(
 export const webSearchTool: AgentTool<typeof webSearchSchema> = {
 	name: "web_search",
 	label: "Web Search",
-	description: webSearchDescription,
+	description: renderPromptTemplate(webSearchDescription),
 	parameters: webSearchSchema,
 	execute: async (toolCallId, params) => {
 		return executeWebSearch(toolCallId, params as WebSearchParams);
@@ -343,7 +344,7 @@ export const webSearchTool: AgentTool<typeof webSearchSchema> = {
 export const webSearchCustomTool: CustomTool<typeof webSearchSchema, WebSearchRenderDetails> = {
 	name: "web_search",
 	label: "Web Search",
-	description: webSearchDescription,
+	description: renderPromptTemplate(webSearchDescription),
 	parameters: webSearchSchema,
 
 	async execute(