修复 Arc 无标题 iCloud 密码弹窗的安全自动填入

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
 .build/
+.worktrees/
 dist/
 *.xcuserstate

Sources/ApplePasswordBridge/Accessibility.swift

@@ -1,11 +1,25 @@
 import AppKit
 import ApplicationServices
 
+enum AccessibilityValueNormalizer {
+    static func urlString(from value: Any?) -> String? {
+        if let string = value as? String { return string }
+        if let url = value as? URL { return url.absoluteString }
+        if let url = value as? NSURL { return url.absoluteString }
+        return nil
+    }
+
+    static func bool(from value: Any?) -> Bool? {
+        (value as? NSNumber)?.boolValue
+    }
+}
+
 struct AccessibilityNode {
     let element: AXUIElement
     let role: String
     let text: String
     let value: String?
+    let diagnosticURL: String?
     let position: CGPoint?
 
     var isTextInput: Bool {
@@ -58,11 +72,15 @@ enum AccessibilityTree {
             let role = (copy(element, attribute: kAXRoleAttribute as CFString) as? String) ?? ""
             let value = copy(element, attribute: kAXValueAttribute as CFString) as? String
             let values = textAttributes.compactMap { copy(element, attribute: $0) as? String }
+            let diagnosticURL = AccessibilityValueNormalizer.urlString(
+                from: copy(element, attribute: "AXURL" as CFString)
+            )
             result.append(AccessibilityNode(
                 element: element,
                 role: role,
                 text: values.joined(separator: "\n"),
                 value: value,
+                diagnosticURL: diagnosticURL,
                 position: point(element, attribute: kAXPositionAttribute as CFString)
             ))
 
@@ -80,6 +98,18 @@ enum AccessibilityTree {
         copy(element, attribute: kAXTitleAttribute as CFString) as? String
     }
 
+    static func role(of element: AXUIElement) -> String {
+        (copy(element, attribute: kAXRoleAttribute as CFString) as? String) ?? ""
+    }
+
+    static func subrole(of element: AXUIElement) -> String {
+        (copy(element, attribute: kAXSubroleAttribute as CFString) as? String) ?? ""
+    }
+
+    static func bool(_ element: AXUIElement, attribute: CFString) -> Bool {
+        AccessibilityValueNormalizer.bool(from: copy(element, attribute: attribute)) ?? false
+    }
+
     static func focus(_ element: AXUIElement) -> Bool {
         AXUIElementSetAttributeValue(
             element,

Sources/ApplePasswordBridge/ApplicationRules.swift

@@ -24,7 +24,7 @@ enum FillSpeed: String, CaseIterable, Identifiable {
     }
 }
 
-enum ApplicationRuleMode: String, CaseIterable, Identifiable {
+enum ApplicationRuleMode: String, CaseIterable, Identifiable, Sendable {
     case allowlist
     case denylist
 
@@ -38,7 +38,7 @@ enum ApplicationRuleMode: String, CaseIterable, Identifiable {
     }
 }
 
-struct TargetApplication: Codable, Hashable, Identifiable {
+struct TargetApplication: Codable, Hashable, Identifiable, Sendable {
     let bundleIdentifier: String
     let displayName: String
 
@@ -50,7 +50,7 @@ struct TargetApplication: Codable, Hashable, Identifiable {
     )
 }
 
-struct ApplicationRulePolicy {
+struct ApplicationRulePolicy: Sendable {
     let mode: ApplicationRuleMode
     let allowlist: Set<String>
     let denylist: Set<String>

Sources/ApplePasswordBridge/BridgeApp.swift

@@ -122,6 +122,40 @@ private struct BridgeMenu: View {
                 }
             }
 
+            Divider()
+
+            VStack(alignment: .leading, spacing: 8) {
+                Button {
+                    Task { await model.runDiagnostics() }
+                } label: {
+                    Label(
+                        model.isDiagnosing ? "正在诊断…" : "诊断当前授权窗口",
+                        systemImage: "stethoscope"
+                    )
+                    .frame(maxWidth: .infinity)
+                }
+                .disabled(model.isDiagnosing)
+
+                if let report = model.diagnosticReport {
+                    Text(report.summary)
+                        .font(.caption)
+                        .foregroundStyle(.secondary)
+                        .lineLimit(2)
+                        .textSelection(.enabled)
+
+                    HStack {
+                        Text(report.generatedAt, style: .time)
+                            .font(.caption2)
+                            .foregroundStyle(.secondary)
+                        Spacer()
+                        Button("复制诊断报告", action: model.copyDiagnosticReport)
+                            .controlSize(.small)
+                    }
+                }
+            }
+
+            Divider()
+
             VStack(alignment: .leading, spacing: 8) {
                 PermissionRow(
                     title: "辅助功能",

Sources/ApplePasswordBridge/BridgeModel.swift

@@ -3,6 +3,28 @@ import Combine
 import ServiceManagement
 import UniformTypeIdentifiers
 
+private final class DiagnosticsTaskBox: @unchecked Sendable {
+    private let lock = NSLock()
+    private var task: Task<BrowserDiagnosticReport, Never>?
+    private var cancellationRequested = false
+
+    func set(_ task: Task<BrowserDiagnosticReport, Never>) {
+        lock.lock()
+        self.task = task
+        let shouldCancel = cancellationRequested
+        lock.unlock()
+        if shouldCancel { task.cancel() }
+    }
+
+    func cancel() {
+        lock.lock()
+        cancellationRequested = true
+        let task = task
+        lock.unlock()
+        task?.cancel()
+    }
+}
+
 @MainActor
 final class BridgeModel: ObservableObject {
     @Published var monitoringEnabled: Bool {
@@ -27,6 +49,8 @@ final class BridgeModel: ObservableObject {
     @Published private(set) var launchAtLogin = false
     @Published private(set) var statusText = "正在启动"
     @Published private(set) var isWorking = false
+    @Published private(set) var diagnosticReport: BrowserDiagnosticReport?
+    @Published private(set) var isDiagnosing = false
 
     private enum Keys {
         static let monitoring = "monitoringEnabled"
@@ -40,6 +64,7 @@ final class BridgeModel: ObservableObject {
 
     private let codeReader = PasswordCodeReader()
     private let browserAutofill = BrowserAutofill()
+    private let browserDiagnostics: any BrowserDiagnosticsRunning
     private var scanTimer: Timer?
     private var hotKey: GlobalHotKey?
     private var currentCode: CapturedCode?
@@ -51,7 +76,8 @@ final class BridgeModel: ObservableObject {
     private var manualRequestPending = false
     private var started = false
 
-    init() {
+    init(browserDiagnostics: any BrowserDiagnosticsRunning = BrowserDiagnostics(), startAutomatically: Bool = true) {
+        self.browserDiagnostics = browserDiagnostics
         UserDefaults.standard.register(defaults: [
             Keys.monitoring: true,
             Keys.automaticFill: true,
@@ -76,11 +102,39 @@ final class BridgeModel: ObservableObject {
             key: Keys.denylistedApplications,
             fallback: []
         )
-        Task { @MainActor [weak self] in
-            self?.start()
+        if startAutomatically {
+            Task { @MainActor [weak self] in self?.start() }
         }
     }
 
+    func runDiagnostics() async {
+        guard !isDiagnosing else { return }
+        isDiagnosing = true
+        defer { isDiagnosing = false }
+        let policy = applicationPolicy
+        let applications = activeApplicationRules
+        let now = Date()
+        let runner = browserDiagnostics
+        let handle = DiagnosticsTaskBox()
+        let report = await withTaskCancellationHandler(operation: {
+            let task = Task.detached(priority: .userInitiated) {
+                runner.run(policy: policy, configuredApplications: applications, now: now)
+            }
+            handle.set(task)
+            return await task.value
+        }, onCancel: {
+            handle.cancel()
+        })
+        guard !Task.isCancelled else { return }
+        diagnosticReport = report
+    }
+
+    func copyDiagnosticReport() {
+        guard let report = diagnosticReport else { return }
+        NSPasteboard.general.clearContents()
+        NSPasteboard.general.setString(report.plainText, forType: .string)
+    }
+
     func start() {
         guard !started else { return }
         started = true
@@ -249,15 +303,15 @@ final class BridgeModel: ObservableObject {
         }
         guard let code = currentCode, code.isFresh() else {
             currentCode = nil
-            scheduleRetry(for: [target.identity])
+            scheduleRetry(for: [target.retryIdentity])
             if manual { statusText = "未发现有效的 Apple 密码验证码窗口" }
             return
         }
         let isRecentlyFilledCode = lastSuccessfulCode.map {
             $0.value == code.value && $0.isFresh(at: now)
         } ?? false
         guard manual || !isRecentlyFilledCode else {
-            markHandled(target.identity)
+            markHandled(target.retryIdentity)
             return
         }
 
@@ -270,10 +324,10 @@ final class BridgeModel: ObservableObject {
                 source: code.source
             )
             currentCode = nil
-            markHandled(target.identity)
+            markHandled(target.retryIdentity)
             statusText = "已填入 \(target.application.localizedName ?? "目标应用")（\(code.source.rawValue)）"
         } catch {
-            scheduleRetry(for: [target.identity])
+            scheduleRetry(for: [target.retryIdentity])
             statusText = error.localizedDescription
         }
     }