Merge branch 'dev' into window-sync

feat: Dont session duplicate the tabs, b=no-bug, c=workspaces
feat: Also change icons and labels if the tab is pending, b=no-bug, c=tabs, workspaces
2025-09-06 19:38:24 +00:00 · 2025-09-03 13:06:44 +02:00 · 2025-09-02 16:21:04 +02:00 · 2025-09-01 16:09:59 +02:00 · 2025-08-27 23:25:07 +02:00
36 changed files with 444 additions and 210 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -734,8 +734,8 @@ jobs:
          GIT_CURL_VERBOSE: 1
        with:
          token: ${{ secrets.DEPLOY_KEY }}
-          commit-message: Update to version `${{ needs.build-data.outputs.version }}`
-          title: Update to version `${{ needs.build-data.outputs.version }}`
+          commit-message: 🚀 Update to version ${{ needs.build-data.outputs.version }}
+          title: 🚀 Update to version ${{ needs.build-data.outputs.version }}
          body: |
            This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}.

--- a/.well-known/funding-manifest-urls
+++ b/.well-known/funding-manifest-urls
@@ -0,0 +1 @@
+https://zen-browser.app/funding.json
--- a/build/flatpak/app.zen_browser.zen.yml.template
+++ b/build/flatpak/app.zen_browser.zen.yml.template
@@ -11,7 +11,6 @@ add-extensions:
    add-ld-path: .
 command: launch-script.sh
 finish-args:
-  - --allow=devel
  - --share=ipc
  - --share=network
  - --socket=pulseaudio
@@ -20,29 +19,16 @@ finish-args:
  - --socket=pcsc
  - --socket=cups
  - --persist=.zen
-  - --env=DICPATH=/usr/share/hunspell
  - --filesystem=xdg-download:rw
-  - --filesystem=/run/.heim_org.h5l.kcm-socket
-  - --filesystem=xdg-run/speech-dispatcher:ro
  - --device=all
  - --talk-name=org.freedesktop.FileManager1
+  - --talk-name=org.freedesktop.ScreenSaver
+  - --own-name=org.mozilla.zen.*
+  - --own-name=org.mpris.MediaPlayer2.firefox.*
  - --system-talk-name=org.freedesktop.NetworkManager
  - --talk-name=org.a11y.Bus
-  - --talk-name=org.gtk.vfs.*
-  - --own-name=org.mpris.MediaPlayer2.firefox.*
-  - --own-name=org.mozilla.zen.*
-cleanup:
-  - /include
-  - /lib/pkgconfig
-  - /share/pkgconfig
-  - /share/aclocal
-  - /share/gtk-doc
-  - /share/doc
-  - /share/info
-  - /man
-  - /share/man
-  - '*.la'
-  - '*.a'
+  - --env=GTK_PATH=/app/lib/gtkmodules
+  - --env=MESA_SHADER_CACHE_DIR=/var/cache/mesa_shader_cache_db
 modules:
  - name: zen_browser
    buildsystem: simple
--- a/locales/pt-PT/browser/browser/zen-folders.ftl
+++ b/locales/pt-PT/browser/browser/zen-folders.ftl
@@ -15,7 +15,7 @@ zen-folders-panel-change-folder-space =
 zen-folders-panel-change-icon-folder = 
    .label = Alterar Ícone
 zen-folders-unload-all-tooltip = 
-    .tooltiptext = Descarregar ativos nesta pasta
+    .tooltiptext = Unload active in this folder
 zen-folders-unload-folder = 
-    .label = Descarregar Todos os Separadores
+    .label = Unload All Tabs
 zen-folders-search-no-results = Não existem separadores que correspondam a essa pesquisa 🤔
--- a/prefs/compact-mode.yaml
+++ b/prefs/compact-mode.yaml
@@ -36,6 +36,6 @@
  value: false

 # Do not edit manually
- name: zen.view.compact.enable-at-startup
+- name: zen.view.compact.should-enable-at-startup
  hidden: true
  value: false
--- a/prefs/extensions.yaml
+++ b/prefs/extensions.yaml
@@ -4,3 +4,6 @@

 - name: xpinstall.signatures.required
  value: true
+
+- name: extensions.pocket.enabled
+  value: false
--- a/prefs/workspaces.yaml
+++ b/prefs/workspaces.yaml
@@ -36,9 +36,6 @@
  value: '@cond'
  condition: '!defined(MOZILLA_OFFICIAL)' # Section: Pinned tabs management

- name: zen.pinned-tab-manager.wheel-close-if-pending
-  value: true
-
 - name: zen.pinned-tab-manager.debug
  value: false

--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0b2e6bc02 100644
+index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..d031a99ae5c9c6e69cfd831c7d271d8a8d097dc8 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
@@ -26,6 +26,7 @@
@@ -25,7 +25,7 @@ index 665b048cf149b9a6d0ccc43f8d9199f077b8ada2..fcff5cc6a4a50ff2d76930e4d2a1e1d0
     </vbox>
   </html:template>
 
-+<hbox id="zen-main-app-wrapper" flex="1" class="browser-toolbox-background">
+<hbox id="zen-main-app-wrapper" flex="1" persist="zen-compact-mode" class="browser-toolbox-background">
 #include navigator-toolbox.inc.xhtml
 
 #include browser-box.inc.xhtml
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -58,3 +58,4 @@
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenDownloadAnimation.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenEmojiPicker.mjs"></script>
 <script type="text/javascript" src="chrome://browser/content/zen-components/ZenWorkspaceCreation.mjs"></script>
+<script type="text/javascript" src="chrome://browser/content/zen-components/ZenWindowSyncing.mjs"></script>
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -44,6 +44,7 @@
        content/browser/zen-components/ZenWorkspaceIcons.mjs                    (../../zen/workspaces/ZenWorkspaceIcons.mjs)
        content/browser/zen-components/ZenWorkspace.mjs                         (../../zen/workspaces/ZenWorkspace.mjs)
        content/browser/zen-components/ZenWorkspaces.mjs                        (../../zen/workspaces/ZenWorkspaces.mjs)
