diff --git a/conf/all_models.json b/conf/all_models.json
index 17e06ce442..cdc0597d2d 100644
--- a/conf/all_models.json
+++ b/conf/all_models.json
@@ -7253,6 +7253,40 @@
       "context_length": 16000,
       "max_output": 16000
     },
+    {
+      "name": "google/gemini-3.8-flash",
+      "alias": [
+        "gemini-3.8-flash",
+        "models/gemini-3.8-flash"
+      ],
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "context_length": 1048576,
+      "max_output": 65536
+    },
+    {
+      "name": "google/gemini-3.6-flash",
+      "alias": [
+        "gemini-3.6-flash",
+        "models/gemini-3.6-flash"
+      ],
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "context_length": 1048576,
+      "max_output": 65536
+    },
     {
       "name": "google/gemini-3.5-flash",
       "alias": [
@@ -7269,7 +7303,7 @@
         "clear_thinking": true
       },
       "context_length": 1048576,
-      "max_output": 1048576
+      "max_output": 65536
     },
     {
       "name": "google/gemini-3.5-live-translate-preview",
@@ -7301,8 +7335,15 @@
         "gemini-3-1-flash"
       ],
       "model_types": [
-        "chat"
-      ]
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "context_length": 1048576,
+      "max_output": 65536
     },
     {
       "name": "google/gemini-3.1-flash-image",
@@ -7334,7 +7375,7 @@
         "clear_thinking": true
       },
       "context_length": 1048576,
