From e529e2f8a5c7b01e90309b02147e7ca3bbfd2a63 Mon Sep 17 00:00:00 2001
From: Vamsi-2581 <245859299+Vamsi-2581@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:22:45 +0530
Subject: [PATCH 1/4] fix: preserve canonical URL after client navigation

---
 src/code.ts | 29 +++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/code.ts b/src/code.ts
index 2fc0d62..a6f0f1f 100644
--- a/src/code.ts
+++ b/src/code.ts
@@ -1448,6 +1448,17 @@ ${
         const tag = document.querySelector(selector);
         if (tag && value && tag.getAttribute('content') !== value) tag.setAttribute('content', value);
       }
+      function getCanonicalUrl() {
+        const pageId = getPage() || SLUG_TO_PAGE[getSlug()];
+        if (pageId) {
+          const slug = PAGE_TO_SLUG[pageId];
+          const path = slug === undefined ? '/' + pageId : (slug ? '/' + slug : '');
+          return 'https://' + MY_DOMAIN + path;
+        }
+        const isNotFound = NOT_FOUND_PATH !== null && location.pathname === NOT_FOUND_PATH;
+        return 'https://' + MY_DOMAIN + (isNotFound ? '/404' : '');
+      }
+
       function applyMeta() {
         const slug = location.pathname === NOT_FOUND_PATH ? '404'
           : PAGE_TO_SLUG[getPage()] ?? (slugs.includes(getSlug()) ? getSlug() : null);
@@ -1464,14 +1475,22 @@ ${
         setContent('meta[name="description"]', description);
         setContent('meta[property="og:description"]', description);
         setContent('meta[name="twitter:description"]', description);
+        const canonicalUrl = getCanonicalUrl();
+        const canonical = document.querySelector('link[rel="canonical"]');
+        if (canonical && canonical.getAttribute('href') !== canonicalUrl) {
+          canonical.setAttribute('href', canonicalUrl);
+        }
+        setContent('meta[property="og:url"]', canonicalUrl);
+        setContent('meta[name="twitter:url"]', canonicalUrl);
       }
       new MutationObserver(applyMeta).observe(document.head, {
         subtree: true,
         childList: true,
         characterData: true,
         attributes: true,
-        attributeFilter: ['content'],
+        attributeFilter: ['content', 'href'],
       });
+      applyMeta();
       const observer = new MutationObserver(function() {
         if (redirected) return;
         const nav = document.querySelector('.notion-topbar');
@@ -1480,6 +1499,7 @@ ${
           || mobileNav && mobileNav.firstChild) {
           redirected = true;
           updateSlug();
+          applyMeta();
           // Notion only exposes ThemeStore via __console in debug sessions
           if (window.__console?.environment?.ThemeStore) addDarkModeButton(nav ? 'web' : 'mobile');
           const onpopstate = window.onpopstate;
@@ -1492,6 +1512,7 @@ ${
             }
             if (onpopstate) onpopstate.apply(this, [].slice.call(arguments));
             updateSlug();
+          applyMeta();
           };
         }
       });
@@ -1503,6 +1524,7 @@ ${
         if (!redirected) {
           redirected = true;
           updateSlug();
+          applyMeta();
           const onpopstate = window.onpopstate;
           window.onpopstate = function() {
             if (slugs.includes(getSlug())) {
@@ -1513,6 +1535,7 @@ ${
             }
             if (onpopstate) onpopstate.apply(this, [].slice.call(arguments));
             updateSlug();
+          applyMeta();
           };
         }
       }, 2000);
@@ -1529,7 +1552,9 @@ ${
         if (id && pages.includes(id)) {
           arguments[2] = '/' + PAGE_TO_SLUG[id];
         }
-        return pushState.apply(window.history, arguments);
+        const result = pushState.apply(window.history, arguments);
+        applyMeta();
+        return result;
       };
       const open = window.XMLHttpRequest.prototype.open;
       window.XMLHttpRequest.prototype.open = function() {

From 2da9ecb8f21c0cbdac7c998b44595a00d57415b0 Mon Sep 17 00:00:00 2001
From: Vamsi-2581 <245859299+Vamsi-2581@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:22:51 +0530
Subject: [PATCH 2/4] test: cover client canonical metadata updates

---
 test/generated-worker.test.mjs | 97 ++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)

diff --git a/test/generated-worker.test.mjs b/test/generated-worker.test.mjs
index 1bfc461..4cdf8ad 100644
--- a/test/generated-worker.test.mjs
+++ b/test/generated-worker.test.mjs
@@ -1,4 +1,5 @@
 import assert from 'node:assert/strict';
+import { runInNewContext } from 'node:vm';
 import { before, test } from 'node:test';
 import { gzipSync } from 'node:zlib';
 import { createServer } from 'vite';
@@ -310,3 +311,99 @@ test('the home page keeps its canonical URL and metadata', async (t) => {
     title: 'Home title',
   });
 });
+
+
+function fakeTag(initialAttributes) {
+  const attributes = { ...initialAttributes };
+  return {
+    getAttribute: (name) => attributes[name] ?? null,
+    setAttribute: (name, value) => { attributes[name] = value; },
+  };
+}
+
+async function runClientMetadata(t, path) {
+  const handlers = await rewriteHandlers(t, path, HOME_METADATA);
+  const appended = [];
+  handlers.body.element({ append: (html) => appended.push(html) });
+  const script = appended.join('').match(/<script>([\s\S]*?)<\/script>/)?.[1];
+  assert.ok(script, 'generated worker should append its client script');
+
+  const tags = {
+    canonical: fakeTag({ href: 'https://notes.example.com/Notion-Title-11111111111111111111111111111111' }),
+    ogUrl: fakeTag({ content: '/Notion-Title-11111111111111111111111111111111' }),
+    twitterUrl: fakeTag({ content: '/Notion-Title-11111111111111111111111111111111' }),
+  };
+  const selectors = new Map([
+    ['link[rel="canonical"]', tags.canonical],
+    ['meta[property="og:url"]', tags.ogUrl],
+    ['meta[name="twitter:url"]', tags.twitterUrl],
+  ]);
+  const observers = [];
+  class TestMutationObserver {
+    constructor(callback) { this.callback = callback; observers.push(this); }
+    observe() {}
+  }
+  const location = { protocol: 'https:', host: 'notes.example.com', pathname: path };
+  const history = {
+    state: {},
+    pushState(_state, _title, url) {
+      if (url !== undefined) location.pathname = new URL(url, 'https://notes.example.com').pathname;
+    },
+    replaceState(_state, _title, url) {
+      if (url !== undefined) location.pathname = new URL(url, 'https://notes.example.com').pathname;
+    },
+  };
+  const window = { history, XMLHttpRequest: { prototype: { open() {} } } };
+  const document = {
+    head: {},
+    body: { classList: { contains: () => false, add() {}, remove() {} } },
+    title: 'Home | Notion',
+    createElement: () => ({ addEventListener() {}, appendChild() {} }),
+    querySelector: (selector) => selectors.get(selector) || null,
+  };
+
+  runInNewContext(script, {
+    window,
+    document,
+    location,
+    MutationObserver: TestMutationObserver,
+    URL,
+    setTimeout: () => 0,
+  });
+  return { tags, observers, window, location };
+}
+
+test('client metadata preserves canonical URLs after Notion changes the head and during navigation', async (t) => {
+  const page = await runClientMetadata(t, '/');
+  const expectedHome = 'https://notes.example.com';
+  assert.equal(page.tags.canonical.getAttribute('href'), expectedHome);
+  assert.equal(page.tags.ogUrl.getAttribute('content'), expectedHome);
+  assert.equal(page.tags.twitterUrl.getAttribute('content'), expectedHome);
+
+  // A later Notion head rewrite must not replace the Worknot URLs.
+  for (const [tag, attribute] of [
+    [page.tags.canonical, 'href'],
+    [page.tags.ogUrl, 'content'],
+    [page.tags.twitterUrl, 'content'],
+  ]) {
+    tag.setAttribute(attribute, '/Notion-Title-11111111111111111111111111111111');
+  }
+  page.observers[0].callback([]);
+  assert.equal(page.tags.canonical.getAttribute('href'), expectedHome);
+  assert.equal(page.tags.ogUrl.getAttribute('content'), expectedHome);
+  assert.equal(page.tags.twitterUrl.getAttribute('content'), expectedHome);
+
+  // The same generated client script handles mapped and unmapped page navigation.
+  page.window.history.pushState({}, '', '/' + OTHER);
+  assert.equal(page.location.pathname, '/chapter');
+  assert.equal(page.tags.canonical.getAttribute('href'), 'https://notes.example.com/chapter');
+  assert.equal(page.tags.ogUrl.getAttribute('content'), 'https://notes.example.com/chapter');
+  assert.equal(page.tags.twitterUrl.getAttribute('content'), 'https://notes.example.com/chapter');
+
+  page.window.history.pushState({}, '', '/' + UNMAPPED);
+  assert.equal(page.location.pathname, '/' + UNMAPPED);
+  const expectedUnmapped = 'https://notes.example.com/' + UNMAPPED;
+  assert.equal(page.tags.canonical.getAttribute('href'), expectedUnmapped);
+  assert.equal(page.tags.ogUrl.getAttribute('content'), expectedUnmapped);
+  assert.equal(page.tags.twitterUrl.getAttribute('content'), expectedUnmapped);
+});

