gh-14843: Prevent quick audio tracks from creating a new controller (gh-14871)

Co-authored-by: mr. m <91018726+mr-cheffy@users.noreply.github.com>

.github/workflows/build.yml

@@ -500,10 +500,24 @@ jobs:
           path: updates-server
           token: ${{ secrets.DEPLOY_KEY }}
 
-      - name: Download object files
+      - name: Download signed windows objects
         if: ${{ inputs.update_branch == 'release' }}
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
         run: |
-          git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object --depth 1
+          mkdir -p .github/workflows/object
+          gh release download "windows-signed-${{ github.run_id }}" \
+            --repo zen-browser/windows-binaries \
+            --pattern 'windows-x64-signed-*.tar.gz' \
+            --dir .github/workflows/object
+
+          for arch in x86_64 arm64; do
+            archive=".github/workflows/object/windows-x64-signed-$arch.tar.gz"
+            dest=".github/workflows/object/windows-x64-signed-$arch"
+            echo "Expanding $archive"
+            mkdir -p "$dest"
+            tar -xvf "$archive" -C "$dest"
+          done
 
       - name: Sign MAR files
         env:
@@ -616,6 +630,17 @@ jobs:
             ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
             ./zen.macos-universal.dmg/*
 
+      - name: Clean up signed windows staging release
+        if: ${{ inputs.update_branch == 'release' }}
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+        run: |
+          # The per-run staging prerelease on windows-binaries has served its purpose
+          # now that the signed bundles are published in the real release. Never fail
+          # the release over this cleanup.
+          gh release delete "windows-signed-${{ github.run_id }}" \
+            --repo zen-browser/windows-binaries --cleanup-tag --yes || true
+
   prepare-flatpak:
     if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
     permissions: write-all

.github/workflows/windows-profile-build.yml

@@ -61,7 +61,6 @@ jobs:
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd C:\artifact
-          ls
           Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
           ls
 

.github/workflows/windows-release-build.yml

@@ -260,8 +260,8 @@ jobs:
           export ZEN_CROSS_COMPILING=1
           export ZEN_RELEASE=1
           npm run package
-          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls ./dist
+          mv ./dist/zen-$(npm run --silent surfer -- get version | xargs).en-US.win64${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.zip zen.win64.zip
           ls .
 
       - name: Move package for PGO upload

.rust-toolchain

@@ -1 +1 @@
-1.90
+1.94.1

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.4`! 🚀
-- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 152.0.4`!
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `153.0.3`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 153.0.3`!
 
 ### Contributing
 

build/firefox-cache/l10n-last-commit-hash

@@ -1 +1 @@
-3985a970489e32fc751e1b80abf4d5534c905e45
+8a0a534248f80d8c53a8997f24683521c3a50ebc

build/windows/sign.ps1

@@ -170,14 +170,16 @@ function SignAndPackage($name) {
     echo "Packaging $name"
     npm run package -- --verbose
 
-    # In the release script, we do the following:
+    # We assemble the signed bundle as a plain folder here (with no top-level
+    # directory inside it) and compress it into windows-x64-signed-$name.tar.gz
+    # at the end of the script, once every .exe has been signed. The release
+    # workflow expands it back with:
     #  tar -xvf .github/workflows/object/windows-x64-signed-x86_64.tar.gz -C windows-x64-signed-x86_64
-    # We need to create a tar with the same structure and no top-level directory
-    # Inside, we need:
+    # Inside the bundle we need:
     #  - update_manifest/*
     #  - windows.mar
     #  - zen.installer.exe
-    echo "Creating tar for $name"
+    echo "Preparing signed bundle for $name"
     rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
     mkdir windsign-temp\windows-x64-signed-$name
 
@@ -200,9 +202,8 @@ function SignAndPackage($name) {
     # Move the manifest
     mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
 
-    # note: We need to sign it into a parent folder, called windows-x64-signed-$name
-    rmdir .\windsign-temp\windows-binaries\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
-    mv windsign-temp\windows-x64-signed-$name .\windsign-temp\windows-binaries -Force
+    # The signed bundle stays in windsign-temp\windows-x64-signed-$name; it is
+    # compressed and uploaded to the staging release once every .exe is signed.
     rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
 
     echo "Finished $name"
@@ -211,16 +212,42 @@ function SignAndPackage($name) {
 SignAndPackage arm64
 SignAndPackage x86_64
 
-$files = Get-ChildItem .\windsign-temp\windows-binaries -Recurse -Include *.exe
+$files = Get-ChildItem .\windsign-temp\windows-x64-signed-x86_64, .\windsign-temp\windows-x64-signed-arm64 -Recurse -Include *.exe
 signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
 
-echo "All artifacts signed and packaged, ready for release!"
-echo "Commiting the changes to the repository"
-cd windsign-temp\windows-binaries
-git add .
-git commit -m "Sign and package windows artifacts"
-git push
-cd ..\..
+# Compress each signed bundle into a single gzip tarball (`-C <dir> .` so it has
+# no top-level directory) and upload it as a release asset on the windows-binaries
+# repo, keyed to this build's run id. Release assets keep the bundles out of git
+# (they were too large to commit) while still living in the windows-binaries repo.
+# The gated release job downloads and expands these from that repo's releases.
+$binariesRepo = "zen-browser/windows-binaries"
+$stagingTag = "windows-signed-$GithubRunId"
+echo "Ensuring staging release $stagingTag exists on $binariesRepo"
+gh release view $stagingTag --repo $binariesRepo *> $null
+if ($LASTEXITCODE -ne 0) {
+    gh release create $stagingTag --repo $binariesRepo --prerelease --title "Windows signed bundles ($GithubRunId)" --notes "Signed Windows bundles for run $GithubRunId, consumed by the release workflow. Safe to delete."
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to create staging release $stagingTag on $binariesRepo"
+    }
+}
+
+foreach ($name in @("x86_64", "arm64")) {
+    $signedDir = ".\windsign-temp\windows-x64-signed-$name"
+    $archive = ".\windsign-temp\windows-x64-signed-$name.tar.gz"
+    echo "Creating compressed tar for $name"
+    Remove-Item $archive -ErrorAction SilentlyContinue
+    tar -czvf $archive -C $signedDir .
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to create tar archive for $name"
+    }
+    echo "Uploading $archive to $binariesRepo release $stagingTag"
+    gh release upload $stagingTag $archive --repo $binariesRepo --clobber
+    if ($LASTEXITCODE -ne 0) {
+        throw "Failed to upload $archive to release $stagingTag"
+    }
+}
+
+echo "All artifacts signed, packaged, and uploaded to $binariesRepo release $stagingTag!"
 
 # Cleaning up
 

configs/windows/mozconfig

@@ -10,7 +10,6 @@ if test "$ZEN_CROSS_COMPILING"; then
   export WINEDEBUG=-all
 
   export MOZ_STUB_INSTALLER=1
-  export MOZ_PKG_FORMAT=TAR
 
   export CROSS_BUILD=1
   CROSS_COMPILE=1

crowdin.yml

@@ -24,3 +24,5 @@ files:
     translation: browser/browser/zen-boosts.ftl
   - source: en-US/browser/browser/zen-space-routing.ftl
     translation: browser/browser/zen-space-routing.ftl
+  - source: en-US/browser/browser/zen-command-palette.ftl
+    translation: browser/browser/zen-command-palette.ftl

locales/en-US/browser/browser/preferences/zen-preferences.ftl

@@ -283,7 +283,8 @@ zen-page-info-shortcut = View Page Info
 zen-find-shortcut = Find on Page
 zen-search-find-again-shortcut = Find Again
 zen-search-find-again-shortcut-prev = Find Previous
-zen-search-find-again-shortcut-2 = Find Again (Alt)
+zen-search-find-again-shortcut-alt = Find Again (Alt)
+zen-search-find-again-shortcut-prev-alt = Find Previous (Alt)
 zen-bookmark-this-page-shortcut = Bookmark This Page
 zen-bookmark-show-library-shortcut = Show Bookmarks Library
 zen-key-stop = Stop Loading

locales/en-US/browser/browser/zen-command-palette.ftl

@@ -0,0 +1,36 @@
+# 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/.
+
+zen-action-toggle-compact-mode = Toggle Compact Mode
+zen-action-open-theme-picker = Open Theme Picker
+zen-action-new-split-view = New Split View
+zen-action-new-folder = New Folder
+zen-action-copy-current-url = Copy Current URL
+zen-action-settings = Settings
+zen-action-open-private-window = Open Private Window
+zen-action-open-new-window = Open New Window
+zen-action-new-blank-window = New Blank Window
+zen-action-pin-tab = Pin Tab
+zen-action-unpin-tab = Unpin Tab
+zen-action-open-space-routing = Open Space Routing
+zen-action-new-boost = New Boost
+zen-action-next-space = Next Space
+zen-action-previous-space = Previous Space
+zen-action-close-tab = Close Tab
+zen-action-reload-tab = Reload Tab
+zen-action-reload-tab-without-cache = Reload Tab Without Cache
+zen-action-next-tab = Next Tab
+zen-action-previous-tab = Previous Tab
+zen-action-capture-screenshot = Capture Screenshot
+zen-action-toggle-tabs-on-right = Toggle Tabs on right
+zen-action-add-to-essentials = Add to Essentials
+zen-action-remove-from-essentials = Remove from Essentials
+zen-action-find-in-page = Find in Page
+zen-action-manage-extensions = Manage Extensions
+zen-action-switch-to-automatic-appearance = Switch to Automatic Appearance
+zen-action-switch-to-light-mode = Switch to Light Mode
+zen-action-switch-to-dark-mode = Switch to Dark Mode
+zen-action-print = Print
+zen-action-focus-on = Focus on
+zen-action-extension = Extension

locales/en-US/browser/browser/zen-general.ftl

@@ -87,6 +87,8 @@ zen-icons-picker-emoji =
   .label = Emojis
 zen-icons-picker-svg =
   .label = Icons
+zen-emojis-picker-search =
+  .placeholder = Search emojis
 
 urlbar-search-mode-zen_actions = Actions
 zen-site-data-settings = Settings
@@ -149,6 +151,9 @@ zen-sidebar-notification-updated-heading = Update Complete!
 zen-sidebar-notification-updated-label = What's new in { -brand-short-name }
 zen-sidebar-notification-updated-tooltip =
     .title = View Release Notes
+zen-sidebar-notification-donate-label = Support { -brand-short-name }
+zen-sidebar-notification-donate-tooltip =
+    .title = Donate to the project
 zen-sidebar-notification-restart-safe-mode-label = Something broke?
 zen-sidebar-notification-restart-safe-mode-tooltip =
     .title = Restart in Safe Mode

locales/en-US/browser/browser/zen-live-folders.ftl

@@ -20,6 +20,9 @@ zen-live-folder-github-option-assigned-self =
 zen-live-folder-github-option-review-requested =
     .label = Review Requests
 
+zen-live-folder-github-option-include-drafts =
+    .label = Include Draft Pull Requests
+
 zen-live-folder-type-rss =
     .label = RSS Feed
 

locales/en-US/browser/browser/zen-workspaces.ftl

@@ -82,6 +82,7 @@ zen-workspace-creation-profile = Profile
     .tooltiptext = Profiles are used to separate cookies and site data between spaces.
 zen-workspace-creation-header = Create a Space
 zen-workspace-creation-label = Spaces are used to organize your tabs and sessions.
+zen-workspace-default-profile = Default
 
 zen-workspaces-delete-workspace-title = Delete Space?
 zen-workspaces-delete-workspace-body = Are you sure you want to delete { $name }? This action cannot be undone.

prefs/zen/compact-mode.yaml

@@ -20,6 +20,14 @@
 - name: zen.view.compact.sidebar-keep-hover.duration
   value: 150
 
+# How far (in CSS pixels) the mouse may travel past the window bounds after
+# leaving the window before the hovered sidebar/toolbar is collapsed
+- name: zen.view.compact.outside-window-edge-offset.horizontal
+  value: 200
+
+- name: zen.view.compact.outside-window-edge-offset.vertical
+  value: 100
+
 - name: zen.view.compact.animate-sidebar
   value: true
 

prefs/zen/sync.yaml

@@ -0,0 +1,12 @@
+# 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/.
+
+- name: services.sync.engine.spaces
+  value: true
+  condition: "@IS_TWILIGHT@"
+
+- name: services.sync.engine.spaces
+  value: false
+  locked: true
+  condition: "!@IS_TWILIGHT@"

prefs/zen/view.yaml

@@ -46,6 +46,12 @@
 - name: zen.view.context-menu.refresh
   value: "@IS_TWILIGHT@"
 
+- name: zen.view.drag-window-from-content
+  value: true
+
+- name: zen.view.drag-window-from-content.height-percentage
+  value: 5
+
 - name: zen.view.borderless-fullscreen
   value: true
 

prefs/zen/workspaces.yaml

@@ -32,9 +32,6 @@
 - name: zen.workspaces.scroll-modifier-key
   value: ctrl
 
-- name: services.sync.engine.workspaces
-  value: false
-
 - name: zen.workspaces.separate-essentials
   value: true
 

src/-stylelintrc-js.patch

@@ -1,5 +1,5 @@
 diff --git a/.stylelintrc.js b/.stylelintrc.js
-index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb72433976b2c 100644
+index b484bf6600a7e1b8ad2aed8c8b7fe5e84cc3d023..f89712e2c13dfa0bcb48e55cd3872c67f5c98dad 100644
 --- a/.stylelintrc.js
 +++ b/.stylelintrc.js
 @@ -67,7 +67,7 @@ module.exports = {
@@ -11,9 +11,9 @@ index 3c9fecf731126fdbf900d1bdcd3635dd31ed53ef..c3a210b8153e9699c6cbdc0d568bb724
        {
          ignore: ["blockless-at-rules"],
        },
-@@ -274,7 +274,7 @@ module.exports = {
-     // Remove this line setting `csscontrols/use-logical` to null after implementing fixes
-     "csstools/use-logical": null,
+@@ -280,7 +280,7 @@ module.exports = {
+     "media-query-no-invalid": null,
+     "stylelint-plugin-mozilla/media-query-no-invalid": true,
      "stylelint-plugin-mozilla/no-base-design-tokens": true,
 -    "stylelint-plugin-mozilla/use-design-tokens": true,
 +    "stylelint-plugin-mozilla/use-design-tokens": false,

src/browser/base/content/browser-box-inc-xhtml.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 31cd4f927c273573b38021f84417101c57377902..f293e1c61d3b7a80b7dc472d927893f0439d6af9 100644
+index 4a16fe93daeefb88af024c1dac05bc1f518c3fcb..a420768e4047937c8becefb69c1017e13fc12231 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
 @@ -3,12 +3,22 @@
@@ -10,7 +10,7 @@ index 31cd4f927c273573b38021f84417101c57377902..f293e1c61d3b7a80b7dc472d927893f0
 +  <html:div id="zen-browser-background" class="zen-browser-generic-background">
 +    <html:div class="zen-browser-grain" />
 +  </html:div>
-   <box context="sidebar-context-menu" id="sidebar-main" class="chrome-block" hidden="true">
+   <box context="sidebar-context-menu" id="sidebar-container" class="chrome-block" hidden="true">
      <html:sidebar-main flex="1">
        <box id="vertical-tabs" slot="tabstrip" customizable="true" contextmenu="toolbar-context-menu"></box>
      </html:sidebar-main>

src/browser/base/content/navigator-toolbox-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca05859408b6d 100644
+index 10faff18ca0c6df472de81b5dbdba83309fa2eb8..b675df9ad22150f5a1060dedbabf6cb27c951619 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -10,7 +10,7 @@ ChromeUtils.defineESModuleGetters(this, {
@@ -37,15 +37,15 @@ index 1982ebadbd2df5ea309db487a4f30288f1af43e5..926c681d4733c84768a23407d60ca058
          case "back-button":
          case "forward-button":
          case "reload-button":
-@@ -329,6 +341,7 @@ document.addEventListener(
+@@ -331,6 +343,7 @@ document.addEventListener(
          #downloads-button,
          #fxa-toolbar-menu-button,
          #unified-extensions-button,
 +        #zen-site-data-icon-button,
          #library-button,
+         #ipprotection-button,
          #split-view-button,
-         #smartwindow-ask-button
-@@ -413,6 +426,16 @@ document.addEventListener(
+@@ -416,6 +429,16 @@ document.addEventListener(
            gUnifiedExtensions.togglePanel(event);
            break;
  

src/browser/base/content/zen-panels/emojis-picker.inc

@@ -14,7 +14,7 @@
   <hbox id="PanelUI-zen-emojis-picker-pages">
     <vbox emojis="true">
       <hbox id="PanelUI-zen-emojis-picker-header">
-        <html:input type="search" id="PanelUI-zen-emojis-picker-search" placeholder="Search emojis" />
+        <html:input type="search" id="PanelUI-zen-emojis-picker-search" data-l10n-id="zen-emojis-picker-search" />
       </hbox>
       <hbox id="PanelUI-zen-emojis-picker-list" />
     </vbox>

src/browser/components/aiwindow/ui/modules/AIWindow-sys-mjs.patch

@@ -1,12 +1,12 @@
 diff --git a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-index f6f1dd1f6b4d21d27e39b48bb7a57871ad5d019d..bf743120cf9f137cbe06d05896f706fb3d5b9435 100644
+index 88c3545431cf1a300d968c296d9b171871b15fe5..754cd644f2e7b82db40d5c06618ac1764424484c 100644
 --- a/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
 +++ b/browser/components/aiwindow/ui/modules/AIWindow.sys.mjs
-@@ -287,6 +287,7 @@ export const AIWindow = {
+@@ -308,6 +308,7 @@ export const AIWindow = {
    },
  
-   _updateToolbarButtonPositions(win, { isToggling = false } = {}) {
+   _updateToolbarButtonPositions(win) {
 +    return;
      const modeSwitcherButton = win.document.getElementById("ai-window-toggle");
      const hamburgerMenu = win.document.getElementById("PanelUI-button");
- 
+     const hamburgerMenuShouldBeAdjacent =

src/browser/components/extensions/parent/ext-browser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index aca5a23deda6b0f2316b0e108cff20ffd7feda67..a06c90937f97a4994b0807b54984089dbe627a71 100644
+index 91adc6bc3649af47745818e6f9d00cbbdffc35a5..e221b077dbfbe20c8696732f003bd5809d761a02 100644
 --- a/browser/components/extensions/parent/ext-browser.js
 +++ b/browser/components/extensions/parent/ext-browser.js
-@@ -352,6 +352,7 @@ class TabTracker extends TabTrackerBase {
+@@ -362,6 +362,7 @@ class TabTracker extends TabTrackerBase {
    }
  
    getId(nativeTab) {
@@ -10,15 +10,15 @@ index aca5a23deda6b0f2316b0e108cff20ffd7feda67..a06c90937f97a4994b0807b54984089d
      let id = this._tabs.get(nativeTab);
      if (id) {
        return id;
-@@ -386,6 +387,7 @@ class TabTracker extends TabTrackerBase {
+@@ -395,6 +396,7 @@ class TabTracker extends TabTrackerBase {
      if (nativeTab.documentGlobal.closed) {
        throw new Error("Cannot attach ID to a tab in a closed window.");
      }
 +    if (nativeTab.hasAttribute("zen-empty-tab")) return;
  
      this._tabs.set(nativeTab, id);
-     if (nativeTab.linkedBrowser) {
-@@ -1276,6 +1278,10 @@ class TabManager extends TabManagerBase {
+     this._tabIds.set(id, nativeTab);
+@@ -1262,6 +1264,10 @@ class TabManager extends TabManagerBase {
    }
  
    canAccessTab(nativeTab) {

src/browser/components/extensions/parent/ext-tabs-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/extensions/parent/ext-tabs.js b/browser/components/extensions/parent/ext-tabs.js
-index 8f5fdecc9394d42a1460a1b73fb8c4e92f63c41e..82c03e234289c7b00f49f73854be45fb95fb91d7 100644
+index f342748d4b680a5de3a8b7c90df79f7c380b9e1c..65091cf370e00a580ae2cb1fad9cde76f10c8bd9 100644
 --- a/browser/components/extensions/parent/ext-tabs.js
 +++ b/browser/components/extensions/parent/ext-tabs.js
-@@ -514,6 +514,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -438,6 +438,7 @@ this.tabs = class extends ExtensionAPIPersistent {
          }
  
          let tab = tabManager.getWrapper(updatedTab);
@@ -10,11 +10,11 @@ index 8f5fdecc9394d42a1460a1b73fb8c4e92f63c41e..82c03e234289c7b00f49f73854be45fb
  
          let changeInfo = {};
          for (let prop of needed) {
-@@ -883,6 +884,7 @@ this.tabs = class extends ExtensionAPIPersistent {
+@@ -806,6 +807,7 @@ this.tabs = class extends ExtensionAPIPersistent {
                });
              }
  
 +            window.gZenCompactModeManager._nextTimeWillBeActive = active;
              let nativeTab = window.gBrowser.addTab(url, options);
+             tabTracker.addTabReadyBlocker(nativeTab);
  
-             if (active) {

src/browser/components/nova/NovaPrefs-sys-mjs.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/components/nova/NovaPrefs.sys.mjs b/browser/components/nova/NovaPrefs.sys.mjs
-index 3d22c881c481643fcffbc581523905a1847a7d41..453dd4d9c43d7483c037a993afbf2b854533497c 100644
---- a/browser/components/nova/NovaPrefs.sys.mjs
-+++ b/browser/components/nova/NovaPrefs.sys.mjs
-@@ -18,7 +18,7 @@ const PLATFORM_PREFS = (() => {
- })();
- 
- function applyNovaPlatformDefaults() {
--  const on = Services.prefs.getBoolPref("browser.nova.enabled", false);
-+  const on = true;
-   const defaults = Services.prefs.getDefaultBranch("");
-   for (const pref of PLATFORM_PREFS) {
-     defaults.setBoolPref(pref, on);

src/browser/components/places/PlacesUIUtils-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/places/PlacesUIUtils.sys.mjs b/browser/components/places/PlacesUIUtils.sys.mjs
-index 7c2786cc1be512ddfc165fb8f6514131ac033040..5846aff53030ef0fad2f87d017ba3713889b474d 100644
+index 7c11a2004c87aa6f0c61cf05ca522c7471c7be71..0f92f9925221cadbd258402f1b6a86a71fdb42e9 100644
 --- a/browser/components/places/PlacesUIUtils.sys.mjs
 +++ b/browser/components/places/PlacesUIUtils.sys.mjs
 @@ -61,6 +61,7 @@ class BookmarkState {
@@ -157,12 +157,3 @@ index 7c2786cc1be512ddfc165fb8f6514131ac033040..5846aff53030ef0fad2f87d017ba3713
    /**
     * Append transactions to update tags by given information.
     *
-@@ -915,7 +1024,7 @@ export var PlacesUIUtils = {
-     aNode,
-     aWhere,
-     aWindow,
--    { aPrivate = false, userContextId = 0 } = {}
-+    { aPrivate = false, userContextId = undefined } = {}
-   ) {
-     if (
-       aNode &&

src/browser/components/preferences/config/account-sync-mjs.patch

@@ -0,0 +1,20 @@
+diff --git a/browser/components/preferences/config/account-sync.mjs b/browser/components/preferences/config/account-sync.mjs
+index b503987a08e2ce64bfc01c4e3a21e5e19ef834f0..b1c03a0b219fd3eddd93c1deaeb18ab79c85f168 100644
+--- a/browser/components/preferences/config/account-sync.mjs
++++ b/browser/components/preferences/config/account-sync.mjs
+@@ -42,6 +42,7 @@ Preferences.addAll([
+   { id: "services.sync.engine.creditcards", type: "bool" },
+   { id: "services.sync.engine.addons", type: "bool" },
+   { id: "services.sync.engine.prefs", type: "bool" },
++  { id: "services.sync.engine.spaces", type: "bool" },
+ ]);
+ 
+ /**
+@@ -546,6 +547,7 @@ const SYNC_ENGINE_SETTINGS = [
+     type: "payments",
+   },
+   { id: "syncAddons", pref: "services.sync.engine.addons", type: "addons" },
++  { id: "syncSpaces", pref: "services.sync.engine.spaces", type: "workspaces" },
+   { id: "syncSettings", pref: "services.sync.engine.prefs", type: "settings" },
+ ];
+ 

src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch

@@ -6,7 +6,7 @@ index 64aa0d98a0622c01f3dcfff1a04bfcda368354d2..2013e04b0881ad2295d6897b91e1573c
    { id: "services.sync.engine.passwords", type: "bool" },
    { id: "services.sync.engine.addresses", type: "bool" },
    { id: "services.sync.engine.creditcards", type: "bool" },
-+  { id: "services.sync.engine.workspaces", type: "bool" },
++  { id: "services.sync.engine.spaces", type: "bool" },
  ]);
  
  let gSyncChooseWhatToSync = {

src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch

@@ -20,7 +20,7 @@ index a893c5ec3d007820d98f5d92dd039640faa2c181..9cbd00102e44ccf98b37845474d92d57
 +      <html:div class="sync-engine-workspaces">
 +        <checkbox
 +                data-l10n-id="sync-engine-workspaces"
-+                preference="services.sync.engine.workspaces"
++                preference="services.sync.engine.spaces"
 +        />
 +      </html:div>
      </html:div>

src/browser/components/preferences/main-js.patch

@@ -1,10 +1,10 @@
 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a172342724a770435 100644
+index fcbd421c99b24e53e46131a1e21ec690814cbf4f..fe3778a57aaeebc53f7f6763ea234cbb41816186 100644
 --- a/browser/components/preferences/main.js
 +++ b/browser/components/preferences/main.js
-@@ -643,6 +643,11 @@ function createStartupConfig(hidden = false) {
-         id: "browserRestoreSession",
-         l10nId: "startup-restore-windows-and-tabs",
+@@ -662,6 +662,11 @@ function createStartupConfig(hidden = false) {
+           },
+         ],
        },
 +      {
 +        id: "zenWorkspaceContinueWhereLeftOff",
@@ -14,7 +14,7 @@ index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a17234272
        {
          id: "windowsLaunchOnLogin",
          l10nId: "windows-launch-on-login",
-@@ -690,7 +695,7 @@ function createStartupConfig(hidden = false) {
+@@ -709,7 +714,7 @@ function createStartupConfig(hidden = false) {
  SettingGroupManager.registerGroups({
    defaultBrowser: createDefaultBrowserConfig(),
    startup: createStartupConfig(
@@ -23,7 +23,7 @@ index c86e54bb6f5e00d9d7bdd81154857a5be97f909c..4035f6a667a361ad106e816a17234272
    ),
  });
  
-@@ -743,7 +748,7 @@ function getBundleForLocales(newLocales) {
+@@ -762,7 +767,7 @@ function getBundleForLocales(newLocales) {
      ])
    );
    return new Localization(

src/browser/components/preferences/preferences-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070c1574714 100644
+index c76a0647e14bac806d9428483bb565b3e10c31e7..2188f7808aca090f92574c7f5c55a28a9c5bb3f8 100644
 --- a/browser/components/preferences/preferences.js
 +++ b/browser/components/preferences/preferences.js
-@@ -132,6 +132,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
+@@ -131,6 +131,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
        styleSheets: [
          "chrome://browser/skin/preferences/dialog.css",
          "chrome://browser/skin/preferences/preferences.css",
@@ -10,7 +10,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
        ],
        resizeCallback: async ({ title, frame }) => {
          // Search within main document and highlight matched keyword.
-@@ -437,6 +437,8 @@ const CONFIG_PANES = Object.freeze({
+@@ -437,6 +438,8 @@ const CONFIG_PANES = Object.freeze({
    tabsBrowsing: {
      l10nId: "tabs-browsing-section",
      groupIds: [
@@ -19,7 +19,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
        "browserLayout",
        "tabs",
        "pageNavigation",
-@@ -477,7 +480,7 @@ function register_module(categoryName, categoryObject) {
+@@ -483,7 +486,7 @@ function register_module(categoryName, categoryObject) {
        }
        this._initted = true;
        let template = document.getElementById("template-" + categoryName);
@@ -28,10 +28,10 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
          // Replace the template element with the nodes inside of it.
          template.replaceWith(template.content);
  
-@@ -522,6 +525,10 @@ function init_all() {
+@@ -527,6 +530,10 @@ function init_all() {
+   register_module("paneHome", gHomePane);
    register_module("paneSearch", gSearchPane);
    register_module("panePrivacy", gPrivacyPane);
-   register_module("paneContainers", gContainersPane);
 +  register_module("paneZenLooks", gZenLooksAndFeel);
 +  register_module("paneZenTabManagement", gZenWorkspacesSettings);
 +  register_module("paneZenCKS", gZenCKSSettings);
@@ -39,7 +39,7 @@ index 57add34d876fb885275f1147209c6fbeee367a7c..be0ab43b299317c0022a5e719f47a070
  
    // Restore the cached Firefox Labs nav button visibility so it shows
    // immediately when recipes are expected to be available, before
-@@ -651,9 +658,9 @@ async function gotoPref(
+@@ -656,9 +663,9 @@ async function gotoPref(
    let redesignEnabled = srdSectionPrefs.all;
    let categories = document.getElementById("categories");
    const kDefaultCategoryInternalName = redesignEnabled

src/browser/components/preferences/preferences-xhtml.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea2c1297ee 100644
+index 1b8c38159314b6edee9e6f455beb2b63db1ad3f0..1308345db640dba6b2848b49ef7c11819f9f5727 100644
 --- a/browser/components/preferences/preferences.xhtml
 +++ b/browser/components/preferences/preferences.xhtml
-@@ -42,6 +42,8 @@
+@@ -39,6 +39,8 @@
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-pane.css" />
    <link rel="stylesheet" href="chrome://browser/content/preferences/widgets/setting-control.css" />
  
@@ -11,7 +11,7 @@ index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea
    <link rel="localization" href="branding/brand.ftl"/>
    <link rel="localization" href="browser/browser.ftl"/>
      <!-- Used by fontbuilder.js -->
-@@ -121,6 +123,26 @@
+@@ -118,6 +120,26 @@
          iconsrc="chrome://browser/skin/preferences/category-general.svg"
          data-l10n-id="pane-general-title">
        </html:moz-page-nav-button>
@@ -38,8 +38,8 @@ index 9760a4a35b0b3bd21edec07a70c10bccc23e4a09..9f22146c259ea5b45005be660bfcb9ea
        <html:moz-page-nav-button id="category-sync"
          hidden="true"
          view="paneSync"
-@@ -253,6 +275,10 @@
- #include containers.inc.xhtml
+@@ -248,6 +270,10 @@
+ #include privacy.inc.xhtml
  #include sync.inc.xhtml
  #include moreFromMozilla.inc.xhtml
 +#include zenLooksAndFeel.inc.xhtml

src/browser/components/preferences/sync-inc-xhtml.patch

@@ -6,7 +6,7 @@ index c379e1a5f82692406a92d9fcd3bca2769dfac5b2..af037dd3d995813d966524ac44a3795d
                      <image class="sync-engine-image sync-engine-prefs" alt=""/>
                      <label data-l10n-id="sync-currently-syncing-settings"/>
                    </html:div>
-+                  <html:div engine_preference="services.sync.engine.workspaces">
++                  <html:div engine_preference="services.sync.engine.spaces">
 +                    <image class="sync-engine-image sync-engine-workspaces" alt=""/>
 +                    <label data-l10n-id="sync-currently-syncing-workspaces"/>
 +                  </html:div>

src/browser/components/preferences/zen-settings.js

@@ -803,6 +803,7 @@ const zenMissingKeyboardShortcutL10n = {
 
   key_inspectorMac: "zen-key-inspector-mac",
   key_findSelection: "zen-key-find-selection",
+  key_findPrevious2: "zen-search-find-again-shortcut-prev-alt",
 
   // Devtools
   key_toggleToolbox: "zen-devtools-toggle-shortcut",
@@ -826,6 +827,9 @@ var zenIgnoreKeyboardShortcutIDs = [
   "key_exitFullScreen_old",
   "key_exitFullScreen_compat",
   "key_duplicateTab",
+  "key_addTabSplitView",
+  "key_separateTabSplitView",
+  "viewOpenTabsSidebarKb",
 ];
 
 var zenIgnoreKeyboardShortcutL10n = [

src/browser/components/sessionstore/SessionStore-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1db40aecce 100644
+index 11191a82a0f0dc6eee60f9de52a63bc6085c3981..f995c3b297c53aa6ee2219bfc09515ee4aa3be28 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
 @@ -129,6 +129,9 @@ const TAB_EVENTS = [
@@ -12,7 +12,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  ];
  
  const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-@@ -199,6 +202,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -201,6 +204,8 @@ ChromeUtils.defineESModuleGetters(lazy, {
    TabStateCache: "resource:///modules/sessionstore/TabStateCache.sys.mjs",
    TabStateFlusher: "resource:///modules/sessionstore/TabStateFlusher.sys.mjs",
    setTimeout: "resource://gre/modules/Timer.sys.mjs",
@@ -21,7 +21,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  });
  
  ChromeUtils.defineLazyGetter(lazy, "blankURI", () => {
-@@ -1287,10 +1292,7 @@ var SessionStoreInternal = {
+@@ -1300,10 +1305,7 @@ var SessionStoreInternal = {
     */
    get willAutoRestore() {
      return (
@@ -33,7 +33,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
      );
    },
  
-@@ -1965,6 +1967,9 @@ var SessionStoreInternal = {
+@@ -1990,6 +1992,9 @@ var SessionStoreInternal = {
        case "TabPinned":
        case "TabUnpinned":
        case "SwapDocShells":
@@ -43,7 +43,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
          this.saveStateDelayed(win);
          break;
        case "TabGroupCreate":
-@@ -2074,6 +2079,10 @@ var SessionStoreInternal = {
+@@ -2099,6 +2104,10 @@ var SessionStoreInternal = {
        this._windows[aWindow.__SSi].isTaskbarTab = true;
      }
  
@@ -54,7 +54,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
      if (lazy.AIWindow.isAIWindowActiveAndEnabled(aWindow)) {
        this._windows[aWindow.__SSi].isAIWindow = true;
      }
-@@ -2110,7 +2119,7 @@ var SessionStoreInternal = {
+@@ -2135,7 +2144,7 @@ var SessionStoreInternal = {
      let isTaskbarTab = this._windows[aWindow.__SSi].isTaskbarTab;
      // A regular window is not a private window, taskbar tab window, or popup window
      let isRegularWindow =
@@ -63,7 +63,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
      // perform additional initialization when the first window is loading
      if (lazy.RunState.isStopped) {
-@@ -2122,7 +2131,7 @@ var SessionStoreInternal = {
+@@ -2147,7 +2156,7 @@ var SessionStoreInternal = {
          // to disk to NOW() to enforce a full interval before the next write.
          lazy.SessionSaver.updateLastSaveTime();
  
@@ -72,7 +72,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            this._log.debug(
              "initializeWindow, the window is private or a web app. Saving SessionStartup.state for possibly restoring later"
            );
-@@ -2164,6 +2173,7 @@ var SessionStoreInternal = {
+@@ -2191,6 +2200,7 @@ var SessionStoreInternal = {
            null,
            "sessionstore-one-or-no-tab-restored"
          );
@@ -80,7 +80,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
          this._deferredAllWindowsRestored.resolve();
        }
        // this window was opened by _openWindowWithState
-@@ -2213,7 +2223,6 @@ var SessionStoreInternal = {
+@@ -2240,7 +2250,6 @@ var SessionStoreInternal = {
        if (closedWindowState) {
          let newWindowState;
          if (
@@ -88,7 +88,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            !lazy.SessionStartup.willRestore()
          ) {
            // We want to split the window up into pinned tabs and unpinned tabs.
-@@ -2249,6 +2258,7 @@ var SessionStoreInternal = {
+@@ -2276,6 +2285,7 @@ var SessionStoreInternal = {
          }
  
          if (newWindowState) {
@@ -96,23 +96,17 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            // Ensure that the window state isn't hidden
            this._restoreCount = 1;
            let state = { windows: [newWindowState] };
-@@ -2277,6 +2287,15 @@ var SessionStoreInternal = {
+@@ -2312,6 +2322,9 @@ var SessionStoreInternal = {
        });
        this._shouldRestoreLastSession = false;
      }
 +    else if (!aInitialState && isRegularWindow) {
-+      let windowPromises = [];
-+      for (let window of this._browserWindows) {
-+        windowPromises.push(lazy.TabStateFlusher.flushWindow(window));
-+      }
-+      Promise.all(windowPromises).finally(() => {
-+        lazy.ZenSessionStore.restoreNewWindow(aWindow, this);
-+      });
++      lazy.ZenSessionStore.restoreNewWindow(aWindow, this);
 +    }
  
      if (this._restoreLastWindow && aWindow.toolbar.visible) {
        // always reset (if not a popup window)
-@@ -2427,7 +2446,7 @@ var SessionStoreInternal = {
+@@ -2462,7 +2475,7 @@ var SessionStoreInternal = {
  
      var tabbrowser = aWindow.gBrowser;
  
@@ -121,7 +115,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
      TAB_EVENTS.forEach(function (aEvent) {
        tabbrowser.tabContainer.removeEventListener(aEvent, this, true);
-@@ -2478,7 +2497,7 @@ var SessionStoreInternal = {
+@@ -2513,7 +2526,7 @@ var SessionStoreInternal = {
  
        let isLastRegularWindow =
          Object.values(this._windows).filter(
@@ -130,7 +124,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
          ).length == 1;
        this._log.debug(
          `onClose, closing window isLastRegularWindow? ${isLastRegularWindow}`
-@@ -2535,8 +2554,8 @@ var SessionStoreInternal = {
+@@ -2570,8 +2583,8 @@ var SessionStoreInternal = {
        // 2) Flush the window.
        // 3) When the flush is complete, revisit our decision to store the window
        //    in _closedWindows, and add/remove as necessary.
@@ -141,7 +135,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        }
  
        completionPromise = lazy.TabStateFlusher.flushWindow(aWindow).then(() => {
-@@ -2556,8 +2575,9 @@ var SessionStoreInternal = {
+@@ -2591,8 +2604,9 @@ var SessionStoreInternal = {
  
          // Save non-private windows if they have at
          // least one saveable tab or are the last window.
@@ -153,7 +147,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
            if (!isLastWindow && winData.closedId > -1) {
              this._addClosedAction(
-@@ -2633,7 +2653,7 @@ var SessionStoreInternal = {
+@@ -2668,7 +2682,7 @@ var SessionStoreInternal = {
     *        to call this method again asynchronously (for example, after
     *        a window flush).
     */
@@ -162,7 +156,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
      // Make sure SessionStore is still running, and make sure that we
      // haven't chosen to forget this window.
      if (
-@@ -2650,6 +2670,7 @@ var SessionStoreInternal = {
+@@ -2685,6 +2699,7 @@ var SessionStoreInternal = {
        // _closedWindows from a previous call to this function.
        let winIndex = this._closedWindows.indexOf(winData);
        let alreadyStored = winIndex != -1;
@@ -170,7 +164,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        // If sidebar command is truthy, i.e. sidebar is open, store sidebar settings
        let shouldStore = hasSaveableTabs || isLastWindow;
  
-@@ -3467,7 +3488,7 @@ var SessionStoreInternal = {
+@@ -3507,7 +3522,7 @@ var SessionStoreInternal = {
      if (!isPrivateWindow && tabState.isPrivate) {
        return;
      }
@@ -179,7 +173,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        return;
      }
  
-@@ -4206,6 +4227,12 @@ var SessionStoreInternal = {
+@@ -4246,6 +4261,12 @@ var SessionStoreInternal = {
          Math.min(tabState.index, tabState.entries.length)
        );
        tabState.pinned = false;
@@ -192,7 +186,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
        if (inBackground === false) {
          aWindow.gBrowser.selectedTab = newTab;
-@@ -4642,6 +4669,8 @@ var SessionStoreInternal = {
+@@ -4679,6 +4700,8 @@ var SessionStoreInternal = {
        // Append the tab if we're opening into a different window,
        tabIndex: aSource == aTargetWindow ? pos : Infinity,
        pinned: state.pinned,
@@ -201,7 +195,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        userContextId: state.userContextId,
        skipLoad: true,
        preferredRemoteType,
-@@ -5146,9 +5175,10 @@ var SessionStoreInternal = {
+@@ -5176,9 +5199,10 @@ var SessionStoreInternal = {
        if (activePageData.title && activePageData.title != activePageData.url) {
          win.gBrowser.setInitialTabTitle(tab, activePageData.title, {
            isContentTitle: true,
@@ -213,7 +207,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        }
      }
  
-@@ -5513,7 +5543,7 @@ var SessionStoreInternal = {
+@@ -5543,7 +5567,7 @@ var SessionStoreInternal = {
  
      for (let i = tabbrowser.pinnedTabCount; i < tabbrowser.tabs.length; i++) {
        let tab = tabbrowser.tabs[i];
@@ -222,7 +216,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
          removableTabs.push(tab);
        }
      }
-@@ -5626,7 +5656,7 @@ var SessionStoreInternal = {
+@@ -5656,7 +5680,7 @@ var SessionStoreInternal = {
  
      // collect the data for all windows
      for (ix in this._windows) {
@@ -231,7 +225,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
          // window data is still in _statesToRestore
          continue;
        }
-@@ -5770,11 +5800,12 @@ var SessionStoreInternal = {
+@@ -5800,11 +5824,12 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
@@ -245,7 +239,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
      // update the internal state data for this window
      for (let tab of tabs) {
        if (tab == aWindow.FirefoxViewHandler.tab) {
-@@ -5785,6 +5816,9 @@ var SessionStoreInternal = {
+@@ -5815,6 +5840,9 @@ var SessionStoreInternal = {
        tabsData.push(tabData);
      }
  
@@ -255,7 +249,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
      // update tab group state for this window
      winData.groups = [];
      for (let tabGroup of aWindow.gBrowser.tabGroups) {
-@@ -5801,7 +5835,7 @@ var SessionStoreInternal = {
+@@ -5831,7 +5859,7 @@ var SessionStoreInternal = {
      // a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
      // since it's only inserted into the tab strip after it's selected).
      if (aWindow.FirefoxViewHandler.tab?.selected) {
@@ -264,7 +258,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        winData.title = tabbrowser.tabs[0].label;
      }
      winData.selected = selectedIndex;
-@@ -6003,8 +6037,8 @@ var SessionStoreInternal = {
+@@ -6033,8 +6061,8 @@ var SessionStoreInternal = {
      // selectTab represents.
      let selectTab = 0;
      if (overwriteTabs) {
@@ -275,7 +269,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
        selectTab = Math.min(selectTab, winData.tabs.length);
      }
  
-@@ -6026,6 +6060,7 @@ var SessionStoreInternal = {
+@@ -6056,6 +6084,7 @@ var SessionStoreInternal = {
      if (overwriteTabs) {
        for (let i = tabbrowser.browsers.length - 1; i >= 0; i--) {
          if (!tabbrowser.tabs[i].selected) {
@@ -283,7 +277,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            tabbrowser.removeTab(tabbrowser.tabs[i]);
          }
        }
-@@ -6060,6 +6095,12 @@ var SessionStoreInternal = {
+@@ -6090,6 +6119,12 @@ var SessionStoreInternal = {
          savedTabGroup => !openTabGroupIdsInWindow.has(savedTabGroup.id)
        );
      }
@@ -296,7 +290,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
      // Move the originally open tabs to the end.
      if (initialTabs) {
-@@ -6626,6 +6667,25 @@ var SessionStoreInternal = {
+@@ -6656,6 +6691,25 @@ var SessionStoreInternal = {
  
      // Most of tabData has been restored, now continue with restoring
      // attributes that may trigger external events.
@@ -322,7 +316,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
      if (tabData.pinned) {
        tabbrowser.pinTab(tab);
-@@ -6793,6 +6853,9 @@ var SessionStoreInternal = {
+@@ -6838,6 +6892,9 @@ var SessionStoreInternal = {
          aWindow.gURLBar.readOnly = false;
        }
      }
@@ -332,7 +326,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
  
      let promiseParts = Promise.withResolvers();
      aWindow.setTimeout(() => {
-@@ -7588,7 +7651,7 @@ var SessionStoreInternal = {
+@@ -7633,7 +7690,7 @@ var SessionStoreInternal = {
  
        let groupsToSave = new Map();
        for (let tIndex = 0; tIndex < window.tabs.length; ) {
@@ -341,7 +335,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            // Adjust window.selected
            if (tIndex + 1 < window.selected) {
              window.selected -= 1;
-@@ -7603,7 +7666,7 @@ var SessionStoreInternal = {
+@@ -7648,7 +7705,7 @@ var SessionStoreInternal = {
            );
            // We don't want to increment tIndex here.
            continue;
@@ -350,7 +344,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            // Convert any open groups into saved groups.
            let groupStateToSave = window.groups.find(
              groupState => groupState.id == window.tabs[tIndex].groupId
-@@ -8062,7 +8125,6 @@ var SessionStoreInternal = {
+@@ -8193,7 +8250,6 @@ var SessionStoreInternal = {
      timer.initWithCallback(
        function () {
          if (beats <= 0) {
@@ -358,7 +352,7 @@ index 183543c5f29ff4c879d3058e4c09faf376a69cb7..ab482c32cc697ccef82bf0aeaa0e3a1d
            Glean.sessionRestore.shutdownFlushAllOutcomes.timed_out.add(1);
            deferred.resolve();
          }
-@@ -8540,6 +8602,7 @@ var SessionStoreInternal = {
+@@ -8671,6 +8727,7 @@ var SessionStoreInternal = {
      if (
        !savedTabGroupState.tabs.length ||
        this.getSavedTabGroup(savedTabGroupState.id)

src/browser/components/tabbrowser/content/tabbrowser-js.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae107790751 100644
+index c42b1a1a8df6b38886c17f71ea88e5aaa7eebc80..c741404ed973ee3ac246fe246c0f645eb49d12e9 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -511,6 +511,7 @@
+@@ -509,6 +509,7 @@
       * @type {MozBrowser[]}
       */
      get splitViewBrowsers() {
@@ -10,7 +10,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        const browsers = [];
        if (this.#activeSplitView) {
          for (const tab of this.#activeSplitView.tabs) {
-@@ -584,15 +585,66 @@
+@@ -578,15 +579,66 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -79,7 +79,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      set selectedTab(val) {
        if (
          gSharedTabWarning.willShowSharedTabWarning(val) ||
-@@ -601,6 +653,9 @@
+@@ -595,6 +647,9 @@
        ) {
          return;
        }
@@ -89,7 +89,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // Update the tab
        this.tabbox.selectedTab = val;
      }
-@@ -668,6 +723,10 @@
+@@ -662,6 +717,10 @@
          userContextId = parseInt(tabArgument.getAttribute("usercontextid"), 10);
        }
  
@@ -97,10 +97,10 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
 +        userContextId = window._zenStartupUnsyncedUserContextId;
 +      }
 +
-       if (tabArgument && tabArgument.linkedBrowser) {
-         remoteType = tabArgument.linkedBrowser.remoteType;
-         initialBrowsingContextGroupId =
-@@ -760,6 +819,8 @@
+       if (openWindowInfo) {
+         userContextId = openWindowInfo.originAttributes.userContextId;
+       }
+@@ -763,6 +822,8 @@
        this.tabpanels.appendChild(panel);
  
        let tab = this.tabs[0];
@@ -109,7 +109,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        tab.linkedPanel = uniqueId;
        this._selectedTab = tab;
        this._selectedBrowser = browser;
-@@ -1126,18 +1187,24 @@
+@@ -1129,18 +1190,24 @@
        aTab,
        { telemetrySource = this.TabMetrics.METRIC_SOURCE.UNKNOWN } = {}
      ) {
@@ -135,7 +135,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -1145,16 +1212,25 @@
+@@ -1148,16 +1215,25 @@
      }
  
      unpinTab(aTab) {
@@ -162,7 +162,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        });
  
        aTab.style.marginInlineStart = "";
-@@ -1369,6 +1445,9 @@
+@@ -1372,6 +1448,9 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -172,7 +172,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        if (
          aIconURL &&
          !LOCAL_PROTOCOLS.some(protocol => aIconURL.startsWith(protocol))
-@@ -1378,6 +1457,9 @@
+@@ -1381,6 +1460,9 @@
          );
          return;
        }
@@ -182,23 +182,23 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1700,7 +1782,6 @@
+@@ -1703,7 +1785,6 @@
  
        // Preview mode should not reset the owner
-       if (!this._previewMode && !oldTab.selected) {
+       if (!this.#previewMode && !oldTab.selected) {
 -        oldTab.owner = null;
        }
  
-       let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
-@@ -1791,6 +1872,7 @@
-       if (!this._previewMode) {
+       let lastRelatedTab = this.#lastRelatedTabMap.get(oldTab);
+@@ -1794,6 +1875,7 @@
+       if (!this.#previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
 +        newTab.removeAttribute("unread");
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.documentGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -2005,6 +2087,9 @@
+@@ -2008,6 +2090,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -208,7 +208,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2043,7 +2128,7 @@
+@@ -2046,7 +2131,7 @@
        // Focus the location bar if it was previously focused for that tab.
        // In full screen mode, only bother making the location bar visible
        // if the tab is a blank one.
@@ -217,7 +217,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          let selectURL = () => {
            if (this._asyncTabSwitching) {
              // Set _awaitingSetURI flag to suppress popup notification
-@@ -2331,7 +2416,12 @@
+@@ -2334,7 +2419,12 @@
        return this._setTabLabel(aTab, aLabel);
      }
  
@@ -231,16 +231,16 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        if (!aLabel || (isURL && /^about:reader\?url=/.test(aLabel))) {
          return false;
        }
-@@ -2457,7 +2547,7 @@
+@@ -2460,7 +2550,7 @@
          newIndex = this.selectedTab._tPos + 1;
        }
  
 -      if (replace) {
-+      if (replace && !(!targetTab && this.selectedTab?.hasAttribute('zen-empty-tab'))) {
++      if (replace && !((targetTab || this.selectedTab)?.hasAttribute('zen-empty-tab'))) {
          if (this.isTabGroupLabel(targetTab)) {
            throw new Error(
              "Replacing a tab group label with a tab is not supported"
-@@ -2737,6 +2827,7 @@
+@@ -2735,6 +2825,7 @@
        uriIsAboutBlank,
        userContextId,
        skipLoad,
@@ -248,7 +248,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      } = {}) {
        let b = document.createXULElement("browser");
        // Use the JSM global to create the permanentKey, so that if the
-@@ -2810,8 +2901,7 @@
+@@ -2808,8 +2899,7 @@
          // we use a different attribute name for this?
          b.setAttribute("name", name);
        }
@@ -258,7 +258,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          b.setAttribute("transparent", "true");
        }
  
-@@ -2981,7 +3071,7 @@
+@@ -2964,7 +3054,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -267,7 +267,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -3041,8 +3131,8 @@
+@@ -3024,8 +3114,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -278,7 +278,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -3227,7 +3317,6 @@
+@@ -3210,7 +3300,6 @@
              this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
                tabIndex: tab._tPos + 1,
                userContextId: tab.userContextId,
@@ -286,7 +286,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
                focusUrlBar: true,
              });
              resolve(this.selectedBrowser);
-@@ -3337,6 +3426,10 @@
+@@ -3320,6 +3409,10 @@
          schemelessInput,
          hasValidUserGestureActivation = false,
          textDirectiveUserActivation = false,
@@ -297,7 +297,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } = {}
      ) {
        // all callers of addTab that pass a params object need to pass
-@@ -3347,10 +3440,25 @@
+@@ -3330,10 +3423,25 @@
          );
        }
  
@@ -308,7 +308,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
 +
 +      let hasZenDefaultUserContextId = false;
 +      let zenForcedWorkspaceId = undefined;
-+      if (beforeRouteResult.isRouteFound && typeof userContextId !== "undefined") {
++      if (beforeRouteResult.isRouteFound && (typeof userContextId === "undefined" || fromExternal)) {
 +        userContextId = beforeRouteResult.userContextId;
 +        hasZenDefaultUserContextId = true;
 +      } else if (typeof gZenWorkspaces !== "undefined" && !_forZenEmptyTab) {
@@ -323,7 +323,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // If we're opening a foreground tab, set the owner by default.
        ownerTab ??= inBackground ? null : this.selectedTab;
  
-@@ -3358,6 +3466,7 @@
+@@ -3341,6 +3449,7 @@
        if (this.selectedTab.owner) {
          this.selectedTab.owner = null;
        }
@@ -331,7 +331,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        // Find the tab that opened this one, if any. This is used for
        // determining positioning, and inherited attributes such as the
-@@ -3410,6 +3519,22 @@
+@@ -3393,6 +3502,22 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -354,7 +354,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          if (insertTab) {
            // Insert the tab into the tab container in the correct position.
            this.#insertTabAtIndex(t, {
-@@ -3418,6 +3543,7 @@
+@@ -3401,6 +3526,7 @@
              ownerTab,
              openerTab,
              pinned,
@@ -362,7 +362,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
              bulkOrderedOpen,
              tabGroup: tabGroup ?? openerTab?.group,
            });
-@@ -3436,6 +3562,7 @@
+@@ -3419,6 +3545,7 @@
            openWindowInfo,
            skipLoad,
            triggeringRemoteType,
@@ -370,7 +370,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          }));
  
          if (focusUrlBar) {
-@@ -3560,6 +3687,12 @@
+@@ -3543,6 +3670,12 @@
          }
        }
  
@@ -383,7 +383,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // Additionally send pinned tab events
        if (pinned) {
          this.#notifyPinnedStatus(t);
-@@ -3570,6 +3703,15 @@
+@@ -3553,6 +3686,15 @@
        if (!inBackground) {
          this.selectedTab = t;
        }
@@ -399,7 +399,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        return t;
      }
  
-@@ -3802,6 +3944,7 @@
+@@ -3785,6 +3927,7 @@
          isAdoptingGroup = false,
          isUserTriggered = false,
          telemetryUserCreateSource = "unknown",
@@ -407,7 +407,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } = {}
      ) {
        if (
-@@ -3812,9 +3955,6 @@
+@@ -3795,9 +3938,6 @@
              !this.isSplitViewWrapper(tabOrSplitView)
          )
        ) {
@@ -417,7 +417,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        }
  
        if (!color) {
-@@ -3835,9 +3975,14 @@
+@@ -3818,9 +3958,14 @@
          label,
          isAdoptingGroup
        );
@@ -434,7 +434,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        );
        group.addTabs(tabsAndSplitViews);
  
-@@ -3958,7 +4103,7 @@
+@@ -3941,7 +4086,7 @@
        }
  
        this.#handleTabMove(tab, () =>
@@ -443,7 +443,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        );
      }
  
-@@ -4044,6 +4189,7 @@
+@@ -4027,6 +4172,7 @@
          color: group.color,
          insertBefore: newTabs[0],
          isAdoptingGroup: true,
@@ -451,7 +451,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        });
      }
  
-@@ -4254,6 +4400,7 @@
+@@ -4237,6 +4383,7 @@
          openWindowInfo,
          skipLoad,
          triggeringRemoteType,
@@ -459,7 +459,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        }
      ) {
        // If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
-@@ -4323,6 +4470,7 @@
+@@ -4297,6 +4444,7 @@
            openWindowInfo,
            name,
            skipLoad,
@@ -467,7 +467,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          });
        }
  
-@@ -4536,9 +4684,9 @@
+@@ -4510,9 +4658,9 @@
          }
  
          // Add a new tab if needed.
@@ -479,7 +479,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
            let url = "about:blank";
            if (tabData.entries?.length) {
-@@ -4575,8 +4723,10 @@
+@@ -4545,8 +4693,10 @@
              insertTab: false,
              skipLoad: true,
              preferredRemoteType,
@@ -491,7 +491,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
            if (select) {
              tabToSelect = tab;
            }
-@@ -4598,7 +4748,8 @@
+@@ -4568,7 +4718,8 @@
            this.pinTab(tab);
            // Then ensure all the tab open/pinning information is sent.
            this._fireTabOpen(tab, {});
@@ -501,7 +501,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
            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 +4769,10 @@
+@@ -4588,7 +4739,10 @@
                  tabGroup.stateData.id,
                  tabGroup.stateData.color,
                  tabGroup.stateData.collapsed,
@@ -513,7 +513,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
                );
                tabsFragment.appendChild(tabGroup.node);
              }
-@@ -4673,9 +4827,21 @@
+@@ -4643,9 +4797,21 @@
        // to remove the old selected tab.
        if (tabToSelect) {
          let leftoverTab = this.selectedTab;
@@ -535,7 +535,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        if (tabs.length > 1 || !tabs[0].selected) {
          this._updateTabsAfterInsert();
-@@ -4866,11 +5032,17 @@
+@@ -4836,11 +5002,17 @@
        if (ownerTab) {
          tab.owner = ownerTab;
        }
@@ -554,16 +554,16 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -4882,7 +5054,7 @@
+@@ -4852,7 +5024,7 @@
            let lastRelatedTab =
-             openerTab && this._lastRelatedTabMap.get(openerTab);
+             openerTab && this.#lastRelatedTabMap.get(openerTab);
            let previousTab = lastRelatedTab || openerTab || this.selectedTab;
 -          if (!tabGroup) {
 +          if (!tabGroup && pinned === previousTab.group?.pinned) {
              tabGroup = previousTab.group;
            }
            if (
-@@ -4898,7 +5070,7 @@
+@@ -4868,7 +5040,7 @@
                  previousTab.splitview
                ) + 1;
            } else if (previousTab.visible) {
@@ -572,7 +572,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
            } else if (previousTab == FirefoxViewHandler.tab) {
              elementIndex = 0;
            }
-@@ -4926,14 +5098,14 @@
+@@ -4896,14 +5068,14 @@
        }
        // Ensure index is within bounds.
        if (tab.pinned) {
@@ -591,7 +591,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        if (pinned && !itemAfter?.pinned) {
          itemAfter = null;
-@@ -4950,7 +5122,7 @@
+@@ -4920,7 +5092,7 @@
  
        this.tabContainer._invalidateCachedTabs();
  
@@ -600,7 +600,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          if (
            (this.isTab(itemAfter) && itemAfter.group == tabGroup) ||
            this.isSplitViewWrapper(itemAfter)
-@@ -4981,7 +5153,11 @@
+@@ -4951,7 +5123,11 @@
          const tabContainer = pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
@@ -612,7 +612,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        }
  
        if (tab.group?.collapsed) {
-@@ -4996,6 +5172,7 @@
+@@ -4966,6 +5142,7 @@
        if (pinned) {
          this._updateTabBarForPinnedTabs();
        }
@@ -620,7 +620,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        TabBarVisibility.update();
      }
-@@ -5544,6 +5721,7 @@
+@@ -5514,6 +5691,7 @@
          telemetrySource,
        } = {}
      ) {
@@ -628,7 +628,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // When 'closeWindowWithLastTab' pref is enabled, closing all tabs
        // can be considered equivalent to closing the window.
        if (
-@@ -5633,6 +5811,7 @@
+@@ -5603,6 +5781,7 @@
          if (lastToClose) {
            this.removeTab(lastToClose, aParams);
          }
@@ -636,7 +636,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } catch (e) {
          console.error(e);
        }
-@@ -5678,6 +5857,14 @@
+@@ -5648,6 +5827,14 @@
          return;
        }
  
@@ -651,7 +651,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        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 +5872,9 @@
+@@ -5655,6 +5842,9 @@
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
        let isLastTab = this.#isLastTabInWindow(aTab);
@@ -661,7 +661,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -5696,13 +5886,14 @@
+@@ -5666,13 +5856,14 @@
            telemetrySource,
          })
        ) {
@@ -677,7 +677,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -5733,7 +5924,13 @@
+@@ -5703,7 +5894,13 @@
          // We're not animating, so we can cancel the animation stopwatch.
          Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
          aTab._closeTimeAnimTimerId = null;
@@ -692,7 +692,16 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          return;
        }
  
-@@ -5867,7 +6064,7 @@
+@@ -5746,7 +5943,7 @@
+      */
+     #isLastTabInWindow(tab) {
+       for (const otherTab of this.tabs) {
+-        if (otherTab != tab && otherTab.isOpen && !otherTab.hidden) {
++        if (otherTab != tab && otherTab.isOpen && !otherTab.hidden && !otherTab.hasAttribute("zen-empty-tab")) {
+           return false;
+         }
+       }
+@@ -5837,7 +6034,7 @@
            closeWindowWithLastTab != null
              ? closeWindowWithLastTab
              : !window.toolbar.visible ||
@@ -701,7 +710,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5891,6 +6088,7 @@
+@@ -5861,6 +6058,7 @@
  
          newTab = true;
        }
@@ -709,7 +718,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        aTab._endRemoveArgs = [closeWindow, newTab];
  
        // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -5931,13 +6129,7 @@
+@@ -5901,13 +6099,7 @@
        aTab._mouseleave();
  
        if (newTab) {
@@ -724,15 +733,15 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } else {
          TabBarVisibility.update();
        }
-@@ -6070,6 +6262,7 @@
+@@ -6040,6 +6232,7 @@
          this.tabs[i]._tPos = i;
        }
  
 +      gZenWorkspaces.updateTabsContainers();
-       if (!this._windowIsClosing) {
+       if (!this.#windowIsClosing) {
          // update tab close buttons state
          this.tabContainer._updateCloseButtons();
-@@ -6255,6 +6448,7 @@
+@@ -6225,6 +6418,7 @@
          memory_after: await getTotalMemoryUsage(),
          time_to_unload_in_ms: timeElapsed,
        });
@@ -740,7 +749,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      }
  
      /**
-@@ -6300,6 +6494,7 @@
+@@ -6270,6 +6464,7 @@
        }
  
        let excludeTabs = new Set(aExcludeTabs);
@@ -748,7 +757,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        // If this tab has a successor, it should be selectable, since
        // hiding or closing a tab removes that tab as a successor.
-@@ -6312,15 +6507,22 @@
+@@ -6282,15 +6477,22 @@
          !excludeTabs.has(aTab.owner) &&
          Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
        ) {
@@ -773,7 +782,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        let tab = this.tabContainer.findNextTab(aTab, {
          direction: 1,
          filter: _tab => remainingTabs.includes(_tab),
-@@ -6334,7 +6536,7 @@
+@@ -6304,7 +6506,7 @@
        }
  
        if (tab) {
@@ -782,7 +791,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        }
  
        // If no qualifying visible tab was found, see if there is a tab in
-@@ -6355,7 +6557,7 @@
+@@ -6325,7 +6527,7 @@
          });
        }
  
@@ -791,7 +800,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      }
  
      _blurTab(aTab) {
-@@ -6366,7 +6568,7 @@
+@@ -6336,7 +6538,7 @@
       * @returns {boolean}
       *   False if swapping isn't permitted, true otherwise.
       */
@@ -800,7 +809,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // Do not allow transfering a private tab to a non-private window
        // and vice versa.
        if (
-@@ -6420,6 +6622,7 @@
+@@ -6390,6 +6592,7 @@
        // fire the beforeunload event in the process.  Close the other
        // window if this was its last tab.
        if (
@@ -808,7 +817,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          !remoteBrowser._beginRemoveTab(aOtherTab, {
            adoptedByTab: aOurTab,
            closeWindowWithLastTab: true,
-@@ -6431,7 +6634,7 @@
+@@ -6401,7 +6604,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.
@@ -817,7 +826,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        if (closeWindow) {
          let win = aOtherTab.documentGlobal;
          win.windowUtils.suppressAnimation(true);
-@@ -6565,11 +6768,13 @@
+@@ -6535,11 +6738,13 @@
        }
  
        // Finish tearing down the tab that's going away.
@@ -831,7 +840,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        this.setTabTitle(aOurTab);
  
-@@ -6771,10 +6976,10 @@
+@@ -6759,10 +6964,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -844,7 +853,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -6834,7 +7039,8 @@
+@@ -6822,7 +7027,8 @@
       * @param {object} [aOptions={}]
       *   Key-value pairs that will be serialized into the features string.
       */
@@ -854,7 +863,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        if (this.tabs.length == 1) {
          return null;
        }
-@@ -6851,7 +7057,7 @@
+@@ -6839,7 +7045,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);
@@ -863,7 +872,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          private: PrivateBrowsingUtils.isWindowPrivate(window),
          features: Object.entries(aOptions)
            .map(([key, value]) => `${key}=${value}`)
-@@ -6859,6 +7065,8 @@
+@@ -6847,6 +7053,8 @@
          openerWindow: window,
          args,
        });
@@ -872,7 +881,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      }
  
      /**
-@@ -6971,7 +7179,7 @@
+@@ -6959,7 +7167,7 @@
       *   `true` if element is a `<tab-group>`
       */
      isTabGroup(element) {
@@ -881,7 +890,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
      }
  
      /**
-@@ -7056,8 +7264,8 @@
+@@ -7044,8 +7252,8 @@
        }
  
        // Don't allow mixing pinned and unpinned tabs.
@@ -892,7 +901,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } else {
          tabIndex = Math.max(tabIndex, this.pinnedTabCount);
        }
-@@ -7103,8 +7311,8 @@
+@@ -7091,8 +7299,8 @@
        this.#handleTabMove(
          element,
          () => {
@@ -903,7 +912,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
              neighbor = neighbor.group;
            }
            if (neighbor?.splitview) {
-@@ -7115,6 +7323,12 @@
+@@ -7103,6 +7311,12 @@
                return;
              }
            }
@@ -916,7 +925,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
            if (movingForwards && neighbor) {
              neighbor.after(element);
-@@ -7173,23 +7387,31 @@
+@@ -7161,23 +7375,31 @@
      #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
        if (this.isTabGroupLabel(targetElement)) {
          targetElement = targetElement.group;
@@ -954,7 +963,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        } 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 +7424,35 @@
+@@ -7190,12 +7412,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.
@@ -991,7 +1000,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        // 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 +7461,7 @@
+@@ -7204,6 +7449,7 @@
        }
  
        let getContainer = () =>
@@ -999,7 +1008,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          element.pinned
            ? this.tabContainer.pinnedTabsContainer
            : this.tabContainer;
-@@ -7224,11 +7470,15 @@
+@@ -7212,11 +7458,15 @@
          element,
          () => {
            if (moveBefore) {
@@ -1016,7 +1025,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
            }
          },
          metricsContext
-@@ -7302,11 +7552,15 @@
+@@ -7290,11 +7540,15 @@
       * @param {TabMetricsContext} [metricsContext]
       */
      moveTabToExistingGroup(aTab, aGroup, metricsContext) {
@@ -1035,7 +1044,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        }
        if (aTab.group && aTab.group.id === aGroup.id) {
          return;
-@@ -7378,6 +7632,7 @@
+@@ -7366,6 +7620,7 @@
  
        let state = {
          tabIndex: tab._tPos,
@@ -1043,7 +1052,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        };
        if (tab.visible) {
          state.elementIndex = tab.elementIndex;
-@@ -7409,7 +7664,7 @@
+@@ -7397,7 +7652,7 @@
        let changedSplitView =
          previousTabState.splitViewId != currentTabState.splitViewId;
  
@@ -1052,7 +1061,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
          tab.dispatchEvent(
            new CustomEvent("TabMove", {
              bubbles: true,
-@@ -7456,6 +7711,10 @@
+@@ -7444,6 +7699,10 @@
  
        moveActionCallback();
  
@@ -1063,7 +1072,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // Clear tabs cache after moving nodes because the order of tabs may have
        // changed.
        this.tabContainer._invalidateCachedTabs();
-@@ -7506,7 +7765,22 @@
+@@ -7494,7 +7753,22 @@
       * @returns {object}
       *    The new tab in the current window, null if the tab couldn't be adopted.
       */
@@ -1087,7 +1096,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        // 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 +7823,8 @@
+@@ -7537,6 +7811,8 @@
        }
        params.skipLoad = true;
        let newTab = this.addWebTab("about:blank", params);
@@ -1096,7 +1105,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
  
        aTab.container.tabDragAndDrop.finishAnimateTabMove();
  
-@@ -8259,7 +8535,7 @@
+@@ -8247,7 +8523,7 @@
          // preventDefault(). It will still raise the window if appropriate.
          return;
        }
@@ -1105,7 +1114,7 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        window.focus();
        aEvent.preventDefault();
      }
-@@ -8276,7 +8552,6 @@
+@@ -8264,7 +8540,6 @@
  
      on_TabGroupCollapse(aEvent) {
        aEvent.target.tabs.forEach(tab => {
@@ -1113,38 +1122,38 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
        });
      }
  
-@@ -8630,7 +8905,9 @@
+@@ -8618,7 +8893,9 @@
  
-         let filter = this._tabFilters.get(tab);
+         let filter = this.#tabFilters.get(tab);
          if (filter) {
 +          try {
            browser.webProgress.removeProgressListener(filter);
 +          } catch {}
  
-           let listener = this._tabListeners.get(tab);
+           let listener = this.#tabListeners.get(tab);
            if (listener) {
-@@ -9435,6 +9712,7 @@
+@@ -9423,6 +9700,7 @@
              aWebProgress.isTopLevel
            ) {
-             this.mTab.setAttribute("busy", "true");
-+            if (!this.mTab.selected) this.mTab.setAttribute("unread", "true");
-             gBrowser._tabAttrModified(this.mTab, ["busy"]);
-             this.mTab._notselectedsinceload = !this.mTab.selected;
+             this._tab.setAttribute("busy", "true");
++            if (!this._tab.selected) this._tab.setAttribute("unread", "true");
+             gBrowser._tabAttrModified(this._tab, ["busy"]);
+             this._tab._notselectedsinceload = !this._tab.selected;
            }
-@@ -9515,6 +9793,7 @@
+@@ -9503,6 +9781,7 @@
          // known defaults. Note we use the original URL since about:newtab
          // redirects to a prerendered page.
          const shouldRemoveFavicon =
-+          !this.mTab.zenStaticIcon &&
-           !this.mBrowser.mIconURL &&
++          !this._tab.zenStaticIcon &&
+           !this._browser.mIconURL &&
            !ignoreBlank &&
            !(originalLocation.spec in FAVICON_DEFAULTS);
-@@ -9689,13 +9968,6 @@
-             this.mBrowser.originalURI = aRequest.originalURI;
+@@ -9677,13 +9956,6 @@
+             this._browser.originalURI = aRequest.originalURI;
            }
  
 -          if (!gBrowser._allowTransparentBrowser) {
--            this.mBrowser.toggleAttribute(
+-            this._browser.toggleAttribute(
 -              "transparent",
 -              AIWindow.isAIWindowActive(window) &&
 -                AIWindow.isAIWindowContentPage(aLocation)
@@ -1152,8 +1161,8 @@ index 08b5b56e069d038d72c87355920c4ce8a55ed805..209c0ddc0297adb8340180c58de07ae1
 -          }
          }
  
-         let userContextId = this.mBrowser.getAttribute("usercontextid") || 0;
-@@ -10587,7 +10859,8 @@ var TabContextMenu = {
+         let userContextId = this._browser.getAttribute("usercontextid") || 0;
+@@ -10532,7 +10804,8 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !this.multiselected;

src/browser/components/urlbar/UrlbarProvidersManager-sys-mjs.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-index 8de151f473ac6b95bc606251f78a4bede093ee0c..dbd302259c54b0196a370b9ff12ba0dcf1545272 100644
+index d2e2415e6b7c8833617dd1d4d01b16b110afbfa5..4a1e6e0940789b55144afd0566ecb91d88f7d590 100644
 --- a/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
 +++ b/browser/components/urlbar/UrlbarProvidersManager.sys.mjs
-@@ -913,6 +913,7 @@ export class Query {
+@@ -914,6 +914,7 @@ export class Query {
      if (
        result.heuristic &&
        this.context.searchMode &&
@@ -10,21 +10,21 @@ index 8de151f473ac6b95bc606251f78a4bede093ee0c..dbd302259c54b0196a370b9ff12ba0dc
        (!this.context.trimmedSearchString ||
          (!this.context.searchMode.engineName && !result.autofill))
      ) {
-@@ -1043,6 +1044,7 @@ function updateSourcesIfEmpty(context) {
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_TITLE,
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_URL,
-             lazy.UrlbarTokenizer.TYPE.RESTRICT_ACTION,
-+            lazy.UrlbarTokenizer.TYPE.RESTRICT_WORKSPACE,
+@@ -1044,6 +1045,7 @@ function updateSourcesIfEmpty(context) {
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_TITLE,
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_URL,
+             lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_ACTION,
++            lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_WORKSPACE,
            ].includes(t.type)
          );
  
-@@ -1100,6 +1102,14 @@ function updateSourcesIfEmpty(context) {
+@@ -1103,6 +1105,14 @@ function updateSourcesIfEmpty(context) {
            acceptedSources.push(source);
          }
          break;
 +      case lazy.UrlbarUtils.RESULT_SOURCE.WORKSPACES:
 +        if (
-+          restrictTokenType === lazy.UrlbarTokenizer.TYPE.RESTRICT_WORKSPACE ||
++          restrictTokenType === lazy.UrlbarShared.TOKEN_TYPE.RESTRICT_WORKSPACE ||
 +          !restrictTokenType
 +        ) {
 +          acceptedSources.push(source);

src/browser/components/urlbar/UrlbarResult-sys-mjs.patch

@@ -1,15 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarResult.sys.mjs b/browser/components/urlbar/UrlbarResult.sys.mjs
-index 21f7938f76375e7230f9509e4932cafa4d0e57f2..ab96b160b6c65da3bf267d9fe2f1f35c7507466e 100644
---- a/browser/components/urlbar/UrlbarResult.sys.mjs
-+++ b/browser/components/urlbar/UrlbarResult.sys.mjs
-@@ -181,6 +181,10 @@ export class UrlbarResult {
-     return this.#heuristic;
-   }
- 
-+  set heuristic(value) {
-+    this.#heuristic = value;
-+  }
-+
-   get hideRowLabel() {
-     return this.#hideRowLabel;
-   }

src/browser/components/urlbar/UrlbarTokenizer-sys-mjs.patch

@@ -1,28 +0,0 @@
-diff --git a/browser/components/urlbar/UrlbarTokenizer.sys.mjs b/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-index d4af0ee5138a69139b94d898fb07e2345172f025..f750aae3f9f0a849ca009784510575b2b7119e6d 100644
---- a/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-+++ b/browser/components/urlbar/UrlbarTokenizer.sys.mjs
-@@ -66,6 +66,7 @@ export var UrlbarTokenizer = {
-     // `looksLikeOrigin()` returned `LOOKS_LIKE_ORIGIN.OTHER` for this token. It
-     // may or may not be an origin.
-     POSSIBLE_ORIGIN_BUT_SEARCH_ALLOWED: 12,
-+    RESTRICT_WORKSPACE: 13,
-   }),
- 
-   // The special characters below can be typed into the urlbar to restrict
-@@ -83,6 +84,7 @@ export var UrlbarTokenizer = {
-     TITLE: "#",
-     URL: "$",
-     ACTION: ">",
-+    WORKSPACE: "`",
-   }),
- 
-   // The keys of characters in RESTRICT that will enter search mode.
-@@ -97,6 +99,7 @@ export var UrlbarTokenizer = {
-     if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
-       keys.push(this.RESTRICT.ACTION);
-     }
-+    keys.push(this.RESTRICT.WORKSPACE);
-     return new Set(keys);
-   },
- 

src/browser/components/urlbar/UrlbarUtils-sys-mjs.patch

@@ -26,7 +26,7 @@ index aa7c67f2bfaa3f15d592a14b527a8721dfc9bc6f..d2fe012796ea3a5be05090a732011b3c
        },
 +      {
 +        source: this.RESULT_SOURCE.WORKSPACES,
-+        restrict: lazy.UrlbarTokenizer.RESTRICT.WORKSPACE,
++        restrict: lazy.UrlbarShared.RESTRICT_TOKENS.WORKSPACE,
 +        icon: "chrome://browser/skin/zen-icons/selectable/layers.svg",
 +        pref: "shortcuts.workspaces",
 +        telemetryLabel: "workspaces",

src/browser/components/urlbar/UrlbarValueFormatter-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
-index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d813e5e06 100644
+index 7ccffa60be42ba5e554b0e91bc831c56c24dfb42..ca5d6f983490f6cfc392c92f3570a5fb1bb3c43d 100644
 --- a/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 +++ b/browser/components/urlbar/UrlbarValueFormatter.sys.mjs
 @@ -77,7 +77,7 @@ export class UrlbarValueFormatter {
@@ -11,7 +11,7 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      });
    }
  
-@@ -105,6 +105,18 @@ export class UrlbarValueFormatter {
+@@ -126,6 +126,18 @@ export class UrlbarValueFormatter {
    }
  
    #ensureFormattedHostVisible(urlMetaData) {
@@ -30,7 +30,7 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      // Make sure the host is always visible. Since it is aligned on
      // the first strong directional character, we set scrollLeft
      // appropriately to ensure the domain stays visible in case of an
-@@ -381,7 +393,7 @@ export class UrlbarValueFormatter {
+@@ -403,7 +415,7 @@ export class UrlbarValueFormatter {
     * @returns {boolean}
     *   True if formatting was applied and false if not.
     */
@@ -39,11 +39,15 @@ index 8def83509f097ba034b9d94ae00d2ee474ec2d30..ebdb84b9af928b132b848bd4c5bb506d
      let urlMetaData = this.#getUrlMetaData();
      if (!urlMetaData) {
        return false;
-@@ -650,6 +662,7 @@ export class UrlbarValueFormatter {
-       this.#window.requestAnimationFrame(() => {
-         if (instance == this.#resizeInstance) {
-           this.#ensureFormattedHostVisible();
-+          this._formatURL();
+@@ -688,9 +700,10 @@ export class UrlbarValueFormatter {
+           ) {
+             // The host range is no longer valid.
+             this.#removeURLFormat();
+-            this.#formatURL();
++            this._formatURL();
+           } else {
+             this.#ensureFormattedHostVisible();
++            this._formatURL();
+           }
          }
        });
-     }, 100);

src/browser/components/urlbar/content/UrlbarInput-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/content/UrlbarInput.mjs b/browser/components/urlbar/content/UrlbarInput.mjs
-index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07ed57bd36 100644
+index 0b1b4b2f0f8d6b0fb126aa1224409ab6f1ffb8d8..4405e1bf385477c2161ae3a5a62e32c1403a3630 100644
 --- a/browser/components/urlbar/content/UrlbarInput.mjs
 +++ b/browser/components/urlbar/content/UrlbarInput.mjs
 @@ -98,6 +98,13 @@ const lazy = XPCOMUtils.declareLazy({
@@ -61,10 +61,10 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
    }
  
    /**
-@@ -1627,7 +1656,11 @@ ${
-     }
+@@ -1630,7 +1659,11 @@ ${
+     openParams.avoidBrowserFocus = keepViewOpen;
  
-     if (!this.#providesSearchMode(result)) {
+     if (!this.#providesSearchMode(result) && !keepViewOpen) {
 -      this.view.close({ elementPicked: true });
 +      if (this._zenHandleUrlbarClose) {
 +        this._zenHandleUrlbarClose(true, true);
@@ -74,7 +74,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      }
  
      if (isCanonized) {
-@@ -2936,6 +2969,42 @@ ${
+@@ -2940,6 +2973,42 @@ ${
      await this.#updateLayoutBreakoutDimensions();
    }
  
@@ -117,9 +117,9 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
    startLayoutExtend() {
      if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
        // Do not expand if the Urlbar does not support being expanded or it is
-@@ -2954,6 +3023,13 @@ ${
- 
+@@ -2957,6 +3026,13 @@ ${
      this.toggleAttribute("breakout-extend", true);
+     this.#updateTextboxPosition();
  
 +    this.window.gZenUIManager.onUrlbarOpen();
 +    if (this.zenUrlbarBehavior == 'float' || (this.zenUrlbarBehavior == 'floating-on-type' && !this.focusedViaMousedown)) {
@@ -131,7 +131,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      // Enable the animation only after the first extend call to ensure it
      // doesn't run when opening a new window.
      if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2981,6 +3057,29 @@ ${
+@@ -2984,6 +3060,29 @@ ${
        return;
      }
  
@@ -161,7 +161,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      this.toggleAttribute("breakout-extend", false);
      this.#updateTextboxPosition();
    }
-@@ -3028,7 +3127,7 @@ ${
+@@ -3031,7 +3130,7 @@ ${
      forceUnifiedSearchButtonAvailable = false
    ) {
      let prevState = this.getAttribute("pageproxystate");
@@ -170,7 +170,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      this.setAttribute("pageproxystate", state);
      this._inputContainer.setAttribute("pageproxystate", state);
      this._identityBox?.setAttribute("pageproxystate", state);
-@@ -3309,10 +3408,12 @@ ${
+@@ -3314,10 +3413,12 @@ ${
      }
  
      this.style.top = px(
@@ -183,7 +183,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      );
    }
  
-@@ -3371,9 +3472,10 @@ ${
+@@ -3376,9 +3477,10 @@ ${
            return;
          }
  
@@ -195,7 +195,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
          );
          this.style.setProperty(
            "--urlbar-height",
-@@ -3878,6 +3980,7 @@ ${
+@@ -3883,6 +3985,7 @@ ${
    }
  
    _toggleActionOverride(event) {
@@ -203,7 +203,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (
        event.keyCode == KeyEvent.DOM_VK_SHIFT ||
        event.keyCode == KeyEvent.DOM_VK_ALT ||
-@@ -3990,8 +4093,8 @@ ${
+@@ -3995,8 +4098,8 @@ ${
      if (!this.#isAddressbar) {
        return val;
      }
@@ -214,15 +214,15 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        : val;
      // Only trim value if the directionality doesn't change to RTL and we're not
      // showing a strikeout https protocol.
-@@ -4290,6 +4393,7 @@ ${
-     resultDetails = null,
-     browser = this.window.gBrowser.selectedBrowser
+@@ -4298,6 +4401,7 @@ ${
+     browser = this.window.gBrowser.selectedBrowser,
+     keepViewOpen = false
    ) {
 +    openUILinkWhere = this.window.gZenUIManager.getOpenUILinkWhere(url, browser, openUILinkWhere);
      if (this.#isAddressbar) {
        this.#prepareAddressbarLoad(
          url,
-@@ -4401,6 +4505,10 @@ ${
+@@ -4411,6 +4515,10 @@ ${
        }
        reuseEmpty = true;
      }
@@ -233,7 +233,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (
        where == "tab" &&
        reuseEmpty &&
-@@ -4408,6 +4516,9 @@ ${
+@@ -4418,6 +4526,9 @@ ${
      ) {
        where = "current";
      }
@@ -243,7 +243,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      return where;
    }
  
-@@ -4662,6 +4773,7 @@ ${
+@@ -4672,6 +4783,7 @@ ${
        this.setResultForCurrentValue(null);
        this.handleCommand();
        this.controller.clearLastQueryContextCache();
@@ -251,7 +251,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
        this._suppressStartQuery = false;
      });
-@@ -4669,7 +4781,6 @@ ${
+@@ -4679,7 +4791,6 @@ ${
      contextMenu.addEventListener("popupshowing", () => {
        // Close the results pane when the input field contextual menu is open,
        // because paste and go doesn't want a result selection.
@@ -259,7 +259,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
        let controller =
          this.document.commandDispatcher.getControllerForCommand("cmd_paste");
-@@ -4825,7 +4936,11 @@ ${
+@@ -4842,7 +4953,11 @@ ${
      if (!engineName && !source && !this.hasAttribute("searchmode")) {
        return;
      }
@@ -272,7 +272,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      if (this._searchModeIndicatorTitle) {
        this._searchModeIndicatorTitle.textContent = "";
        this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
-@@ -5141,6 +5256,7 @@ ${
+@@ -5159,6 +5274,7 @@ ${
  
      this.document.l10n.setAttributes(
        this.inputField,
@@ -280,7 +280,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        l10nId,
        l10nId == "urlbar-placeholder-with-name"
          ? { name: engineName }
-@@ -5264,6 +5380,11 @@ ${
+@@ -5282,6 +5398,11 @@ ${
    }
  
    _on_click(event) {
@@ -292,7 +292,11 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
      switch (event.target) {
        case this.inputField:
        case this._inputContainer:
-@@ -5356,7 +5477,7 @@ ${
+@@ -5371,10 +5492,11 @@ ${
+       }
+       if (untrim) {
+         this._setValue(this._untrimmedValue);
++        this.setSelectionRange(0, this.value.length);
        }
      }
  
@@ -301,7 +305,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
        this.view.autoOpen({ event });
      } else {
        if (this._untrimOnFocusAfterKeydown) {
-@@ -5396,9 +5517,16 @@ ${
+@@ -5414,9 +5536,16 @@ ${
    }
  
    _on_mousedown(event) {
@@ -319,7 +323,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
          if (
            event.composedTarget != this.inputField &&
            event.composedTarget != this._inputContainer
-@@ -5408,6 +5536,10 @@ ${
+@@ -5426,6 +5555,10 @@ ${
  
          this.focusedViaMousedown = !this.focused;
          this.#preventClickSelectsAll = this.focused;
@@ -330,7 +334,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
  
          // Keep the focus status, since the attribute may be changed
          // upon calling this.focus().
-@@ -5443,7 +5575,7 @@ ${
+@@ -5461,7 +5594,7 @@ ${
          }
          // Don't close the view when clicking on a tab; we may want to keep the
          // view open on tab switch, and the TabSelect event arrived earlier.
@@ -339,7 +343,7 @@ index 0fba59d62af9d3cd05bfee2cf84cd8b7cf9bfd6e..3997a5109267f378b59aa6510cbacd07
            break;
          }
  
-@@ -5732,7 +5864,7 @@ ${
+@@ -5750,7 +5883,7 @@ ${
      // When we are in actions search mode we can show more results so
      // increase the limit.
      let maxResults =

src/browser/components/urlbar/content/UrlbarResult-mjs.patch

@@ -0,0 +1,15 @@
+diff --git a/browser/components/urlbar/content/UrlbarResult.mjs b/browser/components/urlbar/content/UrlbarResult.mjs
+index 30662cbb0551a5efe12926eb1524719ece24ee48..1ed598c8b8c0836759b5af10e6cc9f5e334744ef 100644
+--- a/browser/components/urlbar/content/UrlbarResult.mjs
++++ b/browser/components/urlbar/content/UrlbarResult.mjs
+@@ -184,6 +184,10 @@ export class UrlbarResult {
+     return this.#heuristic;
+   }
+ 
++  set heuristic(value) {
++    this.#heuristic = value;
++  }
++
+   get hideRowLabel() {
+     return this.#hideRowLabel;
+   }

src/browser/components/urlbar/content/UrlbarShared-mjs.patch

@@ -0,0 +1,28 @@
+diff --git a/browser/components/urlbar/content/UrlbarShared.mjs b/browser/components/urlbar/content/UrlbarShared.mjs
+index 5522d8a8c8d9549453c1700ff6fec40be52747ce..7b8ad33cc337907249749074057254bf7e316994 100644
+--- a/browser/components/urlbar/content/UrlbarShared.mjs
++++ b/browser/components/urlbar/content/UrlbarShared.mjs
+@@ -32,6 +32,7 @@ export const UrlbarShared = {
+     // `looksLikeOrigin()` returned `LOOKS_LIKE_ORIGIN.OTHER` for this token.
+     // It may or may not be an origin.
+     POSSIBLE_ORIGIN_BUT_SEARCH_ALLOWED: 12,
++    RESTRICT_WORKSPACE: 13,
+   }),
+ 
+   /**
+@@ -52,6 +53,7 @@ export const UrlbarShared = {
+     TITLE: "#",
+     URL: "$",
+     ACTION: ">",
++    WORKSPACE: "`",
+   }),
+ 
+   /**
+@@ -68,6 +70,7 @@ export const UrlbarShared = {
+     if (lazy.UrlbarPrefs.get("scotchBonnet.enableOverride")) {
+       keys.push(this.RESTRICT_TOKENS.ACTION);
+     }
++    keys.push(this.RESTRICT_TOKENS.WORKSPACE);
+     return new Set(keys);
+   },
+ };

src/browser/components/urlbar/content/UrlbarView-mjs.patch

@@ -1,8 +1,8 @@
-diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c02f69a94 100644
---- a/browser/components/urlbar/UrlbarView.sys.mjs
-+++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -640,7 +640,7 @@ export class UrlbarView {
+diff --git a/browser/components/urlbar/content/UrlbarView.mjs b/browser/components/urlbar/content/UrlbarView.mjs
+index 8afb2bf4a757b3ef7902f5a6e6eed6b70ca2845e..440dea1e66540ca1998cb7464b6695ac823fedcb 100644
+--- a/browser/components/urlbar/content/UrlbarView.mjs
++++ b/browser/components/urlbar/content/UrlbarView.mjs
+@@ -674,7 +674,7 @@ export class UrlbarView {
        !this.input.value ||
        this.input.getAttribute("pageproxystate") == "valid"
      ) {
@@ -11,7 +11,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
          // Try to reuse the cached top-sites context. If it's not cached, then
          // there will be a gap of time between when the input is focused and
          // when the view opens that can be perceived as flicker.
-@@ -777,10 +777,6 @@ export class UrlbarView {
+@@ -812,10 +812,6 @@ export class UrlbarView {
      }
  
      // If search mode isn't active, close the view.
@@ -22,7 +22,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
  
      // Search mode is active.  If the one-offs should be shown, make sure they
      // are enabled and show the view.
-@@ -2988,6 +2984,8 @@ export class UrlbarView {
+@@ -3031,6 +3027,8 @@ export class UrlbarView {
        if (row?.hasAttribute("row-selectable")) {
          row?.toggleAttribute("selected", true);
        }
@@ -31,7 +31,7 @@ index b665adb1a1ce8bbae8df4cbea6c3248c3e4fb431..1de7f9461b8ccbd4680b917e6dd5ba3c
        if (element != row) {
          row?.toggleAttribute("descendant-selected", true);
        }
-@@ -3477,7 +3475,7 @@ export class UrlbarView {
+@@ -3544,7 +3542,7 @@ export class UrlbarView {
    }
  
    #enableOrDisableRowWrap() {

src/browser/themes/shared/identity-block/identity-block-css.patch

@@ -1,18 +1,18 @@
 diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
-index f239438ce661ae2c33a3e04ecc6d403b3a56a42b..c3a237aa78cff7aaaf0a7b931dd2b4d99049c051 100644
+index 82c3e319f783e6383ce437131808bbde14293379..6b4444b8ad68664f746be057aae4c59e01e8d170 100644
 --- a/browser/themes/shared/identity-block/identity-block.css
 +++ b/browser/themes/shared/identity-block/identity-block.css
-@@ -7,7 +7,7 @@
- #identity-box {
-   margin-inline-end: var(--identity-box-margin-inline);
+@@ -12,7 +12,7 @@
+ }
  
+ #identity-box {
 -  &[pageproxystate="invalid"] {
 +  :root[zen-has-empty-tab='true'] & {
      pointer-events: none;
      -moz-user-focus: ignore;
-   }
-@@ -85,13 +85,6 @@
-   }
+ 
+@@ -96,13 +96,6 @@
+   margin: 0;
  }
  
 -#identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
@@ -25,7 +25,7 @@ index f239438ce661ae2c33a3e04ecc6d403b3a56a42b..c3a237aa78cff7aaaf0a7b931dd2b4d9
  
  #urlbar[focused] {
    #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button:not(:hover, [open]),
-@@ -182,16 +175,17 @@
+@@ -193,16 +186,17 @@
    }
  
    #identity-icon {

src/browser/themes/shared/jar-inc-mn.patch

@@ -1,11 +1,10 @@
 diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index e3bdc11e449fb2cd2a4033a1d8c1bba00455e748..f928bc1a3a668dcc1a9ecde9945c6349e5903828 100644
+index 7892988bd5994d5183d25bf575d486f89ac888d0..a837672bb2fa1a404640fc8b2908fe4bd68d3c04 100644
 --- a/browser/themes/shared/jar.inc.mn
 +++ b/browser/themes/shared/jar.inc.mn
-@@ -352,3 +352,5 @@
- 
+@@ -357,3 +357,5 @@
    skin/classic/browser/illustrations/market-opt-in.svg         (../shared/illustrations/market-opt-in.svg)
+   skin/classic/browser/illustrations/tab-groups.svg            (../shared/illustrations/tab-groups.svg)
    skin/classic/browser/illustrations/yelpRealtime-opt-in.svg   (../shared/illustrations/yelpRealtime-opt-in.svg)
 +
 +#include zen-sources.inc.mn
-\ No newline at end of file

src/browser/themes/shared/places/organizer-shared-css.patch

@@ -0,0 +1,21 @@
+diff --git a/browser/themes/shared/places/organizer-shared.css b/browser/themes/shared/places/organizer-shared.css
+index fe6b79cfc2453927c324a044bd62040f866def95..a93813c76ba3633c365a739289b39187c0d1e881 100644
+--- a/browser/themes/shared/places/organizer-shared.css
++++ b/browser/themes/shared/places/organizer-shared.css
+@@ -52,6 +52,16 @@
+   }
+ }
+ 
++#places .zenEditBMPanel_fieldContainer {
++  display: contents;
++}
++
++#places label[control="editBMPanel_workspacesSelectorExpander"],
++#places #editBMPanel_workspaceDropdown,
++#places #editBMPanel_workspaceList {
++  display: none;
++}
++
+ #editBMPanel_itemsCountText {
+   grid-column: auto / span 2;
+   justify-self: center;

src/browser/themes/shared/preferences/zen-preferences.css

@@ -484,11 +484,10 @@ groupbox h2 {
 #helpButton,
 #support-firefox,
 #tabGroupSuggestions,
-#web-appearance-manage-themes-link,
 #setting-control-sidebarChatbotFieldset,
 #setting-control-supportFirefox,
 .mission-message,
-html|setting-group:is([data-subcategory="layout"], [groupid="support"]) {
+html|setting-group:is([data-subcategory="layout"], [groupid="support"], [groupid="browserTheme"]) {
   display: none !important;
 }
 

src/browser/themes/shared/tabbrowser/content-area-css.patch

@@ -1,16 +1,16 @@
 diff --git a/browser/themes/shared/tabbrowser/content-area.css b/browser/themes/shared/tabbrowser/content-area.css
-index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb04ac6adbd 100644
+index 3acdec2b8e043fe27919cfa54e73f4d3c491bfc8..267a1087134464a8193a824a2d7f8ac15ff8ad60 100644
 --- a/browser/themes/shared/tabbrowser/content-area.css
 +++ b/browser/themes/shared/tabbrowser/content-area.css
-@@ -171,7 +171,6 @@
+@@ -157,7 +157,6 @@
    min-height: 0;
  
    /* We want to be able to show the frame color behind the clipped radiused corner */
 -  background: var(--tabpanel-background-color);
  
-   /* stylelint-disable-next-line media-query-no-invalid */
    @media -moz-pref("sidebar.revamp") {
-@@ -235,7 +234,6 @@
+     outline: 0.01px solid var(--chrome-content-separator-color);
+@@ -216,7 +215,6 @@
    }
  
    browser:is([blank], [pendingpaint]) {
@@ -18,7 +18,7 @@ index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb0
    }
  
    /* Exclude browsers with smartwindow-content attribute which inherit
-@@ -555,7 +553,7 @@ split-view-footer {
+@@ -553,7 +551,7 @@ split-view-footer {
  
  .dialogStack {
    z-index: var(--browser-stack-z-index-dialog-stack);
@@ -27,7 +27,7 @@ index dff8162a84dbbe6873fa771828698b47b80d0472..e0c378af7a5cc607c2de1c9b5693adb0
    inset: 0;
    /* --browser-with-dialog set on browser[tabDialogShowing], we want to position the overlay
       only on the top of the <browser> element so it doesn't overlap the DevTools toolbox */
-@@ -722,7 +720,7 @@ split-view-footer {
+@@ -718,7 +716,7 @@ split-view-footer {
  
  .dialogOverlay[topmost="true"],
  #window-modal-dialog::backdrop {

src/browser/themes/shared/tabbrowser/tabs-css.patch

@@ -1,8 +1,8 @@
 diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf272870987 100644
+index 24ad9ab050a67d4a375eb1d05261a7f7c267d7d1..b2f2ae8e765ad1f052aa07ab1d47f285062fbbcc 100644
 --- a/browser/themes/shared/tabbrowser/tabs.css
 +++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -34,7 +34,7 @@
+@@ -33,7 +33,7 @@
    --tab-group-line-thickness: 2px;
    --tab-group-line-toolbar-border-distance: 1px;
    /* Collapsed tabs should be square, so set width to match the min height */
@@ -11,7 +11,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    --tab-collapsed-width: calc(var(--tab-collapsed-background-width) + 2 * var(--tab-inner-inline-margin));
    --tab-pinned-min-width-expanded: calc(var(--tab-pinned-expanded-background-width) + 2 * var(--tab-pinned-margin-inline-expanded));
    --tab-note-icon-end-margin: var(--dimension-4);
-@@ -285,7 +285,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -282,7 +282,6 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    :root:not([uidensity="compact"], [sidebar-expand-on-hover]) &[pinned] {
@@ -19,7 +19,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &:is([selected], [multiselected]) {
-@@ -299,6 +298,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -296,6 +295,7 @@ tab-split-view-wrapper[dragtarget] {
      border-radius: inherit;
      position: relative;
      overflow: hidden;
@@ -27,8 +27,8 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  
      &::before {
        position: absolute;
-@@ -498,10 +498,6 @@ tab-split-view-wrapper[dragtarget] {
-   /* stylelint-disable-next-line media-query-no-invalid */
+@@ -493,10 +493,6 @@ tab-split-view-wrapper[dragtarget] {
+ 
    @media -moz-pref("browser.tabs.fadeOutUnloadedTabs") {
      &[pending] {
 -      filter: grayscale(100%);
@@ -38,8 +38,8 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -518,10 +514,6 @@ tab-split-view-wrapper[dragtarget] {
-   /* stylelint-disable-next-line media-query-no-invalid */
+@@ -512,10 +508,6 @@ tab-split-view-wrapper[dragtarget] {
+ 
    @media -moz-pref("browser.tabs.fadeOutExplicitlyUnloadedTabs") {
      &[pending][discarded] {
 -      filter: grayscale(100%);
@@ -49,7 +49,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        opacity: 0.5;
        /* Fade the favicon out */
        transition-property: filter, opacity;
-@@ -596,7 +588,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -589,7 +581,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"] & {
@@ -58,7 +58,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &[crashed] {
-@@ -604,7 +596,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -597,7 +589,7 @@ tab-split-view-wrapper[dragtarget] {
    }
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -67,7 +67,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
      &[soundplaying] {
        list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
      }
-@@ -661,7 +653,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -651,7 +643,7 @@ tab-split-view-wrapper[dragtarget] {
      }
    }
  
@@ -76,7 +76,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    &[crashed] {
      display: revert;
    }
-@@ -829,7 +821,7 @@ tab-split-view-wrapper[dragtarget] {
+@@ -811,7 +803,7 @@ tab-split-view-wrapper[dragtarget] {
        has not been added to root. There are certain scenarios when that attribute is temporarily
        removed from root such as when toggling the sidebar to expand with the toolbar button. */
      #tabbrowser-tabs[orient="horizontal"] &:not([pinned]):not([crashed]),
@@ -85,7 +85,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
        &:is([soundplaying], [muted], [activemedia-blocked]) {
          display: flex;
        }
-@@ -1053,7 +1045,6 @@ tab-split-view-wrapper[dragtarget] {
+@@ -1031,7 +1023,6 @@ tab-split-view-wrapper[dragtarget] {
  .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected]),
  .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected]),
  #tabbrowser-tabs[orient="vertical"] .tabbrowser-tab > .tab-stack > .tab-content[titlechanged]:not([selected]) {
@@ -93,7 +93,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    background-position: center bottom 6.5px;
    background-size: 4px 4px;
    background-repeat: no-repeat;
-@@ -1813,7 +1804,7 @@ tab-group {
+@@ -1780,7 +1771,7 @@ tab-group {
  }
  
  #tabbrowser-tabs[orient="vertical"][expanded] {
@@ -102,7 +102,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    &[movingtab][movingtab-addToGroup]:not([movingtab-group], [movingtab-ungroup]) .tabbrowser-tab:is(:active, [multiselected]) {
      margin-inline-start: var(--space-medium);
    }
-@@ -2378,7 +2369,7 @@ tab-group {
+@@ -2335,7 +2326,7 @@ tab-group {
    }
  }
  
@@ -111,7 +111,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  #vertical-tabs-newtab-button {
    appearance: none;
    min-height: var(--tab-min-height);
-@@ -2389,7 +2380,7 @@ tab-group {
+@@ -2346,7 +2337,7 @@ tab-group {
    margin-inline: var(--tab-inner-inline-margin);
  
    #tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -120,7 +120,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  
    &:hover {
-@@ -2413,7 +2404,7 @@ tab-group {
+@@ -2370,7 +2361,7 @@ tab-group {
   * flex container. #tabs-newtab-button is a child of the arrowscrollbox where
   * we don't want a gap (between tabs), so we have to add some margin.
   */
@@ -129,7 +129,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    margin-block: var(--tab-block-margin);
  }
  
-@@ -2610,7 +2601,6 @@ tab-group {
+@@ -2560,7 +2551,6 @@ tab-group {
  
    &:not([expanded]) {
      .tabbrowser-tab[pinned] {
@@ -137,7 +137,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
      }
  
      .tab-background {
-@@ -2651,8 +2641,8 @@ tab-group {
+@@ -2599,8 +2589,8 @@ tab-group {
        display: block;
        position: absolute;
        inset: auto;
@@ -148,7 +148,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
  
        &:-moz-window-inactive {
          background-image:
-@@ -2753,9 +2743,6 @@ tab-group {
+@@ -2698,9 +2688,6 @@ tab-group {
    ~ #tabbrowser-tabs[orient="horizontal"]::before {
      display: flex;
      content: "";
@@ -158,7 +158,7 @@ index b70af17781a4128593e3c092cf0f6aec81ab5f9a..1c11c2bf9dcde9d468959e9115a48cf2
    }
  }
  
-@@ -2788,7 +2775,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -2733,7 +2720,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
    list-style-image: url(chrome://global/skin/icons/plus.svg);
  }
  

src/browser/themes/shared/urlbar-searchbar-css.patch

@@ -1,17 +1,19 @@
 diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
-index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec772e3a7d 100644
+index cc595de7e3839f7e688122552bca95f9f9ad3988..da4b1e1b5013d7a1a9af3d45d94db7194a1826f7 100644
 --- a/browser/themes/shared/urlbar-searchbar.css
 +++ b/browser/themes/shared/urlbar-searchbar.css
-@@ -12,7 +12,7 @@
-   /* Usually we wouldn't need snapping border widths manually, but we use this
-    * for other layout calculations too */
-   --urlbar-container-border-width: max(env(hairline), round(down, 1px, env(hairline)));
--  --urlbar-container-padding: round(up, 1px, env(hairline));
-+  --urlbar-container-padding: 2px;
-   --urlbar-container-inset: calc(var(--urlbar-container-border-width) + var(--urlbar-container-padding));
+@@ -19,8 +19,8 @@
  
+   @media not -moz-pref("browser.nova.enabled") {
+     --urlbar-basic-component-size: calc(var(--urlbar-min-height) - 2 * (var(--urlbar-input-container-border-width) + var(--urlbar-input-container-padding)));
+-    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
+-    --urlbar-input-container-padding: round(up, 1px, env(hairline));
++    --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
++    --urlbar-input-container-padding: 2px;
+   }
    @media (max-width: 770px) {
-@@ -55,7 +55,7 @@ toolbar[inactive="true"] .urlbar,
+     --urlbar-container-min-width: 240px;
+@@ -114,7 +114,7 @@ toolbar[inactive="true"] .urlbar,
  .urlbar:not([usertyping]) > .urlbar-input-container > .urlbar-go-button,
  .urlbar:not(#searchbar-new, [focused]) > .urlbar-input-container > .urlbar-go-button,
  #urlbar-revert-button-container {
@@ -20,7 +22,7 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
  }
  
  /* Document Picture-in-Picture API window */
-@@ -205,6 +205,10 @@ toolbar[inactive="true"] .urlbar,
+@@ -350,6 +350,10 @@ toolbar[inactive="true"] .urlbar,
      mask-image: linear-gradient(to right, transparent var(--urlbar-scheme-size), black calc(var(--urlbar-scheme-size) + 3ch));
    }
  
@@ -28,10 +30,10 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
 +    mask-image: linear-gradient(to right, transparent, black 3ch, black calc(100% - 3ch), transparent);
 +  }
 +
-   /* stylelint-disable-next-line media-query-no-invalid */
-   @media -moz-pref("browser.nova.enabled") {
-     &::selection {
-@@ -429,10 +433,14 @@ toolbar[inactive="true"] .urlbar,
+   &::selection {
+     border-radius: var(--urlbar-selection-border-radius);
+   }
+@@ -464,10 +468,14 @@ toolbar[inactive="true"] .urlbar,
  
    .urlbar[breakout][breakout-extend] {
      height: auto;
@@ -44,5 +46,5 @@ index cbd074b9bacfbf7cc82a67ad586ebc31c4d85970..993c61ba389cb9d912b2cebee9d71bec
      > .urlbar-input-container {
 +      align-items: center;
        height: var(--urlbar-container-height);
-       padding-block: calc((var(--urlbar-container-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding));
-       padding-inline: calc(var(--urlbar-margin-inline) + var(--urlbar-container-padding));
+       padding-block: calc((var(--urlbar-container-height) - var(--urlbar-height)) / 2 + var(--urlbar-input-container-padding));
+       padding-inline: calc(var(--urlbar-margin-inline) + var(--urlbar-input-container-padding));

src/browser/themes/shared/urlbar/variables-css.patch

@@ -1,13 +0,0 @@
-diff --git a/browser/themes/shared/urlbar/variables.css b/browser/themes/shared/urlbar/variables.css
-index 64eb46b3061504e590d3fcee0c30c902f68764fe..6e7ffe043c5676da27a6eb5b105dac2fde3309da 100644
---- a/browser/themes/shared/urlbar/variables.css
-+++ b/browser/themes/shared/urlbar/variables.css
-@@ -9,7 +9,7 @@
- :root {
-   --identity-box-margin-inline: 4px;
-   --urlbar-min-height: max(32px, 1.4em);
--  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 2px /* padding */ - 16px /* icon */) / 2);
-+  --urlbar-icon-padding: calc((var(--urlbar-min-height) - 2px /* border */ - 14px /* icon */) / 2);
- 
-   /* This should be used for icons and chiclets inside the input field, as well
-      as result rows. It makes the gap around them more uniform when they are

src/browser/themes/shared/zen-icons/icons.css

@@ -816,61 +816,57 @@
   display: none !important;
 }
 
-#zen-media-playpause-button {
+.zen-media-playpause-button {
   list-style-image: url("media-play.svg");
 }
 
-#zen-media-controls-toolbar.playing #zen-media-playpause-button {
+.zen-media-card.playing .zen-media-playpause-button {
   list-style-image: url("media-pause.svg");
 }
 
-#zen-media-nexttrack-button {
+.zen-media-nexttrack-button {
   list-style-image: url("media-next.svg");
 }
 
-#zen-media-previoustrack-button {
+.zen-media-previoustrack-button {
   list-style-image: url("media-previous.svg");
 }
 
-#zen-media-controls-toolbar[muted] #zen-media-mute-button {
+.zen-media-card[muted] .zen-media-mute-button {
   list-style-image: url("media-mute.svg");
 }
 
-#zen-media-mute-button {
+.zen-media-mute-button {
   list-style-image: url("media-unmute.svg");
 }
 
-#zen-media-close-button {
+.zen-media-close-button {
   list-style-image: url("close.svg");
 }
 
-#zen-media-focus-button:hover {
+.zen-media-focus-button:hover {
   list-style-image: url("screen.svg");
 }
 
-#zen-media-close-button {
-  list-style-image: url("close.svg");
-}
-
-#zen-media-mute-mic-button {
+.zen-media-mute-mic-button {
   list-style-image: url("microphone-fill.svg");
 }
 
-#zen-media-controls-toolbar[mic-muted] #zen-media-mute-mic-button {
+.zen-media-card[mic-muted] .zen-media-mute-mic-button {
   list-style-image: url("microphone-blocked-fill.svg");
   fill: rgb(224, 41, 29);
 }
 
-#zen-media-mute-camera-button {
+.zen-media-mute-camera-button {
   list-style-image: url("video-fill.svg");
 }
 
-#zen-media-controls-toolbar[camera-muted] #zen-media-mute-camera-button {
+.zen-media-card[camera-muted] .zen-media-mute-camera-button {
   list-style-image: url("video-blocked-fill.svg");
   fill: rgb(224, 41, 29);
 }
 
-#zen-media-pip-button {
+.zen-media-pip-button {
   list-style-image: url("chrome://global/skin/media/picture-in-picture-open.svg");
 }
 

src/docshell/base/BrowsingContext-h.patch

@@ -1,5 +1,5 @@
 diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
-index 02abb6ab9562a7b41f4a95a6289c80da8d1176e8..1722802021f331338fc10c768301a953e582b711 100644
+index 6f7f58bba3be6f08b3b27e81f30864c61d683351..2516126365ee9e1c07e245a873efe5f48767aff7 100644
 --- a/docshell/base/BrowsingContext.h
 +++ b/docshell/base/BrowsingContext.h
 @@ -265,6 +265,9 @@ struct EmbedderColorSchemes {
@@ -24,13 +24,23 @@ index 02abb6ab9562a7b41f4a95a6289c80da8d1176e8..1722802021f331338fc10c768301a953
    float FullZoom() const { return GetFullZoom(); }
    float TextZoom() const { return GetTextZoom(); }
  
-@@ -1275,6 +1283,9 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
+@@ -1290,6 +1298,19 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
    }
  
    void DidSet(FieldIndex<IDX_SessionStoreEpoch>, uint32_t aOldValue);
 +  void DidSet(FieldIndex<IDX_ZenBoostsData>, nscolor aOldValue);
 +  void DidSet(FieldIndex<IDX_ZenBoostsComplementaryRotation>, float aOldValue);
 +  void DidSet(FieldIndex<IDX_IsZenBoostsInverted>, bool aOldValue);
++  bool CanSet(FieldIndex<IDX_ZenBoostsData>, const nscolor&, ContentParent*) {
++    return true;
++  }
++  bool CanSet(FieldIndex<IDX_ZenBoostsComplementaryRotation>, const float&,
++              ContentParent*) {
++    return true;
++  }
++  bool CanSet(FieldIndex<IDX_IsZenBoostsInverted>, const bool&, ContentParent*) {
++    return true;
++  }
  
-   using CanSetResult = syncedcontext::CanSetResult;
- 
+   // Ensure that opener is in the same BrowsingContextGroup.
+   bool CanSet(FieldIndex<IDX_OpenerId>, const uint64_t& aValue,

src/dom/base/Document-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
-index 328b7524810322561700347fa7f26403897635a8..58d33d68e050d11ea712413ad5c2170a112e404a 100644
+index 73eb08f648d55121a0cd96cd808f932fb14bfee6..efa99861a5da12ad8d0daa2c0eb1473c57810397 100644
 --- a/dom/base/Document.cpp
 +++ b/dom/base/Document.cpp
-@@ -467,6 +467,7 @@
+@@ -471,6 +471,7 @@
  #include "prtime.h"
  #include "prtypes.h"
  #include "xpcpublic.h"
@@ -10,14 +10,15 @@ index 328b7524810322561700347fa7f26403897635a8..58d33d68e050d11ea712413ad5c2170a
  
  // clang-format off
  #include "mozilla/Encoding.h"
-@@ -3198,6 +3199,10 @@ void Document::FillStyleSetUserAndUASheets() {
-   for (StyleSheet* sheet : *sheetService->UserStyleSheets()) {
-     styleSet.AppendStyleSheet(*sheet);
-   }
-+  if (auto sheet = zen::ZenStyleSheetCache::Singleton()->GetModsSheet(); sheet && IsInChromeDocShell()) {
-+    // The mods sheet is only used in the chrome docshell.
-+    styleSet.AppendStyleSheet(*sheet);
-+  }
+@@ -3164,6 +3165,11 @@ void Document::FillStyleSetUserAndUASheets() {
+     }
+   };
  
-   StyleSheet* sheet = IsInChromeDocShell() ? cache->GetUserChromeSheet()
-                                            : cache->GetUserContentSheet();
++  if (IsInChromeDocShell()) {
++    // The mods sheet is only used in the chrome docshell.
++    MaybeAppend(zen::ZenStyleSheetCache::Singleton()->GetModsSheet());
++  }
++
+   MaybeAppend(IsInChromeDocShell() ? cache->GetUserChromeSheet()
+                                    : cache->GetUserContentSheet());
+   MaybeAppend(cache->GetUASheet());

src/dom/chrome-webidl/MediaController-webidl.patch

@@ -1,5 +1,5 @@
 diff --git a/dom/chrome-webidl/MediaController.webidl b/dom/chrome-webidl/MediaController.webidl
-index 6063e86e747dac87aafc865af95800daef2a5b9d..7fc4e72ee73a16b9ec2c1b9d11d926246fb7f7b6 100644
+index 790bc66a31253a861b21658e67c83796ae939298..0fb7e6cfbb1d1d35aeceb8d7b903cd86bf64403c 100644
 --- a/dom/chrome-webidl/MediaController.webidl
 +++ b/dom/chrome-webidl/MediaController.webidl
 @@ -23,6 +23,12 @@ enum MediaControlKey {
@@ -15,12 +15,15 @@ index 6063e86e747dac87aafc865af95800daef2a5b9d..7fc4e72ee73a16b9ec2c1b9d11d92624
  /**
   * MediaController is used to control media playback for a tab, and each tab
   * would only have one media controller, which can be accessed from the
-@@ -36,10 +42,14 @@ interface MediaController : EventTarget {
+@@ -36,6 +42,7 @@ interface MediaController : EventTarget {
    readonly attribute boolean isPlaying;
    readonly attribute boolean isAnyMediaBeingControlled;
    readonly attribute MediaSessionPlaybackState playbackState;
 +  readonly attribute boolean isBeingUsedInPIPModeOrFullscreen;
  
+   // The effective audio-session type the tab is currently claiming. Chrome
+   // consumers can use this to apply tab/application level audio-focus
+@@ -46,6 +53,9 @@ interface MediaController : EventTarget {
    [Throws]
    MediaMetadataInit getMetadata();
  

src/eslint-file-globals-config-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/eslint-file-globals.config.mjs b/eslint-file-globals.config.mjs
-index bf1341a84382380d45b936aeffde3f167301a9ed..b6aa373252888dcdefd528a40329f1959086d8e5 100644
+index c15744aeaf940cea9e438e7b9924a328d2615b9f..df5c6c3f36e78537e0a54fb89dfd5b3d510a51a4 100644
 --- a/eslint-file-globals.config.mjs
 +++ b/eslint-file-globals.config.mjs
 @@ -22,6 +22,7 @@
@@ -10,9 +10,9 @@ index bf1341a84382380d45b936aeffde3f167301a9ed..b6aa373252888dcdefd528a40329f195
  
  export default [
    {
-@@ -550,4 +551,9 @@ export default [
-     ],
-     languageOptions: { globals: globals.worker },
+@@ -576,4 +577,9 @@ export default [
+       globals: globals.audioWorklet,
+     },
    },
 +  {
 +    name: "zen-globals",

src/external-patches/firefox/add_urlbar_closeonwindowblur_preference.patch

@@ -32,9 +32,9 @@ diff --git a/browser/components/urlbar/UrlbarPrefs.sys.mjs b/browser/components/
    // or remote settings.
    ["flightStatus.minKeywordLength", 0],
  
-diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
---- a/browser/components/urlbar/UrlbarView.sys.mjs
-+++ b/browser/components/urlbar/UrlbarView.sys.mjs
+diff --git a/browser/components/urlbar/content/UrlbarView.mjs b/browser/components/urlbar/content/UrlbarView.mjs
+--- a/browser/components/urlbar/content/UrlbarView.mjs
++++ b/browser/components/urlbar/content/UrlbarView.mjs
 @@ -3909,10 +3909,16 @@
        }
      }

src/layout/base/nsPresContext-h.patch

@@ -1,5 +1,5 @@
 diff --git a/layout/base/nsPresContext.h b/layout/base/nsPresContext.h
-index 13aa7141c8e5297d0dd6aa9bd78fd32f050e8123..149a89e928d354f116c54f71605830f5ec6b7f8a 100644
+index 5f27c288fd027cf245421e7f049103a7e19da18a..fcd65b74c5881a75d9cb6847379e32d0a0652e67 100644
 --- a/layout/base/nsPresContext.h
 +++ b/layout/base/nsPresContext.h
 @@ -594,6 +594,22 @@ class nsPresContext : public nsISupports,
@@ -23,11 +23,11 @@ index 13aa7141c8e5297d0dd6aa9bd78fd32f050e8123..149a89e928d354f116c54f71605830f5
 +  bool ZenBoostsOverrideInverted() const { return mZenBoostsOverrideInverted; }
 +
    /**
-    * Return the device's screen size in inches, for font size
-    * inflation.
-@@ -1441,6 +1457,11 @@ class nsPresContext : public nsISupports,
-   mozilla::dom::PrefersColorSchemeOverride mOverriddenOrEmbedderColorScheme;
+    * Sets the effective link parameters overrides, and invalidate stuff as
+    * needed.
+@@ -1434,6 +1450,11 @@ class nsPresContext : public nsISupports,
    mozilla::StyleForcedColors mForcedColors;
+   mozilla::StyleLinkParameters mLinkParameters;
  
 +  nscolor mZenBoostsOverrideAccent = 0;
 +  float mZenBoostsOverrideComplementaryRotation = 0.0f;

src/layout/generic/nsTextPaintStyle-cpp.patch

@@ -1,5 +1,5 @@
 diff --git a/layout/generic/nsTextPaintStyle.cpp b/layout/generic/nsTextPaintStyle.cpp
-index 5d1bf44687e925aff67f44c8e0629f7f06e84e98..1fa60a4d91edc60ba733cefc5f73ab8b7684d02a 100644
+index f741ab5eb83778ec2460a5d975757f09b3f2865e..f39a019c0d82db7ba9a122ce5269d0833ae04568 100644
 --- a/layout/generic/nsTextPaintStyle.cpp
 +++ b/layout/generic/nsTextPaintStyle.cpp
 @@ -240,7 +240,7 @@ bool nsTextPaintStyle::GetTargetTextColor(nscolor* aForeColor) {
@@ -39,18 +39,8 @@ index 5d1bf44687e925aff67f44c8e0629f7f06e84e98..1fa60a4d91edc60ba733cefc5f73ab8b
    return NS_GET_A(*aBackColor) != 0;
  }
  
-@@ -466,19 +467,19 @@ bool nsTextPaintStyle::InitSelectionColorsAndShadow() {
-     // this is web content or chrome content. See bug 2029839.
-     if (!mFrame->PresContext()->Document()->ChromeRulesEnabled()) {
-       mSelectionBGColor = mSelectionPseudoStyle->GetVisitedDependentColor(
--          &nsStyleBackground::mBackgroundColor);
--      mSelectionTextColor =
--          mSelectionPseudoStyle->GetVisitedDependentColor(&nsStyleText::mColor);
-+          &nsStyleBackground::mBackgroundColor, mFrame);
-+      mSelectionTextColor = mSelectionPseudoStyle->GetVisitedDependentColor(
-+          &nsStyleText::mColor, mFrame);
-       return true;
-     }
+@@ -462,12 +463,12 @@ bool nsTextPaintStyle::InitSelectionColorsAndShadow() {
+     mSelectionPseudoStyle = std::move(style);
  
      if (nscolor bgColor = mSelectionPseudoStyle->GetVisitedDependentColor(
 -            &nsStyleBackground::mBackgroundColor);

src/layout/style/StyleColor-cpp.patch

@@ -1,8 +1,8 @@
 diff --git a/layout/style/StyleColor.cpp b/layout/style/StyleColor.cpp
-index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e96cf76f9 100644
+index bbee32af30f35525730a10d0b242c0e8a8fe4695..a590fff105b30bc96fa7a0d8a8d3b1d5aa997e08 100644
 --- a/layout/style/StyleColor.cpp
 +++ b/layout/style/StyleColor.cpp
-@@ -8,6 +8,7 @@
+@@ -9,6 +9,7 @@
  #include "mozilla/dom/BindingDeclarations.h"
  #include "nsIFrame.h"
  #include "nsStyleStruct.h"
@@ -10,7 +10,7 @@ index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e
  
  namespace mozilla {
  
-@@ -34,23 +35,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
+@@ -96,23 +97,24 @@ StyleAbsoluteColor StyleColor::ResolveColor(
  
  template <>
  nscolor StyleColor::CalcColor(nscolor aColor) const {
@@ -40,27 +40,31 @@ index 95c7ae6abea5032bef0466e8d59d212374d7a4d0..85a48f27251756c72db8ed03a673a18e
  }
  
  StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
-@@ -58,7 +60,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
+@@ -120,7 +122,7 @@ StyleAbsoluteColor StyleAbsoluteColor::ToColorSpace(
    return Servo_ConvertColorSpace(this, aColorSpace);
  }
  
 -nscolor StyleAbsoluteColor::ToColor() const {
 +nscolor StyleAbsoluteColor::ToColor(const nsIFrame* aFrame) const {
-   auto srgb = ToColorSpace(StyleColorSpace::Srgb);
+   constexpr StyleColorSpace DEST_COLOR_SPACE = StyleColorSpace::Srgb;
  
-   // TODO(tlouw): Needs gamut mapping here. Right now we just hard clip the
-@@ -68,10 +70,12 @@ nscolor StyleAbsoluteColor::ToColor() const {
-   auto green = std::clamp(srgb.components._1, 0.0f, 1.0f);
-   auto blue = std::clamp(srgb.components._2, 0.0f, 1.0f);
+   constexpr float MIN = 0.0f;
+@@ -162,11 +164,13 @@ nscolor StyleAbsoluteColor::ToColor() const {
+     }
+   }
  
--  return NS_RGBA(nsStyleUtil::FloatToColorComponent(red),
+-  return NS_RGBA(
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._0),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._1),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.components._2),
+-      nsStyleUtil::FloatToColorComponent(translatedColor.alpha));
 +  return zen::nsZenBoostsBackend::ResolveStyleColor(
-+         NS_RGBA(nsStyleUtil::FloatToColorComponent(red),
-                  nsStyleUtil::FloatToColorComponent(green),
-                  nsStyleUtil::FloatToColorComponent(blue),
--                 nsStyleUtil::FloatToColorComponent(srgb.alpha));
-+                 nsStyleUtil::FloatToColorComponent(srgb.alpha)),
-+         aFrame);
++      NS_RGBA(
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._0),
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._1),
++          nsStyleUtil::FloatToColorComponent(translatedColor.components._2),
++          nsStyleUtil::FloatToColorComponent(translatedColor.alpha)),
++      aFrame);
  }
  
  }  // namespace mozilla

src/layout/svg/SVGImageContext-cpp.patch

@@ -1,5 +1,5 @@
 diff --git a/layout/svg/SVGImageContext.cpp b/layout/svg/SVGImageContext.cpp
-index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835ab18e6619 100644
+index 384401ae2cb80a1bf438b1fb3d849254de100210..e5ef332bc529e6588c33b507993880ca9def51d1 100644
 --- a/layout/svg/SVGImageContext.cpp
 +++ b/layout/svg/SVGImageContext.cpp
 @@ -10,6 +10,7 @@
@@ -30,8 +30,8 @@ index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835a
  /* static */
  void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
                                               nsIFrame* aFromFrame,
-@@ -43,6 +57,8 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
-     aContext.SetColorScheme(Some(scheme));
+@@ -50,6 +64,8 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
+     }
    }
  
 +  MaybeStoreZenBoosts(aContext, aPresContext);
@@ -39,7 +39,7 @@ index ecbda963b75fb70b62885a0c8f7a517011a8d5dc..5f55f0a4174db830656d434b5295835a
    const nsStyleSVG* style = aStyle.StyleSVG();
    if (!style->ExposesContextProperties()) {
      // Content must have '-moz-context-properties' set to the names of the
-@@ -57,12 +73,14 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
+@@ -64,12 +80,14 @@ void SVGImageContext::MaybeStoreContextPaint(SVGImageContext& aContext,
    if ((style->mMozContextProperties.bits & StyleContextPropertyBits::FILL) &&
        style->mFill.kind.IsColor()) {
      haveContextPaint = true;

src/layout/svg/SVGImageContext-h.patch

@@ -1,5 +1,5 @@
 diff --git a/layout/svg/SVGImageContext.h b/layout/svg/SVGImageContext.h
-index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2424dded5 100644
+index b1f811989697966e30859610f4fc07579d0385ab..f6f4cd5a45fc49b416111d980fab4e612788903e 100644
 --- a/layout/svg/SVGImageContext.h
 +++ b/layout/svg/SVGImageContext.h
 @@ -6,6 +6,7 @@
@@ -44,12 +44,12 @@ index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2
    const Maybe<SVGPreserveAspectRatio>& GetPreserveAspectRatio() const {
      return mPreserveAspectRatio;
    }
-@@ -107,7 +128,11 @@ class SVGImageContext {
- 
+@@ -116,7 +137,11 @@ class SVGImageContext {
      return contextPaintIsEqual && mViewportSize == aOther.mViewportSize &&
             mPreserveAspectRatio == aOther.mPreserveAspectRatio &&
--           mColorScheme == aOther.mColorScheme;
-+           mColorScheme == aOther.mColorScheme &&
+            mColorScheme == aOther.mColorScheme &&
+-           mLinkParameters == aOther.mLinkParameters;
++           mLinkParameters == aOther.mLinkParameters &&
 +           mZenBoostsAccent == aOther.mZenBoostsAccent &&
 +           mZenBoostsComplementaryRotation ==
 +               aOther.mZenBoostsComplementaryRotation &&
@@ -57,21 +57,20 @@ index 159d9cbbd0711076ee6c2a71a3da04bd92a0102c..daefc40590c4d7d7fac9db25c6ec4ba2
    }
  
    bool operator!=(const SVGImageContext&) const = default;
-@@ -119,7 +144,9 @@ class SVGImageContext {
-     }
+@@ -129,7 +154,8 @@ class SVGImageContext {
      return HashGeneric(hash, mViewportSize.map(HashSize).valueOr(0),
                         mPreserveAspectRatio.map(HashPAR).valueOr(0),
--                       mColorScheme.map(HashColorScheme).valueOr(0));
-+                       mColorScheme.map(HashColorScheme).valueOr(0),
-+                       mZenBoostsAccent, mZenBoostsComplementaryRotation,
-+                       mZenBoostsInverted);
+                        mColorScheme.map(HashColorScheme).valueOr(0),
+-                       HashLinkParameters(mLinkParameters));
++                       HashLinkParameters(mLinkParameters), mZenBoostsAccent,
++                       mZenBoostsComplementaryRotation, mZenBoostsInverted);
    }
  
   private:
-@@ -138,6 +165,9 @@ class SVGImageContext {
-   Maybe<CSSIntSize> mViewportSize;
+@@ -167,6 +193,9 @@ class SVGImageContext {
    Maybe<SVGPreserveAspectRatio> mPreserveAspectRatio;
    Maybe<ColorScheme> mColorScheme;
+   StyleLinkParameters mLinkParameters;
 +  nscolor mZenBoostsAccent = 0;
 +  float mZenBoostsComplementaryRotation = 0.0f;
 +  bool mZenBoostsInverted = false;

src/services/sync/modules/service-sys-mjs.patch

@@ -0,0 +1,15 @@
+diff --git a/services/sync/modules/service.sys.mjs b/services/sync/modules/service.sys.mjs
+index 4f4efe572909441abdd81909282936702c225621..81ab06a9414ed656b644a21b40b683f06a4f8dbf 100644
+--- a/services/sync/modules/service.sys.mjs
++++ b/services/sync/modules/service.sys.mjs
+@@ -99,6 +99,10 @@ function getEngineModules() {
+     whenTrue: "ExtensionStorageEngineKinto",
+     whenFalse: "ExtensionStorageEngineBridge",
+   };
++  result.Spaces = {
++    module: "resource:///modules/zen/ZenWorkspacesSync.sys.mjs",
++    symbol: "ZenWorkspacesEngine",
++  };
+   return result;
+ }
+ 

src/servo/ports/geckolib/cbindgen-toml.patch

@@ -1,8 +1,8 @@
 diff --git a/servo/ports/geckolib/cbindgen.toml b/servo/ports/geckolib/cbindgen.toml
-index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f38e5c655 100644
+index 10c0c702dbad97d5e73d84e2c913a3541380c4dd..2291871e58ae259f3bc3d573eb32e7cb47cc8953 100644
 --- a/servo/ports/geckolib/cbindgen.toml
 +++ b/servo/ports/geckolib/cbindgen.toml
-@@ -666,9 +666,9 @@ renaming_overrides_prefixing = true
+@@ -673,9 +673,9 @@ renaming_overrides_prefixing = true
    nscolor CalcColor(const nsIFrame*) const;
    /**
     * Compute the final color, taking into account the foreground color from the
@@ -14,7 +14,7 @@ index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f
    /**
     * Compute the final color, making the argument the foreground color.
     */
-@@ -691,9 +691,11 @@ renaming_overrides_prefixing = true
+@@ -698,9 +698,11 @@ renaming_overrides_prefixing = true
  
    /**
     * Convert this color to an nscolor. The color will be converted to sRGB first
@@ -27,4 +27,4 @@ index 17937bd70ead3b86e59b3da8c8d90591ee48e0a2..2bddfd549243ddc387107df00625ea5f
 +  nscolor ToColor(const nsIFrame*) const;
  """
  
- "OwnedSlice" = """
+ "ColorFunction" = """

src/toolkit/components/contextualidentity/ContextualIdentityService-sys-mjs.patch

@@ -0,0 +1,37 @@
+diff --git a/toolkit/components/contextualidentity/ContextualIdentityService.sys.mjs b/toolkit/components/contextualidentity/ContextualIdentityService.sys.mjs
+index 5702ff28cc22206f5ce16584dac8a78d816562ce..3d08ecc97ce5995b30d8a4af0c33df329b428008 100644
+--- a/toolkit/components/contextualidentity/ContextualIdentityService.sys.mjs
++++ b/toolkit/components/contextualidentity/ContextualIdentityService.sys.mjs
+@@ -270,11 +270,29 @@ _ContextualIdentityService.prototype = {
+     });
+   },
+ 
+-  create(name, icon, color) {
++  create(name, icon, color, id = null) {
+     this.ensureDataReady();
+ 
+-    // Retrieve the next userContextId available.
+-    let userContextId = ++this._lastUserContextId;
++    if (id !== null) {
++      id = typeof id == "string" ? Number(id) : id;
++      if (!Number.isSafeInteger(id) || id <= 0) {
++        throw new Error(`Invalid userContextId '${id}'`);
++      }
++    }
++
++    let userContextId;
++    if (
++      id !== null &&
++      !this._identities.some(identity => identity.userContextId === id)
++    ) {
++      userContextId = id;
++      this._lastUserContextId = Math.max(
++        this._lastUserContextId,
++        userContextId
++      );
++    } else {
++      userContextId = ++this._lastUserContextId;
++    }
+ 
+     // Throw an error if the next userContextId available is invalid (the one associated to
+     // MAX_USER_CONTEXT_ID is already reserved to "userContextIdInternal.webextStorageLocal", which

src/toolkit/mozapps/extensions/Blocklist-sys-mjs.patch

@@ -0,0 +1,22 @@
+diff --git a/toolkit/mozapps/extensions/Blocklist.sys.mjs b/toolkit/mozapps/extensions/Blocklist.sys.mjs
+index 4e1e0aac91612c846bb664efe3dbb50ecf63597d..93eb9a05520198eb3f9af35aa58d789719169434 100644
+--- a/toolkit/mozapps/extensions/Blocklist.sys.mjs
++++ b/toolkit/mozapps/extensions/Blocklist.sys.mjs
+@@ -411,7 +411,7 @@ class TargetAppFilter {
+     if (!Array.isArray(versionRange)) {
+       const { maxVersion = "*" } = versionRange;
+       const matchesRange =
+-        Services.vc.compare(lazy.gApp.version, maxVersion) <= 0;
++        Services.vc.compare(AppConstants.ZEN_FIREFOX_VERSION, maxVersion) <= 0;
+       return matchesRange ? entry : null;
+     }
+ 
+@@ -433,7 +433,7 @@ class TargetAppFilter {
+         const { maxVersion = "*" } = ta;
+         if (
+           guid == lazy.gAppID &&
+-          Services.vc.compare(lazy.gApp.version, maxVersion) <= 0
++          Services.vc.compare(AppConstants.ZEN_FIREFOX_VERSION, maxVersion) <= 0
+         ) {
+           return entry;
+         }

src/toolkit/mozapps/extensions/content/aboutaddons-css.patch

@@ -1,18 +1,17 @@
 diff --git a/toolkit/mozapps/extensions/content/aboutaddons.css b/toolkit/mozapps/extensions/content/aboutaddons.css
-index 619ae975710359fe879f197c689969ed726de7c0..542adaf0aa4f9d7336d969754228c1a93640b6af 100644
+index d0af33257f01df0deb5469d964a53be687a15f2f..2ef7fc1f0d8b0b67743b7d67df3719be0b46a4b0 100644
 --- a/toolkit/mozapps/extensions/content/aboutaddons.css
 +++ b/toolkit/mozapps/extensions/content/aboutaddons.css
-@@ -105,6 +105,13 @@ h2 {
- .category[name="theme"] {
-   background-image: url("chrome://mozapps/skin/extensions/category-themes.svg");
+@@ -713,6 +713,12 @@ section:not(:empty) ~ #empty-addons-message {
+   font-weight: var(--font-weight-bold);
  }
-+
+ 
 +@media -moz-pref('zen.theme.disable-lightweight') {
-+  .category[name="theme"] {
++  #category-theme {
 +    display: none;
 +  }
 +}
 +
- .category[name="plugin"] {
-   background-image: url("chrome://mozapps/skin/extensions/category-plugins.svg");
- }
+ /* Position the badged dot in the top-end (right in ltr, left in rtl)
+  * corner of the badged category icon. */
+ @media (max-width: 950px) {

src/toolkit/themes/shared/design-system/dist/tokens-shared-css.patch

@@ -1,19 +1,19 @@
 diff --git a/toolkit/themes/shared/design-system/dist/tokens-shared.css b/toolkit/themes/shared/design-system/dist/tokens-shared.css
-index 94afbe630914eef375967f2eff310d69c61fa1aa..04b42529d43c5100a76c883220875c0b70ad0616 100644
+index 15c0d98a18b4f19e7f2e03d2b78066b0353f416a..b32f6244c7a07e93894bab422691a605456034a1 100644
 --- a/toolkit/themes/shared/design-system/dist/tokens-shared.css
 +++ b/toolkit/themes/shared/design-system/dist/tokens-shared.css
 @@ -7,6 +7,8 @@
  
- @layer tokens-foundation, tokens-foundation-nova, tokens-prefers-contrast, tokens-prefers-contrast-nova, tokens-forced-colors, tokens-forced-colors-nova, tokens-browser-theme, tokens-browser-theme-nova;
+ @layer tokens-foundation, tokens-browser-theme, tokens-foundation-brand, tokens-foundation-nova, tokens-browser-theme-nova, tokens-foundation-brand-nova, tokens-prefers-contrast, tokens-prefers-contrast-nova, tokens-forced-colors, tokens-forced-colors-nova;
  
 +@import url("chrome://browser/content/zen-styles/zen-theme.css");
 +
  @layer tokens-foundation {
    :root,
    :host(.anonymous-content-host) {
-@@ -368,8 +370,8 @@
-     --panel-background-color-dimmed-further: color-mix(in srgb, currentColor 30%, transparent);
-     --panel-border-color: ThreeDShadow;
+@@ -424,8 +426,8 @@
+     --panel-background-color-dimmed-further: var(--background-color-dimmed-further);
+     --panel-border-color: light-dark(rgb(240, 240, 244), rgb(82, 82, 94));
      --panel-border-radius: var(--border-radius-medium);
 -    --panel-box-shadow: 0 0 var(--panel-box-shadow-margin) hsla(0, 0%, 0%, 0.2);
 -    --panel-box-shadow-margin: 4px;
@@ -21,4 +21,4 @@ index 94afbe630914eef375967f2eff310d69c61fa1aa..04b42529d43c5100a76c883220875c0b
 +    --panel-box-shadow-margin: 8px;
      --panel-menuitem-border-radius: var(--border-radius-small);
      --panel-menuitem-margin: var(--panel-menuitem-margin-block) var(--panel-menuitem-margin-inline);
-     --panel-menuitem-margin-block: 0px;
+     --panel-menuitem-margin-block: 0;

src/toolkit/themes/shared/in-content/common-shared-css.patch

@@ -1,17 +1,17 @@
 diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes/shared/in-content/common-shared.css
-index 8cbeb5d266b19c2c5b3d605b23c8c421a03c2a0e..7db0baeee11b99a5da1c143c682e38751a9ac03c 100644
+index 087d356b80886b22692f948a97f229ccf75737fd..9c2d370e94d1f901ded4a7a786a475fdf867de07 100644
 --- a/toolkit/themes/shared/in-content/common-shared.css
 +++ b/toolkit/themes/shared/in-content/common-shared.css
-@@ -57,7 +57,7 @@
+@@ -40,7 +40,7 @@
     * this in forced colors mode, as we should be using system colours then.
     */
    :root[dialogroot] {
--    --background-color-canvas: #42414d;
+-    --background-color-canvas: var(--color-gray-80);
 +    --background-color-canvas: var(--zen-dialog-background);
    }
  }
  
-@@ -158,7 +158,7 @@ xul|menulist {
+@@ -141,7 +141,7 @@ xul|menulist {
    border-radius: var(--button-border-radius);
    background-color: var(--button-background-color);
    font-weight: normal;

src/zen/@types/lib.gecko.darwin.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -8,7 +5,7 @@
  */
 
 declare global {
-  // https://searchfox.org/mozilla-central/source/accessible/interfaces/nsIAccessibleMacInterface.idl
+  // https://searchfox.org/firefox-main/source/accessible/interfaces/nsIAccessibleMacInterface.idl
 
   interface nsIAccessibleMacNSObjectWrapper extends nsISupports {}
 
@@ -29,13 +26,13 @@ declare global {
     readonly data: any;
   }
 
-  // https://searchfox.org/mozilla-central/source/browser/components/migration/nsIKeychainMigrationUtils.idl
+  // https://searchfox.org/firefox-main/source/browser/components/migration/nsIKeychainMigrationUtils.idl
 
   interface nsIKeychainMigrationUtils extends nsISupports {
     getGenericPassword(aServiceName: string, aAccountName: string): string;
   }
 
-  // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIMacShellService.idl
+  // https://searchfox.org/firefox-main/source/browser/components/shell/nsIMacShellService.idl
 
   interface nsIMacShellService extends nsIShellService {
     showDesktopPreferences(): void;
@@ -43,7 +40,7 @@ declare global {
     getAvailableApplicationsForProtocol(protocol: string): string[][];
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIMacDockSupport.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIMacDockSupport.idl
 
   interface nsIAppBundleLaunchOptions extends nsISupports {
     readonly addsToRecentItems: boolean;
@@ -69,7 +66,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIMacFinderProgress.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIMacFinderProgress.idl
 
   type nsIMacFinderProgressCanceledCallback = Callable<{
     canceled(): void;
@@ -84,7 +81,7 @@ declare global {
     end(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIMacSharingService.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIMacSharingService.idl
 
   interface nsIMacSharingService extends nsISupports {
     getSharingProviders(pageUrl: string): any;
@@ -92,7 +89,7 @@ declare global {
     openSharingPreferences(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIMacUserActivityUpdater.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIMacUserActivityUpdater.idl
 
   interface nsIMacUserActivityUpdater extends nsISupports {
     updateLocation(
@@ -102,7 +99,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIMacWebAppUtils.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIMacWebAppUtils.idl
 
   type nsITrashAppCallback = Callable<{
     trashAppFinished(rv: nsresult): void;
@@ -114,7 +111,7 @@ declare global {
     trashApp(path: string, callback: nsITrashAppCallback): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIStandaloneNativeMenu.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIStandaloneNativeMenu.idl
 
   interface nsIStandaloneNativeMenu extends nsISupports {
     init(aElement: Element): void;
@@ -124,7 +121,7 @@ declare global {
     dump(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarProgress.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarProgress.idl
 
   interface nsITaskbarProgress extends nsISupports {
     readonly STATE_NO_PROGRESS?: 0;
@@ -140,7 +137,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITouchBarHelper.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITouchBarHelper.idl
 
   interface nsITouchBarHelper extends nsISupports {
     readonly activeUrl: string;
@@ -154,7 +151,7 @@ declare global {
     insertRestrictionInUrlbar(aToken: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITouchBarInput.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITouchBarInput.idl
 
   type nsITouchBarInputCallback = Callable<{
     onCommand(): void;
@@ -171,7 +168,7 @@ declare global {
     children: nsIArray;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITouchBarUpdater.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITouchBarUpdater.idl
 
   interface nsITouchBarUpdater extends nsISupports {
     updateTouchBarInputs(
@@ -188,14 +185,14 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/xpcom/base/nsIMacPreferencesReader.idl
+  // https://searchfox.org/firefox-main/source/xpcom/base/nsIMacPreferencesReader.idl
 
   interface nsIMacPreferencesReader extends nsISupports {
     policiesEnabled(): boolean;
     readPreferences(): any;
   }
 
-  // https://searchfox.org/mozilla-central/source/xpcom/io/nsILocalFileMac.idl
+  // https://searchfox.org/firefox-main/source/xpcom/io/nsILocalFileMac.idl
 
   interface nsILocalFileMac extends nsIFile {
     launchWithDoc(aDocToLoad: nsIFile, aLaunchInBackground: boolean): void;

src/zen/@types/lib.gecko.linux.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -8,7 +5,7 @@
  */
 
 declare global {
-  // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIGNOMEShellService.idl
+  // https://searchfox.org/firefox-main/source/browser/components/shell/nsIGNOMEShellService.idl
 
   interface nsIGNOMEShellService extends nsIShellService {
     readonly canSetDesktopBackground: boolean;
@@ -17,14 +14,14 @@ declare global {
     setGSettingsString(aScheme: string, aKey: string, aValue: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIOpenTabsProvider.idl
+  // https://searchfox.org/firefox-main/source/browser/components/shell/nsIOpenTabsProvider.idl
 
   interface nsIOpenTabsProvider extends nsISupports {
     getOpenTabs(): string[];
     switchToOpenTab(url: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIApplicationChooser.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIApplicationChooser.idl
 
   type nsIApplicationChooserFinishedCallback = Callable<{
     done(handlerApp: nsIHandlerApp): void;
@@ -38,13 +35,13 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIGtkTaskbarProgress.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIGtkTaskbarProgress.idl
 
   interface nsIGtkTaskbarProgress extends nsITaskbarProgress {
     setPrimaryWindow(aWindow: mozIDOMWindowProxy): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarProgress.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarProgress.idl
 
   interface nsITaskbarProgress extends nsISupports {
     readonly STATE_NO_PROGRESS?: 0;

src/zen/@types/lib.gecko.modules.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated by running "mach ts paths".
@@ -8,6 +5,7 @@
 
 export interface Modules {
   "chrome://browser/content/aboutlogins/aboutLoginsUtils.mjs": typeof import("chrome://browser/content/aboutlogins/aboutLoginsUtils.mjs");
+  "chrome://browser/content/aiwindow/modules/ChatMarkdownParser.mjs": typeof import("chrome://browser/content/aiwindow/modules/ChatMarkdownParser.mjs");
   "chrome://browser/content/aiwindow/modules/TokenStreamParser.mjs": typeof import("chrome://browser/content/aiwindow/modules/TokenStreamParser.mjs");
   "chrome://browser/content/asrouter/components/menu-message.mjs": typeof import("chrome://browser/content/asrouter/components/menu-message.mjs");
   "chrome://browser/content/backup/backup-constants.mjs": typeof import("chrome://browser/content/backup/backup-constants.mjs");
@@ -15,28 +13,48 @@ export interface Modules {
   "chrome://browser/content/genai/content/link-preview-card.mjs": typeof import("chrome://browser/content/genai/content/link-preview-card.mjs");
   "chrome://browser/content/genai/content/model-optin.mjs": typeof import("chrome://browser/content/genai/content/model-optin.mjs");
   "chrome://browser/content/ipprotection/ipprotection-constants.mjs": typeof import("chrome://browser/content/ipprotection/ipprotection-constants.mjs");
+  "chrome://browser/content/ipprotection/ipprotection-utils.mjs": typeof import("chrome://browser/content/ipprotection/ipprotection-utils.mjs");
   "chrome://browser/content/migration/migration-wizard-constants.mjs": typeof import("chrome://browser/content/migration/migration-wizard-constants.mjs");
+  "chrome://browser/content/multilineeditor/prosemirror.bundle.mjs": typeof import("chrome://browser/content/multilineeditor/prosemirror.bundle.mjs");
   "chrome://browser/content/nsContextMenu.sys.mjs": typeof import("chrome://browser/content/nsContextMenu.sys.mjs");
+  "chrome://browser/content/preferences/config/LegacyPaneMappings.mjs": typeof import("chrome://browser/content/preferences/config/LegacyPaneMappings.mjs");
   "chrome://browser/content/preferences/config/SettingGroupManager.mjs": typeof import("chrome://browser/content/preferences/config/SettingGroupManager.mjs");
   "chrome://browser/content/preferences/config/SettingPaneManager.mjs": typeof import("chrome://browser/content/preferences/config/SettingPaneManager.mjs");
+  "chrome://browser/content/preferences/config/about-firefox.mjs": typeof import("chrome://browser/content/preferences/config/about-firefox.mjs");
+  "chrome://browser/content/preferences/config/accessibility.mjs": typeof import("chrome://browser/content/preferences/config/accessibility.mjs");
+  "chrome://browser/content/preferences/config/account-sync.mjs": typeof import("chrome://browser/content/preferences/config/account-sync.mjs");
+  "chrome://browser/content/preferences/config/appearance.mjs": typeof import("chrome://browser/content/preferences/config/appearance.mjs");
+  "chrome://browser/content/preferences/config/downloads.mjs": typeof import("chrome://browser/content/preferences/config/downloads.mjs");
   "chrome://browser/content/preferences/config/home-startup.mjs": typeof import("chrome://browser/content/preferences/config/home-startup.mjs");
+  "chrome://browser/content/preferences/config/languages.mjs": typeof import("chrome://browser/content/preferences/config/languages.mjs");
+  "chrome://browser/content/preferences/config/passwords-autofill.mjs": typeof import("chrome://browser/content/preferences/config/passwords-autofill.mjs");
+  "chrome://browser/content/preferences/config/privacy.mjs": typeof import("chrome://browser/content/preferences/config/privacy.mjs");
+  "chrome://browser/content/preferences/config/search.mjs": typeof import("chrome://browser/content/preferences/config/search.mjs");
+  "chrome://browser/content/preferences/config/tabs-browsing.mjs": typeof import("chrome://browser/content/preferences/config/tabs-browsing.mjs");
   "chrome://browser/content/screenshots/fileHelpers.mjs": typeof import("chrome://browser/content/screenshots/fileHelpers.mjs");
   "chrome://browser/content/sidebar/sidebar-main.mjs": typeof import("chrome://browser/content/sidebar/sidebar-main.mjs");
   "chrome://browser/content/sidebar/sidebar-panel-header.mjs": typeof import("chrome://browser/content/sidebar/sidebar-panel-header.mjs");
   "chrome://browser/content/sidebar/sidebar-permissions-ui.mjs": typeof import("chrome://browser/content/sidebar/sidebar-permissions-ui.mjs");
   "chrome://browser/content/sidebar/sidebar-permissions.mjs": typeof import("chrome://browser/content/sidebar/sidebar-permissions.mjs");
+  "chrome://browser/content/tabbrowser/tab-groups-list.mjs": typeof import("chrome://browser/content/tabbrowser/tab-groups-list.mjs");
   "chrome://browser/content/tabbrowser/tab-hover-preview.mjs": typeof import("chrome://browser/content/tabbrowser/tab-hover-preview.mjs");
   "chrome://browser/content/translations/TranslationsPanelShared.sys.mjs": typeof import("chrome://browser/content/translations/TranslationsPanelShared.sys.mjs");
   "chrome://browser/content/urlbar/SmartbarInput.mjs": typeof import("chrome://browser/content/urlbar/SmartbarInput.mjs");
   "chrome://browser/content/urlbar/SmartbarInputController.mjs": typeof import("chrome://browser/content/urlbar/SmartbarInputController.mjs");
+  "chrome://browser/content/urlbar/UrlbarEventBufferer.mjs": typeof import("chrome://browser/content/urlbar/UrlbarEventBufferer.mjs");
   "chrome://browser/content/urlbar/UrlbarInput.mjs": typeof import("chrome://browser/content/urlbar/UrlbarInput.mjs");
+  "chrome://browser/content/urlbar/UrlbarResult.mjs": typeof import("chrome://browser/content/urlbar/UrlbarResult.mjs");
+  "chrome://browser/content/urlbar/UrlbarShared.mjs": typeof import("chrome://browser/content/urlbar/UrlbarShared.mjs");
   "chrome://browser/content/webrtc/webrtc-preview.mjs": typeof import("chrome://browser/content/webrtc/webrtc-preview.mjs");
   "chrome://devtools-startup/content/DevToolsShim.sys.mjs": typeof import("chrome://devtools-startup/content/DevToolsShim.sys.mjs");
   "chrome://formautofill/content/manageDialog.mjs": typeof import("chrome://formautofill/content/manageDialog.mjs");
+  "chrome://global/content/ScrollOffsets.mjs": typeof import("chrome://global/content/ScrollOffsets.mjs");
   "chrome://global/content/aboutLogging/profileStorage.mjs": typeof import("chrome://global/content/aboutLogging/profileStorage.mjs");
   "chrome://global/content/bindings/colorpicker-common.mjs": typeof import("chrome://global/content/bindings/colorpicker-common.mjs");
   "chrome://global/content/certviewer/certDecoder.mjs": typeof import("chrome://global/content/certviewer/certDecoder.mjs");
   "chrome://global/content/elements/browser-custom-element.mjs": typeof import("chrome://global/content/elements/browser-custom-element.mjs");
+  "chrome://global/content/errors/error-lookup.mjs": typeof import("chrome://global/content/errors/error-lookup.mjs");
+  "chrome://global/content/errors/error-registry.mjs": typeof import("chrome://global/content/errors/error-registry.mjs");
   "chrome://global/content/ml/BlockWords.sys.mjs": typeof import("chrome://global/content/ml/BlockWords.sys.mjs");
   "chrome://global/content/ml/ClusterAlgos.sys.mjs": typeof import("chrome://global/content/ml/ClusterAlgos.sys.mjs");
   "chrome://global/content/ml/EmbeddingsGenerator.sys.mjs": typeof import("chrome://global/content/ml/EmbeddingsGenerator.sys.mjs");
@@ -73,6 +91,7 @@ export interface Modules {
   "chrome://mochikit/content/tests/SimpleTest/DragTargetParentContext.sys.mjs": typeof import("chrome://mochikit/content/tests/SimpleTest/DragTargetParentContext.sys.mjs");
   "chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs": typeof import("chrome://mochitests/content/browser/accessible/tests/browser/Common.sys.mjs");
   "chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs": typeof import("chrome://mochitests/content/browser/accessible/tests/browser/Layout.sys.mjs");
+  "chrome://mochitests/content/browser/browser/components/aiwindow/models/tests/browser_eval/tests/basic_quality.sys.mjs": typeof import("chrome://mochitests/content/browser/browser/components/aiwindow/models/tests/browser_eval/tests/basic_quality.sys.mjs");
   "chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs": typeof import("chrome://mochitests/content/browser/devtools/client/debugger/test/mochitest/examples/worker-esm-dep.mjs");
   "chrome://mochitests/content/browser/devtools/shared/test-helpers/trace-objects.sys.mjs": typeof import("chrome://mochitests/content/browser/devtools/shared/test-helpers/trace-objects.sys.mjs");
   "chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs": typeof import("chrome://mochitests/content/browser/js/xpconnect/tests/browser/worker_source.mjs");
@@ -113,6 +132,7 @@ export interface Modules {
   "chrome://remote/content/shared/AsyncQueue.sys.mjs": typeof import("chrome://remote/content/shared/AsyncQueue.sys.mjs");
   "chrome://remote/content/shared/BiMap.sys.mjs": typeof import("chrome://remote/content/shared/BiMap.sys.mjs");
   "chrome://remote/content/shared/Browser.sys.mjs": typeof import("chrome://remote/content/shared/Browser.sys.mjs");
+  "chrome://remote/content/shared/BrowsingContextUtils.sys.mjs": typeof import("chrome://remote/content/shared/BrowsingContextUtils.sys.mjs");
   "chrome://remote/content/shared/Capture.sys.mjs": typeof import("chrome://remote/content/shared/Capture.sys.mjs");
   "chrome://remote/content/shared/ChallengeHeaderParser.sys.mjs": typeof import("chrome://remote/content/shared/ChallengeHeaderParser.sys.mjs");
   "chrome://remote/content/shared/DOM.sys.mjs": typeof import("chrome://remote/content/shared/DOM.sys.mjs");
@@ -167,7 +187,6 @@ export interface Modules {
   "chrome://remote/content/shared/messagehandler/WindowGlobalMessageHandler.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/WindowGlobalMessageHandler.sys.mjs");
   "chrome://remote/content/shared/messagehandler/sessiondata/SessionData.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/sessiondata/SessionData.sys.mjs");
   "chrome://remote/content/shared/messagehandler/sessiondata/SessionDataReader.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/sessiondata/SessionDataReader.sys.mjs");
-  "chrome://remote/content/shared/messagehandler/transports/BrowsingContextUtils.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/transports/BrowsingContextUtils.sys.mjs");
   "chrome://remote/content/shared/messagehandler/transports/RootTransport.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/transports/RootTransport.sys.mjs");
   "chrome://remote/content/shared/messagehandler/transports/js-window-actors/MessageHandlerFrameActor.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/transports/js-window-actors/MessageHandlerFrameActor.sys.mjs");
   "chrome://remote/content/shared/messagehandler/transports/js-window-actors/MessageHandlerFrameChild.sys.mjs": typeof import("chrome://remote/content/shared/messagehandler/transports/js-window-actors/MessageHandlerFrameChild.sys.mjs");
@@ -185,7 +204,9 @@ export interface Modules {
   "chrome://remote/content/shared/webdriver/URLPattern.sys.mjs": typeof import("chrome://remote/content/shared/webdriver/URLPattern.sys.mjs");
   "chrome://remote/content/shared/webdriver/UserPromptHandler.sys.mjs": typeof import("chrome://remote/content/shared/webdriver/UserPromptHandler.sys.mjs");
   "chrome://remote/content/shared/webdriver/process-actors/WebDriverProcessDataParent.sys.mjs": typeof import("chrome://remote/content/shared/webdriver/process-actors/WebDriverProcessDataParent.sys.mjs");
+  "chrome://remote/content/webdriver-bidi/ConsoleMessageFormatter.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/ConsoleMessageFormatter.sys.mjs");
   "chrome://remote/content/webdriver-bidi/DownloadBehaviorManager.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/DownloadBehaviorManager.sys.mjs");
+  "chrome://remote/content/webdriver-bidi/HelperAppDialogHandler.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/HelperAppDialogHandler.sys.mjs");
   "chrome://remote/content/webdriver-bidi/NewSessionHandler.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/NewSessionHandler.sys.mjs");
   "chrome://remote/content/webdriver-bidi/ProxyPerUserContextManager.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/ProxyPerUserContextManager.sys.mjs");
   "chrome://remote/content/webdriver-bidi/RemoteValue.sys.mjs": typeof import("chrome://remote/content/webdriver-bidi/RemoteValue.sys.mjs");
@@ -224,11 +245,17 @@ export interface Modules {
   "moz-src:///browser/components/StartupTelemetry.sys.mjs": typeof import("moz-src:///browser/components/StartupTelemetry.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/Chat.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/Chat.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/ChatUtils.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/ChatUtils.sys.mjs");
-  "moz-src:///browser/components/aiwindow/models/CitationParser.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/CitationParser.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/ConversationSuggestions.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/ConversationSuggestions.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/IntentClassifier.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/IntentClassifier.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/PreferencesNavMap.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/PreferencesNavMap.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/PromptLoader.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/PromptLoader.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/PromptOptimizer.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/PromptOptimizer.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/SearchBrowsingHistory.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/SearchBrowsingHistory.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/SearchBrowsingHistoryDomainBoost.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/SearchBrowsingHistoryDomainBoost.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/SecurityProperties.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/SecurityProperties.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/SmartWindowNavigationInfo.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/SmartWindowNavigationInfo.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/TelemetryManager.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/TelemetryManager.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/TelemetryUtils.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/TelemetryUtils.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/TitleGeneration.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/TitleGeneration.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/Tools.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/Tools.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/Utils.sys.mjs");
@@ -241,19 +268,27 @@ export interface Modules {
   "moz-src:///browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/memories/MemoriesManager.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/memories/MemoriesSchedulers.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/memories/MemoriesSchedulers.sys.mjs");
+  "moz-src:///browser/components/aiwindow/models/memories/MemoriesSessions.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/memories/MemoriesSessions.sys.mjs");
   "moz-src:///browser/components/aiwindow/models/memories/SensitiveInfoDetector.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/models/memories/SensitiveInfoDetector.sys.mjs");
   "moz-src:///browser/components/aiwindow/services/MemoryStore.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/services/MemoryStore.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/actors/AIChatContentChild.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/actors/AIChatContentChild.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindow.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/AIWindowAccountAuth.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindowAccountAuth.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/AIWindowConstants.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindowConstants.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/AIWindowMenu.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindowMenu.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindowTabStatesManager.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/AIWindowUI.sys.mjs");
-  "moz-src:///browser/components/aiwindow/ui/modules/ChatConstants.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatConstants.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/ChatConversation.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatConversation.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/ChatEnums.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatEnums.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatStore.sys.mjs");
   "moz-src:///browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ChatUtils.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/FeedbackModal.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/FeedbackModal.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/SmartWindowTelemetry.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/SmartWindowTelemetry.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/TabManagementService.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/TabManagementService.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/ToolActionLog.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ToolActionLog.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/ToolUI.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ToolUI.sys.mjs");
+  "moz-src:///browser/components/aiwindow/ui/modules/ToolUITelemetry.sys.mjs": typeof import("moz-src:///browser/components/aiwindow/ui/modules/ToolUITelemetry.sys.mjs");
   "moz-src:///browser/components/attribution/AttributionCode.sys.mjs": typeof import("moz-src:///browser/components/attribution/AttributionCode.sys.mjs");
   "moz-src:///browser/components/attribution/MacAttribution.sys.mjs": typeof import("moz-src:///browser/components/attribution/MacAttribution.sys.mjs");
   "moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs": typeof import("moz-src:///browser/components/contentanalysis/content/ContentAnalysis.sys.mjs");
@@ -265,6 +300,7 @@ export interface Modules {
   "moz-src:///browser/components/customizableui/SearchWidgetTracker.sys.mjs": typeof import("moz-src:///browser/components/customizableui/SearchWidgetTracker.sys.mjs");
   "moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs": typeof import("moz-src:///browser/components/customizableui/ToolbarContextMenu.sys.mjs");
   "moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs": typeof import("moz-src:///browser/components/customizableui/ToolbarDropHandler.sys.mjs");
+  "moz-src:///browser/components/customkeys/CustomKeys.sys.mjs": typeof import("moz-src:///browser/components/customkeys/CustomKeys.sys.mjs");
   "moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs": typeof import("moz-src:///browser/components/downloads/DownloadSpamProtection.sys.mjs");
   "moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs": typeof import("moz-src:///browser/components/downloads/DownloadsCommon.sys.mjs");
   "moz-src:///browser/components/downloads/DownloadsMacFinderProgress.sys.mjs": typeof import("moz-src:///browser/components/downloads/DownloadsMacFinderProgress.sys.mjs");
@@ -274,25 +310,12 @@ export interface Modules {
   "moz-src:///browser/components/genai/LinkPreview.sys.mjs": typeof import("moz-src:///browser/components/genai/LinkPreview.sys.mjs");
   "moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs": typeof import("moz-src:///browser/components/genai/LinkPreviewModel.sys.mjs");
   "moz-src:///browser/components/genai/PageAssist.sys.mjs": typeof import("moz-src:///browser/components/genai/PageAssist.sys.mjs");
-  "moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/GuardianClient.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPAutoRestore.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPAutoRestore.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPChannelFilter.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPEnrollAndEntitleManager.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPExceptionsManager.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPNetworkErrorObserver.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPNetworkUtils.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPNetworkUtils.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPNimbusHelper.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPOnboardingMessageHelper.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPProxyManager.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPSignInWatcher.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPStartupCache.sys.mjs");
+  "moz-src:///browser/components/ipprotection/IPPUsageHelper.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPPUsageHelper.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPProtection.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtection.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPProtectionAlertManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionAlertManager.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionHelpers.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPProtectionInfobarManager.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionInfobarManager.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionPanel.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionServerlist.sys.mjs");
-  "moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionService.sys.mjs");
   "moz-src:///browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs": typeof import("moz-src:///browser/components/ipprotection/IPProtectionToolbarButton.sys.mjs");
   "moz-src:///browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs": typeof import("moz-src:///browser/components/mozcachedohttp/MozCachedOHTTPProtocolHandler.sys.mjs");
   "moz-src:///browser/components/newtab/AboutNewTabComponents.sys.mjs": typeof import("moz-src:///browser/components/newtab/AboutNewTabComponents.sys.mjs");
@@ -308,9 +331,12 @@ export interface Modules {
   "moz-src:///browser/components/places/PlacesUIUtils.sys.mjs": typeof import("moz-src:///browser/components/places/PlacesUIUtils.sys.mjs");
   "moz-src:///browser/components/privatebrowsing/ResetPBMPanel.sys.mjs": typeof import("moz-src:///browser/components/privatebrowsing/ResetPBMPanel.sys.mjs");
   "moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs": typeof import("moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs");
+  "moz-src:///browser/components/protections/PrivacyMetricsService.sys.mjs": typeof import("moz-src:///browser/components/protections/PrivacyMetricsService.sys.mjs");
   "moz-src:///browser/components/qrcode/QRCodeGenerator.sys.mjs": typeof import("moz-src:///browser/components/qrcode/QRCodeGenerator.sys.mjs");
   "moz-src:///browser/components/qrcode/QRCodeWorker.sys.mjs": typeof import("moz-src:///browser/components/qrcode/QRCodeWorker.sys.mjs");
   "moz-src:///browser/components/reportbrokensite/ReportBrokenSite.sys.mjs": typeof import("moz-src:///browser/components/reportbrokensite/ReportBrokenSite.sys.mjs");
+  "moz-src:///browser/components/screenshots/ScreenshotsOverlayChild.sys.mjs": typeof import("moz-src:///browser/components/screenshots/ScreenshotsOverlayChild.sys.mjs");
+  "moz-src:///browser/components/screenshots/ScreenshotsUtils.sys.mjs": typeof import("moz-src:///browser/components/screenshots/ScreenshotsUtils.sys.mjs");
   "moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs": typeof import("moz-src:///browser/components/search/BrowserSearchTelemetry.sys.mjs");
   "moz-src:///browser/components/search/OpenSearchManager.sys.mjs": typeof import("moz-src:///browser/components/search/OpenSearchManager.sys.mjs");
   "moz-src:///browser/components/search/SERPCategorization.sys.mjs": typeof import("moz-src:///browser/components/search/SERPCategorization.sys.mjs");
@@ -340,11 +366,10 @@ export interface Modules {
   "moz-src:///browser/components/urlbar/MerinoClient.sys.mjs": typeof import("moz-src:///browser/components/urlbar/MerinoClient.sys.mjs");
   "moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs": typeof import("moz-src:///browser/components/urlbar/QuickActionsLoaderDefault.sys.mjs");
   "moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs": typeof import("moz-src:///browser/components/urlbar/QuickSuggest.sys.mjs");
-  "moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs": typeof import("moz-src:///browser/components/urlbar/SearchModeSwitcher.sys.mjs");
   "moz-src:///browser/components/urlbar/SmartbarMentionsPanelSearch.sys.mjs": typeof import("moz-src:///browser/components/urlbar/SmartbarMentionsPanelSearch.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarController.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarController.sys.mjs");
-  "moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarEventBufferer.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarPrefs.sys.mjs");
+  "moz-src:///browser/components/urlbar/UrlbarProviderActionsSearchMode.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderActionsSearchMode.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarProviderAiChat.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderAiChat.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarProviderAutofill.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderAutofill.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarProviderCalculator.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderCalculator.sys.mjs");
@@ -363,24 +388,19 @@ export interface Modules {
   "moz-src:///browser/components/urlbar/UrlbarProviderTopSites.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderTopSites.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProviderUnitConversion.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarProvidersManager.sys.mjs");
-  "moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarResult.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarSearchOneOffs.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarSearchTermsPersistence.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarSearchUtils.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarTokenizer.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarUtils.sys.mjs");
   "moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarValueFormatter.sys.mjs");
-  "moz-src:///browser/components/urlbar/UrlbarView.sys.mjs": typeof import("moz-src:///browser/components/urlbar/UrlbarView.sys.mjs");
   "moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs": typeof import("moz-src:///browser/components/urlbar/private/AmpSuggestions.sys.mjs");
   "moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs": typeof import("moz-src:///browser/components/urlbar/private/GeolocationUtils.sys.mjs");
   "moz-src:///browser/components/urlbar/private/MLSuggest.sys.mjs": typeof import("moz-src:///browser/components/urlbar/private/MLSuggest.sys.mjs");
-  "moz-src:///browser/components/urlbar/private/SportsSuggestions.sys.mjs": typeof import("moz-src:///browser/components/urlbar/private/SportsSuggestions.sys.mjs");
   "moz-src:///browser/components/urlbar/private/SuggestBackendRust.sys.mjs": typeof import("moz-src:///browser/components/urlbar/private/SuggestBackendRust.sys.mjs");
   "moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs": typeof import("moz-src:///browser/modules/CanvasPermissionPromptHelper.sys.mjs");
   "moz-src:///browser/modules/ContextId.sys.mjs": typeof import("moz-src:///browser/modules/ContextId.sys.mjs");
   "moz-src:///browser/modules/PrivateBrowsingUI.sys.mjs": typeof import("moz-src:///browser/modules/PrivateBrowsingUI.sys.mjs");
-  "moz-src:///browser/modules/UnexpectedScriptObserver.sys.mjs": typeof import("moz-src:///browser/modules/UnexpectedScriptObserver.sys.mjs");
-  "moz-src:///browser/modules/WebAuthnPromptHelper.sys.mjs": typeof import("moz-src:///browser/modules/WebAuthnPromptHelper.sys.mjs");
   "moz-src:///browser/themes/ToolbarIconColor.sys.mjs": typeof import("moz-src:///browser/themes/ToolbarIconColor.sys.mjs");
   "moz-src:///dom/notification/MemoryNotificationDB.sys.mjs": typeof import("moz-src:///dom/notification/MemoryNotificationDB.sys.mjs");
   "moz-src:///dom/notification/NotificationDB.sys.mjs": typeof import("moz-src:///dom/notification/NotificationDB.sys.mjs");
@@ -392,6 +412,30 @@ export interface Modules {
   "moz-src:///toolkit/components/doh/DoHController.sys.mjs": typeof import("moz-src:///toolkit/components/doh/DoHController.sys.mjs");
   "moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs": typeof import("moz-src:///toolkit/components/doh/DoHHeuristics.sys.mjs");
   "moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs": typeof import("moz-src:///toolkit/components/doh/TRRPerformance.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/GuardianTypes.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/GuardianTypes.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPAuthProvider.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPAutoRestore.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPAutoRestore.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPAutoStart.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPAutoStart.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPChannelFilter.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPChannelFilter.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPEarlyStartupFilter.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPEarlyStartupFilter.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPExceptionsManager.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPExceptionsManager.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPNetworkErrorObserver.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPNetworkErrorObserver.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPNetworkUtils.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPNetworkUtils.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPNimbusHelper.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPNimbusHelper.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPProxyManager.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPProxyManager.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPSessionPrefManager.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPSessionPrefManager.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPPStartupCache.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPPStartupCache.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPProtectionActivator.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPProtectionActivator.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPProtectionServerlist.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPProtectionServerlist.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/IPProtectionService.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/IPProtectionService.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/enterprise/IPPAlwaysOn.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/enterprise/IPPAlwaysOn.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/enterprise/IPPEnterpriseAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/enterprise/IPPEnterpriseAuthProvider.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/fxa/GuardianClient.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/fxa/GuardianClient.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/fxa/IPPAndroidAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/fxa/IPPAndroidAuthProvider.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/fxa/IPPFxaActivateAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/fxa/IPPFxaActivateAuthProvider.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/fxa/IPPFxaAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/fxa/IPPFxaAuthProvider.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/fxa/IPPSignInWatcher.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/fxa/IPPSignInWatcher.sys.mjs");
+  "moz-src:///toolkit/components/ipprotection/gpi/IPPGpiAuthProvider.sys.mjs": typeof import("moz-src:///toolkit/components/ipprotection/gpi/IPPGpiAuthProvider.sys.mjs");
   "moz-src:///toolkit/components/pageextractor/DOMExtractor.sys.mjs": typeof import("moz-src:///toolkit/components/pageextractor/DOMExtractor.sys.mjs");
   "moz-src:///toolkit/components/qrcode/encoder.mjs": typeof import("moz-src:///toolkit/components/qrcode/encoder.mjs");
   "moz-src:///toolkit/components/reader/AboutReader.sys.mjs": typeof import("moz-src:///toolkit/components/reader/AboutReader.sys.mjs");
@@ -401,6 +445,7 @@ export interface Modules {
   "moz-src:///toolkit/components/search/ConfigSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/ConfigSearchEngine.sys.mjs");
   "moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/OpenSearchEngine.sys.mjs");
   "moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs": typeof import("moz-src:///toolkit/components/search/OpenSearchLoader.sys.mjs");
+  "moz-src:///toolkit/components/search/OpenSearchParser.sys.mjs": typeof import("moz-src:///toolkit/components/search/OpenSearchParser.sys.mjs");
   "moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/PolicySearchEngine.sys.mjs");
   "moz-src:///toolkit/components/search/SearchEngine.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchEngine.sys.mjs");
   "moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs": typeof import("moz-src:///toolkit/components/search/SearchEngineSelector.sys.mjs");
@@ -423,6 +468,7 @@ export interface Modules {
   "moz-src:///toolkit/modules/DateTimePickerPanel.sys.mjs": typeof import("moz-src:///toolkit/modules/DateTimePickerPanel.sys.mjs");
   "moz-src:///toolkit/modules/FaviconUtils.sys.mjs": typeof import("moz-src:///toolkit/modules/FaviconUtils.sys.mjs");
   "moz-src:///toolkit/modules/PrefUtils.sys.mjs": typeof import("moz-src:///toolkit/modules/PrefUtils.sys.mjs");
+  "moz-src:///toolkit/modules/WebAuthnPromptHelper.sys.mjs": typeof import("moz-src:///toolkit/modules/WebAuthnPromptHelper.sys.mjs");
   "moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs": typeof import("moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs");
   "resource:///actors/AboutLoginsParent.sys.mjs": typeof import("resource:///actors/AboutLoginsParent.sys.mjs");
   "resource:///actors/AboutNewTabParent.sys.mjs": typeof import("resource:///actors/AboutNewTabParent.sys.mjs");
@@ -458,8 +504,8 @@ export interface Modules {
   "resource:///modules/ChromeProfileMigrator.sys.mjs": typeof import("resource:///modules/ChromeProfileMigrator.sys.mjs");
   "resource:///modules/ChromeWindowsLoginCrypto.sys.mjs": typeof import("resource:///modules/ChromeWindowsLoginCrypto.sys.mjs");
   "resource:///modules/ContentCrashHandlers.sys.mjs": typeof import("resource:///modules/ContentCrashHandlers.sys.mjs");
-  "resource:///modules/CustomKeys.sys.mjs": typeof import("resource:///modules/CustomKeys.sys.mjs");
   "resource:///modules/Dedupe.sys.mjs": typeof import("resource:///modules/Dedupe.sys.mjs");
+  "resource:///modules/DefaultWindowsLaunchOnLogin.sys.mjs": typeof import("resource:///modules/DefaultWindowsLaunchOnLogin.sys.mjs");
   "resource:///modules/DevToolsStartup.sys.mjs": typeof import("resource:///modules/DevToolsStartup.sys.mjs");
   "resource:///modules/Discovery.sys.mjs": typeof import("resource:///modules/Discovery.sys.mjs");
   "resource:///modules/ESEDBReader.sys.mjs": typeof import("resource:///modules/ESEDBReader.sys.mjs");
@@ -491,13 +537,13 @@ export interface Modules {
   "resource:///modules/OpenTabsController.sys.mjs": typeof import("resource:///modules/OpenTabsController.sys.mjs");
   "resource:///modules/PageActions.sys.mjs": typeof import("resource:///modules/PageActions.sys.mjs");
   "resource:///modules/PartnerLinkAttribution.sys.mjs": typeof import("resource:///modules/PartnerLinkAttribution.sys.mjs");
+  "resource:///modules/PermissionPromptTargeting.sys.mjs": typeof import("resource:///modules/PermissionPromptTargeting.sys.mjs");
   "resource:///modules/PermissionUI.sys.mjs": typeof import("resource:///modules/PermissionUI.sys.mjs");
   "resource:///modules/PopupAndRedirectBlockerObserver.sys.mjs": typeof import("resource:///modules/PopupAndRedirectBlockerObserver.sys.mjs");
   "resource:///modules/ProcessHangMonitor.sys.mjs": typeof import("resource:///modules/ProcessHangMonitor.sys.mjs");
+  "resource:///modules/ReducedProtectionNotification.sys.mjs": typeof import("resource:///modules/ReducedProtectionNotification.sys.mjs");
   "resource:///modules/SafariProfileMigrator.sys.mjs": typeof import("resource:///modules/SafariProfileMigrator.sys.mjs");
   "resource:///modules/Sanitizer.sys.mjs": typeof import("resource:///modules/Sanitizer.sys.mjs");
-  "resource:///modules/ScreenshotsOverlayChild.sys.mjs": typeof import("resource:///modules/ScreenshotsOverlayChild.sys.mjs");
-  "resource:///modules/ScreenshotsUtils.sys.mjs": typeof import("resource:///modules/ScreenshotsUtils.sys.mjs");
   "resource:///modules/SelectionChangedMenulist.sys.mjs": typeof import("resource:///modules/SelectionChangedMenulist.sys.mjs");
   "resource:///modules/SharingUtils.sys.mjs": typeof import("resource:///modules/SharingUtils.sys.mjs");
   "resource:///modules/SiteDataManager.sys.mjs": typeof import("resource:///modules/SiteDataManager.sys.mjs");
@@ -507,11 +553,11 @@ export interface Modules {
   "resource:///modules/ThemeVariableMap.sys.mjs": typeof import("resource:///modules/ThemeVariableMap.sys.mjs");
   "resource:///modules/TransientPrefs.sys.mjs": typeof import("resource:///modules/TransientPrefs.sys.mjs");
   "resource:///modules/URILoadingHelper.sys.mjs": typeof import("resource:///modules/URILoadingHelper.sys.mjs");
+  "resource:///modules/UpdatePolicyEnforcer.sys.mjs": typeof import("resource:///modules/UpdatePolicyEnforcer.sys.mjs");
   "resource:///modules/WebProtocolHandlerRegistrar.sys.mjs": typeof import("resource:///modules/WebProtocolHandlerRegistrar.sys.mjs");
   "resource:///modules/WindowsJumpLists.sys.mjs": typeof import("resource:///modules/WindowsJumpLists.sys.mjs");
   "resource:///modules/WindowsPreviewPerTab.sys.mjs": typeof import("resource:///modules/WindowsPreviewPerTab.sys.mjs");
   "resource:///modules/ZoomUI.sys.mjs": typeof import("resource:///modules/ZoomUI.sys.mjs");
-  "resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs": typeof import("resource:///modules/aboutwelcome/AWScreenUtils.sys.mjs");
   "resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs": typeof import("resource:///modules/aboutwelcome/AWToolbarUtils.sys.mjs");
   "resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs": typeof import("resource:///modules/aboutwelcome/AboutWelcomeDefaults.sys.mjs");
   "resource:///modules/aboutwelcome/AboutWelcomeTelemetry.sys.mjs": typeof import("resource:///modules/aboutwelcome/AboutWelcomeTelemetry.sys.mjs");
@@ -520,6 +566,7 @@ export interface Modules {
   "resource:///modules/asrouter/ASRouterDefaultConfig.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterDefaultConfig.sys.mjs");
   "resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterNewTabHook.sys.mjs");
   "resource:///modules/asrouter/ASRouterPreferences.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterPreferences.sys.mjs");
+  "resource:///modules/asrouter/ASRouterScreenUtils.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterScreenUtils.sys.mjs");
   "resource:///modules/asrouter/ASRouterStorage.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterStorage.sys.mjs");
   "resource:///modules/asrouter/ASRouterTargeting.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterTargeting.sys.mjs");
   "resource:///modules/asrouter/ASRouterTelemetry.sys.mjs": typeof import("resource:///modules/asrouter/ASRouterTelemetry.sys.mjs");
@@ -538,6 +585,7 @@ export interface Modules {
   "resource:///modules/asrouter/PageEventManager.sys.mjs": typeof import("resource:///modules/asrouter/PageEventManager.sys.mjs");
   "resource:///modules/asrouter/PanelTestProvider.sys.mjs": typeof import("resource:///modules/asrouter/PanelTestProvider.sys.mjs");
   "resource:///modules/asrouter/RemoteL10n.sys.mjs": typeof import("resource:///modules/asrouter/RemoteL10n.sys.mjs");
+  "resource:///modules/asrouter/SmartWindowNewTabPromo.sys.mjs": typeof import("resource:///modules/asrouter/SmartWindowNewTabPromo.sys.mjs");
   "resource:///modules/asrouter/Spotlight.sys.mjs": typeof import("resource:///modules/asrouter/Spotlight.sys.mjs");
   "resource:///modules/asrouter/ToastNotification.sys.mjs": typeof import("resource:///modules/asrouter/ToastNotification.sys.mjs");
   "resource:///modules/asrouter/ToolbarBadgeHub.sys.mjs": typeof import("resource:///modules/asrouter/ToolbarBadgeHub.sys.mjs");
@@ -559,6 +607,7 @@ export interface Modules {
   "resource:///modules/backup/SelectableProfileBackupResource.sys.mjs": typeof import("resource:///modules/backup/SelectableProfileBackupResource.sys.mjs");
   "resource:///modules/backup/SessionStoreBackupResource.sys.mjs": typeof import("resource:///modules/backup/SessionStoreBackupResource.sys.mjs");
   "resource:///modules/backup/SiteSettingsBackupResource.sys.mjs": typeof import("resource:///modules/backup/SiteSettingsBackupResource.sys.mjs");
+  "resource:///modules/contentsharing/ContentSharingUtils.sys.mjs": typeof import("resource:///modules/contentsharing/ContentSharingUtils.sys.mjs");
   "resource:///modules/distribution.sys.mjs": typeof import("resource:///modules/distribution.sys.mjs");
   "resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs": typeof import("resource:///modules/firefox-view-synced-tabs-error-handler.sys.mjs");
   "resource:///modules/firefox-view-tabs-setup-manager.sys.mjs": typeof import("resource:///modules/firefox-view-tabs-setup-manager.sys.mjs");
@@ -640,6 +689,11 @@ export interface Modules {
   "resource://devtools/client/shared/components/tree/TreeRow.mjs": typeof import("resource://devtools/client/shared/components/tree/TreeRow.mjs");
   "resource://devtools/client/shared/components/tree/TreeView.mjs": typeof import("resource://devtools/client/shared/components/tree/TreeView.mjs");
   "resource://devtools/client/shared/focus.mjs": typeof import("resource://devtools/client/shared/focus.mjs");
+  "resource://devtools/client/shared/inplace-editor-utils/autocomplete-anchor-function.mjs": typeof import("resource://devtools/client/shared/inplace-editor-utils/autocomplete-anchor-function.mjs");
+  "resource://devtools/client/shared/inplace-editor-utils/autocomplete-anchor-size-function.mjs": typeof import("resource://devtools/client/shared/inplace-editor-utils/autocomplete-anchor-size-function.mjs");
+  "resource://devtools/client/shared/inplace-editor-utils/autocomplete-color-function.mjs": typeof import("resource://devtools/client/shared/inplace-editor-utils/autocomplete-color-function.mjs");
+  "resource://devtools/client/shared/inplace-editor-utils/autocomplete-linear-gradient-function.mjs": typeof import("resource://devtools/client/shared/inplace-editor-utils/autocomplete-linear-gradient-function.mjs");
+  "resource://devtools/client/shared/inplace-editor-utils/constants.mjs": typeof import("resource://devtools/client/shared/inplace-editor-utils/constants.mjs");
   "resource://devtools/client/shared/scroll.mjs": typeof import("resource://devtools/client/shared/scroll.mjs");
   "resource://devtools/client/shared/sourceeditor/codemirror6/codemirror6.bundle.mjs": typeof import("resource://devtools/client/shared/sourceeditor/codemirror6/codemirror6.bundle.mjs");
   "resource://devtools/client/storage/VariablesView.sys.mjs": typeof import("resource://devtools/client/storage/VariablesView.sys.mjs");
@@ -685,6 +739,7 @@ export interface Modules {
   "resource://devtools/shared/test-helpers/dump-scope.sys.mjs": typeof import("resource://devtools/shared/test-helpers/dump-scope.sys.mjs");
   "resource://devtools/shared/test-helpers/tracked-objects.sys.mjs": typeof import("resource://devtools/shared/test-helpers/tracked-objects.sys.mjs");
   "resource://devtools/shared/validate-breakpoint.sys.mjs": typeof import("resource://devtools/shared/validate-breakpoint.sys.mjs");
+  "resource://devtools/shared/webconsole/formatMessageParametersAndText.sys.mjs": typeof import("resource://devtools/shared/webconsole/formatMessageParametersAndText.sys.mjs");
   "resource://devtools/shared/worker/worker.sys.mjs": typeof import("resource://devtools/shared/worker/worker.sys.mjs");
   "resource://gre/actors/AutoCompleteParent.sys.mjs": typeof import("resource://gre/actors/AutoCompleteParent.sys.mjs");
   "resource://gre/actors/FormHandlerChild.sys.mjs": typeof import("resource://gre/actors/FormHandlerChild.sys.mjs");
@@ -719,6 +774,7 @@ export interface Modules {
   "resource://gre/modules/BookmarkJSONUtils.sys.mjs": typeof import("resource://gre/modules/BookmarkJSONUtils.sys.mjs");
   "resource://gre/modules/BookmarkList.sys.mjs": typeof import("resource://gre/modules/BookmarkList.sys.mjs");
   "resource://gre/modules/Bookmarks.sys.mjs": typeof import("resource://gre/modules/Bookmarks.sys.mjs");
+  "resource://gre/modules/BreachAlertStore.sys.mjs": typeof import("resource://gre/modules/BreachAlertStore.sys.mjs");
   "resource://gre/modules/BrowserTelemetryUtils.sys.mjs": typeof import("resource://gre/modules/BrowserTelemetryUtils.sys.mjs");
   "resource://gre/modules/BrowserUtils.sys.mjs": typeof import("resource://gre/modules/BrowserUtils.sys.mjs");
   "resource://gre/modules/CSV.sys.mjs": typeof import("resource://gre/modules/CSV.sys.mjs");
@@ -845,14 +901,15 @@ export interface Modules {
   "resource://gre/modules/GeckoViewActorManager.sys.mjs": typeof import("resource://gre/modules/GeckoViewActorManager.sys.mjs");
   "resource://gre/modules/GeckoViewAutocomplete.sys.mjs": typeof import("resource://gre/modules/GeckoViewAutocomplete.sys.mjs");
   "resource://gre/modules/GeckoViewAutofill.sys.mjs": typeof import("resource://gre/modules/GeckoViewAutofill.sys.mjs");
-  "resource://gre/modules/GeckoViewChildModule.sys.mjs": typeof import("resource://gre/modules/GeckoViewChildModule.sys.mjs");
   "resource://gre/modules/GeckoViewClipboardPermission.sys.mjs": typeof import("resource://gre/modules/GeckoViewClipboardPermission.sys.mjs");
   "resource://gre/modules/GeckoViewIdentityCredential.sys.mjs": typeof import("resource://gre/modules/GeckoViewIdentityCredential.sys.mjs");
+  "resource://gre/modules/GeckoViewPreferences.sys.mjs": typeof import("resource://gre/modules/GeckoViewPreferences.sys.mjs");
   "resource://gre/modules/GeckoViewPrompter.sys.mjs": typeof import("resource://gre/modules/GeckoViewPrompter.sys.mjs");
   "resource://gre/modules/GeckoViewSettings.sys.mjs": typeof import("resource://gre/modules/GeckoViewSettings.sys.mjs");
   "resource://gre/modules/GeckoViewTab.sys.mjs": typeof import("resource://gre/modules/GeckoViewTab.sys.mjs");
   "resource://gre/modules/GeckoViewTelemetry.sys.mjs": typeof import("resource://gre/modules/GeckoViewTelemetry.sys.mjs");
   "resource://gre/modules/GeckoViewTestUtils.sys.mjs": typeof import("resource://gre/modules/GeckoViewTestUtils.sys.mjs");
+  "resource://gre/modules/GeckoViewTrackingDB.sys.mjs": typeof import("resource://gre/modules/GeckoViewTrackingDB.sys.mjs");
   "resource://gre/modules/GeckoViewUtils.sys.mjs": typeof import("resource://gre/modules/GeckoViewUtils.sys.mjs");
   "resource://gre/modules/GeckoViewWebExtension.sys.mjs": typeof import("resource://gre/modules/GeckoViewWebExtension.sys.mjs");
   "resource://gre/modules/Geometry.sys.mjs": typeof import("resource://gre/modules/Geometry.sys.mjs");
@@ -868,9 +925,9 @@ export interface Modules {
   "resource://gre/modules/Integration.sys.mjs": typeof import("resource://gre/modules/Integration.sys.mjs");
   "resource://gre/modules/JSONFile.sys.mjs": typeof import("resource://gre/modules/JSONFile.sys.mjs");
   "resource://gre/modules/JsonSchema.sys.mjs": typeof import("resource://gre/modules/JsonSchema.sys.mjs");
+  "resource://gre/modules/KeyboardLockUtils.sys.mjs": typeof import("resource://gre/modules/KeyboardLockUtils.sys.mjs");
   "resource://gre/modules/KeywordUtils.sys.mjs": typeof import("resource://gre/modules/KeywordUtils.sys.mjs");
   "resource://gre/modules/LangPackMatcher.sys.mjs": typeof import("resource://gre/modules/LangPackMatcher.sys.mjs");
-  "resource://gre/modules/LayoutUtils.sys.mjs": typeof import("resource://gre/modules/LayoutUtils.sys.mjs");
   "resource://gre/modules/LightweightThemeConsumer.sys.mjs": typeof import("resource://gre/modules/LightweightThemeConsumer.sys.mjs");
   "resource://gre/modules/LightweightThemeManager.sys.mjs": typeof import("resource://gre/modules/LightweightThemeManager.sys.mjs");
   "resource://gre/modules/LoadURIDelegate.sys.mjs": typeof import("resource://gre/modules/LoadURIDelegate.sys.mjs");
@@ -904,6 +961,7 @@ export interface Modules {
   "resource://gre/modules/NativeMessaging.sys.mjs": typeof import("resource://gre/modules/NativeMessaging.sys.mjs");
   "resource://gre/modules/NetUtil.sys.mjs": typeof import("resource://gre/modules/NetUtil.sys.mjs");
   "resource://gre/modules/NewTabUtils.sys.mjs": typeof import("resource://gre/modules/NewTabUtils.sys.mjs");
+  "resource://gre/modules/NimbusGeckoViewQATelemetry.sys.mjs": typeof import("resource://gre/modules/NimbusGeckoViewQATelemetry.sys.mjs");
   "resource://gre/modules/OSCrypto_win.sys.mjs": typeof import("resource://gre/modules/OSCrypto_win.sys.mjs");
   "resource://gre/modules/OSKeyStore.sys.mjs": typeof import("resource://gre/modules/OSKeyStore.sys.mjs");
   "resource://gre/modules/ObjectUtils.sys.mjs": typeof import("resource://gre/modules/ObjectUtils.sys.mjs");
@@ -950,6 +1008,7 @@ export interface Modules {
   "resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs": typeof import("resource://gre/modules/RustSharedRemoteSettingsService.sys.mjs");
   "resource://gre/modules/SafeBrowsing.sys.mjs": typeof import("resource://gre/modules/SafeBrowsing.sys.mjs");
   "resource://gre/modules/SandboxUtils.sys.mjs": typeof import("resource://gre/modules/SandboxUtils.sys.mjs");
+  "resource://gre/modules/ScheduledTask.sys.mjs": typeof import("resource://gre/modules/ScheduledTask.sys.mjs");
   "resource://gre/modules/Schemas.sys.mjs": typeof import("resource://gre/modules/Schemas.sys.mjs");
   "resource://gre/modules/SecurityInfo.sys.mjs": typeof import("resource://gre/modules/SecurityInfo.sys.mjs");
   "resource://gre/modules/SelectionUtils.sys.mjs": typeof import("resource://gre/modules/SelectionUtils.sys.mjs");
@@ -975,7 +1034,6 @@ export interface Modules {
   "resource://gre/modules/TelemetrySession.sys.mjs": typeof import("resource://gre/modules/TelemetrySession.sys.mjs");
   "resource://gre/modules/TelemetryStorage.sys.mjs": typeof import("resource://gre/modules/TelemetryStorage.sys.mjs");
   "resource://gre/modules/TelemetryTimestamps.sys.mjs": typeof import("resource://gre/modules/TelemetryTimestamps.sys.mjs");
-  "resource://gre/modules/TelemetryUtils.sys.mjs": typeof import("resource://gre/modules/TelemetryUtils.sys.mjs");
   "resource://gre/modules/Timer.sys.mjs": typeof import("resource://gre/modules/Timer.sys.mjs");
   "resource://gre/modules/Troubleshoot.sys.mjs": typeof import("resource://gre/modules/Troubleshoot.sys.mjs");
   "resource://gre/modules/UninstallPing.sys.mjs": typeof import("resource://gre/modules/UninstallPing.sys.mjs");
@@ -1036,6 +1094,7 @@ export interface Modules {
   "resource://gre/modules/narrate/NarrateControls.sys.mjs": typeof import("resource://gre/modules/narrate/NarrateControls.sys.mjs");
   "resource://gre/modules/policies/WindowsGPOParser.sys.mjs": typeof import("resource://gre/modules/policies/WindowsGPOParser.sys.mjs");
   "resource://gre/modules/policies/macOSPoliciesParser.sys.mjs": typeof import("resource://gre/modules/policies/macOSPoliciesParser.sys.mjs");
+  "resource://gre/modules/psm/DER.sys.mjs": typeof import("resource://gre/modules/psm/DER.sys.mjs");
   "resource://gre/modules/psm/QWACs.sys.mjs": typeof import("resource://gre/modules/psm/QWACs.sys.mjs");
   "resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs": typeof import("resource://gre/modules/psm/RemoteSecuritySettings.sys.mjs");
   "resource://gre/modules/psm/X509.sys.mjs": typeof import("resource://gre/modules/psm/X509.sys.mjs");
@@ -1059,6 +1118,7 @@ export interface Modules {
   "resource://gre/modules/shared/FieldScanner.sys.mjs": typeof import("resource://gre/modules/shared/FieldScanner.sys.mjs");
   "resource://gre/modules/shared/FormAutofillHandler.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillHandler.sys.mjs");
   "resource://gre/modules/shared/FormAutofillHeuristics.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillHeuristics.sys.mjs");
+  "resource://gre/modules/shared/FormAutofillML.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillML.sys.mjs");
   "resource://gre/modules/shared/FormAutofillNameUtils.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillNameUtils.sys.mjs");
   "resource://gre/modules/shared/FormAutofillSection.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillSection.sys.mjs");
   "resource://gre/modules/shared/FormAutofillUtils.sys.mjs": typeof import("resource://gre/modules/shared/FormAutofillUtils.sys.mjs");
@@ -1098,6 +1158,7 @@ export interface Modules {
   "resource://newtab/lib/HighlightsFeed.sys.mjs": typeof import("resource://newtab/lib/HighlightsFeed.sys.mjs");
   "resource://newtab/lib/InferredModel/FeatureModel.sys.mjs": typeof import("resource://newtab/lib/InferredModel/FeatureModel.sys.mjs");
   "resource://newtab/lib/InferredModel/GreedyContentRanker.mjs": typeof import("resource://newtab/lib/InferredModel/GreedyContentRanker.mjs");
+  "resource://newtab/lib/InferredModel/InferredConstants.sys.mjs": typeof import("resource://newtab/lib/InferredModel/InferredConstants.sys.mjs");
   "resource://newtab/lib/InferredPersonalizationFeed.sys.mjs": typeof import("resource://newtab/lib/InferredPersonalizationFeed.sys.mjs");
   "resource://newtab/lib/NewTabActorRegistry.sys.mjs": typeof import("resource://newtab/lib/NewTabActorRegistry.sys.mjs");
   "resource://newtab/lib/NewTabAttributionFeed.sys.mjs": typeof import("resource://newtab/lib/NewTabAttributionFeed.sys.mjs");
@@ -1109,6 +1170,7 @@ export interface Modules {
   "resource://newtab/lib/PersistentCache.sys.mjs": typeof import("resource://newtab/lib/PersistentCache.sys.mjs");
   "resource://newtab/lib/PlacesFeed.sys.mjs": typeof import("resource://newtab/lib/PlacesFeed.sys.mjs");
   "resource://newtab/lib/PrefsFeed.sys.mjs": typeof import("resource://newtab/lib/PrefsFeed.sys.mjs");
+  "resource://newtab/lib/RemoteRenderer.sys.mjs": typeof import("resource://newtab/lib/RemoteRenderer.sys.mjs");
   "resource://newtab/lib/Screenshots.sys.mjs": typeof import("resource://newtab/lib/Screenshots.sys.mjs");
   "resource://newtab/lib/SectionsLayoutFeed.sys.mjs": typeof import("resource://newtab/lib/SectionsLayoutFeed.sys.mjs");
   "resource://newtab/lib/SectionsManager.sys.mjs": typeof import("resource://newtab/lib/SectionsManager.sys.mjs");
@@ -1125,8 +1187,10 @@ export interface Modules {
   "resource://newtab/lib/TopStoriesFeed.sys.mjs": typeof import("resource://newtab/lib/TopStoriesFeed.sys.mjs");
   "resource://newtab/lib/UTEventReporting.sys.mjs": typeof import("resource://newtab/lib/UTEventReporting.sys.mjs");
   "resource://newtab/lib/Wallpapers/WallpaperFeed.sys.mjs": typeof import("resource://newtab/lib/Wallpapers/WallpaperFeed.sys.mjs");
+  "resource://newtab/lib/Wallpapers/WallpaperThemeUtils.mjs": typeof import("resource://newtab/lib/Wallpapers/WallpaperThemeUtils.mjs");
   "resource://newtab/lib/WeatherFeed.sys.mjs": typeof import("resource://newtab/lib/WeatherFeed.sys.mjs");
   "resource://newtab/lib/Widgets/ListsFeed.sys.mjs": typeof import("resource://newtab/lib/Widgets/ListsFeed.sys.mjs");
+  "resource://newtab/lib/Widgets/SportsFeed.sys.mjs": typeof import("resource://newtab/lib/Widgets/SportsFeed.sys.mjs");
   "resource://newtab/lib/Widgets/TimerFeed.sys.mjs": typeof import("resource://newtab/lib/Widgets/TimerFeed.sys.mjs");
   "resource://newtab/lib/actors/NewTabAttributionParent.sys.mjs": typeof import("resource://newtab/lib/actors/NewTabAttributionParent.sys.mjs");
   "resource://nimbus/ExperimentAPI.sys.mjs": typeof import("resource://nimbus/ExperimentAPI.sys.mjs");
@@ -1178,6 +1242,8 @@ export interface Modules {
   "resource://pdf.js/PdfJsTelemetry.sys.mjs": typeof import("resource://pdf.js/PdfJsTelemetry.sys.mjs");
   "resource://pdf.js/PdfSandbox.sys.mjs": typeof import("resource://pdf.js/PdfSandbox.sys.mjs");
   "resource://pdf.js/PdfStreamConverter.sys.mjs": typeof import("resource://pdf.js/PdfStreamConverter.sys.mjs");
+  "resource://pdf.js/PdfjsParent.sys.mjs": typeof import("resource://pdf.js/PdfjsParent.sys.mjs");
+  "resource://pdf.js/build/pdf.mjs": typeof import("resource://pdf.js/build/pdf.mjs");
   "resource://reftest/AsyncSpellCheckTestHelper.sys.mjs": typeof import("resource://reftest/AsyncSpellCheckTestHelper.sys.mjs");
   "resource://reftest/PerTestCoverageUtils.sys.mjs": typeof import("resource://reftest/PerTestCoverageUtils.sys.mjs");
   "resource://reftest/reftest.sys.mjs": typeof import("resource://reftest/reftest.sys.mjs");
@@ -1190,7 +1256,6 @@ export interface Modules {
   "resource://services-common/observers.sys.mjs": typeof import("resource://services-common/observers.sys.mjs");
   "resource://services-common/rest.sys.mjs": typeof import("resource://services-common/rest.sys.mjs");
   "resource://services-common/tokenserverclient.sys.mjs": typeof import("resource://services-common/tokenserverclient.sys.mjs");
-  "resource://services-common/uptake-telemetry.sys.mjs": typeof import("resource://services-common/uptake-telemetry.sys.mjs");
   "resource://services-common/utils.sys.mjs": typeof import("resource://services-common/utils.sys.mjs");
   "resource://services-settings/Attachments.sys.mjs": typeof import("resource://services-settings/Attachments.sys.mjs");
   "resource://services-settings/Database.sys.mjs": typeof import("resource://services-settings/Database.sys.mjs");
@@ -1199,6 +1264,7 @@ export interface Modules {
   "resource://services-settings/RemoteSettingsWorker.sys.mjs": typeof import("resource://services-settings/RemoteSettingsWorker.sys.mjs");
   "resource://services-settings/SharedUtils.sys.mjs": typeof import("resource://services-settings/SharedUtils.sys.mjs");
   "resource://services-settings/SyncHistory.sys.mjs": typeof import("resource://services-settings/SyncHistory.sys.mjs");
+  "resource://services-settings/UptakeTelemetry.sys.mjs": typeof import("resource://services-settings/UptakeTelemetry.sys.mjs");
   "resource://services-settings/Utils.sys.mjs": typeof import("resource://services-settings/Utils.sys.mjs");
   "resource://services-settings/remote-settings.sys.mjs": typeof import("resource://services-settings/remote-settings.sys.mjs");
   "resource://services-sync/SyncDisconnect.sys.mjs": typeof import("resource://services-sync/SyncDisconnect.sys.mjs");
@@ -1263,6 +1329,9 @@ export interface Modules {
   "resource://test/esmified-1.sys.mjs": typeof import("resource://test/esmified-1.sys.mjs");
   "resource://test/esmified-3.sys.mjs": typeof import("resource://test/esmified-3.sys.mjs");
   "resource://test/esmified-4.sys.mjs": typeof import("resource://test/esmified-4.sys.mjs");
+  "resource://test/import_attributes.mjs": typeof import("resource://test/import_attributes.mjs");
+  "resource://test/import_attributes_css.mjs": typeof import("resource://test/import_attributes_css.mjs");
+  "resource://test/import_attributes_text.mjs": typeof import("resource://test/import_attributes_text.mjs");
   "resource://test/import_non_shared_1.mjs": typeof import("resource://test/import_non_shared_1.mjs");
   "resource://test/non_shared_1.mjs": typeof import("resource://test/non_shared_1.mjs");
   "resource://test/non_shared_nest_import_non_shared_1.mjs": typeof import("resource://test/non_shared_nest_import_non_shared_1.mjs");
@@ -1276,6 +1345,7 @@ export interface Modules {
   "resource://test/non_shared_nest_import_shared_target_2.sys.mjs": typeof import("resource://test/non_shared_nest_import_shared_target_2.sys.mjs");
   "resource://test/not_found.mjs": typeof import("resource://test/not_found.mjs");
   "resource://testing-common/AIWindowTestUtils.sys.mjs": typeof import("resource://testing-common/AIWindowTestUtils.sys.mjs");
+  "resource://testing-common/AboutAddonsTestUtils.sys.mjs": typeof import("resource://testing-common/AboutAddonsTestUtils.sys.mjs");
   "resource://testing-common/AddonTestUtils.sys.mjs": typeof import("resource://testing-common/AddonTestUtils.sys.mjs");
   "resource://testing-common/AllJavascriptTypes.mjs": typeof import("resource://testing-common/AllJavascriptTypes.mjs");
   "resource://testing-common/AppData.sys.mjs": typeof import("resource://testing-common/AppData.sys.mjs");
@@ -1285,6 +1355,7 @@ export interface Modules {
   "resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs": typeof import("resource://testing-common/AsyncSpellCheckTestHelper.sys.mjs");
   "resource://testing-common/BackgroundTasksTestUtils.sys.mjs": typeof import("resource://testing-common/BackgroundTasksTestUtils.sys.mjs");
   "resource://testing-common/BrowserTestUtils.sys.mjs": typeof import("resource://testing-common/BrowserTestUtils.sys.mjs");
+  "resource://testing-common/ContentSharingMockServer.sys.mjs": typeof import("resource://testing-common/ContentSharingMockServer.sys.mjs");
   "resource://testing-common/ContentTask.sys.mjs": typeof import("resource://testing-common/ContentTask.sys.mjs");
   "resource://testing-common/ContentTaskUtils.sys.mjs": typeof import("resource://testing-common/ContentTaskUtils.sys.mjs");
   "resource://testing-common/CookieXPCShellUtils.sys.mjs": typeof import("resource://testing-common/CookieXPCShellUtils.sys.mjs");
@@ -1305,6 +1376,7 @@ export interface Modules {
   "resource://testing-common/JSObjectsTestUtils.sys.mjs": typeof import("resource://testing-common/JSObjectsTestUtils.sys.mjs");
   "resource://testing-common/LangPackMatcherTestUtils.sys.mjs": typeof import("resource://testing-common/LangPackMatcherTestUtils.sys.mjs");
   "resource://testing-common/LoginTestUtils.sys.mjs": typeof import("resource://testing-common/LoginTestUtils.sys.mjs");
+  "resource://testing-common/MLTestUtils.sys.mjs": typeof import("resource://testing-common/MLTestUtils.sys.mjs");
   "resource://testing-common/MerinoTestUtils.sys.mjs": typeof import("resource://testing-common/MerinoTestUtils.sys.mjs");
   "resource://testing-common/MessageChannel.sys.mjs": typeof import("resource://testing-common/MessageChannel.sys.mjs");
   "resource://testing-common/MockColorPicker.sys.mjs": typeof import("resource://testing-common/MockColorPicker.sys.mjs");
@@ -1333,6 +1405,7 @@ export interface Modules {
   "resource://testing-common/SearchTestUtils.sys.mjs": typeof import("resource://testing-common/SearchTestUtils.sys.mjs");
   "resource://testing-common/SearchUITestUtils.sys.mjs": typeof import("resource://testing-common/SearchUITestUtils.sys.mjs");
   "resource://testing-common/SessionStoreTestUtils.sys.mjs": typeof import("resource://testing-common/SessionStoreTestUtils.sys.mjs");
+  "resource://testing-common/SidebarTestUtils.sys.mjs": typeof import("resource://testing-common/SidebarTestUtils.sys.mjs");
   "resource://testing-common/Sinon.sys.mjs": typeof import("resource://testing-common/Sinon.sys.mjs");
   "resource://testing-common/SiteDataTestUtils.sys.mjs": typeof import("resource://testing-common/SiteDataTestUtils.sys.mjs");
   "resource://testing-common/SpecialPowersParent.sys.mjs": typeof import("resource://testing-common/SpecialPowersParent.sys.mjs");
@@ -1368,6 +1441,10 @@ export interface Modules {
   "resource://testing-common/dom/simpledb/test/modules/SimpleDBUtils.sys.mjs": typeof import("resource://testing-common/dom/simpledb/test/modules/SimpleDBUtils.sys.mjs");
   "resource://testing-common/early_hint_preload_test_helper.sys.mjs": typeof import("resource://testing-common/early_hint_preload_test_helper.sys.mjs");
   "resource://testing-common/httpd.sys.mjs": typeof import("resource://testing-common/httpd.sys.mjs");
+  "resource://testing-common/ipprotection/IPPAlwaysOn.sys.mjs": typeof import("resource://testing-common/ipprotection/IPPAlwaysOn.sys.mjs");
+  "resource://testing-common/ipprotection/IPPDummyAuthProvider.sys.mjs": typeof import("resource://testing-common/ipprotection/IPPDummyAuthProvider.sys.mjs");
+  "resource://testing-common/ipprotection/IPPEnterpriseAuthProvider.sys.mjs": typeof import("resource://testing-common/ipprotection/IPPEnterpriseAuthProvider.sys.mjs");
+  "resource://testing-common/ipprotection/IPPGpiAuthProvider.sys.mjs": typeof import("resource://testing-common/ipprotection/IPPGpiAuthProvider.sys.mjs");
   "resource://testing-common/services/common/logging.sys.mjs": typeof import("resource://testing-common/services/common/logging.sys.mjs");
   "resource://testing-common/services/sync/fakeservices.sys.mjs": typeof import("resource://testing-common/services/sync/fakeservices.sys.mjs");
   "resource://testing-common/services/sync/fxa_utils.sys.mjs": typeof import("resource://testing-common/services/sync/fxa_utils.sys.mjs");

src/zen/@types/lib.gecko.nsresult.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from xpc.msg and error_list.json.
@@ -674,6 +671,9 @@ interface nsIXPCComponents_Results {
   /** The URI is not available for add-ons */
   NS_ERROR_HARMFULADDON_URI: 0x805d002e;
 
+  /** Save Link As failed to see the headers early enough to choose a filename */
+  NS_ERROR_SAVE_LINK_AS_TIMEOUT: 0x805d0020;
+
   // Profile manager error codes
 
   /** Flushing the profiles to disk would have overwritten changes made elsewhere. */
@@ -703,6 +703,11 @@ interface nsIXPCComponents_Results {
 
   /** Client initialization attempted before origin has been initialized. */
   NS_ERROR_DOM_QM_CLIENT_INIT_ORIGIN_UNINITIALIZED: 0x80730001;
+
+  // Codes related to IndexedDB
+
+  /** A mutation operation was attempted on a database that did not allow mutations. */
+  NS_ERROR_DOM_INDEXEDDB_NOT_ALLOWED_ERR: 0x80660006;
 }
 
 type nsIXPCComponents_Values =

src/zen/@types/lib.gecko.services.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from services.json.

src/zen/@types/lib.gecko.tweaks.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * Gecko generic/specialized adjustments for xpcom and webidl types.
  */

src/zen/@types/lib.gecko.win32.d.ts

@@ -1,6 +1,3 @@
-// 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/.
 /**
  * NOTE: Do not modify this file by hand.
  * Content was generated from source XPCOM .idl files.
@@ -8,7 +5,7 @@
  */
 
 declare global {
-  // https://searchfox.org/mozilla-central/source/toolkit/components/aboutthirdparty/nsIAboutThirdParty.idl
+  // https://searchfox.org/firefox-main/source/toolkit/components/aboutthirdparty/nsIAboutThirdParty.idl
 
   interface nsIInstalledApplication extends nsISupports {
     readonly name: string;
@@ -31,7 +28,7 @@ declare global {
     loadModuleForTesting(aModulePath: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/components/aboutwindowsmessages/nsIAboutWindowsMessages.idl
+  // https://searchfox.org/firefox-main/source/toolkit/components/aboutwindowsmessages/nsIAboutWindowsMessages.idl
 
   interface nsIAboutWindowsMessages extends nsISupports {
     getMessages(
@@ -41,7 +38,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/components/alerts/nsIWindowsAlertsService.idl
+  // https://searchfox.org/firefox-main/source/toolkit/components/alerts/nsIWindowsAlertsService.idl
 } // global
 
 declare enum nsIWindowsAlertNotification_ImagePlacement {
@@ -71,7 +68,7 @@ declare global {
     removeAllNotificationsForInstall(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/mozapps/defaultagent/nsIDefaultAgent.idl
+  // https://searchfox.org/firefox-main/source/toolkit/mozapps/defaultagent/nsIDefaultAgent.idl
 
   interface nsIDefaultAgent extends nsISupports {
     registerTask(aUniqueToken: string): void;
@@ -105,7 +102,7 @@ declare global {
     agentDisabled(): boolean;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/mozapps/defaultagent/nsIWindowsMutex.idl
+  // https://searchfox.org/firefox-main/source/toolkit/mozapps/defaultagent/nsIWindowsMutex.idl
 
   interface nsIWindowsMutex extends nsISupports {
     tryLock(): void;
@@ -117,15 +114,15 @@ declare global {
     createMutex(aName: string): nsIWindowsMutex;
   }
 
-  // https://searchfox.org/mozilla-central/source/dom/geolocation/nsIGeolocationUIUtilsWin.idl
+  // https://searchfox.org/firefox-main/source/dom/geolocation/nsIGeolocationUIUtilsWin.idl
 
   interface nsIGeolocationUIUtilsWin extends nsISupports {
     dismissPrompts(aBC: BrowsingContext): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/netwerk/socket/nsINamedPipeService.idl
+  // https://searchfox.org/firefox-main/source/netwerk/socket/nsINamedPipeService.idl
 
-  // https://searchfox.org/mozilla-central/source/browser/components/shell/nsIWindowsShellService.idl
+  // https://searchfox.org/firefox-main/source/browser/components/shell/nsIWindowsShellService.idl
 } // global
 
 declare enum nsIWindowsShellService_LaunchOnLoginEnabledEnumerator {
@@ -185,7 +182,7 @@ declare global {
     queryCurrentDefaultHandlerFor(aFileExtensionOrProtocol: string): string;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl
+  // https://searchfox.org/firefox-main/source/toolkit/components/taskscheduler/nsIWinTaskSchedulerService.idl
 
   interface nsIWinTaskSchedulerService extends nsISupports {
     registerTask(
@@ -203,7 +200,7 @@ declare global {
     deleteFolder(aParentFolderName: string, aSubFolderName: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIJumpListBuilder.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIJumpListBuilder.idl
 
   interface nsIJumpListBuilder extends nsISupports {
     obtainAndCacheFavicon(faviconURL: nsIURI): string;
@@ -218,9 +215,9 @@ declare global {
     clearJumpList(): Promise<any>;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIPrintSettingsWin.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIPrintSettingsWin.idl
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarOverlayIconController.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarOverlayIconController.idl
 
   interface nsITaskbarOverlayIconController extends nsISupports {
     setOverlayIcon(
@@ -230,7 +227,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarPreview.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarPreview.idl
 
   interface nsITaskbarPreview extends nsISupports {
     controller: nsITaskbarPreviewController;
@@ -240,7 +237,7 @@ declare global {
     invalidate(): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarPreviewButton.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarPreviewButton.idl
 
   interface nsITaskbarPreviewButton extends nsISupports {
     tooltip: string;
@@ -251,7 +248,7 @@ declare global {
     visible: boolean;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarPreviewController.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarPreviewController.idl
 
   type nsITaskbarPreviewCallback = Callable<{
     done(aCanvas: nsISupports, aDrawBorder: boolean): void;
@@ -272,7 +269,7 @@ declare global {
     onClick(button: nsITaskbarPreviewButton): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarProgress.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarProgress.idl
 
   interface nsITaskbarProgress extends nsISupports {
     readonly STATE_NO_PROGRESS?: 0;
@@ -288,7 +285,7 @@ declare global {
     ): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarTabPreview.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarTabPreview.idl
 
   interface nsITaskbarTabPreview extends nsITaskbarPreview {
     title: string;
@@ -296,7 +293,7 @@ declare global {
     move(aNext: nsITaskbarTabPreview): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsITaskbarWindowPreview.idl
+  // https://searchfox.org/firefox-main/source/widget/nsITaskbarWindowPreview.idl
 
   interface nsITaskbarWindowPreview extends nsITaskbarPreview {
     readonly NUM_TOOLBAR_BUTTONS?: 7;
@@ -305,7 +302,7 @@ declare global {
     enableCustomDrawing: boolean;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIWinTaskbar.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIWinTaskbar.idl
 
   interface nsIWinTaskbar extends nsISupports {
     readonly available: boolean;
@@ -325,7 +322,7 @@ declare global {
     setGroupIdForWindow(aParent: mozIDOMWindow, aIdentifier: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/widget/nsIWindowsUIUtils.idl
+  // https://searchfox.org/firefox-main/source/widget/nsIWindowsUIUtils.idl
 
   interface nsIWindowsUIUtils extends nsISupports {
     readonly systemSmallIconSize: i32;
@@ -346,7 +343,7 @@ declare global {
     shareUrl(urlToShare: string, shareTitle: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/system/windowsPackageManager/nsIWindowsPackageManager.idl
+  // https://searchfox.org/firefox-main/source/toolkit/system/windowsPackageManager/nsIWindowsPackageManager.idl
 
   interface nsIWindowsPackageManager extends nsISupports {
     findUserInstalledPackages(prefix: string[]): string[];
@@ -354,7 +351,7 @@ declare global {
     campaignId(): Promise<any>;
   }
 
-  // https://searchfox.org/mozilla-central/source/xpcom/ds/nsIWindowsRegKey.idl
+  // https://searchfox.org/firefox-main/source/xpcom/ds/nsIWindowsRegKey.idl
 
   interface nsIWindowsRegKey extends nsISupports {
     readonly ROOT_KEY_CLASSES_ROOT?: 2147483648;
@@ -401,7 +398,7 @@ declare global {
     writeBinaryValue(name: string, data: string): void;
   }
 
-  // https://searchfox.org/mozilla-central/source/toolkit/xre/nsIWinAppHelper.idl
+  // https://searchfox.org/firefox-main/source/toolkit/xre/nsIWinAppHelper.idl
 
   interface nsIWinAppHelper extends nsISupports {
     readonly userCanElevate: boolean;

src/zen/@types/lib.gecko.xpidl.d.ts

@@ -1,13 +1,10 @@
-// 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/.
 /**
  * Gecko XPIDL base types.
  */
 
 /**
  * Generic IDs are created by most code which passes a nsID to js.
- * https://searchfox.org/mozilla-central/source/js/xpconnect/src/XPCJSID.cpp#24
+ * https://searchfox.org/firefox-main/source/js/xpconnect/src/XPCJSID.cpp#24
  */
 interface nsID<uuid = string> {
   readonly number: uuid;
@@ -16,7 +13,7 @@ interface nsID<uuid = string> {
 /**
  * In addition to nsID, interface IIDs support instanceof type guards,
  * and expose constants defined on the class, including variants from enums.
- * https://searchfox.org/mozilla-central/source/js/xpconnect/src/XPCJSID.cpp#45
+ * https://searchfox.org/firefox-main/source/js/xpconnect/src/XPCJSID.cpp#45
  */
 type nsJSIID<iface, enums = {}> = nsID &
   Constants<iface> &
@@ -31,8 +28,10 @@ type nsIID = nsIXPCComponents_Interfaces[keyof nsIXPCComponents_Interfaces];
 /** A generic to resolve QueryInterface return type from a nsIID. */
 type nsQIResult<iid> = iid extends { prototype: infer U } ? U : never;
 
-/** Picks only const number properties from T. */
-type Constants<T> = { [K in keyof T as IfConst<K, T[K]>]: T[K] };
+/** Picks only const number properties from T and marks them as required. */
+type Constants<T> = {
+  [K in keyof T as IfConst<K, T[K]>]-?: Exclude<T[K], undefined>;
+};
 
 /** Resolves only for keys K whose corresponding type T is a narrow number. */
 type IfConst<K, T> = T extends number ? (number extends T ? never : K) : never;

src/zen/boosts/ZenBoostStyles.sys.mjs

@@ -81,8 +81,15 @@ export class nsZenBoostStyles {
     }
 
     if (fontCase != "" || fontFamily != "") {
+      const ignoredElements = [
+        ".google-symbols",
+        "gf-load-icon-font",
+        "mat-icon",
+        ".google-material-icons",
+        "span",
+      ];
       style += `/* Text Format */\n`;
-      style += `body *:not(.google-symbols, gf-load-icon-font, mat-icon, .google-material-icons) {\n`;
+      style += `body *:not(${ignoredElements.join(",")}) {\n`;
       style += `${fontFamily}\n`;
       style += `${fontCase}\n`;
       style += `}\n`;

src/zen/boosts/ZenBoostsEditor.mjs

@@ -64,11 +64,11 @@ export class nsZenBoostEditor {
   }
 
   /**
-   * Returns the ZenBoosts JSWindowActor child for the currently selected tab.
+   * Returns the parent Boost JSActor for the currently selected tab.
    *
-   * @returns {ZenBoostsChild} zenBoostsChild Boost JSActor child
+   * @returns {ZenBoostsParent} Boost JSActor parent
    */
-  get zenBoostsChild() {
+  get zenBoostsParent() {
     const linkedBrowser = this.openerWindow.gBrowser.selectedTab.linkedBrowser;
     const actor =
       linkedBrowser.browsingContext.currentWindowGlobal.getActor("ZenBoosts");
@@ -138,6 +138,18 @@ export class nsZenBoostEditor {
       .getElementById("zen-boost-css-inspector")
       .addEventListener("click", this.onInspectorButtonPressed.bind(this));
 
+    const commandActions = {
+      cmd_zenBoostEditName: () => this.editBoostName(),
+      cmd_zenBoostShuffle: () => this.shuffleBoost(),
+      cmd_zenBoostReset: () => this.resetBoost(),
+      cmd_zenBoostLoad: () => this.onLoadBoostClick(),
+      cmd_zenBoostSave: () => this.onSaveBoostClick(),
+      cmd_zenBoostDelete: () => this.deleteBoost(),
+    };
+    for (const [id, action] of Object.entries(commandActions)) {
+      this.doc.getElementById(id).addEventListener("command", action);
+    }
+
     this.doc.addEventListener("keydown", event => {
       if (
         event.key === "Escape" ||
@@ -454,13 +466,13 @@ export class nsZenBoostEditor {
   }
 
   async onZapButtonPressed() {
-    this.zenBoostsChild.sendQuery("ZenBoost:ToggleZapMode");
+    this.zenBoostsParent.sendQuery("ZenBoost:ToggleZapMode");
     // Focus the parent browser window
     this.openerWindow.focus();
   }
 
   async onPickerButtonPressed() {
-    this.zenBoostsChild.sendQuery("ZenBoost:TogglePickerMode");
+    this.zenBoostsParent.sendQuery("ZenBoost:TogglePickerMode");
     this.openerWindow.focus();
   }
 
@@ -485,11 +497,11 @@ ${cssSelector} {
   }
 
   onInspectorButtonPressed() {
-    this.zenBoostsChild.sendQuery("ZenBoost:OpenInspector");
+    this.zenBoostsParent.sendQuery("ZenBoost:OpenInspector");
   }
 
   async onUpdateZapButtonVisual() {
-    const actor = this.zenBoostsChild;
+    const actor = this.zenBoostsParent;
     const zapButton = this.doc.getElementById("zen-boost-zap");
 
     const zapEnabled = await actor.sendQuery("ZenBoost:ZapModeEnabled");
@@ -501,7 +513,7 @@ ${cssSelector} {
 
   async onUpdatePickerButtonVisual() {
     const pickerButton = this.doc.getElementById("zen-boost-css-picker");
-    const selectEnabled = await this.zenBoostsChild.sendQuery(
+    const selectEnabled = await this.zenBoostsParent.sendQuery(
       "ZenBoost:SelectorPickerModeEnabled"
     );
 
@@ -648,7 +660,7 @@ ${cssSelector} {
   /**
    * Handles the size toggle button press, cycling through size override options
    */
-  async onBoostSizePressed() {
+  onBoostSizePressed() {
     if (this.currentBoostData.sizeOverride == 1) {
       this.currentBoostData.sizeOverride = 1.1;
     } else if (this.currentBoostData.sizeOverride == 1.1) {
@@ -659,7 +671,10 @@ ${cssSelector} {
       this.currentBoostData.sizeOverride = 0.9;
     } else if (this.currentBoostData.sizeOverride == 0.9) {
       this.currentBoostData.sizeOverride = 1;
-      await this.zenBoostsChild.sendQuery("ZenBoost:DisableSizeOverride");
+      this.zenBoostsParent.updateBoostSizeOverride(
+        this.currentBoostData.sizeOverride,
+        /* disable: */ true
+      );
     }
 
     this.currentBoostData.changeWasMade = true;

src/zen/boosts/actors/ZenBoostsChild.sys.mjs

@@ -280,9 +280,6 @@ export class ZenBoostsChild extends JSWindowActorChild {
       case "ZenBoost:OpenInspector":
         this.sendAsyncMessage("ZenBoost:OpenInspector");
         break;
-      case "ZenBoost:DisableSizeOverride":
-        this.disableSizeOverride();
-        break;
     }
     return null;
   }
@@ -359,13 +356,9 @@ export class ZenBoostsChild extends JSWindowActorChild {
         this.#loadStyleSheet(boost.styleSheet);
       }
 
-      if (
-        boostData.sizeOverride &&
-        isFinite(boostData.sizeOverride) &&
-        boostData.sizeOverride !== 1
-      ) {
-        browsingContext.fullZoom = boostData.sizeOverride;
-      }
+      this.sendAsyncMessage("ZenBoost:UpdateBoostSize", {
+        sizeOverride: boostData.sizeOverride,
+      });
 
       browsingContext.isZenBoostsInverted = boostData.smartInvert;
       if (boostData.enableColorBoost) {
@@ -552,14 +545,6 @@ export class ZenBoostsChild extends JSWindowActorChild {
     this.sendNotify("selector-picker-state-update", "ondisable");
   }
 
-  disableSizeOverride() {
-    const browsingContext = this.browsingContext;
-    if (!browsingContext || browsingContext.parent !== null) {
-      return;
-    }
-    browsingContext.fullZoom = 1;
-  }
-
   sendNotify(topic, msg = null) {
     this.sendAsyncMessage("ZenBoost:Notify", { topic, msg });
   }

src/zen/boosts/actors/ZenBoostsParent.sys.mjs

@@ -72,6 +72,23 @@ export class ZenBoostsParent extends JSWindowActorParent {
     }
   }
 
+  /**
+   * Updates the boost size override on webpage
+   *
+   * @param {number} sizeOverride - The size to apply on the webpage as a override
+   * @param {boolean} disable - Whether to disable the override (sets override to the default 1)
+   */
+  updateBoostSizeOverride(sizeOverride, disable = false) {
+    if (
+      sizeOverride &&
+      isFinite(sizeOverride) &&
+      (sizeOverride !== 1 || disable)
+    ) {
+      const fullZoom = this.browsingContext.topChromeWindow.FullZoom;
+      fullZoom.setZoom(sizeOverride, this.browsingContext.top.embedderElement);
+    }
+  }
+
   /**
    * Handles messages received from child actors.
    * Retrieves boost data for a domain when requested.
@@ -174,6 +191,11 @@ export class ZenBoostsParent extends JSWindowActorParent {
             : null,
         };
       }
+      case "ZenBoost:UpdateBoostSize": {
+        const { sizeOverride } = message.data;
+        this.updateBoostSizeOverride(sizeOverride);
+        break;
+      }
       default: {
         console.warn(`[ZenBoostsParent]: Unknown message: ${message.name}`);
         break;

src/zen/boosts/jar.inc.mn

@@ -9,6 +9,7 @@
 
         # Windows
 *       content/browser/zen-components/windows/zen-boost-editor.xhtml           (../../zen/boosts/zen-boost-editor.inc.xhtml)
+        content/browser/zen-components/windows/zen-boost-editor.js              (../../zen/boosts/zen-boost-editor.js)
 
         # Images
         content/browser/zen-images/boost-indicator.svg                          (../../zen/images/boost-indicator.svg)

src/zen/boosts/zen-boost-editor.inc.xhtml

@@ -138,28 +138,14 @@
   </popupset>
 
   <commandset id="zenBoostCommandSet">
-    <command id="cmd_zenBoostEditName"
-            oncommand="window.boostEditor.editBoostName();" />
-
-    <command id="cmd_zenBoostShuffle"
-            oncommand="window.boostEditor.shuffleBoost();" />
-
-    <command id="cmd_zenBoostReset"
-            oncommand="window.boostEditor.resetBoost();" />
-
-    <command id="cmd_zenBoostLoad"
-      oncommand="window.boostEditor.onLoadBoostClick();" />
-
-    <command id="cmd_zenBoostSave"
-            oncommand="window.boostEditor.onSaveBoostClick();" />
-
-    <command id="cmd_zenBoostDelete"
-            oncommand="window.boostEditor.deleteBoost();" />
+    <command id="cmd_zenBoostEditName" />
+    <command id="cmd_zenBoostShuffle" />
+    <command id="cmd_zenBoostReset" />
+    <command id="cmd_zenBoostLoad" />
+    <command id="cmd_zenBoostSave" />
+    <command id="cmd_zenBoostDelete" />
   </commandset>
 
-  <script>
-    const { nsZenBoostEditor } = ChromeUtils.importESModule( "resource:///modules/zen/boosts/ZenBoostsEditor.mjs" );
-    window.boostEditor = new nsZenBoostEditor(document, window.domain, window, window.openerWindow);
-  </script>
+  <script src="chrome://browser/content/zen-components/windows/zen-boost-editor.js"></script>
 </html:body>
 </html>

src/zen/boosts/zen-boost-editor.js

@@ -0,0 +1,14 @@
+/* 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/. */
+
+const { nsZenBoostEditor } = ChromeUtils.importESModule(
+  "resource:///modules/zen/boosts/ZenBoostsEditor.mjs"
+);
+
+window.boostEditor = new nsZenBoostEditor(
+  document,
+  window.domain,
+  window,
+  window.openerWindow
+);

src/zen/common/modules/ZenStartup.mjs

@@ -7,7 +7,7 @@ import checkForZenUpdates, {
 } from "chrome://browser/content/ZenUpdates.mjs";
 
 class ZenStartup {
-  #watermarkIgnoreElements = ["zen-toast-container"];
+  #watermarkIgnoreElements = ["zen-toast-container", "zen-browser-background"];
   #hasInitializedLayout = false;
 
   isReady = false;
@@ -53,12 +53,11 @@ class ZenStartup {
       // overlap and interaction issues with vertical tabs
       document.getElementById("browser").prepend(deckTemplate);
 
-      gZenWorkspaces.init();
-      setTimeout(() => {
+      gZenWorkspaces.init().then(() => {
         gZenUIManager.init();
         this.#initUIComponents();
         this.#checkForWelcomePage();
-      }, 0);
+      });
     } catch (e) {
       console.error("ZenThemeModifier: Error initializing browser layout", e);
     }
@@ -119,7 +118,9 @@ class ZenStartup {
       document.documentElement.removeAttribute("zen-before-loaded");
       return;
     }
-    for (let elem of document.querySelectorAll("#browser > *, #urlbar")) {
+    for (let elem of document.querySelectorAll(
+      `#browser > *:not(${this.#watermarkIgnoreElements.map(id => "#" + id).join(", ")}), #urlbar`
+    )) {
       elem.style.opacity = 0;
     }
   }

src/zen/common/modules/ZenUpdates.mjs

@@ -32,6 +32,11 @@ export default function checkForZenUpdates() {
         ),
         l10nId: "zen-sidebar-notification-updated",
         special: true,
+        icon: "chrome://browser/skin/zen-icons/sparkles.svg",
+      },
+      {
+        url: "https://www.zen-browser.app/donate",
+        l10nId: "zen-sidebar-notification-donate",
         icon: "chrome://browser/skin/zen-icons/heart-circle-fill.svg",
       },
       {

src/zen/common/styles/zen-browser-ui.css

@@ -27,7 +27,7 @@ body,
   }
 }
 
-:root[zen-before-loaded="true"] #browser > *:not(#zen-toast-container),
+:root[zen-before-loaded="true"] #browser > *:not(#zen-toast-container, #zen-browser-background),
 :root[zen-before-loaded="true"] #urlbar {
   opacity: 0 !important;
 }
@@ -353,3 +353,11 @@ body,
 :root[zen-right-side="true"] #zen-appcontent-navbar-wrapper #PanelUI-button {
   order: 2;
 }
+
+/* See #14409: firefox 150's body paint containment prevents the right side compact
+ sidebar from remaining active at the screen edge in macOS fullscreen */
+@media (-moz-platform: macos) {
+  :root[macOSNativeFullscreen][zen-compact-mode][zen-right-side] body {
+    contain: none;
+  }
+}

src/zen/common/styles/zen-omnibox.css

@@ -712,7 +712,7 @@
 }
 
 /* Hide the results body when there are no results, to avoid showing an empty box */
-.urlbarView[noresults] > .urlbarView-body-outer > .urlbarView-body-inner,
+.urlbar[noresults] .urlbarView > .urlbarView-body-outer > .urlbarView-body-inner,
 #urlbar-search-mode-indicator-close {
   display: none;
 }

src/zen/common/styles/zen-sidebar-notification.css

@@ -19,6 +19,8 @@
   flex-direction: column;
   min-width: 0;
   border-radius: var(--border-radius-medium);
+  outline: var(--zen-sidebar-notification-outline);
+  outline-offset: -1.5px;
   box-shadow: var(--zen-sidebar-notification-shadow);
   font-size: 12px;
 }

src/zen/common/styles/zen-theme.css

@@ -190,7 +190,7 @@
   --urlbar-box-active-bgcolor: var(--toolbarbutton-hover-background) !important;
   --zen-input-border-color: light-dark(rgb(204, 204, 204), rgb(66, 65, 77));
   --urlbar-box-hover-bgcolor: var(--toolbarbutton-hover-background) !important;
-  --input-bgcolor: light-dark(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)) !important;
+  --input-text-background-color: light-dark(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2)) !important;
   --toolbar-field-focus-background-color: light-dark(
     rgba(255, 255, 255, 0.25),
     rgba(0, 0, 0, 0.3)
@@ -262,6 +262,7 @@
     light-dark(white, black)
   );
   --zen-sidebar-notification-shadow: 0 0 6px light-dark(rgba(0, 0, 0, 0.1), rgba(0, 0, 0, 0.3));
+  --zen-sidebar-notification-outline: 1px solid light-dark(transparent, rgba(255, 255, 255, 0.1));
 
   --zen-sidebar-themed-icon-fill: light-dark(color-mix(in srgb, var(--zen-primary-color) 50%, black), color-mix(in srgb, var(--zen-colors-primary) 15%, #ebebeb));
 

src/zen/common/sys/ZenActorsManager.sys.mjs

@@ -57,6 +57,22 @@ let JSWINDOWACTORS = {
     remoteTypes: ["web", "file"],
     enablePreference: "zen.glance.enabled",
   },
+  ZenWindowDrag: {
+    parent: {
+      esModuleURI: "resource:///actors/ZenWindowDragParent.sys.mjs",
+    },
+    child: {
+      esModuleURI: "resource:///actors/ZenWindowDragChild.sys.mjs",
+      events: {
+        mousedown: {
+          mozSystemGroup: true,
+        },
+      },
+    },
+    messageManagerGroups: ["browsers"],
+    remoteTypes: ["web", "file"],
+    enablePreference: "zen.view.drag-window-from-content",
+  },
 };
 
 if (!Services.appinfo.inSafeMode) {

src/zen/compact-mode/ZenCompactMode.mjs

@@ -34,6 +34,29 @@ XPCOMUtils.defineLazyPreferenceGetter(
   true
 );
 
+// Distance (in CSS pixels) the mouse can travel past the window bounds after
+// leaving the window before the hovered element is collapsed
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "COMPACT_MODE_OUTSIDE_WINDOW_HORIZONTAL_OFFSET",
+  "zen.view.compact.outside-window-edge-offset.horizontal",
+  250
+);
+
+XPCOMUtils.defineLazyPreferenceGetter(
+  lazy,
+  "COMPACT_MODE_OUTSIDE_WINDOW_VERTICAL_OFFSET",
+  "zen.view.compact.outside-window-edge-offset.vertical",
+  150
+);
+
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "zenMouseTracker",
+  "@mozilla.org/zen/mouse-tracker;1",
+  Ci.nsIZenMouseTracker
+);
+
 ChromeUtils.defineLazyGetter(lazy, "mainAppWrapper", () =>
   document.getElementById("zen-main-app-wrapper")
 );
@@ -71,9 +94,21 @@ window.gZenCompactModeManager = {
       tabIsRightObserver
     );
 
+    const outsideMouseTrackerExitObserver =
+      this._onOutsideMouseTrackerExit.bind(this);
+    Services.obs.addObserver(
+      outsideMouseTrackerExitObserver,
+      "zen-mouse-tracker:exited"
+    );
+
     window.addEventListener(
       "unload",
       () => {
+        this._stopTrackingMouseOutsideWindow();
+        Services.obs.removeObserver(
+          outsideMouseTrackerExitObserver,
+          "zen-mouse-tracker:exited"
+        );
         Services.prefs.removeObserver(
           "zen.tabs.vertical.right-side",
           tabIsRightObserver
@@ -94,6 +129,10 @@ window.gZenCompactModeManager = {
       this._clearAllHoverStates()
     );
 
+    // Hide any element kept open by the outside mouse tracking as soon as the
+    // window loses focus
+    window.addEventListener("deactivate", () => this._collapseTrackedElement());
+
     this._canShowBackgroundTabToast = Services.prefs.getBoolPref(
       "zen.view.compact.show-background-tab-toast",
       true
@@ -149,6 +188,7 @@ window.gZenCompactModeManager = {
       return;
     }
     delete this._isTabBeingDragged;
+    this._stopTrackingMouseOutsideWindow();
     this.sidebar.removeAttribute("zen-user-show");
     // We use this element in order to make it persis across restarts, by using the XULStore.
     // main-window can't store attributes other than window sizes, so we use this instead
@@ -723,6 +763,9 @@ window.gZenCompactModeManager = {
       }
     } else {
       if (attr === "zen-has-hover") {
+        if (element === this._outsideTrackedElement) {
+          this._stopTrackingMouseOutsideWindow();
+        }
         element.removeAttribute("zen-has-implicit-hover");
         gURLBar.updateTextOverflow();
       }
@@ -886,18 +929,23 @@ window.gZenCompactModeManager = {
           }
           window.cancelAnimationFrame(this._removeHoverFrames[target.id]);
 
-          this.flashElement(
-            target,
-            this.hideAfterHoverDuration,
-            "has-hover" + target.id,
-            "zen-has-hover"
-          );
+          if (!this._trackMouseOutsideWindow(entry.screenEdge, target)) {
+            // We can't track the mouse position outside of the window on
+            // this platform, fall back to hiding after a fixed duration
+            this.flashElement(
+              target,
+              this.hideAfterHoverDuration,
+              "has-hover" + target.id,
+              "zen-has-hover"
+            );
+          }
           document.addEventListener(
             "mousemove",
             () => {
               if (target.matches(":hover")) {
                 return;
               }
+              // Closing the element also stops the outside mouse tracking
               this._setElementExpandAttribute(target, false);
               this.clearFlashTimeout("has-hover" + target.id);
             },
@@ -941,7 +989,55 @@ window.gZenCompactModeManager = {
     return bBox.left - error < x && x < bBox.right + error;
   },
 
+  _trackMouseOutsideWindow(screenEdge, target) {
+    this._stopTrackingMouseOutsideWindow();
+    const maxEdgeOffset =
+      screenEdge === "left" || screenEdge === "right"
+        ? lazy.COMPACT_MODE_OUTSIDE_WINDOW_HORIZONTAL_OFFSET
+        : lazy.COMPACT_MODE_OUTSIDE_WINDOW_VERTICAL_OFFSET;
+    try {
+      lazy.zenMouseTracker.registerWindow(window, screenEdge, maxEdgeOffset);
+    } catch (e) {
+      // The platform can't track the global mouse position (e.g. Linux)
+      return false;
+    }
+    this._outsideTrackedElement = target;
+    this.clearFlashTimeout("has-hover" + target.id);
+    window.requestAnimationFrame(() => {
+      if (this._outsideTrackedElement === target) {
+        this._setElementExpandAttribute(target, true);
+      }
+    });
+    return true;
+  },
+
+  _stopTrackingMouseOutsideWindow() {
+    const target = this._outsideTrackedElement;
+    if (!target) {
+      return;
+    }
+    this._outsideTrackedElement = null;
+    lazy.zenMouseTracker.unregisterWindow(window);
+  },
+
+  _collapseTrackedElement() {
+    const target = this._outsideTrackedElement;
+    if (!target) {
+      return;
+    }
+    // Closing the element also unregisters us from the mouse tracker
+    this._setElementExpandAttribute(target, false);
+    this.clearFlashTimeout("has-hover" + target.id);
+  },
+
+  _onOutsideMouseTrackerExit(subject) {
+    if (subject === window) {
+      this._collapseTrackedElement();
+    }
+  },
+
   _clearAllHoverStates() {
+    this._stopTrackingMouseOutsideWindow();
     // Clear hover attributes from all hoverable elements
     for (let entry of this.hoverableElements) {
       const target = entry.element;
@@ -977,6 +1073,14 @@ window.gZenCompactModeManager = {
       !gZenGlanceManager._animating &&
       !this._nextTimeWillBeActive
     ) {
+      const isTabRoutedToCurrentSpace =
+        beforeRouteResult.targetRoute === gZenWorkspaces.activeWorkspace;
+      // Do not show the toast if the sidebar is not hidden and
+      // the tab is being routed to the current space
+      if (!isSidebarHidden && isTabRoutedToCurrentSpace) {
+        return;
+      }
+
       let messageId = "zen-background-tab-opened-toast";
       let toastOptions = {
         button: {
@@ -988,7 +1092,7 @@ window.gZenCompactModeManager = {
         },
       };
 
-      if (beforeRouteResult.isRouteFound) {
+      if (beforeRouteResult.isRouteFound && !isTabRoutedToCurrentSpace) {
         messageId = "zen-space-routing-tab-routed-toast";
         toastOptions = {
           l10nArgs: { targetWorkspace: beforeRouteResult.targetWorkspaceName },

src/zen/compact-mode/ZenMouseTracker.cpp

@@ -0,0 +1,246 @@
+/* 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/. */
+
+#include "ZenMouseTracker.h"
+#include "ZenMouseTrackerInternal.h"
+
+#include <atomic>
+
+#include "mozilla/Services.h"
+#include "mozilla/WidgetUtils.h"
+#include "nsIObserverService.h"
+#include "nsIWidget.h"
+#include "nsThreadUtils.h"
+
+namespace zen {
+
+NS_IMPL_ISUPPORTS(ZenMouseTracker, nsIZenMouseTracker, nsIObserver)
+
+static ZenMouseTracker* sInstance = nullptr;
+
+// Pointer moves are coalesced: the backends may report them faster than we
+// want to run the checks, and on Windows they arrive from a low level hook
+// where as little work as possible should happen. These are atomic since
+// some backends (e.g. the macOS global event monitor) may deliver the moves
+// off the main thread.
+static std::atomic<int32_t> sLatestPointerX{0};
+static std::atomic<int32_t> sLatestPointerY{0};
+static std::atomic<bool> sPendingEvaluation{false};
+
+ZenMouseTracker::ZenMouseTracker() {
+  MOZ_ASSERT(NS_IsMainThread());
+  sInstance = this;
+}
+
+ZenMouseTracker::~ZenMouseTracker() {
+  ZenNativeMouseMonitor::Stop();
+  if (sInstance == this) {
+    sInstance = nullptr;
+  }
+}
+
+// static
+mozilla::Maybe<ZenMouseTracker::TrackedEdge> ZenMouseTracker::ParseEdge(
+    const nsACString& aScreenEdge) {
+  if (aScreenEdge.EqualsLiteral("left")) {
+    return mozilla::Some(TrackedEdge::Left);
+  }
+  if (aScreenEdge.EqualsLiteral("right")) {
+    return mozilla::Some(TrackedEdge::Right);
+  }
+  if (aScreenEdge.EqualsLiteral("top")) {
+    return mozilla::Some(TrackedEdge::Top);
+  }
+  if (aScreenEdge.EqualsLiteral("bottom")) {
+    return mozilla::Some(TrackedEdge::Bottom);
+  }
+  return mozilla::Nothing();
+}
+
+NS_IMETHODIMP
+ZenMouseTracker::RegisterWindow(mozIDOMWindowProxy* aWindow,
+                                const nsACString& aScreenEdge,
+                                float aMaxEdgeOffset) {
+  MOZ_ASSERT(NS_IsMainThread());
+  const auto edge = ParseEdge(aScreenEdge);
+  if (!aWindow || edge.isNothing() || aMaxEdgeOffset < 0.0f) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  nsCOMPtr<nsPIDOMWindowOuter> window = nsPIDOMWindowOuter::From(aWindow);
+  if (!window) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  nsresult rv = ZenNativeMouseMonitor::Start();
+  if (NS_FAILED(rv)) {
+    return rv;
+  }
+
+  for (auto& tracked : mTracked) {
+    if (tracked.mWindow == window) {
+      tracked.mEdge = *edge;
+      tracked.mMaxEdgeOffset = aMaxEdgeOffset;
+      return NS_OK;
+    }
+  }
+  mTracked.AppendElement(TrackedWindow{window, *edge, aMaxEdgeOffset});
+  AddObservers();
+  return NS_OK;
+}
+
+void ZenMouseTracker::AddObservers() {
+  if (mObserving) {
+    return;
+  }
+  if (nsCOMPtr<nsIObserverService> obs =
+          mozilla::services::GetObserverService()) {
+    obs->AddObserver(this, "domwindowclosed", false);
+    obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
+    mObserving = true;
+  }
+}
+
+void ZenMouseTracker::RemoveObservers() {
+  if (!mObserving) {
+    return;
+  }
+  if (nsCOMPtr<nsIObserverService> obs =
+          mozilla::services::GetObserverService()) {
+    obs->RemoveObserver(this, "domwindowclosed");
+    obs->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
+  }
+  mObserving = false;
+}
+
+NS_IMETHODIMP
+ZenMouseTracker::UnregisterWindow(mozIDOMWindowProxy* aWindow) {
+  MOZ_ASSERT(NS_IsMainThread());
+  if (!aWindow) {
+    return NS_ERROR_INVALID_ARG;
+  }
+  StopTrackingWindow(nsPIDOMWindowOuter::From(aWindow));
+  return NS_OK;
+}
+
+void ZenMouseTracker::StopTrackingWindow(nsPIDOMWindowOuter* aWindow) {
+  for (size_t i = 0; i < mTracked.Length(); i++) {
+    if (mTracked[i].mWindow == aWindow) {
+      mTracked.RemoveElementAt(i);
+      break;
+    }
+  }
+  OnTrackedListChanged();
+}
+
+void ZenMouseTracker::OnTrackedListChanged() {
+  if (mTracked.IsEmpty()) {
+    ZenNativeMouseMonitor::Stop();
+    RemoveObservers();
+  }
+}
+
+// static
+void ZenMouseTracker::OnNativePointerMove(const mozilla::DesktopPoint& aPoint) {
+  sLatestPointerX = int32_t(aPoint.x);
+  sLatestPointerY = int32_t(aPoint.y);
+  if (sPendingEvaluation.exchange(true)) {
+    // An already queued evaluation will pick up the position we just stored
+    return;
+  }
+  nsresult rv = NS_DispatchToMainThread(
+      NS_NewRunnableFunction("zen::ZenMouseTracker::Evaluate", [] {
+        sPendingEvaluation = false;
+        if (RefPtr<ZenMouseTracker> tracker = sInstance) {
+          tracker->Evaluate(mozilla::DesktopPoint(float(sLatestPointerX),
+                                                  float(sLatestPointerY)));
+        }
+      }));
+  if (NS_FAILED(rv)) {
+    // Don't let a failed dispatch (e.g. during shutdown) block all future
+    // evaluations
+    sPendingEvaluation = false;
+  }
+}
+
+void ZenMouseTracker::Evaluate(const mozilla::DesktopPoint& aPoint) {
+  nsTArray<nsCOMPtr<nsPIDOMWindowOuter>> exited;
+  for (size_t i = mTracked.Length(); i > 0; i--) {
+    auto& tracked = mTracked[i - 1];
+    RefPtr<nsIWidget> widget =
+        mozilla::widget::WidgetUtils::DOMWindowToWidget(tracked.mWindow);
+    if (!widget) {
+      mTracked.RemoveElementAt(i - 1);
+      continue;
+    }
+    if (!IsPointerWithinBounds(tracked, aPoint, widget)) {
+      exited.AppendElement(std::move(tracked.mWindow));
+      mTracked.RemoveElementAt(i - 1);
+    }
+  }
+  OnTrackedListChanged();
+
+  if (exited.IsEmpty()) {
+    return;
+  }
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (!obs) {
+    return;
+  }
+  for (auto& window : exited) {
+    obs->NotifyObservers(window, ZEN_MOUSE_TRACKER_EXITED_TOPIC, nullptr);
+  }
+}
+
+// static
+bool ZenMouseTracker::IsPointerWithinBounds(const TrackedWindow& aTracked,
+                                            const mozilla::DesktopPoint& aPoint,
+                                            nsIWidget* aWidget) {
+  const auto scale = aWidget->GetDesktopToDeviceScale();
+  const float x = aPoint.x * scale.scale;
+  const float y = aPoint.y * scale.scale;
+
+  const auto origin = aWidget->WidgetToScreenOffset();
+  const auto size = aWidget->GetClientSize();
+  const float left = origin.x;
+  const float top = origin.y;
+  const float right = left + size.width;
+  const float bottom = top + size.height;
+
+  if (x >= left && x <= right && y >= top && y <= bottom) {
+    // Back inside the window; the in-window hover logic owns this case
+    return true;
+  }
+
+  const float maxOffset =
+      aTracked.mMaxEdgeOffset * float(aWidget->GetDefaultScale().scale);
+  switch (aTracked.mEdge) {
+    case TrackedEdge::Left:
+      return x >= left - maxOffset && x < left && y >= top && y <= bottom;
+    case TrackedEdge::Right:
+      return x > right && x <= right + maxOffset && y >= top && y <= bottom;
+    case TrackedEdge::Top:
+      return y >= top - maxOffset && y < top && x >= left && x <= right;
+    case TrackedEdge::Bottom:
+      return y > bottom && y <= bottom + maxOffset && x >= left && x <= right;
+  }
+  return false;
+}
+
+NS_IMETHODIMP
+ZenMouseTracker::Observe(nsISupports* aSubject, const char* aTopic,
+                         const char16_t* aData) {
+  if (!strcmp(aTopic, "domwindowclosed")) {
+    if (nsCOMPtr<nsPIDOMWindowOuter> window = do_QueryInterface(aSubject)) {
+      StopTrackingWindow(window);
+    }
+    return NS_OK;
+  }
+  if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
+    mTracked.Clear();
+    OnTrackedListChanged();
+  }
+  return NS_OK;
+}
+
+}  // namespace zen

src/zen/compact-mode/ZenMouseTracker.h

@@ -0,0 +1,92 @@
+/* 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/. */
+
+#ifndef mozilla_ZenMouseTracker_h_
+#define mozilla_ZenMouseTracker_h_
+
+#include "nsIZenMouseTracker.h"
+
+#include "mozilla/Maybe.h"
+#include "nsIObserver.h"
+#include "nsCOMPtr.h"
+#include "nsPIDOMWindow.h"
+#include "nsTArray.h"
+#include "Units.h"
+
+class nsIWidget;
+
+// Fired with the tracked window as subject once the pointer breaks the
+// tracking conditions; tracking for that window has already stopped.
+#define ZEN_MOUSE_TRACKER_EXITED_TOPIC "zen-mouse-tracker:exited"
+
+namespace zen {
+
+/**
+ * @brief Watches the global OS pointer position for registered windows and
+ *   notifies observers once the pointer moves too far away from the window
+ *   edge it left through.
+ */
+class ZenMouseTracker final : public nsIZenMouseTracker, public nsIObserver {
+ public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIZENMOUSETRACKER
+  NS_DECL_NSIOBSERVER
+
+  ZenMouseTracker();
+
+  /**
+   * @brief Called by the platform backends whenever the OS pointer moves.
+   * @param aPoint The pointer position in desktop pixels, relative to the
+   *   origin of the (primary) screen. May be called outside of a clean event
+   *   loop iteration (e.g. from a low level hook), evaluation is coalesced
+   *   onto the main thread.
+   */
+  static void OnNativePointerMove(const mozilla::DesktopPoint& aPoint);
+
+ private:
+  ~ZenMouseTracker();
+
+  enum class TrackedEdge : uint8_t { Left, Right, Top, Bottom };
+
+  struct TrackedWindow {
+    nsCOMPtr<nsPIDOMWindowOuter> mWindow;
+    TrackedEdge mEdge;
+    float mMaxEdgeOffset;  // In CSS pixels
+  };
+
+  static mozilla::Maybe<TrackedEdge> ParseEdge(const nsACString& aScreenEdge);
+
+  /**
+   * @brief Check every tracked window against the given pointer position and
+   *   notify + stop tracking the ones the pointer moved too far away from.
+   */
+  void Evaluate(const mozilla::DesktopPoint& aPoint);
+
+  /**
+   * @brief Whether the pointer is still allowed to keep the window's edge
+   *   element open, given the window's bounds on screen.
+   */
+  static bool IsPointerWithinBounds(const TrackedWindow& aTracked,
+                                    const mozilla::DesktopPoint& aPoint,
+                                    nsIWidget* aWidget);
+
+  void StopTrackingWindow(nsPIDOMWindowOuter* aWindow);
+
+  /**
+   * @brief Tear down the native monitor and our observers once the last
+   *   tracked window is gone, so the service is fully idle while nothing is
+   *   being tracked.
+   */
+  void OnTrackedListChanged();
+
+  void AddObservers();
+  void RemoveObservers();
+
+  nsTArray<TrackedWindow> mTracked;
+  bool mObserving = false;
+};
+
+}  // namespace zen
+
+#endif