-      "max_output": 1048576
+      "max_output": 65536
     },
     {
       "name": "google/gemini-3.1-flash-lite-preview",
@@ -7384,6 +7425,7 @@
     {
       "name": "google/gemini-3.1-pro-preview",
       "alias": [
+        "gemini-3.1-pro",
         "gemini-3.1-pro-preview",
         "models/gemini-3.1-pro-preview",
         "google/gemini-3.1-pro"
@@ -7445,7 +7487,7 @@
         "clear_thinking": true
       },
       "context_length": 1048576,
-      "max_output": 1048576
+      "max_output": 65536
     },
     {
       "name": "google/gemini-3-pro-image",
diff --git a/conf/llm_factories.json b/conf/llm_factories.json
index 904c42ad55..fbbc970f6a 100644
--- a/conf/llm_factories.json
+++ b/conf/llm_factories.json
@@ -2361,8 +2361,8 @@
                 },
                 {
                     "llm_name": "gemini-3-flash-preview",
-                    "tags": "LLM,CHAT,256K,IMAGE2TEXT",
-                    "max_tokens": 256000,
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
                     "model_type": [
                         "chat",
                         "vision"
@@ -3256,64 +3256,157 @@
             "rank": "997",
             "llm": [
                 {
-                    "llm_name": "gemini-3-pro-preview",
-                    "tags": "LLM,1M,IMAGE2TEXT",
+                    "llm_name": "gemini-3.8-flash",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
                     "max_tokens": 1048576,
                     "model_type": [
-                        "image2text",
-                        "chat"
+                        "chat",
+                        "vision"
                     ],
-                    "is_tools": true
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
                 },
                 {
-                    "llm_name": "gemini-2.5-flash",
-                    "tags": "LLM,1024K,IMAGE2TEXT",
+                    "llm_name": "gemini-3.6-flash",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
                     "max_tokens": 1048576,
                     "model_type": [
-                        "image2text",
-                        "chat"
+                        "chat",
+                        "vision"
                     ],
-                    "is_tools": true
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3.5-flash",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3.1-pro",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3.1-flash",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3.1-flash-lite",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3-flash-preview",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-3-pro-preview",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
                 },
                 {
                     "llm_name": "gemini-2.5-pro",
-                    "tags": "LLM,IMAGE2TEXT,1024K",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
                     "max_tokens": 1048576,
                     "model_type": [
-                        "image2text",
-                        "chat"
+                        "chat",
+                        "vision"
                     ],
-                    "is_tools": true
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
+                },
+                {
+                    "llm_name": "gemini-2.5-flash",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
+                    "max_tokens": 1048576,
+                    "model_type": [
+                        "chat",
+                        "vision"
+                    ],
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
                 },
                 {
                     "llm_name": "gemini-2.5-flash-lite",
-                    "tags": "LLM,1024K,IMAGE2TEXT",
+                    "tags": "LLM,CHAT,1M,IMAGE2TEXT",
                     "max_tokens": 1048576,
                     "model_type": [
-                        "image2text",
-                        "chat"
+                        "chat",
+                        "vision"
                     ],
-                    "is_tools": true
-                },
-                {
-                    "llm_name": "gemini-2.0-flash",
-                    "tags": "LLM,1024K",
-                    "max_tokens": 1048576,
-                    "model_type": [
-                        "image2text",
-                        "chat"
-                    ],
-                    "is_tools": true
-                },
-                {
-                    "llm_name": "gemini-2.0-flash-lite",
-                    "tags": "LLM,1024K",
-                    "max_tokens": 1048576,
-                    "model_type": [
-                        "image2text",
-                        "chat"
-                    ],
-                    "is_tools": true
+                    "is_tools": true,
+                    "features": [
+                        "is_tools",
+                        "thinking"
+                    ]
                 },
                 {
                     "llm_name": "gemini-embedding-001",
diff --git a/conf/models/cheaperinference.json b/conf/models/cheaperinference.json
index 67e686812b..fadf258bce 100644
--- a/conf/models/cheaperinference.json
+++ b/conf/models/cheaperinference.json
@@ -314,7 +314,7 @@
     },
     {
       "name": "gemini-3-flash-preview",
-      "context_length": 256000,
+      "context_length": 1048576,
       "max_output": 65536,
       "model_types": [
         "chat",
diff --git a/conf/models/google.json b/conf/models/google.json
index 87cb3421ff..8e1462558c 100644
--- a/conf/models/google.json
+++ b/conf/models/google.json
@@ -10,11 +10,12 @@
   "class": "gemini",
   "models": [
     {
-      "name": "gemini-2.5-flash",
+      "name": "gemini-3.8-flash",
       "context_length": 1048576,
       "max_output": 65536,
       "model_types": [
-        "chat"
+        "chat",
+        "vision"
       ],
       "thinking": {
         "default_value": true,
@@ -25,7 +26,159 @@
       }
     },
     {
-      "name": "text-embedding-004",
+      "name": "gemini-3.6-flash",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3.5-flash",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3.1-pro",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3.1-flash",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3.1-flash-lite",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3-flash-preview",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-3-pro-preview",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-2.5-pro",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-2.5-flash",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "thinking": {
+        "default_value": true,
+        "clear_thinking": true
+      },
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-2.5-flash-lite",
+      "context_length": 1048576,
+      "max_output": 65536,
+      "model_types": [
+        "chat",
+        "vision"
+      ],
+      "tools": {
+        "support": true
+      }
+    },
+    {
+      "name": "gemini-embedding-001",
       "max_tokens": 2048,
       "model_types": [
         "embedding"
@@ -37,12 +190,28 @@
     "thinking": {
       "default_value": true,
       "supported_models": [
+        "gemini-3.8-flash",
+        "gemini-3.6-flash",
+        "gemini-3.5-flash",
+        "gemini-3.1-pro",
+        "gemini-3.1-flash",
+        "gemini-3-flash-preview",
+        "gemini-3-pro-preview",
+        "gemini-2.5-pro",
         "gemini-2.5-flash"
       ]
     },
     "reasoning_effort": {
       "default_value": "high",
       "supported_modes": [
+        "gemini-3.8-flash",
+        "gemini-3.6-flash",
+        "gemini-3.5-flash",
+        "gemini-3.1-pro",
+        "gemini-3.1-flash",
+        "gemini-3-flash-preview",
+        "gemini-3-pro-preview",
+        "gemini-2.5-pro",
         "gemini-2.5-flash"
       ]
     }