Merge branch 'dev' into window-sync

* fix: Fixed issues with glance tab switching, b=no-bug, c=glance, tabs

* feat: Set overlay before glance configuring, b=no-bug, c=glance

* chore: Fix lint, b=no-bug, c=glance

* fix: Fixed prevtab being null, b=no-bug, c=glance

.dockerignore

@@ -0,0 +1,5 @@
+node_modules
+.git
+.DS_Store
+*.log
+engine

.editorconfig

@@ -0,0 +1,16 @@
+# 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/.
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

.formal-git/components

@@ -0,0 +1,21 @@
+split-view
+kbs
+folders
+workspaces
+mods
+tests
+glance
+media
+images
+vendor
+tabs
+compact-mode
+common
+fonts
+welcome
+scripts
+workflows
+winsign
+flatpak
+configs
+l10n

.formal-git/template

@@ -0,0 +1 @@
+{type}: {message}, b={bugId}, c={components}

.gitattributes

@@ -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/.
+
+*.patch linguist-language=C++
+*.d.ts linguist-language=TypeScript
+
+src/zen/tests/*.js linguist-language=Test

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-
-patreon: zen_browser

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,32 +1,85 @@
 name: Bug Report
 description: File a bug report
-labels: [bug]
 body:
   - type: markdown
     attributes:
       value: |
-        Thank you for filing a bug report.
+        <p align="center">
+          <a href="https://zen-browser.app">
+            <picture>
+              <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg">
+              <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-dark.svg">
+              <img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg" alt="Zen Logo" width="64" height="64">
+            </picture>
+            <img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-browser.svg" alt="Zen Browser Text" width="156" height="64">
+          </a>
+        </p>
+
+        <p align="center"><em>Thank you for filing a bug report!</em></p>
+
+        > [!IMPORTANT]
+        > - Please provide descriptive titles. Bad titles do more harm than good.
+        > - Please search existing issues to avoid creating duplicates.
+        > - For enhancement requests, please use GitHub Discussions.
+        > - Please fill out the template below to the best of your ability.
+        > - Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
+  - type: checkboxes
+    id: captchas
+    attributes:
+      label: Preliminary Checks
+      description: Please confirm the following before submitting a bug report. This helps us triage and resolve issues more efficiently.
+      options:
+        - label: I have read and understood the important section above.
+          required: true
+        - label: I have searched existing issues and avoided creating duplicates.
+          required: true
+        - label: I am not filing an enhancement request.
+          required: true
+        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+          required: true
+        - label: I have checked that this issue can be reproduced once I removed all my Mods and Custom CSS.
+          required: true
   - type: textarea
     id: what-happened
     attributes:
       label: What happened?
-      description: Also tell us, what did you expect to happen?
+      description: Describe the bug clearly and concisely.
       placeholder: Tell us what you see!
     validations:
       required: true
-  - type: checkboxes
-    id: firefox
+  - type: input
+    id: expected-behavior
     attributes:
-      label: Reproducible?
-      description: Is this issue reproducible on Firefox?
-      options:
-        - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+      label: Expected behavior
+      description: Please write a description of what was supposed to happen.
+    validations:
+      required: true
+  - type: input
+    id: actual-behavior
+    attributes:
+      label: Actual behavior
+      description: Please write a description of what actually happened.
+    validations:
+      required: true
+  - type: textarea
+    id: how-to-reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Please Provide numbered steps to reproduce this issue so developers can replicate them easily.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots and videos
+      description: |
+        If applicable, add screenshots or videos to help explain your problem.
   - type: input
     id: version
     attributes:
       label: Version
-      description: What version of our software are you running? Please DO NOT report Classic bugs.
-      placeholder: 1.0.0
+      description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
+      placeholder: 1.0.0b
     validations:
       required: true
   - type: dropdown
@@ -35,14 +88,48 @@ body:
       label: What platform are you seeing the problem on?
       multiple: true
       options:
-        - Linux
-        - macOS
-        - Windows
+        - Linux (AppImage)
+        - Linux (Flatpak)
+        - Linux (Tarball)
+        - macOS - aarch64
+        - macOS - Intel
+        - Windows - aarch64
+        - Windows - x64
+        - Other
     validations:
       required: true
+  - type: dropdown
+    id: component
+    attributes:
+      label: What component is this issue related to?
+      options:
+        - Other
+        - Bookmarks
+        - Compact Mode
+        - Customizable UI / Toolbars
+        - Extensions
+        - Glance
+        - Keyboard Shortcuts
+        - Localization
+        - Media Controler
+        - Mods / Themes
+        - Performance
+        - Privacy
+        - Security
+        - Settings
+        - Split View
+        - Sync
+        - Tab Folders
+        - Tab unloading
+        - Tabs
+        - URL Bar
+        - Workspaces
+    validations:
+      required: true
+
   - type: textarea
     id: logs
     attributes:
-      label: Relevant log output
+      label: Relevant log output if applicable
       description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
-      render: shell
+      render: shell

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1,5 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
+contact_links:
+  - name: Feature Request
+    url: https://github.com/zen-browser/desktop/discussions
+    about: Please use GitHub discussions for feature requests.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: feature_request
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/advanced-issue-labeler.yml

@@ -0,0 +1,58 @@
+policy:
+  - section:
+      - id: [component]
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'component: sync'
+            keys: ['Sync']
+          - name: 'component: compact-mode'
+            keys: ['Compact Mode']
+          - name: 'component: workspaces'
+            keys: ['Workspaces']
+          - name: 'component: mods-themes'
+            keys: ['Mods / Themes']
+          - name: 'component: bookmarks'
+            keys: ['Bookmarks']
+          - name: 'component: glance'
+            keys: ['Glance']
+          - name: 'component: url-bar'
+            keys: ['URL Bar']
+          - name: 'component: tabs'
+            keys: ['Tabs']
+          - name: 'component: settings'
+            keys: ['Settings']
+          - name: 'component: privacy'
+            keys: ['Privacy']
+          - name: 'component: split-view'
+            keys: ['Split View']
+          - name: 'component: performance'
+            keys: ['Performance']
+          - name: 'component: media-controller'
+            keys: ['Media Controler']
+          - name: 'component: tab-unloading'
+            keys: ['Tab unloading']
+          - name: 'component: tab-folders'
+            keys: ['Tab Folders']
+          - name: 'component: keyboard-shortcuts'
+            keys: ['Keyboard Shortcuts']
+          - name: 'component: security'
+            keys: ['Security']
+          - name: 'component: extensions'
+            keys: ['Extensions']
+          - name: 'component: customizable-ui-toolbars'
+            keys: ['Customizable UI / Toolbars']
+          - name: 'component: localization'
+            keys: ['Localization']
+          - name: 'component: other'
+            keys: ['Other']
+
+      - id: [platform]
+        block-list: ['Other']
+        label:
+          # Make sure it's in sync with the dropdown in the issue template
+          - name: 'platform: linux'
+            keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
+          - name: 'platform: macOS'
+            keys: ['macOS - aarch64', 'macOS - Intel']
+          - name: 'platform: windows'
+            keys: ['Windows - x64', 'Windows - aarch64']

.github/workflows/alpha.yml

@@ -1,322 +0,0 @@
-name: Zen Alpha builds
-
-on:
-  workflow_dispatch:
-    inputs:
-      create_release:
-        description: 'Create a new release for this build'
-        required: false
-        default: false
-        type: 'boolean'
-      update_version:
-        description: 'Update the version number'
-        required: false
-        default: true
-        type: 'boolean'
-
-jobs:
-
-  build-data:
-    permissions:
-      contents: write
-    name: Generate build data
-    runs-on: ubuntu-latest
-    outputs:
-      build_date: ${{ steps.data.outputs.builddate }}
-      version: ${{ steps.data.outputs.version }}
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Setup Surfer
-        run: |
-          npm i -g @zen-browser/surfer
-
-      - name: Bump version
-        if: ${{ github.event.inputs.update_version == 'true' }}
-        run: |
-          pnpm surfer ci --brand alpha --bump prerelease
-
-      - name: Bump version without new version
-        if: ${{ github.event.inputs.update_version == 'false' }}
-        run: |
-          pnpm surfer ci --brand alpha
-
-      - name: Debug
-        run: |
-          surfer get version
-          surfer get version | xargs
-          echo "$(surfer get version | xargs)"
-
-      - name: Export release date
-        id: data
-        shell: bash
-        run: |
-          echo "builddate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
-          echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        if: ${{ github.event.inputs.update_version == 'true' }}
-        with:
-          commit_message: 🔖 Update version to ${{ steps.data.outputs.version }}
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
-
-  check-release:
-    runs-on: ubuntu-latest
-    needs: [build-data]
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-        
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Setup surfer
-        run: |
-          npm i -g @zen-browser/surfer
-
-      - name: Activate surfer CLI
-        run: |
-          echo "There's a bug in the surfer CLI, we run this so that surfer sets everything up correctly"
-          pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-  
-      - name: Check version
-        run: |
-          echo "$(pwd)"
-          ls .
-          echo "version=$(pnpm surfer get version | xargs)" >> $GITHUB_OUTPUT
-          if [[ $(pnpm surfer get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
-            echo ">>> Version matches"
-          else
-            echo ">>> Version mismatch"
-            exit 1
-          fi
-
-
-  source:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-    needs: [build-data]
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
-
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download --verbose
-
-      - name: Import
-        run: pnpm surfer import --verbose
-
-      - name: Compress
-        run: |
-          cd engine
-          # -h is used to dereference symlinks
-          tar --use-compress-program=zstd -hcf ../zen.source.tar.gz *
-          cd ..
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: zen.source.tar.gz
-          path: ./zen.source.tar.gz
-
-  #windows-step-1:
-  #  name: Windows build step 1 (PGO build)
-  #  uses: ./.github/workflows/windows-alpha-build.yml
-  #  needs: [build-data]
-  #  permissions:
-  #    contents: write
-  #  with:
-  #    build-version: ${{ needs.build-data.outputs.version }}
-  #    generate-gpo: true
-  #    profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip
-
-  #windows-step-2:
-  #  name: Windows build step 2 (Generate profile data)
-  #  uses: ./.github/workflows/windows-profile-build.yml
-  #  permissions:
-  #    contents: write
-  #  needs: [windows-step-1, build-data]
-  #  with:
-  #    build-version: ${{ needs.build-data.outputs.version }}
-  #    profile-data-path-archive: zen-windows-x86_64-profile-data-and-jarlog.zip
-
-  windows-step-3:
-    name: Windows build step 3 (build with profile data)
-    uses: ./.github/workflows/windows-alpha-build.yml
-    permissions:
-      contents: write
-    needs: [build-data]
-    with:
-      build-version: ${{ needs.build-data.outputs.version }}
-      generate-gpo: false
-
-  linux:
-    name: Linux build
-    uses: ./.github/workflows/linux-alpha-build.yml
-    permissions:
-      contents: write
-    needs: [build-data] 
-    with:
-      build-version: ${{ needs.build-data.outputs.version }}
-
-  mac:
-    name: macOS build
-    uses: ./.github/workflows/macos-alpha-build.yml
-    permissions:
-      contents: write
-    needs: [build-data]
-    with:
-      build-version: ${{ needs.build-data.outputs.version }}
-
-  release:
-    if: ${{ github.event.inputs.create_release == 'true' }}
-    permissions: write-all
-    name: Release
-    needs: [build-data, linux, source, windows-step-3, check-release, mac]
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Update repo
-        uses: actions/checkout@v3
-
-      - name: Git Pull
-        run: git pull
-
-      - uses: actions/download-artifact@v4
-
-      - name: List
-        run: find .
-
-      - name: Clone updates repo
-        uses: actions/checkout@v4
-        with:
-          repository: zen-browser/updates-server
-          path: updates-server
-          token: ${{ secrets.DEPLOY_KEY }}
-
-      - name: Copy update manifests
-        run: |
-          cd updates-server
-          mkdir -p updates
-          cp -a ../linux_update_manifest/. updates/
-          cp -a ../windows_update_manifest/.  updates/
-          cp -a ../macos_update_manifest/.  updates/
-
-      - uses: stefanzweifel/git-auto-commit-action@v4
-        with:
-          commit_message: 🚀 Update update manifests
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-bot@users.noreply.github.com
-          repository: ./updates-server
-
-      - name: release-github
-        uses: 'marvinpinto/action-automatic-releases@latest'
-        with:
-          repo_token: '${{ secrets.DEPLOY_KEY }}'
-          automatic_release_tag: ${{ needs.build-data.outputs.version }}
-          title: 'Alpha build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
-          files: |
-            zen.linux.tar.bz2
-            zen.win64.zip
-            zen.source.tar.gz
-            linux.mar
-            windows.mar
-            macos.mar
-            zen.installer.exe
-            zen.installer.pretty.exe
-            zen.macos.dmg
-
-  distro-flatpak:
-    name: Build flatpak repos
-    needs: [linux, release]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    container:
-      image: bilelmoussaoui/flatpak-github-actions:gnome-44
-      options: --privileged
-    if: ${{ github.event.inputs.create_release == 'true' }}
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          repository: zen-browser/flatpak
-          token: ${{ secrets.DEPLOY_KEY }}
-          submodules: recursive
-          
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
-        with:
-          bundle: org.zen.browser.flatpak
-          manifest-path: org.zen.browser.flatpak.yml
-          cache-key: flatpak-builder-${{ github.sha }}
-          verbose: true
-
-      - name: Find flatpak bundle
-        run: find . 
-
-      - name: Upload flatpak bundle
-        uses: actions/upload-artifact@v4
-        with:
-          name: zen.flatpak
-          path: ./org.zen.browser.flatpak
-      

.github/workflows/build.yml

@@ -0,0 +1,751 @@
+name: Zen Release builds
+
+on:
+  workflow_dispatch:
+    inputs:
+      create_release:
+        description: 'Create a new release for this build'
+        required: false
+        default: false
+        type: 'boolean'
+      update_version:
+        description: 'Update the version number'
+        required: false
+        default: false
+        type: 'boolean'
+      update_branch:
+        description: 'Update branch with new version'
+        required: true
+        default: 'release'
+        type: 'choice'
+        options:
+          - 'release'
+          - 'twilight'
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: 'boolean'
+        default: false
+  workflow_call:
+    inputs:
+      create_release:
+        description: 'Create a new release for this build'
+        required: false
+        default: false
+        type: 'boolean'
+      update_version:
+        description: 'Update the version number'
+        required: false
+        default: false
+        type: 'boolean'
+      update_branch:
+        description: 'Update branch with new version'
+        required: true
+        default: 'release'
+        type: 'string'
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: 'boolean'
+        default: false
+
+jobs:
+  buildid:
+    name: Generate build ID
+    runs-on: ubuntu-latest
+    outputs:
+      buildids: ${{ steps.get.outputs.bid }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - id: get
+        shell: bash -xe {0}
+        run: |
+          bdat=`date +"%Y%m%d%I%M%S"`
+          echo "bid=${bdat}" >> $GITHUB_OUTPUT
+
+      - name: Debug
+        run: |
+          echo "create_release: ${{ inputs.create_release }}"
+          echo "update_version: ${{ inputs.update_version }}"
+          echo "use sccache: ${{ inputs.use-sccache }}"
+          echo "update_branch: ${{ inputs.update_branch }}"
+          echo "GITHUB_REPOSITORY: ${{ github.repository }}"
+          echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
+          echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
+
+      - name: Check if correct branch
+        if: ${{ inputs.create_release }}
+        run: |
+          echo "Checking if we are on the correct branch"
+          git branch
+          git status
+          git branch --show-current
+          branch="${{ inputs.update_branch }}"
+          if [[ $branch == "twilight" ]]; then
+            branch="dev"
+          elif [[ $branch == "release" ]]; then
+            branch="stable"
+          fi
+          if [[ $(git branch --show-current) != $branch ]]; then
+            echo ">>> Branch mismatch"
+          # exit 1
+          else
+            echo ">>> Branch matches"
+          fi
+
+  start-self-host:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download aws-cli
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Start self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Starting self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_START_SCRIPT }}" | base64 -d > start.sh
+          sudo chmod +x start.sh
+          bash ./start.sh
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm start.sh || true
+
+  build-data:
+    permissions:
+      contents: write
+    name: Generate build data
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: buildid
+    outputs:
+      build_date: ${{ steps.data.outputs.builddate }}
+      version: ${{ steps.data.outputs.version }}
+      build_time: ${{ steps.data.outputs.buildtime }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Setup Surfer
+        run: |
+          npm i -g @zen-browser/surfer
+
+      - name: Bump version
+        if: ${{ inputs.update_version && inputs.update_branch == 'release' }}
+        run: |
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --bump prerelease
+
+      - name: Bump version without new version
+        if: ${{ !inputs.update_version || inputs.update_branch == 'twilight' }}
+        run: |
+          npm run surfer -- ci --brand ${{ inputs.update_branch }}
+
+      - name: Debug
+        run: |
+          surfer get version
+          surfer get version | xargs
+          echo "$(surfer get version | xargs)"
+
+      - name: Export release date
+        id: data
+        shell: bash
+        run: |
+          echo "builddate=$(date +"%Y-%m-%d")" >> $GITHUB_OUTPUT
+          echo "version=$(surfer get version | xargs)" >> $GITHUB_OUTPUT
+          echo "buildtime=$(date +"%H:%M:%S")" >> $GITHUB_OUTPUT
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        if: ${{ inputs.update_version }}
+        with:
+          commit_message: 🔖 Update version to ${{ steps.data.outputs.version }}
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+
+  lint:
+    uses: ./.github/workflows/code-linter.yml
+    needs: [build-data]
+    name: Lint
+
+  check-release:
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: [build-data, lint]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Setup Surfer
+        run: |
+          npm i -g @zen-browser/surfer
+
+      - name: Activate Surfer CLI
+        run: |
+          npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+
+      - name: Check version
+        run: |
+          echo "$(pwd)"
+          echo $(npm run --silent surfer -- get version | xargs)
+          echo "version=$(npm run --silent surfer -- get version | xargs)" >> $GITHUB_OUTPUT
+          if [[ $(npm run --silent surfer -- get version | xargs) == ${{ needs.build-data.outputs.version }} ]]; then
+            echo ">>> Version matches"
+          else
+            echo ">>> Version mismatch"
+            exit 1
+          fi
+
+  source:
+    permissions:
+      contents: write
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: [build-data, check-release]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.update_branch }} --display-version ${{ needs.build-data.outputs.version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download --verbose
+
+      - name: Import
+        run: npm run import -- --verbose
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Compress
+        run: |
+          tar \
+            --exclude='./.git' \
+            --use-compress-program=zstd \
+            -hcf zen.source.tar.zst \
+            -C engine .
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.source.tar.zst
+          path: ./zen.source.tar.zst
+
+  windows-step-1:
+    name: Windows build step 1 (PGO build)
+    uses: ./.github/workflows/windows-release-build.yml
+    needs: [build-data, buildid]
+    permissions:
+      contents: write
+    secrets: inherit
+    with:
+      use-sccache: ${{ inputs.use-sccache }}
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: true
+      profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+
+  windows-step-2:
+    name: Windows build step 2 (Generate profile data)
+    uses: ./.github/workflows/windows-profile-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [windows-step-1, build-data]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      profile-data-path-archive: zen.win64-pgo-stage-1.zip
+      release-branch: ${{ inputs.update_branch }}
+
+  windows-step-3:
+    name: Windows build step 3 (build with profile data)
+    uses: ./.github/workflows/windows-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, windows-step-2, start-self-host, buildid]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      generate-gpo: false
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+
+  linux:
+    name: Linux build
+    uses: ./.github/workflows/linux-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, start-self-host, buildid]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+
+  mac:
+    name: macOS build
+    uses: ./.github/workflows/macos-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, buildid]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+      MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+      use-sccache: ${{ inputs.use-sccache }}
+
+  mac-uni:
+    name: macOS build (Universal)
+    uses: ./.github/workflows/macos-universal-release-build.yml
+    permissions:
+      contents: write
+    secrets: inherit
+    needs: [build-data, mac]
+    with:
+      build-version: ${{ needs.build-data.outputs.version }}
+      release-branch: ${{ inputs.update_branch }}
+
+  appimage:
+    name: AppImage build - Linux ${{ matrix.arch }}
+    permissions:
+      contents: write
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    strategy:
+      matrix:
+        arch: [x86_64, aarch64]
+    needs: [linux]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install dependencies
+        run: |
+          npm ci
+          sudo apt-get update
+          sudo apt-get -y install libfuse2 desktop-file-utils appstream
+
+      - name: Download Linux build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-${{ matrix.arch }}.tar.xz
+
+      - name: Execute AppImage build
+        run: |
+          set -eux
+          export ARCH=${{ matrix.arch }}
+          UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync"
+          rm build/AppDir/.DirIcon || true
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
+          cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon
+
+          if [ "${{ inputs.update_branch }}" = "twilight" ]; then
+            sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop
+            sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
+          fi
+
+          APPDIR=build/AppDir
+          tar -xvf *.tar.* && rm -rf *.tar.*
+          mv zen/* $APPDIR/
+          wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
+          wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH"
+          chmod +x *.AppImage
+          chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH"
+          chmod +x ./build/AppDir/AppRun
+
+          # keep the uruntime mountpoint (massively speeds up launch time)
+          sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH"
+
+          echo "AppDir: $APPDIR"
+          ls -al
+          find .
+          ls -al "$APPDIR"
+          ./appimagetool-x86_64.AppImage -u "$UPINFO" "$APPDIR" zen-"$ARCH".AppImage --runtime-file ./uruntime-appimage-squashfs-lite-"$ARCH"
+          mkdir dist
+          mv zen*AppImage* dist/.
+          unset ARCH
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage
+          path: ./dist/zen-${{ matrix.arch }}.AppImage
+
+      - name: Upload artifact (ZSync)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen-${{ matrix.arch }}.AppImage.zsync
+          path: ./dist/zen-${{ matrix.arch }}.AppImage.zsync
+
+  stop-self-hosted:
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    needs: [windows-step-3, linux]
+    if: always()
+    steps:
+      - name: Download aws-cli
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+          unzip awscliv2.zip
+          sudo ./aws/install --update
+
+      - name: Stop self-hosted runner
+        if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Stopping self-hosted runner"
+          echo "${{ secrets.SELF_HOSTED_RUNNER_STOP_SCRIPT }}" | base64 -d > stop.sh
+          sudo chmod +x stop.sh
+          bash ./stop.sh > /dev/null
+
+      - name: Remove self-hosted runner script
+        if: always() && ${{ inputs.create_release && inputs.update_branch == 'release' }}
+        run: |
+          echo "Removing self-hosted runner script"
+          rm stop.sh || true
+
+  release:
+    if: ${{ inputs.create_release || inputs.update_branch == 'twilight' }}
+    permissions: write-all
+    name: Release
+    needs:
+      [
+        build-data,
+        linux,
+        windows-step-3,
+        check-release,
+        mac-uni,
+        appimage,
+        source,
+        lint,
+        stop-self-hosted,
+      ]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+    environment:
+      name: ${{ inputs.update_branch == 'release' && 'Deploy-Release' || 'Deploy-Twilight' }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download artifact
+        uses: actions/download-artifact@v4
+
+      - name: Checkout updates repository
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/updates-server
+          path: updates-server
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download object files
+        if: ${{ inputs.update_branch == 'release' }}
+        run: |
+          git clone https://github.com/zen-browser/windows-binaries.git .github/workflows/object --depth 1
+
+      - name: Copy update manifests
+        env:
+          RELEASE_BRANCH: ${{ inputs.update_branch }}
+        run: |
+          cd updates-server
+          mkdir -p updates
+          cp -a ../linux_update_manifest_x86_64/.  updates/
+          cp -a ../linux_update_manifest_aarch64/.  updates/
+
+          if [[ $RELEASE_BRANCH == 'release' ]]; then
+            cp -a ../.github/workflows/object/windows-x64-signed-x86_64/update_manifest/.  updates/
+            cp -a ../.github/workflows/object/windows-x64-signed-arm64/update_manifest/.  updates/
+          else
+            cp -a ../windows_update_manifest_x86_64/.  updates/
+            cp -a ../windows_update_manifest_arm64/.  updates/
+          fi
+
+          cp -a ../macos_update_manifest/.  updates/
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 🚀 Update update manifests
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+          repository: ./updates-server
+
+      - name: Generate Release Notes
+        env:
+          RELEASE_BRANCH: ${{ inputs.update_branch }}
+        run: bash .github/workflows/src/generate_release_notes.sh
+
+        # If we are on Twilight, we want to just update the Twilight tag's release
+      - name: Update Twilight tag
+        if: ${{ inputs.update_branch == 'twilight' }}
+        uses: softprops/action-gh-release@v2.2.2
+        with:
+          body_path: release_notes.md
+          files: |
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
+            ./zen.win-x86_64.zip/*
+            ./zen.win-arm64.zip/*
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./windows.mar/*
+            ./windows-arm64.mar/*
+            ./macos.mar/*
+            ./zen.installer.exe/*
+            ./zen.installer-arm64.exe/*
+            ./zen.macos-universal.dmg/*
+          tag_name: 'twilight'
+          name: 'Twilight build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }} at ${{ needs.build-data.outputs.build_time }})'
+          draft: false
+          generate_release_notes: false
+          prerelease: true
+          token: ${{ secrets.DEPLOY_KEY }}
+          fail_on_unmatched_files: false
+        env:
+          GITHUB_REPOSITORY: ${{ github.repository }}
+
+      - name: Release
+        uses: softprops/action-gh-release@v2.2.2
+        if: ${{ inputs.update_branch == 'release' }}
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+          tag_name: ${{ needs.build-data.outputs.version }}
+          prerelease: false
+          fail_on_unmatched_files: false
+          generate_release_notes: false
+          name: 'Release build - ${{ needs.build-data.outputs.version }} (${{ needs.build-data.outputs.build_date }})'
+          body_path: release_notes.md
+          files: |
+            ./zen.source.tar.zst/*
+            ./zen.linux-x86_64.tar.xz/*
+            ./zen.linux-aarch64.tar.xz/*
+            ./zen-x86_64.AppImage/*
+            ./zen-x86_64.AppImage.zsync/*
+            ./zen-aarch64.AppImage/*
+            ./zen-aarch64.AppImage.zsync/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.win-x86_64.zip
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.win-arm64.zip
+            ./linux.mar/*
+            ./linux-aarch64.mar/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/windows.mar
+            ./.github/workflows/object/windows-x64-signed-arm64/windows-arm64.mar
+            ./macos.mar/*
+            ./.github/workflows/object/windows-x64-signed-x86_64/zen.installer.exe
+            ./.github/workflows/object/windows-x64-signed-arm64/zen.installer-arm64.exe
+            ./zen.macos-universal.dmg/*
+
+  prepare-flatpak:
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+    permissions: write-all
+    name: Prepare Flatpak
+    needs: [release, linux, build-data]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+
+    steps:
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/release-utils
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Install dependencies
+        run: |
+          git pull
+          sudo apt-get update
+          npm ci
+
+      - name: Generate new Flatpak release
+        run: |
+          npm run build-flatpak -- \
+            --version ${{ needs.build-data.outputs.version }}
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 🚀 Update releases for Flatpak
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: zen-browser/flatpak
+          token: ${{ secrets.DEPLOY_KEY }}
+          path: flatpak
+
+      - name: Move releases.xml
+        run: |
+          pwd
+          ls .
+          ls ..
+          mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
+          # output the version to the file
+          echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: '[release]: Update Flatpak manifest'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com
+          repository: ./flatpak
+
+      - name: Wait 2 minutes for the Flatpak repo to update
+        run: sleep 120
+
+  release-flatpak:
+    if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
+    permissions: write-all
+    name: Release Flatpak
+    needs: [prepare-flatpak, build-data]
+    runs-on: blacksmith-2vcpu-ubuntu-2404
+
+    steps:
+      - name: Checkout Flatpak repository
+        uses: actions/checkout@v4
+        with:
+          repository: flathub/app.zen_browser.zen
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download Linux x86_64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-x86_64.tar.xz
+
+      - name: Download Linux aarch64 build
+        uses: actions/download-artifact@v4
+        with:
+          name: zen.linux-aarch64.tar.xz
+
+      - name: Update repository
+        uses: actions/checkout@v4
+        with:
+          path: zen-browser
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Download Flatpak archive
+        run: |
+          wget https://github.com/zen-browser/flatpak/releases/latest/download/archive.tar -O archive.tar
+
+      - name: Setup Git
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Prepare Flatpak manifest
+        run: |
+          python3 ./zen-browser/scripts/prepare-flatpak-release.py \
+            --flatpak-archive archive.tar \
+            --version ${{ needs.build-data.outputs.version }} \
+            --linux-archive zen.linux-x86_64.tar.xz \
+            --linux-aarch64-archive zen.linux-aarch64.tar.xz \
+            --output app.zen_browser.zen.yml \
+            --template-root ./zen-browser/build/flatpak
+
+      - name: Commit changes
+        run: |
+          git add app.zen_browser.zen.yml
+          git commit -m "Update to version ${{ needs.build-data.outputs.version }}"
+
+      - name: Clean up
+        run: |
+          rm -rf zen-browser
+          rm -rf archive.tar
+          rm -rf zen.linux-x86_64.tar.xz
+          rm -rf zen.linux-aarch64.tar.xz
+
+      - name: Upload Flatpak manifest
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: app.zen_browser.zen.yml
+          path: ./app.zen_browser.zen.yml
+
+      - name: Create pull request
+        uses: peter-evans/create-pull-request@v7
+        env:
+          GIT_TRACE: 1
+          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 }}`
+          body: |
+            This PR updates the Zen Browser Flatpak package to version ${{ needs.build-data.outputs.version }}.
+
+            @${{ github.actor }} please review and merge this PR.
+          branch: update-to-${{ needs.build-data.outputs.version }}
+          base: master
+          git-token: ${{ secrets.DEPLOY_KEY }}
+          delete-branch: true

.github/workflows/check-candidate-release.yml

@@ -0,0 +1,24 @@
+name: Check Firefox Candidate Release
+
+on:
+  schedule:
+    - cron: '59 4 * * 2'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  check_candidates:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+
+      - name: Check for any updates
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
+        run: |
+          python3 scripts/check_rc_response.py

.github/workflows/clear-all-cache.yml

@@ -0,0 +1,25 @@
+name: Cleanup cache
+on:
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Cleanup
+        run: |
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh cache list --limit 1000 --json id --jq '.[].id')
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh cache delete $cacheKey
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ github.token }}
+          GH_REPO: ${{ github.repository }}

.github/workflows/code-linter.yml

@@ -0,0 +1,40 @@
+name: Code Linter
+
+on:
+  push:
+    branches:
+      - dev
+  workflow_call:
+  pull_request:
+    branches:
+      - dev
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    if: ${{ !contains(github.event.head_commit.message, '[no-lint]') }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup and run autopep8
+        if: ${{ contains(join(github.event.commits.*.modified, ' '), '.py') || contains(join(github.event.commits.*.added, ' '), '.py') || contains(join(github.event.commits.*.removed, ' '), '.py') }}
+        run: |
+          sudo apt install python3-autopep8
+          autopep8 --diff scripts/ src/
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Lint
+        run: npm run lint

.github/workflows/issue-labeler.yml

@@ -0,0 +1,34 @@
+name: Issue labeler
+on:
+  issues:
+    types: [opened]
+
+permissions:
+  contents: read
+
+jobs:
+  label-component:
+    runs-on: ubuntu-latest
+
+    permissions:
+      # required for all workflows
+      issues: write
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Parse issue form
+        uses: stefanbuck/github-issue-parser@v3
+        id: issue-parser
+        with:
+          template-path: .github/ISSUE_TEMPLATE/bug_report.yml
+
+      - name: Set labels based on animals field
+        uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+        with:
+          issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+          token: ${{ secrets.DEPLOY_KEY }}

.github/workflows/issue-metrics.yml

@@ -0,0 +1,67 @@
+name: Monthly issue metrics
+permissions:
+  contents: write
+  issues: read
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '3 2 1 * *'
+
+jobs:
+  build:
+    name: issue metrics
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Get dates for last month
+        shell: bash
+        run: |
+          # Get the current date
+          current_date=$(date +'%Y-%m-%d')
+
+          # Calculate the previous month
+          previous_date=$(date -d "$current_date -1 month" +'%Y-%m-%d')
+
+          # Extract the year and month from the previous date
+          previous_year=$(date -d "$previous_date" +'%Y')
+          previous_month=$(date -d "$previous_date" +'%m')
+
+          # Calculate the first day of the previous month
+          first_day=$(date -d "$previous_year-$previous_month-01" +'%Y-%m-%d')
+
+          # Calculate the last day of the previous month
+          last_day=$(date -d "$first_day +1 month -1 day" +'%Y-%m-%d')
+
+          echo "$first_day..$last_day"
+          echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+          echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
+
+      - name: Run issue-metrics tool
+        uses: github/issue-metrics@v2
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+          HIDE_AUTHOR: true
+          HIDE_TIME_TO_ANSWER: true
+          SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
+
+      - name: Move metrics to docs folder
+        run: |
+          mkdir -p docs/issue-metrics
+          rm -f docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+          mv issue_metrics.md docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+
+      - name: Remove metrisc JSON
+        run: |
+          rm -f issue_metrics.json
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'docs: Update monthly issue metrics, b=(no bug), c={docs}'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: zen-browser-auto@users.noreply.github.com

.github/workflows/linux-alpha-build.yml

@@ -1,129 +0,0 @@
-
-on:
-  workflow_call:
-    inputs:
-      build-version:
-        description: 'The version to build'
-        required: true
-        type: string
-    
-jobs:
-  build-linux:
-    permissions:
-      contents: write
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v3
-
-        # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update --fix-missing
-          sudo apt-get update
-          sudo apt-get install dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
-          pip install pycairo testresources
-
-      - name: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
-
-      - name: Configure sccache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Install sccache
-        env:
-          LINK: https://github.com/mozilla/sccache/releases/download
-          SCCACHE_VERSION: 0.2.13
-        run: |
-          SCCACHE_FILE=sccache-$SCCACHE_VERSION-x86_64-unknown-linux-musl
-          mkdir -p $HOME/.local/bin
-          curl -L "$LINK/$SCCACHE_VERSION/$SCCACHE_FILE.tar.gz" | tar xz
-          mv -f $SCCACHE_FILE/sccache $HOME/.local/bin/sccache
-          echo "$HOME/.local/bin" >> $GITHUB_PATH
-
-      - name: Save sccache
-        uses: actions/cache@v3
-        continue-on-error: false
-        with:
-          path: /home/runner/.cache/sccache
-          key: ${{ runner.os }}-sccache
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
-
-      - name: Download firefox source and dependencies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser
-          cd ..
-
-      - name: Build
-        continue-on-error: true
-        run: sh .github/workflows/src/alpha-build.sh
-
-      - name: Build again if it failed
-        if: failure()
-        run: sh .github/workflows/src/alpha-build.sh
-
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
-        run: |
-          mv dist/zen-*.tar.bz2 "zen.linux.tar.bz2"
-          mv dist/output.mar linux.mar
-
-      - name: Upload binary
-        uses: actions/upload-artifact@v4
-        with:
-          name: zen.linux.tar.bz2
-          path: ./zen.linux.tar.bz2
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux.mar
-          path: ./linux.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux_update_manifest
-          path: ./dist/update

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

@@ -0,0 +1,176 @@
+name: Linux Release Build
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
+
+jobs:
+  build-linux:
+    permissions:
+      contents: write
+    # aarch64 does not need full 16x
+    runs-on: ${{ (inputs.release-branch == 'release' && matrix.arch == 'x86_64') && 'self-hosted' || 'blacksmith-8vcpu-ubuntu-2404' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
+    name: Build Linux - ${{ matrix.arch }}
+
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: false
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          set -x
+          sudo apt-get update --fix-missing
+          sudo apt-get update
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Fix Rust version
+        run: |
+          # Install a rust version compatible with LLVM 18
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
+          source $HOME/.cargo/env
+
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-unknown-linux-gnu
+          else
+            rustup target add x86_64-unknown-linux-gnu
+          fi
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          . "$HOME/.cargo/env"
+          npm run import
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export SURFER_PLATFORM="linux"
+          ./mach --no-interactive bootstrap --application-choice browser
+          cd ..
+
+      - name: Insert API Keys
+        run: |
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
+      - name: Build
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+        continue-on-error: true
+        run: |
+          export SURFER_PLATFORM="linux"
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
+          fi
+          bash .github/workflows/src/release-build.sh
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+        run: |
+          export SURFER_PLATFORM="linux"
+          export ZEN_RELEASE=1
+          npm run package
+
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
+
+      - name: Rename artifacts
+        run: |
+          mv dist/zen-*.tar.xz "zen.linux-${{ matrix.arch }}.tar.xz"
+          mv dist/output.mar linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+
+      - name: Upload build artifact (binary)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.linux-${{ matrix.arch }}.tar.xz
+          path: ./zen.linux-${{ matrix.arch }}.tar.xz
+
+      - name: Upload build artifact (.mar)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+          path: ./linux${{ matrix.arch == 'aarch64' && '-aarch64' || '' }}.mar
+
+      - name: Upload build artifact (update manifests)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: linux_update_manifest_${{ matrix.arch }}
+          path: ./dist/update

.github/workflows/macos-alpha-build.yml

@@ -1,98 +0,0 @@
-
-on:
-  workflow_call:
-    inputs:
-      build-version:
-        description: 'The version to build'
-        required: true
-        type: string
-
-jobs:
-  mac-build:
-    runs-on: macos-14
-
-    steps:
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.11' 
-
-      - uses: actions/checkout@v4
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install system dependencies
-        run: |
-          brew install cairo sccache gnu-tar mercurial
-          sudo pip install setuptools
-
-      - name: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
-
-      - name: Force usage fo gnu-tar
-        run: |
-          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
-          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
-          source ~/.bash_profile
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Get pnpm store directory
-        id: pnpm-cache
-        shell: bash
-        run: |
-          echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      - name: Install dependencies
-        run: pnpm install
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
-
-      - name: Download firefox source and dependancies
-        run: pnpm surfer download
-
-      - name: Import
-        run: pnpm surfer import
-
-      - name: Bootstrap
-        run: |
-          cd engine
-          ./mach --no-interactive bootstrap --application-choice browser 
-          cd ..
-
-      - name: surfer build
-        run: sh .github/workflows/src/alpha-build.sh
-
-      - name: Package
-        run: pnpm package
-
-      - name: Rename artifacts
-        run: |
-          mv ./dist/*.dmg "zen.macos.dmg"
-          mv ./dist/output.mar macos.mar
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: zen.macos.dmg
-          path: ./zen.macos.dmg
-
-      - name: Upload mar
-        uses: actions/upload-artifact@v4
-        with:
-          name: macos.mar
-          path: ./macos.mar
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v4
-        with:
-          name: macos_update_manifest
-          path: ./dist/update

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

@@ -0,0 +1,193 @@
+name: macOS Release Build
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
+
+jobs:
+  mac-build:
+    name: Build macOS - ${{ matrix.arch }}
+    runs-on: macos-26
+
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        # note: This will use the version defined in '.python-version' by default
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install cairo gnu-tar mercurial
+          sudo pip install setuptools
+
+          brew uninstall --ignore-dependencies python3.12 -f
+
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          python3 -m pip install --user mercurial
+
+          rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
+          rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
+          rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'
+
+          brew install watchman
+
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
+          source $HOME/.cargo/env
+
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-apple-darwin
+          else
+            rustup target add x86_64-apple-darwin
+          fi
+
+      - name: Force usage of gnu-tar
+        run: |
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
+          source ~/.bash_profile
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Load surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Import
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: npm run import -- --verbose
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export SURFER_PLATFORM="darwin"
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          # Always exist with 0, even if bootstrap fails
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes --exclude macos-sdk || true
+          cd ..
+
+      - name: Build language packs
+        run: sh scripts/download-language-packs.sh
+
+      - name: Insert API Keys
+        run: |
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
+      - name: Build Zen
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+        run: |
+          export SURFER_PLATFORM="darwin"
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
+          fi
+          bash .github/workflows/src/release-build.sh
+
+      - name: Package
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+        run: |
+          export SURFER_PLATFORM="darwin"
+          export ZEN_RELEASE=1
+          npm run package
+
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
+
+      - name: Rename artifacts
+        run: |
+          echo "Tarballing DMG"
+          set -ex
+          mv ./dist/*.dmg ./zen-${{ matrix.arch }}-apple-darwin-dist.dmg
+          mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/host/bin/mar ./zen-macos-host-mar
+          mv ./engine/obj-${{ matrix.arch }}-apple-darwin/dist/bin/platform.ini ./platform.ini
+
+      - name: Upload dist dmg
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 1
+          name: zen-${{ matrix.arch }}-apple-darwin-dist.dmg
+          path: ./zen-${{ matrix.arch }}-apple-darwin-dist.dmg
+
+      - name: Upload host mar
+        uses: actions/upload-artifact@v4
+        if: matrix.arch == 'aarch64'
+        with:
+          retention-days: 1
+          name: zen-macos-host-mar
+          path: ./zen-macos-host-mar
+
+      - name: Upload platform.ini
+        uses: actions/upload-artifact@v4
+        if: matrix.arch == 'x86_64'
+        with:
+          retention-days: 1
+          name: platform.ini
+          path: ./platform.ini

.github/workflows/macos-universal-release-build.yml

@@ -0,0 +1,261 @@
+name: macOS Release Build
+
+on:
+  workflow_call:
+    inputs:
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+
+jobs:
+  mac-build:
+    name: Unify macOS (Universal)
+    runs-on: 'macos-26'
+
+    strategy:
+      fail-fast: false
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        # note: This will use the version defined in '.python-version' by default
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install system dependencies
+        run: |
+          brew update
+          brew install cairo gnu-tar mercurial
+          sudo pip install setuptools
+
+          brew uninstall --ignore-dependencies python3.12 -f
+
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          python3 -m pip install --user mercurial
+
+          rm '/usr/local/bin/2to3-3.11' '/usr/local/bin/2to3-3.12' '/usr/local/bin/2to3'
+          rm '/usr/local/bin/idle3.11' '/usr/local/bin/idle3.12' '/usr/local/bin/idle3'
+          rm '/usr/local/bin/pydoc3.11' '/usr/local/bin/pydoc3.12' '/usr/local/bin/pydoc3'
+          rm '/usr/local/bin/python3.11' '/usr/local/bin/python3.12' '/usr/local/bin/python3'
+          rm '/usr/local/bin/python3.11-config' '/usr/local/bin/python3.12-config' '/usr/local/bin/python3-config'
+
+          brew install watchman
+
+          cargo install apple-codesign
+
+      - name: Force usage of gnu-tar
+        run: |
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.bash_profile
+          echo 'export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"' >> ~/.zsh
+          source ~/.bash_profile
+
+      - name: Install dependencies
+        run: |
+          npm ci
+
+      - name: Load surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox source and dependencies
+        run: npm run download
+
+      - name: Bootstrap
+        run: |
+          cd engine
+          export SURFER_PLATFORM="darwin"
+          export PATH="$(python3 -m site --user-base)/bin":$PATH
+          ./mach --no-interactive bootstrap --application-choice browser --no-system-changes || true
+          cd ..
+
+      - name: Import
+        run: npm run import
+
+      - name: Populate mozconfig
+        env:
+          SURFER_MOZCONFIG_ONLY: true
+        run: |
+          npm run build
+          cd engine
+          ./mach configure
+
+      - name: Download x86_64 DMG from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-x86_64-apple-darwin-dist.dmg
+
+      - name: Download aarch64 DMG from artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-aarch64-apple-darwin-dist.dmg
+
+      - name: Remove any existing .app folders
+        run: |
+          set -x
+          cd engine
+          rm -rf "./obj-x86_64-apple-darwin/" || true
+          rm -rf "./obj-aarch64-apple-darwin/" || true
+
+      - name: Extract .app from dmg
+        run: |
+          set -ex
+          cd engine
+          echo "Extracting x86_64 .app from dmg"
+          mkdir -p ./obj-x86_64-apple-darwin/dist
+          mkdir -p ./obj-aarch64-apple-darwin/dist
+          ./mach python -m mozbuild.action.unpack_dmg \
+            ../zen-x86_64-apple-darwin-dist.dmg \
+            ./obj-x86_64-apple-darwin/dist
+          echo "Extracting aarch64 .app from dmg"
+          ./mach python -m mozbuild.action.unpack_dmg \
+            ../zen-aarch64-apple-darwin-dist.dmg \
+            ./obj-aarch64-apple-darwin/dist
+
+      - name: Find first .app folder name
+        run: |
+          cd engine/obj-x86_64-apple-darwin/dist
+          export APP_NAME=${{ inputs.release-branch == 'twilight' && 'Twilight' || 'Zen' }}
+          echo "APP_NAME=$APP_NAME" >> $GITHUB_ENV
+          echo "APP_NAME=$APP_NAME"
+
+      - name: List .app folders
+        run: |
+          ls engine/
+          echo "--------------------"
+          cd engine/obj-x86_64-apple-darwin/dist
+          find . -maxdepth 1 -name "*.app" -type d
+          cd ../..
+
+      - name: create .p12 for codesign 🖊️
+        run: |
+          cd engine
+          echo "${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}" > cert.txt
+          base64 --decode -i cert.txt -o zenCert.p12
+          echo "${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}" > zenpCertPassword.passwd
+
+      - name: Remove certificate sensitive information
+        run: |
+          rm engine/cert.txt || true
+
+      - name: Import provisioning profile for .app
+        run: |
+          echo "${{ secrets.macOS_PROVISIONING_PROFILE }}" | base64 --decode > ./engine/Zen_Browser.provisionprofile
+          ls -la
+
+      - name: Unify architectures
+        run: |
+          cd engine
+          ./mach python "./toolkit/mozapps/installer/unify.py" "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" "./obj-aarch64-apple-darwin/dist/${{ env.APP_NAME }}.app"
+          echo "Merged aaarch64 into x86_64!"
+
+      - name: Import APPLE DEVELOPER ID CERTIFICATE for .app
+        uses: Apple-Actions/import-codesign-certs@v3
+        with:
+          p12-file-base64: ${{ secrets.macOS_CERTIFICATES_P12_For_App_BASE64 }}
+          p12-password: ${{ secrets.macOS_CERTIFICATES_P12_PASSWORD }}
+
+      - name: Copy provisioning profile for .app (embedded in .app)
+        run: |
+          cd engine
+          echo "Copying provisioning profile for .app on both architectures (${{ env.APP_NAME }})"
+          cp ./Zen_Browser.provisionprofile "./embedded.provisionprofile"
+
+      - name: Sign .app
+        run: |
+          cd engine
+          # TODO: Change it to "production" once we figure out the issue with the webauth
+          ./mach macos-sign -v -r -c "release" -e "production" -a "./obj-x86_64-apple-darwin/dist/${{ env.APP_NAME }}.app" --rcodesign-p12-file zenCert.p12 --rcodesign-p12-password-file zenpCertPassword.passwd
+
+      - name: Create DMG
+        run: |
+          cd engine
+          ./mach python -m mozbuild.action.make_dmg \
+            --volume-name "${{ env.APP_NAME }}" \
+            --background ./browser/branding/${{ inputs.release-branch }}/background.png \
+            --icon ./browser/branding/${{ inputs.release-branch }}/firefox.icns \
+            --dsstore ./browser/branding/${{ inputs.release-branch }}/dsstore \
+            ./obj-x86_64-apple-darwin/dist/ ../zen-macOS-universal-temp.dmg
+
+      - name: Remove sensitive information
+        run: |
+          rm -f ./engine/Zen_Browser.provisionprofile
+
+      - name: Sign .dmg
+        run: |
+          set -ex
+          hdiutil convert zen-macOS-universal-temp.dmg -format UDZO -imagekey zlib-level=9 -o zen.macos-universal.dmg
+          codesign -s "${{ secrets.macOS_AppleDeveloperId }}" zen.macos-universal.dmg
+          xcrun notarytool submit "zen.macos-universal.dmg" \
+            --apple-id "${{ secrets.macOS_AppleAccountId }}" \
+            --team-id "${{ secrets.macOS_AppleDeveloperIdTeamId }}" \
+            --password "${{ secrets.macOS_AppleDeveloperIdPassword }}" \
+            --no-s3-acceleration \
+            --wait
+          xcrun stapler staple "zen.macos-universal.dmg"
+
+      - name: Download host mar
+        uses: actions/download-artifact@v4
+        with:
+          name: zen-macos-host-mar
+
+      - name: Upload build artifact
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.macos-universal.dmg
+          path: ./zen.macos-universal.dmg
+
+      - name: Download platform.ini
+        uses: actions/download-artifact@v4
+        with:
+          name: platform.ini
+
+      - name: Package for mar
+        env:
+          JUST_MAR: true
+        run: |
+          # we don't need it anymore
+          set -ex
+          rm -rf ./engine/obj-aarch64-apple-darwin
+          mkdir -p ./engine/obj-x86_64-apple-darwin/dist/bin
+          mv ./platform.ini ./engine/obj-x86_64-apple-darwin/dist/bin/platform.ini
+          export SURFER_PLATFORM="darwin"
+          export ZEN_RELEASE=1
+          # full path to zen-macos-host-mar
+          export MAR=$(pwd)/zen-macos-host-mar
+          chmod +x $MAR
+          echo "MAR=$MAR"
+          npm run package -- --verbose
+          mv ./dist/output.mar ./macos.mar
+
+      - name: Upload build artifact (.mar)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos.mar
+          path: ./macos.mar
+
+      - name: Upload build artifact (update manifests)
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: macos_update_manifest
+          path: ./dist/update

.github/workflows/pr-test.yml

@@ -0,0 +1,34 @@
+name: Pull request test
+permissions:
+  contents: read
+
+on:
+  pull_request:
+    branches:
+      - dev
+
+jobs:
+  pr-test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Install Surfer
+        run: npm i -g @zen-browser/surfer
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Download Firefox and dependencies
+        run: surfer download
+
+      - name: Import patches
+        run: surfer i

.github/workflows/src/alpha-build.sh

@@ -1,28 +0,0 @@
-set -ex
-
-if command -v apt-get &> /dev/null
-then
-  sudo apt-get update
-  sudo apt-get install -y xvfb
-fi
-
-ulimit -n 4096
-
-# Check if xfvb is installed
-if ! command -v Xvfb &> /dev/null
-then
-  if ! test "$ZEN_CROSS_COMPILING"
-  then
-    Xvfb :2 -screen 0 1024x768x24 &
-    export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
-    export DISPLAY=:2
-  fi
-  export ZEN_RELEASE=1
-  pnpm build 
-else
-  echo "Xvfb could not be found, running without it"
-  echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
-  set -v
-  export ZEN_RELEASE=1
-  pnpm build
-fi

.github/workflows/src/disk-setup-and-swap.sh

@@ -1,50 +0,0 @@
-
-echo Before:
-if [ command -v free ]; then
-    free -h
-fi
-if [ command -v df ]; then
-    df -h
-fi
-
-echo
-echo
-
-sudo swapoff /mnt/swapfile
-sudo rm /mnt/swapfile
-sudo fallocate -l 10G /mnt/swapfile
-sudo chmod 600 /mnt/swapfile
-sudo mkswap /mnt/swapfile
-sudo swapon /mnt/swapfile
-sudo apt remove -y '^dotnet-.*' '^llvm-.*' '^php.*' '^mongodb-.*' '^mysql-.*' clang azure-cli google-cloud-sdk google-chrome-stable microsoft-edge firefox powershell mono-devel libgl1-mesa-dri acl aria2 autoconf automake binutils bison brotli bzip2 coreutils 
-sudo apt autoremove -y
-sudo apt clean
-sudo rm -rf  ./git
-sudo rm -rf /home/linuxbrew
-sudo rm -rf /usr/share/dotnet
-sudo rm -rf /usr/local/lib/android
-sudo rm -rf /usr/local/graalvm
-sudo rm -rf /usr/local/share/powershell
-sudo rm -rf /usr/local/share/chromium
-sudo rm -rf /opt/ghc
-sudo rm -rf /usr/local/share/boost
-sudo rm -rf "$AGENT_TOOLSDIRECTORY"
-sudo rm -rf /etc/apache2
-sudo rm -rf /etc/nginx
-sudo rm -rf /usr/local/share/chrome_driver
-sudo rm -rf /usr/local/share/edge_driver
-sudo rm -rf /usr/local/share/gecko_driver
-sudo rm -rf /usr/share/java
-sudo rm -rf /usr/share/miniconda
-sudo rm -rf /usr/local/share/vcpkg
-
-echo
-echo
-
-echo After:
-if [ command -v free ]; then
-    free -h
-fi
-if [ command -v df ]; then
-    df -h
-fi

.github/workflows/src/generate_release_notes.sh

@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+RELEASE_NOTES_URL="https://raw.githubusercontent.com/zen-browser/www/refs/heads/main/src/release-notes/stable.json"
+
+if [ "$RELEASE_BRANCH" = "release" ]; then
+  RELEASE_TYPE="Stable"
+
+  echo "Fetching release notes from GitHub..."
+  RELEASE_NOTES_JSON=$(curl -s --retry 5 --retry-delay 5 "$RELEASE_NOTES_URL")
+
+  if [ -z "$RELEASE_NOTES_JSON" ]; then
+    echo "Error: Failed to fetch release notes from GitHub"
+    exit 1
+  fi
+
+  LATEST_RELEASE=$(echo "$RELEASE_NOTES_JSON" | jq -r 'last')
+  EXTRA_NOTES=$(echo "$LATEST_RELEASE" | jq -r '.extra // ""')
+else
+  RELEASE_TYPE="Twilight"
+fi
+
+{
+  echo "# Zen ${RELEASE_TYPE} Release"
+
+  if [ "$RELEASE_TYPE" = "Twilight" ]; then
+    echo
+    echo "> [!NOTE]"
+    echo "> You're currently in Twilight mode, this means you're downloading the latest experimental features and updates."
+    echo ">"
+    echo "> If you encounter any issues, please report them on the [issues page](https://github.com/zen-browser/desktop/issues)."
+  fi
+
+  if [ "$RELEASE_TYPE" = "Stable" ]; then
+    echo "${EXTRA_NOTES}"
+
+    if echo "$LATEST_RELEASE" | jq -e '.security != null and .security != ""' > /dev/null; then
+      echo
+      echo "## Security"
+      echo "[Various security fixes]($(echo "$LATEST_RELEASE" | jq -r '.security'))"
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.features // []) | length > 0' > /dev/null; then
+      echo
+      echo "## New Features"
+      echo "$LATEST_RELEASE" | jq -r '.features[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.fixes // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Fixes"
+      echo "$LATEST_RELEASE" | jq -r '.fixes[] | if type=="object" then "- " + .description + " ([#" + (.issue|tostring) + "](" + "https://github.com/zen-browser/desktop/issues/" + (.issue|tostring) + "))" else "- " + . end'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.breakingChanges // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Breaking Changes"
+      echo "$LATEST_RELEASE" | jq -r '.breakingChanges[] | if type=="string" then "- " + . else "- " + .description + " [Learn more](" + .link + ")" end'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.themeChanges // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Theme Changes"
+      echo "$LATEST_RELEASE" | jq -r '.themeChanges[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.changes // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Changes"
+      echo "$LATEST_RELEASE" | jq -r '.changes[] | "- " + .'
+    fi
+
+    if echo "$LATEST_RELEASE" | jq -e '(.knownIssues // []) | length > 0' > /dev/null; then
+      echo
+      echo "## Known Issues"
+      echo "$LATEST_RELEASE" | jq -r '.knownIssues[] | "- " + .'
+    fi
+  fi
+} > "release_notes.md"
+
+echo "Release notes generated: release_notes.md"

.github/workflows/src/release-build.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -xe
+
+if command -v apt-get &> /dev/null; then
+  sudo apt-get install python3-launchpadlib
+  sudo apt-get update
+  sudo apt-get install -y xvfb libnvidia-egl-wayland1 mesa-utils libgl1-mesa-dri
+fi
+
+. $HOME/.cargo/env
+
+ulimit -n 4096
+
+if command -v Xvfb &> /dev/null; then
+  if ! test "$ZEN_CROSS_COMPILING"; then
+    Xvfb :2 -nolisten tcp -noreset -screen 0 1024x768x24 &
+    export LLVM_PROFDATA=$HOME/.mozbuild/clang/bin/llvm-profdata
+    export DISPLAY=:2
+  fi
+  export ZEN_RELEASE=1
+  npm run build
+else
+  echo "Xvfb could not be found, running without it"
+  echo "ASSUMING YOU ARE RUNNING THIS ON MACOS"
+
+  set -v
+  export ZEN_RELEASE=1
+  npm run build
+fi

.github/workflows/src/windows_mozconfig

@@ -1,41 +0,0 @@
-
-export WINSYSROOT="$(echo ~)/win-cross/vs2022"
-
-export MIDL="$(echo ~)/win-cross/wine/bin/widl"
-export WINE="$(echo ~)/win-cross/wine/bin/wine64"
-export WINEDEBUG=-all
-
-#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
-#? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-windows-msvc
-
-export MOZ_STUB_INSTALLER=1
-export MOZ_PKG_FORMAT=TAR
-
-export CROSS_BUILD=1
-CROSS_COMPILE=1
-TOOLS=$(echo ~)/win-cross
-
-export MIDL="$TOOLS/wine/bin/widl"
-export MOZ_INCLUDE_SOURCE_INFO=1
-export MOZ_STUB_INSTALLER=1
-export WINEDEBUG=-all
-export WINE="$TOOLS/wine/bin/wine64"
-#export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
-#export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
-
-ac_add_options --disable-maintenance-service
-ac_add_options --disable-bits-download
-
-# if test "$ZEN_GA_GENERATE_PROFILE"; then
-#   mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
-#   ac_add_options --enable-profile-generate=cross
-#   ac_add_options --without-wasm-sandboxed-libraries
-# else
-ac_add_options --disable-profiling
-#   ac_add_options --enable-profile-use=cross
-#   ac_add_options --with-pgo-profile-path=$(echo ~)/artifact/merged.profdata
-#   ac_add_options --with-pgo-jarlog=$(echo ~)/artifact/en-US.log
-# fi
-
-# ALWAYS MANTAIN ONE LINE BREAK AT THE END OF THIS FILE

.github/workflows/twilight-release-schedule.yml

@@ -0,0 +1,37 @@
+name: Zen Twilight Scheduled Releases
+
+on:
+  schedule:
+    - cron: '0 23 * * *'
+  workflow_dispatch:
+    inputs:
+      create_release:
+        description: 'Whether to do a release'
+        required: false
+        type: boolean
+        default: true
+
+jobs:
+  twilight-release-schedule:
+    name: Twilight Release Schedule
+    permissions: write-all
+    secrets: inherit
+    uses: ./.github/workflows/build.yml
+    with:
+      create_release: ${{ github.event_name != 'workflow_dispatch' && true || inputs.create_release }}
+      update_branch: twilight
+      use-sccache: false
+      update_version: false
+
+  post-build:
+    name: Post Build
+    runs-on: ubuntu-latest
+    needs: twilight-release-schedule
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: '.nvmrc'

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

@@ -1,200 +0,0 @@
-
-on:
-  workflow_call:
-    inputs:
-      generate-gpo: 
-        required: true
-        type: boolean
-        default: false
-      build-version:
-        description: 'The version to build'
-        required: true
-        type: string
-      profile-data-path-archive:
-        description: 'The path to the zip archive containing the profile data'
-        type: string
-
-jobs:
-  windows-build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-
-      - uses: actions/checkout@v4
-
-      # Give the runner some swap space in an attempt to stop gkrust from crashing the build
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@v1.0
-        with:
-          swap-size-gb: 6
-
-      - name: Install pnpm
-        run: npm install -g pnpm
-
-      - name: Setup git
-        run: |
-          git config --global user.email "mauro-balades@users.noreply.github.com"
-          git config --global user.name "mauro-balades"
-
-      - name: Install dependencies
-        run: |
-          pnpm i
-
-      - name: Load surfer CI setup
-        run: pnpm surfer ci --brand alpha --display-version ${{ inputs.build-version }}
-
-      - name: Download
-        run: pnpm surfer download
-
-      - name: Free up space
-        run: sh .github/workflows/src/disk-setup-and-swap.sh
-
-      - name: "win-cross Cache"
-        env:
-          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
-        id: cache-win-cross
-        uses: actions/cache@v4
-        with:
-          path: ${HOME}/win-cross
-          key: win-cross
-
-      - name: Configure sccache
-        uses: actions/github-script@v7
-        with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
-
-      - name: Setup For Windows
-        if: steps.cache-win-cross.outputs.cache-hit != 'true'
-        run: |
-          set -x
-          mkdir -p ~/win-cross
-          cd engine/
-  
-          echo Setup wine
-          aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
-          tar --zstd -xvf wine.tar.zst -C ~/win-cross
-          rm wine.tar.zst
-  
-          echo Setup Visual Studio
-          sudo apt install -y msitools python3-pip
-          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
-          
-      - name: Bootstrap
-        run: |
-          set -x
-          cd engine/
-
-          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
-
-          cat ../.github/workflows/src/windows_mozconfig >> ../configs/common/mozconfig
-
-          cd ..
-          npm install -g pnpm
-          export SURFER_PLATFORM="win32"
-          pnpm surfer bootstrap
-
-          cd engine/
-          ls ~/.mozbuild/clang/lib/clang/
-          echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
-          cat ../configs/common/mozconfig
-
-          ls ~/win-cross/wine || true
-          ls ~/win-cross/vs2022 || true
-  
-      - name: setup Rust 
-        run: |
-          cd engine/
-          # Install a rust version compatible with 17
-          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.76
-          source $HOME/.cargo/env
-          
-          rustup target add x86_64-pc-windows-msvc
-          cargo install cargo-download
-          cargo download -x windows=0.52.0
-          #? https://github.com/mozilla/sccache#known-caveats
-          export CARGO_INCREMENTAL=0
-          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.52.0" >> ../configs/common/mozconfig
-
-      - uses: actions/download-artifact@v4
-        name: Download artifact if use profdata
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          path: ~/artifact
-
-      - name: Import
-        run: pnpm surfer import --verbose  
-
-      - name: Build
-        run: |
-          set -x
-          unset SURFER_PLATFORM
-          export ZEN_CROSS_COMPILING=1
-          if test ${{ inputs.generate-gpo }}; then
-            #export ZEN_GA_GENERATE_PROFILE=1
-            echo "note: PGO build is disabled"
-          fi
-          sh .github/workflows/src/alpha-build.sh
-
-      - name: Package
-        run: |
-          set -x
-          export SURFER_PLATFORM="win32"
-          pnpm package
-          mv ./dist/output.mar windows.mar
-          mv ./dist/zen-$(pnpm surfer get version | xargs).en-US.win64.zip zen.win64.zip
-          ls ./dist
-          ls .
-
-      - name: Move package for PGO upload
-        if: ${{ inputs.generate-gpo }}
-        run: |
-          set -x
-          mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          name: zen.win64.zip
-          path: ./zen.win64.zip
-
-      - name: Upload PGO build
-        uses: actions/upload-artifact@v4
-        if: ${{ inputs.generate-gpo }}
-        with:
-          name: ${{ inputs.profile-data-path-archive }}
-          path: ./zen.win64-pgo-stage-1.zip
- 
-      - name: Upload mar
-        uses: actions/upload-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          name: windows.mar
-          path: ./windows.mar
-
-      - name: Upload installer
-        uses: actions/upload-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          name: zen.installer.exe
-          path: ./dist/zen.installer.exe
-
-      - name: Upload installer stub
-        uses: actions/upload-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          name: zen.installer.pretty.exe
-          path: ./dist/zen.installer.pretty.exe
-
-      - name: Upload update manifests
-        uses: actions/upload-artifact@v4
-        if: ${{ !inputs.generate-gpo }}
-        with:
-          name: windows_update_manifest
-          path: ./dist/update

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

@@ -1,3 +1,7 @@
+name: Windows PGO Builds
+
+permissions:
+  contents: read
 
 on:
   workflow_call:
@@ -10,81 +14,102 @@ on:
         description: 'The path to the zip archive containing the profile data'
         required: false
         type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
 
 jobs:
   windows-profile-build:
-    runs-on: windows-latest
-    # Script edited from https://github.com/Floorp-Projects/Floorp/blob/ESR115/.github/workflows/window-generate-profile-data-and-jarlog.yml
+    name: |
+      Windows Profile Build - ${{ matrix.arch }}
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+
+    runs-on: ${{ inputs.release-branch == 'release' && 'windows-latest' || 'windows-latest' }}
+
     steps:
-      - name: Checkout
+      - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Install Node.js and pnpm
-        uses: actions/setup-node@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version-file: '.nvmrc'
 
-      - name: Setup git
+      - name: Setup Git
         run: |
           git config --global user.email "mauro-balades@users.noreply.github.com"
           git config --global user.name "mauro-balades"
 
-      - name: Install pnpm
-        run: npm install -g pnpm
-
       - name: Install Surfer
-        run: |
-          npm i -g @zen-browser/surfer
+        run: npm i -g @zen-browser/surfer
 
-      - uses: actions/download-artifact@v4
-        name: Download artifact 
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download artifact
+        if: ${{ matrix.arch == 'x86_64' }}
+        uses: actions/download-artifact@v4
         with:
           path: C:\artifact
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-zen-windows-profile-data-and-jarlog.zip
 
-      - name:  Unpack artifact
+      - name: Unpack artifact
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           cd C:\artifact
           ls
-          7z x ${{ inputs.profile-data-path-archive }}
+          Expand-Archive -Path .\${{ inputs.profile-data-path-archive }} -DestinationPath C:\artifact
           ls
 
-      - name: Setup 
+      - name: Setup
         run: |
-          (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe","C:\MozillaBuildSetup-Latest.exe")
+          (New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
           C:\MozillaBuildSetup-Latest.exe /S | out-null
 
-      - name: Download firefox
+      - name: Download Firefox and dependencies
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
-          git config --global core.safecrlf false  
-          pnpm surfer download
+          git config --global core.safecrlf false
+          npm run download
 
-      - name: Generate 
+      - name: Import patches
+        if: ${{ matrix.arch == 'x86_64' }}
+        env:
+          SURFER_NO_BRANDING_PATCH: true
+        run: npm run import
+
+      - name: Generate
+        if: ${{ matrix.arch == 'x86_64' }}
         run: |
           ls
           $Env:USE_MINTTY = "0"
-
-          $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\","/"
+          $workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
           $workspace_dir = $workspace_dir_current + "/engine"
           echo $workspace_dir
-
           echo "cd $workspace_dir" '' >> mozilla-build-run.sh
+          echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
           echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
-          echo 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
           echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
           C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
 
-      - name: 🐛 Debug Session
-        if: ${{ failure() }}
-        uses: Warpbuilds/gha-debug@v1.3
-        timeout-minutes: 15
+      - name: Move profile data
+        if: ${{ matrix.arch == 'x86_64' }}
+        run: |
+          dir
+          dir engine
+          mv engine/merged.profdata merged.profdata
+          mv engine/en-US.log en-US.log
 
-      - name: Publish merged.profdata
+      - name: Upload artifacts
+        if: ${{ matrix.arch == 'x86_64' }}
         uses: actions/upload-artifact@v4
         with:
-          path: merged.profdata
-
-      - name: Publish en-US.log
-        uses: actions/upload-artifact@v4
-        with:
-          path: en-US.log
-
+          retention-days: 1
+          path: |
+            merged.profdata
+            en-US.log
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}

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

@@ -0,0 +1,343 @@
+name: Windows Release Build
+
+permissions:
+  contents: read
+
+on:
+  workflow_call:
+    inputs:
+      generate-gpo:
+        required: true
+        type: boolean
+        default: false
+      build-version:
+        description: 'The version to build'
+        required: true
+        type: string
+      profile-data-path-archive:
+        description: 'The path to the zip archive containing the profile data'
+        type: string
+      release-branch:
+        description: 'The branch to build'
+        required: true
+        type: string
+      MOZ_BUILD_DATE:
+        type: string
+        required: true
+        default: ''
+      use-sccache:
+        description: 'Use sccache'
+        required: true
+        type: boolean
+        default: false
+
+jobs:
+  windows-build:
+    name: Build Windows - ${{ matrix.arch }}
+    # aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
+    runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'blacksmith-8vcpu-ubuntu-2404' }}
+    env:
+      SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
+      CARGO_TERM_COLOR: always
+      RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
+      CARGO_INCREMENTAL: 0
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x86_64, aarch64]
+
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        with:
+          tool-cache: false
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          token: ${{ secrets.DEPLOY_KEY }}
+
+      - name: Setup Node.js
+        uses: useblacksmith/setup-node@v5
+        with:
+          node-version-file: '.nvmrc'
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@main
+        if: ${{ inputs.use-sccache }}
+        with:
+          disable_annotations: true
+
+      - name: Expose actions cache variables
+        uses: actions/github-script@v6
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env['ACTIONS_CACHE_URL'])
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env['ACTIONS_RUNTIME_TOKEN'])
+
+      - name: Setup Git
+        run: |
+          git config --global user.email "mauro-balades@users.noreply.github.com"
+          git config --global user.name "mauro-balades"
+
+      - name: Install dependencies
+        run: |
+          npm ci
+          sudo apt-get update
+          sudo apt-get install -y python3 python3-pip dos2unix yasm nasm build-essential libgtk2.0-dev libpython3-dev m4 uuid libasound2-dev libcurl4-openssl-dev libdbus-1-dev libdrm-dev libdbus-glib-1-dev libgtk-3-dev libpulse-dev libx11-xcb-dev libxt-dev xvfb lld llvm --fix-missing
+
+      - name: Load Surfer CI setup
+        run: npm run surfer -- ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}
+
+      - name: Download Firefox and dependencies
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        run: npm run download
+
+      - name: win-cross Cache
+        env:
+          SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
+        id: cache-win-cross
+        uses: useblacksmith/cache@v5
+        with:
+          path: ${HOME}/win-cross
+          key: win-cross
+
+      - name: Setup for Windows
+        if: steps.cache-win-cross.outputs.cache-hit != 'true' && !(inputs.generate-gpo && matrix.arch == 'aarch64')
+        run: |
+          set -x
+          mkdir -p ~/win-cross
+          cd engine/
+          sudo apt-get install python3-launchpadlib
+          sudo add-apt-repository ppa:savoury1/backports
+          sudo apt-get update
+          sudo apt-get install -y python3-pip autoconf \
+            autoconf2.13 \
+            automake \
+            bison \
+            build-essential \
+            cabextract \
+            curl \
+            cmake \
+            flex \
+            gawk \
+            gcc-multilib \
+            git \
+            gnupg \
+            jq \
+            libbz2-dev \
+            libexpat1-dev \
+            libffi-dev \
+            libncursesw5-dev \
+            libsqlite3-dev \
+            libssl-dev \
+            libtool \
+            libucl-dev \
+            libxml2-dev \
+            msitools \
+            ninja-build \
+            openssh-client \
+            p7zip-full \
+            pkg-config \
+            procps \
+            python3-requests \
+            python3-toml \
+            scons \
+            subversion \
+            tar \
+            unzip \
+            uuid \
+            uuid-dev \
+            wget \
+            zip \
+            zlib1g-dev \
+            aria2
+          echo Setup wine
+          aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
+          tar --zstd -xf wine.tar.zst -C ~/win-cross
+          rm wine.tar.zst
+          echo Setup Visual Studio
+          ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
+
+      - name: Import
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+        run: |
+          . "$HOME/.cargo/env"
+          npm run import -- --verbose
+
+      - name: Bootstrap
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        run: |
+          set -x
+          cd engine/
+          chmod -R +x "$(echo ~)/win-cross/vs2022" || true
+          cd ..
+          export SURFER_PLATFORM="win32"
+          npm run bootstrap
+          cd engine/
+          ls ~/.mozbuild/clang/lib/clang/
+          echo "export LIB=\"$(cd ~/.mozbuild/clang/lib/clang/* && cd lib/windows && pwd)\"" >> ../configs/common/mozconfig
+          cat ../configs/common/mozconfig
+          sudo apt-get update
+          sudo apt-get install dos2unix
+          ls ~/win-cross/wine || true
+          ls ~/win-cross/vs2022 || true
+
+      - name: Setup Rust
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
+          source $HOME/.cargo/env
+          if test "${{ matrix.arch }}" = "aarch64"; then
+            rustup target add aarch64-pc-windows-msvc
+          else
+            rustup target add x86_64-pc-windows-msvc
+          fi
+          cd engine/
+          cargo install cargo-download --locked
+          cargo download -x windows=0.58.0
+          export CARGO_INCREMENTAL=0
+          echo "" >> ../configs/common/mozconfig
+          echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.58.0" >> ../configs/common/mozconfig
+
+      - name: Build language packs
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        run: sh scripts/download-language-packs.sh
+
+      - name: Download artifact (if use profdata)
+        uses: actions/download-artifact@v4
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        with:
+          path: ~/artifact
+          name: windows-profdata-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+
+      - name: Show artifact info
+        if: ${{ !inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        run: |
+          ls ~/artifact
+          ls ~/artifact/en-US.log
+          ls ~/artifact/merged.profdata
+          chmod +x ~/artifact/en-US.log
+          chmod +x ~/artifact/merged.profdata
+
+      - name: Insert API Keys
+        run: |
+          mkdir -p ~/.zen-keys
+          echo "${{ secrets.ZEN_SAFEBROWSING_API_KEY }}" > ~/.zen-keys/safebrowsing.dat
+
+      - name: Build
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_RELEASE_BRANCH: ${{ inputs.release-branch }}
+        run: |
+          set -x
+          dos2unix configs/windows/mozconfig
+          export SURFER_PLATFORM="win32"
+          export ZEN_CROSS_COMPILING=1
+          if test ${{ inputs.generate-gpo }} = true; then
+            export ZEN_GA_GENERATE_PROFILE=1
+          fi
+          if [[ -n ${{ inputs.MOZ_BUILD_DATE }} ]];then
+            export MOZ_BUILD_DATE=${{ inputs.MOZ_BUILD_DATE }}
+          fi
+          bash .github/workflows/src/release-build.sh
+
+      - name: Package
+        if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
+        env:
+          SURFER_COMPAT: ${{ matrix.arch }}
+          ZEN_GA_DISABLE_PGO: true
+        run: |
+          set -x
+          export SURFER_PLATFORM="win32"
+          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
+          ls .
+
+      - name: Remove API Keys
+        run: |
+          rm -rf ~/.zen-keys
+
+      - name: Move package for PGO upload
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        run: |
+          set -x
+          mv ./zen.win64.zip ./zen.win64-pgo-stage-1.zip
+
+      - name: Rename artifacts
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          mv ./zen.win64.zip zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          mv ./dist/output.mar windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          mv ./dist/zen.installer.exe ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
+
+      - name: Upload artifact (PGO)
+        uses: actions/upload-artifact@v4
+        if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
+        with:
+          retention-days: 5
+          name: ${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}-${{ inputs.profile-data-path-archive }}
+          path: ./zen.win64-pgo-stage-1.zip
+
+      - name: Remove unnecessary files from obj
+        if: ${{ !inputs.generate-gpo }}
+        run: |
+          set -x
+          mkdir obj-${{ matrix.arch }}-pc-windows-msvc/
+
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/_tests
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config/autoconf.mk
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/config.statusd/substs/
+          rm -rf engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist/install
+
+          find engine/obj-${{ matrix.arch }}-pc-windows-msvc/dist -maxdepth 1 -type f -name "*.zip" -delete
+
+          cp -r --no-dereference engine/obj-${{ matrix.arch }}-pc-windows-msvc/* obj-${{ matrix.arch }}-pc-windows-msvc/ || true
+
+      - name: Upload dist object
+        if: ${{ !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 2
+          name: windows-x64-obj-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: obj-${{ matrix.arch }}-pc-windows-msvc
+
+      - name: Upload artifact (if Twilight branch, binary)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+          path: ./zen.win-${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}.zip
+
+      - name: Upload artifact (if Twilight branch, installer)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: zen.installer${{ matrix.arch == 'aarch64' && '-arm64' ||  '' }}.exe
+          path: ./zen.installer${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.exe
+
+      - name: Upload artifact (if Twilight branch, .mar)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+          path: ./windows${{ matrix.arch == 'aarch64' && '-arm64' || '' }}.mar
+
+      - name: Upload artifact (if Twilight branch, update manifests)
+        if: ${{ inputs.release-branch == 'twilight' && !inputs.generate-gpo }}
+        uses: actions/upload-artifact@v4
+        with:
+          retention-days: 5
+          name: windows_update_manifest_${{ matrix.arch == 'aarch64' && 'arm64' || matrix.arch }}
+          path: ./dist/update

.gitignore

@@ -1,3 +1,6 @@
+# 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/.
 
 .dotbuild/
 engine/
@@ -6,4 +9,16 @@ node_modules/
 .surfer/
 
 __pycache__/
-dist/
+dist/
+
+windsign-temp/
+venv/
+
+!firefox-cache/
+win-cross/
+
+!firefox-patches/
+target/
+.vscode/
+
+locales/firefox-l10n/

.husky/pre-commit

@@ -0,0 +1 @@
+npx lint-staged

.nvmrc

@@ -0,0 +1 @@
+20

.prettierignore

@@ -0,0 +1,39 @@
+# 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/.
+
+engine/
+
+**/*.html
+**/*.xhtml
+**/*.inc.xhtml
+**/*.bundle.min.js
+**/*.min.js
+**/*.min.mjs
+
+**/*.svg
+
+**/*.inc.css
+
+surfer.json
+
+src/browser/app/profile/*.js
+pnpm-lock.yaml
+
+**/engine/
+
+docs/issue-metrics/*.md
+
+.husky/
+
+# Some CSS files are preprocessed and prettier doesn't handle them well
+# We also dont want to format the CSS files that are generated by the build
+src/zen/tabs/zen-tabs.css
+src/zen/common/styles/zen-theme.css
+src/zen/compact-mode/zen-compact-mode.css
+src/zen/common/ZenEmojis.mjs
+
+src/zen/split-view/zen-decks.css
+src/zen/workspaces/zen-workspaces.css
+
+*.inc

.prettierrc.json

@@ -0,0 +1,12 @@
+{
+  "bracketSameLine": true,
+  "endOfLine": "lf",
+  "trailingComma": "es5",
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "jsxSingleQuote": false,
+  "semi": true,
+  "printWidth": 100,
+  "plugins": ["prettier-plugin-sh"]
+}

.python-version

@@ -0,0 +1 @@
+3.11

.rust-toolchain

@@ -0,0 +1 @@
+1.82

.vscode/settings.json

@@ -1,18 +0,0 @@
-{
-  "files.associations": {
-    "*.inc": "cpp",
-    "typeindex": "cpp",
-    "typeinfo": "cpp",
-    "functional": "cpp",
-    "array": "cpp",
-    "*.tcc": "cpp",
-    "memory": "cpp",
-    "future": "cpp",
-    "istream": "cpp",
-    "tuple": "cpp",
-    "utility": "cpp",
-    "variant": "cpp",
-    "compare": "cpp",
-    "thread": "cpp"
-  }
-}

CODEOWNERS

@@ -1 +1 @@
-*                    @mauro-balades 
+* @mr-cheffy

CODE_OF_CONDUCT.md

@@ -0,0 +1,134 @@
+<!--
+   - 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/.
+   -->
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+- Demonstrating empathy and kindness toward other people
+- Being respectful of differing opinions, viewpoints, and experiences
+- Giving and gracefully accepting constructive feedback
+- Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+- Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+- The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+- Trolling, insulting or derogatory comments, and personal or political attacks
+- Public or private harassment
+- Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+- Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+hello@zen-browser.app.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.

README.md

@@ -1,57 +1,52 @@
+<!--
+   - 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/.
+   -->
+<!-- TODO: Get a job -->
+<img src="./docs/assets/zen-dark.svg" width="100px" align="left">
 
-# 🌀 Zen Browser
+### `Zen Browser`
 
-Experience tranquillity while browsing the web without people tracking you!
+[![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases)
+[![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
+[![Zen Release builds](https://github.com/zen-browser/desktop/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
 
-# Compatibility
+Zen is a firefox-based browser with the aim of pushing your productivity to a new level!
 
-Zen is currently built using firefox version `128.0.2`!
+<div flex="true">
+  <a href="https://zen-browser.app/download">
+    Download
+  </a>
+  •
+  <a href="https://zen-browser.app">
+    Website
+  </a>
+  •
+  <a href="https://docs.zen-browser.app">
+    Documentation
+  </a>
+  •
+  <a href="https://zen-browser.app/release-notes/latest">
+    Release Notes
+  </a>
+</div>
 
-* Checkout the latest [releases notes](https://get-zen.vercel.app/release-notes)!
+### Firefox Versions
 
-## 🚀 Run Locally
+- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `144.0`! 🚀
+- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 144.0`!
 
-Clone the project
+### Contributing
 
-```bash
-git clone https://github.com/zen-browser/desktop.git
-cd desktop
-```
+If you'd like to report a bug, please do so on our [GitHub Issues page](https://github.com/zen-browser/desktop/issues/) and for feature requests, you can use [Github Discussions](https://github.com/zen-browser/desktop/discussions).
 
-Install dependencies 
+Zen is an open-source project, and we welcome contributions from the community! Please take a look at the [contribution guidelines](./docs/contribute.md) before getting started!
 
-```bash
-npm i
-```
+#### Partners
 
-Download and bootstrap the browser
-
-```
-npm run init
-```
-
-Start building the browser
-
-```
-npm run build
-```
-
-Finally, run the browser!
-
-```
-npm start
-```
-
-## Contributing
-
-Contributions are always welcome!
-
-See `contributing.md` for ways to get started.
-
-Please adhere to this project's `code of conduct`.
-
-
-## License
-
-[MPL LICENSE](/LICENSE)
+Thanks to all the partners of Zen for their support and contributions:
 
+<a href="https://blacksmith.sh">
+  <img src="./docs/assets/blacksmith-yellow.png" width="350px"/>
+</a>

SECURITY.md

@@ -0,0 +1,11 @@
+<!--
+   - 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/.
+   -->
+
+# Security Policy
+
+## Reporting a Vulnerability
+
+Please report security vulnerabilities [here](https://github.com/zen-browser/desktop/security/advisories/new)

babel.config.json

@@ -0,0 +1,3 @@
+{
+  "presets": ["@babel/preset-typescript"]
+}

build/AppDir/AppRun

@@ -0,0 +1,10 @@
+#!/bin/sh
+# 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/.
+
+CURRENTDIR="$(dirname "$(readlink -f "$0")")"
+export PATH="${CURRENTDIR}:${PATH}"
+export MOZ_LEGACY_PROFILES=1          # Prevent per installation profiles
+export MOZ_APP_LAUNCHER="${APPIMAGE}" # Allows setting as default browser
+exec "${CURRENTDIR}/zen" "$@"

build/AppDir/distribution/policies.json

@@ -0,0 +1,8 @@
+{
+  "policies": {
+    "DisableAppUpdate": true,
+    "AppAutoUpdate": false,
+    "ManualAppUpdateOnly": true,
+    "BackgroundAppUpdate": false
+  }
+}

build/AppDir/zen.desktop

@@ -0,0 +1,26 @@
+[Desktop Entry]
+Name=Zen Browser
+Comment=Experience tranquillity while browsing the web without people tracking you!
+Exec=zen %u
+Icon=zen
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
+StartupWMClass=zen
+Categories=Network;WebBrowser;
+StartupNotify=true
+Terminal=false
+X-MultipleArgs=false
+Keywords=Internet;WWW;Browser;Web;Explorer;
+Actions=new-window;new-private-window;profilemanager;
+
+[Desktop Action new-window]
+Name=Open a New Window
+Exec=zen %u
+
+[Desktop Action new-private-window]
+Name=Open a New Private Window
+Exec=zen --private-window %u
+
+[Desktop Action profilemanager]
+Name=Open the Profile Manager
+Exec=zen --ProfileManager %u

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

@@ -0,0 +1 @@
+16e978d10b8a1c49267e8f1574f52c3e0d5089ae

build/flatpak/app.zen_browser.zen.yml.template

@@ -0,0 +1,94 @@
+app-id: app.zen_browser.zen
+runtime: org.freedesktop.Platform
+runtime-version: '24.08'
+sdk: org.freedesktop.Sdk
+base: org.mozilla.firefox.BaseApp
+base-version: '24.08'
+add-extensions:
+  org.freedesktop.Platform.ffmpeg-full:
+    directory: lib/ffmpeg
+    version: '24.08.26'
+    add-ld-path: .
+  app.zen_browser.zen.systemconfig:
+    directory: etc/zen
+    no-autodownload: true
+command: launch-script.sh
+finish-args:
+  - --allow=devel
+  - --share=ipc
+  - --share=network
+  - --socket=pulseaudio
+  - --socket=wayland
+  - --socket=fallback-x11
+  - --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
+  - --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'
+modules:
+  - name: zen_browser
+    buildsystem: simple
+    build-commands:
+      - mv zen /app/
+      - mkdir -p /app/lib/ffmpeg
+      - mkdir -p /app/etc/zen
+
+      - install -Dm0755 metadata/launch-script.sh ${{FLATPAK_DEST}}/bin/launch-script.sh
+      - install -Dm0644 metadata/policies.json ${{FLATPAK_DEST}}/bin/distribution/policies.json
+      - install -Dm0644 metadata/icons/${{FLATPAK_ID}}.svg ${{FLATPAK_DEST}}/share/icons/hicolor/scalable/apps/${{FLATPAK_ID}}.svg
+      - install -Dm0644 metadata/${{FLATPAK_ID}}.metainfo.xml ${{FLATPAK_DEST}}/share/metainfo/${{FLATPAK_ID}}.metainfo.xml
+      - install -Dm0644 metadata/${{FLATPAK_ID}}.desktop ${{FLATPAK_DEST}}/share/applications/${{FLATPAK_ID}}.desktop
+
+    sources:
+      - type: archive
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-x86_64.tar.xz
+        sha256: {linux_sha256}
+        strip-components: 0
+        only-arches:
+          - x86_64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-x86_64.tar.xz") | .browser_download_url
+          is-main-source: true
+
+      - type: archive
+        url: https://github.com/zen-browser/desktop/releases/download/{version}/zen.linux-aarch64.tar.xz
+        sha256: {linux_aarch64_sha256}
+        strip-components: 0
+        only-arches:
+          - aarch64
+        x-checker-data:
+          type: json
+          url: https://api.github.com/repos/zen-browser/desktop/releases/latest
+          version-query: .tag_name
+          url-query: .assets[] | select(.name=="zen.linux-aarch64.tar.xz") | .browser_download_url
+          is-main-source: true
+
+      - type: archive
+        url: https://github.com/zen-browser/flatpak/releases/download/{version}/archive.tar
+        sha256: {flatpak_sha256}
+        strip-components: 0
+        dest: metadata

build/ts/transform-ts.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 fs = require('fs');
+const MJS_FILES = ['src/zen/split-view/ZenViewSplitter.ts'];
+
+for (const file of MJS_FILES) {
+  const code = fs.readFileSync(file, 'utf8');
+  require('@babel/core').transformSync(code, {
+    presets: ['@babel/preset-typescript'],
+    filename: file,
+  });
+}

build/winsign/bootstrap.ps1

@@ -0,0 +1,13 @@
+# 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/.
+
+(New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
+C:\MozillaBuildSetup-Latest.exe /S | out-null
+
+rustup target add aarch64-pc-windows-msvc
+rustup target add x86_64-pc-windows-msvc
+
+cd engine
+./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ../win-cross/vs2022
+cd ..

build/winsign/firefox_update.ps1

@@ -0,0 +1,15 @@
+# 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/.
+
+Remove-Item -Recurse -Force engine
+Remove-Item -Recurse -Force .surfer
+
+npm run init
+
+$job = Start-Job -ScriptBlock {
+    npm run build
+}
+
+# Wait for job to complete with timeout (in seconds)
+$job | Wait-Job -Timeout 5

build/winsign/sign.ps1

@@ -0,0 +1,233 @@
+# 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/.
+
+param(
+    [string][Parameter(Mandatory=$true)]$SignIdentity,
+    [string][Parameter(Mandatory=$true)]$GithubRunId
+)
+
+$ErrorActionPreference = "Stop"
+
+echo "Preparing environment"
+git pull origin dev --recurse
+mkdir windsign-temp -ErrorAction SilentlyContinue
+
+# Download in parallel
+
+#show output too
+#Start-Job -Name "DownloadGitObjectsRepo" -ScriptBlock {
+#    param($PWD)
+#    echo "Downloading git objects repo to $PWD\windsign-temp\windows-binaries"
+#    git clone https://github.com/zen-browser/windows-binaries.git $PWD\windsign-temp\windows-binaries
+#    echo "Downloaded git objects repo to"
+#} -Verbose -ArgumentList $PWD -Debug
+
+Start-Job -Name "DownloadGitl10n" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    $env:ZEN_L10N_CURR_DIR=[regex]::replace($PWD, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
+    C:\mozilla-build\start-shell.bat $PWD\scripts\download-language-packs.sh
+    echo "Fetched l10n and Firefox's one"
+} -Verbose -ArgumentList $PWD -Debug
+
+Start-Job -Name "SurferInit" -ScriptBlock {
+    param($PWD)
+    cd $PWD
+    npm run import -- --verbose
+    $surferJson = Get-Content surfer.json | ConvertFrom-Json
+    $version = $surferJson.brands.release.release.displayVersion
+    npm run ci -- $version
+} -Verbose -ArgumentList $PWD -Debug
+
+echo "Downloading artifacts info"
+$artifactsInfo=gh api repos/zen-browser/desktop/actions/runs/$GithubRunId/artifacts
+$token = gh auth token
+
+function New-TemporaryDirectory {
+    $tmp = [System.IO.Path]::GetTempPath() # Not $env:TEMP, see https://stackoverflow.com/a/946017
+    $name = (New-Guid).ToString("N")
+    New-Item -ItemType Directory -Path (Join-Path $tmp $name)
+}
+
+function DownloadFile($url, $targetFile) {
+   $uri = New-Object "System.Uri" "$url"
+   $request = [System.Net.HttpWebRequest]::Create($uri)
+   $request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3"
+   $request.Headers.Add("Authorization", "Bearer $token")
+   $response = $request.GetResponse()
+   $totalLength = [System.Math]::Floor($response.get_ContentLength()/1024)
+   $responseStream = $response.GetResponseStream()
+   $targetStream = New-Object -TypeName System.IO.FileStream -ArgumentList $targetFile, Create
+   $buffer = new-object byte[] 10KB
+   $count = $responseStream.Read($buffer,0,$buffer.length)
+   $downloadedBytes = $count
+
+    while ($count -gt 0) {
+        $targetStream.Write($buffer, 0, $count)
+        $count = $responseStream.Read($buffer,0,$buffer.length)
+        $downloadedBytes = $downloadedBytes + $count
+        Write-Progress -activity "Downloading file '$($url.split('/') | Select -Last 1)'" -status "Downloaded ($([System.Math]::Floor($downloadedBytes/1024))K of $($totalLength)K): " -PercentComplete ((([System.Math]::Floor($downloadedBytes/1024)) / $totalLength)  * 100)
+    }
+
+   Write-Progress -activity "Finished downloading file '$($url.split('/') | Select -Last 1)'"
+
+   $targetStream.Flush()
+   $targetStream.Close()
+   $targetStream.Dispose()
+   $responseStream.Dispose()
+}
+
+function DownloadArtifacts($name) {
+    echo "Downloading artifacts for $name"
+    $artifactUrl=$($artifactsInfo | jq -r --arg NAME "windows-x64-obj-$name" '.artifacts[] | select(.name == $NAME) | .archive_download_url')
+    echo "Artifact URL: $artifactUrl"
+
+    # download the artifact
+    $outputPath="$PWD\windsign-temp\windows-x64-obj-$name"
+    $tempDir = New-TemporaryDirectory
+    $tempFile = Join-Path $tempDir "artifact-$($name).zip"
+
+    echo "Downloading artifact to $tempFile"
+    DownloadFile $artifactUrl $tempFile
+
+    Start-Job -Name "UnzipArtifact$name" -ScriptBlock {
+        param($tempFile, $outputPath)
+        echo "Unzipping artifact to $outputPath"
+        Expand-Archive -Path $tempFile -DestinationPath $outputPath -Force
+        echo "Unzipped artifact to $outputPath"
+    } -ArgumentList $tempFile, $outputPath -Verbose -Debug
+}
+
+DownloadArtifacts arm64
+DownloadArtifacts x86_64
+
+# Wait for the jobs to finish
+Wait-Job -Name "UnzipArtifactarm64"
+Wait-Job -Name "UnzipArtifactx86_64"
+
+mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue
+
+# Collect all .exe and .dll files into a list
+$files = Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-x86_64\ -Recurse -Include *.dll
+
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.exe
+$files += Get-ChildItem windsign-temp\windows-x64-obj-arm64\ -Recurse -Include *.dll
+
+signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha256 /v $files
+
+$env:ZEN_RELEASE="true"
+$env:SURFER_SIGNING_MODE="true"
+$env:SCCACHE_GHA_ENABLED="false"
+Wait-Job -Name "SurferInit"
+Wait-Job -Name "DownloadGitl10n"
+
+function SignAndPackage($name) {
+    echo "Executing on $name"
+    rmdir .\dist -Recurse -ErrorAction SilentlyContinue
+    rmdir engine\obj-$name-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+    $objName=$name
+    # instead of arm, use aarch64
+    if ($name -eq "arm64") {
+        $objName="aarch64"
+    }
+
+    echo "Removing old obj dir"
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+
+    echo "Creating new obj dir"
+    cp windsign-temp\windows-x64-obj-$name engine\obj-$objName-pc-windows-msvc\ -Recurse
+
+    echo "Copying setup.exe into obj dir"
+    $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe"
+
+    if ($name -eq "arm64") {
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT"
+    } else {
+        $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT"
+    }
+
+    $env:MAR="..\\build\\winsign\\mar.exe"
+    if ($name -eq "arm64") {
+        $env:SURFER_COMPAT="aarch64"
+    } else {
+        $env:SURFER_COMPAT="x86_64"
+    }
+    echo "Compat Mode? $env:SURFER_COMPAT"
+
+    # Configure each time since we are cloning from a linux environment into
+    # a windows environment, and the build system is not smart enough to detect that
+    # we are on a different platform.
+    cd .\engine
+    echo "Configuring for $name"
+    .\mach configure
+    cd ..
+
+    echo "Packaging $name"
+    npm run package -- --verbose
+
+    # In the release script, we do the following:
+    #  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:
+    #  - update_manifest/*
+    #  - windows.mar
+    #  - zen.installer.exe
+    echo "Creating tar for $name"
+    rm .\windsign-temp\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
+    mkdir windsign-temp\windows-x64-signed-$name
+
+    # Move the MAR, add the `-arm64` suffix if needed
+    echo "Moving MAR for $name"
+    if ($name -eq "arm64") {
+        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-$name.mar
+    } else {
+        mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows.mar
+    }
+
+    # Move the installer
+    echo "Moving installer for $name"
+    if ($name -eq "arm64") {
+        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-$name.exe
+    } else {
+        mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer.exe
+    }
+
+    # 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
+    rmdir engine\obj-$objName-pc-windows-msvc\ -Recurse -ErrorAction SilentlyContinue
+
+    echo "Finished $name"
+}
+
+SignAndPackage arm64
+SignAndPackage x86_64
+
+$files = Get-ChildItem .\windsign-temp\windows-binaries -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 ..\..
+
+# Cleaning up
+
+echo "All done!"
+echo "All the artifacts (x86_64 and arm46) are signed and packaged, get a rest now!"
+Read-Host "Press Enter to continue"
+
+echo "Cleaning up"
+rmdir windsign-temp\windows-x64-obj-x86_64 -Recurse -ErrorAction SilentlyContinue
+rmdir windsign-temp\windows-x64-obj-arm64 -Recurse -ErrorAction SilentlyContinue
+
+echo "Opening visual studio code"
+code .

configs/branding/alpha/MacOSInstaller.svg

@@ -1,4 +0,0 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
- <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>

configs/branding/beta/MacOSInstaller.svg

@@ -1,4 +0,0 @@
-<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg">
-  <rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />
-  Sorry, your browser does not support inline SVG.  
-</svg>

configs/branding/release/MacOSInstaller.svg

@@ -0,0 +1 @@
+<svg width="320" height="130" xmlns="http://www.w3.org/2000/svg"><rect width="300" height="100" x="10" y="10" style="fill:rgb(0,0,255);stroke-width:3;stroke:red" />Sorry, your browser does not support inline SVG.</svg> 

configs/branding/release/content/about-logo-private.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="e" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.h{filter:url(#f);}.i{fill:#202020;}.j{fill:#f2f0e3;}</style><filter id="f" x="-.4" y="1.68" width="256.8" height="256.8" filterUnits="userSpaceOnUse"><feOffset dx="0" dy="2"/><feGaussianBlur result="g" stdDeviation="2"/><feFlood flood-color="#000" flood-opacity=".5"/><feComposite in2="g" operator="in"/><feComposite in="SourceGraphic"/></filter></defs><g class="h"><rect class="i" x="5.75" y="5.7717" width="244.5" height="244.5" rx="46" ry="46"/></g><path class="j" d="M165.9933,146.3748c-15.6335,0-28.7244,11.028-31.9466,25.7088h-12.0935c-3.2222-14.6808-16.313-25.7088-31.9466-25.7088-18.0431,0-32.7232,14.68-32.7232,32.7232s14.68,32.7232,32.7232,32.7232c15.6335,0,28.7244-11.028,31.9466-25.7088h12.0935c3.2222,14.6808,16.313,25.7088,31.9466,25.7088,18.0431,0,32.7232-14.68,32.7232-32.7232s-14.68-32.7232-32.7232-32.7232ZM90.0067,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945ZM165.9933,197.7925c-10.3086,0-18.6945-8.3859-18.6945-18.6945s8.3859-18.6945,18.6945-18.6945,18.6945,8.3859,18.6945,18.6945-8.3859,18.6945-18.6945,18.6945Z"/><path class="j" d="M214.577,115.6777h-21.8838l-9.2611-65.4244c-.3037-2.145-1.5845-4.0301-3.4665-5.1073-1.882-1.0741-4.1554-1.2212-6.1595-.3914l-45.8062,18.9293-45.8062-18.9293c-2.0041-.8298-4.2775-.6826-6.1595.3914-1.882,1.0772-3.1627,2.9623-3.4665,5.1073l-9.2611,65.4244h-21.8838c-3.8735,0-7.0143,3.1408-7.0143,7.0143s3.1408,7.0143,7.0143,7.0143h173.1541c3.8735,0,7.0143-3.1408,7.0143-7.0143s-3.1408-7.0143-7.0143-7.0143ZM85.1906,61.1725l40.1289,16.5839c1.716.7077,3.645.7077,5.361,0l40.1289-16.5839,7.7142,54.5052h-101.0473l7.7142-54.5052Z"/></svg>

configs/branding/release/content/about-logo.svg

@@ -0,0 +1,12 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_109_1042)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M512 627.385C575.725 627.385 627.385 575.725 627.385 512C627.385 448.275 575.725 396.615 512 396.615C448.275 396.615 396.615 448.275 396.615 512C396.615 575.725 448.275 627.385 512 627.385ZM604.308 512C604.308 562.98 562.98 604.308 512 604.308C461.02 604.308 419.692 562.98 419.692 512C419.692 461.02 461.02 419.692 512 419.692C562.98 419.692 604.308 461.02 604.308 512Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M712 512C712 622.457 622.457 712 512 712C401.543 712 312 622.457 312 512C312 401.543 401.543 312 512 312C622.457 312 712 401.543 712 512ZM512 673.538C601.215 673.538 673.538 601.215 673.538 512C673.538 422.785 601.215 350.462 512 350.462C422.785 350.462 350.462 422.785 350.462 512C350.462 601.215 422.785 673.538 512 673.538Z" fill="#F76F53"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M812 512C812 677.685 677.685 812 512 812C346.315 812 212 677.685 212 512C212 346.315 346.315 212 512 212C677.685 212 812 346.315 812 512ZM512 758.154C647.947 758.154 758.154 647.947 758.154 512C758.154 376.053 647.947 265.846 512 265.846C376.053 265.846 265.846 376.053 265.846 512C265.846 647.947 376.053 758.154 512 758.154Z" fill="#F76F53"/>
+</g>
+<defs>
+<clipPath id="clip0_109_1042">
+<rect width="1024" height="1024" fill="white"/>
+</clipPath>
+</defs>
+</svg>

configs/branding/release/content/firefox-wordmark.svg

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 56"><defs><style>.b{fill:context-fill #20123a;}</style></defs><path class="b" d="M11.2896,37.6632h15.1928v5.2919H3.2415v-3.8076l15.1487-21.2557H3.2126v-5.2919h23.2393v3.811l-15.1622,21.2523ZM50.8649,26.3765c.5434,1.4469.8151,3.1418.8151,5.0778v1.7322h-15.5019v.017c0,1.1243.2089,2.0991.6301,2.9176.4195.822,1.0139,1.4537,1.7849,1.8987s1.6847.6657,2.7427.6657c.7014,0,1.3433-.0984,1.9258-.2955.5842-.197,1.0818-.4925,1.4979-.8899.4144-.394.7303-.8797.9476-1.4503l5.8404.3838c-.2972,1.4028-.9018,2.6255-1.8154,3.6683-.9137,1.0428-2.0906,1.8511-3.5273,2.4319-1.4385.5774-3.0959.8661-4.9726.8661-2.3419,0-4.3561-.4755-6.0408-1.43-1.6847-.9544-2.9805-2.3063-3.8907-4.0623-.9086-1.7526-1.362-3.8314-1.362-6.2327,0-2.3402.4534-4.3951,1.362-6.1647.9103-1.7696,2.1925-3.1486,3.8466-4.1336,1.6558-.9884,3.5986-1.4843,5.8318-1.4843,1.503,0,2.9024.2411,4.2032.7201,1.2992.4789,2.4354,1.199,3.4084,2.1568.9731.9578,1.7306,2.1602,2.274,3.6072ZM45.7378,29.2737c0-.9069-.1987-1.7119-.5927-2.4149-.3957-.6997-.9409-1.2534-1.6388-1.6508-.6964-.4008-1.503-.6012-2.4235-.6012-.9578,0-1.8053.2208-2.5406.6589-.7371.4382-1.3127,1.0292-1.7271,1.7628-.3818.679-.5853,1.4304-.6228,2.2451h9.5455ZM73.0682,20.9318c-1.1769-.6929-2.5543-1.0394-4.1353-1.0394-1.6898,0-3.1265.3872-4.3137,1.165-1.1854.7744-2.0294,1.824-2.5338,3.1486h-.2667v-4.0181h-6.017v22.7672h6.3125v-13.1617c.0102-.9782.1953-1.8138.557-2.5135.36-.6963.8644-1.2261,1.5115-1.593.647-.3635,1.396-.5469,2.2451-.5469,1.2653,0,2.257.394,2.9788,1.1786.7217.7846,1.0767,1.8749,1.0682,3.2675v13.3689h6.3125v-14.4965c0-1.7662-.326-3.2913-.9782-4.5718-.6521-1.2805-1.5658-2.2655-2.741-2.955Z"/></svg>