fix: reviewer's comments

Author: bradjin8

api/export_api.py

@@ -22,11 +22,9 @@
 from utils.text_extract import extract_text_from_bubble, slug
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
 from utils.cursor_md_exporter import cursor_ide_chat_to_markdown
-from services.workspace_context import (
-    enrich_workspace_context_from_global_db,
-    resolve_workspace_context,
-)
+from services.workspace_context import resolve_workspace_context_minimal
 from services.workspace_db import (
+    load_bubble_map,
     load_code_block_diff_map,
     open_global_db,
 )
@@ -100,11 +98,7 @@ def export_chats():
                 last_export_ms = to_epoch_ms(ts_str)
 
         # ── Workspace scanning via service layer ──────────────────────────────
-        ctx = resolve_workspace_context(
-            workspace_path,
-            include_invalid_workspace_ids=False,
-            include_workspace_path_map=False,
-        )
+        ctx = resolve_workspace_context_minimal(workspace_path)
         workspace_entries = ctx.workspace_entries
         composer_id_to_ws = ctx.composer_id_to_workspace_id
 
@@ -126,10 +120,7 @@ def export_chats():
             if global_db is None:
                 return jsonify({"error": "Cursor global storage not found"}), 404
 
-            ctx = enrich_workspace_context_from_global_db(
-                ctx, global_db, populate_bubble_map=True,
-            )
-            bubble_map = ctx.bubble_map
+            bubble_map = load_bubble_map(global_db)
             code_block_diff_map = load_code_block_diff_map(global_db)
 
             try:

services/workspace_context.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
+import sqlite3
 from dataclasses import dataclass, replace
-from typing import TYPE_CHECKING
 
 from services.workspace_db import (
     build_composer_id_to_workspace_id,
@@ -18,15 +18,11 @@
     create_workspace_path_to_id_map,
 )
 
-if TYPE_CHECKING:
-    import sqlite3
-
 
 @dataclass(frozen=True)
 class WorkspaceContext:
     """Precomputed workspace-resolution maps for conversation assignment."""
 
-    workspace_path: str
     workspace_entries: list[dict]
     invalid_workspace_ids: set[str]
     composer_id_to_workspace_id: dict[str, str]
@@ -36,82 +32,79 @@ class WorkspaceContext:
     bubble_map: dict[str, dict]
 
 
+def _entries(
+    workspace_path: str,
+    workspace_entries: list[dict] | None,
+) -> list[dict]:
+    if workspace_entries is not None:
+        return workspace_entries
+    return collect_workspace_entries(workspace_path)
+
+
+def _assemble_context(
+    entries: list[dict],
+    *,
+    invalid_workspace_ids: set[str],
+    workspace_path_to_id: dict[str, str],
+    composer_id_to_workspace_id: dict[str, str],
+) -> WorkspaceContext:
+    return WorkspaceContext(
+        workspace_entries=entries,
+        invalid_workspace_ids=invalid_workspace_ids,
+        composer_id_to_workspace_id=composer_id_to_workspace_id,
+        project_name_to_workspace_id=create_project_name_to_workspace_id_map(entries),
+        workspace_path_to_id=workspace_path_to_id,
+        project_layouts_map={},
+        bubble_map={},
+    )
+
+
 def resolve_workspace_context(
     workspace_path: str,
     *,
     workspace_entries: list[dict] | None = None,
-    rules: list | None = None,
-    nocache: bool = False,
-    use_composer_cache: bool = False,
-    include_invalid_workspace_ids: bool = True,
-    include_workspace_path_map: bool = True,
-    global_db: sqlite3.Connection | None = None,
-    populate_project_layouts: bool = False,
-    populate_bubble_map: bool = False,
 ) -> WorkspaceContext:
