Harden export state parsing and listing cache fast path

Author: clean6378-max-it

scripts/export.py

@@ -174,6 +174,8 @@ def _read_last_export_ms(state_path: str, since: Literal["all", "last"]) -> int:
     try:
         with open(state_path, "r", encoding="utf-8") as f:
             st = json.load(f)
+        if not isinstance(st, dict):
+            return 0
         ts = st.get("lastExportTime")
         if ts:
             return to_epoch_ms(ts)

services/export_engine.py

@@ -216,7 +216,7 @@ def _collect_ide_export_entries(
         composer_id = row["key"].split(":")[1]
         try:
             cd = json.loads(row["value"])
-        except (json.JSONDecodeError, ValueError) as parse_err:
+        except (json.JSONDecodeError, TypeError, ValueError) as parse_err:
             _logger.debug(
                 "Skipping corrupt composerData row %s: %s",
                 composer_id,
@@ -370,7 +370,8 @@ def _collect_cli_export_entries(
         for session in cp["sessions"]:
             meta = session.get("meta", {})
             session_id = session["session_id"]
-            created_ms: int = meta.get("createdAt") or int(
+            created_raw = meta.get("createdAt")
+            created_ms = to_epoch_ms(created_raw) if created_raw else int(
                 datetime.now().timestamp() * 1000,
             )
             session_name = meta.get("name") or f"Session {session_id[:8]}"

services/workspace_listing.py

@@ -21,12 +21,15 @@
 from models import Bubble, ParseWarningCollector
 from services.export_engine import WorkspaceOrchestration, prepare_workspace_orchestration
 from services.summary_cache import (
+    fingerprint_workspace_storage,
     get_cached_projects,
     nocache_enabled,
     set_cached_projects,
 )
 from services.workspace_db import (
     COMPOSER_ROWS_WITH_HEADERS_SQL,
+    collect_workspace_entries,
+    global_storage_db_path,
     load_project_layouts_for_composer,
     load_project_layouts_map,
     open_global_db,
@@ -91,14 +94,29 @@ def list_workspace_projects(
         :meth:`models.ParseWarningCollector.to_api_list`; empty when no skips.
     """
     effective_nocache = nocache_enabled(request_nocache=nocache)
-    orch = prepare_workspace_orchestration(
-        workspace_path, rules, nocache=effective_nocache,
-    )
+    workspace_entries: list[dict[str, Any]] | None = None
     if not effective_nocache:
-        cached = get_cached_projects(orch.fingerprint)
+        workspace_entries = collect_workspace_entries(workspace_path)
+        gdb = global_storage_db_path(workspace_path)
+        cli_path = get_cli_chats_path()
+        fingerprint = fingerprint_workspace_storage(
+            workspace_path,
+            workspace_entries,
+            global_db_path=gdb if os.path.isfile(gdb) else None,
+            rules=rules,
+            cli_chats_path=cli_path if os.path.isdir(cli_path) else None,
+        )
+        cached = get_cached_projects(fingerprint)
         if cached is not None:
             return cached
 
+    orch = prepare_workspace_orchestration(
+        workspace_path,
+        rules,
+        nocache=effective_nocache,
+        workspace_entries=workspace_entries,
+    )
+
     projects, warnings = _build_workspace_projects_uncached(
         workspace_path, rules, orch,
     )