From c29279f9e74ab22fa2663564b8b86dc435b6456e Mon Sep 17 00:00:00 2001
From: Shaun <49644668+sz30@users.noreply.github.com>
Date: Sat, 3 Oct 2026 19:18:49 +0800
Subject: [PATCH 1/4] Update antigravity_fix.py

---
 src/converter/antigravity_fix.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/converter/antigravity_fix.py b/src/converter/antigravity_fix.py
index b5769c506..5803acef2 100644
--- a/src/converter/antigravity_fix.py
+++ b/src/converter/antigravity_fix.py
@@ -672,17 +672,20 @@ def _normalize_antigravity_request(
                         break
 
     if "claude" in model.lower():
-        # 2. Claude 模型关键词映射
-        # 使用关键词匹配而不是精确匹配，更灵活地处理各种变体
         original_model = model
-        if "opus" in model.lower():
+        model_lower = model.lower()
+
+        if "claude-opus-5-5" in model_lower or "claude-sonnet-5-5" in model_lower:
+            # Claude 5.5 model IDs are already returned by Antigravity,
+            # so keep them unchanged.
+            pass
+        elif "opus" in model_lower:
             model = "claude-opus-4-6-thinking"
-        elif "sonnet" in model.lower():
+        elif "sonnet" in model_lower:
             model = "claude-sonnet-4-6"
-        elif "haiku" in model.lower():
+        elif "haiku" in model_lower:
             model = "gemini-2.5-flash"
-        elif "claude" in model.lower():
-            # Claude 模型兜底：如果包含 claude 但不是 opus/sonnet/haiku
+        else:
             model = "claude-sonnet-4-6"
 
         if original_model != model:

From 4f6af1e2ea9684352260d007b2386f3139328825 Mon Sep 17 00:00:00 2001
From: Shaun <49644668+sz30@users.noreply.github.com>
Date: Sat, 3 Oct 2026 20:34:02 +0800
Subject: [PATCH 2/4] Update antigravity_fix.py

---
 src/converter/antigravity_fix.py | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/converter/antigravity_fix.py b/src/converter/antigravity_fix.py
index 5803acef2..df0c5ff0b 100644
--- a/src/converter/antigravity_fix.py
+++ b/src/converter/antigravity_fix.py
@@ -674,23 +674,6 @@ def _normalize_antigravity_request(
     if "claude" in model.lower():
         original_model = model
         model_lower = model.lower()
-
-        if "claude-opus-5-5" in model_lower or "claude-sonnet-5-5" in model_lower:
-            # Claude 5.5 model IDs are already returned by Antigravity,
-            # so keep them unchanged.
-            pass
-        elif "opus" in model_lower:
-            model = "claude-opus-4-6-thinking"
-        elif "sonnet" in model_lower:
-            model = "claude-sonnet-4-6"
-        elif "haiku" in model_lower:
-            model = "gemini-2.5-flash"
-        else:
-            model = "claude-sonnet-4-6"
-
-        if original_model != model:
-            log.debug(f"[ANTIGRAVITY] 映射模型: {original_model} -> {model}")
-
     return model
 
 

From c15164e7d64ff5d82b7e79cc063baf407021f76d Mon Sep 17 00:00:00 2001
From: Shaun <49644668+sz30@users.noreply.github.com>
Date: Sat, 3 Oct 2026 20:56:59 +0800
Subject: [PATCH 3/4] Update antigravity_fix.py

---
 src/converter/antigravity_fix.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/converter/antigravity_fix.py b/src/converter/antigravity_fix.py
index df0c5ff0b..fee70bf14 100644
--- a/src/converter/antigravity_fix.py
+++ b/src/converter/antigravity_fix.py
@@ -671,9 +671,8 @@ def _normalize_antigravity_request(
                             log.debug(f"[ANTIGRAVITY] 已在最后一个 assistant 消息开头插入思考块（含跳过验证签名）")
                         break
 
-    if "claude" in model.lower():
-        original_model = model
-        model_lower = model.lower()
+    #实测Antigravity 现在已经返回真实模型 ID，因此这里可以直接保留原始 model ID，
+    #无需再根据 opus / sonnet 等关键词把 Claude 模型强制映射到硬编码的某个固定版本。
     return model
 
 

From 219aa51ba0de4ed66fe5b2e3a63d8107fed9d7cd Mon Sep 17 00:00:00 2001
From: Shaun <49644668+sz30@users.noreply.github.com>
Date: Sat, 3 Oct 2026 21:04:40 +0800
Subject: [PATCH 4/4] Update antigravity_fix.py

---
 src/converter/antigravity_fix.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/converter/antigravity_fix.py b/src/converter/antigravity_fix.py
index fee70bf14..f136267bb 100644
--- a/src/converter/antigravity_fix.py
+++ b/src/converter/antigravity_fix.py
@@ -671,8 +671,8 @@ def _normalize_antigravity_request(
                             log.debug(f"[ANTIGRAVITY] 已在最后一个 assistant 消息开头插入思考块（含跳过验证签名）")
                         break
 
-    #实测Antigravity 现在已经返回真实模型 ID，因此这里可以直接保留原始 model ID，
-    #无需再根据 opus / sonnet 等关键词把 Claude 模型强制映射到硬编码的某个固定版本。
+    #实测 Antigravity 现在已经返回真实模型 ID，因此这里可以直接保留原始 model ID，
+    #无需再根据 opus / sonnet 等关键词把 Claude 模型强制映射到某个固定版本。
     return model