Even More Sprite Glyphs (#7761)

Follow-on to #7755, adds the sixteenth blocks from the Symbols for
Legacy Computing Supplement and a few circle/ellipse glyphs that connect
to existing glyphs.

In order to add the one sixteenth blocks I reworked block element
alignment to not use the `yHalfs`, `yThirds`, etc. functions, but
instead a more versatile `Fraction` type I introduced, and making these
changes slightly affected how the vertical/horizontal eighths glyphs are
sized, and the horizontal center-point alignment of the smooth mosaic
glyphs for odd cell widths (shifted by half a pixel), but I believe both
of these to be improvements.

### Circle/ellipse glyphs
```
Existing sprites:
🯠 🯡 🯢 🯣

Which connect like so:
🯢🯡🯣
🯠

New sprites:
𜸀 𜸁 𜸋 𜸌

Which connect like so:
🯡𜸀𜸀🯣 🯢 𜸋𜸌
    𜸁
    𜸁
    🯠
```
|Main (via font)|This PR (via sprites)|
|-|-|
|![image](https://github.com/user-attachments/assets/b0102f7e-1cb3-4842-a8c6-352df6d5264f)|![image](https://github.com/user-attachments/assets/9a35d444-39ff-41e1-a632-597f195090a8)|

### Diffs
|Range|||||
|-|-|-|-|-|
|U+1CE00...U+1CEFF|![sprite_face_diff-U+1CE00 U+1CEFF-9x17+1](https://github.com/user-attachments/assets/632daca9-9d1e-458b-b645-3841de9f4915)|![sprite_face_diff-U+1CE00 U+1CEFF-11x21+2](https://github.com/user-attachments/assets/47731d99-9e1a-4005-a56c-dc9af3c38160)|![sprite_face_diff-U+1CE00 U+1CEFF-12x24+3](https://github.com/user-attachments/assets/2a4fd0d7-4114-480d-91e8-f8182ef0ff2b)|![sprite_face_diff-U+1CE00 U+1CEFF-18x36+4](https://github.com/user-attachments/assets/17b886b8-ad6d-4503-85dd-10ea2f734c09)|
|U+1FB00...U+1FBFF|![sprite_face_diff-U+1FB00 U+1FBFF-9x17+1](https://github.com/user-attachments/assets/c24814ea-67ef-4030-819b-a3f3d6ddac0c)|![sprite_face_diff-U+1FB00 U+1FBFF-11x21+2](https://github.com/user-attachments/assets/354ebadf-5d9c-4681-86c8-f6c21f82932e)|![sprite_face_diff-U+1FB00 U+1FBFF-12x24+3](https://github.com/user-attachments/assets/9fbb2c21-9ccd-466c-9bde-b8ce63e5df8b)|![sprite_face_diff-U+1FB00 U+1FBFF-18x36+4](https://github.com/user-attachments/assets/f76866ab-21c4-43b8-a591-009c4399ce17)|

.envrc

@@ -4,3 +4,5 @@ if has nix; then
   watch_file nix/{devShell,package,wraptest}.nix
   use flake
 fi
+
+source_env_if_exists .envrc.local

.gitattributes

@@ -1,7 +1,12 @@
 build.zig.zon.nix linguist-generated=true
+build.zig.zon.txt linguist-generated=true
+build.zig.zon.json linguist-generated=true
 vendor/** linguist-vendored
 website/** linguist-documentation
 pkg/breakpad/vendor/** linguist-vendored
 pkg/cimgui/vendor/** linguist-vendored
+pkg/glfw/wayland-headers/** linguist-vendored
+pkg/libintl/config.h linguist-generated=true
+pkg/libintl/libintl.h linguist-generated=true
 pkg/simdutf/vendor/** linguist-vendored
 src/terminal/res/** linguist-vendored

.github/DISCUSSION_TEMPLATE/issue-triage.yml

@@ -0,0 +1,162 @@
+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

.github/scripts/check-translations.sh

@@ -0,0 +1,14 @@
+#!/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

.github/workflows/nix.yml

@@ -36,16 +36,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
       - name: Setup Nix
-        uses: cachix/install-nix-action@v30
+        uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

.github/workflows/release-pr.yml

@@ -47,7 +47,7 @@ jobs:
           sentry-cli dif upload --project ghostty --wait dsym.zip
 
   build-macos:
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     steps:
       - name: Checkout code
@@ -57,10 +57,10 @@ jobs:
           fetch-depth: 0
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -94,7 +94,7 @@ jobs:
       - name: Build Ghostty.app
         run: |
           cd macos
-          sudo xcode-select -s /Applications/Xcode_16.0.app
+          sudo xcode-select -s /Applications/Xcode_26.0.app
           xcodebuild -target Ghostty -configuration Release
 
       # We inject the "build number" as simply the number of commits since HEAD.
@@ -199,7 +199,7 @@ jobs:
           destination-dir: ./
 
   build-macos-debug:
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     steps:
       - name: Checkout code
@@ -209,10 +209,10 @@ jobs:
           fetch-depth: 0
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -246,7 +246,7 @@ jobs:
       - name: Build Ghostty.app
         run: |
           cd macos
-          sudo xcode-select -s /Applications/Xcode_16.0.app
+          sudo xcode-select -s /Applications/Xcode_26.0.app
           xcodebuild -target Ghostty -configuration Release
 
       # We inject the "build number" as simply the number of commits since HEAD.

.github/workflows/release-tag.yml

@@ -77,22 +77,31 @@ jobs:
     needs: [setup]
     env:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
     steps:
       - uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v30
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: Create Tarball
         run: |
-          git archive --format=tgz --prefix="ghostty-${GHOSTTY_VERSION}/" -o "ghostty-${GHOSTTY_VERSION}.tar.gz" HEAD
+          nix develop -c zig build distcheck
-          git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD
+          cp zig-out/dist/ghostty-${GHOSTTY_VERSION}.tar.gz .
 
       - name: Sign Tarball
         run: |
@@ -108,12 +117,10 @@ jobs:
           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
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     env:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
@@ -123,16 +130,16 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_16.4.app
 
       - name: Setup Sparkle
         env:
@@ -281,7 +288,7 @@ jobs:
 
   appcast:
     needs: [setup, build-macos]
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     env:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
       GHOSTTY_BUILD: ${{ needs.setup.outputs.build }}

.github/workflows/release-tip.yml

@@ -101,24 +101,38 @@ jobs:
         )
       }}
     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@v4
-      - uses: cachix/install-nix-action@v30
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
       - name: Create Tarball
-        run: git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD
+        run: |
+          rm -rf zig-out/dist
+          nix develop -c zig build distcheck
+          cp zig-out/dist/*.tar.gz ghostty-source.tar.gz
+
       - name: Sign Tarball
         run: |
           echo -n "${{ secrets.MINISIGN_KEY }}" > minisign.key
           echo -n "${{ secrets.MINISIGN_PASSWORD }}" > minisign.password
           nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password
+
       - name: Update Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -140,7 +154,7 @@ jobs:
         )
       }}
 
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     steps:
       - name: Checkout code
@@ -150,16 +164,16 @@ jobs:
           fetch-depth: 0
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       # Setup Sparkle
       - name: Setup Sparkle
@@ -285,7 +299,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -355,7 +369,7 @@ jobs:
         )
       }}
 
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     steps:
       - name: Checkout code
@@ -365,16 +379,16 @@ jobs:
           fetch-depth: 0
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       # Setup Sparkle
       - name: Setup Sparkle
@@ -493,7 +507,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true
@@ -530,7 +544,7 @@ jobs:
         )
       }}
 
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     timeout-minutes: 90
     steps:
       - name: Checkout code
@@ -540,16 +554,16 @@ jobs:
           fetch-depth: 0
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       # Setup Sparkle
       - name: Setup Sparkle
@@ -668,7 +682,7 @@ jobs:
 
       # Update Release
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v2.3.2
         with:
           name: 'Ghostty Tip ("Nightly")'
           prerelease: true

.github/workflows/test.yml

@@ -8,15 +8,22 @@ name: Test
 jobs:
   required:
     name: "Required Checks: Test"
-    runs-on: namespace-profile-ghostty-sm
+    runs-on: namespace-profile-ghostty-xsm
     needs:
-      - build
       - build-bench
+      - build-dist
+      - build-flatpak
+      - build-linux
       - build-linux-libghostty
       - build-nix
+      - build-snap
       - build-macos
+      - build-macos-tahoe
       - build-macos-matrix
       - build-windows
+      - build-windows-cross
+      - flatpak-check-zig-cache
+      - flatpak
       - test
       - test-gtk
       - test-sentry-linux
@@ -24,7 +31,11 @@ jobs:
       - prettier
       - alejandra
       - typos
+      - translations
+      - blueprint-compiler
       - test-pkg-linux
+      - test-debian-12
+      - zig-fmt
     steps:
       - id: status
         name: Determine status
@@ -45,52 +56,6 @@ jobs:
           echo "One or more required build workflows failed: ${{ steps.status.outputs.results }}"
           exit 1
 
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["namespace-profile-ghostty-md"]
-
-        target: [
-            aarch64-linux,
-            x86_64-linux,
-            x86-windows-gnu,
-            x86_64-windows-gnu,
-            # We don't support cross-compiling to macOS because the macOS build
-            # requires xcode due to the swift harness.
-            #aarch64-macos,
-            #x86_64-macos,
-          ]
-    runs-on: ${{ matrix.os }}
-    needs: test
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
-        with:
-          path: |
-            /nix
-            /zig
-
-      # 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 }}"
-
-      # Cross-compile the binary. We always use static building for this
-      # because its the only way to access the headers.
-      - name: Test Build
-        run: nix develop -c zig build -Dapp-runtime=glfw -Dtarget=${{ matrix.target }}
-
   build-bench:
     # We build benchmarks on large because it uses ReleaseFast
     runs-on: namespace-profile-ghostty-lg
@@ -103,17 +68,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -121,6 +86,73 @@ jobs:
       - name: Build Benchmarks
         run: nix develop -c zig build -Dapp-runtime=glfw -Demit-bench
 
+  build-flatpak:
+    strategy:
+      fail-fast: false
+    runs-on: namespace-profile-ghostty-sm
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build with Flatpak
+        run: |
+          nix develop -c \
+            zig build \
+            -Dflatpak=true
+
+  build-linux:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [namespace-profile-ghostty-md, namespace-profile-ghostty-md-arm64]
+    runs-on: ${{ matrix.os }}
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Test Build
+        run: nix develop -c zig build -Dapp-runtime=glfw
+
   build-linux-libghostty:
     runs-on: namespace-profile-ghostty-md
     needs: test
@@ -132,17 +164,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -165,42 +197,96 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: Test NixOS package build
+      - name: Test release NixOS package build
-        run: nix build .#ghostty
+        run: nix build .#ghostty-releasefast
+
+      - name: Check version
+        run: result/bin/ghostty +version | grep -q 'builtin.OptimizeMode.ReleaseFast'
+
+      - name: Check to see if the binary has been stripped
+        run: nm result/bin/.ghostty-wrapped 2>&1 | grep -q 'no symbols'
+
+      - name: Test debug NixOS package build
+        run: nix build .#ghostty-debug
+
+      - name: Check version
+        run: result/bin/ghostty +version | grep -q 'builtin.OptimizeMode.Debug'
+
+      - name: Check to see if the binary has not been stripped
+        run: nm result/bin/.ghostty-wrapped 2>&1 | grep -q 'main_ghostty.main'
+
+  build-dist:
+    runs-on: namespace-profile-ghostty-md
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Build and Check Source Tarball
+        run: |
+          rm -rf zig-out/dist
+          nix develop -c zig build distcheck
+          cp zig-out/dist/*.tar.gz ghostty-source.tar.gz
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: source-tarball
+          path: |-
+            ghostty-source.tar.gz
 
   build-macos:
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     needs: test
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: XCode Select
+      - name: Xcode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       - name: get the Zig deps
         id: deps
@@ -211,7 +297,47 @@ jobs:
       - name: Build GhosttyKit
         run: nix develop -c zig build --system ${{ steps.deps.outputs.deps }}
 
-      # The native app is built with native XCode tooling. This also does
+      # 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 && xcodebuild -target Ghostty
+
+      # Build the iOS target without code signing just to verify it works.
+      - name: Build Ghostty iOS
+        run: |
+          cd macos
+          xcodebuild -target Ghostty-iOS "CODE_SIGNING_ALLOWED=NO"
+
+  build-macos-tahoe:
+    runs-on: namespace-profile-ghostty-macos-tahoe
+    needs: test
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # TODO(tahoe): https://github.com/NixOS/nix/issues/13342
+      - uses: DeterminateSystems/nix-installer-action@main
+        with:
+          determinate: true
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      - name: Xcode Select
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
+
+      - name: get the Zig deps
+        id: deps
+        run: nix build -L .#deps && echo "deps=$(readlink ./result)" >> $GITHUB_OUTPUT
+
+      # GhosttyKit is the framework that is built from Zig for our native
+      # Mac app to access.
+      - name: Build GhosttyKit
+        run: nix develop -c zig build --system ${{ steps.deps.outputs.deps }}
+
+      # 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
@@ -224,23 +350,23 @@ jobs:
           xcodebuild -target Ghostty-iOS "CODE_SIGNING_ALLOWED=NO"
 
   build-macos-matrix:
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     needs: test
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: XCode Select
+      - name: Xcode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       - name: get the Zig deps
         id: deps
@@ -276,6 +402,43 @@ jobs:
           nix develop -c zig build --system ${{ steps.deps.outputs.deps }} -Dapp-runtime=glfw -Drenderer=metal -Dfont-backend=coretext_harfbuzz
           nix develop -c zig build --system ${{ steps.deps.outputs.deps }} -Dapp-runtime=glfw -Drenderer=metal -Dfont-backend=coretext_noshape
 
+  build-snap:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          [namespace-profile-ghostty-snap, namespace-profile-ghostty-snap-arm64]
+    runs-on: ${{ matrix.os }}
+    needs: [test, build-dist]
+    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@v4
+        with:
+          name: source-tarball
+      - 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@v1.2.8
+        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@v1
+        with:
+          path: dist
+
   build-windows:
     runs-on: windows-2022
     # this will not stop other jobs from running
@@ -344,6 +507,52 @@ jobs:
         shell: pwsh
         run: Get-Content -Path ".\build.log"
 
+  build-windows-cross:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["namespace-profile-ghostty-md"]
+
+        target: [
+            x86-windows-gnu,
+            x86_64-windows-gnu,
+            # We don't support cross-compiling to macOS or Linux because
+            # we require system libraries.
+            #aarch64-linux,
+            #x86_64-linux,
+            #aarch64-macos,
+            #x86_64-macos,
+          ]
+    runs-on: ${{ matrix.os }}
+    needs: test
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+
+      # Install Nix and use that to run our tests so our environment matches exactly.
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+
+      # Cross-compile the binary. We always use static building for this
+      # because its the only way to access the headers.
+      - name: Test Build
+        run: nix develop -c zig build -Dapp-runtime=glfw -Dtarget=${{ matrix.target }}
+
   test:
     if: github.repository == 'ghostty-org/ghostty'
     runs-on: namespace-profile-ghostty-md
@@ -355,17 +564,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -374,7 +583,7 @@ jobs:
         run: nix develop -c zig build -Dapp-runtime=none test
 
       - name: Test GTK Build
-        run: nix develop -c zig build -Dapp-runtime=gtk -Dgtk-adwaita=true -Demit-docs
+        run: nix develop -c zig build -Dapp-runtime=gtk -Demit-docs
 
       - name: Test GLFW Build
         run: nix develop -c zig build -Dapp-runtime=glfw
@@ -387,10 +596,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        adwaita: ["true", "false"]
         x11: ["true", "false"]
         wayland: ["true", "false"]
-    name: GTK adwaita=${{ matrix.adwaita }} x11=${{ matrix.x11 }} wayland=${{ matrix.wayland }}
+    name: GTK x11=${{ matrix.x11 }} wayland=${{ matrix.wayland }}
     runs-on: namespace-profile-ghostty-sm
     needs: test
     env:
@@ -401,17 +609,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -421,7 +629,6 @@ jobs:
           nix develop -c \
             zig build \
             -Dapp-runtime=gtk \
-            -Dgtk-adwaita=${{ matrix.adwaita }} \
             -Dgtk-x11=${{ matrix.x11 }} \
             -Dgtk-wayland=${{ matrix.wayland }}
 
@@ -441,17 +648,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -461,23 +668,23 @@ jobs:
           nix develop -c zig build -Dsentry=${{ matrix.sentry }}
 
   test-macos:
-    runs-on: namespace-profile-ghostty-macos
+    runs-on: namespace-profile-ghostty-macos-sequoia
     needs: test
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
-      - name: XCode Select
+      - name: Xcode Select
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_26.0.app
 
       - name: get the Zig deps
         id: deps
@@ -486,9 +693,9 @@ jobs:
       - name: test
         run: nix develop -c zig build test --system ${{ steps.deps.outputs.deps }}
 
-  prettier:
+  zig-fmt:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-sm
+    runs-on: namespace-profile-ghostty-xsm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -496,15 +703,42 @@ jobs:
     steps:
       - uses: actions/checkout@v4 # Check out repo so we can lint it
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          skipPush: true
+          useDaemon: false # sometimes fails on short jobs
+      - name: zig fmt
+        run: nix develop -c zig fmt --check .
+
+  prettier:
+    if: github.repository == 'ghostty-org/ghostty'
+    runs-on: namespace-profile-ghostty-xsm
+    timeout-minutes: 60
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - uses: actions/checkout@v4 # Check out repo so we can lint it
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -515,7 +749,7 @@ jobs:
 
   alejandra:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-sm
+    runs-on: namespace-profile-ghostty-xsm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -523,15 +757,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4 # Check out repo so we can lint it
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -542,7 +776,7 @@ jobs:
 
   typos:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-sm
+    runs-on: namespace-profile-ghostty-xsm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -550,15 +784,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4 # Check out repo so we can lint it
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -567,6 +801,62 @@ jobs:
       - name: typos check
         run: nix develop -c typos
 
+  translations:
+    if: github.repository == 'ghostty-org/ghostty'
+    runs-on: namespace-profile-ghostty-xsm
+    timeout-minutes: 60
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - uses: actions/checkout@v4 # Check out repo so we can lint it
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          skipPush: true
+          useDaemon: false # sometimes fails on short jobs
+      - name: check translations
+        run: nix develop -c .github/scripts/check-translations.sh
+
+  blueprint-compiler:
+    if: github.repository == 'ghostty-org/ghostty'
+    runs-on: namespace-profile-ghostty-xsm
+    timeout-minutes: 60
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - uses: actions/checkout@v4 # Check out repo so we can lint it
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+      - uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          skipPush: true
+          useDaemon: false # sometimes fails on short jobs
+      - name: check blueprints
+        run: nix develop -c ./nix/build-support/check-blueprints.sh
+      - name: check unchanged
+        run: git diff --exit-code
+
   test-pkg-linux:
     strategy:
       fail-fast: false
@@ -583,17 +873,17 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
+      - uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -601,3 +891,85 @@ jobs:
       - name: Test ${{ matrix.pkg }} Build
         run: |
           nix develop -c sh -c "cd pkg/${{ matrix.pkg }} ; zig build test"
+
+  test-debian-12:
+    name: Test build on Debian 12
+    runs-on: namespace-profile-ghostty-sm
+    needs: [test, build-dist]
+    steps:
+      - name: Install and configure Namespace CLI
+        uses: namespacelabs/nscloud-setup@v0
+
+      - name: Configure Namespace powered Buildx
+        uses: namespacelabs/nscloud-setup-buildx-action@v0
+
+      - name: Download Source Tarball Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: source-tarball
+
+      - name: Extract tarball
+        run: |
+          mkdir dist
+          tar --verbose --extract --strip-components 1 --directory dist --file ghostty-source.tar.gz
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: dist
+          file: dist/src/build/docker/debian/Dockerfile
+          build-args: |
+            DISTRO_VERSION=12
+
+  flatpak-check-zig-cache:
+    if: github.repository == 'ghostty-org/ghostty'
+    runs-on: namespace-profile-ghostty-xsm
+    env:
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
+        with:
+          path: |
+            /nix
+            /zig
+      - name: Setup Nix
+        uses: cachix/install-nix-action@v31
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+      - uses: cachix/cachix-action@v16
+        with:
+          name: ghostty
+          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
+          useDaemon: false # sometimes fails on short jobs
+      - name: Check Flatpak Zig Dependencies
+        run: nix develop -c ./flatpak/build-support/check-zig-cache.sh
+
+  flatpak:
+    if: github.repository == 'ghostty-org/ghostty'
+    name: "Flatpak"
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-47
+      options: --privileged
+    strategy:
+      fail-fast: false
+      matrix:
+        variant:
+          - arch: x86_64
+            runner: namespace-profile-ghostty-md
+          - arch: aarch64
+            runner: namespace-profile-ghostty-md-arm64
+    runs-on: ${{ matrix.variant.runner }}
+    needs: [flatpak-check-zig-cache, test]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: com.mitchellh.ghostty
+          manifest-path: flatpak/com.mitchellh.ghostty.yml
+          cache-key: flatpak-builder-${{ github.sha }}
+          arch: ${{ matrix.variant.arch }}
+          verbose: true

.github/workflows/update-colorschemes.yml

@@ -22,17 +22,17 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Cache
-        uses: namespacelabs/nscloud-cache-action@v1.2.0
+        uses: namespacelabs/nscloud-cache-action@v1.2.8
         with:
           path: |
             /nix
             /zig
 
       - name: Setup Nix
-        uses: cachix/install-nix-action@v30
+        uses: cachix/install-nix-action@v31
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
+      - uses: cachix/cachix-action@v16
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -50,6 +50,8 @@ jobs:
           if ! git diff --exit-code build.zig.zon; then
             nix develop -c ./nix/build-support/check-zig-cache.sh --update
             nix develop -c ./nix/build-support/check-zig-cache.sh
+            nix develop -c ./flatpak/build-support/check-zig-cache.sh --update
+            nix develop -c ./flatpak/build-support/check-zig-cache.sh
           fi
 
       # Verify the build still works. We choose an arbitrary build type
@@ -67,6 +69,9 @@ jobs:
           add-paths: |
             build.zig.zon
             build.zig.zon.nix
+            build.zig.zon.txt
+            build.zig.zon.json
+            flatpak/zig-packages.json
           body: |
             Upstream revision: https://github.com/mbadolato/iTerm2-Color-Schemes/tree/${{ steps.zig_fetch.outputs.upstream_rev }}
           labels: dependencies

.gitignore

@@ -5,6 +5,7 @@
 .DS_Store
 .vscode/
 .direnv/
+.envrc.local
 .flatpak-builder/
 zig-cache/
 .zig-cache/
@@ -13,9 +14,10 @@ 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
-/build.zig.zon2json-lock

.prettierignore

@@ -11,6 +11,9 @@ 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
 

CODEOWNERS

@@ -78,9 +78,19 @@
 #   the GTK apprt. Also includes X11/Wayland integrations and general
 #   Linux support.
 #
+# - @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.
 #
+# - @ghostty-org/packaging/snap - Ghostty snap packaging
+#   (https://snapcraft.io/ghostty)
+#
 # - @ghostty-org/renderer - Ghostty rendering subsystem, including the
 #   rendering abstractions as well as specific renderers like OpenGL
 #   and Metal.
@@ -138,12 +148,38 @@
 
 # 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/unicode/ @ghostty-org/terminal
 /src/Surface.zig @ghostty-org/terminal
 /src/surface_mouse.zig @ghostty-org/terminal
+
+# 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/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
+
+# Packaging - Snap
+/snap/ @ghostty-org/snap

CONTRIBUTING.md

@@ -21,6 +21,15 @@ 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".
 
+**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.
+Translations usually do not need to go through the process of issue triage
+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!**
 
 1. Search the issue tracker and discussions for similar issues.
@@ -86,6 +95,10 @@ pull request will be accepted with a high degree of certainty.
 > 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

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Mitchell Hashimoto
+Copyright (c) 2024 Mitchell Hashimoto, Ghostty contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

PACKAGING.md

@@ -4,13 +4,12 @@ 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.
 
-> [!NOTE]
+> [!IMPORTANT]
 >
-> While Ghostty went through an extensive private beta testing period,
+> This document is only accurate for the Ghostty source alongside it.
-> packaging Ghostty is immature and may require additional build script
+> **Do not use this document for older or newer versions of Ghostty!** If
-> tweaks and documentation improvement. I'm extremely motivated to work with
+> you are reading this document in a different version of Ghostty, please
-> package maintainers to improve the packaging process. Please open issues
+> find the `PACKAGING.md` file alongside that version.
-> to discuss any packaging issues you encounter.
 
 ## Source Tarballs
 
@@ -23,13 +22,6 @@ https://release.files.ghostty.org/VERSION/ghostty-VERSION.tar.gz
 https://release.files.ghostty.org/VERSION/ghostty-VERSION.tar.gz.minisig
 ```
 
-> [!NOTE]
->
-> **Version 1.0.0 the filename is `ghostty-source.tar.gz`.** Future
-> versions will use the `ghostty-VERSION.tar.gz` format since it is more
-> typical for source tarballs. But for version 1.0.0, the filename is
-> `ghostty-source.tar.gz`.
-
 Signature files are signed with
 [minisign](https://jedisct1.github.io/minisign/)
 using the following public key:
@@ -44,6 +36,19 @@ 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,
@@ -55,7 +60,7 @@ To find the version of Zig required to build Ghostty, check the `required_zig`
 constant in `build.zig`. You don't need to know Zig to extract this information.
 This version will always be an official released version of Zig.
 
-For example, at the time of writing this document, Ghostty requires Zig 0.13.0.
+For example, at the time of writing this document, Ghostty requires Zig 0.14.0.
 
 ## Building Ghostty
 

README.md

@@ -188,8 +188,11 @@ SENTRY_DSN=https://e914ee84fd895c4fe324afa3e53dac76@o4507352570920960.ingest.us.
 ## Developing Ghostty
 
 See the documentation on the Ghostty website for
-[building Ghostty from source](http://ghostty.org/docs/install/build).
+[building Ghostty from a source tarball](http://ghostty.org/docs/install/build).
-For development, omit the `-Doptimize` flag to build a debug 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
@@ -206,6 +209,43 @@ Other useful commands:
   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).
+
+### 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.
+
 ### Linting
 
 #### Prettier
@@ -233,7 +273,7 @@ nix develop -c prettier --write .
 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 Alejanda:
+Nix users can use the following command to format with Alejandra:
 
 ```
 nix develop -c alejandra .

TODO.md

@@ -1,21 +0,0 @@
-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

build.zig

@@ -3,7 +3,7 @@ const builtin = @import("builtin");
 const buildpkg = @import("src/build/main.zig");
 
 comptime {
-    buildpkg.requireZig("0.13.0");
+    buildpkg.requireZig("0.14.0");
 }
 
 pub fn build(b: *std.Build) !void {
@@ -11,34 +11,42 @@ pub fn build(b: *std.Build) !void {
 
     // Ghostty resources like terminfo, shell integration, themes, etc.
     const resources = try buildpkg.GhosttyResources.init(b, &config);
+    const i18n = try buildpkg.GhosttyI18n.init(b, &config);
 
     // Ghostty dependencies used by many artifacts.
     const deps = try buildpkg.SharedDeps.init(b, &config);
-    const exe = try buildpkg.GhosttyExe.init(b, &config, &deps);
     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
-    if (config.emit_docs) {
+    const docs = try buildpkg.GhosttyDocs.init(b, &deps);
-        const docs = try buildpkg.GhosttyDocs.init(b, &deps);
+    if (config.emit_docs) docs.install();
-        docs.install();
-    }
 
     // Ghostty webdata
-    if (config.emit_webdata) {
+    const webdata = try buildpkg.GhosttyWebdata.init(b, &deps);
-        const webdata = try buildpkg.GhosttyWebdata.init(b, &deps);
+    if (config.emit_webdata) webdata.install();
-        webdata.install();
-    }
 
     // Ghostty bench tools
-    if (config.emit_bench) {
+    const bench = try buildpkg.GhosttyBench.init(b, &deps);
-        const bench = try buildpkg.GhosttyBench.init(b, &deps);
+    if (config.emit_bench) bench.install();
-        bench.install();
+
+    // Ghostty dist tarball
+    const dist = try buildpkg.GhosttyDist.init(b, &config);
+    {
+        const step = b.step("dist", "Build the dist tarball");
+        step.dependOn(dist.install_step);
+        const check_step = b.step("distcheck", "Install and validate the dist tarball");
+        check_step.dependOn(dist.check_step);
+        check_step.dependOn(dist.install_step);
     }
 
     // If we're not building libghostty, then install the exe and resources.
     if (config.app_runtime != .none) {
         exe.install();
         resources.install();
+        i18n.install();
     }
 
     // Libghostty
@@ -48,7 +56,7 @@ pub fn build(b: *std.Build) !void {
     // 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.isDarwin()) darwin: {
+        if (config.target.result.os.tag.isDarwin()) darwin: {
             if (!config.emit_xcframework) break :darwin;
 
             // Build the xcframework
@@ -58,6 +66,7 @@ pub fn build(b: *std.Build) !void {
             // 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.
@@ -80,6 +89,16 @@ pub fn build(b: *std.Build) !void {
     {
         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"),
+        );
+
         const run_step = b.step("run", "Run the app");
         run_step.dependOn(&run_cmd.step);
     }
@@ -91,9 +110,15 @@ pub fn build(b: *std.Build) !void {
 
         const test_exe = b.addTest(.{
             .name = "ghostty-test",
-            .root_source_file = b.path("src/main.zig"),
+            .filters = if (test_filter) |v| &.{v} else &.{},
-            .target = config.target,
+            .root_module = b.createModule(.{
-            .filter = test_filter,
+                .root_source_file = b.path("src/main.zig"),
+                .target = config.target,
+                .optimize = .Debug,
+                .strip = false,
+                .omit_frame_pointer = false,
+                .unwind_tables = .sync,
+            }),
         });
 
         {
@@ -103,4 +128,11 @@ pub fn build(b: *std.Build) !void {
             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.
+    {
+        const step = b.step("update-translations", "Update translation files");
+        step.dependOn(i18n.update_step);
+    }
 }

build.zig.zon

@@ -1,90 +1,111 @@
 .{
-    .name = "ghostty",
+    .name = .ghostty,
-    .version = "1.1.2",
+    .version = "1.1.4",
     .paths = .{""},
+    .fingerprint = 0x64407a2a0b4147e5,
     .dependencies = .{
         // Zig libs
+
         .libxev = .{
-            .url = "https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz",
+            // mitchellh/libxev
-            .hash = "1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c",
+            .url = "https://github.com/mitchellh/libxev/archive/75a10d0fb374e8eb84948dcfc68d865e755e59c2.tar.gz",
-        },
+            .hash = "libxev-0.0.0-86vtcyMBEwA-UpcjfOICyI2GYG8o6MiRbinS1_8g1_rw",
-        .mach_glfw = .{
-            .url = "https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz",
-            .hash = "12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62",
             .lazy = true,
         },
         .vaxis = .{
-            .url = "git+https://github.com/rockorager/libvaxis/?ref=main#6d729a2dc3b934818dffe06d2ba3ce02841ed74b",
+            // rockorager/libvaxis
-            .hash = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f",
+            .url = "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23",
+            .hash = "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn",
+            .lazy = true,
         },
         .z2d = .{
-            .url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a",
+            // vancluever/z2d
-            .hash = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a",
+            .url = "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz",
+            .hash = "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg",
+            .lazy = true,
         },
         .zig_objc = .{
-            .url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz",
+            // mitchellh/zig-objc
-            .hash = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634",
+            .url = "https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz",
+            .hash = "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt",
+            .lazy = true,
         },
         .zig_js = .{
-            .url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz",
+            // mitchellh/zig-js
-            .hash = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc",
+            .url = "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz",
+            .hash = "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ",
+            .lazy = true,
         },
         .ziglyph = .{
             .url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz",
-            .hash = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25",
+            .hash = "ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf",
+            .lazy = true,
         },
         .zig_wayland = .{
-            .url = "https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz",
+            // codeberg ifreund/zig-wayland
-            .hash = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38",
+            .url = "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz",
+            .hash = "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy",
         },
         .zf = .{
-            .url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd",
+            // natecraddock/zf
-            .hash = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8",
+            .url = "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz",
+            .hash = "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9",
+            .lazy = true,
         },
         .gobject = .{
-            .url = "https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst",
+            // https://github.com/jcollie/ghostty-gobject based on zig_gobject
-            .hash = "12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d",
+            // Temporary until we generate them at build time automatically.
+            .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,
         },
 
         // C libs
-        .cimgui = .{ .path = "./pkg/cimgui" },
+        .cimgui = .{ .path = "./pkg/cimgui", .lazy = true },
-        .fontconfig = .{ .path = "./pkg/fontconfig" },
+        .fontconfig = .{ .path = "./pkg/fontconfig", .lazy = true },
-        .freetype = .{ .path = "./pkg/freetype" },
+        .freetype = .{ .path = "./pkg/freetype", .lazy = true },
-        .harfbuzz = .{ .path = "./pkg/harfbuzz" },
+        .glfw = .{ .path = "./pkg/glfw", .lazy = true },
-        .highway = .{ .path = "./pkg/highway" },
+        .gtk4_layer_shell = .{ .path = "./pkg/gtk4-layer-shell", .lazy = true },
-        .libpng = .{ .path = "./pkg/libpng" },
+        .harfbuzz = .{ .path = "./pkg/harfbuzz", .lazy = true },
-        .macos = .{ .path = "./pkg/macos" },
+        .highway = .{ .path = "./pkg/highway", .lazy = true },
-        .oniguruma = .{ .path = "./pkg/oniguruma" },
+        .libintl = .{ .path = "./pkg/libintl", .lazy = true },
-        .opengl = .{ .path = "./pkg/opengl" },
+        .libpng = .{ .path = "./pkg/libpng", .lazy = true },
-        .sentry = .{ .path = "./pkg/sentry" },
+        .macos = .{ .path = "./pkg/macos", .lazy = true },
-        .simdutf = .{ .path = "./pkg/simdutf" },
+        .oniguruma = .{ .path = "./pkg/oniguruma", .lazy = true },
-        .utfcpp = .{ .path = "./pkg/utfcpp" },
+        .opengl = .{ .path = "./pkg/opengl", .lazy = true },
-        .wuffs = .{ .path = "./pkg/wuffs" },
+        .sentry = .{ .path = "./pkg/sentry", .lazy = true },
-        .zlib = .{ .path = "./pkg/zlib" },
+        .simdutf = .{ .path = "./pkg/simdutf", .lazy = true },
+        .utfcpp = .{ .path = "./pkg/utfcpp", .lazy = true },
+        .wuffs = .{ .path = "./pkg/wuffs", .lazy = true },
+        .zlib = .{ .path = "./pkg/zlib", .lazy = true },
 
         // Shader translation
-        .glslang = .{ .path = "./pkg/glslang" },
+        .glslang = .{ .path = "./pkg/glslang", .lazy = true },
-        .spirv_cross = .{ .path = "./pkg/spirv-cross" },
+        .spirv_cross = .{ .path = "./pkg/spirv-cross", .lazy = true },
 
         // Wayland
         .wayland = .{
             .url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz",
-            .hash = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f",
+            .hash = "N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t",
+            .lazy = true,
         },
         .wayland_protocols = .{
             .url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz",
-            .hash = "12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef",
+            .hash = "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S",
+            .lazy = true,
         },
         .plasma_wayland_protocols = .{
-            .url = "git+https://github.com/KDE/plasma-wayland-protocols?ref=main#db525e8f9da548cffa2ac77618dd0fbe7f511b86",
+            .url = "https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz",
-            .hash = "12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566",
+            .hash = "N-V-__8AAKYZBAB-CFHBKs3u4JkeiT4BMvyHu3Y5aaWF3Bbs",
+            .lazy = true,
         },
 
         // Other
         .apple_sdk = .{ .path = "./pkg/apple-sdk" },
         .iterm2_themes = .{
-            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz",
+            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/6fa671fdc1daf1fcfa025cb960ffa3e7373a2ed8.tar.gz",
-            .hash = "12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3",
+            .hash = "N-V-__8AAGHcWgTaKLjwmFkxToNT4jgz5VXUHR7hz8TQ2_AS",
+            .lazy = true,
         },
     },
 }

build.zig.zon.json

@@ -0,0 +1,172 @@
+{
+  "N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ": {
+    "name": "breakpad",
+    "url": "https://deps.files.ghostty.org/breakpad-b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz",
+    "hash": "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk="
+  },
+  "N-V-__8AAIrfdwARSa-zMmxWwFuwpXf1T3asIN7s5jqi9c1v": {
+    "name": "fontconfig",
+    "url": "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz",
+    "hash": "sha256-O6LdkhWHGKzsXKrxpxYEO1qgVcJ7CB2RSvPMtA3OilU="
+  },
+  "N-V-__8AAKLKpwC4H27Ps_0iL3bPkQb-z6ZVSrB-x_3EEkub": {
+    "name": "freetype",
+    "url": "https://deps.files.ghostty.org/freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz",
+    "hash": "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw="
+  },
+  "N-V-__8AADcZkgn4cMhTUpIz6mShCKyqqB-NBtf_S2bHaTC-": {
+    "name": "gettext",
+    "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.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR": {
+    "name": "gobject",
+    "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",
+    "url": "https://deps.files.ghostty.org/gtk4-layer-shell-1.1.0.tar.gz",
+    "hash": "sha256-mChCgSYKXu9bT2OlXxbEv2p4ihAgptsDfssPcfozaYg="
+  },
+  "N-V-__8AAG02ugUcWec-Ndp-i7JTsJ0dgF8nnJRUInkGLG7G": {
+    "name": "harfbuzz",
+    "url": "https://deps.files.ghostty.org/harfbuzz-11.0.0.tar.xz",
+    "hash": "sha256-8WNRuv4hRyX+LB1bWfDZPkmQWkskeJn7kNcM/5U6K5s="
+  },
+  "N-V-__8AAGmZhABbsPJLfbqrh6JTHsXhY6qCaLAQyx25e0XE": {
+    "name": "highway",
+    "url": "https://deps.files.ghostty.org/highway-66486a10623fa0d72fe91260f96c892e41aceb06.tar.gz",
+    "hash": "sha256-h9T4iT704I8iSXNgj/6/lCaKgTgLp5wS6IQZaMgKohI="
+  },
+  "N-V-__8AAH0GaQC8a52s6vfIxg88OZgFgEW6DFxfSK4lX_l3": {
+    "name": "imgui",
+    "url": "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz",
+    "hash": "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA="
+  },
+  "N-V-__8AAGHcWgTaKLjwmFkxToNT4jgz5VXUHR7hz8TQ2_AS": {
+    "name": "iterm2_themes",
+    "url": "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/6fa671fdc1daf1fcfa025cb960ffa3e7373a2ed8.tar.gz",
+    "hash": "sha256-g9o2CIc/TfWYoUS/l/HP5KZECD7qNsdQUlFruaKkVz4="
+  },
+  "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-86vtcyMBEwA-UpcjfOICyI2GYG8o6MiRbinS1_8g1_rw": {
+    "name": "libxev",
+    "url": "https://github.com/mitchellh/libxev/archive/75a10d0fb374e8eb84948dcfc68d865e755e59c2.tar.gz",
+    "hash": "sha256-/CSKSuZZfn0aIQlVZ0O8ch5O4gCajYBTTuoetRdo0n4="
+  },
+  "N-V-__8AAG3RoQEyRC2Vw7Qoro5SYBf62IHn3HjqtNVY6aWK": {
+    "name": "libxml2",
+    "url": "https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz",
+    "hash": "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU="
+  },
+  "N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c": {
+    "name": "oniguruma",
+    "url": "https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz",
+    "hash": "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA="
+  },
+  "N-V-__8AADYiAAB_80AWnH1AxXC0tql9thT-R-DYO1gBqTLc": {
+    "name": "pixels",
+    "url": "https://deps.files.ghostty.org/pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz",
+    "hash": "sha256-Veg7FtCRCCUCvxSb9FfzH0IJLFmCZQ4/+657SIcb8Ro="
+  },
+  "N-V-__8AAKYZBAB-CFHBKs3u4JkeiT4BMvyHu3Y5aaWF3Bbs": {
+    "name": "plasma_wayland_protocols",
+    "url": "https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz",
+    "hash": "sha256-XFi6IUrNjmvKNCbcCLAixGqN2Zeymhs+KLrfccIN9EE="
+  },
+  "N-V-__8AAPlZGwBEa-gxrcypGBZ2R8Bse4JYSfo_ul8i2jlG": {
+    "name": "sentry",
+    "url": "https://deps.files.ghostty.org/sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz",
+    "hash": "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8="
+  },
+  "N-V-__8AANb6pwD7O1WG6L5nvD_rNMvnSc9Cpg1ijSlTYywv": {
+    "name": "spirv_cross",
+    "url": "https://deps.files.ghostty.org/spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz",
+    "hash": "sha256-tStvz8Ref6abHwahNiwVVHNETizAmZVVaxVsU7pmV+M="
+  },
+  "N-V-__8AAHffAgDU0YQmynL8K35WzkcnMUmBVQHQ0jlcKpjH": {
+    "name": "utfcpp",
+    "url": "https://deps.files.ghostty.org/utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz",
+    "hash": "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8="
+  },
+  "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn": {
+    "name": "vaxis",
+    "url": "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23",
+    "hash": "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY="
+  },
+  "N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t": {
+    "name": "wayland",
+    "url": "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz",
+    "hash": "sha256-6kGR1o5DdnflHzqs3ieCmBAUTpMdOXoyfcYDXiw5xQ0="
+  },
+  "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S": {
+    "name": "wayland_protocols",
+    "url": "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz",
+    "hash": "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg="
+  },
+  "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs": {
+    "name": "wuffs",
+    "url": "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz",
+    "hash": "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM="
+  },
+  "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg": {
+    "name": "z2d",
+    "url": "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz",
+    "hash": "sha256-wfadegeixcbgxRzRtf6M2H34CTuvDM22XVIhuufFBG4="
+  },
+  "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9": {
+    "name": "zf",
+    "url": "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz",
+    "hash": "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I="
+  },
+  "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM": {
+    "name": "zg",
+    "url": "git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc",
+    "hash": "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA="
+  },
+  "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ": {
+    "name": "zig_js",
+    "url": "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz",
+    "hash": "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0="
+  },
+  "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt": {
+    "name": "zig_objc",
+    "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": {
+    "name": "zigimg",
+    "url": "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d",
+    "hash": "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0="
+  },
+  "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",
+    "url": "https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz",
+    "hash": "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw="
+  }
+}

build.zig.zon.nix

@@ -1,22 +1,20 @@
-# generated by zon2nix (https://github.com/Cloudef/zig2nix)
+# generated by zon2nix (https://github.com/jcollie/zon2nix)
 {
   lib,
   linkFarm,
   fetchurl,
   fetchgit,
   runCommandLocal,
-  zig,
+  zig_0_14,
   name ? "zig-packages",
-}:
+}: let
-with builtins;
-with lib; let
   unpackZigArtifact = {
     name,
     artifact,
   }:
     runCommandLocal name
     {
-      nativeBuildInputs = [zig];
+      nativeBuildInputs = [zig_0_14];
     }
     ''
       hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
@@ -38,12 +36,12 @@ with lib; let
     url,
     hash,
   }: let
-    parts = splitString "#" url;
+    parts = lib.splitString "#" url;
-    url_base = elemAt parts 0;
+    url_base = builtins.elemAt parts 0;
-    url_without_query = elemAt (splitString "?" url_base) 0;
+    url_without_query = builtins.elemAt (lib.splitString "?" url_base) 0;
-    rev_base = elemAt parts 1;
+    rev_base = builtins.elemAt parts 1;
     rev =
-      if match "^[a-fA-F0-9]{40}$" rev_base != null
+      if builtins.match "^[a-fA-F0-9]{40}$" rev_base != null
       then rev_base
       else "refs/heads/${rev_base}";
   in
@@ -58,9 +56,9 @@ with lib; let
     url,
     hash,
   }: let
-    parts = splitString "://" url;
+    parts = lib.splitString "://" url;
-    proto = elemAt parts 0;
+    proto = builtins.elemAt parts 0;
-    path = elemAt parts 1;
+    path = builtins.elemAt parts 1;
     fetcher = {
       "git+http" = fetchGitZig {
         inherit name hash;
@@ -84,215 +82,15 @@ with lib; let
 in
   linkFarm name [
     {
-      name = "1220ebf88622c4d502dc59e71347e4d28c47e033f11b59aff774ae5787565c40999c";
+      name = "N-V-__8AALw2uwF_03u4JRkZwRLc3Y9hakkYV7NKRR9-RIZJ";
       path = fetchZigArtifact {
-        name = "libxev";
+        name = "breakpad";
-        url = "https://github.com/mitchellh/libxev/archive/31eed4e337fed7b0149319e5cdbb62b848c24fbd.tar.gz";
+        url = "https://deps.files.ghostty.org/breakpad-b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz";
-        hash = "sha256-VHP90NTytIZ8UZsYRKOOxN490/I6yv6ec40sP8y5MJ8=";
+        hash = "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk=";
       };
     }
     {
-      name = "12206ed982e709e565d536ce930701a8c07edfd2cfdce428683f3f2a601d37696a62";
+      name = "N-V-__8AAIrfdwARSa-zMmxWwFuwpXf1T3asIN7s5jqi9c1v";
-      path = fetchZigArtifact {
-        name = "mach_glfw";
-        url = "https://github.com/mitchellh/mach-glfw/archive/37c2995f31abcf7e8378fba68ddcf4a3faa02de0.tar.gz";
-        hash = "sha256-HhXIvWUS8/CHWY4VXPG2ZEo+we8XOn3o5rYJCQ1n8Nk=";
-      };
-    }
-    {
-      name = "1220736fa4ba211162c7a0e46cc8fe04d95921927688bff64ab5da7420d098a7272d";
-      path = fetchZigArtifact {
-        name = "glfw";
-        url = "https://github.com/mitchellh/glfw/archive/b552c6ec47326b94015feddb36058ea567b87159.tar.gz";
-        hash = "sha256-IeBVAOQmtyFqVxzuXPek1onuPwIamcOyYtxqKpPEQjU=";
-      };
-    }
-    {
-      name = "12202adbfecdad671d585c9a5bfcbd5cdf821726779430047742ce1bf94ad67d19cb";
-      path = fetchZigArtifact {
-        name = "xcode_frameworks";
-        url = "https://github.com/mitchellh/xcode-frameworks/archive/69801c154c39d7ae6129ea1ba8fe1afe00585fc8.tar.gz";
-        hash = "sha256-mP/I2coL57UJm/3+4Q8sPAgQwk8V4zM+S4VBBTrX2To=";
-      };
-    }
-    {
-      name = "122004bfd4c519dadfb8e6281a42fc34fd1aa15aea654ea8a492839046f9894fa2cf";
-      path = fetchZigArtifact {
-        name = "vulkan_headers";
-        url = "https://github.com/mitchellh/vulkan-headers/archive/04c8a0389d5a0236a96312988017cd4ce27d8041.tar.gz";
-        hash = "sha256-K+zrRudgHFukOM6En1StRYRMNYkeRk+qHTXvrXaG+FU=";
-      };
-    }
-    {
-      name = "1220b3164434d2ec9db146a40bf3a30f490590d68fa8529776a3138074f0da2c11ca";
-      path = fetchZigArtifact {
-        name = "wayland_headers";
-        url = "https://github.com/mitchellh/wayland-headers/archive/5f991515a29f994d87b908115a2ab0b899474bd1.tar.gz";
-        hash = "sha256-uFilLZinKkZt6RdVTV3lUmJpzpswDdFva22FvwU/XQI=";
-      };
-    }
-    {
-      name = "122089c326186c84aa2fd034b16abc38f3ebf4862d9ae106dc1847ac44f557b36465";
-      path = fetchZigArtifact {
-        name = "x11_headers";
-        url = "https://github.com/mitchellh/x11-headers/archive/2ffbd62d82ff73ec929dd8de802bc95effa0ef88.tar.gz";
-        hash = "sha256-EhV2bmTY/OMYN1wEul35gD0hQgS/Al262jO3pVr0O+c=";
-      };
-    }
-    {
-      name = "12200df4ebeaed45de26cb2c9f3b6f3746d8013b604e035dae658f86f586c8c91d2f";
-      path = fetchZigArtifact {
-        name = "vaxis";
-        url = "git+https://github.com/rockorager/libvaxis/?ref=main#6d729a2dc3b934818dffe06d2ba3ce02841ed74b";
-        hash = "sha256-fFf79fCy4QQFVNcN722tSMjB6FyVEzCB36oH1olk9JQ=";
-      };
-    }
-    {
-      name = "1220dd654ef941fc76fd96f9ec6adadf83f69b9887a0d3f4ee5ac0a1a3e11be35cf5";
-      path = fetchZigArtifact {
-        name = "zigimg";
-        url = "git+https://github.com/zigimg/zigimg#3a667bdb3d7f0955a5a51c8468eac83210c1439e";
-        hash = "sha256-oLf3YH3yeg4ikVO/GahMCDRMTU31AHkfSnF4rt7xTKo=";
-      };
-    }
-    {
-      name = "122055beff332830a391e9895c044d33b15ea21063779557024b46169fb1984c6e40";
-      path = fetchZigArtifact {
-        name = "zg";
-        url = "https://codeberg.org/atman/zg/archive/v0.13.2.tar.gz";
-        hash = "sha256-2x9hT7bYq9KJYWLVOf21a+QvTG/F7HWT+YK15IMRzNY=";
-      };
-    }
-    {
-      name = "12201f0d542e7541cf492a001d4d0d0155c92f58212fbcb0d224e95edeba06b5416a";
-      path = fetchZigArtifact {
-        name = "z2d";
-        url = "git+https://github.com/vancluever/z2d?ref=v0.4.0#4638bb02a9dc41cc2fb811f092811f6a951c752a";
-        hash = "sha256-YpWXn1J3JKQSCrWB25mAfzd1/T56QstEZnhPzBwxgoM=";
-      };
-    }
-    {
-      name = "1220e17e64ef0ef561b3e4b9f3a96a2494285f2ec31c097721bf8c8677ec4415c634";
-      path = fetchZigArtifact {
-        name = "zig_objc";
-        url = "https://github.com/mitchellh/zig-objc/archive/9b8ba849b0f58fe207ecd6ab7c147af55b17556e.tar.gz";
-        hash = "sha256-H+HIbh2T23uzrsg9/1/vl9Ir1HCAa2pzeTx6zktJH9Q=";
-      };
-    }
-    {
-      name = "12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc";
-      path = fetchZigArtifact {
-        name = "zig_js";
-        url = "https://github.com/mitchellh/zig-js/archive/d0b8b0a57c52fbc89f9d9fecba75ca29da7dd7d1.tar.gz";
-        hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";
-      };
-    }
-    {
-      name = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25";
-      path = fetchZigArtifact {
-        name = "ziglyph";
-        url = "https://deps.files.ghostty.org/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz";
-        hash = "sha256-cse98+Ft8QUjX+P88yyYfaxJOJGQ9M7Ymw7jFxDz89k=";
-      };
-    }
-    {
-      name = "12209ca054cb1919fa276e328967f10b253f7537c4136eb48f3332b0f7cf661cad38";
-      path = fetchZigArtifact {
-        name = "zig_wayland";
-        url = "https://deps.files.ghostty.org/zig-wayland-fbfe3b4ac0b472a27b1f1a67405436c58cbee12d.tar.gz";
-        hash = "sha256-RtAystqK/GRYIquTK1KfD7rRSCrfuzAvCD1Z9DE1ldc=";
-      };
-    }
-    {
-      name = "1220edc3b8d8bedbb50555947987e5e8e2f93871ca3c8e8d4cc8f1377c15b5dd35e8";
-      path = fetchZigArtifact {
-        name = "zf";
-        url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd";
-        hash = "sha256-t6QNrEJZ4GZZsYixjYvpdrYoCmNbG8TTUmGs2MFa4sU=";
-      };
-    }
-    {
-      name = "1220c72c1697dd9008461ead702997a15d8a1c5810247f02e7983b9f74c6c6e4c087";
-      path = fetchZigArtifact {
-        name = "vaxis";
-        url = "git+https://github.com/rockorager/libvaxis/?ref=main#dc0a228a5544988d4a920cfb40be9cd28db41423";
-        hash = "sha256-QWN4jOrA91KlbqmeEHHJ4HTnCC9nmfxt8DHUXJpAzLI=";
-      };
-    }
-    {
-      name = "12208d70ee791d7ef7e16e1c3c9c1127b57f1ed066a24f87d57fc9f730c5dc394b9d";
-      path = fetchZigArtifact {
-        name = "gobject";
-        url = "https://github.com/ianprime0509/zig-gobject/releases/download/v0.2.2/bindings-gnome47.tar.zst";
-        hash = "sha256-UU97kNv/bZzQPKz1djhEDLapLguvfBpFfWVb6FthtcI=";
-      };
-    }
-    {
-      name = "12202cdac858abc52413a6c6711d5026d2d3c8e13f95ca2c327eade0736298bb021f";
-      path = fetchZigArtifact {
-        name = "wayland";
-        url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz";
-        hash = "sha256-m9G72jdG30KH2yQhNBcBJ46OnekzuX0i2uIOyczkpLk=";
-      };
-    }
-    {
-      name = "12201a57c6ce0001aa034fa80fba3e1cd2253c560a45748f4f4dd21ff23b491cddef";
-      path = fetchZigArtifact {
-        name = "wayland_protocols";
-        url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz";
-        hash = "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg=";
-      };
-    }
-    {
-      name = "12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566";
-      path = fetchZigArtifact {
-        name = "plasma_wayland_protocols";
-        url = "git+https://github.com/KDE/plasma-wayland-protocols?ref=main#db525e8f9da548cffa2ac77618dd0fbe7f511b86";
-        hash = "sha256-iWRv3+OfmHxmeCJ8m0ChjgZX6mwXlcFmK8P/Vt8gDj4=";
-      };
-    }
-    {
-      name = "12203d2647e5daf36a9c85b969e03f422540786ce9ea624eb4c26d204fe1f46218f3";
-      path = fetchZigArtifact {
-        name = "iterm2_themes";
-        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/db227d159adc265818f2e898da0f70ef8d7b580e.tar.gz";
-        hash = "sha256-Iyf7U4rpvNkPX4AOEbYSYGte5+SjRwsWD2luOn1Hz8U=";
-      };
-    }
-    {
-      name = "1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402";
-      path = fetchZigArtifact {
-        name = "imgui";
-        url = "https://github.com/ocornut/imgui/archive/e391fe2e66eb1c96b1624ae8444dc64c23146ef4.tar.gz";
-        hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";
-      };
-    }
-    {
-      name = "1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d";
-      path = fetchZigArtifact {
-        name = "freetype";
-        url = "https://github.com/freetype/freetype/archive/refs/tags/VER-2-13-2.tar.gz";
-        hash = "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw=";
-      };
-    }
-    {
-      name = "1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66";
-      path = fetchZigArtifact {
-        name = "libpng";
-        url = "https://github.com/glennrp/libpng/archive/refs/tags/v1.6.43.tar.gz";
-        hash = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=";
-      };
-    }
-    {
-      name = "1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb";
-      path = fetchZigArtifact {
-        name = "zlib";
-        url = "https://github.com/madler/zlib/archive/refs/tags/v1.3.1.tar.gz";
-        hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
-      };
-    }
-    {
-      name = "12201149afb3326c56c05bb0a577f54f76ac20deece63aa2f5cd6ff31a4fa4fcb3b7";
       path = fetchZigArtifact {
         name = "fontconfig";
         url = "https://deps.files.ghostty.org/fontconfig-2.14.2.tar.gz";
@@ -300,91 +98,259 @@ in
       };
     }
     {
-      name = "122032442d95c3b428ae8e526017fad881e7dc78eab4d558e9a58a80bfbd65a64f7d";
+      name = "N-V-__8AAKLKpwC4H27Ps_0iL3bPkQb-z6ZVSrB-x_3EEkub";
       path = fetchZigArtifact {
-        name = "libxml2";
+        name = "freetype";
-        url = "https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.tar.gz";
+        url = "https://deps.files.ghostty.org/freetype-1220b81f6ecfb3fd222f76cf9106fecfa6554ab07ec7fdc4124b9bb063ae2adf969d.tar.gz";
-        hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
+        hash = "sha256-QnIB9dUVFnDQXB9bRb713aHy592XHvVPD+qqf/0quQw=";
       };
     }
     {
-      name = "1220b8588f106c996af10249bfa092c6fb2f35fbacb1505ef477a0b04a7dd1063122";
+      name = "N-V-__8AADcZkgn4cMhTUpIz6mShCKyqqB-NBtf_S2bHaTC-";
       path = fetchZigArtifact {
-        name = "harfbuzz";
+        name = "gettext";
-        url = "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/8.4.0.tar.gz";
+        url = "https://deps.files.ghostty.org/gettext-0.24.tar.gz";
-        hash = "sha256-nxygiYE7BZRK0c6MfgGCEwJtNdybq0gKIeuHaDg5ZVY=";
+        hash = "sha256-yRhQPVk9cNr0hE0XWhPYFq+stmfAb7oeydzVACwVGLc=";
       };
     }
     {
-      name = "12205c83b8311a24b1d5ae6d21640df04f4b0726e314337c043cde1432758cbe165b";
+      name = "N-V-__8AAMrJSwAUGb9-vTzkNR-5LXS81MR__ZRVfF3tWgG6";
       path = fetchZigArtifact {
-        name = "highway";
+        name = "glfw";
-        url = "https://github.com/google/highway/archive/refs/tags/1.1.0.tar.gz";
+        url = "https://github.com/glfw/glfw/archive/e7ea71be039836da3a98cea55ae5569cb5eb885c.tar.gz";
-        hash = "sha256-NUqLRTm1iOcLmOxwhEJz4/J0EwLEw3e8xOgbPRhm98k=";
+        hash = "sha256-M3N1XUAlMebBo5X1Py+9YxjKXgZ6eacqWRCbUmwLKQo=";
       };
     }
     {
-      name = "1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb";
+      name = "N-V-__8AABzkUgISeKGgXAzgtutgJsZc0-kkeqBBscJgMkvy";
-      path = fetchZigArtifact {
-        name = "oniguruma";
-        url = "https://github.com/kkos/oniguruma/archive/refs/tags/v6.9.9.tar.gz";
-        hash = "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA=";
-      };
-    }
-    {
-      name = "1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e";
-      path = fetchZigArtifact {
-        name = "sentry";
-        url = "https://github.com/getsentry/sentry-native/archive/refs/tags/0.7.8.tar.gz";
-        hash = "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8=";
-      };
-    }
-    {
-      name = "12207fd37bb8251919c112dcdd8f616a491857b34a451f7e4486490077206dc2a1ea";
-      path = fetchZigArtifact {
-        name = "breakpad";
-        url = "https://github.com/getsentry/breakpad/archive/b99f444ba5f6b98cac261cbb391d8766b34a5918.tar.gz";
-        hash = "sha256-bMqYlD0amQdmzvYQd8Ca/1k4Bj/heh7+EijlQSttatk=";
-      };
-    }
-    {
-      name = "1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641";
-      path = fetchZigArtifact {
-        name = "utfcpp";
-        url = "https://github.com/nemtrif/utfcpp/archive/refs/tags/v4.0.5.tar.gz";
-        hash = "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8=";
-      };
-    }
-    {
-      name = "122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd";
-      path = fetchZigArtifact {
-        name = "wuffs";
-        url = "https://github.com/google/wuffs/archive/refs/tags/v0.4.0-alpha.9.tar.gz";
-        hash = "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM=";
-      };
-    }
-    {
-      name = "12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806";
-      path = fetchZigArtifact {
-        name = "pixels";
-        url = "git+https://github.com/make-github-pseudonymous-again/pixels?ref=main#d843c2714d32e15b48b8d7eeb480295af537f877";
-        hash = "sha256-kXYGO0qn2PfyOYCrRA49BHIgTzdmKhI8SNO1ZKfUYEE=";
-      };
-    }
-    {
-      name = "12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1";
       path = fetchZigArtifact {
         name = "glslang";
-        url = "https://github.com/KhronosGroup/glslang/archive/refs/tags/14.2.0.tar.gz";
+        url = "https://deps.files.ghostty.org/glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz";
         hash = "sha256-FKLtu1Ccs+UamlPj9eQ12/WXFgS0uDPmPmB26MCpl7U=";
       };
     }
     {
-      name = "1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da";
+      name = "gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR";
+      path = fetchZigArtifact {
+        name = "gobject";
+        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=";
+      };
+    }
+    {
+      name = "N-V-__8AALiNBAA-_0gprYr92CjrMj1I5bqNu0TSJOnjFNSr";
+      path = fetchZigArtifact {
+        name = "gtk4_layer_shell";
+        url = "https://deps.files.ghostty.org/gtk4-layer-shell-1.1.0.tar.gz";
+        hash = "sha256-mChCgSYKXu9bT2OlXxbEv2p4ihAgptsDfssPcfozaYg=";
+      };
+    }
+    {
+      name = "N-V-__8AAG02ugUcWec-Ndp-i7JTsJ0dgF8nnJRUInkGLG7G";
+      path = fetchZigArtifact {
+        name = "harfbuzz";
+        url = "https://deps.files.ghostty.org/harfbuzz-11.0.0.tar.xz";
+        hash = "sha256-8WNRuv4hRyX+LB1bWfDZPkmQWkskeJn7kNcM/5U6K5s=";
+      };
+    }
+    {
+      name = "N-V-__8AAGmZhABbsPJLfbqrh6JTHsXhY6qCaLAQyx25e0XE";
+      path = fetchZigArtifact {
+        name = "highway";
+        url = "https://deps.files.ghostty.org/highway-66486a10623fa0d72fe91260f96c892e41aceb06.tar.gz";
+        hash = "sha256-h9T4iT704I8iSXNgj/6/lCaKgTgLp5wS6IQZaMgKohI=";
+      };
+    }
+    {
+      name = "N-V-__8AAH0GaQC8a52s6vfIxg88OZgFgEW6DFxfSK4lX_l3";
+      path = fetchZigArtifact {
+        name = "imgui";
+        url = "https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz";
+        hash = "sha256-oF/QHgTPEat4Hig4fGIdLkIPHmBEyOJ6JeYD6pnveGA=";
+      };
+    }
+    {
+      name = "N-V-__8AAGHcWgTaKLjwmFkxToNT4jgz5VXUHR7hz8TQ2_AS";
+      path = fetchZigArtifact {
+        name = "iterm2_themes";
+        url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/6fa671fdc1daf1fcfa025cb960ffa3e7373a2ed8.tar.gz";
+        hash = "sha256-g9o2CIc/TfWYoUS/l/HP5KZECD7qNsdQUlFruaKkVz4=";
+      };
+    }
+    {
+      name = "N-V-__8AAJrvXQCqAT8Mg9o_tk6m0yf5Fz-gCNEOKLyTSerD";
+      path = fetchZigArtifact {
+        name = "libpng";
+        url = "https://deps.files.ghostty.org/libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz";
+        hash = "sha256-/syVtGzwXo4/yKQUdQ4LparQDYnp/fF16U/wQcrxoDo=";
+      };
+    }
+    {
+      name = "libxev-0.0.0-86vtcyMBEwA-UpcjfOICyI2GYG8o6MiRbinS1_8g1_rw";
+      path = fetchZigArtifact {
+        name = "libxev";
+        url = "https://github.com/mitchellh/libxev/archive/75a10d0fb374e8eb84948dcfc68d865e755e59c2.tar.gz";
+        hash = "sha256-/CSKSuZZfn0aIQlVZ0O8ch5O4gCajYBTTuoetRdo0n4=";
+      };
+    }
+    {
+      name = "N-V-__8AAG3RoQEyRC2Vw7Qoro5SYBf62IHn3HjqtNVY6aWK";
+      path = fetchZigArtifact {
+        name = "libxml2";
+        url = "https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz";
+        hash = "sha256-bCgFni4+60K1tLFkieORamNGwQladP7jvGXNxdiaYhU=";
+      };
+    }
+    {
+      name = "N-V-__8AAHjwMQDBXnLq3Q2QhaivE0kE2aD138vtX2Bq1g7c";
+      path = fetchZigArtifact {
+        name = "oniguruma";
+        url = "https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz";
+        hash = "sha256-ABqhIC54RI9MC/GkjHblVodrNvFtks4yB+zP1h2Z8qA=";
+      };
+    }
+    {
+      name = "N-V-__8AADYiAAB_80AWnH1AxXC0tql9thT-R-DYO1gBqTLc";
+      path = fetchZigArtifact {
+        name = "pixels";
+        url = "https://deps.files.ghostty.org/pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz";
+        hash = "sha256-Veg7FtCRCCUCvxSb9FfzH0IJLFmCZQ4/+657SIcb8Ro=";
+      };
+    }
+    {
+      name = "N-V-__8AAKYZBAB-CFHBKs3u4JkeiT4BMvyHu3Y5aaWF3Bbs";
+      path = fetchZigArtifact {
+        name = "plasma_wayland_protocols";
+        url = "https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz";
+        hash = "sha256-XFi6IUrNjmvKNCbcCLAixGqN2Zeymhs+KLrfccIN9EE=";
+      };
+    }
+    {
+      name = "N-V-__8AAPlZGwBEa-gxrcypGBZ2R8Bse4JYSfo_ul8i2jlG";
+      path = fetchZigArtifact {
+        name = "sentry";
+        url = "https://deps.files.ghostty.org/sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz";
+        hash = "sha256-KsZJfMjWGo0xCT5HrduMmyxFsWsHBbszSoNbZCPDGN8=";
+      };
+    }
+    {
+      name = "N-V-__8AANb6pwD7O1WG6L5nvD_rNMvnSc9Cpg1ijSlTYywv";
       path = fetchZigArtifact {
         name = "spirv_cross";
-        url = "https://github.com/KhronosGroup/SPIRV-Cross/archive/476f384eb7d9e48613c45179e502a15ab95b6b49.tar.gz";
+        url = "https://deps.files.ghostty.org/spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz";
         hash = "sha256-tStvz8Ref6abHwahNiwVVHNETizAmZVVaxVsU7pmV+M=";
       };
     }
+    {
+      name = "N-V-__8AAHffAgDU0YQmynL8K35WzkcnMUmBVQHQ0jlcKpjH";
+      path = fetchZigArtifact {
+        name = "utfcpp";
+        url = "https://deps.files.ghostty.org/utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz";
+        hash = "sha256-/8ZooxDndgfTk/PBizJxXyI9oerExNbgV5oR345rWc8=";
+      };
+    }
+    {
+      name = "vaxis-0.1.0-BWNV_FUICQAFZnTCL11TUvnUr1Y0_ZdqtXHhd51d76Rn";
+      path = fetchZigArtifact {
+        name = "vaxis";
+        url = "git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23";
+        hash = "sha256-bNZ3oveT6vPChjimPJ/GGfcdivlAeJdl/xfWM+S/MHY=";
+      };
+    }
+    {
+      name = "N-V-__8AAKrHGAAs2shYq8UkE6bGcR1QJtLTyOE_lcosMn6t";
+      path = fetchZigArtifact {
+        name = "wayland";
+        url = "https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz";
+        hash = "sha256-6kGR1o5DdnflHzqs3ieCmBAUTpMdOXoyfcYDXiw5xQ0=";
+      };
+    }
+    {
+      name = "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S";
+      path = fetchZigArtifact {
+        name = "wayland_protocols";
+        url = "https://deps.files.ghostty.org/wayland-protocols-258d8f88f2c8c25a830c6316f87d23ce1a0f12d9.tar.gz";
+        hash = "sha256-XO3K3egbdeYPI+XoO13SuOtO+5+Peb16NH0UiusFMPg=";
+      };
+    }
+    {
+      name = "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs";
+      path = fetchZigArtifact {
+        name = "wuffs";
+        url = "https://deps.files.ghostty.org/wuffs-122037b39d577ec2db3fd7b2130e7b69ef6cc1807d68607a7c232c958315d381b5cd.tar.gz";
+        hash = "sha256-nkzSCr6W5sTG7enDBXEIhgEm574uLD41UVR2wlC+HBM=";
+      };
+    }
+    {
+      name = "z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg";
+      path = fetchZigArtifact {
+        name = "z2d";
+        url = "https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz";
+        hash = "sha256-wfadegeixcbgxRzRtf6M2H34CTuvDM22XVIhuufFBG4=";
+      };
+    }
+    {
+      name = "zf-0.10.3-OIRy8aiIAACLrBllz0zjxaH0aOe5oNm3KtEMyCntST-9";
+      path = fetchZigArtifact {
+        name = "zf";
+        url = "https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz";
+        hash = "sha256-3nulNQd/4rZ4paeXJYXwAliNNyRNsIOX/q3z1JB8C7I=";
+      };
+    }
+    {
+      name = "zg-0.13.4-AAAAAGiZ7QLz4pvECFa_wG4O4TP4FLABHHbemH2KakWM";
+      path = fetchZigArtifact {
+        name = "zg";
+        url = "git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc";
+        hash = "sha256-fo3l6cjkrr/godElTGnQzalBsasN7J73IDIRmw7v1gA=";
+      };
+    }
+    {
+      name = "N-V-__8AAB9YCQBaZtQjJZVndk-g_GDIK-NTZcIa63bFp9yZ";
+      path = fetchZigArtifact {
+        name = "zig_js";
+        url = "https://deps.files.ghostty.org/zig_js-12205a66d423259567764fa0fc60c82be35365c21aeb76c5a7dc99698401f4f6fefc.tar.gz";
+        hash = "sha256-fyNeCVbC9UAaKJY6JhAZlT0A479M/AKYMPIWEZbDWD0=";
+      };
+    }
+    {
+      name = "zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt";
+      path = fetchZigArtifact {
+        name = "zig_objc";
+        url = "https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz";
+        hash = "sha256-zn1tR6xhSmDla4UJ3t+Gni4Ni3R8deSK3tEe7DGzNXw=";
+      };
+    }
+    {
+      name = "wayland-0.4.0-dev-lQa1kjfIAQCmhhQu3xF0KH-94-TzeMXOqfnP0-Dg6Wyy";
+      path = fetchZigArtifact {
+        name = "zig_wayland";
+        url = "https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.tar.gz";
+        hash = "sha256-E77GZ15APYbbO1WzmuJi8eG9/iQFbc2CgkNBxjCLUhk=";
+      };
+    }
+    {
+      name = "zigimg-0.1.0-lly-O6N2EABOxke8dqyzCwhtUCAafqP35zC7wsZ4Ddxj";
+      path = fetchZigArtifact {
+        name = "zigimg";
+        url = "git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d";
+        hash = "sha256-oblfr2FIzuqq0FLo/RrzCwUX1NJJuT53EwD3nP3KwN0=";
+      };
+    }
+    {
+      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=";
+      };
+    }
+    {
+      name = "N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o";
+      path = fetchZigArtifact {
+        name = "zlib";
+        url = "https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz";
+        hash = "sha256-F+iIY/NgBnKrSRgvIXKBtvxNPHYr3jYZNeQ2qVIU0Fw=";
+      };
+    }
   ]

build.zig.zon.txt

@@ -0,0 +1,34 @@
+git+https://codeberg.org/atman/zg#4a002763419a34d61dcbb1f415821b83b9bf8ddc
+git+https://github.com/TUSF/zigimg#31268548fe3276c0e95f318a6c0d2ab10565b58d
+git+https://github.com/rockorager/libvaxis#1f41c121e8fc153d9ce8c6eb64b2bbab68ad7d23
+https://codeberg.org/ifreund/zig-wayland/archive/f3c5d503e540ada8cbcb056420de240af0c094f7.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
+https://deps.files.ghostty.org/gettext-0.24.tar.gz
+https://deps.files.ghostty.org/glslang-12201278a1a05c0ce0b6eb6026c65cd3e9247aa041b1c260324bf29cee559dd23ba1.tar.gz
+https://deps.files.ghostty.org/gtk4-layer-shell-1.1.0.tar.gz
+https://deps.files.ghostty.org/harfbuzz-11.0.0.tar.xz
+https://deps.files.ghostty.org/highway-66486a10623fa0d72fe91260f96c892e41aceb06.tar.gz
+https://deps.files.ghostty.org/imgui-1220bc6b9daceaf7c8c60f3c3998058045ba0c5c5f48ae255ff97776d9cd8bfc6402.tar.gz
+https://deps.files.ghostty.org/libpng-1220aa013f0c83da3fb64ea6d327f9173fa008d10e28bc9349eac3463457723b1c66.tar.gz
+https://deps.files.ghostty.org/libxml2-2.11.5.tar.gz
+https://deps.files.ghostty.org/oniguruma-1220c15e72eadd0d9085a8af134904d9a0f5dfcbed5f606ad60edc60ebeccd9706bb.tar.gz
+https://deps.files.ghostty.org/pixels-12207ff340169c7d40c570b4b6a97db614fe47e0d83b5801a932dcd44917424c8806.tar.gz
+https://deps.files.ghostty.org/plasma_wayland_protocols-12207e0851c12acdeee0991e893e0132fc87bb763969a585dc16ecca33e88334c566.tar.gz
+https://deps.files.ghostty.org/sentry-1220446be831adcca918167647c06c7b825849fa3fba5f22da394667974537a9c77e.tar.gz
+https://deps.files.ghostty.org/spirv_cross-1220fb3b5586e8be67bc3feb34cbe749cf42a60d628d2953632c2f8141302748c8da.tar.gz
+https://deps.files.ghostty.org/utfcpp-1220d4d18426ca72fc2b7e56ce47273149815501d0d2395c2a98c726b31ba931e641.tar.gz
+https://deps.files.ghostty.org/wayland-9cb3d7aa9dc995ffafdbdef7ab86a949d0fb0e7d.tar.gz
+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/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/6fa671fdc1daf1fcfa025cb960ffa3e7373a2ed8.tar.gz
+https://github.com/mitchellh/libxev/archive/75a10d0fb374e8eb84948dcfc68d865e755e59c2.tar.gz
+https://github.com/mitchellh/zig-objc/archive/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz
+https://github.com/natecraddock/zf/archive/7aacbe6d155d64d15937ca95ca6c014905eb531f.tar.gz
+https://github.com/vancluever/z2d/archive/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz

com.mitchellh.ghostty.yml

@@ -1,59 +0,0 @@
-# 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

dist/linux/app.desktop.in

@@ -1,13 +1,15 @@
 [Desktop Entry]
-Name=Ghostty
+Version=1.0
+Name=@NAME@
 Type=Application
 Comment=A terminal emulator
-Exec=ghostty
+TryExec=@GHOSTTY@
+Exec=@GHOSTTY@ --launched-from=desktop
 Icon=com.mitchellh.ghostty
 Categories=System;TerminalEmulator;
 Keywords=terminal;tty;pty;
 StartupNotify=true
-StartupWMClass=com.mitchellh.ghostty
+StartupWMClass=@APPID@
 Terminal=false
 Actions=new-window;
 X-GNOME-UsesNotifications=true
@@ -16,7 +18,8 @@ X-TerminalArgTitle=--title=
 X-TerminalArgAppId=--class=
 X-TerminalArgDir=--working-directory=
 X-TerminalArgHold=--wait-after-command
+DBusActivatable=true
 
 [Desktop Action new-window]
 Name=New Window
-Exec=ghostty
+Exec=@GHOSTTY@ --launched-from=desktop

dist/linux/com.mitchellh.ghostty.metainfo.xml.in

@@ -0,0 +1,59 @@
+<?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>

dist/linux/dbus.service.flatpak.in

@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=@APPID@
+Exec=@GHOSTTY@ --launched-from=dbus

dist/linux/dbus.service.in

@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=@APPID@
+SystemdService=@APPID@.service
+Exec=@GHOSTTY@ --launched-from=dbus

dist/linux/systemd.service.in

@@ -0,0 +1,11 @@
+[Unit]
+Description=@NAME@
+After=graphical-session.target
+
+[Service]
+Type=dbus
+BusName=@APPID@
+ExecStart=@GHOSTTY@ --launched-from=systemd
+
+[Install]
+WantedBy=graphical-session.target

dist/macos/Info.plist

@@ -1,17 +0,0 @@
-<?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>
-

flake.lock

@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1733328505,
+        "lastModified": 1747046372,
-        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -34,46 +34,26 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
+    "nixpkgs": {
       "locked": {
-        "lastModified": 1738255539,
+        "lastModified": 1748189127,
-        "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=",
+        "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
-        "owner": "nixos",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
-        "repo": "nixpkgs",
+        "type": "tarball",
-        "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5",
+        "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
-        "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "type": "tarball",
-        "ref": "release-24.11",
+        "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1738136902,
-        "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
       }
     },
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
-        "nixpkgs-stable": "nixpkgs-stable",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "zig": "zig",
-        "zig2nix": "zig2nix"
+        "zon2nix": "zon2nix"
       }
     },
     "systems": {
@@ -98,15 +78,15 @@
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1738239110,
+        "lastModified": 1748261582,
-        "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=",
+        "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "1a8fb6f3a04724519436355564b95fce5e272504",
+        "rev": "aafb1b093fb838f7a02613b719e85ec912914221",
         "type": "github"
       },
       "original": {
@@ -115,27 +95,27 @@
         "type": "github"
       }
     },
-    "zig2nix": {
+    "zon2nix": {
       "inputs": {
         "flake-utils": [
           "flake-utils"
         ],
         "nixpkgs": [
-          "nixpkgs-stable"
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1738263917,
+        "lastModified": 1742104771,
-        "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=",
+        "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
         "owner": "jcollie",
-        "repo": "zig2nix",
+        "repo": "zon2nix",
-        "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
+        "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
         "type": "github"
       },
       "original": {
         "owner": "jcollie",
-        "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a",
+        "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
-        "repo": "zig2nix",
+        "repo": "zon2nix",
         "type": "github"
       }
     }

flake.nix

@@ -2,12 +2,10 @@
   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-stable.url = "github:nixos/nixpkgs/release-24.11";
+    nixpkgs.url = "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz";
     flake-utils.url = "github:numtide/flake-utils";
 
     # Used for shell.nix
@@ -19,16 +17,16 @@
     zig = {
       url = "github:mitchellh/zig-overlay";
       inputs = {
-        nixpkgs.follows = "nixpkgs-stable";
+        nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
         flake-compat.follows = "";
       };
     };
 
-    zig2nix = {
+    zon2nix = {
-      url = "github:jcollie/zig2nix?ref=c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a";
+      url = "github:jcollie/zon2nix?ref=56c159be489cc6c0e73c3930bd908ddc6fe89613";
       inputs = {
-        nixpkgs.follows = "nixpkgs-stable";
+        nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
       };
     };
@@ -36,22 +34,20 @@
 
   outputs = {
     self,
-    nixpkgs-unstable,
+    nixpkgs,
-    nixpkgs-stable,
     zig,
-    zig2nix,
+    zon2nix,
     ...
   }:
-    builtins.foldl' nixpkgs-stable.lib.recursiveUpdate {} (
+    builtins.foldl' nixpkgs.lib.recursiveUpdate {} (
       builtins.map (
         system: let
-          pkgs-stable = nixpkgs-stable.legacyPackages.${system};
+          pkgs = nixpkgs.legacyPackages.${system};
-          pkgs-unstable = nixpkgs-unstable.legacyPackages.${system};
         in {
-          devShell.${system} = pkgs-stable.callPackage ./nix/devShell.nix {
+          devShell.${system} = pkgs.callPackage ./nix/devShell.nix {
-            zig = zig.packages.${system}."0.13.0";
+            zig = zig.packages.${system}."0.14.1";
-            wraptest = pkgs-stable.callPackage ./nix/wraptest.nix {};
+            wraptest = pkgs.callPackage ./nix/wraptest.nix {};
-            zig2nix = zig2nix;
+            zon2nix = zon2nix;
           };
 
           packages.${system} = let
@@ -61,30 +57,29 @@
               revision = self.shortRev or self.dirtyShortRev or "dirty";
             };
           in rec {
-            deps = pkgs-stable.callPackage ./build.zig.zon.nix {};
+            deps = pkgs.callPackage ./build.zig.zon.nix {};
-            ghostty-debug = pkgs-stable.callPackage ./nix/package.nix (mkArgs "Debug");
+            ghostty-debug = pkgs.callPackage ./nix/package.nix (mkArgs "Debug");
-            ghostty-releasesafe = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
+            ghostty-releasesafe = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseSafe");
-            ghostty-releasefast = pkgs-stable.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
+            ghostty-releasefast = pkgs.callPackage ./nix/package.nix (mkArgs "ReleaseFast");
 
             ghostty = ghostty-releasefast;
             default = ghostty;
           };
 
-          formatter.${system} = pkgs-stable.alejandra;
+          formatter.${system} = pkgs.alejandra;
 
           apps.${system} = let
             runVM = (
               module: let
                 vm = import ./nix/vm/create.nix {
-                  inherit system module;
+                  inherit system module nixpkgs;
-                  nixpkgs = nixpkgs-stable;
                   overlay = self.overlays.debug;
                 };
-                program = pkgs-stable.writeShellScript "run-ghostty-vm" ''
+                program = pkgs.writeShellScript "run-ghostty-vm" ''
                   SHARED_DIR=$(pwd)
                   export SHARED_DIR
 
-                  ${pkgs-stable.lib.getExe vm.config.system.build.vm} "$@"
+                  ${pkgs.lib.getExe vm.config.system.build.vm} "$@"
                 '';
               in {
                 type = "app";

flatpak/build-support/check-zig-cache.sh

@@ -0,0 +1,108 @@
+#!/usr/bin/env bash
+#
+# This script checks if the flatpak/zig-packages.json file is up-to-date.
+# If the `--update` flag is passed, it will update all necessary
+# files to be up to date.
+#
+# The files owned by this are:
+#
+#   - flatpak/zig-packages.json
+#
+# All of these are auto-generated and should not be edited manually.
+
+# Nothing in this script should fail.
+set -eu
+set -o pipefail
+
+WORK_DIR=$(mktemp -d)
+
+if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
+  echo "could not create temp dir"
+  exit 1
+fi
+
+function cleanup {
+  rm -rf "$WORK_DIR"
+}
+
+trap cleanup EXIT
+
+help() {
+  echo ""
+  echo "To fix, please (manually) re-run the script from the repository root,"
+  echo "commit, and submit a PR with the update:"
+  echo ""
+  echo "    ./flatpak/build-support/check-zig-cache.sh --update"
+  echo "    git add flatpak/zig-packages.json"
+  echo "    git commit -m \"flatpak: update zig-packages.json\""
+  echo ""
+}
+
+# Turn Nix's base64 hashes into regular hexadecimal form
+decode_hash() {
+  input=$1
+  input=${input#sha256-}
+  echo "$input" | base64 -d | od -vAn -t x1 | tr -d ' \n'
+}
+
+ROOT="$(realpath "$(dirname "$0")/../../")"
+ZIG_PACKAGES_JSON="$ROOT/flatpak/zig-packages.json"
+BUILD_ZIG_ZON_JSON="$ROOT/build.zig.zon.json"
+
+if [ ! -f "${BUILD_ZIG_ZON_JSON}" ]; then
+  echo -e "\nERROR: build.zig.zon2json-lock missing."
+  help
+  exit 1
+fi
+
+if [ -f "${ZIG_PACKAGES_JSON}" ]; then
+  OLD_HASH=$(sha512sum "${ZIG_PACKAGES_JSON}" | awk '{print $1}')
+fi
+
+while read -r url sha256 dest; do
+  src_type=archive
+  sha256=$(decode_hash "$sha256")
+  git_commit=
+  if [[ "$url" =~ ^git\+* ]]; then
+    src_type=git
+    sha256=
+    url=${url#git+}
+    git_commit=${url##*#}
+    url=${url%%/\?ref*}
+    url=${url%%#*}
+  fi
+
+  jq \
+    -nec \
+    --arg type "$src_type" \
+    --arg url "$url" \
+    --arg git_commit "$git_commit" \
+    --arg dest "$dest" \
+    --arg sha256 "$sha256" \
+    '{
+      type: $type,
+      url: $url,
+      commit: $git_commit,
+      dest: $dest,
+      sha256: $sha256,
+    } | with_entries(select(.value != ""))'
+done < <(jq -rc 'to_entries[] | [.value.url, .value.hash, "vendor/p/\(.key)"] | @tsv' "$BUILD_ZIG_ZON_JSON") |
+  jq -s '.' >"$WORK_DIR/zig-packages.json"
+
+NEW_HASH=$(sha512sum "$WORK_DIR/zig-packages.json" | awk '{print $1}')
+
+if [ "${OLD_HASH}" == "${NEW_HASH}" ]; then
+  echo -e "\nOK: flatpak/zig-packages.json unchanged."
+  exit 0
+elif [ "${1:-}" != "--update" ]; then
+  echo -e "\nERROR: flatpak/zig-packages.json needs to be updated."
+  echo ""
+  echo "    * Old hash: ${OLD_HASH}"
+  echo "    * New hash: ${NEW_HASH}"
+  help
+  exit 1
+else
+  mv "$WORK_DIR/zig-packages.json" "$ZIG_PACKAGES_JSON"
+  echo -e "\nOK: flatpak/zig-packages.json updated."
+  exit 0
+fi

flatpak/com.mitchellh.ghostty-debug.yml

@@ -0,0 +1,61 @@
+app-id: com.mitchellh.ghostty-debug
+runtime: org.gnome.Platform
+runtime-version: "48"
+sdk: org.gnome.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.ziglang
+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: /usr/lib/sdk/ziglang
+    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

flatpak/com.mitchellh.ghostty.yml

@@ -0,0 +1,60 @@
+app-id: com.mitchellh.ghostty
+runtime: org.gnome.Platform
+runtime-version: "48"
+sdk: org.gnome.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.ziglang
+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: /usr/lib/sdk/ziglang
+    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

flatpak/dependencies.yml

@@ -0,0 +1,66 @@
+name: dependencies-meta
+buildsystem: simple
+build-commands:
+  - true
+modules:
+  - 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: blueprint-compiler
+    buildsystem: meson
+    cleanup:
+      - "*"
+    sources:
+      - type: git
+        url: https://gitlab.gnome.org/jwestman/blueprint-compiler.git
+        tag: v0.16.0
+        commit: 04ef0944db56ab01307a29aaa7303df6067cb3c0
+        x-checker-data:
+          type: git
+          tag-pattern: ^v([\d.]+)$
+
+  - 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

flatpak/exceptions.json

@@ -0,0 +1,3 @@
+{
+  "com.mitchellh.ghostty": ["finish-args-flatpak-spawn-access"]
+}

flatpak/zig-packages.json

@@ -0,0 +1,206 @@
+[
+  {
+    "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://github.com/glfw/glfw/archive/e7ea71be039836da3a98cea55ae5569cb5eb885c.tar.gz",
+    "dest": "vendor/p/N-V-__8AAMrJSwAUGb9-vTzkNR-5LXS81MR__ZRVfF3tWgG6",
+    "sha256": "3373755d402531e6c1a395f53f2fbd6318ca5e067a79a72a59109b526c0b290a"
+  },
+  {
+    "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/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",
+    "dest": "vendor/p/gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR",
+    "sha256": "85672997459ddd7c9d4fe458efe548a315cf842cde95ed48a7be984a1f8a98b2"
+  },
+  {
+    "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/archive/6fa671fdc1daf1fcfa025cb960ffa3e7373a2ed8.tar.gz",
+    "dest": "vendor/p/N-V-__8AAGHcWgTaKLjwmFkxToNT4jgz5VXUHR7hz8TQ2_AS",
+    "sha256": "83da3608873f4df598a144bf97f1cfe4a644083eea36c75052516bb9a2a4573e"
+  },
+  {
+    "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/75a10d0fb374e8eb84948dcfc68d865e755e59c2.tar.gz",
+    "dest": "vendor/p/libxev-0.0.0-86vtcyMBEwA-UpcjfOICyI2GYG8o6MiRbinS1_8g1_rw",
+    "sha256": "fc248a4ae6597e7d1a2109556743bc721e4ee2009a8d80534eea1eb51768d27e"
+  },
+  {
+    "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/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": "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/8bbd035f4101f02b1d27947def0d7da3215df7fe.tar.gz",
+    "dest": "vendor/p/z2d-0.7.0-j5P_Hg_DDACq-2H2Zh7rAq6_TXWdQzv7JAUfnrdeDosg",
+    "sha256": "c1f69d7a07a2c5c6e0c51cd1b5fe8cd87df8093baf0ccdb65d5221bae7c5046e"
+  },
+  {
+    "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/3ab0d37c7d6b933d6ded1b3a35b6b60f05590a98.tar.gz",
+    "dest": "vendor/p/zig_objc-0.0.0-Ir_Sp3TyAADEVRTxXlScq3t_uKAM91MYNerZkHfbD0yt",
+    "sha256": "ce7d6d47ac614a60e56b8509dedf869e2e0d8b747c75e48aded11eec31b3357c"
+  },
+  {
+    "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/ziglyph-b89d43d1e3fb01b6074bc1f7fc980324b04d26a5.tar.gz",
+    "dest": "vendor/p/ziglyph-0.11.2-AAAAAHPtHwB4Mbzn1KvOV7Wpjo82NYEc_v0WC8oCLrkf",
+    "sha256": "72c7bdf3e16df105235fe3fcf32c987dac49389190f4ced89b0ee31710f3f3d9"
+  },
+  {
+    "type": "archive",
+    "url": "https://deps.files.ghostty.org/zlib-1220fed0c74e1019b3ee29edae2051788b080cd96e90d56836eea857b0b966742efb.tar.gz",
+    "dest": "vendor/p/N-V-__8AAB0eQwD-0MdOEBmz7intriBReIsIDNlukNVoNu6o",
+    "sha256": "17e88863f3600672ab49182f217281b6fc4d3c762bde361935e436a95214d05c"
+  }
+]

images/Ghostty.icon/icon.json

@@ -0,0 +1,170 @@
+{
+  "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"
+  }
+}

include/ghostty.h

@@ -103,10 +103,30 @@ typedef enum {
   GHOSTTY_ACTION_REPEAT,
 } ghostty_input_action_e;
 
+// Based on: https://www.w3.org/TR/uievents-code/
 typedef enum {
-  GHOSTTY_KEY_INVALID,
+  GHOSTTY_KEY_UNIDENTIFIED,
 
-  // a-z
+  // "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,
   GHOSTTY_KEY_A,
   GHOSTTY_KEY_B,
   GHOSTTY_KEY_C,
@@ -133,56 +153,91 @@ typedef enum {
   GHOSTTY_KEY_X,
   GHOSTTY_KEY_Y,
   GHOSTTY_KEY_Z,
-
-  // 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_SPACE,
-  GHOSTTY_KEY_APOSTROPHE,
-  GHOSTTY_KEY_COMMA,
-  GHOSTTY_KEY_GRAVE_ACCENT,  // `
-  GHOSTTY_KEY_PERIOD,
-  GHOSTTY_KEY_SLASH,
   GHOSTTY_KEY_MINUS,
-  GHOSTTY_KEY_PLUS,
+  GHOSTTY_KEY_PERIOD,
-  GHOSTTY_KEY_EQUAL,
+  GHOSTTY_KEY_QUOTE,
-  GHOSTTY_KEY_LEFT_BRACKET,   // [
+  GHOSTTY_KEY_SEMICOLON,
-  GHOSTTY_KEY_RIGHT_BRACKET,  // ]
+  GHOSTTY_KEY_SLASH,
-  GHOSTTY_KEY_BACKSLASH,      // \
 
-  // control
+  // "Functional Keys" § 3.1.2
-  GHOSTTY_KEY_UP,
+  GHOSTTY_KEY_ALT_LEFT,
-  GHOSTTY_KEY_DOWN,
+  GHOSTTY_KEY_ALT_RIGHT,
-  GHOSTTY_KEY_RIGHT,
-  GHOSTTY_KEY_LEFT,
-  GHOSTTY_KEY_HOME,
-  GHOSTTY_KEY_END,
-  GHOSTTY_KEY_INSERT,
-  GHOSTTY_KEY_DELETE,
-  GHOSTTY_KEY_CAPS_LOCK,
-  GHOSTTY_KEY_SCROLL_LOCK,
-  GHOSTTY_KEY_NUM_LOCK,
-  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_CAPS_LOCK,
-  GHOSTTY_KEY_PAUSE,
+  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,
 
-  // function keys
+  // "Control Pad Section" § 3.2
+  GHOSTTY_KEY_DELETE,
+  GHOSTTY_KEY_END,
+  GHOSTTY_KEY_HELP,
+  GHOSTTY_KEY_HOME,
+  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_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_ESCAPE,
   GHOSTTY_KEY_F1,
   GHOSTTY_KEY_F2,
   GHOSTTY_KEY_F3,
@@ -208,59 +263,53 @@ 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,
 
-  // keypad
+  // "Media Keys" § 3.6
-  GHOSTTY_KEY_KP_0,
+  GHOSTTY_KEY_BROWSER_BACK,
-  GHOSTTY_KEY_KP_1,
+  GHOSTTY_KEY_BROWSER_FAVORITES,
-  GHOSTTY_KEY_KP_2,
+  GHOSTTY_KEY_BROWSER_FORWARD,
-  GHOSTTY_KEY_KP_3,
+  GHOSTTY_KEY_BROWSER_HOME,
-  GHOSTTY_KEY_KP_4,
+  GHOSTTY_KEY_BROWSER_REFRESH,
-  GHOSTTY_KEY_KP_5,
+  GHOSTTY_KEY_BROWSER_SEARCH,
-  GHOSTTY_KEY_KP_6,
+  GHOSTTY_KEY_BROWSER_STOP,
-  GHOSTTY_KEY_KP_7,
+  GHOSTTY_KEY_EJECT,
-  GHOSTTY_KEY_KP_8,
+  GHOSTTY_KEY_LAUNCH_APP_1,
-  GHOSTTY_KEY_KP_9,
+  GHOSTTY_KEY_LAUNCH_APP_2,
-  GHOSTTY_KEY_KP_DECIMAL,
+  GHOSTTY_KEY_LAUNCH_MAIL,
-  GHOSTTY_KEY_KP_DIVIDE,
+  GHOSTTY_KEY_MEDIA_PLAY_PAUSE,
-  GHOSTTY_KEY_KP_MULTIPLY,
+  GHOSTTY_KEY_MEDIA_SELECT,
-  GHOSTTY_KEY_KP_SUBTRACT,
+  GHOSTTY_KEY_MEDIA_STOP,
-  GHOSTTY_KEY_KP_ADD,
+  GHOSTTY_KEY_MEDIA_TRACK_NEXT,
-  GHOSTTY_KEY_KP_ENTER,
+  GHOSTTY_KEY_MEDIA_TRACK_PREVIOUS,
-  GHOSTTY_KEY_KP_EQUAL,
+  GHOSTTY_KEY_POWER,
-  GHOSTTY_KEY_KP_SEPARATOR,
+  GHOSTTY_KEY_SLEEP,
-  GHOSTTY_KEY_KP_LEFT,
+  GHOSTTY_KEY_AUDIO_VOLUME_DOWN,
-  GHOSTTY_KEY_KP_RIGHT,
+  GHOSTTY_KEY_AUDIO_VOLUME_MUTE,
-  GHOSTTY_KEY_KP_UP,
+  GHOSTTY_KEY_AUDIO_VOLUME_UP,
-  GHOSTTY_KEY_KP_DOWN,
+  GHOSTTY_KEY_WAKE_UP,
-  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,
 
-  // modifiers
+  // "Legacy, Non-standard, and Special Keys" § 3.7
-  GHOSTTY_KEY_LEFT_SHIFT,
+  GHOSTTY_KEY_COPY,
-  GHOSTTY_KEY_LEFT_CONTROL,
+  GHOSTTY_KEY_CUT,
-  GHOSTTY_KEY_LEFT_ALT,
+  GHOSTTY_KEY_PASTE,
-  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;
@@ -277,6 +326,13 @@ 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,
@@ -299,8 +355,41 @@ typedef struct {
   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;
@@ -322,6 +411,9 @@ 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;
 } ghostty_surface_config_s;
 
 typedef struct {
@@ -348,6 +440,11 @@ typedef struct {
   size_t len;
 } ghostty_config_color_list_s;
 
+// config.Palette
+typedef struct {
+  ghostty_config_color_s colors[256];
+} ghostty_config_palette_s;
+
 // apprt.Target.Key
 typedef enum {
   GHOSTTY_TARGET_APP,
@@ -412,8 +509,16 @@ typedef enum {
   GHOSTTY_FULLSCREEN_NATIVE,
   GHOSTTY_FULLSCREEN_NON_NATIVE,
   GHOSTTY_FULLSCREEN_NON_NATIVE_VISIBLE_MENU,
+  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,
@@ -570,6 +675,7 @@ 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,
@@ -579,12 +685,15 @@ typedef enum {
   GHOSTTY_ACTION_TOGGLE_SPLIT_ZOOM,
   GHOSTTY_ACTION_PRESENT_TERMINAL,
   GHOSTTY_ACTION_SIZE_LIMIT,
+  GHOSTTY_ACTION_RESET_WINDOW_SIZE,
   GHOSTTY_ACTION_INITIAL_SIZE,
   GHOSTTY_ACTION_CELL_SIZE,
   GHOSTTY_ACTION_INSPECTOR,
+  GHOSTTY_ACTION_SHOW_GTK_INSPECTOR,
   GHOSTTY_ACTION_RENDER_INSPECTOR,
   GHOSTTY_ACTION_DESKTOP_NOTIFICATION,
   GHOSTTY_ACTION_SET_TITLE,
+  GHOSTTY_ACTION_PROMPT_TITLE,
   GHOSTTY_ACTION_PWD,
   GHOSTTY_ACTION_MOUSE_SHAPE,
   GHOSTTY_ACTION_MOUSE_VISIBILITY,
@@ -592,11 +701,17 @@ 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_tag_e;
 
 typedef union {
@@ -618,6 +733,7 @@ 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;
@@ -665,6 +781,7 @@ typedef struct {
 int ghostty_init(void);
 void ghostty_cli_main(uintptr_t, char**);
 ghostty_info_s ghostty_info(void);
+const char* ghostty_translate(const char*);
 
 ghostty_config_t ghostty_config_new();
 void ghostty_config_free(ghostty_config_t);
@@ -698,13 +815,15 @@ 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, ghostty_surface_config_s*);
+ghostty_surface_t ghostty_surface_new(ghostty_app_t,
+                                      const 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);
@@ -716,9 +835,11 @@ 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,
@@ -748,16 +869,16 @@ void ghostty_surface_complete_clipboard_request(ghostty_surface_t,
                                                 void*,
                                                 bool);
 bool ghostty_surface_has_selection(ghostty_surface_t);
-uintptr_t ghostty_surface_selection(ghostty_surface_t, char*, uintptr_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*);
 
 #ifdef __APPLE__
 void ghostty_surface_set_display_id(ghostty_surface_t, uint32_t);
 void* ghostty_surface_quicklook_font(ghostty_surface_t);
-uintptr_t ghostty_surface_quicklook_word(ghostty_surface_t,
+bool ghostty_surface_quicklook_word(ghostty_surface_t, ghostty_text_s*);
-                                         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);

macos/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,74 +0,0 @@
-{
-  "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
-  }
-}

macos/Ghostty.xcodeproj/project.pbxproj

@@ -12,10 +12,18 @@
 		552964E62B34A9B400030505 /* vim in Resources */ = {isa = PBXBuildFile; fileRef = 552964E52B34A9B400030505 /* vim */; };
 		857F63812A5E64F200CA4815 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 857F63802A5E64F200CA4815 /* MainMenu.xib */; };
 		9351BE8E3D22937F003B3499 /* nvim in Resources */ = {isa = PBXBuildFile; fileRef = 9351BE8E2D22937F003B3499 /* nvim */; };
+		A50297352DFA0F3400B4E924 /* Double+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A50297342DFA0F3300B4E924 /* Double+Extension.swift */; };
+		A511940F2E050595007258CC /* CloseTerminalIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A511940E2E050590007258CC /* CloseTerminalIntent.swift */; };
+		A51194112E05A483007258CC /* QuickTerminalIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51194102E05A480007258CC /* QuickTerminalIntent.swift */; };
+		A51194132E05D006007258CC /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51194122E05D003007258CC /* Optional+Extension.swift */; };
+		A51194172E05D964007258CC /* PermissionRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51194162E05D95E007258CC /* PermissionRequest.swift */; };
+		A51194192E05DFC4007258CC /* IntentPermission.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51194182E05DFBB007258CC /* IntentPermission.swift */; };
 		A514C8D62B54A16400493A16 /* Ghostty.Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514C8D52B54A16400493A16 /* Ghostty.Config.swift */; };
 		A514C8D72B54A16400493A16 /* Ghostty.Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514C8D52B54A16400493A16 /* Ghostty.Config.swift */; };
 		A514C8D82B54DC6800493A16 /* Ghostty.App.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D0C992B543F3B00305CE6 /* Ghostty.App.swift */; };
-		A51B78472AF4B58B00F3EDB9 /* TerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51B78462AF4B58B00F3EDB9 /* TerminalWindow.swift */; };
+		A51544FE2DFB111C009E85D8 /* TitlebarTabsTahoeTerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51544FD2DFB1110009E85D8 /* TitlebarTabsTahoeTerminalWindow.swift */; };
+		A51545002DFB112E009E85D8 /* TerminalTabsTitlebarTahoe.xib in Resources */ = {isa = PBXBuildFile; fileRef = A51544FF2DFB112E009E85D8 /* TerminalTabsTitlebarTahoe.xib */; };
+		A51B78472AF4B58B00F3EDB9 /* TitlebarTabsVenturaTerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51B78462AF4B58B00F3EDB9 /* TitlebarTabsVenturaTerminalWindow.swift */; };
 		A51BFC1E2B2FB5CE00E92F16 /* About.xib in Resources */ = {isa = PBXBuildFile; fileRef = A51BFC1D2B2FB5CE00E92F16 /* About.xib */; };
 		A51BFC202B2FB64F00E92F16 /* AboutController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51BFC1F2B2FB64F00E92F16 /* AboutController.swift */; };
 		A51BFC222B2FB6B400E92F16 /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51BFC212B2FB6B400E92F16 /* AboutView.swift */; };
@@ -34,18 +42,32 @@
 		A5333E242B5A22D9008AEFF7 /* Ghostty.Shell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D58852ACDDB4100508D2C /* Ghostty.Shell.swift */; };
 		A53426352A7DA53D00EBB7A2 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53426342A7DA53D00EBB7A2 /* AppDelegate.swift */; };
 		A535B9DA299C569B0017E2E4 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A535B9D9299C569B0017E2E4 /* ErrorView.swift */; };
+		A53A297B2DB2E49700B6E02C /* CommandPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53A297A2DB2E49400B6E02C /* CommandPalette.swift */; };
+		A53A297F2DB4480F00B6E02C /* EventModifiers+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53A297E2DB4480A00B6E02C /* EventModifiers+Extension.swift */; };
+		A53A29812DB44A6100B6E02C /* KeyboardShortcut+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53A29802DB44A5E00B6E02C /* KeyboardShortcut+Extension.swift */; };
+		A53A29882DB69D2F00B6E02C /* TerminalCommandPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53A29872DB69D2C00B6E02C /* TerminalCommandPalette.swift */; };
 		A53A6C032CCC1B7F00943E98 /* Ghostty.Action.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53A6C022CCC1B7D00943E98 /* Ghostty.Action.swift */; };
 		A53D0C8E2B53B0EA00305CE6 /* GhosttyKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5D495A1299BEC7E00DD1313 /* GhosttyKit.xcframework */; };
 		A53D0C942B53B43700305CE6 /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D0C932B53B43700305CE6 /* iOSApp.swift */; };
 		A53D0C952B53B4D800305CE6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5B30538299BEAAB0047F10C /* Assets.xcassets */; };
 		A53D0C9B2B543F3B00305CE6 /* Ghostty.App.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53D0C992B543F3B00305CE6 /* Ghostty.App.swift */; };
 		A53D0C9C2B543F7B00305CE6 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = A55B7BB729B6F53A0055DE60 /* Package.swift */; };
+		A546F1142D7B68D7003B11A0 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = A546F1132D7B68D7003B11A0 /* locale */; };
 		A54B0CE92D0CECD100CBEFF8 /* ColorizedGhosttyIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54B0CE82D0CECD100CBEFF8 /* ColorizedGhosttyIconView.swift */; };
 		A54B0CEB2D0CFB4C00CBEFF8 /* NSImage+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54B0CEA2D0CFB4A00CBEFF8 /* NSImage+Extension.swift */; };
 		A54B0CED2D0CFB7700CBEFF8 /* ColorizedGhosttyIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54B0CEC2D0CFB7300CBEFF8 /* ColorizedGhosttyIcon.swift */; };
 		A54B0CEF2D0D2E2800CBEFF8 /* ColorizedGhosttyIconImage.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54B0CEE2D0D2E2400CBEFF8 /* ColorizedGhosttyIconImage.swift */; };
 		A54D786C2CA7978E001B19B1 /* BaseTerminalController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A54D786B2CA79788001B19B1 /* BaseTerminalController.swift */; };
-		A55685E029A03A9F004303CE /* AppError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A55685DF29A03A9F004303CE /* AppError.swift */; };
+		A553F4062E05E93000257779 /* Optional+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51194122E05D003007258CC /* Optional+Extension.swift */; };
+		A553F4072E05E93D00257779 /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A586366A2DF0A98900E04A10 /* Array+Extension.swift */; };
+		A553F4132E06EB1600257779 /* Ghostty.icon in Resources */ = {isa = PBXBuildFile; fileRef = A553F4122E06EB1600257779 /* Ghostty.icon */; };
+		A553F4142E06EB1600257779 /* Ghostty.icon in Resources */ = {isa = PBXBuildFile; fileRef = A553F4122E06EB1600257779 /* Ghostty.icon */; };
+		A5593FDF2DF8D57C00B47B10 /* TerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5593FDE2DF8D57100B47B10 /* TerminalWindow.swift */; };
+		A5593FE12DF8D74000B47B10 /* HiddenTitlebarTerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5593FE02DF8D73400B47B10 /* HiddenTitlebarTerminalWindow.swift */; };
+		A5593FE32DF8D78600B47B10 /* TerminalHiddenTitlebar.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5593FE22DF8D78600B47B10 /* TerminalHiddenTitlebar.xib */; };
+		A5593FE52DF8DE3000B47B10 /* TerminalTabsTitlebarVentura.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5593FE42DF8DE3000B47B10 /* TerminalTabsTitlebarVentura.xib */; };
+		A5593FE72DF927D200B47B10 /* TransparentTitlebarTerminalWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5593FE62DF927CC00B47B10 /* TransparentTitlebarTerminalWindow.swift */; };
+		A5593FE92DF927DF00B47B10 /* TerminalTransparentTitlebar.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5593FE82DF927DF00B47B10 /* TerminalTransparentTitlebar.xib */; };
 		A55B7BB829B6F53A0055DE60 /* Package.swift in Sources */ = {isa = PBXBuildFile; fileRef = A55B7BB729B6F53A0055DE60 /* Package.swift */; };
 		A55B7BBC29B6FC330055DE60 /* SurfaceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A55B7BBB29B6FC330055DE60 /* SurfaceView.swift */; };
 		A56B880B2A840447007A0E29 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A56B880A2A840447007A0E29 /* Carbon.framework */; };
@@ -54,14 +76,19 @@
 		A571AB1D2A206FCF00248498 /* GhosttyKit.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5D495A1299BEC7E00DD1313 /* GhosttyKit.xcframework */; };
 		A57D79272C9C879B001D522E /* SecureInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57D79262C9C8798001D522E /* SecureInput.swift */; };
 		A586167C2B7703CC009BDB1D /* fish in Resources */ = {isa = PBXBuildFile; fileRef = A586167B2B7703CC009BDB1D /* fish */; };
+		A586365F2DEE6C2300E04A10 /* SplitTree.swift in Sources */ = {isa = PBXBuildFile; fileRef = A586365E2DEE6C2100E04A10 /* SplitTree.swift */; };
+		A58636662DEF964100E04A10 /* TerminalSplitTreeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58636652DEF963F00E04A10 /* TerminalSplitTreeView.swift */; };
+		A586366B2DF0A98C00E04A10 /* Array+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A586366A2DF0A98900E04A10 /* Array+Extension.swift */; };
+		A586366F2DF25D8600E04A10 /* Duration+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A586366E2DF25D8300E04A10 /* Duration+Extension.swift */; };
+		A58636712DF298FB00E04A10 /* ExpiringUndoManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58636702DF298F700E04A10 /* ExpiringUndoManager.swift */; };
+		A58636732DF4813400E04A10 /* UndoManager+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58636722DF4813000E04A10 /* UndoManager+Extension.swift */; };
+		A5874D992DAD751B00E83852 /* CGS.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5874D982DAD751A00E83852 /* CGS.swift */; };
+		A5874D9D2DAD786100E83852 /* NSWindow+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5874D9C2DAD785F00E83852 /* NSWindow+Extension.swift */; };
 		A59444F729A2ED5200725BBA /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59444F629A2ED5200725BBA /* SettingsView.swift */; };
 		A59630972AEE163600D64628 /* HostingWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59630962AEE163600D64628 /* HostingWindow.swift */; };
 		A596309A2AEE1C6400D64628 /* Terminal.xib in Resources */ = {isa = PBXBuildFile; fileRef = A59630992AEE1C6400D64628 /* Terminal.xib */; };
 		A596309C2AEE1C9E00D64628 /* TerminalController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596309B2AEE1C9E00D64628 /* TerminalController.swift */; };
 		A596309E2AEE1D6C00D64628 /* TerminalView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596309D2AEE1D6C00D64628 /* TerminalView.swift */; };
-		A59630A02AEF6AEB00D64628 /* TerminalManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A596309F2AEF6AEB00D64628 /* TerminalManager.swift */; };
-		A59630A22AF0415000D64628 /* Ghostty.TerminalSplit.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59630A12AF0415000D64628 /* Ghostty.TerminalSplit.swift */; };
-		A59630A42AF059BB00D64628 /* Ghostty.SplitNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59630A32AF059BB00D64628 /* Ghostty.SplitNode.swift */; };
 		A5985CD72C320C4500C57AD3 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5985CD62C320C4500C57AD3 /* String+Extension.swift */; };
 		A5985CD82C320C4500C57AD3 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5985CD62C320C4500C57AD3 /* String+Extension.swift */; };
 		A5985CE62C33060F00C57AD3 /* man in Resources */ = {isa = PBXBuildFile; fileRef = A5985CE52C33060F00C57AD3 /* man */; };
@@ -71,9 +98,10 @@
 		A5A1F8852A489D6800D1E8BC /* terminfo in Resources */ = {isa = PBXBuildFile; fileRef = A5A1F8842A489D6800D1E8BC /* terminfo */; };
 		A5A2A3CA2D4445E30033CF96 /* Dock.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A2A3C92D4445E20033CF96 /* Dock.swift */; };
 		A5A2A3CC2D444ABB0033CF96 /* NSApplication+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A2A3CB2D444AB80033CF96 /* NSApplication+Extension.swift */; };
-		A5A6F72A2CC41B8900B232A5 /* Xcode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A6F7292CC41B8700B232A5 /* Xcode.swift */; };
+		A5A6F72A2CC41B8900B232A5 /* AppInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A6F7292CC41B8700B232A5 /* AppInfo.swift */; };
 		A5AEB1652D5BE7D000513529 /* LastWindowPosition.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5AEB1642D5BE7BF00513529 /* LastWindowPosition.swift */; };
 		A5B30539299BEAAB0047F10C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5B30538299BEAAB0047F10C /* Assets.xcassets */; };
+		A5B4EA852DFE691B0022C3A2 /* NSMenuItem+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5B4EA842DFE69140022C3A2 /* NSMenuItem+Extension.swift */; };
 		A5CA378C2D2A4DEB00931030 /* KeyboardLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA378B2D2A4DE800931030 /* KeyboardLayout.swift */; };
 		A5CA378E2D31D6C300931030 /* Weak.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA378D2D31D6C100931030 /* Weak.swift */; };
 		A5CBD0562C9E65B80017A1AE /* DraggableWindowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */; };
@@ -99,9 +127,20 @@
 		A5E112932AF73E6E00C6E0C2 /* ClipboardConfirmation.xib in Resources */ = {isa = PBXBuildFile; fileRef = A5E112922AF73E6E00C6E0C2 /* ClipboardConfirmation.xib */; };
 		A5E112952AF73E8A00C6E0C2 /* ClipboardConfirmationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E112942AF73E8A00C6E0C2 /* ClipboardConfirmationController.swift */; };
 		A5E112972AF7401B00C6E0C2 /* ClipboardConfirmationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E112962AF7401B00C6E0C2 /* ClipboardConfirmationView.swift */; };
+		A5E4082A2E022E9E0035FEAC /* TabGroupCloseCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408292E022E9B0035FEAC /* TabGroupCloseCoordinator.swift */; };
+		A5E4082E2E0237460035FEAC /* NewTerminalIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E4082D2E0237410035FEAC /* NewTerminalIntent.swift */; };
+		A5E408302E0271320035FEAC /* GhosttyIntentError.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E4082F2E0271320035FEAC /* GhosttyIntentError.swift */; };
+		A5E408322E02FEDF0035FEAC /* TerminalEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408312E02FEDC0035FEAC /* TerminalEntity.swift */; };
+		A5E408342E0320140035FEAC /* GetTerminalDetailsIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408332E03200F0035FEAC /* GetTerminalDetailsIntent.swift */; };
+		A5E408382E03C7DA0035FEAC /* Ghostty.Surface.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408372E03C7D80035FEAC /* Ghostty.Surface.swift */; };
+		A5E4083A2E0449BD0035FEAC /* Ghostty.Command.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408392E0449BB0035FEAC /* Ghostty.Command.swift */; };
+		A5E4083C2E044DB50035FEAC /* Ghostty.Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E4083B2E044DB40035FEAC /* Ghostty.Error.swift */; };
+		A5E408402E04532C0035FEAC /* CommandEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E4083F2E04532A0035FEAC /* CommandEntity.swift */; };
+		A5E408432E047D0B0035FEAC /* CommandPaletteIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408422E047D060035FEAC /* CommandPaletteIntent.swift */; };
+		A5E408452E0483FD0035FEAC /* KeybindIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408442E0483F80035FEAC /* KeybindIntent.swift */; };
+		A5E408472E04852B0035FEAC /* InputIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5E408462E0485270035FEAC /* InputIntent.swift */; };
 		A5FEB3002ABB69450068369E /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FEB2FF2ABB69450068369E /* main.swift */; };
 		AEE8B3452B9AA39600260C5E /* NSPasteboard+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEE8B3442B9AA39600260C5E /* NSPasteboard+Extension.swift */; };
-		AEF9CE242B6AD07A0017E195 /* TerminalToolbar.swift in Sources */ = {isa = PBXBuildFile; fileRef = AEF9CE232B6AD07A0017E195 /* TerminalToolbar.swift */; };
 		C159E81D2B66A06B00FDFE9C /* OSColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C159E81C2B66A06B00FDFE9C /* OSColor+Extension.swift */; };
 		C159E89D2B69A2EF00FDFE9C /* OSColor+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C159E81C2B66A06B00FDFE9C /* OSColor+Extension.swift */; };
 		C1F26EA72B738B9900404083 /* NSView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C1F26EA62B738B9900404083 /* NSView+Extension.swift */; };
@@ -118,8 +157,16 @@
 		552964E52B34A9B400030505 /* vim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = vim; path = "../zig-out/share/vim"; sourceTree = "<group>"; };
 		857F63802A5E64F200CA4815 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
 		9351BE8E2D22937F003B3499 /* nvim */ = {isa = PBXFileReference; lastKnownFileType = folder; name = nvim; path = "../zig-out/share/nvim"; sourceTree = "<group>"; };
+		A50297342DFA0F3300B4E924 /* Double+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Double+Extension.swift"; sourceTree = "<group>"; };
+		A511940E2E050590007258CC /* CloseTerminalIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloseTerminalIntent.swift; sourceTree = "<group>"; };
+		A51194102E05A480007258CC /* QuickTerminalIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuickTerminalIntent.swift; sourceTree = "<group>"; };
+		A51194122E05D003007258CC /* Optional+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Optional+Extension.swift"; sourceTree = "<group>"; };
+		A51194162E05D95E007258CC /* PermissionRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionRequest.swift; sourceTree = "<group>"; };
+		A51194182E05DFBB007258CC /* IntentPermission.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntentPermission.swift; sourceTree = "<group>"; };
 		A514C8D52B54A16400493A16 /* Ghostty.Config.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.Config.swift; sourceTree = "<group>"; };
-		A51B78462AF4B58B00F3EDB9 /* TerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalWindow.swift; sourceTree = "<group>"; };
+		A51544FD2DFB1110009E85D8 /* TitlebarTabsTahoeTerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitlebarTabsTahoeTerminalWindow.swift; sourceTree = "<group>"; };
+		A51544FF2DFB112E009E85D8 /* TerminalTabsTitlebarTahoe.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TerminalTabsTitlebarTahoe.xib; sourceTree = "<group>"; };
+		A51B78462AF4B58B00F3EDB9 /* TitlebarTabsVenturaTerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitlebarTabsVenturaTerminalWindow.swift; sourceTree = "<group>"; };
 		A51BFC1D2B2FB5CE00E92F16 /* About.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = About.xib; sourceTree = "<group>"; };
 		A51BFC1F2B2FB64F00E92F16 /* AboutController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutController.swift; sourceTree = "<group>"; };
 		A51BFC212B2FB6B400E92F16 /* AboutView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
@@ -135,15 +182,26 @@
 		A5333E212B5A2128008AEFF7 /* SurfaceView_AppKit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SurfaceView_AppKit.swift; sourceTree = "<group>"; };
 		A53426342A7DA53D00EBB7A2 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		A535B9D9299C569B0017E2E4 /* ErrorView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
+		A53A297A2DB2E49400B6E02C /* CommandPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandPalette.swift; sourceTree = "<group>"; };
+		A53A297E2DB4480A00B6E02C /* EventModifiers+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "EventModifiers+Extension.swift"; sourceTree = "<group>"; };
+		A53A29802DB44A5E00B6E02C /* KeyboardShortcut+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "KeyboardShortcut+Extension.swift"; sourceTree = "<group>"; };
+		A53A29872DB69D2C00B6E02C /* TerminalCommandPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalCommandPalette.swift; sourceTree = "<group>"; };
 		A53A6C022CCC1B7D00943E98 /* Ghostty.Action.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.Action.swift; sourceTree = "<group>"; };
 		A53D0C932B53B43700305CE6 /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
 		A53D0C992B543F3B00305CE6 /* Ghostty.App.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.App.swift; sourceTree = "<group>"; };
+		A546F1132D7B68D7003B11A0 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = "../zig-out/share/locale"; sourceTree = "<group>"; };
 		A54B0CE82D0CECD100CBEFF8 /* ColorizedGhosttyIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorizedGhosttyIconView.swift; sourceTree = "<group>"; };
 		A54B0CEA2D0CFB4A00CBEFF8 /* NSImage+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+Extension.swift"; sourceTree = "<group>"; };
 		A54B0CEC2D0CFB7300CBEFF8 /* ColorizedGhosttyIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorizedGhosttyIcon.swift; sourceTree = "<group>"; };
 		A54B0CEE2D0D2E2400CBEFF8 /* ColorizedGhosttyIconImage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorizedGhosttyIconImage.swift; sourceTree = "<group>"; };
 		A54D786B2CA79788001B19B1 /* BaseTerminalController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTerminalController.swift; sourceTree = "<group>"; };
-		A55685DF29A03A9F004303CE /* AppError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppError.swift; sourceTree = "<group>"; };
+		A553F4122E06EB1600257779 /* Ghostty.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; name = Ghostty.icon; path = ../images/Ghostty.icon; sourceTree = SOURCE_ROOT; };
+		A5593FDE2DF8D57100B47B10 /* TerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalWindow.swift; sourceTree = "<group>"; };
+		A5593FE02DF8D73400B47B10 /* HiddenTitlebarTerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HiddenTitlebarTerminalWindow.swift; sourceTree = "<group>"; };
+		A5593FE22DF8D78600B47B10 /* TerminalHiddenTitlebar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TerminalHiddenTitlebar.xib; sourceTree = "<group>"; };
+		A5593FE42DF8DE3000B47B10 /* TerminalTabsTitlebarVentura.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TerminalTabsTitlebarVentura.xib; sourceTree = "<group>"; };
+		A5593FE62DF927CC00B47B10 /* TransparentTitlebarTerminalWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransparentTitlebarTerminalWindow.swift; sourceTree = "<group>"; };
+		A5593FE82DF927DF00B47B10 /* TerminalTransparentTitlebar.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TerminalTransparentTitlebar.xib; sourceTree = "<group>"; };
 		A55B7BB729B6F53A0055DE60 /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
 		A55B7BBB29B6FC330055DE60 /* SurfaceView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SurfaceView.swift; sourceTree = "<group>"; };
 		A56B880A2A840447007A0E29 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = System/Library/Frameworks/Carbon.framework; sourceTree = SDKROOT; };
@@ -152,14 +210,19 @@
 		A571AB1C2A206FC600248498 /* Ghostty-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "Ghostty-Info.plist"; sourceTree = "<group>"; };
 		A57D79262C9C8798001D522E /* SecureInput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecureInput.swift; sourceTree = "<group>"; };
 		A586167B2B7703CC009BDB1D /* fish */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fish; path = "../zig-out/share/fish"; sourceTree = "<group>"; };
+		A586365E2DEE6C2100E04A10 /* SplitTree.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SplitTree.swift; sourceTree = "<group>"; };
+		A58636652DEF963F00E04A10 /* TerminalSplitTreeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalSplitTreeView.swift; sourceTree = "<group>"; };
+		A586366A2DF0A98900E04A10 /* Array+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Array+Extension.swift"; sourceTree = "<group>"; };
+		A586366E2DF25D8300E04A10 /* Duration+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Duration+Extension.swift"; sourceTree = "<group>"; };
+		A58636702DF298F700E04A10 /* ExpiringUndoManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExpiringUndoManager.swift; sourceTree = "<group>"; };
+		A58636722DF4813000E04A10 /* UndoManager+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UndoManager+Extension.swift"; sourceTree = "<group>"; };
+		A5874D982DAD751A00E83852 /* CGS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGS.swift; sourceTree = "<group>"; };
+		A5874D9C2DAD785F00E83852 /* NSWindow+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSWindow+Extension.swift"; sourceTree = "<group>"; };
 		A59444F629A2ED5200725BBA /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
 		A59630962AEE163600D64628 /* HostingWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostingWindow.swift; sourceTree = "<group>"; };
 		A59630992AEE1C6400D64628 /* Terminal.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Terminal.xib; sourceTree = "<group>"; };
 		A596309B2AEE1C9E00D64628 /* TerminalController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalController.swift; sourceTree = "<group>"; };
 		A596309D2AEE1D6C00D64628 /* TerminalView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalView.swift; sourceTree = "<group>"; };
-		A596309F2AEF6AEB00D64628 /* TerminalManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalManager.swift; sourceTree = "<group>"; };
-		A59630A12AF0415000D64628 /* Ghostty.TerminalSplit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.TerminalSplit.swift; sourceTree = "<group>"; };
-		A59630A32AF059BB00D64628 /* Ghostty.SplitNode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.SplitNode.swift; sourceTree = "<group>"; };
 		A5985CD62C320C4500C57AD3 /* String+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		A5985CE52C33060F00C57AD3 /* man */ = {isa = PBXFileReference; lastKnownFileType = folder; name = man; path = "../zig-out/share/man"; sourceTree = "<group>"; };
 		A599CDAF2CF103F20049FA26 /* NSAppearance+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSAppearance+Extension.swift"; sourceTree = "<group>"; };
@@ -168,11 +231,12 @@
 		A5A1F8842A489D6800D1E8BC /* terminfo */ = {isa = PBXFileReference; lastKnownFileType = folder; name = terminfo; path = "../zig-out/share/terminfo"; sourceTree = "<group>"; };
 		A5A2A3C92D4445E20033CF96 /* Dock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dock.swift; sourceTree = "<group>"; };
 		A5A2A3CB2D444AB80033CF96 /* NSApplication+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSApplication+Extension.swift"; sourceTree = "<group>"; };
-		A5A6F7292CC41B8700B232A5 /* Xcode.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Xcode.swift; sourceTree = "<group>"; };
+		A5A6F7292CC41B8700B232A5 /* AppInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppInfo.swift; sourceTree = "<group>"; };
 		A5AEB1642D5BE7BF00513529 /* LastWindowPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LastWindowPosition.swift; sourceTree = "<group>"; };
 		A5B30531299BEAAA0047F10C /* Ghostty.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ghostty.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A5B30538299BEAAB0047F10C /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		A5B3053D299BEAAB0047F10C /* Ghostty.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Ghostty.entitlements; sourceTree = "<group>"; };
+		A5B4EA842DFE69140022C3A2 /* NSMenuItem+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMenuItem+Extension.swift"; sourceTree = "<group>"; };
 		A5CA378B2D2A4DE800931030 /* KeyboardLayout.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyboardLayout.swift; sourceTree = "<group>"; };
 		A5CA378D2D31D6C100931030 /* Weak.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Weak.swift; sourceTree = "<group>"; };
 		A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DraggableWindowView.swift; sourceTree = "<group>"; };
@@ -199,9 +263,20 @@
 		A5E112922AF73E6E00C6E0C2 /* ClipboardConfirmation.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ClipboardConfirmation.xib; sourceTree = "<group>"; };
 		A5E112942AF73E8A00C6E0C2 /* ClipboardConfirmationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClipboardConfirmationController.swift; sourceTree = "<group>"; };
 		A5E112962AF7401B00C6E0C2 /* ClipboardConfirmationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClipboardConfirmationView.swift; sourceTree = "<group>"; };
+		A5E408292E022E9B0035FEAC /* TabGroupCloseCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabGroupCloseCoordinator.swift; sourceTree = "<group>"; };
+		A5E4082D2E0237410035FEAC /* NewTerminalIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewTerminalIntent.swift; sourceTree = "<group>"; };
+		A5E4082F2E0271320035FEAC /* GhosttyIntentError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GhosttyIntentError.swift; sourceTree = "<group>"; };
+		A5E408312E02FEDC0035FEAC /* TerminalEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalEntity.swift; sourceTree = "<group>"; };
+		A5E408332E03200F0035FEAC /* GetTerminalDetailsIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetTerminalDetailsIntent.swift; sourceTree = "<group>"; };
+		A5E408372E03C7D80035FEAC /* Ghostty.Surface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.Surface.swift; sourceTree = "<group>"; };
+		A5E408392E0449BB0035FEAC /* Ghostty.Command.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.Command.swift; sourceTree = "<group>"; };
+		A5E4083B2E044DB40035FEAC /* Ghostty.Error.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ghostty.Error.swift; sourceTree = "<group>"; };
+		A5E4083F2E04532A0035FEAC /* CommandEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandEntity.swift; sourceTree = "<group>"; };
+		A5E408422E047D060035FEAC /* CommandPaletteIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandPaletteIntent.swift; sourceTree = "<group>"; };
+		A5E408442E0483F80035FEAC /* KeybindIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeybindIntent.swift; sourceTree = "<group>"; };
+		A5E408462E0485270035FEAC /* InputIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputIntent.swift; sourceTree = "<group>"; };
 		A5FEB2FF2ABB69450068369E /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		AEE8B3442B9AA39600260C5E /* NSPasteboard+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSPasteboard+Extension.swift"; sourceTree = "<group>"; };
-		AEF9CE232B6AD07A0017E195 /* TerminalToolbar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalToolbar.swift; sourceTree = "<group>"; };
 		C159E81C2B66A06B00FDFE9C /* OSColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OSColor+Extension.swift"; sourceTree = "<group>"; };
 		C1F26EA62B738B9900404083 /* NSView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSView+Extension.swift"; sourceTree = "<group>"; };
 		C1F26EE72B76CBFC00404083 /* VibrantLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VibrantLayer.h; sourceTree = "<group>"; };
@@ -259,8 +334,11 @@
 				A56D58872ACDE6BE00508D2C /* Services */,
 				A59630982AEE1C4400D64628 /* Terminal */,
 				A5CBD05A2CA0C5910017A1AE /* QuickTerminal */,
+				A5E4082C2E0237270035FEAC /* App Intents */,
 				A5E112912AF73E4D00C6E0C2 /* ClipboardConfirmation */,
 				A57D79252C9C8782001D522E /* Secure Input */,
+				A58636622DEF955100E04A10 /* Splits */,
+				A53A29742DB2E04900B6E02C /* Command Palette */,
 				A534263E2A7DCC5800EBB7A2 /* Settings */,
 				A51BFC1C2B2FB5AB00E92F16 /* About */,
 				A54B0CE72D0CEC9800CBEFF8 /* Colorized Ghostty Icon */,
@@ -272,31 +350,25 @@
 		A534263D2A7DCBB000EBB7A2 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
+				A58636692DF0A98100E04A10 /* Extensions */,
+				A5874D9B2DAD781100E83852 /* Private */,
+				A5A6F7292CC41B8700B232A5 /* AppInfo.swift */,
 				A5AEB1642D5BE7BF00513529 /* LastWindowPosition.swift */,
-				A5A6F7292CC41B8700B232A5 /* Xcode.swift */,
 				A5CEAFFE29C2410700646FDA /* Backport.swift */,
 				A5333E1B2B5A1CE3008AEFF7 /* CrossKit.swift */,
 				A5CBD0572C9F30860017A1AE /* Cursor.swift */,
 				A5D0AF3C2B37804400D21823 /* CodableBridge.swift */,
-				A5A2A3C92D4445E20033CF96 /* Dock.swift */,
+				A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */,
+				A58636702DF298F700E04A10 /* ExpiringUndoManager.swift */,
 				A52FFF582CAA4FF1000C6A5B /* Fullscreen.swift */,
 				A59630962AEE163600D64628 /* HostingWindow.swift */,
 				A5CA378B2D2A4DE800931030 /* KeyboardLayout.swift */,
 				A59FB5D02AE0DEA7009128F3 /* MetalView.swift */,
-				A5CBD0552C9E65A50017A1AE /* DraggableWindowView.swift */,
+				A51194162E05D95E007258CC /* PermissionRequest.swift */,
-				C159E81C2B66A06B00FDFE9C /* OSColor+Extension.swift */,
+				A5E408292E022E9B0035FEAC /* TabGroupCloseCoordinator.swift */,
-				A599CDAF2CF103F20049FA26 /* NSAppearance+Extension.swift */,
-				A5A2A3CB2D444AB80033CF96 /* NSApplication+Extension.swift */,
-				A54B0CEA2D0CFB4A00CBEFF8 /* NSImage+Extension.swift */,
-				A52FFF5C2CAB4D05000C6A5B /* NSScreen+Extension.swift */,
-				C1F26EA62B738B9900404083 /* NSView+Extension.swift */,
-				AEE8B3442B9AA39600260C5E /* NSPasteboard+Extension.swift */,
-				A5985CD62C320C4500C57AD3 /* String+Extension.swift */,
-				A5CC36142C9CDA03004D6760 /* View+Extension.swift */,
 				A5CA378D2D31D6C100931030 /* Weak.swift */,
 				C1F26EE72B76CBFC00404083 /* VibrantLayer.h */,
 				C1F26EE82B76CBFC00404083 /* VibrantLayer.m */,
-				A5CEAFDA29B8005900646FDA /* SplitView */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -312,6 +384,15 @@
 			path = Settings;
 			sourceTree = "<group>";
 		};
+		A53A29742DB2E04900B6E02C /* Command Palette */ = {
+			isa = PBXGroup;
+			children = (
+				A53A297A2DB2E49400B6E02C /* CommandPalette.swift */,
+				A53A29872DB69D2C00B6E02C /* TerminalCommandPalette.swift */,
+			);
+			path = "Command Palette";
+			sourceTree = "<group>";
+		};
 		A53D0C912B53B41900305CE6 /* App */ = {
 			isa = PBXGroup;
 			children = (
@@ -361,6 +442,23 @@
 			path = Sources;
 			sourceTree = "<group>";
 		};
+		A5593FDD2DF8D56000B47B10 /* Window Styles */ = {
+			isa = PBXGroup;
+			children = (
+				A59630992AEE1C6400D64628 /* Terminal.xib */,
+				A5593FE22DF8D78600B47B10 /* TerminalHiddenTitlebar.xib */,
+				A51544FF2DFB112E009E85D8 /* TerminalTabsTitlebarTahoe.xib */,
+				A5593FE42DF8DE3000B47B10 /* TerminalTabsTitlebarVentura.xib */,
+				A5593FE82DF927DF00B47B10 /* TerminalTransparentTitlebar.xib */,
+				A5593FDE2DF8D57100B47B10 /* TerminalWindow.swift */,
+				A5593FE02DF8D73400B47B10 /* HiddenTitlebarTerminalWindow.swift */,
+				A51B78462AF4B58B00F3EDB9 /* TitlebarTabsVenturaTerminalWindow.swift */,
+				A51544FD2DFB1110009E85D8 /* TitlebarTabsTahoeTerminalWindow.swift */,
+				A5593FE62DF927CC00B47B10 /* TransparentTitlebarTerminalWindow.swift */,
+			);
+			path = "Window Styles";
+			sourceTree = "<group>";
+		};
 		A55B7BB429B6F4410055DE60 /* Ghostty */ = {
 			isa = PBXGroup;
 			children = (
@@ -370,14 +468,14 @@
 				A5333E152B59DE8E008AEFF7 /* SurfaceView_UIKit.swift */,
 				A59FB5CE2AE0DB50009128F3 /* InspectorView.swift */,
 				A53D0C992B543F3B00305CE6 /* Ghostty.App.swift */,
+				A5E408392E0449BB0035FEAC /* Ghostty.Command.swift */,
 				A514C8D52B54A16400493A16 /* Ghostty.Config.swift */,
 				A53A6C022CCC1B7D00943E98 /* Ghostty.Action.swift */,
+				A5E4083B2E044DB40035FEAC /* Ghostty.Error.swift */,
 				A5CF66D62D29DDB100139794 /* Ghostty.Event.swift */,
 				A5278A9A2AA05B2600CD3039 /* Ghostty.Input.swift */,
 				A56D58852ACDDB4100508D2C /* Ghostty.Shell.swift */,
-				A59630A32AF059BB00D64628 /* Ghostty.SplitNode.swift */,
+				A5E408372E03C7D80035FEAC /* Ghostty.Surface.swift */,
-				A59630A12AF0415000D64628 /* Ghostty.TerminalSplit.swift */,
-				A55685DF29A03A9F004303CE /* AppError.swift */,
 				A52FFF5A2CAA54A8000C6A5B /* FullscreenMode+Extension.swift */,
 				A5CF66D32D289CEA00139794 /* NSEvent+Extension.swift */,
 			);
@@ -401,16 +499,58 @@
 			path = "Secure Input";
 			sourceTree = "<group>";
 		};
+		A58636622DEF955100E04A10 /* Splits */ = {
+			isa = PBXGroup;
+			children = (
+				A586365E2DEE6C2100E04A10 /* SplitTree.swift */,
+				A58636652DEF963F00E04A10 /* TerminalSplitTreeView.swift */,
+				A5CEAFDB29B8009000646FDA /* SplitView.swift */,
+				A5CEAFDD29B8058B00646FDA /* SplitView.Divider.swift */,
+			);
+			path = Splits;
+			sourceTree = "<group>";
+		};
+		A58636692DF0A98100E04A10 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				A586366A2DF0A98900E04A10 /* Array+Extension.swift */,
+				A50297342DFA0F3300B4E924 /* Double+Extension.swift */,
+				A586366E2DF25D8300E04A10 /* Duration+Extension.swift */,
+				A53A29802DB44A5E00B6E02C /* KeyboardShortcut+Extension.swift */,
+				A53A297E2DB4480A00B6E02C /* EventModifiers+Extension.swift */,
+				A51194122E05D003007258CC /* Optional+Extension.swift */,
+				C159E81C2B66A06B00FDFE9C /* OSColor+Extension.swift */,
+				A599CDAF2CF103F20049FA26 /* NSAppearance+Extension.swift */,
+				A5A2A3CB2D444AB80033CF96 /* NSApplication+Extension.swift */,
+				A54B0CEA2D0CFB4A00CBEFF8 /* NSImage+Extension.swift */,
+				A5B4EA842DFE69140022C3A2 /* NSMenuItem+Extension.swift */,
+				A52FFF5C2CAB4D05000C6A5B /* NSScreen+Extension.swift */,
+				AEE8B3442B9AA39600260C5E /* NSPasteboard+Extension.swift */,
+				C1F26EA62B738B9900404083 /* NSView+Extension.swift */,
+				A5874D9C2DAD785F00E83852 /* NSWindow+Extension.swift */,
+				A5985CD62C320C4500C57AD3 /* String+Extension.swift */,
+				A58636722DF4813000E04A10 /* UndoManager+Extension.swift */,
+				A5CC36142C9CDA03004D6760 /* View+Extension.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
+		A5874D9B2DAD781100E83852 /* Private */ = {
+			isa = PBXGroup;
+			children = (
+				A5874D982DAD751A00E83852 /* CGS.swift */,
+				A5A2A3C92D4445E20033CF96 /* Dock.swift */,
+			);
+			path = Private;
+			sourceTree = "<group>";
+		};
 		A59630982AEE1C4400D64628 /* Terminal */ = {
 			isa = PBXGroup;
 			children = (
-				A59630992AEE1C6400D64628 /* Terminal.xib */,
+				A5593FDD2DF8D56000B47B10 /* Window Styles */,
-				A596309F2AEF6AEB00D64628 /* TerminalManager.swift */,
 				A596309B2AEE1C9E00D64628 /* TerminalController.swift */,
 				A5D0AF3A2B36A1DE00D21823 /* TerminalRestorable.swift */,
 				A596309D2AEE1D6C00D64628 /* TerminalView.swift */,
-				A51B78462AF4B58B00F3EDB9 /* TerminalWindow.swift */,
-				AEF9CE232B6AD07A0017E195 /* TerminalToolbar.swift */,
 				A535B9D9299C569B0017E2E4 /* ErrorView.swift */,
 				A54D786B2CA79788001B19B1 /* BaseTerminalController.swift */,
 			);
@@ -424,6 +564,7 @@
 				29C15B1C2CDC3B2000520DD4 /* bat */,
 				A586167B2B7703CC009BDB1D /* fish */,
 				55154BDF2B33911F001622DC /* ghostty */,
+				A546F1132D7B68D7003B11A0 /* locale */,
 				A5985CE52C33060F00C57AD3 /* man */,
 				9351BE8E2D22937F003B3499 /* nvim */,
 				A5A1F8842A489D6800D1E8BC /* terminfo */,
@@ -438,6 +579,7 @@
 			children = (
 				A571AB1C2A206FC600248498 /* Ghostty-Info.plist */,
 				A5B30538299BEAAB0047F10C /* Assets.xcassets */,
+				A553F4122E06EB1600257779 /* Ghostty.icon */,
 				A5B3053D299BEAAB0047F10C /* Ghostty.entitlements */,
 				A51BFC282B30F26D00E92F16 /* GhosttyDebug.entitlements */,
 				3B39CAA42B33949B00DABEB8 /* GhosttyReleaseLocal.entitlements */,
@@ -478,15 +620,6 @@
 			path = "Global Keybinds";
 			sourceTree = "<group>";
 		};
-		A5CEAFDA29B8005900646FDA /* SplitView */ = {
-			isa = PBXGroup;
-			children = (
-				A5CEAFDB29B8009000646FDA /* SplitView.swift */,
-				A5CEAFDD29B8058B00646FDA /* SplitView.Divider.swift */,
-			);
-			path = SplitView;
-			sourceTree = "<group>";
-		};
 		A5D495A3299BECBA00DD1313 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -506,6 +639,32 @@
 			path = ClipboardConfirmation;
 			sourceTree = "<group>";
 		};
+		A5E4082C2E0237270035FEAC /* App Intents */ = {
+			isa = PBXGroup;
+			children = (
+				A5E408412E0453370035FEAC /* Entities */,
+				A511940E2E050590007258CC /* CloseTerminalIntent.swift */,
+				A5E4082D2E0237410035FEAC /* NewTerminalIntent.swift */,
+				A5E408332E03200F0035FEAC /* GetTerminalDetailsIntent.swift */,
+				A51194102E05A480007258CC /* QuickTerminalIntent.swift */,
+				A5E408422E047D060035FEAC /* CommandPaletteIntent.swift */,
+				A5E408462E0485270035FEAC /* InputIntent.swift */,
+				A5E408442E0483F80035FEAC /* KeybindIntent.swift */,
+				A5E4082F2E0271320035FEAC /* GhosttyIntentError.swift */,
+				A51194182E05DFBB007258CC /* IntentPermission.swift */,
+			);
+			path = "App Intents";
+			sourceTree = "<group>";
+		};
+		A5E408412E0453370035FEAC /* Entities */ = {
+			isa = PBXGroup;
+			children = (
+				A5E408312E02FEDC0035FEAC /* TerminalEntity.swift */,
+				A5E4083F2E04532A0035FEAC /* CommandEntity.swift */,
+			);
+			path = Entities;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -593,20 +752,26 @@
 			buildActionMask = 2147483647;
 			files = (
 				FC9ABA9C2D0F53F80020D4C8 /* bash-completion in Resources */,
+				A553F4142E06EB1600257779 /* Ghostty.icon in Resources */,
+				A5593FE52DF8DE3000B47B10 /* TerminalTabsTitlebarVentura.xib in Resources */,
+				29C15B1D2CDC3B2900520DD4 /* bat in Resources */,
+				A586167C2B7703CC009BDB1D /* fish in Resources */,
+				55154BE02B33911F001622DC /* ghostty in Resources */,
+				A5593FE32DF8D78600B47B10 /* TerminalHiddenTitlebar.xib in Resources */,
+				A546F1142D7B68D7003B11A0 /* locale in Resources */,
+				A5985CE62C33060F00C57AD3 /* man in Resources */,
+				9351BE8E3D22937F003B3499 /* nvim in Resources */,
+				A5A1F8852A489D6800D1E8BC /* terminfo in Resources */,
+				552964E62B34A9B400030505 /* vim in Resources */,
+				FC5218FA2D10FFCE004C93E0 /* zsh in Resources */,
 				A5B30539299BEAAB0047F10C /* Assets.xcassets in Resources */,
 				A51BFC1E2B2FB5CE00E92F16 /* About.xib in Resources */,
+				A5593FE92DF927DF00B47B10 /* TerminalTransparentTitlebar.xib in Resources */,
 				A5E112932AF73E6E00C6E0C2 /* ClipboardConfirmation.xib in Resources */,
 				A5CDF1912AAF9A5800513312 /* ConfigurationErrors.xib in Resources */,
 				857F63812A5E64F200CA4815 /* MainMenu.xib in Resources */,
-				29C15B1D2CDC3B2900520DD4 /* bat in Resources */,
 				A596309A2AEE1C6400D64628 /* Terminal.xib in Resources */,
-				A586167C2B7703CC009BDB1D /* fish in Resources */,
+				A51545002DFB112E009E85D8 /* TerminalTabsTitlebarTahoe.xib in Resources */,
-				FC5218FA2D10FFCE004C93E0 /* zsh in Resources */,
-				55154BE02B33911F001622DC /* ghostty in Resources */,
-				A5985CE62C33060F00C57AD3 /* man in Resources */,
-				A5A1F8852A489D6800D1E8BC /* terminfo in Resources */,
-				552964E62B34A9B400030505 /* vim in Resources */,
-				9351BE8E3D22937F003B3499 /* nvim in Resources */,
 				A5CBD05C2CA0C5C70017A1AE /* QuickTerminal.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -616,6 +781,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A53D0C952B53B4D800305CE6 /* Assets.xcassets in Resources */,
+				A553F4132E06EB1600257779 /* Ghostty.icon in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -627,71 +793,101 @@
 			buildActionMask = 2147483647;
 			files = (
 				A5AEB1652D5BE7D000513529 /* LastWindowPosition.swift in Sources */,
-				A59630A42AF059BB00D64628 /* Ghostty.SplitNode.swift in Sources */,
+				A5E408432E047D0B0035FEAC /* CommandPaletteIntent.swift in Sources */,
 				A514C8D62B54A16400493A16 /* Ghostty.Config.swift in Sources */,
 				A54B0CEB2D0CFB4C00CBEFF8 /* NSImage+Extension.swift in Sources */,
+				A5874D9D2DAD786100E83852 /* NSWindow+Extension.swift in Sources */,
 				A54D786C2CA7978E001B19B1 /* BaseTerminalController.swift in Sources */,
+				A58636732DF4813400E04A10 /* UndoManager+Extension.swift in Sources */,
 				A59FB5CF2AE0DB50009128F3 /* InspectorView.swift in Sources */,
 				CFBB5FEA2D231E5000FD62EE /* QuickTerminalSpaceBehavior.swift in Sources */,
 				A54B0CE92D0CECD100CBEFF8 /* ColorizedGhosttyIconView.swift in Sources */,
 				A5D0AF3D2B37804400D21823 /* CodableBridge.swift in Sources */,
+				A51194132E05D006007258CC /* Optional+Extension.swift in Sources */,
 				A5D0AF3B2B36A1DE00D21823 /* TerminalRestorable.swift in Sources */,
 				C1F26EA72B738B9900404083 /* NSView+Extension.swift in Sources */,
+				A586366F2DF25D8600E04A10 /* Duration+Extension.swift in Sources */,
 				A5CF66D42D289CEE00139794 /* NSEvent+Extension.swift in Sources */,
+				A5E408342E0320140035FEAC /* GetTerminalDetailsIntent.swift in Sources */,
 				A5CBD0642CA122E70017A1AE /* QuickTerminalPosition.swift in Sources */,
 				A596309C2AEE1C9E00D64628 /* TerminalController.swift in Sources */,
+				A5E408322E02FEDF0035FEAC /* TerminalEntity.swift in Sources */,
 				A5CC36152C9CDA06004D6760 /* View+Extension.swift in Sources */,
 				A56D58892ACDE6CA00508D2C /* ServiceProvider.swift in Sources */,
 				A5CBD0602CA0C90A0017A1AE /* QuickTerminalWindow.swift in Sources */,
 				A5CBD05E2CA0C5EC0017A1AE /* QuickTerminalController.swift in Sources */,
 				A5CF66D72D29DDB500139794 /* Ghostty.Event.swift in Sources */,
+				A511940F2E050595007258CC /* CloseTerminalIntent.swift in Sources */,
+				A5E408382E03C7DA0035FEAC /* Ghostty.Surface.swift in Sources */,
+				A5593FE72DF927D200B47B10 /* TransparentTitlebarTerminalWindow.swift in Sources */,
 				A5A2A3CA2D4445E30033CF96 /* Dock.swift in Sources */,
+				A586365F2DEE6C2300E04A10 /* SplitTree.swift in Sources */,
 				A51BFC222B2FB6B400E92F16 /* AboutView.swift in Sources */,
 				A5278A9B2AA05B2600CD3039 /* Ghostty.Input.swift in Sources */,
+				A53A29812DB44A6100B6E02C /* KeyboardShortcut+Extension.swift in Sources */,
+				A50297352DFA0F3400B4E924 /* Double+Extension.swift in Sources */,
 				A5CBD0562C9E65B80017A1AE /* DraggableWindowView.swift in Sources */,
+				A51194112E05A483007258CC /* QuickTerminalIntent.swift in Sources */,
 				C1F26EE92B76CBFC00404083 /* VibrantLayer.m in Sources */,
+				A5593FDF2DF8D57C00B47B10 /* TerminalWindow.swift in Sources */,
+				A58636712DF298FB00E04A10 /* ExpiringUndoManager.swift in Sources */,
 				A59630972AEE163600D64628 /* HostingWindow.swift in Sources */,
-				A59630A02AEF6AEB00D64628 /* TerminalManager.swift in Sources */,
 				A51BFC2B2B30F6BE00E92F16 /* UpdateDelegate.swift in Sources */,
 				A5CBD06B2CA322430017A1AE /* GlobalEventTap.swift in Sources */,
 				AEE8B3452B9AA39600260C5E /* NSPasteboard+Extension.swift in Sources */,
+				A51194172E05D964007258CC /* PermissionRequest.swift in Sources */,
+				A51194192E05DFC4007258CC /* IntentPermission.swift in Sources */,
 				A52FFF5D2CAB4D08000C6A5B /* NSScreen+Extension.swift in Sources */,
 				A53426352A7DA53D00EBB7A2 /* AppDelegate.swift in Sources */,
 				A5CBD0582C9F30960017A1AE /* Cursor.swift in Sources */,
-				A5A6F72A2CC41B8900B232A5 /* Xcode.swift in Sources */,
+				A5A6F72A2CC41B8900B232A5 /* AppInfo.swift in Sources */,
 				A52FFF5B2CAA54B1000C6A5B /* FullscreenMode+Extension.swift in Sources */,
 				A5333E222B5A2128008AEFF7 /* SurfaceView_AppKit.swift in Sources */,
 				A5CA378E2D31D6C300931030 /* Weak.swift in Sources */,
 				A5CDF1952AAFA19600513312 /* ConfigurationErrorsView.swift in Sources */,
 				A55B7BBC29B6FC330055DE60 /* SurfaceView.swift in Sources */,
 				A5333E1C2B5A1CE3008AEFF7 /* CrossKit.swift in Sources */,
+				A5B4EA852DFE691B0022C3A2 /* NSMenuItem+Extension.swift in Sources */,
+				A5874D992DAD751B00E83852 /* CGS.swift in Sources */,
+				A586366B2DF0A98C00E04A10 /* Array+Extension.swift in Sources */,
+				A5E408472E04852B0035FEAC /* InputIntent.swift in Sources */,
+				A51544FE2DFB111C009E85D8 /* TitlebarTabsTahoeTerminalWindow.swift in Sources */,
 				A59444F729A2ED5200725BBA /* SettingsView.swift in Sources */,
 				A56D58862ACDDB4100508D2C /* Ghostty.Shell.swift in Sources */,
 				A5985CD72C320C4500C57AD3 /* String+Extension.swift in Sources */,
 				A5A2A3CC2D444ABB0033CF96 /* NSApplication+Extension.swift in Sources */,
-				A59630A22AF0415000D64628 /* Ghostty.TerminalSplit.swift in Sources */,
+				A5E408302E0271320035FEAC /* GhosttyIntentError.swift in Sources */,
+				A5E4083A2E0449BD0035FEAC /* Ghostty.Command.swift in Sources */,
+				A5E408452E0483FD0035FEAC /* KeybindIntent.swift in Sources */,
 				A5FEB3002ABB69450068369E /* main.swift in Sources */,
+				A53A297F2DB4480F00B6E02C /* EventModifiers+Extension.swift in Sources */,
+				A5E4082E2E0237460035FEAC /* NewTerminalIntent.swift in Sources */,
+				A53A297B2DB2E49700B6E02C /* CommandPalette.swift in Sources */,
 				A55B7BB829B6F53A0055DE60 /* Package.swift in Sources */,
-				A51B78472AF4B58B00F3EDB9 /* TerminalWindow.swift in Sources */,
+				A51B78472AF4B58B00F3EDB9 /* TitlebarTabsVenturaTerminalWindow.swift in Sources */,
 				A57D79272C9C879B001D522E /* SecureInput.swift in Sources */,
 				A5CEAFDC29B8009000646FDA /* SplitView.swift in Sources */,
+				A5593FE12DF8D74000B47B10 /* HiddenTitlebarTerminalWindow.swift in Sources */,
+				A5E4083C2E044DB50035FEAC /* Ghostty.Error.swift in Sources */,
 				A5CDF1932AAF9E0800513312 /* ConfigurationErrorsController.swift in Sources */,
 				A53A6C032CCC1B7F00943E98 /* Ghostty.Action.swift in Sources */,
 				A54B0CED2D0CFB7700CBEFF8 /* ColorizedGhosttyIcon.swift in Sources */,
 				A5CA378C2D2A4DEB00931030 /* KeyboardLayout.swift in Sources */,
 				A54B0CEF2D0D2E2800CBEFF8 /* ColorizedGhosttyIconImage.swift in Sources */,
 				A59FB5D12AE0DEA7009128F3 /* MetalView.swift in Sources */,
-				A55685E029A03A9F004303CE /* AppError.swift in Sources */,
 				A599CDB02CF103F60049FA26 /* NSAppearance+Extension.swift in Sources */,
 				A52FFF572CA90484000C6A5B /* QuickTerminalScreen.swift in Sources */,
 				A5CC36132C9CD72D004D6760 /* SecureInputOverlay.swift in Sources */,
+				A5E408402E04532C0035FEAC /* CommandEntity.swift in Sources */,
+				A5E4082A2E022E9E0035FEAC /* TabGroupCloseCoordinator.swift in Sources */,
 				A535B9DA299C569B0017E2E4 /* ErrorView.swift in Sources */,
+				A53A29882DB69D2F00B6E02C /* TerminalCommandPalette.swift in Sources */,
 				A51BFC202B2FB64F00E92F16 /* AboutController.swift in Sources */,
 				A5CEAFFF29C2410700646FDA /* Backport.swift in Sources */,
 				A5E112952AF73E8A00C6E0C2 /* ClipboardConfirmationController.swift in Sources */,
 				A596309E2AEE1D6C00D64628 /* TerminalView.swift in Sources */,
+				A58636662DEF964100E04A10 /* TerminalSplitTreeView.swift in Sources */,
 				A52FFF592CAA4FF3000C6A5B /* Fullscreen.swift in Sources */,
-				AEF9CE242B6AD07A0017E195 /* TerminalToolbar.swift in Sources */,
 				C159E81D2B66A06B00FDFE9C /* OSColor+Extension.swift in Sources */,
 				A5CEAFDE29B8058B00646FDA /* SplitView.Divider.swift in Sources */,
 				A5E112972AF7401B00C6E0C2 /* ClipboardConfirmationView.swift in Sources */,
@@ -704,6 +900,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				A5CBD0592C9F37B10017A1AE /* Backport.swift in Sources */,
+				A553F4062E05E93000257779 /* Optional+Extension.swift in Sources */,
 				A53D0C942B53B43700305CE6 /* iOSApp.swift in Sources */,
 				A514C8D72B54A16400493A16 /* Ghostty.Config.swift in Sources */,
 				A5333E232B5A219A008AEFF7 /* SurfaceView.swift in Sources */,
@@ -713,6 +910,7 @@
 				A53D0C9B2B543F3B00305CE6 /* Ghostty.App.swift in Sources */,
 				A5333E242B5A22D9008AEFF7 /* Ghostty.Shell.swift in Sources */,
 				A5985CD82C320C4500C57AD3 /* String+Extension.swift in Sources */,
+				A553F4072E05E93D00257779 /* Array+Extension.swift in Sources */,
 				C159E89D2B69A2EF00FDFE9C /* OSColor+Extension.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -778,7 +976,7 @@
 		3B39CAA32B33946300DABEB8 /* ReleaseLocal */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -948,7 +1146,7 @@
 		A5B30541299BEAAB0047F10C /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -1002,7 +1200,7 @@
 		A5B30542299BEAAB0047F10C /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
@@ -1055,7 +1253,7 @@
 		A5D449A82B53AE7B000F5B83 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -1094,7 +1292,7 @@
 		A5D449A92B53AE7B000F5B83 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
@@ -1133,7 +1331,7 @@
 		A5D449AA2B53AE7B000F5B83 /* ReleaseLocal */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = Ghostty;
 				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;

macos/Sources/App/macOS/AppDelegate.swift

@@ -18,6 +18,7 @@ class AppDelegate: NSObject,
     )
 
     /// Various menu items so that we can programmatically sync the keyboard shortcut with the Ghostty config
+    @IBOutlet private var menuAbout: NSMenuItem?
     @IBOutlet private var menuServices: NSMenu?
     @IBOutlet private var menuCheckForUpdates: NSMenuItem?
     @IBOutlet private var menuOpenConfig: NSMenuItem?
@@ -28,12 +29,16 @@ class AppDelegate: NSObject,
     @IBOutlet private var menuNewWindow: NSMenuItem?
     @IBOutlet private var menuNewTab: NSMenuItem?
     @IBOutlet private var menuSplitRight: NSMenuItem?
+    @IBOutlet private var menuSplitLeft: NSMenuItem?
     @IBOutlet private var menuSplitDown: NSMenuItem?
+    @IBOutlet private var menuSplitUp: NSMenuItem?
     @IBOutlet private var menuClose: NSMenuItem?
     @IBOutlet private var menuCloseTab: NSMenuItem?
     @IBOutlet private var menuCloseWindow: NSMenuItem?
     @IBOutlet private var menuCloseAllWindows: NSMenuItem?
 
+    @IBOutlet private var menuUndo: NSMenuItem?
+    @IBOutlet private var menuRedo: NSMenuItem?
     @IBOutlet private var menuCopy: NSMenuItem?
     @IBOutlet private var menuPaste: NSMenuItem?
     @IBOutlet private var menuPasteSelection: NSMenuItem?
@@ -41,6 +46,7 @@ class AppDelegate: NSObject,
 
     @IBOutlet private var menuToggleVisibility: NSMenuItem?
     @IBOutlet private var menuToggleFullScreen: NSMenuItem?
+    @IBOutlet private var menuBringAllToFront: NSMenuItem?
     @IBOutlet private var menuZoomSplit: NSMenuItem?
     @IBOutlet private var menuPreviousSplit: NSMenuItem?
     @IBOutlet private var menuNextSplit: NSMenuItem?
@@ -48,12 +54,17 @@ class AppDelegate: NSObject,
     @IBOutlet private var menuSelectSplitBelow: NSMenuItem?
     @IBOutlet private var menuSelectSplitLeft: NSMenuItem?
     @IBOutlet private var menuSelectSplitRight: NSMenuItem?
+    @IBOutlet private var menuReturnToDefaultSize: NSMenuItem?
+    @IBOutlet private var menuFloatOnTop: NSMenuItem?
+    @IBOutlet private var menuUseAsDefault: NSMenuItem?
 
     @IBOutlet private var menuIncreaseFontSize: NSMenuItem?
     @IBOutlet private var menuDecreaseFontSize: NSMenuItem?
     @IBOutlet private var menuResetFontSize: NSMenuItem?
+    @IBOutlet private var menuChangeTitle: NSMenuItem?
     @IBOutlet private var menuQuickTerminal: NSMenuItem?
     @IBOutlet private var menuTerminalInspector: NSMenuItem?
+    @IBOutlet private var menuCommandPalette: NSMenuItem?
 
     @IBOutlet private var menuEqualizeSplits: NSMenuItem?
     @IBOutlet private var menuMoveSplitDividerUp: NSMenuItem?
@@ -77,11 +88,14 @@ class AppDelegate: NSObject,
     /// The ghostty global state. Only one per process.
     let ghostty: Ghostty.App = Ghostty.App()
 
-    /// Manages our terminal windows.
+    /// The global undo manager for app-level state such as window restoration.
-    let terminalManager: TerminalManager
+    lazy var undoManager = ExpiringUndoManager()
 
     /// Our quick terminal. This starts out uninitialized and only initializes if used.
-    private var quickController: QuickTerminalController? = nil
+    private(set) lazy var quickController = QuickTerminalController(
+        ghostty,
+        position: derivedConfig.quickTerminalPosition
+    )
 
     /// Manages updates
     let updaterController: SPUStandardUpdaterController
@@ -98,6 +112,9 @@ class AppDelegate: NSObject,
     /// The observer for the app appearance.
     private var appearanceObserver: NSKeyValueObservation? = nil
 
+    /// Signals
+    private var signals: [DispatchSourceSignal] = []
+
     /// The custom app icon image that is currently in use.
     @Published private(set) var appIcon: NSImage? = nil {
         didSet {
@@ -106,7 +123,6 @@ class AppDelegate: NSObject,
     }
 
     override init() {
-        terminalManager = TerminalManager(ghostty)
         updaterController = SPUStandardUpdaterController(
             // Important: we must not start the updater here because we need to read our configuration
             // first to determine whether we're automatically checking, downloading, etc. The updater
@@ -146,10 +162,6 @@ class AppDelegate: NSObject,
             toggleSecureInput(self)
         }
 
-        // Hook up updater menu
-        menuCheckForUpdates?.target = updaterController
-        menuCheckForUpdates?.action = #selector(SPUStandardUpdaterController.checkForUpdates(_:))
-
         // Initial config loading
         ghosttyConfigDidChange(config: ghostty.config)
 
@@ -169,6 +181,12 @@ class AppDelegate: NSObject,
             handler: localEventHandler)
 
         // Notifications
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(windowDidBecomeKey),
+            name: NSWindow.didBecomeKeyNotification,
+            object: nil
+        )
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(quickTerminalDidChangeVisibility),
@@ -181,6 +199,22 @@ class AppDelegate: NSObject,
             name: .ghosttyConfigDidChange,
             object: nil
         )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(ghosttyBellDidRing(_:)),
+            name: .ghosttyBellDidRing,
+            object: nil
+        )
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(ghosttyNewWindow(_:)),
+            name: Ghostty.Notification.ghosttyNewWindow,
+            object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(ghosttyNewTab(_:)),
+            name: Ghostty.Notification.ghosttyNewTab,
+            object: nil)
 
         // Configure user notifications
         let actions = [
@@ -188,6 +222,7 @@ class AppDelegate: NSObject,
         ]
 
         let center = UNUserNotificationCenter.current()
+
         center.setNotificationCategories([
             UNNotificationCategory(
                 identifier: Ghostty.userNotificationCategory,
@@ -214,12 +249,21 @@ class AppDelegate: NSObject,
 
             ghostty_app_set_color_scheme(app, scheme)
         }
+
+        // Setup our menu
+        setupMenuImages()
+
+        // Setup signal handlers
+        setupSignals()
     }
 
     func applicationDidBecomeActive(_ notification: Notification) {
         // If we're back manually then clear the hidden state because macOS handles it.
         self.hiddenState = nil
 
+        // Clear the dock badge when the app becomes active
+        self.setDockBadge(nil)
+
         // First launch stuff
         if (!applicationHasBecomeActive) {
             applicationHasBecomeActive = true
@@ -228,8 +272,10 @@ class AppDelegate: NSObject,
             // is possible to have other windows in a few scenarios:
             //   - if we're opening a URL since `application(_:openFile:)` is called before this.
             //   - if we're restoring from persisted state
-            if terminalManager.windows.count == 0 && derivedConfig.initialWindow {
+            if TerminalController.all.isEmpty && derivedConfig.initialWindow {
-                terminalManager.newWindow()
+                undoManager.disableUndoRegistration()
+                _ = TerminalController.newWindow(ghostty)
+                undoManager.enableUndoRegistration()
             }
         }
     }
@@ -249,7 +295,7 @@ class AppDelegate: NSObject,
         // NOTE(mitchellh): I don't think we need this check at all anymore. I'm keeping it
         // here because I don't want to remove it in a patch release cycle but we should
         // target removing it soon.
-        if (self.quickController == nil && windows.allSatisfy { !$0.isVisible }) {
+        if (windows.allSatisfy { !$0.isVisible }) {
             return .terminateNow
         }
 
@@ -296,6 +342,13 @@ class AppDelegate: NSObject,
         }
     }
 
+    func applicationWillTerminate(_ notification: Notification) {
+        // We have no notifications we want to persist after death,
+        // so remove them all now. In the future we may want to be
+        // more selective and only remove surface-targeted notifications.
+        UNUserNotificationCenter.current().removeAllDeliveredNotifications()
+    }
+
     /// This is called when the application is already open and someone double-clicks the icon
     /// or clicks the dock icon.
     func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
@@ -307,10 +360,15 @@ class AppDelegate: NSObject,
         // This is possible with flag set to false if there a race where the
         // window is still initializing and is not visible but the user clicked
         // the dock icon.
-        guard terminalManager.windows.count == 0 else { return true }
+        guard TerminalController.all.isEmpty else { return true }
+
+        // If the application isn't active yet then we don't want to process
+        // this because we're not ready. This happens sometimes in Xcode runs
+        // but I haven't seen it happen in releases. I'm unsure why.
+        guard applicationHasBecomeActive else { return true }
 
         // No visible windows, open a new one.
-        terminalManager.newWindow()
+        _ = TerminalController.newWindow(ghostty)
         return false
     }
 
@@ -326,16 +384,24 @@ class AppDelegate: NSObject,
         var config = Ghostty.SurfaceConfiguration()
 
         if (isDirectory.boolValue) {
-            // When opening a directory, create a new tab in the main window with that as the working directory.
+            // When opening a directory, create a new tab in the main
+            // window with that as the working directory.
             // If no windows exist, a new one will be created.
             config.workingDirectory = filename
-            terminalManager.newTab(withBaseConfig: config)
+            _ = TerminalController.newTab(ghostty, withBaseConfig: config)
         } else {
-            // When opening a file, open a new window with that file as the command,
+            // When opening a file, we want to execute the file. To do this, we
-            // and its parent directory as the working directory.
+            // don't override the command directly, because it won't load the
-            config.command = filename
+            // profile/rc files for the shell, which is super important on macOS
+            // due to things like Homebrew. Instead, we set the command to
+            // `<filename>; exit` which is what Terminal and iTerm2 do.
+            config.initialInput = "\(filename); exit\n"
+
+            // Set the parent directory to our working directory so that relative
+            // paths in scripts work.
             config.workingDirectory = (filename as NSString).deletingLastPathComponent
-            terminalManager.newWindow(withBaseConfig: config)
+
+            _ = TerminalController.newWindow(ghostty, withBaseConfig: config)
         }
 
         return true
@@ -346,10 +412,79 @@ class AppDelegate: NSObject,
         return dockMenu
     }
 
+    /// Setup signal handlers
+    private func setupSignals() {
+        // Register a signal handler for config reloading. It appears that all
+        // of this is required. I've commented each line because its a bit unclear.
+        // Warning: signal handlers don't work when run via Xcode. They have to be
+        // run on a real app bundle.
+
+        // We need to ignore signals we register with makeSignalSource or they
+        // don't seem to handle.
+        signal(SIGUSR2, SIG_IGN)
+
+        // Make the signal source and register our event handle. We keep a weak
+        // ref to ourself so we don't create a retain cycle.
+        let sigusr2 = DispatchSource.makeSignalSource(signal: SIGUSR2, queue: .main)
+        sigusr2.setEventHandler { [weak self] in
+            guard let self else { return }
+            Ghostty.logger.info("reloading configuration in response to SIGUSR2")
+            self.ghostty.reloadConfig()
+        }
+
+        // The signal source starts unactivated, so we have to resume it once
+        // we setup the event handler.
+        sigusr2.resume()
+
+        // We need to keep a strong reference to it so it isn't disabled.
+        signals.append(sigusr2)
+    }
+
+    /// Setup all the images for our menu items.
+    private func setupMenuImages() {
+        // Note: This COULD Be done all in the xib file, but I find it easier to
+        // modify this stuff as code.
+        self.menuAbout?.setImageIfDesired(systemSymbolName: "info.circle")
+        self.menuCheckForUpdates?.setImageIfDesired(systemSymbolName: "square.and.arrow.down")
+        self.menuOpenConfig?.setImageIfDesired(systemSymbolName: "gear")
+        self.menuReloadConfig?.setImageIfDesired(systemSymbolName: "arrow.trianglehead.2.clockwise.rotate.90")
+        self.menuSecureInput?.setImageIfDesired(systemSymbolName: "lock.display")
+        self.menuNewWindow?.setImageIfDesired(systemSymbolName: "macwindow.badge.plus")
+        self.menuNewTab?.setImageIfDesired(systemSymbolName: "macwindow")
+        self.menuSplitRight?.setImageIfDesired(systemSymbolName: "rectangle.righthalf.inset.filled")
+        self.menuSplitLeft?.setImageIfDesired(systemSymbolName: "rectangle.leadinghalf.inset.filled")
+        self.menuSplitUp?.setImageIfDesired(systemSymbolName: "rectangle.tophalf.inset.filled")
+        self.menuSplitDown?.setImageIfDesired(systemSymbolName: "rectangle.bottomhalf.inset.filled")
+        self.menuClose?.setImageIfDesired(systemSymbolName: "xmark")
+        self.menuIncreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.larger")
+        self.menuResetFontSize?.setImageIfDesired(systemSymbolName: "textformat.size")
+        self.menuDecreaseFontSize?.setImageIfDesired(systemSymbolName: "textformat.size.smaller")
+        self.menuCommandPalette?.setImageIfDesired(systemSymbolName: "filemenu.and.selection")
+        self.menuQuickTerminal?.setImageIfDesired(systemSymbolName: "apple.terminal")
+        self.menuChangeTitle?.setImageIfDesired(systemSymbolName: "pencil.line")
+        self.menuTerminalInspector?.setImageIfDesired(systemSymbolName: "scope")
+        self.menuToggleFullScreen?.setImageIfDesired(systemSymbolName: "square.arrowtriangle.4.outward")
+        self.menuToggleVisibility?.setImageIfDesired(systemSymbolName: "eye")
+        self.menuZoomSplit?.setImageIfDesired(systemSymbolName: "arrow.up.left.and.arrow.down.right")
+        self.menuPreviousSplit?.setImageIfDesired(systemSymbolName: "chevron.backward.2")
+        self.menuNextSplit?.setImageIfDesired(systemSymbolName: "chevron.forward.2")
+        self.menuEqualizeSplits?.setImageIfDesired(systemSymbolName: "inset.filled.topleft.topright.bottomleft.bottomright.rectangle")
+        self.menuSelectSplitLeft?.setImageIfDesired(systemSymbolName: "arrow.left")
+        self.menuSelectSplitRight?.setImageIfDesired(systemSymbolName: "arrow.right")
+        self.menuSelectSplitAbove?.setImageIfDesired(systemSymbolName: "arrow.up")
+        self.menuSelectSplitBelow?.setImageIfDesired(systemSymbolName: "arrow.down")
+        self.menuMoveSplitDividerUp?.setImageIfDesired(systemSymbolName: "arrow.up.to.line")
+        self.menuMoveSplitDividerDown?.setImageIfDesired(systemSymbolName: "arrow.down.to.line")
+        self.menuMoveSplitDividerLeft?.setImageIfDesired(systemSymbolName: "arrow.left.to.line")
+        self.menuMoveSplitDividerRight?.setImageIfDesired(systemSymbolName: "arrow.right.to.line")
+        self.menuFloatOnTop?.setImageIfDesired(systemSymbolName: "square.3.layers.3d.top.filled")
+    }
+
     /// Sync all of our menu item keyboard shortcuts with the Ghostty configuration.
     private func syncMenuShortcuts(_ config: Ghostty.Config) {
         guard ghostty.readiness == .ready else { return }
 
+        syncMenuShortcut(config, action: "check_for_updates", menuItem: self.menuCheckForUpdates)
         syncMenuShortcut(config, action: "open_config", menuItem: self.menuOpenConfig)
         syncMenuShortcut(config, action: "reload_config", menuItem: self.menuReloadConfig)
         syncMenuShortcut(config, action: "quit", menuItem: self.menuQuit)
@@ -361,8 +496,12 @@ class AppDelegate: NSObject,
         syncMenuShortcut(config, action: "close_window", menuItem: self.menuCloseWindow)
         syncMenuShortcut(config, action: "close_all_windows", menuItem: self.menuCloseAllWindows)
         syncMenuShortcut(config, action: "new_split:right", menuItem: self.menuSplitRight)
+        syncMenuShortcut(config, action: "new_split:left", menuItem: self.menuSplitLeft)
         syncMenuShortcut(config, action: "new_split:down", menuItem: self.menuSplitDown)
+        syncMenuShortcut(config, action: "new_split:up", menuItem: self.menuSplitUp)
 
+        syncMenuShortcut(config, action: "undo", menuItem: self.menuUndo)
+        syncMenuShortcut(config, action: "redo", menuItem: self.menuRedo)
         syncMenuShortcut(config, action: "copy_to_clipboard", menuItem: self.menuCopy)
         syncMenuShortcut(config, action: "paste_from_clipboard", menuItem: self.menuPaste)
         syncMenuShortcut(config, action: "paste_from_selection", menuItem: self.menuPasteSelection)
@@ -380,13 +519,17 @@ class AppDelegate: NSObject,
         syncMenuShortcut(config, action: "resize_split:right,10", menuItem: self.menuMoveSplitDividerRight)
         syncMenuShortcut(config, action: "resize_split:left,10", menuItem: self.menuMoveSplitDividerLeft)
         syncMenuShortcut(config, action: "equalize_splits", menuItem: self.menuEqualizeSplits)
+        syncMenuShortcut(config, action: "reset_window_size", menuItem: self.menuReturnToDefaultSize)
 
         syncMenuShortcut(config, action: "increase_font_size:1", menuItem: self.menuIncreaseFontSize)
         syncMenuShortcut(config, action: "decrease_font_size:1", menuItem: self.menuDecreaseFontSize)
         syncMenuShortcut(config, action: "reset_font_size", menuItem: self.menuResetFontSize)
+        syncMenuShortcut(config, action: "prompt_surface_title", menuItem: self.menuChangeTitle)
         syncMenuShortcut(config, action: "toggle_quick_terminal", menuItem: self.menuQuickTerminal)
         syncMenuShortcut(config, action: "toggle_visibility", menuItem: self.menuToggleVisibility)
+        syncMenuShortcut(config, action: "toggle_window_float_on_top", menuItem: self.menuFloatOnTop)
         syncMenuShortcut(config, action: "inspector:toggle", menuItem: self.menuTerminalInspector)
+        syncMenuShortcut(config, action: "toggle_command_palette", menuItem: self.menuCommandPalette)
 
         syncMenuShortcut(config, action: "toggle_secure_input", menuItem: self.menuSecureInput)
 
@@ -404,19 +547,15 @@ class AppDelegate: NSObject,
     /// action string used for the Ghostty configuration.
     private func syncMenuShortcut(_ config: Ghostty.Config, action: String, menuItem: NSMenuItem?) {
         guard let menu = menuItem else { return }
-        guard let equiv = config.keyEquivalent(for: action) else {
+        guard let shortcut = config.keyboardShortcut(for: action) else {
             // No shortcut, clear the menu item
             menu.keyEquivalent = ""
             menu.keyEquivalentModifierMask = []
             return
         }
 
-        menu.keyEquivalent = equiv.key
+        menu.keyEquivalent = shortcut.key.character.description
-        menu.keyEquivalentModifierMask = equiv.modifiers
+        menu.keyEquivalentModifierMask = .init(swiftUIFlags: shortcut.modifiers)
-    }
-
-    private func focusedSurface() -> ghostty_surface_t? {
-        return terminalManager.focusedSurface?.surface
     }
 
     // MARK: Notifications and Events
@@ -439,17 +578,22 @@ class AppDelegate: NSObject,
         guard NSApp.mainWindow == nil else { return event }
 
         // If this event as-is would result in a key binding then we send it.
-        if let app = ghostty.app,
+        if let app = ghostty.app {
-           ghostty_app_key_is_binding(
+            var ghosttyEvent = event.ghosttyKeyEvent(GHOSTTY_ACTION_PRESS)
-            app,
+            let match = (event.characters ?? "").withCString { ptr in
-            event.ghosttyKeyEvent(GHOSTTY_ACTION_PRESS)) {
+                ghosttyEvent.text = ptr
+                if !ghostty_app_key_is_binding(app, ghosttyEvent) {
+                    return false
+                }
+
+                return ghostty_app_key(app, ghosttyEvent)
+            }
+
             // If the key was handled by Ghostty we stop the event chain. If
             // the key wasn't handled then we let it fall through and continue
             // processing. This is important because some bindings may have no
             // affect at this scope.
-            if (ghostty_app_key(
+            if match {
-                app,
-                event.ghosttyKeyEvent(GHOSTTY_ACTION_PRESS))) {
                 return nil
             }
         }
@@ -476,6 +620,10 @@ class AppDelegate: NSObject,
         return event
     }
 
+    @objc private func windowDidBecomeKey(_ notification: Notification) {
+        syncFloatOnTopMenu(notification.object as? NSWindow)
+    }
+
     @objc private func quickTerminalDidChangeVisibility(_ notification: Notification) {
         guard let quickController = notification.object as? QuickTerminalController else { return }
         self.menuQuickTerminal?.state = if (quickController.visible) { .on } else { .off }
@@ -493,6 +641,80 @@ class AppDelegate: NSObject,
         ghosttyConfigDidChange(config: config)
     }
 
+    @objc private func ghosttyBellDidRing(_ notification: Notification) {
+        if (ghostty.config.bellFeatures.contains(.attention)) {
+            // Bounce the dock icon if we're not focused.
+            NSApp.requestUserAttention(.informationalRequest)
+
+            // Handle setting the dock badge based on permissions
+            ghosttyUpdateBadgeForBell()
+        }
+    }
+
+    private func ghosttyUpdateBadgeForBell() {
+        let center = UNUserNotificationCenter.current()
+        center.getNotificationSettings { settings in
+            switch settings.authorizationStatus {
+            case .authorized:
+                // Already authorized, check badge setting and set if enabled
+                if settings.badgeSetting == .enabled {
+                    DispatchQueue.main.async {
+                        self.setDockBadge()
+                    }
+                }
+
+            case .notDetermined:
+                // Not determined yet, request authorization for badge
+                center.requestAuthorization(options: [.badge]) { granted, error in
+                    if let error = error {
+                        Self.logger.warning("Error requesting badge authorization: \(error)")
+                        return
+                    }
+
+                    if granted {
+                        // Permission granted, set the badge
+                        DispatchQueue.main.async {
+                            self.setDockBadge()
+                        }
+                    }
+                }
+
+            case .denied, .provisional, .ephemeral:
+                // In these known non-authorized states, do not attempt to set the badge.
+                break
+
+            @unknown default:
+                // Handle future unknown states by doing nothing.
+                break
+            }
+        }
+    }
+
+    @objc private func ghosttyNewWindow(_ notification: Notification) {
+        let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
+        let config = configAny as? Ghostty.SurfaceConfiguration
+        _ = TerminalController.newWindow(ghostty, withBaseConfig: config)
+    }
+
+    @objc private func ghosttyNewTab(_ notification: Notification) {
+        guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
+        guard let window = surfaceView.window else { return }
+
+        // We only want to listen to new tabs if the focused parent is
+        // a regular terminal controller.
+        guard window.windowController is TerminalController else { return }
+
+        let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
+        let config = configAny as? Ghostty.SurfaceConfiguration
+
+        _ = TerminalController.newTab(ghostty, from: window, withBaseConfig: config)
+    }
+
+    private func setDockBadge(_ label: String? = "•") {
+        NSApp.dockTile.badgeLabel = label
+        NSApp.dockTile.display()
+    }
+
     private func ghosttyConfigDidChange(config: Ghostty.Config) {
         // Update the config we need to store
         self.derivedConfig = DerivedConfig(config)
@@ -523,13 +745,22 @@ class AppDelegate: NSObject,
 
         // Config could change keybindings, so update everything that depends on that
         syncMenuShortcuts(config)
-        terminalManager.relabelAllTabs()
+        TerminalController.all.forEach { $0.relabelTabs() }
 
         // Config could change window appearance. We wrap this in an async queue because when
         // this is called as part of application launch it can deadlock with an internal
         // AppKit mutex on the appearance.
         DispatchQueue.main.async { self.syncAppearance(config: config) }
 
+        // Decide whether to hide/unhide app from dock and app switcher
+        switch (config.macosHidden) {
+        case .never:
+            NSApp.setActivationPolicy(.regular)
+
+        case .always:
+            NSApp.setActivationPolicy(.accessory)
+        }
+
         // If we have configuration errors, we need to show them.
         let c = ConfigurationErrorsController.sharedInstance
         c.errors = config.errors
@@ -643,9 +874,11 @@ class AppDelegate: NSObject,
     //MARK: - GhosttyAppDelegate
 
     func findSurface(forUUID uuid: UUID) -> Ghostty.SurfaceView? {
-        for c in terminalManager.windows {
+        for c in TerminalController.all {
-            if let v = c.controller.surfaceTree?.findUUID(uuid: uuid) {
+            for view in c.surfaceTree {
-                return v
+                if view.uuid == uuid {
+                    return view
+                }
             }
         }
 
@@ -691,8 +924,12 @@ class AppDelegate: NSObject,
         ghostty.reloadConfig()
     }
 
+    @IBAction func checkForUpdates(_ sender: Any?) {
+        updaterController.checkForUpdates(sender)
+    }
+
     @IBAction func newWindow(_ sender: Any?) {
-        terminalManager.newWindow()
+        _ = TerminalController.newWindow(ghostty)
 
         // We also activate our app so that it becomes front. This may be
         // necessary for the dock menu.
@@ -700,7 +937,7 @@ class AppDelegate: NSObject,
     }
 
     @IBAction func newTab(_ sender: Any?) {
-        terminalManager.newTab()
+        _ = TerminalController.newTab(ghostty)
 
         // We also activate our app so that it becomes front. This may be
         // necessary for the dock menu.
@@ -708,7 +945,7 @@ class AppDelegate: NSObject,
     }
 
     @IBAction func closeAllWindows(_ sender: Any?) {
-        terminalManager.closeAllWindows()
+        TerminalController.closeAllWindows()
         AboutController.shared.hide()
     }
 
@@ -726,14 +963,6 @@ class AppDelegate: NSObject,
     }
 
     @IBAction func toggleQuickTerminal(_ sender: Any) {
-        if quickController == nil {
-            quickController = QuickTerminalController(
-                ghostty,
-                position: derivedConfig.quickTerminalPosition
-            )
-        }
-
-        guard let quickController = self.quickController else { return }
         quickController.toggle()
     }
 
@@ -762,6 +991,22 @@ class AppDelegate: NSObject,
         hiddenState = nil
     }
 
+    @IBAction func bringAllToFront(_ sender: Any) {
+        if !NSApp.isActive {
+            NSApp.activate(ignoringOtherApps: true)
+        }
+
+        NSApplication.shared.arrangeInFront(sender)
+    }
+
+    @IBAction func undo(_ sender: Any?) {
+        undoManager.undo()
+    }
+
+    @IBAction func redo(_ sender: Any?) {
+        undoManager.redo()
+    }
+
     private struct DerivedConfig {
         let initialWindow: Bool
         let shouldQuitAfterLastWindowClosed: Bool
@@ -809,3 +1054,66 @@ class AppDelegate: NSObject,
         }
     }
 }
+
+// MARK: Floating Windows
+
+extension AppDelegate {
+    func syncFloatOnTopMenu(_ window: NSWindow?) {
+        guard let window = (window ?? NSApp.keyWindow) as? TerminalWindow else {
+            // If some other window became key we always turn this off
+            self.menuFloatOnTop?.state = .off
+            return
+        }
+
+        self.menuFloatOnTop?.state = window.level == .floating ? .on : .off
+    }
+
+    @IBAction func floatOnTop(_ menuItem: NSMenuItem) {
+        menuItem.state = menuItem.state == .on ? .off : .on
+        guard let window = NSApp.keyWindow else { return }
+        window.level = menuItem.state == .on ? .floating : .normal
+    }
+
+    @IBAction func useAsDefault(_ sender: NSMenuItem) {
+        let ud = UserDefaults.standard
+        let key = TerminalWindow.defaultLevelKey
+        if (menuFloatOnTop?.state == .on) {
+            ud.set(NSWindow.Level.floating, forKey: key)
+        } else {
+            ud.removeObject(forKey: key)
+        }
+    }
+}
+
+// MARK: NSMenuItemValidation
+
+extension AppDelegate: NSMenuItemValidation {
+    func validateMenuItem(_ item: NSMenuItem) -> Bool {
+        switch item.action {
+        case #selector(floatOnTop(_:)),
+            #selector(useAsDefault(_:)):
+            // Float on top items only active if the key window is a primary
+            // terminal window (not quick terminal).
+            return NSApp.keyWindow is TerminalWindow
+
+        case #selector(undo(_:)):
+            if undoManager.canUndo {
+                item.title = "Undo \(undoManager.undoActionName)"
+            } else {
+                item.title = "Undo"
+            }
+            return undoManager.canUndo
+
+        case #selector(redo(_:)):
+            if undoManager.canRedo {
+                item.title = "Redo \(undoManager.redoActionName)"
+            } else {
+                item.title = "Redo"
+            }
+            return undoManager.canRedo
+
+        default:
+            return true
+        }
+    }
+}

macos/Sources/App/macOS/MainMenu.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
@@ -14,14 +14,19 @@
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customObject id="bbz-4X-AYv" userLabel="AppDelegate" customClass="AppDelegate" customModule="Ghostty" customModuleProvider="target">
             <connections>
+                <outlet property="menuAbout" destination="5kV-Vb-QxS" id="Y5y-UO-NK6"/>
+                <outlet property="menuBringAllToFront" destination="LE2-aR-0XJ" id="AP9-oK-60V"/>
+                <outlet property="menuChangeTitle" destination="24I-xg-qIq" id="kg6-kT-jNL"/>
                 <outlet property="menuCheckForUpdates" destination="GEA-5y-yzH" id="0nV-Tf-nJQ"/>
                 <outlet property="menuClose" destination="DVo-aG-piG" id="R3t-0C-aSU"/>
                 <outlet property="menuCloseAllWindows" destination="yKr-Vi-Yqw" id="Zet-Ir-zbm"/>
                 <outlet property="menuCloseTab" destination="Obb-Mk-j8J" id="Gda-L0-gdz"/>
                 <outlet property="menuCloseWindow" destination="W5w-UZ-crk" id="6ff-BT-ENV"/>
+                <outlet property="menuCommandPalette" destination="et6-de-Mh7" id="53t-cu-dm5"/>
                 <outlet property="menuCopy" destination="Jqf-pv-Zcu" id="bKd-1C-oy9"/>
                 <outlet property="menuDecreaseFontSize" destination="kzb-SZ-dOA" id="Y1B-Vh-6Z2"/>
                 <outlet property="menuEqualizeSplits" destination="3gH-VD-vL9" id="SiZ-ce-FOF"/>
+                <outlet property="menuFloatOnTop" destination="uRj-7z-1Nh" id="94n-o9-Jol"/>
                 <outlet property="menuIncreaseFontSize" destination="CIH-ey-Z6x" id="hkc-9C-80E"/>
                 <outlet property="menuMoveSplitDividerDown" destination="Zj7-2W-fdF" id="997-LL-nlN"/>
                 <outlet property="menuMoveSplitDividerLeft" destination="wSR-ny-j1a" id="HCZ-CI-2ob"/>
@@ -36,8 +41,10 @@
                 <outlet property="menuPreviousSplit" destination="Lic-px-1wg" id="Rto-CG-yRe"/>
                 <outlet property="menuQuickTerminal" destination="1pv-LF-NBJ" id="glN-5B-IGi"/>
                 <outlet property="menuQuit" destination="4sb-4s-VLi" id="qYN-S1-6UW"/>
+                <outlet property="menuRedo" destination="EX8-lB-4s7" id="wON-2J-yT1"/>
                 <outlet property="menuReloadConfig" destination="KKH-XX-5py" id="Wvp-7J-wqX"/>
                 <outlet property="menuResetFontSize" destination="Jah-MY-aLX" id="ger-qM-wrm"/>
+                <outlet property="menuReturnToDefaultSize" destination="Gbx-Vi-OGC" id="po9-qC-Iz6"/>
                 <outlet property="menuSecureInput" destination="oC6-w4-qI7" id="PCc-pe-Mda"/>
                 <outlet property="menuSelectAll" destination="q2h-lq-e4r" id="s98-r1-Jcv"/>
                 <outlet property="menuSelectSplitAbove" destination="0yU-hC-8xF" id="aPc-lS-own"/>
@@ -45,11 +52,15 @@
                 <outlet property="menuSelectSplitLeft" destination="cTK-oy-KuV" id="Jpr-5q-dqz"/>
                 <outlet property="menuSelectSplitRight" destination="upj-mc-L7X" id="nLY-o1-lky"/>
                 <outlet property="menuServices" destination="aQe-vS-j8Q" id="uWQ-Wo-T1L"/>
-                <outlet property="menuSplitDown" destination="UDZ-4y-6xL" id="fgZ-Wb-8OR"/>
+                <outlet property="menuSplitDown" destination="UDZ-4y-6xL" id="ptr-mj-Azh"/>
+                <outlet property="menuSplitLeft" destination="Ppv-GP-lQU" id="Xd5-Cd-Jut"/>
                 <outlet property="menuSplitRight" destination="VUR-Ld-nLx" id="RxO-Zw-ovb"/>
+                <outlet property="menuSplitUp" destination="Ggp-7N-GbX" id="YJF-uq-S4Y"/>
                 <outlet property="menuTerminalInspector" destination="QwP-M5-fvh" id="wJi-Dh-S9f"/>
                 <outlet property="menuToggleFullScreen" destination="8kY-Pi-KaY" id="yQg-6V-OO6"/>
                 <outlet property="menuToggleVisibility" destination="DOX-wA-ilh" id="iBj-Bc-2bq"/>
+                <outlet property="menuUndo" destination="r83-CV-syt" id="bU9-0b-xgQ"/>
+                <outlet property="menuUseAsDefault" destination="TrB-O8-g8H" id="af4-Jh-2HU"/>
                 <outlet property="menuZoomSplit" destination="oPd-mn-IEH" id="wTu-jK-egI"/>
             </connections>
         </customObject>
@@ -68,6 +79,9 @@
                             </menuItem>
                             <menuItem title="Check for Updates..." id="GEA-5y-yzH">
                                 <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="checkForUpdates:" target="bbz-4X-AYv" id="z2n-lC-48f"/>
+                                </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
                             <menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW">
@@ -143,10 +157,22 @@
                                     <action selector="splitRight:" target="-1" id="cv2-Xg-FR4"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Split Left" id="Ppv-GP-lQU">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="splitLeft:" target="-1" id="Cey-Mf-bD2"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Split Down" id="UDZ-4y-6xL">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
-                                    <action selector="splitDown:" target="-1" id="c6x-CF-u52"/>
+                                    <action selector="splitDown:" target="-1" id="Zej-CF-6nO"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Split Up" id="Ggp-7N-GbX">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="splitUp:" target="-1" id="bbi-dK-pOS"/>
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="sjq-M1-UGS"/>
@@ -181,6 +207,19 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="Edit" id="iU4-OB-ccf">
                         <items>
+                            <menuItem title="Undo" id="r83-CV-syt">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="undo:" target="-1" id="jrW-j3-OZj"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" id="EX8-lB-4s7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="redo:" target="-1" id="7UK-Hj-s4O"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="4O9-zO-zB9"/>
                             <menuItem title="Copy" id="Jqf-pv-Zcu">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -213,18 +252,18 @@
                     <modifierMask key="keyEquivalentModifierMask"/>
                     <menu key="submenu" title="View" id="m6z-2H-VW7">
                         <items>
-                            <menuItem title="Increase Font Size" id="CIH-ey-Z6x" userLabel="Increase Font Size">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="increaseFontSize:" target="-1" id="361-5E-7PY"/>
-                                </connections>
-                            </menuItem>
                             <menuItem title="Reset Font Size" id="Jah-MY-aLX">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
                                     <action selector="resetFontSize:" target="-1" id="3dh-T9-IkH"/>
                                 </connections>
                             </menuItem>
+                            <menuItem title="Increase Font Size" id="CIH-ey-Z6x" userLabel="Increase Font Size">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="increaseFontSize:" target="-1" id="361-5E-7PY"/>
+                                </connections>
+                            </menuItem>
                             <menuItem title="Decrease Font Size" id="kzb-SZ-dOA">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -232,6 +271,19 @@
                                 </connections>
                             </menuItem>
                             <menuItem isSeparatorItem="YES" id="L3L-I8-sqk"/>
+                            <menuItem title="Command Palette" id="et6-de-Mh7">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="toggleCommandPalette:" target="-1" id="FcT-XD-gM1"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Change Title..." id="24I-xg-qIq">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="changeTitle:" target="-1" id="XuL-QB-Q9l"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="Vkj-tP-dMZ"/>
                             <menuItem title="Quick Terminal" id="1pv-LF-NBJ">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -270,12 +322,6 @@
                                     <action selector="toggleGhosttyFullScreen:" target="-1" id="QB9-7R-xyc"/>
                                 </connections>
                             </menuItem>
-                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
-                                <modifierMask key="keyEquivalentModifierMask"/>
-                                <connections>
-                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
-                                </connections>
-                            </menuItem>
                             <menuItem title="Show/Hide All Terminals" id="DOX-wA-ilh">
                                 <modifierMask key="keyEquivalentModifierMask"/>
                                 <connections>
@@ -370,6 +416,33 @@
                                     </items>
                                 </menu>
                             </menuItem>
+                            <menuItem isSeparatorItem="YES" id="dgt-Tx-d4e"/>
+                            <menuItem title="Return To Default Size" id="Gbx-Vi-OGC" userLabel="Return To Default Size">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="returnToDefaultSize:" target="-1" id="Bpt-GO-UU1"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="Cm3-gn-vtj"/>
+                            <menuItem title="Float on Top" id="uRj-7z-1Nh">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="floatOnTop:" target="bbz-4X-AYv" id="N58-PO-7pj"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Use as Default" id="TrB-O8-g8H">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="useAsDefault:" target="bbz-4X-AYv" id="RHA-Nl-L2U"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="CpM-rI-Sc1"/>
+                            <menuItem title="Bring All to Front" id="LE2-aR-0XJ">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="DRN-fu-gQh"/>
+                                </connections>
+                            </menuItem>
                         </items>
                     </menu>
                 </menuItem>

macos/Sources/Features/App Intents/CloseTerminalIntent.swift

@@ -0,0 +1,35 @@
+import AppKit
+import AppIntents
+import GhosttyKit
+
+struct CloseTerminalIntent: AppIntent {
+    static var title: LocalizedStringResource = "Close Terminal"
+    static var description = IntentDescription("Close an existing terminal.")
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to close.",
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = .background
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surfaceView = terminal.surfaceView else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        guard let controller = surfaceView.window?.windowController as? BaseTerminalController else {
+            return .result()
+        }
+
+        controller.closeSurface(surfaceView, withConfirmation: false)
+        return .result()
+    }
+}

macos/Sources/Features/App Intents/CommandPaletteIntent.swift

@@ -0,0 +1,38 @@
+import AppKit
+import AppIntents
+
+/// App intent that invokes a command palette entry.
+@available(macOS 14.0, *)
+struct CommandPaletteIntent: AppIntent {
+    static var title: LocalizedStringResource = "Invoke Command Palette Action"
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to base available commands from."
+    )
+    var terminal: TerminalEntity
+
+    @Parameter(
+        title: "Command",
+        description: "The command to invoke.",
+        optionsProvider: CommandQuery()
+    )
+    var command: CommandEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = .background
+
+    @MainActor
+    func perform() async throws -> some IntentResult & ReturnsValue<Bool> {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        let performed = surface.perform(action: command.action)
+        return .result(value: performed)
+    }
+}

macos/Sources/Features/App Intents/Entities/CommandEntity.swift

@@ -0,0 +1,128 @@
+import AppIntents
+
+// MARK: AppEntity
+
+@available(macOS 14.0, *)
+struct CommandEntity: AppEntity {
+    let id: ID
+
+    // Note: for macOS 26 we can move all the properties to @ComputedProperty.
+
+    @Property(title: "Title")
+    var title: String
+
+    @Property(title: "Description")
+    var description: String
+
+    @Property(title: "Action")
+    var action: String
+
+    /// The underlying data model
+    let command: Ghostty.Command
+
+    /// A command identifier is a composite key based on the terminal and action.
+    struct ID: Hashable {
+        let terminalId: TerminalEntity.ID
+        let actionKey: String
+
+        init(terminalId: TerminalEntity.ID, actionKey: String) {
+            self.terminalId = terminalId
+            self.actionKey = actionKey
+        }
+    }
+
+    static var typeDisplayRepresentation: TypeDisplayRepresentation {
+        TypeDisplayRepresentation(name: "Command Palette Command")
+    }
+
+    var displayRepresentation: DisplayRepresentation {
+        DisplayRepresentation(
+            title: LocalizedStringResource(stringLiteral: command.title),
+            subtitle: LocalizedStringResource(stringLiteral: command.description),
+        )
+    }
+
+    static var defaultQuery = CommandQuery()
+
+    init(_ command: Ghostty.Command, for terminal: TerminalEntity) {
+        self.id = .init(terminalId: terminal.id, actionKey: command.actionKey)
+        self.command = command
+        self.title = command.title
+        self.description = command.description
+        self.action = command.action
+    }
+}
+
+@available(macOS 14.0, *)
+extension CommandEntity.ID: RawRepresentable {
+    var rawValue: String {
+        return "\(terminalId):\(actionKey)"
+    }
+
+    init?(rawValue: String) {
+        let components = rawValue.split(separator: ":", maxSplits: 1)
+        guard components.count == 2 else { return nil }
+
+        guard let terminalId = TerminalEntity.ID(uuidString: String(components[0])) else {
+            return nil
+        }
+
+        self.terminalId = terminalId
+        self.actionKey = String(components[1])
+    }
+}
+
+// Required by AppEntity
+@available(macOS 14.0, *)
+extension CommandEntity.ID: EntityIdentifierConvertible {
+    static func entityIdentifier(for entityIdentifierString: String) -> CommandEntity.ID? {
+        .init(rawValue: entityIdentifierString)
+    }
+    
+    var entityIdentifierString: String {
+        rawValue
+    }
+}
+
+// MARK: EntityQuery
+
+@available(macOS 14.0, *)
+struct CommandQuery: EntityQuery {
+    // Inject our terminal parameter from our command palette intent.
+    @IntentParameterDependency<CommandPaletteIntent>(\.$terminal)
+    var commandPaletteIntent
+
+    @MainActor
+    func entities(for identifiers: [CommandEntity.ID]) async throws -> [CommandEntity] {
+        // Extract unique terminal IDs to avoid fetching duplicates
+        let terminalIds = Set(identifiers.map(\.terminalId))
+        let terminals = try await TerminalEntity.defaultQuery.entities(for: Array(terminalIds))
+
+        // Build a cache of terminals and their available commands
+        // This avoids repeated command fetching for the same terminal
+        typealias Tuple = (terminal: TerminalEntity, commands: [Ghostty.Command])
+        let commandMap: [TerminalEntity.ID: Tuple] =
+            terminals.reduce(into: [:]) { result, terminal in
+                guard let commands = try? terminal.surfaceModel?.commands() else { return }
+                result[terminal.id] = (terminal: terminal, commands: commands)
+            }
+        
+        // Map each identifier to its corresponding CommandEntity. If a command doesn't
+        // exist it maps to nil and is removed via compactMap.
+        return identifiers.compactMap { id in
+            guard let (terminal, commands) = commandMap[id.terminalId],
+                  let command = commands.first(where: { $0.actionKey == id.actionKey }) else {
+                return nil
+            }
+
+            return CommandEntity(command, for: terminal)
+        }
+    }
+
+    @MainActor
+    func suggestedEntities() async throws -> [CommandEntity] {
+        guard let terminal = commandPaletteIntent?.terminal,
+              let surface = terminal.surfaceModel else { return [] }
+        return try surface.commands().map { CommandEntity($0, for: terminal) }
+    }
+}

macos/Sources/Features/App Intents/Entities/TerminalEntity.swift

@@ -0,0 +1,139 @@
+import AppKit
+import AppIntents
+import SwiftUI
+
+struct TerminalEntity: AppEntity {
+    let id: UUID
+
+    @Property(title: "Title")
+    var title: String
+
+    @Property(title: "Working Directory")
+    var workingDirectory: String?
+
+    @Property(title: "Kind")
+    var kind: Kind
+
+    @MainActor
+    @DeferredProperty(title: "Full Contents")
+    @available(macOS 26.0, *)
+    var screenContents: String? {
+        get async {
+            guard let surfaceView else { return nil }
+            return surfaceView.cachedScreenContents.get()
+        }
+    }
+
+    @MainActor
+    @DeferredProperty(title: "Visible Contents")
+    @available(macOS 26.0, *)
+    var visibleContents: String? {
+        get async {
+            guard let surfaceView else { return nil }
+            return surfaceView.cachedVisibleContents.get()
+        }
+    }
+
+    var screenshot: Image?
+
+    static var typeDisplayRepresentation: TypeDisplayRepresentation {
+        TypeDisplayRepresentation(name: "Terminal")
+    }
+
+    @MainActor
+    var displayRepresentation: DisplayRepresentation {
+        var rep = DisplayRepresentation(title: "\(title)")
+        if let screenshot,
+           let nsImage = ImageRenderer(content: screenshot).nsImage,
+           let data = nsImage.tiffRepresentation {
+            rep.image = .init(data: data)
+        }
+
+        return rep
+    }
+
+    /// Returns the view associated with this entity. This may no longer exist.
+    @MainActor
+    var surfaceView: Ghostty.SurfaceView? {
+        Self.defaultQuery.all.first { $0.uuid == self.id }
+    }
+
+    @MainActor
+    var surfaceModel: Ghostty.Surface? {
+        surfaceView?.surfaceModel
+    }
+
+    static var defaultQuery = TerminalQuery()
+
+    init(_ view: Ghostty.SurfaceView) {
+        self.id = view.uuid
+        self.title = view.title
+        self.workingDirectory = view.pwd
+        self.screenshot = view.screenshot()
+        
+        // Determine the kind based on the window controller type
+        if view.window?.windowController is QuickTerminalController {
+            self.kind = .quick
+        } else {
+            self.kind = .normal
+        }
+    }
+}
+
+extension TerminalEntity {
+    enum Kind: String, AppEnum {
+        case normal
+        case quick
+        
+        static var typeDisplayRepresentation = TypeDisplayRepresentation(name: "Terminal Kind")
+        
+        static var caseDisplayRepresentations: [Self: DisplayRepresentation] = [
+            .normal: .init(title: "Normal"),
+            .quick: .init(title: "Quick")
+        ]
+    }
+}
+
+struct TerminalQuery: EntityStringQuery, EnumerableEntityQuery {
+    @MainActor
+    func entities(for identifiers: [TerminalEntity.ID]) async throws -> [TerminalEntity] {
+        return all.filter {
+            identifiers.contains($0.uuid)
+        }.map {
+            TerminalEntity($0)
+        }
+    }
+
+    @MainActor
+    func entities(matching string: String) async throws -> [TerminalEntity] {
+        return all.filter {
+            $0.title.localizedCaseInsensitiveContains(string)
+        }.map {
+            TerminalEntity($0)
+        }
+    }
+
+    @MainActor
+    func allEntities() async throws -> [TerminalEntity] {
+        return all.map { TerminalEntity($0) }
+    }
+
+    @MainActor
+    func suggestedEntities() async throws -> [TerminalEntity] {
+        return try await allEntities()
+    }
+
+    @MainActor
+    var all: [Ghostty.SurfaceView] {
+        // Find all of our terminal windows. This will include the quick terminal
+        // but only if it was previously opened.
+        let controllers = NSApp.windows.compactMap {
+            $0.windowController as? BaseTerminalController
+        }
+        
+        // Get all our surfaces
+        return controllers.flatMap {
+            $0.surfaceTree.root?.leaves() ?? []
+        }
+    }
+}

macos/Sources/Features/App Intents/GetTerminalDetailsIntent.swift

@@ -0,0 +1,69 @@
+import AppKit
+import AppIntents
+
+/// App intent that retrieves details about a specific terminal.
+struct GetTerminalDetailsIntent: AppIntent {
+    static var title: LocalizedStringResource = "Get Details of Terminal"
+
+    @Parameter(
+        title: "Detail",
+        description: "The detail to extract about a terminal."
+    )
+    var detail: TerminalDetail
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to extract information about."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = .background
+
+    static var parameterSummary: some ParameterSummary {
+        Summary("Get \(\.$detail) from \(\.$terminal)")
+    }
+
+    @MainActor
+    func perform() async throws -> some IntentResult & ReturnsValue<String?> {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        switch detail {
+        case .title: return .result(value: terminal.title)
+        case .workingDirectory: return .result(value: terminal.workingDirectory)
+        case .allContents:
+            guard let view = terminal.surfaceView else { throw GhosttyIntentError.surfaceNotFound }
+            return .result(value: view.cachedScreenContents.get())
+        case .selectedText:
+            guard let view = terminal.surfaceView else { throw GhosttyIntentError.surfaceNotFound }
+            return .result(value: view.accessibilitySelectedText())
+        case .visibleText:
+            guard let view = terminal.surfaceView else { throw GhosttyIntentError.surfaceNotFound }
+            return .result(value: view.cachedVisibleContents.get())
+        }
+    }
+}
+
+// MARK: TerminalDetail
+
+enum TerminalDetail: String {
+    case title
+    case workingDirectory
+    case allContents
+    case selectedText
+    case visibleText
+}
+
+extension TerminalDetail: AppEnum {
+    static var typeDisplayRepresentation = TypeDisplayRepresentation(name: "Terminal Detail")
+
+    static var caseDisplayRepresentations: [Self: DisplayRepresentation] = [
+        .title: .init(title: "Title"),
+        .workingDirectory: .init(title: "Working Directory"),
+        .allContents: .init(title: "Full Contents"),
+        .selectedText: .init(title: "Selected Text"),
+        .visibleText: .init(title: "Visible Text"),
+    ]
+}

macos/Sources/Features/App Intents/GhosttyIntentError.swift

@@ -0,0 +1,13 @@
+enum GhosttyIntentError: Error, CustomLocalizedStringResourceConvertible {
+    case appUnavailable
+    case surfaceNotFound
+    case permissionDenied
+
+    var localizedStringResource: LocalizedStringResource {
+        switch self {
+        case .appUnavailable: "The Ghostty app isn't properly initialized."
+        case .surfaceNotFound: "The terminal no longer exists."
+        case .permissionDenied: "Ghostty doesn't allow Shortcuts."
+        }
+    }
+}

macos/Sources/Features/App Intents/InputIntent.swift

@@ -0,0 +1,317 @@
+import AppKit
+import AppIntents
+
+/// App intent to input text in a terminal.
+struct InputTextIntent: AppIntent {
+    static var title: LocalizedStringResource = "Input Text to Terminal"
+
+    @Parameter(
+        title: "Text",
+        description: "The text to input to the terminal. The text will be inputted as if it was pasted.",
+        inputOptions: String.IntentInputOptions(
+            capitalizationType: .none,
+            multiline: true,
+            autocorrect: false,
+            smartQuotes: false,
+            smartDashes: false
+        )
+    )
+    var text: String
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to scope this action to."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        surface.sendText(text)
+        return .result()
+    }
+}
+
+/// App intent to trigger a keyboard event.
+struct KeyEventIntent: AppIntent {
+    static var title: LocalizedStringResource = "Send Keyboard Event to Terminal"
+    static var description = IntentDescription("Simulate a keyboard event. This will not handle text encoding; use the 'Input Text' action for that.")
+
+    @Parameter(
+        title: "Key",
+        description: "The key to send to the terminal.",
+        default: .enter
+    )
+    var key: Ghostty.Input.Key
+
+    @Parameter(
+        title: "Modifier(s)",
+        description: "The modifiers to send with the key event.",
+        default: []
+    )
+    var mods: [KeyEventMods]
+
+    @Parameter(
+        title: "Event Type",
+        description: "A key press or release.",
+        default: .press
+    )
+    var action: Ghostty.Input.Action
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to scope this action to."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        // Convert KeyEventMods array to Ghostty.Input.Mods
+        let ghosttyMods = mods.reduce(Ghostty.Input.Mods()) { result, mod in
+            result.union(mod.ghosttyMod)
+        }
+        
+        let keyEvent = Ghostty.Input.KeyEvent(
+            key: key,
+            action: action,
+            mods: ghosttyMods
+        )
+        surface.sendKeyEvent(keyEvent)
+
+        return .result()
+    }
+}
+
+// MARK: MouseButtonIntent
+
+/// App intent to trigger a mouse button event.
+struct MouseButtonIntent: AppIntent {
+    static var title: LocalizedStringResource = "Send Mouse Button Event to Terminal"
+
+    @Parameter(
+        title: "Button",
+        description: "The mouse button to press or release.",
+        default: .left
+    )
+    var button: Ghostty.Input.MouseButton
+
+    @Parameter(
+        title: "Action",
+        description: "Whether to press or release the button.",
+        default: .press
+    )
+    var action: Ghostty.Input.MouseState
+
+    @Parameter(
+        title: "Modifier(s)",
+        description: "The modifiers to send with the mouse event.",
+        default: []
+    )
+    var mods: [KeyEventMods]
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to scope this action to."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        // Convert KeyEventMods array to Ghostty.Input.Mods
+        let ghosttyMods = mods.reduce(Ghostty.Input.Mods()) { result, mod in
+            result.union(mod.ghosttyMod)
+        }
+        
+        let mouseEvent = Ghostty.Input.MouseButtonEvent(
+            action: action,
+            button: button,
+            mods: ghosttyMods
+        )
+        surface.sendMouseButton(mouseEvent)
+
+        return .result()
+    }
+}
+
+/// App intent to send a mouse position event.
+struct MousePosIntent: AppIntent {
+    static var title: LocalizedStringResource = "Send Mouse Position Event to Terminal"
+    static var description = IntentDescription("Send a mouse position event to the terminal. This reports the cursor position for mouse tracking.")
+
+    @Parameter(
+        title: "X Position",
+        description: "The horizontal position of the mouse cursor in pixels.",
+        default: 0
+    )
+    var x: Double
+
+    @Parameter(
+        title: "Y Position", 
+        description: "The vertical position of the mouse cursor in pixels.",
+        default: 0
+    )
+    var y: Double
+
+    @Parameter(
+        title: "Modifier(s)",
+        description: "The modifiers to send with the mouse position event.",
+        default: []
+    )
+    var mods: [KeyEventMods]
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to scope this action to."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        // Convert KeyEventMods array to Ghostty.Input.Mods
+        let ghosttyMods = mods.reduce(Ghostty.Input.Mods()) { result, mod in
+            result.union(mod.ghosttyMod)
+        }
+        
+        let mousePosEvent = Ghostty.Input.MousePosEvent(
+            x: x,
+            y: y,
+            mods: ghosttyMods
+        )
+        surface.sendMousePos(mousePosEvent)
+
+        return .result()
+    }
+}
+
+/// App intent to send a mouse scroll event.
+struct MouseScrollIntent: AppIntent {
+    static var title: LocalizedStringResource = "Send Mouse Scroll Event to Terminal"
+    static var description = IntentDescription("Send a mouse scroll event to the terminal with configurable precision and momentum.")
+
+    @Parameter(
+        title: "X Scroll Delta",
+        description: "The horizontal scroll amount.",
+        default: 0
+    )
+    var x: Double
+
+    @Parameter(
+        title: "Y Scroll Delta",
+        description: "The vertical scroll amount.",
+        default: 0
+    )
+    var y: Double
+
+    @Parameter(
+        title: "High Precision",
+        description: "Whether this is a high-precision scroll event (e.g., from trackpad).",
+        default: false
+    )
+    var precision: Bool
+
+    @Parameter(
+        title: "Momentum Phase",
+        description: "The momentum phase for inertial scrolling.",
+        default: Ghostty.Input.Momentum.none
+    )
+    var momentum: Ghostty.Input.Momentum
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to scope this action to."
+    )
+    var terminal: TerminalEntity
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        let scrollEvent = Ghostty.Input.MouseScrollEvent(
+            x: x,
+            y: y,
+            mods: .init(precision: precision, momentum: momentum)
+        )
+        surface.sendMouseScroll(scrollEvent)
+
+        return .result()
+    }
+}
+
+// MARK: Mods
+
+enum KeyEventMods: String, AppEnum, CaseIterable {
+    case shift
+    case control
+    case option
+    case command
+    
+    static var typeDisplayRepresentation = TypeDisplayRepresentation(name: "Modifier Key")
+    
+    static var caseDisplayRepresentations: [KeyEventMods : DisplayRepresentation] = [
+        .shift: "Shift",
+        .control: "Control",
+        .option: "Option",
+        .command: "Command"
+    ]
+    
+    var ghosttyMod: Ghostty.Input.Mods {
+        switch self {
+        case .shift: .shift
+        case .control: .ctrl
+        case .option: .alt
+        case .command: .super
+        }
+    }
+}

macos/Sources/Features/App Intents/IntentPermission.swift

@@ -0,0 +1,57 @@
+import AppKit
+
+/// Requests permission for Shortcuts app to interact with Ghostty
+///
+/// This function displays a permission dialog asking the user to allow Shortcuts
+/// to interact with Ghostty. The permission is automatically cached for 10 minutes
+/// if the user selects "Allow", meaning subsequent intent calls won't show the dialog
+/// again during that time period.
+/// 
+/// The permission uses a shared UserDefaults key across all intents, so granting
+/// permission for one intent allows all Ghostty intents to execute without additional
+/// prompts for the duration of the cache period.
+/// 
+/// - Returns: `true` if permission is granted, `false` if denied
+/// 
+/// ## Usage
+/// Add this check at the beginning of any App Intent's `perform()` method:
+/// ```swift
+/// @MainActor
+/// func perform() async throws -> some IntentResult {
+///     guard await requestIntentPermission() else {
+///         throw GhosttyIntentError.permissionDenied
+///     }
+///     // ... continue with intent implementation
+/// }
+/// ```
+func requestIntentPermission() async -> Bool {
+    await withCheckedContinuation { continuation in
+        Task { @MainActor in
+            if let delegate = NSApp.delegate as? AppDelegate {
+                switch (delegate.ghostty.config.macosShortcuts) {
+                case .allow:
+                    continuation.resume(returning: true)
+                    return
+
+                case .deny:
+                    continuation.resume(returning: false)
+                    return
+
+                case .ask:
+                    // Continue with the permission dialog
+                    break
+                }
+            }
+
+
+            PermissionRequest.show(
+                "com.mitchellh.ghostty.shortcutsPermission",
+                message: "Allow Shortcuts to interact with Ghostty?",
+                allowDuration: .forever,
+                rememberDuration: nil,
+            ) { response in
+                continuation.resume(returning: response)
+            }
+        }
+    }
+}

macos/Sources/Features/App Intents/KeybindIntent.swift

@@ -0,0 +1,35 @@
+import AppKit
+import AppIntents
+
+struct KeybindIntent: AppIntent {
+    static var title: LocalizedStringResource = "Invoke a Keybind Action"
+
+    @Parameter(
+        title: "Terminal",
+        description: "The terminal to invoke the action on."
+    )
+    var terminal: TerminalEntity
+
+    @Parameter(
+        title: "Action",
+        description: "The keybind action to invoke. This can be any valid keybind action you could put in a configuration file."
+    )
+    var action: String
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = [.background, .foreground]
+
+    @MainActor
+    func perform() async throws -> some IntentResult & ReturnsValue<Bool> {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let surface = terminal.surfaceModel else {
+            throw GhosttyIntentError.surfaceNotFound
+        }
+
+        let performed = surface.perform(action: action)
+        return .result(value: performed)
+    }
+}

macos/Sources/Features/App Intents/NewTerminalIntent.swift

@@ -0,0 +1,168 @@
+import AppKit
+import AppIntents
+import GhosttyKit
+
+/// App intent that allows creating a new terminal window or tab.
+///
+/// This requires macOS 15 or greater because we use features of macOS 15 here.
+@available(macOS 15.0, *)
+struct NewTerminalIntent: AppIntent {
+    static var title: LocalizedStringResource = "New Terminal"
+    static var description = IntentDescription("Create a new terminal.")
+
+    @Parameter(
+        title: "Location",
+        description: "The location that the terminal should be created.",
+        default: .window
+    )
+    var location: NewTerminalLocation
+
+    @Parameter(
+        title: "Command",
+        description: "Command to execute within your configured shell.",
+    )
+    var command: String?
+
+    @Parameter(
+        title: "Working Directory",
+        description: "The working directory to open in the terminal.",
+        supportedContentTypes: [.folder]
+    )
+    var workingDirectory: IntentFile?
+
+    @Parameter(
+        title: "Environment Variables",
+        description: "Environment variables in `KEY=VALUE` format.",
+        default: []
+    )
+    var env: [String]
+
+    @Parameter(
+        title: "Parent Terminal",
+        description: "The terminal to inherit the base configuration from."
+    )
+    var parent: TerminalEntity?
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = .foreground(.immediate)
+
+    @available(macOS, obsoleted: 26.0, message: "Replaced by supportedModes")
+    static var openAppWhenRun = true
+
+    @MainActor
+    func perform() async throws -> some IntentResult & ReturnsValue<TerminalEntity?> {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        guard let appDelegate = NSApp.delegate as? AppDelegate else {
+            throw GhosttyIntentError.appUnavailable
+        }
+        let ghostty = appDelegate.ghostty
+
+        var config = Ghostty.SurfaceConfiguration()
+
+        // We don't run command as "command" and instead use "initialInput" so
+        // that we can get all the login scripts to setup things like PATH.
+        if let command {
+            config.initialInput = "\(command); exit\n"
+        }
+
+        // If we were given a working directory then open that directory
+        if let url = workingDirectory?.fileURL {
+            let dir = url.hasDirectoryPath ? url : url.deletingLastPathComponent()
+            config.workingDirectory = dir.path(percentEncoded: false)
+        }
+
+        // Parse environment variables from KEY=VALUE format
+        for envVar in env {
+            if let separatorIndex = envVar.firstIndex(of: "=") {
+                let key = String(envVar[..<separatorIndex])
+                let value = String(envVar[envVar.index(after: separatorIndex)...])
+                config.environmentVariables[key] = value
+            }
+        }
+
+        // Determine if we have a parent and get it
+        let parent: Ghostty.SurfaceView?
+        if let parentParam = self.parent {
+            guard let view = parentParam.surfaceView else {
+                throw GhosttyIntentError.surfaceNotFound
+            }
+
+            parent = view
+        } else if let preferred = TerminalController.preferredParent {
+            parent = preferred.focusedSurface ?? preferred.surfaceTree.root?.leftmostLeaf()
+        } else {
+            parent = nil
+        }
+
+        switch location {
+        case .window:
+            let newController = TerminalController.newWindow(
+                ghostty,
+                withBaseConfig: config,
+                withParent: parent?.window)
+            if let view = newController.surfaceTree.root?.leftmostLeaf() {
+                return .result(value: TerminalEntity(view))
+            }
+
+        case .tab:
+            let newController = TerminalController.newTab(
+                ghostty,
+                from: parent?.window,
+                withBaseConfig: config)
+            if let view = newController?.surfaceTree.root?.leftmostLeaf() {
+                return .result(value: TerminalEntity(view))
+            }
+
+        case .splitLeft, .splitRight, .splitUp, .splitDown:
+            guard let parent,
+                  let controller = parent.window?.windowController as? BaseTerminalController else {
+                throw GhosttyIntentError.surfaceNotFound
+            }
+
+            if let view = controller.newSplit(
+                at: parent,
+                direction: location.splitDirection!
+            ) {
+                return .result(value: TerminalEntity(view))
+            }
+        }
+
+        return .result(value: .none)
+    }
+}
+
+// MARK: NewTerminalLocation
+
+enum NewTerminalLocation: String {
+    case tab
+    case window
+    case splitLeft = "split:left"
+    case splitRight = "split:right"
+    case splitUp = "split:up"
+    case splitDown = "split:down"
+    
+    var splitDirection: SplitTree<Ghostty.SurfaceView>.NewDirection? {
+        switch self {
+        case .splitLeft: return .left
+        case .splitRight: return .right
+        case .splitUp: return .up
+        case .splitDown: return .down
+        default: return nil
+        }
+    }
+}
+
+extension NewTerminalLocation: AppEnum {
+    static var typeDisplayRepresentation = TypeDisplayRepresentation(name: "Terminal Location")
+
+    static var caseDisplayRepresentations: [Self: DisplayRepresentation] = [
+        .tab: .init(title: "Tab"),
+        .window: .init(title: "Window"),
+        .splitLeft: .init(title: "Split Left"),
+        .splitRight: .init(title: "Split Right"),
+        .splitUp: .init(title: "Split Up"),
+        .splitDown: .init(title: "Split Down"),
+    ]
+}

macos/Sources/Features/App Intents/QuickTerminalIntent.swift

@@ -0,0 +1,32 @@
+import AppKit
+import AppIntents
+
+struct QuickTerminalIntent: AppIntent {
+    static var title: LocalizedStringResource = "Open the Quick Terminal"
+    static var description = IntentDescription("Open the Quick Terminal. If it is already open, then do nothing.")
+
+    @available(macOS 26.0, *)
+    static var supportedModes: IntentModes = .background
+
+    @MainActor
+    func perform() async throws -> some IntentResult & ReturnsValue<[TerminalEntity]> {
+        guard await requestIntentPermission() else {
+            throw GhosttyIntentError.permissionDenied
+        }
+        
+        guard let delegate = NSApp.delegate as? AppDelegate else {
+            throw GhosttyIntentError.appUnavailable
+        }
+
+        // This is safe to call even if it is already shown.
+        let c = delegate.quickController
+        c.animateIn()
+
+        // Grab all our terminals
+        let terminals = c.surfaceTree.root?.leaves().map {
+            TerminalEntity($0)
+        } ?? []
+
+        return .result(value: terminals)
+    }
+}

macos/Sources/Features/Colorized Ghostty Icon/ColorizedGhosttyIconImage.swift

@@ -4,12 +4,26 @@ extension View {
     /// Returns the ghostty icon to use for views.
     func ghosttyIconImage() -> Image {
         #if os(macOS)
+        // If we have a specific icon set, then use that
         if let delegate = NSApplication.shared.delegate as? AppDelegate,
            let nsImage = delegate.appIcon {
             return Image(nsImage: nsImage)
         }
+
+        // Grab the icon from the running application. This is the best way
+        // I've found so far to get the proper icon for our current icon
+        // tinting and so on with macOS Tahoe
+        if let icon = NSRunningApplication.current.icon {
+            return Image(nsImage: icon)
+        }
+
+        // Get our defined application icon image.
+        if let nsImage = NSApp.applicationIconImage {
+            return Image(nsImage: nsImage)
+        }
         #endif
 
+        // Fall back to a static representation
         return Image("AppIconImage")
     }
 }

macos/Sources/Features/Command Palette/CommandPalette.swift

@@ -0,0 +1,276 @@
+import SwiftUI
+
+struct CommandOption: Identifiable, Hashable {
+    let id = UUID()
+    let title: String
+    let description: String?
+    let symbols: [String]?
+    let action: () -> Void
+
+    static func == (lhs: CommandOption, rhs: CommandOption) -> Bool {
+        lhs.id == rhs.id
+    }
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(id)
+    }
+}
+
+struct CommandPaletteView: View {
+    @Binding var isPresented: Bool
+    var backgroundColor: Color = Color(nsColor: .windowBackgroundColor)
+    var options: [CommandOption]
+    @State private var query = ""
+    @State private var selectedIndex: UInt?
+    @State private var hoveredOptionID: UUID?
+
+    // The options that we should show, taking into account any filtering from
+    // the query.
+    var filteredOptions: [CommandOption] {
+        if query.isEmpty {
+            return options
+        } else {
+            return options.filter { $0.title.localizedCaseInsensitiveContains(query) }
+        }
+    }
+
+    var selectedOption: CommandOption? {
+        guard let selectedIndex else { return nil }
+        return if selectedIndex < filteredOptions.count {
+            filteredOptions[Int(selectedIndex)]
+        } else {
+            filteredOptions.last
+        }
+    }
+
+    var body: some View {
+        let scheme: ColorScheme = if OSColor(backgroundColor).isLightColor {
+            .light
+        } else {
+            .dark
+        }
+
+        VStack(alignment: .leading, spacing: 0) {
+            CommandPaletteQuery(query: $query) { event in
+                switch (event) {
+                case .exit:
+                    isPresented = false
+
+                case .submit:
+                    isPresented = false
+                    selectedOption?.action()
+
+                case .move(.up):
+                    if filteredOptions.isEmpty { break }
+                    let current = selectedIndex ?? UInt(filteredOptions.count)
+                    selectedIndex = (current == 0)
+                        ? UInt(filteredOptions.count - 1)
+                        : current - 1
+
+                case .move(.down):
+                    if filteredOptions.isEmpty { break }
+                    let current = selectedIndex ?? UInt.max
+                    selectedIndex = (current >= UInt(filteredOptions.count - 1))
+                        ? 0
+                        : current + 1
+
+                case .move(_):
+                    // Unknown, ignore
+                    break
+                }
+            }
+            .onChange(of: query) { newValue in
+                // If the user types a query then we want to make sure the first
+                // value is selected. If the user clears the query and we were selecting
+                // the first, we unset any selection.
+                if !newValue.isEmpty {
+                    if selectedIndex == nil {
+                        selectedIndex = 0
+                    }
+                } else {
+                    if let selectedIndex, selectedIndex == 0 {
+                        self.selectedIndex = nil
+                    }
+                }
+            }
+
+            Divider()
+
+            CommandTable(
+                options: filteredOptions,
+                selectedIndex: $selectedIndex,
+                hoveredOptionID: $hoveredOptionID) { option in
+                    isPresented = false
+                    option.action()
+            }
+        }
+        .frame(maxWidth: 500)
+        .background(
+            ZStack {
+                Rectangle()
+                    .fill(.ultraThinMaterial)
+                Rectangle()
+                    .fill(backgroundColor)
+                    .blendMode(.color)
+            }
+                .compositingGroup()
+        )
+        .clipShape(RoundedRectangle(cornerRadius: 10))
+        .overlay(
+            RoundedRectangle(cornerRadius: 10)
+                .stroke(Color(nsColor: .tertiaryLabelColor).opacity(0.75))
+        )
+        .shadow(radius: 32, x: 0, y: 12)
+        .padding()
+        .environment(\.colorScheme, scheme)
+    }
+}
+
+/// The text field for building the query for the command palette.
+fileprivate struct CommandPaletteQuery: View {
+    @Binding var query: String
+    var onEvent: ((KeyboardEvent) -> Void)? = nil
+    @FocusState private var isTextFieldFocused: Bool
+
+    enum KeyboardEvent {
+        case exit
+        case submit
+        case move(MoveCommandDirection)
+    }
+
+    var body: some View {
+        ZStack {
+            Group {
+                Button { onEvent?(.move(.up)) } label: { Color.clear }
+                    .buttonStyle(PlainButtonStyle())
+                    .keyboardShortcut(.upArrow, modifiers: [])
+                Button { onEvent?(.move(.down)) } label: { Color.clear }
+                    .buttonStyle(PlainButtonStyle())
+                    .keyboardShortcut(.downArrow, modifiers: [])
+
+                Button { onEvent?(.move(.up)) } label: { Color.clear }
+                    .buttonStyle(PlainButtonStyle())
+                    .keyboardShortcut(.init("p"), modifiers: [.control])
+                Button { onEvent?(.move(.down)) } label: { Color.clear }
+                    .buttonStyle(PlainButtonStyle())
+                    .keyboardShortcut(.init("n"), modifiers: [.control])
+            }
+            .frame(width: 0, height: 0)
+            .accessibilityHidden(true)
+
+            TextField("Execute a command…", text: $query)
+                .padding()
+                .font(.system(size: 20, weight: .light))
+                .frame(height: 48)
+                .textFieldStyle(.plain)
+                .focused($isTextFieldFocused)
+                .onAppear {
+                    isTextFieldFocused = true
+                }
+                .onChange(of: isTextFieldFocused) { focused in
+                    if !focused {
+                        onEvent?(.exit)
+                    }
+                }
+                .onExitCommand { onEvent?(.exit) }
+                .onMoveCommand { onEvent?(.move($0)) }
+                .onSubmit { onEvent?(.submit) }
+        }
+    }
+}
+
+fileprivate struct CommandTable: View {
+    var options: [CommandOption]
+    @Binding var selectedIndex: UInt?
+    @Binding var hoveredOptionID: UUID?
+    var action: (CommandOption) -> Void
+
+    var body: some View {
+        if options.isEmpty {
+            Text("No matches")
+                .foregroundStyle(.secondary)
+                .padding()
+        } else {
+            ScrollViewReader { proxy in
+                ScrollView {
+                    VStack(alignment: .leading, spacing: 0) {
+                        ForEach(Array(options.enumerated()), id: \.1.id) { index, option in
+                            CommandRow(
+                                option: option,
+                                isSelected: {
+                                    if let selected = selectedIndex {
+                                        return selected == index ||
+                                            (selected >= options.count &&
+                                                index == options.count - 1)
+                                    } else {
+                                        return false
+                                    }
+                                }(),
+                                hoveredID: $hoveredOptionID
+                            ) {
+                                action(option)
+                            }
+                        }
+                    }
+                    .padding(10)
+                }
+                .frame(maxHeight: 200)
+                .onChange(of: selectedIndex) { _ in
+                    guard let selectedIndex,
+                          selectedIndex < options.count else { return }
+                    proxy.scrollTo(
+                        options[Int(selectedIndex)].id)
+                }
+            }
+        }
+    }
+}
+
+/// A single row in the command palette.
+fileprivate struct CommandRow: View {
+    let option: CommandOption
+    var isSelected: Bool
+    @Binding var hoveredID: UUID?
+    var action: () -> Void
+
+    var body: some View {
+        Button(action: action) {
+            HStack {
+                Text(option.title)
+                Spacer()
+                if let symbols = option.symbols {
+                    ShortcutSymbolsView(symbols: symbols)
+                        .foregroundStyle(.secondary)
+                }
+            }
+            .padding(8)
+            .background(
+                isSelected
+                    ? Color.accentColor.opacity(0.2)
+                    : (hoveredID == option.id
+                       ? Color.secondary.opacity(0.2)
+                       : Color.clear)
+            )
+            .cornerRadius(5)
+        }
+        .help(option.description ?? "")
+        .buttonStyle(.plain)
+        .onHover { hovering in
+            hoveredID = hovering ? option.id : nil
+        }
+    }
+}
+
+/// A row of Text representing a shortcut.
+fileprivate struct ShortcutSymbolsView: View {
+    let symbols: [String]
+
+    var body: some View {
+        HStack(spacing: 1) {
+            ForEach(symbols, id: \.self) { symbol in
+                Text(symbol)
+                    .frame(minWidth: 13)
+            }
+        }
+    }
+}

macos/Sources/Features/Command Palette/TerminalCommandPalette.swift

@@ -0,0 +1,92 @@
+import SwiftUI
+import GhosttyKit
+
+struct TerminalCommandPaletteView: View {
+    /// The surface that this command palette represents.
+    let surfaceView: Ghostty.SurfaceView
+
+    /// Set this to true to show the view, this will be set to false if any actions
+    /// result in the view disappearing.
+    @Binding var isPresented: Bool
+
+    /// The configuration so we can lookup keyboard shortcuts.
+    @ObservedObject var ghosttyConfig: Ghostty.Config
+
+    /// The callback when an action is submitted.
+    var onAction: ((String) -> Void)
+
+    // The commands available to the command palette.
+    private var commandOptions: [CommandOption] {
+        guard let surface = surfaceView.surfaceModel else { return [] }
+        do {
+            return try surface.commands().map { c in
+                return CommandOption(
+                    title: c.title,
+                    description: c.description,
+                    symbols: ghosttyConfig.keyboardShortcut(for: c.action)?.keyList
+                ) {
+                    onAction(c.action)
+                }
+            }
+        } catch {
+            return []
+        }
+    }
+
+    var body: some View {
+        ZStack {
+            if isPresented {
+                GeometryReader { geometry in
+                    VStack {
+                        Spacer().frame(height: geometry.size.height * 0.05)
+
+                        ResponderChainInjector(responder: surfaceView)
+                            .frame(width: 0, height: 0)
+
+                        CommandPaletteView(
+                            isPresented: $isPresented,
+                            backgroundColor: ghosttyConfig.backgroundColor,
+                            options: commandOptions
+                        )
+                        .transition(
+                            .move(edge: .top)
+                            .combined(with: .opacity)
+                            .animation(.spring(response: 0.4, dampingFraction: 0.8))
+                        ) // Spring animation
+                        .zIndex(1) // Ensure it's on top
+
+                        Spacer()
+                    }
+                    .frame(width: geometry.size.width, height: geometry.size.height, alignment: .top)
+                }
+            }
+        }
+        .onChange(of: isPresented) { newValue in
+            // When the command palette disappears we need to send focus back to the
+            // surface view we were overlaid on top of. There's probably a better way
+            // to handle the first responder state here but I don't know it.
+            if !newValue {
+                // Has to be on queue because onChange happens on a user-interactive
+                // thread and Xcode is mad about this call on that.
+                DispatchQueue.main.async {
+                    surfaceView.window?.makeFirstResponder(surfaceView)
+                }
+            }
+        }
+    }
+}
+
+/// This is done to ensure that the given view is in the responder chain.
+fileprivate struct ResponderChainInjector: NSViewRepresentable {
+    let responder: NSResponder
+
+    func makeNSView(context: Context) -> NSView {
+        let dummy = NSView()
+        DispatchQueue.main.async {
+            dummy.nextResponder = responder
+        }
+        return dummy
+    }
+
+    func updateNSView(_ nsView: NSView, context: Context) {}
+}

macos/Sources/Features/Global Keybinds/GlobalEventTap.swift

@@ -141,12 +141,7 @@ fileprivate func cgEventFlagsChangedHandler(
     guard let event: NSEvent = .init(cgEvent: cgEvent) else { return result }
 
     // Build our event input and call ghostty
-    var key_ev = ghostty_input_key_s()
+    let key_ev = event.ghosttyKeyEvent(GHOSTTY_ACTION_PRESS)
-    key_ev.action = GHOSTTY_ACTION_PRESS
-    key_ev.mods = Ghostty.ghosttyMods(event.modifierFlags)
-    key_ev.keycode = UInt32(event.keyCode)
-    key_ev.text = nil
-    key_ev.composing = false
     if (ghostty_app_key(ghostty, key_ev)) {
         GlobalEventTap.logger.info("global key event handled event=\(event)")
         return nil

macos/Sources/Features/QuickTerminal/QuickTerminalController.swift

@@ -3,12 +3,6 @@ import Cocoa
 import SwiftUI
 import GhosttyKit
 
-// This is a Apple's private function that we need to call to get the active space.
-@_silgen_name("CGSGetActiveSpace")
-func CGSGetActiveSpace(_ cid: Int) -> size_t
-@_silgen_name("CGSMainConnectionID")
-func CGSMainConnectionID() -> Int
-
 /// Controller for the "quick" terminal.
 class QuickTerminalController: BaseTerminalController {
     override var windowNibName: NSNib.Name? { "QuickTerminal" }
@@ -25,7 +19,15 @@ class QuickTerminalController: BaseTerminalController {
     private var previousApp: NSRunningApplication? = nil
 
     // The active space when the quick terminal was last shown.
-    private var previousActiveSpace: size_t = 0
+    private var previousActiveSpace: CGSSpace? = nil
+
+    /// The window frame saved when the quick terminal's surface tree becomes empty.
+    /// 
+    /// This preserves the user's window size and position when all terminal surfaces
+    /// are closed (e.g., via the `exit` command). When a new surface is created,
+    /// the window will be restored to this frame, preventing SwiftUI from resetting
+    /// the window to its default minimum size.
+    private var lastClosedFrame: NSRect? = nil
 
     /// Non-nil if we have hidden dock state.
     private var hiddenDock: HiddenDock? = nil
@@ -36,11 +38,15 @@ class QuickTerminalController: BaseTerminalController {
     init(_ ghostty: Ghostty.App,
          position: QuickTerminalPosition = .top,
          baseConfig base: Ghostty.SurfaceConfiguration? = nil,
-         surfaceTree tree: Ghostty.SplitNode? = nil
+         surfaceTree tree: SplitTree<Ghostty.SurfaceView>? = nil
     ) {
         self.position = position
         self.derivedConfig = DerivedConfig(ghostty.config)
-        super.init(ghostty, baseConfig: base, surfaceTree: tree)
+
+        // Important detail here: we initialize with an empty surface tree so
+        // that we don't start a terminal process. This gets started when the
+        // first terminal is shown in `animateIn`.
+        super.init(ghostty, baseConfig: base, surfaceTree: .init())
 
         // Setup our notifications for behaviors
         let center = NotificationCenter.default
@@ -51,7 +57,7 @@ class QuickTerminalController: BaseTerminalController {
             object: nil)
         center.addObserver(
             self,
-            selector: #selector(onToggleFullscreen),
+            selector: #selector(onToggleFullscreen(notification:)),
             name: Ghostty.Notification.ghosttyToggleFullscreen,
             object: nil)
         center.addObserver(
@@ -59,6 +65,17 @@ class QuickTerminalController: BaseTerminalController {
             selector: #selector(ghosttyConfigDidChange(_:)),
             name: .ghosttyConfigDidChange,
             object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(closeWindow(_:)),
+            name: .ghosttyCloseWindow,
+            object: nil
+        )
+        center.addObserver(
+            self,
+            selector: #selector(onNewTab),
+            name: Ghostty.Notification.ghosttyNewTab,
+            object: nil)
     }
 
     required init?(coder: NSCoder) {
@@ -149,14 +166,24 @@ class QuickTerminalController: BaseTerminalController {
                 animateOut()
 
             case .move:
-                let currentActiveSpace = CGSGetActiveSpace(CGSMainConnectionID())
+                let currentActiveSpace = CGSSpace.active()
                 if previousActiveSpace == currentActiveSpace {
                     // We haven't moved spaces. We lost focus to another app on the
                     // current space. Animate out.
                     animateOut()
                 } else {
-                    // We've moved to a different space. Bring the quick terminal back
+                    // We've moved to a different space.
-                    // into view.
+
+                    // If we're fullscreen, we need to exit fullscreen because the visible
+                    // bounds may have changed causing a new behavior.
+                    if let fullscreenStyle, fullscreenStyle.isFullscreen {
+                        fullscreenStyle.exit()
+                        DispatchQueue.main.async {
+                            self.onToggleFullscreen()
+                        }
+                    }
+
+                    // Make the window visible again on this space
                     DispatchQueue.main.async {
                         self.window?.makeKeyAndOrderFront(nil)
                     }
@@ -176,13 +203,51 @@ class QuickTerminalController: BaseTerminalController {
 
     // MARK: Base Controller Overrides
 
-    override func surfaceTreeDidChange(from: Ghostty.SplitNode?, to: Ghostty.SplitNode?) {
+    override func surfaceTreeDidChange(from: SplitTree<Ghostty.SurfaceView>, to: SplitTree<Ghostty.SurfaceView>) {
         super.surfaceTreeDidChange(from: from, to: to)
 
-        // If our surface tree is nil then we animate the window out.
+        // If our surface tree is nil then we animate the window out. We
-        if (to == nil) {
+        // defer reinitializing the tree to save some memory here.
+        if to.isEmpty {
             animateOut()
+            return
         }
+
+        // If we're not empty (e.g. this isn't the first set) and we're
+        // not visible, then we animate in. This allows us to show the quick
+        // terminal when things such as undo/redo are done.
+        if !from.isEmpty && !visible {
+            animateIn()
+            return
+        }
+    }
+
+    override func closeSurface(
+        _ node: SplitTree<Ghostty.SurfaceView>.Node,
+        withConfirmation: Bool = true
+    ) {
+        // If this isn't the root then we're dealing with a split closure.
+        if surfaceTree.root != node {
+            super.closeSurface(node, withConfirmation: withConfirmation)
+            return
+        }
+
+        // If this isn't a final leaf then we're dealing with a split closure
+        guard case .leaf(let surface) = node else {
+            super.closeSurface(node, withConfirmation: withConfirmation)
+            return
+        }
+
+        // If its the root, we check if the process exited. If it did,
+        // then we do empty the tree.
+        if surface.processExited {
+            surfaceTree = .init()
+            return
+        }
+
+        // If its the root then we just animate out. We never actually allow
+        // the surface to fully close.
+        animateOut()
     }
 
     // MARK: Methods
@@ -219,19 +284,20 @@ class QuickTerminalController: BaseTerminalController {
         }
 
         // Set previous active space
-        self.previousActiveSpace = CGSGetActiveSpace(CGSMainConnectionID())
+        self.previousActiveSpace = CGSSpace.active()
+
+        // If our surface tree is empty then we initialize a new terminal. The surface
+        // tree can be empty if for example we run "exit" in the terminal and force
+        // animate out.
+        if surfaceTree.isEmpty,
+           let ghostty_app = ghostty.app {
+            let view = Ghostty.SurfaceView(ghostty_app, baseConfig: nil)
+            surfaceTree = SplitTree(view: view)
+            focusedSurface = view
+        }
 
         // Animate the window in
         animateWindowIn(window: window, from: position)
-
-        // If our surface tree is nil then we initialize a new terminal. The surface
-        // tree can be nil if for example we run "eixt" in the terminal and force
-        // animate out.
-        if (surfaceTree == nil) {
-            let leaf: Ghostty.SplitNode.Leaf = .init(ghostty.app!, baseConfig: nil)
-            surfaceTree = .leaf(leaf)
-            focusedSurface = leaf.surface
-        }
     }
 
     func animateOut() {
@@ -253,6 +319,12 @@ class QuickTerminalController: BaseTerminalController {
     private func animateWindowIn(window: NSWindow, from position: QuickTerminalPosition) {
         guard let screen = derivedConfig.quickTerminalScreen.screen else { return }
 
+        // Restore our previous frame if we have one
+        if let lastClosedFrame {
+            window.setFrame(lastClosedFrame, display: false)
+            self.lastClosedFrame = nil
+        }
+
         // Move our window off screen to the top
         position.setInitial(in: window, on: screen)
 
@@ -363,6 +435,12 @@ class QuickTerminalController: BaseTerminalController {
     }
 
     private func animateWindowOut(window: NSWindow, to position: QuickTerminalPosition) {
+        // Save the current window frame before animating out. This preserves
+        // the user's preferred window size and position for when the quick
+        // terminal is reactivated with a new surface. Without this, SwiftUI
+        // would reset the window to its minimum content size.
+        lastClosedFrame = window.frame
+
         // If we hid the dock then we unhide it.
         hiddenDock = nil
 
@@ -437,14 +515,7 @@ class QuickTerminalController: BaseTerminalController {
         }
     }
 
-    // MARK: First Responder
+    private func showNoNewTabAlert() {
-
-    @IBAction override func closeWindow(_ sender: Any) {
-        // Instead of closing the window, we animate it out.
-        animateOut()
-    }
-
-    @IBAction func newTab(_ sender: Any?) {
         guard let window else { return }
         let alert = NSAlert()
         alert.messageText = "Cannot Create New Tab"
@@ -454,11 +525,27 @@ class QuickTerminalController: BaseTerminalController {
         alert.beginSheetModal(for: window)
     }
 
+    // MARK: First Responder
+
+    @IBAction override func closeWindow(_ sender: Any) {
+        // Instead of closing the window, we animate it out.
+        animateOut()
+    }
+
+    @IBAction func newTab(_ sender: Any?) {
+        showNoNewTabAlert()
+    }
+
     @IBAction func toggleGhosttyFullScreen(_ sender: Any) {
         guard let surface = focusedSurface?.surface else { return }
         ghostty.toggleFullscreen(surface: surface)
     }
 
+    @IBAction func toggleTerminalInspector(_ sender: Any?) {
+        guard let surface = focusedSurface?.surface else { return }
+        ghostty.toggleTerminalInspector(surface: surface)
+    }
+
     // MARK: Notifications
 
     @objc private func applicationWillTerminate(_ notification: Notification) {
@@ -471,9 +558,29 @@ class QuickTerminalController: BaseTerminalController {
     @objc private func onToggleFullscreen(notification: SwiftUI.Notification) {
         guard let target = notification.object as? Ghostty.SurfaceView else { return }
         guard target == self.focusedSurface else { return }
+        onToggleFullscreen()
+    }
 
-        // We ignore the requested mode and always use non-native for the quick terminal
+    private func onToggleFullscreen() {
-        toggleFullscreen(mode: .nonNative)
+        // We ignore the configured fullscreen style and always use non-native
+        // because the way the quick terminal works doesn't support native.
+        let mode: FullscreenMode
+        if (NSApp.isFrontmost) {
+            // If we're frontmost and we have a notch then we keep padding
+            // so all lines of the terminal are visible.
+            if (window?.screen?.hasNotch ?? false) {
+                mode = .nonNativePaddedNotch
+            } else {
+                mode = .nonNative
+            }
+        } else {
+            // An additional detail is that if the is NOT frontmost, then our
+            // NSApp.presentationOptions will not take effect so we must always
+            // do the visible menu mode since we can't get rid of the menu.
+            mode = .nonNativeVisibleMenu
+        }
+
+        toggleFullscreen(mode: mode)
     }
 
     @objc private func ghosttyConfigDidChange(_ notification: Notification) {
@@ -492,6 +599,14 @@ class QuickTerminalController: BaseTerminalController {
         syncAppearance()
     }
 
+    @objc private func onNewTab(notification: SwiftUI.Notification) {
+        guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
+        guard let window = surfaceView.window else { return }
+        guard window.windowController is QuickTerminalController else { return }
+        // Tabs aren't supported with Quick Terminals or derivatives
+        showNoNewTabAlert()
+    }
+
     private struct DerivedConfig {
         let quickTerminalScreen: QuickTerminalScreen
         let quickTerminalAnimationDuration: Double

macos/Sources/Features/Services/ServiceProvider.swift

@@ -5,7 +5,7 @@ class ServiceProvider: NSObject {
     static private let errorNoString = NSString(string: "Could not load any text from the clipboard.")
 
     /// The target for an open operation
-    enum OpenTarget {
+    private enum OpenTarget {
         case tab
         case window
     }
@@ -15,7 +15,7 @@ class ServiceProvider: NSObject {
         userData: String?,
         error: AutoreleasingUnsafeMutablePointer<NSString>
     ) {
-        openTerminalFromPasteboard(pasteboard: pasteboard, target: .tab, error: error)
+        openTerminal(from: pasteboard, target: .tab, error: error)
     }
 
     @objc func openWindow(
@@ -23,45 +23,39 @@ class ServiceProvider: NSObject {
         userData: String?,
         error: AutoreleasingUnsafeMutablePointer<NSString>
     ) {
-        openTerminalFromPasteboard(pasteboard: pasteboard, target: .window, error: error)
+        openTerminal(from: pasteboard, target: .window, error: error)
     }
 
-    @inline(__always)
+    private func openTerminal(
-    private func openTerminalFromPasteboard(
+        from pasteboard: NSPasteboard,
-        pasteboard: NSPasteboard,
         target: OpenTarget,
         error: AutoreleasingUnsafeMutablePointer<NSString>
     ) {
-        guard let objs = pasteboard.readObjects(forClasses: [NSURL.self]) as? [NSURL] else {
+        guard let delegate = NSApp.delegate as? AppDelegate else { return }
+
+        guard let pathURLs = pasteboard.readObjects(forClasses: [NSURL.self]) as? [URL] else {
             error.pointee = Self.errorNoString
             return
         }
-        let filePaths = objs.map { $0.path }.compactMap { $0 }
 
-        openTerminal(filePaths, target: target)
+        // Build a set of unique directory URLs to open. File paths are truncated
-    }
+        // to their directories because that's the only thing we can open.
+        let directoryURLs = Set(
+            pathURLs.map { url -> URL in
+                url.hasDirectoryPath ? url : url.deletingLastPathComponent()
+            }
+        )
 
-    private func openTerminal(_ paths: [String], target: OpenTarget) {
+        for url in directoryURLs {
-        guard let delegateRaw = NSApp.delegate else { return }
-        guard let delegate = delegateRaw as? AppDelegate else { return }
-        let terminalManager = delegate.terminalManager
-
-        for path in paths {
-            // We only open in directories.
-            var isDirectory = ObjCBool(true)
-            guard FileManager.default.fileExists(atPath: path, isDirectory: &isDirectory) else { continue }
-            guard isDirectory.boolValue else { continue }
-
-            // Build our config
             var config = Ghostty.SurfaceConfiguration()
-            config.workingDirectory = path
+            config.workingDirectory = url.path(percentEncoded: false)
 
             switch (target) {
             case .window:
-                terminalManager.newWindow(withBaseConfig: config)
+                _ = TerminalController.newWindow(delegate.ghostty, withBaseConfig: config)
 
             case .tab:
-                terminalManager.newTab(withBaseConfig: config)
+                _ = TerminalController.newTab(delegate.ghostty, withBaseConfig: config)
             }
         }
 

macos/Sources/Features/Splits/SplitView.Divider.swift

@@ -7,6 +7,7 @@ extension SplitView {
         let visibleSize: CGFloat
         let invisibleSize: CGFloat
         let color: Color
+        @Binding var split: CGFloat
 
         private var visibleWidth: CGFloat? {
             switch (direction) {
@@ -79,6 +80,40 @@ extension SplitView {
                     NSCursor.pop()
                 }
             }
+            .accessibilityElement(children: .ignore)
+            .accessibilityLabel(axLabel)
+            .accessibilityValue("\(Int(split * 100))%")
+            .accessibilityHint(axHint)
+            .accessibilityAddTraits(.isButton)
+            .accessibilityAdjustableAction { direction in
+                let adjustment: CGFloat = 0.025
+                switch direction {
+                case .increment:
+                    split = min(split + adjustment, 0.9)
+                case .decrement:
+                    split = max(split - adjustment, 0.1)
+                @unknown default:
+                    break
+                }
+            }
+        }
+
+        private var axLabel: String {
+            switch direction {
+            case .horizontal:
+                return "Horizontal split divider"
+            case .vertical:
+                return "Vertical split divider"
+            }
+        }
+
+        private var axHint: String {
+            switch direction {
+            case .horizontal:
+                return "Drag to resize the left and right panes"
+            case .vertical:
+                return "Drag to resize the top and bottom panes"
+            }
         }
     }
 }

macos/Sources/Features/Splits/SplitView.swift

@@ -1,5 +1,4 @@
 import SwiftUI
-import Combine
 
 /// A split view shows a left and right (or top and bottom) view with a divider in the middle to do resizing.
 /// The terminlogy "left" and "right" is always used but for vertical splits "left" is "top" and "right" is "bottom".
@@ -13,12 +12,10 @@ struct SplitView<L: View, R: View>: View {
     /// Divider color
     let dividerColor: Color
 
-    /// If set, the split view supports programmatic resizing via events sent via the publisher.
     /// Minimum increment (in points) that this split can be resized by, in
     /// each direction. Both `height` and `width` should be whole numbers
     /// greater than or equal to 1.0
     let resizeIncrements: NSSize
-    let resizePublisher: PassthroughSubject<Double, Never>
 
     /// The left and right views to render.
     let left: L
@@ -45,47 +42,32 @@ struct SplitView<L: View, R: View>: View {
                 left
                     .frame(width: leftRect.size.width, height: leftRect.size.height)
                     .offset(x: leftRect.origin.x, y: leftRect.origin.y)
+                    .accessibilityElement(children: .contain)
+                    .accessibilityLabel(leftPaneLabel)
                 right
                     .frame(width: rightRect.size.width, height: rightRect.size.height)
                     .offset(x: rightRect.origin.x, y: rightRect.origin.y)
+                    .accessibilityElement(children: .contain)
+                    .accessibilityLabel(rightPaneLabel)
                 Divider(direction: direction,
                         visibleSize: splitterVisibleSize,
                         invisibleSize: splitterInvisibleSize,
-                        color: dividerColor)
+                        color: dividerColor,
+                        split: $split)
                     .position(splitterPoint)
                     .gesture(dragGesture(geo.size, splitterPoint: splitterPoint))
             }
-            .onReceive(resizePublisher) { value in
+            .accessibilityElement(children: .contain)
-                resize(for: geo.size, amount: value)
+            .accessibilityLabel(splitViewLabel)
-            }
         }
     }
 
-    /// Initialize a split view. This view isn't programmatically resizable; it can only be resized
+    /// Initialize a split view that can be resized by manually dragging the divider.
-    /// by manually dragging the divider.
-    init(_ direction: SplitViewDirection,
-         _ split: Binding<CGFloat>,
-         dividerColor: Color,
-         @ViewBuilder left: (() -> L),
-         @ViewBuilder right: (() -> R)) {
-        self.init(
-            direction,
-            split,
-            dividerColor: dividerColor,
-            resizeIncrements: .init(width: 1, height: 1),
-            resizePublisher: .init(),
-            left: left,
-            right: right
-        )
-    }
-
-    /// Initialize a split view that supports programmatic resizing.
     init(
         _ direction: SplitViewDirection,
         _ split: Binding<CGFloat>,
         dividerColor: Color,
-        resizeIncrements: NSSize,
+        resizeIncrements: NSSize = .init(width: 1, height: 1),
-        resizePublisher: PassthroughSubject<Double, Never>,
         @ViewBuilder left: (() -> L),
         @ViewBuilder right: (() -> R)
     ) {
@@ -93,25 +75,10 @@ struct SplitView<L: View, R: View>: View {
         self._split = split
         self.dividerColor = dividerColor
         self.resizeIncrements = resizeIncrements
-        self.resizePublisher = resizePublisher
         self.left = left()
         self.right = right()
     }
 
-    private func resize(for size: CGSize, amount: Double) {
-        let dim: CGFloat
-        switch (direction) {
-        case .horizontal:
-            dim = size.width
-        case .vertical:
-            dim = size.height
-        }
-
-        let pos = split * dim
-        let new = min(max(minSize, pos + amount), dim - minSize)
-        split = new / dim
-    }
-
     private func dragGesture(_ size: CGSize, splitterPoint: CGPoint) -> some Gesture {
         return DragGesture()
             .onChanged { gesture in
@@ -177,6 +144,35 @@ struct SplitView<L: View, R: View>: View {
             return CGPoint(x: size.width / 2, y: leftRect.size.height)
         }
     }
+    
+    // MARK: Accessibility
+    
+    private var splitViewLabel: String {
+        switch direction {
+        case .horizontal:
+            return "Horizontal split view"
+        case .vertical:
+            return "Vertical split view"
+        }
+    }
+    
+    private var leftPaneLabel: String {
+        switch direction {
+        case .horizontal:
+            return "Left pane"
+        case .vertical:
+            return "Top pane"
+        }
+    }
+    
+    private var rightPaneLabel: String {
+        switch direction {
+        case .horizontal:
+            return "Right pane"
+        case .vertical:
+            return "Bottom pane"
+        }
+    }
 }
 
 enum SplitViewDirection: Codable {

macos/Sources/Features/Splits/TerminalSplitTreeView.swift

@@ -0,0 +1,62 @@
+import SwiftUI
+
+struct TerminalSplitTreeView: View {
+    let tree: SplitTree<Ghostty.SurfaceView>
+    let onResize: (SplitTree<Ghostty.SurfaceView>.Node, Double) -> Void
+
+    var body: some View {
+        if let node = tree.zoomed ?? tree.root {
+            TerminalSplitSubtreeView(
+                node: node,
+                isRoot: node == tree.root,
+                onResize: onResize)
+            // This is necessary because we can't rely on SwiftUI's implicit
+            // structural identity to detect changes to this view. Due to
+            // the tree structure of splits it could result in bad beaviors.
+            // See: https://github.com/ghostty-org/ghostty/issues/7546
+            .id(node.structuralIdentity)
+        }
+    }
+}
+
+struct TerminalSplitSubtreeView: View {
+    @EnvironmentObject var ghostty: Ghostty.App
+
+    let node: SplitTree<Ghostty.SurfaceView>.Node
+    var isRoot: Bool = false
+    let onResize: (SplitTree<Ghostty.SurfaceView>.Node, Double) -> Void
+
+    var body: some View {
+        switch (node) {
+        case .leaf(let leafView):
+            Ghostty.InspectableSurface(
+                surfaceView: leafView,
+                isSplit: !isRoot)
+                .accessibilityElement(children: .contain)
+                .accessibilityLabel("Terminal pane")
+
+        case .split(let split):
+            let splitViewDirection: SplitViewDirection = switch (split.direction) {
+            case .horizontal: .horizontal
+            case .vertical: .vertical
+            }
+
+            SplitView(
+                splitViewDirection,
+                .init(get: {
+                    CGFloat(split.ratio)
+                }, set: {
+                    onResize(node, $0)
+                }),
+                dividerColor: ghostty.config.splitDividerColor,
+                resizeIncrements: .init(width: 1, height: 1),
+                left: {
+                    TerminalSplitSubtreeView(node: split.left, onResize: onResize)
+                },
+                right: {
+                    TerminalSplitSubtreeView(node: split.right, onResize: onResize)
+                }
+            )
+        }
+    }
+}

macos/Sources/Features/Terminal/BaseTerminalController.swift

@@ -1,5 +1,6 @@
 import Cocoa
 import SwiftUI
+import Combine
 import GhosttyKit
 
 /// A base class for windows that can contain Ghostty windows. This base class implements
@@ -40,11 +41,14 @@ class BaseTerminalController: NSWindowController,
         didSet { syncFocusToSurfaceTree() }
     }
 
-    /// The surface tree for this window.
+    /// The tree of splits within this terminal window.
-    @Published var surfaceTree: Ghostty.SplitNode? = nil {
+    @Published var surfaceTree: SplitTree<Ghostty.SurfaceView> = .init() {
         didSet { surfaceTreeDidChange(from: oldValue, to: surfaceTree) }
     }
 
+    /// This can be set to show/hide the command palette.
+    @Published var commandPaletteIsShowing: Bool = false
+
     /// Whether the terminal surface should focus when the mouse is over it.
     var focusFollowsMouse: Bool {
         self.derivedConfig.focusFollowsMouse
@@ -68,6 +72,30 @@ class BaseTerminalController: NSWindowController,
     /// The configuration derived from the Ghostty config so we don't need to rely on references.
     private var derivedConfig: DerivedConfig
 
+    /// The cancellables related to our focused surface.
+    private var focusedSurfaceCancellables: Set<AnyCancellable> = []
+
+    /// The time that undo/redo operations that contain running ptys are valid for.
+    var undoExpiration: Duration {
+        ghostty.config.undoTimeout
+    }
+
+    /// The undo manager for this controller is the undo manager of the window,
+    /// which we set via the delegate method.
+    override var undoManager: ExpiringUndoManager? {
+        // This should be set via the delegate method windowWillReturnUndoManager
+        if let result = window?.undoManager as? ExpiringUndoManager {
+            return result
+        }
+
+        // If the window one isn't set, we fallback to our global one.
+        if let appDelegate = NSApplication.shared.delegate as? AppDelegate {
+            return appDelegate.undoManager
+        }
+
+        return nil
+    }
+
     struct SavedFrame {
         let window: NSRect
         let screen: NSRect
@@ -79,7 +107,7 @@ class BaseTerminalController: NSWindowController,
 
     init(_ ghostty: Ghostty.App,
          baseConfig base: Ghostty.SurfaceConfiguration? = nil,
-         surfaceTree tree: Ghostty.SplitNode? = nil
+         surfaceTree tree: SplitTree<Ghostty.SurfaceView>? = nil
     ) {
         self.ghostty = ghostty
         self.derivedConfig = DerivedConfig(ghostty.config)
@@ -88,7 +116,7 @@ class BaseTerminalController: NSWindowController,
 
         // Initialize our initial surface.
         guard let ghostty_app = ghostty.app else { preconditionFailure("app must be loaded") }
-        self.surfaceTree = tree ?? .leaf(.init(ghostty_app, baseConfig: base))
+        self.surfaceTree = tree ?? .init(view: Ghostty.SurfaceView(ghostty_app, baseConfig: base))
 
         // Setup our notifications for behaviors
         let center = NotificationCenter.default
@@ -107,6 +135,48 @@ class BaseTerminalController: NSWindowController,
             selector: #selector(ghosttyConfigDidChangeBase(_:)),
             name: .ghosttyConfigDidChange,
             object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyCommandPaletteDidToggle(_:)),
+            name: .ghosttyCommandPaletteDidToggle,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyMaximizeDidToggle(_:)),
+            name: .ghosttyMaximizeDidToggle,
+            object: nil)
+
+        // Splits
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidCloseSurface(_:)),
+            name: Ghostty.Notification.ghosttyCloseSurface,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidNewSplit(_:)),
+            name: Ghostty.Notification.ghosttyNewSplit,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidEqualizeSplits(_:)),
+            name: Ghostty.Notification.didEqualizeSplits,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidFocusSplit(_:)),
+            name: Ghostty.Notification.ghosttyFocusSplit,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidToggleSplitZoom(_:)),
+            name: Ghostty.Notification.didToggleSplitZoom,
+            object: nil)
+        center.addObserver(
+            self,
+            selector: #selector(ghosttyDidResizeSplit(_:)),
+            name: Ghostty.Notification.didResizeSplit,
+            object: nil)
 
         // Listen for local events that we need to know of outside of
         // single surface handlers.
@@ -117,20 +187,58 @@ class BaseTerminalController: NSWindowController,
 
     deinit {
         NotificationCenter.default.removeObserver(self)
-
+        undoManager?.removeAllActions(withTarget: self)
         if let eventMonitor {
             NSEvent.removeMonitor(eventMonitor)
         }
     }
 
+    // MARK: Methods
+
+    /// Create a new split.
+    @discardableResult
+    func newSplit(
+        at oldView: Ghostty.SurfaceView,
+        direction: SplitTree<Ghostty.SurfaceView>.NewDirection,
+        baseConfig config: Ghostty.SurfaceConfiguration? = nil
+    ) -> Ghostty.SurfaceView? {
+        // We can only create new splits for surfaces in our tree.
+        guard surfaceTree.root?.node(view: oldView) != nil else { return nil }
+
+        // Create a new surface view
+        guard let ghostty_app = ghostty.app else { return nil }
+        let newView = Ghostty.SurfaceView(ghostty_app, baseConfig: config)
+
+        // Do the split
+        let newTree: SplitTree<Ghostty.SurfaceView>
+        do {
+            newTree = try surfaceTree.insert(
+                view: newView,
+                at: oldView,
+                direction: direction)
+        } catch {
+            // If splitting fails for any reason (it should not), then we just log
+            // and return. The new view we created will be deinitialized and its
+            // no big deal.
+            Ghostty.logger.warning("failed to insert split: \(error)")
+            return nil
+        }
+
+        replaceSurfaceTree(
+            newTree,
+            moveFocusTo: newView,
+            moveFocusFrom: oldView,
+            undoAction: "New Split")
+
+        return newView
+    }
+
     /// Called when the surfaceTree variable changed.
     ///
     /// Subclasses should call super first.
-    func surfaceTreeDidChange(from: Ghostty.SplitNode?, to: Ghostty.SplitNode?) {
+    func surfaceTreeDidChange(from: SplitTree<Ghostty.SurfaceView>, to: SplitTree<Ghostty.SurfaceView>) {
-        // If our surface tree becomes nil then ensure all surfaces
+        // If our surface tree becomes empty then we have no focused surface.
-        // in the old tree have closed.
+        if (to.isEmpty) {
-        if (to == nil) {
-            from?.close()
             focusedSurface = nil
         }
     }
@@ -138,15 +246,14 @@ class BaseTerminalController: NSWindowController,
     /// Update all surfaces with the focus state. This ensures that libghostty has an accurate view about
     /// what surface is focused. This must be called whenever a surface OR window changes focus.
     func syncFocusToSurfaceTree() {
-        guard let tree = self.surfaceTree else { return }
+        for surfaceView in surfaceTree {
-
-        for leaf in tree {
             // Our focus state requires that this window is key and our currently
-            // focused surface is the surface in this leaf.
+            // focused surface is the surface in this view.
             let focused: Bool = (window?.isKeyWindow ?? false) &&
+                !commandPaletteIsShowing &&
                 focusedSurface != nil &&
-                leaf.surface == focusedSurface!
+                surfaceView == focusedSurface!
-            leaf.surface.focusDidChange(focused)
+            surfaceView.focusDidChange(focused)
         }
     }
 
@@ -159,6 +266,164 @@ class BaseTerminalController: NSWindowController,
         savedFrame = .init(window: window.frame, screen: screen.visibleFrame)
     }
 
+    func confirmClose(
+        messageText: String,
+        informativeText: String,
+        completion: @escaping () -> Void
+    ) {
+        // If we already have an alert, we need to wait for that one.
+        guard alert == nil else { return }
+
+        // If there is no window to attach the modal then we assume success
+        // since we'll never be able to show the modal.
+        guard let window else {
+            completion()
+            return
+        }
+
+        // If we need confirmation by any, show one confirmation for all windows
+        // in the tab group.
+        let alert = NSAlert()
+        alert.messageText = messageText
+        alert.informativeText = informativeText
+        alert.addButton(withTitle: "Close")
+        alert.addButton(withTitle: "Cancel")
+        alert.alertStyle = .warning
+        alert.beginSheetModal(for: window) { response in
+            self.alert = nil
+            if response == .alertFirstButtonReturn {
+                completion()
+            }
+        }
+
+        // Store our alert so we only ever show one.
+        self.alert = alert
+    }
+
+    /// Close a surface from a view.
+    func closeSurface(
+        _ view: Ghostty.SurfaceView,
+        withConfirmation: Bool = true
+    ) {
+        guard let node = surfaceTree.root?.node(view: view) else { return }
+        closeSurface(node, withConfirmation: withConfirmation)
+    }
+
+    /// Close a surface node (which may contain splits), requesting confirmation if necessary.
+    ///
+    /// This will also insert the proper undo stack information in.
+    func closeSurface(
+        _ node: SplitTree<Ghostty.SurfaceView>.Node,
+        withConfirmation: Bool = true
+    ) {
+        // This node must be part of our tree
+        guard surfaceTree.contains(node) else { return }
+
+        // If the child process is not alive, then we exit immediately
+        guard withConfirmation else {
+            removeSurfaceNode(node)
+            return
+        }
+
+        // Confirm close. We use an NSAlert instead of a SwiftUI confirmationDialog
+        // due to SwiftUI bugs (see Ghostty #560). To repeat from #560, the bug is that
+        // confirmationDialog allows the user to Cmd-W close the alert, but when doing
+        // so SwiftUI does not update any of the bindings to note that window is no longer
+        // being shown, and provides no callback to detect this.
+        confirmClose(
+            messageText: "Close Terminal?",
+            informativeText: "The terminal still has a running process. If you close the terminal the process will be killed."
+        ) { [weak self] in
+            if let self {
+                self.removeSurfaceNode(node)
+            }
+        }
+    }
+
+    // MARK: Split Tree Management
+
+    /// Find the next surface to focus when a node is being closed.
+    /// Goes to previous split unless we're the leftmost leaf, then goes to next.
+    private func findNextFocusTargetAfterClosing(node: SplitTree<Ghostty.SurfaceView>.Node) -> Ghostty.SurfaceView? {
+        guard let root = surfaceTree.root else { return nil }
+        
+        // If we're the leftmost, then we move to the next surface after closing.
+        // Otherwise, we move to the previous.
+        if root.leftmostLeaf() == node.leftmostLeaf() {
+            return surfaceTree.focusTarget(for: .next, from: node)
+        } else {
+            return surfaceTree.focusTarget(for: .previous, from: node)
+        }
+    }
+    
+    /// Remove a node from the surface tree and move focus appropriately.
+    ///
+    /// This also updates the undo manager to support restoring this node.
+    ///
+    /// This does no confirmation and assumes confirmation is already done.
+    private func removeSurfaceNode(_ node: SplitTree<Ghostty.SurfaceView>.Node) {
+        // Move focus if the closed surface was focused and we have a next target
+        let nextFocus: Ghostty.SurfaceView? = if node.contains(
+            where: { $0 == focusedSurface }
+        ) {
+            findNextFocusTargetAfterClosing(node: node)
+        } else {
+            nil
+        }
+
+        replaceSurfaceTree(
+            surfaceTree.remove(node),
+            moveFocusTo: nextFocus,
+            moveFocusFrom: focusedSurface,
+            undoAction: "Close Terminal"
+        )
+    }
+
+    private func replaceSurfaceTree(
+        _ newTree: SplitTree<Ghostty.SurfaceView>,
+        moveFocusTo newView: Ghostty.SurfaceView? = nil,
+        moveFocusFrom oldView: Ghostty.SurfaceView? = nil,
+        undoAction: String? = nil
+    ) {
+        // Setup our new split tree
+        let oldTree = surfaceTree
+        surfaceTree = newTree
+        if let newView {
+            DispatchQueue.main.async {
+                Ghostty.moveFocus(to: newView, from: oldView)
+            }
+        }
+
+        // Setup our undo
+        if let undoManager {
+            if let undoAction {
+                undoManager.setActionName(undoAction)
+            }
+            undoManager.registerUndo(
+                withTarget: self,
+                expiresAfter: undoExpiration
+            ) { target in
+                target.surfaceTree = oldTree
+                if let oldView {
+                    DispatchQueue.main.async {
+                        Ghostty.moveFocus(to: oldView, from: target.focusedSurface)
+                    }
+                }
+
+                undoManager.registerUndo(
+                    withTarget: target,
+                    expiresAfter: target.undoExpiration
+                ) { target in
+                    target.replaceSurfaceTree(
+                        newTree,
+                        moveFocusTo: newView,
+                        moveFocusFrom: target.focusedSurface,
+                        undoAction: undoAction)
+                }
+            }
+        }
+    }
+
     // MARK: Notifications
 
     @objc private func didChangeScreenParametersNotification(_ notification: Notification) {
@@ -219,6 +484,160 @@ class BaseTerminalController: NSWindowController,
         self.derivedConfig = DerivedConfig(config)
     }
 
+    @objc private func ghosttyCommandPaletteDidToggle(_ notification: Notification) {
+        guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
+        guard surfaceTree.contains(surfaceView) else { return }
+        toggleCommandPalette(nil)
+    }
+
+    @objc private func ghosttyMaximizeDidToggle(_ notification: Notification) {
+        guard let window else { return }
+        guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
+        guard surfaceTree.contains(surfaceView) else { return }
+        window.zoom(nil)
+    }
+
+    @objc private func ghosttyDidCloseSurface(_ notification: Notification) {
+        guard let target = notification.object as? Ghostty.SurfaceView else { return }
+        guard let node = surfaceTree.root?.node(view: target) else { return }
+        closeSurface(
+            node,
+            withConfirmation: (notification.userInfo?["process_alive"] as? Bool) ?? false)
+    }
+
+    @objc private func ghosttyDidNewSplit(_ notification: Notification) {
+        // The target must be within our tree
+        guard let oldView = notification.object as? Ghostty.SurfaceView else { return }
+        guard surfaceTree.root?.node(view: oldView) != nil else { return }
+
+        // Notification must contain our base config
+        let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
+        let config = configAny as? Ghostty.SurfaceConfiguration
+
+        // Determine our desired direction
+        guard let directionAny = notification.userInfo?["direction"] else { return }
+        guard let direction = directionAny as? ghostty_action_split_direction_e else { return }
+        let splitDirection: SplitTree<Ghostty.SurfaceView>.NewDirection
+        switch (direction) {
+        case GHOSTTY_SPLIT_DIRECTION_RIGHT: splitDirection = .right
+        case GHOSTTY_SPLIT_DIRECTION_LEFT: splitDirection = .left
+        case GHOSTTY_SPLIT_DIRECTION_DOWN: splitDirection = .down
+        case GHOSTTY_SPLIT_DIRECTION_UP: splitDirection = .up
+        default: return
+        }
+
+        newSplit(at: oldView, direction: splitDirection, baseConfig: config)
+    }
+
+    @objc private func ghosttyDidEqualizeSplits(_ notification: Notification) {
+        guard let target = notification.object as? Ghostty.SurfaceView else { return }
+        
+        // Check if target surface is in current controller's tree
+        guard surfaceTree.contains(target) else { return }
+        
+        // Equalize the splits
+        surfaceTree = surfaceTree.equalize()
+    }
+    
+    @objc private func ghosttyDidFocusSplit(_ notification: Notification) {
+        // The target must be within our tree
+        guard let target = notification.object as? Ghostty.SurfaceView else { return }
+        guard surfaceTree.root?.node(view: target) != nil else { return }
+
+        // Get the direction from the notification
+        guard let directionAny = notification.userInfo?[Ghostty.Notification.SplitDirectionKey] else { return }
+        guard let direction = directionAny as? Ghostty.SplitFocusDirection else { return }
+        
+        // Convert Ghostty.SplitFocusDirection to our SplitTree.FocusDirection
+        let focusDirection: SplitTree<Ghostty.SurfaceView>.FocusDirection
+        switch direction {
+        case .previous: focusDirection = .previous
+        case .next: focusDirection = .next
+        case .up: focusDirection = .spatial(.up)
+        case .down: focusDirection = .spatial(.down)
+        case .left: focusDirection = .spatial(.left)
+        case .right: focusDirection = .spatial(.right)
+        }
+
+        // Find the node for the target surface
+        guard let targetNode = surfaceTree.root?.node(view: target) else { return }
+        
+        // Find the next surface to focus
+        guard let nextSurface = surfaceTree.focusTarget(for: focusDirection, from: targetNode) else {
+            return
+        }
+
+        // Remove the zoomed state for this surface tree.
+        if surfaceTree.zoomed != nil {
+            surfaceTree = .init(root: surfaceTree.root, zoomed: nil)
+        }
+
+        // Move focus to the next surface
+        DispatchQueue.main.async {
+            Ghostty.moveFocus(to: nextSurface, from: target)
+        }
+    }
+    
+    @objc private func ghosttyDidToggleSplitZoom(_ notification: Notification) {
+        // The target must be within our tree
+        guard let target = notification.object as? Ghostty.SurfaceView else { return }
+        guard let targetNode = surfaceTree.root?.node(view: target) else { return }
+
+        // Toggle the zoomed state
+        if surfaceTree.zoomed == targetNode {
+            // Already zoomed, unzoom it
+            surfaceTree = SplitTree(root: surfaceTree.root, zoomed: nil)
+        } else {
+            // We require that the split tree have splits
+            guard surfaceTree.isSplit else { return }
+
+            // Not zoomed or different node zoomed, zoom this node
+            surfaceTree = SplitTree(root: surfaceTree.root, zoomed: targetNode)
+        }
+
+        // Move focus to our window. Importantly this ensures that if we click the
+        // reset zoom button in a tab bar of an unfocused tab that we become focused.
+        window?.makeKeyAndOrderFront(nil)
+
+        // Ensure focus stays on the target surface. We lose focus when we do
+        // this so we need to grab it again.
+        DispatchQueue.main.async {
+            Ghostty.moveFocus(to: target)
+        }
+    }
+    
+    @objc private func ghosttyDidResizeSplit(_ notification: Notification) {
+        // The target must be within our tree
+        guard let target = notification.object as? Ghostty.SurfaceView else { return }
+        guard let targetNode = surfaceTree.root?.node(view: target) else { return }
+        
+        // Extract direction and amount from notification
+        guard let directionAny = notification.userInfo?[Ghostty.Notification.ResizeSplitDirectionKey] else { return }
+        guard let direction = directionAny as? Ghostty.SplitResizeDirection else { return }
+        
+        guard let amountAny = notification.userInfo?[Ghostty.Notification.ResizeSplitAmountKey] else { return }
+        guard let amount = amountAny as? UInt16 else { return }
+        
+        // Convert Ghostty.SplitResizeDirection to SplitTree.Spatial.Direction
+        let spatialDirection: SplitTree<Ghostty.SurfaceView>.Spatial.Direction
+        switch direction {
+        case .up: spatialDirection = .up
+        case .down: spatialDirection = .down
+        case .left: spatialDirection = .left
+        case .right: spatialDirection = .right
+        }
+        
+        // Use viewBounds for the spatial calculation bounds
+        let bounds = CGRect(origin: .zero, size: surfaceTree.viewBounds())
+        
+        // Perform the resize using the new SplitTree resize method
+        do {
+            surfaceTree = try surfaceTree.resize(node: targetNode, by: amount, in: spatialDirection, with: bounds)
+        } catch {
+            Ghostty.logger.warning("failed to resize split: \(error)")
+        }
+    }
+
     // MARK: Local Events
 
     private func localEventHandler(_ event: NSEvent) -> NSEvent? {
@@ -232,20 +651,17 @@ class BaseTerminalController: NSWindowController,
     }
 
     private func localEventFlagsChanged(_ event: NSEvent) -> NSEvent? {
-        // Go through all our surfaces and notify it that the flags changed.
+        var surfaces: [Ghostty.SurfaceView] = surfaceTree.map { $0 }
-        if let surfaceTree {
-            var surfaces: [Ghostty.SurfaceView] = surfaceTree.map { $0.surface }
 
-            // If we're the main window receiving key input, then we want to avoid
+        // If we're the main window receiving key input, then we want to avoid
-            // calling this on our focused surface because that'll trigger a double
+        // calling this on our focused surface because that'll trigger a double
-            // flagsChanged call.
+        // flagsChanged call.
-            if NSApp.mainWindow == window {
+        if NSApp.mainWindow == window {
-                surfaces = surfaces.filter { $0 != focusedSurface }
+            surfaces = surfaces.filter { $0 != focusedSurface }
-            }
+        }
         
-            for surface in surfaces {
+        for surface in surfaces {
-                surface.flagsChanged(with: event)
+            surface.flagsChanged(with: event)
-            }
         }
 
         return event
@@ -253,13 +669,27 @@ class BaseTerminalController: NSWindowController,
 
     // MARK: TerminalViewDelegate
 
-    // Note: this is different from surfaceDidTreeChange(from:,to:) because this is called
-    // when the currently set value changed in place and the from:to: variant is called
-    // when the variable was set.
-    func surfaceTreeDidChange() {}
-
     func focusedSurfaceDidChange(to: Ghostty.SurfaceView?) {
+        let lastFocusedSurface = focusedSurface
         focusedSurface = to
+
+        // Important to cancel any prior subscriptions
+        focusedSurfaceCancellables = []
+
+        // Setup our title listener. If we have a focused surface we always use that.
+        // Otherwise, we try to use our last focused surface. In either case, we only
+        // want to care if the surface is in the tree so we don't listen to titles of
+        // closed surfaces.
+        if let titleSurface = focusedSurface ?? lastFocusedSurface,
+           surfaceTree.contains(titleSurface) {
+            // If we have a surface, we want to listen for title changes.
+            titleSurface.$title
+                .sink { [weak self] in self?.titleDidChange(to: $0) }
+                .store(in: &focusedSurfaceCancellables)
+        } else {
+            // There is no surface to listen to titles for.
+            titleDidChange(to: "👻")
+        }
     }
 
     func titleDidChange(to: String) {
@@ -286,7 +716,24 @@ class BaseTerminalController: NSWindowController,
         self.window?.contentResizeIncrements = to
     }
 
-    func zoomStateDidChange(to: Bool) {}
+    func splitDidResize(node: SplitTree<Ghostty.SurfaceView>.Node, to newRatio: Double) {
+        let resizedNode = node.resize(to: newRatio)
+        do {
+            surfaceTree = try surfaceTree.replace(node: node, with: resizedNode)
+        } catch {
+            Ghostty.logger.warning("failed to replace node during split resize: \(error)")
+            return
+        }
+    }
+
+    func performAction(_ action: String, on surfaceView: Ghostty.SurfaceView) {
+        guard let surface = surfaceView.surface else { return }
+        let len = action.utf8CString.count
+        if (len == 0) { return }
+        _ = action.withCString { cString in
+            ghostty_surface_binding_action(surface, cString, UInt(len - 1))
+        }
+    }
 
     // MARK: Fullscreen
 
@@ -337,13 +784,7 @@ class BaseTerminalController: NSWindowController,
         }
     }
 
-    func fullscreenDidChange() {
+    func fullscreenDidChange() {}
-        // For some reason focus can get lost when we change fullscreen. Regardless of
-        // mode above we just move it back.
-        if let focusedSurface {
-            Ghostty.moveFocus(to: focusedSurface)
-        }
-    }
 
     // MARK: Clipboard Confirmation
 
@@ -411,8 +852,21 @@ class BaseTerminalController: NSWindowController,
     // MARK: NSWindowController
 
     override func windowDidLoad() {
+        super.windowDidLoad()
+
+        // Setup our undo manager.
+
+        // Everything beyond here is setting up the window
         guard let window else { return }
 
+        // If there is a hardcoded title in the configuration, we set that
+        // immediately. Future `set_title` apprt actions will override this
+        // if necessary but this ensures our window loads with the proper
+        // title immediately rather than on another event loop tick (see #5934)
+        if let title = derivedConfig.title {
+            window.title = title
+        }
+
         // We always initialize our fullscreen style to native if we can because
         // initialization sets up some state (i.e. observers). If its set already
         // somehow we don't do this.
@@ -432,35 +886,21 @@ class BaseTerminalController: NSWindowController,
         guard let window = self.window else { return true }
 
         // If we have no surfaces, close.
-        guard let node = self.surfaceTree else { return true }
+        if surfaceTree.isEmpty { return true }
 
         // If we already have an alert, continue with it
         guard alert == nil else { return false }
 
         // If our surfaces don't require confirmation, close.
-        if (!node.needsConfirmQuit()) { return true }
+        if !surfaceTree.contains(where: { $0.needsConfirmQuit }) { return true }
 
         // We require confirmation, so show an alert as long as we aren't already.
-        let alert = NSAlert()
+        confirmClose(
-        alert.messageText = "Close Terminal?"
+            messageText: "Close Terminal?",
-        alert.informativeText = "The terminal still has a running process. If you close the " +
+            informativeText: "The terminal still has a running process. If you close the terminal the process will be killed."
-        "terminal the process will be killed."
+        ) {
-        alert.addButton(withTitle: "Close the Terminal")
+            window.close()
-        alert.addButton(withTitle: "Cancel")
+        }
-        alert.alertStyle = .warning
-        alert.beginSheetModal(for: window, completionHandler: { response in
-            self.alert = nil
-            switch (response) {
-            case .alertFirstButtonReturn:
-                alert.window.orderOut(nil)
-                window.close()
-
-            default:
-                break
-            }
-        })
-
-        self.alert = alert
 
         return false
     }
@@ -472,6 +912,9 @@ class BaseTerminalController: NSWindowController,
         // the view and the window so we had to nil this out to break it but I think this
         // may now be resolved. We should verify that no memory leaks and we can remove this.
         window.contentView = nil
+
+        // Make sure we clean up all our undos
+        window.undoManager?.removeAllActions(withTarget: self)
     }
 
     func windowDidBecomeKey(_ notification: Notification) {
@@ -487,10 +930,9 @@ class BaseTerminalController: NSWindowController,
     }
 
     func windowDidChangeOcclusionState(_ notification: Notification) {
-        guard let surfaceTree = self.surfaceTree else { return }
         let visible = self.window?.occlusionState.contains(.visible) ?? false
-        for leaf in surfaceTree {
+        for view in surfaceTree {
-            if let surface = leaf.surface.surface {
+            if let surface = view.surface {
                 ghostty_surface_set_occlusion(surface, visible)
             }
         }
@@ -504,6 +946,11 @@ class BaseTerminalController: NSWindowController,
         windowFrameDidChange()
     }
 
+    func windowWillReturnUndoManager(_ window: NSWindow) -> UndoManager? {
+        guard let appDelegate = NSApplication.shared.delegate as? AppDelegate else { return nil }
+        return appDelegate.undoManager
+    }
+
     // MARK: First Responder
 
     @IBAction func close(_ sender: Any) {
@@ -521,11 +968,21 @@ class BaseTerminalController: NSWindowController,
         ghostty.split(surface: surface, direction: GHOSTTY_SPLIT_DIRECTION_RIGHT)
     }
 
+    @IBAction func splitLeft(_ sender: Any) {
+        guard let surface = focusedSurface?.surface else { return }
+        ghostty.split(surface: surface, direction: GHOSTTY_SPLIT_DIRECTION_LEFT)
+    }
+
     @IBAction func splitDown(_ sender: Any) {
         guard let surface = focusedSurface?.surface else { return }
         ghostty.split(surface: surface, direction: GHOSTTY_SPLIT_DIRECTION_DOWN)
     }
 
+    @IBAction func splitUp(_ sender: Any) {
+        guard let surface = focusedSurface?.surface else { return }
+        ghostty.split(surface: surface, direction: GHOSTTY_SPLIT_DIRECTION_UP)
+    }
+
     @IBAction func splitZoom(_ sender: Any) {
         guard let surface = focusedSurface?.surface else { return }
         ghostty.splitToggleZoom(surface: surface)
@@ -601,23 +1058,30 @@ class BaseTerminalController: NSWindowController,
         ghostty.changeFontSize(surface: surface, .reset)
     }
 
+    @IBAction func toggleCommandPalette(_ sender: Any?) {
+        commandPaletteIsShowing.toggle()
+    }
+
     @objc func resetTerminal(_ sender: Any) {
         guard let surface = focusedSurface?.surface else { return }
         ghostty.resetTerminal(surface: surface)
     }
 
     private struct DerivedConfig {
+        let title: String?
         let macosTitlebarProxyIcon: Ghostty.MacOSTitlebarProxyIcon
         let windowStepResize: Bool
         let focusFollowsMouse: Bool
 
         init() {
+            self.title = nil
             self.macosTitlebarProxyIcon = .visible
             self.windowStepResize = false
             self.focusFollowsMouse = false
         }
 
         init(_ config: Ghostty.Config) {
+            self.title = config.title
             self.macosTitlebarProxyIcon = config.macosTitlebarProxyIcon
             self.windowStepResize = config.windowStepResize
             self.focusFollowsMouse = config.focusFollowsMouse

macos/Sources/Features/Terminal/TerminalManager.swift

@@ -1,372 +0,0 @@
-import Cocoa
-import SwiftUI
-import GhosttyKit
-import Combine
-
-/// Manages a set of terminal windows. This is effectively an array of TerminalControllers.
-/// This abstraction helps manage tabs and multi-window scenarios.
-class TerminalManager {
-    struct Window {
-        let controller: TerminalController
-        let closePublisher: AnyCancellable
-    }
-
-    let ghostty: Ghostty.App
-
-    /// The currently focused surface of the main window.
-    var focusedSurface: Ghostty.SurfaceView? { mainWindow?.controller.focusedSurface }
-
-    /// The set of windows we currently have.
-    var windows: [Window] = []
-
-    // Keep track of the last point that our window was launched at so that new
-    // windows "cascade" over each other and don't just launch directly on top
-    // of each other.
-    private static var lastCascadePoint = NSPoint(x: 0, y: 0)
-
-    /// Returns the main window of the managed window stack. If there is no window
-    /// then an arbitrary window will be chosen.
-    private var mainWindow: Window? {
-        for window in windows {
-            if (window.controller.window?.isMainWindow ?? false) {
-                return window
-            }
-        }
-
-        // If we have no main window, just use the last window.
-        return windows.last
-    }
-
-    /// The configuration derived from the Ghostty config so we don't need to rely on references.
-    private var derivedConfig: DerivedConfig
-
-    init(_ ghostty: Ghostty.App) {
-        self.ghostty = ghostty
-        self.derivedConfig = DerivedConfig(ghostty.config)
-
-        let center = NotificationCenter.default
-        center.addObserver(
-            self,
-            selector: #selector(onNewTab),
-            name: Ghostty.Notification.ghosttyNewTab,
-            object: nil)
-        center.addObserver(
-            self,
-            selector: #selector(onNewWindow),
-            name: Ghostty.Notification.ghosttyNewWindow,
-            object: nil)
-        center.addObserver(
-            self,
-            selector: #selector(ghosttyConfigDidChange(_:)),
-            name: .ghosttyConfigDidChange,
-            object: nil)
-    }
-
-    deinit {
-        let center = NotificationCenter.default
-        center.removeObserver(self)
-    }
-
-    // MARK: - Window Management
-
-    /// Create a new terminal window.
-    func newWindow(withBaseConfig base: Ghostty.SurfaceConfiguration? = nil) {
-        let c = createWindow(withBaseConfig: base)
-        let window = c.window!
-
-        // If the previous focused window was native fullscreen, the new window also
-        // becomes native fullscreen.
-        if let parent = focusedSurface?.window,
-            parent.styleMask.contains(.fullScreen) {
-            window.toggleFullScreen(nil)
-        } else if derivedConfig.windowFullscreen {
-            switch (derivedConfig.windowFullscreenMode) {
-            case .native:
-                // Native has to be done immediately so that our stylemask contains
-                // fullscreen for the logic later in this method.
-                c.toggleFullscreen(mode: .native)
-
-            case .nonNative, .nonNativeVisibleMenu:
-                // If we're non-native then we have to do it on a later loop
-                // so that the content view is setup.
-                DispatchQueue.main.async {
-                    c.toggleFullscreen(mode: self.derivedConfig.windowFullscreenMode)
-                }
-            }
-        }
-
-        // If our app isn't active, we make it active. All new_window actions
-        // force our app to be active.
-        if !NSApp.isActive {
-            NSApp.activate(ignoringOtherApps: true)
-        }
-
-        // We're dispatching this async because otherwise the lastCascadePoint doesn't
-        // take effect. Our best theory is there is some next-event-loop-tick logic
-        // that Cocoa is doing that we need to be after.
-        DispatchQueue.main.async {
-            // Only cascade if we aren't fullscreen.
-            if (!window.styleMask.contains(.fullScreen)) {
-                Self.lastCascadePoint = window.cascadeTopLeft(from: Self.lastCascadePoint)
-            }
-
-            c.showWindow(self)
-        }
-    }
-
-    /// Creates a new tab in the current main window. If there are no windows, a window
-    /// is created.
-    func newTab(withBaseConfig base: Ghostty.SurfaceConfiguration? = nil) {
-        // If there is no main window, just create a new window
-        guard let parent = mainWindow?.controller.window else {
-            newWindow(withBaseConfig: base)
-            return
-        }
-
-        // Create a new window and add it to the parent
-        newTab(to: parent, withBaseConfig: base)
-    }
-
-    private func newTab(to parent: NSWindow, withBaseConfig base: Ghostty.SurfaceConfiguration?) {
-        // If our parent is in non-native fullscreen, then new tabs do not work.
-        // See: https://github.com/mitchellh/ghostty/issues/392
-        if let controller = parent.windowController as? TerminalController,
-           let fullscreenStyle = controller.fullscreenStyle,
-           fullscreenStyle.isFullscreen && !fullscreenStyle.supportsTabs {
-            let alert = NSAlert()
-            alert.messageText = "Cannot Create New Tab"
-            alert.informativeText = "New tabs are unsupported while in non-native fullscreen. Exit fullscreen and try again."
-            alert.addButton(withTitle: "OK")
-            alert.alertStyle = .warning
-            alert.beginSheetModal(for: parent)
-            return
-        }
-
-        // Create a new window and add it to the parent
-        let controller = createWindow(withBaseConfig: base)
-        let window = controller.window!
-
-        // If the parent is miniaturized, then macOS exhibits really strange behaviors
-        // so we have to bring it back out.
-        if (parent.isMiniaturized) { parent.deminiaturize(self) }
-
-        // If our parent tab group already has this window, macOS added it and
-        // we need to remove it so we can set the correct order in the next line.
-        // If we don't do this, macOS gets really confused and the tabbedWindows
-        // state becomes incorrect.
-        //
-        // At the time of writing this code, the only known case this happens
-        // is when the "+" button is clicked in the tab bar.
-        if let tg = parent.tabGroup, tg.windows.firstIndex(of: window) != nil {
-            tg.removeWindow(window)
-        }
-
-        // Our windows start out invisible. We need to make it visible. If we
-        // don't do this then various features such as window blur won't work because
-        // the macOS APIs only work on a visible window.
-        controller.showWindow(self)
-
-        // If we have the "hidden" titlebar style we want to create new
-        // tabs as windows instead, so just skip adding it to the parent.
-        if (derivedConfig.macosTitlebarStyle != "hidden") {
-            // Add the window to the tab group and show it.
-            switch derivedConfig.windowNewTabPosition {
-            case "end":
-                // If we already have a tab group and we want the new tab to open at the end,
-                // then we use the last window in the tab group as the parent.
-                if let last = parent.tabGroup?.windows.last {
-                    last.addTabbedWindow(window, ordered: .above)
-                } else {
-                    fallthrough
-                }
-            case "current": fallthrough
-            default:
-                parent.addTabbedWindow(window, ordered: .above)
-
-            }
-        }
-
-        window.makeKeyAndOrderFront(self)
-
-        // It takes an event loop cycle until the macOS tabGroup state becomes
-        // consistent which causes our tab labeling to be off when the "+" button
-        // is used in the tab bar. This fixes that. If we can find a more robust
-        // solution we should do that.
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { controller.relabelTabs() }
-    }
-
-    /// Creates a window controller, adds it to our managed list, and returns it.
-    func createWindow(withBaseConfig base: Ghostty.SurfaceConfiguration? = nil,
-                      withSurfaceTree tree: Ghostty.SplitNode? = nil) -> TerminalController {
-        // Initialize our controller to load the window
-        let c = TerminalController(ghostty, withBaseConfig: base, withSurfaceTree: tree)
-
-        // Create a listener for when the window is closed so we can remove it.
-        let pubClose = NotificationCenter.default.publisher(
-            for: NSWindow.willCloseNotification,
-            object: c.window!
-        ).sink { notification in
-            guard let window = notification.object as? NSWindow else { return }
-            guard let c = window.windowController as? TerminalController else { return }
-            self.removeWindow(c)
-        }
-
-        // Keep track of every window we manage
-        windows.append(Window(
-            controller: c,
-            closePublisher: pubClose
-        ))
-
-        return c
-    }
-
-    func removeWindow(_ controller: TerminalController) {
-        // Remove it from our managed set
-        guard let idx = self.windows.firstIndex(where: { $0.controller == controller }) else { return }
-        let w = self.windows[idx]
-        self.windows.remove(at: idx)
-
-        // Ensure any publishers we have are cancelled
-        w.closePublisher.cancel()
-
-        // If we remove a window, we reset the cascade point to the key window so that
-        // the next window cascade's from that one.
-        if let focusedWindow = NSApplication.shared.keyWindow {
-            // If we are NOT the focused window, then we are a tabbed window. If we
-            // are closing a tabbed window, we want to set the cascade point to be
-            // the next cascade point from this window.
-            if focusedWindow != controller.window {
-                // The cascadeTopLeft call below should NOT move the window. Starting with
-                // macOS 15, we found that specifically when used with the new window snapping
-                // features of macOS 15, this WOULD move the frame. So we keep track of the
-                // old frame and restore it if necessary. Issue:
-                // https://github.com/ghostty-org/ghostty/issues/2565
-                let oldFrame = focusedWindow.frame
-
-                Self.lastCascadePoint = focusedWindow.cascadeTopLeft(from: NSZeroPoint)
-
-                if focusedWindow.frame != oldFrame {
-                    focusedWindow.setFrame(oldFrame, display: true)
-                }
-
-                return
-            }
-
-            // If we are the focused window, then we set the last cascade point to
-            // our own frame so that it shows up in the same spot.
-            let frame = focusedWindow.frame
-            Self.lastCascadePoint = NSPoint(x: frame.minX, y: frame.maxY)
-        }
-
-        // I don't think we strictly have to do this but if a window is
-        // closed I want to make sure that the app state is invalided so
-        // we don't reopen closed windows.
-        NSApplication.shared.invalidateRestorableState()
-    }
-
-    /// Close all windows, asking for confirmation if necessary.
-    func closeAllWindows() {
-        var needsConfirm: Bool = false
-        for w in self.windows {
-            if (w.controller.surfaceTree?.needsConfirmQuit() ?? false) {
-                needsConfirm = true
-                break
-            }
-        }
-
-        if (!needsConfirm) {
-            for w in self.windows {
-                w.controller.close()
-            }
-
-            return
-        }
-
-        // If we don't have a main window, we just close all windows because
-        // we have no window to show the modal on top of. I'm sure there's a way
-        // to do an app-level alert but I don't know how and this case should never
-        // really happen.
-        guard let alertWindow = mainWindow?.controller.window else {
-            for w in self.windows {
-                w.controller.close()
-            }
-
-            return
-        }
-
-        // If we need confirmation by any, show one confirmation for all windows
-        let alert = NSAlert()
-        alert.messageText = "Close All Windows?"
-        alert.informativeText = "All terminal sessions will be terminated."
-        alert.addButton(withTitle: "Close All Windows")
-        alert.addButton(withTitle: "Cancel")
-        alert.alertStyle = .warning
-        alert.beginSheetModal(for: alertWindow, completionHandler: { response in
-            if (response == .alertFirstButtonReturn) {
-                for w in self.windows {
-                    w.controller.close()
-                }
-            }
-        })
-    }
-
-    /// Relabels all the tabs with the proper keyboard shortcut.
-    func relabelAllTabs() {
-        for w in windows {
-            w.controller.relabelTabs()
-        }
-    }
-
-    // MARK: - Notifications
-
-    @objc private func onNewWindow(notification: SwiftUI.Notification) {
-        let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
-        let config = configAny as? Ghostty.SurfaceConfiguration
-        self.newWindow(withBaseConfig: config)
-    }
-
-    @objc private func onNewTab(notification: SwiftUI.Notification) {
-        guard let surfaceView = notification.object as? Ghostty.SurfaceView else { return }
-        guard let window = surfaceView.window else { return }
-
-        let configAny = notification.userInfo?[Ghostty.Notification.NewSurfaceConfigKey]
-        let config = configAny as? Ghostty.SurfaceConfiguration
-
-        self.newTab(to: window, withBaseConfig: config)
-    }
-
-    @objc private func ghosttyConfigDidChange(_ notification: Notification) {
-        // We only care if the configuration is a global configuration, not a
-        // surface-specific one.
-        guard notification.object == nil else { return }
-
-        // Get our managed configuration object out
-        guard let config = notification.userInfo?[
-            Notification.Name.GhosttyConfigChangeKey
-        ] as? Ghostty.Config else { return }
-
-        // Update our derived config
-        self.derivedConfig = DerivedConfig(config)
-    }
-
-    private struct DerivedConfig {
-        let windowFullscreen: Bool
-        let windowFullscreenMode: FullscreenMode
-        let macosTitlebarStyle: String
-        let windowNewTabPosition: String
-
-        init() {
-            self.windowFullscreen = false
-            self.windowFullscreenMode = .native
-            self.macosTitlebarStyle = "transparent"
-            self.windowNewTabPosition = ""
-        }
-
-        init(_ config: Ghostty.Config) {
-            self.windowFullscreen = config.windowFullscreen
-            self.windowFullscreenMode = config.windowFullscreenMode
-            self.macosTitlebarStyle = config.macosTitlebarStyle
-            self.windowNewTabPosition = config.windowNewTabPosition
-        }
-    }
-}

macos/Sources/Features/Terminal/TerminalRestorable.swift

@@ -4,10 +4,10 @@ import Cocoa
 class TerminalRestorableState: Codable {
     static let selfKey = "state"
     static let versionKey = "version"
-    static let version: Int = 2
+    static let version: Int = 3
 
     let focusedSurface: String?
-    let surfaceTree: Ghostty.SplitNode?
+    let surfaceTree: SplitTree<Ghostty.SurfaceView>
 
     init(from controller: TerminalController) {
         self.focusedSurface = controller.focusedSurface?.uuid.uuidString
@@ -83,18 +83,29 @@ class TerminalWindowRestoration: NSObject, NSWindowRestoration {
         // can be found for events from libghostty. This uses the low-level
         // createWindow so that AppKit can place the window wherever it should
         // be.
-        let c = appDelegate.terminalManager.createWindow(withSurfaceTree: state.surfaceTree)
+        let c = TerminalController.init(
+            appDelegate.ghostty,
+            withSurfaceTree: state.surfaceTree)
         guard let window = c.window else {
             completionHandler(nil, TerminalRestoreError.windowDidNotLoad)
             return
         }
 
         // Setup our restored state on the controller
-        if let focusedStr = state.focusedSurface,
+        // Find the focused surface in surfaceTree
-           let focusedUUID = UUID(uuidString: focusedStr),
+        if let focusedStr = state.focusedSurface {
-           let view = c.surfaceTree?.findUUID(uuid: focusedUUID) {
+            var foundView: Ghostty.SurfaceView?
-            c.focusedSurface = view
+            for view in c.surfaceTree {
-            restoreFocus(to: view, inWindow: window)
+                if view.uuid.uuidString == focusedStr {
+                    foundView = view
+                    break
+                }
+            }
+            
+            if let view = foundView {
+                c.focusedSurface = view
+                restoreFocus(to: view, inWindow: window)
+            }
         }
 
         completionHandler(window, nil)

macos/Sources/Features/Terminal/TerminalToolbar.swift

@@ -1,103 +0,0 @@
-import Cocoa
-
-// Custom NSToolbar subclass that displays a centered window title,
-// in order to accommodate the titlebar tabs feature.
-class TerminalToolbar: NSToolbar, NSToolbarDelegate {
-    private let titleTextField = CenteredDynamicLabel(labelWithString: "👻 Ghostty")
-
-    var titleText: String {
-        get {
-            titleTextField.stringValue
-        }
-
-        set {
-            titleTextField.stringValue = newValue
-        }
-    }
-
-    var titleFont: NSFont? {
-        get {
-            titleTextField.font
-        }
-
-        set {
-            titleTextField.font = newValue
-        }
-    }
-
-    override init(identifier: NSToolbar.Identifier) {
-        super.init(identifier: identifier)
-
-        delegate = self
-        centeredItemIdentifiers.insert(.titleText)
-    }
-
-    func toolbar(_ toolbar: NSToolbar,
-                 itemForItemIdentifier itemIdentifier: NSToolbarItem.Identifier,
-                 willBeInsertedIntoToolbar flag: Bool) -> NSToolbarItem? {
-        var item: NSToolbarItem
-
-        switch itemIdentifier {
-        case .titleText:
-            item = NSToolbarItem(itemIdentifier: .titleText)
-            item.view = self.titleTextField
-            item.visibilityPriority = .user
-
-            // This ensures the title text field doesn't disappear when shrinking the view
-            self.titleTextField.translatesAutoresizingMaskIntoConstraints = false
-            self.titleTextField.setContentHuggingPriority(.defaultLow, for: .horizontal)
-            self.titleTextField.setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
-            
-            // Add constraints to the toolbar item's view
-            NSLayoutConstraint.activate([
-                // Set the height constraint to match the toolbar's height
-                self.titleTextField.heightAnchor.constraint(equalToConstant: 22), // Adjust as needed
-            ])
-            
-            item.isEnabled = true
-        case .resetZoom:
-            item = NSToolbarItem(itemIdentifier: .resetZoom)
-        default:
-            item = NSToolbarItem(itemIdentifier: itemIdentifier)
-        }
-
-        return item
-    }
-
-    func toolbarAllowedItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-        return [.titleText, .flexibleSpace, .space, .resetZoom]
-    }
-
-    func toolbarDefaultItemIdentifiers(_ toolbar: NSToolbar) -> [NSToolbarItem.Identifier] {
-        // These space items are here to ensure that the title remains centered when it starts
-        // getting smaller than the max size so starts clipping. Lucky for us, two of the
-        // built-in spacers plus the un-zoom button item seems to exactly match the space
-        // on the left that's reserved for the window buttons.
-        return [.flexibleSpace, .titleText, .flexibleSpace]
-    }
-}
-
-/// A label that expands to fit whatever text you put in it and horizontally centers itself in the current window.
-fileprivate class CenteredDynamicLabel: NSTextField {
-    override func viewDidMoveToSuperview() {
-        // Configure the text field
-        isEditable = false
-        isBordered = false
-        drawsBackground = false
-        alignment = .center
-        lineBreakMode = .byTruncatingTail
-        cell?.truncatesLastVisibleLine = true
-                
-        // Use Auto Layout
-        translatesAutoresizingMaskIntoConstraints = false
-        
-        // Set content hugging and compression resistance priorities
-        setContentHuggingPriority(.defaultLow, for: .horizontal)
-        setContentCompressionResistancePriority(.defaultHigh, for: .horizontal)
-    }
-}
-
-extension NSToolbarItem.Identifier {
-    static let resetZoom = NSToolbarItem.Identifier("ResetZoom")
-    static let titleText = NSToolbarItem.Identifier("TitleText")
-}

macos/Sources/Features/Terminal/TerminalView.swift

@@ -8,21 +8,17 @@ protocol TerminalViewDelegate: AnyObject {
     /// Called when the currently focused surface changed. This can be nil.
     func focusedSurfaceDidChange(to: Ghostty.SurfaceView?)
 
-    /// The title of the terminal should change.
-    func titleDidChange(to: String)
-
     /// The URL of the pwd should change.
     func pwdDidChange(to: URL?)
 
     /// The cell size changed.
     func cellSizeDidChange(to: NSSize)
 
-    /// The surface tree did change in some way, i.e. a split was added, removed, etc. This is
+    /// Perform an action. At the time of writing this is only triggered by the command palette.
-    /// not called initially.
+    func performAction(_ action: String, on: Ghostty.SurfaceView)
-    func surfaceTreeDidChange()
 
-    /// This is called when a split is zoomed.
+    /// A split is resizing to a given value.
-    func zoomStateDidChange(to: Bool)
+    func splitDidResize(node: SplitTree<Ghostty.SurfaceView>.Node, to newRatio: Double)
 }
 
 /// The view model is a required implementation for TerminalView callers. This contains
@@ -31,7 +27,10 @@ protocol TerminalViewDelegate: AnyObject {
 protocol TerminalViewModel: ObservableObject {
     /// The tree of terminal surfaces (splits) within the view. This is mutated by TerminalView
     /// and children. This should be @Published.
-    var surfaceTree: Ghostty.SplitNode? { get set }
+    var surfaceTree: SplitTree<Ghostty.SurfaceView> { get set }
+
+    /// The command palette state.
+    var commandPaletteIsShowing: Bool { get set }
 }
 
 /// The main terminal view. This terminal view supports splits.
@@ -44,24 +43,18 @@ struct TerminalView<ViewModel: TerminalViewModel>: View {
     // An optional delegate to receive information about terminal changes.
     weak var delegate: (any TerminalViewDelegate)? = nil
 
+    // The most recently focused surface, equal to focusedSurface when
+    // it is non-nil.
+    @State private var lastFocusedSurface: Weak<Ghostty.SurfaceView> = .init()
+
     // This seems like a crutch after switching from SwiftUI to AppKit lifecycle.
     @FocusState private var focused: Bool
 
     // Various state values sent back up from the currently focused terminals.
     @FocusedValue(\.ghosttySurfaceView) private var focusedSurface
-    @FocusedValue(\.ghosttySurfaceTitle) private var surfaceTitle
     @FocusedValue(\.ghosttySurfacePwd) private var surfacePwd
-    @FocusedValue(\.ghosttySurfaceZoomed) private var zoomedSplit
     @FocusedValue(\.ghosttySurfaceCellSize) private var cellSize
 
-    // The title for our window
-    private var title: String {
-        if let surfaceTitle, !surfaceTitle.isEmpty {
-            return surfaceTitle
-        }
-        return "👻"
-    }
-
     // The pwd of the focused surface as a URL
     private var pwdURL: URL? {
         guard let surfacePwd, surfacePwd != "" else { return nil }
@@ -75,42 +68,48 @@ struct TerminalView<ViewModel: TerminalViewModel>: View {
         case .error:
             ErrorView()
         case .ready:
-            VStack(spacing: 0) {
+            ZStack {
-                // If we're running in debug mode we show a warning so that users
+                VStack(spacing: 0) {
-                // know that performance will be degraded.
+                    // If we're running in debug mode we show a warning so that users
-                if (Ghostty.info.mode == GHOSTTY_BUILD_MODE_DEBUG || Ghostty.info.mode == GHOSTTY_BUILD_MODE_RELEASE_SAFE) {
+                    // know that performance will be degraded.
-                    DebugBuildWarningView()
+                    if (Ghostty.info.mode == GHOSTTY_BUILD_MODE_DEBUG || Ghostty.info.mode == GHOSTTY_BUILD_MODE_RELEASE_SAFE) {
-                }
+                        DebugBuildWarningView()
+                    }
 
-                Ghostty.TerminalSplit(node: $viewModel.surfaceTree)
+                    TerminalSplitTreeView(
-                    .environmentObject(ghostty)
+                        tree: viewModel.surfaceTree,
-                    .focused($focused)
+                        onResize: { delegate?.splitDidResize(node: $0, to: $1) })
-                    .onAppear { self.focused = true }
+                        .environmentObject(ghostty)
-                    .onChange(of: focusedSurface) { newValue in
+                        .focused($focused)
-                        self.delegate?.focusedSurfaceDidChange(to: newValue)
+                        .onAppear { self.focused = true }
-                    }
+                        .onChange(of: focusedSurface) { newValue in
-                    .onChange(of: title) { newValue in
+                            // We want to keep track of our last focused surface so even if
-                        self.delegate?.titleDidChange(to: newValue)
+                            // we lose focus we keep this set to the last non-nil value.
-                    }
+                            if newValue != nil {
-                    .onChange(of: pwdURL) { newValue in
+                                lastFocusedSurface = .init(newValue)
-                        self.delegate?.pwdDidChange(to: newValue)
+                                self.delegate?.focusedSurfaceDidChange(to: newValue)
-                    }
+                            }
-                    .onChange(of: cellSize) { newValue in
+                        }
-                        guard let size = newValue else { return }
+                        .onChange(of: pwdURL) { newValue in
-                        self.delegate?.cellSizeDidChange(to: size)
+                            self.delegate?.pwdDidChange(to: newValue)
-                    }
+                        }
-                    .onChange(of: viewModel.surfaceTree?.hashValue) { _ in
+                        .onChange(of: cellSize) { newValue in
-                        // This is funky, but its the best way I could think of to detect
+                            guard let size = newValue else { return }
-                        // ANY CHANGE within the deeply nested surface tree -- detecting a change
+                            self.delegate?.cellSizeDidChange(to: size)
-                        // in the hash value.
+                        }
-                        self.delegate?.surfaceTreeDidChange()
+                }
-                    }
+                // Ignore safe area to extend up in to the titlebar region if we have the "hidden" titlebar style
-                    .onChange(of: zoomedSplit) { newValue in
+                .ignoresSafeArea(.container, edges: ghostty.config.macosTitlebarStyle == "hidden" ? .top : [])
-                        self.delegate?.zoomStateDidChange(to: newValue ?? false)
+
+                if let surfaceView = lastFocusedSurface.value {
+                    TerminalCommandPaletteView(
+                        surfaceView: surfaceView,
+                        isPresented: $viewModel.commandPaletteIsShowing,
+                        ghosttyConfig: ghostty.config) { action in
+                        self.delegate?.performAction(action, on: surfaceView)
                     }
+                }
             }
-            // Ignore safe area to extend up in to the titlebar region if we have the "hidden" titlebar style
-            .ignoresSafeArea(.container, edges: ghostty.config.macosTitlebarStyle == "hidden" ? .top : [])
         }
     }
 }
@@ -140,6 +139,10 @@ struct DebugBuildWarningView: View {
         }
         .background(Color(.windowBackgroundColor))
         .frame(maxWidth: .infinity)
+        .accessibilityElement(children: .combine)
+        .accessibilityLabel("Debug build warning")
+        .accessibilityValue("Debug builds of Ghostty are very slow and you may experience performance problems. Debug builds are only recommended during development.")
+        .accessibilityAddTraits(.isStaticText)
         .onTapGesture {
             isPopover = true
         }

macos/Sources/Features/Terminal/Window Styles/HiddenTitlebarTerminalWindow.swift

@@ -0,0 +1,96 @@
+import AppKit
+
+class HiddenTitlebarTerminalWindow: TerminalWindow {
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        // Setup our initial style
+        reapplyHiddenStyle()
+
+        // Notifications
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(fullscreenDidExit(_:)),
+            name: .fullscreenDidExit,
+            object: nil)
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+
+    private static let hiddenStyleMask: NSWindow.StyleMask = [
+        // We need `titled` in the mask to get the normal window frame
+        .titled,
+
+        // Full size content view so we can extend
+        // content in to the hidden titlebar's area
+        .fullSizeContentView,
+
+        .resizable,
+        .closable,
+        .miniaturizable,
+    ]
+
+    /// Apply the hidden titlebar style.
+    private func reapplyHiddenStyle() {
+        // Apply our style mask while preserving the .fullScreen option
+        if styleMask.contains(.fullScreen) {
+            styleMask = Self.hiddenStyleMask.union([.fullScreen])
+        } else {
+            styleMask = Self.hiddenStyleMask
+        }
+
+        // Hide the title
+        titleVisibility = .hidden
+        titlebarAppearsTransparent = true
+
+        // Hide the traffic lights (window control buttons)
+        standardWindowButton(.closeButton)?.isHidden = true
+        standardWindowButton(.miniaturizeButton)?.isHidden = true
+        standardWindowButton(.zoomButton)?.isHidden = true
+
+        // Disallow tabbing if the titlebar is hidden, since that will (should) also hide the tab bar.
+        tabbingMode = .disallowed
+
+        // Nuke it from orbit -- hide the titlebar container entirely, just in case. There are
+        // some operations that appear to bring back the titlebar visibility so this ensures
+        // it is gone forever.
+        if let themeFrame = contentView?.superview,
+           let titleBarContainer = themeFrame.firstDescendant(withClassName: "NSTitlebarContainerView") {
+            titleBarContainer.isHidden = true
+        }
+    }
+
+    // MARK: NSWindow
+
+    override var title: String {
+        didSet {
+            // Updating the title text as above automatically reveals the
+            // native title view in macOS 15.0 and above. Since we're using
+            // a custom view instead, we need to re-hide it.
+            reapplyHiddenStyle()
+        }
+    }
+
+    // We override this so that with the hidden titlebar style the titlebar
+    // area is not draggable.
+    override var contentLayoutRect: CGRect {
+        var rect = super.contentLayoutRect
+        rect.origin.y = 0
+        rect.size.height = self.frame.height
+        return rect
+    }
+
+    // MARK: Notifications
+
+    @objc private func fullscreenDidExit(_ notification: Notification) {
+        // Make sure they're talking about our window
+        guard let fullscreen = notification.object as? FullscreenBase else { return }
+        guard fullscreen.window == self else { return }
+
+        // On exit we need to reapply the style because macOS breaks it usually.
+        // This is safe to call repeatedly so if its not broken its still safe.
+        reapplyHiddenStyle()
+    }
+}

macos/Sources/Features/Terminal/Window Styles/Terminal.xib

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23094" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23094"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -17,10 +17,10 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1667"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
             <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
-                <autoresizingMask key="autoresizingMask"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             </view>
             <connections>
                 <outlet property="delegate" destination="-2" id="tG2-b7-nb8"/>

macos/Sources/Features/Terminal/Window Styles/TerminalHiddenTitlebar.xib

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="TerminalController" customModule="Ghostty" customModuleProvider="target">
+            <connections>
+                <outlet property="window" destination="QvC-M9-y7g" id="cg9-Ep-qHg"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="👻 Ghostty" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="HiddenTitlebarTerminalWindow" customModule="Ghostty" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="tG2-b7-nb8"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="-82"/>
+        </window>
+    </objects>
+</document>

macos/Sources/Features/Terminal/Window Styles/TerminalTabsTitlebarTahoe.xib

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="TerminalController" customModule="Ghostty" customModuleProvider="target">
+            <connections>
+                <outlet property="window" destination="QvC-M9-y7g" id="cg9-Ep-qHg"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="👻 Ghostty" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="TitlebarTabsTahoeTerminalWindow" customModule="Ghostty" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="tG2-b7-nb8"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="-82"/>
+        </window>
+    </objects>
+</document>

macos/Sources/Features/Terminal/Window Styles/TerminalTabsTitlebarVentura.xib

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="TerminalController" customModule="Ghostty" customModuleProvider="target">
+            <connections>
+                <outlet property="window" destination="QvC-M9-y7g" id="cg9-Ep-qHg"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="👻 Ghostty" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="QvC-M9-y7g" customClass="TitlebarTabsVenturaTerminalWindow" customModule="Ghostty" customModuleProvider="target">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="0.0" y="0.0" width="800" height="600"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="3008" height="1661"/>
+            <view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
+                <rect key="frame" x="0.0" y="0.0" width="800" height="600"/>
+                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            </view>
+            <connections>
+                <outlet property="delegate" destination="-2" id="tG2-b7-nb8"/>
+            </connections>
+            <point key="canvasLocation" x="132" y="-82"/>
+        </window>
+    </objects>
+</document>