fix: addressed reviewer's comment

Author: bradjin8

api/export_api.py

@@ -47,8 +47,12 @@ def _get_export_state() -> dict:
         try:
             with open(state_path, "r", encoding="utf-8") as f:
                 return json.load(f)
-        except Exception:
-            pass
+        except (json.JSONDecodeError, ValueError, OSError) as e:
+            _logger.warning(
+                "Could not read export state from %s: %s",
+                state_path,
+                e,
+            )
     return {}
 
 

api/workspaces.py

@@ -40,6 +40,11 @@
 _logger = logging.getLogger(__name__)
 
 
+def _exclusion_rules() -> list:
+    """Return loaded exclusion rules from app config (empty list when unset)."""
+    return current_app.config.get("EXCLUSION_RULES") or []
+
+
 # ---------------------------------------------------------------------------
 # GET /api/workspaces
 # ---------------------------------------------------------------------------
@@ -48,7 +53,7 @@
 def list_workspaces():
     try:
         workspace_path = resolve_workspace_path()
-        rules = current_app.config.get("EXCLUSION_RULES") or []
+        rules = _exclusion_rules()
         projects, warnings = list_workspace_projects(workspace_path, rules)
         payload: dict = {"projects": projects}
         if warnings:
@@ -144,10 +149,14 @@ def get_workspace(workspace_id):
 @bp.route("/api/workspaces/<workspace_id>/tabs")
 def get_workspace_tabs(workspace_id):
     if workspace_id.startswith("cli:"):
-        return get_cli_workspace_tabs(workspace_id)
+        try:
+            return get_cli_workspace_tabs(workspace_id)
+        except Exception:
+            _logger.exception("Failed to get CLI workspace tabs")
+            return jsonify({"error": "Failed to get workspace tabs"}), 500
     try:
         workspace_path = resolve_workspace_path()
-        rules = current_app.config.get("EXCLUSION_RULES") or []
+        rules = _exclusion_rules()
         payload, status = assemble_workspace_tabs(workspace_id, workspace_path, rules)
         return jsonify(payload), status
     except Exception:

scripts/export.py

@@ -39,7 +39,6 @@
     extract_text_from_bubble,
     slug,
 )
-from utils.tool_parser import parse_tool_call  # noqa: E402
 from utils.workspace_path import (  # noqa: E402
     get_cli_chats_path,
     resolve_workspace_path,
@@ -197,8 +196,11 @@ def main():
             ts = st.get("lastExportTime")
             if ts:
                 last_export = int(datetime.fromisoformat(ts.replace("Z", "+00:00")).timestamp() * 1000)
-        except Exception:
-            pass
+        except Exception as e:
+            _logger.warning(
+                "Could not read last export timestamp; defaulting to full export: %s",
+                e,
+            )
 
     # ── Workspace scanning via service layer ──────────────────────────────────
     workspace_entries = collect_workspace_entries(workspace_path)

services/workspace_listing.py

@@ -38,7 +38,20 @@
 
 
 def list_workspace_projects(workspace_path: str, rules: list) -> tuple[list[dict], list[dict]]:
-    """Return (projects, warnings) for GET /api/workspaces."""
+    """List workspace projects for GET /api/workspaces.
+
+    Args:
+        workspace_path: Cursor ``workspaceStorage`` root.
+        rules: Exclusion rule token lists from :func:`utils.exclusion_rules.load_rules`.
+
+    Returns:
+        ``(projects, warnings)``. Each project dict has ``id``, ``name``,
+        ``path`` (``workspace.json`` path), ``conversationCount``,
+        ``lastModified`` (ISO 8601), and optional ``aliasIds`` / ``source``
+        (``"cli"`` for Cursor CLI projects). *warnings* is a list of structured
+        parse-error dicts (``type``, ``count``, ``detail``) from
+        :meth:`models.ParseWarningCollector.to_api_list`; empty when no skips.
+    """
     parse_warnings = ParseWarningCollector()
     workspace_entries = collect_workspace_entries(workspace_path)
     invalid_workspace_ids = collect_invalid_workspace_ids(workspace_entries)

services/workspace_resolver.py

@@ -227,8 +227,18 @@ def determine_project_for_conversation(
 ) -> str | None:
     """Resolve which workspace folder owns a composer conversation.
 
-    Uses per-workspace composer maps, project layouts, file paths in bubbles,
-    and path-segment heuristics in priority order.
+    Args:
+        composer_data: Parsed ``composerData`` JSON for *composer_id*.
+        composer_id: Composer UUID from the global DB key.
+        project_layouts_map: ``{composer_id: [root_path, ...]}`` from global KV.
+        project_name_to_workspace_id: Basename-to-workspace-folder map.
+        workspace_path_to_id: Normalized root path to workspace folder map.
+        workspace_entries: Output of :func:`services.workspace_db.collect_workspace_entries`.
+        bubble_map: ``{bubble_id: bubble_dict}`` from global KV.
+        composer_id_to_workspace_id: Definitive per-workspace composer map; when
+            ``None``, layout and path heuristics are used without this shortcut.
+        invalid_workspace_ids: Workspace folders marked invalid; mapped IDs in
+            this set are ignored when using *composer_id_to_workspace_id*.
 
     Returns:
         Workspace folder name, or ``None`` when no project can be determined.
@@ -360,7 +370,27 @@ def infer_invalid_workspace_aliases(
     composer_id_to_ws: dict,
     invalid_workspace_ids: set[str],
 ) -> dict[str, str]:
-    """Majority-vote each invalid workspace ID to its most likely valid replacement."""
+    """Map invalid workspace IDs to valid replacements by majority vote.
+
+    For each composer assigned to an *invalid_workspace_ids* entry, calls
+    :func:`determine_project_for_conversation` without the definitive composer map
+    and counts votes for inferred valid workspace folders.
+
+    Args:
+        composer_rows: Global ``composerData:*`` SQLite rows.
+        project_layouts_map: Layout map passed to :func:`determine_project_for_conversation`.
+        project_name_map: Basename map for path resolution.
+        workspace_path_map: Normalized path map for path resolution.
+        workspace_entries: Workspace folder entries from storage scan.
+        bubble_map: Bubble KV map for path resolution.
+        composer_id_to_ws: Composer-to-workspace map (may point at invalid IDs).
+        invalid_workspace_ids: Workspace folder names to reassign.
+
+    Returns:
+        ``{invalid_id: replacement_id}`` for IDs with at least one vote. Ties
+        break by choosing the replacement with the highest vote count (first
+        max in iteration order). Returns ``{}`` when no invalid ID receives votes.
+    """
     votes: dict[str, dict[str, int]] = {}
     for row in composer_rows:
         cid = row["key"].split(":")[1]

services/workspace_tabs.py

@@ -82,7 +82,20 @@ def assemble_workspace_tabs(
     workspace_path: str,
     rules: list,
 ) -> tuple[dict, int]:
-    """Build (payload, status) for GET /api/workspaces/<id>/tabs; status=404 if global storage is missing."""
+    """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`.
+
+    Returns:
+        ``(payload, status)``. On success (``200``), *payload* contains ``tabs``
+        (list of tab dicts with ``id``, ``title``, ``timestamp``, ``bubbles``,
+        optional ``metadata`` / ``codeBlockDiffs``) and optional ``warnings``
+        when parse failures were skipped. On failure (``404``), *payload* is
+        ``{"error": "Global storage not found"}``.
+    """
     parse_warnings = ParseWarningCollector()
     response: dict = {"tabs": []}
 
@@ -359,7 +372,12 @@ def _safe_fetchall(query: str, params: tuple = ()) -> list:
 
                     # Context window
                     ctx_window = raw.get("contextWindowStatusAtCreation") or {}
-                    ctx_pct = ctx_window.get("percentageRemainingFloat") or ctx_window.get("percentageRemaining")
+                    ctx_pct = None
+                    if isinstance(ctx_window, dict):
+                        if ctx_window.get("percentageRemainingFloat") is not None:
+                            ctx_pct = ctx_window.get("percentageRemainingFloat")
+                        elif ctx_window.get("percentageRemaining") is not None:
+                            ctx_pct = ctx_window.get("percentageRemaining")
 
                     # Display text fallbacks
                     display_text = full_text.strip()

tests/test_workspace_tabs_malformed_nested.py

@@ -201,7 +201,7 @@ def test_non_dict_parse_result_does_not_drop_composer(self) -> None:
 
         with tempfile.TemporaryDirectory() as tmp:
             ws_root = _seed_workspace_with_tool_former(tmp)
-            # Force _parse_tool_call to return None — the previous code
+            # Force parse_tool_call to return None — the previous code
             # would have stored ``tool_calls = [None]`` and crashed in the
             # display-text fallback with ``NoneType.get``.
             with patch("services.workspace_tabs.parse_tool_call", return_value=None):