Fix report sources and card highlights

Author: chengtan9907

deployments/desktop/shared/agents.py

@@ -467,7 +467,12 @@ def _reading_report_dirs() -> List[Path]:
         return [configured] if configured.exists() and configured.is_dir() else [configured]
     fallback = (PROJECT_ROOT / "data" / "reading_reports").resolve()
     legacy_exports = (PROJECT_ROOT / "data" / "exports").resolve()
-    ordered = [configured, fallback, legacy_exports]
+    ordered = [configured]
+    notes_git_dir = _configured_reading_notes_git_dir()
+    if notes_git_dir is not None:
+        ordered.append(notes_git_dir.resolve())
+        ordered.extend(path.resolve() for path in notes_git_dir.glob("Deep Reading - *") if path.is_dir())
+    ordered.extend([fallback, legacy_exports])
     results: List[Path] = []
     seen: Set[str] = set()
     for candidate in ordered:
@@ -678,8 +683,42 @@ def _is_reading_report_record(report: Dict[str, Any]) -> bool:
     return source_type in {"arxiv", "pdf", "local_pdf", "feishu_file_key", "reading_report"}
 
 
+def _normalized_report_dedupe_key(report: Dict[str, Any]) -> str:
+    arxiv_id = str(report.get("arxiv_id") or "").strip().lower()
+    if arxiv_id:
+        return f"arxiv:{arxiv_id}"
+    doi = str((report.get("metadata") or {}).get("doi") or "").strip().lower()
+    if doi:
+        return f"doi:{doi}"
+    title = re.sub(r"[^a-z0-9]+", " ", str(report.get("title") or "").lower()).strip()
+    return f"title:{title}" if title else f"path:{report.get('report_path') or report.get('report_id')}"
+
+
+def _report_source_priority(path: Path) -> int:
+    resolved = path.resolve()
+    notes_git_dir = _configured_reading_notes_git_dir()
+    if notes_git_dir is not None:
+        try:
+            resolved.relative_to(notes_git_dir.resolve())
+            return 30
+        except ValueError:
+            pass
+    notes_root = _configured_notes_root_dir()
+    if notes_root is not None:
+        try:
+            resolved.relative_to(notes_root.resolve())
+            return 20
+        except ValueError:
+            pass
+    try:
+        resolved.relative_to((PROJECT_ROOT / "data" / "exports").resolve())
+        return 0
+    except ValueError:
+        return 10
+
+
 def _all_report_records() -> List[Dict[str, Any]]:
-    reports: List[Dict[str, Any]] = []
+    reports_by_key: Dict[str, Dict[str, Any]] = {}
     seen: Set[str] = set()
     for root in _reading_report_dirs():
         for path in root.rglob("*.md"):
@@ -692,8 +731,19 @@ def _all_report_records() -> List[Dict[str, Any]]:
             report = _report_record(path)
             if not _is_reading_report_record(report):
                 continue
-            reports.append(report)
-    reports.sort(key=lambda item: item["_sort_ts"], reverse=True)
+            report["_source_priority"] = _report_source_priority(path)
+            dedupe_key = _normalized_report_dedupe_key(report)
+            existing = reports_by_key.get(dedupe_key)
+            if existing is None or (
+                int(report.get("_source_priority") or 0),
+                float(report.get("_sort_ts") or 0),
+            ) > (
+                int(existing.get("_source_priority") or 0),
+                float(existing.get("_sort_ts") or 0),
+            ):
+                reports_by_key[dedupe_key] = report
+    reports = list(reports_by_key.values())
+    reports.sort(key=lambda item: float(item.get("_sort_ts") or 0), reverse=True)
     return reports
 
 

deployments/desktop/static/desktop.css

@@ -1102,6 +1102,17 @@ body.chat-view #chat {
   background: #f1f6ff;
 }
 
+.report-row.highlighted {
+  border-color: #f4c84a;
+  background: #fff8d8;
+  box-shadow: inset 3px 0 0 #d99a00;
+}
+
+.report-row.highlighted.active {
+  border-color: #d99a00;
+  background: #fff3bd;
+}
+
 .report-row h3 {
   margin: 0 0 4px;
   font-size: 12.5px;

deployments/desktop/static/desktop.js

@@ -3,6 +3,7 @@
 
   const DEMO_MODE = new URLSearchParams(window.location.search).get("demo") === "1";
   const LOCALE_KEY = "paperflow.desktop.locale";
+  const REPORT_HIGHLIGHTS_KEY = "paperflow.report.cardHighlights";
   const supportedLocales = new Set(["zh", "en"]);
   const requestedLocale = new URLSearchParams(window.location.search).get("lang");
   const savedLocale = window.localStorage.getItem(LOCALE_KEY);
@@ -24,6 +25,7 @@
     reports: [],
     currentReport: null,
     reportAnnotationRange: null,
+    highlightedReports: new Set(),
     wikiNodes: [],
     wikiGraph: null,
     wikiMap: null,
@@ -2680,6 +2682,36 @@
     return `paperflow.report.annotations.${reportId || ""}`;
   }
 
