fix: resolve issue 1 findings not resolved fully

Author: bradjin8

services/workspace_tabs.py

@@ -689,12 +689,15 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
         cd = composer.raw
 
         # Verify the conversation belongs to the requested workspace.
-        # Scoped MRC load for this composer only; full map + alias scan only
-        # when invalid workspace folders need majority-vote reassignment.
+        # Always scoped: only load messageRequestContext rows for this composer.
         project_layouts_map: dict[str, list] = {}
         invalid_workspace_aliases: dict[str, str] = {}
+        project_layouts_map[composer_id] = load_project_layouts_for_composer(
+            global_db, composer_id,
+        )
         if invalid_workspace_ids:
-            project_layouts_map = load_project_layouts_map(global_db)
+            # Alias resolution still needs the composer roster, but project layouts
+            # are intentionally limited to this composer (single-tab scope).
             composer_rows_for_aliases = _safe_fetchall(COMPOSER_ROWS_WITH_HEADERS_SQL)
             invalid_workspace_aliases = infer_invalid_workspace_aliases(
                 composer_rows=composer_rows_for_aliases,
@@ -706,10 +709,6 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
                 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_workspace_tabs_summary.py

@@ -108,6 +108,31 @@ def _make_fixture(base: str) -> str:
     return ws_path
 
 
+def _add_invalid_workspace_and_mrc_rows(ws_path: str) -> None:
+    """Add an invalid workspace entry and MRC rows for two composers (alias-path trigger)."""
+    invalid_dir = os.path.join(ws_path, "invalid-ws")
+    os.makedirs(invalid_dir, exist_ok=True)
+    wj = os.path.join(invalid_dir, "workspace.json")
+    with open(wj, "w", encoding="utf-8") as f:
+        json.dump({}, f)
+
+    global_db = os.path.join(os.path.dirname(ws_path), "globalStorage", "state.vscdb")
+    conn = sqlite3.connect(global_db)
+    for cid, ctx_id in (
+        (COMPOSER_ID, "ctx-summary"),
+        (OTHER_COMPOSER_ID, "ctx-other"),
+    ):
+        conn.execute(
+            "INSERT INTO cursorDiskKV ([key], value) VALUES (?, ?)",
+            (
+                f"messageRequestContext:{cid}:{ctx_id}",
+                json.dumps({"projectLayouts": [f"/roots/{cid}"]}),
+            ),
+        )
+    conn.commit()
+    conn.close()
+
+
 def _collect_queries(ws_path, fn):
     """Call fn(ws_path) while recording every SQL query; return (result, queries)."""
     import services.workspace_tabs as _ws_tabs_mod
@@ -203,6 +228,25 @@ 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_with_invalid_workspaces(self):
+        """With invalid workspace folders, alias scan runs but MRC stays per-composer."""
+        _add_invalid_workspace_and_mrc_rows(self.ws_path)
+        (_, _), queries = _collect_queries(
+            self.ws_path,
+            lambda p: assemble_single_tab("global", COMPOSER_ID, p, rules=[]),
+        )
+        self.assertTrue(queries, msg="expected SQL queries to be recorded")
+        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}",
+        )
+
     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(