-    """Run the workspace-determination ceremony and return a typed context.
-
-    Always resolves ``workspace_entries`` (when not supplied), composer and
-    project-name maps. Optional pieces are controlled by flags so lightweight
-    consumers (e.g. HTTP export) can omit unused maps.
-
-    Args:
-        workspace_path: Cursor ``workspaceStorage`` root.
-        workspace_entries: Pre-collected entries; when ``None``, scanned from disk.
-        rules: Exclusion rules; required when ``use_composer_cache`` is ``True``.
-        nocache: Skip the mtime-keyed composer-map disk cache.
-        use_composer_cache: Use :func:`build_composer_id_to_workspace_id_cached`.
-        include_invalid_workspace_ids: When ``False``, ``invalid_workspace_ids`` is empty.
-        include_workspace_path_map: When ``False``, ``workspace_path_to_id`` is empty.
-        global_db: Open global ``state.vscdb`` connection for optional KV loads.
-        populate_project_layouts: Populate ``project_layouts_map`` from *global_db*.
-        populate_bubble_map: Populate ``bubble_map`` from *global_db*.
-
-    Returns:
-        :class:`WorkspaceContext` with all requested maps populated.
-    """
-    entries = (
-        workspace_entries
-        if workspace_entries is not None
-        else collect_workspace_entries(workspace_path)
+    """Full workspace maps with an uncached composer→workspace scan (CLI export)."""
+    entries = _entries(workspace_path, workspace_entries)
+    return _assemble_context(
+        entries,
+        invalid_workspace_ids=collect_invalid_workspace_ids(entries),
+        workspace_path_to_id=create_workspace_path_to_id_map(entries),
+        composer_id_to_workspace_id=build_composer_id_to_workspace_id(
+            workspace_path, entries,
+        ),
     )
-    invalid_ids = (
-        collect_invalid_workspace_ids(entries)
-        if include_invalid_workspace_ids
-        else set()
-    )
-    project_name_map = create_project_name_to_workspace_id_map(entries)
-    workspace_path_map = (
-        create_workspace_path_to_id_map(entries)
-        if include_workspace_path_map
-        else {}
-    )
-    if use_composer_cache:
-        if rules is None:
-            raise ValueError("rules is required when use_composer_cache=True")
-        composer_id_to_ws = build_composer_id_to_workspace_id_cached(
+
+
+def resolve_workspace_context_cached(
+    workspace_path: str,
+    rules: list,
+    *,
+    workspace_entries: list[dict] | None = None,
+    nocache: bool = False,
+) -> WorkspaceContext:
+    """Full workspace maps with a mtime-keyed composer map (listing / tabs)."""
+    entries = _entries(workspace_path, workspace_entries)
+    return _assemble_context(
+        entries,
+        invalid_workspace_ids=collect_invalid_workspace_ids(entries),
+        workspace_path_to_id=create_workspace_path_to_id_map(entries),
+        composer_id_to_workspace_id=build_composer_id_to_workspace_id_cached(
             workspace_path, entries, rules, nocache=nocache,
-        )
-    else:
-        composer_id_to_ws = build_composer_id_to_workspace_id(workspace_path, entries)
-
-    project_layouts: dict[str, list] = {}
-    bubble_map: dict[str, dict] = {}
-    if global_db is not None:
-        if populate_project_layouts:
-            project_layouts = load_project_layouts_map(global_db)
-        if populate_bubble_map:
-            bubble_map = load_bubble_map(global_db)
+        ),
+    )
 
-    return WorkspaceContext(
-        workspace_path=workspace_path,
-        workspace_entries=entries,
-        invalid_workspace_ids=invalid_ids,
-        composer_id_to_workspace_id=composer_id_to_ws,
-        project_name_to_workspace_id=project_name_map,
-        workspace_path_to_id=workspace_path_map,
-        project_layouts_map=project_layouts,
-        bubble_map=bubble_map,
+
+def resolve_workspace_context_minimal(workspace_path: str) -> WorkspaceContext:
+    """Entries, project-name, and composer maps only (HTTP export)."""
+    entries = collect_workspace_entries(workspace_path)
+    return _assemble_context(
+        entries,
+        invalid_workspace_ids=set(),
+        workspace_path_to_id={},
+        composer_id_to_workspace_id=build_composer_id_to_workspace_id(
+            workspace_path, entries,
+        ),
     )
 
 

services/workspace_listing.py

@@ -24,7 +24,7 @@
     nocache_enabled,
     set_cached_projects,
 )
-from services.workspace_context import resolve_workspace_context
+from services.workspace_context import resolve_workspace_context_cached
 from services.workspace_db import (
     COMPOSER_ROWS_WITH_HEADERS_SQL,
     collect_workspace_entries,
@@ -122,12 +122,11 @@ def _build_workspace_projects_uncached(
     nocache: bool,
 ) -> tuple[list[dict], list[dict]]:
     parse_warnings = ParseWarningCollector()
-    ctx = resolve_workspace_context(
+    ctx = resolve_workspace_context_cached(
         workspace_path,
+        rules,
         workspace_entries=workspace_entries,
-        rules=rules,
         nocache=nocache,
-        use_composer_cache=True,
     )
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id

services/workspace_tabs.py

@@ -27,7 +27,7 @@
     nocache_enabled,
     set_cached_tab_summaries,
 )
-from services.workspace_context import resolve_workspace_context
+from services.workspace_context import resolve_workspace_context_cached
 from services.workspace_db import (
     COMPOSER_ROWS_WITH_HEADERS_SQL,
     collect_workspace_entries,
@@ -486,12 +486,11 @@ def _build_workspace_tab_summaries_uncached(
     parse_warnings = ParseWarningCollector()
     response: dict = {"tabs": []}
 
-    ctx = resolve_workspace_context(
+    ctx = resolve_workspace_context_cached(
         workspace_path,
+        rules,
         workspace_entries=workspace_entries,
-        rules=rules,
         nocache=nocache,
-        use_composer_cache=True,
     )
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id
@@ -637,11 +636,7 @@ def assemble_single_tab(
     """
     parse_warnings = ParseWarningCollector()
 
-    ctx = resolve_workspace_context(
-        workspace_path,
-        rules=rules,
-        use_composer_cache=True,
-    )
+    ctx = resolve_workspace_context_cached(workspace_path, rules)
     workspace_entries = ctx.workspace_entries
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id
@@ -773,11 +768,7 @@ def assemble_workspace_tabs(
     parse_warnings = ParseWarningCollector()
     response: dict = {"tabs": []}
 
-    ctx = resolve_workspace_context(
-        workspace_path,
-        rules=rules,
-        use_composer_cache=True,
-    )
+    ctx = resolve_workspace_context_cached(workspace_path, rules)
     workspace_entries = ctx.workspace_entries
     invalid_workspace_ids = ctx.invalid_workspace_ids
     project_name_map = ctx.project_name_to_workspace_id