diff --git a/agent/config.py b/agent/config.py
index c29d390..b4e638c 100644
--- a/agent/config.py
+++ b/agent/config.py
@@ -9,7 +9,7 @@ class Settings(BaseSettings):
     anthropic_api_key: str
     model: str = "claude-sonnet-4-5-20250929"
     safedir: str = "./workspace"
-    max_tokens: int = 500
+    max_tokens: int = 8096
 
     model_config = {"env_file": PROJECT_ROOT / ".env"}
 
diff --git a/tests/test_config.py b/tests/test_config.py
index bc9e306..f4f54e8 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -12,13 +12,13 @@ def test_settings_with_all_values():
     settings = Settings(
         anthropic_api_key="sk-ant-test",
         model="claude-test",
-        max_tokens=500,
+        max_tokens=8096,
         safedir="/tmp/test",
     )
 
     assert settings.anthropic_api_key == "sk-ant-test"
     assert settings.model == "claude-test"
-    assert settings.max_tokens == 500
+    assert settings.max_tokens == 8096
 
 
 @pytest.mark.unit
@@ -30,7 +30,7 @@ def test_settings_defaults():
 
     # Should use defaults
     assert settings.model == "claude-sonnet-4-5-20250929"
-    assert settings.max_tokens == 500
+    assert settings.max_tokens == 8096
 
 
 @pytest.mark.unit