@oh-my-pi/pi-ai 6.9.69 → 8.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-ai",
-	"version": "6.9.69",
+	"version": "8.0.0",
 	"description": "Unified LLM API with automatic model discovery and provider configuration",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -17,7 +17,7 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-utils": "6.9.69",
+		"@oh-my-pi/pi-utils": "8.0.0",
 		"@anthropic-ai/sdk": "0.71.2",
 		"@aws-sdk/client-bedrock-runtime": "^3.968.0",
 		"@bufbuild/protobuf": "^2.10.2",

package/src/index.ts

@@ -5,11 +5,18 @@ export * from "./providers/anthropic";
 export * from "./providers/cursor";
 export * from "./providers/google";
 export * from "./providers/google-gemini-cli";
+export * from "./providers/google-gemini-cli-usage";
 export * from "./providers/google-vertex";
 export * from "./providers/openai-completions";
 export * from "./providers/openai-responses";
 export * from "./stream";
 export * from "./types";
+export * from "./usage";
+export * from "./usage/claude";
+export * from "./usage/github-copilot";
+export * from "./usage/google-antigravity";
+export * from "./usage/openai-codex";
+export * from "./usage/zai";
 export * from "./utils/event-stream";
 export * from "./utils/oauth/index";
 export * from "./utils/overflow";

package/src/providers/amazon-bedrock.ts

@@ -18,7 +18,7 @@ import {
 	ToolResultStatus,
 } from "@aws-sdk/client-bedrock-runtime";
 
