Merge upstream/ghostty into sidequery/ghostree

.agents/skills/writing-commit-messages/SKILL.md

@@ -0,0 +1,62 @@
+---
+name: writing-commit-messages
+description: >-
+  Writes Git commit messages. Activates when the user asks to write
+  a commit message, draft a commit message, or similar.
+---
+
+# Writing Commit Messages
+
+Write commit messages that follow commit style guidelines for the project.
+
+## Format
+
+```
+<subsystem>: <summary>
+
+<reference issues/PRs/etc.>
+
+<long form description>
+```
+
+## Rules
+
+### Subject line
+
+- **Subsystem prefix**: Use a short, lowercase identifier for the
+  area of code changed (e.g., `terminal`, `vt`, `lib`, `config`,
+  `font`). Determine this from the file paths in the diff. If
+  changes span the macOS app, use `macos`. For GTK, use `gtk`. For
+  build system, use `build`. Use nested subsystems with `/` when
+  helpful and exclusive (e.g., `terminal/osc`).
+- **Summary**: Lowercase start (not capitalized), imperative mood,
+  no trailing period. Keep it concise—ideally under 60 characters
+  total for the whole subject line.
+
+### References
+
+- If the change relates to a GitHub issue, PR, or discussion, list
+  the relevant numbers on their own lines after the subject, separated
+  by a blank line. E.g. `#1234`
+- If there are no references, omit this section entirely (no blank
+  line).
+
+### Long form description
+
+- Describe **what changed**, **what the previous behavior was**,
+  and **how the new behavior works** at a high level.
+- Use plain prose, not bullet points. Wrap lines at ~72 characters.
+- Focus on the _why_ and _how_ rather than restating the diff.
+- Keep the tone direct and technical without no filler phrases.
+- Don't exceed a handful of paragraphs; less is more.
+
+## Workflow
+
+- If `.jj` is present, use `jj` instead of `git` for all commands.
+- Run a diff to see what changes are present since the last commit.
+- Identify the subsystem from the changed file paths.
+- Identify any referenced issues/PRs from the diff context or
+  branch name.
+- Draft the commit message following the format above.
+- Apply the commit
+- Don't push the commit; leave that to the user.

.gitattributes

@@ -1,3 +1,47 @@
+#--------------------------------------------------------------------
+# Line endings
+#--------------------------------------------------------------------
+# Source code - always LF
+*.zig text eol=lf
+*.c text eol=lf
+*.h text eol=lf
+*.cpp text eol=lf
+*.m text eol=lf
+*.swift text eol=lf
+*.py text eol=lf
+*.sh text eol=lf
+*.glsl text eol=lf
+*.blp text eol=lf
+
+# Config/build files - always LF
+*.zon text eol=lf
+*.nix text eol=lf
+*.md text eol=lf
+*.json text eol=lf
+*.yml text eol=lf
+*.yaml text eol=lf
+*.toml text eol=lf
+CMakeLists.txt text eol=lf
+*.cmake text eol=lf
+Makefile text eol=lf
+
+# Text data files - always LF (embedded in Zig, parsed with \n split)
+*.txt text eol=lf
+
+# Windows resource files - preserve as-is (native Windows tooling)
+*.rc -text
+*.manifest -text
+
+# Binary files
+*.png binary
+*.ico binary
+*.icns binary
+*.ttf binary
+*.otf binary
+
+#--------------------------------------------------------------------
+# Linguist
+#--------------------------------------------------------------------
 build.zig.zon.nix linguist-generated=true
 build.zig.zon.txt linguist-generated=true
 build.zig.zon.json linguist-generated=true

.github/workflows/flatpak.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: ${{ matrix.variant.runner }}
     steps:
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           run-id: ${{ inputs.source-run-id }}
           artifact-ids: ${{ inputs.source-artifact-id }}
@@ -41,7 +41,7 @@ jobs:
           mkdir dist
           tar --verbose --extract --strip-components 1 --directory dist --file ghostty-source.tar.gz
 
