@oh-my-pi/pi-coding-agent 12.18.3 → 12.19.2

package/src/web/search/providers/exa.ts

@@ -8,6 +8,7 @@ import { getEnvApiKey } from "@oh-my-pi/pi-ai";
 import { findApiKey as findExaKey } from "../../../exa/mcp-client";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
+import { dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
 
@@ -88,18 +89,6 @@ async function callExaSearch(apiKey: string, params: ExaSearchParams): Promise<E
 	return response.json() as Promise<ExaSearchResponse>;
 }
 
-/** Calculate age in seconds from ISO date string */
-function dateToAgeSeconds(dateStr: string | null | undefined): number | undefined {
-	if (!dateStr) return undefined;
-	try {
-		const date = new Date(dateStr);
-		if (Number.isNaN(date.getTime())) return undefined;
-		return Math.floor((Date.now() - date.getTime()) / 1000);
-	} catch {
-		return undefined;
-	}
-}
-
 /** Execute Exa web search */
 export async function searchExa(params: ExaSearchParams): Promise<SearchResponse> {
 	const apiKey = getEnvApiKey("exa");

package/src/web/search/providers/kimi.ts

@@ -6,12 +6,12 @@
  */
 import { getEnvApiKey } from "@oh-my-pi/pi-ai";
 import { $env } from "@oh-my-pi/pi-utils";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
-import { AgentStorage } from "../../../session/agent-storage";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
+import { clampNumResults, dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { findCredential } from "./utils";
 
 const KIMI_SEARCH_URL = "https://api.kimi.com/coding/v1/search";
 
@@ -51,53 +51,14 @@ function resolveBaseUrl(): string {
 	return asTrimmed($env.MOONSHOT_SEARCH_BASE_URL) ?? asTrimmed($env.KIMI_SEARCH_BASE_URL) ?? KIMI_SEARCH_URL;
 }
 
-function clampNumResults(value: number | undefined): number {
-	if (!value || Number.isNaN(value)) return DEFAULT_NUM_RESULTS;
-	return Math.min(MAX_NUM_RESULTS, Math.max(1, value));
-}
-
-function dateToAgeSeconds(dateStr: string | undefined): number | undefined {
-	if (!dateStr) return undefined;
-	try {
-		const date = new Date(dateStr);
-		if (Number.isNaN(date.getTime())) return undefined;
-		return Math.floor((Date.now() - date.getTime()) / 1000);
-	} catch {
-		return undefined;
-	}
-}
-
-/**
- * Find Kimi search credentials from environment or agent.db credentials.
- * Priority: MOONSHOT_SEARCH_API_KEY / KIMI_SEARCH_API_KEY / MOONSHOT_API_KEY, then agent.db providers "moonshot" or "kimi-code".
- */
+/** Find Kimi search credentials from environment or agent.db credentials. */
 async function findApiKey(): Promise<string | null> {
 	const envKey =
 		asTrimmed($env.MOONSHOT_SEARCH_API_KEY) ??
 		asTrimmed($env.KIMI_SEARCH_API_KEY) ??
 		getEnvApiKey("moonshot") ??
 		null;
-	if (envKey) return envKey;
-
-	try {
-		const storage = await AgentStorage.open(getAgentDbPath());
-		for (const provider of ["moonshot", "kimi-code"] as const) {
-			const records = storage.listAuthCredentials(provider);
-			for (const record of records) {
-				const credential = record.credential;
-				if (credential.type === "api_key" && credential.key.trim().length > 0) {
-					return credential.key;
-				}
-				if (credential.type === "oauth" && credential.access.trim().length > 0) {
-					return credential.access;
-				}
-			}
-		}
-	} catch {
-		return null;
-	}
-
-	return null;
+	return findCredential(envKey, "moonshot", "kimi-code");
 }
 
 async function callKimiSearch(
@@ -143,7 +104,7 @@ export async function searchKimi(params: KimiSearchParams): Promise<SearchRespon
 		);
 	}
 
-	const limit = clampNumResults(params.num_results);
+	const limit = clampNumResults(params.num_results, DEFAULT_NUM_RESULTS, MAX_NUM_RESULTS);
 	const { response, requestId } = await callKimiSearch(apiKey, {
 		query: params.query,
 		limit,

package/src/web/search/providers/perplexity.ts

@@ -19,6 +19,7 @@ import type {
 	SearchSource,
 } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
+import { dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
 
@@ -383,18 +384,6 @@ async function callPerplexityOAuth(
 	};
 }
 
-/** Calculate age in seconds from ISO date string */
-function dateToAgeSeconds(dateStr: string | null | undefined): number | undefined {
-	if (!dateStr) return undefined;
-	try {
-		const date = new Date(dateStr);
-		if (Number.isNaN(date.getTime())) return undefined;
-		return Math.floor((Date.now() - date.getTime()) / 1000);
-	} catch {
-		return undefined;
-	}
-}
-
 function messageContentToText(content: PerplexityMessageOutput["content"]): string {
 	if (!content) return "";
 	if (typeof content === "string") return content;

package/src/web/search/providers/synthetic.ts

@@ -6,12 +6,11 @@
  */
 
 import { getEnvApiKey } from "@oh-my-pi/pi-ai";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
-import { AgentStorage } from "../../../session/agent-storage";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { findCredential } from "./utils";
 
 const SYNTHETIC_SEARCH_URL = "https://api.synthetic.new/v2/search";
 
@@ -26,31 +25,9 @@ interface SyntheticSearchResponse {
 	results: SyntheticSearchResult[];
 }
 
-/**
- * Find Synthetic API key from environment or agent.db credentials.
- * Priority: SYNTHETIC_API_KEY env var, then credentials stored under provider "synthetic".
- */
+/** Find Synthetic API key from environment or agent.db credentials. */
 export async function findApiKey(): Promise<string | null> {
-	const envKey = getEnvApiKey("synthetic");
-	if (envKey) return envKey;
-
-	try {
-		const storage = await AgentStorage.open(getAgentDbPath());
-		const records = storage.listAuthCredentials("synthetic");
-		for (const record of records) {
-			const credential = record.credential;
-			if (credential.type === "api_key" && credential.key.trim().length > 0) {
-				return credential.key;
-			}
-			if (credential.type === "oauth" && credential.access.trim().length > 0) {
-				return credential.access;
-			}
-		}
-	} catch {
-		return null;
-	}
-
-	return null;
+	return findCredential(getEnvApiKey("synthetic"), "synthetic");
 }
 
 /** Call Synthetic search API. */

package/src/web/search/providers/utils.ts

@@ -0,0 +1,36 @@
+import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
+import { AgentStorage } from "../../../session/agent-storage";
+
+/**
+ * Search for an API credential by checking an env-derived key first,
+ * then falling back to agent.db stored credentials for the given providers.
+ *
+ * @param envKey - Pre-resolved environment variable value (or null)
+ * @param storageProviders - Provider names to look up in AgentStorage
+ */
+export async function findCredential(
+	envKey: string | null | undefined,
+	...storageProviders: string[]
+): Promise<string | null> {
+	if (envKey) return envKey;
+
+	try {
+		const storage = await AgentStorage.open(getAgentDbPath());
+		for (const provider of storageProviders) {
+			const records = storage.listAuthCredentials(provider);
+			for (const record of records) {
+				const credential = record.credential;
+				if (credential.type === "api_key" && credential.key.trim().length > 0) {
+					return credential.key;
+				}
+				if (credential.type === "oauth" && credential.access.trim().length > 0) {
+					return credential.access;
+				}
+			}
+		}
+	} catch {
+		return null;
+	}
+
+	return null;
+}

package/src/web/search/providers/zai.ts

@@ -5,13 +5,13 @@
  * the unified SearchResponse shape used by the web search tool.
  */
 import { getEnvApiKey } from "@oh-my-pi/pi-ai";
-import { getAgentDbPath } from "@oh-my-pi/pi-utils/dirs";
-import { AgentStorage } from "../../../session/agent-storage";
-
+import { asRecord, asString } from "../../../web/scrapers/utils";
 import type { SearchResponse, SearchSource } from "../../../web/search/types";
 import { SearchProviderError } from "../../../web/search/types";
+import { dateToAgeSeconds } from "../utils";
 import type { SearchParams } from "./base";
 import { SearchProvider } from "./base";
+import { findCredential } from "./utils";
 
 const ZAI_MCP_URL = "https://api.z.ai/api/mcp/web_search_prime/mcp";
 const ZAI_TOOL_NAME = "webSearchPrime";
@@ -50,50 +50,9 @@ interface JsonRpcPayload {
 	error?: JsonRpcError;
 }
 
-function asRecord(value: unknown): Record<string, unknown> | null {
-	return typeof value === "object" && value !== null ? (value as Record<string, unknown>) : null;
-}
-
-function asString(value: unknown): string | undefined {
-	return typeof value === "string" && value.trim().length > 0 ? value : undefined;
-}
-
-/**
- * Finds Z.AI API credentials from environment or saved auth storage.
- * Priority: ZAI_API_KEY env var, then credentials stored under provider "zai".
- */
+/** Find Z.AI API credentials from environment or saved auth storage. */
 export async function findApiKey(): Promise<string | null> {
-	const envKey = getEnvApiKey("zai");
-	if (envKey) return envKey;
-
-	try {
-		const storage = await AgentStorage.open(getAgentDbPath());
-		const records = storage.listAuthCredentials("zai");
-		for (const record of records) {
-			const credential = record.credential;
-			if (credential.type === "api_key" && credential.key.trim().length > 0) {
-				return credential.key;
-			}
-			if (credential.type === "oauth" && credential.access.trim().length > 0) {
-				return credential.access;
-			}
-		}
-	} catch {
-		return null;
-	}
-
-	return null;
-}
-
-function dateToAgeSeconds(dateStr: string | undefined): number | undefined {
-	if (!dateStr) return undefined;
-	try {
-		const date = new Date(dateStr);
-		if (Number.isNaN(date.getTime())) return undefined;
-		return Math.floor((Date.now() - date.getTime()) / 1000);
-	} catch {
-		return undefined;
-	}
+	return findCredential(getEnvApiKey("zai"), "zai");
 }
 
 async function callZaiTool(apiKey: string, args: Record<string, unknown>): Promise<unknown> {
@@ -172,7 +131,7 @@ async function callZaiTool(apiKey: string, args: Record<string, unknown>): Promi
 		const content = Array.isArray(resultRecord.content) ? resultRecord.content : [];
 		const errorText = content
 			.map(item => asString(asRecord(item)?.text))
-			.filter((text): text is string => text !== undefined)
+			.filter((text): text is string => text != null)
 			.join("\n")
 			.trim();
 		const statusMatch = errorText.match(/MCP error\s*(-?\d+)/i);
@@ -298,10 +257,10 @@ function toSources(results: ZaiSearchResult[]): SearchSource[] {
 		sources.push({
 			title: asString(result.title) ?? url,
 			url,
-			snippet: asString(result.content),
-			publishedDate,
+			snippet: asString(result.content) ?? undefined,
+			publishedDate: publishedDate ?? undefined,
 			ageSeconds: dateToAgeSeconds(publishedDate),
-			author: asString(result.media),
+			author: asString(result.media) ?? undefined,
 		});
 	}
 	return sources;

package/src/web/search/types.ts

@@ -81,34 +81,6 @@ export class SearchProviderError extends Error {
 	}
 }
 
-/** Auth configuration for Anthropic */
-export interface AnthropicAuthConfig {
-	apiKey: string;
-	baseUrl: string;
-	isOAuth: boolean;
-}
-
-/** models.json structure for provider resolution */
-export interface ModelsJson {
-	providers?: Record<
-		string,
-		{
-			baseUrl?: string;
-			apiKey?: string;
-			api?: string;
-		}
-	>;
-}
-
-/** OAuth credential for Anthropic API access */
-export interface AnthropicOAuthCredential {
-	type: "oauth";
-	access: string;
-	refresh?: string;
-	/** Expiry timestamp in milliseconds */
-	expires: number;
-}
-
 /** Anthropic API response types */
 export interface AnthropicSearchResult {
 	type: "web_search_result";

package/src/web/search/utils.ts

@@ -0,0 +1,17 @@
+/** Calculate age in seconds from an ISO date string. Returns undefined on invalid input. */
+export function dateToAgeSeconds(dateStr: string | null | undefined): number | undefined {
+	if (!dateStr) return undefined;
+	try {
+		const date = new Date(dateStr);
+		if (Number.isNaN(date.getTime())) return undefined;
+		return Math.floor((Date.now() - date.getTime()) / 1000);
+	} catch {
+		return undefined;
+	}
+}
+
+/** Clamp a result count to [1, maxVal], returning defaultVal when value is absent or NaN. */
+export function clampNumResults(value: number | undefined, defaultVal: number, maxVal: number): number {
+	if (!value || Number.isNaN(value)) return defaultVal;
+	return Math.min(maxVal, Math.max(1, value));
+}

package/src/tools/output-utils.ts

@@ -1,63 +0,0 @@
-import { ArtifactManager } from "../session/artifacts";
-import type { ToolSession } from ".";
-
-export interface TailBuffer {
-	append(chunk: string): void;
-	text(): string;
-	bytes(): number;
-}
-
-export function createTailBuffer(maxBytes: number): TailBuffer {
-	let buffer = "";
-	let bufferBytes = 0;
-
-	const append = (text: string) => {
-		if (!text) return;
-		const chunkBytes = Buffer.byteLength(text, "utf-8");
-		buffer += text;
-		bufferBytes += chunkBytes;
-
-		if (bufferBytes > maxBytes) {
-			const buf = Buffer.from(buffer, "utf-8");
-			let start = Math.max(0, buf.length - maxBytes);
-			while (start < buf.length && (buf[start] & 0xc0) === 0x80) {
-				start++;
-			}
-			buffer = buf.subarray(start).toString("utf-8");
-			bufferBytes = Buffer.byteLength(buffer, "utf-8");
-		}
-	};
-
-	return {
-		append,
-		text: () => buffer,
-		bytes: () => bufferBytes,
-	};
-}
-
-export function getArtifactManager(session: ToolSession): ArtifactManager | null {
-	if (session.artifactManager) {
-		return session.artifactManager;
-	}
-	const sessionFile = session.getSessionFile();
-	if (!sessionFile) {
-		return null;
-	}
-	const manager = new ArtifactManager(sessionFile);
-	session.artifactManager = manager;
-	return manager;
-}
-
-export async function allocateOutputArtifact(
-	session: ToolSession,
-	toolType: string,
-): Promise<{ artifactPath?: string; artifactId?: string }> {
-	const manager = getArtifactManager(session);
-	if (!manager) return {};
-	try {
-		const allocation = await manager.allocatePath(toolType);
-		return { artifactPath: allocation.path, artifactId: allocation.id };
-	} catch {
-		return {};
-	}
-}