From acdfbee4f96216c6c2f20c0177f75a9885424263 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Thu, 22 Jan 2026 08:26:08 +0000
Subject: [PATCH] fix: detect antigravity claude by provider

---
 src/agents/pi-embedded-helpers/google.ts | 12 +++++++++---
 src/agents/pi-embedded-runner/google.ts  | 15 +++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/agents/pi-embedded-helpers/google.ts b/src/agents/pi-embedded-helpers/google.ts
index 59bd06b1325..8d53901d67d 100644
--- a/src/agents/pi-embedded-helpers/google.ts
+++ b/src/agents/pi-embedded-helpers/google.ts
@@ -6,9 +6,15 @@ export function isGoogleModelApi(api?: string | null): boolean {
   );
 }
 
-export function isAntigravityClaude(api?: string | null, modelId?: string): boolean {
-  if (api !== "google-antigravity") return false;
-  return modelId?.toLowerCase().includes("claude") ?? false;
+export function isAntigravityClaude(params: {
+  api?: string | null;
+  provider?: string | null;
+  modelId?: string;
+}): boolean {
+  const provider = params.provider?.toLowerCase();
+  const api = params.api?.toLowerCase();
+  if (provider !== "google-antigravity" && api !== "google-antigravity") return false;
+  return params.modelId?.toLowerCase().includes("claude") ?? false;
 }
 
 export { sanitizeGoogleTurnOrdering };
diff --git a/src/agents/pi-embedded-runner/google.ts b/src/agents/pi-embedded-runner/google.ts
index 5f8fa1b18ad..41b93225f75 100644
--- a/src/agents/pi-embedded-runner/google.ts
+++ b/src/agents/pi-embedded-runner/google.ts
@@ -273,7 +273,11 @@ export async function sanitizeSessionHistory(params: {
   sessionManager: SessionManager;
   sessionId: string;
 }): Promise<AgentMessage[]> {
-  const isAntigravityClaudeModel = isAntigravityClaude(params.modelApi, params.modelId);
+  const isAntigravityClaudeModel = isAntigravityClaude({
+    api: params.modelApi,
+    provider: params.provider,
+    modelId: params.modelId,
+  });
   const provider = normalizeProviderId(params.provider ?? "");
   const modelId = (params.modelId ?? "").toLowerCase();
   const isOpenRouterGemini =
@@ -285,15 +289,14 @@ export async function sanitizeSessionHistory(params: {
     sanitizeToolCallIds,
     toolCallIdMode,
     enforceToolCallLast: params.modelApi === "anthropic-messages",
-    preserveSignatures: params.modelApi === "google-antigravity" && isAntigravityClaudeModel,
+    preserveSignatures: isAntigravityClaudeModel,
     sanitizeThoughtSignatures: isOpenRouterGemini
       ? { allowBase64Only: true, includeCamelCase: true }
       : undefined,
   });
-  const sanitizedThinking =
-    params.modelApi === "google-antigravity" && isAntigravityClaudeModel
-      ? sanitizeAntigravityThinkingBlocks(sanitizedImages)
-      : sanitizedImages;
+  const sanitizedThinking = isAntigravityClaudeModel
+    ? sanitizeAntigravityThinkingBlocks(sanitizedImages)
+    : sanitizedImages;
   const repairedTools = sanitizeToolUseResultPairing(sanitizedThinking);
 
   return applyGoogleTurnOrderingFix({