wip: OpenGLv2

2025-10-01 15:38:35 +00:00 · 2025-03-26 12:32:27 -07:00
852 changed files with 65095 additions and 91919 deletions
--- a/.agents/commands/gh-issue
+++ b/.agents/commands/gh-issue
@@ -1,64 +0,0 @@
-#!/usr/bin/env nu
-
-# A command to generate an agent prompt to diagnose and formulate 
-# a plan for resolving a GitHub issue.
-#
-# IMPORTANT: This command is prompted to NOT write any code and to ONLY
-# produce a plan. You should still be vigilant when running this but that
-# is the expected behavior.
-# 
-# The `<issue>` parameter can be either an issue number or a full GitHub
-# issue URL.
-def main [
-  issue: any, # Ghostty issue number or URL
-  --repo: string = "ghostty-org/ghostty" # GitHub repository in the format "owner/repo"
-] {
-  # TODO: This whole script doesn't handle errors very well. I actually
-  # don't know Nu well enough to know the proper way to handle it all.
-  
-  let issueData = gh issue view $issue --json author,title,number,body,comments | from json
-  let comments = $issueData.comments | each { |comment|
-    $"
-### Comment by ($comment.author.login)
-($comment.body)
-" | str trim
-  } | str join "\n\n"
-
-  $"
-Deep-dive on this GitHub issue. Find the problem and generate a plan. 
-Do not write code. Explain the problem clearly and propose a comprehensive plan 
-to solve it.
-
-# ($issueData.title) \(($issueData.number)\)
-
-## Description
-($issueData.body)
-
-## Comments
-($comments)
-
-## Your Tasks
-
-You are an experienced software developer tasked with diagnosing issues.
-
-1. Review the issue context and details. 
-2. Examine the relevant parts of the codebase. Analyze the code thoroughly
-   until you have a solid understanding of how it works.
-3. Explain the issue in detail, including the problem and its root cause.
-4. Create a comprehensive plan to solve the issue. The plan should include:
-   - Required code changes
-   - Potential impacts on other parts of the system
-   - Necessary tests to be written or updated
-   - Documentation updates
-   - Performance considerations
-   - Security implications
-   - Backwards compatibility \(if applicable\)
-   - Include the reference link to the source issue and any related discussions
-4. Think deeply about all aspects of the task. Consider edge cases, potential
-   challenges, and best practices for addressing the issue. Review the plan 
-   with the oracle and adjust it based on its feedback.
-
-**ONLY CREATE A PLAN. DO NOT WRITE ANY CODE.** Your task is to create
-a thorough, comprehensive strategy for understanding and resolving the issue.
-" | str trim
-}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,6 @@
 root = true

-[*.{sh,bash,elv}]
+[*.{sh,bash}]
 indent_size = 2
 indent_style = space

