refactor(mcp): inline _request_scope and tighten _extract_response_data

Two more simplifications in utils.py the reviewer/PM flagged:

1. _request_scope was a no-op wrapper around logfire.span that added
   nothing — same name, same attributes, one call deep. Inlined at all
   5 call sites (call_get/put/post/patch/delete). The helper is gone.

2. _extract_response_data used `except Exception` to swallow any JSON
   decode failure. That's defensive code for upstream gateway HTML
   error pages (Fly/Cloudflare 5xx); FastAPI itself always emits JSON.
   Replaced with a content-type check: if the response doesn't claim
   `application/json`, return None; otherwise let any decode error
   surface. Matches CLAUDE.md's fail-fast guidance.

Tests updated: MockResponse fixtures now include a
`headers = {"content-type": "application/json"}` attribute so they
pass the new gate.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Signed-off-by: phernandez <paul@basicmachines.co>

Author: phernandez

src/basic_memory/mcp/tools/utils.py

@@ -109,15 +109,20 @@ def get_error_message(
         return f"HTTP error {status_code}: {method} request to '{path}' failed"
 
 
-def _extract_response_data(response: Response) -> typing.Any:
-    """Safely decode response payload for error reporting."""
-    try:
-        return response.json()
-    except Exception:
+def _extract_response_data(response: Response) -> Any:
+    """Decode the JSON payload of an API response for error reporting.
+
+    Upstream gateways (Fly, Cloudflare, load balancers) can return HTML
+    error pages before the request reaches our FastAPI app; those have no
+    structured `detail` to surface, so we skip them. A malformed body with
+    a JSON content-type is a server bug and we let it raise.
+    """
+    if "application/json" not in response.headers.get("content-type", ""):
         return None
+    return response.json()
 
 
-def _response_detail_text(response_data: typing.Any) -> str | None:
+def _response_detail_text(response_data: Any) -> str | None:
     """Extract textual error detail from API payloads."""
     if isinstance(response_data, dict):
         detail = response_data.get("detail")
@@ -168,30 +173,6 @@ def _resolve_error_message(
     return get_error_message(status_code, url, method)
 
 
-@contextmanager
-def _request_scope(
-    method: str,
-    *,
-    client_name: str | None,
-    operation: str | None,
-    path_template: str | None,
-    params: QueryParamTypes | None = None,
-    has_body: bool = False,
-):
-    """Create the shared MCP transport span used by all HTTP helpers."""
-    with logfire.span(
-        "mcp.http.request",
-        method=method,
-        client_name=client_name,
-        operation=operation,
-        path_template=path_template,
-        phase="request",
-        has_query=bool(params),
-        has_body=has_body,
-    ) as active_span:
-        yield active_span
-
-
 async def call_get(
     client: AsyncClient,
     url: URL | str,
@@ -231,12 +212,15 @@ async def call_get(
     request_span: logfire.LogfireSpan | None = None
 
     try:
-        with _request_scope(
-            "GET",
+        with logfire.span(
+            "mcp.http.request",
+            method="GET",
             client_name=client_name,
             operation=operation,
             path_template=path_template,
-            params=params,
+            phase="request",
+            has_query=bool(params),
+            has_body=False,
         ) as request_span:
             response = await client.get(
                 url,
@@ -328,12 +312,14 @@ async def call_put(
     request_span: logfire.LogfireSpan | None = None
 
     try:
-        with _request_scope(
-            "PUT",
+        with logfire.span(
+            "mcp.http.request",
+            method="PUT",
             client_name=client_name,
             operation=operation,
             path_template=path_template,
-            params=params,
+            phase="request",
+            has_query=bool(params),
             has_body=any(value is not None for value in (content, data, files, json)),
         ) as request_span:
             response = await client.put(
@@ -430,12 +416,14 @@ async def call_patch(
     request_span: logfire.LogfireSpan | None = None
 
     try:
-        with _request_scope(
-            "PATCH",
+        with logfire.span(
+            "mcp.http.request",
+            method="PATCH",
             client_name=client_name,
             operation=operation,
             path_template=path_template,
-            params=params,
+            phase="request",
+            has_query=bool(params),
             has_body=any(value is not None for value in (content, data, files, json)),
         ) as request_span:
             response = await client.patch(
@@ -538,12 +526,14 @@ async def call_post(
     request_span: logfire.LogfireSpan | None = None
 
     try:
-        with _request_scope(
-            "POST",
+        with logfire.span(
+            "mcp.http.request",
+            method="POST",
             client_name=client_name,
             operation=operation,
             path_template=path_template,
-            params=params,
+            phase="request",
+            has_query=bool(params),
             has_body=any(value is not None for value in (content, data, files, json)),
         ) as request_span:
             response = await client.post(
@@ -665,12 +655,15 @@ async def call_delete(
     request_span: logfire.LogfireSpan | None = None
 
     try:
-        with _request_scope(
-            "DELETE",
+        with logfire.span(
+            "mcp.http.request",
+            method="DELETE",
             client_name=client_name,
             operation=operation,
             path_template=path_template,
-            params=params,
+            phase="request",
+            has_query=bool(params),
+            has_body=False,
         ) as request_span:
             response = await client.delete(
                 url=url,

tests/mcp/test_tool_utils.py

@@ -24,6 +24,7 @@ def __init__(self, status_code=200):
             self.status_code = status_code
             self.is_success = status_code < 400
             self.json = lambda: {}
+            self.headers = {"content-type": "application/json"}
 
         def raise_for_status(self):
             if self.status_code >= 400:

tests/mcp/test_tool_utils_cloud_auth.py

@@ -14,6 +14,7 @@ def __init__(self, status_code: int, payload: dict):
         self.status_code = status_code
         self._payload = payload
         self.is_success = status_code < 400
+        self.headers = {"content-type": "application/json"}
 
     def json(self):
         return self._payload