Preserve legacy Keychain prompt overrides

Author: MGidnian

Sources/CodexBar/CookieHeaderStore.swift

@@ -72,7 +72,7 @@ struct KeychainCookieHeaderStore: CookieHeaderStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: self.promptKind,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/CopilotTokenStore.swift

@@ -44,7 +44,7 @@ struct KeychainCopilotTokenStore: CopilotTokenStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .copilotToken,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/KeychainPromptCoordinator.swift

@@ -88,9 +88,6 @@ enum KeychainPromptCoordinator {
         "https://github.com/steipete/CodexBar/blob/main/docs/keychain-prompts.md"
 
     static func install() {
-        KeychainPromptHandler.handler = { context in
-            _ = self.presentKeychainPrompt(context)
-        }
         KeychainPromptHandler.resultHandler = { context in
             self.presentKeychainPrompt(context)
         }

Sources/CodexBar/KimiTokenStore.swift

@@ -44,7 +44,7 @@ struct KeychainKimiTokenStore: KimiTokenStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .kimiToken,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/MiniMaxAPITokenStore.swift

@@ -44,7 +44,7 @@ struct KeychainMiniMaxAPITokenStore: MiniMaxAPITokenStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .minimaxToken,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/MiniMaxCookieStore.swift

@@ -44,7 +44,7 @@ struct KeychainMiniMaxCookieStore: MiniMaxCookieStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .minimaxCookie,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/SyntheticTokenStore.swift

@@ -44,7 +44,7 @@ struct KeychainSyntheticTokenStore: SyntheticTokenStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .syntheticToken,
                 service: self.service,
                 account: self.account))

Sources/CodexBar/ZaiTokenStore.swift

@@ -61,7 +61,7 @@ struct KeychainZaiTokenStore: ZaiTokenStoring {
         if case .interactionRequired = KeychainAccessPreflight
             .checkGenericPassword(service: self.service, account: self.account)
         {
-            KeychainPromptHandler.handler?(KeychainPromptContext(
+            KeychainPromptHandler.notify(KeychainPromptContext(
                 kind: .zaiToken,
                 service: self.service,
                 account: self.account))

Sources/CodexBarCore/KeychainAccessPreflight.swift

@@ -59,12 +59,12 @@ public enum KeychainPromptHandler {
         if let taskHandlerStore {
             return taskHandlerStore.handler(context)
         }
-        if let resultHandler {
-            return resultHandler(context)
+        if let handler {
+            handler(context)
+            return true
         }
-        guard let handler else { return false }
-        handler(context)
-        return true
+        if let resultHandler { return resultHandler(context) }
+        return false
     }
 
     #if DEBUG
@@ -117,6 +117,7 @@ public enum KeychainPromptHandler {
             try await operation()
         }
     }
+
     #endif
 }
 

Tests/CodexBarTests/KeychainPromptCoordinatorTests.swift

@@ -3,6 +3,7 @@ import Testing
 @testable import CodexBar
 @testable import CodexBarCore
 
+@Suite(.serialized)
 struct KeychainPromptCoordinatorTests {
     @Test
     func `detects raw SwiftPM debug executable`() {
@@ -102,4 +103,24 @@ struct KeychainPromptCoordinatorTests {
 
         #expect(!result)
     }
+
+    @Test
+    func `legacy prompt handler takes precedence over result handler`() {
+        let context = KeychainPromptContext(
+            kind: .claudeOAuth,
+            service: "Claude Code-credentials",
+            account: nil)
+
+        let previousHandler = KeychainPromptHandler.handler
+        let previousResultHandler = KeychainPromptHandler.resultHandler
+        defer {
+            KeychainPromptHandler.handler = previousHandler
+            KeychainPromptHandler.resultHandler = previousResultHandler
+        }
+        KeychainPromptHandler.handler = { _ in }
+        KeychainPromptHandler.resultHandler = { _ in false }
+        let result = KeychainPromptHandler.notifyIfHandled(context)
+
+        #expect(result)
+    }
 }