@oh-my-pi/pi-ai 8.1.0 → 8.2.0

package/src/providers/cursor.ts

@@ -1,9 +1,10 @@
 import { createHash } from "node:crypto";
-import { appendFile } from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import http2 from "node:http2";
 import { create, fromBinary, fromJson, type JsonValue, toBinary, toJson } from "@bufbuild/protobuf";
 import { ValueSchema } from "@bufbuild/protobuf/wkt";
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
+import JSON5 from "json5";
+import { calculateCost } from "../models";
 import type {
 	Api,
 	AssistantMessage,
@@ -22,11 +23,10 @@ import type {
 	Tool,
 	ToolCall,
 	ToolResultMessage,
-} from "@oh-my-pi/pi-ai/types";
-import { AssistantMessageEventStream } from "@oh-my-pi/pi-ai/utils/event-stream";
-import { parseStreamingJson } from "@oh-my-pi/pi-ai/utils/json-parse";
-import { formatErrorMessageWithRetryAfter } from "@oh-my-pi/pi-ai/utils/retry-after";
-import JSON5 from "json5";
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { parseStreamingJson } from "../utils/json-parse";
+import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
 import type { McpToolDefinition } from "./cursor/gen/agent_pb";
 import {
 	AgentClientMessageSchema,
@@ -142,7 +142,7 @@ async function appendCursorDebugLog(entry: CursorLogEntry): Promise<void> {
 	const logPath = process.env.DEBUG_CURSOR_LOG;
 	if (!logPath) return;
 	try {
-		await appendFile(logPath, `${JSON.stringify(entry, debugReplacer)}\n`);
+		await fs.appendFile(logPath, `${JSON.stringify(entry, debugReplacer)}\n`);
 	} catch {
 		// Ignore debug log failures
 	}
@@ -245,7 +245,7 @@ function decodeLogData(value: unknown): unknown {
 		return value;
 	}
 	if (Array.isArray(value)) {
-		return value.map((entry) => decodeLogData(entry));
+		return value.map(entry => decodeLogData(entry));
 	}
 	const record = value as Record<string, unknown>;
 	const typeName = record.$typeName;
@@ -375,13 +375,13 @@ export const streamCursor: StreamFunction<"cursor-agent"> = (
 				get firstTokenTime() {
 					return firstTokenTime;
 				},
-				setTextBlock: (b) => {
+				setTextBlock: b => {
 					currentTextBlock = b;
 				},
-				setThinkingBlock: (b) => {
+				setThinkingBlock: b => {
 					currentThinkingBlock = b;
 				},
-				setToolCall: (t) => {
+				setToolCall: t => {
 					currentToolCall = t;
 				},
 				setFirstTokenTime: () => {
@@ -427,7 +427,7 @@ export const streamCursor: StreamFunction<"cursor-agent"> = (
 							usageState,
 							requestContextTools,
 							onConversationCheckpoint,
-						).catch((error) => {
+						).catch(error => {
 							log("error", "handleServerMessage", { error: String(error) });
 						});
 					} catch (e) {
@@ -452,7 +452,7 @@ export const streamCursor: StreamFunction<"cursor-agent"> = (
 			heartbeatTimer = setInterval(sendHeartbeat, 5000);
 
 			await new Promise<void>((resolve, reject) => {
-				h2Request!.on("trailers", (trailers) => {
+				h2Request!.on("trailers", trailers => {
 					const status = trailers["grpc-status"];
 					const msg = trailers["grpc-message"];
 					if (status && status !== "0") {
@@ -662,9 +662,9 @@ async function handleShellStreamArgs(
 		args as any,
 		execHandlers?.shell,
 		onToolResult,
-		(toolResult) => buildShellResultFromToolResult(args as any, toolResult),
-		(reason) => buildShellRejectedResult((args as any).command, (args as any).workingDirectory, reason),
-		(error) => buildShellFailureResult((args as any).command, (args as any).workingDirectory, error),
+		toolResult => buildShellResultFromToolResult(args as any, toolResult),
+		reason => buildShellRejectedResult((args as any).command, (args as any).workingDirectory, reason),
+		error => buildShellFailureResult((args as any).command, (args as any).workingDirectory, error),
 	);
 
 	sendShellStreamEvent(h2Request, execMsg, { case: "start", value: create(ShellStreamStartSchema, {}) });
@@ -810,9 +810,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.read,
 				onToolResult,
-				(toolResult) => buildReadResultFromToolResult(args.path, toolResult),
-				(reason) => buildReadRejectedResult(args.path, reason),
-				(error) => buildReadErrorResult(args.path, error),
+				toolResult => buildReadResultFromToolResult(args.path, toolResult),
+				reason => buildReadRejectedResult(args.path, reason),
+				error => buildReadErrorResult(args.path, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "readResult", execResult);
 			return;
@@ -823,9 +823,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.ls,
 				onToolResult,
-				(toolResult) => buildLsResultFromToolResult(args.path, toolResult),
-				(reason) => buildLsRejectedResult(args.path, reason),
-				(error) => buildLsErrorResult(args.path, error),
+				toolResult => buildLsResultFromToolResult(args.path, toolResult),
+				reason => buildLsRejectedResult(args.path, reason),
+				error => buildLsErrorResult(args.path, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "lsResult", execResult);
 			return;
@@ -836,9 +836,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.grep,
 				onToolResult,
-				(toolResult) => buildGrepResultFromToolResult(args, toolResult),
-				(reason) => buildGrepErrorResult(reason),
-				(error) => buildGrepErrorResult(error),
+				toolResult => buildGrepResultFromToolResult(args, toolResult),
+				reason => buildGrepErrorResult(reason),
+				error => buildGrepErrorResult(error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "grepResult", execResult);
 			return;
@@ -849,7 +849,7 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.write,
 				onToolResult,
-				(toolResult) =>
+				toolResult =>
 					buildWriteResultFromToolResult(
 						{
 							path: args.path,
@@ -859,8 +859,8 @@ async function handleExecServerMessage(
 						},
 						toolResult,
 					),
-				(reason) => buildWriteRejectedResult(args.path, reason),
-				(error) => buildWriteErrorResult(args.path, error),
+				reason => buildWriteRejectedResult(args.path, reason),
+				error => buildWriteErrorResult(args.path, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "writeResult", execResult);
 			return;
@@ -871,9 +871,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.delete,
 				onToolResult,
-				(toolResult) => buildDeleteResultFromToolResult(args.path, toolResult),
-				(reason) => buildDeleteRejectedResult(args.path, reason),
-				(error) => buildDeleteErrorResult(args.path, error),
+				toolResult => buildDeleteResultFromToolResult(args.path, toolResult),
+				reason => buildDeleteRejectedResult(args.path, reason),
+				error => buildDeleteErrorResult(args.path, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "deleteResult", execResult);
 			return;
@@ -884,9 +884,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.shell,
 				onToolResult,
-				(toolResult) => buildShellResultFromToolResult(args, toolResult),
-				(reason) => buildShellRejectedResult(args.command, args.workingDirectory, reason),
-				(error) => buildShellFailureResult(args.command, args.workingDirectory, error),
+				toolResult => buildShellResultFromToolResult(args, toolResult),
+				reason => buildShellRejectedResult(args.command, args.workingDirectory, reason),
+				error => buildShellFailureResult(args.command, args.workingDirectory, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "shellResult", execResult);
 			return;
@@ -944,9 +944,9 @@ async function handleExecServerMessage(
 				args,
 				execHandlers?.diagnostics,
 				onToolResult,
-				(toolResult) => buildDiagnosticsResultFromToolResult(args.path, toolResult),
-				(reason) => buildDiagnosticsRejectedResult(args.path, reason),
-				(error) => buildDiagnosticsErrorResult(args.path, error),
+				toolResult => buildDiagnosticsResultFromToolResult(args.path, toolResult),
+				reason => buildDiagnosticsRejectedResult(args.path, reason),
+				error => buildDiagnosticsErrorResult(args.path, error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "diagnosticsResult", execResult);
 			return;
@@ -958,9 +958,9 @@ async function handleExecServerMessage(
 				mcpCall,
 				execHandlers?.mcp,
 				onToolResult,
-				(toolResult) => buildMcpResultFromToolResult(mcpCall, toolResult),
-				(_reason) => buildMcpToolNotFoundResult(mcpCall),
-				(error) => buildMcpErrorResult(error),
+				toolResult => buildMcpResultFromToolResult(mcpCall, toolResult),
+				_reason => buildMcpToolNotFoundResult(mcpCall),
+				error => buildMcpErrorResult(error),
 			);
 			sendExecClientMessage(h2Request, execMsg, "mcpResult", execResult);
 			return;
@@ -1075,7 +1075,7 @@ async function applyToolResultHandler(
 }
 
 function toolResultToText(toolResult: ToolResultMessage): string {
-	return toolResult.content.map((item) => (item.type === "text" ? item.text : `[${item.mimeType} image]`)).join("\n");
+	return toolResult.content.map(item => (item.type === "text" ? item.text : `[${item.mimeType} image]`)).join("\n");
 }
 
 function toolResultWasTruncated(toolResult: ToolResultMessage): boolean {
@@ -1274,8 +1274,8 @@ function buildLsResultFromToolResult(path: string, toolResult: ToolResultMessage
 	const rootPath = path || ".";
 	const entries = text
 		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0 && !line.startsWith("["));
+		.map(line => line.trim())
+		.filter(line => line.length > 0 && !line.startsWith("["));
 	const childrenDirs: LsDirectoryTreeNode[] = [];
 	const childrenFiles: LsDirectoryTreeNode_File[] = [];
 
@@ -1346,8 +1346,8 @@ function buildGrepResultFromToolResult(
 	const clientTruncated = toolResultDetailBoolean(toolResult, "truncated");
 	const lines = text
 		.split("\n")
-		.map((line) => line.trimEnd())
-		.filter((line) => line.length > 0 && !line.startsWith("[") && !line.toLowerCase().startsWith("no matches"));
+		.map(line => line.trimEnd())
+		.filter(line => line.length > 0 && !line.startsWith("[") && !line.toLowerCase().startsWith("no matches"));
 
 	const workspaceKey = args.path || ".";
 	let unionResult: GrepUnionResult;
@@ -1367,7 +1367,7 @@ function buildGrepResultFromToolResult(
 		});
 	} else if (outputMode === "count") {
 		const counts = lines
-			.map((line) => {
+			.map(line => {
 				const separatorIndex = line.lastIndexOf(":");
 				if (separatorIndex === -1) {
 					return null;
@@ -1417,7 +1417,7 @@ function buildGrepResultFromToolResult(
 		const matches = Array.from(matchMap.entries()).map(([file, matches]) =>
 			create(GrepFileMatchSchema, {
 				file,
-				matches: matches.map((entry) =>
+				matches: matches.map(entry =>
 					create(GrepContentMatchSchema, {
 						lineNumber: entry.line,
 						content: entry.content,
@@ -1586,7 +1586,7 @@ function buildTodoWriteArgs(toolCall: CursorUpdateTodosToolCall): {
 	const todos = toolCall.updateTodosToolCall?.args?.todos;
 	if (!todos) return null;
 	return {
-		todos: todos.map((todo) => ({
+		todos: todos.map(todo => ({
 			id: typeof todo.id === "string" && todo.id.length > 0 ? todo.id : undefined,
 			content: typeof todo.content === "string" ? todo.content : "",
 			activeForm: typeof todo.content === "string" ? todo.content : "",
@@ -1599,7 +1599,7 @@ function buildMcpResultFromToolResult(_mcpCall: CursorMcpCall, toolResult: ToolR
 	if (toolResult.isError) {
 		return buildMcpErrorResult(toolResultToText(toolResult) || "MCP tool failed");
 	}
-	const content = toolResult.content.map((item) => {
+	const content = toolResult.content.map(item => {
 		if (item.type === "image") {
 			return create(McpToolResultContentItemSchema, {
 				content: {
@@ -1810,12 +1810,12 @@ function buildMcpToolDefinitions(tools: Tool[] | undefined): McpToolDefinition[]
 		return [];
 	}
 
-	const advertisedTools = tools.filter((tool) => !CURSOR_NATIVE_TOOL_NAMES.has(tool.name));
+	const advertisedTools = tools.filter(tool => !CURSOR_NATIVE_TOOL_NAMES.has(tool.name));
 	if (advertisedTools.length === 0) {
 		return [];
 	}
 
-	return advertisedTools.map((tool) => {
+	return advertisedTools.map(tool => {
 		const jsonSchema = tool.parameters as Record<string, unknown> | undefined;
 		const schemaValue: JsonValue =
 			jsonSchema && typeof jsonSchema === "object"
@@ -1841,7 +1841,7 @@ function extractUserMessageText(msg: Message): string {
 	if (typeof content === "string") return content.trim();
 	const text = content
 		.filter((c): c is TextContent => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 	return text.trim();
 }
@@ -1854,7 +1854,7 @@ function extractAssistantMessageText(msg: Message): string {
 	if (!Array.isArray(msg.content)) return "";
 	return msg.content
 		.filter((c): c is TextContent => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 }
 
@@ -2007,7 +2007,7 @@ function buildGrpcRequest(
 	// Build conversation turns from prior messages (excluding the last user message)
 	const turns = buildConversationTurns(context.messages);
 
-	const hasMatchingPrompt = state.conversationState?.rootPromptMessagesJson?.some((entry) =>
+	const hasMatchingPrompt = state.conversationState?.rootPromptMessagesJson?.some(entry =>
 		Buffer.from(entry).equals(systemPromptId),
 	);
 
@@ -2064,7 +2064,7 @@ function buildGrpcRequest(
 
 	const requestBytes = toBinary(AgentClientMessageSchema, clientMessage);
 
-	const toolNames = context.tools?.map((tool) => tool.name) ?? [];
+	const toolNames = context.tools?.map(tool => tool.name) ?? [];
 	const detail =
 		process.env.DEBUG_CURSOR === "2"
 			? ` ${JSON.stringify(clientMessage.message.value, debugReplacer, 2)?.slice(0, 2000)}`
@@ -2082,6 +2082,6 @@ function buildGrpcRequest(
 function extractText(content: (TextContent | ImageContent)[]): string {
 	return content
 		.filter((c): c is TextContent => c.type === "text")
-		.map((c) => c.text)
+		.map(c => c.text)
 		.join("\n");
 }

package/src/providers/google-gemini-cli-usage.ts

@@ -6,8 +6,8 @@ import type {
 	UsageProvider,
 	UsageReport,
 	UsageWindow,
-} from "@oh-my-pi/pi-ai/usage";
-import { refreshGoogleCloudToken } from "@oh-my-pi/pi-ai/utils/oauth/google-gemini-cli";
+} from "../usage";
+import { refreshGoogleCloudToken } from "../utils/oauth/google-gemini-cli";
 
 const DEFAULT_ENDPOINT = "https://cloudcode-pa.googleapis.com";
 const CACHE_TTL_MS = 60_000;

package/src/providers/google-gemini-cli.ts

@@ -3,10 +3,10 @@
  * Shared implementation for both google-gemini-cli and google-antigravity providers.
  * Uses the Cloud Code Assist API endpoint to access Gemini and Claude models.
  */
-
 import { createHash } from "node:crypto";
 import type { Content, ThinkingConfig } from "@google/genai";
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
+import { abortableSleep } from "@oh-my-pi/pi-utils";
+import { calculateCost } from "../models";
 import type {
 	Api,
 	AssistantMessage,
@@ -17,10 +17,9 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "@oh-my-pi/pi-ai/types";
-import { AssistantMessageEventStream } from "@oh-my-pi/pi-ai/utils/event-stream";
-import { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
-import { abortableSleep } from "@oh-my-pi/pi-utils";
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import {
 	convertMessages,
 	convertTools,
@@ -660,8 +659,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 
 										const providedId = part.functionCall.id;
 										const needsNewId =
-											!providedId ||
-											output.content.some((b) => b.type === "toolCall" && b.id === providedId);
+											!providedId || output.content.some(b => b.type === "toolCall" && b.id === providedId);
 										const toolCallId = needsNewId
 											? `${part.functionCall.name}_${Date.now()}_${++toolCallCounter}`
 											: providedId;
@@ -695,7 +693,7 @@ export const streamGoogleGeminiCli: StreamFunction<"google-gemini-cli"> = (
 
 							if (candidate?.finishReason) {
 								output.stopReason = mapStopReasonString(candidate.finishReason);
-								if (output.content.some((b) => b.type === "toolCall")) {
+								if (output.content.some(b => b.type === "toolCall")) {
 									output.stopReason = "toolUse";
 								}
 							}
@@ -840,7 +838,7 @@ function deriveSessionId(context: Context): string | undefined {
 		} else if (Array.isArray(message.content)) {
 			text = message.content
 				.filter((item): item is TextContent => item.type === "text")
-				.map((item) => item.text)
+				.map(item => item.text)
 				.join("\n");
 		}
 

package/src/providers/google-shared.ts

@@ -1,10 +1,9 @@
 /**
  * Shared utilities for Google Generative AI and Google Cloud Code Assist providers.
  */
-
 import { type Content, FinishReason, FunctionCallingConfigMode, type Part, type Schema } from "@google/genai";
-import type { Context, ImageContent, Model, StopReason, TextContent, Tool } from "@oh-my-pi/pi-ai/types";
-import { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
+import type { Context, ImageContent, Model, StopReason, TextContent, Tool } from "../types";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import { transformMessages } from "./transform-messages";
 
 type GoogleApiType = "google-generative-ai" | "google-gemini-cli" | "google-vertex";
@@ -86,7 +85,7 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 					parts: [{ text: sanitizeSurrogates(msg.content) }],
 				});
 			} else {
-				const parts: Part[] = msg.content.map((item) => {
+				const parts: Part[] = msg.content.map(item => {
 					if (item.type === "text") {
 						return { text: sanitizeSurrogates(item.text) };
 					} else {
@@ -99,8 +98,8 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 					}
 				});
 				// Filter out images if model doesn't support them, and empty text blocks
-				let filteredParts = !model.input.includes("image") ? parts.filter((p) => p.text !== undefined) : parts;
-				filteredParts = filteredParts.filter((p) => {
+				let filteredParts = !model.input.includes("image") ? parts.filter(p => p.text !== undefined) : parts;
+				filteredParts = filteredParts.filter(p => {
 					if (p.text !== undefined) {
 						return p.text.trim().length > 0;
 					}
@@ -180,7 +179,7 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 		} else if (msg.role === "toolResult") {
 			// Extract text and image content
 			const textContent = msg.content.filter((c): c is TextContent => c.type === "text");
-			const textResult = textContent.map((c) => c.text).join("\n");
+			const textResult = textContent.map(c => c.text).join("\n");
 			const imageContent = model.input.includes("image")
 				? msg.content.filter((c): c is ImageContent => c.type === "image")
 				: [];
@@ -196,7 +195,7 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 			// Use "output" key for success, "error" key for errors as per SDK documentation
 			const responseValue = hasText ? sanitizeSurrogates(textResult) : hasImages ? "(see attached image)" : "";
 
-			const imageParts: Part[] = imageContent.map((imageBlock) => ({
+			const imageParts: Part[] = imageContent.map(imageBlock => ({
 				inlineData: {
 					mimeType: imageBlock.mimeType,
 					data: imageBlock.data,
@@ -221,7 +220,7 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 			// Cloud Code Assist API requires all function responses to be in a single user turn.
 			// Check if the last content is already a user turn with function responses and merge.
 			const lastContent = contents[contents.length - 1];
-			if (lastContent?.role === "user" && lastContent.parts?.some((p) => p.functionResponse)) {
+			if (lastContent?.role === "user" && lastContent.parts?.some(p => p.functionResponse)) {
 				lastContent.parts.push(functionResponsePart);
 			} else {
 				contents.push({
@@ -270,7 +269,7 @@ const UNSUPPORTED_SCHEMA_FIELDS = new Set([
 
 function sanitizeSchemaImpl(value: unknown, isInsideProperties: boolean): unknown {
 	if (Array.isArray(value)) {
-		return value.map((entry) => sanitizeSchemaImpl(entry, isInsideProperties));
+		return value.map(entry => sanitizeSchemaImpl(entry, isInsideProperties));
 	}
 
 	if (!value || typeof value !== "object") {
@@ -286,11 +285,11 @@ function sanitizeSchemaImpl(value: unknown, isInsideProperties: boolean): unknow
 			const variants = obj[combiner] as Record<string, unknown>[];
 
 			// Check if ALL variants have a const field
-			const allHaveConst = variants.every((v) => v && typeof v === "object" && "const" in v);
+			const allHaveConst = variants.every(v => v && typeof v === "object" && "const" in v);
 
 			if (allHaveConst && variants.length > 0) {
 				// Extract all const values into enum
-				result.enum = variants.map((v) => v.const);
+				result.enum = variants.map(v => v.const);
 
 				// Inherit type from first variant if present
 				const firstType = variants[0]?.type;
@@ -327,7 +326,7 @@ function sanitizeSchemaImpl(value: unknown, isInsideProperties: boolean): unknow
 	if (constValue !== undefined) {
 		// Convert const to enum, merging with existing enum if present
 		const existingEnum = Array.isArray(result.enum) ? result.enum : [];
-		if (!existingEnum.some((item) => Object.is(item, constValue))) {
+		if (!existingEnum.some(item => Object.is(item, constValue))) {
 			existingEnum.push(constValue);
 		}
 		result.enum = existingEnum;

package/src/providers/google-vertex.ts

@@ -5,7 +5,7 @@ import {
 	type ThinkingConfig,
 	ThinkingLevel,
 } from "@google/genai";
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
+import { calculateCost } from "../models";
 import type {
 	Api,
 	AssistantMessage,
@@ -16,10 +16,10 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "@oh-my-pi/pi-ai/types";
-import { AssistantMessageEventStream } from "@oh-my-pi/pi-ai/utils/event-stream";
-import { formatErrorMessageWithRetryAfter } from "@oh-my-pi/pi-ai/utils/retry-after";
-import { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import type { GoogleThinkingLevel } from "./google-gemini-cli";
 import {
 	convertMessages,
@@ -183,7 +183,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 
 							const providedId = part.functionCall.id;
 							const needsNewId =
-								!providedId || output.content.some((b) => b.type === "toolCall" && b.id === providedId);
+								!providedId || output.content.some(b => b.type === "toolCall" && b.id === providedId);
 							const toolCallId = needsNewId
 								? `${part.functionCall.name}_${Date.now()}_${++toolCallCounter}`
 								: providedId;
@@ -211,7 +211,7 @@ export const streamGoogleVertex: StreamFunction<"google-vertex"> = (
 
 				if (candidate?.finishReason) {
 					output.stopReason = mapStopReason(candidate.finishReason);
-					if (output.content.some((b) => b.type === "toolCall")) {
+					if (output.content.some(b => b.type === "toolCall")) {
 						output.stopReason = "toolUse";
 					}
 				}

package/src/providers/google.ts

@@ -4,8 +4,8 @@ import {
 	GoogleGenAI,
 	type ThinkingConfig,
 } from "@google/genai";
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
-import { getEnvApiKey } from "@oh-my-pi/pi-ai/stream";
+import { calculateCost } from "../models";
+import { getEnvApiKey } from "../stream";
 import type {
 	Api,
 	AssistantMessage,
@@ -16,10 +16,10 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "@oh-my-pi/pi-ai/types";
-import { AssistantMessageEventStream } from "@oh-my-pi/pi-ai/utils/event-stream";
-import { formatErrorMessageWithRetryAfter } from "@oh-my-pi/pi-ai/utils/retry-after";
-import { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import type { GoogleThinkingLevel } from "./google-gemini-cli";
 import {
 	convertMessages,
@@ -170,7 +170,7 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 							// Generate unique ID if not provided or if it's a duplicate
 							const providedId = part.functionCall.id;
 							const needsNewId =
-								!providedId || output.content.some((b) => b.type === "toolCall" && b.id === providedId);
+								!providedId || output.content.some(b => b.type === "toolCall" && b.id === providedId);
 							const toolCallId = needsNewId
 								? `${part.functionCall.name}_${Date.now()}_${++toolCallCounter}`
 								: providedId;
@@ -198,7 +198,7 @@ export const streamGoogle: StreamFunction<"google-generative-ai"> = (
 
 				if (candidate?.finishReason) {
 					output.stopReason = mapStopReason(candidate.finishReason);
-					if (output.content.some((b) => b.type === "toolCall")) {
+					if (output.content.some(b => b.type === "toolCall")) {
 						output.stopReason = "toolUse";
 					}
 				}

package/src/providers/openai-codex/request-transformer.ts

@@ -73,8 +73,8 @@ function filterInput(input: InputItem[] | undefined): InputItem[] | undefined {
 	if (!Array.isArray(input)) return input;
 
 	return input
-		.filter((item) => item.type !== "item_reference")
-		.map((item) => {
+		.filter(item => item.type !== "item_reference")
+		.map(item => {
 			if (item.id != null) {
 				const { id: _id, ...rest } = item;
 				return rest as InputItem;
@@ -97,11 +97,11 @@ export async function transformRequestBody(
 		if (body.input) {
 			const functionCallIds = new Set(
 				body.input
-					.filter((item) => item.type === "function_call" && typeof item.call_id === "string")
-					.map((item) => item.call_id as string),
+					.filter(item => item.type === "function_call" && typeof item.call_id === "string")
+					.map(item => item.call_id as string),
 			);
 
-			body.input = body.input.map((item) => {
+			body.input = body.input.map(item => {
 				if (item.type === "function_call_output" && typeof item.call_id === "string") {
 					const callId = item.call_id as string;
 					if (!functionCallIds.has(callId)) {
@@ -131,7 +131,7 @@ export async function transformRequestBody(
 
 	if (prompt?.developerMessages && prompt.developerMessages.length > 0 && Array.isArray(body.input)) {
 		const developerMessages = prompt.developerMessages.map(
-			(text) =>
+			text =>
 				({
 					type: "message",
 					role: "developer",