Merge origin/master into feat/split-api-workspaces-25

Resolves the structural conflict in api/workspaces.py: PR #31's whole
point is splitting the 1400-line monolith into services (HEAD has the
thin route handlers that delegate to services.workspace_listing /
services.workspace_tabs / services.cli_tabs / services.workspace_resolver),
while master had #35's lint cleanup applied to the still-inline
monolith. Took HEAD's structure wholesale via `git checkout --ours` then
layered in master's print → _logger.exception pattern on the three thin
route-handler error catches (list_workspaces / get_workspace / tabs).

Plus two ruff E741 cleanups (1-char `l → ln` renames) in
services/cli_tabs.py:63 and services/workspace_tabs.py:348 — these
existed on PR #31's branch because the lint pass on master fixed the
same pattern in api/workspaces.py but PR #31 extracted to services
before that pass landed.

Verified locally:
  - ruff check api/ utils/ scripts/export.py app.py services/
    → All checks passed
  - unittest discover tests → 207 / 207 OK

Known follow-up (NOT in this commit): mypy gate (newly enforced by #35)
now flags 27 pre-existing errors in services/workspace_tabs.py (26)
and services/workspace_resolver.py (1) — all "object has no attribute X"
style, the upstream dict types are too loose. Out of scope for a merge
resolution; flagging to Brad for a separate tightening pass on the
services/ modules.

Author: timon0305

.github/workflows/tests.yml

@@ -55,9 +55,9 @@ jobs:
   # Codebase already has type hints across most of the surface (~70+ typed
   # functions). Mypy runs in lenient mode (--ignore-missing-imports for
   # untyped third-party deps; no strict-optional) so the gate isn't a wall
-  # of false positives on first run. continue-on-error keeps findings as
-  # warnings during the surface-cleanup phase; flip to required by removing
-  # continue-on-error once the surface is clean.
+  # of false positives. The transitional `continue-on-error: true` was
+  # removed in #29 once mypy reached zero errors on this repo — type
+  # failures now block merges.
   typecheck:
     name: Typecheck (mypy)
     runs-on: ubuntu-latest
@@ -75,9 +75,8 @@ jobs:
           python -m pip install 'flask>=3.0' 'fpdf2>=2.7' 'mypy>=1.10'
 
       - name: Run mypy
-        # Transitional only (maintainer consensus): keeps CI green until `mypy` exits
-        # zero on this repo — then delete this line so type errors fail the job.
-        continue-on-error: true
+        # No `continue-on-error` — mypy now exits zero on this repo (closes #29),
+        # so type errors must fail the job from here on.
         run: mypy --ignore-missing-imports --no-strict-optional --pretty .
 
   # ── Secret scan: gitleaks ─────────────────────────────────────────────────

api/composers.py

@@ -5,6 +5,7 @@
 """
 
 import json
+import logging
 import os
 import sqlite3
 from contextlib import closing
@@ -16,6 +17,7 @@
 from utils.workspace_descriptor import _read_json_file
 
 bp = Blueprint("composers", __name__)
+_logger = logging.getLogger(__name__)
 
 
 @bp.route("/api/composers")
@@ -63,8 +65,8 @@ def list_composers():
         composers.sort(key=lambda c: to_epoch_ms(c.get("lastUpdatedAt")), reverse=True)
         return jsonify(composers)
 
-    except Exception as e:
-        print(f"Failed to get composers: {e}")
+    except Exception:
+        _logger.exception("Failed to get composers")
         return jsonify({"error": "Failed to get composers"}), 500
 
 
@@ -118,6 +120,6 @@ def get_composer(composer_id):
 
         return jsonify({"error": "Composer not found"}), 404
 
-    except Exception as e:
-        print(f"Failed to get composer: {e}")
+    except Exception:
+        _logger.exception("Failed to get composer")
         return jsonify({"error": "Failed to get composer"}), 500

api/export_api.py

@@ -9,7 +9,6 @@
 import os
 import re
 import sqlite3
-import sys
 import zipfile
 from contextlib import closing
 from datetime import datetime
@@ -18,7 +17,7 @@
 from flask import Blueprint, Response, current_app, jsonify, request
 
 from utils.workspace_path import resolve_workspace_path
-from utils.path_helpers import normalize_file_path, get_workspace_folder_paths, to_epoch_ms
+from utils.path_helpers import get_workspace_folder_paths, to_epoch_ms
 from utils.text_extract import extract_text_from_bubble
 from utils.tool_parser import parse_tool_call
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
@@ -390,15 +389,15 @@ def export_chats():
                         status_str = f" ({tool_status})" if tool_status else ""
                         md += f"> **Tool: {tool_summary}**{status_str}\n"
                         if t.get("input"):
-                            md += f">\n> **INPUT:**\n> ```\n"
+                            md += ">\n> **INPUT:**\n> ```\n"
                             for iline in str(t["input"]).split("\n"):
                                 md += f"> {iline}\n"
-                            md += f"> ```\n"
+                            md += "> ```\n"
                         if t.get("output"):
-                            md += f">\n> **OUTPUT:**\n> ```\n"
+                            md += ">\n> **OUTPUT:**\n> ```\n"
                             for oline in str(t["output"]).split("\n"):
                                 md += f"> {oline}\n"
-                            md += f"> ```\n"
+                            md += "> ```\n"
                         md += "\n"
                     md += "---\n\n"
 

api/logs.py

@@ -4,6 +4,7 @@
 """
 
 import json
+import logging
 import os
 import re
 import sqlite3
@@ -16,6 +17,7 @@
 from utils.path_helpers import to_epoch_ms
 
 bp = Blueprint("logs", __name__)
+_logger = logging.getLogger(__name__)
 
 
 def _extract_chat_id_from_bubble_key(key: str) -> str | None:
@@ -69,8 +71,8 @@ def get_logs():
                         "type": "chat",
                         "messageCount": len(bubbles),
                     })
