Skip to content

fix: handle QR refresh failure and remove dead onChange #8248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashleeradka merged 1 commit into from
Feb 24, 2026
Merged

fix: handle QR refresh failure and remove dead onChange #8248

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions clients/macos/vellum-assistant/Features/Settings/PairingQRCodeSheet.swift
View file
Open in desktop
Comment thread
ashleeradka marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ struct PairingQRCodeSheet: View {
@State private var registrationState: RegistrationState = .idle
@State private var registrationError: String? = nil
@State private var refreshTask: Task<Void, Never>? = nil
@State private var consecutiveRefreshFailures: Int = 0

/// Re-register every 4 minutes to stay ahead of the 5-minute TTL.
private static let refreshInterval: UInt64 = 4 * 60 * 1_000_000_000
Expand Down Expand Up @@ -131,14 +132,6 @@ struct PairingQRCodeSheet: View {
.onDisappear {
stopRefreshTimer()
}
.onChange(of: daemonClient != nil) { _, isConnected in
// When the daemon connects after the sheet is already open,
// trigger registration so the user doesn't have to dismiss and reopen.
if isConnected, registrationState != .registered {
registerWithDaemon()
startRefreshTimer()
}
}
}

private func errorContent(_ message: String) -> some View {
Expand Down Expand Up @@ -215,9 +208,15 @@ struct PairingQRCodeSheet: View {
pairingRequestId = newRequestId
pairingSecret = newSecret
registrationState = .registered
consecutiveRefreshFailures = 0
case .failure:
// Keep the old QR visible; the next timer tick will retry.
break
consecutiveRefreshFailures += 1
if consecutiveRefreshFailures >= 2 {
registrationState = .failed
registrationError = "Re-registration failed. Close and reopen to try again."
stopRefreshTimer()
Comment thread
ashleeradka marked this conversation as resolved.
}
// On first failure, keep old QR visible; the next timer tick will retry.
}
}

Expand Down