-import { calculateCost } from "../models";
+import { calculateCost } from "$ai/models";
 import type {
 	Api,
 	AssistantMessage,
@@ -34,10 +34,10 @@ import type {
 	Tool,
 	ToolCall,
 	ToolResultMessage,
-} from "../types";
-import { AssistantMessageEventStream } from "../utils/event-stream";
-import { parseStreamingJson } from "../utils/json-parse";
-import { sanitizeSurrogates } from "../utils/sanitize-unicode";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { parseStreamingJson } from "$ai/utils/json-parse";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 import { transformMessages } from "./transform-messages";
 
 export interface BedrockOptions extends StreamOptions {
@@ -342,22 +342,39 @@ function convertMessages(context: Context, model: Model<"bedrock-converse-stream
 
 		switch (m.role) {
 			case "user":
-				result.push({
-					role: ConversationRole.USER,
-					content:
-						typeof m.content === "string"
-							? [{ text: sanitizeSurrogates(m.content) }]
-							: m.content.map((c) => {
-									switch (c.type) {
-										case "text":
-											return { text: sanitizeSurrogates(c.text) };
-										case "image":
-											return { image: createImageBlock(c.mimeType, c.data) };
-										default:
-											throw new Error("Unknown user content type");
-									}
-								}),
-				});
+				if (typeof m.content === "string") {
+					// Skip empty user messages
+					if (!m.content || m.content.trim() === "") continue;
+					result.push({
+						role: ConversationRole.USER,
+						content: [{ text: sanitizeSurrogates(m.content) }],
+					});
+				} else {
+					const contentBlocks = m.content
+						.map((c) => {
+							switch (c.type) {
+								case "text":
+									return { text: sanitizeSurrogates(c.text) };
+								case "image":
+									return { image: createImageBlock(c.mimeType, c.data) };
+								default:
+									throw new Error("Unknown user content type");
+							}
+						})
+						.filter((block) => {
+							// Filter out empty text blocks
+							if ("text" in block && block.text) {
+								return block.text.trim().length > 0;
+							}
+							return true; // Keep non-text blocks (images)
+						});
+					// Skip message if all blocks filtered out
+					if (contentBlocks.length === 0) continue;
+					result.push({
+						role: ConversationRole.USER,
+						content: contentBlocks,
+					});
+				}
 				break;
 			case "assistant": {
 				// Skip assistant messages with empty content (e.g., from aborted requests)

package/src/providers/anthropic.ts

@@ -4,8 +4,8 @@ import type {
 	MessageCreateParamsStreaming,
 	MessageParam,
 } from "@anthropic-ai/sdk/resources/messages";
-import { calculateCost } from "../models";
-import { getEnvApiKey, OUTPUT_FALLBACK_BUFFER } from "../stream";
+import { calculateCost } from "$ai/models";
+import { getEnvApiKey, OUTPUT_FALLBACK_BUFFER } from "$ai/stream";
 import type {
 	Api,
 	AssistantMessage,
@@ -21,11 +21,11 @@ import type {
 	Tool,
 	ToolCall,
 	ToolResultMessage,
-} 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";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { parseStreamingJson } from "$ai/utils/json-parse";
+import { formatErrorMessageWithRetryAfter } from "$ai/utils/retry-after";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 
 import { transformMessages } from "./transform-messages";
 

package/src/providers/cursor.ts

@@ -4,7 +4,7 @@ import http2 from "node:http2";
 import { create, fromBinary, fromJson, type JsonValue, toBinary, toJson } from "@bufbuild/protobuf";
 import { ValueSchema } from "@bufbuild/protobuf/wkt";
 import JSON5 from "json5";
-import { calculateCost } from "../models";
+import { calculateCost } from "$ai/models";
 import type {
 	Api,
 	AssistantMessage,
@@ -23,10 +23,10 @@ import type {
 	Tool,
 	ToolCall,
 	ToolResultMessage,
-} from "../types";
-import { AssistantMessageEventStream } from "../utils/event-stream";
-import { parseStreamingJson } from "../utils/json-parse";
-import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { parseStreamingJson } from "$ai/utils/json-parse";
+import { formatErrorMessageWithRetryAfter } from "$ai/utils/retry-after";
 import type { McpToolDefinition } from "./cursor/gen/agent_pb";
 import {
 	AgentClientMessageSchema,
@@ -1838,11 +1838,12 @@ function buildMcpToolDefinitions(tools: Tool[] | undefined): McpToolDefinition[]
 function extractUserMessageText(msg: Message): string {
 	if (msg.role !== "user") return "";
 	const content = msg.content;
-	if (typeof content === "string") return content;
-	return content
+	if (typeof content === "string") return content.trim();
+	const text = content
 		.filter((c): c is TextContent => c.type === "text")
 		.map((c) => c.text)
 		.join("\n");
+	return text.trim();
 }
 
 /**
@@ -1891,7 +1892,7 @@ function buildConversationTurns(messages: Message[]): Uint8Array[] {
 
 		// Create and serialize user message
 		const userText = extractUserMessageText(msg);
-		if (!userText) {
+		if (!userText || userText.length === 0) {
 			i++;
 			continue;
 		}
@@ -1982,10 +1983,15 @@ function buildGrpcRequest(
 	const userText =
 		lastMessage?.role === "user"
 			? typeof lastMessage.content === "string"
-				? lastMessage.content
+				? lastMessage.content.trim()
 				: extractText(lastMessage.content)
 			: "";
 
+	// Validate that we have non-empty user text for the action
+	if (!userText || userText.trim().length === 0) {
+		throw new Error("Cannot send empty user message to Cursor API");
+	}
+
 	const userMessage = create(UserMessageSchema, {
 		text: userText,
 		messageId: crypto.randomUUID(),

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

@@ -0,0 +1,271 @@
+import type {
+	UsageAmount,
+	UsageFetchContext,
+	UsageFetchParams,
+	UsageLimit,
+	UsageProvider,
+	UsageReport,
+	UsageWindow,
+} from "$ai/usage";
+import { refreshGoogleCloudToken } from "$ai/utils/oauth/google-gemini-cli";
+
+const DEFAULT_ENDPOINT = "https://cloudcode-pa.googleapis.com";
+const CACHE_TTL_MS = 60_000;
+
+const GEMINI_CLI_HEADERS = {
+	"User-Agent": "google-cloud-sdk vscode_cloudshelleditor/0.1",
+	"X-Goog-Api-Client": "gl-node/22.17.0",
+	"Client-Metadata": JSON.stringify({
+		ideType: "IDE_UNSPECIFIED",
+		platform: "PLATFORM_UNSPECIFIED",
+		pluginType: "GEMINI",
+	}),
+};
+
+const GEMINI_TIER_MAP: Array<{ tier: string; models: string[] }> = [
+	{
+		tier: "3-Flash",
+		models: ["gemini-3-flash-preview", "gemini-3-flash"],
+	},
+	{
+		tier: "Flash",
+		models: ["gemini-2.5-flash", "gemini-2.5-flash-lite", "gemini-2.0-flash", "gemini-1.5-flash"],
+	},
+	{
+		tier: "Pro",
+		models: ["gemini-2.5-pro", "gemini-3-pro-preview", "gemini-3-pro", "gemini-1.5-pro"],
+	},
+];
+
+interface LoadCodeAssistResponse {
+	cloudaicompanionProject?: string | { id?: string };
+	currentTier?: { id?: string; name?: string };
+}
+
+interface RetrieveUserQuotaResponse {
+	buckets?: Array<{
+		modelId?: string;
+		remainingFraction?: number;
+		resetTime?: string;
+	}>;
+}
+
+function getProjectId(payload: LoadCodeAssistResponse | undefined): string | undefined {
+	if (!payload) return undefined;
+	if (typeof payload.cloudaicompanionProject === "string") {
+		return payload.cloudaicompanionProject;
+	}
+	if (payload.cloudaicompanionProject && typeof payload.cloudaicompanionProject === "object") {
+		return payload.cloudaicompanionProject.id;
+	}
+	return undefined;
+}
+
+function getModelTier(modelId: string): string | undefined {
+	for (const entry of GEMINI_TIER_MAP) {
+		if (entry.models.includes(modelId)) {
+			return entry.tier;
+		}
+	}
+	const normalized = modelId.toLowerCase();
+	if (normalized.includes("flash")) return "Flash";
+	if (normalized.includes("pro")) return "Pro";
+	return undefined;
+}
+
+function parseWindow(resetTime: string | undefined, now: number): UsageWindow {
+	if (!resetTime) {
+		return {
+			id: "quota",
+			label: "Quota window",
+		};
+	}
+	const resetsAt = Date.parse(resetTime);
+	if (Number.isNaN(resetsAt)) {
+		return {
+			id: "quota",
+			label: "Quota window",
+		};
+	}
+	return {
+		id: `reset-${resetsAt}`,
+		label: "Quota window",
+		resetsAt,
+		resetInMs: Math.max(0, resetsAt - now),
+	};
+}
+
+function buildAmount(remainingFraction: number | undefined): UsageAmount {
+	if (remainingFraction === undefined || !Number.isFinite(remainingFraction)) {
+		return { unit: "percent" };
+	}
+	const remaining = Math.min(Math.max(remainingFraction, 0), 1);
+	const used = Math.min(Math.max(1 - remaining, 0), 1);
+	return {
+		unit: "percent",
+		used: Math.round(used * 1000) / 10,
+		remaining: Math.round(remaining * 1000) / 10,
+		limit: 100,
+		usedFraction: used,
+		remainingFraction: remaining,
+	};
+}
+
+async function resolveAccessToken(params: UsageFetchParams, ctx: UsageFetchContext): Promise<string | undefined> {
+	const { credential } = params;
+	if (credential.type !== "oauth") return undefined;
+	const now = ctx.now();
+	if (credential.accessToken && (!credential.expiresAt || credential.expiresAt > now + 60_000)) {
+		return credential.accessToken;
+	}
+	if (!credential.refreshToken || !credential.projectId) return credential.accessToken;
+	try {
+		const refreshed = await refreshGoogleCloudToken(credential.refreshToken, credential.projectId);
+		return refreshed.access;
+	} catch (error) {
+		ctx.logger?.warn("Gemini CLI token refresh failed", { error: String(error) });
+		return credential.accessToken;
+	}
+}
+
+async function loadCodeAssist(
+	params: UsageFetchParams,
+	ctx: UsageFetchContext,
+	accessToken: string,
+	baseUrl: string,
+	projectId?: string,
+): Promise<LoadCodeAssistResponse | undefined> {
+	const response = await ctx.fetch(`${baseUrl}/v1internal:loadCodeAssist`, {
+		method: "POST",
+		headers: {
+			Authorization: `Bearer ${accessToken}`,
+			"Content-Type": "application/json",
+			...GEMINI_CLI_HEADERS,
+		},
+		body: JSON.stringify({
+			...(projectId ? { cloudaicompanionProject: projectId } : {}),
+			metadata: {
+				ideType: "IDE_UNSPECIFIED",
+				platform: "PLATFORM_UNSPECIFIED",
+				pluginType: "GEMINI",
+			},
+		}),
+		signal: params.signal,
+	});
+
+	if (!response.ok) {
+		const errorText = await response.text();
+		ctx.logger?.warn("Gemini CLI loadCodeAssist failed", {
+			status: response.status,
+			error: errorText,
+		});
+		return undefined;
+	}
+
+	return (await response.json()) as LoadCodeAssistResponse;
+}
+
+async function fetchQuota(
+	params: UsageFetchParams,
+	ctx: UsageFetchContext,
+	accessToken: string,
+	baseUrl: string,
+	projectId?: string,
+): Promise<RetrieveUserQuotaResponse | undefined> {
+	const response = await ctx.fetch(`${baseUrl}/v1internal:retrieveUserQuota`, {
+		method: "POST",
+		headers: {
+			Authorization: `Bearer ${accessToken}`,
+			"Content-Type": "application/json",
+			...GEMINI_CLI_HEADERS,
+		},
+		body: JSON.stringify(projectId ? { project: projectId } : {}),
+		signal: params.signal,
+	});
+
+	if (!response.ok) {
+		const errorText = await response.text();
+		ctx.logger?.warn("Gemini CLI retrieveUserQuota failed", {
+			status: response.status,
+			error: errorText,
+		});
+		return undefined;
+	}
+
+	return (await response.json()) as RetrieveUserQuotaResponse;
+}
+
+export const googleGeminiCliUsageProvider: UsageProvider = {
+	id: "google-gemini-cli",
+	supports: ({ credential }) => credential.type === "oauth" && !!credential.accessToken,
+	async fetchUsage(params, ctx) {
+		const { credential } = params;
+		if (credential.type !== "oauth") {
+			return null;
+		}
+		const accessToken = await resolveAccessToken(params, ctx);
+		if (!accessToken) {
+			return null;
+		}
+
+		const now = ctx.now();
+		const baseUrl = (params.baseUrl?.trim() || DEFAULT_ENDPOINT).replace(/\/$/, "");
+		const cacheKey = `usage:${params.provider}:${credential.accountId ?? credential.email ?? "default"}:${baseUrl}:${
+			credential.projectId ?? "default"
+		}`;
+		const cached = await ctx.cache.get(cacheKey);
+		if (cached && cached.expiresAt > now) {
+			return cached.value;
+		}
+
+		const loadResponse = await loadCodeAssist(params, ctx, accessToken, baseUrl, credential.projectId);
+		const projectId = credential.projectId ?? getProjectId(loadResponse);
+		const quotaResponse = await fetchQuota(params, ctx, accessToken, baseUrl, projectId);
+		if (!quotaResponse) {
+			const entry = { value: null, expiresAt: now + CACHE_TTL_MS };
+			await ctx.cache.set(cacheKey, entry);
+			return null;
+		}
+
+		const limits: UsageLimit[] = [];
+		const buckets = quotaResponse.buckets ?? [];
+
+		buckets.forEach((bucket, index) => {
+			const modelId = bucket.modelId;
+			const window = parseWindow(bucket.resetTime, now);
+			const amount = buildAmount(bucket.remainingFraction);
+			const tier = modelId ? getModelTier(modelId) : undefined;
+			const label = modelId ? `Gemini ${modelId}` : "Gemini quota";
+			const id = `${modelId ?? "unknown"}:${window?.id ?? index}`;
+
+			limits.push({
+				id,
+				label,
+				scope: {
+					provider: params.provider,
+					accountId: credential.accountId,
+					projectId,
+					modelId,
+					tier,
+					windowId: window?.id,
+				},
+				window,
+				amount,
+			});
+		});
+
+		const report: UsageReport = {
+			provider: params.provider,
+			fetchedAt: now,
+			limits,
+			metadata: {
+				currentTierId: loadResponse?.currentTier?.id,
+				currentTierName: loadResponse?.currentTier?.name,
+			},
+			raw: quotaResponse,
+		};
+
+		await ctx.cache.set(cacheKey, { value: report, expiresAt: now + CACHE_TTL_MS });
+		return report;
+	},
+};

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

@@ -7,7 +7,7 @@
 import { createHash } from "node:crypto";
 import type { Content, ThinkingConfig } from "@google/genai";
 import { abortableSleep } from "@oh-my-pi/pi-utils";
-import { calculateCost } from "../models";
+import { calculateCost } from "$ai/models";
 import type {
 	Api,
 	AssistantMessage,
@@ -18,9 +18,9 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "../types";
-import { AssistantMessageEventStream } from "../utils/event-stream";
-import { sanitizeSurrogates } from "../utils/sanitize-unicode";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 import {
 	convertMessages,
 	convertTools,

package/src/providers/google-shared.ts

@@ -3,8 +3,8 @@
  */
 
 import { type Content, FinishReason, FunctionCallingConfigMode, type Part, type Schema } from "@google/genai";
-import type { Context, ImageContent, Model, StopReason, TextContent, Tool } from "../types";
-import { sanitizeSurrogates } from "../utils/sanitize-unicode";
+import type { Context, ImageContent, Model, StopReason, TextContent, Tool } from "$ai/types";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 import { transformMessages } from "./transform-messages";
 
 type GoogleApiType = "google-generative-ai" | "google-gemini-cli" | "google-vertex";
@@ -79,6 +79,8 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 	for (const msg of transformedMessages) {
 		if (msg.role === "user") {
 			if (typeof msg.content === "string") {
+				// Skip empty user messages
+				if (!msg.content || msg.content.trim() === "") continue;
 				contents.push({
 					role: "user",
 					parts: [{ text: sanitizeSurrogates(msg.content) }],
@@ -96,7 +98,14 @@ export function convertMessages<T extends GoogleApiType>(model: Model<T>, contex
 						};
 					}
 				});
-				const filteredParts = !model.input.includes("image") ? parts.filter((p) => p.text !== undefined) : parts;
+				// 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) => {
+					if (p.text !== undefined) {
+						return p.text.trim().length > 0;
+					}
+					return true; // Keep non-text parts (images)
+				});
 				if (filteredParts.length === 0) continue;
 				contents.push({
 					role: "user",

package/src/providers/google-vertex.ts

@@ -5,7 +5,7 @@ import {
 	type ThinkingConfig,
 	ThinkingLevel,
 } from "@google/genai";
-import { calculateCost } from "../models";
+import { calculateCost } from "$ai/models";
 import type {
 	Api,
 	AssistantMessage,
@@ -16,10 +16,10 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "../types";
-import { AssistantMessageEventStream } from "../utils/event-stream";
-import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
-import { sanitizeSurrogates } from "../utils/sanitize-unicode";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { formatErrorMessageWithRetryAfter } from "$ai/utils/retry-after";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 import type { GoogleThinkingLevel } from "./google-gemini-cli";
 import {
 	convertMessages,

package/src/providers/google.ts

@@ -4,8 +4,8 @@ import {
 	GoogleGenAI,
 	type ThinkingConfig,
 } from "@google/genai";
-import { calculateCost } from "../models";
-import { getEnvApiKey } from "../stream";
+import { calculateCost } from "$ai/models";
+import { getEnvApiKey } from "$ai/stream";
 import type {
 	Api,
 	AssistantMessage,
@@ -16,10 +16,10 @@ import type {
 	TextContent,
 	ThinkingContent,
 	ToolCall,
-} from "../types";
-import { AssistantMessageEventStream } from "../utils/event-stream";
-import { formatErrorMessageWithRetryAfter } from "../utils/retry-after";
-import { sanitizeSurrogates } from "../utils/sanitize-unicode";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { formatErrorMessageWithRetryAfter } from "$ai/utils/retry-after";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
 import type { GoogleThinkingLevel } from "./google-gemini-cli";
 import {
 	convertMessages,

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

@@ -50,6 +50,10 @@ function clampReasoningEffort(model: string, effort: ReasoningConfig["effort"]):
 		return "high";
 	}
 
+	if ((modelId === "gpt-5.2" || modelId === "gpt-5.2-codex") && effort === "minimal") {
+		return "low";
+	}
+
 	// gpt-5.1-codex-mini only supports medium/high.
 	if (modelId === "gpt-5.1-codex-mini") {
 		return effort === "high" || effort === "xhigh" ? "high" : "medium";

package/src/providers/openai-codex-responses.ts

@@ -9,9 +9,8 @@ import type {
 	ResponseOutputMessage,
 	ResponseReasoningItem,
 } from "openai/resources/responses/responses";
-import packageJson from "../../package.json" with { type: "json" };
-import { calculateCost } from "../models";
-import { getEnvApiKey } from "../stream";
+import { calculateCost } from "$ai/models";
+import { getEnvApiKey } from "$ai/stream";
 import type {
 	Api,
 	AssistantMessage,
@@ -24,11 +23,12 @@ import type {
 	ThinkingContent,
 	Tool,
 	ToolCall,
-} 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";
+} from "$ai/types";
+import { AssistantMessageEventStream } from "$ai/utils/event-stream";
+import { parseStreamingJson } from "$ai/utils/json-parse";
+import { formatErrorMessageWithRetryAfter } from "$ai/utils/retry-after";
+import { sanitizeSurrogates } from "$ai/utils/sanitize-unicode";
+import packageJson from "../../package.json" with { type: "json" };
 import {
 	CODEX_BASE_URL,
 	JWT_CLAIM_PATH,
@@ -571,6 +571,8 @@ function convertMessages(model: Model<"openai-codex-responses">, context: Contex
 	for (const msg of transformedMessages) {
 		if (msg.role === "user") {
 			if (typeof msg.content === "string") {
+				// Skip empty user messages
+				if (!msg.content || msg.content.trim() === "") continue;
 				messages.push({
 					role: "user",
 					content: [{ type: "input_text", text: sanitizeSurrogates(msg.content) }],
@@ -589,9 +591,16 @@ function convertMessages(model: Model<"openai-codex-responses">, context: Contex
 						image_url: `data:${item.mimeType};base64,${item.data}`,
 					} satisfies ResponseInputImage;
 				});
-				const filteredContent = !model.input.includes("image")
+				// Filter out images if model doesn't support them, and empty text blocks
+				let filteredContent = !model.input.includes("image")
 					? content.filter((c) => c.type !== "input_image")
 					: content;
+				filteredContent = filteredContent.filter((c) => {
+					if (c.type === "input_text") {
+						return c.text.trim().length > 0;
+					}
+					return true; // Keep non-text content (images)
+				});
 				if (filteredContent.length === 0) continue;
 				messages.push({
 					role: "user",