Merge upstream Maccy (58 commits, Swift 6)

.github/workflows/ci.yml

@@ -23,4 +23,5 @@ jobs:
         run: |
           xcodebuild test -project Maccy.xcodeproj -scheme Maccy -destination 'platform=macOS' \
             -only-testing:MaccyTests -skip-testing:MaccyTests/ClipboardTests \
+            -skip-testing:MaccyTests/SharedStateTests/ClipboardTests \
             CODE_SIGN_IDENTITY=- CODE_SIGNING_ALLOWED=NO

Maccy.xctestplan

@@ -14,6 +14,12 @@
         "argument" : "enable-testing"
       }
     ],
+    "environmentVariableEntries" : [
+      {
+        "key" : "CI",
+        "value" : "$(CI)"
+      }
+    ],
     "targetForVariableExpansion" : {
       "containerPath" : "container:Maccy.xcodeproj",
       "identifier" : "DAEE38421E3DBEB100DD2966",

Maccy/Accessibility.swift

@@ -10,7 +10,8 @@ struct Accessibility {
     // Show the system "grant Accessibility" prompt. This lets macOS register the
     // correct (current) binary itself, instead of relying on a manual drag-in
     // that TCC churn keeps invalidating.
-    let options = [kAXTrustedCheckOptionPrompt.takeUnretainedValue() as String: true] as CFDictionary
+    // Literal value of kAXTrustedCheckOptionPrompt; Swift 6 rejects reading that global var.
+    let options = ["AXTrustedCheckOptionPrompt": true] as CFDictionary
     _ = AXIsProcessTrustedWithOptions(options)
   }
 }

Maccy/Actions/ActionRule.swift

@@ -3,7 +3,7 @@ import Defaults
 import Foundation
 
 // MatchMode: unchanged contract.
