fixes

Author: hannesrudolph

packages/types/src/providers/gemini.ts

@@ -10,6 +10,7 @@ export const geminiModels = {
 		maxTokens: 65_536,
 		contextWindow: 1_048_576,
 		supportsImages: true,
+		supportsNativeTools: true,
 		supportsPromptCache: true,
 		supportsReasoningEffort: ["low", "high"],
 		reasoningEffort: "low",

src/api/transform/__tests__/gemini-format.spec.ts

@@ -124,13 +124,10 @@ describe("convertAnthropicMessageToGemini", () => {
 		const result = convertAnthropicMessageToGemini(anthropicMessage)
 
 		expect(result).toEqual([
-			{
-				role: "model",
-				parts: [{ text: "Let me calculate that for you." }],
-			},
 			{
 				role: "model",
 				parts: [
+					{ text: "Let me calculate that for you." },
 					{
 						functionCall: {
 							name: "calculator",
@@ -159,13 +156,10 @@ describe("convertAnthropicMessageToGemini", () => {
 		const result = convertAnthropicMessageToGemini(anthropicMessage)
 
 		expect(result).toEqual([
-			{
-				role: "user",
-				parts: [{ text: "Here's the result:" }],
-			},
 			{
 				role: "user",
 				parts: [
+					{ text: "Here's the result:" },
 					{
 						functionResponse: {
 							name: "calculator",
@@ -195,12 +189,7 @@ describe("convertAnthropicMessageToGemini", () => {
 		const result = convertAnthropicMessageToGemini(anthropicMessage)
 
 		// Should skip the empty tool result
-		expect(result).toEqual([
-			{
-				role: "user",
-				parts: [],
-			},
-		])
+		expect(result).toEqual([])
 	})
 
 	it("should convert a message with tool result as array with text only", () => {
@@ -347,6 +336,38 @@ describe("convertAnthropicMessageToGemini", () => {
 		])
 	})
 
+	it("should handle tool names with hyphens", () => {
+		const anthropicMessage: Anthropic.Messages.MessageParam = {
+			role: "user",
+			content: [
+				{
+					type: "tool_result",
+					tool_use_id: "search-files-123",
+					content: "found files",
+				},
+			],
+		}
+
+		const result = convertAnthropicMessageToGemini(anthropicMessage)
+
+		expect(result).toEqual([
+			{
+				role: "user",
+				parts: [
+					{
+						functionResponse: {
+							name: "search-files",
+							response: {
+								name: "search-files",
+								content: "found files",
+							},
+						},
+					},
+				],
+			},
+		])
+	})
+
 	it("should throw an error for unsupported content block type", () => {
 		const anthropicMessage: Anthropic.Messages.MessageParam = {
 			role: "user",

src/api/transform/gemini-format.ts

@@ -79,7 +79,8 @@ export function convertAnthropicContentToGemini(
 				}
 
 				// Extract tool name from tool_use_id (e.g., "calculator-123" -> "calculator")
-				const toolName = block.tool_use_id.split("-")[0]
+				const lastHyphenIndex = block.tool_use_id.lastIndexOf("-")
+				const toolName = lastHyphenIndex >= 0 ? block.tool_use_id.slice(0, lastHyphenIndex) : block.tool_use_id
 
 				if (typeof block.content === "string") {
 					return {
@@ -124,59 +125,16 @@ export function convertAnthropicMessageToGemini(
 	message: Anthropic.Messages.MessageParam,
 	options?: { includeThoughtSignatures?: boolean },
 ): Content[] {
-	const content: ExtendedContentBlockParam[] = Array.isArray(message.content)
-		? (message.content as ExtendedContentBlockParam[])
-		: [{ type: "text", text: message.content ?? "" }]
-
-	const toolUseParts = content.filter((block) => block.type === "tool_use") as Anthropic.ToolUseBlock[]
-	const toolResultParts = content.filter((block) => block.type === "tool_result") as Anthropic.ToolResultBlockParam[]
-	const otherParts = content.filter((block) => block.type !== "tool_use" && block.type !== "tool_result")
-	const thoughtSignatureBlocks = content.filter((block) => isThoughtSignatureContentBlock(block))
-	const role = message.role === "assistant" ? "model" : "user"
-	const assistantThoughtOptions = {
-		...options,
-		includeThoughtSignatures: message.role === "assistant" ? options?.includeThoughtSignatures ?? true : false,
-	}
-
-	// Gemini expects a flat list of Content objects. We group regular message parts,
-	// tool uses, and tool results into separate Content entries while preserving their
-	// relative order within each category.
-	const contents: Content[] = []
-
-	if (otherParts.length > 0) {
-		contents.push({
-			role,
-			parts: convertAnthropicContentToGemini(otherParts, assistantThoughtOptions),
-		})
-	}
-
-	if (toolUseParts.length > 0) {
-		const toolUseWithSignatures =
-			thoughtSignatureBlocks.length > 0 ? [...thoughtSignatureBlocks, ...toolUseParts] : toolUseParts
-		contents.push({
-			role: "model",
-			parts: convertAnthropicContentToGemini(toolUseWithSignatures, {
-				...options,
-				includeThoughtSignatures: options?.includeThoughtSignatures ?? true,
-			}),
-		})
-	}
-
-	if (toolResultParts.length > 0) {
-		contents.push({
-			role: "user",
-			parts: convertAnthropicContentToGemini(toolResultParts, { ...options, includeThoughtSignatures: false }),
-		})
-	}
+	const parts = convertAnthropicContentToGemini(message.content, options)
 
-	if (contents.length === 0) {
-		return [
-			{
-				role,
-				parts: convertAnthropicContentToGemini(message.content ?? "", assistantThoughtOptions),
-			},
-		]
+	if (parts.length === 0) {
+		return []
 	}
 
-	return contents
+	return [
+		{
+			role: message.role === "assistant" ? "model" : "user",
+			parts,
+		},
+	]
 }