+        content/browser/zen-components/ZenWindowSyncing.mjs                     (../../zen/workspaces/ZenWindowSyncing.mjs)
        content/browser/zen-components/ZenWorkspaceCreation.mjs                 (../../zen/workspaces/ZenWorkspaceCreation.mjs)
        content/browser/zen-components/ZenWorkspacesStorage.mjs                 (../../zen/workspaces/ZenWorkspacesStorage.mjs)
        content/browser/zen-components/ZenWorkspacesSync.mjs                    (../../zen/workspaces/ZenWorkspacesSync.mjs)
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c328341c6e6eb 100644
+index d80a66a01002e78a9c65545d08fe786328ddf124..46b1e3075165e1e9e783db84861b0fea99420448 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -422,15 +422,64 @@
@@ -395,10 +395,10 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
 +            gZenWorkspaces._initialTab._shouldRemove = true;
 +          }
 +        }
-+      }
+       }
 +      else {
 +        gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
-       }
+      }
 +      this._hasAlreadyInitializedZenSessionStore = true;
 
       if (tabs.length > 1 || !tabs[0].selected) {
@@ -522,17 +522,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       if (
         !this._beginRemoveTab(aTab, {
           closeWindowFastpath: true,
-@@ -4771,7 +4912,9 @@
-         // We're not animating, so we can cancel the animation stopwatch.
-         Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
-         aTab._closeTimeAnimTimerId = null;
-+        gZenVerticalTabsManager.animateTabClose(aTab, (animate && !gReduceMotion)).then(() => {
-         this._endRemoveTab(aTab);
-+        });
-         return;
-       }
- 
-@@ -4905,7 +5048,7 @@
+@@ -4905,7 +5046,7 @@
           closeWindowWithLastTab != null
             ? closeWindowWithLastTab
             : !window.toolbar.visible ||
@@ -541,7 +531,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
 
         if (closeWindow) {
           // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4929,6 +5072,7 @@
+@@ -4929,6 +5070,7 @@
 
         newTab = true;
       }
@@ -549,7 +539,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       aTab._endRemoveArgs = [closeWindow, newTab];
 
       // swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4969,13 +5113,7 @@
+@@ -4969,13 +5111,7 @@
       aTab._mouseleave();
 
       if (newTab) {
@@ -564,7 +554,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       } else {
         TabBarVisibility.update();
       }
-@@ -5108,6 +5246,7 @@
+@@ -5108,6 +5244,7 @@
         this.tabs[i]._tPos = i;
       }
 
@@ -572,7 +562,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       if (!this._windowIsClosing) {
         // update tab close buttons state
         this.tabContainer._updateCloseButtons();
-@@ -5320,6 +5459,7 @@
+@@ -5320,6 +5457,7 @@
       }
 
       let excludeTabs = new Set(aExcludeTabs);
@@ -580,7 +570,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
 
       // If this tab has a successor, it should be selectable, since
       // hiding or closing a tab removes that tab as a successor.
-@@ -5332,13 +5472,13 @@
+@@ -5332,13 +5470,13 @@
         !excludeTabs.has(aTab.owner) &&
         Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
       ) {
@@ -596,7 +586,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       );
 
       let tab = this.tabContainer.findNextTab(aTab, {
-@@ -5354,7 +5494,7 @@
+@@ -5354,7 +5492,7 @@
       }
 
       if (tab) {
@@ -605,7 +595,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       }
 
       // If no qualifying visible tab was found, see if there is a tab in
-@@ -5375,7 +5515,7 @@
+@@ -5375,7 +5513,7 @@
         });
       }
 
@@ -614,7 +604,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
     }
 
     _blurTab(aTab) {
-@@ -5777,10 +5917,10 @@
+@@ -5777,10 +5915,10 @@
       SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
     }
 
@@ -627,7 +617,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
         aTab.selected ||
         aTab.closing ||
         // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5839,6 +5979,7 @@
+@@ -5839,6 +5977,7 @@
      * @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
      */
     replaceTabWithWindow(aTab, aOptions) {
@@ -635,7 +625,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       if (this.tabs.length == 1) {
         return null;
       }
-@@ -5972,7 +6113,7 @@
+@@ -5972,7 +6111,7 @@
      *   `true` if element is a `<tab-group>`
      */
     isTabGroup(element) {
@@ -644,7 +634,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
     }
 
     /**
-@@ -6048,8 +6189,8 @@
+@@ -6048,8 +6187,8 @@
       }
 
       // Don't allow mixing pinned and unpinned tabs.
@@ -655,7 +645,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       } else {
         tabIndex = Math.max(tabIndex, this.pinnedTabCount);
       }
-@@ -6075,10 +6216,16 @@
+@@ -6075,10 +6214,16 @@
       this.#handleTabMove(
         element,
         () => {
@@ -674,7 +664,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
           if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
             neighbor.after(element);
           } else {
-@@ -6136,23 +6283,28 @@
+@@ -6136,23 +6281,28 @@
     #moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
       if (this.isTabGroupLabel(targetElement)) {
         targetElement = targetElement.group;
@@ -709,7 +699,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       } 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
-@@ -6165,14 +6317,34 @@
+@@ -6165,14 +6315,34 @@
         //    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.
@@ -745,7 +735,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
         element.pinned
           ? this.tabContainer.pinnedTabsContainer
           : this.tabContainer;
-@@ -6181,7 +6353,7 @@
+@@ -6181,7 +6351,7 @@
         element,
         () => {
           if (moveBefore) {
@@ -754,7 +744,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
           } else if (targetElement) {
             targetElement.after(element);
           } else {
-@@ -6227,10 +6399,10 @@
+@@ -6227,10 +6397,10 @@
      * @param {TabMetricsContext} [metricsContext]
      */
     moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -767,7 +757,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
         return;
       }
       if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -6261,6 +6433,7 @@