-      - uses: flatpak/flatpak-github-actions/flatpak-builder@92ae9851ad316786193b1fd3f40c4b51eb5cb101 # v6.6
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@401fe28a8384095fc1531b9d320b292f0ee45adb # v6.7
         with:
           bundle: com.mitchellh.ghostty
           manifest-path: dist/flatpak/com.mitchellh.ghostty.yml

.github/workflows/milestone.yml

@@ -11,12 +11,15 @@ on:
 
 jobs:
   update-milestone:
+    # Ignore bot-authored pull requests (dependabot, app bots, etc)
+    # and CI-only PRs.
+    if: github.event_name == 'issues' || (github.event.pull_request.user.type != 'Bot' && !startsWith(github.event.pull_request.title, 'ci:'))
     runs-on: namespace-profile-ghostty-sm
     name: Milestone Update
     steps:
       - name: Set Milestone for PR
         uses: hustcer/milestone-action@ebed8d5daafd855a600d7e665c1b130f06d24130 # v3.1
-        if: github.event.pull_request.merged == true
+        if: github.event.pull_request.merged == true && !contains(github.event.pull_request.title, 'VOUCHED') && !startsWith(github.event.pull_request.title, 'ci:')
         with:
           action: bind-pr # `bind-pr` is the default action
           github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/nix.yml

@@ -8,7 +8,7 @@ concurrency:
 jobs:
   required:
     name: "Required Checks: Nix"
-    runs-on: ubuntu-24.04
+    runs-on: namespace-profile-ghostty-sm
     needs:
       - check-zig-cache-hash
     steps:
@@ -32,18 +32,25 @@ jobs:
           exit 1
 
   check-zig-cache-hash:
-    runs-on: ubuntu-24.04
+    if: github.repository == 'ghostty-org/ghostty'
+    runs-on: namespace-profile-ghostty-sm
     env:
-      ZIG_LOCAL_CACHE_DIR: ${{ github.workspace }}/.zig-cache/local
-      ZIG_GLOBAL_CACHE_DIR: ${{ github.workspace }}/.zig-cache/global
+      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
+      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
     steps:
       - name: Checkout code
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Setup Cache
+        uses: namespacelabs/nscloud-cache-action@a90bb5d4b27522ce881c6e98eebd7d7e6d1653f9 # v1.4.2
+        with:
+          path: |
+            /nix
+            /zig
       - name: Setup Nix
-        uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+        uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
         with:
           nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"

.github/workflows/release-tag.yml

@@ -89,11 +89,11 @@ jobs:
             /nix
             /zig
 
-      - uses: cachix/install-nix-action@19effe9fe722874e6d46dd7182e4b8b7a43c4a99 # v31.10.0
+      - uses: cachix/install-nix-action@616559265b40713947b9c190a8ff4b507b5df49b # v31.10.4
         with:
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
@@ -147,13 +147,13 @@ jobs:
       - uses: DeterminateSystems/nix-installer-action@main
         with:
           determinate: true
-      - uses: cachix/cachix-action@3ba601ff5bbb07c7220846facfa2cd81eeee15a1 # v16
+      - uses: cachix/cachix-action@1eb2ef646ac0255473d23a5907ad7b04ce94065c # v17
         with:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 
       - name: XCode Select
-        run: sudo xcode-select -s /Applications/Xcode_26.2.app
+        run: sudo xcode-select -s /Applications/Xcode_26.3.app
 
       - name: Xcode Version
         run: xcodebuild -version
@@ -299,7 +299,7 @@ jobs:
           curl -sL https://sentry.io/get-cli/ | bash
 
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
@@ -322,7 +322,7 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
@@ -370,17 +370,17 @@ jobs:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
     steps:
       - name: Download macOS Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: macos
 
       - name: Download Sparkle Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: sparkle
 
       - name: Download Source Tarball Artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: source-tarball