-            except Exception as e:
-                print(f"Error reading global storage: {e}")
+            except Exception:
+                _logger.exception("Error reading global storage")
 
         # Per-workspace (legacy)
         try:
@@ -133,9 +135,9 @@ def get_logs():
         except Exception:
             pass
 
-        logs.sort(key=lambda l: l.get("timestamp") or 0, reverse=True)
+        logs.sort(key=lambda log: log.get("timestamp") or 0, reverse=True)
         return jsonify({"logs": logs})
 
-    except Exception as e:
-        print(f"Failed to get logs: {e}")
+    except Exception:
+        _logger.exception("Failed to get logs")
         return jsonify({"error": "Failed to get logs", "logs": []}), 500

api/search.py

@@ -4,6 +4,7 @@
 """
 
 import json
+import logging
 import os
 import re
 import sqlite3
@@ -15,11 +16,12 @@
 
 from utils.exclusion_rules import build_searchable_text, is_excluded_by_rules
 from utils.workspace_path import resolve_workspace_path, get_cli_chats_path
-from utils.path_helpers import normalize_file_path, get_workspace_folder_paths, to_epoch_ms
+from utils.path_helpers import to_epoch_ms
 from utils.text_extract import extract_text_from_bubble
 from utils.cli_chat_reader import list_cli_projects, traverse_blobs, messages_to_bubbles
 
 bp = Blueprint("search", __name__)
+_logger = logging.getLogger(__name__)
 
 
 def _json_dump_safe(value) -> str:
@@ -51,7 +53,7 @@ def _build_exclusion_searchable(
     metadata_parts: list[str] | None = None,
 ) -> str:
     """Build broad searchable text so exclusion rules cover visible output."""
-    combined = []
+    combined: list[str] = []
     if content_parts:
         combined.extend(p for p in content_parts if p)
     if metadata_parts:
@@ -231,7 +233,7 @@ def search():
                                 # Derive title from first bubble
                                 for text in bubble_texts:
                                     if text:
-                                        first_lines = [l for l in text.split("\n") if l.strip()]
+                                        first_lines = [ln for ln in text.split("\n") if ln.strip()]
                                         if first_lines:
                                             title = first_lines[0][:100]
                                         break
@@ -250,8 +252,8 @@ def search():
                     except Exception:
                         pass
 
-            except Exception as e:
-                print(f"Error searching global storage: {e}")
+            except Exception:
+                _logger.exception("Error searching global storage")
             finally:
                 if conn is not None:
                     conn.close()
@@ -435,8 +437,8 @@ def search():
                                 "type": "cli_agent",
                                 "source": "cli",
                             })
-            except Exception as e:
-                print(f"Error searching CLI sessions: {e}")
+            except Exception:
+                _logger.exception("Error searching CLI sessions")
 
         # Sort by timestamp descending
         def _ts(r):
@@ -451,6 +453,6 @@ def _ts(r):
 
         return jsonify({"results": results})
 
-    except Exception as e:
-        print(f"Search failed: {e}")
+    except Exception:
+        _logger.exception("Search failed")
         return jsonify({"error": "Search failed", "results": []}), 500

api/workspaces.py

@@ -7,6 +7,7 @@
 
 from __future__ import annotations
 
+import logging
 import os
 from datetime import datetime, timezone
 
@@ -30,6 +31,7 @@
 from services.workspace_tabs import assemble_workspace_tabs
 
 bp = Blueprint("workspaces", __name__)
+_logger = logging.getLogger(__name__)
 
 
 # ---------------------------------------------------------------------------
@@ -43,8 +45,8 @@ def list_workspaces():
         rules = current_app.config.get("EXCLUSION_RULES") or []
         projects = list_workspace_projects(workspace_path, rules)
         return jsonify(projects)
-    except Exception as e:
-        print(f"Failed to get workspaces: {e}")
+    except Exception:
+        _logger.exception("Failed to get workspaces")
         return jsonify({"error": "Failed to get workspaces"}), 500
 
 
@@ -120,8 +122,8 @@ def get_workspace(workspace_id):
             "lastModified": datetime.fromtimestamp(mtime, tz=timezone.utc).isoformat(),
         })
 
-    except Exception as e:
-        print(f"Failed to get workspace: {e}")
+    except Exception:
+        _logger.exception("Failed to get workspace")
         return jsonify({"error": "Failed to get workspace"}), 500
 
 
@@ -138,7 +140,7 @@ def get_workspace_tabs(workspace_id):
         rules = current_app.config.get("EXCLUSION_RULES") or []
         payload, status = assemble_workspace_tabs(workspace_id, workspace_path, rules)
         return jsonify(payload), status
-    except Exception as e:
-        print(f"Failed to get workspace tabs: {e}")
+    except Exception:
+        _logger.exception("Failed to get workspace tabs")
         return jsonify({"error": "Failed to get workspace tabs"}), 500
 

app.py

@@ -90,7 +90,6 @@ def favicon():
 
 if __name__ == "__main__":
     import argparse
-    import sys
 
     parser = argparse.ArgumentParser(description="Cursor Chat Browser (Python)")
     parser.add_argument("--port", type=int, default=3000)

scripts/__init__.py

@@ -22,22 +22,23 @@
 if str(_project_root) not in sys.path:
     sys.path.insert(0, str(_project_root))
 
-from utils.exclusion_rules import (
+# noqa: E402 — these imports must come after the sys.path.insert above so the
+# script can be run directly as `python scripts/export.py` from anywhere.
+from utils.exclusion_rules import (  # noqa: E402
     resolve_exclusion_rules_path,
     load_rules,
     build_searchable_text,
     is_excluded_by_rules,
 )
-from utils.path_helpers import get_workspace_folder_paths as _shared_get_workspace_folder_paths
-from utils.tool_parser import parse_tool_call
-from utils.workspace_path import get_cli_chats_path
-from utils.cli_chat_reader import (
+from utils.path_helpers import get_workspace_folder_paths as _shared_get_workspace_folder_paths  # noqa: E402
+from utils.tool_parser import parse_tool_call  # noqa: E402
+from utils.workspace_path import get_cli_chats_path  # noqa: E402
+from utils.cli_chat_reader import (  # noqa: E402
     list_cli_projects,
     traverse_blobs,
     messages_to_bubbles,
-    aggregate_session_stats,
 )
-from utils.cursor_md_exporter import cursor_cli_session_to_markdown
+from utils.cursor_md_exporter import cursor_cli_session_to_markdown  # noqa: E402
 
 _logger = logging.getLogger(__name__)
 
@@ -52,7 +53,7 @@ def _json_dump_safe(value) -> str:
 
 def _load_manifest_entries(manifest_path: str) -> dict:
     """Load manifest entries keyed by log_id from a JSONL file."""
-    existing = {}
+    existing: dict = {}
     if not os.path.isfile(manifest_path):
         return existing
     try:
@@ -347,9 +348,9 @@ def main():
                         layouts = ctx.get("projectLayouts")
                         if isinstance(layouts, list):
                             project_layouts_map.setdefault(cid, [])
-                            for l in layouts:
+                            for layout in layouts:
                                 try:
-                                    o = json.loads(l) if isinstance(l, str) else l
+                                    o = json.loads(layout) if isinstance(layout, str) else layout
                                     if isinstance(o, dict) and o.get("rootPath"):
                                         project_layouts_map[cid].append(o["rootPath"])
                                 except Exception:
@@ -682,7 +683,7 @@ def assign_workspace(cd, cid):
         created_ms = to_epoch_ms(cd.get("createdAt")) or ts
         fm_lines = ["---"]
         fm_lines.append(f"log_id: {composer_id}")
-        fm_lines.append(f"log_type: chat")
+        fm_lines.append("log_type: chat")
         fm_lines.append(f'title: "{title.replace(chr(34), chr(92)+chr(34))}"')
         fm_lines.append(f"created_at: {datetime.fromtimestamp(created_ms / 1000).isoformat()}")
         fm_lines.append(f"updated_at: {datetime.fromtimestamp(updated_at / 1000).isoformat() if updated_at else datetime.now().isoformat()}")
@@ -930,25 +931,25 @@ def assign_workspace(cd, cid):
         zip_name = f"cursor-export-{today}.zip"
         zip_path = os.path.join(out_dir, zip_name)
         with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as zf:
-            for e in exported:
-                zf.writestr(e["rel_path"], e["content"])
+            for entry in exported:
+                zf.writestr(entry["rel_path"], entry["content"])
         print(f"Exported {count} chat(s) to {zip_path}")
     else:
         # Write individual Markdown files to disk
-        for e in exported:
-            os.makedirs(os.path.dirname(e["out_path"]), exist_ok=True)
-            with open(e["out_path"], "w", encoding="utf-8") as f:
-                f.write(e["content"])
+        for entry in exported:
+            os.makedirs(os.path.dirname(entry["out_path"]), exist_ok=True)
+            with open(entry["out_path"], "w", encoding="utf-8") as f:
+                f.write(entry["content"])
 
         # Manifest in output directory
         manifest_path = os.path.join(out_dir, "manifest.jsonl")
         existing = _load_manifest_entries(manifest_path)
 
-        for e in exported:
-            existing[e["id"]] = {
-                "log_id": e["id"],
-                "path": os.path.relpath(e["out_path"], out_dir),
-                "updated_at": datetime.fromtimestamp(e["updatedAt"] / 1000).isoformat() if e["updatedAt"] else datetime.now().isoformat(),
+        for entry in exported:
+            existing[entry["id"]] = {
+                "log_id": entry["id"],
+                "path": os.path.relpath(entry["out_path"], out_dir),
+                "updated_at": datetime.fromtimestamp(entry["updatedAt"] / 1000).isoformat() if entry["updatedAt"] else datetime.now().isoformat(),
             }
 
         if existing:
@@ -957,11 +958,11 @@ def assign_workspace(cd, cid):
         # Canonical manifest in user state dir so tracking survives changing --out paths
         global_manifest_path = os.path.join(state_dir, "manifest.jsonl")
         global_existing = _load_manifest_entries(global_manifest_path)
-        for e in exported:
-            global_existing[e["id"]] = {
-                "log_id": e["id"],
-                "path": e["out_path"],
-                "updated_at": datetime.fromtimestamp(e["updatedAt"] / 1000).isoformat() if e["updatedAt"] else datetime.now().isoformat(),
+        for entry in exported:
+            global_existing[entry["id"]] = {
+                "log_id": entry["id"],
+                "path": entry["out_path"],
+                "updated_at": datetime.fromtimestamp(entry["updatedAt"] / 1000).isoformat() if entry["updatedAt"] else datetime.now().isoformat(),
             }
         if global_existing:
             _write_manifest_entries(global_manifest_path, global_existing)

scripts/export.py

@@ -60,7 +60,7 @@ def _get_cli_workspace_tabs(workspace_id: str):
             if not title or title.startswith("New Agent"):
                 for b in bubbles:
                     if b["type"] == "user" and b.get("text"):
-                        first_lines = [l for l in b["text"].split("\n") if l.strip()]
+                        first_lines = [ln for ln in b["text"].split("\n") if ln.strip()]
                         if first_lines:
                             title = first_lines[0][:100]
                             if len(title) == 100: