closes #14331 : Refactor SR to support container tab forcing

2026-06-27 21:20:27 +00:00 · 2026-06-22 12:13:52 +02:00
21 changed files with 189 additions and 889 deletions
--- a/README.md
+++ b/README.md
@@ -34,8 +34,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne

 ### Firefox Versions

- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.3`! 🚀
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.3`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `152.0.1`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.1`!

 ### Contributing

--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-b223f3727a037a7b8a0f36f34bfe8c4622a7f387
+2960f4c1ce58d289d3b9ec885695f0017d2636ab
--- a/locales/en-US/browser/browser/zen-general.ftl
+++ b/locales/en-US/browser/browser/zen-general.ftl
@@ -19,19 +19,13 @@ tab-context-zen-add-essential-badge = { $num } / { $max }
 tab-context-zen-remove-essential =
    .label = Remove from Essentials
    .accesskey = R
-tab-context-zen-edit-pinned-page =
+tab-context-zen-replace-pinned-url-with-current =
    .label =
        { $isEssential ->
-            [true] Edit Essential URL
-           *[false] Edit Pinned URL
+            [true] Replace Essential URL with Current
+           *[false] Replace Pinned URL with Current
        }
-    .accesskey = P
-tab-context-zen-replace-pinned-url-with-current =
-    .label = Replace with Current URL
    .accesskey = C
-tab-context-zen-edit-pinned-url =
-    .label = Edit...
-    .accesskey = E
 tab-context-zen-edit-title =
    .label = Change Label...
 tab-context-zen-edit-icon =
@@ -61,10 +55,6 @@ zen-general-confirm =
    .label = Confirm

 zen-pinned-tab-replaced = Pinned tab URL has been replaced with the current URL!
-zen-pinned-tab-url-edited = Pinned tab URL has been updated!
-zen-pinned-tab-url-invalid = That doesn't look like a valid URL.
-zen-pinned-tab-edit-url-title = Edit Pinned URL
-zen-pinned-tab-edit-url-label = Enter the URL this pinned tab should point to:
 zen-tabs-renamed = Tab has been successfully renamed!
 zen-background-tab-opened-toast = New background tab opened!
 zen-workspace-renamed-toast = Workspace has been successfully renamed!
--- a/locales/en-US/browser/browser/zen-space-routing.ftl
+++ b/locales/en-US/browser/browser/zen-space-routing.ftl
@@ -25,9 +25,3 @@ zen-space-routing-open-in = Open In
 zen-space-routing-url = URL

 zen-space-routing-tab-routed-toast = New tab opened in { $targetWorkspace }
-tab-context-zen-add-domain-to-sr = 
-    .label = 
-        { $tabCount ->
-            [one] Add Route for Domain
-            *[other] Add Route for Domains
-        }
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
    "build": "surfer build",
    "build:ui": "surfer build --ui",
    "start": "cd engine && python3 ./mach run --noprofile",
+    "start:debug": "npm start -- --jsdebugger --wait-for-jsdebugger",
    "start:bloat": "XPCOM_MEM_BLOAT_LOG=1 npm start",
    "import": "npm run ffprefs && npm run import:dumps && surfer import",
    "import:dumps": "python3 scripts/update_service_dumps.py",
--- a/src/browser/base/content/aboutDialog-css.patch
+++ b/src/browser/base/content/aboutDialog-css.patch
@@ -1,18 +0,0 @@
-diff --git a/browser/base/content/aboutDialog.css b/browser/base/content/aboutDialog.css
-index 017125bc2510e5f5e317a5e78c40d6aa9ded76ca..d343d8c62a2251e3c3a33ae8f2ab9c4c68218c22 100644
--- a/browser/base/content/aboutDialog.css
-+++ b/browser/base/content/aboutDialog.css
-@@ -135,6 +135,13 @@
-   margin: 0 40px;
- }
- 
-+#trademark {
-+  font-size: xx-small;
-+  text-align: center;
-+  margin-block: 10px;
-+  color: var(--text-color-deemphasized);
-+}
-+
- #currentChannel {
-   margin: 0;
-   padding: 0;
--- a/src/browser/base/content/aboutDialog-xhtml.patch
+++ b/src/browser/base/content/aboutDialog-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index 3ffd464b960a4299a7dd0cd87e4fc2f781b9d593..7a831c8ee2b73bb89bf8a82ac24958b55c16a5aa 100644
+index 3ffd464b960a4299a7dd0cd87e4fc2f781b9d593..ef9f42d1f0196902b4af31f4496891fcd6319831 100644
 --- a/browser/base/content/aboutDialog.xhtml
 +++ b/browser/base/content/aboutDialog.xhtml
@@ -102,10 +102,6 @@
@@ -39,8 +39,8 @@ index 3ffd464b960a4299a7dd0cd87e4fc2f781b9d593..7a831c8ee2b73bb89bf8a82ac24958b5
         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
 -        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
 -        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>
-+        <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottom-links-terms"/>
-+        <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottom-links-privacy"/>
+        <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottomLinks-rights"/>
+        <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
       </hbox>
       <description id="trademark" data-l10n-id="trademarkInfo"></description>
     </vbox>
--- a/src/browser/base/content/zen-commands.inc.xhtml
+++ b/src/browser/base/content/zen-commands.inc.xhtml
@@ -35,7 +35,6 @@
  <command id="cmd_zenToggleTabsOnRight" />

  <command id="cmd_zenReplacePinnedUrlWithCurrent" />
-  <command id="cmd_zenEditPinnedUrl" />
  <command id="cmd_contextZenAddToEssentials" />
  <command id="cmd_contextZenRemoveFromEssentials" />

--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d83330c265dfc 100644
+index 08b5b56e069d038d72c87355920c4ce8a55ed805..99b3de9a7be5cd5fd73c0b9dbbe265655d7171ce 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -511,6 +511,7 @@
@@ -285,22 +285,21 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } = {}
     ) {
       // all callers of addTab that pass a params object need to pass
-@@ -3347,10 +3438,25 @@
+@@ -3347,10 +3438,24 @@
         );
       }
 
-+      const beforeRouteResult = window.gZenSpaceRoutingManager.onBeforeAddTab(uriString, { skipRoute, pinned, tabGroup, fromExternal }, window);
+      const beforeRouteResult = window.gZenSpaceRoutingManager.onBeforeAddTab(uriString, { skipRoute, pinned, tabGroup, fromExternal, zenWorkspaceId }, window);
 +      if (beforeRouteResult.shouldEarlyExit) {
 +        return null;
 +      }
 +
 +      let hasZenDefaultUserContextId = false;
-+      let zenForcedWorkspaceId = undefined;
 +      if (beforeRouteResult.isRouteFound && typeof userContextId !== "undefined") {
 +        userContextId = beforeRouteResult.userContextId;
 +        hasZenDefaultUserContextId = true;
 +      } else if (typeof gZenWorkspaces !== "undefined" && !_forZenEmptyTab) {
-+        [userContextId, hasZenDefaultUserContextId, zenForcedWorkspaceId] = gZenWorkspaces.getContextIdIfNeeded(userContextId, fromExternal, triggeringPrincipal);
+        [userContextId, hasZenDefaultUserContextId] = gZenWorkspaces.getContextIdIfNeeded(userContextId, fromExternal, triggeringPrincipal);
 +      }
 +
       if (!UserInteraction.running("browser.tabs.opening", window)) {
@@ -311,7 +310,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // If we're opening a foreground tab, set the owner by default.
       ownerTab ??= inBackground ? null : this.selectedTab;
 
-@@ -3358,6 +3464,7 @@
+@@ -3358,6 +3463,7 @@
       if (this.selectedTab.owner) {
         this.selectedTab.owner = null;
       }
@@ -319,7 +318,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       // Find the tab that opened this one, if any. This is used for
       // determining positioning, and inherited attributes such as the
-@@ -3410,6 +3517,22 @@
+@@ -3410,6 +3516,18 @@
           noInitialLabel,
           skipBackgroundNotify,
         });
@@ -328,10 +327,6 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 +        }
 +        if (zenWorkspaceId) {
 +          t.setAttribute("zen-workspace-id", zenWorkspaceId);
-+          t.setAttribute("change-workspace", "")
-+        } else if (zenForcedWorkspaceId !== undefined) {
-+          t.setAttribute("zen-workspace-id", zenForcedWorkspaceId);
-+          t.setAttribute("change-workspace", "")
 +        }
 +        if (_forZenEmptyTab) {
 +          t.setAttribute("zen-empty-tab", "true");
@@ -342,7 +337,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         if (insertTab) {
           // Insert the tab into the tab container in the correct position.
           this.#insertTabAtIndex(t, {
-@@ -3418,6 +3541,7 @@
+@@ -3418,6 +3536,7 @@
             ownerTab,
             openerTab,
             pinned,
@@ -350,7 +345,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
             bulkOrderedOpen,
             tabGroup: tabGroup ?? openerTab?.group,
           });
-@@ -3436,6 +3560,7 @@
+@@ -3436,6 +3555,7 @@
           openWindowInfo,
           skipLoad,
           triggeringRemoteType,
@@ -358,7 +353,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         }));
 
         if (focusUrlBar) {
-@@ -3560,6 +3685,12 @@
+@@ -3560,6 +3680,12 @@
         }
       }
 
@@ -371,7 +366,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // Additionally send pinned tab events
       if (pinned) {
         this.#notifyPinnedStatus(t);
-@@ -3570,6 +3701,15 @@
+@@ -3570,6 +3696,15 @@
       if (!inBackground) {
         this.selectedTab = t;
       }
@@ -387,7 +382,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       return t;
     }
 
-@@ -3802,6 +3942,7 @@
+@@ -3802,6 +3937,7 @@
         isAdoptingGroup = false,
         isUserTriggered = false,
         telemetryUserCreateSource = "unknown",
@@ -395,7 +390,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } = {}
     ) {
       if (
-@@ -3812,9 +3953,6 @@
+@@ -3812,9 +3948,6 @@
             !this.isSplitViewWrapper(tabOrSplitView)
         )
       ) {
@@ -405,7 +400,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       }
 
       if (!color) {
-@@ -3835,9 +3973,14 @@
+@@ -3835,9 +3968,14 @@
         label,
         isAdoptingGroup
       );
@@ -422,7 +417,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       );
       group.addTabs(tabsAndSplitViews);
 
-@@ -3958,7 +4101,7 @@
+@@ -3958,7 +4096,7 @@
       }
 
       this.#handleTabMove(tab, () =>
@@ -431,7 +426,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       );
     }
 
-@@ -4044,6 +4187,7 @@
+@@ -4044,6 +4182,7 @@
         color: group.color,
         insertBefore: newTabs[0],
         isAdoptingGroup: true,
@@ -439,7 +434,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       });
     }
 
-@@ -4254,6 +4398,7 @@
+@@ -4254,6 +4393,7 @@
         openWindowInfo,
         skipLoad,
         triggeringRemoteType,
@@ -447,7 +442,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       }
     ) {
       // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4323,6 +4468,7 @@
+@@ -4323,6 +4463,7 @@
           openWindowInfo,
           name,
           skipLoad,
@@ -455,7 +450,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         });
       }
 
-@@ -4536,9 +4682,9 @@
+@@ -4536,9 +4677,9 @@
         }
 
         // Add a new tab if needed.
@@ -467,7 +462,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
           let url = "about:blank";
           if (tabData.entries?.length) {
-@@ -4575,8 +4721,10 @@
+@@ -4575,8 +4716,10 @@
             insertTab: false,
             skipLoad: true,
             preferredRemoteType,
@@ -479,7 +474,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
           if (select) {
             tabToSelect = tab;
           }
-@@ -4598,7 +4746,8 @@
+@@ -4598,7 +4741,8 @@
           this.pinTab(tab);
           // Then ensure all the tab open/pinning information is sent.
           this._fireTabOpen(tab, {});
@@ -489,7 +484,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
           let { groupId } = tabData;
           const tabGroup = tabGroupWorkingData.get(groupId);
           // if a tab refers to a tab group we don't know, skip any group
-@@ -4618,7 +4767,10 @@
+@@ -4618,7 +4762,10 @@
                 tabGroup.stateData.id,
                 tabGroup.stateData.color,
                 tabGroup.stateData.collapsed,
@@ -501,7 +496,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
               );
               tabsFragment.appendChild(tabGroup.node);
             }
-@@ -4673,9 +4825,21 @@
+@@ -4673,9 +4820,21 @@
       // to remove the old selected tab.
       if (tabToSelect) {
         let leftoverTab = this.selectedTab;
@@ -523,15 +518,12 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       if (tabs.length > 1 || !tabs[0].selected) {
         this._updateTabsAfterInsert();
-@@ -4866,11 +5030,17 @@
+@@ -4866,11 +5025,14 @@
       if (ownerTab) {
         tab.owner = ownerTab;
       }
 +      if ((!tab.pinned && tabGroup?.isZenFolder && !Services.prefs.getBoolPref('zen.folders.owned-tabs-in-folder')) || (tabGroup && tabGroup.hasAttribute("split-view-group"))) {
 +        tabGroup = null;
-+      }
-+      if (openerTab?.hasAttribute("zen-glance-tab")) {
-+        openerTab = gZenGlanceManager.getTabOrGlanceParent(openerTab);
 +      }
 
       // Ensure we have an index if one was not provided.
@@ -542,7 +534,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         if (
           !bulkOrderedOpen &&
           ((openerTab &&
-@@ -4882,7 +5052,7 @@
+@@ -4882,7 +5044,7 @@
           let lastRelatedTab =
             openerTab && this._lastRelatedTabMap.get(openerTab);
           let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -551,7 +543,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
             tabGroup = previousTab.group;
           }
           if (
-@@ -4898,7 +5068,7 @@
+@@ -4898,7 +5060,7 @@
                 previousTab.splitview
               ) + 1;
           } else if (previousTab.visible) {
@@ -560,7 +552,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
           } else if (previousTab == FirefoxViewHandler.tab) {
             elementIndex = 0;
           }
-@@ -4926,14 +5096,14 @@
+@@ -4926,14 +5088,14 @@
       }
       // Ensure index is within bounds.
       if (tab.pinned) {
@@ -579,7 +571,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       if (pinned && !itemAfter?.pinned) {
         itemAfter = null;
-@@ -4950,7 +5120,7 @@
+@@ -4950,7 +5112,7 @@
 
       this.tabContainer._invalidateCachedTabs();
 
@@ -588,7 +580,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         if (
           (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
           this.isSplitViewWrapper(itemAfter)
-@@ -4981,7 +5151,11 @@
+@@ -4981,7 +5143,11 @@
         const tabContainer = pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
@@ -600,7 +592,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       }
 
       if (tab.group?.collapsed) {
-@@ -4996,6 +5170,7 @@
+@@ -4996,6 +5162,7 @@
       if (pinned) {
         this._updateTabBarForPinnedTabs();
       }
@@ -608,7 +600,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       TabBarVisibility.update();
     }
-@@ -5544,6 +5719,7 @@
+@@ -5544,6 +5711,7 @@
         telemetrySource,
       } = {}
     ) {
@@ -616,7 +608,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
       // can be considered equivalent to closing the window.
       if (
-@@ -5633,6 +5809,7 @@
+@@ -5633,6 +5801,7 @@
         if (lastToClose) {
           this.removeTab(lastToClose, aParams);
         }
@@ -624,7 +616,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } catch (e) {
         console.error(e);
       }
-@@ -5678,6 +5855,14 @@
+@@ -5678,6 +5847,14 @@
         return;
       }
 
@@ -639,7 +631,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       let isVisibleTab = aTab.visible;
       // We have to sample the tab width now, since _beginRemoveTab might
       // end up modifying the DOM in such a way that aTab gets a new
-@@ -5685,6 +5870,9 @@
+@@ -5685,6 +5862,9 @@
       // state).
       let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
       let isLastTab = this.#isLastTabInWindow(aTab);
@@ -649,7 +641,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       if (
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
-@@ -5696,13 +5884,14 @@
+@@ -5696,13 +5876,14 @@
           telemetrySource,
         })
       ) {
@@ -665,7 +657,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       let lockTabSizing =
         !this.tabContainer.verticalMode &&
         !aTab.pinned &&
-@@ -5733,7 +5922,13 @@
+@@ -5733,7 +5914,13 @@
         // We're not animating, so we can cancel the animation stopwatch.
         Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
         aTab._closeTimeAnimTimerId = null;
@@ -680,7 +672,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         return;
       }
 
-@@ -5867,7 +6062,7 @@
+@@ -5867,7 +6054,7 @@
           closeWindowWithLastTab != null
             ? closeWindowWithLastTab
             : !window.toolbar.visible ||
@@ -689,7 +681,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
         if (closeWindow) {
           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5891,6 +6086,7 @@
+@@ -5891,6 +6078,7 @@
 
         newTab = true;
       }
@@ -697,7 +689,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       aTab._endRemoveArgs = [closeWindow, newTab];
 
       // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5931,13 +6127,7 @@
+@@ -5931,13 +6119,7 @@
       aTab._mouseleave();
 
       if (newTab) {
@@ -712,7 +704,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } else {
         TabBarVisibility.update();
       }
-@@ -6070,6 +6260,7 @@
+@@ -6070,6 +6252,7 @@
         this.tabs[i]._tPos = i;
       }
 
@@ -720,7 +712,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       if (!this._windowIsClosing) {
         // update tab close buttons state
         this.tabContainer._updateCloseButtons();
-@@ -6255,6 +6446,7 @@
+@@ -6255,6 +6438,7 @@
         memory_after: await getTotalMemoryUsage(),
         time_to_unload_in_ms: timeElapsed,
       });
@@ -728,7 +720,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
     }
 
     /**
-@@ -6300,6 +6492,7 @@
+@@ -6300,6 +6484,7 @@
       }
 
       let excludeTabs = new Set(aExcludeTabs);
@@ -736,7 +728,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       // If this tab has a successor, it should be selectable, since
       // hiding or closing a tab removes that tab as a successor.
-@@ -6312,15 +6505,22 @@
+@@ -6312,15 +6497,22 @@
         !excludeTabs.has(aTab.owner) &&
         Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
       ) {
@@ -761,7 +753,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       let tab = this.tabContainer.findNextTab(aTab, {
         direction: 1,
         filter: _tab => remainingTabs.includes(_tab),
-@@ -6334,7 +6534,7 @@
+@@ -6334,7 +6526,7 @@
       }
 
       if (tab) {
@@ -770,7 +762,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       }
 
       // If no qualifying visible tab was found, see if there is a tab in
-@@ -6355,7 +6555,7 @@
+@@ -6355,7 +6547,7 @@
         });
       }
 
@@ -779,7 +771,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
     }
 
     _blurTab(aTab) {
-@@ -6366,7 +6566,7 @@
+@@ -6366,7 +6558,7 @@
      * @returns {boolean}
      *   False if swapping isn't permitted, true otherwise.
      */
@@ -788,7 +780,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // Do not allow transfering a private tab to a non-private window
       // and vice versa.
       if (
-@@ -6420,6 +6620,7 @@
+@@ -6420,6 +6612,7 @@
       // fire the beforeunload event in the process.  Close the other
       // window if this was its last tab.
       if (
@@ -796,7 +788,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         !remoteBrowser._beginRemoveTab(aOtherTab, {
           adoptedByTab: aOurTab,
           closeWindowWithLastTab: true,
-@@ -6431,7 +6632,7 @@
+@@ -6431,7 +6624,7 @@
       // If this is the last tab of the window, hide the window
       // immediately without animation before the docshell swap, to avoid
       // about:blank being painted.
@@ -805,7 +797,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       if (closeWindow) {
         let win = aOtherTab.documentGlobal;
         win.windowUtils.suppressAnimation(true);
-@@ -6565,11 +6766,13 @@
+@@ -6565,11 +6758,13 @@
       }
 
       // Finish tearing down the tab that's going away.
@@ -819,7 +811,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       this.setTabTitle(aOurTab);
 
-@@ -6771,10 +6974,10 @@
+@@ -6771,10 +6966,10 @@
       SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
     }
 
@@ -832,7 +824,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         aTab.selected ||
         aTab.closing ||
         // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6834,7 +7037,8 @@
+@@ -6834,7 +7029,8 @@
      * @param {object} [aOptions={}]
      *   Key-value pairs that will be serialized into the features string.
      */
@@ -842,7 +834,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       if (this.tabs.length == 1) {
         return null;
       }
-@@ -6851,7 +7055,7 @@
+@@ -6851,7 +7047,7 @@
       // tell a new window to take the "dropped" tab
       let args = Cc["@mozilla.org/array;1"].createInstance(Ci.nsIMutableArray);
       args.appendElement(aTab.splitview ?? aTab);
@@ -851,7 +843,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         private: PrivateBrowsingUtils.isWindowPrivate(window),
         features: Object.entries(aOptions)
           .map(([key, value]) => `${key}=${value}`)
-@@ -6859,6 +7063,8 @@
+@@ -6859,6 +7055,8 @@
         openerWindow: window,
         args,
       });
@@ -860,7 +852,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
     }
 
     /**
-@@ -6971,7 +7177,7 @@
+@@ -6971,7 +7169,7 @@
      *   `true` if element is a `<tab-group>`
      */
     isTabGroup(element) {
@@ -869,7 +861,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
     }
 
     /**
-@@ -7056,8 +7262,8 @@
+@@ -7056,8 +7254,8 @@
       }
 
       // Don't allow mixing pinned and unpinned tabs.
@@ -880,7 +872,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } else {
         tabIndex = Math.max(tabIndex, this.pinnedTabCount);
       }
-@@ -7103,8 +7309,8 @@
+@@ -7103,8 +7301,8 @@
       this.#handleTabMove(
         element,
         () => {
@@ -891,7 +883,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
             neighbor = neighbor.group;
           }
           if (neighbor?.splitview) {
-@@ -7115,6 +7321,12 @@
+@@ -7115,6 +7313,12 @@
               return;
             }
           }
@@ -904,7 +896,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
           if (movingForwards && neighbor) {
             neighbor.after(element);
-@@ -7173,23 +7385,31 @@
+@@ -7173,23 +7377,31 @@
     #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
       if (this.isTabGroupLabel(targetElement)) {
         targetElement = targetElement.group;
@@ -942,7 +934,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       } else if (!element.pinned && targetElement && targetElement.pinned) {
         // If the caller asks to move an unpinned element next to a pinned
         // tab, move the unpinned element to be the first unpinned element
-@@ -7202,12 +7422,35 @@
+@@ -7202,12 +7414,35 @@
         //    move the tab group right before the first unpinned tab.
         // 4. Moving a tab group and the first unpinned tab is grouped:
         //    move the tab group right before the first unpinned tab's tab group.
@@ -979,7 +971,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       // We want to include the splitview wrapper if it's the targetElement, but
       // not in the case where we want to reverse tabs within the same splitview.
-@@ -7216,6 +7459,7 @@
+@@ -7216,6 +7451,7 @@
       }
 
       let getContainer = () =>
@@ -987,7 +979,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         element.pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
-@@ -7224,11 +7468,15 @@
+@@ -7224,11 +7460,15 @@
         element,
         () => {
           if (moveBefore) {
@@ -1004,7 +996,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
           }
         },
         metricsContext
-@@ -7302,11 +7550,15 @@
+@@ -7302,11 +7542,15 @@
      * @param {TabMetricsContext} [metricsContext]
      */
     moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -1023,7 +1015,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       }
       if (aTab.group && aTab.group.id === aGroup.id) {
         return;
-@@ -7378,6 +7630,7 @@
+@@ -7378,6 +7622,7 @@
 
       let state = {
         tabIndex: tab._tPos,
@@ -1031,7 +1023,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       };
       if (tab.visible) {
         state.elementIndex = tab.elementIndex;
-@@ -7409,7 +7662,7 @@
+@@ -7409,7 +7654,7 @@
       let changedSplitView =
         previousTabState.splitViewId != currentTabState.splitViewId;
 
@@ -1040,7 +1032,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         tab.dispatchEvent(
           new CustomEvent("TabMove", {
             bubbles: true,
-@@ -7456,6 +7709,10 @@
+@@ -7456,6 +7701,10 @@
 
       moveActionCallback();
 
@@ -1051,7 +1043,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // Clear tabs cache after moving nodes because the order of tabs may have
       // changed.
       this.tabContainer._invalidateCachedTabs();
-@@ -7506,7 +7763,22 @@
+@@ -7506,7 +7755,22 @@
      * @returns {object}
      *    The new tab in the current window, null if the tab couldn't be adopted.
      */
@@ -1075,7 +1067,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       // Swap the dropped tab with a new one we create and then close
       // it in the other window (making it seem to have moved between
       // windows). We also ensure that the tab we create to swap into has
-@@ -7549,6 +7821,8 @@
+@@ -7549,6 +7813,8 @@
       }
       params.skipLoad = true;
       let newTab = this.addWebTab("about:blank", params);
@@ -1084,7 +1076,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
       aTab.container.tabDragAndDrop.finishAnimateTabMove();
 
-@@ -8259,7 +8533,7 @@
+@@ -8259,7 +8525,7 @@
         // preventDefault(). It will still raise the window if appropriate.
         return;
       }
@@ -1093,7 +1085,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       window.focus();
       aEvent.preventDefault();
     }
-@@ -8276,7 +8550,6 @@
+@@ -8276,7 +8542,6 @@
 
     on_TabGroupCollapse(aEvent) {
       aEvent.target.tabs.forEach(tab => {
@@ -1101,7 +1093,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
       });
     }
 
-@@ -8630,7 +8903,9 @@
+@@ -8630,7 +8895,9 @@
 
         let filter = this._tabFilters.get(tab);
         if (filter) {
@@ -1111,7 +1103,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
 
           let listener = this._tabListeners.get(tab);
           if (listener) {
-@@ -9435,6 +9710,7 @@
+@@ -9435,6 +9702,7 @@
             aWebProgress.isTopLevel
           ) {
             this.mTab.setAttribute("busy", "true");
@@ -1119,7 +1111,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
             gBrowser._tabAttrModified(this.mTab, ["busy"]);
             this.mTab._notselectedsinceload = !this.mTab.selected;
           }
-@@ -9515,6 +9791,7 @@
+@@ -9515,6 +9783,7 @@
         // known defaults. Note we use the original URL since about:newtab
         // redirects to a prerendered page.
         const shouldRemoveFavicon =
@@ -1127,7 +1119,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
           !this.mBrowser.mIconURL &&
           !ignoreBlank &&
           !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9689,13 +9966,6 @@
+@@ -9689,13 +9958,6 @@
             this.mBrowser.originalURI = aRequest.originalURI;
           }
 
@@ -1141,7 +1133,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..87f41c8583c26f364530def5bd5d8333
         }
 
         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10587,7 +10857,8 @@ var TabContextMenu = {
+@@ -10587,7 +10849,8 @@ var TabContextMenu = {
     );
     contextUnpinSelectedTabs.hidden =
       !this.contextTab.pinned || !this.multiselected;
--- a/src/zen/ZenComponents.manifest
+++ b/src/zen/ZenComponents.manifest
@@ -16,4 +16,3 @@ category app-startup nsBrowserGlue @mozilla.org/browser/browserglue;1 applicatio
 #include common/Components.manifest
 #include sessionstore/SessionComponents.manifest
 #include live-folders/LiveFoldersComponents.manifest
-#include space-routing/SpaceRoutingComponents.manifest
--- a/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs
+++ b/src/zen/common/sys/ui/ZenSpaceRoutingNavigation.sys.mjs
@@ -35,6 +35,13 @@ export class ZenSpaceRoutingNavigation extends ZenUIComponent {
      return;
    }

+    // The tab we spawn for a route must be allowed to load once without being
+    // redirected again, regardless of when its workspace attribute lands.
+    if (aBrowser._zenSkipNavRouteOnce) {
+      aBrowser._zenSkipNavRouteOnce = false;
+      return;
+    }
+
    let uri;
    try {
      uri = aRequest.QueryInterface(Ci.nsIChannel).URI;
@@ -73,49 +80,16 @@ export class ZenSpaceRoutingNavigation extends ZenUIComponent {
    }

    const currentWorkspaceId = tab.getAttribute("zen-workspace-id");
-    const targetWorkspaceId =
-      win.gZenSpaceRoutingManager.getRedirectTargetWorkspaceId(
+    if (
+      !win.gZenSpaceRoutingManager.shouldRedirectNavigation(
        uri.spec,
        currentWorkspaceId,
        win
-      );
-    if (!targetWorkspaceId) {
+      )
+    ) {
      return;
    }

-    // A brand-new tab whose very first real navigation this is (a
-    // target="_blank" link, window.open(), or a freshly opened tab) is still
-    // showing its initial about:blank document. There is nothing to preserve,
-    // so rather than cancelling the load and spawning a duplicate tab - which
-    // would leave this one behind empty - just move this very tab into the
-    // destination space and let the in-flight load finish in place.
-    const isInitialDocument =
-      aBrowser.browsingContext?.currentWindowGlobal?.isInitialDocument ?? false;
-    if (isInitialDocument) {
-      const wasSelected = tab.selected;
-      // Defer so we don't mutate the tab strip from inside a progress notification.
-      win.setTimeout(() => {
-        if (!tab.isConnected) {
-          return;
-        }
-        gBrowser.selectedTab = tab.owner;
-        win.gZenWorkspaces.moveTabToWorkspace(tab, targetWorkspaceId);
-        if (wasSelected) {
-          const targetWorkspace =
-            win.gZenWorkspaces.getWorkspaceFromId(targetWorkspaceId);
-          if (targetWorkspace) {
-            win.gZenWorkspaces.lastSelectedWorkspaceTabs[targetWorkspaceId] =
-              tab;
-            win.gZenWorkspaces.changeWorkspace(targetWorkspace);
-          }
-        }
-      }, 0);
-      return;
-    }
-
-    // An already-loaded page is navigating in place. Preserve it in its current
-    // tab and re-open the destination in a new routed tab instead.
-    //
    // Under Fission the parent-side aRequest is a RemoteWebProgress stand-in
    // whose cancel()/loadInfo throw NS_ERROR_NOT_IMPLEMENTED (the real channel
    // lives in the content process). Stop the in-place load through the browser,
@@ -137,14 +111,13 @@ export class ZenSpaceRoutingNavigation extends ZenUIComponent {

    // Defer so we don't mutate the tab strip from inside a progress notification.
    win.setTimeout(() => {
-      gBrowser.addTab(urlToOpen, {
+      const newTab = gBrowser.addTab(urlToOpen, {
        triggeringPrincipal: principal,
        ownerTab: tab.isConnected ? tab : null,
-        // The user was actively navigating this tab, so follow the navigation
-        // into the routed tab instead of opening it in the background (addTab
-        // defaults inBackground to true).
-        inBackground: false,
      });
+      if (newTab?.linkedBrowser) {
+        newTab.linkedBrowser._zenSkipNavRouteOnce = true;
+      }
    }, 0);
  }
 }
--- a/src/zen/common/zen-sets.js
+++ b/src/zen/common/zen-sets.js
@@ -78,9 +78,6 @@ document.addEventListener(
          case "cmd_zenReplacePinnedUrlWithCurrent":
            gZenPinnedTabManager.replacePinnedUrlWithCurrent();
            break;
-          case "cmd_zenEditPinnedUrl":
-            gZenPinnedTabManager.editPinnedUrl();
-            break;
          case "cmd_contextZenAddToEssentials":
            gZenPinnedTabManager.addToEssentials();
            break;
--- a/src/zen/sessionstore/ZenWindowSync.sys.mjs
+++ b/src/zen/sessionstore/ZenWindowSync.sys.mjs
@@ -1232,38 +1232,19 @@ class nsZenWindowSync {
      activeIndex = Math.min(activeIndex, entries.length - 1);
      activeIndex = Math.max(activeIndex, 0);
      let entryToUse = (entries[activeIndex] || entries[0]) ?? null;
-      this.#setPinnedInitialState(
-        aTab,
-        { url: entryToUse?.url, title: entryToUse?.title },
-        image
-      );
-    });
-  }
-
-  /**
-   * Sets the canonical pinned URL for a tab across all windows. Used to let the
-   * user edit a pinned tab's URL directly.
-   *
-   * @param {object} aTab - The tab to set the pinned URL for.
-   * @param {string} aUrl - The URL to store as the canonical pinned URL.
-   * @param {string} [aImage] - Optional Icon to store.
-   */
-  setPinnedUrl(aTab, aUrl, aImage) {
-    this.log(`Setting pinned url for tab ${aTab.id}`);
-    this.#setPinnedInitialState(
-      aTab,
-      { url: aUrl, title: aTab.zenStaticLabel },
-      aImage
-    );
-  }
-
-  #setPinnedInitialState(aTab, aEntry, aImage) {
-    const initialState = { entry: aEntry, image: aImage };
-    this.#runOnAllWindows(null, win => {
-      const targetTab = this.getItemFromWindow(win, aTab.id);
-      if (targetTab) {
-        targetTab._zenPinnedInitialState = initialState;
-      }
+      const initialState = {
+        entry: {
+          url: entryToUse?.url,
+          title: entryToUse?.title,
+        },
+        image,
+      };
+      this.#runOnAllWindows(null, win => {
+        const targetTab = this.getItemFromWindow(win, aTab.id);
+        if (targetTab) {
+          targetTab._zenPinnedInitialState = initialState;
+        }
+      });
    });
  }

--- a/src/zen/space-routing/SpaceRoutingComponents.manifest
+++ b/src/zen/space-routing/SpaceRoutingComponents.manifest
@@ -1,5 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-category browser-window-delayed-startup resource:///modules/zen/spacerouting/ZenSpaceRoutingManager.sys.mjs gZenSpaceRoutingManager.onDelayedBrowserStartup
--- a/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
+++ b/src/zen/space-routing/ZenSpaceRoutingManager.sys.mjs
@@ -3,6 +3,16 @@
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

 import { JSONFile } from "resource://gre/modules/JSONFile.sys.mjs";
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+
+const lazy = {};
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "shouldForceContainerTabsToWorkspace",
+  "zen.workspaces.force-container-workspace",
+  false
+);

 class nsZenSpaceRoutingManager {
  #file = null;
@@ -18,58 +28,6 @@ class nsZenSpaceRoutingManager {
    this.#readFromDisk();
  }

-  /**
-   * Auto invoked for every window on delayed startup
-   *
-   * @param {nsIDOMWindow} window - The browser window that just started up
-   */
-  onDelayedBrowserStartup(window) {
-    const element = window.MozXULElement.parseXULToFragment(`
-        <menuseparator/>
-        <menuitem id="context_zen-add-domain-to-routing"
-                  data-lazy-l10n-id="tab-context-zen-add-domain-to-sr"
-                  data-l10n-args='{"tabCount": 1}'/>
-      `);
-    window.document.getElementById("context_undoCloseTab").after(element);
-
-    window.document
-      .getElementById("context_zen-add-domain-to-routing")
-      .addEventListener("command", this.#onAddSelectedToRouting.bind(this));
-    window.document
-      .getElementById("tabContextMenu")
-      .addEventListener(
-        "popupshowing",
-        this.#updateTabCloseCountState.bind(this)
-      );
-  }
-
-  /**
-   * Updates the "context_zen-add-domain-to-routing" command
-   * to reflect the number of selected tabs, when applicable.
-   *
-   * @param {Event} event - The event param
-   */
-  #updateTabCloseCountState(event) {
-    const window = event.target.documentGlobal;
-    window.document.l10n.setArgs(
-      window.document.getElementById("context_zen-add-domain-to-routing"),
-      { tabCount: window.gBrowser.selectedTabs.length }
-    );
-  }
-
-  /**
-   * Callback for whenever the menuitem command is ran
-   *
-   * @param {Event} event - The event parameter
-   */
-  #onAddSelectedToRouting(event) {
-    const window = event.target.documentGlobal;
-    const tabs = window.TabContextMenu.contextTab.multiselected
-      ? window.gBrowser.selectedTabs
-      : [window.TabContextMenu.contextTab];
-    this.addRouteForSelected(tabs, window);
-  }
-
  /**
   * Callback that will be executed from tabbrowser.js
   * This method can be used to stop the tab from being created.
@@ -104,7 +62,7 @@ class nsZenSpaceRoutingManager {
        break;
      default: {
        const targetWorkspace =
-          win.gZenWorkspaces.getWorkspaceFromId(targetRoute);
+          win?.gZenWorkspaces?.getWorkspaceFromId(targetRoute);

        if (targetWorkspace) {
          userContextId = targetWorkspace.containerTabId;
@@ -114,6 +72,37 @@ class nsZenSpaceRoutingManager {
      }
    }

+    if (!isRouteFound) {
+      let tabSpaceId = options.zenWorkspaceId;
+      let spaceManager = win.gZenWorkspaces;
+      if (lazy.shouldForceContainerTabsToWorkspace) {
+        // In case its undefined, to make it into an integer.
+        const tabContainerId = options.userContextId || 0;
+        const currentSpace = spaceManager.getActiveWorkspaceFromCache();
+          console.log("[ZenSpaceRouting] Tab is opening with userContextId", tabContainerId, "and active space has containerTabId", currentSpace.containerTabId);
+        if (tabContainerId !== currentSpace.containerTabId) {
+          const targetWorkspace = spaceManager.getWorkspaces().find(
+            workspace => workspace.containerTabId === tabContainerId
+          );
+          if (targetWorkspace) {
+            tabSpaceId = targetWorkspace.uuid;
+          }
+        }
+      }
+      // Add support for zen.workspaces.force-container-workspace in SR,
+      // instead of using the old implementation. Lets create a temporary route
+      // for this tab, so that it will be routed to the correct space.
+      if (tabSpaceId && tabSpaceId !== spaceManager.activeWorkspace) {
+        const targetWorkspace = spaceManager.getWorkspaceFromId(tabSpaceId);
+        if (targetWorkspace) {
+          userContextId = targetWorkspace.containerTabId;
+          isRouteFound = true;
+          targetWorkspaceName = targetWorkspace.name;
+          targetRoute = tabSpaceId;
+        }
+      }
+    }
+
    return {
      shouldEarlyExit: false,
      userContextId,
@@ -159,26 +148,8 @@ class nsZenSpaceRoutingManager {
   * @returns {boolean} True when the navigation should open in a new routed tab
   */
  shouldRedirectNavigation(uriString, currentWorkspaceId, win) {
-    return !!this.getRedirectTargetWorkspaceId(
-      uriString,
-      currentWorkspaceId,
-      win
-    );
-  }
-
-  /**
-   * Resolves the destination space for an in-place top-level navigation, or
-   * null when the navigation should be left alone (no rule, the destination is
-   * "most-recent-space", the tab already lives there, or the space is gone).
-   *
-   * @param {string} uriString - The destination URI
-   * @param {string|null} currentWorkspaceId - The zen-workspace-id of the navigating tab
-   * @param {Window} win - The owning browser window
-   * @returns {string|null} The target workspace id, or null to leave the navigation in place
-   */
-  getRedirectTargetWorkspaceId(uriString, currentWorkspaceId, win) {
    if (!win?.gZenWorkspaces?.workspaceEnabled) {
-      return null;
+      return false;
    }

    const targetRoute = this.routeUri(uriString, { fromExternal: false });
@@ -188,13 +159,11 @@ class nsZenSpaceRoutingManager {
      targetRoute === "most-recent-space" ||
      targetRoute === currentWorkspaceId
    ) {
-      return null;
+      return false;
    }

    // Only redirect when the destination space actually exists.
-    return win.gZenWorkspaces.getWorkspaceFromId(targetRoute)
-      ? targetRoute
-      : null;
+    return !!win.gZenWorkspaces.getWorkspaceFromId(targetRoute);
  }

  /**
@@ -239,8 +208,8 @@ class nsZenSpaceRoutingManager {
          break;

        default: {
-          const workspaces = win?.gZenWorkspaces;
-          const targetWorkspace = workspaces?.getWorkspaceFromId?.(targetRoute);
+          const workspaces = win.gZenWorkspaces;
+          const targetWorkspace = workspaces.getWorkspaceFromId(targetRoute);

          if (targetWorkspace) {
            workspaces.moveTabToWorkspace(newTab, targetWorkspace.uuid);
@@ -475,37 +444,6 @@ class nsZenSpaceRoutingManager {
    this.#file.data.defaultRouteExternal = routeType;
  }

-  /**
-   * Adds a new route for all given tabs
-   *
-   * @param {Array<object>} selectedTabs - The tabs that should be routed
-   * @param {Window} parentWindow - The window from which this is being executed
-   */
-  addRouteForSelected(selectedTabs, parentWindow) {
-    const newRoute = this.createNewRoute();
-    let routeReference = "";
-
-    if (selectedTabs.length == 1) {
-      newRoute.matchType = "contains";
-      routeReference = selectedTabs[0].linkedBrowser.currentURI.host;
-    } else {
-      newRoute.matchType = "regex";
-      routeReference = "(";
-      for (let i = 0; i < selectedTabs.length; i++) {
-        const domain = selectedTabs[i].linkedBrowser.currentURI.host;
-        routeReference += domain.replaceAll(".", "\.");
-        if (i != selectedTabs.length - 1) {
-          routeReference += "|";
-        }
-      }
-      routeReference += ")";
-    }
-
-    newRoute.reference = routeReference;
-    this.updateRoute(newRoute);
-    this.openSpaceRoutingDialog(parentWindow);
-  }
-
  /**
   * Saves all routes. The list of
   * routes is stripped of empty routes
--- a/src/zen/spaces/ZenSpaceManager.mjs
+++ b/src/zen/spaces/ZenSpaceManager.mjs
@@ -106,12 +106,6 @@ class nsZenWorkspaces {
      "zen.workspaces.wrap-around-navigation",
      true
    );
-    XPCOMUtils.defineLazyPreferenceGetter(
-      this,
-      "shouldForceContainerTabsToWorkspace",
-      "zen.workspaces.force-container-workspace",
-      true
-    );
    XPCOMUtils.defineLazyPreferenceGetter(
      this,
      "shouldOpenNewTabIfLastUnpinnedTabIsClosed",
@@ -788,11 +782,6 @@ class nsZenWorkspaces {
      window.addEventListener("TabUnpinned", tabUpdateListener);
      window.addEventListener("aftercustomization", tabUpdateListener);
      window.addEventListener("TabSelect", this.onLocationChange.bind(this));
-      window.addEventListener(
-        "TabBrowserInserted",
-        this.onTabBrowserInserted.bind(this)
-      );
-
      this.updateWorkspacesChangeContextMenu();
    })();
  }
@@ -1506,15 +1495,15 @@ class nsZenWorkspaces {
        continue;
      }

-      if (container) {
-        const newtabPlacement = Services.prefs.getBoolPref(
-          "zen.view.show-newtab-button-top",
-          false
-        );
-        const insertElement = newtabPlacement
-          ? container.firstChild
-          : container.lastChild;
+      const newtabPlacement = Services.prefs.getBoolPref(
+        "zen.view.show-newtab-button-top",
+        false
+      );
+      const insertElement = newtabPlacement
+        ? container.firstChild
+        : container.lastChild;

+      if (container) {
        if (tab.group?.hasAttribute("split-view-group")) {
          gBrowser.zenHandleTabMove(tab.group, () => {
            for (const subTab of tab.group.tabs) {
@@ -2298,12 +2287,12 @@ class nsZenWorkspaces {
  }

  onBeforeTabSelect(aTab) {
-    if (this.#inChangingWorkspace || !aTab) {
+    if (this.#inChangingWorkspace) {
      // Just in case, Let's not do these checks while we are
      // in the middle of changing workspace,
      return false;
    }
-    const tabSpace = aTab.getAttribute("zen-workspace-id");
+    const tabSpace = aTab?.getAttribute("zen-workspace-id");
    if (
      tabSpace &&
      tabSpace !== this.activeWorkspace &&
@@ -2794,44 +2783,6 @@ class nsZenWorkspaces {
    }
  }

-  async onTabBrowserInserted(event) {
-    let tab = event.originalTarget;
-    const isEssential = tab.getAttribute("zen-essential") === "true";
-    const workspaceID = tab.getAttribute("zen-workspace-id");
-
-    if (!this.workspaceEnabled || isEssential) {
-      return;
-    }
-
-    if (workspaceID) {
-      if (
-        tab.hasAttribute("change-workspace") &&
-        this.moveTabToWorkspace(tab, workspaceID)
-      ) {
-        this.lastSelectedWorkspaceTabs[workspaceID] =
-          gZenGlanceManager.getTabOrGlanceParent(tab);
-        tab.removeAttribute("change-workspace");
-        const workspace = this.getWorkspaceFromId(workspaceID);
-        setTimeout(() => {
-          this.changeWorkspace(workspace);
-        }, 0);
-      }
-      return;
-    }
-
-    let activeWorkspace = this.getActiveWorkspace();
-    if (!activeWorkspace) {
-      return;
-    }
-    if (tab.hasAttribute("zen-workspace-id")) {
-      const tabWorkspaceId = tab.getAttribute("zen-workspace-id");
-      this.moveTabToWorkspace(tab, tabWorkspaceId);
-      await this.changeWorkspaceWithID(tabWorkspaceId);
-    } else {
-      tab.setAttribute("zen-workspace-id", activeWorkspace.uuid);
-    }
-  }
-
  #changeToEmptyTab() {
    const isEmpty = gBrowser.selectedTab.hasAttribute("zen-empty-tab");
    gZenCompactModeManager.sidebar.toggleAttribute(
@@ -3017,7 +2968,7 @@ class nsZenWorkspaces {

  getContextIdIfNeeded(userContextId, fromExternal, triggeringPrincipal) {
    if (!this.workspaceEnabled) {
-      return [userContextId, false, undefined];
+      return [userContextId, false];
    }

    if (
@@ -3025,27 +2976,7 @@ class nsZenWorkspaces {
      triggeringPrincipal.isAddonOrExpandedAddonPrincipal &&
      typeof userContextId === "undefined"
    ) {
-      return [userContextId, false, undefined];
-    }
-
-    if (
-      this.shouldForceContainerTabsToWorkspace &&
-      typeof userContextId !== "undefined" &&
-      this._workspaceCache &&
-      !fromExternal
-    ) {
-      // Find all workspaces that match the given userContextId
-      const matchingWorkspaces = this._workspaceCache.filter(
-        workspace => workspace.containerTabId === userContextId
-      );
-
-      // Check if exactly one workspace matches
-      if (matchingWorkspaces.length === 1) {
-        const workspace = matchingWorkspaces[0];
-        if (workspace.uuid !== this.getActiveWorkspaceFromCache().uuid) {
-          return [userContextId, true, workspace.uuid];
-        }
-      }
+      return [userContextId, false];
    }

    const activeWorkspace = this.getActiveWorkspaceFromCache();
@@ -3056,9 +2987,9 @@ class nsZenWorkspaces {
      typeof userContextId !== "undefined" &&
      userContextId !== activeWorkspaceUserContextId
    ) {
-      return [userContextId, false, undefined];
+      return [userContextId, false];
    }
-    return [activeWorkspaceUserContextId, true, undefined];
+    return [activeWorkspaceUserContextId, true];
  }

  getTabsToExclude(aTab) {
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -1240,17 +1240,13 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
   */
  contextSplitTabs(otherTabHint = null) {
    let tabs;
-    let currentTab = gZenGlanceManager.getTabOrGlanceParent(
-      TabContextMenu.contextTab || gBrowser.selectedTab
-    );
+    let currentTab = TabContextMenu.contextTab || gBrowser.selectedTab;
    if (currentTab.multiselected) {
      tabs = gBrowser.selectedTabs;
    } else if (!currentTab.selected && !currentTab.splitView) {
      tabs = [
        currentTab,
-        ...gBrowser.selectedTabs.filter(
-          t => t !== currentTab && !t.hasAttribute("zen-glance-tab")
-        ),
+        ...gBrowser.selectedTabs.filter(t => t !== currentTab),
      ];
    } else {
      tabs = [currentTab];
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -246,66 +246,6 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
    gZenUIManager.showToast("zen-pinned-tab-replaced");
  }

-  async editPinnedUrl(tab = undefined) {
-    tab ??= TabContextMenu.contextTab;
-    if (!tab || !tab.pinned) {
-      return;
-    }
-
-    const initialUrl =
-      tab._zenPinnedInitialState?.entry?.url ||
-      tab.linkedBrowser?.currentURI?.spec;
-    const [title, label] = await document.l10n.formatValues([
-      { id: "zen-pinned-tab-edit-url-title" },
-      { id: "zen-pinned-tab-edit-url-label" },
-    ]);
-    const result = { value: initialUrl ?? "" };
-    const confirmed = Services.prompt.prompt(
-      window,
-      title,
-      label,
-      result,
-      null,
-      { value: false }
-    );
-    if (!confirmed) {
-      return;
-    }
-
-    let uri;
-    try {
-      uri = Services.uriFixup.getFixupURIInfo(
-        result.value.trim(),
-        Ci.nsIURIFixup.FIXUP_FLAG_FIX_SCHEME_TYPOS
-      ).preferredURI;
-    } catch (_) {}
-    if (!uri) {
-      gZenUIManager.showToast("zen-pinned-tab-url-invalid");
-      return;
-    }
-    const url = uri.spec;
-
-    // Skip when the value wasn't actually changed from what was prefilled.
-    if (!url || url === initialUrl) {
-      return;
-    }
-
-    const image = tab.zenStaticIcon || (await this.#getCachedFavicon(uri));
-    window.gZenWindowSync.setPinnedUrl(tab, url, image);
-    this.#resetTabToStoredState(tab);
-    gZenUIManager.showToast("zen-pinned-tab-url-edited");
-  }
-
-  async #getCachedFavicon(uri) {
-    try {
-      const favicon = await PlacesUtils.favicons.getFaviconForPage(uri);
-      return favicon?.dataURI?.spec;
-    } catch (ex) {
-      console.error("Failed to get favicon for edited pinned url:", ex);
-      return null;
-    }
-  }
-
  _initClosePinnedTabShortcut() {
    let cmdClose = document.getElementById("cmd_close");

@@ -605,20 +545,11 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
    }
    const elements = window.MozXULElement.parseXULToFragment(`
            <menuseparator id="context_zen-pinned-tab-separator" hidden="true"/>
-            <menu id="context_zen-edit-pinned-page"
-                  data-lazy-l10n-id="tab-context-zen-edit-pinned-page"
-                  data-l10n-args="{&quot;isEssential&quot;:&quot;&quot;}"
-                  hidden="true">
-              <menupopup>
-                <menuitem id="context_zen-replace-pinned-url-with-current"
-                          data-lazy-l10n-id="tab-context-zen-replace-pinned-url-with-current"
-                          data-l10n-args="{&quot;isEssential&quot;:&quot;&quot;}"
-                          command="cmd_zenReplacePinnedUrlWithCurrent"/>
-                <menuitem id="context_zen-edit-pinned-url"
-                          data-lazy-l10n-id="tab-context-zen-edit-pinned-url"
-                          command="cmd_zenEditPinnedUrl"/>
-              </menupopup>
-            </menu>
+            <menuitem id="context_zen-replace-pinned-url-with-current"
+                      data-lazy-l10n-id="tab-context-zen-replace-pinned-url-with-current"
+                      data-l10n-args="{&quot;isEssential&quot;:&quot;&quot;}"
+                      hidden="true"
+                      command="cmd_zenReplacePinnedUrlWithCurrent"/>
            <menuitem id="context_zen-reset-pinned-tab"
                      data-lazy-l10n-id="tab-context-zen-reset-pinned-tab"
                      data-l10n-args="{&quot;isEssential&quot;:&quot;&quot;}"
@@ -688,24 +619,15 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
    const zenResetPinnedTab = document.getElementById(
      "context_zen-reset-pinned-tab"
    );
-    const zenEditPinnedPage = document.getElementById(
-      "context_zen-edit-pinned-page"
-    );
    const zenReplacePinnedUrl = document.getElementById(
      "context_zen-replace-pinned-url-with-current"
    );
-    [zenResetPinnedTab, zenEditPinnedPage].forEach(element => {
+    [zenResetPinnedTab, zenReplacePinnedUrl].forEach(element => {
      if (element) {
        element.hidden = !isVisible;
+        document.l10n.setArgs(element, { isEssential });
      }
    });
-    [zenResetPinnedTab, zenEditPinnedPage, zenReplacePinnedUrl].forEach(
-      element => {
-        if (element) {
-          document.l10n.setArgs(element, { isEssential });
-        }
-      }
-    );
    zenAddEssential.hidden = isEssential || !!contextTab.group;
    document.l10n
      .formatValue("tab-context-zen-add-essential-badge", {
@@ -935,7 +857,7 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
    ) {
      return;
    }
-    // Remove # from the URL
+    // Remove # and ? from the URL
    const pinUrl = tab._zenPinnedInitialState.entry.url.split("#")[0];
    const currentUrl = location.split("#")[0];
    // Add an indicator that the pin has been changed
@@ -975,14 +897,10 @@ class nsZenPinnedTabManager extends nsZenDOMOperatedFeature {
    } else {
      tab.setAttribute("zen-pinned-changed", "true");
    }
-    if (tab._zenPinnedInitialState.image) {
-      tab.style.setProperty(
-        "--zen-original-tab-icon",
-        `url(${tab._zenPinnedInitialState.image})`
-      );
-    } else {
-      tab.style.removeProperty("--zen-original-tab-icon");
-    }
+    tab.style.setProperty(
+      "--zen-original-tab-icon",
+      `url(${tab._zenPinnedInitialState.image})`
+    );
  }

  removeTabContainersDragoverClass(hideIndicator = true) {
--- a/src/zen/tests/pinned/browser.toml
+++ b/src/zen/tests/pinned/browser.toml
@@ -13,8 +13,6 @@ prefs = ["zen.workspaces.separate-essentials=false"]

 ["browser_pinned_created.js"]

-["browser_pinned_edit_url.js"]
-
 ["browser_pinned_nounload_reset.js"]

 ["browser_pinned_reset_button.js"]
--- a/src/zen/tests/pinned/browser_pinned_edit_url.js
+++ b/src/zen/tests/pinned/browser_pinned_edit_url.js
@@ -1,384 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   https://creativecommons.org/publicdomain/zero/1.0/ */
-
-"use strict";
-
-async function pinTab(url) {
-  const tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url);
-  gBrowser.pinTab(tab);
-  await gBrowser.TabStateFlusher.flush(tab.linkedBrowser);
-  // eslint-disable-next-line mozilla/no-arbitrary-setTimeout
-  await new Promise(r => setTimeout(r, 500));
-  return tab;
-}
-
-// XPCOM service methods can't be stubbed in place (non-configurable), so we
-// swap the whole service object out for a mock and restore it afterwards.
-function mockPrompt(value) {
-  const original = Services.prompt;
-  Services.prompt = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
-    prompt(win, title, label, result) {
-      if (value === null) {
-        return false; // user cancelled
-      }
-      result.value = value;
-      return true;
-    },
-  };
-  return () => {
-    Services.prompt = original;
-  };
-}
-
-function mockFavicons(faviconSpec) {
-  const original = PlacesUtils.favicons;
-  const mock = {
-    callCount: 0,
-    defaultFavicon: { spec: "data:image/png;base64,DEFAULT" },
-    getFaviconForPage() {
-      mock.callCount++;
-      return Promise.resolve(
-        faviconSpec ? { dataURI: { spec: faviconSpec } } : null
-      );
-    },
-  };
-  PlacesUtils.favicons = mock;
-  return {
-    mock,
-    restore: () => {
-      PlacesUtils.favicons = original;
-    },
-  };
-}
-
-add_task(async function test_EditPinnedUrl_SurvivesRebuild() {
-  // Pinned tab at url1 (loaded), then select a different tab (unfocus it).
-  const tab = await pinTab("https://example.com/1");
-  const other = await BrowserTestUtils.openNewForegroundTab(
-    gBrowser,
-    "https://example.com/other"
-  );
-
-  const editedUrl = "https://example.com/edited";
-  const restorePrompt = mockPrompt(editedUrl);
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    // Close + re-open rebuilds the tab: the in-memory _zenPinnedInitialState is
-    // gone and gets reconstructed from the persisted session via
-    // setPinnedTabState (exactly what #onSessionStoreInitialized does).
-    delete tab._zenPinnedInitialState;
-    await window.gZenWindowSync.setPinnedTabState(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      editedUrl,
-      "After the tab is rebuilt, the pinned URL should still be the edited one"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(other);
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_ActiveTabNavigates() {
-  // Editing the active (focused) pinned tab applies the new URL immediately:
-  // the live tab navigates to it (matching Arc's behavior).
-  const tab = await pinTab("https://example.com/1");
-  Assert.equal(gBrowser.selectedTab, tab, "the pinned tab should be active");
-
-  const editedUrl = "https://example.com/edited";
-  const restorePrompt = mockPrompt(editedUrl);
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-    await BrowserTestUtils.waitForCondition(
-      () => tab.linkedBrowser.currentURI.spec === editedUrl,
-      "the active pinned tab to navigate to the edited URL"
-    );
-
-    Assert.equal(
-      tab.linkedBrowser.currentURI.spec,
-      editedUrl,
-      "Editing the active pinned tab should navigate it to the new URL"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(
-  async function test_EditPinnedUrl_FaviconLookupErrorLeavesImageEmpty() {
-    const tab = await pinTab("https://example.com/1");
-    const restorePrompt = mockPrompt("https://example.org/edited");
-    const favicons = mockFavicons(null);
-    // Simulate a Places DB failure so #getCachedFavicon hits its catch branch.
-    favicons.mock.getFaviconForPage = () =>
-      Promise.reject(new Error("simulated favicon DB failure"));
-
-    try {
-      await gZenPinnedTabManager.editPinnedUrl(tab);
-
-      Assert.equal(
-        tab._zenPinnedInitialState.entry.url,
-        "https://example.org/edited",
-        "The URL should still be updated when the favicon lookup fails"
-      );
-      ok(
-        !tab._zenPinnedInitialState.image,
-        "The image should be left empty (populated by the next navigation)"
-      );
-    } finally {
-      restorePrompt();
-      favicons.restore();
-      await BrowserTestUtils.removeTab(tab);
-    }
-  }
-);
-
-add_task(async function test_EditPinnedUrl_UpdatesUrlAndFavicon() {
-  const tab = await pinTab("https://example.com/1");
-  const faviconSpec = "data:image/png;base64,iVBORw0KGgo=";
-  const restorePrompt = mockPrompt("https://example.org/edited");
-  const favicons = mockFavicons(faviconSpec);
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      "https://example.org/edited",
-      "The pinned URL should be updated to the edited value"
-    );
-    Assert.equal(
-      tab._zenPinnedInitialState.image,
-      faviconSpec,
-      "The stored icon should be the cached favicon for the new URL"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_NoCachedFaviconLeavesImageEmpty() {
-  const tab = await pinTab("https://example.com/1");
-  const restorePrompt = mockPrompt("https://example.org/edited");
-  const favicons = mockFavicons(null); // no cached favicon for the new URL
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    ok(
-      !tab._zenPinnedInitialState.image,
-      "Without a cached favicon the image is left empty, not the default; the " +
-        "next navigation captures the real icon"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_ClearsStaleTitle() {
-  const tab = await pinTab("https://example.com/1");
-  const restorePrompt = mockPrompt("https://example.org/edited");
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    ok(
-      !tab._zenPinnedInitialState.entry.title,
-      "The previous title is cleared so the new page's title is used on load"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_KeepsCustomLabel() {
-  const tab = await pinTab("https://example.com/1");
-  tab.zenStaticLabel = "My Pinned Tab";
-  const restorePrompt = mockPrompt("https://example.org/edited");
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.title,
-      "My Pinned Tab",
-      "An explicit custom label is preserved across a URL edit"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    delete tab.zenStaticLabel;
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_KeepsCustomIcon() {
-  const tab = await pinTab("https://example.com/1");
-  const customIcon = "data:image/svg+xml,custom-icon";
-  tab.zenStaticIcon = customIcon;
-  const restorePrompt = mockPrompt("https://example.org/edited");
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      "https://example.org/edited",
-      "The pinned URL should still be updated when a custom icon is set"
-    );
-    Assert.equal(
-      tab._zenPinnedInitialState.image,
-      customIcon,
-      "A user-set custom icon should be preserved, not overridden by a favicon"
-    );
-    Assert.equal(
-      favicons.mock.callCount,
-      0,
-      "Favicon lookup should be skipped when a custom icon is set"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    delete tab.zenStaticIcon;
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_InvalidUrlKeepsState() {
-  const tab = await pinTab("https://example.com/1");
-  const originalUrl = tab._zenPinnedInitialState.entry.url;
-  const restorePrompt = mockPrompt("   "); // whitespace only -> not a valid URL
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      originalUrl,
-      "The pinned URL should be unchanged for invalid input"
-    );
-    ok(
-      !tab.hasAttribute("zen-pinned-changed"),
-      "The tab should not be marked as changed for invalid input"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_CancelKeepsState() {
-  const tab = await pinTab("https://example.com/1");
-  const originalUrl = tab._zenPinnedInitialState.entry.url;
-  const restorePrompt = mockPrompt(null); // user cancels the dialog
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      originalUrl,
-      "The pinned URL should be unchanged when the dialog is cancelled"
-    );
-  } finally {
-    restorePrompt();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_FixesSchemeTypo() {
-  const tab = await pinTab("https://example.com/1");
-  const restorePrompt = mockPrompt("htps://example.org/typo");
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      tab._zenPinnedInitialState.entry.url,
-      "https://example.org/typo",
-      "A mistyped scheme (htps://) should be auto-fixed to https://"
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_AddsMissingScheme() {
-  const tab = await pinTab("https://example.com/1");
-  const restorePrompt = mockPrompt("example.org/no-scheme");
-  const favicons = mockFavicons("data:image/png;base64,iVBORw0KGgo=");
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    const stored = tab._zenPinnedInitialState.entry.url;
-    ok(
-      /^https?:\/\//.test(stored),
-      `A scheme should be prepended when omitted (got "${stored}")`
-    );
-    ok(
-      stored.endsWith("example.org/no-scheme"),
-      `Host and path should be preserved (got "${stored}")`
-    );
-  } finally {
-    restorePrompt();
-    favicons.restore();
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
-
-add_task(async function test_EditPinnedUrl_PrefillsWithStoredUrl() {
-  const tab = await pinTab("https://example.com/1");
-  // The stored pinned URL differs from the live browser URL (e.g. it was pinned
-  // as http but the server redirected the tab to https).
-  tab._zenPinnedInitialState = {
-    entry: { url: "http://example.com/pinned" },
-    image: "",
-  };
-
-  let prefilled;
-  const originalPrompt = Services.prompt;
-  Services.prompt = {
-    QueryInterface: ChromeUtils.generateQI([Ci.nsIPromptService]),
-    prompt(win, title, label, result) {
-      prefilled = result.value;
-      return false; // cancel, we only care about the prefilled value
-    },
-  };
-
-  try {
-    await gZenPinnedTabManager.editPinnedUrl(tab);
-
-    Assert.equal(
-      prefilled,
-      "http://example.com/pinned",
-      "The edit dialog should prefill with the stored pinned URL, not the live browser URL"
-    );
-  } finally {
-    Services.prompt = originalPrompt;
-    await BrowserTestUtils.removeTab(tab);
-  }
-});
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
  "binaryName": "zen",
  "version": {
    "product": "firefox",
-    "version": "152.0.3",
-    "candidate": "152.0.3",
+    "version": "152.0.1",
+    "candidate": "152.0.1",
    "candidateBuild": 1
  },
  "buildOptions": {
@@ -20,7 +20,7 @@
      "brandShortName": "Zen",
      "brandFullName": "Zen Browser",
      "release": {
-        "displayVersion": "1.21.4b",
+        "displayVersion": "1.21.3b",
        "github": {
          "repo": "zen-browser/desktop"
        },