From 2bde2be9224adaa5af0458d6811efd7fcb00a5f7 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 4 May 2026 15:50:03 -0400
Subject: [PATCH 1/4] fix(timeline): use route dates for heatmap entries

---
 docs/guide/html-template/backlinks.md         |  2 +-
 emanote/CHANGELOG.md                          |  1 +
 .../_emanote-static/js/timeline-heatmap.js    | 14 +++++------
 .../default/templates/components/timeline.tpl |  2 +-
 emanote/src/Emanote/View/Template.hs          |  7 +++++-
 tests/features/smoke.feature                  |  1 +
 .../fixtures/notebook/dailyhost/2025-01-02.md |  2 +-
 tests/step_definitions/smoke_steps.ts         | 25 +++++++++++++++++++
 8 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/docs/guide/html-template/backlinks.md b/docs/guide/html-template/backlinks.md
index ad664496d..b895da8e9 100644
--- a/docs/guide/html-template/backlinks.md
+++ b/docs/guide/html-template/backlinks.md
@@ -28,6 +28,6 @@ Hovering a filled cell opens a context flyout (header `YYYY-MM-DD — title`, th
 - Right-panel at `lg:`+ (compact 4×4 cells in the narrow column)
 - Bottom strip at `<lg` (cells stretch as horizontal bars to fill the wider row)
 
-Dates are parsed out of each linked note's title via a `YYYY-MM-DD` regex; entries without a parseable date are silently skipped (with the screen-reader fallback list still readable).
+Dates come from the linked note's route via `Calendar.parseRouteDay`, the same parser used for the daily/non-daily split. A daily note can therefore have a custom title without disappearing from the heatmap.
 
 See [[daily-notes]] for how the daily/non-daily split feeds these two surfaces.
diff --git a/emanote/CHANGELOG.md b/emanote/CHANGELOG.md
index 7d110cba4..bc5ccfcb4 100644
--- a/emanote/CHANGELOG.md
+++ b/emanote/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 **Bug fixes**
 
+- Timeline heatmap backlinks now use the daily note's route-derived date instead of parsing `YYYY-MM-DD` out of the rendered title, so custom-titled daily notes still appear in the heatmap.
 - Cascade-declared `tags` no longer disappear from a child note that declares any of its own. The metadata-cascade merger previously inherited `aeson-extra`'s `lodashMerge`, which aligns arrays by index — `tags: [team-doc]` in `folder.yaml` plus `tags: [internal-note]` in `folder/note.md` produced `[internal-note]`, dropping the cascaded entry both from the per-page chip strip and from the `#352` global tag index. The merger now unions cascade arrays; see [yaml-config](docs/guide/yaml-config.md) for the full contract. `aeson-extra` is no longer a dependency (closes [#697](https://github.com/srid/emanote/issues/697)).
 - Wiki link custom titles now render HTML entities like `&nbsp;` the same way regular Markdown link labels do. Previously `[[note|Spivak&nbsp;(2014)]]` rendered the entity text literally as `&nbsp;` (closes [#441](https://github.com/srid/emanote/issues/441)).
 - Atom feed: a feed query that matches no notes no longer crashes the build; an empty-but-valid Atom document is emitted instead. Configuration errors (missing/invalid query block, missing `page.siteUrl`) still fail loudly ([#490](https://github.com/srid/emanote/issues/490), [#650](https://github.com/srid/emanote/pull/650))
diff --git a/emanote/default/_emanote-static/js/timeline-heatmap.js b/emanote/default/_emanote-static/js/timeline-heatmap.js
index dd1959d97..3a6c5893e 100644
--- a/emanote/default/_emanote-static/js/timeline-heatmap.js
+++ b/emanote/default/_emanote-static/js/timeline-heatmap.js
@@ -1,7 +1,7 @@
 // Render daily-note backlinks (`<ema:note:backlinks:daily>`) as a year-stacked
 // heatmap into #timeline-heatmap, using the hidden <ul id="timeline-data"> as
-// the data source. Dates are parsed out of each backlink's title via a
-// YYYY-MM-DD regex; entries without a parseable date are silently skipped
+// the data source. Dates come from Haskell-emitted data-iso-date attributes;
+// entries without a parseable date are silently skipped
 // (the hidden list is also the screen-reader / no-JS fallback so they're
 // still reachable).
 //
@@ -30,8 +30,6 @@ import {
   formatCellHeader,
 } from '@emanote/calendar-grid';
 
-const DATE_RE = /(\d{4})-(\d{2})-(\d{2})/;
-
 const ROW_CLASSES = 'flex items-center gap-1.5';
 const LABEL_CLASSES = 'w-7 text-[0.65rem] uppercase tracking-wider text-gray-500 dark:text-gray-400 select-none shrink-0';
 const YEAR_LABEL_CLASSES = 'text-xs font-semibold tracking-tight text-gray-700 dark:text-gray-300 mb-1';
@@ -41,15 +39,17 @@ function parseEntries(listEl) {
   for (const li of listEl.querySelectorAll('li')) {
     const title = li.dataset.title || '';
     const url = li.dataset.url || '';
+    const isoDate = li.dataset.isoDate || '';
     // The <li>'s inner HTML is the rendered backlink context (paragraphs
     // around where this note is referenced from the daily note). Used
     // verbatim inside the cell's hover flyout — same context shape as
     // backlinks-margin so timeline + backlinks read as one family.
     const contextHTML = li.innerHTML.trim();
-    const m = title.match(DATE_RE);
-    if (!m) continue;
-    const [, y, mo, d] = m;
+    const parts = isoDate.split('-');
+    if (parts.length !== 3) continue;
+    const [y, mo, d] = parts;
     const year = +y, month = +mo, day = +d;
+    if (!Number.isFinite(year) || !Number.isFinite(month) || !Number.isFinite(day)) continue;
     if (!out.has(year)) out.set(year, new Map());
     const yr = out.get(year);
     if (!yr.has(month)) yr.set(month, new Map());
diff --git a/emanote/default/templates/components/timeline.tpl b/emanote/default/templates/components/timeline.tpl
index 59ad41380..840c88080 100644
--- a/emanote/default/templates/components/timeline.tpl
+++ b/emanote/default/templates/components/timeline.tpl
@@ -14,7 +14,7 @@
     </h3>
     <ul class="timeline-data" hidden>
       <backlink>
-        <li data-url="${backlink:note:url}" data-title="${backlink:note:title}">
+        <li data-url="${backlink:note:url}" data-title="${backlink:note:title}" data-iso-date="${backlink:note:iso-date}">
           <backlink:note:contexts>
             <apply template="context" />
           </backlink:note:contexts>
diff --git a/emanote/src/Emanote/View/Template.hs b/emanote/src/Emanote/View/Template.hs
index 1d1b2a925..6800c29e1 100644
--- a/emanote/src/Emanote/View/Template.hs
+++ b/emanote/src/Emanote/View/Template.hs
@@ -222,6 +222,7 @@ backlinksSplice model (bs :: [(R.LMLRoute, NonEmpty [B.Block])]) =
       -- TODO: reuse note splice
       "backlink:note:title" ## C.titleSplice bctx (M.modelLookupTitle source model)
       "backlink:note:url" ## HI.textSplice (SR.siteRouteUrl model $ SR.lmlSiteRoute (R.LMLView_Html, source))
+      "backlink:note:iso-date" ## HI.textSplice (routeDayIsoText source)
       "backlink:note:contexts" ##
         Splices.listSplice (toList contexts) "context"
           $ \backlinkCtx -> do
@@ -231,6 +232,10 @@ backlinksSplice model (bs :: [(R.LMLRoute, NonEmpty [B.Block])]) =
                 $ \ctx' ->
                   Splices.pandocSplice ctx' ctxDoc
 
+routeDayIsoText :: R.LMLRoute -> Text
+routeDayIsoText =
+  maybe "" (toText . formatTime defaultTimeLocale "%Y-%m-%d") . Calendar.parseRouteDay
+
 {- | Heist splice for the sidebar tree.
 
 If there is no 'current route', all sub-trees are marked as active/open.
@@ -247,7 +252,7 @@ routeTreeSplices tCtx mCurrentRoute model = do
         -- otherwise. Sole source of truth for daily-note dates on the JS side
         -- (sidebar-calendar reads it via data-iso-date) so date detection
         -- stays in Haskell, not duplicated as a regex per widget.
-        "node:iso-date" ## HI.textSplice (maybe "" (toText . formatTime defaultTimeLocale "%Y-%m-%d") $ Calendar.parseRouteDay nodeRoute)
+        "node:iso-date" ## HI.textSplice (routeDayIsoText nodeRoute)
         let isActiveNode = Just nodeRoute == mCurrentRoute
             isActiveTree =
               -- Active tree checking is applicable only when there is an
diff --git a/tests/features/smoke.feature b/tests/features/smoke.feature
index ba267f1dc..1948ad3f6 100644
--- a/tests/features/smoke.feature
+++ b/tests/features/smoke.feature
@@ -142,6 +142,7 @@ Feature: Smoke
     When I open "/dailyhost.html"
     Then the Timeline panel links to "dailyhost/2025-01-01"
     And the Timeline panel links to "dailyhost/2025-01-02"
+    And every Timeline data entry has an ISO date
 
   Scenario: Non-daily backlinks land in the Backlinks panel and not the Timeline
     When I open "/dailyhost.html"
diff --git a/tests/fixtures/notebook/dailyhost/2025-01-02.md b/tests/fixtures/notebook/dailyhost/2025-01-02.md
index 2ed47f197..5bb32692c 100644
--- a/tests/fixtures/notebook/dailyhost/2025-01-02.md
+++ b/tests/fixtures/notebook/dailyhost/2025-01-02.md
@@ -1,3 +1,3 @@
-# 2025-01-02
+# Retitled daily note
 
 Another daily-named note linking to [[dailyhost]].
diff --git a/tests/step_definitions/smoke_steps.ts b/tests/step_definitions/smoke_steps.ts
index 06cbd9a69..fb4e8585c 100644
--- a/tests/step_definitions/smoke_steps.ts
+++ b/tests/step_definitions/smoke_steps.ts
@@ -725,6 +725,31 @@ Then(
   },
 );
 
+Then(
+  "every Timeline data entry has an ISO date",
+  async function (this: EmanoteWorld) {
+    const entries = await this.page.evaluate(() =>
+      Array.from(
+        document.querySelectorAll(".emanote-timeline .timeline-data li"),
+      ).map((li) => ({
+        title: (li as HTMLElement).dataset.title ?? "",
+        isoDate: (li as HTMLElement).dataset.isoDate ?? "",
+      })),
+    );
+    assert.ok(
+      entries.length > 0,
+      "Expected at least one hidden Timeline data entry in the fixture.",
+    );
+    for (const entry of entries) {
+      assert.match(
+        entry.isoDate,
+        /^\d{4}-\d{2}-\d{2}$/,
+        `Expected Timeline entry ${JSON.stringify(entry.title)} to carry data-iso-date from Haskell, got ${JSON.stringify(entry.isoDate)}.`,
+      );
+    }
+  },
+);
+
 Then(
   "the Backlinks panel links to {string}",
   async function (this: EmanoteWorld, hrefSubstring: string) {

From 560f44f0d6cd4a58d4b818c86a110b43a7182409 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 4 May 2026 15:55:30 -0400
Subject: [PATCH 2/4] refactor(hickey): carry daily backlink dates

Carry the parsed Day from daily backlink classification into the template splice instead of re-parsing the route.
---
 emanote/src/Emanote/View/Template.hs | 61 ++++++++++++++++++----------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/emanote/src/Emanote/View/Template.hs b/emanote/src/Emanote/View/Template.hs
index 6800c29e1..cedef28fc 100644
--- a/emanote/src/Emanote/View/Template.hs
+++ b/emanote/src/Emanote/View/Template.hs
@@ -2,10 +2,10 @@ module Emanote.View.Template (emanoteSiteOutput, render) where
 
 import Control.Monad.Logger (MonadLoggerIO)
 import Data.Aeson.Types qualified as Aeson
-import Data.List (partition)
 import Data.Map.Syntax ((##))
 import Data.Set qualified as Set
 import Data.Text qualified as T
+import Data.Time.Calendar (Day)
 import Data.Time.Format (defaultTimeLocale, formatTime)
 import Data.Tree qualified as Tree
 import Ema qualified
@@ -190,9 +190,16 @@ renderLmlHtml model note = do
           else mempty
     "ema:note:backlinks" ##
       backlinksSplice model (G.modelLookupBacklinks r model)
-    let (backlinksDaily, backlinksNoDaily) = partition (Calendar.isDailyNote . fst) $ G.modelLookupBacklinks r model
+    let (backlinksDaily, backlinksNoDaily) =
+          partitionEithers
+            [ maybe
+              (Right (source, contexts))
+              (\day -> Left (source, day, contexts))
+              (Calendar.parseRouteDay source)
+            | (source, contexts) <- G.modelLookupBacklinks r model
+            ]
     "ema:note:backlinks:daily" ##
-      backlinksSplice model backlinksDaily
+      dailyBacklinksSplice model backlinksDaily
     "ema:note:backlinks:nodaily" ##
       backlinksSplice model backlinksNoDaily
     let folgeAnc = G.modelFolgezettelAncestorTree model r
@@ -216,25 +223,35 @@ backlinksSplice :: Model -> [(R.LMLRoute, NonEmpty [B.Block])] -> HI.Splice Iden
 backlinksSplice model (bs :: [(R.LMLRoute, NonEmpty [B.Block])]) =
   Splices.listSplice bs "backlink"
     $ \(source, contexts) -> do
-      let bnote = fromMaybe (error "backlink note missing - impossible") $ M.modelLookupNoteByRoute' source model
-          bmeta = Meta.getEffectiveRouteMetaWith (bnote ^. MN.noteMeta) source model
-          bctx = C.mkTemplateRenderCtx model source bmeta
-      -- TODO: reuse note splice
-      "backlink:note:title" ## C.titleSplice bctx (M.modelLookupTitle source model)
-      "backlink:note:url" ## HI.textSplice (SR.siteRouteUrl model $ SR.lmlSiteRoute (R.LMLView_Html, source))
-      "backlink:note:iso-date" ## HI.textSplice (routeDayIsoText source)
-      "backlink:note:contexts" ##
-        Splices.listSplice (toList contexts) "context"
-          $ \backlinkCtx -> do
-            let ctxDoc = Pandoc mempty $ one $ B.Div B.nullAttr backlinkCtx
-            "context:body" ##
-              C.withInlineCtx bctx
-                $ \ctx' ->
-                  Splices.pandocSplice ctx' ctxDoc
+      backlinkSplices model source contexts Nothing
 
-routeDayIsoText :: R.LMLRoute -> Text
-routeDayIsoText =
-  maybe "" (toText . formatTime defaultTimeLocale "%Y-%m-%d") . Calendar.parseRouteDay
+dailyBacklinksSplice :: Model -> [(R.LMLRoute, Day, NonEmpty [B.Block])] -> HI.Splice Identity
+dailyBacklinksSplice model bs =
+  Splices.listSplice bs "backlink"
+    $ \(source, day, contexts) ->
+      backlinkSplices model source contexts (Just day)
+
+backlinkSplices :: Model -> R.LMLRoute -> NonEmpty [B.Block] -> Maybe Day -> H.Splices (HI.Splice Identity)
+backlinkSplices model source contexts mDay = do
+  let bnote = fromMaybe (error "backlink note missing - impossible") $ M.modelLookupNoteByRoute' source model
+      bmeta = Meta.getEffectiveRouteMetaWith (bnote ^. MN.noteMeta) source model
+      bctx = C.mkTemplateRenderCtx model source bmeta
+  -- TODO: reuse note splice
+  "backlink:note:title" ## C.titleSplice bctx (M.modelLookupTitle source model)
+  "backlink:note:url" ## HI.textSplice (SR.siteRouteUrl model $ SR.lmlSiteRoute (R.LMLView_Html, source))
+  "backlink:note:iso-date" ## HI.textSplice (maybe "" dayIsoText mDay)
+  "backlink:note:contexts" ##
+    Splices.listSplice (toList contexts) "context"
+      $ \backlinkCtx -> do
+        let ctxDoc = Pandoc mempty $ one $ B.Div B.nullAttr backlinkCtx
+        "context:body" ##
+          C.withInlineCtx bctx
+            $ \ctx' ->
+              Splices.pandocSplice ctx' ctxDoc
+
+dayIsoText :: Day -> Text
+dayIsoText =
+  toText . formatTime defaultTimeLocale "%Y-%m-%d"
 
 {- | Heist splice for the sidebar tree.
 
@@ -252,7 +269,7 @@ routeTreeSplices tCtx mCurrentRoute model = do
         -- otherwise. Sole source of truth for daily-note dates on the JS side
         -- (sidebar-calendar reads it via data-iso-date) so date detection
         -- stays in Haskell, not duplicated as a regex per widget.
-        "node:iso-date" ## HI.textSplice (routeDayIsoText nodeRoute)
+        "node:iso-date" ## HI.textSplice (maybe "" dayIsoText $ Calendar.parseRouteDay nodeRoute)
         let isActiveNode = Just nodeRoute == mCurrentRoute
             isActiveTree =
               -- Active tree checking is applicable only when there is an

From b35fdccf7eee378ca33caf7c20ccd430b49ac79e Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 4 May 2026 16:08:38 -0400
Subject: [PATCH 3/4] test(e2e): drain live server stdout

Drain the live Emanote subprocess stdout pipe so long morph-mode e2e runs cannot block when the pipe buffer fills.
---
 tests/support/hooks.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/support/hooks.ts b/tests/support/hooks.ts
index 3e1493ce5..3b552506d 100644
--- a/tests/support/hooks.ts
+++ b/tests/support/hooks.ts
@@ -89,6 +89,9 @@ async function startLive(): Promise<{ url: string; resource: BackendResource }>
     ["-L", fixtureDir, "run", "--port", String(port)],
     { stdio: ["ignore", "pipe", "pipe"] },
   );
+  // Drain stdout too; otherwise a chatty live server can block once the pipe
+  // buffer fills, which surfaces as Playwright navigation timeouts.
+  proc.stdout?.on("data", () => {});
   proc.stderr?.on("data", (d: Buffer) =>
     process.stderr.write(`[emanote:live] ${d}`),
   );

From 8d2b2009b5afc7434deef09cb54f9aa4f31911e1 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Mon, 4 May 2026 17:12:54 -0400
Subject: [PATCH 4/4] test(e2e): drop redundant stdout drain

origin/master now ignores the live e2e server stdout pipe, so the branch no longer needs the separate drain listener.
---
 tests/support/hooks.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/support/hooks.ts b/tests/support/hooks.ts
index 71b7f833e..901fd7e86 100644
--- a/tests/support/hooks.ts
+++ b/tests/support/hooks.ts
@@ -92,9 +92,6 @@ async function startLive(): Promise<{ url: string; resource: BackendResource }>
     // making later page.goto("/") calls hang even though the backend started.
     { stdio: ["ignore", "ignore", "pipe"] },
   );
-  // Drain stdout too; otherwise a chatty live server can block once the pipe
-  // buffer fills, which surfaces as Playwright navigation timeouts.
-  proc.stdout?.on("data", () => {});
   proc.stderr?.on("data", (d: Buffer) =>
     process.stderr.write(`[emanote:live] ${d}`),
   );