fix: Keep patch series together

Author: bzg

resources/bark-index.js

@@ -384,23 +384,6 @@ function sortReports(key, dir) {
 
 /* ── Series folding ─────────────────────────────────────────── */
 
-function seriesStatusSummary(members) {
-  var acked = 0, closed = 0, open = 0;
-  for (var i = 0; i < members.length; i++) {
-    var seq = members[i].raw['patch-seq'] || '';
-    if (seq.indexOf('0/') === 0) continue; // skip cover letter
-    var flags = members[i].raw.flags || '---';
-    if (flags.length >= 3 && flags[2] !== '-') closed++;
-    else if (flags[0] !== '-') acked++;
-    else open++;
-  }
-  var parts = [];
-  if (acked)  parts.push(acked + ' acked');
-  if (closed) parts.push(closed + ' closed');
-  if (open)   parts.push(open + ' open');
-  return parts.join(', ');
-}
-
 function isSeriesHomogeneous(members) {
   var refCat = null;
   for (var i = 0; i < members.length; i++) {
@@ -465,7 +448,6 @@ function buildDisplayList() {
     repEntry._seriesFolded = folded;
     repEntry._seriesId = sid;
     repEntry._seriesMembers = members;
-    repEntry._seriesSummary = seriesStatusSummary(members);
 
     // Replace placeholder with representative + optionally expanded members
     var insert = [repEntry];
@@ -557,19 +539,11 @@ function buildRowElement(rpt) {
   if (rpt._isSeries && rpt._seriesMembers && rpt._seriesMembers.length > 1) {
     var arrow = rpt._seriesFolded ? '\u25B6' : '\u25BC';
     var stitle = rpt._seriesFolded ? 'Unfold series' : 'Fold series';
-    var patchCount = 0;
-    if (rpt._seriesMembers) {
-      for (var si = 0; si < rpt._seriesMembers.length; si++) {
-        var ps = rpt._seriesMembers[si].raw['patch-seq'] || '';
-        if (ps.indexOf('0/') !== 0) patchCount++;
-      }
-    }
-    var slabel = '[' + patchCount + ' patch' + (patchCount !== 1 ? 'es' : '') + ': ' + (rpt._seriesSummary || '') + ']';
     var safeSid = rpt._seriesId.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
     seriesHtml = '<a href="javascript:void(0)" onclick="toggleSeriesFold(\'' +
       escAttr(safeSid) + '\'); return false;" title="' + escAttr(stitle) +
       '" style="font-size:0.75rem;margin-right:0.3em;text-decoration:none">' +
-      arrow + ' <small>' + escHtml(slabel) + '</small></a>';
+      arrow + '</a>';
   }
 
   var patchHtml = '';

resources/emails.edn

@@ -1686,4 +1686,42 @@
   :email/in-reply-to "<122@test.org>"
   :email/references  "<122@test.org>"
   :email/body-text  "Yes, my bug is a special case of the broader issue.\nSuperseded-by: <123@test.org>\n"}
+
+ ;; =========================================================================
+ ;; 125 — Cover letter for a series with no inner-bracket topic.
+ ;;       Each patch has a different `subdir:` colon-prefix in its
+ ;;       subject, so the per-message :topic parsed from the subject
+ ;;       diverges across patches. Threading via In-Reply-To must keep
+ ;;       all patches in the same series anyway.
+ ;; =========================================================================
+ {:email/id        "125"
+  :email/source      "direct"
+  :email/message-id  "<125@test.org>"
+  :email/subject     "[PATCH 0/2] orgweb: several minor style fixes"
+  :email/from-address "kana@test.org"
+  :email/date-sent  #inst "2026-03-04T10:00:00"
+  :email/ingested-at #inst "2026-03-04T10:00:00"
+  :email/body-text  "Cover letter for a small style cleanup.\n"}
+
+ {:email/id        "126"
+  :email/source      "direct"
+  :email/message-id  "<126@test.org>"
+  :email/subject     "[PATCH 1/2] org-demo.html: use canonical aside"
+  :email/from-address "kana@test.org"
+  :email/date-sent  #inst "2026-03-04T10:01:00"
+  :email/ingested-at #inst "2026-03-04T10:01:00"
+  :email/in-reply-to "<125@test.org>"
+  :email/references  "<125@test.org>"
+  :email/body-text  "Patch 1.\n\ndiff --git a/org-demo.html b/org-demo.html\n--- a/org-demo.html\n+++ b/org-demo.html\n@@ -1,3 +1,3 @@\n-old\n+new\n"}
+
+ {:email/id        "127"
+  :email/source      "direct"
+  :email/message-id  "<127@test.org>"
+  :email/subject     "[PATCH 2/2] css: fix horizontal scroll on mobile"
+  :email/from-address "kana@test.org"
+  :email/date-sent  #inst "2026-03-04T10:02:00"
+  :email/ingested-at #inst "2026-03-04T10:02:00"
+  :email/in-reply-to "<125@test.org>"
+  :email/references  "<125@test.org>"
+  :email/body-text  "Patch 2.\n\ndiff --git a/style.css b/style.css\n--- a/style.css\n+++ b/style.css\n@@ -1,3 +1,3 @@\n-old\n+new\n"}
 ]

src/bark/series.clj

@@ -47,6 +47,25 @@
            (not [?s :series/closed _])]
          db topic sender)))
 
