From cd33724b36b4d780de6eee171ca43ec1f883dacf Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 00:34:47 -0700 Subject: [PATCH 01/34] Expose missing sign-in error state in tests Settings sign-in errors currently disappear into logs, so this adds a behavioral regression test for invalid callback handling before the production error surface exists. Constraint: Do not run local tests for this repository; CI owns test execution. Confidence: high Scope-risk: narrow Tested: Not run locally by instruction. Not-tested: Local cmux-unit execution. --- GhosttyTabs.xcodeproj/project.pbxproj | 4 ++ cmuxTests/AuthManagerSignInErrorTests.swift | 76 +++++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 cmuxTests/AuthManagerSignInErrorTests.swift diff --git a/GhosttyTabs.xcodeproj/project.pbxproj b/GhosttyTabs.xcodeproj/project.pbxproj index 4095ad9b706c..1b8e90bafd97 100644 --- a/GhosttyTabs.xcodeproj/project.pbxproj +++ b/GhosttyTabs.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 063BC42CEE257D6213A2E30C /* WindowAndDragTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEE83F8394D90ACACD8E19DD /* WindowAndDragTests.swift */; }; + A36170000000000000000001 /* AuthManagerSignInErrorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A36170000000000000000002 /* AuthManagerSignInErrorTests.swift */; }; 2907A0032907A0032907A003 /* AppDelegateIssue2907RoutingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2907A0042907A0042907A004 /* AppDelegateIssue2907RoutingTests.swift */; }; 0F2C25F9170130F8DC09DD1B /* WorkspaceManualUnreadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D301919B10F22B8708E8883 /* WorkspaceManualUnreadTests.swift */; }; A11EAA000000000000000000 /* AppearanceSettingsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A11EAA000000000000000001 /* AppearanceSettingsTests.swift */; }; @@ -522,6 +523,7 @@ A50019A1 /* SettingsNavigation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsNavigation.swift; sourceTree = ""; }; A50019B1 /* SettingsSearchAliases.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSearchAliases.swift; sourceTree = ""; }; A50019B3 /* SettingsSearchIndexTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsSearchIndexTests.swift; sourceTree = ""; }; + A36170000000000000000002 /* AuthManagerSignInErrorTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthManagerSignInErrorTests.swift; sourceTree = ""; }; B37A00000000000000000002 /* BetaFeaturesSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BetaFeaturesSettingsView.swift; sourceTree = ""; }; B37A00000000000000000008 /* SettingsCardNote.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsCardNote.swift; sourceTree = ""; }; A5001012 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -1235,6 +1237,7 @@ C2B6A97D1F2E4C71A8B9D002 /* BrowserOmnibarPerformanceSupportTests.swift */, A5008382 /* CommandPaletteSearchEngineTests.swift */, A50019B3 /* SettingsSearchIndexTests.swift */, + A36170000000000000000002 /* AuthManagerSignInErrorTests.swift */, 970226F3C99D0D937CD00539 /* BrowserConfigTests.swift */, 58C7B1B978620BE162CC057E /* BrowserPanelTests.swift */, D0B1000DA1B2C3D4E5F60001 /* CmuxWebViewDragRoutingTests.swift */, @@ -1852,6 +1855,7 @@ A5008381 /* BrowserFindJavaScriptTests.swift in Sources */, A5008383 /* CommandPaletteSearchEngineTests.swift in Sources */, A50019B2 /* SettingsSearchIndexTests.swift in Sources */, + A36170000000000000000001 /* AuthManagerSignInErrorTests.swift in Sources */, E12E88F82733EC42F32C36A3 /* BrowserConfigTests.swift in Sources */, 1F14445B9627DE9D3AF4FD2E /* BrowserPanelTests.swift in Sources */, D0B1000CA1B2C3D4E5F60001 /* CmuxWebViewDragRoutingTests.swift in Sources */, diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift new file mode 100644 index 000000000000..d35ddf2581c3 --- /dev/null +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -0,0 +1,76 @@ +import XCTest + +#if canImport(cmux_DEV) +@testable import cmux_DEV +#elseif canImport(cmux) +@testable import cmux +#endif + +@MainActor +final class AuthManagerSignInErrorTests: XCTestCase { + func testInvalidCallbackStoresVisibleSignInError() async throws { + let suiteName = "AuthManagerSignInErrorTests.InvalidCallback.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let manager = AuthManager( + tokenStore: TestTokenStore(), + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + do { + try await manager.handleCallbackURL(URL(string: "cmux://auth-callback?stack_refresh=refresh-token")!) + XCTFail("Expected invalid callback to throw") + } catch AuthManagerError.invalidCallback { + // Expected path. + } catch { + XCTFail("Expected invalidCallback, got \(error)") + } + + guard case .authManager(.invalidCallback)? = manager.lastSignInError else { + XCTFail("Expected invalid callback to be stored as the visible sign-in error") + return + } + XCTAssertEqual( + manager.lastSignInError?.localizedMessage, + AuthManagerError.invalidCallback.errorDescription + ) + } +} + +private actor TestTokenStore: StackAuthTokenStoreProtocol { + private var accessToken: String? + private var refreshToken: String? + + func getStoredAccessToken() async -> String? { + accessToken + } + + func getStoredRefreshToken() async -> String? { + refreshToken + } + + func setTokens(accessToken: String?, refreshToken: String?) async { + self.accessToken = accessToken + self.refreshToken = refreshToken + } + + func clearTokens() async { + accessToken = nil + refreshToken = nil + } + + func compareAndSet( + compareRefreshToken: String, + newRefreshToken: String?, + newAccessToken: String? + ) async { + guard refreshToken == compareRefreshToken else { return } + refreshToken = newRefreshToken + accessToken = newAccessToken + } +} From 239560a5d620e53fe36f78477262957cf742ca0c Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 00:38:00 -0700 Subject: [PATCH 02/34] Surface sign-in failures where users can act Settings auth previously converted ASWebAuthenticationSession and callback failures into log lines only, so users saw the web sheet disappear without any actionable state. AuthManager now stores a typed visible error, keeps in-flight web sessions from being cancelled by duplicate entry, and clears stale errors on successful sign-in paths. Constraint: Settings strings must use String(localized:) and Localizable.xcstrings entries. Constraint: Local tests are intentionally not run in this repo; CI owns test execution. Rejected: Keep using NSLog-only failures | leaves issue 3617 with no visible user feedback. Confidence: medium Scope-risk: narrow Tested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings Not-tested: Local unit/UI tests by instruction. --- CHANGELOG.md | 6 +++ Resources/Localizable.xcstrings | 29 ++++++++++++ Sources/Auth/AuthManager.swift | 82 +++++++++++++++++++++++++++------ Sources/cmuxApp.swift | 27 +++++++++-- 4 files changed, 124 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f3fee3a3331..40211943168b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to cmux are documented here. +## [Unreleased] + +### Fixed +- Surface Settings > Sign In failures in Account settings instead of only logging ASWebAuthenticationSession and callback errors ([#3617](https://github.com/manaflow-ai/cmux/issues/3617)) + ## [0.64.3] - 2026-05-05 ### Added @@ -63,6 +68,7 @@ All notable changes to cmux are documented here. - Gemini and Rovo Dev session hooks with sessions piped into Vault ([#3530](https://github.com/manaflow-ai/cmux/pull/3530), [#3535](https://github.com/manaflow-ai/cmux/pull/3535)) - iMessage mode for agent prompts ([#3252](https://github.com/manaflow-ai/cmux/pull/3252)) - Settings sidebar shell and unified config utility window with cmux, Ghostty, and synced tabs ([#3024](https://github.com/manaflow-ai/cmux/pull/3024), [#3244](https://github.com/manaflow-ai/cmux/pull/3244), [#3400](https://github.com/manaflow-ai/cmux/pull/3400)) +- Settings > Sign In for connecting a cmux account from Account settings - Make `cmux.json` the canonical settings file with JSONC parsing and legacy `settings.json` fallback ([#3409](https://github.com/manaflow-ai/cmux/pull/3409), [#3424](https://github.com/manaflow-ai/cmux/pull/3424)) - Configurable `cmux.json` workspace and tab bar plus-button actions ([#3084](https://github.com/manaflow-ai/cmux/pull/3084), [#3348](https://github.com/manaflow-ai/cmux/pull/3348)) - Configurable surface tab bar font size ([#2645](https://github.com/manaflow-ai/cmux/pull/2645)) diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 899ac886f992..0a37e74c998c 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -106451,6 +106451,35 @@ } } }, + "settings.account.error.signInFailed": { + "extractionState": "manual", + "localizations": { + "en": { + "stringUnit": { + "state": "translated", + "value": "Sign in failed. Try again." + } + }, + "ja": { + "stringUnit": { + "state": "translated", + "value": "サインインに失敗しました。もう一度お試しください。" + } + }, + "uk": { + "stringUnit": { + "state": "translated", + "value": "Не вдалося ввійти. Спробуйте ще раз." + } + }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "로그인에 실패했습니다. 다시 시도하세요." + } + } + } + }, "rightSidebar.mode.feed": { "extractionState": "manual", "localizations": { diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index e060796c6d08..4876779cd5b1 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -31,7 +31,7 @@ private final class AuthPresentationContext: NSObject, ASWebAuthenticationPresen } } -enum AuthManagerError: LocalizedError { +enum AuthManagerError: LocalizedError, Equatable { case invalidCallback case missingAccessToken case missingRefreshToken @@ -57,6 +57,31 @@ enum AuthManagerError: LocalizedError { } } +enum AuthSignInError: Equatable { + case authManager(AuthManagerError) + case message(String) + + var localizedMessage: String { + switch self { + case .authManager(let error): + return error.errorDescription ?? Self.genericLocalizedMessage + case .message(let message): + let trimmed = message.trimmingCharacters(in: .whitespacesAndNewlines) + guard !trimmed.isEmpty else { + return Self.genericLocalizedMessage + } + return "\(Self.genericLocalizedMessage) \(trimmed)" + } + } + + private static var genericLocalizedMessage: String { + String( + localized: "settings.account.error.signInFailed", + defaultValue: "Sign in failed. Try again." + ) + } +} + protocol StackAuthTokenStoreProtocol: TokenStoreProtocol, Sendable { func seed(accessToken: String, refreshToken: String) async func clear() async @@ -128,6 +153,7 @@ final class AuthManager: ObservableObject { @Published private(set) var isLoading = false @Published private(set) var isRestoringSession = false @Published private(set) var didCompleteBrowserSignIn = false + @Published private(set) var lastSignInError: AuthSignInError? @Published var selectedTeamID: String? { didSet { guard selectedTeamID != oldValue else { return } @@ -186,9 +212,9 @@ final class AuthManager: ObservableObject { private var webAuthSession: ASWebAuthenticationSession? func beginSignIn() { + guard webAuthSession == nil else { return } loginPollTask?.cancel() - webAuthSession?.cancel() - webAuthSession = nil + lastSignInError = nil isLoading = true let signInURL = AuthEnvironment.signInURL() @@ -205,13 +231,19 @@ final class AuthManager: ObservableObject { self.webAuthSession = nil } if let error { - NSLog("auth.webauth failed: %@", "\(error)") + let nsError = error as NSError + self.lastSignInError = .message(nsError.localizedDescription) + NSLog("auth.webauth failed: %@ (%ld) %@", nsError.domain, nsError.code, nsError.localizedDescription) + return + } + guard let callbackURL else { + self.lastSignInError = .authManager(.invalidCallback) return } - guard let callbackURL else { return } do { try await self.handleCallbackURL(callbackURL) } catch { + self.lastSignInError = Self.signInError(from: error) NSLog("auth.webauth callback failed: %@", "\(error)") } } @@ -219,10 +251,11 @@ final class AuthManager: ObservableObject { session.presentationContextProvider = AuthPresentationContext.shared session.prefersEphemeralWebBrowserSession = false - if session.start() { - webAuthSession = session - } else { + webAuthSession = session + if !session.start() { NSLog("auth.webauth: session.start() returned false") + webAuthSession = nil + lastSignInError = .message("") isLoading = false } } @@ -395,18 +428,26 @@ final class AuthManager: ObservableObject { func handleCallbackURL(_ url: URL) async throws { guard let payload = AuthCallbackRouter.callbackPayload(from: url) else { - throw AuthManagerError.invalidCallback + let error = AuthManagerError.invalidCallback + lastSignInError = .authManager(error) + throw error } isLoading = true defer { isLoading = false } - await tokenStore.seed( - accessToken: payload.accessToken, - refreshToken: payload.refreshToken - ) - try await refreshSession() - didCompleteBrowserSignIn = true + do { + await tokenStore.seed( + accessToken: payload.accessToken, + refreshToken: payload.refreshToken + ) + try await refreshSession() + didCompleteBrowserSignIn = true + lastSignInError = nil + } catch { + lastSignInError = Self.signInError(from: error) + throw error + } } func seedTokensFromCLI(refreshToken: String, accessToken: String?) async { @@ -434,6 +475,7 @@ final class AuthManager: ObservableObject { do { try await refreshSession() authLog("seedTokensFromCLI: success user=\(currentUser?.primaryEmail ?? "nil")") + lastSignInError = nil } catch { authLog("seedTokensFromCLI: refreshSession failed: \(error)") } @@ -505,6 +547,7 @@ final class AuthManager: ObservableObject { isAuthenticated = true selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: result.teams) didCompleteBrowserSignIn = true + lastSignInError = nil authLog("applySignInResult: user=\(result.email ?? "nil") teams=\(result.teams.count) teamID=\(selectedTeamID ?? "nil")") } @@ -568,6 +611,7 @@ final class AuthManager: ObservableObject { availableTeams = teams isAuthenticated = true selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: teams) + lastSignInError = nil authLog("signInWithCredential: success user=\(user.primaryEmail ?? "nil") teams=\(teams.count) teamID=\(selectedTeamID ?? "nil")") didCompleteBrowserSignIn = true } @@ -576,6 +620,7 @@ final class AuthManager: ObservableObject { try? await client.signOut() await tokenStore.clear() clearSessionState(clearSelectedTeam: true) + lastSignInError = nil } /// Cached access token for fast synchronous reads (no actor hops). @@ -667,6 +712,13 @@ final class AuthManager: ObservableObject { Self.authLog(message) } + private static func signInError(from error: Error) -> AuthSignInError { + if let authError = error as? AuthManagerError { + return .authManager(authError) + } + return .message((error as NSError).localizedDescription) + } + private func refreshSession() async throws { let user: CMUXAuthUser? do { diff --git a/Sources/cmuxApp.swift b/Sources/cmuxApp.swift index 941d3fa288c6..b45295ddc318 100644 --- a/Sources/cmuxApp.swift +++ b/Sources/cmuxApp.swift @@ -7517,7 +7517,7 @@ private struct AuthSettingsRow: View { @ObservedObject var authManager: AuthManager var body: some View { - HStack(alignment: .center, spacing: 12) { + HStack(alignment: .top, spacing: 12) { VStack(alignment: .leading, spacing: 2) { Text(titleText) .font(.system(size: 13, weight: .medium)) @@ -7530,12 +7530,23 @@ private struct AuthSettingsRow: View { Spacer(minLength: 12) if authManager.isLoading || authManager.isRestoringSession { ProgressView().controlSize(.small) + .padding(.top, 2) } - Button(action: buttonAction) { - Text(buttonTitle) + VStack(alignment: .trailing, spacing: 4) { + Button(action: buttonAction) { + Text(buttonTitle) + } + .controlSize(.small) + .disabled(authManager.isLoading || authManager.isRestoringSession) + if let signInErrorText { + Text(signInErrorText) + .font(.system(size: 11)) + .foregroundStyle(.red) + .multilineTextAlignment(.trailing) + .fixedSize(horizontal: false, vertical: true) + .frame(maxWidth: 220, alignment: .trailing) + } } - .controlSize(.small) - .disabled(authManager.isLoading || authManager.isRestoringSession) } .padding(.horizontal, 14) .padding(.vertical, 10) @@ -7567,6 +7578,11 @@ private struct AuthSettingsRow: View { ) } + private var signInErrorText: String? { + guard !authManager.isAuthenticated else { return nil } + return authManager.lastSignInError?.localizedMessage + } + private var buttonTitle: String { if authManager.isAuthenticated { return String( @@ -7581,6 +7597,7 @@ private struct AuthSettingsRow: View { } private func buttonAction() { + guard !authManager.isLoading && !authManager.isRestoringSession else { return } if authManager.isAuthenticated { Task { @MainActor in await authManager.signOut() From d52dab01c0e9e894b4ac215608ba68d58cdd4094 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 00:43:28 -0700 Subject: [PATCH 03/34] Keep auth UI changes within Swift file budgets The workflow guard rejects growth in already-large Swift files, so the new sign-in error model and account settings row live in focused sub-500-line files instead of increasing AuthManager.swift and cmuxApp.swift. Constraint: CI enforces .github/swift-file-length-budget.tsv. Rejected: Refresh the Swift length budget | this change can stay within the existing budget by splitting focused code. Confidence: high Scope-risk: narrow Tested: python3 scripts/swift_file_length_budget.py --budget .github/swift-file-length-budget.tsv Tested: git diff --check Tested: python3 -m json.tool Resources/Localizable.xcstrings Not-tested: Local unit/UI tests by instruction. --- GhosttyTabs.xcodeproj/project.pbxproj | 8 +++ Sources/Auth/AuthManager.swift | 58 ---------------- Sources/Auth/AuthManagerErrors.swift | 61 ++++++++++++++++ Sources/Settings/AuthSettingsRow.swift | 96 ++++++++++++++++++++++++++ Sources/cmuxApp.swift | 95 ------------------------- 5 files changed, 165 insertions(+), 153 deletions(-) create mode 100644 Sources/Auth/AuthManagerErrors.swift create mode 100644 Sources/Settings/AuthSettingsRow.swift diff --git a/GhosttyTabs.xcodeproj/project.pbxproj b/GhosttyTabs.xcodeproj/project.pbxproj index 1b8e90bafd97..69c1376d6296 100644 --- a/GhosttyTabs.xcodeproj/project.pbxproj +++ b/GhosttyTabs.xcodeproj/project.pbxproj @@ -26,7 +26,9 @@ C2B6A97D1F2E4C71A8B9D001 /* BrowserOmnibarPerformanceSupportTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C2B6A97D1F2E4C71A8B9D002 /* BrowserOmnibarPerformanceSupportTests.swift */; }; 3023A1003023A1003023A100 /* ConfigSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3023B1003023B1003023B100 /* ConfigSource.swift */; }; 3023A1013023A1013023A101 /* ConfigSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3023B1013023B1013023B101 /* ConfigSettingsView.swift */; }; + A36170000000000000000005 /* AuthSettingsRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = A36170000000000000000006 /* AuthSettingsRow.swift */; }; 350DAC5EBD38642A3E81471A /* AuthManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 312DE7503B4658DD173121B8 /* AuthManager.swift */; }; + A36170000000000000000003 /* AuthManagerErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = A36170000000000000000004 /* AuthManagerErrors.swift */; }; 36CE99ED050785B5E96B72BB /* AuthCallbackRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 61A19A4145F034965110CF87 /* AuthCallbackRouter.swift */; }; 4378399A7C0245EF8186F306 /* OmnibarAndToolsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B09C007F42697761B5F1A2AB /* OmnibarAndToolsTests.swift */; }; 46F6AC15863EC84DCD3770A2 /* TerminalAndGhosttyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02FC74F2C27127CC565B3E8C /* TerminalAndGhosttyTests.swift */; }; @@ -462,7 +464,9 @@ 2F0C05000000000000000001 /* MainWindowFocusController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainWindowFocusController.swift; sourceTree = ""; }; 3023B1003023B1003023B100 /* ConfigSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings/ConfigSource.swift; sourceTree = ""; }; 3023B1013023B1013023B101 /* ConfigSettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings/ConfigSettingsView.swift; sourceTree = ""; }; + A36170000000000000000006 /* AuthSettingsRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Settings/AuthSettingsRow.swift; sourceTree = ""; }; 312DE7503B4658DD173121B8 /* AuthManager.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AuthManager.swift; sourceTree = ""; }; + A36170000000000000000004 /* AuthManagerErrors.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AuthManagerErrors.swift; sourceTree = ""; }; FEED0000000000000000F001 /* FeedCoordinator.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FeedCoordinator.swift; sourceTree = ""; }; FEED0000000000000000F004 /* FeedPanelView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FeedPanelView.swift; sourceTree = ""; }; FEED0000000000000000F012 /* FeedPermissionActionPolicy.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = FeedPermissionActionPolicy.swift; sourceTree = ""; }; @@ -885,6 +889,7 @@ 61A19A4145F034965110CF87 /* AuthCallbackRouter.swift */, 43430FA5929121E2EAAB3091 /* AuthEnvironment.swift */, 312DE7503B4658DD173121B8 /* AuthManager.swift */, + A36170000000000000000004 /* AuthManagerErrors.swift */, 5B1EA8948C5F126FE63CFB4E /* AuthSettingsStore.swift */, ); name = Auth; @@ -970,6 +975,7 @@ children = ( 3023B1003023B1003023B100 /* ConfigSource.swift */, 3023B1013023B1013023B101 /* ConfigSettingsView.swift */, + A36170000000000000000006 /* AuthSettingsRow.swift */, A11EAB000000000000000001 /* AppearanceSettings.swift */, A11EAC000000000000000001 /* GhosttyTerminalAppearance.swift */, A11EAD000000000000000001 /* WorkspaceAppearanceResolution.swift */, @@ -1744,9 +1750,11 @@ FEED0000000000000000F00B /* FeedPreviewWindowController.swift in Sources */, FEED0000000000000000F00D /* FeedButtonStyleDebugWindowController.swift in Sources */, FEED0000000000000000F00F /* FeedTextEditorDebugWindowController.swift in Sources */, + A36170000000000000000005 /* AuthSettingsRow.swift in Sources */, 36CE99ED050785B5E96B72BB /* AuthCallbackRouter.swift in Sources */, D9FEC58D5BACCF76459F1BBE /* AuthEnvironment.swift in Sources */, 350DAC5EBD38642A3E81471A /* AuthManager.swift in Sources */, + A36170000000000000000003 /* AuthManagerErrors.swift in Sources */, 698944F99A6ADFBA24A7BFB9 /* AuthSettingsStore.swift in Sources */, ACE4FE1A8F1CC6C0B6A673AB /* VMClient.swift in Sources */, ACE4FE2A8F1CC6C0B6A673AB /* VMClientSocketCommands.swift in Sources */, diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 4876779cd5b1..3ca19cd40b70 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -31,57 +31,6 @@ private final class AuthPresentationContext: NSObject, ASWebAuthenticationPresen } } -enum AuthManagerError: LocalizedError, Equatable { - case invalidCallback - case missingAccessToken - case missingRefreshToken - - var errorDescription: String? { - switch self { - case .invalidCallback: - return String( - localized: "settings.account.error.invalidCallback", - defaultValue: "The sign-in callback was invalid." - ) - case .missingAccessToken: - return String( - localized: "settings.account.error.missingAccessToken", - defaultValue: "Account access token is unavailable." - ) - case .missingRefreshToken: - return String( - localized: "settings.account.error.missingRefreshToken", - defaultValue: "Account refresh token is unavailable." - ) - } - } -} - -enum AuthSignInError: Equatable { - case authManager(AuthManagerError) - case message(String) - - var localizedMessage: String { - switch self { - case .authManager(let error): - return error.errorDescription ?? Self.genericLocalizedMessage - case .message(let message): - let trimmed = message.trimmingCharacters(in: .whitespacesAndNewlines) - guard !trimmed.isEmpty else { - return Self.genericLocalizedMessage - } - return "\(Self.genericLocalizedMessage) \(trimmed)" - } - } - - private static var genericLocalizedMessage: String { - String( - localized: "settings.account.error.signInFailed", - defaultValue: "Sign in failed. Try again." - ) - } -} - protocol StackAuthTokenStoreProtocol: TokenStoreProtocol, Sendable { func seed(accessToken: String, refreshToken: String) async func clear() async @@ -712,13 +661,6 @@ final class AuthManager: ObservableObject { Self.authLog(message) } - private static func signInError(from error: Error) -> AuthSignInError { - if let authError = error as? AuthManagerError { - return .authManager(authError) - } - return .message((error as NSError).localizedDescription) - } - private func refreshSession() async throws { let user: CMUXAuthUser? do { diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift new file mode 100644 index 000000000000..5c357a6ce490 --- /dev/null +++ b/Sources/Auth/AuthManagerErrors.swift @@ -0,0 +1,61 @@ +import Foundation + +enum AuthManagerError: LocalizedError, Equatable { + case invalidCallback + case missingAccessToken + case missingRefreshToken + + var errorDescription: String? { + switch self { + case .invalidCallback: + return String( + localized: "settings.account.error.invalidCallback", + defaultValue: "The sign-in callback was invalid." + ) + case .missingAccessToken: + return String( + localized: "settings.account.error.missingAccessToken", + defaultValue: "Account access token is unavailable." + ) + case .missingRefreshToken: + return String( + localized: "settings.account.error.missingRefreshToken", + defaultValue: "Account refresh token is unavailable." + ) + } + } +} + +enum AuthSignInError: Equatable { + case authManager(AuthManagerError) + case message(String) + + var localizedMessage: String { + switch self { + case .authManager(let error): + return error.errorDescription ?? Self.genericLocalizedMessage + case .message(let message): + let trimmed = message.trimmingCharacters(in: .whitespacesAndNewlines) + guard !trimmed.isEmpty else { + return Self.genericLocalizedMessage + } + return "\(Self.genericLocalizedMessage) \(trimmed)" + } + } + + private static var genericLocalizedMessage: String { + String( + localized: "settings.account.error.signInFailed", + defaultValue: "Sign in failed. Try again." + ) + } +} + +extension AuthManager { + static func signInError(from error: Error) -> AuthSignInError { + if let authError = error as? AuthManagerError { + return .authManager(authError) + } + return .message((error as NSError).localizedDescription) + } +} diff --git a/Sources/Settings/AuthSettingsRow.swift b/Sources/Settings/AuthSettingsRow.swift new file mode 100644 index 000000000000..3b27ab2caba1 --- /dev/null +++ b/Sources/Settings/AuthSettingsRow.swift @@ -0,0 +1,96 @@ +import SwiftUI + +struct AuthSettingsRow: View { + @ObservedObject var authManager: AuthManager + + var body: some View { + HStack(alignment: .top, spacing: 12) { + VStack(alignment: .leading, spacing: 2) { + Text(titleText) + .font(.system(size: 13, weight: .medium)) + if let subtitle = subtitleText { + Text(subtitle) + .font(.system(size: 11)) + .foregroundColor(.secondary) + } + } + Spacer(minLength: 12) + if authManager.isLoading || authManager.isRestoringSession { + ProgressView().controlSize(.small) + .padding(.top, 2) + } + VStack(alignment: .trailing, spacing: 4) { + Button(action: buttonAction) { + Text(buttonTitle) + } + .controlSize(.small) + .disabled(authManager.isLoading || authManager.isRestoringSession) + if let signInErrorText { + Text(signInErrorText) + .font(.system(size: 11)) + .foregroundStyle(.red) + .multilineTextAlignment(.trailing) + .fixedSize(horizontal: false, vertical: true) + .frame(maxWidth: 220, alignment: .trailing) + } + } + } + .padding(.horizontal, 14) + .padding(.vertical, 10) + } + + private var titleText: String { + if authManager.isAuthenticated { + if let email = authManager.currentUser?.primaryEmail, !email.isEmpty { + return email + } + return String( + localized: "settings.account.signedIn.title", + defaultValue: "Signed in" + ) + } + return String( + localized: "settings.account.signedOut.title", + defaultValue: "Not signed in" + ) + } + + private var subtitleText: String? { + if authManager.isAuthenticated { + return authManager.currentUser?.displayName + } + return String( + localized: "settings.account.signedOut.subtitle", + defaultValue: "Sign in with your cmux account to enable sync across devices." + ) + } + + private var signInErrorText: String? { + guard !authManager.isAuthenticated else { return nil } + return authManager.lastSignInError?.localizedMessage + } + + private var buttonTitle: String { + if authManager.isAuthenticated { + return String( + localized: "settings.account.signOut", + defaultValue: "Sign Out" + ) + } + return String( + localized: "settings.account.signIn", + defaultValue: "Sign In…" + ) + } + + private func buttonAction() { + guard !authManager.isLoading && !authManager.isRestoringSession else { return } + if authManager.isAuthenticated { + Task { @MainActor in + await authManager.signOut() + } + } else { + authManager.beginSignIn() + } + } +} diff --git a/Sources/cmuxApp.swift b/Sources/cmuxApp.swift index b45295ddc318..780e8a5bcc85 100644 --- a/Sources/cmuxApp.swift +++ b/Sources/cmuxApp.swift @@ -7513,101 +7513,6 @@ struct SettingsSectionHeader: View { } } -private struct AuthSettingsRow: View { - @ObservedObject var authManager: AuthManager - - var body: some View { - HStack(alignment: .top, spacing: 12) { - VStack(alignment: .leading, spacing: 2) { - Text(titleText) - .font(.system(size: 13, weight: .medium)) - if let subtitle = subtitleText { - Text(subtitle) - .font(.system(size: 11)) - .foregroundColor(.secondary) - } - } - Spacer(minLength: 12) - if authManager.isLoading || authManager.isRestoringSession { - ProgressView().controlSize(.small) - .padding(.top, 2) - } - VStack(alignment: .trailing, spacing: 4) { - Button(action: buttonAction) { - Text(buttonTitle) - } - .controlSize(.small) - .disabled(authManager.isLoading || authManager.isRestoringSession) - if let signInErrorText { - Text(signInErrorText) - .font(.system(size: 11)) - .foregroundStyle(.red) - .multilineTextAlignment(.trailing) - .fixedSize(horizontal: false, vertical: true) - .frame(maxWidth: 220, alignment: .trailing) - } - } - } - .padding(.horizontal, 14) - .padding(.vertical, 10) - } - - private var titleText: String { - if authManager.isAuthenticated { - if let email = authManager.currentUser?.primaryEmail, !email.isEmpty { - return email - } - return String( - localized: "settings.account.signedIn.title", - defaultValue: "Signed in" - ) - } - return String( - localized: "settings.account.signedOut.title", - defaultValue: "Not signed in" - ) - } - - private var subtitleText: String? { - if authManager.isAuthenticated { - return authManager.currentUser?.displayName - } - return String( - localized: "settings.account.signedOut.subtitle", - defaultValue: "Sign in with your cmux account to enable sync across devices." - ) - } - - private var signInErrorText: String? { - guard !authManager.isAuthenticated else { return nil } - return authManager.lastSignInError?.localizedMessage - } - - private var buttonTitle: String { - if authManager.isAuthenticated { - return String( - localized: "settings.account.signOut", - defaultValue: "Sign Out" - ) - } - return String( - localized: "settings.account.signIn", - defaultValue: "Sign In…" - ) - } - - private func buttonAction() { - guard !authManager.isLoading && !authManager.isRestoringSession else { return } - if authManager.isAuthenticated { - Task { @MainActor in - await authManager.signOut() - } - } else { - authManager.beginSignIn() - } - } -} - struct SettingsCard: View { @ViewBuilder let content: Content From 8f37f3d579d928e35c4614dd7044ec525bed9d1a Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 01:12:06 -0700 Subject: [PATCH 04/34] Treat web auth cancellation as dismissal ASWebAuthenticationSession reports user-dismissed sheets as canceledLogin. That path should end loading without presenting a failure banner, while real web-auth errors still surface a visible Settings error. Constraint: AuthManager.swift must stay within the Swift file length budget. Rejected: Surface canceledLogin as a generic failure | normal user dismissal is not an actionable sign-in failure. Confidence: medium Scope-risk: narrow Tested: python3 scripts/swift_file_length_budget.py --budget .github/swift-file-length-budget.tsv Tested: git diff --check Not-tested: Local unit/UI tests by instruction. --- Sources/Auth/AuthManager.swift | 12 ++++++++---- Sources/Auth/AuthManagerErrors.swift | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 3ca19cd40b70..80f6fa239772 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -2,6 +2,7 @@ import AppKit import AuthenticationServices import CMUXAuthCore import Foundation +import OSLog import StackAuth #if canImport(Security) import Security @@ -181,8 +182,12 @@ final class AuthManager: ObservableObject { } if let error { let nsError = error as NSError + if Self.shouldSuppressWebAuthError(nsError) { + Self.authLogger.debug("auth.webauth cancelled by user") + return + } self.lastSignInError = .message(nsError.localizedDescription) - NSLog("auth.webauth failed: %@ (%ld) %@", nsError.domain, nsError.code, nsError.localizedDescription) + Self.authLogger.error("auth.webauth failed: domain=\(nsError.domain, privacy: .public) code=\(nsError.code, privacy: .public) description=\(nsError.localizedDescription, privacy: .private)") return } guard let callbackURL else { @@ -192,8 +197,7 @@ final class AuthManager: ObservableObject { do { try await self.handleCallbackURL(callbackURL) } catch { - self.lastSignInError = Self.signInError(from: error) - NSLog("auth.webauth callback failed: %@", "\(error)") + Self.authLogger.error("auth.webauth callback failed: \(String(describing: error), privacy: .private)") } } } @@ -202,7 +206,7 @@ final class AuthManager: ObservableObject { webAuthSession = session if !session.start() { - NSLog("auth.webauth: session.start() returned false") + Self.authLogger.error("auth.webauth session.start returned false") webAuthSession = nil lastSignInError = .message("") isLoading = false diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift index 5c357a6ce490..fb5836fe8717 100644 --- a/Sources/Auth/AuthManagerErrors.swift +++ b/Sources/Auth/AuthManagerErrors.swift @@ -1,4 +1,6 @@ +import AuthenticationServices import Foundation +import OSLog enum AuthManagerError: LocalizedError, Equatable { case invalidCallback @@ -52,10 +54,22 @@ enum AuthSignInError: Equatable { } extension AuthManager { + static var authLogger: Logger { + Logger( + subsystem: Bundle.main.bundleIdentifier ?? AuthKeychainServiceName.stableFallback, + category: "auth" + ) + } + static func signInError(from error: Error) -> AuthSignInError { if let authError = error as? AuthManagerError { return .authManager(authError) } return .message((error as NSError).localizedDescription) } + + static func shouldSuppressWebAuthError(_ error: NSError) -> Bool { + error.domain == ASWebAuthenticationSessionError.errorDomain + && error.code == ASWebAuthenticationSessionError.canceledLogin.rawValue + } } From 13f41d5bb4be716fab309c8be39b149e52eeab2b Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 01:17:16 -0700 Subject: [PATCH 05/34] Keep raw auth errors out of Settings copy Generic sign-in failures should be visible without exposing platform NSError descriptions to users. The original message payload still travels in AuthSignInError for diagnostics and mapping, while the user-facing string stays localized and stable. Constraint: Settings copy must use localized strings and avoid leaking OAuth/session implementation details. Rejected: Append NSError.localizedDescription to the generic string | produces developer-facing hybrid text in the Account settings UI. Confidence: high Scope-risk: narrow Tested: git diff --check; python3 scripts/swift_file_length_budget.py --budget .github/swift-file-length-budget.tsv Not-tested: Local tests/build omitted per instruction to avoid local test runs and direct xcodebuild. --- Sources/Auth/AuthManagerErrors.swift | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift index fb5836fe8717..6047d09096d5 100644 --- a/Sources/Auth/AuthManagerErrors.swift +++ b/Sources/Auth/AuthManagerErrors.swift @@ -36,12 +36,8 @@ enum AuthSignInError: Equatable { switch self { case .authManager(let error): return error.errorDescription ?? Self.genericLocalizedMessage - case .message(let message): - let trimmed = message.trimmingCharacters(in: .whitespacesAndNewlines) - guard !trimmed.isEmpty else { - return Self.genericLocalizedMessage - } - return "\(Self.genericLocalizedMessage) \(trimmed)" + case .message: + return Self.genericLocalizedMessage } } @@ -54,12 +50,10 @@ enum AuthSignInError: Equatable { } extension AuthManager { - static var authLogger: Logger { - Logger( - subsystem: Bundle.main.bundleIdentifier ?? AuthKeychainServiceName.stableFallback, - category: "auth" - ) - } + nonisolated static let authLogger = Logger( + subsystem: Bundle.main.bundleIdentifier ?? AuthKeychainServiceName.stableFallback, + category: "auth" + ) static func signInError(from error: Error) -> AuthSignInError { if let authError = error as? AuthManagerError { From 3f650e6b71e61cc36efb69b125c100370dec1cb8 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 01:50:24 -0700 Subject: [PATCH 06/34] Retry macOS CI after Zig download instability The native sign-in fix is unchanged; hosted macOS CI failed while installing Zig from ziglang.org, and CircleCI cannot be rerun from this workspace without a CircleCI token. Constraint: User requires CI green before the final tagged reload and local launch. Rejected: Change app code without CI logs | no branch-specific failure evidence was available. Rejected: Modify CI installer immediately | a no-op retry preserves PR scope before adding workflow hardening. Confidence: medium Scope-risk: narrow Tested: No code changes; GitHub/Vercel/review checks were passing before retry. Not-tested: CircleCI step logs unavailable via public API; local tests/builds omitted per instruction. From ab73452264f188a186f496da4ef3faeb390d4bb2 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 10:08:51 -0700 Subject: [PATCH 07/34] Preserve sign-in progress while callbacks settle Review feedback showed that callback handling could clear the loading state while an ASWebAuthenticationSession was still active. The callback path now only owns loading state for out-of-band callbacks, while the browser-session completion remains responsible for in-flight sessions. The session.start failure path also records a useful diagnostic payload, and the changelog heading spacing matches the markdown rule.\n\nConstraint: Do not run local tests or direct xcodebuild for this branch.\nConfidence: high\nScope-risk: narrow\nDirective: Keep web-auth-session state ownership in one place; callback helpers should not make the Sign In button appear idle while a session is still in flight.\nTested: git diff --check; python3 -m json.tool Resources/Localizable.xcstrings; python3 scripts/swift_file_length_budget.py --budget .github/swift-file-length-budget.tsv\nNot-tested: Local unit tests and app build per user instruction; CI will verify after push. --- CHANGELOG.md | 1 + Sources/Auth/AuthManager.swift | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40211943168b..ea526a2208b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ All notable changes to cmux are documented here. ## [Unreleased] ### Fixed + - Surface Settings > Sign In failures in Account settings instead of only logging ASWebAuthenticationSession and callback errors ([#3617](https://github.com/manaflow-ai/cmux/issues/3617)) ## [0.64.3] - 2026-05-05 diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 80f6fa239772..1a1404f1c2e9 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -208,7 +208,7 @@ final class AuthManager: ObservableObject { if !session.start() { Self.authLogger.error("auth.webauth session.start returned false") webAuthSession = nil - lastSignInError = .message("") + lastSignInError = .message("auth.webauth session.start returned false") isLoading = false } } @@ -385,9 +385,9 @@ final class AuthManager: ObservableObject { lastSignInError = .authManager(error) throw error } - - isLoading = true - defer { isLoading = false } + let shouldManageLoading = webAuthSession == nil + if shouldManageLoading { isLoading = true } + defer { if shouldManageLoading { isLoading = false } } do { await tokenStore.seed( From 9aeb58f355ac765084564a3f4ef21f8b640a647a Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 10:28:03 -0700 Subject: [PATCH 08/34] Restart stalled external PR status contexts The required GitHub checks and review feedback were clean on ab734522, but Vercel and CircleCI left optional commit statuses pending without starting jobs or exposing failure logs. This empty commit refreshes those external contexts so the PR can reach an observable terminal state without changing product code.\n\nConstraint: No direct xcodebuild or local tests per user instruction.\nRejected: Patch CI config without logs | no evidence of a repository-side failure.\nConfidence: medium\nScope-risk: narrow\nDirective: Do not treat this as product behavior; it is an external CI/status retry only.\nTested: Required PR checks were green before this retry; no file changes in this commit.\nNot-tested: Local tests/build intentionally not run. From 4b4d085190b6bfd70f20b84334051d422ba36e1c Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 10:40:23 -0700 Subject: [PATCH 09/34] Short-circuit failed browser sign-in awaits ASWebAuthenticationSession.start() can fail synchronously, leaving beginSignInAndAwait() to subscribe after isLoading has already returned to false. The awaited path now returns immediately in that settled state instead of waiting for a publisher transition that already happened.\n\nConstraint: No direct xcodebuild or local tests per user instruction.\nConfidence: high\nScope-risk: narrow\nDirective: Awaited auth helpers must handle synchronous settle paths as well as publisher-delivered transitions.\nTested: git diff --check; python3 scripts/swift_file_length_budget.py --budget .github/swift-file-length-budget.tsv\nNot-tested: Local unit tests/build intentionally not run. --- Sources/Auth/AuthManager.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 1a1404f1c2e9..efa12bb297f7 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -221,6 +221,7 @@ final class AuthManager: ObservableObject { func beginSignInAndAwait(timeout: TimeInterval) async -> Bool { if isAuthenticated { return true } beginSignIn() + if !isLoading { return isAuthenticated } return await waitForSignInSettled(timeout: timeout) } From 20fad03545372d66b27ce58addff95eaa151ae0c Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 11:01:46 -0700 Subject: [PATCH 10/34] Make macOS CI tolerate transient Zig downloads CircleCI macOS jobs were failing before any Swift compilation because the shared Zig tarball download returned upstream 500/connection-reset errors. The install step now retries the same verified tarball and minisig downloads before handing them to minisign, preserving the existing verification boundary while avoiding empty retry commits for a transient network failure. Constraint: Do not run local tests or direct xcodebuild per user instruction. Rejected: Push another empty retry commit | repeats the same failure path without improving the setup invariant Confidence: high Scope-risk: narrow Directive: Keep Zig installation verified by minisign; retries must not bypass signature verification. Tested: git diff --check; Ruby YAML parse for .circleci/config.yml Not-tested: CircleCI macOS jobs pending remote run --- .circleci/config.yml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32adf4d85111..0f1e0b54f817 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -77,9 +77,28 @@ commands: ZIG_URL="https://ziglang.org/download/${ZIG_REQUIRED}/zig-${ZIG_ARCH}-macos-${ZIG_REQUIRED}.tar.xz" ZIG_MINISIGN_PUBLIC_KEY="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U" + download_with_retry() { + local url="$1" + local output="$2" + + for attempt in 1 2 3 4 5; do + if curl -fSL "$url" -o "$output"; then + return 0 + fi + + if [ "$attempt" -eq 5 ]; then + echo "Failed to download $url after $attempt attempts" >&2 + return 1 + fi + + echo "Download failed on attempt $attempt, retrying..." + sleep $((attempt * 5)) + done + } + echo "Installing verified zig ${ZIG_REQUIRED} from tarball" - curl -fSL "$ZIG_URL" -o /tmp/zig.tar.xz - curl -fSL "${ZIG_URL}.minisig" -o /tmp/zig.tar.xz.minisig + download_with_retry "$ZIG_URL" /tmp/zig.tar.xz + download_with_retry "${ZIG_URL}.minisig" /tmp/zig.tar.xz.minisig minisign -Vm /tmp/zig.tar.xz -x /tmp/zig.tar.xz.minisig -P "$ZIG_MINISIGN_PUBLIC_KEY" tar xf /tmp/zig.tar.xz -C /tmp sudo mkdir -p /usr/local/bin /usr/local/lib From ce5f2ce1081f460006800cc5cfd1040692114d70 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Wed, 6 May 2026 11:09:56 -0700 Subject: [PATCH 11/34] Restart stalled CircleCI workflow after merge CircleCI created a workflow for the merge commit but left all macOS jobs in not_running with no queued_at or started_at timestamp, and unauthenticated rerun is rejected. Moving the branch is the available non-destructive restart path for the external status. Constraint: Push only to origin; do not run local tests or direct xcodebuild per user instruction. Rejected: Wait on the existing CircleCI workflow indefinitely | no runner or queue state was advancing Confidence: medium Scope-risk: narrow Directive: Treat this as CI orchestration retry only; do not infer app behavior from the stalled workflow. Tested: git status clean; origin remote verified as manaflow-ai/cmux Not-tested: Fresh CircleCI workflow pending From f4bfd1223ca66246fd1b2ef116a2ab351020a34c Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 11 May 2026 21:33:54 -0700 Subject: [PATCH 12/34] Hide auth logger helper --- Sources/Auth/AuthManager.swift | 7 +++++++ Sources/Auth/AuthManagerErrors.swift | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index fea1c2a7a66c..4d214b2f1a0e 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -8,6 +8,13 @@ import StackAuth import Security #endif +private extension AuthManager { + nonisolated static let authLogger = Logger( + subsystem: Bundle.main.bundleIdentifier ?? AuthKeychainServiceName.stableFallback, + category: "auth" + ) +} + private final class AuthPresentationContext: NSObject, ASWebAuthenticationPresentationContextProviding { static let shared = AuthPresentationContext() diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift index 62f2e6f2a2b6..fe706b79ecdf 100644 --- a/Sources/Auth/AuthManagerErrors.swift +++ b/Sources/Auth/AuthManagerErrors.swift @@ -1,6 +1,5 @@ import AuthenticationServices import Foundation -import OSLog enum AuthManagerError: LocalizedError, Equatable { case invalidCallback @@ -50,11 +49,6 @@ enum AuthSignInError: Equatable { } extension AuthManager { - nonisolated static let authLogger = Logger( - subsystem: Bundle.main.bundleIdentifier ?? AuthKeychainServiceName.stableFallback, - category: "auth" - ) - nonisolated static func signInError(from error: Error) -> AuthSignInError { if let authError = error as? AuthManagerError { return .authManager(authError) From 7e597fc662d46c04be997d8f174950ef116f3166 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 11 May 2026 21:53:32 -0700 Subject: [PATCH 13/34] Restart stalled external status contexts CircleCI created workflow 4104854c-f259-484b-979b-2022d2a5514a for f4bfd1223 but left all macOS jobs in not_running with no started_at after an extended wait. Vercel preview contexts also remained pending. This empty commit refreshes optional external contexts without changing product code. Constraint: push only to origin; do not run local tests or direct xcodebuild per user instruction. Tested: git status clean; origin remote verified as https://github.com/manaflow-ai/cmux.git. Not-tested: local tests/build intentionally not run. From 414cfc08d1fb442555178e94135d9154ebff4d06 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 11 May 2026 22:06:04 -0700 Subject: [PATCH 14/34] Avoid duplicate sign-in error assignment --- Sources/Auth/AuthManager.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 4d214b2f1a0e..707d04de5384 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -246,7 +246,6 @@ final class AuthManager: ObservableObject { do { try await self.handleCallbackURL(callbackURL) } catch { - self.lastSignInError = Self.signInError(from: error) Self.authLogger.error("auth.webauth callback failed: \(String(describing: error), privacy: .private)") } } From 82aa2e1db758197664e871bc60583e9206b4498a Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 02:26:15 -0700 Subject: [PATCH 15/34] Await sign-in token persistence --- Sources/Auth/AuthManager.swift | 8 ++------ cmuxTests/AuthManagerBrowserSignInTests.swift | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 707d04de5384..f4796529c08e 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -540,14 +540,10 @@ final class AuthManager: ObservableObject { teams: teams) } - func applySignInResult(_ result: SignInResult) { + func applySignInResult(_ result: SignInResult) async { // Cache access token for fast synchronous reads lastKnownAccessToken = result.accessToken - // Store tokens in keychain (fire-and-forget) - let store = tokenStore - Task.detached { - await store.setTokens(accessToken: result.accessToken, refreshToken: result.refreshToken) - } + await tokenStore.setTokens(accessToken: result.accessToken, refreshToken: result.refreshToken) // Update published state synchronously on main actor let user = CMUXAuthUser(id: result.userId, primaryEmail: result.email, displayName: result.displayName) currentUser = user diff --git a/cmuxTests/AuthManagerBrowserSignInTests.swift b/cmuxTests/AuthManagerBrowserSignInTests.swift index d7f19de515f4..6035ebc2e87e 100644 --- a/cmuxTests/AuthManagerBrowserSignInTests.swift +++ b/cmuxTests/AuthManagerBrowserSignInTests.swift @@ -212,7 +212,7 @@ final class AuthManagerBrowserSignInTests: XCTestCase { ) await manager.awaitBootstrapped() - manager.applySignInResult(AuthManager.SignInResult( + await manager.applySignInResult(AuthManager.SignInResult( accessToken: "old-access-token", refreshToken: "old-refresh-token", email: "old@example.com", From 40b30ac0bdf2b4bd458c67c9c2a1b812b647b3b0 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 02:47:00 -0700 Subject: [PATCH 16/34] Restart stalled external status contexts From dc27731ab9774258f8d3faedb9a862431f5503d2 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 03:11:54 -0700 Subject: [PATCH 17/34] Clear stale web auth sessions --- Sources/Auth/AuthManager.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index f4796529c08e..b936a840332a 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -177,7 +177,11 @@ final class AuthManager: ObservableObject { } private func beginSignIn(keepLoadingForExternalBrowser: Bool) { - guard webAuthSession == nil else { return } + if let existingSession = webAuthSession { + guard !isLoading else { return } + existingSession.cancel() + webAuthSession = nil + } lastSignInError = nil if usesSystemWebAuthenticationSession() { @@ -273,6 +277,8 @@ final class AuthManager: ObservableObject { if !isLoading { return isAuthenticated } let signedIn = await waitForSignInSettled(timeout: timeout) if !signedIn && isLoading && !isAuthenticated { + webAuthSession?.cancel() + webAuthSession = nil isLoading = false } return signedIn From 970f399af39c9241d60a5cc46be1f93f11dba600 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 03:43:09 -0700 Subject: [PATCH 18/34] Guard stale web auth completions --- Sources/Auth/AuthManager.swift | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index b936a840332a..2a5b9558d983 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -39,6 +39,11 @@ private final class AuthPresentationContext: NSObject, ASWebAuthenticationPresen } } +@MainActor +private final class AuthWebAuthenticationSessionHandle { + weak var session: ASWebAuthenticationSession? +} + protocol StackAuthTokenStoreProtocol: TokenStoreProtocol, Sendable { func seed(accessToken: String, refreshToken: String) async func clear() async @@ -223,15 +228,26 @@ final class AuthManager: ObservableObject { let signInURL = AuthEnvironment.signInURL() let callbackScheme = AuthEnvironment.callbackScheme + let sessionHandle = AuthWebAuthenticationSessionHandle() let session = ASWebAuthenticationSession( url: signInURL, callbackURLScheme: callbackScheme - ) { [weak self] callbackURL, error in - Task { @MainActor [weak self] in + ) { [weak self, sessionHandle] callbackURL, error in + Task { @MainActor [weak self, sessionHandle] in guard let self else { return } + func isCurrentSession() -> Bool { + guard let session = sessionHandle.session else { return false } + return self.webAuthSession === session + } + guard isCurrentSession() else { + Self.authLogger.debug("auth.webauth stale completion ignored") + return + } defer { - self.isLoading = false - self.webAuthSession = nil + if isCurrentSession() { + self.isLoading = false + self.webAuthSession = nil + } } if let error { let nsError = error as NSError @@ -254,6 +270,7 @@ final class AuthManager: ObservableObject { } } } + sessionHandle.session = session session.presentationContextProvider = AuthPresentationContext.shared session.prefersEphemeralWebBrowserSession = false From 2bfa4763868b34f3772bf3f862a7468e82b64d60 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 09:05:07 -0700 Subject: [PATCH 19/34] Fix web auth session actor isolation --- Sources/Auth/AuthManager.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 2a5b9558d983..54587a6d24d5 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -235,6 +235,7 @@ final class AuthManager: ObservableObject { ) { [weak self, sessionHandle] callbackURL, error in Task { @MainActor [weak self, sessionHandle] in guard let self else { return } + @MainActor func isCurrentSession() -> Bool { guard let session = sessionHandle.session else { return false } return self.webAuthSession === session From 9b9b0b6872bd5822bd328a3b81f77f598f353704 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 13:19:05 -0700 Subject: [PATCH 20/34] Mark auth sign-in state sendable --- Sources/Auth/AuthManager.swift | 2 +- Sources/Auth/AuthManagerErrors.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 54587a6d24d5..fb8574f2c59f 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -514,7 +514,7 @@ final class AuthManager: ObservableObject { } } - struct SignInResult { + struct SignInResult: Sendable { let accessToken: String let refreshToken: String let email: String? diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift index fe706b79ecdf..e812de6201bf 100644 --- a/Sources/Auth/AuthManagerErrors.swift +++ b/Sources/Auth/AuthManagerErrors.swift @@ -1,7 +1,7 @@ import AuthenticationServices import Foundation -enum AuthManagerError: LocalizedError, Equatable { +enum AuthManagerError: LocalizedError, Equatable, Sendable { case invalidCallback case missingAccessToken case missingRefreshToken @@ -27,7 +27,7 @@ enum AuthManagerError: LocalizedError, Equatable { } } -enum AuthSignInError: Equatable { +enum AuthSignInError: Equatable, Sendable { case authManager(AuthManagerError) case message(String) From d1e1c09cc341a3c90be3802ea274920c5bf3e969 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Tue, 12 May 2026 17:11:41 -0700 Subject: [PATCH 21/34] Fix credential sign-in error state --- Sources/Auth/AuthManager.swift | 109 +++++++++++++++++---------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index fb8574f2c59f..b67f6238ae9e 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -587,62 +587,67 @@ final class AuthManager: ObservableObject { // Sign in directly via the Stack Auth API and store tokens ourselves, // bypassing the StackClientApp which has token refresh issues. - let json = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/auth/password/sign-in", - body: try JSONSerialization.data(withJSONObject: ["email": email, "password": password]), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey - ) - guard let accessToken = json["access_token"] as? String, - let refreshToken = json["refresh_token"] as? String else { - throw AuthManagerError.invalidCallback - } - await tokenStore.setTokens(accessToken: accessToken, refreshToken: refreshToken) - - // Fetch user info directly with the access token - let userJSON = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/users/me", - body: Data(), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey, - extraHeaders: ["x-stack-access-token": accessToken], - method: "GET" - ) - let user = CMUXAuthUser( - id: userJSON["id"] as? String ?? "", - primaryEmail: userJSON["primary_email"] as? String, - displayName: userJSON["display_name"] as? String - ) + do { + let json = try await Self.stackAPIRequest( + url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/auth/password/sign-in", + body: try JSONSerialization.data(withJSONObject: ["email": email, "password": password]), + projectID: AuthEnvironment.stackProjectID, + clientKey: AuthEnvironment.stackPublishableClientKey + ) + guard let accessToken = json["access_token"] as? String, + let refreshToken = json["refresh_token"] as? String else { + throw AuthManagerError.invalidCallback + } + await tokenStore.setTokens(accessToken: accessToken, refreshToken: refreshToken) + + // Fetch user info directly with the access token + let userJSON = try await Self.stackAPIRequest( + url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/users/me", + body: Data(), + projectID: AuthEnvironment.stackProjectID, + clientKey: AuthEnvironment.stackPublishableClientKey, + extraHeaders: ["x-stack-access-token": accessToken], + method: "GET" + ) + let user = CMUXAuthUser( + id: userJSON["id"] as? String ?? "", + primaryEmail: userJSON["primary_email"] as? String, + displayName: userJSON["display_name"] as? String + ) - // Fetch teams - let teamsJSON = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/teams?user_id=me", - body: Data(), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey, - extraHeaders: ["x-stack-access-token": accessToken], - method: "GET" - ) - var teams: [AuthTeamSummary] = [] - if let items = teamsJSON["items"] as? [[String: Any]] { - for item in items { - if let id = item["id"] as? String { - teams.append(AuthTeamSummary( - id: id, - displayName: item["display_name"] as? String ?? "" - )) + // Fetch teams + let teamsJSON = try await Self.stackAPIRequest( + url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/teams?user_id=me", + body: Data(), + projectID: AuthEnvironment.stackProjectID, + clientKey: AuthEnvironment.stackPublishableClientKey, + extraHeaders: ["x-stack-access-token": accessToken], + method: "GET" + ) + var teams: [AuthTeamSummary] = [] + if let items = teamsJSON["items"] as? [[String: Any]] { + for item in items { + if let id = item["id"] as? String { + teams.append(AuthTeamSummary( + id: id, + displayName: item["display_name"] as? String ?? "" + )) + } } } - } - currentUser = user - settingsStore.saveCachedUser(user) - availableTeams = teams - isAuthenticated = true - selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: teams) - lastSignInError = nil - authLog("signInWithCredential: success user=\(user.primaryEmail ?? "nil") teams=\(teams.count) teamID=\(selectedTeamID ?? "nil")") - didCompleteBrowserSignIn = true + currentUser = user + settingsStore.saveCachedUser(user) + availableTeams = teams + isAuthenticated = true + selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: teams) + lastSignInError = nil + authLog("signInWithCredential: success user=\(user.primaryEmail ?? "nil") teams=\(teams.count) teamID=\(selectedTeamID ?? "nil")") + didCompleteBrowserSignIn = true + } catch { + lastSignInError = Self.signInError(from: error) + throw error + } } func signOut() async { From 0d177da29bbe4e153371acb9b2735f7eb3dbc601 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Thu, 14 May 2026 16:53:26 -0700 Subject: [PATCH 22/34] Clear credential sign-in errors at attempt start --- Sources/Auth/AuthManager.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index b9f54831b53e..05392cc23519 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -600,6 +600,7 @@ final class AuthManager: ObservableObject { func signInWithCredential(email: String, password: String) async throws { authLog("signInWithCredential: email=\(email)") + lastSignInError = nil isLoading = true defer { isLoading = false } From 599ce3baadbfe78f43247be93e9b4c80d37dd3fe Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Thu, 14 May 2026 17:11:51 -0700 Subject: [PATCH 23/34] Surface browser sign-in timeout errors --- Sources/Auth/AuthManager.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 05392cc23519..770dc5af634c 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -287,6 +287,7 @@ final class AuthManager: ObservableObject { if !isLoading { return isAuthenticated } let signedIn = await waitForSignInSettled(timeout: timeout) if !signedIn && isLoading && !isAuthenticated { + lastSignInError = .message("auth.webauth sign-in attempt timed out") webAuthSession?.cancel() if let attemptID = activeBrowserSignInAttemptID { finishBrowserSignInAttempt(attemptID) From 32e2f96ba0d0f2fbfb049a11600992ca10aa5daa Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Thu, 14 May 2026 17:21:56 -0700 Subject: [PATCH 24/34] Show generic copy for auth sign-in errors --- Sources/Auth/AuthManagerErrors.swift | 7 +------ cmuxTests/AuthManagerSignInErrorTests.swift | 6 +++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Sources/Auth/AuthManagerErrors.swift b/Sources/Auth/AuthManagerErrors.swift index e812de6201bf..23b399a08763 100644 --- a/Sources/Auth/AuthManagerErrors.swift +++ b/Sources/Auth/AuthManagerErrors.swift @@ -32,12 +32,7 @@ enum AuthSignInError: Equatable, Sendable { case message(String) var localizedMessage: String { - switch self { - case .authManager(let error): - return error.errorDescription ?? Self.genericLocalizedMessage - case .message: - return Self.genericLocalizedMessage - } + Self.genericLocalizedMessage } private static var genericLocalizedMessage: String { diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index d35ddf2581c3..b7ea44e45c80 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -35,10 +35,14 @@ final class AuthManagerSignInErrorTests: XCTestCase { XCTFail("Expected invalid callback to be stored as the visible sign-in error") return } - XCTAssertEqual( + XCTAssertNotEqual( manager.lastSignInError?.localizedMessage, AuthManagerError.invalidCallback.errorDescription ) + XCTAssertEqual( + manager.lastSignInError?.localizedMessage, + AuthSignInError.message("diagnostic detail").localizedMessage + ) } } From 51e928ba9b8c814f284b9661e3dfd81f956d0f24 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Sat, 16 May 2026 19:33:25 -0700 Subject: [PATCH 25/34] Guard async sign-in state publication --- Sources/Auth/AuthManager.swift | 38 ++++++- cmuxTests/AuthManagerSignInErrorTests.swift | 112 ++++++++++++++++++++ 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 770dc5af634c..60ed9ed3050e 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -584,10 +584,17 @@ final class AuthManager: ObservableObject { } func applySignInResult(_ result: SignInResult) async { - // Cache access token for fast synchronous reads - lastKnownAccessToken = result.accessToken + let mutationGeneration = beginAuthMutation(.signIn) await tokenStore.setTokens(accessToken: result.accessToken, refreshToken: result.refreshToken) - // Update published state synchronously on main actor + guard await keepAuthMutationIfCurrent( + mutationGeneration, + accessToken: result.accessToken, + refreshToken: result.refreshToken + ) else { + return + } + + lastKnownAccessToken = result.accessToken let user = CMUXAuthUser(id: result.userId, primaryEmail: result.email, displayName: result.displayName) currentUser = user settingsStore.saveCachedUser(user) @@ -602,8 +609,13 @@ final class AuthManager: ObservableObject { func signInWithCredential(email: String, password: String) async throws { authLog("signInWithCredential: email=\(email)") lastSignInError = nil + let mutationGeneration = beginAuthMutation(.signIn) isLoading = true - defer { isLoading = false } + defer { + if isCurrentAuthMutation(mutationGeneration) { + isLoading = false + } + } // Sign in directly via the Stack Auth API and store tokens ourselves, // bypassing the StackClientApp which has token refresh issues. @@ -619,6 +631,13 @@ final class AuthManager: ObservableObject { throw AuthManagerError.invalidCallback } await tokenStore.setTokens(accessToken: accessToken, refreshToken: refreshToken) + guard await keepAuthMutationIfCurrent( + mutationGeneration, + accessToken: accessToken, + refreshToken: refreshToken + ) else { + return + } lastKnownAccessToken = accessToken // Fetch user info directly with the access token @@ -657,6 +676,13 @@ final class AuthManager: ObservableObject { } } + guard await keepAuthMutationIfCurrent( + mutationGeneration, + accessToken: accessToken, + refreshToken: refreshToken + ) else { + return + } currentUser = user settingsStore.saveCachedUser(user) availableTeams = teams @@ -666,7 +692,9 @@ final class AuthManager: ObservableObject { authLog("signInWithCredential: success user=\(user.primaryEmail ?? "nil") teams=\(teams.count) teamID=\(selectedTeamID ?? "nil")") didCompleteBrowserSignIn = true } catch { - lastSignInError = Self.signInError(from: error) + if isCurrentAuthMutation(mutationGeneration) { + lastSignInError = Self.signInError(from: error) + } throw error } } diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index b7ea44e45c80..921195b1a82e 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -44,6 +44,55 @@ final class AuthManagerSignInErrorTests: XCTestCase { AuthSignInError.message("diagnostic detail").localizedMessage ) } + + func testApplySignInResultDoesNotRestoreAuthAfterConcurrentSignOut() async throws { + let suiteName = "AuthManagerSignInErrorTests.ConcurrentSignOut.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let tokenStore = BlockingSetTokenStore() + let manager = AuthManager( + client: TestAuthClient(), + tokenStore: tokenStore, + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + let result = AuthManager.SignInResult( + accessToken: "access-token", + refreshToken: "refresh-token", + email: "user@example.com", + displayName: "Test User", + userId: "user-id", + selectedTeamId: nil, + teams: [] + ) + let applyTask = Task { + await manager.applySignInResult(result) + } + + await tokenStore.waitForBlockedSet() + await manager.signOut() + await tokenStore.releaseBlockedSet() + await applyTask.value + + XCTAssertFalse(manager.isAuthenticated) + XCTAssertNil(manager.currentUser) + let storedAccessToken = await tokenStore.currentAccessToken() + let storedRefreshToken = await tokenStore.currentRefreshToken() + XCTAssertNil(storedAccessToken) + XCTAssertNil(storedRefreshToken) + } +} + +private struct TestAuthClient: AuthClientProtocol { + func currentUser() async throws -> CMUXAuthUser? { nil } + func listTeams() async throws -> [AuthTeamSummary] { [] } + func currentAccessToken() async throws -> String? { nil } + func signOut() async throws {} } private actor TestTokenStore: StackAuthTokenStoreProtocol { @@ -78,3 +127,66 @@ private actor TestTokenStore: StackAuthTokenStoreProtocol { accessToken = newAccessToken } } + +private actor BlockingSetTokenStore: StackAuthTokenStoreProtocol { + private var accessToken: String? + private var refreshToken: String? + private var shouldBlockNextSet = true + private var setIsBlocked = false + private var setStartedWaiters: [CheckedContinuation] = [] + private var releaseSetContinuation: CheckedContinuation? + + func waitForBlockedSet() async { + if setIsBlocked { return } + await withCheckedContinuation { continuation in + setStartedWaiters.append(continuation) + } + } + + func releaseBlockedSet() { + guard let continuation = releaseSetContinuation else { return } + releaseSetContinuation = nil + continuation.resume() + } + + func getStoredAccessToken() async -> String? { + accessToken + } + + func getStoredRefreshToken() async -> String? { + refreshToken + } + + func setTokens(accessToken: String?, refreshToken: String?) async { + if shouldBlockNextSet { + shouldBlockNextSet = false + setIsBlocked = true + let waiters = setStartedWaiters + setStartedWaiters.removeAll() + for waiter in waiters { + waiter.resume() + } + await withCheckedContinuation { continuation in + releaseSetContinuation = continuation + } + setIsBlocked = false + } + self.accessToken = accessToken + self.refreshToken = refreshToken + } + + func clearTokens() async { + accessToken = nil + refreshToken = nil + } + + func compareAndSet( + compareRefreshToken: String, + newRefreshToken: String?, + newAccessToken: String? + ) async { + guard refreshToken == compareRefreshToken else { return } + refreshToken = newRefreshToken + accessToken = newAccessToken + } +} From 9c0b630ce707ffc53780f6f301d1b570e6d865b1 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Sat, 16 May 2026 19:45:35 -0700 Subject: [PATCH 26/34] Import auth core in auth manager tests --- cmuxTests/AuthManagerSignInErrorTests.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index 921195b1a82e..275c698478d1 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -1,3 +1,4 @@ +import CMUXAuthCore import XCTest #if canImport(cmux_DEV) From c87e5b9bb51345e12cb5cbdd6095ed6103c4c291 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Sat, 16 May 2026 19:47:24 -0700 Subject: [PATCH 27/34] Guard stale callback sign-in errors --- Sources/Auth/AuthManager.swift | 8 +++ cmuxTests/AuthManagerSignInErrorTests.swift | 63 +++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 60ed9ed3050e..fc6bf8559e18 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -487,6 +487,14 @@ final class AuthManager: ObservableObject { ) return } catch { + guard isCurrentAuthMutation(mutationGeneration) else { + _ = await keepAuthMutationIfCurrent( + mutationGeneration, + accessToken: payload.accessToken, + refreshToken: payload.refreshToken + ) + return + } lastSignInError = Self.signInError(from: error) throw error } diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index 275c698478d1..41413b4f1b76 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -87,6 +87,37 @@ final class AuthManagerSignInErrorTests: XCTestCase { XCTAssertNil(storedAccessToken) XCTAssertNil(storedRefreshToken) } + + func testStaleCallbackFailureDoesNotOverwriteSignOutState() async throws { + let suiteName = "AuthManagerSignInErrorTests.StaleCallbackFailure.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let client = BlockingFailureAuthClient() + let manager = AuthManager( + client: client, + tokenStore: TestTokenStore(), + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + let callbackURL = try XCTUnwrap(URL(string: "cmux://auth-callback?stack_refresh=refresh-token&stack_access=access-token")) + let callbackTask = Task { + try await manager.handleCallbackURL(callbackURL) + } + + await client.waitForCurrentUserRequest() + await manager.signOut() + await client.failCurrentUserRequest() + try await callbackTask.value + + XCTAssertFalse(manager.isAuthenticated) + XCTAssertNil(manager.currentUser) + XCTAssertNil(manager.lastSignInError) + } } private struct TestAuthClient: AuthClientProtocol { @@ -96,6 +127,38 @@ private struct TestAuthClient: AuthClientProtocol { func signOut() async throws {} } +private actor BlockingFailureAuthClient: AuthClientProtocol { + private var currentUserContinuation: CheckedContinuation? + private var currentUserWaiter: CheckedContinuation? + + func currentUser() async throws -> CMUXAuthUser? { + try await withCheckedThrowingContinuation { continuation in + currentUserContinuation = continuation + currentUserWaiter?.resume() + currentUserWaiter = nil + } + } + + func waitForCurrentUserRequest() async { + if currentUserContinuation != nil { + return + } + await withCheckedContinuation { continuation in + currentUserWaiter = continuation + } + } + + func failCurrentUserRequest() { + let continuation = currentUserContinuation + currentUserContinuation = nil + continuation?.resume(throwing: AuthManagerError.missingAccessToken) + } + + func listTeams() async throws -> [AuthTeamSummary] { [] } + func currentAccessToken() async throws -> String? { nil } + func signOut() async throws {} +} + private actor TestTokenStore: StackAuthTokenStoreProtocol { private var accessToken: String? private var refreshToken: String? From 4fe4bd14048c2a9570c45f5b10c353fd28960a0b Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Sun, 17 May 2026 23:28:23 -0700 Subject: [PATCH 28/34] Guard superseded credential sign-ins --- Sources/Auth/AuthManager.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index fc6bf8559e18..7df48a3a3b8e 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -644,7 +644,7 @@ final class AuthManager: ObservableObject { accessToken: accessToken, refreshToken: refreshToken ) else { - return + throw CancellationError() } lastKnownAccessToken = accessToken @@ -689,7 +689,7 @@ final class AuthManager: ObservableObject { accessToken: accessToken, refreshToken: refreshToken ) else { - return + throw CancellationError() } currentUser = user settingsStore.saveCachedUser(user) From 3cadbcb9d18c4768a264c7f45caac4a16cad700e Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Sun, 17 May 2026 23:59:08 -0700 Subject: [PATCH 29/34] fix: guard stale sign-in error state --- Sources/Auth/AuthManager.swift | 14 ++++++++--- cmuxTests/AuthManagerSignInErrorTests.swift | 27 +++++++++++++++++++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 7df48a3a3b8e..5a2406c33217 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -202,6 +202,8 @@ final class AuthManager: ObservableObject { case signOut } + private struct AuthMutationSupersededError: Error, Sendable {} + #if DEBUG func markBrowserSignInLoadingForTesting() { _ = startBrowserSignInAttempt() @@ -457,7 +459,9 @@ final class AuthManager: ObservableObject { func handleCallbackURL(_ url: URL) async throws { guard let payload = AuthCallbackRouter.callbackPayload(from: url) else { let error = AuthManagerError.invalidCallback - lastSignInError = .authManager(error) + if hasActiveBrowserSignInAttempt { + lastSignInError = .authManager(error) + } throw error } let mutationGeneration = beginAuthMutation(.signIn) @@ -644,7 +648,7 @@ final class AuthManager: ObservableObject { accessToken: accessToken, refreshToken: refreshToken ) else { - throw CancellationError() + throw AuthMutationSupersededError() } lastKnownAccessToken = accessToken @@ -689,7 +693,7 @@ final class AuthManager: ObservableObject { accessToken: accessToken, refreshToken: refreshToken ) else { - throw CancellationError() + throw AuthMutationSupersededError() } currentUser = user settingsStore.saveCachedUser(user) @@ -956,6 +960,10 @@ final class AuthManager: ObservableObject { && signOutCancelledBrowserSignInAttemptID != attemptID } + private var hasActiveBrowserSignInAttempt: Bool { + activeBrowserSignInAttemptID != nil + } + private func finishBrowserSignInAttempt(_ attemptID: UInt64) { guard activeBrowserSignInAttemptID == attemptID else { return } isLoading = false diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index 41413b4f1b76..c3611e0a2f6c 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -23,6 +23,7 @@ final class AuthManagerSignInErrorTests: XCTestCase { ) await manager.awaitBootstrapped() + manager.markBrowserSignInLoadingForTesting() do { try await manager.handleCallbackURL(URL(string: "cmux://auth-callback?stack_refresh=refresh-token")!) XCTFail("Expected invalid callback to throw") @@ -46,6 +47,32 @@ final class AuthManagerSignInErrorTests: XCTestCase { ) } + func testStaleInvalidCallbackDoesNotStoreVisibleSignInError() async throws { + let suiteName = "AuthManagerSignInErrorTests.StaleInvalidCallback.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let manager = AuthManager( + tokenStore: TestTokenStore(), + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + do { + try await manager.handleCallbackURL(URL(string: "cmux://auth-callback?stack_refresh=refresh-token")!) + XCTFail("Expected invalid callback to throw") + } catch AuthManagerError.invalidCallback { + // Expected path. + } catch { + XCTFail("Expected invalidCallback, got \(error)") + } + + XCTAssertNil(manager.lastSignInError) + } + func testApplySignInResultDoesNotRestoreAuthAfterConcurrentSignOut() async throws { let suiteName = "AuthManagerSignInErrorTests.ConcurrentSignOut.\(UUID().uuidString)" guard let defaults = UserDefaults(suiteName: suiteName) else { From c8d8d1794955047ea0647d61f256457b740a84ca Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 18 May 2026 00:33:35 -0700 Subject: [PATCH 30/34] fix: keep credential sign-in supersession internal --- Sources/Auth/AuthManager.swift | 115 +++++++------------ cmuxTests/AuthManagerSignInErrorTests.swift | 117 ++++++++++++++++++++ 2 files changed, 156 insertions(+), 76 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 5a2406c33217..cab9e12220b1 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -151,6 +151,7 @@ final class AuthManager: ObservableObject { private let tokenStore: any StackAuthTokenStoreProtocol private let settingsStore: AuthSettingsStore private let urlOpener: (URL) -> Void + private let credentialSignIn: @Sendable (_ email: String, _ password: String) async throws -> SignInResult /// Resolves when the on-launch session restoration finishes (success or failure). /// Any probe that needs a definitive `isAuthenticated` value must `await` this @@ -163,12 +164,16 @@ final class AuthManager: ObservableObject { client: (any AuthClientProtocol)? = nil, tokenStore: any StackAuthTokenStoreProtocol = KeychainStackTokenStore(), settingsStore: AuthSettingsStore = AuthSettingsStore(), - urlOpener: ((URL) -> Void)? = nil + urlOpener: ((URL) -> Void)? = nil, + credentialSignIn: (@Sendable (_ email: String, _ password: String) async throws -> SignInResult)? = nil ) { self.tokenStore = tokenStore self.settingsStore = settingsStore self.client = client ?? Self.makeDefaultClient(tokenStore: tokenStore) self.urlOpener = urlOpener ?? Self.defaultURLOpener + self.credentialSignIn = credentialSignIn ?? { email, password in + try await Self.signInWithCredentialDirectly(email: email, password: password) + } let cachedUser = settingsStore.cachedUser() self.currentUser = cachedUser self.selectedTeamID = settingsStore.selectedTeamID @@ -208,6 +213,11 @@ final class AuthManager: ObservableObject { func markBrowserSignInLoadingForTesting() { _ = startBrowserSignInAttempt() } + + func markCredentialSignInLoadingForTesting() { + _ = beginAuthMutation(.signIn) + isLoading = true + } #endif func beginSignIn() { @@ -597,6 +607,12 @@ final class AuthManager: ObservableObject { func applySignInResult(_ result: SignInResult) async { let mutationGeneration = beginAuthMutation(.signIn) + isLoading = true + defer { + if isCurrentAuthMutation(mutationGeneration) { + isLoading = false + } + } await tokenStore.setTokens(accessToken: result.accessToken, refreshToken: result.refreshToken) guard await keepAuthMutationIfCurrent( mutationGeneration, @@ -606,15 +622,7 @@ final class AuthManager: ObservableObject { return } - lastKnownAccessToken = result.accessToken - let user = CMUXAuthUser(id: result.userId, primaryEmail: result.email, displayName: result.displayName) - currentUser = user - settingsStore.saveCachedUser(user) - availableTeams = result.teams - isAuthenticated = true - selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: result.teams) - didCompleteBrowserSignIn = true - lastSignInError = nil + publishSignInResult(result) authLog("applySignInResult: user=\(result.email ?? "nil") teams=\(result.teams.count) teamID=\(selectedTeamID ?? "nil")") } @@ -632,77 +640,20 @@ final class AuthManager: ObservableObject { // Sign in directly via the Stack Auth API and store tokens ourselves, // bypassing the StackClientApp which has token refresh issues. do { - let json = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/auth/password/sign-in", - body: try JSONSerialization.data(withJSONObject: ["email": email, "password": password]), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey - ) - guard let accessToken = json["access_token"] as? String, - let refreshToken = json["refresh_token"] as? String else { - throw AuthManagerError.invalidCallback - } - await tokenStore.setTokens(accessToken: accessToken, refreshToken: refreshToken) - guard await keepAuthMutationIfCurrent( - mutationGeneration, - accessToken: accessToken, - refreshToken: refreshToken - ) else { - throw AuthMutationSupersededError() - } - lastKnownAccessToken = accessToken - - // Fetch user info directly with the access token - let userJSON = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/users/me", - body: Data(), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey, - extraHeaders: ["x-stack-access-token": accessToken], - method: "GET" - ) - let user = CMUXAuthUser( - id: userJSON["id"] as? String ?? "", - primaryEmail: userJSON["primary_email"] as? String, - displayName: userJSON["display_name"] as? String - ) - - // Fetch teams - let teamsJSON = try await Self.stackAPIRequest( - url: "\(AuthEnvironment.stackBaseURL.absoluteString)/api/v1/teams?user_id=me", - body: Data(), - projectID: AuthEnvironment.stackProjectID, - clientKey: AuthEnvironment.stackPublishableClientKey, - extraHeaders: ["x-stack-access-token": accessToken], - method: "GET" - ) - var teams: [AuthTeamSummary] = [] - if let items = teamsJSON["items"] as? [[String: Any]] { - for item in items { - if let id = item["id"] as? String { - teams.append(AuthTeamSummary( - id: id, - displayName: item["display_name"] as? String ?? "" - )) - } - } - } - + let result = try await credentialSignIn(email, password) + await tokenStore.setTokens(accessToken: result.accessToken, refreshToken: result.refreshToken) guard await keepAuthMutationIfCurrent( mutationGeneration, - accessToken: accessToken, - refreshToken: refreshToken + accessToken: result.accessToken, + refreshToken: result.refreshToken ) else { throw AuthMutationSupersededError() } - currentUser = user - settingsStore.saveCachedUser(user) - availableTeams = teams - isAuthenticated = true - selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: teams) - lastSignInError = nil - authLog("signInWithCredential: success user=\(user.primaryEmail ?? "nil") teams=\(teams.count) teamID=\(selectedTeamID ?? "nil")") - didCompleteBrowserSignIn = true + publishSignInResult(result) + authLog("signInWithCredential: success user=\(result.email ?? "nil") teams=\(result.teams.count) teamID=\(selectedTeamID ?? "nil")") + } catch is AuthMutationSupersededError { + authLog("signInWithCredential: superseded by a newer auth mutation") + return } catch { if isCurrentAuthMutation(mutationGeneration) { lastSignInError = Self.signInError(from: error) @@ -711,6 +662,18 @@ final class AuthManager: ObservableObject { } } + private func publishSignInResult(_ result: SignInResult) { + lastKnownAccessToken = result.accessToken + let user = CMUXAuthUser(id: result.userId, primaryEmail: result.email, displayName: result.displayName) + currentUser = user + settingsStore.saveCachedUser(user) + availableTeams = result.teams + isAuthenticated = true + selectedTeamID = Self.resolveTeamID(selectedTeamID: selectedTeamID, teams: result.teams) + didCompleteBrowserSignIn = true + lastSignInError = nil + } + func signOut() async { let signOutGeneration = beginAuthMutation(.signOut) cancelBrowserSignInForSignOut() diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index c3611e0a2f6c..422585b2d7d1 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -115,6 +115,75 @@ final class AuthManagerSignInErrorTests: XCTestCase { XCTAssertNil(storedRefreshToken) } + func testApplySignInResultClearsSupersededCredentialLoadingState() async throws { + let suiteName = "AuthManagerSignInErrorTests.ApplyClearsLoading.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let manager = AuthManager( + tokenStore: TestTokenStore(), + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + manager.markCredentialSignInLoadingForTesting() + XCTAssertTrue(manager.isLoading) + + await manager.applySignInResult(makeSignInResult()) + + XCTAssertTrue(manager.isAuthenticated) + XCTAssertFalse(manager.isLoading) + XCTAssertNil(manager.lastSignInError) + } + + func testSupersededCredentialSignInDoesNotLeakInternalError() async throws { + let suiteName = "AuthManagerSignInErrorTests.CredentialSuperseded.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let tokenStore = TestTokenStore() + let credentialSignIn = BlockingCredentialSignIn(result: makeSignInResult()) + let manager = AuthManager( + client: TestAuthClient(), + tokenStore: tokenStore, + settingsStore: AuthSettingsStore(userDefaults: defaults), + credentialSignIn: { _, _ in + try await credentialSignIn.signIn() + } + ) + await manager.awaitBootstrapped() + + let signInTask = Task { + try await manager.signInWithCredential(email: "user@example.com", password: "password") + } + await credentialSignIn.waitForRequest() + XCTAssertTrue(manager.isLoading) + + await manager.signOut() + await credentialSignIn.release() + + do { + try await signInTask.value + } catch { + XCTFail("Expected superseded credential sign-in to return without leaking an internal error, got \(error)") + } + + XCTAssertFalse(manager.isAuthenticated) + XCTAssertFalse(manager.isLoading) + XCTAssertNil(manager.currentUser) + XCTAssertNil(manager.lastSignInError) + let storedAccessToken = await tokenStore.currentAccessToken() + let storedRefreshToken = await tokenStore.currentRefreshToken() + XCTAssertNil(storedAccessToken) + XCTAssertNil(storedRefreshToken) + } + func testStaleCallbackFailureDoesNotOverwriteSignOutState() async throws { let suiteName = "AuthManagerSignInErrorTests.StaleCallbackFailure.\(UUID().uuidString)" guard let defaults = UserDefaults(suiteName: suiteName) else { @@ -154,6 +223,54 @@ private struct TestAuthClient: AuthClientProtocol { func signOut() async throws {} } +private func makeSignInResult() -> AuthManager.SignInResult { + AuthManager.SignInResult( + accessToken: "access-token", + refreshToken: "refresh-token", + email: "user@example.com", + displayName: "Test User", + userId: "user-id", + selectedTeamId: nil, + teams: [] + ) +} + +private actor BlockingCredentialSignIn { + private let result: AuthManager.SignInResult + private var signInContinuation: CheckedContinuation? + private var requestWaiters: [CheckedContinuation] = [] + + init(result: AuthManager.SignInResult) { + self.result = result + } + + func signIn() async throws -> AuthManager.SignInResult { + try await withCheckedThrowingContinuation { continuation in + signInContinuation = continuation + let waiters = requestWaiters + requestWaiters.removeAll() + for waiter in waiters { + waiter.resume() + } + } + } + + func waitForRequest() async { + if signInContinuation != nil { + return + } + await withCheckedContinuation { continuation in + requestWaiters.append(continuation) + } + } + + func release() { + let continuation = signInContinuation + signInContinuation = nil + continuation?.resume(returning: result) + } +} + private actor BlockingFailureAuthClient: AuthClientProtocol { private var currentUserContinuation: CheckedContinuation? private var currentUserWaiter: CheckedContinuation? From 8739c406cfc31b600df761d406cd0c2a36c7dcf9 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 18 May 2026 02:44:50 -0700 Subject: [PATCH 31/34] fix: clear stale apply sign-in errors --- Sources/Auth/AuthManager.swift | 1 + cmuxTests/AuthManagerSignInErrorTests.swift | 39 +++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index cab9e12220b1..126e769043f3 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -606,6 +606,7 @@ final class AuthManager: ObservableObject { } func applySignInResult(_ result: SignInResult) async { + lastSignInError = nil let mutationGeneration = beginAuthMutation(.signIn) isLoading = true defer { diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index 422585b2d7d1..de099e76227d 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -139,6 +139,45 @@ final class AuthManagerSignInErrorTests: XCTestCase { XCTAssertNil(manager.lastSignInError) } + func testApplySignInResultClearsVisibleErrorBeforeTokenPersistence() async throws { + let suiteName = "AuthManagerSignInErrorTests.ApplyClearsErrorBeforePersistence.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let tokenStore = BlockingSetTokenStore() + let manager = AuthManager( + tokenStore: tokenStore, + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + manager.markBrowserSignInLoadingForTesting() + do { + try await manager.handleCallbackURL(URL(string: "cmux://auth-callback?stack_refresh=refresh-token")!) + XCTFail("Expected invalid callback to throw") + } catch AuthManagerError.invalidCallback { + // Expected path. + } catch { + XCTFail("Expected invalidCallback, got \(error)") + } + XCTAssertNotNil(manager.lastSignInError) + + let applyTask = Task { + await manager.applySignInResult(makeSignInResult()) + } + await tokenStore.waitForBlockedSet() + + XCTAssertNil(manager.lastSignInError) + + await tokenStore.releaseBlockedSet() + await applyTask.value + XCTAssertTrue(manager.isAuthenticated) + XCTAssertNil(manager.lastSignInError) + } + func testSupersededCredentialSignInDoesNotLeakInternalError() async throws { let suiteName = "AuthManagerSignInErrorTests.CredentialSuperseded.\(UUID().uuidString)" guard let defaults = UserDefaults(suiteName: suiteName) else { From 5e20521678bfe3221ced194e731387619d9c07a7 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 18 May 2026 19:13:26 -0700 Subject: [PATCH 32/34] Fix timed-out sign-in callback race --- Sources/Auth/AuthManager.swift | 39 +++++++++++++----- cmuxTests/AuthManagerSignInErrorTests.swift | 44 +++++++++++++++++++++ 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index 126e769043f3..c12465ab2d4d 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -205,6 +205,16 @@ final class AuthManager: ObservableObject { case restore case signIn case signOut + case signInCancellation + + var clearsSupersededAuthState: Bool { + switch self { + case .signOut, .signInCancellation: + return true + case .restore, .signIn: + return false + } + } } private struct AuthMutationSupersededError: Error, Sendable {} @@ -218,6 +228,10 @@ final class AuthManager: ObservableObject { _ = beginAuthMutation(.signIn) isLoading = true } + + func markBrowserSignInTimedOutForTesting() { + timeOutBrowserSignInAttempt() + } #endif func beginSignIn() { @@ -299,14 +313,7 @@ final class AuthManager: ObservableObject { if !isLoading { return isAuthenticated } let signedIn = await waitForSignInSettled(timeout: timeout) if !signedIn && isLoading && !isAuthenticated { - lastSignInError = .message("auth.webauth sign-in attempt timed out") - webAuthSession?.cancel() - if let attemptID = activeBrowserSignInAttemptID { - finishBrowserSignInAttempt(attemptID) - } else { - webAuthSession = nil - isLoading = false - } + timeOutBrowserSignInAttempt() } return signedIn } @@ -902,7 +909,9 @@ final class AuthManager: ObservableObject { accessToken: accessToken, refreshToken: refreshToken ) - if cachedMatches || storedCleared || currentAuthMutationKind == .signOut { + let shouldClearSupersededAuthState = + currentAuthMutationKind?.clearsSupersededAuthState == true + if cachedMatches || storedCleared || shouldClearSupersededAuthState { clearSessionState(clearSelectedTeam: true) } return false @@ -938,6 +947,18 @@ final class AuthManager: ObservableObject { } } + private func timeOutBrowserSignInAttempt() { + lastSignInError = .message("auth.webauth sign-in attempt timed out") + _ = beginAuthMutation(.signInCancellation) + webAuthSession?.cancel() + if let attemptID = activeBrowserSignInAttemptID { + finishBrowserSignInAttempt(attemptID) + } else { + webAuthSession = nil + isLoading = false + } + } + private func cancelBrowserSignInForSignOut() { if let attemptID = activeBrowserSignInAttemptID { signOutCancelledBrowserSignInAttemptID = attemptID diff --git a/cmuxTests/AuthManagerSignInErrorTests.swift b/cmuxTests/AuthManagerSignInErrorTests.swift index de099e76227d..cfc315871ec9 100644 --- a/cmuxTests/AuthManagerSignInErrorTests.swift +++ b/cmuxTests/AuthManagerSignInErrorTests.swift @@ -253,6 +253,50 @@ final class AuthManagerSignInErrorTests: XCTestCase { XCTAssertNil(manager.currentUser) XCTAssertNil(manager.lastSignInError) } + + func testTimedOutBrowserSignInDoesNotAuthenticateFromInFlightCallback() async throws { + let suiteName = "AuthManagerSignInErrorTests.TimeoutSupersedesCallback.\(UUID().uuidString)" + guard let defaults = UserDefaults(suiteName: suiteName) else { + XCTFail("Failed to create isolated UserDefaults suite") + return + } + defer { defaults.removePersistentDomain(forName: suiteName) } + + let tokenStore = BlockingSetTokenStore() + let manager = AuthManager( + client: TestAuthClient(), + tokenStore: tokenStore, + settingsStore: AuthSettingsStore(userDefaults: defaults) + ) + await manager.awaitBootstrapped() + + manager.markBrowserSignInLoadingForTesting() + let callbackURL = try XCTUnwrap(URL( + string: "cmux://auth-callback?stack_refresh=refresh-token&stack_access=access-token" + )) + let callbackTask = Task { + try await manager.handleCallbackURL(callbackURL) + } + + await tokenStore.waitForBlockedSet() + manager.markBrowserSignInTimedOutForTesting() + + XCTAssertFalse(manager.isAuthenticated) + XCTAssertFalse(manager.isLoading) + XCTAssertNotNil(manager.lastSignInError) + + await tokenStore.releaseBlockedSet() + try await callbackTask.value + + XCTAssertFalse(manager.isAuthenticated) + XCTAssertFalse(manager.isLoading) + XCTAssertNil(manager.currentUser) + XCTAssertNotNil(manager.lastSignInError) + let storedAccessToken = await tokenStore.currentAccessToken() + let storedRefreshToken = await tokenStore.currentRefreshToken() + XCTAssertNil(storedAccessToken) + XCTAssertNil(storedRefreshToken) + } } private struct TestAuthClient: AuthClientProtocol { From 7ecf7d69251f5552ca4e44575c389b0da294a7bd Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 18 May 2026 21:42:57 -0700 Subject: [PATCH 33/34] Localize sign-in failure copy --- Resources/Localizable.xcstrings | 94 ++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 2 deletions(-) diff --git a/Resources/Localizable.xcstrings b/Resources/Localizable.xcstrings index 17debb4d1cbe..855f2667a9d1 100644 --- a/Resources/Localizable.xcstrings +++ b/Resources/Localizable.xcstrings @@ -108159,28 +108159,118 @@ "settings.account.error.signInFailed": { "extractionState": "manual", "localizations": { + "ar": { + "stringUnit": { + "state": "translated", + "value": "فشل تسجيل الدخول. حاول مرة أخرى." + } + }, + "bs": { + "stringUnit": { + "state": "translated", + "value": "Prijava nije uspjela. Pokušajte ponovo." + } + }, + "da": { + "stringUnit": { + "state": "translated", + "value": "Login mislykkedes. Prøv igen." + } + }, + "de": { + "stringUnit": { + "state": "translated", + "value": "Anmeldung fehlgeschlagen. Versuchen Sie es erneut." + } + }, "en": { "stringUnit": { "state": "translated", "value": "Sign in failed. Try again." } }, + "es": { + "stringUnit": { + "state": "translated", + "value": "No se pudo iniciar sesión. Inténtalo de nuevo." + } + }, + "fr": { + "stringUnit": { + "state": "translated", + "value": "Échec de la connexion. Réessayez." + } + }, + "it": { + "stringUnit": { + "state": "translated", + "value": "Accesso non riuscito. Riprova." + } + }, "ja": { "stringUnit": { "state": "translated", "value": "サインインに失敗しました。もう一度お試しください。" } }, + "ko": { + "stringUnit": { + "state": "translated", + "value": "로그인에 실패했습니다. 다시 시도하세요." + } + }, + "nb": { + "stringUnit": { + "state": "translated", + "value": "Innlogging mislyktes. Prøv igjen." + } + }, + "pl": { + "stringUnit": { + "state": "translated", + "value": "Logowanie nie powiodło się. Spróbuj ponownie." + } + }, + "pt-BR": { + "stringUnit": { + "state": "translated", + "value": "Falha ao entrar. Tente novamente." + } + }, + "ru": { + "stringUnit": { + "state": "translated", + "value": "Не удалось войти. Попробуйте ещё раз." + } + }, + "th": { + "stringUnit": { + "state": "translated", + "value": "ลงชื่อเข้าใช้ไม่สำเร็จ ลองอีกครั้ง" + } + }, + "tr": { + "stringUnit": { + "state": "translated", + "value": "Oturum açma başarısız. Tekrar deneyin." + } + }, "uk": { "stringUnit": { "state": "translated", "value": "Не вдалося ввійти. Спробуйте ще раз." } }, - "ko": { + "zh-Hans": { "stringUnit": { "state": "translated", - "value": "로그인에 실패했습니다. 다시 시도하세요." + "value": "登录失败。请重试。" + } + }, + "zh-Hant": { + "stringUnit": { + "state": "translated", + "value": "登入失敗。請再試一次。" } } } From 30c027836bd1b751b6f35ba4e5eee828a585cd45 Mon Sep 17 00:00:00 2001 From: Austin Wang Date: Mon, 18 May 2026 21:53:07 -0700 Subject: [PATCH 34/34] Return authoritative sign-in await state --- Sources/Auth/AuthManager.swift | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Sources/Auth/AuthManager.swift b/Sources/Auth/AuthManager.swift index c12465ab2d4d..f6303584d374 100644 --- a/Sources/Auth/AuthManager.swift +++ b/Sources/Auth/AuthManager.swift @@ -312,10 +312,13 @@ final class AuthManager: ObservableObject { beginSignIn() if !isLoading { return isAuthenticated } let signedIn = await waitForSignInSettled(timeout: timeout) - if !signedIn && isLoading && !isAuthenticated { + if signedIn || isAuthenticated { + return true + } + if isLoading { timeOutBrowserSignInAttempt() } - return signedIn + return isAuthenticated } /// Signs out and awaits the state to flip. signOut() is already async and