Skip to content

fix: re-register QR pairing before TTL and handle missing daemon #8199

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: re-register QR pairing before TTL and handle missing daemon #8199

Show file tree
Hide file tree
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
129 changes: 81 additions & 48 deletions clients/macos/vellum-assistant/Features/Settings/PairingQRCodeSheet.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,18 @@ struct PairingQRCodeSheet: View {
@Environment(\.dismiss) var dismiss

let gatewayUrl: String
let daemonClient: DaemonClient
let daemonClient: DaemonClient?

@State private var hostId: String = ""
@State private var pairingRequestId: String = UUID().uuidString
@State private var pairingSecret: String = generatePairingSecret()
@State private var localLanUrl: String? = nil
@State private var registrationState: RegistrationState = .idle
@State private var registrationError: String? = nil
@State private var refreshTask: Task<Void, Never>? = nil

/// Re-register every 4 minutes to stay ahead of the 5-minute TTL.
private static let refreshInterval: UInt64 = 4 * 60 * 1_000_000_000

enum RegistrationState {
case idle, registering, registered, failed
Expand All @@ -45,54 +49,58 @@ struct PairingQRCodeSheet: View {
Button("Done") { dismiss() }
}

switch registrationState {
case .idle, .registering:
VStack(spacing: VSpacing.sm) {
ProgressView()
.controlSize(.large)
Text("Registering pairing request...")
.font(VFont.body)
.foregroundColor(VColor.textSecondary)
}
.frame(width: 220, height: 220)

case .registered:
if let qrImage = generateQRImage() {
Image(nsImage: qrImage)
.resizable()
.interpolation(.none)
.scaledToFit()
.frame(width: 220, height: 220)
.padding(VSpacing.md)
.background(Color.white)
.cornerRadius(VRadius.md)
} else {
errorContent("Failed to generate QR code.")
}

case .failed:
errorContent(registrationError ?? "Could not register pairing request. Ensure the daemon is running.")
}
if daemonClient == nil {
errorContent("Cannot generate QR code \u{2014} daemon not connected. Please wait for the daemon to start and try again.")
} else {
switch registrationState {
case .idle, .registering:
VStack(spacing: VSpacing.sm) {
ProgressView()
.controlSize(.large)
Text("Registering pairing request...")
.font(VFont.body)
.foregroundColor(VColor.textSecondary)
}
.frame(width: 220, height: 220)

case .registered:
if let qrImage = generateQRImage() {
Image(nsImage: qrImage)
.resizable()
.interpolation(.none)
.scaledToFit()
.frame(width: 220, height: 220)
.padding(VSpacing.md)
.background(Color.white)
.cornerRadius(VRadius.md)
} else {
errorContent("Failed to generate QR code.")
}

// State indicator
if canGenerateQR {
HStack(spacing: VSpacing.sm) {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(VColor.success)
.font(.system(size: 14))
Text("Ready to pair with iOS")
.font(VFont.body)
.foregroundColor(VColor.success)
case .failed:
errorContent(registrationError ?? "Could not register pairing request. Ensure the daemon is running.")
}

if localLanUrl != nil {
HStack(spacing: VSpacing.xs) {
Image(systemName: "wifi")
.foregroundColor(VColor.textMuted)
.font(.system(size: 12))
Text("LAN pairing available")
.font(VFont.caption)
.foregroundColor(VColor.textMuted)
// State indicator
if canGenerateQR {
HStack(spacing: VSpacing.sm) {
Image(systemName: "checkmark.circle.fill")
.foregroundColor(VColor.success)
.font(.system(size: 14))
Text("Ready to pair with iOS")
.font(VFont.body)
.foregroundColor(VColor.success)
}

if localLanUrl != nil {
HStack(spacing: VSpacing.xs) {
Image(systemName: "wifi")
.foregroundColor(VColor.textMuted)
.font(.system(size: 12))
Text("LAN pairing available")
.font(VFont.caption)
.foregroundColor(VColor.textMuted)
}
}
}
}
Expand All @@ -102,7 +110,7 @@ struct PairingQRCodeSheet: View {
.foregroundColor(VColor.textSecondary)
.multilineTextAlignment(.center)

if registrationState == .failed {
if registrationState == .failed && daemonClient != nil {
Button("Retry") {
pairingRequestId = UUID().uuidString
pairingSecret = Self.generatePairingSecret()
Expand All @@ -116,7 +124,12 @@ struct PairingQRCodeSheet: View {
.onAppear {
hostId = Self.computeHostId()
localLanUrl = computeLocalLanUrl()
guard daemonClient != nil else { return }
registerWithDaemon()
startRefreshTimer()
Comment thread
ashleeradka marked this conversation as resolved.
}
.onDisappear {
stopRefreshTimer()
}
}

Expand All @@ -133,13 +146,33 @@ struct PairingQRCodeSheet: View {
.frame(width: 220, height: 220)
}

// MARK: - Refresh Timer

private func startRefreshTimer() {
stopRefreshTimer()
refreshTask = Task { @MainActor in
while !Task.isCancelled {
try? await Task.sleep(nanoseconds: Self.refreshInterval)
guard !Task.isCancelled else { break }
pairingRequestId = UUID().uuidString
pairingSecret = Self.generatePairingSecret()
registerWithDaemon()
Comment thread
ashleeradka marked this conversation as resolved.
}
}
}

private func stopRefreshTimer() {
refreshTask?.cancel()
refreshTask = nil
}

// MARK: - Registration

private func registerWithDaemon() {
registrationState = .registering
registrationError = nil

guard let port = daemonClient.httpPort else {
guard let port = daemonClient?.httpPort else {
registrationState = .failed
registrationError = "Daemon HTTP server not running."
return
Expand Down
10 changes: 4 additions & 6 deletions clients/macos/vellum-assistant/Features/Settings/SettingsConnectTab.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,10 @@ struct SettingsConnectTab: View {
Text("This will replace the current bearer token and restart the daemon. Any paired devices will need to reconnect.")
}
.sheet(isPresented: $showingPairingQR) {
if let client = daemonClient {
PairingQRCodeSheet(
gatewayUrl: store.resolvedIosGatewayUrl,
daemonClient: client
)
}
PairingQRCodeSheet(
gatewayUrl: store.resolvedIosGatewayUrl,
daemonClient: daemonClient
)
}
}

Expand Down