+(defn find-open-series-via-parents
+  "Find an open series among parent reports' :report/series, restricted
+  to series with the given sender and expected total. Threading is the
+  reliable signal for series membership: the per-message :topic parsed
+  from the subject can vary across patches when each patch carries its
+  own `subdir:` colon-prefix, but threading via In-Reply-To/References
+  consistently links every patch back to the cover letter (or to a
+  sibling already in the series)."
+  [db parent-report-eids sender total]
+  (when (seq parent-report-eids)
+    (d/q '[:find ?s .
+           :in $ [?r ...] ?sender ?total
+           :where
+           [?r :report/series ?s]
+           [?s :series/sender ?sender]
+           [?s :series/expected ?total]
+           (not [?s :series/closed _])]
+         db parent-report-eids sender total)))
+
 (defn create-series! [conn topic sender total]
   (let [sid (next-series-id (d/db conn) topic sender total)]
     (d/transact! conn [{:series/id       sid
@@ -140,7 +159,10 @@
           (log/info "Auto-closed series"
                     (pr-str (:series/id (d/pull (d/db conn) [:series/id] sid)))
                     "(superseded)")))
-      (let [series-eid (or (find-open-series (d/db conn) topic from-addr m)
+      (let [series-eid (or (when (pos? n)
+                             (find-open-series-via-parents
+                              (d/db conn) parent-report-eids from-addr m))
+                           (find-open-series (d/db conn) topic from-addr m)
                            (let [sid (create-series! conn topic from-addr m)]
                              (log/info "New series:"
                                        (pr-str (series-id topic from-addr m))

test/bark/digest_test.clj

@@ -451,6 +451,26 @@
             (is (some? (:report/series r39)))
             (is (= "1/3" (:report/patch-seq r39)))))
 
+        ;; --- Series with diverging per-patch :topic (emails 125-127) ---
+        (testing "Series held together by threading despite divergent topics"
+          ;; Cover letter and patches each have a different `subdir:`
+          ;; colon-prefix, so the per-message :topic differs across
+          ;; reports. Threading via In-Reply-To must keep all patches
+          ;; in the cover letter's series.
+          (let [s (get-series-by-id db "orgweb|kana@test.org|2")]
+            (is (some? (:series/id s)))
+            (is (= 2 (:series/expected s)))
+            (is (= "<125@test.org>" (get-in s [:series/cover-letter :email/message-id])))
+            (is (= 2 (series-patch-count db "orgweb|kana@test.org|2"))))
+          (let [r126 (get-report db "<126@test.org>")
+                r127 (get-report db "<127@test.org>")]
+            (is (some? (:report/series r126)))
+            (is (some? (:report/series r127)))
+            (is (= "orgweb|kana@test.org|2"
+                   (:series/id (:report/series r126))))
+            (is (= "orgweb|kana@test.org|2"
+                   (:series/id (:report/series r127))))))
+
         ;; --- Email 40 patch related to bug ---
         (testing "Email 40 patch related to bug"
           (let [patch (get-report db "<40@test.org>")