fix(export): restore incremental mtime diagnostic and batch parse resilience

Author: clean6378-max-it

api/export_api.py

@@ -25,15 +25,13 @@
 from utils.md_exporter import session_to_markdown
 from utils.json_exporter import session_to_json
 from utils.slugify import slugify
-from utils.export_engine import EXPORT_ERRORS, ZipSink, run_bulk_export
+from utils.export_engine import EXPORT_ERRORS as _EXPORT_ERRORS, ZipSink, run_bulk_export
 
 export_bp = Blueprint("export", __name__)
 
 # Tests monkeypatch this path; keep in sync with utils.export_state_store.
 _STATE_FILE = EXPORT_STATE_FILE
 
-_EXPORT_ERRORS = EXPORT_ERRORS
-
 
 def _state_lock() -> Any:
     return export_state_lock(_STATE_FILE)

scripts/export.py

@@ -34,7 +34,7 @@
 from utils.slugify import slugify
 from utils.export_engine import (
     ExportFormat,
-    ListSink,
+    NoopSink,
     SinceMode,
     ZipSink,
     run_bulk_export,
@@ -437,7 +437,7 @@ def cmd_export(args):
     def _on_export_error(sid: str, exc: Exception) -> None:
         print(f"  Warning: failed to export {sid}: {exc}", file=sys.stderr)
 
-    collect_sink = ListSink()
+    collect_sink = NoopSink()
     export_result = run_bulk_export(
         projects=projects,
         since=cast(SinceMode, since),
@@ -471,12 +471,8 @@ def _on_export_error(sid: str, exc: Exception) -> None:
                 "nothing to export."
             )
             return
-        skipped = (
-            export_result.latest_day_scan_total
-            - export_result.latest_day_match_count
-        )
     elif since == "incremental":
-        skipped_mtime_unchanged = skipped
+        skipped_mtime_unchanged = export_result.skipped_mtime_unchanged_count
 
     exported = len(all_exports)
     print(

tests/test_export_engine_parity.py

@@ -19,7 +19,7 @@
 from tests.test_cli_e2e import _run_cli, _seed_base_dir  # noqa: E402
 from utils.export_engine import (  # noqa: E402
     MANIFEST_SHARED_KEYS,
-    ListSink,
+    NoopSink,
     manifest_shared_subset,
     run_bulk_export,
 )
@@ -37,7 +37,7 @@ def test_engine_api_vs_cli_layout_same_markdown_and_manifest(tmp_path: Path) ->
     projects = list_projects(str(base))
     rules: list = []
 
-    api_sink = ListSink()
+    api_sink = NoopSink()
     api_result = run_bulk_export(
         projects=projects,
         since="all",
@@ -48,7 +48,7 @@ def test_engine_api_vs_cli_layout_same_markdown_and_manifest(tmp_path: Path) ->
         path_layout="api",
         manifest_style="api",
     )
-    cli_sink = ListSink()
+    cli_sink = NoopSink()
     cli_result = run_bulk_export(
         projects=projects,
         since="all",

utils/export_engine.py

@@ -61,6 +61,7 @@ class BulkExportResult:
     exported_session_count: int = 0
     failure_count: int = 0
     skipped_count: int = 0
+    skipped_mtime_unchanged_count: int = 0
     total_candidates: int = 0
     latest_day: date | None = None
     latest_day_scan_total: int = 0
@@ -82,20 +83,22 @@ def finalize(self, manifest: list[dict[str, Any]]) -> None:
 
 
 @dataclass
-class ListSink:
-    """In-memory sink for tests; use :attr:`BulkExportResult.exports` for file pairs."""
-
-    manifest: list[dict[str, Any]] = field(default_factory=list)
+class NoopSink:
+    """Satisfies :class:`ExportSink` when only :attr:`BulkExportResult` fields are needed."""
 
     def add_session(
         self,
         files: list[tuple[str, str]],
         manifest_entry: dict[str, Any],
     ) -> None:
-        self.manifest.append(manifest_entry)
+        del files, manifest_entry
 
     def finalize(self, manifest: list[dict[str, Any]]) -> None:
-        self.manifest = manifest
+        del manifest
+
+
+# Backward-compatible alias for tests/docs written during PR1.
+ListSink = NoopSink
 
 
 class ZipSink:
@@ -277,7 +280,7 @@ def _export_parsed(
             result.exports.extend(files)
             result.new_sessions_map[sid] = float(sess_info.get("modified", 0))
             result.exported_session_count += 1
-        except EXPORT_ERRORS as exc:
+        except Exception as exc:
             _record_failure(sid, exc)
 
     if since == "last":
@@ -306,6 +309,7 @@ def _export_parsed(
                         curr_mtime = float(sess_info.get("modified", 0))
                         if curr_mtime and curr_mtime <= prev_mtime:
                             result.skipped_count += 1
+                            result.skipped_mtime_unchanged_count += 1
                             continue
 
                     session = parse_session(sess_info["path"])
@@ -322,7 +326,7 @@ def _export_parsed(
                         continue
 
                     _export_parsed(project, sess_info, session)
-                except EXPORT_ERRORS as exc:
+                except Exception as exc:
                     _record_failure(sid, exc)
 
     result.manifest = manifest