fix: eval.md findings

Author: bradjin8

api/export_api.py

@@ -13,7 +13,9 @@
 from datetime import datetime
 from pathlib import Path
 
-from flask import Blueprint, Response, current_app, jsonify, request
+from flask import Blueprint, Response, jsonify, request
+
+from api.flask_config import exclusion_rules
 
 from utils.workspace_path import resolve_workspace_path
 from utils.path_helpers import to_epoch_ms
@@ -115,7 +117,7 @@ def export_chats():
 
         today = datetime.now().strftime("%Y-%m-%d")
         exported = []
-        rules = current_app.config.get("EXCLUSION_RULES") or []
+        rules = exclusion_rules()
 
         # ── Database reading via service layer ────────────────────────────────
         with open_global_db(workspace_path) as (global_db, _):
@@ -142,7 +144,11 @@ def export_chats():
                     if not headers:
                         continue
 
-                    updated_at_ms = to_epoch_ms(cd.get("lastUpdatedAt")) or to_epoch_ms(cd.get("createdAt")) or 0
+                    updated_at_ms = to_epoch_ms(cd.get("lastUpdatedAt"))
+                    if updated_at_ms is None:
+                        updated_at_ms = to_epoch_ms(cd.get("createdAt"))
+                    if updated_at_ms is None:
+                        updated_at_ms = 0
                     if since == "last" and updated_at_ms and updated_at_ms <= last_export_ms:
                         continue
 

api/flask_config.py

@@ -0,0 +1,10 @@
+"""Shared Flask request/config helpers for API blueprints."""
+
+from __future__ import annotations
+
+from flask import current_app
+
+
+def exclusion_rules() -> list:
+    """Return loaded exclusion rules from app config (empty list when unset)."""
+    return current_app.config.get("EXCLUSION_RULES") or []

api/workspaces.py

@@ -11,7 +11,9 @@
 import os
 from datetime import datetime, timezone
 
-from flask import Blueprint, current_app, jsonify
+from flask import Blueprint, jsonify
+
+from api.flask_config import exclusion_rules
 
 from utils.workspace_path import resolve_workspace_path, get_cli_chats_path
 from utils.cli_chat_reader import list_cli_projects
@@ -40,11 +42,6 @@
 _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
 # ---------------------------------------------------------------------------
@@ -53,7 +50,7 @@ def _exclusion_rules() -> list:
 def list_workspaces():
     try:
         workspace_path = resolve_workspace_path()
-        rules = _exclusion_rules()
+        rules = exclusion_rules()
         projects, warnings = list_workspace_projects(workspace_path, rules)
         payload: dict = {"projects": projects}
         if warnings:
@@ -150,13 +147,13 @@ def get_workspace(workspace_id):
 def get_workspace_tabs(workspace_id):
     if workspace_id.startswith("cli:"):
         try:
-            return get_cli_workspace_tabs(workspace_id)
+            return get_cli_workspace_tabs(workspace_id, exclusion_rules())
         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 = _exclusion_rules()
+        rules = exclusion_rules()
         payload, status = assemble_workspace_tabs(workspace_id, workspace_path, rules)
         return jsonify(payload), status
     except Exception:

scripts/export.py

@@ -268,14 +268,23 @@ def main():
         composer_id = row["key"].split(":")[1]
         try:
             cd = json.loads(row["value"])
-        except Exception:
+        except (json.JSONDecodeError, ValueError) as parse_err:
+            _logger.debug(
+                "Skipping corrupt composerData row %s: %s",
+                composer_id,
+                parse_err,
+            )
             continue
 
         headers = cd.get("fullConversationHeadersOnly") or []
         if not headers:
             continue
 
-        updated_at = to_epoch_ms(cd.get("lastUpdatedAt")) or to_epoch_ms(cd.get("createdAt")) or 0
+        updated_at = to_epoch_ms(cd.get("lastUpdatedAt"))
+        if updated_at is None:
+            updated_at = to_epoch_ms(cd.get("createdAt"))
+        if updated_at is None:
+            updated_at = 0
         if since == "last" and updated_at <= last_export:
             continue
 

services/cli_tabs.py

@@ -3,20 +3,21 @@
 import logging
 from datetime import datetime
 
-from flask import current_app, jsonify
-
-_logger = logging.getLogger(__name__)
+from flask import jsonify
 
 from utils.cli_chat_reader import list_cli_projects, messages_to_bubbles, traverse_blobs
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
 from utils.workspace_path import get_cli_chats_path
 
+_logger = logging.getLogger(__name__)
+
 
