From b0778060a9e613053d726daf8bc55d05add51125 Mon Sep 17 00:00:00 2001
From: Scott Severance <scott@scottseverance.net>
Date: Wed, 26 Aug 2026 10:49:39 +0000
Subject: [PATCH] feat(llm): validate required fields in API responses

---
 agent/core/llm.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/agent/core/llm.py b/agent/core/llm.py
index 8a1e7d6..9ffe11d 100644
--- a/agent/core/llm.py
+++ b/agent/core/llm.py
@@ -22,6 +22,23 @@ def __init__(self, config: LLMConfig):
         self.config = config
         self.base_url = config.base_url.rstrip("/")
 
+    def _validate_response(self, response: dict, required_fields: list[str]) -> None:
+        """Validate that response contains expected fields.
+        
+        Args:
+            response: The response dict to validate.
+            required_fields: List of field names that must be present.
+            
+        Raises:
+            OllamaError: If any required field is missing.
+        """
+        missing = [field for field in required_fields if field not in response]
+        if missing:
+            raise OllamaError(
+                f"Malformed API response: missing required fields {missing}. "
+                f"Got: {response}"
+            )
+
     def _request(
         self,
         endpoint: str,
@@ -144,6 +161,7 @@ def chat(
             return self._stream_chat(data, timeout=timeout)
 
         result = self._request("/api/chat", data, timeout=timeout)
+        self._validate_response(result, ["message"])
         return result
 
     def _stream_chat(
@@ -201,6 +219,7 @@ def generate(self, prompt: str, timeout: Optional[float] = None) -> str:
             },
         }
         result = self._request("/api/generate", data, timeout=timeout)
+        self._validate_response(result, ["response"])
         return result.get("response", "")
 
     def pull_model(