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

package/src/providers/amazon-bedrock.ts

@@ -17,8 +17,7 @@ import {
 	type ToolConfiguration,
 	ToolResultStatus,
 } from "@aws-sdk/client-bedrock-runtime";
-
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
+import { calculateCost } from "../models";
 import type {
 	Api,
 	AssistantMessage,
@@ -34,10 +33,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 { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { parseStreamingJson } from "../utils/json-parse";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import { transformMessages } from "./transform-messages";
 
 export interface BedrockOptions extends StreamOptions {
@@ -200,7 +199,7 @@ function handleContentBlockDelta(
 ): void {
 	const contentBlockIndex = event.contentBlockIndex!;
 	const delta = event.delta;
-	let index = blocks.findIndex((b) => b.index === contentBlockIndex);
+	let index = blocks.findIndex(b => b.index === contentBlockIndex);
 	let block = blocks[index];
 
 	if (delta?.text !== undefined) {
@@ -271,7 +270,7 @@ function handleContentBlockStop(
 	output: AssistantMessage,
 	stream: AssistantMessageEventStream,
 ): void {
-	const index = blocks.findIndex((b) => b.index === event.contentBlockIndex);
+	const index = blocks.findIndex(b => b.index === event.contentBlockIndex);
 	const block = blocks[index];
 	if (!block) return;
 	delete (block as Block).index;
@@ -351,7 +350,7 @@ function convertMessages(context: Context, model: Model<"bedrock-converse-stream
 					});
 				} else {
 					const contentBlocks = m.content
-						.map((c) => {
+						.map(c => {
 							switch (c.type) {
 								case "text":
 									return { text: sanitizeSurrogates(c.text) };
@@ -361,7 +360,7 @@ function convertMessages(context: Context, model: Model<"bedrock-converse-stream
 									throw new Error("Unknown user content type");
 							}
 						})
-						.filter((block) => {
+						.filter(block => {
 							// Filter out empty text blocks
 							if ("text" in block && block.text) {
 								return block.text.trim().length > 0;
@@ -442,7 +441,7 @@ function convertMessages(context: Context, model: Model<"bedrock-converse-stream
 				toolResults.push({
 					toolResult: {
 						toolUseId: sanitizeToolCallId(m.toolCallId),
-						content: m.content.map((c) =>
+						content: m.content.map(c =>
 							c.type === "image"
 								? { image: createImageBlock(c.mimeType, c.data) }
 								: { text: sanitizeSurrogates(c.text) },
@@ -458,7 +457,7 @@ function convertMessages(context: Context, model: Model<"bedrock-converse-stream
 					toolResults.push({
 						toolResult: {
 							toolUseId: sanitizeToolCallId(nextMsg.toolCallId),
-							content: nextMsg.content.map((c) =>
+							content: nextMsg.content.map(c =>
 								c.type === "image"
 									? { image: createImageBlock(c.mimeType, c.data) }
 									: { text: sanitizeSurrogates(c.text) },
@@ -500,7 +499,7 @@ function convertToolConfig(
 ): ToolConfiguration | undefined {
 	if (!tools?.length || toolChoice === "none") return undefined;
 
-	const bedrockTools: BedrockTool[] = tools.map((tool) => ({
+	const bedrockTools: BedrockTool[] = tools.map(tool => ({
 		toolSpec: {
 			name: tool.name,
 			description: tool.description,

package/src/providers/anthropic.ts

@@ -4,8 +4,8 @@ import type {
 	MessageCreateParamsStreaming,
 	MessageParam,
 } from "@anthropic-ai/sdk/resources/messages";
-import { calculateCost } from "@oh-my-pi/pi-ai/models";
-import { getEnvApiKey, OUTPUT_FALLBACK_BUFFER } from "@oh-my-pi/pi-ai/stream";
+import { calculateCost } from "../models";
+import { getEnvApiKey, OUTPUT_FALLBACK_BUFFER } from "../stream";
 import type {
 	Api,
 	AssistantMessage,
@@ -21,12 +21,11 @@ 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 { sanitizeSurrogates } from "@oh-my-pi/pi-ai/utils/sanitize-unicode";
-
+} from "../types";
+import { AssistantMessageEventStream } from "../utils/event-stream";
+import { parseStreamingJson } from "../utils/json-parse";
+import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
+import { sanitizeSurrogates } from "../utils/sanitize-unicode";
 import { transformMessages } from "./transform-messages";
 
 // Stealth mode: Mimic Claude Code headers and tool prefixing.
@@ -89,13 +88,13 @@ function convertContentBlocks(content: (TextContent | ImageContent)[]):
 			  }
 	  > {
 	// If only text blocks, return as concatenated string for simplicity
-	const hasImages = content.some((c) => c.type === "image");
+	const hasImages = content.some(c => c.type === "image");
 	if (!hasImages) {
-		return sanitizeSurrogates(content.map((c) => (c as TextContent).text).join("\n"));
+		return sanitizeSurrogates(content.map(c => (c as TextContent).text).join("\n"));
 	}
 
 	// If we have images, convert to content block array
-	const blocks = content.map((block) => {
+	const blocks = content.map(block => {
 		if (block.type === "text") {
 			return {
 				type: "text" as const,
@@ -113,7 +112,7 @@ function convertContentBlocks(content: (TextContent | ImageContent)[]):
 	});
 
 	// If only images (no text), add placeholder text block
-	const hasText = blocks.some((b) => b.type === "text");
+	const hasText = blocks.some(b => b.type === "text");
 	if (!hasText) {
 		blocks.unshift({
 			type: "text" as const,
@@ -218,7 +217,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 					}
 				} else if (event.type === "content_block_delta") {
 					if (event.delta.type === "text_delta") {
-						const index = blocks.findIndex((b) => b.index === event.index);
+						const index = blocks.findIndex(b => b.index === event.index);
 						const block = blocks[index];
 						if (block && block.type === "text") {
 							block.text += event.delta.text;
@@ -230,7 +229,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 							});
 						}
 					} else if (event.delta.type === "thinking_delta") {
-						const index = blocks.findIndex((b) => b.index === event.index);
+						const index = blocks.findIndex(b => b.index === event.index);
 						const block = blocks[index];
 						if (block && block.type === "thinking") {
 							block.thinking += event.delta.thinking;
@@ -242,7 +241,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 							});
 						}
 					} else if (event.delta.type === "input_json_delta") {
-						const index = blocks.findIndex((b) => b.index === event.index);
+						const index = blocks.findIndex(b => b.index === event.index);
 						const block = blocks[index];
 						if (block && block.type === "toolCall") {
 							block.partialJson += event.delta.partial_json;
@@ -255,7 +254,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 							});
 						}
 					} else if (event.delta.type === "signature_delta") {
-						const index = blocks.findIndex((b) => b.index === event.index);
+						const index = blocks.findIndex(b => b.index === event.index);
 						const block = blocks[index];
 						if (block && block.type === "thinking") {
 							block.thinkingSignature = block.thinkingSignature || "";
@@ -263,7 +262,7 @@ export const streamAnthropic: StreamFunction<"anthropic-messages"> = (
 						}
 					}
 				} else if (event.type === "content_block_stop") {
-					const index = blocks.findIndex((b) => b.index === event.index);
+					const index = blocks.findIndex(b => b.index === event.index);
 					const block = blocks[index];
 					if (block) {
 						delete (block as any).index;
@@ -360,7 +359,7 @@ function isAnthropicBaseUrl(baseUrl?: string): boolean {
 export function normalizeExtraBetas(betas?: string[] | string): string[] {
 	if (!betas) return [];
 	const raw = Array.isArray(betas) ? betas : betas.split(",");
-	return raw.map((beta) => beta.trim()).filter((beta) => beta.length > 0);
+	return raw.map(beta => beta.trim()).filter(beta => beta.length > 0);
 }
 
 // Build deduplicated beta header string
@@ -406,7 +405,7 @@ export function buildAnthropicHeaders(options: AnthropicHeaderOptions): Record<s
 			"X-App",
 			"Authorization",
 			"X-Api-Key",
-		].map((key) => key.toLowerCase()),
+		].map(key => key.toLowerCase()),
 	);
 	const modelHeaders = Object.fromEntries(
 		Object.entries(options.modelHeaders ?? {}).filter(([key]) => !enforcedHeaderKeys.has(key.toLowerCase())),
@@ -687,7 +686,7 @@ function applyPromptCaching(params: MessageCreateParamsStreaming): void {
 	// 3. Cache penultimate user message for conversation history caching
 	const userIndexes = params.messages
 		.map((message, index) => (message.role === "user" ? index : -1))
-		.filter((index) => index >= 0);
+		.filter(index => index >= 0);
 
 	if (userIndexes.length >= 2) {
 		const penultimateUserIndex = userIndexes[userIndexes.length - 2];
@@ -727,6 +726,8 @@ function convertMessages(
 	isOAuthToken: boolean,
 ): MessageParam[] {
 	const params: MessageParam[] = [];
+	// Track tool call IDs from skipped assistant messages to also skip their results
+	let skippedToolCallIds: string[] | null = null;
 
 	// Transform messages for cross-provider compatibility
 	const transformedMessages = transformMessages(messages, model);
@@ -746,7 +747,7 @@ function convertMessages(
 					});
 				}
 			} else if (Array.isArray(msg.content)) {
-				const blocks: Array<ContentBlockParam & CacheControlBlock> = msg.content.map((item) => {
+				const blocks: Array<ContentBlockParam & CacheControlBlock> = msg.content.map(item => {
 					if (item.type === "text") {
 						return {
 							type: "text",
@@ -762,8 +763,8 @@ function convertMessages(
 						},
 					};
 				});
-				let filteredBlocks = !model?.input.includes("image") ? blocks.filter((b) => b.type !== "image") : blocks;
-				filteredBlocks = filteredBlocks.filter((b) => {
+				let filteredBlocks = !model?.input.includes("image") ? blocks.filter(b => b.type !== "image") : blocks;
+				filteredBlocks = filteredBlocks.filter(b => {
 					if (b.type === "text") {
 						return b.text.trim().length > 0;
 					}
@@ -779,6 +780,31 @@ function convertMessages(
 			// Skip messages with undefined/null content
 			if (!msg.content || !Array.isArray(msg.content)) continue;
 
+			// When interleaved thinking is enabled, Anthropic requires the last assistant
+			// message to start with a thinking block. If the first content block is a thinking
+			// block with a missing/invalid signature (e.g., from aborted stream), we must skip
+			// the entire message to avoid API rejection. Checking the first non-empty block.
+			const firstContentBlock = msg.content.find(
+				b =>
+					(b.type === "text" && b.text.trim().length > 0) ||
+					(b.type === "thinking" && b.thinking.trim().length > 0) ||
+					b.type === "toolCall",
+			);
+			if (
+				firstContentBlock?.type === "thinking" &&
+				(!firstContentBlock.thinkingSignature || firstContentBlock.thinkingSignature.trim().length === 0)
+			) {
+				// Skip this assistant message - it has corrupt thinking that would break the API.
+				// Also track any tool calls in this message so we can skip their results.
+				for (const block of msg.content) {
+					if (block.type === "toolCall") {
+						skippedToolCallIds ??= [];
+						skippedToolCallIds.push(block.id);
+					}
+				}
+				continue;
+			}
+
 			const blocks: Array<ContentBlockParam & CacheControlBlock> = [];
 
 			for (const block of msg.content) {
@@ -824,23 +850,27 @@ function convertMessages(
 			const toolResults: Array<ContentBlockParam & CacheControlBlock> = [];
 
 			// Add the current tool result
-			toolResults.push({
-				type: "tool_result",
-				tool_use_id: sanitizeToolCallId(msg.toolCallId),
-				content: convertContentBlocks(msg.content),
-				is_error: msg.isError,
-			});
+			if (!skippedToolCallIds?.includes(msg.toolCallId)) {
+				toolResults.push({
+					type: "tool_result",
+					tool_use_id: sanitizeToolCallId(msg.toolCallId),
+					content: convertContentBlocks(msg.content),
+					is_error: msg.isError,
+				});
+			}
 
 			// Look ahead for consecutive toolResult messages
 			let j = i + 1;
 			while (j < transformedMessages.length && transformedMessages[j].role === "toolResult") {
 				const nextMsg = transformedMessages[j] as ToolResultMessage; // We know it's a toolResult
-				toolResults.push({
-					type: "tool_result",
-					tool_use_id: sanitizeToolCallId(nextMsg.toolCallId),
-					content: convertContentBlocks(nextMsg.content),
-					is_error: nextMsg.isError,
-				});
+				if (!skippedToolCallIds?.includes(nextMsg.toolCallId)) {
+					toolResults.push({
+						type: "tool_result",
+						tool_use_id: sanitizeToolCallId(nextMsg.toolCallId),
+						content: convertContentBlocks(nextMsg.content),
+						is_error: nextMsg.isError,
+					});
+				}
 				j++;
 			}
 
@@ -858,7 +888,7 @@ function convertMessages(
 	}
 
 	// Final validation: filter out any messages with invalid content
-	return params.filter((msg) => {
+	return params.filter(msg => {
 		if (!msg.content) return false;
 		if (typeof msg.content === "string") return msg.content.length > 0;
 		if (Array.isArray(msg.content)) return msg.content.length > 0;
@@ -869,7 +899,7 @@ function convertMessages(
 function convertTools(tools: Tool[], isOAuthToken: boolean): Anthropic.Messages.Tool[] {
 	if (!tools) return [];
 
-	return tools.map((tool) => {
+	return tools.map(tool => {
 		const jsonSchema = tool.parameters as any; // TypeBox already generates JSON Schema
 
 		return {

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;