-def get_cli_workspace_tabs(workspace_id: str):
+def get_cli_workspace_tabs(workspace_id: str, rules: list):
     """Return Flask JSON response with tabs for a Cursor CLI project.
 
     Args:
         workspace_id: Workspace id with ``cli:`` prefix (e.g. ``cli:proj-1``).
+        rules: Exclusion rule token lists (same as :func:`services.workspace_tabs.assemble_workspace_tabs`).
 
     Returns:
         ``flask.Response | tuple[flask.Response, int]`` suitable for a Flask route
@@ -37,7 +38,6 @@ def get_cli_workspace_tabs(workspace_id: str):
         if project is None:
             return jsonify({"error": "CLI project not found"}), 404
 
-        rules = current_app.config.get("EXCLUSION_RULES") or []
         ws_name = project.get("workspace_name") or project_id[:12]
         sessions = project.get("sessions") or []
         if not isinstance(sessions, list):

services/workspace_resolver.py

@@ -111,7 +111,12 @@ def infer_workspace_name_from_context(workspace_path: str, workspace_id: str) ->
                     continue
                 try:
                     ctx = json.loads(row[0])
-                except Exception:
+                except (json.JSONDecodeError, ValueError) as e:
+                    _logger.debug(
+                        "Skipping malformed messageRequestContext for %s: %s",
+                        cid,
+                        e,
+                    )
                     continue
                 layouts = ctx.get("projectLayouts")
                 if not isinstance(layouts, list):
@@ -121,7 +126,12 @@ def infer_workspace_name_from_context(workspace_path: str, workspace_id: str) ->
                     if isinstance(layout, str):
                         try:
                             obj = json.loads(layout)
-                        except Exception:
+                        except (json.JSONDecodeError, ValueError) as e:
+                            _logger.debug(
+                                "Skipping malformed projectLayout for %s: %s",
+                                cid,
+                                e,
+                            )
                             obj = None
                     elif isinstance(layout, dict):
                         obj = layout

tests/test_cli_tabs.py

@@ -59,7 +59,7 @@ def fake_traverse_blobs(db_path):
              patch("services.cli_tabs.list_cli_projects", return_value=[project]), \
              patch("services.cli_tabs.traverse_blobs", side_effect=fake_traverse_blobs), \
              patch("services.cli_tabs.messages_to_bubbles", side_effect=fake_messages_to_bubbles):
-            response = get_cli_workspace_tabs("cli:proj-1")
+            response = get_cli_workspace_tabs("cli:proj-1", [])
 
         self.assertEqual(response.status_code, 200)
         payload = response.get_json()
@@ -86,7 +86,7 @@ def fake_messages_to_bubbles(messages, created_ms):
              patch("services.cli_tabs.list_cli_projects", return_value=[project]), \
              patch("services.cli_tabs.traverse_blobs", side_effect=fake_traverse_blobs), \
              patch("services.cli_tabs.messages_to_bubbles", side_effect=fake_messages_to_bubbles):
-            response = get_cli_workspace_tabs("cli:proj-1")
+            response = get_cli_workspace_tabs("cli:proj-1", [])
 
         self.assertEqual(response.status_code, 200)
         payload = response.get_json()
@@ -113,7 +113,7 @@ def fake_messages_to_bubbles(messages, created_ms):
              patch("services.cli_tabs.list_cli_projects", return_value=garbage_then_real), \
              patch("services.cli_tabs.traverse_blobs", side_effect=fake_traverse_blobs), \
              patch("services.cli_tabs.messages_to_bubbles", side_effect=fake_messages_to_bubbles):
-            response = get_cli_workspace_tabs("cli:proj-1")
+            response = get_cli_workspace_tabs("cli:proj-1", [])
 
         self.assertEqual(response.status_code, 200)
         payload = response.get_json()
@@ -131,7 +131,7 @@ def test_project_missing_workspace_name_uses_fallback(self) -> None:
              patch("services.cli_tabs.traverse_blobs", return_value=["ok"]), \
              patch("services.cli_tabs.messages_to_bubbles",
                    return_value=[{"type": "user", "text": "hi", "timestamp": 1}]):
-            response = get_cli_workspace_tabs("cli:proj-min")
+            response = get_cli_workspace_tabs("cli:proj-min", [])
 
         self.assertEqual(response.status_code, 200)
         # Tab still rendered — ws_name fallback (project_id[:12]) used for searchable text.
@@ -144,7 +144,7 @@ def test_project_missing_sessions_returns_200_empty_tabs(self) -> None:
 
         with app.test_request_context("/api/workspaces/cli:proj-empty/tabs"), \
              patch("services.cli_tabs.list_cli_projects", return_value=[project]):
-            response = get_cli_workspace_tabs("cli:proj-empty")
+            response = get_cli_workspace_tabs("cli:proj-empty", [])
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.get_json(), {"tabs": []})