Fix: reviewer's findings

Author: bradjin8

services/workspace_tabs.py

@@ -689,26 +689,27 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
         cd = composer.raw
 
         # Verify the conversation belongs to the requested workspace.
-        # Use MRC-based project layouts (no bubble scan) for the resolver.
-        project_layouts_map: dict[str, list] = load_project_layouts_map(global_db)
-
-        # Build aliases for workspace resolution (empty bubble_map — summary path)
-        composer_rows_for_aliases = _safe_fetchall(
-            "SELECT key, value FROM cursorDiskKV WHERE key LIKE 'composerData:%'"
-            " AND value IS NOT NULL"
-            " AND value LIKE '%fullConversationHeadersOnly%'"
-            " AND value NOT LIKE '%fullConversationHeadersOnly\":[]%'"
-        )
-        invalid_workspace_aliases = infer_invalid_workspace_aliases(
-            composer_rows=composer_rows_for_aliases,
-            project_layouts_map=project_layouts_map,
-            project_name_map=project_name_map,
-            workspace_path_map=workspace_path_map,
-            workspace_entries=workspace_entries,
-            bubble_map={},
-            composer_id_to_ws=composer_id_to_ws,
-            invalid_workspace_ids=invalid_workspace_ids,
-        )
+        # Scoped MRC load for this composer only; full map + alias scan only
+        # when invalid workspace folders need majority-vote reassignment.
+        project_layouts_map: dict[str, list] = {}
+        invalid_workspace_aliases: dict[str, str] = {}
+        if invalid_workspace_ids:
+            project_layouts_map = load_project_layouts_map(global_db)
+            composer_rows_for_aliases = _safe_fetchall(COMPOSER_ROWS_WITH_HEADERS_SQL)
+            invalid_workspace_aliases = infer_invalid_workspace_aliases(
+                composer_rows=composer_rows_for_aliases,
+                project_layouts_map=project_layouts_map,
+                project_name_map=project_name_map,
+                workspace_path_map=workspace_path_map,
+                workspace_entries=workspace_entries,
+                bubble_map={},
+                composer_id_to_ws=composer_id_to_ws,
+                invalid_workspace_ids=invalid_workspace_ids,
+            )
+        else:
+            project_layouts_map[composer_id] = load_project_layouts_for_composer(
+                global_db, composer_id,
+            )
 
         pid = determine_project_for_conversation(
             cd, composer_id, project_layouts_map,

tests/test_api_endpoints.py

@@ -102,6 +102,52 @@ def test_missing_global_storage_returns_404(self, empty_workspace_client):
         body = response.get_json()
         assert "error" in body
 
+    def test_summary_query_returns_tab_list_without_bubbles(self, client):
+        response = client.get(f"/api/workspaces/{HAPPY_WORKSPACE_ID}/tabs?summary=1")
+        assert response.status_code == 200
+        body = response.get_json()
+        assert "tabs" in body and isinstance(body["tabs"], list)
+        assert body["tabs"], "expected at least one summary tab"
+        tab = next(t for t in body["tabs"] if t["id"] == HAPPY_COMPOSER_ID)
+        assert "title" in tab
+        assert "timestamp" in tab and isinstance(tab["timestamp"], int)
+        assert "messageCount" in tab and isinstance(tab["messageCount"], int)
+        assert "bubbles" not in tab
+
+    def test_summary_query_global_workspace(self, client):
+        response = client.get("/api/workspaces/global/tabs?summary=1")
+        assert response.status_code == 200
+        body = response.get_json()
+        assert "tabs" in body and isinstance(body["tabs"], list)
+
+
+class TestGetWorkspaceTab:
+    def test_happy_path_returns_single_tab(self, client):
+        response = client.get(
+            f"/api/workspaces/{HAPPY_WORKSPACE_ID}/tabs/{HAPPY_COMPOSER_ID}"
+        )
+        assert response.status_code == 200
+        body = response.get_json()
+        assert "tab" in body
+        tab = body["tab"]
+        assert tab["id"] == HAPPY_COMPOSER_ID
+        assert "title" in tab
+        assert "timestamp" in tab and isinstance(tab["timestamp"], int)
+        assert "bubbles" in tab and isinstance(tab["bubbles"], list)
+        assert "codeBlockDiffs" in tab
+
+    def test_unknown_composer_returns_404(self, client):
+        response = client.get(
+            f"/api/workspaces/{HAPPY_WORKSPACE_ID}/tabs/no-such-composer"
+        )
+        assert response.status_code == 404
+        assert "error" in response.get_json()
+
+    def test_cli_workspace_returns_400(self, client):
+        response = client.get("/api/workspaces/cli:proj-1/tabs/cmp-happy")
+        assert response.status_code == 400
+        assert "error" in response.get_json()
+
 
 # ---------------------------------------------------------------------------
 # GET /api/search?q=...

tests/test_workspace_tabs_summary.py

@@ -203,6 +203,29 @@ def test_scoped_bubble_query_only(self):
             msg=f"assemble_single_tab ran a non-scoped bubble scan:\n{global_bubble_scans}",
         )
 
+    def test_scoped_mrc_load_no_invalid_workspaces(self):
+        """Without invalid workspace folders, per-tab load must not full-scan MRC or composers."""
+        (_, _), queries = _collect_queries(
+            self.ws_path,
+            lambda p: assemble_single_tab("global", COMPOSER_ID, p, rules=[]),
+        )
+        mrc_scans = [
+            q for q in queries
+            if "messageRequestContext:%" in q
+            and f"messageRequestContext:{COMPOSER_ID}:%" not in q
+        ]
+        self.assertEqual(
+            mrc_scans,
+            [],
+            msg=f"assemble_single_tab ran a global MRC scan:\n{mrc_scans}",
+        )
+        composer_scans = [q for q in queries if "composerData:%" in q]
+        self.assertEqual(
+            composer_scans,
+            [],
+            msg=f"assemble_single_tab scanned all composers for aliases:\n{composer_scans}",
+        )
+
     def test_single_tab_structure(self):
         payload, status = assemble_single_tab("global", COMPOSER_ID, self.ws_path, rules=[])
         self.assertEqual(status, 200)