-enum MatchMode: String, Codable, CaseIterable, Identifiable {
+nonisolated enum MatchMode: String, Codable, CaseIterable, Identifiable {
   case all // AND
   case any // OR
 
@@ -12,14 +12,14 @@ enum MatchMode: String, Codable, CaseIterable, Identifiable {
 }
 
 // A single condition referencing a provider by id.
-struct RuleCondition: Codable, Identifiable, Hashable {
+nonisolated struct RuleCondition: Codable, Identifiable, Hashable {
   var id: UUID = UUID()
   var provider: String                 // e.g. "builtin.kind", "com.maccyplus.soft-wrap"
   var params: JSONValue = .object([:])
 }
 
 // Persisted configuration for one action within a rule.
-struct ActionConfig: Codable, Identifiable, Hashable {
+nonisolated struct ActionConfig: Codable, Identifiable, Hashable {
   var id: UUID = UUID()
   var provider: String                 // e.g. "builtin.openURL", "com.maccyplus.unwrap"
   var params: JSONValue = .object([:])
@@ -37,7 +37,7 @@ struct ActionConfig: Codable, Identifiable, Hashable {
 
 // A user-defined rule: when its conditions match, its (ordered) actions become
 // available. The first action is the default.
-struct ActionRule: Codable, Identifiable, Hashable, Defaults.Serializable {
+nonisolated struct ActionRule: Codable, Identifiable, Hashable, Defaults.Serializable {
   var id: UUID = UUID()
   var schemaVersion: Int = 3
   var name: String = "New rule"
@@ -47,7 +47,7 @@ struct ActionRule: Codable, Identifiable, Hashable, Defaults.Serializable {
   var actions: [ActionConfig] = []
   var autoRunDefault: Bool = false
 
-  static let presets: [ActionRule] = [
+  @MainActor static let presets: [ActionRule] = [
     // Open links — kind == url → openURL or webSearch
     ActionRule(
       name: "Open links",

Maccy/Actions/ActionsCLI.swift

@@ -187,8 +187,8 @@ enum ActionsCLI {
     // Built from the LIVE provider registry so the catalog can't drift from the
     // installed providers. `ProviderRegistry` is @MainActor; enter synchronously
     // (the CLI has no run loop). `registerProviders()` ran in `run(_:)` first.
-    let catalog: [String: Any] = MainActor.assumeIsolated {
-      func encode(_ descriptors: [ProviderDescriptor]) -> [[String: Any]] {
+    let catalog: [String: Any] = {
+      @MainActor func encode(_ descriptors: [ProviderDescriptor]) -> [[String: Any]] {
         descriptors.map { descriptor -> [String: Any] in
           [
             "id": descriptor.id,
@@ -235,7 +235,7 @@ enum ActionsCLI {
                               "runs that action unconditionally on the most recent clip.",
         "defaultTerminalApps": TerminalApps.defaults
       ]
-    }
+    }()
 
     return emitJSONObject(catalog)
   }
@@ -303,7 +303,7 @@ enum ActionsCLI {
   }
 
   private static func pluginsList() -> Int32 {
-    let payload: [String: Any] = MainActor.assumeIsolated {
+    let payload: [String: Any] = {
       var packages: [String: [String: Any]] = [:]
       for d in ProviderRegistry.shared.descriptors() {
         let pkgID = d.pluginID ?? "builtin"
@@ -324,7 +324,7 @@ enum ActionsCLI {
         "localFolders": Defaults[.localMarketplaceFolders],
         "marketplaces": MarketplaceStore.shared.registeredMarketplaceURLs().map(\.absoluteString)
       ]
-    }
+    }()
     return emitJSONObject(payload)
   }
 

Maccy/Actions/KeyboardLayoutFixer.swift

@@ -4,7 +4,7 @@ import Foundation
 // between US-QWERTY and Israeli SI-1452. Direction is auto-detected by script
 // count. Ported from the standalone KeyLayoutSwitcher engine; dumb +
 // deterministic, with no per-word plausibility scoring.
-enum KeyboardLayoutFixer {
+nonisolated enum KeyboardLayoutFixer {
   // English-typed character -> Hebrew character the user intended.
   static let enToHe: [Character: Character] = [
     // letters lowercase

Maccy/AppDelegate.swift

@@ -4,7 +4,7 @@ import Sparkle
 import SwiftUI
 
 class AppDelegate: NSObject, NSApplicationDelegate {
-  static let isTesting = CommandLine.arguments.contains("enable-testing")
+  nonisolated static let isTesting = CommandLine.arguments.contains("enable-testing")
   var panel: FloatingPanel<ContentView>!
 
   @objc
@@ -22,10 +22,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
   // dynamic `title` (recent copy text) so VoiceOver always announces something
   // meaningful even when that preference is off or the app is disabled.
   private func updateStatusItemAccessibilityLabel() {
-    let base = NSLocalizedString("status_item_accessibility_label", comment: "")
-    statusItem.button?.setAccessibilityLabel(
-      isStatusItemDisabled ? "\(base) — \(NSLocalizedString("status_item_disabled_accessibility_suffix", comment: ""))" : base
-    )
+    var accessibilityLabel = NSLocalizedString("status_item_accessibility_label", comment: "")
+    if isStatusItemDisabled {
+      accessibilityLabel += " — \(NSLocalizedString("status_item_disabled_accessibility_suffix", comment: ""))"
+    }
+    statusItem.button?.setAccessibilityLabel(accessibilityLabel)
   }
 
   private var isStatusItemDisabled: Bool {
@@ -192,6 +193,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       _ = try? Storage.shared.sanitizeTitles()
     }
 
+    ensureMigration(key: "2026-09-15-remove-unpersistable-contents") {
+      _ = try? Storage.shared.removeUnpersistableContents()
+    }
+
     // The following defaults are not used in Maccy 2.x
     // and should be removed in 3.x.
     // - LaunchAtLogin__hasMigrated
@@ -203,18 +208,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
   @objc
   private func performStatusItemClick() {
-    if let event = NSApp.currentEvent {
-      let modifierFlags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
+    let modifierFlags = (NSApp.currentEvent?.modifierFlags ?? [])
+      .union(NSEvent.modifierFlags)
+      .intersection(.deviceIndependentFlagsMask)
 
-      if modifierFlags.contains(.option) {
-        Defaults[.ignoreEvents].toggle()
+    if modifierFlags.contains(.option) {
+      Defaults[.ignoreEvents].toggle()
 
-        if modifierFlags.contains(.shift) {
-          Defaults[.ignoreOnlyNextEvent] = Defaults[.ignoreEvents]
-        }
-
-        return
+      if modifierFlags.contains(.shift) {
+        Defaults[.ignoreOnlyNextEvent] = Defaults[.ignoreEvents]
       }
+
+      return
     }
 
     panel.toggle(height: AppState.shared.popup.height, at: .statusItem)
@@ -242,7 +247,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
       object: nil,
       queue: nil
     ) { notification in
-      if let name = notification.userInfo?["name"] as? KeyboardShortcuts.Name, names.contains(name) {
+      guard let name = notification.userInfo?["name"] as? KeyboardShortcuts.Name,
+            names.contains(name) else { return }
+      MainActor.assumeIsolated {
         KeyboardShortcuts.disable(name)
       }
     }

Maccy/ApplicationImage.swift

@@ -50,23 +50,21 @@ class ApplicationImage {
         let source = DispatchSource.makeFileSystemObjectSource(
           fileDescriptor: descriptor,
           eventMask: [.write, .delete],
-          queue: DispatchQueue.global()
+          queue: .main
         )
         eventSource = source
         source.setEventHandler {
-          DispatchQueue.main.async {
-            let event = source.data
-            if event.contains(.delete) {
-              // File was deleted.
-              print("Deleted", appURL.path)
-              source.cancel()
-              self.image = nil
-              self.lastChecked = nil
-            } else if event.contains(.write) {
-              // File was modified. Fetch new icon
-              print("Modified", appURL.path)
-              self.image = NSWorkspace.shared.icon(forFile: appURL.path)
-            }
+          let event = source.data
+          if event.contains(.delete) {
+            // File was deleted.
+            print("Deleted", appURL.path)
+            source.cancel()
+            self.image = nil
+            self.lastChecked = nil
+          } else if event.contains(.write) {
+            // File was modified. Fetch new icon
+            print("Modified", appURL.path)
+            self.image = NSWorkspace.shared.icon(forFile: appURL.path)
           }
         }
         source.setCancelHandler {

Maccy/Clipboard.swift

@@ -29,6 +29,10 @@ class Clipboard {
     .concealed,
     .transient
   ]
+  private let unpersistableTypes: Set<NSPasteboard.PasteboardType> = [
+    .appleWebArchive,
+    .safariWebArchve
+  ]
 
   private var enabledTypes: Set<NSPasteboard.PasteboardType> { Defaults[.enabledPasteboardTypes] }
   private var disabledTypes: Set<NSPasteboard.PasteboardType> { supportedTypes.subtracting(enabledTypes) }
@@ -62,6 +66,12 @@ class Clipboard {
     start()
   }
 
+  func isPersistable(_ type: NSPasteboard.PasteboardType) -> Bool {
+    return !unpersistableTypes.contains(type) &&
+             !type.rawValue.hasPrefix(microsoftSourcePrefix) &&
+             !type.rawValue.hasPrefix(dynamicTypePrefix)
+  }
+
   @MainActor
   func copyInMaccy(_ string: String) {
     pasteboard.clearContents()
@@ -198,8 +208,7 @@ class Clipboard {
 
       types = types
         .subtracting(disabledTypes)
-        .filter { !$0.rawValue.starts(with: dynamicTypePrefix) }
-        .filter { !$0.rawValue.starts(with: microsoftSourcePrefix) }
+        .filter(isPersistable)
 
       // Avoid reading Microsoft Word links from bookmarks and cross-references.
       // https://github.com/p0deje/Maccy/issues/613

Maccy/ConcatenatedCollection.swift

@@ -0,0 +1,45 @@
+/// A random-access view over two arrays that does not allocate combined storage.
+nonisolated struct ConcatenatedCollection<Element>: RandomAccessCollection {
+  typealias Index = Int
+
+  private let leading: [Element]
+  private let trailing: [Element]
+
+  init(_ leading: [Element], _ trailing: [Element]) {
+    self.leading = leading
+    self.trailing = trailing
+  }
+
+  var startIndex: Int { 0 }
+  var endIndex: Int { leading.count + trailing.count }
+
+  subscript(position: Int) -> Element {
+    precondition(position >= startIndex && position < endIndex, "Index out of bounds")
+    if position < leading.count {
+      return leading[position]
+    }
+    return trailing[position - leading.count]
+  }
+
+  func index(after index: Int) -> Int {
+    index + 1
+  }
+
+  func index(before index: Int) -> Int {
+    index - 1
+  }
+
+  func index(_ index: Int, offsetBy distance: Int) -> Int {
+    index + distance
+  }
+
+  func distance(from start: Int, to end: Int) -> Int {
+    end - start
+  }
+
+  func toArray() -> [Element] {
+    leading + trailing
+  }
+}
+
+extension ConcatenatedCollection: Equatable where Element: Equatable {}