fix(webview): launch web Play buttons without waiting for navigation

Roblox defers a launchGame sent from the WebView until the Lua app next
navigates, so joining a private server stalled until a sidebar tab was
clicked. Parse launchGame in the runtime, queue it through the
experience launch pipeline, and close the WebView. Other commands still
reach Roblox.

Fixes #169

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 name: Bug report
-description: Report a reproducible problem in Nightcap
+description: Report a reproducible problem in Mocktail
 title: "[Bug]: "
 labels:
   - bug
@@ -11,14 +10,14 @@ body:
       value: |
         Please include enough detail for someone else to reproduce the bug.
 
-        Use any language you are comfortable with.
+        Use any language you are comfortable with. The maintainer can read Russian and English directly, so either is preferred. If you are more comfortable in another language, use it.
 
-        Please write issues and pull requests yourself.
+        Please write issues and pull requests yourself. Do not use AI-generated text.
 
   - type: input
     id: version
     attributes:
-      label: Nightcap version
+      label: Mocktail version
       description: Provide the release version, package version, or commit hash.
       placeholder: "For example: v0.4.0 or 1a2b3c4"
     validations:
@@ -37,7 +36,7 @@ body:
     id: installation
     attributes:
       label: Installation method
-      description: Tell us how Nightcap was installed or built.
+      description: Tell us how Mocktail was installed or built.
       placeholder: "For example: AppImage, Flatpak, AUR, or built from source"
     validations:
       required: true
@@ -56,7 +55,7 @@ body:
       label: Steps to reproduce
       description: List the smallest reliable sequence of actions that triggers the problem.
       placeholder: |
-        1. Start Nightcap with ...
+        1. Start Mocktail with ...
         2. Open ...
         3. Select ...
         4. Observe ...
@@ -76,7 +75,7 @@ body:
       value: |
         Latest log:
 
-        - Flatpak: `~/.var/app/io.github.CoderDayton.nightcap/.local/state/mocktail/logs/latest.log`
+        - Flatpak: `~/.var/app/space.bigrat.mocktail/.local/state/mocktail/logs/latest.log`
         - Other installs: `~/.local/state/mocktail/logs/latest.log`
 
         Older logs are in the `sessions` directory next to `latest.log`.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,5 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 name: Feature request
-description: Suggest an improvement or a new capability for Nightcap
+description: Suggest an improvement or a new capability for Mocktail
 title: "[Feature]: "
 labels:
   - enhancement
@@ -11,9 +10,9 @@ body:
       value: |
         Describe what you want to change and why it would be useful.
 
-        Use any language you are comfortable with.
+        Use any language you are comfortable with. The maintainer can read Russian and English directly, so either is preferred. If you are more comfortable in another language, use it.
 
-        Please write issues and pull requests yourself.
+        Please write issues and pull requests yourself. Do not use AI-generated text.
 
   - type: textarea
     id: problem
@@ -27,7 +26,7 @@ body:
     id: proposal
     attributes:
       label: Proposed solution
-      description: Describe how you would like Nightcap to behave.
+      description: Describe how you would like Mocktail to behave.
     validations:
       required: true
 

.github/pull_request_template.md

@@ -1,4 +1,3 @@
-<!-- Modified by vii from komaruworld/mocktail. See README "About this fork". -->
-<!-- Briefly describe what this pull request adds, changes, or removes. Link the issue with "Closes #123" or "Fixes #123". -->
+<!-- Briefly describe what this pull request adds, changes, or removes. Write it yourself and do not use AI-generated text. Link the issue with "Closes #123" or "Fixes #123". -->
 
 Closes #

.github/workflows/aur.yml

@@ -1,6 +1,8 @@
-name: Check AUR packages
+name: Publish AUR packages
 
 on:
+  push:
+    branches: [main]
   workflow_dispatch:
 
 permissions:
@@ -11,8 +13,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  metadata:
-    name: Refresh AUR metadata
+  publish:
+    name: Publish AUR packages
     runs-on: ubuntu-24.04
     timeout-minutes: 15
     steps:
@@ -25,9 +27,10 @@ jobs:
         shell: bash
         run: |
           set -Eeuo pipefail
-          package_dir="$GITHUB_WORKSPACE/packaging/aur/nightcap-git"
-          version="$(git describe --tags --abbrev=0 --match='v[0-9]*')"
-          version="${version#v}"
+          package_dir="$GITHUB_WORKSPACE/packaging/aur/mocktail-git"
+          version="$(sed -n \
+            's/^[[:space:]]*VERSION[[:space:]]\+\([0-9][0-9.]*\).*/\1/p' \
+            CMakeLists.txt | head -n 1)"
           [[ "$version" =~ ^[0-9]+(\.[0-9]+)*$ ]]
           pkgver="${version}.r$(git rev-list --count HEAD).g$(git rev-parse --short=7 HEAD)"
           sed -i "s/^pkgver=.*/pkgver=${pkgver}/" "$package_dir/PKGBUILD"
@@ -36,21 +39,76 @@ jobs:
             --volume "$package_dir:/pkg" \
             archlinux:base-devel bash -Eeuo pipefail -c '
               useradd --create-home builder
-              install -d -o builder -g builder /tmp/nightcap-git
+              install -d -o builder -g builder /tmp/mocktail-git
               install -o builder -g builder -m 0644 \
-                /pkg/PKGBUILD /tmp/nightcap-git/PKGBUILD
+                /pkg/PKGBUILD /tmp/mocktail-git/PKGBUILD
               runuser -u builder -- bash -c \
-                "cd /tmp/nightcap-git && makepkg --printsrcinfo" \
+                "cd /tmp/mocktail-git && makepkg --printsrcinfo" \
                 > /pkg/.SRCINFO
             '
 
           grep -Fqx "pkgver=${pkgver}" "$package_dir/PKGBUILD"
           grep -Fqx $'\tpkgver = '"${pkgver}" "$package_dir/.SRCINFO"
+          printf 'AUR_PKGVER=%s\n' "$pkgver" >> "$GITHUB_ENV"
 
-      - name: Upload AUR metadata
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: Nightcap-AUR
-          path: packaging/aur/nightcap-git/.SRCINFO
-          if-no-files-found: error
-          retention-days: 14
+      - name: Publish to the AUR
+        shell: bash
+        env:
+          AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          AUR_SSH_KEY_PASSPHRASE: ${{ secrets.AUR_SSH_KEY_PASSPHRASE }}
+        run: |
+          set -Eeuo pipefail
+          [[ -n "$AUR_SSH_PRIVATE_KEY" ]]
+          [[ -n "$AUR_SSH_KEY_PASSPHRASE" ]]
+
+          private_key="$RUNNER_TEMP/aur_ed25519"
+          askpass="$RUNNER_TEMP/aur_askpass"
+          known_hosts="$RUNNER_TEMP/aur_known_hosts"
+          printf '%s\n' "$AUR_SSH_PRIVATE_KEY" > "$private_key"
+          unset AUR_SSH_PRIVATE_KEY
+          chmod 0600 "$private_key"
+          printf '%s\n' \
+            '#!/usr/bin/env bash' \
+            'printf '\''%s\n'\'' "$AUR_SSH_KEY_PASSPHRASE"' \
+            > "$askpass"
+          chmod 0700 "$askpass"
+          eval "$(ssh-agent -s)"
+          trap 'ssh-agent -k >/dev/null; rm -f -- "$private_key" "$askpass"' EXIT
+          DISPLAY=:0 SSH_ASKPASS="$askpass" SSH_ASKPASS_REQUIRE=force \
+            ssh-add "$private_key" </dev/null
+          unset AUR_SSH_KEY_PASSPHRASE
+
+          ssh-keyscan -T 10 -t ed25519 aur.archlinux.org > "$known_hosts"
+          fingerprint="$(ssh-keygen -lf "$known_hosts" -E sha256 | awk '{print $2}')"
+          [[ "$fingerprint" == \
+            'SHA256:RFzBCUItH9LZS0cKB5UE6ceAYhBD5C8GeOBip8Z11+4' ]]
+
+          export GIT_SSH_COMMAND="ssh -F /dev/null -i $private_key \
+            -o BatchMode=yes -o IdentitiesOnly=yes \
+            -o StrictHostKeyChecking=yes \
+            -o UserKnownHostsFile=$known_hosts"
+          publish_aur_package() {
+            local package_name="$1"
+            local commit_message="$2"
+            local source_dir="packaging/aur/$package_name"
+            local aur_dir="$RUNNER_TEMP/${package_name}-aur"
+
+            git clone --branch master --single-branch \
+              "ssh://aur@aur.archlinux.org/${package_name}.git" "$aur_dir"
+            install -m 0644 "$source_dir/PKGBUILD" "$aur_dir/PKGBUILD"
+            install -m 0644 "$source_dir/.SRCINFO" "$aur_dir/.SRCINFO"
+
+            git -C "$aur_dir" config user.name komaruworld
+            git -C "$aur_dir" config user.email rtysus228@gmail.com
+            git -C "$aur_dir" add PKGBUILD .SRCINFO
+            if git -C "$aur_dir" diff --cached --quiet; then
+              printf '%s is already published\n' "$package_name"
+              return
+            fi
+            git -C "$aur_dir" commit -m "$commit_message"
+            git -C "$aur_dir" push origin HEAD:master
+          }
+
+          publish_aur_package mocktail-git "Update to ${AUR_PKGVER}"
+          publish_aur_package mocktail 'make builds stable'
+          publish_aur_package mocktail-bin 'make builds stable'

.github/workflows/flatpak.yml

@@ -1,9 +1,9 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 name: Flatpak
 
 on:
-  push:
-    tags: ['v*']
+  workflow_run:
+    workflows: [Native packages]
+    types: [completed]
   pull_request:
     paths:
       - '.github/workflows/flatpak.yml'
@@ -15,11 +15,13 @@ on:
       - 'config/**'
       - 'include/**'
       - 'packaging/flatpak/**'
+      - 'packaging/discord-join.html'
       - 'packaging/icons/**'
-      - 'packaging/io.github.CoderDayton.nightcap.desktop'
-      - 'packaging/io.github.CoderDayton.nightcap.metainfo.xml'
-      - 'packaging/io.github.CoderDayton.nightcap.svg'
+      - 'packaging/space.bigrat.mocktail.desktop'
+      - 'packaging/space.bigrat.mocktail.metainfo.xml'
+      - 'packaging/space.bigrat.mocktail.svg'
       - 'scripts/assemble_flatpak_pages.sh'
+      - 'scripts/assemble_native_repositories.sh'
       - 'site/**'
       - 'src/**'
       - 'stubs/**'
@@ -27,26 +29,41 @@ on:
   workflow_dispatch:
 
 permissions:
+  actions: read
   contents: read
 
 concurrency:
