Fix Claude source mode fallback on successful CLI login (#2403) #2414
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| import CodexBarCore | ||
| import Foundation | ||
| import Testing | ||
| @testable import CodexBar | ||
|
|
||
| @MainActor | ||
| @Suite(.serialized) | ||
| struct ClaudeIssue2403ReproductionTests { | ||
| private func makeSettings(suiteSuffix: String) -> SettingsStore { | ||
| let suite = "ClaudeIssue2403ReproductionTests-\(suiteSuffix)" | ||
| let defaults = UserDefaults(suiteName: suite)! | ||
| defaults.removePersistentDomain(forName: suite) | ||
| return SettingsStore( | ||
| userDefaults: defaults, | ||
| configStore: testConfigStore(suiteName: suite), | ||
| zaiTokenStore: NoopZaiTokenStore(), | ||
| syntheticTokenStore: NoopSyntheticTokenStore()) | ||
| } | ||
|
|
||
| @Test | ||
| func `web refresh failure disconnects after login`() async throws { | ||
| let registry = ProviderRegistry.shared | ||
| let claudeMetadata = try #require(registry.metadata[.claude]) | ||
|
|
||
| let settings = self.makeSettings(suiteSuffix: "web-unauthorized") | ||
| settings.statusChecksEnabled = false | ||
| settings.refreshFrequency = .manual | ||
| settings.providerDetectionCompleted = true | ||
| settings.claudeUsageDataSource = .web | ||
| settings.setProviderEnabled(provider: .claude, metadata: claudeMetadata, enabled: false) | ||
|
|
||
| let fetcher = UsageFetcher() | ||
| let store = UsageStore( | ||
| fetcher: fetcher, | ||
| browserDetection: BrowserDetection(cacheTTL: 0), | ||
| settings: settings) | ||
|
|
||
| // 1. Simulate user clicking "Sign in with Claude Code..." which runs login runner and succeeds | ||
| await withStatusItemControllerForTesting(store: store, settings: settings, fetcher: fetcher) { controller in | ||
| let didLogin = await controller.runClaudeLoginFlow { _, onPhaseChange in | ||
| onPhaseChange(.requesting) | ||
| await Task.yield() | ||
| onPhaseChange(.waitingBrowser) | ||
| await Task.yield() | ||
| return ClaudeLoginRunner.Result( | ||
| outcome: .success, | ||
| output: "Successfully logged in", | ||
| authLink: nil) | ||
| } | ||
|
|
||
| #expect(didLogin) | ||
| #expect(settings.isProviderEnabledCached(provider: .claude, metadataByProvider: registry.metadata)) | ||
| } | ||
|
|
||
| // 2. Immediately after login, store refreshes provider. | ||
| // If web API is unauthorized (e.g. browser not logged in), web fetch fails with unauthorized | ||
| store.errors[.claude] = ClaudeWebAPIFetcher.FetchError.unauthorized.localizedDescription | ||
|
|
||
| // 3. Verify menu actions immediately revert to re-login / disconnect state | ||
| let actions = MenuDescriptor.build( | ||
| provider: .claude, | ||
| store: store, | ||
| settings: settings, | ||
| account: fetcher.loadAccountInfo(), | ||
| updateReady: false) | ||
| .sections | ||
| .flatMap(\.entries) | ||
| .compactMap { entry -> (String, MenuDescriptor.MenuAction)? in | ||
| guard case let .action(label, action) = entry else { return nil } | ||
| return (label, action) | ||
| } | ||
|
|
||
| #expect(actions.contains { | ||
| $0.0 == "Re-login at claude.ai" && $0.1 == .loginToProvider(url: "https://claude.ai/") | ||
|
There was a problem hiding this comment.
After the successful flow changes this test's source from Useful? React with 👍 / 👎. |
||
| }) | ||
| } | ||
|
|
||
| @Test | ||
| func `login flow succeeds but stale token account causes immediate refresh failure and disconnect`() async throws { | ||
| let registry = ProviderRegistry.shared | ||
| let claudeMetadata = try #require(registry.metadata[.claude]) | ||
|
|
||
| let settings = self.makeSettings(suiteSuffix: "token-account-stale") | ||
| settings.statusChecksEnabled = false | ||
| settings.refreshFrequency = .manual | ||
| settings.providerDetectionCompleted = true | ||
| settings.claudeUsageDataSource = .auto | ||
|
|
||
| // User previously configured a stale/invalid token account | ||
| settings.addTokenAccount(provider: .claude, label: "Old Account", token: "invalid-cookie-session-token") | ||
| settings.setProviderEnabled(provider: .claude, metadata: claudeMetadata, enabled: false) | ||
|
|
||
| let fetcher = UsageFetcher() | ||
| let store = UsageStore( | ||
| fetcher: fetcher, | ||
| browserDetection: BrowserDetection(cacheTTL: 0), | ||
| settings: settings) | ||
|
|
||
| // 1. User signs in with Claude Code CLI | ||
| await withStatusItemControllerForTesting(store: store, settings: settings, fetcher: fetcher) { controller in | ||
| let didLogin = await controller.runClaudeLoginFlow { _, onPhaseChange in | ||
| onPhaseChange(.requesting) | ||
| await Task.yield() | ||
| return ClaudeLoginRunner.Result( | ||
| outcome: .success, | ||
| output: "Logged in successfully", | ||
| authLink: nil) | ||
| } | ||
|
|
||
| #expect(didLogin) | ||
| } | ||
|
|
||
| // 2. Token account override causes fetch to fail on refresh | ||
| store.errors[.claude] = "Claude session key invalid" | ||
|
|
||
| withStatusItemControllerForTesting(store: store, settings: settings, fetcher: fetcher) { controller in | ||
| let model = controller.menuCardModel(for: .claude) | ||
| #expect(model?.subtitleStyle == .error) | ||
| #expect(model?.subtitleText == "Claude session key invalid") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| func `oauth unauthorized error after login forces terminal re-auth prompt`() { | ||
| let settings = self.makeSettings(suiteSuffix: "oauth-unauthorized") | ||
| settings.claudeUsageDataSource = .oauth | ||
|
|
||
| let fetcher = UsageFetcher() | ||
| let store = UsageStore( | ||
| fetcher: fetcher, | ||
| browserDetection: BrowserDetection(cacheTTL: 0), | ||
| settings: settings) | ||
|
|
||
| store.errors[.claude] = ClaudeOAuthFetchError.unauthorized.localizedDescription | ||
|
|
||
| let actions = MenuDescriptor.build( | ||
| provider: .claude, | ||
| store: store, | ||
| settings: settings, | ||
| account: fetcher.loadAccountInfo(), | ||
| updateReady: false) | ||
| .sections | ||
| .flatMap(\.entries) | ||
| .compactMap { entry -> (String, MenuDescriptor.MenuAction)? in | ||
| guard case let .action(label, action) = entry else { return nil } | ||
| return (label, action) | ||
| } | ||
|
|
||
| #expect(actions.contains { | ||
| $0.0 == "Open Terminal" && $0.1 == .openTerminal(command: "claude") | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When Claude is disabled—the setup used by both login-flow tests and a normal sign-in onboarding path—replacing the unconditional
setProviderEnabled(..., enabled: true)call with this source-only update leavesProviderConfig.enabledfalse. ChangingclaudeUsageDataSourcedoes not alter enablement, so the flow reports success and posts a notification while Claude remains hidden and is not refreshed; the newisProviderEnabledCachedassertions consequently fail. Restore provider enablement independently of the selected source.Useful? React with 👍 / 👎.