From ac28f462681335981c4e52fc93015800722a3bd2 Mon Sep 17 00:00:00 2001
From: Vamsi-2581 <245859299+Vamsi-2581@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:27:04 +0530
Subject: [PATCH 3/4] fix: refresh canonical metadata after replaceState

---
 src/code.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/code.ts b/src/code.ts
index a6f0f1f..bedf719 100644
--- a/src/code.ts
+++ b/src/code.ts
@@ -1542,7 +1542,9 @@ ${
       const replaceState = window.history.replaceState;
       window.history.replaceState = function(state) {
         if (arguments[1] !== 'bypass' && (slugs.includes(getSlug()) || location.pathname === NOT_FOUND_PATH)) return;
-        return replaceState.apply(window.history, arguments);
+        const result = replaceState.apply(window.history, arguments);
+        applyMeta();
+        return result;
       };
       const pushState = window.history.pushState;
       window.history.pushState = function(state) {

From 6b2c9573f29f4e3534f0e5aba82acb554a0b7388 Mon Sep 17 00:00:00 2001
From: Vamsi-2581 <245859299+Vamsi-2581@users.noreply.github.com>
Date: Wed, 28 Oct 2026 16:27:15 +0530
Subject: [PATCH 4/4] test: cover canonical metadata after replaceState

---
 test/generated-worker.test.mjs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/generated-worker.test.mjs b/test/generated-worker.test.mjs
index 4cdf8ad..0fbcd9f 100644
--- a/test/generated-worker.test.mjs
+++ b/test/generated-worker.test.mjs
@@ -406,4 +406,11 @@ test('client metadata preserves canonical URLs after Notion changes the head and
   assert.equal(page.tags.canonical.getAttribute('href'), expectedUnmapped);
   assert.equal(page.tags.ogUrl.getAttribute('content'), expectedUnmapped);
   assert.equal(page.tags.twitterUrl.getAttribute('content'), expectedUnmapped);
+
+  // replaceState is also used by the client router and must refresh route metadata.
+  page.window.history.replaceState({}, '', '/' + OTHER);
+  const expectedMapped = 'https://notes.example.com/chapter';
+  assert.equal(page.tags.canonical.getAttribute('href'), expectedMapped);
+  assert.equal(page.tags.ogUrl.getAttribute('content'), expectedMapped);
+  assert.equal(page.tags.twitterUrl.getAttribute('content'), expectedMapped);
 });