-  group: flatpak-${{ github.ref }}
-  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+  group: flatpak-${{ github.event.workflow_run.head_sha || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   flatpak:
-    name: Flatpak build
-    runs-on: ubuntu-24.04
+    name: Flatpak build (${{ matrix.arch }})
+    if: >-
+      github.event_name != 'workflow_run' ||
+      (github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.event != 'pull_request' &&
+      github.event.workflow_run.head_branch == 'main')
+    runs-on: ${{ matrix.runner }}
     timeout-minutes: 120
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: x86_64
+            runner: ubuntu-24.04
+          - arch: aarch64
+            runner: ubuntu-24.04-arm
     env:
-      # Publish on release tags and on manual runs from main. Pull requests
-      # only verify that the manifest still builds.
-      MOCKTAIL_PUBLISH: ${{ startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
+      FLATPAK_ARCH: ${{ matrix.arch }}
+      MOCKTAIL_PUBLISH: ${{ (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'pull_request' && github.event.workflow_run.head_branch == 'main') || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
+      MOCKTAIL_SOURCE_SHA: ${{ github.event.workflow_run.head_sha || github.sha }}
     steps:
       - name: Check out source
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           fetch-depth: 0
+          ref: ${{ github.event.workflow_run.head_sha || github.sha }}
           submodules: recursive
 
       - name: Install Flatpak builder
@@ -57,33 +74,32 @@ jobs:
           flatpak remote-add --user --if-not-exists flathub \
             https://dl.flathub.org/repo/flathub.flatpakrepo
 
-      - name: Build Flatpak repository and bundle
+      - name: Build Flatpak bundle
         shell: bash
         env:
           FLATPAK_GPG_PRIVATE_KEY: ${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}
           FLATPAK_GPG_KEY_ID: ${{ secrets.FLATPAK_GPG_KEY_ID }}
         run: |
           set -Eeuo pipefail
-          # The manifest builds the local checkout from refs/heads/main.
-          git update-ref refs/heads/main "$GITHUB_SHA"
+          git update-ref refs/heads/main "$MOCKTAIL_SOURCE_SHA"
           builder_signing=()
           bundle_keys=()
           if [[ "$MOCKTAIL_PUBLISH" == true ]]; then
             [[ -n "$FLATPAK_GPG_PRIVATE_KEY" && \
                -n "$FLATPAK_GPG_KEY_ID" ]]
-            install -d -m 0700 "$RUNNER_TEMP/nightcap-gnupg"
+            install -d -m 0700 "$RUNNER_TEMP/mocktail-gnupg"
             printf '%s' "$FLATPAK_GPG_PRIVATE_KEY" | \
-              gpg --batch --homedir "$RUNNER_TEMP/nightcap-gnupg" --import
-            gpg --batch --homedir "$RUNNER_TEMP/nightcap-gnupg" \
-              --export "$FLATPAK_GPG_KEY_ID" >nightcap-flatpak.gpg
+              gpg --batch --homedir "$RUNNER_TEMP/mocktail-gnupg" --import
+            gpg --batch --homedir "$RUNNER_TEMP/mocktail-gnupg" \
+              --export "$FLATPAK_GPG_KEY_ID" >mocktail-flatpak.gpg
             builder_signing=(
               "--gpg-sign=$FLATPAK_GPG_KEY_ID"
-              "--gpg-homedir=$RUNNER_TEMP/nightcap-gnupg"
+              "--gpg-homedir=$RUNNER_TEMP/mocktail-gnupg"
             )
-            bundle_keys=(--gpg-keys=nightcap-flatpak.gpg)
+            bundle_keys=(--gpg-keys=mocktail-flatpak.gpg)
           fi
           flatpak-builder \
-            --arch=x86_64 \
+            --arch="$FLATPAK_ARCH" \
             --jobs=4 \
             --user \
             --install-deps-from=flathub \
@@ -93,50 +109,135 @@ jobs:
             --repo=repo \
             "${builder_signing[@]}" \
             build-flatpak-ci \
-            packaging/flatpak/io.github.CoderDayton.nightcap.json
-          if [[ "$MOCKTAIL_PUBLISH" == true ]]; then
-            flatpak build-update-repo \
-              --generate-static-deltas \
-              --static-delta-jobs=2 \
-              --prune \
-              --gpg-sign="$FLATPAK_GPG_KEY_ID" \
-              --gpg-homedir="$RUNNER_TEMP/nightcap-gnupg" \
-              repo
-          fi
+            packaging/flatpak/space.bigrat.mocktail.json
           flatpak build-bundle \
-            --arch=x86_64 \
+            --arch="$FLATPAK_ARCH" \
             "${bundle_keys[@]}" \
             repo \
-            Nightcap-x86_64.flatpak \
-            io.github.CoderDayton.nightcap \
+            "Mocktail-${FLATPAK_ARCH}.flatpak" \
+            space.bigrat.mocktail \
             stable
-          if [[ "$MOCKTAIL_PUBLISH" == true ]]; then
-            ./scripts/assemble_flatpak_pages.sh \
-              repo Nightcap-x86_64.flatpak nightcap-flatpak.gpg public
-          fi
 
       - name: Upload Flatpak
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: Nightcap-x86_64-flatpak
-          path: Nightcap-x86_64.flatpak
+          name: Mocktail-${{ matrix.arch }}-flatpak
+          path: Mocktail-${{ matrix.arch }}.flatpak
           if-no-files-found: error
           retention-days: 14
 
+  publish:
+    name: Assemble multi-architecture Flatpak repository
+    if: >-
+      (github.event_name == 'workflow_run' &&
+      github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.event != 'pull_request' &&
+      github.event.workflow_run.head_branch == 'main') ||
+      (github.event_name == 'workflow_dispatch' &&
+      github.ref == 'refs/heads/main')
+    needs: flatpak
+    runs-on: ubuntu-24.04
+    timeout-minutes: 120
+    steps:
+      - name: Check out source
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          ref: ${{ github.event.workflow_run.head_sha || github.sha }}
+
+      - name: Download both Flatpak bundles
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        with:
+          pattern: Mocktail-*-flatpak
+          path: flatpak-bundles
+          merge-multiple: true
+
+      - name: Download package repositories
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -Eeuo pipefail
+          run_id="${{ github.event.workflow_run.id }}"
+          if [[ -z "$run_id" ]]; then
+            run_id="$(gh run list \
+              --workflow packages.yml \
+              --branch main \
+              --event push \
+              --status success \
+              --limit 1 \
+              --json databaseId \
+              --jq '.[0].databaseId')"
+          fi
+          [[ -n "$run_id" ]]
+          gh run download "$run_id" \
+            --name Mocktail-native-repositories \
+            --dir native-repositories
+          [[ -d native-repositories/apt && \
+             -d native-repositories/rpm && \
+             -d native-repositories/downloads && \
+             -s native-repositories/mocktail-packages.gpg ]]
+
+      - name: Install Flatpak repository tools
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install --yes --no-install-recommends flatpak gnupg ostree
+
+      - name: Sign and publish both architectures
+        shell: bash
+        env:
+          FLATPAK_GPG_PRIVATE_KEY: ${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}
+          FLATPAK_GPG_KEY_ID: ${{ secrets.FLATPAK_GPG_KEY_ID }}
+        run: |
+          set -Eeuo pipefail
+          [[ -n "$FLATPAK_GPG_PRIVATE_KEY" && -n "$FLATPAK_GPG_KEY_ID" ]]
+          [[ -s flatpak-bundles/Mocktail-x86_64.flatpak && \
+             -s flatpak-bundles/Mocktail-aarch64.flatpak ]]
+          install -d -m 0700 "$RUNNER_TEMP/mocktail-gnupg"
+          printf '%s' "$FLATPAK_GPG_PRIVATE_KEY" | \
+            gpg --batch --homedir "$RUNNER_TEMP/mocktail-gnupg" --import
+          gpg --batch --homedir "$RUNNER_TEMP/mocktail-gnupg" \
+            --export "$FLATPAK_GPG_KEY_ID" >mocktail-flatpak.gpg
+          ostree --repo=repo init --mode=archive
+          for arch in x86_64 aarch64; do
+            flatpak build-import-bundle \
+              --gpg-sign="$FLATPAK_GPG_KEY_ID" \
+              --gpg-homedir="$RUNNER_TEMP/mocktail-gnupg" \
+              --no-update-summary \
+              repo "flatpak-bundles/Mocktail-${arch}.flatpak"
+            ostree --repo=repo refs | \
+              grep -Fxq "app/space.bigrat.mocktail/${arch}/stable"
+          done
+          flatpak build-update-repo \
+            --generate-static-deltas \
+            --static-delta-jobs=2 \
+            --prune \
+            --gpg-sign="$FLATPAK_GPG_KEY_ID" \
+            --gpg-homedir="$RUNNER_TEMP/mocktail-gnupg" \
+            repo
+          ./scripts/assemble_flatpak_pages.sh \
+            repo flatpak-bundles/Mocktail-x86_64.flatpak \
+            flatpak-bundles/Mocktail-aarch64.flatpak \
+            mocktail-flatpak.gpg public native-repositories
+
       - name: Configure GitHub Pages
-        if: env.MOCKTAIL_PUBLISH == 'true'
         uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
 
       - name: Upload GitHub Pages repository
-        if: env.MOCKTAIL_PUBLISH == 'true'
         uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0
         with:
           path: public
 
   deploy-pages:
     name: Publish Flatpak repository
-    if: startsWith(github.ref, 'refs/tags/v') || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
-    needs: flatpak
+    if: >-
+      (github.event_name == 'workflow_run' &&
+      github.event.workflow_run.conclusion == 'success' &&
+      github.event.workflow_run.event != 'pull_request' &&
+      github.event.workflow_run.head_branch == 'main') ||
+      (github.event_name == 'workflow_dispatch' &&
+      github.ref == 'refs/heads/main')
+    needs: publish
     runs-on: ubuntu-24.04
     timeout-minutes: 10
     permissions:
@@ -150,43 +251,3 @@ jobs:
       - name: Deploy GitHub Pages
         id: deployment
         uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128 # v5.0.0
-
-  release:
-    name: Attach bundle to GitHub release
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: flatpak
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    permissions:
-      contents: write
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Download Flatpak
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: Nightcap-x86_64-flatpak
-          path: release
-
-      - name: Upload to release
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -Eeuo pipefail
-          tag="${GITHUB_REF_NAME}"
-          (cd release && sha256sum Nightcap-x86_64.flatpak > Nightcap-x86_64.flatpak.sha256)
-          ./scripts/release_notes.sh "$tag" > release/notes.md
-          # The Release workflow creates the same release; whichever job
-          # arrives second sees "already exists" and continues.
-          if ! gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
-            gh release create "$tag" --repo "$GITHUB_REPOSITORY" \
-              --title "Nightcap $tag" --notes-file release/notes.md ||
-              gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null
-          fi
-          gh release edit "$tag" --repo "$GITHUB_REPOSITORY" \
-            --title "Nightcap $tag" --notes-file release/notes.md
-          gh release upload "$tag" --repo "$GITHUB_REPOSITORY" --clobber \
-            release/Nightcap-x86_64.flatpak \
-            release/Nightcap-x86_64.flatpak.sha256

.github/workflows/packages.yml

@@ -1,47 +1,39 @@
-name: Nightly AppImage
+name: Native packages
 
 on:
-  schedule:
-    # 05:00 UTC daily. A run whose commit already carries the continuous tag
-    # exits without rebuilding, so a quiet day costs one probe job.
-    - cron: '0 5 * * *'
+  push:
+    branches: [main]
+    paths-ignore:
+      - '.github/workflows/ci.yml'
+      - '.gitignore'
+      - 'README.md'
+      - 'assets/screenshots/**'
+      - 'docs/**'
+      - 'packaging/aur/**'
+      - 'scripts/build_flatpak.sh'
+      - 'tests/**'
+  pull_request:
+    paths-ignore:
+      - '.github/workflows/ci.yml'
+      - '.gitignore'
+      - 'README.md'
+      - 'assets/screenshots/**'
+      - 'docs/**'
+      - 'packaging/aur/**'
+      - 'scripts/build_flatpak.sh'
+      - 'tests/**'
   workflow_dispatch:
 
 permissions:
   contents: read
 
 concurrency:
-  group: nightly-appimage
-  cancel-in-progress: false
+  group: packages-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
-  probe:
-    name: Check for new commits
-    runs-on: ubuntu-24.04
-    timeout-minutes: 5
-    outputs:
-      build: ${{ steps.decide.outputs.build }}
-    steps:
-      - name: Compare HEAD against the published continuous tag
-        id: decide
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -Eeuo pipefail
-          published="$(gh api "repos/$GITHUB_REPOSITORY/git/ref/tags/continuous" \
-            --jq .object.sha 2>/dev/null || true)"
-          if [[ "$GITHUB_EVENT_NAME" == "schedule" && "$published" == "$GITHUB_SHA" ]]; then
-            echo 'build=false' >>"$GITHUB_OUTPUT"
-            echo "continuous already points at $GITHUB_SHA; nothing to build"
-          else
-            echo 'build=true' >>"$GITHUB_OUTPUT"
-          fi
-
   appimage:
     name: AppImage (AnyLinux)
-    needs: probe
-    if: needs.probe.outputs.build == 'true'
     runs-on: ubuntu-24.04
     timeout-minutes: 90
     steps:
@@ -65,7 +57,7 @@ jobs:
                 cmake git ninja pkgconf lld sdl3 sdl3_ttf curl openssl \
                 nlohmann-json libyaml libelf minizip minizip-ng capstone gtk4 \
                 libadwaita webkitgtk-6.0 libutf8proc fontconfig libglvnd \
-                vulkan-headers zlib libplacebo bubblewrap xdg-dbus-proxy \
+                vulkan-headers zlib libplacebo libpng bubblewrap xdg-dbus-proxy \
                 patchelf jq unzip file ca-certificates dbus zsync
 
               # Reduced ABI-compatible packages belong only in this builder.
@@ -146,17 +138,266 @@ jobs:
       - name: Upload AppImage
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
-          name: Nightcap-AppImage
+          name: Mocktail-AppImage
           path: dist/Mocktail-x86_64.AppImage
           if-no-files-found: error
           retention-days: 14
 
+  appimage-aarch64:
+    name: AppImage (AnyLinux aarch64)
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 120
+    steps:
+      - name: Check out source
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Build aarch64 AppImage
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          docker run --rm --platform linux/arm64 \
+            --volume "$GITHUB_WORKSPACE:/workspace" \
+            --workdir /workspace \
+            --env GH_TOKEN \
+            ghcr.io/pkgforge-dev/archlinux:latest@sha256:b2507f1964270cab3cc190aa8df858521f6a7e45e969146a012877891d5dfc9b bash -Eeuo pipefail -c '
+              test "$(uname -m)" = aarch64
+              pacman-key --init
+              pacman -Syy --noconfirm archlinux-keyring
+              pacman -Syu --noconfirm --needed \
+                base-devel cmake git ninja pkgconf lld sdl3 sdl3_ttf curl openssl \
+                nlohmann-json libyaml libelf minizip minizip-ng capstone gtk4 \
+                libadwaita webkitgtk-6.0 libutf8proc fontconfig libglvnd \
+                vulkan-headers zlib libplacebo libpng bubblewrap xdg-dbus-proxy \
+                patchelf jq unzip file ca-certificates dbus zsync
+
+              ./scripts/install_anylinux_dependencies.sh
+
+              curl --fail --location --retry 3 \
+                --output /tmp/quick-sharun \
+                https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/2a025cef14483c5bc2a75b479071f4d5c58a906f/useful-tools/quick-sharun.sh
+              echo "fa66d0189e1e87df781c049dfb23cbb1e753786056f693a4483d6d3af61e7ee1  /tmp/quick-sharun" | \
+                sha256sum --check --strict
+              chmod 0755 /tmp/quick-sharun
+
+              curl --fail --location --retry 3 \
+                --output /tmp/sharun \
+                https://github.com/pkgforge-dev/Anylinux-sharun/releases/download/2.2.6/sharun-aarch64
+              echo "3b64db0727a9d5c8212c4b2342770583ce552deac0644d2d6033e9ec280f7635  /tmp/sharun" | \
+                sha256sum --check --strict
+              chmod 0755 /tmp/sharun
+
+              curl --fail --location --retry 3 \
+                --output /tmp/anylinux.c \
+                https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/2a025cef14483c5bc2a75b479071f4d5c58a906f/useful-tools/lib/anylinux.c
+              echo "f50650ad96d177559bdd0737df509fa20bd4af08887631c738fc1f31bfac185f  /tmp/anylinux.c" | \
+                sha256sum --check --strict
+
+              curl --fail --location --retry 3 \
+                --output /tmp/appimagetool \
+                https://github.com/pkgforge-dev/appimagetool/releases/download/0.3.3/appimagetool-aarch64-linux
+              echo "298f5293c41f9b2b46290b246e6419783940824ce20b98775a5a153b18fe8422  /tmp/appimagetool" | \
+                sha256sum --check --strict
+              chmod 0755 /tmp/appimagetool
+
+              curl --fail --location --retry 3 \
+                --output /tmp/uruntime \
+                https://github.com/VHSgunzo/uruntime/releases/download/v0.5.9/uruntime-appimage-dwarfs-lite-aarch64
+              echo "5686f126b22d944b2b9c862ee004b4c590b5a5e5215d8790cc0420f1fbbea942  /tmp/uruntime" | \
+                sha256sum --check --strict
+              chmod 0755 /tmp/uruntime
+
+              curl --fail --location --retry 3 \
+                --output /tmp/mkdwarfs \
+                https://github.com/mhx/dwarfs/releases/download/v0.15.6/dwarfs-universal-0.15.6-Linux-aarch64
+              echo "2d513c43ad652163e5e31c1a96f3c736e7e188e661ff62fc9143ea7147bd936b  /tmp/mkdwarfs" | \
+                sha256sum --check --strict
+              chmod 0755 /tmp/mkdwarfs
+
+              git config --global --add safe.directory /workspace
+              git config --global --add safe.directory /workspace/third_party/Vulkan-Headers
+              git config --global --add safe.directory /workspace/third_party/libjnivm
+              export MOCKTAIL_ANYLINUX_SYSTEM_INSTALL=1
+              export MOCKTAIL_ANYLINUX_SHARUN=/tmp/sharun
+              export MOCKTAIL_ANYLINUX_C_SOURCE=/tmp/anylinux.c
+              export RUNTIME=/tmp/uruntime
+              export DWARFS_CMD=/tmp/mkdwarfs
+              make appimage BUILD_DIR=build-appimage-aarch64 JOBS=4 \
+                APPIMAGE=dist/Mocktail-aarch64.AppImage \
+                PORTABLE_MODE=standalone APPIMAGE_FORMAT=anylinux \
+                ANYLINUX_PACKAGER=/tmp/quick-sharun \
+                ANYLINUX_APPIMAGETOOL=/tmp/appimagetool
+              test -x dist/Mocktail-aarch64.AppImage
+            '
+
+      - name: Smoke-test aarch64 AppImage without FUSE
+        shell: bash
+        run: |
+          smoke_dir="$(mktemp -d)"
+          trap 'rm -rf -- "$smoke_dir"' EXIT
+          export XDG_DATA_HOME="$smoke_dir/data"
+          export XDG_CONFIG_HOME="$smoke_dir/config"
+          export XDG_CACHE_HOME="$smoke_dir/cache"
+          export XDG_STATE_HOME="$smoke_dir/state"
+          mkdir -p "$XDG_DATA_HOME" "$XDG_CONFIG_HOME" "$XDG_CACHE_HOME" "$XDG_STATE_HOME"
+          timeout 60s dist/Mocktail-aarch64.AppImage --appimage-extract-and-run --help
+          timeout 60s dist/Mocktail-aarch64.AppImage --appimage-extract-and-run mocktail_updater status
+
+      - name: Upload aarch64 AppImage
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: Mocktail-AppImage-aarch64
+          path: dist/Mocktail-aarch64.AppImage
+          if-no-files-found: error
+          retention-days: 14
+
+  deb:
+    name: DEB (Ubuntu 26.04)
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    steps:
+      - name: Check out source
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Build DEB
+        shell: bash
+        run: |
+          nightly_suffix=".nightly.$(git show -s --format=%cd --date=format:%Y%m%d%H%M%S "$GITHUB_SHA").g${GITHUB_SHA:0:8}"
+          docker run --rm \
+            --volume "$GITHUB_WORKSPACE:/workspace" \
+            --workdir /workspace \
+            --env MOCKTAIL_PACKAGE_VERSION_SUFFIX="$nightly_suffix" \
+            ubuntu:26.04 bash -Eeuo pipefail -c '
+              export DEBIAN_FRONTEND=noninteractive
+              apt-get update
+              apt-get install --yes --no-install-recommends \
+                build-essential cmake git ninja-build pkg-config lld fakeroot \
+                dpkg-dev file libsdl3-dev libsdl3-ttf-dev \
+                libcurl4-openssl-dev libssl-dev nlohmann-json3-dev \
+                libyaml-dev libelf-dev libminizip-dev libcapstone-dev \
+                libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev \
+                libutf8proc-dev libfontconfig1-dev libegl-dev \
+                libvulkan-dev libplacebo-dev libpng-dev zlib1g-dev
+              cmake -S . -B build-deb -G Ninja \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DMOCKTAIL_PACKAGE_NAME=mocktail-nightly \
+                -DMOCKTAIL_PACKAGE_VERSION_SUFFIX="$MOCKTAIL_PACKAGE_VERSION_SUFFIX" \
+                -DBUILD_TESTING=OFF
+              cmake --build build-deb --parallel 4
+              cpack --config build-deb/CPackConfig.cmake \
+                -G DEB -B dist/deb
+              dpkg-deb --info dist/deb/*.deb >/dev/null
+            '
+
+      - name: Upload DEB
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: Mocktail-DEB
+          path: dist/deb/*.deb
+          if-no-files-found: error
+          retention-days: 14
+
+  rpm:
+    name: RPM (Fedora 44)
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    steps:
+      - name: Check out source
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Build RPM
+        shell: bash
+        run: |
+          nightly_suffix=".nightly.$(git show -s --format=%cd --date=format:%Y%m%d%H%M%S "$GITHUB_SHA").g${GITHUB_SHA:0:8}"
+          docker run --rm \
+            --volume "$GITHUB_WORKSPACE:/workspace" \
+            --workdir /workspace \
+            --env MOCKTAIL_PACKAGE_VERSION_SUFFIX="$nightly_suffix" \
+            fedora:44 bash -Eeuo pipefail -c '
+              dnf install --assumeyes \
+                gcc-c++ cmake git ninja-build pkgconf-pkg-config lld rpm-build \
+                SDL3-devel SDL3_ttf-devel libcurl-devel openssl-devel \
+                nlohmann-json-devel libyaml-devel elfutils-libelf-devel \
+                minizip-ng-compat-devel capstone-devel gtk4-devel libadwaita-devel \
+                webkitgtk6.0-devel utf8proc-devel fontconfig-devel \
+                libglvnd-devel vulkan-headers vulkan-loader-devel \
+                libplacebo-devel libpng-devel zlib-ng-compat-devel
+              cmake -S . -B build-rpm -G Ninja \
+                -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DCMAKE_INSTALL_LIBDIR=lib \
+                -DMOCKTAIL_PACKAGE_NAME=mocktail-nightly \
+                -DMOCKTAIL_PACKAGE_VERSION_SUFFIX="$MOCKTAIL_PACKAGE_VERSION_SUFFIX" \
+                -DBUILD_TESTING=OFF
+              cmake --build build-rpm --parallel 4
+              cpack --config build-rpm/CPackConfig.cmake \
+                -G RPM -B dist/rpm
+              rpm --query --package --info dist/rpm/*.rpm >/dev/null
+            '
+
+      - name: Upload RPM
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: Mocktail-RPM
+          path: dist/rpm/*.rpm
+          if-no-files-found: error
+          retention-days: 14
+
+  arch:
+    name: Pacman package (Arch Linux)
+    runs-on: ubuntu-24.04
+    timeout-minutes: 45
+    steps:
+      - name: Check out source
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+        with:
+          fetch-depth: 0
+          submodules: recursive
+
+      - name: Build pacman package
+        shell: bash
+        run: |
+          docker run --rm \
+            --volume "$GITHUB_WORKSPACE:/workspace" \
+            --workdir /workspace \
+            archlinux:base-devel bash -Eeuo pipefail -c '
+              pacman -Syu --needed --noconfirm \
+                cmake git ninja pkgconf lld sdl3 sdl3_ttf curl openssl \
+                nlohmann-json libyaml libelf minizip capstone gtk4 \
+                libadwaita webkitgtk-6.0 libutf8proc fontconfig \
+                libplacebo libpng vulkan-headers vulkan-icd-loader libglvnd zlib
+              useradd --create-home builder
+              chown -R builder:builder /workspace
+              runuser -u builder -- env MOCKTAIL_SOURCE_DIR=/workspace \
+                makepkg --dir /workspace/packaging/arch \
+                  --noconfirm --cleanbuild --force
+              install -d dist/arch
+              cp packaging/arch/*.pkg.tar.zst dist/arch/
+              pacman -Qp dist/arch/*.pkg.tar.zst >/dev/null
+            '
+
+      - name: Upload pacman package
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: Mocktail-Arch
+          path: dist/arch/*.pkg.tar.zst
+          if-no-files-found: error
+          retention-days: 14
+
   publish:
-    name: Publish continuous release
-    needs: [probe, appimage]
-    # A manual run from another branch still builds and smoke-tests, but the
-    # continuous tag and release only ever follow main.
-    if: needs.probe.outputs.build == 'true' && github.ref == 'refs/heads/main'
+    name: Publish continuous packages
+    if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+    needs: [appimage, appimage-aarch64, deb, rpm, arch]
     runs-on: ubuntu-24.04
     timeout-minutes: 30
     permissions:
@@ -167,49 +408,85 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Download AppImage
+      - name: Download packages
         uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
-          name: Nightcap-AppImage
+          pattern: Mocktail-*
           path: release
+          merge-multiple: true
 
-      - name: Name and checksum the nightly build
+      - name: Prepare continuous packages
         shell: bash
         run: |
           set -Eeuo pipefail
-          # The Makefile builds under upstream's artifact name; the published
-          # asset carries this fork's.
-          mv -- release/Mocktail-x86_64.AppImage release/Nightcap-nightly-x86_64.AppImage
-          (cd release && sha256sum Nightcap-nightly-x86_64.AppImage \
-            > Nightcap-nightly-x86_64.AppImage.sha256)
+          mv -- release/Mocktail-x86_64.AppImage release/mocktail-nightly.AppImage
+          mv -- release/Mocktail-aarch64.AppImage release/mocktail-nightly-aarch64.AppImage
+          mv -- release/*.deb release/mocktail-nightly.deb
+          mv -- release/*.rpm release/mocktail-nightly.rpm
+          mv -- release/*.pkg.tar.zst release/mocktail-nightly.pkg.tar.zst
           find release -maxdepth 1 -type f -print
 
+      - name: Build package repositories
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+          FLATPAK_GPG_PRIVATE_KEY: ${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}
+          FLATPAK_GPG_KEY_ID: ${{ secrets.FLATPAK_GPG_KEY_ID }}
+        run: |
+          set -Eeuo pipefail
+          [[ -n "$FLATPAK_GPG_PRIVATE_KEY" && -n "$FLATPAK_GPG_KEY_ID" ]]
+          sudo apt-get update
+          sudo apt-get install --yes --no-install-recommends \
+            apt-utils createrepo-c gnupg rpm
+          install -d stable/deb stable/rpm
+          stable_tag="$(gh api "repos/$GITHUB_REPOSITORY/releases/latest" --jq .tag_name)"
+          gh release download "$stable_tag" --pattern '*.deb' --dir stable/deb
+          gh release download "$stable_tag" --pattern '*.rpm' --dir stable/rpm
+          mapfile -t stable_debs < <(find stable/deb -maxdepth 1 -type f -name '*.deb' -print)
+          mapfile -t stable_rpms < <(find stable/rpm -maxdepth 1 -type f -name '*.rpm' -print)
+          [[ "${#stable_debs[@]}" -eq 1 && "${#stable_rpms[@]}" -eq 1 ]]
+          install -d -m 0700 "$RUNNER_TEMP/mocktail-native-gnupg"
+          printf '%s' "$FLATPAK_GPG_PRIVATE_KEY" | \
+            gpg --batch --homedir "$RUNNER_TEMP/mocktail-native-gnupg" --import
+          gpg --batch --homedir "$RUNNER_TEMP/mocktail-native-gnupg" \
+            --export "$FLATPAK_GPG_KEY_ID" >mocktail-packages.gpg
+          ./scripts/assemble_native_repositories.sh \
+            "${stable_debs[0]}" release/mocktail-nightly.deb \
+            "${stable_rpms[0]}" release/mocktail-nightly.rpm \
+            mocktail-packages.gpg "$FLATPAK_GPG_KEY_ID" \
+            "$RUNNER_TEMP/mocktail-native-gnupg" native-repositories
+
       - name: Update continuous release
         shell: bash
         env:
           GH_TOKEN: ${{ github.token }}
         run: |
           set -Eeuo pipefail
-          git config user.name 'github-actions[bot]'
-          git config user.email '41898282+github-actions[bot]@users.noreply.github.com'
+          git config user.name komaruworld
+          git config user.email rtysus228@gmail.com
           git tag --force continuous "$GITHUB_SHA"
           git push origin refs/tags/continuous --force
-          notes="Automated build of main at ${GITHUB_SHA:0:8}. Untested and unreleased; use a tagged release for normal play."
           if ! gh release view continuous >/dev/null 2>&1; then
             gh release create continuous \
               --prerelease \
-              --title "Nightcap continuous" \
-              --notes "$notes"
+              --title "Mocktail continuous" \
+              --notes "Automated development packages from main."
           fi
-          gh release edit continuous --title "Nightcap continuous" --notes "$notes"
           gh release upload continuous release/* --clobber
-          # Drop assets left by earlier runs under other names.
           while IFS= read -r asset; do
             case "$asset" in
-              Nightcap-nightly-x86_64.AppImage|Nightcap-nightly-x86_64.AppImage.sha256)
+              mocktail-nightly.AppImage|mocktail-nightly-aarch64.AppImage|mocktail-nightly.deb|mocktail-nightly.rpm|mocktail-nightly.pkg.tar.zst)
                 ;;
-              *)
+              Mocktail-*.AppImage|mocktail_*.deb|mocktail-*.deb|mocktail-*.rpm|mocktail-*.pkg.tar.zst)
                 gh release delete-asset continuous "$asset" --yes
                 ;;
             esac
           done < <(gh release view continuous --json assets --jq '.assets[].name')
+
+      - name: Upload package repositories
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: Mocktail-native-repositories
+          path: native-repositories
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/release.yml

@@ -1,338 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags: ['v*']
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-concurrency:
-  group: release-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  appimage:
-    name: AppImage (AnyLinux)
-    runs-on: ubuntu-24.04
-    timeout-minutes: 90
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Check release notes
-        if: startsWith(github.ref, 'refs/tags/v')
-        shell: bash
-        run: ./scripts/release_notes.sh "$GITHUB_REF_NAME" >/dev/null
-
-      - name: Build AppImage
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          docker run --rm \
-            --volume "$GITHUB_WORKSPACE:/workspace" \
-            --workdir /workspace \
-            --env GH_TOKEN \
-            ghcr.io/archlinux/archlinux:base-devel@sha256:c3953446016873a756fb7814f10087cac1634c127f7302e80c81c512da796d05 bash -Eeuo pipefail -c '
-              pacman -Syu --noconfirm --needed \
-                cmake git ninja pkgconf lld sdl3 sdl3_ttf curl openssl \
-                nlohmann-json libyaml libelf minizip minizip-ng capstone gtk4 \
-                libadwaita webkitgtk-6.0 libutf8proc fontconfig libglvnd \
-                vulkan-headers zlib libplacebo bubblewrap xdg-dbus-proxy \
-                patchelf jq unzip file ca-certificates dbus zsync
-
-              ./scripts/install_anylinux_dependencies.sh
-
-              curl --fail --location --retry 3 \
-                --output /tmp/quick-sharun \
-                https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/2a025cef14483c5bc2a75b479071f4d5c58a906f/useful-tools/quick-sharun.sh
-              echo "fa66d0189e1e87df781c049dfb23cbb1e753786056f693a4483d6d3af61e7ee1  /tmp/quick-sharun" | \
-                sha256sum --check --strict
-              chmod 0755 /tmp/quick-sharun
-
-              curl --fail --location --retry 3 \
-                --output /tmp/sharun \
-                https://github.com/pkgforge-dev/Anylinux-sharun/releases/download/2.2.6/sharun-x86_64
-              echo "a4d51752f9861b4870ca529fea04087310b28f8943cc55b99a95b777d4db92ec  /tmp/sharun" | \
-                sha256sum --check --strict
-              chmod 0755 /tmp/sharun
-
-              curl --fail --location --retry 3 \
-                --output /tmp/anylinux.c \
-                https://raw.githubusercontent.com/pkgforge-dev/Anylinux-AppImages/2a025cef14483c5bc2a75b479071f4d5c58a906f/useful-tools/lib/anylinux.c
-              echo "f50650ad96d177559bdd0737df509fa20bd4af08887631c738fc1f31bfac185f  /tmp/anylinux.c" | \
-                sha256sum --check --strict
-
-              curl --fail --location --retry 3 \
-                --output /tmp/appimagetool \
-                https://github.com/pkgforge-dev/appimagetool/releases/download/0.3.3/appimagetool-x86_64-linux
-              echo "0d01a4e2628efc897be9663f0faeed6a171e1851270b4e1ce4c22434a36ecebd  /tmp/appimagetool" | \
-                sha256sum --check --strict
-              chmod 0755 /tmp/appimagetool
-
-              curl --fail --location --retry 3 \
-                --output /tmp/uruntime \
-                https://github.com/VHSgunzo/uruntime/releases/download/v0.5.9/uruntime-appimage-dwarfs-lite-x86_64
-              echo "cef962c299f2fa19b2b3cdf2fa1565ee8541796cc89b9a97a591f94041e8b083  /tmp/uruntime" | \
-                sha256sum --check --strict
-              chmod 0755 /tmp/uruntime
-
-              curl --fail --location --retry 3 \
-                --output /tmp/mkdwarfs \
-                https://github.com/mhx/dwarfs/releases/download/v0.15.6/dwarfs-universal-0.15.6-Linux-x86_64
-              echo "50891c38ba359db8271819a6cbf6aaa8068681523f0c4f2b8242007a45edaa28  /tmp/mkdwarfs" | \
-                sha256sum --check --strict
-              chmod 0755 /tmp/mkdwarfs
-
-              git config --global --add safe.directory /workspace
-              git config --global --add safe.directory /workspace/third_party/Vulkan-Headers
-              git config --global --add safe.directory /workspace/third_party/libjnivm
-              export MOCKTAIL_ANYLINUX_SYSTEM_INSTALL=1
-              export MOCKTAIL_ANYLINUX_SHARUN=/tmp/sharun
-              export MOCKTAIL_ANYLINUX_C_SOURCE=/tmp/anylinux.c
-              export RUNTIME=/tmp/uruntime
-              export DWARFS_CMD=/tmp/mkdwarfs
-              make appimage BUILD_DIR=build-appimage JOBS=4 \
-                APPIMAGE=dist/Mocktail-x86_64.AppImage \
-                PORTABLE_MODE=standalone APPIMAGE_FORMAT=anylinux \
-                ANYLINUX_PACKAGER=/tmp/quick-sharun \
-                ANYLINUX_APPIMAGETOOL=/tmp/appimagetool
-              test -x dist/Mocktail-x86_64.AppImage
-            '
-
-      - name: Smoke-test AppImage without FUSE
-        shell: bash
-        run: |
-          smoke_dir="$(mktemp -d)"
-          trap 'rm -rf -- "$smoke_dir"' EXIT
-          export XDG_DATA_HOME="$smoke_dir/data"
-          export XDG_CONFIG_HOME="$smoke_dir/config"
-          export XDG_CACHE_HOME="$smoke_dir/cache"
-          export XDG_STATE_HOME="$smoke_dir/state"
-          mkdir -p "$XDG_DATA_HOME" "$XDG_CONFIG_HOME" "$XDG_CACHE_HOME" "$XDG_STATE_HOME"
-          timeout 60s dist/Mocktail-x86_64.AppImage --appimage-extract-and-run --help
-          timeout 60s dist/Mocktail-x86_64.AppImage --appimage-extract-and-run mocktail_updater status
-
-      - name: Upload AppImage
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: Mocktail-AppImage
-          path: dist/Mocktail-x86_64.AppImage
-          if-no-files-found: error
-          retention-days: 14
-
-  deb:
-    name: DEB (Ubuntu 26.04)
-    runs-on: ubuntu-24.04
-    timeout-minutes: 45
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Build DEB
-        shell: bash
-        run: |
-          set -Eeuo pipefail
-          docker run --rm \
-            --volume "$GITHUB_WORKSPACE:/workspace" \
-            --workdir /workspace \
-            --env MOCKTAIL_PACKAGE_VERSION="$(./scripts/package_version.sh)" \
-            ubuntu:26.04 bash -Eeuo pipefail -c '
-              export DEBIAN_FRONTEND=noninteractive
-              apt-get update
-              apt-get install --yes --no-install-recommends \
-                build-essential cmake git ninja-build pkg-config lld fakeroot \
-                dpkg-dev file libsdl3-dev libsdl3-ttf-dev \
-                libcurl4-openssl-dev libssl-dev nlohmann-json3-dev \
-                libyaml-dev libelf-dev libminizip-dev libcapstone-dev \
-                libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev \
-                libutf8proc-dev libfontconfig1-dev libegl-dev \
-                libvulkan-dev libplacebo-dev zlib1g-dev libpng-dev
-              cmake -S . -B build-deb -G Ninja \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DMOCKTAIL_PACKAGE_NAME=nightcap \
-                -DMOCKTAIL_PACKAGE_VERSION="$MOCKTAIL_PACKAGE_VERSION" \
-                -DBUILD_TESTING=OFF
-              cmake --build build-deb --parallel 4
-              cpack --config build-deb/CPackConfig.cmake \
-                -G DEB -B dist/deb
-              dpkg-deb --info dist/deb/*.deb >/dev/null
-            '
-
-      - name: Upload DEB
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: Nightcap-DEB
-          path: dist/deb/*.deb
-          if-no-files-found: error
-          retention-days: 14
-
-  rpm:
-    name: RPM (Fedora 44)
-    runs-on: ubuntu-24.04
-    timeout-minutes: 45
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Build RPM
-        shell: bash
-        run: |
-          set -Eeuo pipefail
-          docker run --rm \
-            --volume "$GITHUB_WORKSPACE:/workspace" \
-            --workdir /workspace \
-            --env MOCKTAIL_PACKAGE_VERSION="$(./scripts/package_version.sh)" \
-            fedora:44 bash -Eeuo pipefail -c '
-              dnf install --assumeyes \
-                gcc-c++ cmake git ninja-build pkgconf-pkg-config lld rpm-build \
-                SDL3-devel SDL3_ttf-devel libcurl-devel openssl-devel \
-                nlohmann-json-devel libyaml-devel elfutils-libelf-devel \
-                minizip-ng-compat-devel capstone-devel gtk4-devel libadwaita-devel \
-                webkitgtk6.0-devel utf8proc-devel fontconfig-devel \
-                libglvnd-devel vulkan-headers vulkan-loader-devel \
-                libplacebo-devel zlib-ng-compat-devel libpng-devel
-              cmake -S . -B build-rpm -G Ninja \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DCMAKE_INSTALL_LIBDIR=lib \
-                -DMOCKTAIL_PACKAGE_NAME=nightcap \
-                -DMOCKTAIL_PACKAGE_VERSION="$MOCKTAIL_PACKAGE_VERSION" \
-                -DBUILD_TESTING=OFF
-              cmake --build build-rpm --parallel 4
-              cpack --config build-rpm/CPackConfig.cmake \
-                -G RPM -B dist/rpm
-              rpm --query --package --info dist/rpm/*.rpm >/dev/null
-            '
-
-      - name: Upload RPM
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: Nightcap-RPM
-          path: dist/rpm/*.rpm
-          if-no-files-found: error
-          retention-days: 14
-
-  arch:
-    name: Pacman package (Arch Linux)
-    runs-on: ubuntu-24.04
-    timeout-minutes: 45
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-        with:
-          fetch-depth: 0
-          submodules: recursive
-
-      - name: Build pacman package
-        shell: bash
-        run: |
-          set -Eeuo pipefail
-          version="$(./scripts/package_version.sh)"
-          sed -i "s/^pkgver=.*/pkgver=${version}/" packaging/arch/PKGBUILD
-          docker run --rm \
-            --volume "$GITHUB_WORKSPACE:/workspace" \
-            --workdir /workspace \
-            ghcr.io/archlinux/archlinux:base-devel@sha256:c3953446016873a756fb7814f10087cac1634c127f7302e80c81c512da796d05 bash -Eeuo pipefail -c '
-              pacman -Syu --needed --noconfirm \
-                cmake git ninja pkgconf lld sdl3 sdl3_ttf curl openssl \
-                nlohmann-json libyaml libelf minizip capstone gtk4 \
-                libadwaita webkitgtk-6.0 libutf8proc fontconfig libpng \
-                libplacebo vulkan-headers vulkan-icd-loader libglvnd zlib
-              useradd --create-home builder
-              chown -R builder:builder /workspace
-              runuser -u builder -- env MOCKTAIL_SOURCE_DIR=/workspace \
-                makepkg --dir /workspace/packaging/arch \
-                  --noconfirm --cleanbuild --force
-              install -d dist/arch
-              cp packaging/arch/*.pkg.tar.zst dist/arch/
-              pacman -Qp dist/arch/*.pkg.tar.zst >/dev/null
-            '
-
-      - name: Upload pacman package
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        with:
-          name: Nightcap-Arch
-          path: dist/arch/*.pkg.tar.zst
-          if-no-files-found: error
-          retention-days: 14
-
-  publish:
-    name: Publish GitHub release
-    if: startsWith(github.ref, 'refs/tags/v')
-    needs: [appimage, deb, rpm, arch]
-    runs-on: ubuntu-24.04
-    timeout-minutes: 15
-    permissions:
-      contents: write
-    steps:
-      - name: Check out source
-        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
-
-      - name: Download packages
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          pattern: 'Nightcap-*'
-          merge-multiple: true
-          path: release
-
-      - name: Download AppImage
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
-        with:
-          name: Mocktail-AppImage
-          path: release
-
-      - name: Create release
-        shell: bash
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          set -Eeuo pipefail
-          tag="${GITHUB_REF_NAME}"
-          mv release/Mocktail-x86_64.AppImage release/Nightcap-x86_64.AppImage
-          # An unmatched glob would otherwise reach sha256sum and gh as its own
-          # literal text, so every package pattern has to match before upload.
-          shopt -s nullglob
-          assets=(Nightcap-x86_64.AppImage)
-          for glob in '*.deb' '*.rpm' '*.pkg.tar.zst'; do
-            matched=(release/$glob)
-            if [[ ${#matched[@]} -eq 0 ]]; then
-              echo "::error::no ${glob} package among the release artifacts"
-              exit 1
-            fi
-            assets+=("${matched[@]#release/}")
-          done
-          uploads=()
-          for asset in "${assets[@]}"; do
-            uploads+=("release/$asset" "release/$asset.sha256")
-          done
-          (
-            cd release
-            for asset in "${assets[@]}"; do
-              sha256sum "$asset" > "$asset.sha256"
-            done
-          )
-          ./scripts/release_notes.sh "$tag" > release/notes.md
-          # The Flatpak workflow creates the same release; whichever job
-          # arrives second sees "already exists" and continues.
-          if ! gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then
-            gh release create "$tag" --repo "$GITHUB_REPOSITORY" \
-              --title "Nightcap $tag" --notes-file release/notes.md ||
-              gh release view "$tag" --repo "$GITHUB_REPOSITORY" >/dev/null
-          fi
-          gh release edit "$tag" --repo "$GITHUB_REPOSITORY" \
-            --title "Nightcap $tag" --notes-file release/notes.md
-          gh release upload "$tag" --repo "$GITHUB_REPOSITORY" --clobber \
-            "${uploads[@]}"

.gitignore

@@ -1,6 +1,5 @@
 # Build
 /build/
-/build-test/
 /build_*/
 /build-flatpak/
 /build-anylinux*/
@@ -177,6 +176,3 @@ lsan.log*
 # Test fixtures
 !/third_party/mcpelauncher-linker/core/libziparchive/**/*.zip
 !/third_party/mcpelauncher-linker/core/libziparchive/**/*.apk
-
-# Working plans, not part of the shipped documentation
-/docs/plans/

CHANGELOG.md

@@ -1,246 +0,0 @@
-# Changelog
-
-All notable changes to Nightcap. The format follows
-[Keep a Changelog](https://keepachangelog.com/en/1.1.0/). Release notes on
-GitHub are taken from the matching section here.
-
-## [Unreleased]
-
-## [0.3.2] - 2026-09-29
-
-### Added
-
-- Performance recordings made with `--profile` now show how busy the CPU was
-  during each frame, which makes it easier to tell what caused a stutter.
-- Experimental support for ARM64 (`aarch64`) Linux, running Roblox's Android
-  `arm64-v8a` client.
-
-### Fixed
-
-- When Roblox asks for a Google Play device check during login, Nightcap now
-  answers right away that it isn't supported. Before, the "Verifying you're
-  not a bot" screen waited about a minute for an answer and then sent you
-  back to the login screen.
-- Solving a login challenge now closes its window. Before, Roblox's
-  "challenge completed" signal was ignored and the window stayed open.
-  Thanks to @glook9001.
-- Login no longer stalls after you pass a verification check. Before, Roblox
-  only saw the page's "challenge completed" signal after a one-minute
-  timeout, so it gave up and the login failed. On a Roblox build Nightcap
-  can't handle this way, the log says "WebViewProtocol getter not
-  recognized" and web pages behave as before.
-- Login check windows and other web pages get 5 seconds to start instead of
-  3, so a slow start no longer closes them. The log says how long each one
-  took to open.
-- Less stutter while joining a game and while textures load in. In Blade
-  Ball, loading hitches dropped by about half, and the worst one went from
-  0.8 seconds to 0.55 seconds.
-- Clicking Play on a private server now joins right away. Before, nothing
-  happened until you clicked a sidebar tab like Home.
-- Middle click now reaches Roblox as the middle mouse button.
-- Scrolling follows your system's natural scrolling setting.
-- Fixed a crash on some x86_64 hosts when Roblox asked about a thread other
-  than the one making the call.
-- Roblox updates no longer mix up the ARM64 and x86_64 compatibility profiles
-  for the same version.
-- A partial or out-of-range user id in `MOCKTAIL_ROBLOX_USER_ID` or
-  `MOCKTAIL_LOCAL_STORAGE_CURRENT_USER_ID` is now ignored instead of being
-  partly read.
-
-### Changed
-
-- `make flatpak` and `scripts/build_flatpak.sh` now build with 2 jobs by
-  default instead of 4, so a local Flatpak build is less likely to run out
-  of memory. Set `FLATPAK_JOBS` or `MOCKTAIL_FLATPAK_JOBS` to use more.
-  Thanks to @glook9001.
-
-## [0.3.1] - 2026-09-20
-
-### Added
-
-- Each release carries a DEB, an RPM, and a pacman package beside the
-  AppImage, with a `.sha256` for every file. They install `/usr/bin/mocktail`
-  and conflict with each other and with upstream's `mocktail` package.
-  Nightcap is in no distribution repository or the AUR; the recipes under
-  `packaging/aur/nightcap{,-bin,-git}` build from this repository locally.
-- The AppStream metadata lists the Nightcap releases, so software centres
-  show the release history instead of upstream's.
-
-### Fixed
-
-- ETC2 texture decoding no longer blocks the thread that submits the frame.
-  Uploads decode on a background dispatcher and the submit carries a timeline
-  semaphore wait, so the GPU waits for the texture instead of the render
-  thread. Reading the application's compressed bytes moves to that dispatcher
-  too whenever they are already mapped. In Blade Ball the worst
-  `vkQueueSubmit` fell from 140ms to 1ms, its p99 from 4.9ms to 0.05ms, and
-  the total time spent in submits from 2534ms to 309ms. Frame interval is
-  unchanged: the remaining tail is the engine's own main-thread step. A device
-  without the `timelineSemaphore` feature decodes inline as before, as does a
-  submit whose `pNext` already sizes arrays by its semaphore counts.
-- The mouse pointer jumped when a right-click camera drag ended, and drifted
-  to the viewport edge during one. The input router inferred pointer capture
-  from SDL reporting zero absolute coordinates, which holds on X11 but not on
-  Wayland, where the reported position accumulates the relative deltas and
-  leaves the window. Motion, button, and wheel events now carry the window's
-  relative mouse mode. The right-click camera fallback also only captures
-  inside an experience, so the cursor stays free over the app surface.
-- Shutting the window down while an experience was starting or leaving could
-  free the pointer capture owner underneath the thread using it. Callers off
-  the SDL thread now hold a reference for the length of their call.
-- The TextBox caret did not move when a trailing space was typed in a
-  single-line field. The final cluster rect SDL_ttf reports stops at the last
-  inked glyph, so the laid-out width is used there instead. Wrapped layouts
-  keep the clamp, because their width is the widest line rather than the last.
-- Every TextBox keystroke re-ran `TTF_Init`, a fontconfig sort, six
-  `TTF_OpenFont` calls, and `TTF_Quit` on the render thread. The overlay holds
-  its opened fonts and reopens them only when the Roblox font or the point
-  size changes, keeping the current set when a reopen fails. Measured over 100
-  rasters, 1.59ms to 0.12ms per keystroke.
-- Staged ETC2 copies now carry an explicit host-write barrier. A queue
-  submission only makes host writes from before it visible to the device, and
-  an asynchronous decode writes after the submit, so without the barrier those
-  texels were not guaranteed to reach the copy that reads them.
-
-### Changed
-
-- `docs/PERFORMANCE.md` documents the GameMode settings to run with. A
-  `desiredgov=powersave` in `~/.config/gamemode.ini` overrides the packaged
-  `performance` default and clocks the CPU down for the whole session while
-  still reporting an active performance request.
-
-## [0.3.0] - 2026-09-18
-
-### Added
-
-- Custom Discord presence. `integrations.discord_rpc.text.title` replaces the
-  name in "Playing Nightcap", and `integrations.discord_rpc.images` sets the
-  large and small icons and their hover text. Text and image fields accept
-  `{place_name}`, `{place_icon}`, and `{creator_name}`. A field that expands
-  an empty placeholder is left out, and `text.state: ""` hides the state line.
-- The default Discord card now matches Sober: the title is "Roblox", the
-  details line is "Playing <experience>", the state is "by <creator>", and
-  the Roblox badge sits inside the experience icon. The creator comes from the
-  same Roblox games request that already fetches the experience name. With
-  `show_place_name: false` the creator is hidden too, so the card shows only
-  the title and timer.
-- `--profile <file>` writes a Chrome-format trace of the Vulkan adapter's
-  work: presents, GPU waits, submits, ETC2 texture decode, and pipeline and
-  shader creation. Open it in ui.perfetto.dev. `docs/BENCHMARKING.md`
-  describes the benchmark runs, and `scripts/summarize_profile_trace.py`
-  turns traces into a before and after table.
-
-### Fixed
-
-- Texture uploads stalled the frame they were submitted on. ETC2 batches
-  decoded on worker threads but were then resampled one upload at a time on
-  the submitting thread, which at the default 4x upscale is sixteen times the
-  decoded texels. Resampling now runs on the same worker pool, in two passes so
-  mip level 0 still resolves before the mips built from it. In a 70k-part
-  place the worst `vkQueueSubmit` fell from 167ms to 92ms.
-- Most ETC2 batches decoded on a single thread. Workers were created and
-  joined per batch, so the parallel floor had to cover that cost and sat at a
-  1024x1024 image; batches under it ran on the caller, which was 54% of all
-  decode time in a 70k-part place. Decode workers are now a persistent pool,
-  and the floor drops to a 128x128 image. Mean decode time in that place fell
-  from 8.2ms to 4.7ms, and 11.8ms before both texture fixes.
-- On CPUs with a wide core-speed spread, Feral GameMode pinned the process to
-  the few fastest cores, concentrating Roblox's worker pool onto them instead
-  of spreading it. With `performance.gamemode: auto`, a request that narrows
-  the CPU affinity is now released again, which releases the pin. Set
-  `pin_cores=no` in `~/.config/gamemode.ini` to keep GameMode without the
-  pinning, or `performance.gamemode: on` to accept it. See
-  `docs/PERFORMANCE.md`.
-- With `show_place_name: false`, Discord no longer shows the experience
-  thumbnail or its name on hover.
-- The host main thread no longer spins on the engine's message pump, which
-  cost about half a core and 146,000 empty calls a second. It now rests 100 µs
-  between polls: sleeping when the governor is `performance`, parking the
-  core with TPAUSE on CPUs that have it, spinning otherwise. With GameMode
-  setting the governor, process CPU in a 60k-part place fell from 216% to
-  107% at the same 120 fps. `MOCKTAIL_ENGINE_PUMP_REST` forces a mode; see
-  `docs/PERFORMANCE.md`.
-- ETC2 uploads with a `bufferRowLength` or `bufferImageHeight` larger than
-  the image read the padded rows as packed data and decoded garbage.
-- ETC2 resampling created and joined worker threads on every batch. It now
-  runs on the persistent decode pool.
-- A failed trace write left the profile writer thread waking every 250 ms
-  for the rest of the session. It now exits.
-- The `--profile` trace gains a `pump` slice for the engine's main-thread
-  step.
-
-## [0.2.0] - 2026-09-16
-
-### Added
-
-- FAQ covering Discord RPC, log locations, and VR, adapted from upstream.
-- `input.raw_mouse` in `config.yaml` sends mouse look deltas in the host's
-  own units. Turn it on when first-person aiming feels too slow or too fast
-  under fractional display scaling. Off by default.
-- Nightly AppImage builds, published as the `continuous` prerelease. They are
-  untested; use a tagged release for normal play.
-
-### Changed
-
-- Values in `fflags.json` now win over the performance preset instead of
-  stopping the launch. Startup prints each key it kept.
-- Discord Rich Presence uses Nightcap's own Discord application, so it shows
-  as "Playing Nightcap". Terms and privacy pages for it live on the
-  project site.
-- Discord Rich Presence is on by default. Set
-  `integrations.discord_rpc.enabled: false` to turn it off.
-- The AppImage build verifies its reduced dependency packages against digests
-  taken at build time, rather than a digest list kept in the repository.
-
-### Fixed
-
-- Mouse look keeps responding after a long turn. The tracked pointer position
-  could drift past the edge of the view, which swallowed every reversal until
-  the mouse travelled all the way back.
-- Nightcap no longer refuses to start with `cannot lock appStorage`. It
-  created its own credential directory using the process umask, then rejected
-  that directory for being group writable. Systems with a permissive umask,
-  such as `002`, failed on first run.
-
-## [0.1.0] - 2026-09-15
-
-First Nightcap release, forked from komaruworld/mocktail.
-
-### Added
-
-- ETC2 and EAC texture emulation on Vulkan, so games that use compressed
-  mobile textures render correctly on desktop GPUs. Decoding runs on worker
-  threads to avoid stutter.
-- PNG texture overrides in `~/.config/mocktail/textures`, keyed by upload
-  hash, with a dump mode to find the texture you want to replace.
-- Small textures are upscaled 4x by default. Set
-  `MOCKTAIL_SMALL_TEXTURE_UPSCALE=1` to turn it off.
-- AppImage and signed Flatpak builds on every release tag. The Flatpak repo
-  is published at https://coderdayton.github.io/nightcap/.
-- Roadmap in `docs/ROADMAP.md`.
-
-### Changed
-
-- Frames are presented as soon as they are ready instead of waiting in a
-  queue, which lowers input latency.
-- Roblox now sees the real host RAM and display size instead of a low-end
-  phone profile.
-- App ID is `io.github.CoderDayton.nightcap`, so Nightcap installs next to
-  upstream Mocktail. The binary and config paths keep the `mocktail` name.
-- New name, icon, and colors.
-- The desktop entry launches on Wayland and points at the installed binary.
-
-### Fixed
-
-- Servers no longer kick with error 319 shortly after joining.
-- The FMOD output-device bridge is optional, so the updater no longer fails
-  without it.
-- The AppImage build no longer fails on stale checksums for the slimmed
-  Arch packages.
-
-[Unreleased]: https://github.com/CoderDayton/nightcap/compare/v0.3.2...HEAD
-[0.3.2]: https://github.com/CoderDayton/nightcap/releases/tag/v0.3.2
-[0.3.1]: https://github.com/CoderDayton/nightcap/releases/tag/v0.3.1
-[0.3.0]: https://github.com/CoderDayton/nightcap/releases/tag/v0.3.0
-[0.2.0]: https://github.com/CoderDayton/nightcap/releases/tag/v0.2.0
-[0.1.0]: https://github.com/CoderDayton/nightcap/releases/tag/v0.1.0

CMakeLists.txt

@@ -1,4 +1,3 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,7 +60,7 @@ set(MOCKTAIL_DEFAULT_SIGNING_TRUST_MANIFEST
   CACHE FILEPATH
   "Fallback signing trust manifest used outside an installed runtime"
 )
-set(MOCKTAIL_DISCORD_APPLICATION_ID "1549428231927500843" CACHE STRING
+set(MOCKTAIL_DISCORD_APPLICATION_ID "1537088975720812655" CACHE STRING
   "Discord application ID baked into Mocktail Rich Presence releases"
 )
 string(LENGTH "${MOCKTAIL_DISCORD_APPLICATION_ID}"
@@ -265,8 +264,8 @@ add_library(mocktail_runtime STATIC
   src/runtime/command_line.cc
   src/runtime/crash_report_policy.cc
   src/runtime/discord_rpc.cc
+  src/runtime/device_memory_profile.cc
   src/runtime/device_profile.cc
-  src/runtime/engine_pump_rest.cc
   src/runtime/environment.cc
   src/runtime/external_launch_broker.cc
   src/runtime/frame_rate_policy.cc
@@ -288,7 +287,6 @@ add_library(mocktail_runtime STATIC
   src/runtime/roblox_game_session_native_adapter.cc
   src/runtime/roblox_web_view_bridge.cc
   src/runtime/roblox_permissions_bridge.cc
-  src/runtime/roblox_account_bridge.cc
   src/runtime/payload_update_preflight.cc
   src/runtime/process_launch_policy.cc
   src/runtime/process_diagnostics.cc
@@ -303,7 +301,6 @@ add_library(mocktail_runtime STATIC
   src/runtime/support_bundle.cc
   src/runtime/system_proxy.cc
   src/runtime/texture_memory_policy.cc
-  src/runtime/device_memory_profile.cc
 )
 add_library(Mocktail::Runtime ALIAS mocktail_runtime)
 target_include_directories(mocktail_runtime PUBLIC include)
@@ -386,8 +383,7 @@ add_library(mocktail_webview_helper_policy STATIC
   src/webview/webview_helper_policy.cc
 )
 add_library(Mocktail::WebViewHelperPolicy ALIAS mocktail_webview_helper_policy)
-target_include_directories(mocktail_webview_helper_policy PUBLIC src
-  PRIVATE include)
+target_include_directories(mocktail_webview_helper_policy PUBLIC src)
 target_link_libraries(mocktail_webview_helper_policy PUBLIC
   PkgConfig::WEBKITGTK6
   nlohmann_json::nlohmann_json
@@ -734,24 +730,13 @@ install(FILES
     config/roblox_signing_certificates.json
   DESTINATION "${MOCKTAIL_INSTALL_DATA_DIR}/metadata"
 )
-# The installed desktop entry names the binary by its install path, so it
-# launches from sessions whose PATH lacks the install prefix. Uses the prefix
-# given at install time, not the configure-time one.
-install(CODE "
-  file(READ \"${CMAKE_SOURCE_DIR}/packaging/io.github.CoderDayton.nightcap.desktop\"
-       MOCKTAIL_DESKTOP_ENTRY)
-  string(REPLACE \"Exec=env SDL_VIDEODRIVER=wayland,x11 mocktail %u\"
-         \"Exec=env SDL_VIDEODRIVER=wayland,x11 \${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/mocktail %u\"
-         MOCKTAIL_DESKTOP_ENTRY \"\${MOCKTAIL_DESKTOP_ENTRY}\")
-  file(WRITE \"${CMAKE_BINARY_DIR}/io.github.CoderDayton.nightcap.desktop\"
-       \"\${MOCKTAIL_DESKTOP_ENTRY}\")
-  file(INSTALL \"${CMAKE_BINARY_DIR}/io.github.CoderDayton.nightcap.desktop\"
-       DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/applications\")
-")
-install(FILES packaging/io.github.CoderDayton.nightcap.metainfo.xml
+install(FILES packaging/space.bigrat.mocktail.desktop
+  DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
+)
+install(FILES packaging/space.bigrat.mocktail.metainfo.xml
   DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo"
 )
-install(FILES packaging/io.github.CoderDayton.nightcap.svg
+install(FILES packaging/space.bigrat.mocktail.svg
   DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
 )
 set(MOCKTAIL_HICOLOR_ICON_SIZES
@@ -760,7 +745,7 @@ set(MOCKTAIL_HICOLOR_ICON_SIZES
 # Generated icons are committed, so ImageMagick is not a build dependency.
 foreach(icon_size IN LISTS MOCKTAIL_HICOLOR_ICON_SIZES)
   install(FILES
-      "packaging/icons/hicolor/${icon_size}x${icon_size}/apps/io.github.CoderDayton.nightcap.png"
+      "packaging/icons/hicolor/${icon_size}x${icon_size}/apps/space.bigrat.mocktail.png"
     DESTINATION
       "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${icon_size}x${icon_size}/apps"
   )
@@ -793,29 +778,23 @@ install(CODE "
   endif()
 ")
 
-set(MOCKTAIL_PACKAGE_NAMES mocktail mocktail-nightly nightcap nightcap-nightly)
 set(MOCKTAIL_PACKAGE_NAME "mocktail" CACHE STRING
   "Native package name"
 )
-set(MOCKTAIL_PACKAGE_VERSION "${PROJECT_VERSION}" CACHE STRING
-  "Native package version"
-)
 set(MOCKTAIL_PACKAGE_VERSION_SUFFIX "" CACHE STRING
   "Native package version suffix"
 )
-if(NOT MOCKTAIL_PACKAGE_NAME IN_LIST MOCKTAIL_PACKAGE_NAMES)
-  string(JOIN ", " MOCKTAIL_PACKAGE_NAMES_TEXT ${MOCKTAIL_PACKAGE_NAMES})
+if(NOT MOCKTAIL_PACKAGE_NAME STREQUAL "mocktail" AND
+   NOT MOCKTAIL_PACKAGE_NAME STREQUAL "mocktail-nightly")
   message(FATAL_ERROR
-    "MOCKTAIL_PACKAGE_NAME must be one of ${MOCKTAIL_PACKAGE_NAMES_TEXT}")
+    "MOCKTAIL_PACKAGE_NAME must be mocktail or mocktail-nightly")
 endif()
 
 set(CPACK_PACKAGE_NAME "${MOCKTAIL_PACKAGE_NAME}")
-set(CPACK_PACKAGE_VERSION
-  "${MOCKTAIL_PACKAGE_VERSION}${MOCKTAIL_PACKAGE_VERSION_SUFFIX}"
-)
-set(CPACK_PACKAGE_VENDOR "Nightcap")
-set(CPACK_PACKAGE_CONTACT "vii <coderdayton14@gmail.com>")
-set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/CoderDayton/nightcap")
+set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}${MOCKTAIL_PACKAGE_VERSION_SUFFIX}")
+set(CPACK_PACKAGE_VENDOR "Mocktail Project")
+set(CPACK_PACKAGE_CONTACT "komaruworld <rtysus228@gmail.com>")
+set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/komaruworld/mocktail")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_DESCRIPTION}")
 set(CPACK_PACKAGE_DESCRIPTION
   "Runs the Android Roblox client on Linux."
@@ -825,7 +804,7 @@ set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
 set(CPACK_STRIP_FILES TRUE)
 
 set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
-set(CPACK_DEBIAN_PACKAGE_MAINTAINER "vii <coderdayton14@gmail.com>")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "komaruworld <rtysus228@gmail.com>")
 set(CPACK_DEBIAN_PACKAGE_SECTION "games")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
@@ -835,14 +814,15 @@ set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
 set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games")
 set(CPACK_RPM_PACKAGE_AUTOREQPROV ON)
 
-# Every variant installs the same /usr/bin/mocktail and /usr/share/mocktail,
-# so only one of them can be present at a time.
-set(MOCKTAIL_PACKAGE_SIBLINGS ${MOCKTAIL_PACKAGE_NAMES})
-list(REMOVE_ITEM MOCKTAIL_PACKAGE_SIBLINGS "${MOCKTAIL_PACKAGE_NAME}")
-string(JOIN ", " MOCKTAIL_PACKAGE_CONFLICTS ${MOCKTAIL_PACKAGE_SIBLINGS})
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "${MOCKTAIL_PACKAGE_CONFLICTS}")
-set(CPACK_DEBIAN_PACKAGE_REPLACES "${MOCKTAIL_PACKAGE_CONFLICTS}")
-set(CPACK_RPM_PACKAGE_CONFLICTS "${MOCKTAIL_PACKAGE_CONFLICTS}")
+if(MOCKTAIL_PACKAGE_NAME STREQUAL "mocktail-nightly")
+  set(CPACK_DEBIAN_PACKAGE_CONFLICTS "mocktail")
+  set(CPACK_DEBIAN_PACKAGE_REPLACES "mocktail")
+  set(CPACK_RPM_PACKAGE_CONFLICTS "mocktail")
+else()
+  set(CPACK_DEBIAN_PACKAGE_CONFLICTS "mocktail-nightly")
+  set(CPACK_DEBIAN_PACKAGE_REPLACES "mocktail-nightly")
+  set(CPACK_RPM_PACKAGE_CONFLICTS "mocktail-nightly")
+endif()
 include(CPack)
 
 add_dependencies(mocktail all_stubs)

FAQ.md

@@ -1,50 +1,40 @@
-<!-- Modified by vii from komaruworld/mocktail. See README "About this fork". -->
 # FAQ
 
-## How do I turn Discord RPC off?
+## How do I enable Discord RPC?
 
-RPC is on by default. It never signs in to Discord and never reads an
-account token. To turn it off, launch Nightcap once to create the config,
-then close it. Open `config.yaml`:
+RPC is disabled by default. Launch Mocktail once to create the config, then
+close it. Open `config.yaml`:
 
 - Native / AppImage: `~/.config/mocktail/config.yaml`
-- Flatpak: `~/.var/app/io.github.CoderDayton.nightcap/config/mocktail/config.yaml`
+- Flatpak: `~/.var/app/space.bigrat.mocktail/config/mocktail/config.yaml`
 
 For native installs, a custom `$XDG_CONFIG_HOME` replaces `~/.config`.
 
-Set `enabled` to `false` under `integrations.discord_rpc`. If the block is
+Set `enabled` to `true` under `integrations.discord_rpc`. If the block is
 missing, add it under the existing `integrations` section:
 
 ```yaml
 integrations:
   discord_rpc:
-    enabled: false
+    enabled: true
 ```
 
-Save the file and restart Nightcap. Set `enabled` back to `true` to turn
-RPC on again.
-
-## Can Discord count Nightcap as Roblox play time or quests?
-
-No. Discord only credits play time and quests to games its own scanner
-detects, and Rich Presence never counts. On Linux the scanner only matches
-games with a Linux entry in Discord's list. Roblox has none, so no process
-name Nightcap could use would be detected. Only Roblox or Discord can change
-that.
+Save the file, open Discord Desktop, and restart Mocktail. Set `enabled`
+back to `false` to disable RPC.
 
 ## Where can I find logs for a bug report?
 
-Nightcap saves logs automatically. Reproduce the issue, close Nightcap, and
+Mocktail saves logs automatically. Reproduce the issue, close Mocktail, and
 attach `latest.log`:
 
 - Native / AppImage: `~/.local/state/mocktail/logs/latest.log`
-- Flatpak: `~/.var/app/io.github.CoderDayton.nightcap/.local/state/mocktail/logs/latest.log`
+- Flatpak: `~/.var/app/space.bigrat.mocktail/.local/state/mocktail/logs/latest.log`
 
 For native installs, a custom `$XDG_STATE_HOME` replaces `~/.local/state`.
 
 ## Can I run multiple Roblox instances?
 
-No. Nightcap won't add multi-instance launching. It would mean working around
+No. Mocktail won't add multi-instance launching. It would mean working around
 Roblox's restrictions on running several clients. The [Roblox Terms of Use](https://en.help.roblox.com/hc/en-us/articles/115004647846-Roblox-Terms-of-Use)
 prohibit bypassing technical protections, and violating the terms can get your
 account suspended.
@@ -56,15 +46,12 @@ after Roblox added measures against running multiple clients.
 
 ## Can I play in VR?
 
-VR is experimental and lives on upstream's `vr` branch, which does not
-include the Nightcap changes. Install the
-[build dependencies](README.md#building), then switch to that branch and
-build:
+VR is experimental. Install the [build dependencies](README.md#building),
+then switch to the `vr` branch and build:
 
 ```bash
-git remote add upstream https://github.com/komaruworld/mocktail.git
-git fetch upstream
-git switch -c vr upstream/vr
+git fetch origin
+git switch vr
 git submodule update --init --recursive
 cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DMOCKTAIL_ENABLE_VR=ON
 cmake --build build -j4

Makefile

@@ -1,4 +1,3 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 .DEFAULT_GOAL := all
 .PHONY: all build release debug test apk install register-url-handler release-runtime portable portable-test standalone appimage flatpak run-flatpak run run-smoke run-unlimited run-game run-input run-resize run-network auto-run run-gles run-angle update-roblox update-auto update-auto-launch payload-status payload-rollback support-bundle clean submodules help
 
@@ -20,8 +19,8 @@ ANYLINUX_PACKAGER ?= quick-sharun
 ANYLINUX_APPIMAGETOOL ?= appimagetool
 PREFIX ?= /usr
 FLATPAK_BUILD_DIR ?= build-flatpak
-FLATPAK_MANIFEST ?= packaging/flatpak/io.github.CoderDayton.nightcap.json
-FLATPAK_JOBS ?= 2
+FLATPAK_MANIFEST ?= packaging/flatpak/space.bigrat.mocktail.json
+FLATPAK_JOBS ?= 4
 
 define build_native_runtime
 	@git submodule update --init --recursive
@@ -56,7 +55,7 @@ install: ## Install an already-built dynamic runtime (use: sudo make install)
 register-url-handler: build ## Select this build for Roblox website links
 	@./scripts/register_url_handler.sh --set-default \
 		--executable "$(abspath $(BINARY))" \
-		--desktop-file "$(abspath packaging/io.github.CoderDayton.nightcap.desktop)"
+		--desktop-file "$(abspath packaging/space.bigrat.mocktail.desktop)"
 
 test: ## Build and run all unit tests
 	$(call build_native_runtime,Debug,ON)
@@ -92,7 +91,7 @@ flatpak: ## Build and install the local x86-64 Flatpak
 		--jobs "$(FLATPAK_JOBS)"
 
 run-flatpak: ## Run the installed Flatpak
-	@flatpak run io.github.CoderDayton.nightcap
+	@flatpak run space.bigrat.mocktail
 
 run: export MOCKTAIL_AUTO_EXIT_AFTER_PRESENT_MS = 0
 run: build ## Run the native binary interactively until the window is closed

README.md

@@ -1,90 +1,20 @@
-<!-- Modified by vii from komaruworld/mocktail. See "About this fork" below. -->
-<div align="center">
-  <img src="https://raw.githubusercontent.com/CoderDayton/nightcap/main/packaging/io.github.CoderDayton.nightcap.svg" alt="Nightcap logo" width="128">
-  <h1 style="margin-top: 5px;">
-    Nightcap
-    <br>
-    <a href="https://github.com/CoderDayton/nightcap/actions/workflows/ci.yml"><img src="https://github.com/CoderDayton/nightcap/actions/workflows/ci.yml/badge.svg" alt="CI"></a>
-    <a href="https://github.com/CoderDayton/nightcap/stargazers"><img src="https://img.shields.io/github/stars/CoderDayton/nightcap?style=flat&logo=github" alt="Stars"></a>
-    <a href="LICENSE"><img src="https://img.shields.io/badge/license-Apache--2.0-blue.svg" alt="License"></a>
-  </h1>
-</div>
+# Mocktail
 
-Nightcap is Mocktail, tuned for playing on a real PC. It runs the Android
-`x86_64` Roblox client on Linux, including a Linux userspace hosted by
-FreeBSD's Linuxulator. It provides the Android ABI and JNI pieces the client
-expects, then connects them to SDL3 and Vulkan or OpenGL on the Linux side.
+[![CI](https://github.com/komaruworld/mocktail/actions/workflows/ci.yml/badge.svg)](https://github.com/komaruworld/mocktail/actions/workflows/ci.yml)
+[![Stars](https://img.shields.io/github/stars/komaruworld/mocktail?style=flat&logo=github)](https://github.com/komaruworld/mocktail/stargazers)
+[![Downloads](https://img.shields.io/github/downloads/komaruworld/mocktail/total?logo=github)](https://github.com/komaruworld/mocktail/releases/latest)
+[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
+[![Discord](https://img.shields.io/discord/1543955607869063269?label=discord)](https://discord.gg/rhgpfcmFSD)
 
-Nightcap is an independent community project. It is not affiliated with Roblox
+Mocktail runs the Android `x86_64` Roblox client on Linux and has experimental
+`aarch64` builds for the Android `arm64-v8a` client. It also runs in a Linux
+userspace hosted by FreeBSD's Linuxulator. Mocktail provides the Android ABI
+and JNI pieces the client expects, then connects them to SDL3 and Vulkan or
+OpenGL on the Linux side.
+
+Mocktail is an independent community project. It is not affiliated with Roblox
 Corporation or VinegarHQ and does not distribute the Roblox client.
 
-## About this fork
-
-Nightcap is a fork of [komaruworld/mocktail](https://github.com/komaruworld/mocktail)
-with extra fixes for playing on a PC. The program and config paths keep the
-`mocktail` name so upstream fixes still apply cleanly. The app ID is
-`io.github.CoderDayton.nightcap`, so Nightcap and upstream can be installed
-side by side.
-
-- **Lower input lag.** Frames are shown as soon as they are ready instead of
-  waiting in a queue.
-- **Sharper textures.** Small textures are upscaled 4x by default, and you
-  can replace any texture with your own PNG in `~/.config/mocktail/textures`.
-  A ready-made crosshair is in [`textures/`](textures/README.md). Set
-  `MOCKTAIL_SMALL_TEXTURE_UPSCALE=1` to turn the upscale off.
-- **ETC2 textures on any GPU.** Games that use compressed mobile textures now
-  render correctly on desktop GPUs, without stutter.
-- **No more error 319 kicks.** Servers no longer drop you shortly after
-  joining.
-- **Correct device info.** Roblox sees your real RAM and screen size.
-- **Better desktop launcher.** Runs on Wayland and always finds the installed
-  binary.
-
-Everything else works the same as upstream. See the
-[roadmap](docs/ROADMAP.md) for what is coming next, the
-[changelog](CHANGELOG.md) for what each release changed,
-[performance](docs/PERFORMANCE.md) for CPU load, heat and the knobs that change
-them, and the [FAQ](FAQ.md) for Discord RPC, logs, and VR.
-
-## Install with Flatpak
-
-```bash
-flatpak install --user https://coderdayton.github.io/nightcap/nightcap.flatpakref
-flatpak run io.github.CoderDayton.nightcap
-```
-
-Updates arrive through `flatpak update`. Nightcap is not on Flathub yet.
-
-## AppImage
-
-Grab the AppImage from the
-[latest release](https://github.com/CoderDayton/nightcap/releases/latest),
-make it executable, and run it:
-
-```bash
-chmod +x Nightcap-x86_64.AppImage
-./Nightcap-x86_64.AppImage
-```
-
-## Distribution packages
-
-Each release also carries a DEB, an RPM, and a pacman package, with a
-`.sha256` beside every file on the
-[releases page](https://github.com/CoderDayton/nightcap/releases/latest):
-
-```bash
-sudo apt install ./nightcap_<version>_amd64.deb
-sudo dnf install ./nightcap-<version>-1.x86_64.rpm
-sudo pacman -U nightcap-<version>-1-x86_64.pkg.tar.zst
-```
-
-They install `/usr/bin/mocktail`, so they conflict with upstream's `mocktail`
-package. Nightcap is not in any distribution repository or the AUR; the
-recipes under `packaging/aur` are kept for local builds only.
-
-Or build and install from source using the steps under
-[Building](#building).
-
 ## How it works
 
 ```
@@ -92,24 +22,91 @@ Roblox APK -> signature and ABI checks -> Bionic + JNI -> SDL3 + Vulkan/OpenGL
 ```
 
 The APK is checked before any native code is loaded. It is downloaded on first
-launch and is not bundled with Nightcap. The last working copy is kept in case
+launch and is not bundled with Mocktail. The last working copy is kept in case
 an update fails.
 
+## Install with Flatpak
+
+Install the stable release from Flathub:
+
+```bash
+flatpak install flathub space.bigrat.mocktail
+flatpak run space.bigrat.mocktail
+```
+
+Nightly builds are produced automatically from the latest `main` branch:
+
+```bash
+flatpak install --user https://mocktail.bigrat.space/mocktail.flatpakref
+flatpak run space.bigrat.mocktail
+```
+
+## Install from the AUR
+
+Arch Linux users can install either the pinned source release (`mocktail`) or
+the current development version (`mocktail-git`) with an AUR helper:
+
+```bash
+paru -S mocktail-git
+# or
+yay -S mocktail-git
+```
+
+Use `mocktail` instead of `mocktail-git` to build the pinned release from
+source, or install the stable prebuilt package with `paru -S mocktail-bin` or
+`yay -S mocktail-bin`.
+
+## Install with DNF
+
+Fedora 44 users can install either the stable `mocktail` package or the
+`mocktail-nightly` package built from `main`:
+
+```bash
+sudo curl -fsSL https://mocktail.bigrat.space/rpm/mocktail.repo \
+  -o /etc/yum.repos.d/mocktail.repo
+sudo dnf install mocktail
+# or
+sudo dnf install mocktail-nightly
+```
+
+## Install with APT
+
+Ubuntu 26.04 users can install either the stable `mocktail` package or the
+`mocktail-nightly` package built from `main`:
+
+```bash
+sudo install -d -m 0755 /etc/apt/keyrings
+sudo curl -fsSL https://mocktail.bigrat.space/mocktail-packages.gpg \
+  -o /etc/apt/keyrings/mocktail.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/mocktail.gpg] https://mocktail.bigrat.space/apt mocktail main" | \
+  sudo tee /etc/apt/sources.list.d/mocktail.list >/dev/null
+sudo apt update
+sudo apt install mocktail
+# or
+sudo apt install mocktail-nightly
+```
+
+## Direct downloads
+
+Direct AppImage, DEB, and RPM downloads are available from the
+[Website](https://mocktail.bigrat.space/) and
+[GitHub Releases](https://github.com/komaruworld/mocktail/releases).
+
 <details>
 <summary>Screenshots</summary>
 
-![Roblox home in Nightcap](assets/screenshots/flatpak-home.png)
+![Roblox home in Mocktail](assets/screenshots/flatpak-home.png)
 
-![Roblox gameplay in Nightcap](assets/screenshots/flatpak-gameplay-tower.png)
+![Roblox gameplay in Mocktail](assets/screenshots/flatpak-gameplay-tower.png)
 
-![Roblox experience in Nightcap](assets/screenshots/flatpak-gameplay-lobby.png)
+![Roblox experience in Mocktail](assets/screenshots/flatpak-gameplay-lobby.png)
 
 </details>
 
 ## FFlag overrides
 
 Put a JSON object in `$XDG_CONFIG_HOME/mocktail/fflags.json` (usually
-`~/.config/mocktail/fflags.json`). Nightcap applies it on the next launch.
+`~/.config/mocktail/fflags.json`). Mocktail applies it on the next launch.
 
 PC profiles use the legacy Charts page by default to avoid the blank screen
 caused by `Color3` errors in the newer SDUI page. An explicit
@@ -121,23 +118,21 @@ caused by `Color3` errors in the newer SDUI page. An explicit
   "DFIntExample": "120"
 }
 ```
-## Settings
+## FAQ
 
-Edit `~/.config/mocktail/config.yaml`. Useful options:
+To see the most Frequently Asked Question go check [FAQ.md](FAQ.md)
 
-- `graphics.frame_rate_limit: display` to unlock FPS to your monitor's rate.
-- `graphics.vsync: off` for the lowest lag, at the cost of tearing.
-- `graphics.backend: opengl` if Vulkan does not work on your GPU.
 
 ## Building
 
-Linux `x86_64` is supported. Experimental FreeBSD 15.1 Linuxulator support has
-been tested with an `x86_64` Fedora 44 userspace. On FreeBSD, Nightcap runs
-inside Linuxulator; it is not a native FreeBSD binary. Building requires CMake
-3.20+, Git, pkg-config, LLD, binutils, a C++17 compiler, SDL 3.4+, SDL3_ttf,
-Vulkan, EGL, libplacebo, fontconfig, libcurl, OpenSSL, libelf, libyaml, libpng,
-minizip, Capstone 5, utf8proc, nlohmann/json, GTK4, libadwaita 1.6+, and
-WebKitGTK 6.0.
+Linux `x86_64` is supported. Linux `aarch64` builds are available, with Roblox
+runtime validation still experimental. FreeBSD 15.1 Linuxulator support is
+experimental and has been tested with an `x86_64` Fedora 44 userspace. On
+FreeBSD, Mocktail runs inside Linuxulator; it is not a native FreeBSD binary.
+Building requires CMake 3.20+, Git, pkg-config, LLD, binutils, a C++17
+compiler, SDL 3.4+, SDL3_ttf,
+Vulkan, EGL, libplacebo, fontconfig, libcurl, OpenSSL, libelf, libyaml, minizip,
+Capstone 5, utf8proc, nlohmann/json, GTK4, libadwaita 1.6+, and WebKitGTK 6.0.
 
 See the [FreeBSD Guide](packaging/freebsd/README.md) for setup and launch instructions.
 
@@ -148,10 +143,10 @@ See the [FreeBSD Guide](packaging/freebsd/README.md) for setup and launch instru
 sudo apt update
 sudo apt install build-essential cmake git ninja-build pkg-config lld \
   libsdl3-dev libsdl3-ttf-dev libcurl4-openssl-dev libssl-dev \
-  nlohmann-json3-dev libyaml-dev libpng-dev libelf-dev libminizip-dev \
+  nlohmann-json3-dev libyaml-dev libelf-dev libminizip-dev \
   libcapstone-dev libgtk-4-dev libadwaita-1-dev libwebkitgtk-6.0-dev \
   libutf8proc-dev libfontconfig1-dev libegl-dev libvulkan-dev \
-  libplacebo-dev zlib1g-dev
+  libplacebo-dev libpng-dev zlib1g-dev
 ```
 </details>
 
@@ -160,7 +155,7 @@ sudo apt install build-essential cmake git ninja-build pkg-config lld \
 
 ```bash
 sudo pacman -S --needed base-devel cmake git ninja pkgconf lld sdl3 sdl3_ttf \
-  curl openssl nlohmann-json libyaml libpng libelf minizip capstone gtk4 \
+  curl openssl nlohmann-json libyaml libelf minizip capstone gtk4 \
   libadwaita webkitgtk-6.0 libutf8proc fontconfig libglvnd \
   libplacebo vulkan-headers vulkan-icd-loader zlib
 ```
@@ -172,8 +167,7 @@ sudo pacman -S --needed base-devel cmake git ninja pkgconf lld sdl3 sdl3_ttf \
 ```bash
 sudo dnf install gcc-c++ cmake git ninja-build pkgconf-pkg-config lld \
   SDL3-devel SDL3_ttf-devel libcurl-devel openssl-devel \
-  nlohmann-json-devel libyaml-devel libpng-devel elfutils-libelf-devel \
-  minizip-ng-compat-devel \
+  nlohmann-json-devel libyaml-devel elfutils-libelf-devel minizip-ng-compat-devel \
   capstone-devel gtk4-devel libadwaita-devel webkitgtk6.0-devel \
   utf8proc-devel fontconfig-devel libglvnd-devel vulkan-headers \
   vulkan-loader-devel libplacebo-devel zlib-ng-compat-devel
@@ -181,39 +175,17 @@ sudo dnf install gcc-c++ cmake git ninja-build pkgconf-pkg-config lld \
 </details>
 
 ```bash
-git clone --recurse-submodules https://github.com/CoderDayton/nightcap.git
-cd nightcap
+git clone --recurse-submodules https://github.com/komaruworld/mocktail.git
+cd mocktail
 make build
 ./build/mocktail
 ```
 
-To install it for your user, with an app menu entry and Roblox link handling:
-
-```bash
-make install PREFIX=~/.local
-```
-
-Use `sudo make install` instead to install system-wide under `/usr`. To make
-Roblox website links open the build tree copy without installing, run
-`make register-url-handler`.
-
-To build and install the Flatpak from source, install `flatpak-builder` and run
-`make flatpak`. It builds with 2 parallel jobs to keep memory use low. Pass
-`FLATPAK_JOBS=N` to `make flatpak`, or set `MOCKTAIL_FLATPAK_JOBS=N` for
-`scripts/build_flatpak.sh`, to change that.
-
-To run the same checks as CI before each commit and push, install
-[lefthook](https://github.com/evilmartians/lefthook) and run once:
-
-```bash
-lefthook install
-```
-
 ## Known limitations
 
-Nightcap does not currently work with `hardened_malloc`. Using
-`hardened_malloc` may cause Nightcap to fail to start or crash during runtime.
-Run Nightcap without `hardened_malloc` enabled.
+Mocktail does not currently work with `hardened_malloc`. Using
+`hardened_malloc` may cause Mocktail to fail to start or crash during runtime.
+Run Mocktail without `hardened_malloc` enabled.
 
 ## License
 
@@ -221,12 +193,7 @@ Run Nightcap without `hardened_malloc` enabled.
 
 ## Support
 
-Support this fork by giving it a star or with cryptocurrency:
-
-- LTC: `LdABR2ELRYrUESWZWrEk1uNx38gHHMuHUU`
-- SOL: `tjeDnPoWeyW8zfTf8c5CVAm5QTV8vFPaPouaScAdwfT`
-
-Support the upstream project, which does most of the heavy lifting:
+You can support the project by giving it a star or with cryptocurrency:
 
 - USDT (TON): `UQCi6Yzcc9cOctoij6n_r1K90-OdVxAT0D_xo2UzGKkQaJDY`
 - USDT (TRC20): `TNPMG9Vig2xiuo2r1QqnXRChPH7Vu28Jmx`

cmake/MocktailPlatformGraphics.cmake

@@ -1,4 +1,3 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # Licensed under the Apache License, Version 2.0.
 
@@ -13,7 +12,7 @@ find_path(MOCKTAIL_EGL_INCLUDE_DIR EGL/egl.h REQUIRED)
 find_path(MOCKTAIL_GLES3_INCLUDE_DIR GLES3/gl3.h REQUIRED)
 
 set(MOCKTAIL_WINDOW_ICON_PNG
-  "${MOCKTAIL_PLATFORM_GRAPHICS_ROOT}/packaging/icons/hicolor/48x48/apps/io.github.CoderDayton.nightcap.png"
+  "${MOCKTAIL_PLATFORM_GRAPHICS_ROOT}/packaging/icons/hicolor/48x48/apps/space.bigrat.mocktail.png"
 )
 set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
   "${MOCKTAIL_WINDOW_ICON_PNG}"

config/mocktail.example.yaml

@@ -1,4 +1,3 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Mocktail configuration.
 # The file is created once with mode 0600. Mocktail never replaces your edits.
 
@@ -47,9 +46,7 @@ graphics:
   # display, unlimited, or any positive integer; fixed values are forwarded to
   # DFIntTaskSchedulerTargetFps without a whitelist.
   # frame_rate_limit: -1
-  # Optional presentation synchronization override: auto, on, or off. auto
-  # presents through the lowest-latency synchronized mode the driver offers
-  # unless frame_rate_limit is unlimited.
+  # Optional presentation synchronization override: auto, on, or off.
   # vsync: off
 
 performance:
@@ -77,14 +74,6 @@ audio:
   # between boots; prefer the exact device name when it is unique.
   input_device: default
 
-input:
-  # Boolean (default: false): send mouse look deltas in the host's own units.
-  # They are otherwise scaled by the window's pixel density divided by the
-  # desktop display scale, which cancels to 1.0 unless fractional scaling makes
-  # the two disagree. Turn this on when first-person aiming feels too slow or
-  # too fast under fractional scaling. The pointer position is unaffected.
-  raw_mouse: false
-
 integrations:
   fleasion:
     # Boolean (default: false): trust Fleasion's CA without editing Roblox files.
@@ -97,9 +86,9 @@ integrations:
     # or ~/.config/Fleasion/proxy_ca/ca.crt. Never select ca.key.
     # ca_certificate: /home/user/.config/Fleasion/proxy_ca/ca.crt
   discord_rpc:
-    # Boolean (default: true): publish Nightcap activity to Discord Desktop.
+    # Boolean (default: false): publish Mocktail activity to Discord Desktop.
     # This never signs in to Discord and never reads an account token.
-    enabled: true
+    enabled: false
     # Boolean (default: true): show the current Roblox experience name.
     show_place_name: true
     # Boolean (default: true): show how long the current session has run.
@@ -112,24 +101,12 @@ integrations:
       public_servers_only: true
       # button_label: Join Server
     # English defaults. Uncomment only the lines you want to customize.
-    # Text and image fields accept {place_name}, {place_icon}, and
-    # {creator_name}. A field that expands an empty placeholder is left out,
-    # and a "" title shows the app name.
-    # title, state, and the images fields may be "" to hide them.
     # text:
     #   browsing: Browsing experiences
     #   joining: Joining an experience
-    #   playing: "Playing {place_name}"
-    #   state: "by {creator_name}"
+    #   playing: "{place_name}"
+    #   state: Playing Roblox
     #   unknown_place: Unknown experience
-    #   title: Roblox
-    # Images take an https:// URL, or an asset key uploaded to application_id.
-    # large: "" hides both images; the small image needs a large one.
-    # images:
-    #   large: "{place_icon}"
-    #   large_text: "{place_name}"
-    #   small: roblox_small
-    #   small_text: Roblox
     # Advanced: overrides the application bundled by the package maintainer.
     # application_id: 123456789012345678
 

docs/BENCHMARKING.md

@@ -1,123 +0,0 @@
-# Benchmarking
-
-A pull request that claims a speedup shows before and after numbers taken
-the way this guide describes. Numbers from different machines are not
-compared with each other. Each run is compared with a run on the same
-machine.
-
-## Two layers, two tools
-
-Roblox measures its own work. Nightcap measures the layer between Roblox and
-your driver.
-
-| Layer | What it covers | Tool |
-| --- | --- | --- |
-| Roblox | Scripts, physics, rendering jobs, network | Roblox's stats overlays, Shift+F4 and Shift+F5 in game |
-| Nightcap | Vulkan adapter: present, swapchain and GPU waits, submits, ETC2 texture decode, pipeline and shader creation | `--profile` |
-
-A Nightcap change should move the `--profile` numbers. If it only moves the
-Roblox overlay numbers, say so in the pull request, since the cause is then
-less direct.
-
-## Recording a trace
-
-```sh
-mocktail --profile ~/nightcap-before.json
-```
-
-The Vulkan adapter writes a Chrome-format trace to that file, a few times a
-second. The file is valid JSON after every write, so a session that crashes
-or is killed still leaves a readable trace. Exit from the Roblox menu when you are done. Open the file
-in [ui.perfetto.dev](https://ui.perfetto.dev) or `chrome://tracing`.
-
-Expect about 130 bytes per event, around 15 MB per minute at 240 FPS.
-Profiling is off unless `--profile` is given, and `MOCKTAIL_PROFILE_TRACE`
-does the same thing as the flag.
-
-### What the trace contains
-
-Each slice is named after the call it times, on the thread that made it.
-
-| Category | Slices | Arguments |
-| --- | --- | --- |
-| `present` | `vkQueuePresentKHR`: the whole adapter present, including the text overlay | `result` |
-| `present` | `host present`: the host driver's present, nested inside the slice above | |
-| `wait` | `vkAcquireNextImageKHR`, `vkAcquireNextImage2KHR`, `vkWaitForFences`, `vkWaitSemaphores`, `vkWaitSemaphoresKHR`, `vkQueueWaitIdle`, `vkDeviceWaitIdle` | |
-| `submit` | `vkQueueSubmit`, `vkQueueSubmit2`, `vkQueueSubmit2KHR` | `submits` |
-| `texture` | `etc2 decode`: CPU decode of ETC2 textures. On a device with a timeline semaphore this runs on the decode dispatcher, not the submitting thread | `uploads`, `compressed_bytes`, `decoded_bytes` |
-| `texture` | `etc2 gather`: the part of an asynchronous upload that stays on the submitting thread. Absent when the decode ran inline | `uploads`, `compressed_bytes`, `decoded_bytes`, `ticket` |
-| `texture` | `etc2 staging create`: creating a staging block for ETC2 uploads, when no block has room left | `bytes` |
-| `texture` | `etc2 staging destroy`: destroying empty staging blocks beyond the four kept idle | `buffers` |
-| `texture` | `etc2 release wait`: a command buffer reset waiting for its uploads' decode. Only waits of 0.1 ms or more are recorded | `ticket` |
-| `memory` | `vkAllocateMemory` | `bytes`, `type` (memory type index), `result` |
-| `memory` | `vkFreeMemory`, `vkUnmapMemory`: both include waiting for ETC2 decodes that still read that memory | |
-| `memory` | `vkMapMemory`, `vkCreateImage`, `vkDestroyImage` | |
-| `pipeline` | `vkCreateGraphicsPipelines`, `vkCreateComputePipelines` | `count`, `cache` (1 when a pipeline cache was passed), `result` |
-| `pipeline` | `vkCreateShaderModule` | `bytes`, `result` |
-| `pipeline` | `vkCreatePipelineCache` | `initial_bytes`, `result` |
-| `pump` | `nativeCallMessagesFromMainThread`: the engine's main-thread step, on the host main thread. Only calls of 20 µs or more are recorded; the empty polls between them are not. | `cpu_us`: CPU time the main thread used during the call. Far below the slice's duration means the step spent it waiting |
-
-The `frame interval (ms)` counter is the time between successive adapter
-presents. `vkQueuePresentKHR` time minus `host present` time is the adapter's
-own cost per frame.
-
-Two more counters cover the same interval. `present thread cpu (ms)` is the
-CPU time the thread that presents used in it, and is absent for a frame
-presented from a different thread than the one before. `process cpu (ms)` is
-the CPU time of every thread together, so dividing it by the frame interval
-gives the number of cores busy. A long frame with little present-thread CPU
-was spent waiting.
-
-## The benchmark runs
-
-Run every scenario before and after the change, on the same build type
-(`make build`), with the same `config.yaml`. Close other GPU-heavy apps.
-Record `graphics.frame_rate_limit` and `graphics.vsync` in the pull request,
-because a frame cap hides frame time gains.
-
-Record `~/.config/gamemode.ini` too, and do not change it between the before
-and after runs. `desiredgov` there decides the CPU governor for the whole
-session and therefore which engine pump mode is chosen, which moves process
-CPU by more than most changes under test. See
-[PERFORMANCE.md](PERFORMANCE.md).
-
-Frame interval p99 varies by 2 ms or more between identical runs, so a
-difference that size is not a result. Three runs per scenario is the minimum
-for any frame-time claim; slice totals for a specific subsystem are far less
-noisy and can be read from fewer.
-
-| Scenario | How to start | What to do | What it shows |
-| --- | --- | --- | --- |
-| Home screen, cold | `mocktail --profile home-cold.json` with an empty shader cache (below) | Wait 30 s on the home screen, exit | First-load stutter: `pipeline` and `texture` slices |
-| Tower of Hell | `mocktail --profile toh.json --launch-uri "roblox://experiences/start?placeId=1962086868"` | Stand still at spawn for 60 s, exit | Steady-state frame time on a light scene |
-| Murder Mystery 2 | `mocktail --profile mm2.json --launch-uri "roblox://experiences/start?placeId=142823291"` | Stay in the lobby for 60 s, exit | Frame time with many players and a busier scene |
-
-For the cold run, point the driver's shader cache at an empty directory, so
-your normal cache is left alone:
-
-```sh
-cache=$(mktemp -d)
-MESA_SHADER_CACHE_DIR="$cache" __GL_SHADER_DISK_CACHE_PATH="$cache" \
-  mocktail --profile home-cold.json
-```
-
-`MESA_SHADER_CACHE_DIR` applies to Mesa drivers (AMD, Intel) and
-`__GL_SHADER_DISK_CACHE_PATH` to the NVIDIA driver.
-
-Run each scenario three times and keep the median run, since one run can
-catch a background stall.
-
-## Comparing runs
-
-```sh
-scripts/summarize_profile_trace.py toh-before.json toh-after.json
-```
-
-This prints a Markdown table with one column per trace: frame count, frame
-interval mean, p50, p95, p99 and max, then count, total, mean, p99 and max
-for every slice name, largest total first. Paste the table into the pull
-request and attach both traces.
-
-For frame time, compare p95 and p99 as well as the mean. Stutter shows up in
-the tail first. For first-load work, compare the `total (ms)` rows of the
-`pipeline` and `texture` slices from the cold run.

docs/PERFORMANCE.md

@@ -1,193 +0,0 @@
-# Performance and CPU load
-
-What Nightcap does to your CPU and GPU, which knobs change it, and how to
-measure rather than guess.
-
-## GameMode core pinning
-
-Nightcap asks Feral GameMode for a performance session at startup
-(`performance.gamemode`, default `auto`). GameMode raises the CPU governor and
-the process priority, which helps.
-
-On a CPU with a wide spread of per-core maximum frequencies — Intel P-core and
-E-core parts, AMD parts with preferred cores — GameMode also pins the process
-to the fastest cores. On a 32-thread host that can mean 4 usable threads out of
-32. Roblox spreads its work across a worker pool, so the pin concentrates that
-pool onto a couple of physical cores instead of spreading it. Those cores sit
-near their boost ceiling and run hot while the rest of the chip idles.
-
-GameMode re-applies the pin roughly every 5 seconds, so widening the mask from
-inside the process does not hold. Releasing the request does release the pin.
-
-Under `auto`, Nightcap therefore checks its CPU affinity immediately after the
-request. If GameMode narrowed it, Nightcap ends the request and prints:
-
-```
-  [gamemode] released: it pinned this process to a subset of the CPUs, ...
-```
-
-The trade is that GameMode's governor and priority boost go with it. To keep
-those and lose only the pinning, turn pinning off for every game on the host.
-
-These are the settings to run with:
-
-```ini
-# ~/.config/gamemode.ini
-[general]
-desiredgov=performance
-
-[cpu]
-pin_cores=no
-park_cores=no
-```
-
-`desiredgov` is the one to check first. The packaged default in
-`/usr/share/gamemode/gamemode.ini` is already `performance`, but a value in
-your own file replaces it, and `desiredgov=powersave` there means GameMode
-clocks the CPU **down** for the whole session while still reporting
-`[gamemode] performance request active`. The symptoms are a low CPU clock
-under load, a GPU that never leaves its lower SM clocks, and the engine pump
-falling back to `tpause` — which costs about 70% of a core instead of 3%,
-because `sleep` is only chosen when the governor reads `performance`. On one
-13900K host, correcting `powersave` to `performance` took the process from
-177% CPU to 42% and the package from 70°C to 53-63°C, at the same frame rate.
-
-GameMode reads `$XDG_CONFIG_HOME`, `/usr/share/gamemode` and `/etc`, in that
-order. It does not read anything under Nightcap's own config directory, so this
-file has to live in one of those three places. The daemon reads it when it
-starts, so restart it after editing: `systemctl --user restart gamemoded`.
-
-Restarting the daemon drops the session of any game already running; relaunch
-the game for new settings to apply to it.
-
-`gamemoded` is D-Bus activated through
-`com.feralinteractive.GameMode.service`, so `systemctl --user stop gamemoded`
-does not hold — the next client request starts it again within seconds. To
-measure with GameMode genuinely off, mask it:
-
-```bash
-systemctl --user mask gamemoded     # and --unmask afterwards
-```
-
-The governor switch runs through polkit. Debian and Ubuntu only allow it for
-members of the `gamemode` group; without that, the daemon's journal shows
-`cpugovctl set performance: Not authorized` and the governor stays put while
-the session is otherwise active. Add yourself and log in again:
-
-```bash
-sudo usermod -aG gamemode "$USER"
-```
-
-Fedora and Arch allow any logged-in local user.
-
-Setting `performance.gamemode: on` accepts the pinning instead: `on` is an
-explicit request for GameMode, and Nightcap keeps the session whatever it does
-to the affinity. `off` never contacts the daemon.
-
-To see which CPUs the process may use:
-
-```bash
-pid=$(pgrep -x Main)
-for t in /proc/$pid/task/*; do taskset -pc "${t##*/}"; done
-```
-
-Two traps here. The engine process reports its name as `Main`, not
-`mocktail`; `pgrep -x mocktail` finds only the launcher, which sits near 0%
-CPU and tells you nothing. And `taskset -p` reads one thread, not the whole
-process, so a single call reports the main thread's mask and says nothing
-about the workers — which is where the game's load actually is.
-
-For the same reason, `ps -L -o psr=` shows which core each thread is running
-on right now, not which cores it is allowed on. On a hybrid CPU the scheduler
-preferring P-cores for runnable work is normal and is not a mask.
-
-## The main-thread pump
-
-Roblox posts its per-frame main-thread step at a time of its own choosing,
-and nothing signals the host when it does. The host main thread therefore
-polls `nativeCallMessagesFromMainThread`, and a post that waits more than a
-fraction of a millisecond costs a whole frame. Between polls the thread rests
-for 100 µs, and how it rests decides the CPU clock:
-
-| Mode | When | What it costs |
-| --- | --- | --- |
-| `sleep` | The governor is `performance`, which GameMode sets | The thread idles at about 3% of a core. The governor holds the clock. |
-| `tpause` | Otherwise, on a CPU with WAITPKG (Intel 12th gen and newer) | The core stays awake in a light C0 state. Frame rate holds; the OS books the time as busy, so the thread shows around 70% of a core, at lower power than a spin. |
-| `spin` | Otherwise | The core stays awake at full power. |
-
-Under a power-saving governor the CPU clocks a bursty core down unless some
-core stays awake, and Roblox's render thread then runs slower and drops
-frames. That is why `sleep` is not the default there. Startup prints the
-chosen mode:
-
-```
-  [main] engine pump rest: tpause (MOCKTAIL_ENGINE_PUMP_REST=sleep|tpause|spin)
-```
-
-`MOCKTAIL_ENGINE_PUMP_REST` forces a mode. `sleep` without the governor's help
-runs cooler for a few frames per second less; measure before keeping it.
-
-## Small texture upscaling
-
-`MOCKTAIL_SMALL_TEXTURE_UPSCALE` (default `4`) redraws ETC2 textures of 64px or
-smaller at N times their width and height. At the default that is 16 times the
-pixels per affected texture.
-
-The cost lands in two places. Decoding and resampling is CPU work on up to 8
-threads while textures load, which shows up as a burst rather than a steady
-load. The enlarged textures then stay in GPU memory for the session and cost
-extra sampling bandwidth on every frame that uses them.
-
-That decode does not run on the thread that submits the frame. On a device
-with a timeline semaphore, uploads decode on a background dispatcher and the
-submit carries a semaphore wait, so the GPU waits for the texture instead of
-the render thread. In the trace this is the `etc2 decode` slice on its own
-thread, with only a negligible `etc2 gather` left on the submitting one. A
-device without that feature decodes inline as before.
-
-Set it to `1` to turn upscaling off:
-
-```bash
-MOCKTAIL_SMALL_TEXTURE_UPSCALE=1 mocktail
-```
-
-## Frame rate and present mode
-
-`graphics.frame_rate_limit` (default `-1`) leaves Roblox's own in-game
-framerate cap in charge; Nightcap sets no `DFIntTaskSchedulerTargetFps`
-override. A fixed value forwards that number to the scheduler.
-
-`graphics.vsync` (default `auto`) selects the presentation mode. `auto` and
-`on` both pick the lowest-latency synchronized mode the driver offers, in
-order: `FIFO_LATEST_READY`, `MAILBOX`, `FIFO_RELAXED`, `FIFO`. The first two do
-not block the render thread on the display refresh, so the frame rate is
-governed by the in-game cap rather than by presentation. `off` selects
-`IMMEDIATE` and does not synchronize at all.
-
-If the frame rate is higher than your refresh rate, the extra frames are work
-you cannot see. Lower the in-game cap to your refresh rate first.
-
-## Measuring
-
-Shift+F4 in game shows Roblox's own scheduler jobs, with a millisecond cost and
-a percentage for each. It does not show Nightcap's threads — the Vulkan
-adapter, the ETC2 decode workers, the libc shim — so it is a reading on the
-game, not on the process.
-
-For the whole process:
-
-```bash
-top -H -p $(pgrep -x mocktail)      # per-thread CPU, sorted
-ps -L -o psr=,pcpu=,comm= -p $(pgrep -x mocktail)   # which core each thread is on
-nvidia-smi --query-gpu=utilization.gpu,temperature.gpu,power.draw --format=csv
-```
-
-A thread pinned near 100% while the frame rate is steady is a busy-wait. The
-one exception is the host main thread in `tpause` mode, which the OS reports
-as busy while the core is parked (see above). Load spread across many
-`RBX Worker` threads is the game's own scheduler, and its cost tracks the
-place you are in — part count, moving parts and joints all show in the
-Shift+F4 World section.
-
-`--profile <file>` writes a Chrome trace of the Vulkan adapter's work for
-ui.perfetto.dev. See [BENCHMARKING.md](BENCHMARKING.md).

docs/ROADMAP.md

@@ -1,81 +0,0 @@
-# Nightcap roadmap
-
-What Nightcap is working toward, in priority order. Items move to
-[Shipped](#shipped) when they land on `main`. Open an issue to propose a
-change to this list.
-
-## 1. Settings UI
-
-Nightcap is configured by editing `~/.config/mocktail/config.yaml`. Most
-people never open it, so they never find the FPS unlock or the vsync switch.
-
-Goal: a small GTK4 settings window, reachable from the app menu and from a
-`--settings` flag, that reads and writes the same `config.yaml`.
-
-- Graphics tab: backend, frame rate limit, vsync, small texture upscale.
-- Input tab: the `input.raw_mouse` toggle and controller options.
-- Advanced tab: FFlag overrides with a plain text editor for `fflags.json`.
-- Discord tab: every field in the `discord_rpc` block, so a friend can see
-what you are playing and you can switch it all off in one click.
-- Changes apply on next launch. A restart button restarts Nightcap.
-
-Done when every option in `config/mocktail.example.yaml` that a player would
-touch can be set without a text editor.
-
-## 2. Controller button glyphs
-
-Upstream added Xbox and PlayStation gamepad support through SDL. Controllers
-already hot-plug and release their held inputs when unplugged. One rough edge
-is left.
-
-- Correct button glyphs for the connected pad. `SDL_GetGamepadType` is only
-read for Xbox and PlayStation pads, so a Switch Pro, a GameCube pad, or any
-generic pad SDL reports as `SDL_GAMEPAD_TYPE_STANDARD` reaches Roblox as
-type 0 and draws generic glyphs. `SDL_GetRealGamepadType`, and the vendor
-and product IDs, are available and unused.
-
-Done when a plugged-in pad shows its own buttons.
-
-## Shipped
-
-- Lower input latency: frames are presented as soon as they are ready.
-- Controllers hot-plug without a restart, and a pad that is unplugged mid-game
-releases its held buttons and sticks instead of leaving them stuck.
-- Mouse look keeps responding after a long turn, instead of going dead until
-the pointer travels back from past the screen edge.
-- Optional raw mouse input: `input.raw_mouse` in `config.yaml` sends look
-deltas in host units, so fractional display scaling no longer changes
-first-person sensitivity.
-- Small textures upscaled 4x by default, with PNG overrides in
-`~/.config/mocktail/textures`.
-- ETC2 textures decoded on desktop GPUs without stutter.
-- No more error 319 kicks after joining a server.
-- Roblox sees the real host RAM and screen size.
-- Desktop launcher that works on Wayland and finds the installed binary.
-- Discord Rich Presence on by default, with the experience name, creator,
-elapsed time, the experience icon with a Roblox badge, and a join button
-when the server is public. See the [FAQ](../FAQ.md) to switch it off.
-- Custom Discord presence: title, details, state, and large and small icons
-from `config.yaml`, with `{place_name}`, `{place_icon}`, and
-`{creator_name}` placeholders.
-- `--profile` writes a Chrome-format trace of the Vulkan adapter's work,
-including shader and pipeline creation, readable in `ui.perfetto.dev`.
-[BENCHMARKING.md](BENCHMARKING.md) fixes the experiences to measure and
-`scripts/summarize_profile_trace.py` builds the before and after table.
-- Texture uploads no longer stall the frame they land on: ETC2 decode and
-resampling run on a persistent worker pool.
-- Less stutter while joining an experience and while textures load in. See
-the [changelog](../CHANGELOG.md) for the numbers.
-- The host main thread rests between engine polls instead of spinning, and
-GameMode's core pinning is released, so Roblox's workers spread across
-every core. See [PERFORMANCE.md](PERFORMANCE.md).
-- Own app ID `io.github.CoderDayton.nightcap`, so Nightcap installs next to
-upstream.
-- AppImage and signed Flatpak releases on every `v*` tag, with the Flatpak
-repo on GitHub Pages.
-
-## Not planned
-
-- Replacing the `mocktail` binary and config names. Keeping them makes
-upstream merges clean.
-

include/compat/web_view_protocol_contract.h

@@ -1,190 +0,0 @@
-#ifndef MOCKTAIL_COMPAT_WEB_VIEW_PROTOCOL_CONTRACT_H_
-#define MOCKTAIL_COMPAT_WEB_VIEW_PROTOCOL_CONTRACT_H_
-
-#include <cstddef>
-#include <cstdint>
-#include <cstring>
-#include <optional>
-#include <string_view>
-
-// Roblox's Subsystem<IWebViewProtocol> getter is not exported. The exported
-// WebViewProtocol.initializeAndroidWebViewProtocol calls it first, into a
-// stack slot, then reads the protocol from the returned holder:
-//
-//   x86-64:  lea slot(%rbp),%rbx; mov %rbx,%rdi; call getter;
-//            mov (%rbx),%rbx; mov 0x18(%rbx),%rax
-//   AArch64: add x8, sp, #slot; bl getter; ldr xN, [sp, #slot];
-//            ldr x8, [xN, #0x18]
-//
-// These functions find that call site in the initializer's first bytes and
-// check the getter's own code. Only relocated or build-varying fields (stack
-// slots, frame sizes, PC-relative offsets, the call target) are masked.
-// Verified on x86_64 2.734.917, 2.736.1408 and 2.738.1397, and on arm64-v8a
-// 2.738.1397 and 2.740.931.
-
-namespace mocktail::compat {
-
-// Covers the call site in every verified build (x86-64 +0x27, AArch64 +0x34).
-inline constexpr std::size_t kWebViewProtocolInitializerScanBytes = 128;
-inline constexpr std::size_t kWebViewProtocolGetterBytesX86_64 = 44;
-inline constexpr std::size_t kWebViewProtocolGetterBytesArm64 = 60;
-
-namespace web_view_protocol_contract_detail {
-
-inline bool MatchesMasked(std::string_view code, std::size_t offset,
-                          std::string_view pattern,
-                          std::string_view wildcard) {
-  if (offset > code.size() || code.size() - offset < pattern.size()) {
-    return false;
-  }
-  for (std::size_t index = 0; index < pattern.size(); ++index) {
-    if (wildcard[index] == 'x') continue;
-    if (code[offset + index] != pattern[index]) return false;
-  }
-  return true;
-}
-
-// AArch64 instructions are little-endian words.
-inline std::uint32_t Word(std::string_view code, std::size_t index) {
-  std::uint32_t word = 0;
-  for (std::size_t byte = 0; byte < 4; ++byte) {
-    word |= static_cast<std::uint32_t>(
-                static_cast<unsigned char>(code[index * 4 + byte]))
-            << (8 * byte);
-  }
-  return word;
-}
-
-// One AArch64 instruction word: bits outside `mask` may vary.
-struct MaskedWord {
-  std::uint32_t mask;
-  std::uint32_t value;
-};
-
-inline constexpr std::uint32_t kExact = 0xffffffffU;
-// adrp Xd, page: immlo and immhi vary.
-inline constexpr std::uint32_t kAdrpMask = 0x9f00001fU;
-// add Xd, Xn, #imm12: imm12 varies.
-inline constexpr std::uint32_t kAddImmediateMask = 0xffc003ffU;
-
-}  // namespace web_view_protocol_contract_detail
-
-// Returns the getter address called from the x86-64 initializer at
-// `address`, or nullopt unless the frame setup and exactly one call site
-// match.
-inline std::optional<std::uintptr_t> FindWebViewProtocolGetterCallX86_64(
-    std::string_view code, std::uintptr_t address) {
-  using web_view_protocol_contract_detail::MatchesMasked;
-  // push %rbp; mov %rsp,%rbp
-  if (!MatchesMasked(code, 0, "\x55\x48\x89\xe5", "....")) {
-    return std::nullopt;
-  }
-  static constexpr std::string_view kCallSite(
-      "\x48\x8d\x5d\x00\x48\x89\xdf\xe8\x00\x00\x00\x00\x48\x8b\x1b\x48\x8b\x43"
-      "\x18",
-      19);
-  static constexpr std::string_view kCallSiteWildcard("...x....xxxx.......");
-  static constexpr std::size_t kCallDisplacement = 8;
-  const std::string_view window =
-      code.substr(0, kWebViewProtocolInitializerScanBytes);
-  std::optional<std::size_t> call_site;
-  for (std::size_t offset = 0; offset < window.size(); ++offset) {
-    if (MatchesMasked(window, offset, kCallSite, kCallSiteWildcard)) {
-      if (call_site.has_value()) return std::nullopt;
-      call_site = offset;
-    }
-  }
-  if (!call_site.has_value()) return std::nullopt;
-  std::int32_t displacement = 0;
-  std::memcpy(&displacement, window.data() + *call_site + kCallDisplacement,
-              sizeof(displacement));
-  const std::uintptr_t next_instruction =
-      address + *call_site + kCallDisplacement + sizeof(displacement);
-  return next_instruction +
-         static_cast<std::uintptr_t>(static_cast<std::intptr_t>(displacement));
-}
-
-// The x86-64 getter stores the holder returned by the subsystem's acquire
-// into its result slot (%rdi) and returns that slot.
-inline bool HasWebViewProtocolGetterContractX86_64(std::string_view code) {
-  return web_view_protocol_contract_detail::MatchesMasked(
-      code, 0,
-      std::string_view(
-          "\x55\x48\x89\xe5\x53\x50\x48\x89\xfb\x8a\x05\x00\x00\x00\x00\x84\xc0"
-          "\x74\x19\x48\x8d\x3d\x00\x00\x00\x00\xe8\x59\x00\x00\x00\x48\x89\x03"
-          "\x48\x89\xd8\x48\x83\xc4\x08\x5b\x5d\xc3",
-          kWebViewProtocolGetterBytesX86_64),
-      "...........xxxx.......xxxx..................");
-}
-
-// Returns the getter address called from the AArch64 initializer at
-// `address`, or nullopt unless exactly one call site matches.
-inline std::optional<std::uintptr_t> FindWebViewProtocolGetterCallArm64(
-    std::string_view code, std::uintptr_t address) {
-  using web_view_protocol_contract_detail::Word;
-  const std::size_t words =
-      code.substr(0, kWebViewProtocolInitializerScanBytes).size() / 4;
-  std::optional<std::uintptr_t> getter;
-  for (std::size_t index = 0; index + 4 <= words; ++index) {
-    const std::uint32_t slot_address = Word(code, index);
-    const std::uint32_t call = Word(code, index + 1);
-    const std::uint32_t handle_load = Word(code, index + 2);
-    const std::uint32_t protocol_load = Word(code, index + 3);
-    // add x8, sp, #slot
-    if ((slot_address & 0xffc003ffU) != 0x910003e8U) continue;
-    // bl getter
-    if ((call & 0xfc000000U) != 0x94000000U) continue;
-    // ldr xN, [sp, #slot]
-    if ((handle_load & 0xffc003e0U) != 0xf94003e0U) continue;
-    const std::uint32_t slot = (slot_address >> 10) & 0xfffU;
-    if (((handle_load >> 10) & 0xfffU) * 8 != slot) continue;
-    // ldr x8, [xN, #0x18]
-    const std::uint32_t handle_register = handle_load & 0x1fU;
-    if (protocol_load != (0xf9400c08U | (handle_register << 5))) continue;
-    if (getter.has_value()) return std::nullopt;
-    // imm26 is a signed word offset from the bl instruction.
-    const std::int64_t imm26 = call & 0x03ffffffU;
-    const std::int64_t words_from_call =
-        (imm26 & 0x02000000) != 0 ? imm26 - 0x04000000 : imm26;
-    getter = address + (index + 1) * 4 +
-             static_cast<std::uintptr_t>(words_from_call * 4);
-  }
-  return getter;
-}
-
-// The AArch64 getter saves its result slot (x8) and stores the holder
-// returned by the subsystem's acquire there.
-inline bool HasWebViewProtocolGetterContractArm64(std::string_view code) {
-  using namespace web_view_protocol_contract_detail;
-  static constexpr MaskedWord kGetter[] = {
-      {kExact, 0xa9be7bfdU},              // stp x29, x30, [sp, #-0x20]!
-      {kExact, 0xf9000bf3U},              // str x19, [sp, #0x10]
-      {kExact, 0x910003fdU},              // mov x29, sp
-      {kAdrpMask, 0x90000009U},           // adrp x9, guard
-      {kAddImmediateMask, 0x91000129U},   // add x9, x9, :lo12:guard
-      {kExact, 0xaa0803f3U},              // mov x19, x8
-      {kExact, 0x08dffd29U},              // ldarb w9, [x9]
-      {kExact, 0x36000109U},              // tbz w9, #0, initialize
-      {kAdrpMask, 0x90000000U},           // adrp x0, holder
-      {kAddImmediateMask, 0x91000000U},   // add x0, x0, :lo12:holder
-      {kExact, 0x94000017U},              // bl acquire
-      {kExact, 0xf9000260U},              // str x0, [x19]
-      {kExact, 0xf9400bf3U},              // ldr x19, [sp, #0x10]
-      {kExact, 0xa8c27bfdU},              // ldp x29, x30, [sp], #0x20
-      {kExact, 0xd65f03c0U},              // ret
-  };
-  static_assert(sizeof(kGetter) / sizeof(kGetter[0]) * 4 ==
-                kWebViewProtocolGetterBytesArm64);
-  if (code.size() < kWebViewProtocolGetterBytesArm64) return false;
-  for (std::size_t index = 0; index < sizeof(kGetter) / sizeof(kGetter[0]);
-       ++index) {
-    if ((Word(code, index) & kGetter[index].mask) != kGetter[index].value) {
-      return false;
-    }
-  }
-  return true;
-}
-
-}  // namespace mocktail::compat
-
-#endif  // MOCKTAIL_COMPAT_WEB_VIEW_PROTOCOL_CONTRACT_H_

include/mocktail/graphics/chrome_trace_writer.h

@@ -1,150 +0,0 @@
-#ifndef MOCKTAIL_GRAPHICS_CHROME_TRACE_WRITER_H_
-#define MOCKTAIL_GRAPHICS_CHROME_TRACE_WRITER_H_
-
-#include <condition_variable>
-#include <cstdint>
-#include <cstdio>
-#include <filesystem>
-#include <initializer_list>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <thread>
-
-namespace mocktail {
-namespace graphics {
-
-// Environment variable naming the trace file the Vulkan adapter writes.
-inline constexpr char kProfileTraceEnvironment[] = "MOCKTAIL_PROFILE_TRACE";
-
-struct TraceArg {
-  const char* key;
-  std::int64_t value;
-};
-
-// CLOCK_MONOTONIC in nanoseconds.
-std::uint64_t TraceClockNanos();
-// CPU time used so far by the calling thread, in nanoseconds.
-std::uint64_t TraceThreadCpuNanos();
-// CPU time used so far by every thread of the process, in nanoseconds.
-std::uint64_t TraceProcessCpuNanos();
-
-// CPU time spent between two successive presents.
-struct FrameCpuSample {
-  double process_ms = 0;
-  // Set only when the previous present came from the same thread; thread CPU
-  // clocks of different threads cannot be subtracted.
-  bool has_thread = false;
-  double thread_ms = 0;
-};
-
-// Turns CPU clocks read at each present into per-frame CPU time.
-// Thread-safe.
-class FrameCpuSampler final {
- public:
-  // Returns false for the first present, which ends no frame.
-  bool Sample(std::uint64_t thread_id, std::uint64_t thread_cpu_ns,
-              std::uint64_t process_cpu_ns, FrameCpuSample* sample);
-
- private:
-  std::mutex mutex_;
-  bool has_previous_ = false;
-  std::uint64_t previous_thread_id_ = 0;
-  std::uint64_t previous_thread_cpu_ns_ = 0;
-  std::uint64_t previous_process_cpu_ns_ = 0;
-};
-
-// Writes the Trace Event Format JSON array read by chrome://tracing and
-// ui.perfetto.dev. Recording threads only format into a shared buffer; a
-// background thread owns file writes, so disk stalls do not land inside the
-// measured calls. Events are written in arrival order. Each write ends the
-// file with the closing bracket, so a killed session leaves a loadable trace
-// holding everything written before it died.
-// Names, categories, and keys must outlive the call.
-class ChromeTraceWriter final {
- public:
-  static std::unique_ptr<ChromeTraceWriter> Open(
-      const std::filesystem::path& path, std::string* error);
-
-  ~ChromeTraceWriter();
-  ChromeTraceWriter(const ChromeTraceWriter&) = delete;
-  ChromeTraceWriter& operator=(const ChromeTraceWriter&) = delete;
-
-  // A complete ("X") slice on the calling thread. Slices on one thread must
-  // nest, which scoped timing gives.
-  void Slice(const char* name, const char* category, std::uint64_t start_ns,
-             std::uint64_t end_ns, std::initializer_list<TraceArg> args = {});
-  void Slice(const char* name, const char* category, std::uint64_t start_ns,
-             std::uint64_t end_ns, const TraceArg* args,
-             std::size_t arg_count);
-  // A counter ("C") sample; each name becomes one counter track.
-  void Counter(const char* name, std::uint64_t timestamp_ns, double value);
-
-  // Returns once every event recorded before the call is on disk.
-  void Flush();
-  // Flushes, closes the file, and drops later events. Idempotent.
-  void Close();
-
- private:
-  explicit ChromeTraceWriter(std::FILE* file);
-  void Append(const char* event, std::size_t size);
-  void WriterLoop();
-  void WritePending();
-
-  std::FILE* file_;
-  const int owner_pid_;
-  std::mutex file_mutex_;  // Guards file_ and spare_.
-  std::string spare_;
-  std::mutex mutex_;
-  std::condition_variable wake_;
-  std::string pending_;
-  bool first_event_ = true;
-  bool closed_ = false;
-  bool stopping_ = false;
-  std::thread writer_;
-};
-
-// The process trace named by MOCKTAIL_PROFILE_TRACE, opened on first use.
-// Null when profiling is off or the file could not be opened. The writer is
-// never destroyed; it is closed when the process exits normally.
-ChromeTraceWriter* ActiveProfileTrace();
-
-// Times its own lifetime as one slice. A null writer records nothing.
-class TraceScope final {
- public:
-  TraceScope(ChromeTraceWriter* writer, const char* name,
-             const char* category)
-      : writer_(writer),
-        name_(name),
-        category_(category),
-        start_ns_(writer != nullptr ? TraceClockNanos() : 0) {}
-  ~TraceScope() {
-    if (writer_ != nullptr) {
-      writer_->Slice(name_, category_, start_ns_, TraceClockNanos(), args_,
-                     arg_count_);
-    }
-  }
-  TraceScope(const TraceScope&) = delete;
-  TraceScope& operator=(const TraceScope&) = delete;
-
-  // Keeps the first kMaxArgs arguments.
-  void Arg(const char* key, std::int64_t value) {
-    if (writer_ != nullptr && arg_count_ < kMaxArgs) {
-      args_[arg_count_++] = {key, value};
-    }
-  }
-
- private:
-  static constexpr std::size_t kMaxArgs = 4;
-  ChromeTraceWriter* writer_;
-  const char* name_;
-  const char* category_;
-  std::uint64_t start_ns_;
-  TraceArg args_[kMaxArgs]{};
-  std::size_t arg_count_ = 0;
-};
-
-}  // namespace graphics
-}  // namespace mocktail
-
-#endif  // MOCKTAIL_GRAPHICS_CHROME_TRACE_WRITER_H_

include/mocktail/graphics/etc2_decoder.h

@@ -6,9 +6,6 @@
 
 namespace mocktail::graphics {
 
-// ETC2 and EAC block encodings from the OpenGL ES 3.0 / Vulkan core formats.
-// sRGB variants share the unorm encoding; the colour space belongs to the
-// destination format.
 enum class EtcFormat {
   kEtc2Rgb8,
   kEtc2Rgb8A1,
@@ -19,26 +16,15 @@ enum class EtcFormat {
   kEacRg11Signed,
 };
 
-// Compressed bytes per 4x4 block.
 std::size_t EtcBlockBytes(EtcFormat format);
 
-// Decoded bytes per texel: 4 (RGBA8) for ETC2 formats, 2 per channel
-// (16-bit, little-endian) for EAC formats.
 std::size_t EtcDecodedTexelBytes(EtcFormat format);
 
-// Decodes a width x height image stored as ceil(width/4) x ceil(height/4)
-// blocks into row-major texels. Returns false, writing nothing, when a buffer
-// is smaller than the image requires.
 bool DecodeEtcImage(EtcFormat format, const std::uint8_t* source,
                     std::size_t source_bytes, std::uint32_t width,
                     std::uint32_t height, std::uint8_t* destination,
                     std::size_t destination_bytes);
 
-// Decodes block rows [first_block_row, first_block_row + block_row_count) of
-// the image DecodeEtcImage describes, writing only the texel rows those blocks
-// cover. Bands that together cover every block row produce DecodeEtcImage's
-// output. Returns false, writing nothing, when a buffer is too small or the
-// rows lie outside the image.
 bool DecodeEtcImageBlockRows(EtcFormat format, const std::uint8_t* source,
                              std::size_t source_bytes, std::uint32_t width,
                              std::uint32_t height,
@@ -47,7 +33,6 @@ bool DecodeEtcImageBlockRows(EtcFormat format, const std::uint8_t* source,
                              std::uint8_t* destination,
                              std::size_t destination_bytes);
 
-// One DecodeEtcImage call. Jobs must not share destination bytes.
 struct EtcDecodeJob {
   EtcFormat format = EtcFormat::kEtc2Rgb8;
   const std::uint8_t* source = nullptr;
@@ -56,24 +41,13 @@ struct EtcDecodeJob {
   std::uint32_t height = 0;
   std::uint8_t* destination = nullptr;
   std::size_t destination_bytes = 0;
-  // Set to DecodeEtcImage's result.
   bool ok = false;
 };
 
-// Decodes every job before returning. Large batches are split into block-row
-// bands decoded on up to worker_count threads, the caller included; small
-// batches decode on the caller only.
+// Synchronous; job destination buffers must not overlap.
 void DecodeEtcJobs(EtcDecodeJob* jobs, std::size_t count,
                    unsigned worker_count);
 
-// Calls run(context) worker_count times, once on the caller and the rest on
-// pooled decode workers that run alongside it, and returns when every call
-// has returned. `run` must be safe to call from several threads at once, so
-// it should drain a shared queue. When the pool is busy with another batch,
-// or no worker could be started, run is called on the caller alone.
-void RunOnDecodeWorkers(void (*run)(void*), void* context,
-                        unsigned worker_count);
-
 }  // namespace mocktail::graphics
 
 #endif  // MOCKTAIL_GRAPHICS_ETC2_DECODER_H_

include/mocktail/graphics/texture_override.h

@@ -12,45 +12,32 @@
 
 namespace mocktail::graphics {
 
-// Tightly packed RGBA8 pixels, row-major, top row first.
 struct RgbaImage {
   std::uint32_t width = 0;
   std::uint32_t height = 0;
   std::vector<std::uint8_t> pixels;
 };
 
-// FNV-1a over the bytes; the texture identity used for dump and override
-// file names.
 std::uint64_t HashBytes(const std::uint8_t* data, std::size_t size);
-// 16 lowercase hex digits.
 std::string HashName(std::uint64_t hash);
 
 bool ReadPngRgba(const std::string& path, RgbaImage* image);
 bool WritePngRgba(const std::string& path, const RgbaImage& image);
 
-// Writes width x height RGBA8 pixels to destination, each destination pixel
-// the average of the source box it covers. Growing repeats source pixels.
 void ResampleRgba(const RgbaImage& source, std::uint32_t width,
                   std::uint32_t height, std::uint8_t* destination);
 void ResampleRgba(const std::uint8_t* source, std::uint32_t source_width,
                   std::uint32_t source_height, std::uint32_t width,
                   std::uint32_t height, std::uint8_t* destination);
 
-// Replacement textures keyed by the hash of a texture's level-0 compressed
-// bytes. An override lives at <override_dir>/<hash>.png. With a dump
-// directory, every level-0 texture seen is written once as
-// <dump_dir>/<hash>_<width>x<height>.png so the hash can be found.
-// Thread-safe.
 class TextureOverrides {
  public:
   TextureOverrides(std::string override_dir, std::string dump_dir);
-  // MOCKTAIL_TEXTURE_OVERRIDE_DIR and MOCKTAIL_TEXTURE_DUMP_DIR.
   static TextureOverrides FromEnvironment();
 
   bool enabled() const { return !override_dir_.empty() || !dump_dir_.empty(); }
   bool dumping() const { return !dump_dir_.empty(); }
 
-  // Null when no override file exists; lookups are cached either way.
   std::shared_ptr<const RgbaImage> Lookup(std::uint64_t hash);
   void Dump(std::uint64_t hash, std::uint32_t width, std::uint32_t height,
             const std::uint8_t* rgba);

include/mocktail/graphics/vulkan_etc2_emulation.h

@@ -9,84 +9,41 @@
 
 namespace mocktail::graphics {
 
-// Host format that stores a decoded ETC2/EAC image, with its block encoding.
 struct Etc2EmulatedFormat {
   VkFormat host_format = VK_FORMAT_UNDEFINED;
   EtcFormat etc_format = EtcFormat::kEtc2Rgb8;
 };
 
-// Maps an ETC2/EAC Vulkan format to its decoded host format. Returns false for
-// every other format.
 bool LookupEmulatedEtc2Format(VkFormat format, Etc2EmulatedFormat* out);
 
-// Format features reported for an emulated ETC2/EAC format: the host format's
-// sampling and transfer features only, as for a native compressed format.
 VkFormatFeatureFlags EmulatedEtc2FormatFeatures(
     VkFormatFeatureFlags host_features);
 
-// Staging bytes consumed and decoded bytes produced by one 2D upload region.
-// Returns false for an empty extent, a depth other than 1, or no layers.
 bool Etc2UploadByteCounts(EtcFormat format, const VkExtent3D& extent,
                           std::uint32_t layer_count, VkDeviceSize* compressed,
                           VkDeviceSize* decoded);
 
-// Whether emulated ETC2 is reported to the application as a supported
-// feature, from the MOCKTAIL_ADVERTISE_ETC2 value: "0" hides it, anything
-// else (or unset) reports it. Hidden ETC2 still decodes ETC2 images the
-// application creates; it only steers the application toward other formats.
 bool Etc2SupportAdvertised(const char* value);
 bool Etc2SupportAdvertised();
 
-// Factor applied to emulated ETC2 colour images no larger than
-// kSmallTextureMaxExtent, from the MOCKTAIL_SMALL_TEXTURE_UPSCALE value:
-// 1 leaves them alone; 2..8 create them that many times larger and resample
-// every upload, so a texture override can carry more detail than the
-// original. Unset or non-numeric values use kDefaultSmallTextureUpscale;
-// numeric values out of range are clamped.
 inline constexpr std::uint32_t kSmallTextureMaxExtent = 64;
 inline constexpr std::uint32_t kDefaultSmallTextureUpscale = 4;
 std::uint32_t SmallTextureUpscale(const char* value);
 
-// Staging for decoded uploads is carved out of host-visible blocks this
-// large; an upload that needs more gets a block of its own.
-inline constexpr VkDeviceSize kEtc2StagingBlockBytes = 16 * 1024 * 1024;
-
-// A timeline semaphore and the value an asynchronous decode will signal.
-// `semaphore` is VK_NULL_HANDLE when the decode already finished on the
-// calling thread and the submit needs no extra wait.
-struct Etc2SubmitWait {
-  VkSemaphore semaphore = VK_NULL_HANDLE;
-  std::uint64_t value = 0;
-};
-
-// Reports ETC2/EAC support on hosts without native ETC2 (desktop GPUs) and
-// stores those textures decoded. Images are created with the host format;
-// each staged upload into one is redirected to a host-visible staging buffer
-// that is filled by decoding the application's staging bytes when the
-// command buffer is submitted. Every submit decodes again, as a native copy
-// re-reads its source on each execution.
-// Staging ranges live until their command buffer is begun, reset or freed.
-// MOCKTAIL_DISABLE_ETC2_EMULATION=1 turns the emulation off.
 class VulkanEtc2Emulation final {
  public:
-  explicit VulkanEtc2Emulation(
-      VkDeviceSize staging_block_bytes = kEtc2StagingBlockBytes);
+  VulkanEtc2Emulation();
   ~VulkanEtc2Emulation();
   VulkanEtc2Emulation(const VulkanEtc2Emulation&) = delete;
   VulkanEtc2Emulation& operator=(const VulkanEtc2Emulation&) = delete;
 
-  // True when this physical device lacks native ETC2 and emulation is on.
   bool PhysicalDeviceNeedsEmulation(VkPhysicalDevice physical_device,
                                     PFN_vkGetPhysicalDeviceFeatures host);
 
-  // `timeline_semaphore` states whether the device was created with the
-  // timelineSemaphore feature enabled. Without it every decode runs on the
-  // calling thread.
   void RegisterDevice(VkDevice device, VkPhysicalDevice physical_device,
                       bool emulated,
                       const VkPhysicalDeviceMemoryProperties& memory,
-                      PFN_vkGetDeviceProcAddr get_device_proc_addr,
-                      bool timeline_semaphore = false);
+                      PFN_vkGetDeviceProcAddr get_device_proc_addr);
   void DestroyDevice(VkDevice device);
 
   VkResult CreateImage(VkDevice device, const VkImageCreateInfo* create_info,
@@ -128,28 +85,10 @@ class VulkanEtc2Emulation final {
                           std::uint32_t count,
                           const VkCommandBuffer* secondaries);
 
-  // Decodes every upload recorded into these command buffers and the
-  // secondary command buffers they execute.
-  //
-  // With `allow_async` on a device that has a timeline semaphore, the decode
-  // runs on worker threads, and so does the gather of the compressed bytes
-  // whenever the application already has them mapped. The returned semaphore
-  // and value must then be added to the submit's waits, so the GPU copy
-  // cannot execute before the decode finishes. Values are signalled in the
-  // order they are handed out.
-  //
-  // Those threads read the application's source bytes after this returns,
-  // which Vulkan allows: the application may not write them between the
-  // submit and the copy's completion. Unmapping or freeing that memory waits
-  // for the decodes still reading it.
-  //
-  // Returns `{VK_NULL_HANDLE, 0}` when there was nothing to decode, when
-  // `allow_async` is false, or when the device has no timeline semaphore. In
-  // those cases every upload is already decoded when this returns.
-  Etc2SubmitWait PrepareSubmit(const VkCommandBuffer* command_buffers,
-                               std::uint32_t count, bool allow_async = false);
-  // Destroys the staging buffers owned by a command buffer that is no longer
-  // pending, after waiting for any decode still writing into them.
+  // Resubmission must reread the source bytes.
+  void PrepareSubmit(const VkCommandBuffer* command_buffers,
+                     std::uint32_t count);
+  // Call only after the command buffer is no longer pending.
   void ReleaseCommandBuffer(VkCommandBuffer command_buffer);
 
   struct State;

include/mocktail/platform/platform_runtime.h

@@ -152,10 +152,6 @@ struct MouseMotionEvent {
   float delta_x = 0.0f;
   float delta_y = 0.0f;
   std::uint32_t buttons = 0;
-  // True while the window holds relative mouse mode. The absolute coordinates
-  // are meaningless then: X11 reports zeroes, Wayland reports a position that
-  // accumulates the deltas and can leave the window entirely.
-  bool relative = false;
 };
 
 struct MouseButtonEvent {
@@ -164,8 +160,6 @@ struct MouseButtonEvent {
   std::uint8_t clicks = 0;
   float x = 0.0f;
   float y = 0.0f;
-  // See MouseMotionEvent::relative.
-  bool relative = false;
 };
 
 struct MouseWheelEvent {
@@ -173,8 +167,6 @@ struct MouseWheelEvent {
   float delta_y = 0.0f;
   float mouse_x = 0.0f;
   float mouse_y = 0.0f;
-  // See MouseMotionEvent::relative.
-  bool relative = false;
 };
 
 struct TouchEvent {

include/mocktail/platform/sdl_application_metadata.h

@@ -1,4 +1,3 @@
-// Modified by vii from komaruworld/mocktail. See README "About this fork".
 #ifndef MOCKTAIL_PLATFORM_SDL_APPLICATION_METADATA_H_
 #define MOCKTAIL_PLATFORM_SDL_APPLICATION_METADATA_H_
 
@@ -7,9 +6,9 @@
 namespace mocktail {
 namespace platform {
 
-inline constexpr char kMocktailApplicationName[] = "Nightcap";
+inline constexpr char kMocktailApplicationName[] = "Mocktail";
 inline constexpr char kMocktailApplicationIdentifier[] =
-    "io.github.CoderDayton.nightcap";
+    "space.bigrat.mocktail";
 
 // Configures the stable compositor identity before SDL initializes. The
 // identifier matches the installed desktop file and icon name so Wayland and

include/runtime/command_line.h

@@ -33,8 +33,6 @@ struct CommandLineOptions {
   // Requests one explicit launch of the provider latest without promoting it
   // into the managed payload state.
   bool force_run_latest = false;
-  // Chrome trace file the Vulkan adapter writes; empty when not profiling.
-  std::string profile_trace_path;
 };
 
 struct CommandLineParseResult {

include/runtime/device_memory_profile.h

@@ -6,8 +6,6 @@
 namespace mocktail {
 namespace runtime {
 
-// Android ActivityManager memory values published through DeviceParams.
-// Roblox derives its device RAM tier, and tiered render budgets, from them.
 struct DeviceMemoryProfile {
   std::int32_t total_memory_mb = 0;
   std::int32_t memory_class_mb = 0;
@@ -17,9 +15,6 @@ struct DeviceMemoryProfile {
   bool low_ram_device = false;
 };
 
-// Hosts with at least 4 GiB report their real total memory as a normal-RAM
-// device. Smaller hosts, or an unreadable total (0), keep the 2 GiB low-RAM
-// profile.
 DeviceMemoryProfile BuildDeviceMemoryProfile(std::uint64_t host_memory_bytes);
 
 }  // namespace runtime

include/runtime/discord_rpc.h

@@ -13,14 +13,11 @@ namespace mocktail {
 namespace runtime {
 
 struct DiscordRpcActivity {
-  std::string name;
   std::string details;
   std::string state;
   std::optional<int64_t> start_timestamp;
   std::string large_image;
   std::string large_text;
-  std::string small_image;
-  std::string small_text;
   std::string button_label;
   std::string button_url;
 };
@@ -30,8 +27,7 @@ std::string BuildDiscordJoinUrl(const RobloxExperienceLaunchRequest& request);
 DiscordRpcActivity BuildDiscordRpcActivity(
     const DiscordRpcConfig& config, RobloxExperiencePresencePhase phase,
     const RobloxExperienceLaunchRequest* request, std::string place_name,
-    int64_t session_started_at, std::string place_icon_url = {},
-    std::string creator_name = {});
+    int64_t session_started_at, std::string place_icon_url = {});
 
 // Maintains a direct, unauthenticated Discord Desktop RPC connection. The
 // worker owns all network and IPC work; lifecycle notifications only replace

include/runtime/display_size.h

@@ -7,22 +7,17 @@
 namespace mocktail {
 namespace runtime {
 
-// Host display or window size in physical pixels, published to the Android
-// guest. Header-only so the JNI VM can use it without link dependencies.
 struct DisplaySize {
   std::int32_t width = 1920;
   std::int32_t height = 1080;
 };
 
-// Environment handoffs written after the host window exists, as
-// "WIDTHxHEIGHT": the window's display mode and the window's initial pixels.
+// Physical pixels; window size is captured at startup.
 inline constexpr const char* kDisplaySizeEnvironment =
     "MOCKTAIL_DISPLAY_SIZE_INTERNAL";
 inline constexpr const char* kWindowSizeEnvironment =
     "MOCKTAIL_WINDOW_SIZE_INTERNAL";
 
-// Parses "WIDTHxHEIGHT". A null, malformed or non-positive value, or one that
-// does not fit a Java int, yields the 1920x1080 fallback.
 inline DisplaySize ParseDisplaySize(const char* value) {
   const DisplaySize fallback;
   if (value == nullptr) {
@@ -60,8 +55,6 @@ inline DisplaySize ParseDisplaySize(const char* value) {
           static_cast<std::int32_t>(parts[1])};
 }
 
-// Physical length of a pixel span at the guest's fixed 160 dpi, rounded down
-// to whole millimetres.
 inline std::int32_t PixelsToMillimetersAt160Dpi(std::int32_t pixels) {
   return static_cast<std::int32_t>(static_cast<std::int64_t>(pixels) * 254 /
                                    1600);

include/runtime/engine_pump_rest.h

@@ -1,65 +0,0 @@
-#ifndef MOCKTAIL_RUNTIME_ENGINE_PUMP_REST_H_
-#define MOCKTAIL_RUNTIME_ENGINE_PUMP_REST_H_
-
-#include <cstdint>
-
-namespace mocktail::runtime {
-
-// The engine posts its per-frame main-thread step at a time of its own
-// choosing, with no signal the host can block on, so the host main thread
-// polls nativeCallMessagesFromMainThread. An empty poll costs a few
-// microseconds; polled back to back it burns a core.
-//
-// Between polls the thread rests for kEnginePumpRestNs. A post is then picked
-// up at most kEnginePumpRestNs + timer slack + wake latency late, far under
-// the engine's sub-millisecond slack.
-//
-// How it rests decides the clock. Under a power-saving governor the CPU clocks
-// a bursty core down unless some core stays awake, and the engine's render
-// thread then runs slower and drops frames. So:
-//   kSleep   nanosleep. The core idles. Correct only when the governor holds
-//            the clock up on its own (performance, which GameMode sets).
-//   kTpause  TPAUSE in C0.2. The core stays awake at reduced power, the clock
-//            holds, and the OS books the time as busy. Needs WAITPKG.
-//   kSpin    No rest. The core stays awake at full power.
-inline constexpr uint64_t kEnginePumpRestNs = 100'000;
-// Timer slack the calling thread is set to; the kernel default of 50 us would
-// otherwise stretch every sleep.
-inline constexpr uint64_t kEnginePumpTimerSlackNs = 10'000;
-// Shallow C-state exit plus scheduler latency on the host, for the bound.
-inline constexpr uint64_t kShallowWakeNs = 50'000;
-
-enum class EnginePumpRestMode { kSleep, kTpause, kSpin };
-
-const char* EnginePumpRestModeName(EnginePumpRestMode mode);
-
-struct EnginePumpRestInputs {
-  bool governor_performance = false;
-  bool cpu_has_waitpkg = false;
-  // MOCKTAIL_ENGINE_PUMP_REST: "sleep", "tpause" or "spin". Null, empty or
-  // unknown defers to the policy; "tpause" without WAITPKG does too.
-  const char* override = nullptr;
-};
-
-EnginePumpRestMode ChooseEnginePumpRestMode(const EnginePumpRestInputs& inputs);
-
-// True when the file holds "performance". `path` is a cpufreq
-// scaling_governor file; cpu0's stands for the machine.
-bool CpuGovernorIsPerformance(const char* path);
-
-bool CpuHasWaitPkg();
-
-// The mode chosen from the host on first use.
-EnginePumpRestMode ActiveEnginePumpRestMode();
-
-// Rests the calling thread in the given mode and returns the rest length, 0
-// for kSpin. The first call lowers the thread's timer slack to
-// kEnginePumpTimerSlackNs.
-uint64_t RestAfterEnginePump(EnginePumpRestMode mode);
-inline uint64_t RestAfterEnginePump() {
-  return RestAfterEnginePump(ActiveEnginePumpRestMode());
-}
-
-}  // namespace mocktail::runtime
-
-#endif  // MOCKTAIL_RUNTIME_ENGINE_PUMP_REST_H_

include/runtime/game_mode.h

@@ -1,8 +1,6 @@
 #ifndef MOCKTAIL_RUNTIME_GAME_MODE_H_
 #define MOCKTAIL_RUNTIME_GAME_MODE_H_
 
-#include <sched.h>
-
 #include <string>
 #include <string_view>
 
@@ -24,7 +22,6 @@ enum class GameModeSessionState {
   kDisabled,
   kUnavailable,
   kRequestFailed,
-  kDeclinedCorePinning,
   kAlreadyActive,
   kActive,
   kStopped,
@@ -46,37 +43,9 @@ struct GameModeClientApi {
   ErrorFn error_string = nullptr;
 };
 
-// The CPU affinity calls, injectable so tests exercise the restore without
-// moving the threads they run on.
-struct CpuAffinityApi {
-  // Reads the calling thread's permitted CPUs. GameMode pins every thread
-  // alike, so one thread's mask is enough to detect the pin.
-  using GetFn = int (*)(cpu_set_t* mask);
-  // Applies `mask` to every thread of this process, not only the caller.
-  // Returns 0 when each live thread took it.
-  using SetFn = int (*)(const cpu_set_t* mask);
-
-  GetFn get = nullptr;
-  SetFn set = nullptr;
-};
-
-CpuAffinityApi HostCpuAffinityApi();
-
-// True when `after` permits a strict subset of the CPUs `before` permits.
-// An equal, wider or merely relocated set is not a narrowing.
-bool CpuAffinityNarrowed(const cpu_set_t& before, const cpu_set_t& after);
-
 // Owns at most one ref-counted GameMode request. Missing host support and
 // daemon rejection remain nonfatal because GameMode is an optimization, not a
 // correctness dependency.
-//
-// GameMode pins the calling process to the host's fastest cores when it sees a
-// wide core-speed spread. Roblox spreads its own work over a worker pool, so
-// that pin concentrates the load onto a couple of cores instead of helping,
-// and the daemon re-applies it every few seconds, so correcting the mask in
-// place does not hold. Under `auto`, a request that narrows the affinity is
-// released again: ending the request is what releases the pin. `on` is an
-// explicit choice and keeps the pinned session.
 class GameModeSession final {
  public:
   GameModeSession() = default;
@@ -90,8 +59,6 @@ class GameModeSession final {
   static GameModeSession Start(GameModePolicy policy);
   static GameModeSession StartWithClientForTesting(
       GameModePolicy policy, GameModeClientApi api);
-  static GameModeSession StartWithClientForTesting(
-      GameModePolicy policy, GameModeClientApi api, CpuAffinityApi affinity);
 
   GameModeSessionState state() const { return state_; }
   const std::string& detail() const { return detail_; }
@@ -106,7 +73,6 @@ class GameModeSession final {
  private:
   static GameModeSession StartBound(GameModePolicy policy,
                                     GameModeClientApi api,
-                                    CpuAffinityApi affinity,
                                     void* library_handle);
   void CloseLibrary();
 

include/runtime/performance_policy.h

@@ -1,11 +1,9 @@
-// Modified by vii from komaruworld/mocktail. See README "About this fork".
 #ifndef MOCKTAIL_RUNTIME_PERFORMANCE_POLICY_H_
 #define MOCKTAIL_RUNTIME_PERFORMANCE_POLICY_H_
 
 #include <cstdint>
 #include <string>
 #include <string_view>
-#include <vector>
 
 #include "runtime/frame_rate_policy.h"
 #include "runtime/game_mode.h"
@@ -51,18 +49,18 @@ PerformancePolicy ParsePerformancePolicy(
 // Respects CPU affinity and falls back to the available logical count.
 int DetectAvailablePhysicalCoreCount();
 
-// Disabled policy preserves overrides. A base_json value that differs from
-// the preset is kept as-is and its key is appended to kept_overrides.
-bool MergePerformanceClientSettingsOverrides(
-    const PerformancePolicy& policy, std::string_view base_json,
-    std::string* merged_json, std::string* error,
-    std::vector<std::string>* kept_overrides = nullptr);
+// Disabled policy preserves overrides; conflicting values fail.
+bool MergePerformanceClientSettingsOverrides(const PerformancePolicy& policy,
+                                             std::string_view base_json,
+                                             std::string* merged_json,
+                                             std::string* error);
 
 // Applies mandatory HTTP and crash policies after caller settings.
-bool MergeRuntimeClientSettingsOverrides(
-    const FrameRatePolicy& frame_rate, const PerformancePolicy& performance,
-    std::string_view base_json, std::string* merged_json, std::string* error,
-    std::vector<std::string>* kept_overrides = nullptr);
+bool MergeRuntimeClientSettingsOverrides(const FrameRatePolicy& frame_rate,
+                                         const PerformancePolicy& performance,
+                                         std::string_view base_json,
+                                         std::string* merged_json,
+                                         std::string* error);
 
 // Keeps the legacy test bypass disabled. The host PermissionsProtocol now
 // answers microphone authorization from capture configuration. No permission

include/runtime/roblox_account_bridge.h

@@ -1,94 +0,0 @@
-#ifndef MOCKTAIL_RUNTIME_ROBLOX_ACCOUNT_BRIDGE_H_
-#define MOCKTAIL_RUNTIME_ROBLOX_ACCOUNT_BRIDGE_H_
-
-#include <jni.h>
-
-#include <memory>
-#include <mutex>
-#include <string>
-
-#include "mocktail/status.h"
-#include "runtime/roblox_game_session_native_adapter.h"
-
-namespace mocktail {
-namespace runtime {
-
-// Exact JNI entrypoints behind the APK AccountProtocol device-integrity
-// handlers: JNIAccountProtocol name getters and MessageBus raw handlers.
-struct RobloxAccountProtocolSymbols {
-  using GetStringFn = jstring (*)(JNIEnv*, jclass);
-
-  GetStringFn get_protocol_name = nullptr;
-  GetStringFn get_device_integrity_available_method_name = nullptr;
-  GetStringFn get_integrity_token_method_name = nullptr;
-  GetStringFn get_support_key = nullptr;
-  GetStringFn get_token_key = nullptr;
-  GetStringFn get_result_key = nullptr;
-  void (*set_request_handler_raw)(JNIEnv*, jobject, jstring, jstring,
-                                  jobject) = nullptr;
-  void (*clear_request_handler)(JNIEnv*, jobject, jstring, jstring) = nullptr;
-
-  bool complete() const {
-    return get_protocol_name && get_device_integrity_available_method_name &&
-           get_integrity_token_method_name && get_support_key &&
-           get_token_key && get_result_key && set_request_handler_raw &&
-           clear_request_handler;
-  }
-};
-
-struct RobloxAccountProtocolObjects {
-  jobject message_bus = nullptr;
-  void* context = nullptr;
-  jobject (*create_request_handler)(void*, std::shared_ptr<void>,
-                                    std::string (*)(void*, JNIEnv*,
-                                                    jstring)) = nullptr;
-  void (*clear_request_handler)(void*, jobject) = nullptr;
-
-  bool complete() const {
-    return message_bus && context && create_request_handler &&
-           clear_request_handler;
-  }
-};
-
-// Answers AccountProtocol device-integrity requests for a host that cannot
-// produce Play Integrity tokens. No integrity token is ever produced.
-//
-// DeviceIntegrityAvailable reports no support. The APK handler always reports
-// support, so this answer differs from Android: it tells Roblox's challenge
-// flow up front that no token can come, instead of letting it request one.
-//
-// GetIntegrityToken returns at once with an empty token and
-// TOKEN_PROVIDER_UNINITIALIZED, the APK's answer when its Play token provider
-// never initialized. The APK answers INVALID_NONCE for a request without a
-// requestHash; this bridge never inspects the request, so it cannot.
-// LuaApp bounds each token request with its
-// DeviceIntegrityNativeTimeoutMilliseconds flag; an immediate answer keeps a
-// login challenge from sitting out that bound.
-class RobloxAccountBridge final {
- public:
-  RobloxAccountBridge(JniEnvironmentProvider environment,
-                      RobloxAccountProtocolSymbols symbols,
-                      RobloxAccountProtocolObjects objects);
-  ~RobloxAccountBridge();
-  RobloxAccountBridge(const RobloxAccountBridge&) = delete;
-  RobloxAccountBridge& operator=(const RobloxAccountBridge&) = delete;
-
-  Status Initialize();
-  Status Shutdown();
-
- private:
-  struct State;
-  Status ShutdownLocked();
-
-  const JniEnvironmentProvider environment_;
-  const RobloxAccountProtocolSymbols symbols_;
-  const RobloxAccountProtocolObjects objects_;
-  // Serializes lifecycle only. Native dispatch never holds this mutex.
-  std::mutex lifecycle_mutex_;
-  std::shared_ptr<State> state_;
-};
-
-}  // namespace runtime
-}  // namespace mocktail
-
-#endif  // MOCKTAIL_RUNTIME_ROBLOX_ACCOUNT_BRIDGE_H_

include/runtime/roblox_experience_composition.h

@@ -3,7 +3,6 @@
 
 #include <jni.h>
 
-#include <chrono>
 #include <cstdint>
 #include <deque>
 #include <memory>
@@ -18,7 +17,6 @@
 #include "runtime/roblox_experience_launch_bridge.h"
 #include "runtime/roblox_experience_presence.h"
 #include "runtime/roblox_fresh_game_launch_controller.h"
-#include "runtime/roblox_account_bridge.h"
 #include "runtime/roblox_permissions_bridge.h"
 #include "runtime/roblox_web_view_bridge.h"
 #include "runtime/webview_roblox_cookie.h"
@@ -122,8 +120,7 @@ class RobloxExperienceComposition final {
       RobloxExperienceSurfaceProvider surface_provider = {},
       RobloxExperiencePresenceObserver presence_observer = {},
       bool clear_persisted_web_view_cookie = false,
-      bool microphone_enabled = false,
-      RobloxAccountProtocolSymbols account_symbols = {});
+      bool microphone_enabled = false);
   ~RobloxExperienceComposition();
 
   RobloxExperienceComposition(const RobloxExperienceComposition&) = delete;
@@ -165,7 +162,6 @@ class RobloxExperienceComposition final {
     bool visible = true;
     bool back_navigation_disabled = false;
     bool show_domain_as_title = false;
-    bool close_when_challenge_solved = false;
   };
 
   static Status DispatchLaunch(void* context,
@@ -205,11 +201,8 @@ class RobloxExperienceComposition final {
                         const WebSurfacePresentation& presentation);
   // WebViewProtocol and BrowserService are two logical transports over the
   // APK's single physical WebView container. Either protocol may close or
-  // mutate the surface that the other one opened. A nonzero
-  // expected_logical_generation closes only that surface.
-  Status CloseWebSurface(uint64_t expected_logical_generation = 0);
-  // Closes a solved challenge that Roblox left open past its grace period.
-  Status CloseUnclaimedSolvedChallenge();
+  // mutate the surface that the other one opened.
+  Status CloseWebSurface();
   void HandleWebSurfaceExit(uint64_t process_generation);
   Status Dispatch(const RobloxExperienceLaunchRequest& request);
   Status PromoteAuthenticatedSession();
@@ -236,7 +229,6 @@ class RobloxExperienceComposition final {
   const RobloxWebViewMessageBusSymbols web_view_symbols_;
   const RobloxBrowserServiceSymbols browser_service_symbols_;
   const RobloxPermissionsMessageBusSymbols permissions_symbols_;
-  const RobloxAccountProtocolSymbols account_symbols_;
   const bool microphone_enabled_;
   const RobloxGameSessionSymbols game_symbols_;
   const RobloxExperienceJniFactory jni_factory_;
@@ -256,8 +248,6 @@ class RobloxExperienceComposition final {
   std::unique_ptr<RobloxWebViewBridge> web_view_bridge_;
   std::unique_ptr<RobloxBrowserServiceBridge> browser_service_bridge_;
   std::unique_ptr<RobloxPermissionsBridge> permissions_bridge_;
-  // Optional: a payload without the AccountProtocol entrypoints still starts.
-  std::unique_ptr<RobloxAccountBridge> account_bridge_;
   std::shared_ptr<WebViewHelperProcess> web_surface_process_;
   std::shared_ptr<WebSurfaceExitTarget> web_surface_exit_target_;
   std::shared_ptr<LifecycleTarget> lifecycle_target_;
@@ -267,13 +257,6 @@ class RobloxExperienceComposition final {
   uint64_t web_surface_logical_generation_ = 0;
   uint64_t next_web_surface_process_generation_ = 1;
   uint64_t next_web_surface_logical_generation_ = 1;
-  // The current surface closes as soon as its solved challenge is forwarded.
-  bool web_surface_close_when_challenge_solved_ = false;
-  // Set when a solved challenge is forwarded; applies only to that logical
-  // surface generation.
-  std::optional<std::chrono::steady_clock::time_point>
-      solved_challenge_close_deadline_;
-  uint64_t solved_challenge_logical_generation_ = 0;
   SecureWebViewRobloxCookie web_view_cookie_;
   std::string web_view_cookie_initialization_error_;
   bool web_view_cookie_synchronized_ = false;

include/runtime/roblox_input_native_adapter.h

@@ -123,7 +123,6 @@ class RobloxInputRuntime final {
   RobloxInputSnapshot Snapshot() const;
   Status GetMainWindowIsMouseLockedCenter(bool* locked_center);
   bool SupportsGamepads() const;
-  void SetRawMouseEnabled(bool enabled);
 
   static void PlatformEventCallback(void* context,
                                     const platform::PlatformEvent& event);

include/runtime/roblox_input_router.h

@@ -40,10 +40,9 @@ struct AndroidKeyMapping {
 // through with an ABI-incompatible numeric value.
 AndroidKeyMapping MapSdlKeyToAndroid(uint32_t sdl_scancode, uint32_t sdl_key = 0);
 
-// Translates SDL button numbers to the nativePassMouseButton argument.
-// The first three are Roblox's zero-based MouseButton1/2/3 indices, not Android
-// MotionEvent button bits.
-int32_t MapSdlMouseButtonToRoblox(uint8_t sdl_button);
+// Mirrors the APK's MotionEvent.getActionButton() - 1 conversion. SDL button
+// numbers are not numerically compatible with Android button bit values.
+int32_t MapSdlMouseButtonToAndroid(uint8_t sdl_button);
 
 int32_t MapSdlGamepadButtonToAndroid(uint8_t sdl_button);
 int32_t RobloxGamepadType(platform::GamepadFamily family);
@@ -172,9 +171,6 @@ class RobloxInputRouter final {
                                    const RobloxTextFocusProperties& properties);
   RobloxInputDispatchResult HandleEvent(const platform::PlatformEvent& event);
   RobloxInputSnapshot Snapshot() const;
-  // Raw mouse sends look deltas in host units instead of guest surface units.
-  // The reported pointer position stays in guest units either way.
-  void SetRawMouseEnabled(bool enabled);
 
  private:
   struct ActiveTouch {
@@ -224,10 +220,6 @@ class RobloxInputRouter final {
   Status DisconnectGamepadLocked(ActiveGamepad& gamepad);
   Status DisconnectGamepadsLocked();
   Status ReleasePressedInputsLocked();
-  // Keeps mouse_x_/mouse_y_ where they are for an event that carries no
-  // usable position, clamped to the current viewport. Before any absolute
-  // position has been seen, the held position is the viewport center.
-  void HoldPointerLocked(const platform::SurfaceCoordinateTransform& transform);
   int32_t AllocatePointerIdLocked() const;
   std::vector<ActiveTouch>::iterator FindTouchIteratorLocked(int64_t touch_id,
                                                              int64_t finger_id);
@@ -243,14 +235,8 @@ class RobloxInputRouter final {
   std::vector<ActiveTouch> active_touches_;
   std::vector<ActiveKey> active_keys_;
   std::vector<ActiveGamepad> gamepads_;
-  // Last known pointer position in guest units. Relative-mode motion, and
-  // wheel or button events with zero coordinates, do not move it: the pointer
-  // stays where it was captured while the deltas pass through.
   float mouse_x_ = 0.0f;
   float mouse_y_ = 0.0f;
-  // True once an absolute position has been received since Activate.
-  bool pointer_anchored_ = false;
-  bool raw_mouse_ = false;
 };
 
 const char* RobloxInputDispatchStateName(RobloxInputDispatchState state);

include/runtime/roblox_platform_web_symbols.h

@@ -1,7 +1,6 @@
 #ifndef MOCKTAIL_RUNTIME_ROBLOX_PLATFORM_WEB_SYMBOLS_H_
 #define MOCKTAIL_RUNTIME_ROBLOX_PLATFORM_WEB_SYMBOLS_H_
 
-#include "runtime/roblox_account_bridge.h"
 #include "runtime/roblox_browser_service_bridge.h"
 #include "runtime/roblox_permissions_bridge.h"
 #include "runtime/roblox_web_view_bridge.h"
@@ -16,8 +15,6 @@ struct RobloxPlatformWebSymbols {
   RobloxWebViewMessageBusSymbols web_view;
   RobloxBrowserServiceSymbols browser_service;
   RobloxPermissionsMessageBusSymbols permissions;
-  // Optional and excluded from complete(); see RobloxExperienceComposition.
-  RobloxAccountProtocolSymbols account;
 
   bool complete() const {
     return web_view.complete() && browser_service.complete() &&

include/runtime/roblox_text_surface_overlay.h

@@ -11,8 +11,6 @@
 #include "mocktail/status.h"
 #include "runtime/roblox_text_display_state.h"
 
-struct TTF_Font;
-
 namespace mocktail {
 namespace runtime {
 
@@ -41,8 +39,6 @@ class RobloxTextSurfaceOverlay final {
                              const RobloxTextDisplayUpdate& update);
   void ApplyUpdate(const RobloxTextDisplayUpdate& update);
   Status RasterizeLocked();
-  Status OpenFontsLocked(std::int32_t font, float point_size);
-  void CloseFontsLocked();
   void ClearFrameLocked();
   void RecordFailureLocked(Status status);
 
@@ -50,14 +46,10 @@ class RobloxTextSurfaceOverlay final {
   RobloxTextDisplayState state_;
   RobloxTextOverlayViewport viewport_;
   std::vector<std::uint8_t> rgba_;
-  std::vector<TTF_Font*> fonts_;
-  std::int32_t fonts_font_ = 0;
-  float fonts_point_size_ = 0.0F;
   std::uint64_t state_revision_ = 0;
   std::uint64_t raster_revision_ = 0;
   Status failure_;
   bool initialized_ = false;
-  bool ttf_initialized_ = false;
   bool failure_logged_ = false;
   bool ready_logged_ = false;
 };

include/runtime/roblox_web_view_bridge.h

@@ -13,8 +13,6 @@
 #include <mutex>
 #include <optional>
 #include <string>
-#include <string_view>
-#include <type_traits>
 
 #include "mocktail/status.h"
 #include "runtime/roblox_game_session_native_adapter.h"
@@ -44,10 +42,6 @@ struct RobloxWebViewOpenRequest {
   std::optional<bool> show_domain_as_title;
   std::optional<bool> back_button_visible;
   std::optional<bool> hide_header;
-  // Set by the bridge, never parsed. The host closes an OPEN_CAPTCHA_VIEW
-  // window once its solved captcha has been forwarded, as Android's captcha
-  // activity finishes itself on success.
-  bool close_when_challenge_solved = false;
 };
 
 // WebViewProtocol.mutateWindow is a partial update. Field absence must remain
@@ -67,9 +61,6 @@ Status ParseRobloxWebViewMutationJson(const std::string& json,
                                       RobloxWebViewMutationRequest* request);
 Status ParseRobloxCaptchaOpenJson(const std::string& json,
                                   RobloxWebViewOpenRequest* request);
-// True for a page's Navigation.navigateToFeature command reporting a solved
-// verification (see webview::IsRobloxChallengeSolvedFeature).
-bool IsRobloxWebViewChallengeSuccess(std::string_view command);
 Status ParseRobloxProfileViewUrl(const std::string& url,
                                  RobloxWebViewOpenRequest* request);
 Status ParseRobloxPurchaseRobuxNotification(const std::string& json,
@@ -117,33 +108,6 @@ using BroadcastWebViewDataModelFocusFn = void (*)(JNIEnv *, jclass, jstring,
 using SignalWebViewJavascriptCallbackFn = void (*)(JNIEnv*, jclass, jstring);
 using UpdateRobloxCookieSetHandlerFn =
     void (*)(JNIEnv*, jobject, jobject);
-// Roblox's counted handle to its Subsystem<IWebViewProtocol>. The protocol,
-// and its handleJavascriptCallback subscriber, exist only while a handle is
-// held. Roblox's handle type is not trivially destructible, so its getter
-// returns it through the caller-supplied result slot (rdi on x86-64, x8 on
-// AArch64). The user-provided destructor gives this type the same calling
-// convention. It does not release the handle.
-class RobloxWebViewProtocolHandle final {
- public:
-  RobloxWebViewProtocolHandle() = default;
-  explicit RobloxWebViewProtocolHandle(void* holder) : holder_(holder) {}
-  RobloxWebViewProtocolHandle(const RobloxWebViewProtocolHandle&) = default;
-  RobloxWebViewProtocolHandle& operator=(const RobloxWebViewProtocolHandle&) =
-      default;
-  ~RobloxWebViewProtocolHandle() {}
-
-  void* holder() const { return holder_; }
-
- private:
-  void* holder_ = nullptr;
-};
-static_assert(sizeof(RobloxWebViewProtocolHandle) == sizeof(void*));
-static_assert(!std::is_trivially_destructible_v<RobloxWebViewProtocolHandle>);
-
-// Roblox's Subsystem<IWebViewProtocol> getter. It is not exported; the
-// resolver finds it through the first call in
-// WebViewProtocol.initializeAndroidWebViewProtocol.
-using AcquireWebViewProtocolFn = RobloxWebViewProtocolHandle (*)();
 
 struct RobloxWebViewMessageBusSymbols {
   GetWebViewOpenWindowIdFn get_open_window_id = nullptr;
@@ -165,8 +129,6 @@ struct RobloxWebViewMessageBusSymbols {
   GetWebViewCloseWindowIdFn get_close_window_id = nullptr;
   SignalWebViewJavascriptCallbackFn signal_javascript_callback = nullptr;
   UpdateRobloxCookieSetHandlerFn update_cookie_set_handler = nullptr;
-  // Optional: found by code contract, not by symbol name.
-  AcquireWebViewProtocolFn acquire_web_view_protocol = nullptr;
 
   bool complete() const {
     return get_open_window_id != nullptr &&
@@ -325,10 +287,6 @@ private:
   std::array<std::shared_ptr<RawCallbackTarget>, kSubscriptionCount>
       raw_callback_targets_{};
   std::shared_ptr<HostWindowCloseTarget> host_window_close_target_;
-  // The reference this counts is kept for the process lifetime, as Roblox's
-  // Android app start keeps its own. Neither Shutdown nor destruction
-  // releases it.
-  RobloxWebViewProtocolHandle web_view_protocol_handle_;
   std::size_t in_flight_dispatches_ = 0;
   bool initializing_ = false;
   bool shutting_down_ = false;

include/runtime/roblox_window_input_runtime.h

@@ -36,7 +36,6 @@ class RobloxWindowInputRuntime final {
   Status UpdateTextFocusProperties(uint64_t generation,
                                    const RobloxTextFocusProperties& properties);
   RobloxInputSnapshot Snapshot() const;
-  void SetRawMouseEnabled(bool enabled);
 
  private:
   static void PlatformEventCallback(void* context,

include/runtime/runtime_config.h

@@ -1,4 +1,3 @@
-// Modified by vii from komaruworld/mocktail. See README "About this fork".
 #ifndef MOCKTAIL_RUNTIME_RUNTIME_CONFIG_H_
 #define MOCKTAIL_RUNTIME_RUNTIME_CONFIG_H_
 
@@ -39,10 +38,6 @@ struct InputCapabilityConfig {
   bool touch_enabled = false;
   bool mouse_enabled = true;
   bool keyboard_enabled = true;
-  // Mouse look deltas keep their host units instead of being scaled into guest
-  // surface units. The two differ only when the desktop display scale and the
-  // window's pixel density disagree, as under fractional scaling.
-  bool raw_mouse = false;
 };
 
 struct NetworkProxyConfig {
@@ -51,29 +46,16 @@ struct NetworkProxyConfig {
   int port = 0;
 };
 
-// Text and image fields expand {place_name}, {place_icon}, and
-// {creator_name}. A field that expands an empty placeholder, or renders
-// empty, is left out of the activity.
 struct DiscordRpcTextConfig {
-  std::string title = "Roblox";
   std::string browsing = "Browsing experiences";
   std::string joining = "Joining an experience";
-  std::string playing = "Playing {place_name}";
-  std::string state = "by {creator_name}";
+  std::string playing = "{place_name}";
+  std::string state = "Playing Roblox";
   std::string unknown_place = "Unknown experience";
 };
 
-// Images are an https URL or a Discord application asset key. Discord shows
-// the small image only next to a large one.
-struct DiscordRpcImagesConfig {
-  std::string large = "{place_icon}";
-  std::string large_text = "{place_name}";
-  std::string small = "roblox_small";
-  std::string small_text = "Roblox";
-};
-
 struct DiscordRpcConfig {
-  bool enabled = true;
+  bool enabled = false;
   bool show_place_name = true;
   bool show_elapsed_time = true;
   bool join_enabled = true;
@@ -81,7 +63,6 @@ struct DiscordRpcConfig {
   std::string join_button_label = "Join Server";
   std::string application_id;
   DiscordRpcTextConfig text;
-  DiscordRpcImagesConfig images;
 };
 
 std::optional<NetworkProxyConfig> ParseNetworkProxyConfig(

include/webview/roblox_challenge_features.h

@@ -1,19 +0,0 @@
-#ifndef MOCKTAIL_WEBVIEW_ROBLOX_CHALLENGE_FEATURES_H_
-#define MOCKTAIL_WEBVIEW_ROBLOX_CHALLENGE_FEATURES_H_
-
-#include <string_view>
-
-namespace mocktail::webview {
-
-// Navigation.navigateToFeature features a Roblox verification page sends when
-// the user has solved it. The captcha page sends CaptchaSuccess; the generic
-// challenge page (challenge/cdn/hybrid) sends challengeCompleted. The WebView
-// helper and the runtime both classify page events with this list.
-inline bool IsRobloxChallengeSolvedFeature(std::string_view feature) {
-  return feature == "CaptchaSuccess" || feature == "challengeCompleted" ||
-         feature == "ChallengeCompleted";
-}
-
-}  // namespace mocktail::webview
-
-#endif  // MOCKTAIL_WEBVIEW_ROBLOX_CHALLENGE_FEATURES_H_

lefthook.yml

@@ -1,23 +0,0 @@
-# Local git hooks. Install once with: lefthook install
-# Mirrors the "Repository contracts" job in .github/workflows/ci.yml.
-
-pre-commit:
-  parallel: true
-  commands:
-    shell-syntax:
-      glob: "{scripts,tests,packaging}/**/*.sh"
-      run: for f in {staged_files}; do bash -n "$f" || exit 1; done
-    json:
-      glob: "{config,packaging}/**/*.json"
-      run: for f in {staged_files}; do jq empty "$f" || exit 1; done
-    desktop-entry:
-      glob: "*.desktop"
-      run: desktop-file-validate {staged_files}
-
-pre-push:
-  commands:
-    packaging-contracts:
-      run: >-
-        bash tests/managed_payload_build_contract_test.sh . &&
-        bash tests/flatpak_packaging_test.sh . &&
-        bash tests/native_packaging_test.sh .

packaging/arch/PKGBUILD

@@ -1,14 +1,12 @@
-# Maintainer: vii <coderdayton14@gmail.com>
+# Maintainer: komaruworld <rtysus228@gmail.com>
 
-pkgname=nightcap
-pkgver=0.3.1
-pkgrel=1
+pkgname=mocktail
+pkgver=1.0.3
+pkgrel=2
 pkgdesc='Android x86-64 Roblox compatibility runtime for Linux'
 arch=('x86_64')
-url='https://github.com/CoderDayton/nightcap'
+url='https://github.com/komaruworld/mocktail'
 license=('Apache-2.0')
-provides=('mocktail')
-conflicts=('mocktail')
 depends=(
   'capstone'
   'curl'

packaging/aur/mocktail-bin/.SRCINFO

@@ -1,8 +1,8 @@
-pkgbase = nightcap-bin
+pkgbase = mocktail-bin
 	pkgdesc = Android x86-64 Roblox compatibility runtime for Linux (prebuilt)
-	pkgver = 0.3.1
+	pkgver = 1.0.4
 	pkgrel = 1
-	url = https://github.com/CoderDayton/nightcap
+	url = https://github.com/komaruworld/mocktail
 	arch = x86_64
 	license = Apache-2.0
 	depends = capstone
@@ -30,14 +30,12 @@ pkgbase = nightcap-bin
 	depends = zlib
 	optdepends = gamemode: Feral GameMode integration
 	provides = mocktail
-	provides = nightcap
 	conflicts = mocktail
-	conflicts = nightcap
-	conflicts = nightcap-git
-	noextract = nightcap-0.3.1-1-x86_64.pkg.tar.zst
+	conflicts = mocktail-git
+	noextract = mocktail-1.0.4-x86_64.pkg.tar.zst
 	options = !debug
 	options = !strip
-	source = nightcap-0.3.1-1-x86_64.pkg.tar.zst::https://github.com/CoderDayton/nightcap/releases/download/v0.3.1/nightcap-0.3.1-1-x86_64.pkg.tar.zst
-	sha256sums = SKIP
+	source = mocktail-1.0.4-x86_64.pkg.tar.zst::https://github.com/komaruworld/mocktail/releases/download/1.0.4/mocktail-1.0.4-x86_64.pkg.tar.zst
+	sha256sums = d5cc7216e88fd2889369e8eb7fba4276b2746c2b084dce566aaaa7505bc2ffb7
 
-pkgname = nightcap-bin
+pkgname = mocktail-bin

packaging/aur/mocktail-bin/PKGBUILD

@@ -1,11 +1,11 @@
-# Maintainer: vii <coderdayton14 at gmail dot com>
+# Maintainer: komaruworld <rtysus228 at gmail dot com>
 
-pkgname=nightcap-bin
-pkgver=0.3.1
+pkgname=mocktail-bin
+pkgver=1.0.4
 pkgrel=1
 pkgdesc='Android x86-64 Roblox compatibility runtime for Linux (prebuilt)'
 arch=('x86_64')
-url='https://github.com/CoderDayton/nightcap'
+url='https://github.com/komaruworld/mocktail'
 license=('Apache-2.0')
 depends=(
   'capstone'
@@ -33,18 +33,17 @@ depends=(
   'zlib'
 )
 optdepends=('gamemode: Feral GameMode integration')
-provides=('mocktail' 'nightcap')
-conflicts=('mocktail' 'nightcap' 'nightcap-git')
+provides=('mocktail')
+conflicts=('mocktail' 'mocktail-git')
 options=('!debug' '!strip')
-# The release asset carries the pacman package release built by release.yml.
-_archive="nightcap-${pkgver}-1-${CARCH}.pkg.tar.zst"
-source=("${_archive}::https://github.com/CoderDayton/nightcap/releases/download/v${pkgver}/${_archive}")
+# Release asset names do not include the AUR package release.
+_archive="mocktail-${pkgver}-${CARCH}.pkg.tar.zst"
+source=("${_archive}::https://github.com/komaruworld/mocktail/releases/download/${pkgver}/${_archive}")
 noextract=("${_archive}")
-# Replace with the checksum published beside the release asset.
-sha256sums=('SKIP')
+sha256sums=('d5cc7216e88fd2889369e8eb7fba4276b2746c2b084dce566aaaa7505bc2ffb7')
 
 package() {
   bsdtar -xf "${srcdir}/${_archive}" -C "${pkgdir}" usr
-  install -Dm644 "${pkgdir}/usr/share/licenses/nightcap/LICENSE" \
+  install -Dm644 "${pkgdir}/usr/share/licenses/mocktail/LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

packaging/aur/mocktail-git/.SRCINFO

@@ -1,8 +1,8 @@
-pkgbase = nightcap
+pkgbase = mocktail-git
 	pkgdesc = Android x86-64 Roblox compatibility runtime for Linux
-	pkgver = 0.3.1
+	pkgver = 1.0.2.r24.g9bdd737
 	pkgrel = 1
-	url = https://github.com/CoderDayton/nightcap
+	url = https://github.com/komaruworld/mocktail
 	arch = x86_64
 	license = Apache-2.0
 	makedepends = cmake>=3.20
@@ -38,11 +38,9 @@ pkgbase = nightcap
 	optdepends = gamemode: Feral GameMode integration
 	provides = mocktail
 	conflicts = mocktail
-	conflicts = nightcap-bin
-	conflicts = nightcap-git
+	conflicts = mocktail-bin
 	options = !debug
-	options = !lto
-	source = nightcap::git+https://github.com/CoderDayton/nightcap.git#tag=v0.3.1
+	source = mocktail::git+https://github.com/komaruworld/mocktail.git#branch=main
 	sha256sums = SKIP
 
-pkgname = nightcap
+pkgname = mocktail-git

packaging/aur/mocktail-git/PKGBUILD

@@ -1,11 +1,11 @@
-# Maintainer: vii <coderdayton14 at gmail dot com>
+# Maintainer: komaruworld <rtysus228 at gmail dot com>
 
-pkgname=nightcap-git
-pkgver=0.3.1.r0.g0000000
+pkgname=mocktail-git
+pkgver=1.0.2.r24.g9bdd737
 pkgrel=1
 pkgdesc='Android x86-64 Roblox compatibility runtime for Linux'
 arch=('x86_64')
-url='https://github.com/CoderDayton/nightcap'
+url='https://github.com/komaruworld/mocktail'
 license=('Apache-2.0')
 depends=(
   'capstone'
@@ -42,30 +42,31 @@ makedepends=(
   'vulkan-headers'
 )
 optdepends=('gamemode: Feral GameMode integration')
-provides=('mocktail' 'nightcap')
-conflicts=('mocktail' 'nightcap' 'nightcap-bin')
+provides=('mocktail')
+conflicts=('mocktail' 'mocktail-bin')
 options=('!debug')
 source=(
-  'nightcap::git+https://github.com/CoderDayton/nightcap.git#branch=main'
+  'mocktail::git+https://github.com/komaruworld/mocktail.git#branch=main'
 )
 sha256sums=(
   'SKIP'
 )
 
 pkgver() {
-  cd nightcap
+  cd mocktail
 
   local version
-  version="$(git describe --tags --abbrev=0 --match='v[0-9]*' 2>/dev/null)"
-  version="${version#v}"
+  version="$(sed -n \
+    's/^[[:space:]]*VERSION[[:space:]]\+\([0-9][0-9.]*\).*/\1/p' \
+    CMakeLists.txt | head -n 1)"
   printf '%s.r%s.g%s' \
-    "${version:-0.0.0}" \
+    "${version}" \
     "$(git rev-list --count HEAD)" \
     "$(git rev-parse --short=7 HEAD)"
 }
 
 prepare() {
-  cd nightcap
+  cd mocktail
 
   sed -i \
     's|add_subdirectory(third_party/Vulkan-Headers EXCLUDE_FROM_ALL)|find_package(VulkanHeaders CONFIG REQUIRED)|' \
@@ -73,7 +74,7 @@ prepare() {
 }
 
 build() {
-  cmake -S nightcap -B build -G Ninja \
+  cmake -S mocktail -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -86,6 +87,6 @@ build() {
 
 package() {
   DESTDIR="${pkgdir}" cmake --install build
-  install -Dm644 nightcap/LICENSE \
+  install -Dm644 mocktail/LICENSE \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

packaging/aur/mocktail/.SRCINFO

@@ -1,8 +1,8 @@
-pkgbase = nightcap-git
+pkgbase = mocktail
 	pkgdesc = Android x86-64 Roblox compatibility runtime for Linux
-	pkgver = 0.3.1.r0.g0000000
+	pkgver = 1.0.4
 	pkgrel = 1
-	url = https://github.com/CoderDayton/nightcap
+	url = https://github.com/komaruworld/mocktail
 	arch = x86_64
 	license = Apache-2.0
 	makedepends = cmake>=3.20
@@ -36,13 +36,11 @@ pkgbase = nightcap-git
 	depends = webkitgtk-6.0
 	depends = zlib
 	optdepends = gamemode: Feral GameMode integration
-	provides = mocktail
-	provides = nightcap
-	conflicts = mocktail
-	conflicts = nightcap
-	conflicts = nightcap-bin
+	conflicts = mocktail-bin
+	conflicts = mocktail-git
 	options = !debug
-	source = nightcap::git+https://github.com/CoderDayton/nightcap.git#branch=main
+	options = !lto
+	source = mocktail::git+https://github.com/komaruworld/mocktail.git#tag=1.0.4
 	sha256sums = SKIP
 
-pkgname = nightcap-git
+pkgname = mocktail

packaging/aur/mocktail/PKGBUILD

@@ -1,11 +1,11 @@
-# Maintainer: vii <coderdayton14 at gmail dot com>
+# Maintainer: komaruworld <rtysus228 at gmail dot com>
 
-pkgname=nightcap
-pkgver=0.3.1
+pkgname=mocktail
+pkgver=1.0.4
 pkgrel=1
 pkgdesc='Android x86-64 Roblox compatibility runtime for Linux'
 arch=('x86_64')
-url='https://github.com/CoderDayton/nightcap'
+url='https://github.com/komaruworld/mocktail'
 license=('Apache-2.0')
 depends=(
   'capstone'
@@ -42,18 +42,17 @@ makedepends=(
   'vulkan-headers'
 )
 optdepends=('gamemode: Feral GameMode integration')
-provides=('mocktail')
-conflicts=('mocktail' 'nightcap-bin' 'nightcap-git')
+conflicts=('mocktail-bin' 'mocktail-git')
 options=('!debug' '!lto')
 source=(
-  "nightcap::git+https://github.com/CoderDayton/nightcap.git#tag=v${pkgver}"
+  "mocktail::git+https://github.com/komaruworld/mocktail.git#tag=${pkgver}"
 )
 sha256sums=(
   'SKIP'
 )
 
 prepare() {
-  cd nightcap
+  cd mocktail
 
   sed -i \
     's|add_subdirectory(third_party/Vulkan-Headers EXCLUDE_FROM_ALL)|find_package(VulkanHeaders CONFIG REQUIRED)|' \
@@ -61,7 +60,7 @@ prepare() {
 }
 
 build() {
-  cmake -S nightcap -B build -G Ninja \
+  cmake -S mocktail -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
@@ -74,6 +73,6 @@ build() {
 
 package() {
   DESTDIR="${pkgdir}" cmake --install build
-  install -Dm644 nightcap/LICENSE \
+  install -Dm644 mocktail/LICENSE \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

packaging/flatpak/space.bigrat.mocktail.json

@@ -1,5 +1,5 @@
 {
-  "app-id": "io.github.CoderDayton.nightcap",
+  "app-id": "space.bigrat.mocktail",
   "runtime": "org.gnome.Platform",
   "runtime-version": "50",
   "sdk": "org.gnome.Sdk",

packaging/freebsd/README.md

@@ -1,4 +1,3 @@
-<!-- Modified by vii from komaruworld/mocktail. See the top-level README "About this fork". -->
 # FreeBSD Linuxulator
 
 FreeBSD Linuxulator support is experimental. I tested it on FreeBSD
@@ -16,7 +15,7 @@ tested source revision is `aadd58dddcbc78f4d5594827b46b5633552b15ce`. Run
 the following commands as root.
 
 ```sh
-fetch -o /root/linuxulator.patch https://raw.githubusercontent.com/CoderDayton/nightcap/main/packaging/freebsd/linuxulator.patch
+fetch -o /root/linuxulator.patch https://raw.githubusercontent.com/komaruworld/mocktail/main/packaging/freebsd/linuxulator.patch
 cd /usr/src
 git apply /root/linuxulator.patch
 make -j2 kernel-toolchain
@@ -41,10 +40,11 @@ After reboot, verify the result from the Fedora userspace. It must print
 chroot /compat/linux stat -f -c %t /proc
 ```
 
-## Run Nightcap
+## Run Mocktail
 
-You can simply run the Nightcap AppImage from the
-[latest release](https://github.com/CoderDayton/nightcap/releases/latest)
+You can simply run the Mocktail AppImage from the
+[latest release](https://github.com/komaruworld/mocktail/releases/latest) or
+[nightly build](https://github.com/komaruworld/mocktail/releases/tag/continuous)
 inside the Fedora userspace.
 
 ## Audio
@@ -72,11 +72,11 @@ ctl.!default {
 EOF
 ```
 
-Launch Nightcap with the ALSA audio driver.
+Launch Mocktail with the ALSA audio driver.
 
 ```sh
-SDL_AUDIO_DRIVER=alsa ./Nightcap-x86_64.AppImage
+SDL_AUDIO_DRIVER=alsa ./Mocktail-x86_64.AppImage
 ```
 
-Nightcap cannot override this check because Roblox reads `/proc` directly. The
+Mocktail cannot override this check because Roblox reads `/proc` directly. The
 Linuxulator patch fixes the value before Roblox sees it.

packaging/io.github.CoderDayton.nightcap.desktop

@@ -1,13 +0,0 @@
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
-[Desktop Entry]
-Type=Application
-Name=Nightcap
-GenericName=Roblox Player
-Comment=Play Roblox on Linux
-Exec=env SDL_VIDEODRIVER=wayland,x11 mocktail %u
-Icon=io.github.CoderDayton.nightcap
-StartupWMClass=io.github.CoderDayton.nightcap
-Categories=Game;
-Terminal=false
-MimeType=x-scheme-handler/roblox;x-scheme-handler/roblox-player;
-X-Mocktail-Managed=true

packaging/io.github.CoderDayton.nightcap.metainfo.xml

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Modified by vii from komaruworld/mocktail. See README "About this fork". -->
-<!-- Copyright 2026 Mocktail Project Authors -->
-<!-- SPDX-License-Identifier: CC0-1.0 -->
-<component type="desktop-application">
-  <id>io.github.CoderDayton.nightcap</id>
-  <name>Nightcap</name>
-  <summary>Play Roblox on Linux</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>Apache-2.0</project_license>
-  <developer id="io.github.coderdayton">
-    <name>vii</name>
-  </developer>
-  <branding>
-    <color type="primary" scheme_preference="light">#CEB3EF</color>
-    <color type="primary" scheme_preference="dark">#2F2A6B</color>
-  </branding>
-  <url type="homepage">https://github.com/CoderDayton/nightcap</url>
-  <description>
-    <p>
-      Sign in to Roblox, browse experiences, and play them on Linux.
-    </p>
-    <p>
-      Nightcap is an independent community project, forked from Mocktail. It
-      is not affiliated with Roblox Corporation or VinegarHQ, and the Roblox
-      client is not included.
-    </p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-home.png</image>
-      <caption>Browse Roblox experiences</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-gameplay-tower.png</image>
-      <caption>Play Tower of Hell on Linux</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-gameplay-lobby.png</image>
-      <caption>Play DOORS on Linux</caption>
-    </screenshot>
-  </screenshots>
-  <launchable type="desktop-id">io.github.CoderDayton.nightcap.desktop</launchable>
-  <content_rating type="oars-1.1">
-    <content_attribute id="violence-cartoon">moderate</content_attribute>
-    <content_attribute id="violence-fantasy">moderate</content_attribute>
-    <content_attribute id="violence-realistic">moderate</content_attribute>
-    <content_attribute id="social-chat">moderate</content_attribute>
-    <content_attribute id="social-info">moderate</content_attribute>
-    <content_attribute id="social-audio">moderate</content_attribute>
-    <content_attribute id="social-contacts">intense</content_attribute>
-    <content_attribute id="money-purchasing">intense</content_attribute>
-    <content_attribute id="money-advertising">intense</content_attribute>
-    <content_attribute id="money-gambling">moderate</content_attribute>
-  </content_rating>
-  <provides>
-    <binary>mocktail</binary>
-  </provides>
-  <releases>
-    <release version="0.3.2" date="2026-09-29">
-      <description>
-        <ul>
-          <li>Added experimental support for ARM64 Linux.</li>
-          <li>Fixed login stalling after passing a verification check.</li>
-          <li>Fixed login check windows staying open after they were solved.</li>
-          <li>Fixed Play on a private server doing nothing until a sidebar tab was clicked.</li>
-          <li>Less stutter while joining a game and while textures load in.</li>
-          <li>Middle click and natural scrolling now work as expected.</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.3.1" date="2026-09-20">
-      <description>
-        <ul>
-          <li>Added DEB, RPM, and pacman packages to every release.</li>
-          <li>Smoother frames: textures no longer decode on the thread that submits the frame.</li>
-          <li>Fixed the mouse pointer jumping when a right-click camera drag ended.</li>
-          <li>Fixed the text caret not moving when a trailing space was typed.</li>
-          <li>Faster typing in text boxes.</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.3.0" date="2026-09-18">
-      <description>
-        <ul>
-          <li>Added a custom Discord presence: set the title, state, and icons.</li>
-          <li>Added --profile to record a trace of the renderer's work.</li>
-          <li>Faster texture loading: compressed textures decode and resample on worker threads.</li>
-          <li>Lower CPU use while playing.</li>
-          <li>Fixed GameMode pinning the game to a few CPU cores.</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.2.0" date="2026-09-16">
-      <description>
-        <ul>
-          <li>Discord Rich Presence is on by default.</li>
-          <li>Added input.raw_mouse for mouse look in the host's own units.</li>
-          <li>Fixed mouse look after a long turn.</li>
-          <li>Fixed a first-run failure with "cannot lock appStorage".</li>
-          <li>Values in fflags.json now win over the performance preset.</li>
-        </ul>
-      </description>
-    </release>
-    <release version="0.1.0" date="2026-09-15">
-      <description>
-        <ul>
-          <li>First Nightcap release, forked from Mocktail.</li>
-          <li>Added ETC2 and EAC texture emulation on Vulkan.</li>
-          <li>Added PNG texture overrides.</li>
-          <li>Lower input latency.</li>
-          <li>Roblox now sees the real host RAM and display size.</li>
-        </ul>
-      </description>
-    </release>
-  </releases>
-</component>

packaging/space.bigrat.mocktail.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Type=Application
+Name=Mocktail
+GenericName=Roblox Player
+Comment=Play Roblox on Linux
+Exec=mocktail %u
+Icon=space.bigrat.mocktail
+StartupWMClass=space.bigrat.mocktail
+Categories=Game;
+Terminal=false
+MimeType=x-scheme-handler/roblox;x-scheme-handler/roblox-player;
+X-Mocktail-Managed=true

packaging/space.bigrat.mocktail.metainfo.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2026 Mocktail Project Authors -->
+<!-- SPDX-License-Identifier: CC0-1.0 -->
+<component type="desktop-application">
+  <id>space.bigrat.mocktail</id>
+  <name>Mocktail</name>
+  <summary>Play Roblox on Linux</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>Apache-2.0</project_license>
+  <developer id="space.bigrat">
+    <name>Mocktail Project Authors</name>
+  </developer>
+  <branding>
+    <color type="primary" scheme_preference="light">#CEB3EF</color>
+    <color type="primary" scheme_preference="dark">#2F2A6B</color>
+  </branding>
+  <url type="homepage">https://github.com/komaruworld/mocktail</url>
+  <description>
+    <p>
+      Sign in to Roblox, browse experiences, and play them on Linux.
+    </p>
+    <p>
+      Mocktail is an independent community project. It is not affiliated with
+      Roblox Corporation or VinegarHQ, and the Roblox client is not included.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-home.png</image>
+      <caption>Browse Roblox experiences</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-gameplay-tower.png</image>
+      <caption>Play Tower of Hell on Linux</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/komaruworld/mocktail/88b7382577aa138a2d16619b091f69abcdf7da15/assets/screenshots/flatpak-gameplay-lobby.png</image>
+      <caption>Play DOORS on Linux</caption>
+    </screenshot>
+  </screenshots>
+  <launchable type="desktop-id">space.bigrat.mocktail.desktop</launchable>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">moderate</content_attribute>
+    <content_attribute id="violence-fantasy">moderate</content_attribute>
+    <content_attribute id="violence-realistic">moderate</content_attribute>
+    <content_attribute id="social-chat">moderate</content_attribute>
+    <content_attribute id="social-info">moderate</content_attribute>
+    <content_attribute id="social-audio">moderate</content_attribute>
+    <content_attribute id="social-contacts">intense</content_attribute>
+    <content_attribute id="money-purchasing">intense</content_attribute>
+    <content_attribute id="money-advertising">intense</content_attribute>
+    <content_attribute id="money-gambling">moderate</content_attribute>
+  </content_rating>
+  <provides>
+    <binary>mocktail</binary>
+  </provides>
+  <releases>
+    <release version="1.0.4" date="2026-09-11">
+      <description>
+        <ul>
+          <li>Fixed login issues</li>
+          <li>Fixed low-resolution textures, skybox rendering and HiDPI scaling.</li>
+          <li>Added vc support.</li>
+          <li>Added Xbox and PlayStation gamepad support.</li>
+          <li>Added Nix support</li>
+          <li>Improved text input, fullscreen mode, window sizing, and mouse controls.</li>
+          <li>Updated support for Roblox 2.736.1408.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.0.3" date="2026-08-16">
+      <description>
+        <ul>
+          <li>Fixed issues with downloading Roblox on first launch</li>
+          <li>Added fflags.json for custom FFlags</li>
+          <li>Added a message if your cookies have expired</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.0.2" date="2026-08-14">
+      <description>
+        <ul>
+          <li>Fixed the “Roblox is out of date” bug</li>
+          <li>Improved logging</li>
+          <li>Fixed issues with Discord RPC where the game you were playing wasn’t displayed</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.0.1" date="2026-08-13">
+      <description>
+        <ul>
+          <li>Fix issues with GameMode</li>
+          <li>Add Discord RPC support</li>
+        </ul>
+      </description>
+    </release>
+    <release version="0.1.0" date="2026-08-12"/>
+  </releases>
+</component>

packaging/space.bigrat.mocktail.svg

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Modified by vii from komaruworld/mocktail. See README "About this fork". -->
 <!-- Copyright 2026 Mocktail Project Authors -->
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 <svg xmlns="http://www.w3.org/2000/svg"
@@ -7,7 +6,7 @@
      height="512"
      viewBox="96 96 320 320"
      fill="none">
-  <title>Nightcap</title>
+  <title>Mocktail</title>
   <mask id="mocktail-mark"
         mask-type="alpha"
         maskUnits="userSpaceOnUse"
@@ -20,12 +19,12 @@
   </mask>
   <g mask="url(#mocktail-mark)">
     <path d="M461.343 267.246L461.165 265.65L444.708 108.145C444.345 105.047 443.009 102.143 440.894 99.8515C438.769 97.5865 436.001 96.028 432.962 95.3864C429.924 94.7448 426.761 95.051 423.903 96.2637C421.056 97.5364 418.67 99.6554 417.07 102.332L356.5 146L206 108.145L193.521 42.4325C193.5 39.3045 192.493 36.2626 190.644 33.7398C188.774 31.2601 186.189 29.4138 183.237 28.4502C180.285 27.4866 177.108 27.4521 174.135 28.3513C171.161 29.2864 168.555 31.1314 166.685 33.6262L73.5931 161.71L72.6616 163.009C59.2667 181.485 52.2413 203.814 52.6444 226.631C53.0476 249.448 60.8576 271.515 74.8967 289.505L75.0459 289.702L75.453 290.192L142.096 374.97L174.978 417.241L195.02 442.943C197.361 445.962 200.625 448.131 204.315 449.12C208.005 450.109 211.918 449.862 215.455 448.418L245.662 436.181L295.274 416.014L395.981 375.674L396.235 375.562C417.35 366.989 435.112 351.794 446.852 332.262C458.593 312.73 463.678 289.915 461.343 267.246Z"
-          fill="#2F2A6B"/>
+          fill="#E24329"/>
     <path d="M461.403 267.484L461.225 265.887C433.09 264.216 404.933 268.779 378.766 279.25L234.209 337.935C266.844 379.87 295.27 416.324 295.27 416.324L403.5 418L396.231 375.873C417.371 367.306 435.156 352.105 446.91 332.557C458.664 313.009 463.75 290.172 461.403 267.484Z"
-          fill="#6C4FD1"/>
+          fill="#FC6D26"/>
     <path d="M142.135 375.279L175.016 417.549L195.058 443.252C197.399 446.271 200.664 448.44 204.354 449.429C208.044 450.418 211.956 450.171 215.493 448.727L245.701 436.489L295.313 416.323C295.313 416.323 266.867 379.774 234.21 337.922C185.002 357.838 142.135 375.279 142.135 375.279Z"
-          fill="#A78BFA"/>
+          fill="#FCA326"/>
     <path d="M138.341 214.829C120.941 192.647 98.8514 174.589 73.6535 161.948L72.722 163.247C59.3272 181.723 52.3017 204.052 52.7049 226.869C53.1081 249.685 60.918 271.752 74.9572 289.743L75.1064 289.94L41.5 337.851L142.156 375.208C142.156 375.208 184.959 357.839 234.232 337.851L138.341 214.829Z"
-          fill="#6C4FD1"/>
+          fill="#FC6D26"/>
   </g>
 </svg>

scripts/assemble_flatpak_pages.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # SPDX-License-Identifier: Apache-2.0
 
@@ -7,11 +6,12 @@ set -Eeuo pipefail
 umask 022
 
 readonly REPOSITORY="${1:?Flatpak repository path is required}"
-readonly BUNDLE="${2:?Flatpak bundle path is required}"
-readonly PUBLIC_KEY="${3:?GPG public key path is required}"
-readonly OUTPUT="${4:?Pages output path is required}"
-readonly BASE_URL="https://coderdayton.github.io/nightcap"
-readonly APP_ID="io.github.CoderDayton.nightcap"
+readonly X86_64_BUNDLE="${2:?x86_64 Flatpak bundle path is required}"
+readonly AARCH64_BUNDLE="${3:?aarch64 Flatpak bundle path is required}"
+readonly PUBLIC_KEY="${4:?GPG public key path is required}"
+readonly OUTPUT="${5:?Pages output path is required}"
+readonly NATIVE_REPOSITORIES="${6:?Native repositories path is required}"
+readonly BASE_URL="https://mocktail.bigrat.space"
 readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
 readonly PROJECT_DIR="$(dirname -- "${SCRIPT_DIR}")"
 
@@ -19,14 +19,23 @@ readonly PROJECT_DIR="$(dirname -- "${SCRIPT_DIR}")"
   printf 'Flatpak repository is missing or unsafe: %s\n' "${REPOSITORY}" >&2
   exit 1
 }
-[[ -f "${BUNDLE}" && ! -L "${BUNDLE}" ]] || {
-  printf 'Flatpak bundle is missing or unsafe: %s\n' "${BUNDLE}" >&2
-  exit 1
-}
+for bundle in "${X86_64_BUNDLE}" "${AARCH64_BUNDLE}"; do
+  [[ -f "${bundle}" && ! -L "${bundle}" ]] || {
+    printf 'Flatpak bundle is missing or unsafe: %s\n' "${bundle}" >&2
+    exit 1
+  }
+done
 [[ -s "${PUBLIC_KEY}" && ! -L "${PUBLIC_KEY}" ]] || {
   printf 'Flatpak public key is missing or unsafe: %s\n' "${PUBLIC_KEY}" >&2
   exit 1
 }
+[[ -d "${NATIVE_REPOSITORIES}/apt" &&
+   -d "${NATIVE_REPOSITORIES}/rpm" &&
+   -d "${NATIVE_REPOSITORIES}/downloads" &&
+   -s "${NATIVE_REPOSITORIES}/mocktail-packages.gpg" ]] || {
+  printf 'Native repositories are missing: %s\n' "${NATIVE_REPOSITORIES}" >&2
+  exit 1
+}
 [[ ! -e "${OUTPUT}" ]] || {
   printf 'Pages output already exists: %s\n' "${OUTPUT}" >&2
   exit 1
@@ -34,41 +43,51 @@ readonly PROJECT_DIR="$(dirname -- "${SCRIPT_DIR}")"
 
 mkdir -p -- "${OUTPUT}"
 cp -a -- "${REPOSITORY}" "${OUTPUT}/repo"
-install -m 0644 -- "${BUNDLE}" "${OUTPUT}/Nightcap-x86_64.flatpak"
-install -m 0644 -- "${PUBLIC_KEY}" "${OUTPUT}/nightcap-flatpak.gpg"
+install -m 0644 -- "${X86_64_BUNDLE}" "${OUTPUT}/Mocktail-x86_64.flatpak"
+install -m 0644 -- "${AARCH64_BUNDLE}" "${OUTPUT}/Mocktail-aarch64.flatpak"
+install -m 0644 -- "${PUBLIC_KEY}" "${OUTPUT}/mocktail-flatpak.gpg"
 install -m 0644 -- \
-  "${PROJECT_DIR}/packaging/${APP_ID}.svg" \
-  "${OUTPUT}/nightcap.svg"
-touch -- "${OUTPUT}/.nojekyll"
+  "${PROJECT_DIR}/packaging/space.bigrat.mocktail.svg" \
+  "${OUTPUT}/mocktail.svg"
+install -m 0644 -- \
+  "${PROJECT_DIR}/packaging/discord-join.html" \
+  "${OUTPUT}/join.html"
+install -m 0644 -- "${PROJECT_DIR}/site/index.html" "${OUTPUT}/index.html"
+install -m 0644 -- "${PROJECT_DIR}/site/styles.css" "${OUTPUT}/styles.css"
+install -d -- "${OUTPUT}/packaging"
+install -m 0644 -- \
+  "${PROJECT_DIR}/packaging/space.bigrat.mocktail.svg" \
+  "${OUTPUT}/packaging/space.bigrat.mocktail.svg"
+cp -a -- "${NATIVE_REPOSITORIES}/apt" "${OUTPUT}/apt"
+cp -a -- "${NATIVE_REPOSITORIES}/rpm" "${OUTPUT}/rpm"
+cp -a -- "${NATIVE_REPOSITORIES}/downloads" "${OUTPUT}/downloads"
+install -m 0644 -- \
+  "${NATIVE_REPOSITORIES}/mocktail-packages.gpg" \
+  "${OUTPUT}/mocktail-packages.gpg"
 
 readonly GPG_KEY="$(base64 --wrap=0 "${PUBLIC_KEY}")"
 
-cat >"${OUTPUT}/nightcap.flatpakrepo" <<EOF
+cat >"${OUTPUT}/mocktail.flatpakrepo" <<EOF
 [Flatpak Repo]
-Title=Nightcap
+Title=Mocktail Nightly
 Url=${BASE_URL}/repo/
-Homepage=https://github.com/CoderDayton/nightcap
-Comment=Nightcap releases
-Description=Signed x86_64 release builds of Nightcap
-Icon=${BASE_URL}/nightcap.svg
+Homepage=https://github.com/komaruworld/mocktail
+Comment=Nightly builds of Mocktail
+Description=Signed x86_64 and aarch64 nightly builds published from the latest Mocktail main branch
+Icon=${BASE_URL}/mocktail.svg
 GPGKey=${GPG_KEY}
 EOF
 
-cat >"${OUTPUT}/nightcap.flatpakref" <<EOF
+cat >"${OUTPUT}/mocktail.flatpakref" <<EOF
 [Flatpak Ref]
-Title=Nightcap
-Name=${APP_ID}
+Title=Mocktail Nightly
+Name=space.bigrat.mocktail
 Branch=stable
 Url=${BASE_URL}/repo/
 RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo
-Homepage=https://github.com/CoderDayton/nightcap
-Comment=Roblox on Linux, tuned for a real PC
-Icon=${BASE_URL}/nightcap.svg
+Homepage=https://github.com/komaruworld/mocktail
+Comment=Nightly build from the latest main branch
+Icon=${BASE_URL}/mocktail.svg
 GPGKey=${GPG_KEY}
 IsRuntime=false
 EOF
-
-install -m 0644 -- "${PROJECT_DIR}/site/index.html" "${OUTPUT}/index.html"
-install -m 0644 -- "${PROJECT_DIR}/site/styles.css" "${OUTPUT}/styles.css"
-install -m 0644 -- "${PROJECT_DIR}/site/terms.html" "${OUTPUT}/terms.html"
-install -m 0644 -- "${PROJECT_DIR}/site/privacy.html" "${OUTPUT}/privacy.html"

scripts/build_flatpak.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # SPDX-License-Identifier: Apache-2.0
 
@@ -9,8 +8,8 @@ readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
 readonly PROJECT_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd -P)"
 
 BUILD_DIR="${PROJECT_ROOT}/build-flatpak"
-MANIFEST="${PROJECT_ROOT}/packaging/flatpak/io.github.CoderDayton.nightcap.json"
-JOBS="${MOCKTAIL_FLATPAK_JOBS:-2}"
+MANIFEST="${PROJECT_ROOT}/packaging/flatpak/space.bigrat.mocktail.json"
+JOBS="${MOCKTAIL_FLATPAK_JOBS:-4}"
 
 Usage() {
   cat <<'EOF'
@@ -21,7 +20,7 @@ Build and install Mocktail as a per-user Flatpak for the host architecture.
 Options:
   --build-dir DIR  Builder output directory (default: build-flatpak).
   --manifest FILE  Flatpak manifest path.
-  --jobs N         Maximum parallel build jobs (default: 2).
+  --jobs N         Maximum parallel build jobs (default: 4).
   -h, --help       Show this help.
 EOF
 }

scripts/generate_desktop_icons.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # SPDX-License-Identifier: Apache-2.0
 
 set -euo pipefail
 
 readonly project_root="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")/.." && pwd)"
-readonly source_icon="${project_root}/packaging/io.github.CoderDayton.nightcap.svg"
+readonly source_icon="${project_root}/packaging/space.bigrat.mocktail.svg"
 readonly output_root="${project_root}/packaging/icons/hicolor"
-readonly icon_name="io.github.CoderDayton.nightcap.png"
+readonly icon_name="space.bigrat.mocktail.png"
 readonly icon_sizes=(16 22 24 32 36 48 64 72 96 128 192 256 512)
 
 if ! command -v magick >/dev/null 2>&1; then

scripts/package_anylinux.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # SPDX-License-Identifier: Apache-2.0
 
@@ -153,8 +152,8 @@ AnyLinuxDeploy() {
   local -a deployment_environment=(
     "APPDIR=${app_dir}" "MAIN_BIN=mocktail" "LIB_DIR=/usr/lib"
     "TMPDIR=${ANYLINUX_WORK}/tmp"
-    "DESKTOP=/usr/share/applications/io.github.CoderDayton.nightcap.desktop"
-    "ICON=/usr/share/icons/hicolor/scalable/apps/io.github.CoderDayton.nightcap.svg"
+    "DESKTOP=/usr/share/applications/space.bigrat.mocktail.desktop"
+    "ICON=/usr/share/icons/hicolor/scalable/apps/space.bigrat.mocktail.svg"
     "DEPLOY_DATADIR=0" "DEPLOY_LOCALE=0" "DEPLOY_VULKAN=0"
     "STRACE_MODE=1" "STRACE_BINARY=mocktail" "STRACE_FLAGS=--help"
     "STRACE_TIME=1"

scripts/package_portable.sh

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -921,25 +920,25 @@ BuildAppImage() {
   ln -s "share/mocktail-bundle/run.sh" "${APPDIR}/usr/mocktail"
   install -m 0755 -- "${PROJECT_ROOT}/packaging/AppRun" "${APPDIR}/AppRun"
   install -m 0644 -- \
-    "${PROJECT_ROOT}/packaging/io.github.CoderDayton.nightcap.desktop" \
-    "${APPDIR}/io.github.CoderDayton.nightcap.desktop"
+    "${PROJECT_ROOT}/packaging/space.bigrat.mocktail.desktop" \
+    "${APPDIR}/space.bigrat.mocktail.desktop"
   install -m 0644 -- \
-    "${PROJECT_ROOT}/packaging/io.github.CoderDayton.nightcap.desktop" \
-    "${APPDIR}/usr/share/applications/io.github.CoderDayton.nightcap.desktop"
+    "${PROJECT_ROOT}/packaging/space.bigrat.mocktail.desktop" \
+    "${APPDIR}/usr/share/applications/space.bigrat.mocktail.desktop"
   install -m 0644 -- \
-    "${PROJECT_ROOT}/packaging/io.github.CoderDayton.nightcap.svg" \
-    "${APPDIR}/io.github.CoderDayton.nightcap.svg"
+    "${PROJECT_ROOT}/packaging/space.bigrat.mocktail.svg" \
+    "${APPDIR}/space.bigrat.mocktail.svg"
   install -m 0644 -- \
-    "${PROJECT_ROOT}/packaging/io.github.CoderDayton.nightcap.svg" \
-    "${APPDIR}/usr/share/icons/hicolor/scalable/apps/io.github.CoderDayton.nightcap.svg"
+    "${PROJECT_ROOT}/packaging/space.bigrat.mocktail.svg" \
+    "${APPDIR}/usr/share/icons/hicolor/scalable/apps/space.bigrat.mocktail.svg"
   for icon_path in \
-      "${PROJECT_ROOT}"/packaging/icons/hicolor/*x*/apps/io.github.CoderDayton.nightcap.png; do
+      "${PROJECT_ROOT}"/packaging/icons/hicolor/*x*/apps/space.bigrat.mocktail.png; do
     [[ -f "${icon_path}" ]] || Die "hicolor icon set is incomplete"
     icon_relative_path="${icon_path#"${PROJECT_ROOT}/packaging/icons/hicolor/"}"
     install -D -m 0644 -- "${icon_path}" \
       "${APPDIR}/usr/share/icons/hicolor/${icon_relative_path}"
   done
-  ln -s io.github.CoderDayton.nightcap.svg "${APPDIR}/.DirIcon"
+  ln -s space.bigrat.mocktail.svg "${APPDIR}/.DirIcon"
   mkdir -p -- "$(dirname -- "${APPIMAGE_OUTPUT}")"
   ARCH=x86_64 appimagetool "${APPDIR}" "${APPIMAGE_OUTPUT}"
   rm -rf -- "${APPDIR}"

scripts/package_version.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
-# Copyright 2026 Mocktail Project Authors
-# SPDX-License-Identifier: Apache-2.0
-#
-# Prints the native package version for the current ref. A release tag gives
-# its own version; anything else gives 0.0.0, which sorts below every release.
-
-set -Eeuo pipefail
-
-ref="${1:-${GITHUB_REF_NAME:-}}"
-version="${ref#v}"
-
-if [[ "${version}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-  printf '%s\n' "${version}"
-else
-  printf '0.0.0\n'
-fi

scripts/register_url_handler.sh

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
-# Modified by vii from komaruworld/mocktail. See README "About this fork".
 # Copyright 2026 Mocktail Project Authors
 # SPDX-License-Identifier: Apache-2.0
 
 set -Eeuo pipefail
 umask 077
 
-readonly DESKTOP_ID="io.github.CoderDayton.nightcap.desktop"
+readonly DESKTOP_ID="space.bigrat.mocktail.desktop"
 readonly ROBLOX_SCHEME="x-scheme-handler/roblox"
 readonly ROBLOX_PLAYER_SCHEME="x-scheme-handler/roblox-player"
 
@@ -140,9 +139,8 @@ desktop_source="$(ResolveRegularFile "${desktop_source}" "desktop template")"
 
 [[ "$(grep -Fxc '[Desktop Entry]' "${desktop_source}")" == 1 &&
    "$(grep -Fxc 'Type=Application' "${desktop_source}")" == 1 &&
-   "$(grep -Fxc 'Icon=io.github.CoderDayton.nightcap' "${desktop_source}")" == 1 &&
-   "$(grep -Fxc 'Exec=env SDL_VIDEODRIVER=wayland,x11 mocktail %u' \
-       "${desktop_source}")" == 1 &&
+   "$(grep -Fxc 'Icon=space.bigrat.mocktail' "${desktop_source}")" == 1 &&
+   "$(grep -Fxc 'Exec=mocktail %u' "${desktop_source}")" == 1 &&
    "$(grep -Fxc 'MimeType=x-scheme-handler/roblox;x-scheme-handler/roblox-player;' \
        "${desktop_source}")" == 1 &&
    "$(grep -Fxc 'X-Mocktail-Managed=true' "${desktop_source}")" == 1 &&
@@ -175,8 +173,7 @@ temporary="$(mktemp "${applications_dir}/.${DESKTOP_ID}.XXXXXX.desktop")"
 trap 'rm -f -- "${temporary}"' EXIT
 while IFS= read -r line || [[ -n "${line}" ]]; do
   if [[ "${line}" == Exec=* ]]; then
-    printf 'Exec=env SDL_VIDEODRIVER=wayland,x11 %s %%u\n' \
-      "${mocktail_executable}"
+    printf 'Exec=%s %%u\n' "${mocktail_executable}"
     if [[ -n "${launch_working_directory}" ]]; then
       printf 'Path=%s\n' "${launch_working_directory}"
     fi

scripts/release_notes.sh

@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-# Print the CHANGELOG.md section for one version, for use as GitHub release
-# notes. Usage: scripts/release_notes.sh v0.1.0 [CHANGELOG.md]
-# Exits 1 when the version has no section, so a release cannot ship without
-# notes.
-
-set -Eeuo pipefail
-
-readonly tag="${1:?tag is required, e.g. v0.1.0}"
-readonly changelog="${2:-$(dirname -- "${BASH_SOURCE[0]}")/../CHANGELOG.md}"
-readonly version="${tag#v}"
-
-notes="$(awk -v version="${version}" '
-  /^## \[/ {
-    if (found) exit
-    found = ($0 ~ "^## \\[" version "\\]")
-    next
-  }
-  /^\[[^]]+\]: / { if (found) exit }
-  found { print }
-' "${changelog}")"
-
-# Trim leading and trailing blank lines.
-notes="$(printf '%s\n' "${notes}" | sed -e '/./,$!d' | sed -e ':a' -e '/^\n*$/{$d;N;ba' -e '}')"
-
-[[ -n "${notes}" ]] || {
-  printf 'CHANGELOG.md has no section for version %s\n' "${version}" >&2
-  exit 1
-}
-printf '%s\n' "${notes}"

scripts/summarize_profile_trace.py

@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-# Copyright 2026 Mocktail Project Authors
-# Licensed under the Apache License, Version 2.0.
-"""Summarizes `--profile` traces as a Markdown table for pull requests.
-
-Usage: summarize_profile_trace.py TRACE [TRACE ...]
-
-Each trace gets its own column, so `before.json after.json` compares them.
-Frame times come from the "frame interval (ms)" counter; every other row is
-a slice name recorded by the Vulkan adapter.
-"""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-import json
-import math
-from pathlib import Path
-import sys
-from typing import Iterable
-
-FRAME_COUNTER = "frame interval (ms)"
-
-
-@dataclass(frozen=True)
-class Distribution:
-    count: int
-    total: float
-    mean: float
-    p50: float
-    p95: float
-    p99: float
-    max: float
-
-
-@dataclass(frozen=True)
-class Summary:
-    frames: Distribution | None
-    slices: dict[str, Distribution]
-
-
-def _nearest_rank(ordered: list[float], percent: float) -> float:
-    rank = max(1, math.ceil(percent / 100 * len(ordered)))
-    return ordered[rank - 1]
-
-
-def _distribution(values: list[float]) -> Distribution:
-    ordered = sorted(values)
-    total = sum(ordered)
-    return Distribution(count=len(ordered), total=total,
-                        mean=total / len(ordered),
-                        p50=_nearest_rank(ordered, 50),
-                        p95=_nearest_rank(ordered, 95),
-                        p99=_nearest_rank(ordered, 99), max=ordered[-1])
-
-
-def summarize(events: Iterable[dict]) -> Summary:
-    frames: list[float] = []
-    slices: dict[str, list[float]] = {}
-    for event in events:
-        phase = event.get("ph")
-        if phase == "C" and event.get("name") == FRAME_COUNTER:
-            frames.append(float(event["args"]["value"]))
-        elif phase == "X":
-            slices.setdefault(event["name"], []).append(event["dur"] / 1000)
-    return Summary(
-        frames=_distribution(frames) if frames else None,
-        slices={name: _distribution(values)
-                for name, values in slices.items()})
-
-
-def _row(label: str, cells: list[str]) -> str:
-    return "| " + " | ".join([label, *cells]) + " |"
-
-
-def _cell(distribution: Distribution | None, field: str) -> str:
-    if distribution is None:
-        return "-"
-    if field == "count":
-        return str(distribution.count)
-    return f"{getattr(distribution, field):.2f}"
-
-
-def _metric_row(label: str, distributions: list[Distribution | None],
-                field: str) -> str:
-    return _row(label, [_cell(item, field) for item in distributions])
-
-
-def to_markdown(traces: list[tuple[str, Summary]]) -> str:
-    summaries = [summary for _, summary in traces]
-    lines = [_row("metric", [name for name, _ in traces]),
-             _row("---", ["---:"] * len(traces))]
-
-    frames = [summary.frames for summary in summaries]
-    lines.append(_metric_row("frames", frames, "count"))
-    if any(frames):
-        lines += [_metric_row(f"frame interval {field} (ms)", frames, field)
-                  for field in ("mean", "p50", "p95", "p99", "max")]
-
-    # Largest total time first, taken from whichever trace spent the most.
-    totals: dict[str, float] = {}
-    for summary in summaries:
-        for name, distribution in summary.slices.items():
-            totals[name] = max(totals.get(name, 0.0), distribution.total)
-    for name in sorted(totals, key=lambda name: -totals[name]):
-        column = [summary.slices.get(name) for summary in summaries]
-        lines.append(_metric_row(f"{name} count", column, "count"))
-        lines += [_metric_row(f"{name} {field} (ms)", column, field)
-                  for field in ("total", "mean", "p99", "max")]
-    return "\n".join(lines)
-
-
-def main(arguments: list[str]) -> int:
-    if not arguments:
-        print(__doc__.strip(), file=sys.stderr)
-        return 2
-    traces = []
-    for argument in arguments:
-        path = Path(argument)
-        traces.append((path.name, summarize(json.loads(path.read_text()))))
-    print(to_markdown(traces))
-    return 0
-
-
-if __name__ == "__main__":
-    sys.exit(main(sys.argv[1:]))

site/index.html

@@ -1,56 +1,75 @@
 <!doctype html>
-<!-- Modified by vii from komaruworld/mocktail. See README "About this fork". -->
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <meta name="color-scheme" content="dark">
-  <title>Nightcap for Linux</title>
-  <link rel="icon" href="nightcap.svg" type="image/svg+xml">
+  <title>Mocktail for Linux</title>
   <link rel="stylesheet" href="styles.css">
 </head>
 <body><main>
-  <img src="nightcap.svg" alt="Nightcap logo">
-  <h1>Nightcap</h1>
-  <p>Play Roblox on Linux like it was made for your PC. Nightcap is Mocktail, tuned to feel fast and look sharp.</p>
-  <a class="button" href="https://github.com/CoderDayton/nightcap/releases/latest/download/Nightcap-x86_64.AppImage">Download AppImage</a>
-  <a class="button secondary" href="nightcap.flatpakref">Install with Flatpak</a>
+  <img src="../packaging/space.bigrat.mocktail.svg" alt="Mocktail logo">
+  <h1>Mocktail</h1>
+  <p>Play Roblox on Linux. Use the stable Flathub release, or try the latest nightly build from main. Nightly Flatpaks are available for x86_64 and aarch64; Roblox runtime support on aarch64 is experimental.</p>
+  <a class="button" href="https://flathub.org/apps/space.bigrat.mocktail">Stable on Flathub</a>
+  <a class="button secondary" href="https://mocktail.bigrat.space/mocktail.flatpakref">Nightly build</a>
   <div class="commands">
-    <p>AppImage</p>
-    <code>chmod +x Nightcap-x86_64.AppImage
-./Nightcap-x86_64.AppImage</code>
-    <p>Flatpak</p>
-    <code>flatpak install --user https://coderdayton.github.io/nightcap/nightcap.flatpakref
-flatpak run io.github.CoderDayton.nightcap</code>
-    <p>DEB, RPM and pacman</p>
-    <code>sudo apt install ./nightcap_&lt;version&gt;-1_amd64.deb
-sudo dnf install ./nightcap-&lt;version&gt;-1.x86_64.rpm
-sudo pacman -U nightcap-&lt;version&gt;-1-x86_64.pkg.tar.zst</code>
-    <p>Build from source</p>
-    <code>git clone --recurse-submodules https://github.com/CoderDayton/nightcap.git
-cd nightcap &amp;&amp; make build
-./build/mocktail</code>
+    <p>Stable</p>
+    <code>flatpak install flathub space.bigrat.mocktail</code>
+    <p>Nightly</p>
+    <code>flatpak install --user https://mocktail.bigrat.space/mocktail.flatpakref</code>
   </div>
-  <h2>What's different</h2>
-  <ul>
-    <li>Lower input lag. Frames are shown as soon as they are ready.</li>
-    <li>Sharper textures, with your own PNG overrides if you want them.</li>
-    <li>ETC2 textures render correctly on desktop GPUs.</li>
-    <li>No more error 319 kicks after joining a server.</li>
-    <li>Roblox sees your real RAM and screen size.</li>
-  </ul>
-  <h2>Direct downloads</h2>
-  <p>Prebuilt builds for Linux x86_64.</p>
   <p class="links">
-    <a href="https://github.com/CoderDayton/nightcap/releases/latest/download/Nightcap-x86_64.AppImage">AppImage</a>
-    <a href="Nightcap-x86_64.flatpak">Flatpak bundle</a>
-    <a href="https://github.com/CoderDayton/nightcap/releases/latest">DEB, RPM, pacman</a>
-    <a href="nightcap-flatpak.gpg">Signing key</a>
-    <a href="terms.html">Terms</a>
-    <a href="privacy.html">Privacy</a>
+    <a href="Mocktail-x86_64.flatpak">x86_64 nightly Flatpak</a>
+    <a href="Mocktail-aarch64.flatpak">aarch64 nightly Flatpak</a>
   </p>
-  <p><a class="source" href="https://github.com/CoderDayton/nightcap">Source code</a> ·
-     <a class="source" href="https://github.com/komaruworld/mocktail">Upstream Mocktail</a></p>
-  <p>Nightcap is an independent community project and is not affiliated with Roblox Corporation.</p>
+  <h2>AUR packages</h2>
+  <p>Available from the AUR. Choose one package:</p>
+  <p class="links">
+    <a href="https://aur.archlinux.org/packages/mocktail">mocktail</a>
+    <a href="https://aur.archlinux.org/packages/mocktail-bin">mocktail-bin</a>
+    <a href="https://aur.archlinux.org/packages/mocktail-git">mocktail-git</a>
+  </p>
+  <code>yay -S mocktail
+yay -S mocktail-bin
+yay -S mocktail-git</code>
+  <h2>DNF repository</h2>
+  <p>Stable and nightly packages for Fedora 44. Choose one package.</p>
+  <code>sudo curl -fsSL https://mocktail.bigrat.space/rpm/mocktail.repo -o /etc/yum.repos.d/mocktail.repo</code>
+  <div class="commands">
+    <p>Stable</p>
+    <code>sudo dnf install mocktail</code>
+    <p>Nightly</p>
+    <code>sudo dnf install mocktail-nightly</code>
+  </div>
+  <h2>APT repository</h2>
+  <p>Stable and nightly packages for Ubuntu 26.04. Choose one package.</p>
+  <code>sudo install -d -m 0755 /etc/apt/keyrings
+sudo curl -fsSL https://mocktail.bigrat.space/mocktail-packages.gpg -o /etc/apt/keyrings/mocktail.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/mocktail.gpg] https://mocktail.bigrat.space/apt mocktail main" | sudo tee /etc/apt/sources.list.d/mocktail.list &gt;/dev/null
+sudo apt update</code>
+  <div class="commands">
+    <p>Stable</p>
+    <code>sudo apt install mocktail</code>
+    <p>Nightly</p>
+    <code>sudo apt install mocktail-nightly</code>
+  </div>
+  <h2>Direct downloads</h2>
+  <p>Prebuilt Linux packages. DEB and RPM are for x86_64; the nightly AppImage also has an aarch64 build.</p>
+  <p class="download-label">Stable</p>
+  <p class="links">
+    <a href="https://github.com/komaruworld/mocktail/releases/latest/download/Mocktail-x86_64.AppImage">AppImage</a>
+    <a href="https://mocktail.bigrat.space/downloads/mocktail.deb">DEB</a>
+    <a href="https://mocktail.bigrat.space/downloads/mocktail.rpm">RPM</a>
+  </p>
+  <p class="download-label">Nightly</p>
+  <p class="links">
+    <a href="https://github.com/komaruworld/mocktail/releases/download/continuous/mocktail-nightly.AppImage">AppImage (x86_64)</a>
+    <a href="https://github.com/komaruworld/mocktail/releases/download/continuous/mocktail-nightly-aarch64.AppImage">AppImage (aarch64)</a>
+    <a href="https://github.com/komaruworld/mocktail/releases/download/continuous/mocktail-nightly.deb">DEB</a>
+    <a href="https://github.com/komaruworld/mocktail/releases/download/continuous/mocktail-nightly.rpm">RPM</a>
+  </p>
+  <p><a class="source" href="https://github.com/komaruworld/mocktail">Source code</a></p>
+  <p>Mocktail is an independent community project and is not affiliated with Roblox Corporation.</p>
 </main></body>
 </html>

site/privacy.html

@@ -1,43 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="color-scheme" content="dark">
-  <title>Nightcap Privacy Policy</title>
-  <link rel="icon" href="nightcap.svg" type="image/svg+xml">
-  <link rel="stylesheet" href="styles.css">
-</head>
-<body><main>
-  <h1>Privacy Policy</h1>
-  <p>Nightcap is a Linux runtime for the Roblox Android client. This policy covers Nightcap itself and its Discord application. Roblox and Discord have their own policies for the data they handle.</p>
-
-  <h2>What Nightcap collects</h2>
-  <p>Nothing. Nightcap has no server. It does not collect, store, or send telemetry, analytics, crash reports, or account data to the Nightcap project.</p>
-
-  <h2>What stays on your machine</h2>
-  <ul>
-    <li>Configuration in <code>~/.config/mocktail/</code></li>
-    <li>Session logs and support bundles in <code>~/.local/state/mocktail/</code></li>
-    <li>Roblox login session under <code>~/.local/share/mocktail/</code></li>
-    <li>Roblox cache, downloaded payloads, and shader cache under <code>~/.cache/mocktail/</code></li>
-  </ul>
-  <p>Flatpak installs keep the same layout under <code>~/.var/app/io.github.CoderDayton.nightcap/</code>.</p>
-
-  <h2>Discord Rich Presence</h2>
-  <p>When Rich Presence is on, Nightcap sends the current experience name, its public icon URL, elapsed time, and an optional public server join code to the Discord desktop client on the same machine over a local socket. Discord displays this on your profile under its own privacy settings. Nightcap never signs in to Discord, never reads a Discord token, and never contacts Discord's servers.</p>
-  <p>Set <code>integrations.discord_rpc.enabled: false</code> in <code>config.yaml</code> to turn it off.</p>
-
-  <h2>Roblox</h2>
-  <p>Nightcap talks to Roblox's services exactly as the Roblox client would. That traffic is covered by the Roblox Privacy Policy.</p>
-
-  <h2>Contact</h2>
-  <p>Open an issue at <a class="source" href="https://github.com/CoderDayton/nightcap/issues">github.com/CoderDayton/nightcap/issues</a>.</p>
-
-  <p class="links">
-    <a href="index.html">Home</a>
-    <a href="terms.html">Terms of Service</a>
-    <a href="https://github.com/CoderDayton/nightcap">Source code</a>
-  </p>
-</main></body>
-</html>

site/styles.css

@@ -1,4 +1,3 @@
-/* Modified by vii from komaruworld/mocktail. See README "About this fork". */
 :root {
   font: 17px/1.55 system-ui, sans-serif;
   color-scheme: dark;
@@ -6,8 +5,8 @@
 
 body {
   margin: 0;
-  background: #14122b;
-  color: #ece8ff;
+  background: #0d1117;
+  color: #e6edf3;
 }
 
 main {
@@ -31,13 +30,8 @@ h2 {
   font-size: 1.15rem;
 }
 
-p,
-li {
-  color: #b3aad6;
-}
-
-ul {
-  padding-left: 1.2rem;
+p {
+  color: #9da7b3;
 }
 
 a.button {
@@ -45,14 +39,14 @@ a.button {
   margin: 16px 8px 16px 0;
   padding: 12px 18px;
   border-radius: 9px;
-  background: #6c4fd1;
+  background: #238636;
   color: white;
   font-weight: 700;
   text-decoration: none;
 }
 
 a.secondary {
-  background: #2f2a6b;
+  background: #21262d;
 }
 
 .commands {
@@ -62,7 +56,7 @@ a.secondary {
 .commands p,
 .download-label {
   margin: 14px 0 5px;
-  color: #ece8ff;
+  color: #e6edf3;
   font-size: .82rem;
   font-weight: 700;
   letter-spacing: .04em;
@@ -73,9 +67,9 @@ code {
   display: block;
   padding: 14px;
   overflow-wrap: anywhere;
-  border: 1px solid #3a3470;
+  border: 1px solid #30363d;
   border-radius: 6px;
-  background: #1d1a3d;
+  background: #161b22;
   white-space: pre-wrap;
 }
 
@@ -86,9 +80,9 @@ code {
 .links a {
   display: inline-block;
   margin: 0 14px 6px 0;
-  color: #a78bfa;
+  color: #e6edf3;
 }
 
 a.source {
-  color: #a78bfa;
+  color: #e6edf3;
 }

site/terms.html

@@ -1,36 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="color-scheme" content="dark">
-  <title>Nightcap Terms of Service</title>
-  <link rel="icon" href="nightcap.svg" type="image/svg+xml">
-  <link rel="stylesheet" href="styles.css">
-</head>
-<body><main>
-  <h1>Terms of Service</h1>
-  <p>Nightcap is free and open-source software licensed under the Apache License, Version 2.0. The license text shipped with the source governs your use of the software.</p>
-
-  <h2>No warranty</h2>
-  <p>Nightcap is provided "as is", without warranty of any kind. The authors are not liable for any loss, damage, or account action that results from using it. See sections 7 and 8 of the Apache License.</p>
-
-  <h2>Not affiliated</h2>
-  <p>Nightcap is an independent community project. It is not affiliated with, endorsed by, or supported by Roblox Corporation or Discord Inc. Roblox and Discord are trademarks of their respective owners.</p>
-
-  <h2>Your responsibility</h2>
-  <p>You are responsible for following the Roblox Terms of Use and the Discord Terms of Service while using Nightcap with those services. Nightcap does not modify Roblox game logic, does not bypass Roblox security, and is not a cheat.</p>
-
-  <h2>Discord application</h2>
-  <p>The Nightcap Discord application only provides Rich Presence for the Nightcap desktop runtime. It requests no permissions, has no bot, and does not access your Discord account.</p>
-
-  <h2>Changes</h2>
-  <p>These terms may change with new releases. The current version always lives at this address.</p>
-
-  <p class="links">
-    <a href="index.html">Home</a>
-    <a href="privacy.html">Privacy Policy</a>
-    <a href="https://github.com/CoderDayton/nightcap">Source code</a>
-  </p>
-</main></body>
-</html>

src/graphics/bionic_vulkan_loader_adapter.cc

@@ -1,8 +1,7 @@
-// Modified by vii from komaruworld/mocktail. See README "About this fork".
+// Includes changes by vii from CoderDayton/nightcap.
 // Android Vulkan loader ABI -> host Vulkan loader + SDL3 WSI.
 
 #include <dlfcn.h>
-#include <pthread.h>
 #include <time.h>
 #include <vulkan/vulkan.h>
 
@@ -12,14 +11,12 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <deque>
 #include <mutex>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "mocktail/graphics/android_vulkan_wsi_adapter.h"
-#include "mocktail/graphics/chrome_trace_writer.h"
 #include "mocktail/graphics/present_mode_policy.h"
 #include "mocktail/graphics/vulkan_etc2_emulation.h"
 #include "mocktail/graphics/vulkan_text_overlay_compositor.h"
@@ -783,7 +780,6 @@ bool NameInList(const char* name, const char* const* names,
          });
 }
 
-// Device commands wrapped for ETC2/EAC emulation.
 bool IsEtc2DeviceProc(const char* name) {
   static constexpr const char* kNames[] = {
       "vkCreateImage",          "vkDestroyImage",
@@ -801,7 +797,6 @@ bool IsEtc2DeviceProc(const char* name) {
   return NameInList(name, kNames, sizeof(kNames) / sizeof(kNames[0]));
 }
 
-// Physical-device queries that report emulated ETC2/EAC support.
 bool IsEtc2PhysicalDeviceProc(const char* name) {
   static constexpr const char* kNames[] = {
       "vkGetPhysicalDeviceFeatures",
@@ -1014,8 +1009,7 @@ VkResult WaitForSemaphoresObserved(const char* call_name,
     }
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       call_name, "wait");
+  static_cast<void>(call_name);
   const VkResult result = host_wait(device, wait_info, timeout);
   if (observation != nullptr) {
     observation->SetResult(result);
@@ -1046,7 +1040,6 @@ struct FpsWaitTrace {
   std::atomic<std::uint64_t> total_ns{0};
   std::atomic<std::uint64_t> max_ns{0};
   std::atomic<std::uint64_t> window_start_ns{0};
-  // Longest time between consecutive call starts; for present, a frame time.
   std::atomic<std::uint64_t> max_gap_ns{0};
   std::atomic<std::uint64_t> last_start_ns{0};
 
@@ -1134,12 +1127,7 @@ ObservedHostQueuePresent(VkQueue queue, const VkPresentInfoKHR* present_info) {
   }
   const bool fps_trace = FpsTraceEnabled();
   const std::uint64_t present_start_ns = fps_trace ? MonotonicNanos() : 0;
-  VkResult result = VK_SUCCESS;
-  {
-    mocktail::graphics::TraceScope scope(
-        mocktail::graphics::ActiveProfileTrace(), "host present", "present");
-    result = host_present(queue, present_info);
-  }
+  const VkResult result = host_present(queue, present_info);
   if (fps_trace) {
     PresentWaitTrace().Record(present_start_ns);
   }
@@ -1151,159 +1139,6 @@ ObservedHostQueuePresent(VkQueue queue, const VkPresentInfoKHR* present_info) {
   return result;
 }
 
-// Samples the time between successive adapter present calls, and the CPU
-// time the presenting thread and the whole process used in it.
-void RecordProfiledFrame(mocktail::graphics::ChromeTraceWriter* trace,
-                         std::uint64_t present_start_ns) {
-  static std::atomic<std::uint64_t> previous_start_ns{0};
-  static mocktail::graphics::FrameCpuSampler cpu_sampler;
-  const std::uint64_t previous =
-      previous_start_ns.exchange(present_start_ns, std::memory_order_relaxed);
-  if (previous != 0 && present_start_ns > previous) {
-    trace->Counter("frame interval (ms)", present_start_ns,
-                   static_cast<double>(present_start_ns - previous) / 1e6);
-  }
-  mocktail::graphics::FrameCpuSample cpu;
-  if (cpu_sampler.Sample(static_cast<std::uint64_t>(pthread_self()),
-                         mocktail::graphics::TraceThreadCpuNanos(),
-                         mocktail::graphics::TraceProcessCpuNanos(), &cpu)) {
-    trace->Counter("process cpu (ms)", present_start_ns, cpu.process_ms);
-    if (cpu.has_thread) {
-      trace->Counter("present thread cpu (ms)", present_start_ns,
-                     cpu.thread_ms);
-    }
-  }
-}
-
-// Pipeline and shader creation is wrapped only while profiling, so a normal
-// session calls the host driver directly.
-VkResult VKAPI_CALL ProfiledCreateGraphicsPipelines(
-    VkDevice device, VkPipelineCache cache, std::uint32_t count,
-    const VkGraphicsPipelineCreateInfo* infos,
-    const VkAllocationCallbacks* allocator, VkPipeline* pipelines) {
-  const auto host = reinterpret_cast<PFN_vkCreateGraphicsPipelines>(
-      HostDeviceProc(device, "vkCreateGraphicsPipelines"));
-  if (host == nullptr) {
-    return VK_ERROR_INITIALIZATION_FAILED;
-  }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkCreateGraphicsPipelines",
-                                       "pipeline");
-  const VkResult result =
-      host(device, cache, count, infos, allocator, pipelines);
-  scope.Arg("count", count);
-  scope.Arg("cache", cache != VK_NULL_HANDLE);
-  scope.Arg("result", result);
-  return result;
-}
-
-VkResult VKAPI_CALL ProfiledCreateComputePipelines(
-    VkDevice device, VkPipelineCache cache, std::uint32_t count,
-    const VkComputePipelineCreateInfo* infos,
-    const VkAllocationCallbacks* allocator, VkPipeline* pipelines) {
-  const auto host = reinterpret_cast<PFN_vkCreateComputePipelines>(
-      HostDeviceProc(device, "vkCreateComputePipelines"));
-  if (host == nullptr) {
-    return VK_ERROR_INITIALIZATION_FAILED;
-  }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkCreateComputePipelines",
-                                       "pipeline");
-  const VkResult result =
-      host(device, cache, count, infos, allocator, pipelines);
-  scope.Arg("count", count);
-  scope.Arg("cache", cache != VK_NULL_HANDLE);
-  scope.Arg("result", result);
-  return result;
-}
-
-VkResult VKAPI_CALL ProfiledCreateShaderModule(
-    VkDevice device, const VkShaderModuleCreateInfo* create_info,
-    const VkAllocationCallbacks* allocator, VkShaderModule* shader_module) {
-  const auto host = reinterpret_cast<PFN_vkCreateShaderModule>(
-      HostDeviceProc(device, "vkCreateShaderModule"));
-  if (host == nullptr) {
-    return VK_ERROR_INITIALIZATION_FAILED;
-  }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkCreateShaderModule", "pipeline");
-  const VkResult result = host(device, create_info, allocator, shader_module);
-  scope.Arg("bytes", create_info != nullptr
-                         ? static_cast<std::int64_t>(create_info->codeSize)
-                         : 0);
-  scope.Arg("result", result);
-  return result;
-}
-
-VkResult VKAPI_CALL ProfiledCreatePipelineCache(
-    VkDevice device, const VkPipelineCacheCreateInfo* create_info,
-    const VkAllocationCallbacks* allocator, VkPipelineCache* cache) {
-  const auto host = reinterpret_cast<PFN_vkCreatePipelineCache>(
-      HostDeviceProc(device, "vkCreatePipelineCache"));
-  if (host == nullptr) {
-    return VK_ERROR_INITIALIZATION_FAILED;
-  }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkCreatePipelineCache", "pipeline");
-  const VkResult result = host(device, create_info, allocator, cache);
-  scope.Arg("initial_bytes",
-            create_info != nullptr
-                ? static_cast<std::int64_t>(create_info->initialDataSize)
-                : 0);
-  scope.Arg("result", result);
-  return result;
-}
-
-VkResult VKAPI_CALL ProfiledAllocateMemory(
-    VkDevice device, const VkMemoryAllocateInfo* allocate_info,
-    const VkAllocationCallbacks* allocator, VkDeviceMemory* memory) {
-  const auto host = reinterpret_cast<PFN_vkAllocateMemory>(
-      HostDeviceProc(device, "vkAllocateMemory"));
-  if (host == nullptr) {
-    return VK_ERROR_INITIALIZATION_FAILED;
-  }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkAllocateMemory", "memory");
-  const VkResult result = host(device, allocate_info, allocator, memory);
-  scope.Arg("bytes", allocate_info != nullptr
-                         ? static_cast<std::int64_t>(
-                               allocate_info->allocationSize)
-                         : 0);
-  scope.Arg("type", allocate_info != nullptr
-                        ? static_cast<std::int64_t>(
-                              allocate_info->memoryTypeIndex)
-                        : -1);
-  scope.Arg("result", result);
-  return result;
-}
-
-// Null unless profiling is on and `name` is a profiled device command.
-// These take precedence over the ETC2 wrappers, so a command both wrap is
-// timed inside its adapter function instead.
-PFN_vkVoidFunction ProfileAdapterProc(const char* name) {
-  if (name == nullptr || mocktail::graphics::ActiveProfileTrace() == nullptr) {
-    return nullptr;
-  }
-  if (std::strcmp(name, "vkCreateGraphicsPipelines") == 0) {
-    return reinterpret_cast<PFN_vkVoidFunction>(
-        ProfiledCreateGraphicsPipelines);
-  }
-  if (std::strcmp(name, "vkCreateComputePipelines") == 0) {
-    return reinterpret_cast<PFN_vkVoidFunction>(
-        ProfiledCreateComputePipelines);
-  }
-  if (std::strcmp(name, "vkCreateShaderModule") == 0) {
-    return reinterpret_cast<PFN_vkVoidFunction>(ProfiledCreateShaderModule);
-  }
-  if (std::strcmp(name, "vkCreatePipelineCache") == 0) {
-    return reinterpret_cast<PFN_vkVoidFunction>(ProfiledCreatePipelineCache);
-  }
-  if (std::strcmp(name, "vkAllocateMemory") == 0) {
-    return reinterpret_cast<PFN_vkVoidFunction>(ProfiledAllocateMemory);
-  }
-  return nullptr;
-}
-
 template <typename Function>
 Function HostPhysicalDeviceProc(const char* name, const char* alias) {
   VkInstance instance = VK_NULL_HANDLE;
@@ -1342,134 +1177,18 @@ void ReleaseEtc2PoolCommandBuffers(VkDevice device,
   }
 }
 
-// The stage the decoded staging bytes are read at. Every emulated upload is
-// a buffer-to-image copy, so the transfer stage is the earliest point the GPU
-// may touch them.
-constexpr VkPipelineStageFlags kEtc2WaitStage = VK_PIPELINE_STAGE_TRANSFER_BIT;
-
-// Holds the arrays a rewritten submit points at, so they outlive the call.
-// Deques keep earlier elements addressable as later ones are appended.
-struct Etc2SubmitRewrite {
-  std::deque<std::vector<VkSemaphore>> wait_semaphores;
-  std::deque<std::vector<VkPipelineStageFlags>> wait_stages;
-  std::deque<std::vector<std::uint64_t>> wait_values;
-  std::deque<std::vector<std::uint64_t>> signal_values;
-  std::deque<VkTimelineSemaphoreSubmitInfo> timelines;
-  std::deque<std::vector<VkSemaphoreSubmitInfo>> wait_infos;
-  std::vector<VkSubmitInfo> rewritten;
-  std::vector<VkSubmitInfo2> rewritten2;
-};
-
-// Adds each submit's decode wait to its wait list. A submit whose pNext chain
-// already sizes arrays by its own semaphore counts is decoded on this thread
-// instead: a VkTimelineSemaphoreSubmitInfo would have to be rebuilt, and a
-// VkDeviceGroupSubmitInfo's pWaitSemaphoreDeviceIndices would be left one
-// entry short of the grown wait list.
-const VkSubmitInfo* PrepareEtc2Submit(std::uint32_t submit_count,
-                                      const VkSubmitInfo* submits,
-                                      Etc2SubmitRewrite* rewrite) {
-  if (submits == nullptr || submit_count == 0) {
-    return submits;
+void PrepareEtc2Submit2(std::uint32_t submit_count,
+                        const VkSubmitInfo2* submits) {
+  if (submits == nullptr) {
+    return;
   }
-  bool rewritten_any = false;
   for (std::uint32_t index = 0; index < submit_count; ++index) {
-    const VkSubmitInfo& original = submits[index];
-    const bool fixed_wait_list =
-        FindFeature(original.pNext,
-                    VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO) !=
-            nullptr ||
-        FindFeature(original.pNext,
-                    VK_STRUCTURE_TYPE_DEVICE_GROUP_SUBMIT_INFO) != nullptr;
-    const mocktail::graphics::Etc2SubmitWait wait = State().etc2.PrepareSubmit(
-        original.pCommandBuffers, original.commandBufferCount,
-        !fixed_wait_list);
-    if (wait.semaphore == VK_NULL_HANDLE) {
-      continue;
-    }
-    if (!rewritten_any) {
-      rewrite->rewritten.assign(submits, submits + submit_count);
-      rewritten_any = true;
-    }
-    std::vector<VkSemaphore>& semaphores = rewrite->wait_semaphores.emplace_back(
-        original.pWaitSemaphores,
-        original.pWaitSemaphores + original.waitSemaphoreCount);
-    semaphores.push_back(wait.semaphore);
-    std::vector<VkPipelineStageFlags>& stages =
-        rewrite->wait_stages.emplace_back(
-            original.pWaitDstStageMask,
-            original.pWaitDstStageMask + original.waitSemaphoreCount);
-    stages.push_back(kEtc2WaitStage);
-    // Binary semaphores ignore their value; only the appended entry is read.
-    std::vector<std::uint64_t>& values = rewrite->wait_values.emplace_back(
-        original.waitSemaphoreCount, 0);
-    values.push_back(wait.value);
-
-    VkTimelineSemaphoreSubmitInfo& timeline =
-        rewrite->timelines.emplace_back();
-    timeline.sType = VK_STRUCTURE_TYPE_TIMELINE_SEMAPHORE_SUBMIT_INFO;
-    timeline.pNext = original.pNext;
-    timeline.waitSemaphoreValueCount = static_cast<std::uint32_t>(values.size());
-    timeline.pWaitSemaphoreValues = values.data();
-    if (original.signalSemaphoreCount != 0) {
-      std::vector<std::uint64_t>& signals =
-          rewrite->signal_values.emplace_back(original.signalSemaphoreCount, 0);
-      timeline.signalSemaphoreValueCount =
-          static_cast<std::uint32_t>(signals.size());
-      timeline.pSignalSemaphoreValues = signals.data();
-    }
-
-    VkSubmitInfo& target = rewrite->rewritten[index];
-    target.pNext = &timeline;
-    target.waitSemaphoreCount = static_cast<std::uint32_t>(semaphores.size());
-    target.pWaitSemaphores = semaphores.data();
-    target.pWaitDstStageMask = stages.data();
-  }
-  return rewritten_any ? rewrite->rewritten.data() : submits;
-}
-
-const VkSubmitInfo2* PrepareEtc2Submit2(std::uint32_t submit_count,
-                                        const VkSubmitInfo2* submits,
-                                        Etc2SubmitRewrite* rewrite) {
-  if (submits == nullptr || submit_count == 0) {
-    return submits;
-  }
-  bool rewritten_any = false;
-  for (std::uint32_t index = 0; index < submit_count; ++index) {
-    const VkSubmitInfo2& original = submits[index];
-    std::vector<VkCommandBuffer> command_buffers;
-    command_buffers.reserve(original.commandBufferInfoCount);
-    for (std::uint32_t info = 0; info < original.commandBufferInfoCount;
+    for (std::uint32_t info = 0; info < submits[index].commandBufferInfoCount;
          ++info) {
-      command_buffers.push_back(
-          original.pCommandBufferInfos[info].commandBuffer);
+      State().etc2.PrepareSubmit(
+          &submits[index].pCommandBufferInfos[info].commandBuffer, 1);
     }
-    const mocktail::graphics::Etc2SubmitWait wait = State().etc2.PrepareSubmit(
-        command_buffers.data(),
-        static_cast<std::uint32_t>(command_buffers.size()), true);
-    if (wait.semaphore == VK_NULL_HANDLE) {
-      continue;
-    }
-    if (!rewritten_any) {
-      rewrite->rewritten2.assign(submits, submits + submit_count);
-      rewritten_any = true;
-    }
-    std::vector<VkSemaphoreSubmitInfo>& waits = rewrite->wait_infos.emplace_back(
-        original.pWaitSemaphoreInfos,
-        original.pWaitSemaphoreInfos + original.waitSemaphoreInfoCount);
-    VkSemaphoreSubmitInfo decoded{};
-    decoded.sType = VK_STRUCTURE_TYPE_SEMAPHORE_SUBMIT_INFO;
-    decoded.semaphore = wait.semaphore;
-    decoded.value = wait.value;
-    // Matches kEtc2WaitStage: the staging bytes are read by transfer
-    // commands, which includes the blits an upscaled upload records.
-    decoded.stageMask = VK_PIPELINE_STAGE_2_ALL_TRANSFER_BIT;
-    waits.push_back(decoded);
-
-    VkSubmitInfo2& target = rewrite->rewritten2[index];
-    target.waitSemaphoreInfoCount = static_cast<std::uint32_t>(waits.size());
-    target.pWaitSemaphoreInfos = waits.data();
   }
-  return rewritten_any ? rewrite->rewritten2.data() : submits;
 }
 
 }  // namespace
@@ -1675,10 +1394,6 @@ vkGetInstanceProcAddr(VkInstance instance, const char* name) {
                                  vkGetPhysicalDeviceSurfacePresentModesKHR)
                            : nullptr;
   }
-  if (const PFN_vkVoidFunction profiled = ProfileAdapterProc(name);
-      profiled != nullptr) {
-    return HostInstanceProc(instance, name) != nullptr ? profiled : nullptr;
-  }
   if (const PFN_vkVoidFunction adapter = AdapterProc(name);
       adapter != nullptr) {
     if ((IsDeviceAdapterProc(name) || IsEtc2PhysicalDeviceProc(name)) &&
@@ -1700,10 +1415,6 @@ VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL vkGetDeviceProcAddr(VkDevice device,
   const PFN_vkVoidFunction host = host_get_device_proc_addr != nullptr
                                       ? host_get_device_proc_addr(device, name)
                                       : nullptr;
-  if (const PFN_vkVoidFunction profiled = ProfileAdapterProc(name);
-      profiled != nullptr) {
-    return host != nullptr ? profiled : nullptr;
-  }
   if (!IsDeviceAdapterProc(name)) {
     return host;
   }
@@ -1758,8 +1469,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(
       host_enabled_features.textureCompressionETC2 = VK_FALSE;
       host_info.pEnabledFeatures = &host_enabled_features;
     }
-    // The feature chain is caller-owned; clear the emulated bit only for the
-    // host call and restore it afterwards.
+    // Restore the caller-owned feature bit after the host call.
     requested_features2 = const_cast<VkPhysicalDeviceFeatures2*>(
         reinterpret_cast<const VkPhysicalDeviceFeatures2*>(FindFeature(
             create_info->pNext, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2)));
@@ -1822,8 +1532,7 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateDevice(
     host_memory_properties(physical_device, &memory_properties);
   }
   State().etc2.RegisterDevice(*device, physical_device, etc2_emulated,
-                              memory_properties, host_get_device_proc_addr,
-                              enabled.vulkan12.timelineSemaphore == VK_TRUE);
+                              memory_properties, host_get_device_proc_addr);
 
   std::uint32_t queue_family_count = 0;
   const auto host_get_queue_families =
@@ -1886,10 +1595,6 @@ vkDestroyDevice(VkDevice device, const VkAllocationCallbacks* allocator) {
     host_destroy(device, allocator);
   }
   RemoveHostDeviceDispatch(device);
-  if (auto* trace = mocktail::graphics::ActiveProfileTrace();
-      trace != nullptr) {
-    trace->Flush();
-  }
 }
 
 VKAPI_ATTR void VKAPI_CALL vkGetDeviceQueue(VkDevice device,
@@ -2045,8 +1750,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImageKHR(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkAcquireNextImageKHR", "wait");
   const bool fps_trace = FpsTraceEnabled();
   const std::uint64_t acquire_start_ns = fps_trace ? MonotonicNanos() : 0;
   const VkResult host_result = host_acquire(
@@ -2076,8 +1779,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkAcquireNextImage2KHR(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkAcquireNextImage2KHR", "wait");
   const VkResult host_result =
       host_acquire(device, acquire_info, image_index);
   const VkResult result = NormalizeSwapchainResult(host_result);
@@ -2102,8 +1803,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkWaitForFences(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkWaitForFences", "wait");
   const bool fps_trace = FpsTraceEnabled();
   const std::uint64_t fence_start_ns = fps_trace ? MonotonicNanos() : 0;
   const VkResult result =
@@ -2299,14 +1998,14 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkQueueSubmit", "submit");
-  scope.Arg("submits", submit_count);
-  Etc2SubmitRewrite rewrite;
-  const VkSubmitInfo* prepared =
-      PrepareEtc2Submit(submit_count, submits, &rewrite);
+  if (submits != nullptr) {
+    for (std::uint32_t index = 0; index < submit_count; ++index) {
+      State().etc2.PrepareSubmit(submits[index].pCommandBuffers,
+                                 submits[index].commandBufferCount);
+    }
+  }
   const VkResult result = State().text_overlay.QueueSubmit(
-      queue, submit_count, prepared, fence, host_submit);
+      queue, submit_count, submits, fence, host_submit);
   observation.SetResult(result);
   return result;
 }
@@ -2321,14 +2020,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkQueueSubmit2", "submit");
-  scope.Arg("submits", submit_count);
-  Etc2SubmitRewrite rewrite;
-  const VkSubmitInfo2* prepared =
-      PrepareEtc2Submit2(submit_count, submits, &rewrite);
+  PrepareEtc2Submit2(submit_count, submits);
   const VkResult result = State().text_overlay.QueueSubmit2(
-      queue, submit_count, prepared, fence, host_submit);
+      queue, submit_count, submits, fence, host_submit);
   observation.SetResult(result);
   return result;
 }
@@ -2343,14 +2037,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueSubmit2KHR(
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkQueueSubmit2KHR", "submit");
-  scope.Arg("submits", submit_count);
-  Etc2SubmitRewrite rewrite;
-  const VkSubmitInfo2* prepared =
-      PrepareEtc2Submit2(submit_count, submits, &rewrite);
+  PrepareEtc2Submit2(submit_count, submits);
   const VkResult result = State().text_overlay.QueueSubmit2(
-      queue, submit_count, prepared, fence,
+      queue, submit_count, submits, fence,
       reinterpret_cast<PFN_vkQueueSubmit2>(host_submit));
   observation.SetResult(result);
   return result;
@@ -2380,8 +2069,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkQueueWaitIdle(VkQueue queue) {
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkQueueWaitIdle", "wait");
   const bool fps_trace = FpsTraceEnabled();
   const std::uint64_t idle_start_ns = fps_trace ? MonotonicNanos() : 0;
   const VkResult result =
@@ -2401,8 +2088,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkDeviceWaitIdle(VkDevice device) {
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkDeviceWaitIdle", "wait");
   const VkResult result =
       State().text_overlay.DeviceWaitIdle(device, host_wait);
   observation.SetResult(result);
@@ -2521,15 +2206,8 @@ vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR* present_info) {
     observation.SetResult(VK_ERROR_INITIALIZATION_FAILED);
     return VK_ERROR_INITIALIZATION_FAILED;
   }
-  mocktail::graphics::ChromeTraceWriter* const trace =
-      mocktail::graphics::ActiveProfileTrace();
-  mocktail::graphics::TraceScope scope(trace, "vkQueuePresentKHR", "present");
-  if (trace != nullptr) {
-    RecordProfiledFrame(trace, mocktail::graphics::TraceClockNanos());
-  }
   const VkResult result = state.text_overlay.QueuePresent(
       queue, present_info, ObservedHostQueuePresent);
-  scope.Arg("result", result);
   const VkResult normalized_result = NormalizeSwapchainResult(result);
   if (normalized_result == VK_ERROR_OUT_OF_DATE_KHR) {
     const NoteSurfaceOutOfDateFn note_surface_out_of_date =
@@ -2693,15 +2371,11 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPhysicalDeviceImageFormatProperties2(
 VKAPI_ATTR VkResult VKAPI_CALL vkCreateImage(
     VkDevice device, const VkImageCreateInfo* create_info,
     const VkAllocationCallbacks* allocator, VkImage* image) {
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkCreateImage", "memory");
   return State().etc2.CreateImage(device, create_info, allocator, image);
 }
 
 VKAPI_ATTR void VKAPI_CALL vkDestroyImage(
     VkDevice device, VkImage image, const VkAllocationCallbacks* allocator) {
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkDestroyImage", "memory");
   State().etc2.DestroyImage(device, image, allocator);
 }
 
@@ -2730,8 +2404,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory(VkDevice device,
                                            VkDeviceSize size,
                                            VkMemoryMapFlags flags,
                                            void** data) {
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkMapMemory", "memory");
   return State().etc2.MapMemory(device, memory, offset, size, flags, data);
 }
 
@@ -2743,9 +2415,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkMapMemory2(VkDevice device,
 
 VKAPI_ATTR void VKAPI_CALL vkUnmapMemory(VkDevice device,
                                          VkDeviceMemory memory) {
-  // Includes waiting for ETC2 decodes that still read this memory.
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkUnmapMemory", "memory");
   State().etc2.UnmapMemory(device, memory);
 }
 
@@ -2757,9 +2426,6 @@ VKAPI_ATTR VkResult VKAPI_CALL vkUnmapMemory2(VkDevice device,
 VKAPI_ATTR void VKAPI_CALL vkFreeMemory(
     VkDevice device, VkDeviceMemory memory,
     const VkAllocationCallbacks* allocator) {
-  // Includes waiting for ETC2 decodes that still read this memory.
-  mocktail::graphics::TraceScope scope(mocktail::graphics::ActiveProfileTrace(),
-                                       "vkFreeMemory", "memory");
   State().etc2.FreeMemory(device, memory, allocator);
 }
 

src/graphics/chrome_trace_writer.cc

@@ -1,341 +0,0 @@
-#include "mocktail/graphics/chrome_trace_writer.h"
-
-#include <sys/types.h>
-#include <time.h>
-#include <unistd.h>
-
-#include <algorithm>
-#include <cerrno>
-#include <charconv>
-#include <chrono>
-#include <cmath>
-#include <cstdlib>
-#include <cstring>
-
-namespace mocktail {
-namespace graphics {
-namespace {
-
-// Buffered bytes that wake the writer before its periodic tick.
-constexpr std::size_t kWakeBytes = 256 * 1024;
-constexpr std::chrono::milliseconds kWriteInterval{250};
-// Every write ends the file with this, and the next write starts over it.
-constexpr char kArrayEnd[] = "\n]\n";
-constexpr long kArrayEndBytes = sizeof(kArrayEnd) - 1;
-
-void AppendInteger(std::string* out, std::int64_t value) {
-  char digits[24];
-  const auto [end, error] =
-      std::to_chars(digits, digits + sizeof(digits), value);
-  if (error == std::errc()) {
-    out->append(digits, end);
-  } else {
-    // Appending nothing would leave "ts": with no value, which costs the
-    // whole trace rather than the one field.
-    out->push_back('0');
-  }
-}
-
-void AppendDouble(std::string* out, double value) {
-  // to_chars spells inf and nan without quotes, which no JSON reader accepts.
-  if (!std::isfinite(value)) {
-    out->push_back('0');
-    return;
-  }
-  char digits[32];
-  const auto [end, error] =
-      std::to_chars(digits, digits + sizeof(digits), value);
-  if (error == std::errc()) {
-    out->append(digits, end);
-  } else {
-    out->push_back('0');
-  }
-}
-
-void AppendString(std::string* out, const char* value) {
-  out->push_back('"');
-  for (const char* cursor = value != nullptr ? value : ""; *cursor != '\0';
-       ++cursor) {
-    const unsigned char byte = static_cast<unsigned char>(*cursor);
-    if (byte == '"' || byte == '\\') {
-      out->push_back('\\');
-      out->push_back(static_cast<char>(byte));
-    } else if (byte < 0x20) {
-      static constexpr char kHex[] = "0123456789abcdef";
-      out->append("\\u00");
-      out->push_back(kHex[byte >> 4]);
-      out->push_back(kHex[byte & 0xf]);
-    } else {
-      out->push_back(static_cast<char>(byte));
-    }
-  }
-  out->push_back('"');
-}
-
-void AppendHeader(std::string* out, const char* name, const char* category,
-                  char phase, std::uint64_t timestamp_ns) {
-  static const std::int64_t pid = getpid();
-  thread_local const std::int64_t tid = gettid();
-  out->append("{\"name\":");
-  AppendString(out, name);
-  if (category != nullptr) {
-    out->append(",\"cat\":");
-    AppendString(out, category);
-  }
-  out->append(",\"ph\":\"");
-  out->push_back(phase);
-  out->append("\",\"ts\":");
-  AppendInteger(out, static_cast<std::int64_t>(timestamp_ns / 1000));
-  out->append(",\"pid\":");
-  AppendInteger(out, pid);
-  out->append(",\"tid\":");
-  AppendInteger(out, tid);
-}
-
-std::string& ThreadScratch() {
-  thread_local std::string scratch;
-  scratch.clear();
-  return scratch;
-}
-
-}  // namespace
-
-std::uint64_t TraceClockNanos() {
-  timespec now{};
-  clock_gettime(CLOCK_MONOTONIC, &now);
-  return static_cast<std::uint64_t>(now.tv_sec) * 1'000'000'000ULL +
-         static_cast<std::uint64_t>(now.tv_nsec);
-}
-
-namespace {
-
-std::uint64_t ClockNanos(clockid_t clock) {
-  timespec now{};
-  clock_gettime(clock, &now);
-  return static_cast<std::uint64_t>(now.tv_sec) * 1'000'000'000ULL +
-         static_cast<std::uint64_t>(now.tv_nsec);
-}
-
-}  // namespace
-
-std::uint64_t TraceThreadCpuNanos() {
-  return ClockNanos(CLOCK_THREAD_CPUTIME_ID);
-}
-
-std::uint64_t TraceProcessCpuNanos() {
-  return ClockNanos(CLOCK_PROCESS_CPUTIME_ID);
-}
-
-bool FrameCpuSampler::Sample(std::uint64_t thread_id,
-                             std::uint64_t thread_cpu_ns,
-                             std::uint64_t process_cpu_ns,
-                             FrameCpuSample* sample) {
-  std::lock_guard<std::mutex> lock(mutex_);
-  const bool had_previous = has_previous_;
-  // Clocks are read before the lock, so a reading can arrive after a later
-  // one; a reused thread id restarts its thread clock. Neither may wrap.
-  if (had_previous) {
-    *sample = {};
-    if (process_cpu_ns > previous_process_cpu_ns_) {
-      sample->process_ms =
-          static_cast<double>(process_cpu_ns - previous_process_cpu_ns_) / 1e6;
-    }
-    if (thread_id == previous_thread_id_ &&
-        thread_cpu_ns >= previous_thread_cpu_ns_) {
-      sample->has_thread = true;
-      sample->thread_ms =
-          static_cast<double>(thread_cpu_ns - previous_thread_cpu_ns_) / 1e6;
-    }
-  }
-  has_previous_ = true;
-  previous_thread_id_ = thread_id;
-  previous_thread_cpu_ns_ = thread_cpu_ns;
-  previous_process_cpu_ns_ = std::max(previous_process_cpu_ns_, process_cpu_ns);
-  return had_previous;
-}
-
-std::unique_ptr<ChromeTraceWriter> ChromeTraceWriter::Open(
-    const std::filesystem::path& path, std::string* error) {
-  std::FILE* file = std::fopen(path.c_str(), "wb");
-  if (file == nullptr || std::fputs("[", file) == EOF ||
-      std::fputs(kArrayEnd, file) == EOF || std::fflush(file) != 0) {
-    const int saved = errno;
-    if (file != nullptr) {
-      std::fclose(file);
-    }
-    if (error != nullptr) {
-      *error = "could not open profile trace " + path.string() + ": " +
-               std::strerror(saved);
-    }
-    return nullptr;
-  }
-  return std::unique_ptr<ChromeTraceWriter>(new ChromeTraceWriter(file));
-}
-
-ChromeTraceWriter::ChromeTraceWriter(std::FILE* file)
-    : file_(file), owner_pid_(getpid()) {
-  writer_ = std::thread([this] { WriterLoop(); });
-}
-
-ChromeTraceWriter::~ChromeTraceWriter() { Close(); }
-
-void ChromeTraceWriter::Slice(const char* name, const char* category,
-                              std::uint64_t start_ns, std::uint64_t end_ns,
-                              std::initializer_list<TraceArg> args) {
-  Slice(name, category, start_ns, end_ns, args.begin(), args.size());
-}
-
-void ChromeTraceWriter::Slice(const char* name, const char* category,
-                              std::uint64_t start_ns, std::uint64_t end_ns,
-                              const TraceArg* args, std::size_t arg_count) {
-  std::string& event = ThreadScratch();
-  AppendHeader(&event, name, category, 'X', start_ns);
-  event.append(",\"dur\":");
-  const std::uint64_t start_us = start_ns / 1000;
-  const std::uint64_t end_us = end_ns / 1000;
-  AppendInteger(&event, static_cast<std::int64_t>(
-                            end_us > start_us ? end_us - start_us : 0));
-  if (args != nullptr && arg_count != 0) {
-    event.append(",\"args\":{");
-    for (std::size_t index = 0; index < arg_count; ++index) {
-      if (index != 0) {
-        event.push_back(',');
-      }
-      AppendString(&event, args[index].key);
-      event.push_back(':');
-      AppendInteger(&event, args[index].value);
-    }
-    event.push_back('}');
-  }
-  event.push_back('}');
-  Append(event.data(), event.size());
-}
-
-void ChromeTraceWriter::Counter(const char* name, std::uint64_t timestamp_ns,
-                                double value) {
-  std::string& event = ThreadScratch();
-  AppendHeader(&event, name, nullptr, 'C', timestamp_ns);
-  event.append(",\"args\":{\"value\":");
-  AppendDouble(&event, value);
-  event.append("}}");
-  Append(event.data(), event.size());
-}
-
-void ChromeTraceWriter::Append(const char* event, std::size_t size) {
-  bool wake = false;
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    if (closed_) {
-      return;
-    }
-    pending_.append(first_event_ ? "\n" : ",\n");
-    first_event_ = false;
-    pending_.append(event, size);
-    wake = pending_.size() >= kWakeBytes;
-  }
-  if (wake) {
-    wake_.notify_one();
-  }
-}
-
-void ChromeTraceWriter::WriterLoop() {
-  std::unique_lock<std::mutex> lock(mutex_);
-  while (!stopping_) {
-    wake_.wait_for(lock, kWriteInterval, [this] {
-      return stopping_ || pending_.size() >= kWakeBytes;
-    });
-    if (stopping_) {
-      break;
-    }
-    lock.unlock();
-    WritePending();
-    lock.lock();
-  }
-}
-
-// The file lock is taken before the buffer lock, so chunks reach the file in
-// the order they were buffered.
-void ChromeTraceWriter::WritePending() {
-  std::lock_guard<std::mutex> file_lock(file_mutex_);
-  spare_.clear();
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    pending_.swap(spare_);
-  }
-  if (file_ == nullptr || spare_.empty()) {
-    return;
-  }
-  if (std::fseek(file_, -kArrayEndBytes, SEEK_END) != 0 ||
-      std::fwrite(spare_.data(), 1, spare_.size(), file_) != spare_.size() ||
-      std::fputs(kArrayEnd, file_) == EOF || std::fflush(file_) != 0) {
-    std::fprintf(stderr, "  [profile] trace write failed: %s\n",
-                 std::strerror(errno));
-    std::fclose(file_);
-    file_ = nullptr;
-    {
-      std::lock_guard<std::mutex> lock(mutex_);
-      closed_ = true;
-      // Nothing can reach the file now, so the writer thread exits instead of
-      // ticking for the rest of the process.
-      stopping_ = true;
-    }
-    wake_.notify_all();
-  }
-}
-
-void ChromeTraceWriter::Flush() { WritePending(); }
-
-void ChromeTraceWriter::Close() {
-  // A forked child shares the file but not the writer thread.
-  if (getpid() != owner_pid_) {
-    return;
-  }
-  // A write failure sets stopping_ without joining the thread, so the join
-  // below runs even when stopping_ is already set.
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    stopping_ = true;
-  }
-  wake_.notify_all();
-  if (writer_.joinable() && writer_.get_id() != std::this_thread::get_id()) {
-    writer_.join();
-  }
-  WritePending();
-  std::lock_guard<std::mutex> file_lock(file_mutex_);
-  {
-    std::lock_guard<std::mutex> lock(mutex_);
-    closed_ = true;
-  }
-  if (file_ != nullptr) {
-    std::fclose(file_);
-    file_ = nullptr;
-  }
-}
-
-ChromeTraceWriter* ActiveProfileTrace() {
-  static ChromeTraceWriter* const trace = []() -> ChromeTraceWriter* {
-    const char* path = std::getenv(kProfileTraceEnvironment);
-    if (path == nullptr || path[0] == '\0') {
-      return nullptr;
-    }
-    std::string error;
-    std::unique_ptr<ChromeTraceWriter> writer =
-        ChromeTraceWriter::Open(path, &error);
-    if (writer == nullptr) {
-      std::fprintf(stderr, "  [profile] %s\n", error.c_str());
-      return nullptr;
-    }
-    std::fprintf(stderr, "  [profile] writing Chrome trace to %s\n", path);
-    // Leaked so threads still recording during exit never touch a destroyed
-    // writer; they find it closed instead.
-    static struct CloseAtExit {
-      ChromeTraceWriter* writer;
-      ~CloseAtExit() { writer->Close(); }
-    } close_at_exit{writer.get()};
-    return writer.release();
-  }();
-  return trace;
-}
-
-}  // namespace graphics
-}  // namespace mocktail

src/graphics/etc2_decoder.cc

@@ -5,9 +5,7 @@
 #include <pthread.h>
 
 #include <atomic>
-#include <condition_variable>
 #include <limits>
-#include <mutex>
 #include <vector>
 
 namespace mocktail::graphics {
@@ -42,7 +40,7 @@ int Expand5(int value) { return (value << 3) | (value >> 2); }
 int Expand6(int value) { return (value << 2) | (value >> 4); }
 int Expand7(int value) { return (value << 1) | (value >> 6); }
 
-// Decodes one ETC2 RGB block into 16 column-major RGBA texels (x * 4 + y).
+// Texels use column-major indexing: x * 4 + y.
 void DecodeRgbBlock(const std::uint8_t* b, bool punchthrough,
                     std::array<std::uint8_t, 64>* out) {
   static constexpr int kDelta[8] = {0, 1, 2, 3, -4, -3, -2, -1};
@@ -161,7 +159,6 @@ void DecodeRgbBlock(const std::uint8_t* b, bool punchthrough,
   }
 }
 
-// EAC 3-bit index for column-major texel (x * 4 + y).
 int EacIndex(const std::uint8_t* b, int texel) {
   std::uint64_t bits = 0;
   for (int i = 2; i < 8; ++i) {
@@ -215,11 +212,8 @@ std::size_t EtcDecodedTexelBytes(EtcFormat format) {
 
 namespace {
 
-// Blocks per band handed to one worker: about a 128x128 texel image.
-constexpr std::uint64_t kBlocksPerBand = 4096;
-// Batches smaller than a 128x128 texel image decode on the caller. Waking a
-// pooled worker costs microseconds, so the floor only has to cover that.
-constexpr std::uint64_t kParallelMinimumBlocks = 4096;
+constexpr std::uint64_t kBlocksPerBand = 16384;
+constexpr std::uint64_t kParallelMinimumBlocks = 65536;
 
 bool ImageFits(EtcFormat format, const std::uint8_t* source,
                std::size_t source_bytes, std::uint32_t width,
@@ -277,97 +271,10 @@ struct DecodeBandQueue {
   }
 };
 
-// Decode workers outlive the batches that use them: creating and joining a
-// thread per batch costs more than decoding a small one. The threads park on
-// a condition variable and are never joined, so the pool is leaked at exit.
-class DecodePool {
- public:
-  static DecodePool& Instance() {
-    static DecodePool* pool = new DecodePool();
-    return *pool;
-  }
-
-  // Calls run(context) on the calling thread and on pooled workers, `workers`
-  // calls in all. Returns false without calling it when another batch
-  // already holds the pool or no worker could be started, leaving the whole
-  // batch to the caller.
-  bool Run(void (*run)(void*), void* context, std::size_t workers) {
-    if (workers < 2) {
-      return false;
-    }
-    std::unique_lock<std::mutex> batch(batch_mutex_, std::try_to_lock);
-    if (!batch.owns_lock()) {
-      return false;
-    }
-    const std::size_t helpers = Reserve(workers - 1);
-    if (helpers == 0) {
-      return false;
-    }
-    {
-      std::lock_guard<std::mutex> lock(mutex_);
-      run_ = run;
-      context_ = context;
-      unclaimed_ = helpers;
-      running_ = helpers;
-    }
-    ready_.notify_all();
-    run(context);
-    std::unique_lock<std::mutex> lock(mutex_);
-    done_.wait(lock, [this] { return running_ == 0; });
-    run_ = nullptr;
-    context_ = nullptr;
-    return true;
-  }
-
- private:
-  DecodePool() = default;
-
-  // Grows the pool towards `wanted` and reports how many workers exist, so a
-  // pthread_create failure degrades instead of deadlocking the wait below.
-  std::size_t Reserve(std::size_t wanted) {
-    std::lock_guard<std::mutex> lock(mutex_);
-    while (threads_ < wanted) {
-      pthread_t worker;
-      if (pthread_create(&worker, nullptr, &DecodePool::RunWorker, this) != 0) {
-        break;
-      }
-      pthread_detach(worker);
-      ++threads_;
-    }
-    return std::min(threads_, wanted);
-  }
-
-  static void* RunWorker(void* pool) {
-    static_cast<DecodePool*>(pool)->WorkerLoop();
-    return nullptr;
-  }
-
-  void WorkerLoop() {
-    std::unique_lock<std::mutex> lock(mutex_);
-    for (;;) {
-      ready_.wait(lock, [this] { return unclaimed_ > 0; });
-      --unclaimed_;
-      void (*run)(void*) = run_;
-      void* context = context_;
-      lock.unlock();
-      run(context);
-      lock.lock();
-      if (--running_ == 0) {
-        done_.notify_all();
-      }
-    }
-  }
-
-  std::mutex batch_mutex_;
-  std::mutex mutex_;
-  std::condition_variable ready_;
-  std::condition_variable done_;
-  void (*run_)(void*) = nullptr;
-  void* context_ = nullptr;
-  std::size_t unclaimed_ = 0;
-  std::size_t running_ = 0;
-  std::size_t threads_ = 0;
-};
+void* RunDecodeBandQueue(void* queue) {
+  static_cast<DecodeBandQueue*>(queue)->Run();
+  return nullptr;
+}
 
 }  // namespace
 
@@ -401,20 +308,18 @@ void DecodeEtcJobs(EtcDecodeJob* jobs, std::size_t count,
       total_blocks < kParallelMinimumBlocks
           ? 1
           : std::min<std::size_t>(std::max(worker_count, 1U), bands.size());
-  RunOnDecodeWorkers(
-      [](void* context) { static_cast<DecodeBandQueue*>(context)->Run(); },
-      &queue, static_cast<unsigned>(threads));
-}
-
-void RunOnDecodeWorkers(void (*run)(void*), void* context,
-                        unsigned worker_count) {
-  if (run == nullptr) {
-    return;
+  std::vector<pthread_t> workers;
+  workers.reserve(threads > 0 ? threads - 1 : 0);
+  for (std::size_t index = 1; index < threads; ++index) {
+    pthread_t worker;
+    if (pthread_create(&worker, nullptr, RunDecodeBandQueue, &queue) != 0) {
+      break;
+    }
+    workers.push_back(worker);
   }
-  // The pool declines when it is already busy; the caller drains the whole
-  // batch itself then, exactly as a single-threaded batch does.
-  if (!DecodePool::Instance().Run(run, context, worker_count)) {
-    run(context);
+  queue.Run();
+  for (pthread_t worker : workers) {
+    pthread_join(worker, nullptr);
   }
 }
 

src/graphics/present_mode_policy.cc

@@ -1,4 +1,3 @@
-// Modified by vii from komaruworld/mocktail. See README "About this fork".
 #include "mocktail/graphics/present_mode_policy.h"
 
 #include <algorithm>
@@ -29,9 +28,10 @@ PresentModePolicy ResolvePresentModePolicy(std::string_view vsync_value,
   if (frame_rate_value == "unlimited") {
     return PresentModePolicy::kUnthrottled;
   }
-  // Every synchronized target, including the unmanaged Roblox cap, presents
-  // through the lowest-latency vsync mode the host offers. Roblox's own FIFO
-  // request queues up to two rendered frames before they reach the display.
+  if (frame_rate_value.empty() || frame_rate_value == "-1") {
+    return PresentModePolicy::kHostDefault;
+  }
+  // Display or any fixed scheduler target keeps synchronized presentation.
   return PresentModePolicy::kVsync;
 }