follow up optional PRs

Author: clean6378-max-it

models/raw_access.py

@@ -271,36 +271,40 @@ def composer_code_block_data(
 def bubble_relevant_files(
     bubble: Bubble | dict[str, Any], bubble_id: str = ""
 ) -> list[str]:
-    from models.conversation import Bubble
+    from models.conversation import Bubble, _filter_str_list_elements
 
     if isinstance(bubble, Bubble):
         return bubble.relevant_files
-    return cast(
-        list[str],
+    return _filter_str_list_elements(
         _optional_list_absent_ok(
             bubble,
             "relevantFiles",
             model="Bubble",
             entity_id=bubble_id,
         ),
+        model="Bubble",
+        record_id=bubble_id,
+        field="relevantFiles",
     )
 
 
 def bubble_attached_file_uris(
     bubble: Bubble | dict[str, Any], bubble_id: str = ""
 ) -> list[FileUriDict]:
-    from models.conversation import Bubble
+    from models.conversation import Bubble, _filter_dict_list_elements
 
     if isinstance(bubble, Bubble):
         return bubble.attached_file_code_chunks_uris
-    return cast(
-        list[FileUriDict],
+    return _filter_dict_list_elements(
         _optional_list_absent_ok(
             bubble,
             "attachedFileCodeChunksUris",
             model="Bubble",
             entity_id=bubble_id,
         ),
+        model="Bubble",
+        record_id=bubble_id,
+        field="attachedFileCodeChunksUris",
     )
 
 

tests/test_models_wired_at_read_sites.py

@@ -292,6 +292,38 @@ def swapped_from_dict(raw):  # type: ignore[no-redef]
                     "is back to being just a filter.",
             )
 
+    def test_list_composers_response_fields_do_not_mutate_storage_raw(self):
+        from app import create_app
+        from models import WorkspaceLocalComposer
+        import api.composers as composers_mod
+
+        captured: list[WorkspaceLocalComposer] = []
+        original_from_dict = WorkspaceLocalComposer.from_dict
+
+        def capturing_from_dict(raw):  # type: ignore[no-untyped-def]
+            local = original_from_dict(raw)
+            captured.append(local)
+            return local
+
+        app = create_app()
+        app.config["TESTING"] = True
+        app.config["EXCLUSION_RULES"] = []
+        with patch.object(
+            composers_mod.WorkspaceLocalComposer,
+            "from_dict",
+            side_effect=capturing_from_dict,
+        ):
+            client = app.test_client()
+            response = client.get("/api/composers")
+            self.assertEqual(response.status_code, 200)
+            rows = response.get_json()
+            row = next(c for c in rows if c["composerId"] == COMPOSER_ID)
+            self.assertEqual(row["workspaceId"], WORKSPACE_ID)
+
+        local = next(c for c in captured if c.composer_id == COMPOSER_ID)
+        self.assertNotIn("workspaceId", local._raw)
+        self.assertNotIn("workspaceFolder", local._raw)
+
 
 class TestGetComposerValidatesSchema(unittest.TestCase):
     # Brad's follow-up finding: list_composers() validates each row via

tests/test_raw_accessors.py

@@ -15,6 +15,8 @@
 from models.conversation import Bubble, Composer
 from utils.display_bubble import bubble_display_timestamp_ms
 from models.raw_access import (
+    bubble_attached_file_uris,
+    bubble_relevant_files,
     composer_newly_created_files,
     conversation_header_bubble_id,
     message_request_context_project_layouts,
@@ -163,6 +165,40 @@ def test_dict_bridge_newly_created_files_matches_composer_property(self) -> None
             composer_newly_created_files(composer, "cid-bridge"),
         )
 
+    def test_dict_bridge_relevant_files_skips_non_str_elements(self) -> None:
+        raw = {"relevantFiles": ["/good.py", 123, "/also.py"]}
+        bubble = Bubble.from_dict(raw, bubble_id="b-bridge")
+        with self.assertLogs("models.conversation", level="WARNING") as logs:
+            self.assertEqual(
+                bubble_relevant_files(raw, "b-bridge"),
+                ["/good.py", "/also.py"],
+            )
+        self.assertEqual(bubble.relevant_files, bubble_relevant_files(bubble, "b-bridge"))
+        self.assertTrue(any("relevantFiles" in m for m in logs.output), logs.output)
+
+    def test_dict_bridge_attached_file_uris_skips_non_dict_elements(self) -> None:
+        raw = {
+            "attachedFileCodeChunksUris": [
+                {"path": "/a.py"},
+                "bad",
+                {"path": "/b.py"},
+            ]
+        }
+        bubble = Bubble.from_dict(raw, bubble_id="b-bridge-uri")
+        with self.assertLogs("models.conversation", level="WARNING") as logs:
+            self.assertEqual(
+                bubble_attached_file_uris(raw, "b-bridge-uri"),
+                [{"path": "/a.py"}, {"path": "/b.py"}],
+            )
+        self.assertEqual(
+            bubble.attached_file_code_chunks_uris,
+            bubble_attached_file_uris(bubble, "b-bridge-uri"),
+        )
+        self.assertTrue(
+            any("attachedFileCodeChunksUris" in m for m in logs.output),
+            logs.output,
+        )
+
     def test_optional_raw_list_no_warning_when_present(self) -> None:
         with self.assertNoLogs("models.raw_access", level="WARNING"):
             value = optional_raw_list(