+@@ -6261,6 +6431,7 @@
 
       let state = {
         tabIndex: tab._tPos,
@@ -775,7 +765,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       };
       if (tab.visible) {
         state.elementIndex = tab.elementIndex;
-@@ -6287,7 +6460,7 @@
+@@ -6287,7 +6458,7 @@
       let changedTabGroup =
         previousTabState.tabGroupId != currentTabState.tabGroupId;
 
@@ -784,7 +774,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
         tab.dispatchEvent(
           new CustomEvent("TabMove", {
             bubbles: true,
-@@ -6324,6 +6497,10 @@
+@@ -6324,6 +6495,10 @@
 
       moveActionCallback();
 
@@ -795,7 +785,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
       // Clear tabs cache after moving nodes because the order of tabs may have
       // changed.
       this.tabContainer._invalidateCachedTabs();
-@@ -7221,7 +7398,7 @@
+@@ -7221,7 +7396,7 @@
             // preventDefault(). It will still raise the window if appropriate.
             break;
           }
@@ -804,7 +794,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
           window.focus();
           aEvent.preventDefault();
           break;
-@@ -8166,6 +8343,7 @@
+@@ -8166,6 +8341,7 @@
             aWebProgress.isTopLevel
           ) {
             this.mTab.setAttribute("busy", "true");
@@ -812,7 +802,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
             gBrowser._tabAttrModified(this.mTab, ["busy"]);
             this.mTab._notselectedsinceload = !this.mTab.selected;
           }
-@@ -9157,7 +9335,7 @@ var TabContextMenu = {
+@@ -9157,7 +9333,7 @@ var TabContextMenu = {
     );
     contextUnpinSelectedTabs.hidden =
       !this.contextTab.pinned || !this.multiselected;
@@ -821,7 +811,7 @@ index d80a66a01002e78a9c65545d08fe786328ddf124..346ebe814381e8aa04140f43e98c3283
     // Build Ask Chat items
     TabContextMenu.GenAI.buildTabMenu(
       document.getElementById("context_askChat"),
-@@ -9476,6 +9654,7 @@ var TabContextMenu = {
+@@ -9476,6 +9652,7 @@ var TabContextMenu = {
         )
       );
     } else {
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa24888de67ccb 100644
+index e2b27db6c13278defea3bcc7606a8da54e7d001c..3033f5c98c94cf4b048432dfee72e20f4d8e37b6 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
@@ -332,7 +332,7 @@
@@ -7,7 +7,7 @@ index e2b27db6c13278defea3bcc7606a8da54e7d001c..91e772ab0fed5be50e6dfee40eaa2488
       if (
         event.button != 0 ||
 -        event.target != this.arrowScrollbox ||
-+        !event.target.classList.contains("zen-workspace-empty-space") ||
+        !event.target.classList.contains("zen-workspace-normal-tabs-section") ||
         event.composedTarget.localName == "toolbarbutton"
       ) {
         return;
--- a/src/browser/themes/shared/identity-block/identity-block-css.patch
+++ b/src/browser/themes/shared/identity-block/identity-block-css.patch
@@ -7,7 +7,7 @@ index 13b1659ed5a3b9bb0342b601998d0fd5c9760e22..4f13c401f23f51962986fe8caf197aa5
 #identity-box[pageproxystate="valid"]:is(.notSecureText, .chromeUI, .extensionPage) > .identity-box-button,
 #urlbar-label-box {
 -  background-color: var(--urlbar-box-bgcolor);
-+  background-color: transparent;
+  background-color: light-dark(#cecece, rgb(66, 65, 77));
   color: var(--urlbar-box-text-color);
   padding-inline: 8px;
   border-radius: var(--urlbar-icon-border-radius);
--- a/src/browser/themes/shared/zen-icons/common/selectable/tada.svg
+++ b/src/browser/themes/shared/zen-icons/common/selectable/tada.svg
@@ -1,7 +0,0 @@
-#filter dumbComments emptyLines substitution
-# 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/.
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill="context-fill" fill-opacity="context-fill-opacity" d="m9.874 9.343.056.048 4.988 4.989a.588.588 0 0 1-.145.937l-.068.03-6.106 2.25c-1.147.422-2.264-.656-1.916-1.802l.03-.086 2.25-6.105a.588.588 0 0 1 .85-.303Zm5.309 2.553c.536.028 1.27.141 1.908.525a.588.588 0 0 1-.544 1.04l-.06-.032c-.402-.24-.914-.336-1.366-.359a4 4 0 0 0-.558.002l-.186.02a.588.588 0 0 1-.165-1.165 5 5 0 0 1 .97-.031m1.192-1.638a.588.588 0 0 1 .067 1.172l-.067.003h-.417a.588.588 0 0 1-.068-1.171l.068-.004zm-1.87-.451a.59.59 0 0 1 .047.776l-.048.055-.624.624a.588.588 0 0 1-.88-.776l.049-.056.623-.623a.59.59 0 0 1 .832 0m-1.521-3.096c.263.792.122 1.658-.042 2.264a6 6 0 0 1-.406 1.095.588.588 0 0 1-1.052-.525 4.7 4.7 0 0 0 .323-.879c.133-.49.2-1.02.098-1.455l-.037-.127a.588.588 0 1 1 1.116-.373m3.183 1.434a.59.59 0 0 1 0 .831l-.415.416a.588.588 0 1 1-.832-.831l.415-.416a.59.59 0 0 1 .831 0"/>
-</svg>
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -238,6 +238,10 @@
  list-style-image: url('privateBrowsing.svg') !important;
 }

+#save-to-pocket-button {
+  list-style-image: url('pocket-outline.svg') !important;
+}
+
 #profiler-button-button > .toolbarbutton-icon,
 .subviewbutton[label='Task Manager'] {
  list-style-image: url('tool-profiler.svg') !important;
--- a/src/browser/themes/shared/zen-icons/jar.inc.mn
+++ b/src/browser/themes/shared/zen-icons/jar.inc.mn
@@ -97,6 +97,7 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -238,6 +239,7 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -379,6 +381,7 @@
 *  skin/classic/browser/zen-icons/persistent-storage.svg                      (../shared/zen-icons/lin/persistent-storage.svg) 
 *  skin/classic/browser/zen-icons/pin.svg                      (../shared/zen-icons/lin/pin.svg) 
 *  skin/classic/browser/zen-icons/plus.svg                      (../shared/zen-icons/lin/plus.svg) 
+*  skin/classic/browser/zen-icons/pocket-outline.svg                      (../shared/zen-icons/lin/pocket-outline.svg) 
 *  skin/classic/browser/zen-icons/popup.svg                      (../shared/zen-icons/lin/popup.svg) 
 *  skin/classic/browser/zen-icons/print.svg                      (../shared/zen-icons/lin/print.svg) 
 *  skin/classic/browser/zen-icons/privateBrowsing.svg                      (../shared/zen-icons/lin/privateBrowsing.svg) 
@@ -469,7 +472,6 @@
 *  skin/classic/browser/zen-icons/selectable/star-1.svg          (../shared/zen-icons/common/selectable/star-1.svg) 
 *  skin/classic/browser/zen-icons/selectable/star.svg          (../shared/zen-icons/common/selectable/star.svg) 
 *  skin/classic/browser/zen-icons/selectable/sun.svg          (../shared/zen-icons/common/selectable/sun.svg) 
-*  skin/classic/browser/zen-icons/selectable/tada.svg          (../shared/zen-icons/common/selectable/tada.svg) 
 *  skin/classic/browser/zen-icons/selectable/terminal.svg          (../shared/zen-icons/common/selectable/terminal.svg) 
 *  skin/classic/browser/zen-icons/selectable/triangle.svg          (../shared/zen-icons/common/selectable/triangle.svg) 
 *  skin/classic/browser/zen-icons/selectable/video.svg          (../shared/zen-icons/common/selectable/video.svg) 
--- a/src/browser/themes/shared/zen-icons/lin/pocket-outline.svg
+++ b/src/browser/themes/shared/zen-icons/lin/pocket-outline.svg
@@ -0,0 +1,7 @@
+#filter dumbComments emptyLines substitution
+# 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/.
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
+  <path d="M2.5 2A2.507 2.507 0 0 0 0 4.5V7c0 4.412 3.588 8 8 8s8-3.588 8-8V4.5C16 3.125 14.875 2 13.5 2h-11zm0 1h11c.834 0 1.5.666 1.5 1.5V7c0 3.872-3.128 7-7 7s-7-3.128-7-7V4.5C1 3.666 1.666 3 2.5 3zm2 3a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .707l3.5 3.5a.5.5 0 0 0 .706 0l3.5-3.5a.5.5 0 0 0 0-.706.5.5 0 0 0-.706 0L8 9.293 4.854 6.147A.5.5 0 0 0 4.501 6z"/>
+</svg>
--- a/src/browser/themes/shared/zen-icons/win/pocket-outline.svg
+++ b/src/browser/themes/shared/zen-icons/win/pocket-outline.svg
@@ -0,0 +1,8 @@
+<!--
+   - 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/.
+   -->
+<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="currentColor" fill-opacity="context-fill-opacity">
+  <path d="M2.5 2A2.507 2.507 0 0 0 0 4.5V7c0 4.412 3.588 8 8 8s8-3.588 8-8V4.5C16 3.125 14.875 2 13.5 2h-11zm0 1h11c.834 0 1.5.666 1.5 1.5V7c0 3.872-3.128 7-7 7s-7-3.128-7-7V4.5C1 3.666 1.666 3 2.5 3zm2 3a.5.5 0 0 0-.353.146.5.5 0 0 0 0 .707l3.5 3.5a.5.5 0 0 0 .706 0l3.5-3.5a.5.5 0 0 0 0-.706.5.5 0 0 0-.706 0L8 9.293 4.854 6.147A.5.5 0 0 0 4.501 6z"/>
+</svg>
--- a/src/zen/common/ZenUIManager.mjs
+++ b/src/zen/common/ZenUIManager.mjs
@@ -646,7 +646,7 @@ var gZenVerticalTabsManager = {
            marginBottom: isLastItem() ? [] : [transform, '0px'],
          },
          {
-            duration: 0.11,
+            duration: 0.12,
            easing: 'ease-out',
          }
        )
@@ -668,7 +668,7 @@ var gZenVerticalTabsManager = {
            filter: ['blur(1px)', 'blur(0px)'],
          },
          {
-            duration: 0.11,
+            duration: 0.12,
            easing: 'ease-out',
          }
        )
@@ -684,27 +684,6 @@ var gZenVerticalTabsManager = {
    }
  },

-  animateTabClose(aTab, animate) {
-    if (!animate) {
-      return new Promise((resolve) => {
-        resolve();
-      });
-    }
-    const height = aTab.getBoundingClientRect().height;
-    return gZenUIManager.motion.animate(
-      aTab,
-      {
-        opacity: [1, 0],
-        transform: ['scale(1)', 'scale(0.95)'],
-        marginBottom: [`0px`, `-${height}px`],
-      },
-      {
-        duration: 0.075,
-        easing: 'ease-out',
-      }
-    );
-  },
-
  get actualWindowButtons() {
    // we have multiple ".titlebar-buttonbox-container" in the DOM, because of the titlebar
    if (!this.__actualWindowButtons) {
--- a/src/zen/common/emojis/ZenEmojiPicker.mjs
+++ b/src/zen/common/emojis/ZenEmojiPicker.mjs
@@ -12,8 +12,7 @@
    "layers.svg", "lightning.svg", "mail.svg", "map.svg", "moon.svg", "music.svg", 
    "page.svg", "palette.svg", "paw.svg", "people.svg", "pizza.svg", "planet.svg", 
    "present.svg", "shapes.svg", "skull.svg", "square.svg", "squares.svg", "star.svg", 
-    "star-1.svg", "sun.svg", "tada.svg", "terminal.svg", "triangle.svg", "video.svg",
-    "weight.svg",
+    "star-1.svg", "sun.svg", "terminal.svg", "triangle.svg", "video.svg", "weight.svg",
  ];

  class nsZenEmojiPicker extends nsZenDOMOperatedFeature {
--- a/src/zen/common/styles/zen-browser-container.css
+++ b/src/zen/common/styles/zen-browser-container.css
@@ -16,7 +16,7 @@
        box-shadow: var(--zen-big-shadow);
      }

-      & browser[type='content'] {
+      & browser[transparent='true'] {
        background: light-dark(rgba(255, 255, 255, 0.4), rgba(255, 255, 255, 0.1));
      }

--- a/src/zen/common/styles/zen-popup.css
+++ b/src/zen/common/styles/zen-popup.css
@@ -374,7 +374,7 @@ menuseparator {
      color-mix(in srgb, var(--zen-primary-color) 85%, #0f0f0f 15%)
    );
    box-shadow: 0 0 14px 3px rgba(0, 0, 0, 0.05);
-    border: 1px solid rgba(0, 0, 0, 0.2);
+    border: 1px solid light-dark(rgba(255, 255, 255, 0.2), rgba(0, 0, 0, 0.2));
    display: flex;
    font-weight: 600;
    align-items: center;
--- a/src/zen/common/styles/zen-single-components.css
+++ b/src/zen/common/styles/zen-single-components.css
@@ -235,10 +235,6 @@ body > #confetti {
  mask-composite: exclude;
 }

-#TabsToolbar {
-  -moz-window-dragging: unset;
-}
-
 /* Status panel */

@media (-moz-pref('zen.theme.styled-status-panel')) {
--- a/src/zen/common/styles/zen-theme.css
+++ b/src/zen/common/styles/zen-theme.css
@@ -25,46 +25,27 @@
  --zen-branding-bg-reverse: light-dark(var(--zen-branding-dark), var(--zen-branding-paper));

  /** Zen colors are generated automatically from the primary color */
-  --zen-colors-primary: light-dark(
-    color-mix(in srgb, var(--zen-primary-color) 50%, black 50%),
-    color-mix(in srgb, var(--zen-primary-color) 20%, var(--zen-branding-bg) 80%)
-  );
-  --zen-colors-secondary: light-dark(
-    color-mix(in srgb, var(--zen-colors-primary) 20%, white 80%),
-    color-mix(in srgb, var(--zen-primary-color) 30%, var(--zen-branding-bg) 70%)
-  );
-  --zen-colors-tertiary: light-dark(
-    color-mix(in srgb, var(--zen-primary-color) 2%, white 98%),
-    color-mix(in srgb, var(--zen-primary-color) 1%, var(--zen-branding-bg) 99%)
+  --zen-colors-primary: color-mix(in srgb, var(--zen-primary-color) 50%, black 50%);
+  --zen-colors-secondary: color-mix(in srgb, var(--zen-colors-primary) 20%, white 80%);
+  --zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 2%, white 98%);
+
+  --zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, white 10%);
+  --zen-colors-primary-foreground: var(--zen-branding-bg-reverse);
+  --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 97%, black 3%);
+  --zen-colors-border-contrast: color-mix(
+    in srgb,
+    var(--zen-colors-secondary) 10%,
+    rgba(181, 181, 181, 0.11) 90%
  );

-  --zen-colors-hover-bg: light-dark(
-    color-mix(in srgb, var(--zen-primary-color) 90%, white 10%),
-    color-mix(in srgb, var(--zen-primary-color) 90%, var(--zen-branding-bg) 10%)
-  );
-  --zen-colors-primary-foreground: light-dark(
-    var(--zen-branding-bg-reverse),
-    color-mix(in srgb, var(--zen-primary-color) 80%, white 20%)
-  );
-  --zen-colors-border: light-dark(
-    color-mix(in srgb, var(--zen-colors-secondary) 97%, black 3%),
-    color-mix(in srgb, var(--zen-colors-secondary) 20%, rgb(79, 79, 79) 80%)
-  );
-  --zen-colors-border-contrast: light-dark(
-    color-mix(in srgb, var(--zen-colors-secondary) 10%, rgba(181, 181, 181, 0.11) 90%),
-    color-mix(in srgb, var(--zen-colors-secondary) 10%, rgba(255, 255, 255, 0.11) 90%)
-  );
-
-  --zen-colors-input-bg: light-dark(
-    color-mix(in srgb, var(--zen-primary-color) 1%, var(--zen-colors-tertiary) 99%),
-    color-mix(in srgb, var(--zen-primary-color) 1%, var(--zen-branding-bg) 99%)
+  --zen-colors-input-bg: color-mix(
+    in srgb,
+    var(--zen-primary-color) 1%,
+    var(--zen-colors-tertiary) 99%
  );

  --zen-dialog-background: light-dark(rgb(244, 244, 244), rgb(31, 31, 31));
-  --zen-urlbar-background: light-dark(
-    color-mix(in srgb, var(--zen-primary-color) 3%, #f4f4f4 97%),
-    color-mix(in srgb, var(--zen-primary-color) 4%, rgb(24, 24, 24) 96%)
-  );
+  --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 3%, #f4f4f4 97%);

  --zen-secondary-btn-color: var(--zen-colors-primary-foreground);

@@ -130,10 +111,7 @@
  ) !important;

  --in-content-page-background: var(--zen-colors-tertiary) !important;
-  --zen-in-content-dialog-background: light-dark(
-    var(--zen-colors-tertiary),
-    var(--zen-branding-bg)
-  );
+  --zen-in-content-dialog-background: var(--zen-colors-tertiary);

  --zen-button-border-radius: 5px;
  --zen-button-padding: 0.6rem 1.2rem;
@@ -160,13 +138,6 @@

  --toolbarbutton-hover-background: var(--zen-toolbar-element-bg-hover) !important;

-  /* Using a semitransparent background preserves the tinting from the backdrop.
-    * Note that the toolbar text color from browser-colors.css should be ok,
-    * as the backdrop matches our color scheme. The .6 matches what we do for
-    * acrylic, and the .15 matches the 85% we do for the default toolbar
-    * background on the native theme. */
-  --toolbar-bgcolor: light-dark(rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0.15));
-
  --toolbarbutton-active-background: color-mix(
    in srgb,
    var(--zen-branding-bg-reverse) 7%,
@@ -178,13 +149,10 @@

  /* Other colors */
  --urlbar-box-active-bgcolor: var(--toolbarbutton-hover-background) !important;
+  --toolbar-field-focus-background-color: var(--urlbar-box-bgcolor) !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;
-  --toolbar-field-focus-background-color: light-dark(
-    rgba(255, 255, 255, 0.25),
-    rgba(0, 0, 0, 0.3)
-  ) !important;

  /* Transitions */
  --zen-tabbox-element-indent-transition: margin-inline-start 0.1s ease-in-out;
@@ -316,3 +284,52 @@
    --toolbar-color-scheme: light;
  }
 }
+
+@media (prefers-color-scheme: dark) {
+  :host(:is(.anonymous-content-host, notification-message)),
+  :root {
+    --zen-in-content-dialog-background: var(--zen-branding-bg);
+    --zen-colors-primary: color-mix(
+      in srgb,
+      var(--zen-primary-color) 20%,
+      var(--zen-branding-bg) 80%
+    );
+    --zen-colors-secondary: color-mix(
+      in srgb,
+      var(--zen-primary-color) 30%,
+      var(--zen-branding-bg) 70%
+    );
+    --zen-colors-tertiary: color-mix(
+      in srgb,
+      var(--zen-primary-color) 1%,
+      var(--zen-branding-bg) 99%
+    );
+
+    --zen-colors-hover-bg: color-mix(
+      in srgb,
+      var(--zen-primary-color) 90%,
+      var(--zen-branding-bg) 10%
+    );
+    --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, white 20%);
+
+    --zen-colors-input-bg: color-mix(
+      in srgb,
+      var(--zen-primary-color) 1%,
+      var(--zen-branding-bg) 99%
+    );
+    --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 20%, rgb(79, 79, 79) 80%);
+    --zen-colors-border-contrast: color-mix(
+      in srgb,
+      var(--zen-colors-secondary) 10%,
+      rgba(255, 255, 255, 0.11) 90%
+    );
+
+    --zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 4%, rgb(24, 24, 24) 96%);
+
+    --zen-browser-gradient-base: color-mix(
+      in srgb,
+      var(--zen-primary-color) 30%,
+      var(--zen-branding-bg) 70%
+    );
+  }
+}
--- a/src/zen/common/styles/zen-urlbar.css
+++ b/src/zen/common/styles/zen-urlbar.css
@@ -201,7 +201,7 @@
    display: none;
  }

-  #identity-box:not([pageproxystate='invalid']):not(.notSecure) #identity-icon-box:not([open]) {
+  #identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]) {
    margin-inline-start: calc(-8px - 2 * var(--urlbar-icon-padding));
    transform: translateX(100%);
    opacity: 0;
@@ -376,7 +376,7 @@ button.popup-notification-dropmarker {
  #identity-box:is(:not(.chromeUI), [pageproxystate='invalid'])
  #identity-icon-box {
  border-radius: var(--urlbar-icon-border-radius) !important;
-  min-width: 28px;
+  min-width: 30px;
 }

 /* Notification Stack */
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -37,10 +37,21 @@ var gZenCompactModeManager = {
  HOVER_HACK_DELAY: Services.prefs.getIntPref('zen.view.compact.hover-hack-delay', 0),

  preInit() {
-    this._wasInCompactMode = Services.prefs.getBoolPref(
-      'zen.view.compact.enable-at-startup',
-      false
+    // Remove it before initializing so we can properly calculate the width
+    // of the sidebar at startup and avoid overflowing items not being hidden
+    let xulStoreValue = Services.xulStore.getValue(
+      AppConstants.BROWSER_CHROME_URL,
+      'zen-main-app-wrapper',
+      'zen-compact-mode'
    );
+    if (xulStoreValue === '-moz-missing\n' || !xulStoreValue) {
+      xulStoreValue = false;
+    }
+    this._wasInCompactMode =
+      xulStoreValue ||
+      Services.prefs.getBoolPref('zen.view.compact.should-enable-at-startup', false);
+    lazyCompactMode.mainAppWrapper.removeAttribute('zen-compact-mode');
+
    this._canDebugLog = Services.prefs.getBoolPref('zen.view.compact.debug', false);

    this.addContextMenu();
@@ -123,8 +134,9 @@ var gZenCompactModeManager = {
    // main-window can't store attributes other than window sizes, so we use this instead
    lazyCompactMode.mainAppWrapper.setAttribute('zen-compact-mode', value);
    document.documentElement.setAttribute('zen-compact-mode', value);
+    Services.xulStore.persist(lazyCompactMode.mainAppWrapper, 'zen-compact-mode');
    if (typeof this._wasInCompactMode === 'undefined') {
-      Services.prefs.setBoolPref('zen.view.compact.enable-at-startup', value);
+      Services.prefs.setBoolPref('zen.view.compact.should-enable-at-startup', value);
    }
    this._updateEvent();
  },
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -148,7 +148,7 @@
          right: 0;
          bottom: 0;
          background: var(--zen-dialog-background);
-          outline: 1px solid rgba(255,255,255,.15);
+          outline: 1px solid var(--zen-colors-border);
          outline-offset: -1px;
          box-shadow: var(--zen-big-shadow);
          pointer-events: none;
--- a/src/zen/folders/ZenFolders.mjs
+++ b/src/zen/folders/ZenFolders.mjs
@@ -873,15 +873,9 @@
      // note: We set if the folder is collapsed some time after creation.
      //   we do this to ensure marginBottom is set correctly in the case
      //   that we want it to initially be collapsed.
-      setTimeout(
-        (folder) => {
-          gZenPinnedTabManager.promiseInitializedPinned.then(() => {
-            folder.collapsed = !!options.collapsed;
-          });
-        },
-        0,
-        folder
-      );
+      requestAnimationFrame(() => {
+        folder.collapsed = !!options.collapsed;
+      });
      return folder;
    }

@@ -908,7 +902,6 @@
    }

    handleTabUnpin(tab) {
-      tab.style.removeProperty('--zen-folder-indent');
      const group = tab.group;
      if (!group) {
        return false;
--- a/src/zen/folders/zen-folders.css
+++ b/src/zen/folders/zen-folders.css
@@ -41,7 +41,7 @@ tab-group[split-view-group] {
    outline-offset: var(--tab-outline-offset);
    outline-color: var(--tab-selected-outline-color);
    transition: scale 0.1s ease;
-    margin-inline: 2px !important;
+    margin-inline-start: 0 !important;

    :root:not([zen-sidebar-expanded='true']) & {
      padding: 0;
@@ -269,7 +269,7 @@ zen-folder {
      pointer-events: none;

      :root[zen-sidebar-expanded] & {
-        left: 4px;
+        left: 2px;
      }

      & svg {
--- a/src/zen/tabs/ZenPinnedTabManager.mjs
+++ b/src/zen/tabs/ZenPinnedTabManager.mjs
@@ -69,9 +69,6 @@
    MAX_ESSENTIALS_TABS = 12;

    #hasInitializedPins = false;
-    promiseInitializedPinned = new Promise((resolve) => {
-      this._resolvePinnedInitializedInternal = resolve;
-    });

    async init() {
      if (!this.enabled) {
@@ -95,6 +92,7 @@
    }

    onTabIconChanged(tab, url = null) {
+      tab.dispatchEvent(new CustomEvent('ZenTabIconChanged', { bubbles: true, detail: { tab } }));
      const iconUrl = url ?? tab.iconImage.src;
      if (!iconUrl && tab.hasAttribute('zen-pin-id')) {
        try {
@@ -190,16 +188,10 @@
      return this._pinsCache;
    }

-    #finishedInitializingPins() {
-      this._resolvePinnedInitializedInternal();
-      delete this._resolvePinnedInitializedInternal;
-      this.#hasInitializedPins = true;
-    }
-
    async #initializePinnedTabs(init = false) {
      const pins = this._pinsCache;
      if (!pins?.length || !init) {
-        this.#finishedInitializingPins();
+        this.#hasInitializedPins = true;
        return;
      }

@@ -383,7 +375,7 @@
      }

      setTimeout(() => {
-        this.#finishedInitializingPins();
+        this.#hasInitializedPins = true;
      }, 0);

      gBrowser._updateTabBarForPinnedTabs();
@@ -615,11 +607,7 @@
    async _onTabClick(e) {
      const tab = e.target?.closest('tab');
      if (e.button === 1 && tab) {
-        await this._onCloseTabShortcut(e, tab, {
-          closeIfPending: Services.prefs.getBoolPref(
-            'zen.pinned-tab-manager.wheel-close-if-pending'
-          ),
-        });
+        await this._onCloseTabShortcut(e, tab, { closeIfPending: true });
      }
    }

@@ -691,7 +679,6 @@
        workspaceUuid: tab.getAttribute('zen-workspace-id'),
        isEssential: tab.getAttribute('zen-essential') === 'true',
        parentUuid: tab.group?.getAttribute('zen-pin-id') || null,
-        position: tab._pPos,
      });

      tab.setAttribute('zen-pin-id', uuid);
@@ -1480,6 +1467,7 @@
    }

    async onTabLabelChanged(tab) {
+      tab.dispatchEvent(new CustomEvent('ZenTabLabelChanged', { detail: { tab } }));
      if (!this._pinsCache) {
        return;
      }
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -156,25 +156,25 @@
   Pinned Tabs Separator
   ========================================================================== */
 .pinned-tabs-container-separator {
-  background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
+  background: light-dark(rgba(1, 1, 1, 0.075), rgba(255, 255, 255, 0.1));
  margin: 8px auto;
  border: none;
  height: 1px;
  max-height: 1px;
  width: 98%; /* Slightly less than full width */
  transition:
-    margin 0.1s ease-in-out,
-    background 0.1s ease-in-out,
-    max-height 0.1s ease-in-out;
+    margin 0.2s ease-in-out,
+    background 0.2s ease-in-out,
+    max-height 0.2s ease-in-out;
  overflow: hidden;
  position: relative;
  opacity: 1;

  #tabbrowser-tabs[movingtab] & {
    transition:
-      margin 0.1s ease-in-out,
-      background 0.1s ease-in-out,
-      max-height 0.1s ease-in-out,
+      margin 0.2s ease-in-out,
+      background 0.2s ease-in-out,
+      max-height 0.2s ease-in-out,
      transform 0.1s ease-in-out;
  }

--- a/src/zen/workspaces/ZenWindowSyncing.mjs
+++ b/src/zen/workspaces/ZenWindowSyncing.mjs
@@ -0,0 +1,257 @@
+// 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/.
+{
+  class nsZenWorkspaceWindowSync extends nsZenMultiWindowFeature {
+    #ignoreNextEvents = false;
+    #waitForPromise = null;
+
+    constructor() {
+      super();
+      if (!window.closed) {
+        this.init();
+      }
+    }
+
+    async init() {
+      await gZenWorkspaces.promiseInitialized;
+      this.#makeSureAllTabsHaveIds();
+      this.#setUpEventListeners();
+    }
+
+    #makeSureAllTabsHaveIds() {
+      const allTabs = gZenWorkspaces.allStoredTabs;
+      for (const tab of allTabs) {
+        if (!tab.hasAttribute('zen-sync-id')) {
+          const tabId = gZenUIManager.generateUuidv4();
+          tab.setAttribute('zen-sync-id', tabId);
+        }
+      }
+    }
+
+    #setUpEventListeners() {
+      const kEvents = [
+        'TabClose',
+        'TabOpen',
+        'TabPinned',
+        'TabUnpinned',
+        'TabAddedToEssentials',
+        'TabRemovedFromEssentials',
+        'TabHide',
+        'TabShow',
+        'TabMove',
+        'ZenTabIconChanged',
+        'ZenTabLabelChanged',
+      ];
+      const eventListener = this.#handleEvent.bind(this);
+      for (const event of kEvents) {
+        window.addEventListener(event, eventListener);
+      }
+
+      window.addEventListener('unload', () => {
+        for (const event of kEvents) {
+          window.removeEventListener(event, eventListener);
+        }
+      });
+    }
+
+    #handleEvent(event) {
+      this.#propagateToOtherWindows(event);
+    }
+
+    async #propagateToOtherWindows(event) {
+      if (this.#ignoreNextEvents) {
+        return;
+      }
+      if (this.#waitForPromise) {
+        await this.#waitForPromise;
+      }
+      this.#waitForPromise = new Promise((resolve) => {
+        this.foreachWindowAsActive(async (browser) => {
+          if (browser.gZenWorkspaceWindowSync && !this.windowIsActive(browser)) {
+            await browser.gZenWorkspaceWindowSync.onExternalTabEvent(event);
+          }
+        }).then(() => {
+          resolve();
+        });
+      });
+    }
+
+    async onExternalTabEvent(event) {
+      this.#ignoreNextEvents = true;
+      switch (event.type) {
+        case 'TabClose':
+          this.#onTabClose(event);
+          break;
+        case 'TabOpen':
+          await this.#onTabOpen(event);
+          break;
+        case 'TabPinned':
+          this.#onTabPinned(event);
+          break;
+        case 'TabUnpinned':
+          this.#onTabUnpinned(event);
+          break;
+        case 'TabAddedToEssentials':
+          this.#onTabAddedToEssentials(event);
+          break;
+        case 'TabRemovedFromEssentials':
+          this.#onTabRemovedFromEssentials(event);
+          break;
+        case 'TabHide':
+          this.#onTabHide(event);
+          break;
+        case 'TabShow':
+          this.#onTabShow(event);
+          break;
+        case 'TabMove':
+          this.#onTabMove(event);
+          break;
+        case 'ZenTabIconChanged':
+          this.#onTabIconChanged(event);
+          break;
+        case 'ZenTabLabelChanged':
+          this.#onTabLabelChanged(event);
+          break;
+        default:
+          console.warn(`Unhandled event type: ${event.type}`);
+          break;
+      }
+      this.#ignoreNextEvents = false;
+    }
+
+    #getTabId(tab) {
+      return tab.getAttribute('zen-sync-id');
+    }
+
+    #getTabWithId(tabId) {
+      for (const tab of gZenWorkspaces.allStoredTabs) {
+        if (this.#getTabId(tab) === tabId) {
+          return tab;
+        }
+      }
+      return null;
+    }
+
+    #onTabClose(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToClose = this.#getTabWithId(tabId);
+      if (tabToClose) {
+        gBrowser.removeTab(tabToClose);
+      }
+    }
+
+    #onTabPinned(event) {
+      const targetTab = event.target;
+      if (targetTab.hasAttribute('zen-essential')) {
+        return this.#onTabAddedToEssentials(event);
+      }
+      const tabId = this.#getTabId(targetTab);
+      const elementIndex = targetTab.elementIndex;
+      const tabToPin = this.#getTabWithId(tabId);
+      if (tabToPin) {
+        gBrowser.pinTab(tabToPin);
+        gBrowser.moveTabTo(tabToPin, { elementIndex, forceUngrouped: !!targetTab.group });
+      }
+    }
+
+    #onTabUnpinned(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToUnpin = this.#getTabWithId(tabId);
+      if (tabToUnpin) {
+        gBrowser.unpinTab(tabToUnpin);
+      }
+    }
+
+    #onTabIconChanged(event) {
+      this.#updateTabIconAndLabel(event);
+    }
+
+    #onTabLabelChanged(event) {
+      this.#updateTabIconAndLabel(event);
+    }
+
+    #updateTabIconAndLabel(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToChange = this.#getTabWithId(tabId);
+      if (tabToChange && tabToChange.hasAttribute('pending')) {
+        gBrowser.setIcon(tabToChange, gBrowser.getIcon(targetTab));
+        gBrowser._setTabLabel(tabToChange, targetTab.label);
+      }
+    }
+
+    #onTabAddedToEssentials(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToAdd = this.#getTabWithId(tabId);
+      if (tabToAdd) {
+        gZenPinnedTabManager.addToEssentials(tabToAdd);
+      }
+    }
+
+    #onTabRemovedFromEssentials(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToRemove = this.#getTabWithId(tabId);
+      if (tabToRemove) {
+        gZenPinnedTabManager.removeFromEssentials(tabToRemove);
+      }
+    }
+
+    #onTabHide(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToHide = this.#getTabWithId(tabId);
+      if (tabToHide) {
+        gBrowser.hideTab(tabToHide);
+      }
+    }
+
+    #onTabShow(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabToShow = this.#getTabWithId(tabId);
+      if (tabToShow) {
+        gBrowser.showTab(tabToShow);
+      }
+    }
+
+    #onTabMove(event) {
+      const targetTab = event.target;
+      const tabId = this.#getTabId(targetTab);
+      const tabIndex = targetTab._pPos;
+      const tabToMove = this.#getTabWithId(tabId);
+      if (tabToMove) {
+        gBrowser.moveTabTo(tabToMove, { tabIndex, forceUngrouped: !!targetTab.group });
+      }
+    }
+
+    async #onTabOpen(event) {
+      const targetTab = event.target;
+      const isPinned = targetTab.pinned;
+      const isEssential = isPinned && targetTab.hasAttribute('zen-essential');
+      const elementIndex = targetTab.elementIndex;
+
+      const duplicatedTab = gBrowser.addTrustedTab(targetTab.linkedBrowser.currentURI.spec, {
+        createLazyBrowser: true,
+      });
+
+      duplicatedTab.setAttribute('zen-pin-id', targetTab.getAttribute('zen-pin-id'));
+      duplicatedTab.setAttribute('zen-tab-id', targetTab.getAttribute('zen-tab-id'));
+      duplicatedTab.setAttribute('zen-workspace-id', targetTab.getAttribute('zen-workspace-id'));
+
+      if (isEssential) {
+        gZenPinnedTabManager.addToEssentials(duplicatedTab);
+      } else if (isPinned) {
+        gBrowser.pinTab(duplicatedTab);
+      }
+
+      gBrowser.moveTabTo(duplicatedTab, { elementIndex, forceUngrouped: !!targetTab.group });
+    }
+  }
+
+  window.gZenWorkspaceWindowSync = new nsZenWorkspaceWindowSync();
+}
--- a/src/zen/workspaces/ZenWorkspace.mjs
+++ b/src/zen/workspaces/ZenWorkspace.mjs
@@ -27,7 +27,6 @@
            </hbox>
          </vbox>
        </arrowscrollbox>
-        <vbox class="zen-workspace-empty-space" flex="1" />
      `;
    }

--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1492,8 +1492,8 @@ var gZenWorkspaces = new (class extends nsZenMultiWindowFeature {
      if (container) {
        if (tab.group?.hasAttribute('split-view-group')) {
          gBrowser.zenHandleTabMove(tab.group, () => {
-            for (const subTab of tab.group.tabs) {
-              subTab.setAttribute('zen-workspace-id', workspaceID);
+            for (const tab of tab.group.tabs) {
+              tab.setAttribute('zen-workspace-id', workspaceID);
            }
            container.insertBefore(tab.group, container.lastChild);
          });
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -317,14 +317,15 @@ zen-workspace {
        opacity: 1;
      }
    }
-  }

-  &[active] .zen-workspace-empty-space {
-    -moz-window-dragging: drag;
+    &,
+    & .zen-workspace-normal-tabs-section {
+      height: 100%;
+    }
  }
 }

-/** Customizable UI, this is an auto generated ID */
+/** Customiable UI, this is an auto generated ID */
 #wrapper-zen-workspaces-button {
  width: 100%;
 }
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
      "brandShortName": "Zen",
      "brandFullName": "Zen Browser",
      "release": {
-        "displayVersion": "1.15.5b",
+        "displayVersion": "1.15.3b",
        "github": {
          "repo": "zen-browser/desktop"
        },
@@ -39,7 +39,7 @@
      "brandShortName": "Twilight",
      "brandFullName": "Zen Twilight",
      "release": {
-        "displayVersion": "1.16t",
+        "displayVersion": "1.15t",
        "github": {
          "repo": "zen-browser/desktop"
        }
Author	SHA1	Message	Date
mr. m	f6922ef2ba	Merge branch 'dev' into window-sync	2025-09-03 13:06:44 +02:00
Mr. M	91f5d58fbc	feat: Dont session duplicate the tabs, b=no-bug, c=workspaces	2025-09-02 16:21:04 +02:00
mr. m	7a4cdaa45c	feat: Also change icons and labels if the tab is pending, b=no-bug, c=tabs, workspaces	2025-09-01 16:09:59 +02:00
Mr. M	81e854a89f	feat: Full cross-window workspace syncing, b=no-bug, c=workspaces	2025-08-27 23:25:07 +02:00