fix(#125): address bradjin8 tab nocache, ctx enrichment, and tests

Author: clean6378-max-it

api/workspaces.py

@@ -167,7 +167,8 @@ def get_workspace_tabs(workspace_id: str) -> tuple[Response, int] | Response:
         workspace_id: Storage folder name, ``global`` for unassigned chats, or
             ``cli:<project_id>``.
         summary: When ``1`` or ``true``, return lightweight tab headers only.
-        nocache: When ``1`` or ``true``, bypass cache on summary requests.
+        nocache: When ``1`` or ``true``, bypass cache on summary and full-tab
+            requests (alias disk cache on per-tab lazy load).
 
     Returns:
         Tabs payload from :func:`services.workspace_tabs` helpers (typically
@@ -190,7 +191,9 @@ def get_workspace_tabs(workspace_id: str) -> tuple[Response, int] | Response:
                 workspace_id, workspace_path, rules, nocache=_request_nocache(),
             )
         else:
-            payload, status = assemble_workspace_tabs(workspace_id, workspace_path, rules)
+            payload, status = assemble_workspace_tabs(
+                workspace_id, workspace_path, rules, nocache=_request_nocache(),
+            )
         return json_response(payload, status)
     except Exception:
         _logger.exception("Failed to get workspace tabs")
@@ -209,6 +212,7 @@ def get_workspace_tab(workspace_id: str, composer_id: str) -> tuple[Response, in
         workspace_id: Storage folder name, ``global`` for unassigned chats, or
             ``cli:<project_id>`` (CLI workspaces return 400).
         composer_id: Composer UUID to load.
+        nocache: When ``1`` or ``true``, bypass alias disk cache.
 
     Returns:
         Single-tab JSON from :func:`services.workspace_tabs.assemble_single_tab`
@@ -221,7 +225,13 @@ def get_workspace_tab(workspace_id: str, composer_id: str) -> tuple[Response, in
     try:
         workspace_path = resolve_workspace_path()
         rules = exclusion_rules()
-        payload, status = assemble_single_tab(workspace_id, composer_id, workspace_path, rules)
+        payload, status = assemble_single_tab(
+            workspace_id,
+            composer_id,
+            workspace_path,
+            rules,
+            nocache=_request_nocache(),
+        )
         return json_response(payload, status)
     except Exception:
         _logger.exception("Failed to get workspace tab")

services/workspace_tabs.py

@@ -51,8 +51,8 @@
     set_cached_tab_summaries,
 )
 from services.workspace_context import (
-    resolve_invalid_workspace_aliases_cached,
     resolve_workspace_context_cached,
+    with_invalid_workspace_aliases,
 )
 from services.workspace_db import (
     COMPOSER_ROWS_WITH_HEADERS_SQL,
@@ -453,16 +453,19 @@ def _build_workspace_tab_summaries_uncached(
 
         project_layouts_map = load_project_layouts_map(global_db)
 
+        # Full composerData roster still required for the summary tab loop;
+        # alias inference alone is fingerprint-cached across requests.
         composer_rows = safe_fetchall(global_db, COMPOSER_ROWS_WITH_HEADERS_SQL)
 
-        invalid_workspace_aliases = resolve_invalid_workspace_aliases_cached(
+        ctx = with_invalid_workspace_aliases(
             ctx,
             global_db,
             workspace_path,
             rules,
             nocache=nocache,
             project_layouts_map=project_layouts_map,
         )
+        invalid_workspace_aliases = ctx.invalid_workspace_aliases or {}
 
         for row in composer_rows:
             composer = parse_composer_data_row(
@@ -529,6 +532,8 @@ def assemble_single_tab(
     composer_id: str,
     workspace_path: str,
     rules: list[Any],
+    *,
+    nocache: bool = False,
 ) -> tuple[dict[str, Any], int]:
     """Assemble a single conversation tab for GET /api/workspaces/<id>/tabs/<composer_id>.
 
@@ -541,6 +546,7 @@ def assemble_single_tab(
         composer_id: UUID of the composer / conversation to assemble.
         workspace_path: Cursor ``workspaceStorage`` root.
         rules: Exclusion rule token lists.
+        nocache: When ``True``, bypass alias disk cache reads and writes.
 
     Returns:
         ``(payload, status)``.  On success (``200``), *payload* is
@@ -550,7 +556,9 @@ def assemble_single_tab(
     """
     parse_warnings = ParseWarningCollector()
 
-    ctx = resolve_workspace_context_cached(workspace_path, rules)
+    ctx = resolve_workspace_context_cached(
+        workspace_path, rules, nocache=nocache,
+    )
     workspace_entries = ctx.workspace_entries
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id
@@ -583,12 +591,10 @@ def assemble_single_tab(
         project_layouts_map[composer_id] = load_project_layouts_for_composer(
             global_db, composer_id,
         )
-        invalid_workspace_aliases = resolve_invalid_workspace_aliases_cached(
-            ctx,
-            global_db,
-            workspace_path,
-            rules,
+        ctx = with_invalid_workspace_aliases(
+            ctx, global_db, workspace_path, rules, nocache=nocache,
         )
+        invalid_workspace_aliases = ctx.invalid_workspace_aliases or {}
 
         bubble_map = load_bubbles_for_composer(
             global_db, composer_id, parse_warnings=parse_warnings,
@@ -633,13 +639,16 @@ def assemble_workspace_tabs(
     workspace_id: str,
     workspace_path: str,
     rules: list[Any],
+    *,
+    nocache: bool = False,
 ) -> tuple[dict[str, Any], int]:
     """Build tabs payload for GET /api/workspaces/<id>/tabs (IDE workspaces).
 
     Args:
         workspace_id: Workspace folder name, or ``"global"`` for unassigned chats.
         workspace_path: Cursor ``workspaceStorage`` root.
         rules: Exclusion rule token lists from :func:`utils.exclusion_rules.load_rules`.
+        nocache: When ``True``, bypass alias disk cache reads and writes.
 
     Returns:
         ``(payload, status)``. On success (``200``), *payload* contains ``tabs``
@@ -651,7 +660,9 @@ def assemble_workspace_tabs(
     parse_warnings = ParseWarningCollector()
     response: dict[str, Any] = {"tabs": []}
 
-    ctx = resolve_workspace_context_cached(workspace_path, rules)
+    ctx = resolve_workspace_context_cached(
+        workspace_path, rules, nocache=nocache,
+    )
     workspace_entries = ctx.workspace_entries
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id
@@ -714,13 +725,15 @@ def assemble_workspace_tabs(
         # Get composer data entries with conversations
         composer_rows = safe_fetchall(global_db, COMPOSER_ROWS_WITH_HEADERS_SQL)
 
-        invalid_workspace_aliases = resolve_invalid_workspace_aliases_cached(
+        ctx = with_invalid_workspace_aliases(
             ctx,
             global_db,
             workspace_path,
             rules,
+            nocache=nocache,
             project_layouts_map=project_layouts_map,
         )
+        invalid_workspace_aliases = ctx.invalid_workspace_aliases or {}
 
         for row in composer_rows:
             composer = parse_composer_data_row(

tests/test_workspace_listing_performance.py

@@ -137,12 +137,18 @@ def test_output_shape_preserved(self):
 
     def test_nocache_bypasses_alias_disk_cache(self):
         ws_path = _make_fixture_with_invalid_workspace(self.tmp.name)
-        with patch(
-            "services.summary_cache.get_cached_invalid_workspace_aliases",
-        ) as mock_get:
+        with (
+            patch(
+                "services.summary_cache.get_cached_invalid_workspace_aliases",
+            ) as mock_get,
+            patch(
+                "services.summary_cache.set_cached_invalid_workspace_aliases",
+            ) as mock_set,
+        ):
             mock_get.return_value = {"invalid-ws": "global"}
             list_workspace_projects(ws_path, rules=[], nocache=True)
         mock_get.assert_not_called()
+        mock_set.assert_not_called()
 
 
 if __name__ == "__main__":