Merge upstream-main into main

.github/workflows/milestone.yml

@@ -16,7 +16,7 @@ jobs:
     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 }}

AGENTS.md

@@ -33,6 +33,7 @@ A file for [guiding coding agents](https://agents.md/).
 
 - Don’t rebase a branch after it’s merged.
 - Sync upstream into `upstream-main` via `--ff-only`, then merge `upstream-main` into `main`.
+- **NEVER squash upstream commits.** Always use a real merge (`git merge`, not `git merge --squash`) when merging `upstream-main` into `main`. Squashing severs the git ancestry chain, which permanently inflates GitHub’s "behind" count and forces every future merge to re-resolve conflicts that git would otherwise auto-resolve. This has bitten us before and must not happen again.
 - Avoid force-pushing `main`; if needed, push a `legacy/...` backup ref first.
 
 ## Ghostree Project Context

flake.nix

@@ -10,7 +10,6 @@
     # Gnome 49/Gtk 4.20.
     #
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    flake-utils.url = "github:numtide/flake-utils";
 
     # Used for shell.nix
     flake-compat = {
@@ -22,7 +21,6 @@
       url = "github:mitchellh/zig-overlay";
       inputs = {
         nixpkgs.follows = "nixpkgs";
-        flake-utils.follows = "flake-utils";
         flake-compat.follows = "flake-compat";
       };
     };

include/ghostty.h

@@ -889,6 +889,7 @@ typedef enum {
   GHOSTTY_ACTION_RENDER_INSPECTOR,
   GHOSTTY_ACTION_DESKTOP_NOTIFICATION,
   GHOSTTY_ACTION_SET_TITLE,
+  GHOSTTY_ACTION_SET_TAB_TITLE,
   GHOSTTY_ACTION_PROMPT_TITLE,
   GHOSTTY_ACTION_PWD,
   GHOSTTY_ACTION_MOUSE_SHAPE,
@@ -937,6 +938,7 @@ typedef union {
   ghostty_action_inspector_e inspector;
   ghostty_action_desktop_notification_s desktop_notification;
   ghostty_action_set_title_s set_title;
+  ghostty_action_set_title_s set_tab_title;
   ghostty_action_prompt_title_e prompt_title;
   ghostty_action_pwd_s pwd;
   ghostty_action_mouse_shape_e mouse_shape;
@@ -968,7 +970,7 @@ typedef struct {
 } ghostty_action_s;
 
 typedef void (*ghostty_runtime_wakeup_cb)(void*);
-typedef void (*ghostty_runtime_read_clipboard_cb)(void*,
+typedef bool (*ghostty_runtime_read_clipboard_cb)(void*,
                                                   ghostty_clipboard_e,
                                                   void*);
 typedef void (*ghostty_runtime_confirm_read_clipboard_cb)(

macos/Ghostty-Info.plist

@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleName</key>
 	<string>Ghostree</string>
+	<key>NSAutoFillRequiresTextContentTypeForOneTimeCodeOnMac</key>
+	<true/>
 	<key>NSDockTilePlugIn</key>
 	<string>DockTilePlugin.plugin</string>
 	<key>CFBundleDocumentTypes</key>

macos/GhosttyUITests/GhosttyCustomConfigCase.swift

@@ -27,6 +27,8 @@ class GhosttyCustomConfigCase: XCTestCase {
         true
     }
 
+    static let defaultsSuiteName: String = "GHOSTTY_UI_TESTS"
+
     var configFile: URL?
     override func setUpWithError() throws {
         continueAfterFailure = false
@@ -47,13 +49,14 @@ class GhosttyCustomConfigCase: XCTestCase {
         try newConfig.write(to: configFile!, atomically: true, encoding: .utf8)
     }
 
-    func ghosttyApplication() throws -> XCUIApplication {
+    func ghosttyApplication(defaultsSuite: String = GhosttyCustomConfigCase.defaultsSuiteName) throws -> XCUIApplication {
         let app = XCUIApplication()
         app.launchArguments.append(contentsOf: ["-ApplePersistenceIgnoreState", "YES"])
         guard let configFile else {
             return app
         }
         app.launchEnvironment["GHOSTTY_CONFIG_PATH"] = configFile.path
+        app.launchEnvironment["GHOSTTY_USER_DEFAULTS_SUITE"] = defaultsSuite
         return app
     }
 }