+  function loadReportCardHighlights() {
+    try {
+      const parsed = JSON.parse(window.localStorage.getItem(REPORT_HIGHLIGHTS_KEY) || "[]");
+      state.highlightedReports = new Set(Array.isArray(parsed) ? parsed.filter(Boolean).map(String) : []);
+    } catch (error) {
+      state.highlightedReports = new Set();
+    }
+  }
+
+  function saveReportCardHighlights() {
+    try {
+      window.localStorage.setItem(REPORT_HIGHLIGHTS_KEY, JSON.stringify([...state.highlightedReports]));
+    } catch (error) {
+      console.warn("Unable to save report card highlights", error);
+    }
+  }
+
+  function toggleReportCardHighlight(reportId) {
+    if (!reportId) return;
+    if (state.highlightedReports.has(reportId)) {
+      state.highlightedReports.delete(reportId);
+      showFeedbackToast("success", "已取消高亮", reportId);
+    } else {
+      state.highlightedReports.add(reportId);
+      showFeedbackToast("success", "已高亮报告", "右键可取消高亮");
+    }
+    saveReportCardHighlights();
+    renderReportList(state.reports, state.currentReport?.report_id || reportId);
+  }
+
   function loadReportAnnotation(reportId) {
     if (!reportId) return "";
     try {
@@ -2790,7 +2822,7 @@
     }
     target.className = "reports-list";
     target.innerHTML = reports.map((report) => `
-      <button class="report-row ${report.report_id === activeId ? "active" : ""}" data-report-id="${escapeHtml(report.report_id)}" type="button">
+      <button class="report-row ${report.report_id === activeId ? "active" : ""} ${state.highlightedReports.has(report.report_id) ? "highlighted" : ""}" data-report-id="${escapeHtml(report.report_id)}" type="button">
         <h3>${escapeHtml(report.title || ui().reports.defaultTitle)}</h3>
         <p>${escapeHtml(report.saved_at || "")} · ${escapeHtml(report.status || ui().reports.completed)}</p>
         <p>${escapeHtml(report.snippet || report.report_path || "")}</p>
@@ -5346,6 +5378,12 @@
       const row = event.target.closest("[data-report-id]");
       if (row) runAction(() => loadReportContent(row.dataset.reportId), "打开报告");
     });
+    $("reportsList").addEventListener("contextmenu", (event) => {
+      const row = event.target.closest("[data-report-id]");
+      if (!row) return;
+      event.preventDefault();
+      toggleReportCardHighlight(row.dataset.reportId);
+    });
     ["openReportAbsBtn", "openReportPdfBtn", "openReportDocBtn"].forEach((id) => {
       $(id).addEventListener("click", () => {
         const href = $(id).dataset.href;
@@ -5618,6 +5656,7 @@
   }
 
   async function init() {
+    loadReportCardHighlights();
     bindEvents();
     applyLocale();
     renderChatSources();

tests/test_desktop_gui.py

@@ -3,6 +3,7 @@
 import threading
 import time
 import importlib
+import os
 from datetime import timedelta
 from pathlib import Path
 
@@ -1473,16 +1474,21 @@ def test_desktop_reading_agent_receives_derived_output_dirs(tmp_path, monkeypatc
 def test_desktop_report_dirs_include_legacy_exports_for_recent_generated_reports(tmp_path, monkeypatch: pytest.MonkeyPatch) -> None:
     project_root = tmp_path / "project"
     configured = tmp_path / "Daily Note"
+    notes_year = configured / "Daily Note 2026"
+    deep_reading = notes_year / "Deep Reading - Jun 2026"
     legacy_exports = project_root / "data" / "exports"
-    configured.mkdir()
+    deep_reading.mkdir(parents=True)
     legacy_exports.mkdir(parents=True)
     monkeypatch.setattr(agents, "PROJECT_ROOT", project_root)
     monkeypatch.setattr(agents, "_configured_path", lambda _env_name, _default_relative: str(configured))
+    monkeypatch.setattr(agents, "_configured_reading_notes_git_dir", lambda: notes_year)
     monkeypatch.setattr(agents, "_env_text", lambda _name, default="": "")
 
     dirs = agents._reading_report_dirs()  # noqa: SLF001 - report discovery contract
 
     assert configured.resolve() in dirs
+    assert notes_year.resolve() in dirs
+    assert deep_reading.resolve() in dirs
     assert legacy_exports.resolve() in dirs
 
 
@@ -1744,6 +1750,8 @@ def test_desktop_reports_view_uses_compact_reading_typography() -> None:
     assert "position: fixed;" in css
     assert ".annotation-toolbar.visible {" in css
     assert ".annotation-swatch.bg-red {" in css
+    assert ".report-row.highlighted {" in css
+    assert "box-shadow: inset 3px 0 0 #d99a00;" in css
 
 
 def test_desktop_report_viewer_renders_markdown_and_annotations() -> None:
@@ -1770,6 +1778,68 @@ def test_desktop_report_viewer_renders_markdown_and_annotations() -> None:
     assert 'wrapper.style.fontWeight = "700"' in script
     assert 'wrapper.style.fontStyle = "italic"' in script
     assert "range.extractContents()" in script
+    assert "paperflow.report.cardHighlights" in script
+    assert "function toggleReportCardHighlight" in script
+    assert '.addEventListener("contextmenu"' in script
+    assert "state.highlightedReports.has(report.report_id)" in script
+
+
+def test_report_list_dedupes_to_current_notes_but_sorts_by_time(tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:
+    project_root = tmp_path / "project"
+    notes_root = tmp_path / "Daily Note"
+    notes_year = notes_root / "Daily Note 2026"
+    deep_dir = notes_year / "Deep Reading - Jun 2026"
+    legacy_dir = project_root / "data" / "exports" / "Daily Note 2026" / "Deep Reading - Jun 2026"
+    other_dir = project_root / "data" / "reading_reports"
+    for path in (deep_dir, legacy_dir, other_dir):
+        path.mkdir(parents=True)
+
+    current = deep_dir / "Duplicate Current.md"
+    legacy = legacy_dir / "Duplicate Legacy.md"
+    unique = legacy_dir / "Unique Legacy.md"
+    current.write_text(
+        "---\n"
+        'title: "Duplicate Paper"\n'
+        'arxiv_id: "2606.00001v1"\n'
+        'report_version: "v-current"\n'
+        "---\n"
+        "# Duplicate Paper\n\nCurrent notes copy.",
+        encoding="utf-8",
+    )
+    legacy.write_text(
+        "---\n"
+        'title: "Duplicate Paper"\n'
+        'arxiv_id: "2606.00001v1"\n'
+        'report_version: "v-legacy"\n'
+        "---\n"
+        "# Duplicate Paper\n\nLegacy copy.",
+        encoding="utf-8",
+    )
+    unique.write_text(
+        "---\n"
+        'title: "Unique Legacy"\n'
+        'arxiv_id: "2606.00002v1"\n'
+        'report_version: "v-legacy"\n'
+        "---\n"
+        "# Unique Legacy\n",
+        encoding="utf-8",
+    )
+    os.utime(current, (100, 100))
+    os.utime(legacy, (300, 300))
+    os.utime(unique, (200, 200))
+
+    monkeypatch.setattr(agents, "PROJECT_ROOT", project_root)
+    monkeypatch.setattr(agents, "_configured_path", lambda _env_name, _default_relative: str(notes_root))
+    monkeypatch.setattr(agents, "_configured_notes_root_dir", lambda: notes_root)
+    monkeypatch.setattr(agents, "_configured_reading_notes_git_dir", lambda: notes_year)
+    monkeypatch.setattr(agents, "_env_text", lambda _name, default="": "")
+
+    reports = agents._all_report_records()  # noqa: SLF001 - report list ordering contract
+
+    assert [report["title"] for report in reports] == ["Unique Legacy", "Duplicate Paper"]
+    duplicate = next(report for report in reports if report["title"] == "Duplicate Paper")
+    assert duplicate["report_path"] == str(current)
+    assert "Current notes copy" in duplicate["markdown"]
 
 
 def test_report_record_derives_abs_url_and_patches_missing_institution(tmp_path: Path) -> None: