fix(macos): prioritize onboarding before lock screen

Signed-off-by: xunzhuo <xunzhuo@vllm-semantic-router.ai>

Author: Xunzhuo

apps/macos/Sources/AppModel.swift

@@ -1263,8 +1263,14 @@ final class ElephantAppModel: ObservableObject {
         return UserDefaults.standard.bool(forKey: key)
     }
 
+    private static func hasCompletedOnboarding() -> Bool {
+        UserDefaults.standard.bool(forKey: onboardingCompleteKey)
+    }
+
     private static func shouldPresentLaunchLockScreen() -> Bool {
-        !onboardingPreviewMode && storedAppLockPasswordRecord() != nil
+        !onboardingPreviewMode
+            && hasCompletedOnboarding()
+            && storedAppLockPasswordRecord() != nil
     }
 
     private static func localizedText(_ language: AppLanguage, en: String, zh: String, fr: String, de: String) -> String {
@@ -1360,10 +1366,15 @@ final class ElephantAppModel: ObservableObject {
             try await refreshDashboard()
             corePhase = .ready
             startReadinessPollingIfNeeded()
-            if Self.onboardingPreviewMode || !snapshot.hasElephant || snapshot.providerID.isEmpty {
+            let needsOnboarding = Self.onboardingPreviewMode || !snapshot.hasElephant || snapshot.providerID.isEmpty
+            if needsOnboarding {
+                if !Self.onboardingPreviewMode {
+                    UserDefaults.standard.set(false, forKey: Self.onboardingCompleteKey)
+                }
                 isSleepDisplayPresented = false
                 showingOnboarding = true
             } else if hasAppLockPassword {
+                UserDefaults.standard.set(true, forKey: Self.onboardingCompleteKey)
                 beginSleepDisplay(reason: "launch")
             }
             if UserDefaults.standard.bool(forKey: Self.onboardingLetterPendingKey) {
@@ -1887,7 +1898,7 @@ final class ElephantAppModel: ObservableObject {
     }
 
     func beginSleepDisplay(reason: String = "manual") {
-        guard !showingOnboarding else { return }
+        guard Self.hasCompletedOnboarding(), !showingOnboarding else { return }
         speechOutput.stop()
         sleepDisplayReason = reason
         sleepUnlockPassword = ""

apps/macos/Sources/Views.swift

@@ -24,7 +24,7 @@ struct RootView: View {
             .blur(radius: model.showingOnboardingLetterEnvelope ? 8 : 0)
             .animation(.easeInOut(duration: 0.18), value: sidebarVisible)
 
-            if model.isSleepDisplayPresented {
+            if model.isSleepDisplayPresented && !model.showingOnboarding {
                 SleepDisplayView()
                     .environmentObject(model)
                     .transition(.opacity.combined(with: .scale(scale: 1.015)))
@@ -70,7 +70,12 @@ struct RootView: View {
         .animation(.spring(response: 0.42, dampingFraction: 0.88), value: model.showingOnboardingLetterPrompt)
         .animation(.spring(response: 0.46, dampingFraction: 0.86), value: model.showingOnboardingLetterEnvelope)
         .onChange(of: model.snapshot.hasElephant) { hasElephant in
-            if hasElephant {
+            if hasElephant && !model.snapshot.providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+                onboardingComplete = true
+            }
+        }
+        .onChange(of: model.snapshot.providerID) { providerID in
+            if model.snapshot.hasElephant && !providerID.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
                 onboardingComplete = true
             }
         }