fix: review comments by ai

Author: bradjin8

models/conversation.py

@@ -4,8 +4,6 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-_logger = logging.getLogger(__name__)
-
 from models.errors import SchemaError
 from models.from_dict_validation import (
     require_dict,
@@ -15,6 +13,8 @@
     require_type,
 )
 
+_logger = logging.getLogger(__name__)
+
 
 @dataclass(frozen=True)
 class Composer:

models/raw_access.py

@@ -163,13 +163,19 @@ def composer_headers(
 
     if isinstance(data, Composer):
         return data.full_conversation_headers_only
-    headers = optional_raw_list(
-        data,
-        "fullConversationHeadersOnly",
-        model="Composer",
-        entity_id=composer_id,
-    )
-    return headers if headers is not None else []
+    if not isinstance(data, dict):
+        return []
+    value = data.get("fullConversationHeadersOnly")
+    if value is None:
+        return []
+    if not isinstance(value, list):
+        _logger.warning(
+            "Schema drift in Composer %s: invalid type for fullConversationHeadersOnly (expected list, got %s)",
+            composer_id,
+            type(value).__name__,
+        )
+        return []
+    return value
 
 
 def composer_newly_created_files(data: Any, composer_id: str) -> list[Any]:
@@ -206,11 +212,13 @@ def bubble_relevant_files(bubble: Any, bubble_id: str = "") -> list[Any]:
     if isinstance(bubble, Bubble):
         return bubble.relevant_files
     if isinstance(bubble, dict):
-        value = bubble.get("relevantFiles")
-        if value is None:
-            return []
-        if isinstance(value, list):
-            return value
+        files = optional_raw_list(
+            bubble,
+            "relevantFiles",
+            model="Bubble",
+            entity_id=bubble_id,
+        )
+        return files if files is not None else []
     return []
 
 
@@ -220,23 +228,27 @@ def bubble_attached_file_uris(bubble: Any, bubble_id: str = "") -> list[Any]:
     if isinstance(bubble, Bubble):
         return bubble.attached_file_code_chunks_uris
     if isinstance(bubble, dict):
-        value = bubble.get("attachedFileCodeChunksUris")
-        if value is None:
-            return []
-        if isinstance(value, list):
-            return value
+        uris = optional_raw_list(
+            bubble,
+            "attachedFileCodeChunksUris",
+            model="Bubble",
+            entity_id=bubble_id,
+        )
+        return uris if uris is not None else []
     return []
 
 
 def bubble_context(bubble: Any, bubble_id: str = "") -> dict[str, Any]:
     from models.conversation import Bubble
 
     if isinstance(bubble, Bubble):
-        return bubble.context or {}
+        return bubble.context
     if isinstance(bubble, dict):
-        ctx = bubble.get("context")
-        if ctx is None:
-            return {}
-        if isinstance(ctx, dict):
-            return ctx
+        ctx = optional_raw_dict(
+            bubble,
+            "context",
+            model="Bubble",
+            entity_id=bubble_id,
+        )
+        return ctx if ctx is not None else {}
     return {}

tests/test_raw_accessors.py

@@ -24,7 +24,9 @@
 
 class TestRawAccessorDriftLogging(unittest.TestCase):
     def test_composer_newly_created_files_empty_when_key_missing(self) -> None:
-        bare = Composer.from_dict(GOOD_COMPOSER_RAW, composer_id="cid-2")
+        raw = dict(GOOD_COMPOSER_RAW)
+        raw.pop("newlyCreatedFiles", None)
+        bare = Composer.from_dict(raw, composer_id="cid-2")
         with self.assertNoLogs("models.conversation", level="WARNING"):
             self.assertEqual(bare.newly_created_files, [])
 

utils/text_extract.py

@@ -1,7 +1,17 @@
 """Text extraction helpers mirroring the bubble/richText parsing in the Node.js codebase."""
 
+from __future__ import annotations
+
 import json
 import re
+from typing import Any, Protocol
+
+
+class HasBubbleRaw(Protocol):
+    """Bubble model or any object exposing a Cursor JSON ``raw`` dict."""
+
+    @property
+    def raw(self) -> dict[str, Any]: ...
 
 
 def extract_text_from_rich_text(children: list) -> str:
@@ -21,12 +31,12 @@ def extract_text_from_rich_text(children: list) -> str:
     return text
 
 
-def extract_text_from_bubble(bubble: dict | object) -> str:
+def extract_text_from_bubble(bubble: HasBubbleRaw | dict[str, Any]) -> str:
     """Extract displayable text from a bubble object (text, richText, codeBlocks)."""
-    if hasattr(bubble, "raw"):
-        bubble = bubble.raw  # type: ignore[union-attr]
-    if not bubble or not isinstance(bubble, dict):
+    raw: dict[str, Any] = bubble if isinstance(bubble, dict) else bubble.raw
+    if not raw:
         return ""
+    bubble = raw
 
     text = ""