diff --git a/agent/model_metadata.py b/agent/model_metadata.py
index 8a14ca221..335d02bd6 100644
--- a/agent/model_metadata.py
+++ b/agent/model_metadata.py
@@ -133,6 +133,8 @@ DEFAULT_CONTEXT_LENGTHS = {
     # Google
     "gemini": 1048576,
     # Gemma (open models served via AI Studio)
+    "gemma-4": 256000,  # Gemma 4 family
+    "gemma4": 256000,  # Ollama-style naming (e.g. gemma4:31b-cloud)
     "gemma-4-31b": 256000,
     "gemma-3": 131072,
     "gemma": 8192,  # fallback for older gemma models