Run Claude debug OAuth probe off MainActor

Ratul Sarna committed 9 months ago

Commit ad48e051 parent 54120b91 file · +25 −10Browse files

Unified · Split

         claudeCookieHeader: String,
         keepCLISessionsAlive: Bool) async -> String
     {
-        await self.runWithTimeout(seconds: 15) {
+        struct OAuthDebugProbe: Sendable {
+            let hasCredentials: Bool
+            let ownerRawValue: String
+            let sourceRawValue: String
+            let isExpired: Bool
+        }
+        return await self.runWithTimeout(seconds: 15) {
             var lines: [String] = []
             let manualHeader = claudeCookieSource == .manual
                 ? CookieHeaderNormalizer.normalize(claudeCookieHeader)
             } else {
                 ClaudeWebAPIFetcher.hasSessionKey(browserDetection: self.browserDetection) { msg in lines.append(msg) }
             }
-            // Don't prompt for keychain access during debug dump
+            // Run potentially blocking keychain probes off MainActor so debug dumps don't stall UI rendering.
-            let oauthRecord = try? ClaudeOAuthCredentialsStore.loadRecord(
+            let oauthProbe = await Task.detached(priority: .utility) {
-                allowKeychainPrompt: false,
+                // Don't prompt for keychain access during debug dump.
-                respectKeychainPromptCooldown: true,
+                let oauthRecord = try? ClaudeOAuthCredentialsStore.loadRecord(
-                allowClaudeKeychainRepairWithoutPrompt: false)
+                    allowKeychainPrompt: false,
-            let hasOAuthCredentials = oauthRecord?.credentials.scopes.contains("user:profile") == true
+                    respectKeychainPromptCooldown: true,
+                    allowClaudeKeychainRepairWithoutPrompt: false)
+                return OAuthDebugProbe(
+                    hasCredentials: oauthRecord?.credentials.scopes.contains("user:profile") == true,
+                    ownerRawValue: oauthRecord?.owner.rawValue ?? "none",
+                    sourceRawValue: oauthRecord?.source.rawValue ?? "none",
+                    isExpired: oauthRecord?.credentials.isExpired ?? false)
+            }.value
+            let hasOAuthCredentials = oauthProbe.hasCredentials
             let hasClaudeBinary = ClaudeOAuthDelegatedRefreshCoordinator.isClaudeCLIAvailable()
             let delegatedCooldownSeconds = ClaudeOAuthDelegatedRefreshCoordinator.cooldownRemainingSeconds()
             }
             lines.append("hasSessionKey=\(hasKey)")
             lines.append("hasOAuthCredentials=\(hasOAuthCredentials)")
-            lines.append("oauthCredentialOwner=\(oauthRecord?.owner.rawValue ?? "none")")
+            lines.append("oauthCredentialOwner=\(oauthProbe.ownerRawValue)")
-            lines.append("oauthCredentialSource=\(oauthRecord?.source.rawValue ?? "none")")
+            lines.append("oauthCredentialSource=\(oauthProbe.sourceRawValue)")
-            lines.append("oauthCredentialExpired=\(oauthRecord?.credentials.isExpired ?? false)")
+            lines.append("oauthCredentialExpired=\(oauthProbe.isExpired)")
             lines.append("delegatedRefreshCLIAvailable=\(hasClaudeBinary)")
             lines.append("delegatedRefreshCooldownActive=\(delegatedCooldownSeconds != nil)")
             if let delegatedCooldownSeconds {

Run Claude debug OAuth probe off MainActor

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code