From bf716a0c3940ef9a77a4a5d38581e83c0ad44411 Mon Sep 17 00:00:00 2001
From: Nolin McFarland <nolin.mcfarland@gmail.com>
Date: Mon, 18 May 2026 10:12:26 -0400
Subject: [PATCH] feat: add extension to normalize OSPasteboard string
 interface

---
 macos/Ghostty.xcodeproj/project.pbxproj       |  1 +
 .../Ghostty/Surface View/OSSurfaceView.swift  |  7 ++---
 .../Extensions/OSPasteboard+Extension.swift   | 28 +++++++++++++++++++
 .../SurfaceView+SearchStateTests.swift        |  4 +--
 4 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 macos/Sources/Helpers/Extensions/OSPasteboard+Extension.swift

diff --git a/macos/Ghostty.xcodeproj/project.pbxproj b/macos/Ghostty.xcodeproj/project.pbxproj
index fb24d0813..6d883ded8 100644
--- a/macos/Ghostty.xcodeproj/project.pbxproj
+++ b/macos/Ghostty.xcodeproj/project.pbxproj
@@ -109,6 +109,7 @@
 				Helpers/CrossKit.swift,
 				"Helpers/Extensions/NSImage+Extension.swift",
 				"Helpers/Extensions/OSColor+Extension.swift",
+				"Helpers/Extensions/OSPasteboard+Extension.swift",
 			);
 			target = 8193244C2F24E6C000A9ED8F /* DockTilePlugin */;
 		};
diff --git a/macos/Sources/Ghostty/Surface View/OSSurfaceView.swift b/macos/Sources/Ghostty/Surface View/OSSurfaceView.swift
index d9c01b089..2bf9e4cf3 100644
--- a/macos/Sources/Ghostty/Surface View/OSSurfaceView.swift	
+++ b/macos/Sources/Ghostty/Surface View/OSSurfaceView.swift	
@@ -131,7 +131,7 @@ extension Ghostty.OSSurfaceView {
 
         init(
             from startSearch: Ghostty.Action.StartSearch,
-            pasteboard: OSPasteboard = OSPasteboard(name: .find)
+            pasteboard: OSPasteboard = OSPasteboard.find
         ) {
             self.pasteboard = pasteboard
             if let needle = startSearch.needle, !needle.isEmpty {
@@ -143,7 +143,7 @@ extension Ghostty.OSSurfaceView {
         }
 
         func readPasteboardNeedle() {
-            let pasteboardNeedle = pasteboard.string(forType: .string)
+            let pasteboardNeedle = pasteboard.string
             if let pasteboardNeedle, pasteboardNeedle != needle {
                 needle = pasteboardNeedle
                 needleSelection = needle.startIndex..<needle.endIndex
@@ -151,8 +151,7 @@ extension Ghostty.OSSurfaceView {
         }
 
         func writePasteboardNeedle() {
-            pasteboard.clearContents()
-            pasteboard.setString(needle, forType: .string)
+            pasteboard.string = needle
         }
     }
 
diff --git a/macos/Sources/Helpers/Extensions/OSPasteboard+Extension.swift b/macos/Sources/Helpers/Extensions/OSPasteboard+Extension.swift
new file mode 100644
index 000000000..6a59124e1
--- /dev/null
+++ b/macos/Sources/Helpers/Extensions/OSPasteboard+Extension.swift
@@ -0,0 +1,28 @@
+#if canImport(AppKit)
+
+/// Normalizes the interface between NSPasteboard and UIPasteboard for working with pasteboard
+/// strings.
+extension OSPasteboard {
+    @MainActor static let find = OSPasteboard(name: .find)
+
+    /// The pasteboard's current string value.
+    @MainActor var string: String? {
+        get {
+            string(forType: .string)
+        }
+        set {
+            clearContents()
+            if let newValue {
+                setString(newValue, forType: .string)
+            }
+        }
+    }
+}
+
+#elseif canImport(UIKit)
+
+extension OSPasteboard {
+    static let find = OSPasteboard.withUniqueName()
+}
+
+#endif
diff --git a/macos/Tests/Ghostty/Surface View/SurfaceView+SearchStateTests.swift b/macos/Tests/Ghostty/Surface View/SurfaceView+SearchStateTests.swift
index 00a37f67f..1e0231d31 100644
--- a/macos/Tests/Ghostty/Surface View/SurfaceView+SearchStateTests.swift	
+++ b/macos/Tests/Ghostty/Surface View/SurfaceView+SearchStateTests.swift	
@@ -8,9 +8,7 @@ import Testing
     typealias StartSearch = Ghostty.Action.StartSearch
 
     /// A unique pasteboard for each test case prevents flakiness.
-    let pasteboard = OSPasteboard(
-        name: OSPasteboard.Name(rawValue: UUID().uuidString)
-    )
+    let pasteboard = OSPasteboard.withUniqueName()
 
     init() {
         pasteboard.setString("pb", forType: .string)