fix: code rabbitai comments

Author: bradjin8

services/workspace_resolver.py

@@ -342,6 +342,13 @@ def _infer_invalid_workspace_aliases(
                 e,
             )
             continue
+        if not isinstance(cd, dict):
+            _logger.warning(
+                "Failed to parse Composer from composerData:%s: expected object, got %s",
+                cid,
+                type(cd).__name__,
+            )
+            continue
         inferred = _determine_project_for_conversation(
             cd,
             cid,

services/workspace_tabs.py

@@ -114,8 +114,15 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
             parts = row["key"].split(":")
             if len(parts) >= 3:
                 bid = parts[2]
-                parsed = _try_loads_kv_value(row["value"])
-                if parsed is None:
+                try:
+                    parsed = json.loads(row["value"])
+                except json.JSONDecodeError as e:
+                    _logger.warning(
+                        "Failed to decode Bubble from %s: %s (value: %r)",
+                        row["key"],
+                        e,
+                        row["value"],
+                    )
                     continue
                 try:
                     bubble_obj = Bubble.from_dict(parsed, bubble_id=bid)
@@ -185,8 +192,15 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
 
         for row in composer_rows:
             composer_id = row["key"].split(":")[1]
-            parsed = _try_loads_kv_value(row["value"])
-            if parsed is None:
+            try:
+                parsed = json.loads(row["value"])
+            except json.JSONDecodeError as e:
+                _logger.warning(
+                    "Failed to decode Composer from composerData:%s: %s (value: %r)",
+                    composer_id,
+                    e,
+                    row["value"],
+                )
                 continue
             try:
                 composer = Composer.from_dict(parsed, composer_id=composer_id)

tests/test_invalid_workspace_aliases.py

@@ -87,6 +87,36 @@ def test_drifted_composer_does_not_skew_vote(self):
         # cid-3 is dropped (drift), so boost-ws wins 2-0 (not 2-1)
         self.assertEqual(aliases.get("invalid-ws"), "boost-ws")
 
+    def test_non_dict_composer_json_skipped_without_crash(self) -> None:
+        composer_rows = [
+            {"key": "composerData:cid-1", "value": json.dumps({"createdAt": 1_715_000_000_000, "fullConversationHeadersOnly": []})},
+            {"key": "composerData:cid-2", "value": json.dumps({"createdAt": 1_715_000_000_000, "fullConversationHeadersOnly": []})},
+            {"key": "composerData:cid-bad", "value": json.dumps("not-a-dict")},
+        ]
+        composer_id_to_ws = {"cid-1": "invalid-ws", "cid-2": "invalid-ws", "cid-bad": "invalid-ws"}
+        project_layouts_map = {
+            "cid-1": [normalize_file_path(r"d:\_Cpp_Digest\boostbacklog")],
+            "cid-2": [normalize_file_path(r"d:\_Cpp_Digest\boostbacklog")],
+            "cid-bad": [normalize_file_path(r"d:\_Cpp_Digest\team-brain")],
+        }
+        workspace_path_map = {
+            normalize_file_path(r"d:\_cpp_digest\boostbacklog"): "boost-ws",
+            normalize_file_path(r"d:\_cpp_digest\team-brain"): "team-ws",
+        }
+
+        aliases = _infer_invalid_workspace_aliases(
+            composer_rows=composer_rows,
+            project_layouts_map=project_layouts_map,
+            project_name_map={},
+            workspace_path_map=workspace_path_map,
+            workspace_entries=[],
+            bubble_map={},
+            composer_id_to_ws=composer_id_to_ws,
+            invalid_workspace_ids={"invalid-ws"},
+        )
+
+        self.assertEqual(aliases.get("invalid-ws"), "boost-ws")
+
 
 if __name__ == "__main__":
     unittest.main()

tests/test_parse_failure_logging.py

@@ -8,6 +8,7 @@
 import sqlite3
 import sys
 import tempfile
+from contextlib import closing
 
 import pytest
 
@@ -116,6 +117,68 @@ def test_listing_logs_composer_schema_drift(caplog_at_warning: pytest.LogCapture
     )
 
 
+def test_workspace_tabs_logs_bubble_json_decode_failure(
+    caplog_at_warning: pytest.LogCaptureFixture,
+) -> None:
+    from flask import Flask
+
+    app = Flask(__name__)
+    app.config["TESTING"] = True
+    app.config["EXCLUSION_RULES"] = []
+
+    with tempfile.TemporaryDirectory() as tmp:
+        ws_root = _seed_tabs_with_drifted_bubble(tmp)
+        global_db = os.path.join(tmp, "globalStorage", "state.vscdb")
+        with closing(sqlite3.connect(global_db)) as conn:
+            conn.execute(
+                "INSERT INTO cursorDiskKV ([key], value) VALUES (?, ?)",
+                ("bubbleId:cmp-ok:b-json", "{not valid json"),
+            )
+            conn.commit()
+        with caplog_at_warning.at_level(logging.WARNING, logger="services.workspace_tabs"):
+            with app.test_request_context("/api/workspaces/global/tabs"):
+                payload, status = assemble_workspace_tabs("global", ws_root, rules=[])
+
+    assert status == 200
+    messages = [r.getMessage() for r in caplog_at_warning.records]
+    assert any("decode Bubble" in m and "b-json" in m for m in messages), (
+        f"expected JSON decode warning for b-json, got: {messages}"
+    )
+
+
+def test_workspace_tabs_logs_composer_json_decode_failure(
+    caplog_at_warning: pytest.LogCaptureFixture,
+) -> None:
+    from flask import Flask
+
+    app = Flask(__name__)
+    app.config["TESTING"] = True
+    app.config["EXCLUSION_RULES"] = []
+
+    with tempfile.TemporaryDirectory() as tmp:
+        ws_root = _seed_tabs_with_drifted_bubble(tmp)
+        global_db = os.path.join(tmp, "globalStorage", "state.vscdb")
+        # Value must match composer_rows LIKE '%fullConversationHeadersOnly%' to reach parse.
+        bad_composer_value = (
+            '{"fullConversationHeadersOnly": [{"bubbleId": "b1"}], "createdAt":'
+        )
+        with closing(sqlite3.connect(global_db)) as conn:
+            conn.execute(
+                "INSERT INTO cursorDiskKV ([key], value) VALUES (?, ?)",
+                ("composerData:cmp-json", bad_composer_value),
+            )
+            conn.commit()
+        with caplog_at_warning.at_level(logging.WARNING, logger="services.workspace_tabs"):
+            with app.test_request_context("/api/workspaces/global/tabs"):
+                payload, status = assemble_workspace_tabs("global", ws_root, rules=[])
+
+    assert status == 200
+    messages = [r.getMessage() for r in caplog_at_warning.records]
+    assert any("decode Composer" in m and "cmp-json" in m for m in messages), (
+        f"expected JSON decode warning for cmp-json, got: {messages}"
+    )
+
+
 def test_workspace_tabs_logs_bubble_schema_drift(caplog_at_warning: pytest.LogCaptureFixture) -> None:
     from flask import Flask