--- a/.github/DISCUSSION_TEMPLATE/issue-triage.yml
+++ b/.github/DISCUSSION_TEMPLATE/issue-triage.yml
@@ -1,162 +0,0 @@
-labels: ["needs-confirmation"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        > [!IMPORTANT]
-        > Please read through [the Discussion rules](https://github.com/ghostty-org/ghostty/discussions/6937), review [the FAQs](https://ghostty.org/docs/help#common-issues-and-solutions), and check for both existing [Discussions](https://github.com/ghostty-org/ghostty/discussions?discussions_q=) and [Issues](https://github.com/ghostty-org/ghostty/issues?q=sort%3Areactions-desc) prior to opening a new Discussion.
-  - type: markdown
-    attributes:
-      value: "# Issue Details"
-  - type: textarea
-    attributes:
-      label: Issue Description
-      description: |
-        Provide a detailed description of the issue.  Include relevant information, such as:
-        - The feature or configuration option you encounter the issue with.
-        - Screenshots, screen recordings, or other supporting media (as needed).
-        - If this is a regression of an existing issue that was closed or resolved, please include the previous item reference (Discussion, Issue, PR, commit) in your description.
-
-        > [!TIP]
-        > **Not sure what information to include?**
-        > Here are some recommendations:
-        > - **Input issues:** include your keyboard layout, a screenshot of logged keystrokes from the terminal inspector's "Keyboard" tab (Linux: <kbd>ctrl</kbd>+<kbd>shift</kbd>+<kbd>i</kbd>; MacOS: <kbd>cmd</kbd>+<kbd>alt</kbd>+<kbd>i</kbd>), input method, Linux input method engine (IBus, Fcitx 5, or none) and its version.
-        > - **Font issues:** include the problematic character(s), the output of `ghostty +show-face` for these character(s), and if they work in other applications.
-        > - **Terminal emulation issues (including image rendering issues):** attach an [asciinema](https://docs.asciinema.org/getting-started/) cast file, shell script, or text file for reproduction.
-        > - **Renderer issues:** (Linux) include your OpenGL version, graphics card, driver version.
-        > - **Crashes:** (macOS) include the [Sentry UUID](https://github.com/ghostty-org/ghostty?tab=readme-ov-file#crash-reports); (Linux) try to reproduce using a debug build and provide the stack trace.
-      placeholder: |
-        When using SSH to connect to my remote Linux machine from my local macOS device in Ghostty, I try to run `clear`, and the screen does not clear.  Instead, I see the following error message printed to the terminal: `Error opening terminal: xterm-ghostty.`
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: |
-        Describe how you expect Ghostty to behave in this situation.  Include any relevant documentation links.
-      placeholder: |
-        The screen is cleared and the prompt is redrawn at the top of the window.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Actual Behavior
-      description: |
-        Describe how Ghostty actually behaves in this situation.  If it is not immediately obvious how the actual behavior differs from the expected behavior described above, please be sure to mention the deviation specifically.
-      placeholder: |
-        The screen is not cleared, and an error is printed: `Error opening terminal: xterm-ghostty`.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reproduction Steps
-      description: |
-        Provide a detailed set of step-by-step instructions for reproducing this issue.
-      placeholder: |
-        1. Open Ghostty.
-        2. Connect to a remote server via SSH.
-        3. Try to execute `clear`.
-        4. Observe `xterm-ghostty` error message above.
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Ghostty Logs
-      description: |
-        Provide any captured Ghostty logs or stacktraces during your issue reproduction in this field.  On Linux, logs can be found by running `ghostty` from the command-line; on macOS, logs can be viewed with `sudo log stream --level debug --predicate 'subsystem=="com.mitchellh.ghostty"'` from another terminal emulator.
-      render: text
-  - type: textarea
-    attributes:
-      label: Ghostty Version
-      description: Paste the output of `ghostty +version` here.
-      placeholder: |
-        Ghostty 1.1.3
-
-        Version
-          - version: 1.1.3
-          - channel: stable
-        Build Config
-          - Zig version: 0.13.0
-          - build mode : builtin.OptimizeMode.ReleaseFast
-          - app runtime: apprt.Runtime.none
-          - font engine: font.main.Backend.coretext
-          - renderer   : renderer.Metal
-          - libxev     : main.Backend.kqueue
-      render: text
-    validations:
-      required: true
-  - type: input
-    attributes:
-      label: OS Version Information
-      description: |
-        Please tell us what operating system (name and version) you are using.
-      placeholder: Ubuntu 24.04.1 (Noble Numbat)
-    validations:
-      required: true
-  - type: dropdown
-    attributes:
-      label: (Linux only) Display Server
-      description: |
-        If you run Linux, please tell us if you use X11 or Wayland. If you aren't sure, you can determine this by running `[ -z "$WAYLAND_DISPLAY" ] && echo X11 || echo Wayland`.
-      options:
-        - X11
-        - Wayland
-        - Other
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: (Linux only) Desktop Environment/Window Manager
-      description: |
-        If you run Linux, please tell us what Desktop Environment/Window Manager you are using (include the name and version).
-      placeholder: GNOME 47.4
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: Minimal Ghostty Configuration
-      description: |
-        Please provide the **minimum** configuration needed to reproduce this issue.  If you can still reproduce the issue with one of the lines removed, do not include that line.  If and **only** if you are not able to determine this, paste the contents of your Ghostty configuration file here.
-      placeholder: |
-        font-family = CommitMono Nerd Font
-        font-family-bold = CommitMono Nerd Font
-        font-family-italic = CommitMono Nerd Font
-        font-family-bold-italic = CommitMono Nerd Font
-        font-feature = +cv07
-        font-size = 16
-        font-thicken = true
-        theme = catppuccin-mocha
-      render: ini
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Additional Relevant Configuration
-      description: |
-        If your issue involves other programs, tools, or applications in addition to Ghostty (e.g. Neovim, tmux, Zellij, etc.), please provide the minimum configuration and versions needed for all relevant programs to reproduce the issue here.  If you use custom CSS or shaders for Ghostty, also include them here, if applicable to your issue.
-      placeholder: |
-        #### `tmux.conf` (tmux 3.5a)
-        ```
-        set  -g default-terminal "tmux-256color"
-        set-option -sa terminal-overrides ",xterm*:Tc"
-        set  -g base-index      1
-        setw -g pane-base-index 1
-        ```
-    validations:
-      required: false
-  - type: markdown
-    attributes:
-      value: |
-        # User Acknowledgements
-        > [!TIP]
-        > Use these links to review the existing Ghostty [Discussions](https://github.com/ghostty-org/ghostty/discussions?discussions_q=) and [Issues](https://github.com/ghostty-org/ghostty/issues?q=sort%3Areactions-desc).
-  - type: checkboxes
-    attributes:
-      label: "I acknowledge that:"
-      options:
-        - label: I have reviewed the FAQ and confirm that my issue is NOT among them.
-          required: true
-        - label: I have searched the Ghostty repository (both open and closed Discussions and Issues) and confirm this is not a duplicate of an existing issue or discussion.
-          required: true
-        - label: I have checked the "Preview" tab on all text fields to ensure that everything looks right, and have wrapped all configuration and code in code blocks with a group of three backticks (` ``` `) on separate lines.
-          required: true
--- a/.github/pinact.yml
+++ b/.github/pinact.yml
@@ -1,4 +0,0 @@
-version: 3
-ignore_actions:
-  - name: "DeterminateSystems/nix-installer-action"
-    ref: "main"
--- a/.github/scripts/check-translations.sh
+++ b/.github/scripts/check-translations.sh
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-old_pot=$(mktemp)
-cp po/com.mitchellh.ghostty.pot "$old_pot"
-zig build update-translations
-
-# Compare previous POT to current POT
-msgcmp "$old_pot" po/com.mitchellh.ghostty.pot --use-untranslated
-
-# Compare all other POs to current POT
-for f in po/*.po; do
-  # Ignore untranslated entries
-  msgcmp --use-untranslated "$f" po/com.mitchellh.ghostty.pot;
-done
--- a/.github/scripts/ghostty-tip
+++ b/.github/scripts/ghostty-tip
@@ -1,19 +0,0 @@
-#!/usr/bin/env nu
-
-# Check if a given commit SHA has a corresponding tip release.
-#
-# This does not validate that the commit SHA is valid for the
-# Ghostty repository, only that a tip release exists for it.
-def main [
-  commit: string, # The full length commit SHA 
-] {
-  let url = $"https://tip.files.ghostty.org/($commit)/ghostty-macos-universal.zip"
-
-  try {
-    http head $url
-    exit 0
-  } catch {
-    print -e $"The SHA ($commit) does not have a corresponding tip release."
-    exit 1
-  }
-}
--- a/.github/workflows/clean-artifacts.yml
+++ b/.github/workflows/clean-artifacts.yml
@@ -10,7 +10,7 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Remove old artifacts
-        uses: c-hive/gha-remove-artifacts@44fc7acaf1b3d0987da0e8d4707a989d80e9554b # v1.4.0
+        uses: c-hive/gha-remove-artifacts@v1
        with:
          age: "1 week"
          skip-tags: true
--- a/.github/workflows/milestone.yml
+++ b/.github/workflows/milestone.yml
@@ -15,7 +15,7 @@ jobs:
    name: Milestone Update
    steps:
      - name: Set Milestone for PR
-        uses: hustcer/milestone-action@b57a7e52e9913b6b0cdefb10add762af0398659d # v2.9
+        uses: hustcer/milestone-action@v2
        if: github.event.pull_request.merged == true
        with:
          action: bind-pr # `bind-pr` is the default action
@@ -24,7 +24,7 @@ jobs:

      # Bind milestone to closed issue that has a merged PR fix
      - name: Set Milestone for Issue
-        uses: hustcer/milestone-action@b57a7e52e9913b6b0cdefb10add762af0398659d # v2.9
+        uses: hustcer/milestone-action@v2
        if: github.event.issue.state == 'closed'
        with:
          action: bind-issue
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -34,18 +34,18 @@ jobs:
      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@7baedde84bbf5063413d621f282834bc2654d0c1 # v1.2.18
+        uses: namespacelabs/nscloud-cache-action@v1.2.0
        with:
          path: |
            /nix
            /zig
      - name: Setup Nix
-        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31.7.0
+        uses: cachix/install-nix-action@v30
        with:
          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
--- a/.github/workflows/publish-tag.yml
+++ b/.github/workflows/publish-tag.yml
@@ -64,7 +64,7 @@ jobs:
          mkdir blob
          mv appcast.xml blob/appcast.xml
      - name: Upload Appcast to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_RELEASE_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_RELEASE_AWS_KEY }}
--- a/.github/workflows/release-pr.yml
+++ b/.github/workflows/release-pr.yml
@@ -0,0 +1,351 @@
+on:
+  workflow_dispatch: {}
+
+name: Release PR
+
+jobs:
+  sentry-dsym-debug:
+    runs-on: namespace-profile-ghostty-sm
+    needs: [build-macos-debug]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install sentry-cli
+        run: |
+          curl -sL https://sentry.io/get-cli/ | bash
+
+      - name: Download dSYM
+        run: |
+          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
+          curl -L https://pr.files.ghostty.dev/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-dsym.zip > dsym.zip
+
+      - name: Upload dSYM to Sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          sentry-cli dif upload --project ghostty --wait dsym.zip
+
+  sentry-dsym:
+    runs-on: namespace-profile-ghostty-sm
+    needs: [build-macos]
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install sentry-cli
+        run: |
+          curl -sL https://sentry.io/get-cli/ | bash
+
+      - name: Download dSYM
+        run: |
+          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
+          curl -L https://pr.files.ghostty.dev/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-dsym.zip > dsym.zip
+
+      - name: Upload dSYM to Sentry
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        run: |
+          sentry-cli dif upload --project ghostty --wait dsym.zip
+
+  build-macos:
+    runs-on: namespace-profile-ghostty-macos
+    timeout-minutes: 90
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          # Important so that build number generation works
+          fetch-depth: 0
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      # Setup Sparkle
+      - name: Setup Sparkle
+        env:
+          SPARKLE_VERSION: 2.6.4
+        run: |
+          mkdir -p .action/sparkle
+          cd .action/sparkle
+          curl -L https://github.com/sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-for-Swift-Package-Manager.zip > sparkle.zip
+          unzip sparkle.zip
+          echo "$(pwd)/bin" >> $GITHUB_PATH
+
+      # Load Build Number
+      - name: Build Number
+        run: |
+          echo "GHOSTTY_BUILD=$(git rev-list --count head)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      # GhosttyKit is the framework that is built from Zig for our native
+      # Mac app to access. Build this in release mode.
+      - name: Build GhosttyKit
+        run: nix develop -c zig build -Doptimize=ReleaseSafe
+
+      # The native app is built with native XCode tooling. This also does
+      # codesigning. IMPORTANT: this must NOT run in a Nix environment.
+      # Nix breaks xcodebuild so this has to be run outside.
+      - name: Build Ghostty.app
+        run: |
+          cd macos
+          sudo xcode-select -s /Applications/Xcode_16.0.app
+          xcodebuild -target Ghostty -configuration Release
+
+      # We inject the "build number" as simply the number of commits since HEAD.
+      # This will be a monotonically always increasing build number that we use.
+      - name: Update Info.plist
+        env:
+          SPARKLE_KEY_PUB: ${{ secrets.PROD_MACOS_SPARKLE_KEY_PUB }}
+        run: |
+          # Version Info
+          /usr/libexec/PlistBuddy -c "Set :GhosttyCommit $GHOSTTY_COMMIT" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $GHOSTTY_BUILD" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $GHOSTTY_COMMIT" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+
+          # Updater
+          /usr/libexec/PlistBuddy -c "Set :SUPublicEDKey $SPARKLE_KEY_PUB" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Delete :SUEnableAutomaticChecks" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+
+      - name: Codesign app bundle
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
+        run: |
+          # Turn our base64-encoded certificate back to a regular .p12 file
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+
+          # We need to create a new keychain, otherwise using the certificate will prompt
+          # with a UI dialog asking for the certificate password, which we can't
+          # use in a headless CI environment
+          security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+          security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+
+          # Codesign Sparkle. Some notes here:
+          #   - The XPC services aren't used since we don't sandbox Ghostty,
+          #     but since they're part of the build, they still need to be
+          #     codesigned.
+          #   - The binaries in the "Versions" folders need to NOT be symlinks.
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Downloader.xpc"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Installer.xpc"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework"
+
+          # Codesign the app bundle
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime --entitlements "macos/Ghostty.entitlements" macos/build/Release/Ghostty.app
+
+      - name: "Notarize app bundle"
+        env:
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
+        run: |
+          # Store the notarization credentials so that we can prevent a UI password dialog
+          # from blocking the CI
+          echo "Create keychain profile"
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"
+
+          # We can't notarize an app bundle directly, but we need to compress it as an archive.
+          # Therefore, we create a zip file containing our app bundle, so that we can send it to the
+          # notarization service
+          echo "Creating temp notarization archive"
+          ditto -c -k --keepParent "macos/build/Release/Ghostty.app" "notarization.zip"
+
+          # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
+          # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
+          # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
+          # you're curious
+          echo "Notarize app"
+          xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
+
+          # Finally, we need to "attach the staple" to our executable, which will allow our app to be
+          # validated by macOS even when an internet connection is not available.
+          echo "Attach staple"
+          xcrun stapler staple "macos/build/Release/Ghostty.app"
+
+      # Zip up the app
+      - name: Zip App
+        run: |
+          cd macos/build/Release
+          zip -9 -r --symlinks ../../../ghostty-macos-universal.zip Ghostty.app
+          zip -9 -r --symlinks ../../../ghostty-macos-universal-dsym.zip Ghostty.app.dSYM/
+
+      # Update Blob Storage
+      - name: Prep R2 Storage
+        run: |
+          mkdir blob
+          mkdir -p blob/${GHOSTTY_COMMIT_LONG}
+          cp ghostty-macos-universal.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal.zip
+          cp ghostty-macos-universal-dsym.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-dsym.zip
+      - name: Upload to R2
+        uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.CF_R2_PR_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.CF_R2_PR_AWS_KEY }}
+          r2-secret-access-key: ${{ secrets.CF_R2_PR_SECRET_KEY }}
+          r2-bucket: ghostty-pr
+          source-dir: blob
+          destination-dir: ./
+
+  build-macos-debug:
+    runs-on: namespace-profile-ghostty-macos
+    timeout-minutes: 90
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          # Important so that build number generation works
+          fetch-depth: 0
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v30
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      # Setup Sparkle
+      - name: Setup Sparkle
+        env:
+          SPARKLE_VERSION: 2.5.1
+        run: |
+          mkdir -p .action/sparkle
+          cd .action/sparkle
+          curl -L https://github.com/sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-for-Swift-Package-Manager.zip > sparkle.zip
+          unzip sparkle.zip
+          echo "$(pwd)/bin" >> $GITHUB_PATH
+
+      # Load Build Number
+      - name: Build Number
+        run: |
+          echo "GHOSTTY_BUILD=$(git rev-list --count head)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      # GhosttyKit is the framework that is built from Zig for our native
+      # Mac app to access. Build this in release mode.
+      - name: Build GhosttyKit
+        run: nix develop -c zig build -Doptimize=Debug
+
+      # The native app is built with native XCode tooling. This also does
+      # codesigning. IMPORTANT: this must NOT run in a Nix environment.
+      # Nix breaks xcodebuild so this has to be run outside.
+      - name: Build Ghostty.app
+        run: |
+          cd macos
+          sudo xcode-select -s /Applications/Xcode_16.0.app
+          xcodebuild -target Ghostty -configuration Release
+
+      # We inject the "build number" as simply the number of commits since HEAD.
+      # This will be a monotonically always increasing build number that we use.
+      - name: Update Info.plist
+        env:
+          SPARKLE_KEY_PUB: ${{ secrets.PROD_MACOS_SPARKLE_KEY_PUB }}
+        run: |
+          # Version Info
+          /usr/libexec/PlistBuddy -c "Set :GhosttyCommit $GHOSTTY_COMMIT" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $GHOSTTY_BUILD" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $GHOSTTY_COMMIT" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+
+          # Updater
+          /usr/libexec/PlistBuddy -c "Set :SUPublicEDKey $SPARKLE_KEY_PUB" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+          /usr/libexec/PlistBuddy -c "Delete :SUEnableAutomaticChecks" "macos/build/Release/Ghostty.app/Contents/Info.plist"
+
+      - name: Codesign app bundle
+        env:
+          MACOS_CERTIFICATE: ${{ secrets.PROD_MACOS_CERTIFICATE }}
+          MACOS_CERTIFICATE_PWD: ${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}
+          MACOS_CERTIFICATE_NAME: ${{ secrets.PROD_MACOS_CERTIFICATE_NAME }}
+          MACOS_CI_KEYCHAIN_PWD: ${{ secrets.PROD_MACOS_CI_KEYCHAIN_PWD }}
+        run: |
+          # Turn our base64-encoded certificate back to a regular .p12 file
+          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
+
+          # We need to create a new keychain, otherwise using the certificate will prompt
+          # with a UI dialog asking for the certificate password, which we can't
+          # use in a headless CI environment
+          security create-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+          security default-keychain -s build.keychain
+          security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+          security import certificate.p12 -k build.keychain -P "$MACOS_CERTIFICATE_PWD" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$MACOS_CI_KEYCHAIN_PWD" build.keychain
+
+          # Codesign Sparkle. Some notes here:
+          #   - The XPC services aren't used since we don't sandbox Ghostty,
+          #     but since they're part of the build, they still need to be
+          #     codesigned.
+          #   - The binaries in the "Versions" folders need to NOT be symlinks.
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Downloader.xpc"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/XPCServices/Installer.xpc"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/Autoupdate"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework/Versions/B/Updater.app"
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime "macos/build/Release/Ghostty.app/Contents/Frameworks/Sparkle.framework"
+
+          # Codesign the app bundle
+          /usr/bin/codesign --verbose -f -s "$MACOS_CERTIFICATE_NAME" -o runtime --entitlements "macos/Ghostty.entitlements" macos/build/Release/Ghostty.app
+
+      - name: "Notarize app bundle"
+        env:
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
+        run: |
+          # Store the notarization credentials so that we can prevent a UI password dialog
+          # from blocking the CI
+          echo "Create keychain profile"
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"
+
+          # We can't notarize an app bundle directly, but we need to compress it as an archive.
+          # Therefore, we create a zip file containing our app bundle, so that we can send it to the
+          # notarization service
+          echo "Creating temp notarization archive"
+          ditto -c -k --keepParent "macos/build/Release/Ghostty.app" "notarization.zip"
+
+          # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
+          # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
+          # characteristics. Visit the Notarization docs for more information and strategies on how to optimize it if
+          # you're curious
+          echo "Notarize app"
+          xcrun notarytool submit "notarization.zip" --keychain-profile "notarytool-profile" --wait
+
+          # Finally, we need to "attach the staple" to our executable, which will allow our app to be
+          # validated by macOS even when an internet connection is not available.
+          echo "Attach staple"
+          xcrun stapler staple "macos/build/Release/Ghostty.app"
+
+      # Zip up the app
+      - name: Zip App
+        run: |
+          cd macos/build/Release
+          zip -9 -r --symlinks ../../../ghostty-macos-universal-debug.zip Ghostty.app
+          zip -9 -r --symlinks ../../../ghostty-macos-universal-debug-dsym.zip Ghostty.app.dSYM/
+
+      # Update Blob Storage
+      - name: Prep R2 Storage
+        run: |
+          mkdir blob
+          mkdir -p blob/${GHOSTTY_COMMIT_LONG}
+          cp ghostty-macos-universal-debug.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug.zip
+          cp ghostty-macos-universal-debug-dsym.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-dsym.zip
+      - name: Upload to R2
+        uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.CF_R2_PR_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.CF_R2_PR_AWS_KEY }}
+          r2-secret-access-key: ${{ secrets.CF_R2_PR_SECRET_KEY }}
+          r2-bucket: ghostty-pr
+          source-dir: blob
+          destination-dir: ./
--- a/.github/workflows/release-tag.yml
+++ b/.github/workflows/release-tag.yml
@@ -39,7 +39,7 @@ jobs:

          echo "Version is valid: ${{ github.event.inputs.version }}"

-      - name: Extract the Version
+      - name: Exract the Version
        id: extract_version
        run: |
          if [[ "${{ github.event_name }}" == "push" ]]; then
@@ -56,7 +56,7 @@ jobs:
          fi

      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
        with:
          # Important so that build number generation works
          fetch-depth: 0
@@ -80,30 +80,28 @@ jobs:
      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4

      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@7baedde84bbf5063413d621f282834bc2654d0c1 # v1.2.18
+        uses: namespacelabs/nscloud-cache-action@v1.2.0
        with:
          path: |
            /nix
            /zig

-      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31.7.0
+      - uses: cachix/install-nix-action@v30
        with:
          nix_path: nixpkgs=channel:nixos-unstable

-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: Create Tarball
        run: |
-          rm -rf zig-out/dist
          nix develop -c zig build distcheck
          cp zig-out/dist/ghostty-${GHOSTTY_VERSION}.tar.gz .
-          cp zig-out/dist/ghostty-${GHOSTTY_VERSION}.tar.gz ghostty-source.tar.gz

      - name: Sign Tarball
        run: |
@@ -113,18 +111,16 @@ jobs:
          nix develop -c minisign -S -m "ghostty-source.tar.gz" -s minisign.key < minisign.password

      - name: Upload artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4
        with:
          name: source-tarball
          path: |-
            ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz
            ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz.minisig
-            ghostty-source.tar.gz
-            ghostty-source.tar.gz.minisig

  build-macos:
    needs: [setup]
-    runs-on: namespace-profile-ghostty-macos-tahoe
+    runs-on: namespace-profile-ghostty-macos
    timeout-minutes: 90
    env:
      GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
@@ -132,25 +128,22 @@ jobs:
      GHOSTTY_COMMIT: ${{ needs.setup.outputs.commit }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4

-      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: cachix/install-nix-action@v30
        with:
-          determinate: true
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_26.0.app
-
-      - name: Xcode Version
-        run: xcodebuild -version
+        run: sudo xcode-select -s /Applications/Xcode_16.0.app

      - name: Setup Sparkle
        env:
-          SPARKLE_VERSION: 2.7.3
+          SPARKLE_VERSION: 2.6.4
        run: |
          mkdir -p .action/sparkle
          cd .action/sparkle
@@ -165,7 +158,6 @@ jobs:
          nix develop -c \
            zig build \
            -Doptimize=ReleaseFast \
-            -Demit-macos-app=false \
            -Dversion-string=${GHOSTTY_VERSION}

      # The native app is built with native XCode tooling. This also does
@@ -236,16 +228,14 @@ jobs:

      - name: "Notarize DMG"
        env:
-          APPLE_NOTARIZATION_ISSUER: ${{ secrets.APPLE_NOTARIZATION_ISSUER }}
-          APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-          APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
        run: |
          # Store the notarization credentials so that we can prevent a UI password dialog
          # from blocking the CI
          echo "Create keychain profile"
-          echo "$APPLE_NOTARIZATION_KEY" > notarization_key.p8
-          xcrun notarytool store-credentials "notarytool-profile" --key notarization_key.p8 --key-id "$APPLE_NOTARIZATION_KEY_ID" --issuer "$APPLE_NOTARIZATION_ISSUER"
-          rm notarization_key.p8
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"

          # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
          # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -269,7 +259,7 @@ jobs:
          zip -9 -r --symlinks ../../../ghostty-macos-universal-dsym.zip Ghostty.app.dSYM/

      - name: Upload artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4
        with:
          name: macos
          path: |-
@@ -286,7 +276,7 @@ jobs:
          curl -sL https://sentry.io/get-cli/ | bash

      - name: Download macOS Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v4
        with:
          name: macos

@@ -298,7 +288,7 @@ jobs:

  appcast:
    needs: [setup, build-macos]
-    runs-on: namespace-profile-ghostty-macos-tahoe
+    runs-on: namespace-profile-ghostty-macos
    env:
      GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
      GHOSTTY_BUILD: ${{ needs.setup.outputs.build }}
@@ -306,16 +296,16 @@ jobs:
      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4

      - name: Download macOS Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v4
        with:
          name: macos

      - name: Setup Sparkle
        env:
-          SPARKLE_VERSION: 2.7.3
+          SPARKLE_VERSION: 2.6.4
        run: |
          mkdir -p .action/sparkle
          cd .action/sparkle
@@ -340,7 +330,7 @@ jobs:
          mv appcast_new.xml appcast.xml

      - name: Upload artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4
        with:
          name: sparkle
          path: |-
@@ -357,17 +347,17 @@ jobs:
      GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
    steps:
      - name: Download macOS Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v4
        with:
          name: macos

      - name: Download Sparkle Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v4
        with:
          name: sparkle

      - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v4
        with:
          name: source-tarball

@@ -387,7 +377,7 @@ jobs:
          mv Ghostty.dmg blob/${GHOSTTY_VERSION}/Ghostty.dmg
          mv appcast.xml blob/${GHOSTTY_VERSION}/appcast-staged.xml
      - name: Upload to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_RELEASE_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_RELEASE_AWS_KEY }}
--- a/.github/workflows/release-tip.yml
+++ b/.github/workflows/release-tip.yml
@@ -15,59 +15,11 @@ concurrency:
  cancel-in-progress: false

 jobs:
-  setup:
-    if: |
-      github.event_name == 'workflow_dispatch' ||
-      (
-        github.event.workflow_run.conclusion == 'success' &&
-        github.repository_owner == 'ghostty-org' &&
-        github.ref_name == 'main'
-      )
-    runs-on: namespace-profile-ghostty-sm
-    outputs:
-      should_skip: ${{ steps.check.outputs.should_skip }}
-      build: ${{ steps.extract_build_info.outputs.build }}
-      commit: ${{ steps.extract_build_info.outputs.commit }}
-      commit_long: ${{ steps.extract_build_info.outputs.commit_long }}
-    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          # Important so that build number generation works
-          fetch-depth: 0
-      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31.7.0
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
-        with:
-          name: ghostty
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-      - name: Extract build info
-        id: extract_build_info
-        run: |
-          GHOSTTY_BUILD=$(git rev-list --count HEAD)
-          GHOSTTY_COMMIT=$(git rev-parse --short HEAD)
-          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
-          echo "build=$GHOSTTY_BUILD" >> $GITHUB_OUTPUT
-          echo "commit=$GHOSTTY_COMMIT" >> $GITHUB_OUTPUT
-          echo "commit_long=$GHOSTTY_COMMIT_LONG" >> $GITHUB_OUTPUT
-      - name: Check if tip already exists
-        id: check
-        run: |
-          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
-          if nix develop -c nu .github/scripts/ghostty-tip $GHOSTTY_COMMIT_LONG; then
-            echo "Tip release already exists for commit $GHOSTTY_COMMIT_LONG"
-            echo "should_skip=true" >> $GITHUB_OUTPUT
-          else
-            echo "No tip release found for commit $GHOSTTY_COMMIT_LONG"
-            echo "should_skip=false" >> $GITHUB_OUTPUT
-          fi
-
  tag:
    runs-on: namespace-profile-ghostty-sm
-    needs: [setup, build-macos]
-    if: needs.setup.outputs.should_skip != 'true'
+    needs: [build-macos]
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4
      - name: Tip Tag
        run: |
          git config user.name "github-actions[bot]"
@@ -77,12 +29,9 @@ jobs:

  sentry-dsym-debug-slow:
    runs-on: namespace-profile-ghostty-sm
-    needs: [setup, build-macos-debug-slow]
-    if: needs.setup.outputs.should_skip != 'true'
-    env:
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
+    needs: [build-macos-debug-slow]
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4

      - name: Install sentry-cli
        run: |
@@ -90,6 +39,7 @@ jobs:

      - name: Download dSYM
        run: |
+          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
          curl -L https://tip.files.ghostty.dev/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-slow-dsym.zip > dsym.zip

      - name: Upload dSYM to Sentry
@@ -100,12 +50,9 @@ jobs:

  sentry-dsym-debug-fast:
    runs-on: namespace-profile-ghostty-sm
-    needs: [setup, build-macos-debug-fast]
-    if: needs.setup.outputs.should_skip != 'true'
-    env:
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
+    needs: [build-macos-debug-fast]
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4

      - name: Install sentry-cli
        run: |
@@ -113,6 +60,7 @@ jobs:

      - name: Download dSYM
        run: |
+          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
          curl -L https://tip.files.ghostty.dev/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-fast-dsym.zip > dsym.zip

      - name: Upload dSYM to Sentry
@@ -123,12 +71,9 @@ jobs:

  sentry-dsym:
    runs-on: namespace-profile-ghostty-sm
-    needs: [setup, build-macos]
-    if: needs.setup.outputs.should_skip != 'true'
-    env:
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
+    needs: [build-macos]
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4

      - name: Install sentry-cli
        run: |
@@ -136,6 +81,7 @@ jobs:

      - name: Download dSYM
        run: |
+          GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)
          curl -L https://tip.files.ghostty.dev/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-dsym.zip > dsym.zip

      - name: Upload dSYM to Sentry
@@ -145,33 +91,31 @@ jobs:
          sentry-cli dif upload --project ghostty --wait dsym.zip

  source-tarball:
-    needs: [setup]
    if: |
-      needs.setup.outputs.should_skip != 'true' &&
-      (
+      ${{
        github.event_name == 'workflow_dispatch' ||
        (
          github.event.workflow_run.conclusion == 'success' &&
          github.repository_owner == 'ghostty-org' &&
          github.ref_name == 'main'
        )
-      )
+      }}
    runs-on: namespace-profile-ghostty-md
    env:
      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
    steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@v4
      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@7baedde84bbf5063413d621f282834bc2654d0c1 # v1.2.18
+        uses: namespacelabs/nscloud-cache-action@v1.2.0
        with:
          path: |
            /nix
            /zig
-      - uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31.7.0
+      - uses: cachix/install-nix-action@v30
        with:
          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -188,7 +132,7 @@ jobs:
          nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password

      - name: Update Release
-        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        uses: softprops/action-gh-release@v2
        with:
          name: 'Ghostty Tip ("Nightly")'
          prerelease: true
@@ -200,50 +144,41 @@ jobs:
          token: ${{ secrets.GH_RELEASE_TOKEN }}

  build-macos:
-    needs: [setup]
    if: |
-      needs.setup.outputs.should_skip != 'true' &&
-      (
+      ${{
        github.event_name == 'workflow_dispatch' ||
        (
          github.event.workflow_run.conclusion == 'success' &&
          github.repository_owner == 'ghostty-org' &&
          github.ref_name == 'main'
        )
-      )
+      }}

-    runs-on: namespace-profile-ghostty-macos-tahoe
+    runs-on: namespace-profile-ghostty-macos
    timeout-minutes: 90
-    env:
-      GHOSTTY_BUILD: ${{ needs.setup.outputs.build }}
-      GHOSTTY_COMMIT: ${{ needs.setup.outputs.commit }}
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
        with:
          # Important so that build number generation works
          fetch-depth: 0

-      # TODO(tahoe): https://github.com/NixOS/nix/issues/13342
-      - uses: DeterminateSystems/nix-installer-action@main
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v30
        with:
-          determinate: true
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_26.0.app
-
-      - name: Xcode Version
-        run: xcodebuild -version
+        run: sudo xcode-select -s /Applications/Xcode_16.0.app

      # Setup Sparkle
      - name: Setup Sparkle
        env:
-          SPARKLE_VERSION: 2.7.3
+          SPARKLE_VERSION: 2.6.4
        run: |
          mkdir -p .action/sparkle
          cd .action/sparkle
@@ -251,10 +186,17 @@ jobs:
          unzip sparkle.zip
          echo "$(pwd)/bin" >> $GITHUB_PATH

+      # Load Build Number
+      - name: Build Number
+        run: |
+          echo "GHOSTTY_BUILD=$(git rev-list --count head)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
      # GhosttyKit is the framework that is built from Zig for our native
      # Mac app to access. Build this in release mode.
      - name: Build GhosttyKit
-        run: nix develop -c zig build -Doptimize=ReleaseFast -Demit-macos-app=false
+        run: nix develop -c zig build -Doptimize=ReleaseFast

      # The native app is built with native XCode tooling. This also does
      # codesigning. IMPORTANT: this must NOT run in a Nix environment.
@@ -325,16 +267,14 @@ jobs:

      - name: "Notarize DMG"
        env:
-          APPLE_NOTARIZATION_ISSUER: ${{ secrets.APPLE_NOTARIZATION_ISSUER }}
-          APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-          APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
        run: |
          # Store the notarization credentials so that we can prevent a UI password dialog
          # from blocking the CI
          echo "Create keychain profile"
-          echo "$APPLE_NOTARIZATION_KEY" > notarization_key.p8
-          xcrun notarytool store-credentials "notarytool-profile" --key notarization_key.p8 --key-id "$APPLE_NOTARIZATION_KEY_ID" --issuer "$APPLE_NOTARIZATION_ISSUER"
-          rm notarization_key.p8
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"

          # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
          # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -359,7 +299,7 @@ jobs:

      # Update Release
      - name: Release
-        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        uses: softprops/action-gh-release@v2
        with:
          name: 'Ghostty Tip ("Nightly")'
          prerelease: true
@@ -372,10 +312,6 @@ jobs:

      # Create our appcast for Sparkle
      - name: Generate Appcast
-        if: |
-          github.event.workflow_run.conclusion == 'success' &&
-          github.repository_owner == 'ghostty-org' &&
-          github.ref_name == 'main'
        env:
          SPARKLE_KEY: ${{ secrets.PROD_MACOS_SPARKLE_KEY }}
        run: |
@@ -395,7 +331,7 @@ jobs:
          cp Ghostty.dmg blob/${GHOSTTY_COMMIT_LONG}/Ghostty.dmg

      - name: Upload to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_TIP_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_TIP_AWS_KEY }}
@@ -407,21 +343,13 @@ jobs:
      # Now upload our appcast. This ensures that the appcast never
      # gets out of sync with the binaries.
      - name: Prep R2 Storage for Appcast
-        if: |
-          github.event.workflow_run.conclusion == 'success' &&
-          github.repository_owner == 'ghostty-org' &&
-          github.ref_name == 'main'
        run: |
          rm -r blob
          mkdir blob
          cp appcast_new.xml blob/appcast.xml

      - name: Upload Appcast to R2
-        if: |
-          github.event.workflow_run.conclusion == 'success' &&
-          github.repository_owner == 'ghostty-org' &&
-          github.ref_name == 'main'
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_TIP_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_TIP_AWS_KEY }}
@@ -430,58 +358,42 @@ jobs:
          source-dir: blob
          destination-dir: ./

-      - name: Echo Release URLs
-        run: |
-          echo "Release URLs:"
-          echo "  App Bundle: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal.zip"
-          echo "  Debug Symbols: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-dsym.zip"
-          echo "  DMG: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/Ghostty.dmg"
-
  build-macos-debug-slow:
-    needs: [setup]
    if: |
-      needs.setup.outputs.should_skip != 'true' &&
-      (
+      ${{
        github.event_name == 'workflow_dispatch' ||
        (
          github.event.workflow_run.conclusion == 'success' &&
          github.repository_owner == 'ghostty-org' &&
          github.ref_name == 'main'
        )
-      )
+      }}

-    runs-on: namespace-profile-ghostty-macos-tahoe
+    runs-on: namespace-profile-ghostty-macos
    timeout-minutes: 90
-    env:
-      GHOSTTY_BUILD: ${{ needs.setup.outputs.build }}
-      GHOSTTY_COMMIT: ${{ needs.setup.outputs.commit }}
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
        with:
          # Important so that build number generation works
          fetch-depth: 0

-      # TODO(tahoe): https://github.com/NixOS/nix/issues/13342
-      - uses: DeterminateSystems/nix-installer-action@main
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v30
        with:
-          determinate: true
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_26.0.app
-
-      - name: Xcode Version
-        run: xcodebuild -version
+        run: sudo xcode-select -s /Applications/Xcode_16.0.app

      # Setup Sparkle
      - name: Setup Sparkle
        env:
-          SPARKLE_VERSION: 2.7.3
+          SPARKLE_VERSION: 2.5.1
        run: |
          mkdir -p .action/sparkle
          cd .action/sparkle
@@ -489,10 +401,17 @@ jobs:
          unzip sparkle.zip
          echo "$(pwd)/bin" >> $GITHUB_PATH

+      # Load Build Number
+      - name: Build Number
+        run: |
+          echo "GHOSTTY_BUILD=$(git rev-list --count head)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
      # GhosttyKit is the framework that is built from Zig for our native
      # Mac app to access. Build this in release mode.
      - name: Build GhosttyKit
-        run: nix develop -c zig build -Doptimize=Debug -Demit-macos-app=false
+        run: nix develop -c zig build -Doptimize=Debug

      # The native app is built with native XCode tooling. This also does
      # codesigning. IMPORTANT: this must NOT run in a Nix environment.
@@ -552,16 +471,14 @@ jobs:

      - name: "Notarize app bundle"
        env:
-          APPLE_NOTARIZATION_ISSUER: ${{ secrets.APPLE_NOTARIZATION_ISSUER }}
-          APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-          APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
        run: |
          # Store the notarization credentials so that we can prevent a UI password dialog
          # from blocking the CI
          echo "Create keychain profile"
-          echo "$APPLE_NOTARIZATION_KEY" > notarization_key.p8
-          xcrun notarytool store-credentials "notarytool-profile" --key notarization_key.p8 --key-id "$APPLE_NOTARIZATION_KEY_ID" --issuer "$APPLE_NOTARIZATION_ISSUER"
-          rm notarization_key.p8
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"

          # We can't notarize an app bundle directly, but we need to compress it as an archive.
          # Therefore, we create a zip file containing our app bundle, so that we can send it to the
@@ -590,7 +507,7 @@ jobs:

      # Update Release
      - name: Release
-        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        uses: softprops/action-gh-release@v2
        with:
          name: 'Ghostty Tip ("Nightly")'
          prerelease: true
@@ -607,7 +524,7 @@ jobs:
          cp ghostty-macos-universal-debug-slow.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-slow.zip
          cp ghostty-macos-universal-debug-slow-dsym.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-slow-dsym.zip
      - name: Upload to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_TIP_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_TIP_AWS_KEY }}
@@ -616,57 +533,42 @@ jobs:
          source-dir: blob
          destination-dir: ./

-      - name: Echo Release URLs
-        run: |
-          echo "Release URLs:"
-          echo "  App Bundle: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-slow.zip"
-          echo "  Debug Symbols: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-slow-dsym.zip"
-
  build-macos-debug-fast:
-    needs: [setup]
    if: |
-      needs.setup.outputs.should_skip != 'true' &&
-      (
+      ${{
        github.event_name == 'workflow_dispatch' ||
        (
          github.event.workflow_run.conclusion == 'success' &&
          github.repository_owner == 'ghostty-org' &&
          github.ref_name == 'main'
        )
-      )
+      }}

-    runs-on: namespace-profile-ghostty-macos-tahoe
+    runs-on: namespace-profile-ghostty-macos
    timeout-minutes: 90
-    env:
-      GHOSTTY_BUILD: ${{ needs.setup.outputs.build }}
-      GHOSTTY_COMMIT: ${{ needs.setup.outputs.commit }}
-      GHOSTTY_COMMIT_LONG: ${{ needs.setup.outputs.commit_long }}
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
        with:
          # Important so that build number generation works
          fetch-depth: 0

-      # TODO(tahoe): https://github.com/NixOS/nix/issues/13342
-      - uses: DeterminateSystems/nix-installer-action@main
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v30
        with:
-          determinate: true
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_26.0.app
-
-      - name: Xcode Version
-        run: xcodebuild -version
+        run: sudo xcode-select -s /Applications/Xcode_16.0.app

      # Setup Sparkle
      - name: Setup Sparkle
        env:
-          SPARKLE_VERSION: 2.7.3
+          SPARKLE_VERSION: 2.5.1
        run: |
          mkdir -p .action/sparkle
          cd .action/sparkle
@@ -674,10 +576,17 @@ jobs:
          unzip sparkle.zip
          echo "$(pwd)/bin" >> $GITHUB_PATH

+      # Load Build Number
+      - name: Build Number
+        run: |
+          echo "GHOSTTY_BUILD=$(git rev-list --count head)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
+          echo "GHOSTTY_COMMIT_LONG=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
      # GhosttyKit is the framework that is built from Zig for our native
      # Mac app to access. Build this in release mode.
      - name: Build GhosttyKit
-        run: nix develop -c zig build -Doptimize=ReleaseSafe -Demit-macos-app=false
+        run: nix develop -c zig build -Doptimize=ReleaseSafe

      # The native app is built with native XCode tooling. This also does
      # codesigning. IMPORTANT: this must NOT run in a Nix environment.
@@ -737,16 +646,14 @@ jobs:

      - name: "Notarize app bundle"
        env:
-          APPLE_NOTARIZATION_ISSUER: ${{ secrets.APPLE_NOTARIZATION_ISSUER }}
-          APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
-          APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
+          PROD_MACOS_NOTARIZATION_APPLE_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_APPLE_ID }}
+          PROD_MACOS_NOTARIZATION_TEAM_ID: ${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}
+          PROD_MACOS_NOTARIZATION_PWD: ${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}
        run: |
          # Store the notarization credentials so that we can prevent a UI password dialog
          # from blocking the CI
          echo "Create keychain profile"
-          echo "$APPLE_NOTARIZATION_KEY" > notarization_key.p8
-          xcrun notarytool store-credentials "notarytool-profile" --key notarization_key.p8 --key-id "$APPLE_NOTARIZATION_KEY_ID" --issuer "$APPLE_NOTARIZATION_ISSUER"
-          rm notarization_key.p8
+          xcrun notarytool store-credentials "notarytool-profile" --apple-id "$PROD_MACOS_NOTARIZATION_APPLE_ID" --team-id "$PROD_MACOS_NOTARIZATION_TEAM_ID" --password "$PROD_MACOS_NOTARIZATION_PWD"

          # We can't notarize an app bundle directly, but we need to compress it as an archive.
          # Therefore, we create a zip file containing our app bundle, so that we can send it to the
@@ -775,7 +682,7 @@ jobs:

      # Update Release
      - name: Release
-        uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
+        uses: softprops/action-gh-release@v2
        with:
          name: 'Ghostty Tip ("Nightly")'
          prerelease: true
@@ -792,7 +699,7 @@ jobs:
          cp ghostty-macos-universal-debug-fast.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-fast.zip
          cp ghostty-macos-universal-debug-fast-dsym.zip blob/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-fast-dsym.zip
      - name: Upload to R2
-        uses: ryand56/r2-upload-action@b801a390acbdeb034c5e684ff5e1361c06639e7c # v1.4
+        uses: ryand56/r2-upload-action@latest
        with:
          r2-account-id: ${{ secrets.CF_R2_TIP_ACCOUNT_ID }}
          r2-access-key-id: ${{ secrets.CF_R2_TIP_AWS_KEY }}
@@ -800,9 +707,3 @@ jobs:
          r2-bucket: ghostty-tip
          source-dir: blob
          destination-dir: ./
-
-      - name: Echo Release URLs
-        run: |
-          echo "Release URLs:"
-          echo "  App Bundle: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-fast.zip"
-          echo "  Debug Symbols: https://tip.files.ghostty.org/${GHOSTTY_COMMIT_LONG}/ghostty-macos-universal-debug-fast-dsym.zip"
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -1,59 +0,0 @@
-on:
-  workflow_dispatch:
-    inputs:
-      source-run-id:
-        description: run id of the workflow that generated the artifact
-        required: true
-        type: string
-      source-artifact-id:
-        description: source tarball built during build-dist
-        required: true
-        type: string
-
-name: Snap
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os:
-          [namespace-profile-ghostty-snap, namespace-profile-ghostty-snap-arm64]
-    runs-on: ${{ matrix.os }}
-    timeout-minutes: 45
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          run-id: ${{ inputs.source-run-id }}
-          artifact-ids: ${{ inputs.source-artifact-id }}
-          github-token: ${{ github.token }}
-
-      - name: Extract tarball
-        run: |
-          mkdir dist
-          tar --verbose --extract --strip-components 1 --directory dist --file ghostty-source.tar.gz
-
-      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@7baedde84bbf5063413d621f282834bc2654d0c1 # v1.2.18
-        with:
-          path: |
-            /nix
-            /zig
-
-      - run: sudo apt install -y udev
-
-      - run: sudo systemctl start systemd-udevd
-
-      # Workaround until this is fixed: https://github.com/canonical/lxd-pkg-snap/pull/789
-      - run: |
-          _LXD_SNAP_DEVCGROUP_CONFIG="/var/lib/snapd/cgroup/snap.lxd.device"
-          sudo mkdir -p /var/lib/snapd/cgroup
-          echo 'self-managed=true' | sudo tee  "${_LXD_SNAP_DEVCGROUP_CONFIG}"
-
-      - uses: snapcore/action-build@3bdaa03e1ba6bf59a65f84a751d943d549a54e79 # v1.3.0
-        with:
-          path: dist
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
--- a/.github/workflows/update-colorschemes.yml
+++ b/.github/workflows/update-colorschemes.yml
@@ -17,36 +17,32 @@ jobs:
      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
    steps:
      - name: Checkout code
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0

      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@7baedde84bbf5063413d621f282834bc2654d0c1 # v1.2.18
+        uses: namespacelabs/nscloud-cache-action@v1.2.0
        with:
          path: |
            /nix
            /zig

      - name: Setup Nix
-        uses: cachix/install-nix-action@9280e7aca88deada44c930f1e2c78e21c3ae3edd # v31.7.0
+        uses: cachix/install-nix-action@v30
        with:
          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
+      - uses: cachix/cachix-action@v15
        with:
          name: ghostty
          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

      - name: Run zig fetch
        id: zig_fetch
-        env:
-          GH_TOKEN: ${{ github.token }}
        run: |
-          # Get the latest release from iTerm2-Color-Schemes
-          RELEASE_INFO=$(gh api repos/mbadolato/iTerm2-Color-Schemes/releases/latest)
-          TAG_NAME=$(echo "$RELEASE_INFO" | jq -r '.tag_name')
-          nix develop -c zig fetch --save="iterm2_themes" "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/${TAG_NAME}/ghostty-themes.tgz"
-          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
+          UPSTREAM_REV="$(curl "https://api.github.com/repos/mbadolato/iTerm2-Color-Schemes/commits/master" | jq -r '.sha')"
+          nix develop -c zig fetch --save="iterm2_themes" "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/$UPSTREAM_REV.tar.gz"
+          echo "upstream_rev=$UPSTREAM_REV" >> "$GITHUB_OUTPUT"

      - name: Update zig cache hash
        run: |
@@ -62,7 +58,7 @@ jobs:
        run: nix build .#ghostty

      - name: Create pull request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        uses: peter-evans/create-pull-request@v7
        with:
          title: Update iTerm2 colorschemes
          base: main
@@ -73,7 +69,6 @@ jobs:
            build.zig.zon.nix
            build.zig.zon.txt
            build.zig.zon.json
-            flatpak/zig-packages.json
          body: |
-            Upstream release: https://github.com/mbadolato/iTerm2-Color-Schemes/releases/tag/${{ steps.zig_fetch.outputs.tag_name }}
+            Upstream revision: https://github.com/mbadolato/iTerm2-Color-Schemes/tree/${{ steps.zig_fetch.outputs.upstream_rev }}
          labels: dependencies
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,8 @@ zig-out/
 example/*.wasm
 test/ghostty
 test/cases/**/*.actual.png
-flatpak/builddir/
-flatpak/repo/

 glad.zip
 /Box_test.ppm
 /Box_test_diff.ppm
 /ghostty.qcow2
-
-vgcore.*
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,9 +11,6 @@ zig-out/
 # macos is managed by XCode GUI
 macos/

-# produced by Icon Composer on macOS
-images/Ghostty.icon/icon.json
-
 # website dev run
 website/.next

--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,23 +0,0 @@
-# Agent Development Guide
-
-A file for [guiding coding agents](https://agents.md/).
-
-## Commands
-
- **Build:** `zig build`
- **Test (Zig):** `zig build test`
- **Test filter (Zig)**: `zig build test -Dtest-filter=<test name>`
- **Formatting (Zig)**: `zig fmt .`
- **Formatting (other)**: `prettier -w .`
-
-## Directory Structure
-
- Shared Zig core: `src/`
- C API: `include/ghostty.h`
- macOS app: `macos/`
- GTK (Linux and FreeBSD) app: `src/apprt/gtk`
-
-## macOS App
-
- Do not use `xcodebuild`
- Use `zig build` to build the macOS app and any shared Zig code
--- a/25
+++ b/25
@@ -81,10 +81,6 @@
 # - @ghostty-org/localization/* - Anything related to localization
 #   for a specific locale.
 #
-# - @ghosty-org/localization/manager - Manage all localization tasks
-#   and tooling. They are not responsible for any specific locale but
-#   are responsible for the overall localization process and tooling.
-#
 # - @ghostty-org/macos - The Ghostty macOS app and any macOS-specific
 #   features, configurations, etc.
 #
@@ -148,14 +144,13 @@

 # Shell
 /src/shell-integration/ @ghostty-org/shell
-/src/termio/shell_integration.zig @ghostty-org/shell
+/src/termio/shell-integration.zig @ghostty-org/shell

 # Terminal
 /src/simd/ @ghostty-org/terminal
 /src/input/KeyEncoder.zig @ghostty-org/terminal
 /src/terminal/ @ghostty-org/terminal
 /src/terminfo/ @ghostty-org/terminal
-/src/termio/ @ghostty-org/terminal
 /src/unicode/ @ghostty-org/terminal
 /src/Surface.zig @ghostty-org/terminal
 /src/surface_mouse.zig @ghostty-org/terminal
@@ -163,29 +158,11 @@
 # Localization
 /po/README_TRANSLATORS.md @ghostty-org/localization
 /po/com.mitchellh.ghostty.pot @ghostty-org/localization
-/po/ca_ES.UTF-8.po @ghostty-org/ca_ES
 /po/de_DE.UTF-8.po @ghostty-org/de_DE
-/po/es_BO.UTF-8.po @ghostty-org/es_BO
-/po/es_AR.UTF-8.po @ghostty-org/es_AR
-/po/fr_FR.UTF-8.po @ghostty-org/fr_FR
-/po/hu_HU.UTF-8.po @ghostty-org/hu_HU
-/po/id_ID.UTF-8.po @ghostty-org/id_ID
-/po/ja_JP.UTF-8.po @ghostty-org/ja_JP
-/po/mk_MK.UTF-8.po @ghostty-org/mk_MK
 /po/nb_NO.UTF-8.po @ghostty-org/nb_NO
-/po/nl_NL.UTF-8.po @ghostty-org/nl_NL
 /po/pl_PL.UTF-8.po @ghostty-org/pl_PL
-/po/pt_BR.UTF-8.po @ghostty-org/pt_BR
-/po/ru_RU.UTF-8.po @ghostty-org/ru_RU
-/po/tr_TR.UTF-8.po @ghostty-org/tr_TR
 /po/uk_UA.UTF-8.po @ghostty-org/uk_UA
 /po/zh_CN.UTF-8.po @ghostty-org/zh_CN
-/po/ga_IE.UTF-8.po @ghostty-org/ga_IE
-/po/ko_KR.UTF-8.po @ghostty-org/ko_KR
-/po/he_IL.UTF-8.po @ghostty-org/he_IL
-/po/it_IT.UTF-8.po @ghostty-org/it_IT
-/po/zh_TW.UTF-8.po @ghostty-org/zh_TW
-/po/hr_HR.UTF-8.po @ghostty-org/hr_HR

 # Packaging - Snap
 /snap/ @ghostty-org/snap
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,9 @@
-# Contributing to Ghostty
+# Ghostty Development Process

-This document describes the process of contributing to Ghostty. It is intended
-for anyone considering opening an **issue**, **discussion** or **pull request**.
-For people who are interested in developing Ghostty and technical details behind
-it, please check out our ["Developing Ghostty"](HACKING.md) document as well.
+This document describes the development process for Ghostty. It is intended for
+anyone considering opening an **issue** or **pull request**. If in doubt,
+please open a [discussion](https://github.com/ghostty-org/ghostty/discussions);
+we can always convert that to an issue later.

 > [!NOTE]
 >
@@ -13,57 +13,15 @@ it, please check out our ["Developing Ghostty"](HACKING.md) document as well.
 > time to fixing bugs, maintaining features, and reviewing code, I do kindly
 > ask you spend a few minutes reading this document. Thank you. ❤️

-## AI Assistance Notice
-
-> [!IMPORTANT]
->
-> If you are using **any kind of AI assistance** to contribute to Ghostty,
-> it must be disclosed in the pull request.
-
-If you are using any kind of AI assistance while contributing to Ghostty,
-**this must be disclosed in the pull request**, along with the extent to
-which AI assistance was used (e.g. docs only vs. code generation).
-If PR responses are being generated by an AI, disclose that as well.
-As a small exception, trivial tab-completion doesn't need to be disclosed,
-so long as it is limited to single keywords or short phrases.
-
-An example disclosure:
-
-> This PR was written primarily by Claude Code.
-
-Or a more detailed disclosure:
-
-> I consulted ChatGPT to understand the codebase but the solution
-> was fully authored manually by myself.
-
-Failure to disclose this is first and foremost rude to the human operators
-on the other end of the pull request, but it also makes it difficult to
-determine how much scrutiny to apply to the contribution.
-
-In a perfect world, AI assistance would produce equal or higher quality
-work than any human. That isn't the world we live in today, and in most cases
-it's generating slop. I say this despite being a fan of and using them
-successfully myself (with heavy supervision)!
-
-When using AI assistance, we expect contributors to understand the code
-that is produced and be able to answer critical questions about it. It
-isn't a maintainers job to review a PR so broken that it requires
-significant rework to be acceptable.
-
-Please be respectful to maintainers and disclose AI assistance.
-
 ## Quick Guide

-### I'd like to contribute
+**I'd like to contribute!**

-[All issues are actionable](#issues-are-actionable). Pick one and start
-working on it. Thank you. If you need help or guidance, comment on the issue.
-Issues that are extra friendly to new contributors are tagged with
-["contributor friendly"].
+All issues are actionable. Pick one and start working on it. Thank you.
+If you need help or guidance, comment on the issue. Issues that are extra
+friendly to new contributors are tagged with "contributor friendly".

-["contributor friendly"]: https://github.com/ghostty-org/ghostty/issues?q=is%3Aissue%20is%3Aopen%20label%3A%22contributor%20friendly%22
-
-### I'd like to translate Ghostty to my language
+**I'd like to translate Ghostty to my language!**

 We have written a [Translator's Guide](po/README_TRANSLATORS.md) for
 everyone interested in contributing translations to Ghostty.
@@ -72,39 +30,25 @@ and you can submit pull requests directly, although please make sure that
 our [Style Guide](po/README_TRANSLATORS.md#style-guide) is followed before
 submission.

-### I have a bug! / Something isn't working
+**I have a bug!**

-1. Search the issue tracker and discussions for similar issues. Tip: also
-   search for [closed issues] and [discussions] — your issue might have already
-   been fixed!
-2. If your issue hasn't been reported already, open an ["Issue Triage" discussion]
-   and make sure to fill in the template **completely**. They are vital for
-   maintainers to figure out important details about your setup. Because of
-   this, please make sure that you _only_ use the "Issue Triage" category for
-   reporting bugs — thank you!
+1. Search the issue tracker and discussions for similar issues.
+2. If you don't have steps to reproduce, open a discussion.
+3. If you have steps to reproduce, open an issue.

-[closed issues]: https://github.com/ghostty-org/ghostty/issues?q=is%3Aissue%20state%3Aclosed
-[discussions]: https://github.com/ghostty-org/ghostty/discussions?discussions_q=is%3Aclosed
-["Issue Triage" discussion]: https://github.com/ghostty-org/ghostty/discussions/new?category=issue-triage
+**I have an idea for a feature!**

-### I have an idea for a feature
+1. Open a discussion.

-Open a discussion in the ["Feature Requests, Ideas" category](https://github.com/ghostty-org/ghostty/discussions/new?category=feature-requests-ideas).
+**I've implemented a feature!**

-### I've implemented a feature
-
-1. If there is an issue for the feature, open a pull request straight away.
+1. If there is an issue for the feature, open a pull request.
 2. If there is no issue, open a discussion and link to your branch.
-3. If you want to live dangerously, open a pull request and
-   [hope for the best](#pull-requests-implement-an-issue).
+3. If you want to live dangerously, open a pull request and hope for the best.

-### I have a question
+**I have a question!**

-Open an [Q&A discussion], or join our [Discord Server] and ask away in the
-`#help` channel.
-
-[Q&A discussion]: https://github.com/ghostty-org/ghostty/discussions/new?category=q-a
-[Discord Server]: https://discord.gg/ghostty
+1. Open a discussion or use Discord.

 ## General Patterns

@@ -142,3 +86,187 @@ pull request will be accepted with a high degree of certainty.
 > **Pull requests are NOT a place to discuss feature design.** Please do
 > not open a WIP pull request to discuss a feature. Instead, use a discussion
 > and link to your branch.
+
+# Developer Guide
+
+> [!NOTE]
+>
+> **The remainder of this file is dedicated to developers actively
+> working on Ghostty.** If you're a user reporting an issue, you can
+> ignore the rest of this document.
+
+## Including and Updating Translations
+
+See the [Contributor's Guide](po/README_CONTRIBUTORS.md) for more details.
+
+## Input Stack Testing
+
+The input stack is the part of the codebase that starts with a
+key event and ends with text encoding being sent to the pty (it
+does not include _rendering_ the text, which is part of the
+font or rendering stack).
+
+If you modify any part of the input stack, you must manually verify
+all the following input cases work properly. We unfortunately do
+not automate this in any way, but if we can do that one day that'd
+save a LOT of grief and time.
+
+Note: this list may not be exhaustive, I'm still working on it.
+
+### Linux IME
+
+IME (Input Method Editors) are a common source of bugs in the input stack,
+especially on Linux since there are multiple different IME systems
+interacting with different windowing systems and application frameworks
+all written by different organizations.
+
+The following matrix should be tested to ensure that all IME input works
+properly:
+
+1. Wayland, X11
+2. ibus, fcitx, none
+3. Dead key input (e.g. Spanish), CJK (e.g. Japanese), Emoji, Unicode Hex
+4. ibus versions: 1.5.29, 1.5.30, 1.5.31 (each exhibit slightly different behaviors)
+
+> [!NOTE]
+>
+> This is a **work in progress**. I'm still working on this list and it
+> is not complete. As I find more test cases, I will add them here.
+
+#### Dead Key Input
+
+Set your keyboard layout to "Spanish" (or another layout that uses dead keys).
+
+1. Launch Ghostty
+2. Press `'`
+3. Press `a`
+4. Verify that `á` is displayed
+
+Note that the dead key may or may not show a preedit state visually.
+For ibus and fcitx it does but for the "none" case it does not. Importantly,
+the text should be correct when it is sent to the pty.
+
+We should also test canceling dead key input:
+
+1. Launch Ghostty
+2. Press `'`
+3. Press escape
+4. Press `a`
+5. Verify that `a` is displayed (no diacritic)
+
+#### CJK Input
+
+Configure fcitx or ibus with a keyboard layout like Japanese or Mozc. The
+exact layout doesn't matter.
+
+1. Launch Ghostty
+2. Press `Ctrl+Shift` to switch to "Hiragana"
+3. On a US physical layout, type: `konn`, you should see `こん` in preedit.
+4. Press `Enter`
+5. Verify that `こん` is displayed in the terminal.
+
+We should also test switching input methods while preedit is active, which
+should commit the text:
+
+1. Launch Ghostty
+2. Press `Ctrl+Shift` to switch to "Hiragana"
+3. On a US physical layout, type: `konn`, you should see `こん` in preedit.
+4. Press `Ctrl+Shift` to switch to another layout (any)
+5. Verify that `こん` is displayed in the terminal as committed text.
+
+## Nix Virtual Machines
+
+Several Nix virtual machine definitions are provided by the project for testing
+and developing Ghostty against multiple different Linux desktop environments.
+
+Running these requires a working Nix installation, either Nix on your
+favorite Linux distribution, NixOS, or macOS with nix-darwin installed. Further
+requirements for macOS are detailed below.
+
+VMs should only be run on your local desktop and then powered off when not in
+use, which will discard any changes to the VM.
+
+The VM definitions provide minimal software "out of the box" but additional
+software can be installed by using standard Nix mechanisms like `nix run nixpkgs#<package>`.
+
+### Linux
+
+1. Check out the Ghostty source and change to the directory.
+2. Run `nix run .#<vmtype>`. `<vmtype>` can be any of the VMs defined in the
+   `nix/vm` directory (without the `.nix` suffix) excluding any file prefixed
+   with `common` or `create`.
+3. The VM will build and then launch. Depending on the speed of your system, this
+   can take a while, but eventually you should get a new VM window.
+4. The Ghostty source directory should be mounted to `/tmp/shared` in the VM. Depending
+   on what UID and GID of the user that you launched the VM as, `/tmp/shared` _may_ be
+   writable by the VM user, so be careful!
+
+### macOS
+
+1. To run the VMs on macOS you will need to enable the Linux builder in your `nix-darwin`
+   config. This _should_ be as simple as adding `nix.linux-builder.enable=true` to your
+   configuration and then rebuilding. See [this](https://nixcademy.com/posts/macos-linux-builder/)
+   blog post for more information about the Linux builder and how to tune the performance.
+2. Once the Linux builder has been enabled, you should be able to follow the Linux instructions
+   above to launch a VM.
+
+### Custom VMs
+
+To easily create a custom VM without modifying the Ghostty source, create a new
+directory, then create a file called `flake.nix` with the following text in the
+new directory.
+
+```
+{
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
+    ghostty.url = "github:ghostty-org/ghostty";
+  };
+  outputs = {
+    nixpkgs,
+    ghostty,
+    ...
+  }: {
+   nixosConfigurations.custom-vm = ghostty.create-gnome-vm {
+     nixpkgs = nixpkgs;
+     system = "x86_64-linux";
+     overlay = ghostty.overlays.releasefast;
+     # module = ./configuration.nix # also works
+     module = {pkgs, ...}: {
+       environment.systemPackages = [
+         pkgs.btop
+       ];
+     };
+    };
+  };
+}
+```
+
+The custom VM can then be run with a command like this:
+
+```
+nix run .#nixosConfigurations.custom-vm.config.system.build.vm
+```
+
+A file named `ghostty.qcow2` will be created that is used to persist any changes
+made in the VM. To "reset" the VM to default delete the file and it will be
+recreated the next time you run the VM.
+
+### Contributing new VM definitions
+
+#### VM Acceptance Criteria
+
+We welcome the contribution of new VM definitions, as long as they meet the following criteria:
+
+1. The should be different enough from existing VM definitions that they represent a distinct
+   user (and developer) experience.
+2. There's a significant Ghostty user population that uses a similar environment.
+3. The VMs can be built using only packages from the current stable NixOS release.
+
+#### VM Definition Criteria
+
+1. VMs should be as minimal as possible so that they build and launch quickly.
+   Additional software can be added at runtime with a command like `nix run nixpkgs#<package name>`.
+2. VMs should not expose any services to the network, or run any remote access
+   software like SSH daemons, VNC or RDP.
+3. VMs should auto-login using the "ghostty" user.
--- a/28
+++ b/28
@@ -1,28 +0,0 @@
-# Doxyfile 1.13.2
-
-DOXYFILE_ENCODING      = UTF-8
-PROJECT_NAME           = "libghostty"
-INPUT                  = include/ghostty/vt.h
-INPUT_ENCODING         = UTF-8
-RECURSIVE              = NO
-
-#---------------------------------------------------------------------------
-# HTML Output
-#---------------------------------------------------------------------------
-
-GENERATE_HTML          = YES
-HTML_OUTPUT            = zig-out/share/ghostty/doc/libghostty
-
-#---------------------------------------------------------------------------
-# Man Output
-#---------------------------------------------------------------------------
-
-GENERATE_MAN           = YES
-MAN_OUTPUT             = zig-out/share/man
-MAN_EXTENSION          = .3
-
-#---------------------------------------------------------------------------
-# Other Output
-#---------------------------------------------------------------------------
-
-GENERATE_LATEX         = NO
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,355 +0,0 @@
-# Developing Ghostty
-
-This document describes the technical details behind Ghostty's development.
-If you'd like to open any pull requests or would like to implement new features
-into Ghostty, please make sure to read our ["Contributing to Ghostty"](CONTRIBUTING.md)
-document first.
-
-To start development on Ghostty, you need to build Ghostty from a Git checkout,
-which is very similar in process to [building Ghostty from a source tarball](http://ghostty.org/docs/install/build). One key difference is that obviously
-you need to clone the Git repository instead of unpacking the source tarball:
-
-```shell
-git clone https://github.com/ghostty-org/ghostty
-cd ghostty
-```
-
-> [!NOTE]
->
-> Ghostty may require [extra dependencies](#extra-dependencies)
-> when building from a Git checkout compared to a source tarball.
-> Tip versions may also require a different version of Zig or other toolchains
-> (e.g. the Xcode SDK on macOS) compared to stable versions — make sure to
-> follow the steps closely!
-
-When you're developing Ghostty, it's very likely that you will want to build a
-_debug_ build to diagnose issues more easily. This is already the default for
-Zig builds, so simply run `zig build` **without any `-Doptimize` flags**.
-
-There are many more build steps than just `zig build`, some of which are listed
-here:
-
-| Command                         | Description                                                                                                            |
-| ------------------------------- | ---------------------------------------------------------------------------------------------------------------------- |
-| `zig build run`                 | Runs Ghostty                                                                                                           |
-| `zig build run-valgrind`        | Runs Ghostty under Valgrind to [check for memory leaks](#checking-for-memory-leaks)                                    |
-| `zig build test`                | Runs unit tests (accepts `-Dtest-filter=<filter>` to only run tests whose name matches the filter)                     |
-| `zig build update-translations` | Updates Ghostty's translation strings (see the [Contributor's Guide on Localizing Ghostty](po/README_CONTRIBUTORS.md)) |
-| `zig build dist`                | Builds a source tarball                                                                                                |
-| `zig build distcheck`           | Builds and validates a source tarball                                                                                  |
-
-## Extra Dependencies
-
-Building Ghostty from a Git checkout on Linux requires some additional
-dependencies:
-
- `blueprint-compiler` (version 0.16.0 or newer)
-
-macOS users don't require any additional dependencies.
-
-## Xcode Version and SDKs
-
-Building the Ghostty macOS app requires that Xcode, the macOS SDK,
-and the iOS SDK are all installed.
-
-A common issue is that the incorrect version of Xcode is either
-installed or selected. Use the `xcode-select` command to
-ensure that the correct version of Xcode is selected:
-
-```shell-session
-sudo xcode-select --switch /Applications/Xcode-beta.app
-```
-
-> [!IMPORTANT]
->
-> Main branch development of Ghostty is preparing for the next major
-> macOS release, Tahoe (macOS 26). Therefore, the main branch requires
-> **Xcode 26 and the macOS 26 SDK**.
->
-> You do not need to be running on macOS 26 to build Ghostty, you can
-> still use Xcode 26 beta on macOS 15 stable.
-
-## AI and Agents
-
-If you're using AI assistance with Ghostty, Ghostty provides an
-[AGENTS.md file](https://github.com/ghostty-org/ghostty/blob/main/AGENTS.md)
-read by most of the popular AI agents to help produce higher quality
-results.
-
-We also provide commands in `.agents/commands` that have some vetted
-prompts for common tasks that have been shown to produce good results.
-We provide these to help reduce the amount of time a contributor has to
-spend prompting the AI to get good results, and hopefully to lower the slop
-produced.
-
- `/gh-issue <number/url>` - Produces a prompt for diagnosing a GitHub
-  issue, explaining the problem, and suggesting a plan for resolving it.
-  Requires `gh` to be installed with read-only access to Ghostty.
-
-> [!WARNING]
->
-> All AI assistance usage [must be disclosed](https://github.com/ghostty-org/ghostty/blob/main/CONTRIBUTING.md#ai-assistance-notice)
-> and we expect contributors to understand the code that is produced and
-> be able to answer questions about it. If you don't understand the
-> code produced, feel free to disclose that, but if it has problems, we
-> may ask you to fix it and close the issue. It isn't a maintainers job to
-> review a PR so broken that it requires significant rework to be acceptable.
-
-## Linting
-
-### Prettier
-
-Ghostty's docs and resources (not including Zig code) are linted using
-[Prettier](https://prettier.io) with out-of-the-box settings. A Prettier CI
-check will fail builds with improper formatting. Therefore, if you are
-modifying anything Prettier will lint, you may want to install it locally and
-run this from the repo root before you commit:
-
-```
-prettier --write .
-```
-
-Make sure your Prettier version matches the version of Prettier in [devShell.nix](https://github.com/ghostty-org/ghostty/blob/main/nix/devShell.nix).
-
-Nix users can use the following command to format with Prettier:
-
-```
-nix develop -c prettier --write .
-```
-
-### Alejandra
-
-Nix modules are formatted with [Alejandra](https://github.com/kamadorueda/alejandra/). An Alejandra CI check
-will fail builds with improper formatting.
-
-Nix users can use the following command to format with Alejandra:
-
-```
-nix develop -c alejandra .
-```
-
-Non-Nix users should install Alejandra and use the following command to format with Alejandra:
-
-```
-alejandra .
-```
-
-Make sure your Alejandra version matches the version of Alejandra in [devShell.nix](https://github.com/ghostty-org/ghostty/blob/main/nix/devShell.nix).
-
-### Updating the Zig Cache Fixed-Output Derivation Hash
-
-The Nix package depends on a [fixed-output
-derivation](https://nix.dev/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash)
-that manages the Zig package cache. This allows the package to be built in the
-Nix sandbox.
-
-Occasionally (usually when `build.zig.zon` is updated), the hash that
-identifies the cache will need to be updated. There are jobs that monitor the
-hash in CI, and builds will fail if it drifts.
-
-To update it, you can run the following in the repository root:
-
-```
-./nix/build-support/check-zig-cache.sh --update
-```
-
-This will write out the `nix/zigCacheHash.nix` file with the updated hash
-that can then be committed and pushed to fix the builds.
-
-## Including and Updating Translations
-
-See the [Contributor's Guide](po/README_CONTRIBUTORS.md) for more details.
-
-## Checking for Memory Leaks
-
-While Zig does an amazing job of finding and preventing memory leaks,
-Ghostty uses many third-party libraries that are written in C. Improper usage
-of those libraries or bugs in those libraries can cause memory leaks that
-Zig cannot detect by itself.
-
-### On Linux
-
-On Linux the recommended tool to check for memory leaks is Valgrind. The
-recommended way to run Valgrind is via `zig build`:
-
-```sh
-zig build run-valgrind
-```
-
-This builds a Ghostty executable with Valgrind support and runs Valgrind
-with the proper flags to ensure we're suppressing known false positives.
-
-You can combine the same build args with `run-valgrind` that you can with
-`run`, such as specifying additional configurations after a trailing `--`.
-
-## Input Stack Testing
-
-The input stack is the part of the codebase that starts with a
-key event and ends with text encoding being sent to the pty (it
-does not include _rendering_ the text, which is part of the
-font or rendering stack).
-
-If you modify any part of the input stack, you must manually verify
-all the following input cases work properly. We unfortunately do
-not automate this in any way, but if we can do that one day that'd
-save a LOT of grief and time.
-
-Note: this list may not be exhaustive, I'm still working on it.
-
-### Linux IME
-
-IME (Input Method Editors) are a common source of bugs in the input stack,
-especially on Linux since there are multiple different IME systems
-interacting with different windowing systems and application frameworks
-all written by different organizations.
-
-The following matrix should be tested to ensure that all IME input works
-properly:
-
-1. Wayland, X11
-2. ibus, fcitx, none
-3. Dead key input (e.g. Spanish), CJK (e.g. Japanese), Emoji, Unicode Hex
-4. ibus versions: 1.5.29, 1.5.30, 1.5.31 (each exhibit slightly different behaviors)
-
-> [!NOTE]
->
-> This is a **work in progress**. I'm still working on this list and it
-> is not complete. As I find more test cases, I will add them here.
-
-#### Dead Key Input
-
-Set your keyboard layout to "Spanish" (or another layout that uses dead keys).
-
-1. Launch Ghostty
-2. Press `'`
-3. Press `a`
-4. Verify that `á` is displayed
-
-Note that the dead key may or may not show a preedit state visually.
-For ibus and fcitx it does but for the "none" case it does not. Importantly,
-the text should be correct when it is sent to the pty.
-
-We should also test canceling dead key input:
-
-1. Launch Ghostty
-2. Press `'`
-3. Press escape
-4. Press `a`
-5. Verify that `a` is displayed (no diacritic)
-
-#### CJK Input
-
-Configure fcitx or ibus with a keyboard layout like Japanese or Mozc. The
-exact layout doesn't matter.
-
-1. Launch Ghostty
-2. Press `Ctrl+Shift` to switch to "Hiragana"
-3. On a US physical layout, type: `konn`, you should see `こん` in preedit.
-4. Press `Enter`
-5. Verify that `こん` is displayed in the terminal.
-
-We should also test switching input methods while preedit is active, which
-should commit the text:
-
-1. Launch Ghostty
-2. Press `Ctrl+Shift` to switch to "Hiragana"
-3. On a US physical layout, type: `konn`, you should see `こん` in preedit.
-4. Press `Ctrl+Shift` to switch to another layout (any)
-5. Verify that `こん` is displayed in the terminal as committed text.
-
-## Nix Virtual Machines
-
-Several Nix virtual machine definitions are provided by the project for testing
-and developing Ghostty against multiple different Linux desktop environments.
-
-Running these requires a working Nix installation, either Nix on your
-favorite Linux distribution, NixOS, or macOS with nix-darwin installed. Further
-requirements for macOS are detailed below.
-
-VMs should only be run on your local desktop and then powered off when not in
-use, which will discard any changes to the VM.
-
-The VM definitions provide minimal software "out of the box" but additional
-software can be installed by using standard Nix mechanisms like `nix run nixpkgs#<package>`.
-
-### Linux
-
-1. Check out the Ghostty source and change to the directory.
-2. Run `nix run .#<vmtype>`. `<vmtype>` can be any of the VMs defined in the
-   `nix/vm` directory (without the `.nix` suffix) excluding any file prefixed
-   with `common` or `create`.
-3. The VM will build and then launch. Depending on the speed of your system, this
-   can take a while, but eventually you should get a new VM window.
-4. The Ghostty source directory should be mounted to `/tmp/shared` in the VM. Depending
-   on what UID and GID of the user that you launched the VM as, `/tmp/shared` _may_ be
-   writable by the VM user, so be careful!
-
-### macOS
-
-1. To run the VMs on macOS you will need to enable the Linux builder in your `nix-darwin`
-   config. This _should_ be as simple as adding `nix.linux-builder.enable=true` to your
-   configuration and then rebuilding. See [this](https://nixcademy.com/posts/macos-linux-builder/)
-   blog post for more information about the Linux builder and how to tune the performance.
-2. Once the Linux builder has been enabled, you should be able to follow the Linux instructions
-   above to launch a VM.
-
-### Custom VMs
-
-To easily create a custom VM without modifying the Ghostty source, create a new
-directory, then create a file called `flake.nix` with the following text in the
-new directory.
-
-```
-{
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixpkgs-unstable";
-    ghostty.url = "github:ghostty-org/ghostty";
-  };
-  outputs = {
-    nixpkgs,
-    ghostty,
-    ...
-  }: {
-   nixosConfigurations.custom-vm = ghostty.create-gnome-vm {
-     nixpkgs = nixpkgs;
-     system = "x86_64-linux";
-     overlay = ghostty.overlays.releasefast;
-     # module = ./configuration.nix # also works
-     module = {pkgs, ...}: {
-       environment.systemPackages = [
-         pkgs.btop
-       ];
-     };
-    };
-  };
-}
-```
-
-The custom VM can then be run with a command like this:
-
-```
-nix run .#nixosConfigurations.custom-vm.config.system.build.vm
-```
-
-A file named `ghostty.qcow2` will be created that is used to persist any changes
-made in the VM. To "reset" the VM to default delete the file and it will be
-recreated the next time you run the VM.
-
-### Contributing new VM definitions
-
-#### VM Acceptance Criteria
-
-We welcome the contribution of new VM definitions, as long as they meet the following criteria:
-
-1. They should be different enough from existing VM definitions that they represent a distinct
-   user (and developer) experience.
-2. There's a significant Ghostty user population that uses a similar environment.
-3. The VMs can be built using only packages from the current stable NixOS release.
-
-#### VM Definition Criteria
-
-1. VMs should be as minimal as possible so that they build and launch quickly.
-   Additional software can be added at runtime with a command like `nix run nixpkgs#<package name>`.
-2. VMs should not expose any services to the network, or run any remote access
-   software like SSH daemons, VNC or RDP.
-3. VMs should auto-login using the "ghostty" user.
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2024 Mitchell Hashimoto, Ghostty contributors
+Copyright (c) 2024 Mitchell Hashimoto

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -4,12 +4,13 @@ Ghostty relies on downstream package maintainers to distribute Ghostty to
 end-users. This document provides guidance to package maintainers on how to
 package Ghostty for distribution.

-> [!IMPORTANT]
+> [!NOTE]
 >
-> This document is only accurate for the Ghostty source alongside it.
-> **Do not use this document for older or newer versions of Ghostty!** If
-> you are reading this document in a different version of Ghostty, please
-> find the `PACKAGING.md` file alongside that version.
+> While Ghostty went through an extensive private beta testing period,
+> packaging Ghostty is immature and may require additional build script
+> tweaks and documentation improvement. I'm extremely motivated to work with
+> package maintainers to improve the packaging process. Please open issues
+> to discuss any packaging issues you encounter.

 ## Source Tarballs

@@ -36,19 +37,6 @@ Use the `ghostty-source.tar.gz` asset and _not the GitHub auto-generated
 source tarball_. These tarballs are generated for every commit to
 the `main` branch and are not associated with a specific version.

-> [!WARNING]
->
-> Source tarballs are _not the same_ as a Git checkout. Source tarballs
-> contain some preprocessed files that allow building Ghostty with less
-> dependencies. If you are building Ghostty from a Git checkout, the
-> steps below are the same but they may require additional dependencies
-> not listed here. See the `README.md` for more information on building
-> from a Git checkout.
->
-> For everyone except Ghostty developers, please use the source tarballs.
-> We generate tip source tarballs for users following the development
-> branch.
-
 ## Zig Version

 [Zig](https://ziglang.org) is required to build Ghostty. Prior to Zig 1.0,
@@ -93,6 +81,13 @@ for system packages which separate a build and install step, since the
 install step can then be done with a `mv` or `cp` command (from `/tmp/ghostty`
 to wherever the package manager expects it).

+> [!NOTE]
+>
+> **Version 1.1.1 and 1.1.2 are missing `fetch-zig-cache.sh`.** This was
+> an oversight on the release process. You can use the script from version
+> 1.1.0 to fetch the Zig cache for these versions. Future versions will
+> restore the script.
+
 ### Build Options

 Ghostty uses the Zig build system. You can see all available build options by
@@ -122,3 +117,11 @@ relevant to package maintainers:
  often necessary for system packages to specify a specific minimum Linux
  version, glibc, etc. Run `zig targets` to a get a full list of available
  targets.
+
+> [!WARNING]
+>
+> **The GLFW runtime is not meant for distribution.** The GLFW runtime
+> (`-Dapp-runtime=glfw`) is meant for development and testing only. It is
+> missing many features, has known memory leak scenarios, known crashes,
+> and more. Please do not package the GLFW-based Ghostty runtime for
+> distribution.
--- a/README.md
+++ b/README.md
@@ -13,9 +13,7 @@
    ·
    <a href="https://ghostty.org/docs">Documentation</a>
    ·
-    <a href="CONTRIBUTING.md">Contributing</a>
-    ·
-    <a href="HACKING.md">Developing</a>
+    <a href="#developing-ghostty">Developing</a>
  </p>
 </p>

@@ -51,14 +49,6 @@ See the [download page](https://ghostty.org/download) on the Ghostty website.

 See the [documentation](https://ghostty.org/docs) on the Ghostty website.

-## Contributing and Developing
-
-If you have any ideas, issues, etc. regarding Ghostty, or would like to
-contribute to Ghostty through pull requests, please check out our
-["Contributing to Ghostty"](CONTRIBUTING.md) document. Those who would like
-to get involved with Ghostty's development as well should also read the
-["Developing Ghostty"](HACKING.md) document for more technical details.
-
 ## Roadmap and Status

 The high-level ambitious plan for the project, in order:
@@ -194,3 +184,103 @@ SENTRY_DSN=https://e914ee84fd895c4fe324afa3e53dac76@o4507352570920960.ingest.us.
 > stack memory of each thread at the time of the crash. This information
 > is used to rebuild the stack trace but can also contain sensitive data
 > depending when the crash occurred.
+
+## Developing Ghostty
+
+See the documentation on the Ghostty website for
+[building Ghostty from a source tarball](http://ghostty.org/docs/install/build).
+Building Ghostty from a Git checkout is very similar, except you want to
+omit the `-Doptimize` flag to build a debug build, and you may require
+additional dependencies since the source tarball includes some processed
+files that are not in the Git repository.
+
+On Linux or macOS, you can use `zig build -Dapp-runtime=glfw run` for a quick
+GLFW-based app for a faster development cycle while developing core
+terminal features. Note that this app is missing many features and is also
+known to crash in certain scenarios, so it is only meant for development
+tasks.
+
+Other useful commands:
+
+- `zig build test` for running unit tests.
+- `zig build test -Dtest-filter=<filter>` for running a specific subset of those unit tests
+- `zig build run -Dconformance=<name>` runs a conformance test case from
+  the `conformance` directory. The `name` is the name of the file. This runs
+  in the current running terminal emulator so if you want to check the
+  behavior of this project, you must run this command in Ghostty.
+
+### Extra Dependencies
+
+Building Ghostty from a Git checkout on Linux requires some additional
+dependencies:
+
+- `blueprint-compiler`
+
+macOS users don't require any additional dependencies.
+
+> [!NOTE]
+> This only applies to building from a _Git checkout_. This section does
+> not apply if you're building from a released _source tarball_. For
+> source tarballs, see the
+> [website](http://ghostty.org/docs/install/build).
+
+### Linting
+
+#### Prettier
+
+Ghostty's docs and resources (not including Zig code) are linted using
+[Prettier](https://prettier.io) with out-of-the-box settings. A Prettier CI
+check will fail builds with improper formatting. Therefore, if you are
+modifying anything Prettier will lint, you may want to install it locally and
+run this from the repo root before you commit:
+
+```
+prettier --write .
+```
+
+Make sure your Prettier version matches the version of Prettier in [devShell.nix](https://github.com/ghostty-org/ghostty/blob/main/nix/devShell.nix).
+
+Nix users can use the following command to format with Prettier:
+
+```
+nix develop -c prettier --write .
+```
+
+#### Alejandra
+
+Nix modules are formatted with [Alejandra](https://github.com/kamadorueda/alejandra/). An Alejandra CI check
+will fail builds with improper formatting.
+
+Nix users can use the following command to format with Alejandra:
+
+```
+nix develop -c alejandra .
+```
+
+Non-Nix users should install Alejandra and use the following command to format with Alejandra:
+
+```
+alejandra .
+```
+
+Make sure your Alejandra version matches the version of Alejandra in [devShell.nix](https://github.com/ghostty-org/ghostty/blob/main/nix/devShell.nix).
+
+#### Updating the Zig Cache Fixed-Output Derivation Hash
+
+The Nix package depends on a [fixed-output
+derivation](https://nix.dev/manual/nix/stable/language/advanced-attributes.html#adv-attr-outputHash)
+that manages the Zig package cache. This allows the package to be built in the
+Nix sandbox.
+
+Occasionally (usually when `build.zig.zon` is updated), the hash that
+identifies the cache will need to be updated. There are jobs that monitor the
+hash in CI, and builds will fail if it drifts.
+
+To update it, you can run the following in the repository root:
+
+```
+./nix/build-support/check-zig-cache-hash.sh --update
+```
+
+This will write out the `nix/zigCacheHash.nix` file with the updated hash
+that can then be committed and pushed to fix the builds.
--- a/TODO.md
+++ b/TODO.md
@@ -0,0 +1,21 @@
+Performance:
+
+- Loading fonts on startups should probably happen in multiple threads
+
+Correctness:
+
+- test wrap against wraptest: https://github.com/mattiase/wraptest
+  - automate this in some way
+- Charsets: UTF-8 vs. ASCII mode
+  - we only support UTF-8 input right now
+  - need fallback glyphs if they're not supported
+  - can effect a crash using `vttest` menu `3 10` since it tries to parse
+    ASCII as UTF-8.
+
+Mac:
+
+- Preferences window
+
+Major Features:
+
+- Bell
--- a/build.zig
+++ b/build.zig
@@ -1,77 +1,28 @@
 const std = @import("std");
-const assert = std.debug.assert;
 const builtin = @import("builtin");
 const buildpkg = @import("src/build/main.zig");

 comptime {
-    buildpkg.requireZig("0.15.1");
+    buildpkg.requireZig("0.14.0");
 }

 pub fn build(b: *std.Build) !void {
-    // Works around a Zig but still present in 0.15.1. Remove when fixed.
-    // https://github.com/ghostty-org/ghostty/issues/8924
-    try limitCoresForZigBug();
-
-    // This defines all the available build options (e.g. `-D`). If you
-    // want to know what options are available, you can run `--help` or
-    // you can read `src/build/Config.zig`.
    const config = try buildpkg.Config.init(b);
-    const test_filters = b.option(
-        [][]const u8,
-        "test-filter",
-        "Filter for test. Only applies to Zig tests.",
-    ) orelse &[0][]const u8{};
-
-    // Ghostty dependencies used by many artifacts.
-    const deps = try buildpkg.SharedDeps.init(b, &config);
-
-    // The modules exported for Zig consumers of libghostty. If you're
-    // writing a Zig program that uses libghostty, read this file.
-    const mod = try buildpkg.GhosttyZig.init(
-        b,
-        &config,
-        &deps,
-    );
-
-    // All our steps which we'll hook up later. The steps are shown
-    // up here just so that they are more self-documenting.
-    const libvt_step = b.step("lib-vt", "Build libghostty-vt");
-    const run_step = b.step("run", "Run the app");
-    const run_valgrind_step = b.step(
-        "run-valgrind",
-        "Run the app under valgrind",
-    );
-    const test_step = b.step("test", "Run tests");
-    const test_lib_vt_step = b.step(
-        "test-lib-vt",
-        "Run libghostty-vt tests",
-    );
-    const test_valgrind_step = b.step(
-        "test-valgrind",
-        "Run tests under valgrind",
-    );
-    const translations_step = b.step(
-        "update-translations",
-        "Update translation files",
-    );

    // Ghostty resources like terminfo, shell integration, themes, etc.
    const resources = try buildpkg.GhosttyResources.init(b, &config);
-    const i18n = if (config.i18n) try buildpkg.GhosttyI18n.init(b, &config) else null;
+    const i18n = try buildpkg.GhosttyI18n.init(b, &config);
+
+    // Ghostty dependencies used by many artifacts.
+    const deps = try buildpkg.SharedDeps.init(b, &config);
+    if (config.emit_helpgen) deps.help_strings.install();

    // Ghostty executable, the actual runnable Ghostty program.
    const exe = try buildpkg.GhosttyExe.init(b, &config, &deps);

    // Ghostty docs
    const docs = try buildpkg.GhosttyDocs.init(b, &deps);
-    if (config.emit_docs) {
-        docs.install();
-    } else if (config.target.result.os.tag.isDarwin()) {
-        // If we aren't emitting docs we need to emit a placeholder so
-        // our macOS xcodeproject builds since it expects the `share/man`
-        // directory to exist to copy into the app bundle.
-        docs.installDummy(b.getInstallStep());
-    }
+    if (config.emit_docs) docs.install();

    // Ghostty webdata
    const webdata = try buildpkg.GhosttyWebdata.init(b, &deps);
@@ -91,229 +42,91 @@ pub fn build(b: *std.Build) !void {
        check_step.dependOn(dist.install_step);
    }

-    // libghostty (internal, big)
-    const libghostty_shared = try buildpkg.GhosttyLib.initShared(
-        b,
-        &deps,
-    );
-    const libghostty_static = try buildpkg.GhosttyLib.initStatic(
-        b,
-        &deps,
-    );
-
-    // libghostty-vt
-    const libghostty_vt_shared = try buildpkg.GhosttyLibVt.initShared(
-        b,
-        &mod,
-    );
-    libghostty_vt_shared.install(libvt_step);
-    libghostty_vt_shared.install(b.getInstallStep());
-
-    // Helpgen
-    if (config.emit_helpgen) deps.help_strings.install();
-
-    // Runtime "none" is libghostty, anything else is an executable.
+    // If we're not building libghostty, then install the exe and resources.
    if (config.app_runtime != .none) {
-        if (config.emit_exe) {
-            exe.install();
-            resources.install();
-            if (i18n) |v| v.install();
-        }
-    } else {
-        // Libghostty
-        //
-        // Note: libghostty is not stable for general purpose use. It is used
-        // heavily by Ghostty on macOS but it isn't built to be reusable yet.
-        // As such, these build steps are lacking. For example, the Darwin
-        // build only produces an xcframework.
+        exe.install();
+        resources.install();
+        i18n.install();
+    }

-        // We shouldn't have this guard but we don't currently
-        // build on macOS this way ironically so we need to fix that.
-        if (!config.target.result.os.tag.isDarwin()) {
+    // Libghostty
+    //
+    // Note: libghostty is not stable for general purpose use. It is used
+    // heavily by Ghostty on macOS but it isn't built to be reusable yet.
+    // As such, these build steps are lacking. For example, the Darwin
+    // build only produces an xcframework.
+    if (config.app_runtime == .none) {
+        if (config.target.result.os.tag.isDarwin()) darwin: {
+            if (!config.emit_xcframework) break :darwin;
+
+            // Build the xcframework
+            const xcframework = try buildpkg.GhosttyXCFramework.init(b, &deps);
+            xcframework.install();
+
+            // The xcframework build always installs resources because our
+            // macOS xcode project contains references to them.
+            resources.install();
+            i18n.install();
+
+            // If we aren't emitting docs we need to emit a placeholder so
+            // our macOS xcodeproject builds.
+            if (!config.emit_docs) {
+                var wf = b.addWriteFiles();
+                const path = "share/man/.placeholder";
+                const placeholder = wf.add(path, "emit-docs not true so no man pages");
+                b.getInstallStep().dependOn(&b.addInstallFile(placeholder, path).step);
+            }
+        } else {
+            const libghostty_shared = try buildpkg.GhosttyLib.initShared(b, &deps);
+            const libghostty_static = try buildpkg.GhosttyLib.initStatic(b, &deps);
            libghostty_shared.installHeader(); // Only need one header
            libghostty_shared.install("libghostty.so");
            libghostty_static.install("libghostty.a");
        }
    }

-    // macOS only artifacts. These will error if they're initialized for
-    // other targets.
-    if (config.target.result.os.tag.isDarwin()) {
-        // Ghostty xcframework
-        const xcframework = try buildpkg.GhosttyXCFramework.init(
-            b,
-            &deps,
-            config.xcframework_target,
-        );
-        if (config.emit_xcframework) {
-            xcframework.install();
-
-            // The xcframework build always installs resources because our
-            // macOS xcode project contains references to them.
-            resources.install();
-            if (i18n) |v| v.install();
-        }
-
-        // Ghostty macOS app
-        const macos_app = try buildpkg.GhosttyXcodebuild.init(
-            b,
-            &config,
-            .{
-                .xcframework = &xcframework,
-                .docs = &docs,
-                .i18n = if (i18n) |v| &v else null,
-                .resources = &resources,
-            },
-        );
-        if (config.emit_macos_app) {
-            macos_app.install();
-        }
-    }
-
-    // Run step
-    run: {
-        if (config.app_runtime != .none) {
-            const run_cmd = b.addRunArtifact(exe.exe);
-            if (b.args) |args| run_cmd.addArgs(args);
-
-            // Set the proper resources dir so things like shell integration
-            // work correctly. If we're running `zig build run` in Ghostty,
-            // this also ensures it overwrites the release one with our debug
-            // build.
-            run_cmd.setEnvironmentVariable(
-                "GHOSTTY_RESOURCES_DIR",
-                b.getInstallPath(.prefix, "share/ghostty"),
-            );
-
-            run_step.dependOn(&run_cmd.step);
-            break :run;
-        }
-
-        assert(config.app_runtime == .none);
-
-        // On macOS we can run the macOS app. For "run" we always force
-        // a native-only build so that we can run as quickly as possible.
-        if (config.target.result.os.tag.isDarwin()) {
-            const xcframework_native = try buildpkg.GhosttyXCFramework.init(
-                b,
-                &deps,
-                .native,
-            );
-            const macos_app_native_only = try buildpkg.GhosttyXcodebuild.init(
-                b,
-                &config,
-                .{
-                    .xcframework = &xcframework_native,
-                    .docs = &docs,
-                    .i18n = if (i18n) |v| &v else null,
-                    .resources = &resources,
-                },
-            );
-
-            // Run uses the native macOS app
-            run_step.dependOn(&macos_app_native_only.open.step);
-
-            // If we have no test filters, install the tests too
-            if (test_filters.len == 0) {
-                macos_app_native_only.addTestStepDependencies(test_step);
-            }
-        }
-    }
-
-    // Valgrind
-    if (config.app_runtime != .none) {
-        // We need to rebuild Ghostty with a baseline CPU target.
-        const valgrind_exe = exe: {
-            var valgrind_config = config;
-            valgrind_config.target = valgrind_config.baselineTarget();
-            break :exe try buildpkg.GhosttyExe.init(
-                b,
-                &valgrind_config,
-                &deps,
-            );
-        };
-
-        const run_cmd = b.addSystemCommand(&.{
-            "valgrind",
-            "--leak-check=full",
-            "--num-callers=50",
-            b.fmt("--suppressions={s}", .{b.pathFromRoot("valgrind.supp")}),
-            "--gen-suppressions=all",
-        });
-        run_cmd.addArtifactArg(valgrind_exe.exe);
-        if (b.args) |args| run_cmd.addArgs(args);
-        run_valgrind_step.dependOn(&run_cmd.step);
-    }
-
-    // Zig module tests
+    // Run runs the Ghostty exe
    {
-        const mod_vt_test = b.addTest(.{
-            .root_module = mod.vt,
-            .filters = test_filters,
-        });
-        const mod_vt_test_run = b.addRunArtifact(mod_vt_test);
-        test_lib_vt_step.dependOn(&mod_vt_test_run.step);
+        const run_cmd = b.addRunArtifact(exe.exe);
+        if (b.args) |args| run_cmd.addArgs(args);

-        const mod_vt_c_test = b.addTest(.{
-            .root_module = mod.vt_c,
-            .filters = test_filters,
-        });
-        const mod_vt_c_test_run = b.addRunArtifact(mod_vt_c_test);
-        test_lib_vt_step.dependOn(&mod_vt_c_test_run.step);
+        // Set the proper resources dir so things like shell integration
+        // work correctly. If we're running `zig build run` in Ghostty,
+        // this also ensures it overwrites the release one with our debug
+        // build.
+        run_cmd.setEnvironmentVariable(
+            "GHOSTTY_RESOURCES_DIR",
+            b.getInstallPath(.prefix, "share/ghostty"),
+        );
+
+        const run_step = b.step("run", "Run the app");
+        run_step.dependOn(&run_cmd.step);
    }

    // Tests
    {
-        // Full unit tests
+        const test_step = b.step("test", "Run all tests");
+        const test_filter = b.option([]const u8, "test-filter", "Filter for test");
+
        const test_exe = b.addTest(.{
            .name = "ghostty-test",
-            .filters = test_filters,
-            .root_module = b.createModule(.{
-                .root_source_file = b.path("src/main.zig"),
-                .target = config.baselineTarget(),
-                .optimize = .Debug,
-                .strip = false,
-                .omit_frame_pointer = false,
-                .unwind_tables = .sync,
-            }),
+            .root_source_file = b.path("src/main.zig"),
+            .target = config.target,
+            .filter = test_filter,
        });
-        if (config.emit_test_exe) b.installArtifact(test_exe);
-        _ = try deps.add(test_exe);

-        // Normal test running
-        const test_run = b.addRunArtifact(test_exe);
-        test_step.dependOn(&test_run.step);
-
-        // Normal tests always test our libghostty modules
-        test_step.dependOn(test_lib_vt_step);
-
-        // Valgrind test running
-        const valgrind_run = b.addSystemCommand(&.{
-            "valgrind",
-            "--leak-check=full",
-            "--num-callers=50",
-            b.fmt("--suppressions={s}", .{b.pathFromRoot("valgrind.supp")}),
-            "--gen-suppressions=all",
-        });
-        valgrind_run.addArtifactArg(test_exe);
-        test_valgrind_step.dependOn(&valgrind_run.step);
+        {
+            if (config.emit_test_exe) b.installArtifact(test_exe);
+            _ = try deps.add(test_exe);
+            const test_run = b.addRunArtifact(test_exe);
+            test_step.dependOn(&test_run.step);
+        }
    }

    // update-translations does what it sounds like and updates the "pot"
    // files. These should be committed to the repo.
-    if (i18n) |v| {
-        translations_step.dependOn(v.update_step);
-    } else {
-        try translations_step.addError("cannot update translations when i18n is disabled", .{});
+    {
+        const step = b.step("update-translations", "Update translation files");
+        step.dependOn(i18n.update_step);
    }
 }
-
-// WARNING: Remove this when https://github.com/ghostty-org/ghostty/issues/8924 is resolved!
-// Limit ourselves to 32 cpus on Linux because of an upstream Zig bug.
-fn limitCoresForZigBug() !void {
-    if (comptime builtin.os.tag != .linux) return;
-    const pid = std.os.linux.getpid();
-    var set: std.bit_set.ArrayBitSet(usize, std.os.linux.CPU_SETSIZE * 8) = .initEmpty();
-    for (0..32) |cpu| set.set(cpu);
-    try std.os.linux.sched_setaffinity(pid, &set.masks);
-}
--- a/build.zig.zon
+++ b/build.zig.zon
@@ -1,64 +1,62 @@
 .{
    .name = .ghostty,
-    .version = "1.2.1",
+    .version = "1.1.3",
    .paths = .{""},
    .fingerprint = 0x64407a2a0b4147e5,
-    .minimum_zig_version = "0.14.1",
    .dependencies = .{
        // Zig libs

        .libxev = .{
            // mitchellh/libxev
-            .url = "https://github.com/mitchellh/libxev/archive/34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz",
-            .hash = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs",
+            .url = "https://github.com/mitchellh/libxev/archive/3df9337a9e84450a58a2c4af434ec1a036f7b494.tar.gz",
+            .hash = "libxev-0.0.0-86vtc-ziEgDbLP0vihUn1MhsxNKY4GJEga6BEr7oyHpz",
            .lazy = true,
        },
        .vaxis = .{
            // rockorager/libvaxis
-            .url = "https://github.com/rockorager/libvaxis/archive/6eb16bb4190dc074dafaf4f0ce7dadd50e81192a.tar.gz",
-            .hash = "vaxis-0.5.1-BWNV_BMgCQDXdZzABeY4F_xwgE7nHFtYEP07KgEwJWo8",
+            .url = "git+https://github.com/rockorager/libvaxis#4182b7fa42f27cf14a71dbdb54cfd82c5c6e3447",
+            .hash = "vaxis-0.1.0-BWNV_MHyCAA0rNbPTr50Z44PyEdNP9zQSnHcXBXoo3Ti",
            .lazy = true,
        },
        .z2d = .{
            // vancluever/z2d
-            .url = "https://github.com/vancluever/z2d/archive/a1237f6881d99b75abd8a20a934e62e34b44a005.tar.gz",
-            .hash = "z2d-0.8.2-pre-j5P_HlVRFgCsBTQ3EgUoKbYHx5JMnyH1mHsOSPiafnef",
+            .url = "https://github.com/vancluever/z2d/archive/1e89605a624940c310c7a1d81b46a7c5c05919e3.tar.gz",
+            .hash = "z2d-0.6.0-j5P_HvLdCABu-dXpCeRM7Uk4m16vULg1980lMNCQj4_C",
            .lazy = true,
        },
        .zig_objc = .{
            // mitchellh/zig-objc
-            .url = "https://github.com/mitchellh/zig-objc/archive/f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz",
-            .hash = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK",
+            .url = "https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz",
+            .hash = "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt",
            .lazy = true,
        },
        .zig_js = .{
            // mitchellh/zig-js
-            .url = "https://github.com/mitchellh/zig-js/archive/04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz",
-            .hash = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi",
+            .url = "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz",
+            .hash = "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ",
            .lazy = true,
        },
-        .uucode = .{
-            // TODO: currently the use-llvm branch because its broken on self-hosted
-            .url = "https://github.com/jacobsandlund/uucode/archive/f81f8ef8518b8ec5a7fca30ec5fdbc76cc6197df.tar.gz",
-            .hash = "uucode-0.1.0-ZZjBPjQHQADuCy1VMWftjrMl3iWqgMpUugWVQJG6_7xT",
+        .ziglyph = .{
+            .url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz",
+            .hash = "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf",
+            .lazy = true,
        },
        .zig_wayland = .{
            // codeberg ifreund/zig-wayland
-            .url = "https://codeberg.org/ifreund/zig-wayland/archive/1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz",
-            .hash = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe",
-            .lazy = true,
+            .url = "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz",
+            .hash = "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy",
        },
        .zf = .{
            // natecraddock/zf
-            .url = "https://github.com/jcollie/zf/archive/52ad2e5528ab754f77437edf08a07b5ec843661c.tar.gz",
-            .hash = "zf-0.10.3-OIRy8QGJAACJcu3tCGtfbJnnd3Y4QL7OW_X8PJ8u_ASR",
+            .url = "https://github.com/natecraddock/zf/archive/1039cf75447a8d5b8d481fedb914fe848d246276.tar.gz",
+            .hash = "zf-0.10.3-OIRy8bKIAADhjqtdjVaDfONRuI7RVl5gMbhCoOwiBWV5",
            .lazy = true,
        },
        .gobject = .{
            // https://github.com/jcollie/ghostty-gobject based on zig_gobject
            // Temporary until we generate them at build time automatically.
-            .url = "https://github.com/ghostty-org/zig-gobject/releases/download/2025-09-20-20-1/ghostty-gobject-2025-09-20-20-1.tar.zst",
-            .hash = "gobject-0.3.0-Skun7ET3nQCqJhDL0KnF_X7M4L7o7JePsJBbrYpEr7UV",
+            .url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-18-21-1/ghostty-gobject-0.14.0-2025-03-18-21-1.tar.zst",
+            .hash = "gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR",
            .lazy = true,
        },

@@ -66,6 +64,7 @@
        .cimgui = .{ .path = "./pkg/cimgui", .lazy = true },
        .fontconfig = .{ .path = "./pkg/fontconfig", .lazy = true },
        .freetype = .{ .path = "./pkg/freetype", .lazy = true },
+        .glfw = .{ .path = "./pkg/glfw", .lazy = true },
        .gtk4_layer_shell = .{ .path = "./pkg/gtk4-layer-shell", .lazy = true },
        .harfbuzz = .{ .path = "./pkg/harfbuzz", .lazy = true },
        .highway = .{ .path = "./pkg/highway", .lazy = true },
@@ -101,23 +100,11 @@
            .lazy = true,
        },

-        // Fonts
-        .jetbrains_mono = .{
-            .url = "https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz",
-            .hash = "N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x",
-            .lazy = true,
-        },
-        .nerd_fonts_symbols_only = .{
-            .url = "https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz",
-            .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO26s",
-            .lazy = true,
-        },
-
        // Other
        .apple_sdk = .{ .path = "./pkg/apple-sdk" },
        .iterm2_themes = .{
-            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20250922-150534-d28055b/ghostty-themes.tgz",
-            .hash = "N-V-__8AACEnAwCkyrJ_XqdomYlR8bpuh0l8WDidEz-BAzIv",
+            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/8650079de477e80a5983646e3e4d24cda1dbaefa.tar.gz",
+            .hash = "N-V-__8AADk6LwSAbK3OMyGiadf6aeyztHNV4-zKaLy6IZa6",
            .lazy = true,
        },
    },
--- a/build.zig.zon.json
+++ b/build.zig.zon.json
@@ -19,15 +19,20 @@
    "url": "https://deps.files.ghostty.org/gettext-0.24.tar.gz",
    "hash": "sha256-yRhQPVk9cNr0hE0XWhPYFq+stmfAb7oeydzVACwVGLc="
  },
+  "N-V-__8AAMrJSwAUGb9-vTzkNR-5LXS81MR__ZRVfF3tWgG6": {
+    "name": "glfw",
+    "url": "https://github.com/glfw/glfw/archive/e7ea71be039836da3a98cea55ae5569cb5eb885c.tar.gz",
+    "hash": "sha256-M3N1XUAlMebBo5X1Py+9YxjKXgZ6eacqWRCbUmwLKQo="
+  },
  "N-V-__8AABzkUgISeKGgXAzgtutgJsZc0-kkeqBBscJgMkvy": {
    "name": "glslang",
    "url": "https://deps.files.ghostty.org/glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz",
    "hash": "sha256-FKLtu1Ccs+UamlPj9eQ12/WXFgS0uDPmPmB26MCpl7U="
  },
-  "gobject-0.3.0-Skun7ET3nQCqJhDL0KnF_X7M4L7o7JePsJBbrYpEr7UV": {
+  "gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR": {
    "name": "gobject",
-    "url": "https://github.com/ghostty-org/zig-gobject/releases/download/2025-09-20-20-1/ghostty-gobject-2025-09-20-20-1.tar.zst",
-    "hash": "sha256-SXiqGm81aUn6yq1wFXgNTAULdKOHS/Rzkp5OgNkkcXo="
+    "url": "https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-18-21-1/ghostty-gobject-0.14.0-2025-03-18-21-1.tar.zst",
+    "hash": "sha256-hWcpl0Wd3XydT+RY7+VIoxXPhCzele1Ip76YSh+KmLI="
  },
  "N-V-__8AALiNBAA-_0gprYr92CjrMj1I5bqNu0TSJOnjFNSr": {
    "name": "gtk4_layer_shell",
@@ -49,36 +54,26 @@
    "url": "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz",
    "hash": "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA="
  },
-  "N-V-__8AACEnAwCkyrJ_XqdomYlR8bpuh0l8WDidEz-BAzIv": {
+  "N-V-__8AADk6LwSAbK3OMyGiadf6aeyztHNV4-zKaLy6IZa6": {
    "name": "iterm2_themes",
-    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20250922-150534-d28055b/ghostty-themes.tgz",
-    "hash": "sha256-mdhUxAAqKxRRXwED2laabUo9ZZqZa/MZAsO0+Y9L7uQ="
-  },
-  "N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x": {
-    "name": "jetbrains_mono",
-    "url": "https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz",
-    "hash": "sha256-xXppHouCrQmLWWPzlZAy5AOPORCHr3cViFulkEYQXMQ="
+    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/8650079de477e80a5983646e3e4d24cda1dbaefa.tar.gz",
+    "hash": "sha256-nOkH31MQQd2PPdjVpRxBxNQWfR9Exg6nRF/KHgSz3cM="
  },
  "N-V-__8AAJrvXQCqAT8Mg9o_tk6m0yf5Fz-gCNEOKLyTSerD": {
    "name": "libpng",
    "url": "https://deps.files.ghostty.org/libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz",
    "hash": "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo="
  },
-  "libxev-0.0.0-86vtc2UaEwDfiTKX3iBI-s_hdzfzWQUarT3MUrmUQl-Q": {
+  "libxev-0.0.0-86vtc-ziEgDbLP0vihUn1MhsxNKY4GJEga6BEr7oyHpz": {
    "name": "libxev",
-    "url": "https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz",
-    "hash": "sha256-KaozYKEhhT/6sInef7/8O/60LDBJN+8QmdLuNY1Gkmc="
+    "url": "https://github.com/mitchellh/libxev/archive/3df9337a9e84450a58a2c4af434ec1a036f7b494.tar.gz",
+    "hash": "sha256-oKZqA9d79jHnp/HsqJWQE33Ffn5Ee5G4VnlQepQuY4o="
  },
  "N-V-__8AAG3RoQEyRC2Vw7Qoro5SYBf62IHn3HjqtNVY6aWK": {
    "name": "libxml2",
    "url": "https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz",
    "hash": "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU="
  },
-  "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO26s": {
-    "name": "nerd_fonts_symbols_only",
-    "url": "https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz",
-    "hash": "sha256-EWTRuVbUveJI17LwmYxDzJT1ICQxoVZKeTiVsec7DQQ="
-  },
  "N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c": {
    "name": "oniguruma",
    "url": "https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz",
@@ -109,15 +104,10 @@
    "url": "https://deps.files.ghostty.org/utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz",
    "hash": "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8="
  },
-  "uucode-0.1.0-ZZjBPpAFQABNCvd9cVPBg4I7233Ays-NWfWphPNqGbyE": {
-    "name": "uucode",
-    "url": "https://github.com/jacobsandlund/uucode/archive/190706c6b56f0842d29778007f74f7d3d1335fc5.tar.gz",
-    "hash": "sha256-iq9Oyns5e5Tnz2BKPPPTuyJ03BN4bK0dsmSPE1s0wig="
-  },
-  "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn": {
+  "vaxis-0.1.0-BWNV_MHyCAA0rNbPTr50Z44PyEdNP9zQSnHcXBXoo3Ti": {
    "name": "vaxis",
-    "url": "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23",
-    "hash": "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY="
+    "url": "git+https://github.com/rockorager/libvaxis#4182b7fa42f27cf14a71dbdb54cfd82c5c6e3447",
+    "hash": "sha256-iONEySjPeD0WYJ93fw5mxT+0pVfUO/m6008J/LXjQkA="
  },
  "N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t": {
    "name": "wayland",
@@ -134,15 +124,15 @@
    "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz",
    "hash": "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM="
  },
-  "z2d-0.8.1-j5P_Hq8vDwB8ZaDA54-SzESDLF2zznG_zvTHiQNJImZP": {
+  "z2d-0.6.0-j5P_HvLdCABu-dXpCeRM7Uk4m16vULg1980lMNCQj4_C": {
    "name": "z2d",
-    "url": "https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz",
-    "hash": "sha256-0DbDKSYA1ejhVx/WbOkwTgD57PNRFcnRviqBh8xpPZ0="
+    "url": "https://github.com/vancluever/z2d/archive/1e89605a624940c310c7a1d81b46a7c5c05919e3.tar.gz",
+    "hash": "sha256-PEKVSUZ6teRbDyhFPWSiuBSe40pgr0kVRivIY8Cn8HQ="
  },
-  "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9": {
+  "zf-0.10.3-OIRy8bKIAADhjqtdjVaDfONRuI7RVl5gMbhCoOwiBWV5": {
    "name": "zf",
-    "url": "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz",
-    "hash": "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I="
+    "url": "https://github.com/natecraddock/zf/archive/1039cf75447a8d5b8d481fedb914fe848d246276.tar.gz",
+    "hash": "sha256-xVva07TAYlVv4E4PKe2wUj86a6Ky2YC30YBgtbvNKvw="
  },
  "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM": {
    "name": "zg",
@@ -154,20 +144,25 @@
    "url": "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz",
    "hash": "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0="
  },
-  "zig_objc-0.0.0-Ir_SpwsPAQBJgi9YRm2ubJMfdoysSq5gKpsIj3izQ8Zk": {
+  "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt": {
    "name": "zig_objc",
-    "url": "https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz",
-    "hash": "sha256-o3vl7qfkSi0bKXa6JWuF92qMEGP8Af/shcip5nRo5Nw="
+    "url": "https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz",
+    "hash": "sha256-zn1tR6xhSmDla4UJ3t+Gni4Ni3R8deSK3tEe7DGzNXw="
  },
  "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy": {
    "name": "zig_wayland",
    "url": "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz",
    "hash": "sha256-E77GZ15APYbbO1WzmuJi8eG9/iQFbc2CgkNBxjCLUhk="
  },
-  "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj": {
+  "zigimg-0.1.0-lly-O4heEADSRxoTwJwrD3TBfUob9052sIgb9SL8Iz-A": {
    "name": "zigimg",
-    "url": "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d",
-    "hash": "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0="
+    "url": "git+https://github.com/TUSF/zigimg#0ce4eca3560d5553b13263d6b6bb72e146dd43d0",
+    "hash": "sha256-Rr+mAfbLOoaxHOwCug+0cWCmW9gDhjhnaO2J/Oik9HI="
+  },
+  "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf": {
+    "name": "ziglyph",
+    "url": "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz",
+    "hash": "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k="
  },
  "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o": {
    "name": "zlib",
--- a/build.zig.zon.nix
+++ b/build.zig.zon.nix
@@ -49,7 +49,6 @@
      inherit name rev hash;
      url = url_without_query;
      deepClone = false;
-      fetchSubmodules = false;
    };

  fetchZigArtifact = {
@@ -114,6 +113,14 @@ in
        hash = "sha256-yRhQPVk9cNr0hE0XWhPYFq+stmfAb7oeydzVACwVGLc=";
      };
    }
+    {
+      name = "N-V-__8AAMrJSwAUGb9-vTzkNR-5LXS81MR__ZRVfF3tWgG6";
+      path = fetchZigArtifact {
+        name = "glfw";
+        url = "https://github.com/glfw/glfw/archive/e7ea71be039836da3a98cea55ae5569cb5eb885c.tar.gz";
+        hash = "sha256-M3N1XUAlMebBo5X1Py+9YxjKXgZ6eacqWRCbUmwLKQo=";
+      };
+    }
    {
      name = "N-V-__8AABzkUgISeKGgXAzgtutgJsZc0-kkeqBBscJgMkvy";
      path = fetchZigArtifact {
@@ -123,11 +130,11 @@ in
      };
    }
    {
-      name = "gobject-0.3.0-Skun7ET3nQCqJhDL0KnF_X7M4L7o7JePsJBbrYpEr7UV";
+      name = "gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR";
      path = fetchZigArtifact {
        name = "gobject";
-        url = "https://github.com/ghostty-org/zig-gobject/releases/download/2025-09-20-20-1/ghostty-gobject-2025-09-20-20-1.tar.zst";
-        hash = "sha256-SXiqGm81aUn6yq1wFXgNTAULdKOHS/Rzkp5OgNkkcXo=";
+        url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-18-21-1/ghostty-gobject-0.14.0-2025-03-18-21-1.tar.zst";
+        hash = "sha256-hWcpl0Wd3XydT+RY7+VIoxXPhCzele1Ip76YSh+KmLI=";
      };
    }
    {
@@ -163,19 +170,11 @@ in
      };
    }
    {
-      name = "N-V-__8AACEnAwCkyrJ_XqdomYlR8bpuh0l8WDidEz-BAzIv";
+      name = "N-V-__8AADk6LwSAbK3OMyGiadf6aeyztHNV4-zKaLy6IZa6";
      path = fetchZigArtifact {
        name = "iterm2_themes";
-        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20250922-150534-d28055b/ghostty-themes.tgz";
-        hash = "sha256-mdhUxAAqKxRRXwED2laabUo9ZZqZa/MZAsO0+Y9L7uQ=";
-      };
-    }
-    {
-      name = "N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x";
-      path = fetchZigArtifact {
-        name = "jetbrains_mono";
-        url = "https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz";
-        hash = "sha256-xXppHouCrQmLWWPzlZAy5AOPORCHr3cViFulkEYQXMQ=";
+        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/8650079de477e80a5983646e3e4d24cda1dbaefa.tar.gz";
+        hash = "sha256-nOkH31MQQd2PPdjVpRxBxNQWfR9Exg6nRF/KHgSz3cM=";
      };
    }
    {
@@ -187,11 +186,11 @@ in
      };
    }
    {
-      name = "libxev-0.0.0-86vtc2UaEwDfiTKX3iBI-s_hdzfzWQUarT3MUrmUQl-Q";
+      name = "libxev-0.0.0-86vtc-ziEgDbLP0vihUn1MhsxNKY4GJEga6BEr7oyHpz";
      path = fetchZigArtifact {
        name = "libxev";
-        url = "https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz";
-        hash = "sha256-KaozYKEhhT/6sInef7/8O/60LDBJN+8QmdLuNY1Gkmc=";
+        url = "https://github.com/mitchellh/libxev/archive/3df9337a9e84450a58a2c4af434ec1a036f7b494.tar.gz";
+        hash = "sha256-oKZqA9d79jHnp/HsqJWQE33Ffn5Ee5G4VnlQepQuY4o=";
      };
    }
    {
@@ -202,14 +201,6 @@ in
        hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
      };
    }
-    {
-      name = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO26s";
-      path = fetchZigArtifact {
-        name = "nerd_fonts_symbols_only";
-        url = "https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz";
-        hash = "sha256-EWTRuVbUveJI17LwmYxDzJT1ICQxoVZKeTiVsec7DQQ=";
-      };
-    }
    {
      name = "N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c";
      path = fetchZigArtifact {
@@ -259,19 +250,11 @@ in
      };
    }
    {
-      name = "uucode-0.1.0-ZZjBPpAFQABNCvd9cVPBg4I7233Ays-NWfWphPNqGbyE";
-      path = fetchZigArtifact {
-        name = "uucode";
-        url = "https://github.com/jacobsandlund/uucode/archive/190706c6b56f0842d29778007f74f7d3d1335fc5.tar.gz";
-        hash = "sha256-iq9Oyns5e5Tnz2BKPPPTuyJ03BN4bK0dsmSPE1s0wig=";
-      };
-    }
-    {
-      name = "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn";
+      name = "vaxis-0.1.0-BWNV_MHyCAA0rNbPTr50Z44PyEdNP9zQSnHcXBXoo3Ti";
      path = fetchZigArtifact {
        name = "vaxis";
-        url = "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23";
-        hash = "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY=";
+        url = "git+https://github.com/rockorager/libvaxis#4182b7fa42f27cf14a71dbdb54cfd82c5c6e3447";
+        hash = "sha256-iONEySjPeD0WYJ93fw5mxT+0pVfUO/m6008J/LXjQkA=";
      };
    }
    {
@@ -299,19 +282,19 @@ in
      };
    }
    {
-      name = "z2d-0.8.1-j5P_Hq8vDwB8ZaDA54-SzESDLF2zznG_zvTHiQNJImZP";
+      name = "z2d-0.6.0-j5P_HvLdCABu-dXpCeRM7Uk4m16vULg1980lMNCQj4_C";
      path = fetchZigArtifact {
        name = "z2d";
-        url = "https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz";
-        hash = "sha256-0DbDKSYA1ejhVx/WbOkwTgD57PNRFcnRviqBh8xpPZ0=";
+        url = "https://github.com/vancluever/z2d/archive/1e89605a624940c310c7a1d81b46a7c5c05919e3.tar.gz";
+        hash = "sha256-PEKVSUZ6teRbDyhFPWSiuBSe40pgr0kVRivIY8Cn8HQ=";
      };
    }
    {
-      name = "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9";
+      name = "zf-0.10.3-OIRy8bKIAADhjqtdjVaDfONRuI7RVl5gMbhCoOwiBWV5";
      path = fetchZigArtifact {
        name = "zf";
-        url = "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz";
-        hash = "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I=";
+        url = "https://github.com/natecraddock/zf/archive/1039cf75447a8d5b8d481fedb914fe848d246276.tar.gz";
+        hash = "sha256-xVva07TAYlVv4E4PKe2wUj86a6Ky2YC30YBgtbvNKvw=";
      };
    }
    {
@@ -331,11 +314,11 @@ in
      };
    }
    {
-      name = "zig_objc-0.0.0-Ir_SpwsPAQBJgi9YRm2ubJMfdoysSq5gKpsIj3izQ8Zk";
+      name = "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt";
      path = fetchZigArtifact {
        name = "zig_objc";
-        url = "https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz";
-        hash = "sha256-o3vl7qfkSi0bKXa6JWuF92qMEGP8Af/shcip5nRo5Nw=";
+        url = "https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz";
+        hash = "sha256-zn1tR6xhSmDla4UJ3t+Gni4Ni3R8deSK3tEe7DGzNXw=";
      };
    }
    {
@@ -347,11 +330,19 @@ in
      };
    }
    {
-      name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";
+      name = "zigimg-0.1.0-lly-O4heEADSRxoTwJwrD3TBfUob9052sIgb9SL8Iz-A";
      path = fetchZigArtifact {
        name = "zigimg";
-        url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";
-        hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";
+        url = "git+https://github.com/TUSF/zigimg#0ce4eca3560d5553b13263d6b6bb72e146dd43d0";
+        hash = "sha256-Rr+mAfbLOoaxHOwCug+0cWCmW9gDhjhnaO2J/Oik9HI=";
+      };
+    }
+    {
+      name = "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf";
+      path = fetchZigArtifact {
+        name = "ziglyph";
+        url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
+        hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";
      };
    }
    {
--- a/build.zig.zon.txt
+++ b/build.zig.zon.txt
@@ -1,9 +1,7 @@
 git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc
-git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d
-git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23
+git+https://github.com/TUSF/zigimg#0ce4eca3560d5553b13263d6b6bb72e146dd43d0
+git+https://github.com/rockorager/libvaxis#4182b7fa42f27cf14a71dbdb54cfd82c5c6e3447
 https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz
-https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz
-https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz
 https://deps.files.ghostty.org/breakpad-b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz
 https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz
 https://deps.files.ghostty.org/freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz
@@ -25,11 +23,12 @@ https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.
 https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz
 https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz
 https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz
+https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz
 https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz
-https://github.com/ghostty-org/zig-gobject/releases/download/2025-09-20-20-1/ghostty-gobject-2025-09-20-20-1.tar.zst
-https://github.com/jacobsandlund/uucode/archive/190706c6b56f0842d29778007f74f7d3d1335fc5.tar.gz
-https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20250922-150534-d28055b/ghostty-themes.tgz
-https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz
-https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz
-https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz
-https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz
+https://github.com/glfw/glfw/archive/e7ea71be039836da3a98cea55ae5569cb5eb885c.tar.gz
+https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-18-21-1/ghostty-gobject-0.14.0-2025-03-18-21-1.tar.zst
+https://github.com/mbadolato/iTerm2-Color-Schemes/archive/8650079de477e80a5983646e3e4d24cda1dbaefa.tar.gz
+https://github.com/mitchellh/libxev/archive/3df9337a9e84450a58a2c4af434ec1a036f7b494.tar.gz
+https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz
+https://github.com/natecraddock/zf/archive/1039cf75447a8d5b8d481fedb914fe848d246276.tar.gz
+https://github.com/vancluever/z2d/archive/1e89605a624940c310c7a1d81b46a7c5c05919e3.tar.gz
--- a/com.mitchellh.ghostty.yml
+++ b/com.mitchellh.ghostty.yml
@@ -0,0 +1,59 @@
+# Note: the flatpak build is likely broken right now and is not actively
+# maintained. We may completely remove this file in the future. For now,
+# we want to keep _trying_ but its something with known issues.
+app-id: com.mitchellh.ghostty
+runtime: org.gnome.Platform
+runtime-version: "43"
+sdk: org.gnome.Sdk
+default-branch: tip
+command: ghostty
+build-options:
+  append-path: /app/tmp/zig
+  strip: false
+  no-debuginfo: true
+# Note: we have to use cleanup-commands because flatpak-builder doesn't
+# run "cleanup" on its own: https://github.com/flatpak/flatpak-builder/issues/14
+cleanup-commands:
+  - "rm -rf /app/tmp"
+finish-args:
+  # 3D rendering
+  - --device=dri
+  # Windowing
+  - --share=ipc
+  - --socket=x11
+  - --socket=wayland
+  # Files (we are a terminal so we need all of them)
+  - --filesystem=host
+  # So we can escape the sandbox
+  - --talk-name=org.freedesktop.Flatpak
+modules:
+  # Note: this should be kept in sync with our flake.nix. Over time this
+  # should stabilize to being a release version and not a nightly.
+  - name: zig
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/tmp/zig
+      - cp -r ./* /app/tmp/zig
+    sources:
+      - type: archive
+        url: https://ziglang.org/builds/zig-linux-x86_64-0.12.0-dev.141+ddf5859c2.tar.xz
+        sha256: eaf519b1ec3cb0f3c9bcbc47ead5f50610f9c106279a35b9feb09bed8afc628b
+        only-arches:
+          - x86_64
+      - type: archive
+        url: https://ziglang.org/builds/zig-linux-aarch64-0.12.0-dev.141+ddf5859c2.tar.xz
+        sha256: 4f918ae185a5dc281b5d30be92cd4c36ebd77b8665729c5e2c47a8eeccd243e8
+        only-arches:
+          - aarch64
+
+  - name: ghostty
+    buildsystem: simple
+    build-commands:
+      - MACH_SDK_PATH="$(pwd)/vendor/mach-sdk" zig build -Doptimize=ReleaseSafe -Dcpu=baseline -Dflatpak=true -Dapp-runtime=gtk --prefix /app
+    sources:
+      - type: dir
+        path: .
+        skip:
+          - .flatpak-builder
+          - zig-cache
+          - zig-out
--- a/dist/linux/app.desktop.in
+++ b/dist/linux/app.desktop.in
@@ -1,15 +1,13 @@
 [Desktop Entry]
-Version=1.0
-Name=@NAME@
+Name=Ghostty
 Type=Application
 Comment=A terminal emulator
-TryExec=@GHOSTTY@
-Exec=@GHOSTTY@ --gtk-single-instance=true
+Exec=ghostty
 Icon=com.mitchellh.ghostty
 Categories=System;TerminalEmulator;
 Keywords=terminal;tty;pty;
 StartupNotify=true
-StartupWMClass=@APPID@
+StartupWMClass=com.mitchellh.ghostty
 Terminal=false
 Actions=new-window;
 X-GNOME-UsesNotifications=true
@@ -18,9 +16,7 @@ X-TerminalArgTitle=--title=
 X-TerminalArgAppId=--class=
 X-TerminalArgDir=--working-directory=
 X-TerminalArgHold=--wait-after-command
-DBusActivatable=true
-X-KDE-Shortcuts=Ctrl+Alt+T

 [Desktop Action new-window]
 Name=New Window
-Exec=@GHOSTTY@ --gtk-single-instance=true
+Exec=ghostty
--- a/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
+++ b/dist/linux/com.mitchellh.ghostty.metainfo.xml.in
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>@APPID@</id>
-  <launchable type="desktop-id">@APPID@.desktop</launchable>
-  <name>@NAME@</name>
-  <url type="homepage">https://ghostty.org</url>
-  <url type="help">https://ghostty.org/docs</url>
-  <url type="bugtracker">https://github.com/ghostty-org/ghostty/discussions</url>
-  <url type="contact">https://ghostty.org/docs/help</url>
-  <url type="contribute">https://github.com/ghostty-org/ghostty/blob/main/CONTRIBUTING.md</url>
-  <url type="translate">https://github.com/ghostty-org/ghostty/blob/main/po/README_TRANSLATORS.md</url>
-  <url type="vcs-browser">https://github.com/ghostty-org/ghostty</url>
-  <summary>Ghostty is a fast, feature-rich, and cross-platform terminal emulator</summary>
-  <metadata_license>MIT</metadata_license>
-  <project_license>MIT</project_license>
-  <content_rating type="oars-1.1" />
-  <developer id="com.mitchellh">
-    <name>Mitchell Hashimoto</name>
-  </developer>
-  <update_contact>m@mitchellh.com</update_contact>
-  <description>
-    <p>
-      Ghostty is a terminal emulator that differentiates itself by being fast,
-      feature-rich, and native. While there are many excellent terminal
-      emulators available, they all force you to choose between speed,
-      features, or native UIs. Ghostty provides all three.
-    </p>
-  </description>
-  <recommends>
-    <control>keyboard</control>
-    <control>pointing</control>
-  </recommends>
-  <requires>
-    <!--
-      Mobile/tablet AND desktop supported
-
-      Ref: https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines#display-size
-    -->
-    <display_length compare="ge">360</display_length>
-  </requires>
-  <translation type="gettext">com.mitchellh.ghostty</translation>
-
-  <!--
-    TODO: Generate manifest location data.
-
-    Ref: https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines#manifest-location
-
-  <custom>
-    <value key="flathub::manifest">https://github.com/ghostty-org/ghostty/blob/<hash>/flatpak/com.mitchellh.ghostty.yml</value>
-  </custom>
-  -->
-
-  <releases>
-    <!-- TODO: Generate this automatically -->
-    <release version="1.0.1" date="2024-12-31">
-        <url type="details">https://ghostty.org/docs/install/release-notes/1-0-1</url>
-    </release>
-  </releases>
-</component>
--- a/dist/linux/dbus.service.flatpak.in
+++ b/dist/linux/dbus.service.flatpak.in
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=@APPID@
-Exec=@GHOSTTY@ --gtk-single-instance=true --initial-window=false
--- a/dist/linux/dbus.service.in
+++ b/dist/linux/dbus.service.in
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=@APPID@
-SystemdService=app-@APPID@.service
-Exec=@GHOSTTY@ --gtk-single-instance=true --initial-window=false
--- a/dist/linux/systemd.service.in
+++ b/dist/linux/systemd.service.in
@@ -1,14 +0,0 @@
-[Unit]
-Description=@NAME@
-After=graphical-session.target
-After=dbus.socket
-Requires=dbus.socket
-
-[Service]
-Type=notify-reload
-ReloadSignal=SIGUSR2
-BusName=@APPID@
-ExecStart=@GHOSTTY@ --gtk-single-instance=true --initial-window=false
-
-[Install]
-WantedBy=graphical-session.target
--- a/dist/macos/Ghostty.icns
+++ b/dist/macos/Ghostty.icns
--- a/dist/macos/Info.plist
+++ b/dist/macos/Info.plist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleExecutable</key>
+    <string>ghostty</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.mitchellh.ghostty</string>
+    <key>CFBundleName</key>
+    <string>Ghostty</string>
+    <key>CFBundleDisplayName</key>
+    <string>Ghostty</string>
+    <key>CFBundleIconFile</key>
+    <string>Ghostty.icns</string>
+  </dict>
+</plist>
+
--- a/example/app.ts
+++ b/example/app.ts
@@ -0,0 +1,189 @@
+import { ZigJS } from "zig-js";
+
+const zjs = new ZigJS();
+const importObject = {
+  module: {},
+  env: {
+    memory: new WebAssembly.Memory({
+      initial: 25,
+      maximum: 65536,
+      shared: true,
+    }),
+    log: (ptr: number, len: number) => {
+      const arr = new Uint8ClampedArray(zjs.memory.buffer, ptr, len);
+      const data = arr.slice();
+      const str = new TextDecoder("utf-8").decode(data);
+      console.log(str);
+    },
+  },
+
+  ...zjs.importObject(),
+};
+
+const url = new URL("ghostty-wasm.wasm", import.meta.url);
+fetch(url.href)
+  .then((response) => response.arrayBuffer())
+  .then((bytes) => WebAssembly.instantiate(bytes, importObject))
+  .then((results) => {
+    const memory = importObject.env.memory;
+    const {
+      malloc,
+      free,
+      config_new,
+      config_free,
+      config_load_string,
+      config_finalize,
+      face_new,
+      face_free,
+      face_render_glyph,
+      face_debug_canvas,
+      deferred_face_new,
+      deferred_face_free,
+      deferred_face_load,
+      deferred_face_face,
+      group_new,
+      group_free,
+      group_add_face,
+      group_init_sprite_face,
+      group_index_for_codepoint,
+      group_render_glyph,
+      group_cache_new,
+      group_cache_free,
+      group_cache_index_for_codepoint,
+      group_cache_render_glyph,
+      group_cache_atlas_grayscale,
+      group_cache_atlas_color,
+      atlas_new,
+      atlas_free,
+      atlas_debug_canvas,
+      shaper_new,
+      shaper_free,
+      shaper_test,
+    } = results.instance.exports;
+    // Give us access to the zjs value for debugging.
+    globalThis.zjs = zjs;
+    console.log(zjs);
+
+    // Initialize our zig-js memory
+    zjs.memory = memory;
+
+    // Helpers
+    const makeStr = (str) => {
+      const utf8 = new TextEncoder().encode(str);
+      const ptr = malloc(utf8.byteLength);
+      new Uint8Array(memory.buffer, ptr).set(utf8);
+      return { ptr: ptr, len: utf8.byteLength };
+    };
+
+    // Create our config
+    const config = config_new();
+    const config_str = makeStr("font-family = monospace");
+    config_load_string(config, config_str.ptr, config_str.len);
+    config_finalize(config);
+    free(config_str.ptr);
+
+    // Create our atlas
+    // const atlas = atlas_new(512, 0 /* grayscale */);
+
+    // Create some memory for our string
+    const font_name = makeStr("monospace");
+
+    // Initialize our deferred face
+    // const df = deferred_face_new(font_ptr, font.byteLength, 0 /* text */);
+    //deferred_face_load(df, 72 /* size */);
+    //const face = deferred_face_face(df);
+
+    // Initialize our font face
+    //const face = face_new(font_ptr, font.byteLength, 72 /* size in px */);
+    //free(font_ptr);
+
+    // Create our group
+    const group = group_new(32 /* size */);
+    group_add_face(
+      group,
+      0 /* regular */,
+      deferred_face_new(font_name.ptr, font_name.len, 0 /* text */),
+    );
+    group_add_face(
+      group,
+      0 /* regular */,
+      deferred_face_new(font_name.ptr, font_name.len, 1 /* emoji */),
+    );
+
+    // Initialize our sprite font, without this we just use the browser.
+    group_init_sprite_face(group);
+
+    // Create our group cache
+    const group_cache = group_cache_new(group);
+
+    // Render a glyph
+    // for (let i = 33; i <= 126; i++) {
+    //   const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+    //   group_cache_render_glyph(group_cache, font_idx, i, 0);
+    //   //face_render_glyph(face, atlas, i);
+    // }
+    //
+    // const emoji = ["🐏","🌞","🌚","🍱","💿","🐈","📃","📀","🕡","🙃"];
+    // for (let i = 0; i < emoji.length; i++) {
+    //   const cp = emoji[i].codePointAt(0);
+    //   const font_idx = group_cache_index_for_codepoint(group_cache, cp, 0, -1 /* best choice */);
+    //   group_cache_render_glyph(group_cache, font_idx, cp, 0);
+    // }
+
+    for (let i = 0x2500; i <= 0x257f; i++) {
+      const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+      group_cache_render_glyph(group_cache, font_idx, i, 0);
+    }
+    for (let i = 0x2580; i <= 0x259f; i++) {
+      const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+      group_cache_render_glyph(group_cache, font_idx, i, 0);
+    }
+    for (let i = 0x2800; i <= 0x28ff; i++) {
+      const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+      group_cache_render_glyph(group_cache, font_idx, i, 0);
+    }
+    for (let i = 0x1fb00; i <= 0x1fb3b; i++) {
+      const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+      group_cache_render_glyph(group_cache, font_idx, i, 0);
+    }
+    for (let i = 0x1fb3c; i <= 0x1fb6b; i++) {
+      const font_idx = group_cache_index_for_codepoint(group_cache, i, 0, -1);
+      group_cache_render_glyph(group_cache, font_idx, i, 0);
+    }
+
+    //face_render_glyph(face, atlas, "橋".codePointAt(0));
+    //face_render_glyph(face, atlas, "p".codePointAt(0));
+
+    // Debug our canvas
+    //face_debug_canvas(face);
+
+    // Let's try shaping
+    const shaper = shaper_new(120);
+    //const input = makeStr("hello🐏");
+    const input = makeStr("hello🐏👍🏽");
+    shaper_test(shaper, group_cache, input.ptr, input.len);
+
+    const cp = 1114112;
+    const font_idx = group_cache_index_for_codepoint(
+      group_cache,
+      cp,
+      0,
+      -1 /* best choice */,
+    );
+    group_cache_render_glyph(group_cache, font_idx, cp, -1);
+
+    // Debug our atlas canvas
+    {
+      const atlas = group_cache_atlas_grayscale(group_cache);
+      const id = atlas_debug_canvas(atlas);
+      document.getElementById("atlas-canvas").append(zjs.deleteValue(id));
+    }
+
+    {
+      const atlas = group_cache_atlas_color(group_cache);
+      const id = atlas_debug_canvas(atlas);
+      document.getElementById("atlas-color-canvas").append(zjs.deleteValue(id));
+    }
+
+    //face_free(face);
+  });
--- a/example/c-vt/README.md
+++ b/example/c-vt/README.md
@@ -1,17 +0,0 @@
-# Example: `ghostty-vt` C Program
-
-This contains a simple example of how to use the `ghostty-vt` C library
-with a C program.
-
-This uses a `build.zig` and `Zig` to build the C program so that we
-can reuse a lot of our build logic and depend directly on our source
-tree, but Ghostty emits a standard C library that can be used with any
-C tooling.
-
-## Usage
-
-Run the program:
-
-```shell-session
-zig build run
-```
--- a/example/c-vt/build.zig
+++ b/example/c-vt/build.zig
@@ -1,42 +0,0 @@
-const std = @import("std");
-
-pub fn build(b: *std.Build) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    const run_step = b.step("run", "Run the app");
-
-    const exe_mod = b.createModule(.{
-        .target = target,
-        .optimize = optimize,
-    });
-    exe_mod.addCSourceFiles(.{
-        .root = b.path("src"),
-        .files = &.{"main.c"},
-    });
-
-    // You'll want to use a lazy dependency here so that ghostty is only
-    // downloaded if you actually need it.
-    if (b.lazyDependency("ghostty", .{
-        // Setting simd to false will force a pure static build that
-        // doesn't even require libc, but it has a significant performance
-        // penalty. If your embedding app requires libc anyway, you should
-        // always keep simd enabled.
-        // .simd = false,
-    })) |dep| {
-        exe_mod.linkLibrary(dep.artifact("ghostty-vt"));
-    }
-
-    // Exe
-    const exe = b.addExecutable(.{
-        .name = "c_vt",
-        .root_module = exe_mod,
-    });
-    b.installArtifact(exe);
-
-    // Run
-    const run_cmd = b.addRunArtifact(exe);
-    run_cmd.step.dependOn(b.getInstallStep());
-    if (b.args) |args| run_cmd.addArgs(args);
-    run_step.dependOn(&run_cmd.step);
-}
--- a/example/c-vt/build.zig.zon
+++ b/example/c-vt/build.zig.zon
@@ -1,24 +0,0 @@
-.{
-    .name = .c_vt,
-    .version = "0.0.0",
-    .fingerprint = 0x413a8529b1255f9a,
-    .minimum_zig_version = "0.14.1",
-    .dependencies = .{
-        // Ghostty dependency. In reality, you'd probably use a URL-based
-        // dependency like the one showed (and commented out) below this one.
-        // We use a path dependency here for simplicity and to ensure our
-        // examples always test against the source they're bundled with.
-        .ghostty = .{ .path = "../../" },
-
-        // Example of what a URL-based dependency looks like:
-        // .ghostty = .{
-        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
-        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
-        // },
-    },
-    .paths = .{
-        "build.zig",
-        "build.zig.zon",
-        "src",
-    },
-}
--- a/example/c-vt/src/main.c
+++ b/example/c-vt/src/main.c
@@ -1,36 +0,0 @@
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <ghostty/vt.h>
-
-int main() {
-  GhosttyOscParser parser;
-  if (ghostty_osc_new(NULL, &parser) != GHOSTTY_SUCCESS) {
-    return 1;
-  }
-  
-  // Setup change window title command to change the title to "hello"
-  ghostty_osc_next(parser, '0');
-  ghostty_osc_next(parser, ';');
-  const char *title = "hello";
-  for (size_t i = 0; i < strlen(title); i++) {
-    ghostty_osc_next(parser, title[i]);
-  }
-  
-  // End parsing and get command
-  GhosttyOscCommand command = ghostty_osc_end(parser, 0);
-  
-  // Get and print command type
-  GhosttyOscCommandType type = ghostty_osc_command_type(command);
-  printf("Command type: %d\n", type);
-  
-  // Extract and print the title
-  if (ghostty_osc_command_data(command, GHOSTTY_OSC_DATA_CHANGE_WINDOW_TITLE_STR, &title)) {
-    printf("Extracted title: %s\n", title);
-  } else {
-    printf("Failed to extract title\n");
-  }
-  
-  ghostty_osc_free(parser);
-  return 0;
-}
--- a/example/index.html
+++ b/example/index.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8"/>
+    <title>Ghostty Example</title>
+    <script type="module" src="app.ts"></script>
+  </head>
+  <body>
+    <p>Open your console, we are just debugging here.</p>
+	<p>The current <b>grayscale</b> font atlas is rendered below.</p>
+	<div><div id="atlas-canvas" style="display: inline-block; border: 1px solid green;"></div></div>
+	<p>The current <b>color</b> font atlas is rendered below.</p>
+	<div><div id="atlas-color-canvas" style="display: inline-block; border: 1px solid blue;"></div></div>
+  </body>
+</html>
--- a/example/package-lock.json
+++ b/example/package-lock.json
--- a/example/package.json
+++ b/example/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "ghostty example",
+  "version": "0.1.0",
+  "description": "Example showing ghostty and wasm.",
+  "source": "index.html",
+  "browserslist": "> 0.5%, last 2 versions, not dead",
+  "scripts": {
+    "start": "parcel",
+    "build": "parcel build",
+    "check": "tsc --noEmit"
+  },
+  "author": "Mitchell Hashimoto",
+  "license": "MIT",
+  "devDependencies": {
+    "@parcel/transformer-inline-string": "^2.8.0",
+    "parcel": "^2.8.0",
+    "typescript": "^4.9.3"
+  },
+  "dependencies": {
+    "zig-js": "file:../vendor/zig-js/js"
+  }
+}
--- a/example/zig-vt/README.md
+++ b/example/zig-vt/README.md
@@ -1,14 +0,0 @@
-# Example: `ghostty-vt` Zig Module
-
-This contains a simple example of how to use the `ghostty-vt` Zig module
-exported by Ghostty to have access to a production grade terminal emulator.
-
-Requires the Zig version stated in the `build.zig.zon` file.
-
-## Usage
-
-Run the program:
-
-```shell-session
-zig build run
-```
--- a/example/zig-vt/build.zig
+++ b/example/zig-vt/build.zig
@@ -1,50 +0,0 @@
-const std = @import("std");
-
-pub fn build(b: *std.Build) void {
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
-    const run_step = b.step("run", "Run the app");
-    const test_step = b.step("test", "Run unit tests");
-
-    const exe_mod = b.createModule(.{
-        .root_source_file = b.path("src/main.zig"),
-        .target = target,
-        .optimize = optimize,
-    });
-
-    // You'll want to use a lazy dependency here so that ghostty is only
-    // downloaded if you actually need it.
-    if (b.lazyDependency("ghostty", .{
-        // Setting simd to false will force a pure static build that
-        // doesn't even require libc, but it has a significant performance
-        // penalty. If your embedding app requires libc anyway, you should
-        // always keep simd enabled.
-        // .simd = false,
-    })) |dep| {
-        exe_mod.addImport(
-            "ghostty-vt",
-            dep.module("ghostty-vt"),
-        );
-    }
-
-    // Exe
-    const exe = b.addExecutable(.{
-        .name = "zig_vt",
-        .root_module = exe_mod,
-    });
-    b.installArtifact(exe);
-
-    // Run
-    const run_cmd = b.addRunArtifact(exe);
-    run_cmd.step.dependOn(b.getInstallStep());
-    if (b.args) |args| run_cmd.addArgs(args);
-    run_step.dependOn(&run_cmd.step);
-
-    // Test
-    const exe_unit_tests = b.addTest(.{
-        .root_module = exe_mod,
-    });
-    const run_exe_unit_tests = b.addRunArtifact(exe_unit_tests);
-    test_step.dependOn(&run_exe_unit_tests.step);
-}
--- a/example/zig-vt/build.zig.zon
+++ b/example/zig-vt/build.zig.zon
@@ -1,24 +0,0 @@
-.{
-    .name = .zig_vt,
-    .version = "0.0.0",
-    .fingerprint = 0x6045575a7a8387e6,
-    .minimum_zig_version = "0.14.1",
-    .dependencies = .{
-        // Ghostty dependency. In reality, you'd probably use a URL-based
-        // dependency like the one showed (and commented out) below this one.
-        // We use a path dependency here for simplicity and to ensure our
-        // examples always test against the source they're bundled with.
-        .ghostty = .{ .path = "../../" },
-
-        // Example of what a URL-based dependency looks like:
-        // .ghostty = .{
-        //     .url = "https://github.com/ghostty-org/ghostty/archive/COMMIT.tar.gz",
-        //     .hash = "N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO36s",
-        // },
-    },
-    .paths = .{
-        "build.zig",
-        "build.zig.zon",
-        "src",
-    },
-}
--- a/example/zig-vt/src/main.zig
+++ b/example/zig-vt/src/main.zig
@@ -1,26 +0,0 @@
-const std = @import("std");
-const ghostty_vt = @import("ghostty-vt");
-
-pub fn main() !void {
-    // Use a debug allocator so we get leak checking. You probably want
-    // to replace this for release builds.
-    var gpa: std.heap.DebugAllocator(.{}) = .init;
-    defer _ = gpa.deinit();
-    const alloc = gpa.allocator();
-
-    // Initialize a terminal.
-    var t: ghostty_vt.Terminal = try .init(alloc, .{
-        .cols = 6,
-        .rows = 40,
-    });
-    defer t.deinit(alloc);
-
-    // Write some text. It'll wrap because this is too long for our
-    // columns size above (6).
-    try t.printString("Hello, World!");
-
-    // Get the plain string view of the terminal screen.
-    const str = try t.plainString(alloc);
-    defer alloc.free(str);
-    std.debug.print("{s}\n", .{str});
-}
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
        "type": "github"
      },
      "original": {
@@ -34,37 +34,44 @@
        "type": "github"
      }
    },
-    "nixpkgs": {
+    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1748189127,
-        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
+        "lastModified": 1741992157,
+        "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "da4b122f63095ca1199bd4d526f9e26426697689",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
+        "owner": "nixos",
+        "ref": "release-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
-    "nixpkgs_2": {
+    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1758360447,
-        "narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
-        "rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
-        "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
+        "lastModified": 1741865919,
+        "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a",
+        "type": "github"
      },
      "original": {
-        "type": "tarball",
-        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
      }
    },
    "root": {
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs-unstable": "nixpkgs-unstable",
        "zig": "zig",
        "zon2nix": "zon2nix"
      }
@@ -86,22 +93,20 @@
    },
    "zig": {
      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
+        "flake-compat": [],
        "flake-utils": [
          "flake-utils"
        ],
        "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-stable"
        ]
      },
      "locked": {
-        "lastModified": 1759192380,
-        "narHash": "sha256-0BWJgt4OSzxCESij5oo8WLWrPZ+1qLp8KUQe32QeV4Q=",
+        "lastModified": 1741825901,
+        "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=",
        "owner": "mitchellh",
        "repo": "zig-overlay",
-        "rev": "0bcd1401ed43d10f10cbded49624206553e92f57",
+        "rev": "0b14285e283f5a747f372fb2931835dd937c4383",
        "type": "github"
      },
      "original": {
@@ -112,20 +117,25 @@
    },
    "zon2nix": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
      },
      "locked": {
-        "lastModified": 1758405547,
-        "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
+        "lastModified": 1742104771,
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
        "owner": "jcollie",
        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "type": "github"
      },
      "original": {
        "owner": "jcollie",
+        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
        "repo": "zon2nix",
-        "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
        "type": "github"
      }
    }
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,12 @@
  description = "👻";

  inputs = {
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+
    # We want to stay as up to date as possible but need to be careful that the
    # glibc versions used by our dependencies from Nix are compatible with the
    # system glibc that the user is building for.
-    nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/release-24.11";
    flake-utils.url = "github:numtide/flake-utils";

    # Used for shell.nix
@@ -17,38 +19,40 @@
    zig = {
      url = "github:mitchellh/zig-overlay";
      inputs = {
-        nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-stable";
        flake-utils.follows = "flake-utils";
-        flake-compat.follows = "flake-compat";
+        flake-compat.follows = "";
      };
    };

    zon2nix = {
-      url = "github:jcollie/zon2nix?rev=bf983aa90ff169372b9fa8c02e57ea75e0b42245";
+      url = "github:jcollie/zon2nix?ref=56c159be489cc6c0e73c3930bd908ddc6fe89613";
      inputs = {
-        # Don't override nixpkgs until Zig 0.15 is available in the Nix branch
-        # we are using for "normal" builds.
-        #
-        # nixpkgs.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-unstable";
+        flake-utils.follows = "flake-utils";
      };
    };
  };

  outputs = {
    self,
-    nixpkgs,
+    nixpkgs-unstable,
+    nixpkgs-stable,
    zig,
    zon2nix,
    ...
  }:
-    builtins.foldl' nixpkgs.lib.recursiveUpdate {} (
+    builtins.foldl' nixpkgs-stable.lib.recursiveUpdate {} (
      builtins.map (
        system: let
-          pkgs = nixpkgs.legacyPackages.${system};
+          pkgs-stable = nixpkgs-stable.legacyPackages.${system};
+          pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
        in {
-          devShell.${system} = pkgs.callPackage ./nix/devShell.nix {
-            zig = zig.packages.${system}."0.15.1";
-            wraptest = pkgs.callPackage ./nix/wraptest.nix {};
+          devShell.${system} = pkgs-stable.callPackage ./nix/devShell.nix {
+            zig = zig.packages.${system}."0.14.0";
+            wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {};
+            # remove once blueprint-compiler 0.16.0 is in the stable nixpkgs
+            blueprint-compiler = pkgs-unstable.blueprint-compiler;
            zon2nix = zon2nix;
          };

@@ -59,29 +63,30 @@
              revision = self.shortRev or self.dirtyShortRev or "dirty";
            };
          in rec {
-            deps = pkgs.callPackage ./build.zig.zon.nix {};
-            ghostty-debug = pkgs.callPackage ./nix/package.nix (mkArgs "Debug");
-            ghostty-releasesafe = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
-            ghostty-releasefast = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
+            deps = pkgs-unstable.callPackage ./build.zig.zon.nix {};
+            ghostty-debug = pkgs-unstable.callPackage ./nix/package.nix (mkArgs "Debug");
+            ghostty-releasesafe = pkgs-unstable.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
+            ghostty-releasefast = pkgs-unstable.callPackage ./nix/package.nix (mkArgs "ReleaseFast");

            ghostty = ghostty-releasefast;
            default = ghostty;
          };

-          formatter.${system} = pkgs.alejandra;
+          formatter.${system} = pkgs-stable.alejandra;

          apps.${system} = let
            runVM = (
              module: let
                vm = import ./nix/vm/create.nix {
-                  inherit system module nixpkgs;
+                  inherit system module;
+                  nixpkgs = nixpkgs-unstable;
                  overlay = self.overlays.debug;
                };
-                program = pkgs.writeShellScript "run-ghostty-vm" ''
+                program = pkgs-unstable.writeShellScript "run-ghostty-vm" ''
                  SHARED_DIR=$(pwd)
                  export SHARED_DIR

-                  ${pkgs.lib.getExe vm.config.system.build.vm} "$@"
+                  ${pkgs-unstable.lib.getExe vm.config.system.build.vm} "$@"
                '';
              in {
                type = "app";
--- a/flatpak/com.mitchellh.ghostty-debug.yml
+++ b/flatpak/com.mitchellh.ghostty-debug.yml
@@ -1,59 +0,0 @@
-app-id: com.mitchellh.ghostty-debug
-runtime: org.gnome.Platform
-runtime-version: "49"
-sdk: org.gnome.Sdk
-default-branch: tip
-command: ghostty
-rename-icon: com.mitchellh.ghostty
-finish-args:
-  # 3D rendering
-  - --device=dri
-  # use host PTS namespace
-  - --device=all
-  # Windowing
-  - --share=ipc
-  - --socket=fallback-x11
-  - --socket=wayland
-  # Allow user to specify additional config files in home by default
-  - --filesystem=home:ro
-  # So we can escape the sandbox
-  - --talk-name=org.freedesktop.Flatpak
-cleanup:
-  - /include
-  - /lib/girepository-1.0
-  - /lib/pkgconfig
-  - /share/gir-1.0
-  - /share/pkgconfig
-  - /share/vala
-  - "*.la"
-  - "*.a"
-  - "*.so"
-
-modules:
-  - dependencies.yml
-
-  - name: ghostty
-    buildsystem: simple
-    build-options:
-      append-path: /app/zig
-    build-commands:
-      - zig build
-        -Doptimize=Debug
-        -Dcpu=baseline
-        -Dflatpak=true
-        -Dstrip=false
-        -fno-sys=oniguruma
-        --prefix /app
-        --search-prefix /app
-        --system $PWD/vendor/p
-    sources:
-      - type: dir
-        path: ..
-        skip:
-          - flatpak/.flatpak-builder
-          - flatpak/builddir
-          - flatpak/repo
-          - zig-cache
-          - zig-out
-
-      - zig-packages.json
--- a/flatpak/com.mitchellh.ghostty.yml
+++ b/flatpak/com.mitchellh.ghostty.yml
@@ -1,58 +0,0 @@
-app-id: com.mitchellh.ghostty
-runtime: org.gnome.Platform
-runtime-version: "49"
-sdk: org.gnome.Sdk
-default-branch: tip
-command: ghostty
-finish-args:
-  # 3D rendering
-  - --device=dri
-  # use host PTS namespace
-  - --device=all
-  # Windowing
-  - --share=ipc
-  - --socket=fallback-x11
-  - --socket=wayland
-  # Allow user to specify additional config files in home by default
-  - --filesystem=home:ro
-  # So we can escape the sandbox
-  - --talk-name=org.freedesktop.Flatpak
-cleanup:
-  - /include
-  - /lib/girepository-1.0
-  - /lib/pkgconfig
-  - /share/gir-1.0
-  - /share/pkgconfig
-  - /share/vala
-  - "*.la"
-  - "*.a"
-  - "*.so"
-
-modules:
-  - dependencies.yml
-
-  - name: ghostty
-    buildsystem: simple
-    build-options:
-      append-path: /app/zig
-    build-commands:
-      - zig build
-        -Doptimize=ReleaseFast
-        -Dcpu=baseline
-        -Dflatpak=true
-        -Dstrip=false
-        -fno-sys=oniguruma
-        --prefix /app
-        --search-prefix /app
-        --system $PWD/vendor/p
-    sources:
-      - type: dir
-        path: ..
-        skip:
-          - flatpak/.flatpak-builder
-          - flatpak/builddir
-          - flatpak/repo
-          - zig-cache
-          - zig-out
-
-      - zig-packages.json
--- a/flatpak/dependencies.yml
+++ b/flatpak/dependencies.yml
@@ -1,71 +0,0 @@
-name: dependencies-meta
-buildsystem: simple
-build-commands:
-  - true
-modules:
-  - name: zig
-    buildsystem: simple
-    cleanup:
-      - "*"
-    build-commands:
-      - mkdir -p /app/zig
-      - cp -r ./* /app/zig
-      - chmod a+x /app/zig/zig
-    sources:
-      - type: archive
-        sha256: 24aeeec8af16c381934a6cd7d95c807a8cb2cf7df9fa40d359aa884195c4716c
-        url: https://ziglang.org/download/0.14.1/zig-x86_64-linux-0.14.1.tar.xz
-        only-arches: [x86_64]
-      - type: archive
-        sha256: f7a654acc967864f7a050ddacfaa778c7504a0eca8d2b678839c21eea47c992b
-        url: https://ziglang.org/download/0.14.1/zig-aarch64-linux-0.14.1.tar.xz
-        only-arches: [aarch64]
-
-  - name: bzip2-redirect
-    buildsystem: simple
-    build-commands:
-      - install -Dm644 libbzip2.so /app/lib/libbzip2.so
-    sources:
-      - type: inline
-        contents: INPUT(libbz2.so)
-        dest-filename: libbzip2.so
-
-  - name: gtk4-layer-shell
-    buildsystem: meson
-    sources:
-      # no x-checker-data since this should be synchronized with Nix
-      #
-      # TODO: Automate this with check-zig-cache.sh
-      - type: archive
-        url: https://github.com/wmww/gtk4-layer-shell/archive/refs/tags/v1.1.0.tar.gz
-        sha256: 98284281260a5eef5b4f63a55f16c4bf6a788a1020a6db037ecb0f71fa336988
-
-  - name: pandoc
-    buildsystem: simple
-    cleanup:
-      - "*"
-    build-commands:
-      - install -Dm755 bin/pandoc /app/bin/pandoc
-    sources:
-      - type: archive
-        sha256: d04c95c138202f87d6b00ac19aa3dd874c681f60a9feb3b55c74f764d6d1a17d
-        url: https://github.com/jgm/pandoc/releases/download/3.6.3/pandoc-3.6.3-linux-amd64.tar.gz
-        only-arches: [x86_64]
-        x-checker-data:
-          type: json
-          url: https://api.github.com/repos/jgm/pandoc/releases/latest
-          url-query:
-            .assets[] | select(.name=="pandoc-" + $version + "-linux-amd64.tar.gz")
-            | .browser_download_url
-          version-query: .tag_name
-      - type: archive
-        sha256: 4e774cb1bdb6e56bc55b8eb79200bd9aa6a39905a04ecda7267f5149116f0881
-        url: https://github.com/jgm/pandoc/releases/download/3.6.3/pandoc-3.6.3-linux-arm64.tar.gz
-        only-arches: [aarch64]
-        x-checker-data:
-          type: json
-          url: https://api.github.com/repos/jgm/pandoc/releases/latest
-          url-query:
-            .assets[] | select(.name=="pandoc-" + $version + "-linux-arm64.tar.gz")
-            | .browser_download_url
-          version-query: .tag_name
--- a/flatpak/exceptions.json
+++ b/flatpak/exceptions.json
@@ -1,3 +0,0 @@
-{
-  "com.mitchellh.ghostty": ["finish-args-flatpak-spawn-access"]
-}
--- a/flatpak/zig-packages.json
+++ b/flatpak/zig-packages.json
@@ -1,212 +0,0 @@
-[
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/breakpad-b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz",
-    "dest": "vendor/p/N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ",
-    "sha256": "6cca98943d1a990766cef61077c09aff5938063fe17a1efe1228e5412b6d6ad9"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz",
-    "dest": "vendor/p/N-V-__8AAIrfdwARSa-zMmxWwFuwpXf1T3asIN7s5jqi9c1v",
-    "sha256": "3ba2dd92158718acec5caaf1a716043b5aa055c27b081d914af3ccb40dce8a55"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz",
-    "dest": "vendor/p/N-V-__8AAKLKpwC4H27Ps_0iL3bPkQb-z6ZVSrB-x_3EEkub",
-    "sha256": "427201f5d5151670d05c1f5b45bef5dda1f2e7dd971ef54f0feaaa7ffd2ab90c"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/gettext-0.24.tar.gz",
-    "dest": "vendor/p/N-V-__8AADcZkgn4cMhTUpIz6mShCKyqqB-NBtf_S2bHaTC-",
-    "sha256": "c918503d593d70daf4844d175a13d816afacb667c06fba1ec9dcd5002c1518b7"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz",
-    "dest": "vendor/p/N-V-__8AABzkUgISeKGgXAzgtutgJsZc0-kkeqBBscJgMkvy",
-    "sha256": "14a2edbb509cb3e51a9a53e3f5e435dbf5971604b4b833e63e6076e8c0a997b5"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/ghostty-org/zig-gobject/releases/download/2025-09-20-20-1/ghostty-gobject-2025-09-20-20-1.tar.zst",
-    "dest": "vendor/p/gobject-0.3.0-Skun7ET3nQCqJhDL0KnF_X7M4L7o7JePsJBbrYpEr7UV",
-    "sha256": "4978aa1a6f356949facaad7015780d4c050b74a3874bf473929e4e80d924717a"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/gtk4-layer-shell-1.1.0.tar.gz",
-    "dest": "vendor/p/N-V-__8AALiNBAA-_0gprYr92CjrMj1I5bqNu0TSJOnjFNSr",
-    "sha256": "98284281260a5eef5b4f63a55f16c4bf6a788a1020a6db037ecb0f71fa336988"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/harfbuzz-11.0.0.tar.xz",
-    "dest": "vendor/p/N-V-__8AAG02ugUcWec-Ndp-i7JTsJ0dgF8nnJRUInkGLG7G",
-    "sha256": "f16351bafe214725fe2c1d5b59f0d93e49905a4b247899fb90d70cff953a2b9b"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/highway-66486a10623fa0d72fe91260f96c892e41aceb06.tar.gz",
-    "dest": "vendor/p/N-V-__8AAGmZhABbsPJLfbqrh6JTHsXhY6qCaLAQyx25e0XE",
-    "sha256": "87d4f8893ef4e08f224973608ffebf94268a81380ba79c12e8841968c80aa212"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz",
-    "dest": "vendor/p/N-V-__8AAH0GaQC8a52s6vfIxg88OZgFgEW6DFxfSK4lX_l3",
-    "sha256": "a05fd01e04cf11ab781e28387c621d2e420f1e6044c8e27a25e603ea99ef7860"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/releases/download/release-20250922-150534-d28055b/ghostty-themes.tgz",
-    "dest": "vendor/p/N-V-__8AACEnAwCkyrJ_XqdomYlR8bpuh0l8WDidEz-BAzIv",
-    "sha256": "99d854c4002a2b14515f0103da569a6d4a3d659a996bf31902c3b4f98f4beee4"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/JetBrainsMono-2.304.tar.gz",
-    "dest": "vendor/p/N-V-__8AAIC5lwAVPJJzxnCAahSvZTIlG-HhtOvnM1uh-66x",
-    "sha256": "c57a691e8b82ad098b5963f3959032e4038f391087af7715885ba59046105cc4"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz",
-    "dest": "vendor/p/N-V-__8AAJrvXQCqAT8Mg9o_tk6m0yf5Fz-gCNEOKLyTSerD",
-    "sha256": "fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/mitchellh/libxev/archive/7f803181b158a10fec8619f793e3b4df515566cb.tar.gz",
-    "dest": "vendor/p/libxev-0.0.0-86vtc2UaEwDfiTKX3iBI-s_hdzfzWQUarT3MUrmUQl-Q",
-    "sha256": "29aa3360a121853ffab089de7fbffc3bfeb42c304937ef1099d2ee358d469267"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz",
-    "dest": "vendor/p/N-V-__8AAG3RoQEyRC2Vw7Qoro5SYBf62IHn3HjqtNVY6aWK",
-    "sha256": "6c28059e2e3eeb42b5b4b16489e3916a6346c1095a74fee3bc65cdc5d89a6215"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/NerdFontsSymbolsOnly-3.4.0.tar.gz",
-    "dest": "vendor/p/N-V-__8AAMVLTABmYkLqhZPLXnMl-KyN38R8UVYqGrxqO26s",
-    "sha256": "1164d1b956d4bde248d7b2f0998c43cc94f5202431a1564a793895b1e73b0d04"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz",
-    "dest": "vendor/p/N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c",
-    "sha256": "001aa1202e78448f4c0bf1a48c76e556876b36f16d92ce3207eccfd61d99f2a0"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz",
-    "dest": "vendor/p/N-V-__8AADYiAAB_80AWnH1AxXC0tql9thT-R-DYO1gBqTLc",
-    "sha256": "55e83b16d091082502bf149bf457f31f42092c5982650e3ffbae7b48871bf11a"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz",
-    "dest": "vendor/p/N-V-__8AAKYZBAB-CFHBKs3u4JkeiT4BMvyHu3Y5aaWF3Bbs",
-    "sha256": "5c58ba214acd8e6bca3426dc08b022c46a8dd997b29a1b3e28badf71c20df441"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz",
-    "dest": "vendor/p/N-V-__8AAPlZGwBEa-gxrcypGBZ2R8Bse4JYSfo_ul8i2jlG",
-    "sha256": "2ac6497cc8d61a8d31093e47addb8c9b2c45b16b0705bb334a835b6423c318df"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz",
-    "dest": "vendor/p/N-V-__8AANb6pwD7O1WG6L5nvD_rNMvnSc9Cpg1ijSlTYywv",
-    "sha256": "b52b6fcfc45e7fa69b1f06a1362c155473444e2cc09995556b156c53ba6657e3"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz",
-    "dest": "vendor/p/N-V-__8AAHffAgDU0YQmynL8K35WzkcnMUmBVQHQ0jlcKpjH",
-    "sha256": "ffc668a310e77607d393f3c18b32715f223da1eac4c4d6e0579a11df8e6b59cf"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/jacobsandlund/uucode/archive/190706c6b56f0842d29778007f74f7d3d1335fc5.tar.gz",
-    "dest": "vendor/p/uucode-0.1.0-ZZjBPpAFQABNCvd9cVPBg4I7233Ays-NWfWphPNqGbyE",
-    "sha256": "8aaf4eca7b397b94e7cf604a3cf3d3bb2274dc13786cad1db2648f135b34c228"
-  },
-  {
-    "type": "git",
-    "url": "https://github.com/rockorager/libvaxis",
-    "commit": "1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23",
-    "dest": "vendor/p/vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz",
-    "dest": "vendor/p/N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t",
-    "sha256": "ea4191d68e437677e51f3aacde27829810144e931d397a327dc6035e2c39c50d"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz",
-    "dest": "vendor/p/N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S",
-    "sha256": "5cedcadde81b75e60f23e5e83b5dd2b8eb4efb9f8f79bd7a347d148aeb0530f8"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz",
-    "dest": "vendor/p/N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs",
-    "sha256": "9e4cd20abe96e6c4c6ede9c3057108860126e7be2e2c3e35515476c250be1c13"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/vancluever/z2d/archive/refs/tags/v0.8.1.tar.gz",
-    "dest": "vendor/p/z2d-0.8.1-j5P_Hq8vDwB8ZaDA54-SzESDLF2zznG_zvTHiQNJImZP",
-    "sha256": "d036c3292600d5e8e1571fd66ce9304e00f9ecf35115c9d1be2a8187cc693d9d"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz",
-    "dest": "vendor/p/zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9",
-    "sha256": "de7ba535077fe2b678a5a7972585f002588d37244db08397feadf3d4907c0bb2"
-  },
-  {
-    "type": "git",
-    "url": "https://codeberg.org/atman/zg",
-    "commit": "4a002763419a34d61dcbb1f415821b83b9bf8ddc",
-    "dest": "vendor/p/zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz",
-    "dest": "vendor/p/N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ",
-    "sha256": "7f235e0956c2f5401a28963a261019953d00e3bf4cfc029830f2161196c3583d"
-  },
-  {
-    "type": "archive",
-    "url": "https://github.com/mitchellh/zig-objc/archive/c9e917a4e15a983b672ca779c7985d738a2d517c.tar.gz",
-    "dest": "vendor/p/zig_objc-0.0.0-Ir_SpwsPAQBJgi9YRm2ubJMfdoysSq5gKpsIj3izQ8Zk",
-    "sha256": "a37be5eea7e44a2d1b2976ba256b85f76a8c1063fc01ffec85c8a9e67468e4dc"
-  },
-  {
-    "type": "archive",
-    "url": "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz",
-    "dest": "vendor/p/wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy",
-    "sha256": "13bec6675e403d86db3b55b39ae262f1e1bdfe24056dcd82824341c6308b5219"
-  },
-  {
-    "type": "git",
-    "url": "https://github.com/TUSF/zigimg",
-    "commit": "31268548fe3276c0e95f318a6c0d2ab10565b58d",
-    "dest": "vendor/p/zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj"
-  },
-  {
-    "type": "archive",
-    "url": "https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz",
-    "dest": "vendor/p/N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o",
-    "sha256": "17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c"
-  }
-]
--- a/images/Ghostty.icon/Assets/Ghostty.png
+++ b/images/Ghostty.icon/Assets/Ghostty.png
--- a/images/Ghostty.icon/Assets/Inner
+++ b/images/Ghostty.icon/Assets/Inner
--- a/images/Ghostty.icon/Assets/Screen
+++ b/images/Ghostty.icon/Assets/Screen
--- a/images/Ghostty.icon/Assets/Screen.png
+++ b/images/Ghostty.icon/Assets/Screen.png
--- a/images/Ghostty.icon/Assets/gloss.png
+++ b/images/Ghostty.icon/Assets/gloss.png
--- a/images/Ghostty.icon/icon.json
+++ b/images/Ghostty.icon/icon.json
@@ -1,170 +0,0 @@
-{
-  "color-space-for-untagged-svg-colors" : "display-p3",
-  "fill" : {
-    "linear-gradient" : [
-      "display-p3:0.87945,0.87945,0.87945,1.00000",
-      "display-p3:0.40000,0.40000,0.40392,1.00000"
-    ]
-  },
-  "groups" : [
-    {
-      "blend-mode" : "normal",
-      "layers" : [
-        {
-          "blend-mode" : "overlay",
-          "fill" : {
-            "linear-gradient" : [
-              "srgb:1.00000,1.00000,1.00000,1.00000",
-              "srgb:0.00000,0.00000,0.00000,1.00000"
-            ]
-          },
-          "hidden" : false,
-          "image-name" : "gloss.png",
-          "name" : "GlossTop",
-          "opacity" : 0.25,
-          "position" : {
-            "scale" : 0.98,
-            "translation-in-points" : [
-              0.90625,
-              -236.4609375
-            ]
-          }
-        },
-        {
-          "blend-mode" : "normal",
-          "fill" : "automatic",
-          "hidden" : false,
-          "image-name" : "gloss.png",
-          "name" : "gloss",
-          "position" : {
-            "scale" : 0.98,
-            "translation-in-points" : [
-              0.90625,
-              -236.4609375
-            ]
-          }
-        }
-      ],
-      "lighting" : "individual",
-      "name" : "Group 4",
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : true,
-        "value" : 0.5
-      }
-    },
-    {
-      "blend-mode" : "overlay",
-      "layers" : [
-        {
-          "blend-mode" : "overlay",
-          "fill" : "automatic",
-          "glass" : false,
-          "hidden" : false,
-          "image-name" : "Screen Effects.png",
-          "name" : "Screen Effects"
-        },
-        {
-          "blend-mode" : "overlay",
-          "fill" : "automatic",
-          "glass" : true,
-          "hidden" : false,
-          "image-name" : "Screen Effects.png",
-          "name" : "Screen Effects"
-        }
-      ],
-      "lighting" : "individual",
-      "name" : "Group 3",
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : false,
-        "value" : 0.5
-      }
-    },
-    {
-      "blur-material" : null,
-      "layers" : [
-        {
-          "blend-mode" : "normal",
-          "fill" : "automatic",
-          "hidden" : false,
-          "image-name" : "Ghostty.png",
-          "name" : "Ghostty",
-          "position" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              -185.015625,
-              -143.8359375
-            ]
-          }
-        },
-        {
-          "blend-mode" : "normal",
-          "fill" : {
-            "solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
-          },
-          "glass" : true,
-          "hidden" : false,
-          "image-name" : "Ghostty.png",
-          "name" : "GhosttyBlur",
-          "position" : {
-            "scale" : 1,
-            "translation-in-points" : [
-              -186.59375,
-              -143.8359375
-            ]
-          }
-        },
-        {
-          "hidden" : false,
-          "image-name" : "Screen.png",
-          "name" : "Screen"
-        }
-      ],
-      "lighting" : "individual",
-      "name" : "Group 2",
-      "shadow" : {
-        "kind" : "neutral",
-        "opacity" : 0.5
-      },
-      "translucency" : {
-        "enabled" : false,
-        "value" : 0.5
-      }
-    },
-    {
-      "blend-mode" : "normal",
-      "blur-material" : null,
-      "hidden" : false,
-      "layers" : [
-        {
-          "image-name" : "Inner Bevel 6px.png",
-          "name" : "Inner Bevel 6px"
-        }
-      ],
-      "lighting" : "individual",
-      "name" : "Group 1",
-      "shadow" : {
-        "kind" : "layer-color",
-        "opacity" : 0.2
-      },
-      "specular" : false,
-      "translucency" : {
-        "enabled" : false,
-        "value" : 0.5
-      }
-    }
-  ],
-  "supported-platforms" : {
-    "circles" : [
-      "watchOS"
-    ],
-    "squares" : "shared"
-  }
-}
--- a/images/gnome/1024.png
+++ b/images/gnome/1024.png
--- a/images/gnome/128.png
+++ b/images/gnome/128.png
--- a/images/gnome/16.png
+++ b/images/gnome/16.png
--- a/images/gnome/2048.png
+++ b/images/gnome/2048.png
--- a/images/gnome/256.png
+++ b/images/gnome/256.png
--- a/images/gnome/32.png
+++ b/images/gnome/32.png
--- a/images/gnome/512.png
+++ b/images/gnome/512.png
--- a/images/gnome/64.png
+++ b/images/gnome/64.png
--- a/images/gnome/nightly-1024.png
+++ b/images/gnome/nightly-1024.png
--- a/images/gnome/nightly-128.png
+++ b/images/gnome/nightly-128.png
--- a/images/gnome/nightly-16.png
+++ b/images/gnome/nightly-16.png
--- a/images/gnome/nightly-2048.png
+++ b/images/gnome/nightly-2048.png
--- a/images/gnome/nightly-256.png
+++ b/images/gnome/nightly-256.png
--- a/images/gnome/nightly-32.png
+++ b/images/gnome/nightly-32.png
--- a/images/gnome/nightly-512.png
+++ b/images/gnome/nightly-512.png
--- a/images/gnome/nightly-64.png
+++ b/images/gnome/nightly-64.png
--- a/images/icons/icon_1024.png
+++ b/images/icons/icon_1024.png
--- a/images/icons/icon_1024@2x.png
+++ b/images/icons/icon_1024@2x.png
--- a/images/icons/icon_128.png
+++ b/images/icons/icon_128.png
--- a/images/icons/icon_256.png
+++ b/images/icons/icon_256.png
--- a/images/icons/icon_256@2x.png
+++ b/images/icons/icon_256@2x.png
--- a/images/icons/icon_512.png
+++ b/images/icons/icon_512.png
--- a/images/icons/icon_512@2x.png
+++ b/images/icons/icon_512@2x.png
--- a/include/ghostty.h
+++ b/include/ghostty.h
@@ -103,30 +103,10 @@ typedef enum {
  GHOSTTY_ACTION_REPEAT,
 } ghostty_input_action_e;

-// Based on: https://www.w3.org/TR/uievents-code/
 typedef enum {
-  GHOSTTY_KEY_UNIDENTIFIED,
+  GHOSTTY_KEY_INVALID,

-  // "Writing System Keys" § 3.1.1
-  GHOSTTY_KEY_BACKQUOTE,
-  GHOSTTY_KEY_BACKSLASH,
-  GHOSTTY_KEY_BRACKET_LEFT,
-  GHOSTTY_KEY_BRACKET_RIGHT,
-  GHOSTTY_KEY_COMMA,
-  GHOSTTY_KEY_DIGIT_0,
-  GHOSTTY_KEY_DIGIT_1,
-  GHOSTTY_KEY_DIGIT_2,
-  GHOSTTY_KEY_DIGIT_3,
-  GHOSTTY_KEY_DIGIT_4,
-  GHOSTTY_KEY_DIGIT_5,
-  GHOSTTY_KEY_DIGIT_6,
-  GHOSTTY_KEY_DIGIT_7,
-  GHOSTTY_KEY_DIGIT_8,
-  GHOSTTY_KEY_DIGIT_9,
-  GHOSTTY_KEY_EQUAL,
-  GHOSTTY_KEY_INTL_BACKSLASH,
-  GHOSTTY_KEY_INTL_RO,
-  GHOSTTY_KEY_INTL_YEN,
+  // a-z
  GHOSTTY_KEY_A,
  GHOSTTY_KEY_B,
  GHOSTTY_KEY_C,
@@ -153,91 +133,56 @@ typedef enum {
  GHOSTTY_KEY_X,
  GHOSTTY_KEY_Y,
  GHOSTTY_KEY_Z,
-  GHOSTTY_KEY_MINUS,
-  GHOSTTY_KEY_PERIOD,
-  GHOSTTY_KEY_QUOTE,
+
+  // numbers
+  GHOSTTY_KEY_ZERO,
+  GHOSTTY_KEY_ONE,
+  GHOSTTY_KEY_TWO,
+  GHOSTTY_KEY_THREE,
+  GHOSTTY_KEY_FOUR,
+  GHOSTTY_KEY_FIVE,
+  GHOSTTY_KEY_SIX,
+  GHOSTTY_KEY_SEVEN,
+  GHOSTTY_KEY_EIGHT,
+  GHOSTTY_KEY_NINE,
+
+  // puncuation
  GHOSTTY_KEY_SEMICOLON,
-  GHOSTTY_KEY_SLASH,
-
-  // "Functional Keys" § 3.1.2
-  GHOSTTY_KEY_ALT_LEFT,
-  GHOSTTY_KEY_ALT_RIGHT,
-  GHOSTTY_KEY_BACKSPACE,
-  GHOSTTY_KEY_CAPS_LOCK,
-  GHOSTTY_KEY_CONTEXT_MENU,
-  GHOSTTY_KEY_CONTROL_LEFT,
-  GHOSTTY_KEY_CONTROL_RIGHT,
-  GHOSTTY_KEY_ENTER,
-  GHOSTTY_KEY_META_LEFT,
-  GHOSTTY_KEY_META_RIGHT,
-  GHOSTTY_KEY_SHIFT_LEFT,
-  GHOSTTY_KEY_SHIFT_RIGHT,
  GHOSTTY_KEY_SPACE,
-  GHOSTTY_KEY_TAB,
-  GHOSTTY_KEY_CONVERT,
-  GHOSTTY_KEY_KANA_MODE,
-  GHOSTTY_KEY_NON_CONVERT,
+  GHOSTTY_KEY_APOSTROPHE,
+  GHOSTTY_KEY_COMMA,
+  GHOSTTY_KEY_GRAVE_ACCENT,  // `
+  GHOSTTY_KEY_PERIOD,
+  GHOSTTY_KEY_SLASH,
+  GHOSTTY_KEY_MINUS,
+  GHOSTTY_KEY_PLUS,
+  GHOSTTY_KEY_EQUAL,
+  GHOSTTY_KEY_LEFT_BRACKET,   // [
+  GHOSTTY_KEY_RIGHT_BRACKET,  // ]
+  GHOSTTY_KEY_BACKSLASH,      // \

-  // "Control Pad Section" § 3.2
-  GHOSTTY_KEY_DELETE,
-  GHOSTTY_KEY_END,
-  GHOSTTY_KEY_HELP,
+  // control
+  GHOSTTY_KEY_UP,
+  GHOSTTY_KEY_DOWN,
+  GHOSTTY_KEY_RIGHT,
+  GHOSTTY_KEY_LEFT,
  GHOSTTY_KEY_HOME,
+  GHOSTTY_KEY_END,
  GHOSTTY_KEY_INSERT,
-  GHOSTTY_KEY_PAGE_DOWN,
-  GHOSTTY_KEY_PAGE_UP,
-
-  // "Arrow Pad Section" § 3.3
-  GHOSTTY_KEY_ARROW_DOWN,
-  GHOSTTY_KEY_ARROW_LEFT,
-  GHOSTTY_KEY_ARROW_RIGHT,
-  GHOSTTY_KEY_ARROW_UP,
-
-  // "Numpad Section" § 3.4
+  GHOSTTY_KEY_DELETE,
+  GHOSTTY_KEY_CAPS_LOCK,
+  GHOSTTY_KEY_SCROLL_LOCK,
  GHOSTTY_KEY_NUM_LOCK,
-  GHOSTTY_KEY_NUMPAD_0,
-  GHOSTTY_KEY_NUMPAD_1,
-  GHOSTTY_KEY_NUMPAD_2,
-  GHOSTTY_KEY_NUMPAD_3,
-  GHOSTTY_KEY_NUMPAD_4,
-  GHOSTTY_KEY_NUMPAD_5,
-  GHOSTTY_KEY_NUMPAD_6,
-  GHOSTTY_KEY_NUMPAD_7,
-  GHOSTTY_KEY_NUMPAD_8,
-  GHOSTTY_KEY_NUMPAD_9,
-  GHOSTTY_KEY_NUMPAD_ADD,
-  GHOSTTY_KEY_NUMPAD_BACKSPACE,
-  GHOSTTY_KEY_NUMPAD_CLEAR,
-  GHOSTTY_KEY_NUMPAD_CLEAR_ENTRY,
-  GHOSTTY_KEY_NUMPAD_COMMA,
-  GHOSTTY_KEY_NUMPAD_DECIMAL,
-  GHOSTTY_KEY_NUMPAD_DIVIDE,
-  GHOSTTY_KEY_NUMPAD_ENTER,
-  GHOSTTY_KEY_NUMPAD_EQUAL,
-  GHOSTTY_KEY_NUMPAD_MEMORY_ADD,
-  GHOSTTY_KEY_NUMPAD_MEMORY_CLEAR,
-  GHOSTTY_KEY_NUMPAD_MEMORY_RECALL,
-  GHOSTTY_KEY_NUMPAD_MEMORY_STORE,
-  GHOSTTY_KEY_NUMPAD_MEMORY_SUBTRACT,
-  GHOSTTY_KEY_NUMPAD_MULTIPLY,
-  GHOSTTY_KEY_NUMPAD_PAREN_LEFT,
-  GHOSTTY_KEY_NUMPAD_PAREN_RIGHT,
-  GHOSTTY_KEY_NUMPAD_SUBTRACT,
-  GHOSTTY_KEY_NUMPAD_SEPARATOR,
-  GHOSTTY_KEY_NUMPAD_UP,
-  GHOSTTY_KEY_NUMPAD_DOWN,
-  GHOSTTY_KEY_NUMPAD_RIGHT,
-  GHOSTTY_KEY_NUMPAD_LEFT,
-  GHOSTTY_KEY_NUMPAD_BEGIN,
-  GHOSTTY_KEY_NUMPAD_HOME,
-  GHOSTTY_KEY_NUMPAD_END,
-  GHOSTTY_KEY_NUMPAD_INSERT,
-  GHOSTTY_KEY_NUMPAD_DELETE,
-  GHOSTTY_KEY_NUMPAD_PAGE_UP,
-  GHOSTTY_KEY_NUMPAD_PAGE_DOWN,
-
-  // "Function Section" § 3.5
+  GHOSTTY_KEY_PAGE_UP,
+  GHOSTTY_KEY_PAGE_DOWN,
  GHOSTTY_KEY_ESCAPE,
+  GHOSTTY_KEY_ENTER,
+  GHOSTTY_KEY_TAB,
+  GHOSTTY_KEY_BACKSPACE,
+  GHOSTTY_KEY_PRINT_SCREEN,
+  GHOSTTY_KEY_PAUSE,
+
+  // function keys
  GHOSTTY_KEY_F1,
  GHOSTTY_KEY_F2,
  GHOSTTY_KEY_F3,
@@ -263,53 +208,59 @@ typedef enum {
  GHOSTTY_KEY_F23,
  GHOSTTY_KEY_F24,
  GHOSTTY_KEY_F25,
-  GHOSTTY_KEY_FN,
-  GHOSTTY_KEY_FN_LOCK,
-  GHOSTTY_KEY_PRINT_SCREEN,
-  GHOSTTY_KEY_SCROLL_LOCK,
-  GHOSTTY_KEY_PAUSE,

-  // "Media Keys" § 3.6
-  GHOSTTY_KEY_BROWSER_BACK,
-  GHOSTTY_KEY_BROWSER_FAVORITES,
-  GHOSTTY_KEY_BROWSER_FORWARD,
-  GHOSTTY_KEY_BROWSER_HOME,
-  GHOSTTY_KEY_BROWSER_REFRESH,
-  GHOSTTY_KEY_BROWSER_SEARCH,
-  GHOSTTY_KEY_BROWSER_STOP,
-  GHOSTTY_KEY_EJECT,
-  GHOSTTY_KEY_LAUNCH_APP_1,
-  GHOSTTY_KEY_LAUNCH_APP_2,
-  GHOSTTY_KEY_LAUNCH_MAIL,
-  GHOSTTY_KEY_MEDIA_PLAY_PAUSE,
-  GHOSTTY_KEY_MEDIA_SELECT,
-  GHOSTTY_KEY_MEDIA_STOP,
-  GHOSTTY_KEY_MEDIA_TRACK_NEXT,
-  GHOSTTY_KEY_MEDIA_TRACK_PREVIOUS,
-  GHOSTTY_KEY_POWER,
-  GHOSTTY_KEY_SLEEP,
-  GHOSTTY_KEY_AUDIO_VOLUME_DOWN,
-  GHOSTTY_KEY_AUDIO_VOLUME_MUTE,
-  GHOSTTY_KEY_AUDIO_VOLUME_UP,
-  GHOSTTY_KEY_WAKE_UP,
+  // keypad
+  GHOSTTY_KEY_KP_0,
+  GHOSTTY_KEY_KP_1,
+  GHOSTTY_KEY_KP_2,
+  GHOSTTY_KEY_KP_3,
+  GHOSTTY_KEY_KP_4,
+  GHOSTTY_KEY_KP_5,
+  GHOSTTY_KEY_KP_6,
+  GHOSTTY_KEY_KP_7,
+  GHOSTTY_KEY_KP_8,
+  GHOSTTY_KEY_KP_9,
+  GHOSTTY_KEY_KP_DECIMAL,
+  GHOSTTY_KEY_KP_DIVIDE,
+  GHOSTTY_KEY_KP_MULTIPLY,
+  GHOSTTY_KEY_KP_SUBTRACT,
+  GHOSTTY_KEY_KP_ADD,
+  GHOSTTY_KEY_KP_ENTER,
+  GHOSTTY_KEY_KP_EQUAL,
+  GHOSTTY_KEY_KP_SEPARATOR,
+  GHOSTTY_KEY_KP_LEFT,
+  GHOSTTY_KEY_KP_RIGHT,
+  GHOSTTY_KEY_KP_UP,
+  GHOSTTY_KEY_KP_DOWN,
+  GHOSTTY_KEY_KP_PAGE_UP,
+  GHOSTTY_KEY_KP_PAGE_DOWN,
+  GHOSTTY_KEY_KP_HOME,
+  GHOSTTY_KEY_KP_END,
+  GHOSTTY_KEY_KP_INSERT,
+  GHOSTTY_KEY_KP_DELETE,
+  GHOSTTY_KEY_KP_BEGIN,

-  // "Legacy, Non-standard, and Special Keys" § 3.7
-  GHOSTTY_KEY_COPY,
-  GHOSTTY_KEY_CUT,
-  GHOSTTY_KEY_PASTE,
+  // modifiers
+  GHOSTTY_KEY_LEFT_SHIFT,
+  GHOSTTY_KEY_LEFT_CONTROL,
+  GHOSTTY_KEY_LEFT_ALT,
+  GHOSTTY_KEY_LEFT_SUPER,
+  GHOSTTY_KEY_RIGHT_SHIFT,
+  GHOSTTY_KEY_RIGHT_CONTROL,
+  GHOSTTY_KEY_RIGHT_ALT,
+  GHOSTTY_KEY_RIGHT_SUPER,
 } ghostty_input_key_e;

 typedef struct {
  ghostty_input_action_e action;
  ghostty_input_mods_e mods;
-  ghostty_input_mods_e consumed_mods;
  uint32_t keycode;
  const char* text;
-  uint32_t unshifted_codepoint;
  bool composing;
 } ghostty_input_key_s;

 typedef enum {
+  GHOSTTY_TRIGGER_TRANSLATED,
  GHOSTTY_TRIGGER_PHYSICAL,
  GHOSTTY_TRIGGER_UNICODE,
 } ghostty_input_trigger_tag_e;
@@ -326,13 +277,6 @@ typedef struct {
  ghostty_input_mods_e mods;
 } ghostty_input_trigger_s;

-typedef struct {
-  const char* action_key;
-  const char* action;
-  const char* title;
-  const char* description;
-} ghostty_command_s;
-
 typedef enum {
  GHOSTTY_BUILD_MODE_DEBUG,
  GHOSTTY_BUILD_MODE_RELEASE_SAFE,
@@ -350,52 +294,13 @@ typedef struct {
  const char* message;
 } ghostty_diagnostic_s;

-typedef struct {
-  const char* ptr;
-  uintptr_t len;
-  bool sentinel;
-} ghostty_string_s;
-
 typedef struct {
  double tl_px_x;
  double tl_px_y;
  uint32_t offset_start;
  uint32_t offset_len;
-  const char* text;
-  uintptr_t text_len;
-} ghostty_text_s;
-
-typedef enum {
-  GHOSTTY_POINT_ACTIVE,
-  GHOSTTY_POINT_VIEWPORT,
-  GHOSTTY_POINT_SCREEN,
-  GHOSTTY_POINT_SURFACE,
-} ghostty_point_tag_e;
-
-typedef enum {
-  GHOSTTY_POINT_COORD_EXACT,
-  GHOSTTY_POINT_COORD_TOP_LEFT,
-  GHOSTTY_POINT_COORD_BOTTOM_RIGHT,
-} ghostty_point_coord_e;
-
-typedef struct {
-  ghostty_point_tag_e tag;
-  ghostty_point_coord_e coord;
-  uint32_t x;
-  uint32_t y;
-} ghostty_point_s;
-
-typedef struct {
-  ghostty_point_s top_left;
-  ghostty_point_s bottom_right;
-  bool rectangle;
 } ghostty_selection_s;

-typedef struct {
-  const char* key;
-  const char* value;
-} ghostty_env_var_s;
-
 typedef struct {
  void* nsview;
 } ghostty_platform_macos_s;
@@ -417,10 +322,6 @@ typedef struct {
  float font_size;
  const char* working_directory;
  const char* command;
-  ghostty_env_var_s* env_vars;
-  size_t env_var_count;
-  const char* initial_input;
-  bool wait_after_command;
 } ghostty_surface_config_s;

 typedef struct {
@@ -447,33 +348,6 @@ typedef struct {
  size_t len;
 } ghostty_config_color_list_s;

-// config.Palette
-typedef struct {
-  ghostty_config_color_s colors[256];
-} ghostty_config_palette_s;
-
-// config.QuickTerminalSize
-typedef enum {
-  GHOSTTY_QUICK_TERMINAL_SIZE_NONE,
-  GHOSTTY_QUICK_TERMINAL_SIZE_PERCENTAGE,
-  GHOSTTY_QUICK_TERMINAL_SIZE_PIXELS,
-} ghostty_quick_terminal_size_tag_e;
-
-typedef union {
-  float percentage;
-  uint32_t pixels;
-} ghostty_quick_terminal_size_value_u;
-
-typedef struct {
-  ghostty_quick_terminal_size_tag_e tag;
-  ghostty_quick_terminal_size_value_u value;
-} ghostty_quick_terminal_size_s;
-
-typedef struct {
-  ghostty_quick_terminal_size_s primary;
-  ghostty_quick_terminal_size_s secondary;
-} ghostty_config_quick_terminal_size_s;
-
 // apprt.Target.Key
 typedef enum {
  GHOSTTY_TARGET_APP,
@@ -541,13 +415,6 @@ typedef enum {
  GHOSTTY_FULLSCREEN_NON_NATIVE_PADDED_NOTCH,
 } ghostty_action_fullscreen_e;

-// apprt.action.FloatWindow
-typedef enum {
-  GHOSTTY_FLOAT_WINDOW_ON,
-  GHOSTTY_FLOAT_WINDOW_OFF,
-  GHOSTTY_FLOAT_WINDOW_TOGGLE,
-} ghostty_action_float_window_e;
-
 // apprt.action.SecureInput
 typedef enum {
  GHOSTTY_SECURE_INPUT_ON,
@@ -691,48 +558,6 @@ typedef struct {
  bool soft;
 } ghostty_action_reload_config_s;

-// apprt.action.OpenUrlKind
-typedef enum {
-  GHOSTTY_ACTION_OPEN_URL_KIND_UNKNOWN,
-  GHOSTTY_ACTION_OPEN_URL_KIND_TEXT,
-} ghostty_action_open_url_kind_e;
-
-// apprt.action.OpenUrl.C
-typedef struct {
-  ghostty_action_open_url_kind_e kind;
-  const char* url;
-  uintptr_t len;
-} ghostty_action_open_url_s;
-
-// apprt.action.CloseTabMode
-typedef enum {
-  GHOSTTY_ACTION_CLOSE_TAB_MODE_THIS,
-  GHOSTTY_ACTION_CLOSE_TAB_MODE_OTHER,
-} ghostty_action_close_tab_mode_e;
-
-// apprt.surface.Message.ChildExited
-typedef struct {
-  uint32_t exit_code;
-  uint64_t timetime_ms;
-} ghostty_surface_message_childexited_s;
-
-// terminal.osc.Command.ProgressReport.State
-typedef enum {
-  GHOSTTY_PROGRESS_STATE_REMOVE,
-  GHOSTTY_PROGRESS_STATE_SET,
-  GHOSTTY_PROGRESS_STATE_ERROR,
-  GHOSTTY_PROGRESS_STATE_INDETERMINATE,
-  GHOSTTY_PROGRESS_STATE_PAUSE,
-} ghostty_action_progress_report_state_e;
-
-// terminal.osc.Command.ProgressReport.C
-typedef struct {
-  ghostty_action_progress_report_state_e state;
-  // -1 if no progress was reported, otherwise 0-100 indicating percent
-  // completeness.
-  int8_t progress;
-} ghostty_action_progress_report_s;
-
 // apprt.Action.Key
 typedef enum {
  GHOSTTY_ACTION_QUIT,
@@ -746,7 +571,6 @@ typedef enum {
  GHOSTTY_ACTION_TOGGLE_TAB_OVERVIEW,
  GHOSTTY_ACTION_TOGGLE_WINDOW_DECORATIONS,
  GHOSTTY_ACTION_TOGGLE_QUICK_TERMINAL,
-  GHOSTTY_ACTION_TOGGLE_COMMAND_PALETTE,
  GHOSTTY_ACTION_TOGGLE_VISIBILITY,
  GHOSTTY_ACTION_MOVE_TAB,
  GHOSTTY_ACTION_GOTO_TAB,
@@ -759,9 +583,7 @@ typedef enum {
  GHOSTTY_ACTION_RESET_WINDOW_SIZE,
  GHOSTTY_ACTION_INITIAL_SIZE,
  GHOSTTY_ACTION_CELL_SIZE,
-  GHOSTTY_ACTION_RENDER,
  GHOSTTY_ACTION_INSPECTOR,
-  GHOSTTY_ACTION_SHOW_GTK_INSPECTOR,
  GHOSTTY_ACTION_RENDER_INSPECTOR,
  GHOSTTY_ACTION_DESKTOP_NOTIFICATION,
  GHOSTTY_ACTION_SET_TITLE,
@@ -773,21 +595,12 @@ typedef enum {
  GHOSTTY_ACTION_RENDERER_HEALTH,
  GHOSTTY_ACTION_OPEN_CONFIG,
  GHOSTTY_ACTION_QUIT_TIMER,
-  GHOSTTY_ACTION_FLOAT_WINDOW,
  GHOSTTY_ACTION_SECURE_INPUT,
  GHOSTTY_ACTION_KEY_SEQUENCE,
  GHOSTTY_ACTION_COLOR_CHANGE,
  GHOSTTY_ACTION_RELOAD_CONFIG,
  GHOSTTY_ACTION_CONFIG_CHANGE,
  GHOSTTY_ACTION_CLOSE_WINDOW,
-  GHOSTTY_ACTION_RING_BELL,
-  GHOSTTY_ACTION_UNDO,
-  GHOSTTY_ACTION_REDO,
-  GHOSTTY_ACTION_CHECK_FOR_UPDATES,
-  GHOSTTY_ACTION_OPEN_URL,
-  GHOSTTY_ACTION_SHOW_CHILD_EXITED,
-  GHOSTTY_ACTION_PROGRESS_REPORT,
-  GHOSTTY_ACTION_SHOW_ON_SCREEN_KEYBOARD,
 } ghostty_action_tag_e;

 typedef union {
@@ -809,16 +622,11 @@ typedef union {
  ghostty_action_mouse_over_link_s mouse_over_link;
  ghostty_action_renderer_health_e renderer_health;
  ghostty_action_quit_timer_e quit_timer;
-  ghostty_action_float_window_e float_window;
  ghostty_action_secure_input_e secure_input;
  ghostty_action_key_sequence_s key_sequence;
  ghostty_action_color_change_s color_change;
  ghostty_action_reload_config_s reload_config;
  ghostty_action_config_change_s config_change;
-  ghostty_action_open_url_s open_url;
-  ghostty_action_close_tab_mode_e close_tab_mode;
-  ghostty_surface_message_childexited_s child_exited;
-  ghostty_action_progress_report_s progress_report;
 } ghostty_action_u;

 typedef struct {
@@ -855,44 +663,13 @@ typedef struct {
  ghostty_runtime_close_surface_cb close_surface_cb;
 } ghostty_runtime_config_s;

-// apprt.ipc.Target.Key
-typedef enum {
-  GHOSTTY_IPC_TARGET_CLASS,
-  GHOSTTY_IPC_TARGET_DETECT,
-} ghostty_ipc_target_tag_e;
-
-typedef union {
-  char *klass;
-} ghostty_ipc_target_u;
-
-typedef struct {
-  ghostty_ipc_target_tag_e tag;
-  ghostty_ipc_target_u target;
-} chostty_ipc_target_s;
-
-// apprt.ipc.Action.NewWindow
-typedef struct {
-  // This should be a null terminated list of strings.
-  const char **arguments;
-} ghostty_ipc_action_new_window_s;
-
-typedef union {
-  ghostty_ipc_action_new_window_s new_window;
-} ghostty_ipc_action_u;
-
-// apprt.ipc.Action.Key
-typedef enum {
-  GHOSTTY_IPC_ACTION_NEW_WINDOW,
-} ghostty_ipc_action_tag_e;
-
 //-------------------------------------------------------------------
 // Published API

-int ghostty_init(uintptr_t, char**);
-void ghostty_cli_try_action(void);
+int ghostty_init(void);
+void ghostty_cli_main(uintptr_t, char**);
 ghostty_info_s ghostty_info(void);
 const char* ghostty_translate(const char*);
-void ghostty_string_free(ghostty_string_s);

 ghostty_config_t ghostty_config_new();
 void ghostty_config_free(ghostty_config_t);
@@ -907,7 +684,7 @@ ghostty_input_trigger_s ghostty_config_trigger(ghostty_config_t,
                                               uintptr_t);
 uint32_t ghostty_config_diagnostics_count(ghostty_config_t);
 ghostty_diagnostic_s ghostty_config_get_diagnostic(ghostty_config_t, uint32_t);
-ghostty_string_s ghostty_config_open_path(void);
+void ghostty_config_open();

 ghostty_app_t ghostty_app_new(const ghostty_runtime_config_s*,
                              ghostty_config_t);
@@ -926,15 +703,13 @@ void ghostty_app_set_color_scheme(ghostty_app_t, ghostty_color_scheme_e);

 ghostty_surface_config_s ghostty_surface_config_new();

-ghostty_surface_t ghostty_surface_new(ghostty_app_t,
-                                      const ghostty_surface_config_s*);
+ghostty_surface_t ghostty_surface_new(ghostty_app_t, ghostty_surface_config_s*);
 void ghostty_surface_free(ghostty_surface_t);
 void* ghostty_surface_userdata(ghostty_surface_t);
 ghostty_app_t ghostty_surface_app(ghostty_surface_t);
 ghostty_surface_config_s ghostty_surface_inherited_config(ghostty_surface_t);
 void ghostty_surface_update_config(ghostty_surface_t, ghostty_config_t);
 bool ghostty_surface_needs_confirm_quit(ghostty_surface_t);
-bool ghostty_surface_process_exited(ghostty_surface_t);
 void ghostty_surface_refresh(ghostty_surface_t);
 void ghostty_surface_draw(ghostty_surface_t);
 void ghostty_surface_set_content_scale(ghostty_surface_t, double, double);
@@ -946,11 +721,9 @@ void ghostty_surface_set_color_scheme(ghostty_surface_t,
                                      ghostty_color_scheme_e);
 ghostty_input_mods_e ghostty_surface_key_translation_mods(ghostty_surface_t,
                                                          ghostty_input_mods_e);
-void ghostty_surface_commands(ghostty_surface_t, ghostty_command_s**, size_t*);
 bool ghostty_surface_key(ghostty_surface_t, ghostty_input_key_s);
 bool ghostty_surface_key_is_binding(ghostty_surface_t, ghostty_input_key_s);
 void ghostty_surface_text(ghostty_surface_t, const char*, uintptr_t);
-void ghostty_surface_preedit(ghostty_surface_t, const char*, uintptr_t);
 bool ghostty_surface_mouse_captured(ghostty_surface_t);
 bool ghostty_surface_mouse_button(ghostty_surface_t,
                                  ghostty_input_mouse_state_e,
@@ -965,7 +738,7 @@ void ghostty_surface_mouse_scroll(ghostty_surface_t,
                                  double,
                                  ghostty_input_scroll_mods_t);
 void ghostty_surface_mouse_pressure(ghostty_surface_t, uint32_t, double);
-void ghostty_surface_ime_point(ghostty_surface_t, double*, double*, double*, double*);
+void ghostty_surface_ime_point(ghostty_surface_t, double*, double*);
 void ghostty_surface_request_close(ghostty_surface_t);
 void ghostty_surface_split(ghostty_surface_t, ghostty_action_split_direction_e);
 void ghostty_surface_split_focus(ghostty_surface_t,
@@ -980,16 +753,16 @@ void ghostty_surface_complete_clipboard_request(ghostty_surface_t,
                                                void*,
                                                bool);
 bool ghostty_surface_has_selection(ghostty_surface_t);
-bool ghostty_surface_read_selection(ghostty_surface_t, ghostty_text_s*);
-bool ghostty_surface_read_text(ghostty_surface_t,
-                               ghostty_selection_s,
-                               ghostty_text_s*);
-void ghostty_surface_free_text(ghostty_surface_t, ghostty_text_s*);
+uintptr_t ghostty_surface_selection(ghostty_surface_t, char*, uintptr_t);

 #ifdef __APPLE__
 void ghostty_surface_set_display_id(ghostty_surface_t, uint32_t);
 void* ghostty_surface_quicklook_font(ghostty_surface_t);
-bool ghostty_surface_quicklook_word(ghostty_surface_t, ghostty_text_s*);
+uintptr_t ghostty_surface_quicklook_word(ghostty_surface_t,
+                                         char*,
+                                         uintptr_t,
+                                         ghostty_selection_s*);
+bool ghostty_surface_selection_info(ghostty_surface_t, ghostty_selection_s*);
 #endif

 ghostty_inspector_t ghostty_surface_inspector(ghostty_surface_t);
@@ -1022,9 +795,6 @@ bool ghostty_inspector_metal_shutdown(ghostty_inspector_t);
 // Don't use these unless you know what you're doing.
 void ghostty_set_window_background_blur(ghostty_app_t, void*);

-// Benchmark API, if available.
-bool ghostty_benchmark_cli(const char*, const char*);
-
 #ifdef __cplusplus
 }
 #endif
--- a/include/ghostty/vt.h
+++ b/include/ghostty/vt.h
@@ -1,455 +0,0 @@
-/**
- * @file vt.h
- *
- * libghostty-vt - Virtual terminal sequence parsing library
- * 
- * This library provides functionality for parsing and handling terminal
- * escape sequences as well as maintaining terminal state such as styles,
- * cursor position, screen, scrollback, and more.
- *
- * WARNING: This is an incomplete, work-in-progress API. It is not yet
- * stable and is definitely going to change. 
- */
-
-/**
- * @mainpage libghostty-vt - Virtual Terminal Sequence Parser
- *
- * libghostty-vt is a C library which implements a modern terminal emulator,
- * extracted from the [Ghostty](https://ghostty.org) terminal emulator.
- *
- * libghostty-vt contains the logic for handling the core parts of a terminal
- * emulator: parsing terminal escape sequences and maintaining terminal state.
- * It can handle scrollback, line wrapping, reflow on resize, and more.
- *
- * @warning This library is currently in development and the API is not yet stable.
- * Breaking changes are expected in future versions. Use with caution in production code.
- *
- * @section groups_sec API Reference
- *
- * The API is organized into the following groups:
- * - @ref osc "OSC Parser" - Parse OSC (Operating System Command) sequences
- * - @ref allocator "Memory Management" - Memory management and custom allocators
- *
- */
-
-#ifndef GHOSTTY_VT_H
-#define GHOSTTY_VT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-
-//-------------------------------------------------------------------
-// Types
-
-/**
- * Opaque handle to an OSC parser instance.
- * 
- * This handle represents an OSC (Operating System Command) parser that can
- * be used to parse the contents of OSC sequences. This isn't a full VT
- * parser; it is only the OSC parser component. This is useful if you have
- * a parser already and want to only extract and handle OSC sequences.
- *
- * @ingroup osc
- */
-typedef struct GhosttyOscParser *GhosttyOscParser;
-
-/**
- * Opaque handle to a single OSC command.
- * 
- * This handle represents a parsed OSC (Operating System Command) command.
- * The command can be queried for its type and associated data using
- * `ghostty_osc_command_type` and `ghostty_osc_command_data`.
- *
- * @ingroup osc
- */
-typedef struct GhosttyOscCommand *GhosttyOscCommand;
-
-/**
- * Result codes for libghostty-vt operations.
- */
-typedef enum {
-    /** Operation completed successfully */
-    GHOSTTY_SUCCESS = 0,
-    /** Operation failed due to failed allocation */
-    GHOSTTY_OUT_OF_MEMORY = -1,
-} GhosttyResult;
-
-/**
- * OSC command types.
- *
- * @ingroup osc
- */
-typedef enum {
-  GHOSTTY_OSC_COMMAND_INVALID = 0,
-  GHOSTTY_OSC_COMMAND_CHANGE_WINDOW_TITLE = 1,
-  GHOSTTY_OSC_COMMAND_CHANGE_WINDOW_ICON = 2,
-  GHOSTTY_OSC_COMMAND_PROMPT_START = 3,
-  GHOSTTY_OSC_COMMAND_PROMPT_END = 4,
-  GHOSTTY_OSC_COMMAND_END_OF_INPUT = 5,
-  GHOSTTY_OSC_COMMAND_END_OF_COMMAND = 6,
-  GHOSTTY_OSC_COMMAND_CLIPBOARD_CONTENTS = 7,
-  GHOSTTY_OSC_COMMAND_REPORT_PWD = 8,
-  GHOSTTY_OSC_COMMAND_MOUSE_SHAPE = 9,
-  GHOSTTY_OSC_COMMAND_COLOR_OPERATION = 10,
-  GHOSTTY_OSC_COMMAND_KITTY_COLOR_PROTOCOL = 11,
-  GHOSTTY_OSC_COMMAND_SHOW_DESKTOP_NOTIFICATION = 12,
-  GHOSTTY_OSC_COMMAND_HYPERLINK_START = 13,
-  GHOSTTY_OSC_COMMAND_HYPERLINK_END = 14,
-  GHOSTTY_OSC_COMMAND_CONEMU_SLEEP = 15,
-  GHOSTTY_OSC_COMMAND_CONEMU_SHOW_MESSAGE_BOX = 16,
-  GHOSTTY_OSC_COMMAND_CONEMU_CHANGE_TAB_TITLE = 17,
-  GHOSTTY_OSC_COMMAND_CONEMU_PROGRESS_REPORT = 18,
-  GHOSTTY_OSC_COMMAND_CONEMU_WAIT_INPUT = 19,
-  GHOSTTY_OSC_COMMAND_CONEMU_GUIMACRO = 20,
-} GhosttyOscCommandType;
-
-/**
- * OSC command data types.
- * 
- * These values specify what type of data to extract from an OSC command
- * using `ghostty_osc_command_data`.
- *
- * @ingroup osc
- */
-typedef enum {
-  /** Invalid data type. Never results in any data extraction. */
-  GHOSTTY_OSC_DATA_INVALID = 0,
-  
-  /** 
-   * Window title string data.
-   *
-   * Valid for: GHOSTTY_OSC_COMMAND_CHANGE_WINDOW_TITLE
-   *
-   * Output type: const char ** (pointer to null-terminated string)
-   *
-   * Lifetime: Valid until the next call to any ghostty_osc_* function with 
-   * the same parser instance. Memory is owned by the parser.
-   */
-  GHOSTTY_OSC_DATA_CHANGE_WINDOW_TITLE_STR = 1,
-} GhosttyOscCommandData;
-
-//-------------------------------------------------------------------
-// Allocator Interface
-
-/** @defgroup allocator Memory Management
- *
- * libghostty-vt does require memory allocation for various operations,
- * but is resilient to allocation failures and will gracefully handle
- * out-of-memory situations by returning error codes.
- *
- * The exact memory management semantics are documented in the relevant
- * functions and data structures.
- *
- * libghostty-vt uses explicit memory allocation via an allocator
- * interface provided by GhosttyAllocator. The interface is based on the
- * [Zig](https://ziglang.org) allocator interface, since this has been
- * shown to be a flexible and powerful interface in practice and enables
- * a wide variety of allocation strategies.
- *
- * **For the common case, you can pass NULL as the allocator for any
- * function that accepts one,** and libghostty will use a default allocator.
- * The default allocator will be libc malloc/free if libc is linked. 
- * Otherwise, a custom allocator is used (currently Zig's SMP allocator)
- * that doesn't require any external dependencies.
- *
- * ## Basic Usage
- *
- * For simple use cases, you can ignore this interface entirely by passing NULL
- * as the allocator parameter to functions that accept one. This will use the
- * default allocator (typically libc malloc/free, if libc is linked, but
- * we provide our own default allocator if libc isn't linked).
- *
- * To use a custom allocator:
- * 1. Implement the GhosttyAllocatorVtable function pointers
- * 2. Create a GhosttyAllocator struct with your vtable and context
- * 3. Pass the allocator to functions that accept one
- *
- * @{
- */
-
-/**
- * Function table for custom memory allocator operations.
- * 
- * This vtable defines the interface for a custom memory allocator. All
- * function pointers must be valid and non-NULL.
- *
- * @ingroup allocator
- *
- * If you're not going to use a custom allocator, you can ignore all of
- * this. All functions that take an allocator pointer allow NULL to use a
- * default allocator.
- *
- * The interface is based on the Zig allocator interface. I'll say up front
- * that it is easy to look at this interface and think "wow, this is really
- * overcomplicated". The reason for this complexity is well thought out by
- * the Zig folks, and it enables a diverse set of allocation strategies
- * as shown by the Zig ecosystem. As a consolation, please note that many
- * of the arguments are only needed for advanced use cases and can be
- * safely ignored in simple implementations. For example, if you look at 
- * the Zig implementation of the libc allocator in `lib/std/heap.zig`
- * (search for CAllocator), you'll see it is very simple.
- *
- * We chose to align with the Zig allocator interface because:
- *
- *   1. It is a proven interface that serves a wide variety of use cases
- *      in the real world via the Zig ecosystem. It's shown to work.
- *
- *   2. Our core implementation itself is Zig, and this lets us very
- *      cheaply and easily convert between C and Zig allocators.
- *
- * NOTE(mitchellh): In the future, we can have default implementations of
- * resize/remap and allow those to be null.
- */
-typedef struct {
-    /**
-     * Return a pointer to `len` bytes with specified `alignment`, or return
-     * `NULL` indicating the allocation failed.
-     *
-     * @param ctx The allocator context
-     * @param len Number of bytes to allocate
-     * @param alignment Required alignment for the allocation. Guaranteed to
-     *   be a power of two between 1 and 16 inclusive.
-     * @param ret_addr First return address of the allocation call stack (0 if not provided)
-     * @return Pointer to allocated memory, or NULL if allocation failed
-     */
-    void* (*alloc)(void *ctx, size_t len, uint8_t alignment, uintptr_t ret_addr);
-    
-    /**
-     * Attempt to expand or shrink memory in place.
-     *
-     * `memory_len` must equal the length requested from the most recent
-     * successful call to `alloc`, `resize`, or `remap`. `alignment` must
-     * equal the same value that was passed as the `alignment` parameter to
-     * the original `alloc` call.
-     *
-     * `new_len` must be greater than zero.
-     *
-     * @param ctx The allocator context
-     * @param memory Pointer to the memory block to resize
-     * @param memory_len Current size of the memory block
-     * @param alignment Alignment (must match original allocation)
-     * @param new_len New requested size
-     * @param ret_addr First return address of the allocation call stack (0 if not provided)
-     * @return true if resize was successful in-place, false if relocation would be required
-     */
-    bool (*resize)(void *ctx, void *memory, size_t memory_len, uint8_t alignment, size_t new_len, uintptr_t ret_addr);
-    
-    /**
-     * Attempt to expand or shrink memory, allowing relocation.
-     *
-     * `memory_len` must equal the length requested from the most recent
-     * successful call to `alloc`, `resize`, or `remap`. `alignment` must
-     * equal the same value that was passed as the `alignment` parameter to
-     * the original `alloc` call.
-     *
-     * A non-`NULL` return value indicates the resize was successful. The
-     * allocation may have same address, or may have been relocated. In either
-     * case, the allocation now has size of `new_len`. A `NULL` return value
-     * indicates that the resize would be equivalent to allocating new memory,
-     * copying the bytes from the old memory, and then freeing the old memory.
-     * In such case, it is more efficient for the caller to perform the copy.
-     *
-     * `new_len` must be greater than zero.
-     *
-     * @param ctx The allocator context
-     * @param memory Pointer to the memory block to remap
-     * @param memory_len Current size of the memory block
-     * @param alignment Alignment (must match original allocation)
-     * @param new_len New requested size
-     * @param ret_addr First return address of the allocation call stack (0 if not provided)
-     * @return Pointer to resized memory (may be relocated), or NULL if manual copy is needed
-     */
-    void* (*remap)(void *ctx, void *memory, size_t memory_len, uint8_t alignment, size_t new_len, uintptr_t ret_addr);
-    
-    /**
-     * Free and invalidate a region of memory.
-     *
-     * `memory_len` must equal the length requested from the most recent
-     * successful call to `alloc`, `resize`, or `remap`. `alignment` must
-     * equal the same value that was passed as the `alignment` parameter to
-     * the original `alloc` call.
-     *
-     * @param ctx The allocator context
-     * @param memory Pointer to the memory block to free
-     * @param memory_len Size of the memory block
-     * @param alignment Alignment (must match original allocation)
-     * @param ret_addr First return address of the allocation call stack (0 if not provided)
-     */
-    void (*free)(void *ctx, void *memory, size_t memory_len, uint8_t alignment, uintptr_t ret_addr);
-} GhosttyAllocatorVtable;
-
-/**
- * Custom memory allocator.
- *
- * For functions that take an allocator pointer, a NULL pointer indicates
- * that the default allocator should be used. The default allocator will 
- * be libc malloc/free if we're linking to libc. If libc isn't linked,
- * a custom allocator is used (currently Zig's SMP allocator).
- *
- * @ingroup allocator
- *
- * Usage example:
- * @code
- * GhosttyAllocator allocator = {
- *     .vtable = &my_allocator_vtable,
- *     .ctx = my_allocator_state
- * };
- * @endcode
- */
-typedef struct {
-    /**
-     * Opaque context pointer passed to all vtable functions.
-     * This allows the allocator implementation to maintain state
-     * or reference external resources needed for memory management.
-     */
-    void *ctx;
-
-    /**
-     * Pointer to the allocator's vtable containing function pointers
-     * for memory operations (alloc, resize, remap, free).
-     */
-    const GhosttyAllocatorVtable *vtable;
-} GhosttyAllocator;
-
-/** @} */ // end of allocator group
-
-//-------------------------------------------------------------------
-// Functions
-
-/** @defgroup osc OSC Parser
- *
- * OSC (Operating System Command) sequence parser and command handling.
- *
- * The parser operates in a streaming fashion, processing input byte-by-byte
- * to handle OSC sequences that may arrive in fragments across multiple reads.
- * This interface makes it easy to integrate into most environments and avoids
- * over-allocating buffers.
- *
- * ## Basic Usage
- *
- * 1. Create a parser instance with ghostty_osc_new()
- * 2. Feed bytes to the parser using ghostty_osc_next() 
- * 3. Finalize parsing with ghostty_osc_end() to get the command
- * 4. Query command type and extract data using ghostty_osc_command_type()
- *    and ghostty_osc_command_data()
- * 5. Free the parser with ghostty_osc_free() when done
- *
- * @{
- */
-
-/**
- * Create a new OSC parser instance.
- * 
- * Creates a new OSC (Operating System Command) parser using the provided
- * allocator. The parser must be freed using ghostty_vt_osc_free() when
- * no longer needed.
- * 
- * @param allocator Pointer to the allocator to use for memory management, or NULL to use the default allocator
- * @param parser Pointer to store the created parser handle
- * @return GHOSTTY_SUCCESS on success, or an error code on failure
- */
-GhosttyResult ghostty_osc_new(const GhosttyAllocator *allocator, GhosttyOscParser *parser);
-
-/**
- * Free an OSC parser instance.
- * 
- * Releases all resources associated with the OSC parser. After this call,
- * the parser handle becomes invalid and must not be used.
- * 
- * @param parser The parser handle to free (may be NULL)
- */
-void ghostty_osc_free(GhosttyOscParser parser);
-
-/**
- * Reset an OSC parser instance to its initial state.
- * 
- * Resets the parser state, clearing any partially parsed OSC sequences
- * and returning the parser to its initial state. This is useful for
- * reusing a parser instance or recovering from parse errors.
- * 
- * @param parser The parser handle to reset, must not be null.
- */
-void ghostty_osc_reset(GhosttyOscParser parser);
-
-/**
- * Parse the next byte in an OSC sequence.
- * 
- * Processes a single byte as part of an OSC sequence. The parser maintains
- * internal state to track the progress through the sequence. Call this
- * function for each byte in the sequence data.
- *
- * When finished pumping the parser with bytes, call ghostty_osc_end
- * to get the final result.
- * 
- * @param parser The parser handle, must not be null.
- * @param byte The next byte to parse
- */
-void ghostty_osc_next(GhosttyOscParser parser, uint8_t byte);
-
-/**
- * Finalize OSC parsing and retrieve the parsed command.
- * 
- * Call this function after feeding all bytes of an OSC sequence to the parser
- * using ghostty_osc_next() with the exception of the terminating character
- * (ESC or ST). This function finalizes the parsing process and returns the 
- * parsed OSC command.
- *
- * The return value is never NULL. Invalid commands will return a command
- * with type GHOSTTY_OSC_COMMAND_INVALID.
- * 
- * The terminator parameter specifies the byte that terminated the OSC sequence
- * (typically 0x07 for BEL or 0x5C for ST after ESC). This information is
- * preserved in the parsed command so that responses can use the same terminator
- * format for better compatibility with the calling program. For commands that
- * do not require a response, this parameter is ignored and the resulting
- * command will not retain the terminator information.
- * 
- * The returned command handle is valid until the next call to any 
- * `ghostty_osc_*` function with the same parser instance with the exception
- * of command introspection functions such as `ghostty_osc_command_type`.
- * 
- * @param parser The parser handle, must not be null.
- * @param terminator The terminating byte of the OSC sequence (0x07 for BEL, 0x5C for ST)
- * @return Handle to the parsed OSC command
- */
-GhosttyOscCommand ghostty_osc_end(GhosttyOscParser parser, uint8_t terminator);
-
-/**
- * Get the type of an OSC command.
- * 
- * Returns the type identifier for the given OSC command. This can be used
- * to determine what kind of command was parsed and what data might be
- * available from it.
- * 
- * @param command The OSC command handle to query (may be NULL)
- * @return The command type, or GHOSTTY_OSC_COMMAND_INVALID if command is NULL
- */
-GhosttyOscCommandType ghostty_osc_command_type(GhosttyOscCommand command);
-
-/**
- * Extract data from an OSC command.
- * 
- * Extracts typed data from the given OSC command based on the specified
- * data type. The output pointer must be of the appropriate type for the
- * requested data kind. Valid command types, output types, and memory
- * safety information are documented in the `GhosttyOscCommandData` enum.
- *
- * @param command The OSC command handle to query (may be NULL)
- * @param data The type of data to extract
- * @param out Pointer to store the extracted data (type depends on data parameter)
- * @return true if data extraction was successful, false otherwise
- */
-bool ghostty_osc_command_data(GhosttyOscCommand command, GhosttyOscCommandData data, void *out);
-
-/** @} */ // end of osc group
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* GHOSTTY_VT_H */
--- a/macos/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/macos/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,74 @@
+{
+  "images" : [
+    {
+      "filename" : "macOS-AppIcon-1024px.png",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "filename" : "macOS-AppIcon-16px-16pt@1x.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "macOS-AppIcon-32px-16pt@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "macOS-AppIcon-32px-32pt@1x.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "macOS-AppIcon-64px-32pt@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "macOS-AppIcon-128px-128pt@1x.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "macOS-AppIcon-256px-128pt@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "macOS-AppIcon-256px-128pt@2x 1.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "macOS-AppIcon-512px-256pt@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "macOS-AppIcon-512px.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "macOS-AppIcon-1024px 1.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-1024px.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-128px-128pt@1x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-128px-128pt@1x.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-16px-16pt@1x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-16px-16pt@1x.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-256px-128pt@2x.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-16pt@2x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-16pt@2x.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-32pt@1x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-32px-32pt@1x.png
--- a/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px-256pt@2x.png
+++ b/macos/Assets.xcassets/AppIcon.appiconset/macOS-AppIcon-512px-256pt@2x.png
--- a/Show More
+++ b/Show More