Merge onboarding trust flow improvements

Author: kodjima33

desktop/Desktop/Sources/AuthService.swift

@@ -49,6 +49,10 @@ class AuthService {
         return "\(urlScheme)://auth/callback"
     }
 
+    private var currentBundleIdentifier: String {
+        Bundle.main.bundleIdentifier ?? "unknown.bundle"
+    }
+
     private var urlScheme: String {
         if let urlTypes = Bundle.main.infoDictionary?["CFBundleURLTypes"] as? [[String: Any]],
            let firstType = urlTypes.first,
@@ -503,6 +507,16 @@ class AuthService {
         let state = queryItems.first(where: { $0.name == "state" })?.value
         let error = queryItems.first(where: { $0.name == "error" })?.value
 
+        if let state, let targetBundleId = targetBundleIdentifier(from: state), targetBundleId != currentBundleIdentifier {
+            NSLog(
+                "OMI AUTH: Callback is for bundle %@, current bundle is %@. Forwarding...",
+                targetBundleId,
+                currentBundleIdentifier
+            )
+            forwardOAuthCallback(url: url, toBundleId: targetBundleId)
+            return
+        }
+
         if let error = error {
             NSLog("OMI AUTH: OAuth error: %@", error)
             oauthContinuation?.resume(throwing: AuthError.oauthError(error))
@@ -1052,10 +1066,38 @@ class AuthService {
     private func generateState() -> String {
         var bytes = [UInt8](repeating: 0, count: 32)
         _ = SecRandomCopyBytes(kSecRandomDefault, bytes.count, &bytes)
-        return Data(bytes).base64EncodedString()
+        let nonce = Data(bytes).base64EncodedString()
             .replacingOccurrences(of: "+", with: "-")
             .replacingOccurrences(of: "/", with: "_")
             .replacingOccurrences(of: "=", with: "")
+        // Encode source bundle in state so callbacks can be routed back to the
+        // originating app, even when multiple dev builds share URL schemes.
+        return "\(nonce)|\(currentBundleIdentifier)"
+    }
+
+    private func targetBundleIdentifier(from state: String) -> String? {
+        let parts = state.split(separator: "|", maxSplits: 1).map(String.init)
+        guard parts.count == 2 else { return nil }
+        let bundleId = parts[1].trimmingCharacters(in: .whitespacesAndNewlines)
+        return bundleId.isEmpty ? nil : bundleId
+    }
+
+    private func forwardOAuthCallback(url: URL, toBundleId bundleId: String) {
+        guard let appURL = NSWorkspace.shared.urlForApplication(withBundleIdentifier: bundleId) else {
+            NSLog("OMI AUTH: Unable to forward callback. Bundle %@ not found.", bundleId)
+            return
+        }
+
+        let config = NSWorkspace.OpenConfiguration()
+        config.activates = true
+
+        NSWorkspace.shared.open([url], withApplicationAt: appURL, configuration: config) { _, error in
+            if let error {
+                NSLog("OMI AUTH: Failed to forward callback to %@: %@", bundleId, error.localizedDescription)
+            } else {
+                NSLog("OMI AUTH: Forwarded callback to %@", bundleId)
+            }
+        }
     }
 
     // MARK: - Native Apple Sign In Helpers

desktop/Desktop/Sources/Chat/ChatPrompts.swift

@@ -668,7 +668,7 @@ struct ChatPrompts {
     Say hi to {user_given_name} and confirm the name. Example: "Hey {user_given_name}! That's what I should call you, right?"
     Use `ask_followup` with options like ["Yes!", "Call me something else"].
     If they want a different name, ask what they prefer and call `set_user_preferences(name: "...")`.
-    If confirmed, say: "Nice to meet you {name}! I'm going to request a bunch of permissions and will access your files to learn about you. I won't function well if you don't grant it.\n\nYou can trust me — I'm fully open-source, transparent and secure. All your data belongs to you and encrypted!"
+    If confirmed, say: "Nice to meet you {name}! omi protects your data: open-source, encrypted, and you own everything."
     Then call `save_knowledge_graph` with just the user's name as a person node. This seeds the live graph with their name at the center.
 
     STEP 1.5 — LANGUAGE PREFERENCE
@@ -696,14 +696,14 @@ struct ChatPrompts {
     Share 1-2 specific observations connecting web research + file findings (1 sentence each), then END your message with an explicit question.
     CRITICAL: Your message text MUST end with a question mark. Don't just state observations — ASK the user something.
     Bad: "I see screenpipe repos, RAG workshops, and VS Code extensions."
-    Good: "I see screenpipe repos, RAG workshops, and VS Code extensions. What are you mainly working on right now?"
+    Good: "I see screenpipe repos, RAG workshops, and VS Code extensions. What's your top goal right now?"
     Then call `ask_followup` with 2-4 quick-reply options that are meaningful answers to YOUR question.
-    - If they appear to have a job/company: ask about their current focus, with specific options based on discoveries.
-    - If no job info: ask what they mainly use their computer for, with general options.
-    Example: ask_followup(question: "What are you mainly working on right now?", options: ["Building [product]", "Design + frontend", "Something else"])
-    The user can also type their own answer in the input field — you don't need to add a "Something else" option.
+    - Ask for ONE top monthly goal, not project names.
+    - Offer 3 options based on discovered context plus one typed option.
+    Example: ask_followup(question: "What's your top one goal this month?", options: ["Ship [specific project]", "Improve [specific skill/workflow]", "I'll type my own"])
+    The options should be inferred from their files/web context, not generic.
     WAIT for the user to reply (click a button or type).
-    After the user replies, call `save_knowledge_graph` with any new context from their response.
+    After the user replies, call `save_knowledge_graph` with the chosen goal as a concept node connected to the user.
 
     STEP 5 — PRIVACY NOTE + PERMISSIONS
     Before asking for any permissions, send a trust-building message about data ownership. Example:
@@ -720,12 +720,17 @@ struct ChatPrompts {
     - Give a 1-sentence concrete explanation of what Omi does with that permission (max 20 words).
     - Then RE-ASK the same permission with `ask_followup` again: ["Grant [Permission Name]", "Skip"].
     - Do NOT move to the next permission — stay on this one until the user grants or skips.
-    Here's what each permission does:
-    - **Microphone**: Transcribes your meetings and calls so Omi can give real-time advice and summaries.
-    - **Notifications**: Sends proactive tips and reminders based on what you're working on.
-    - **Accessibility**: Reads UI elements on screen so Omi understands which app and context you're in.
-    - **Automation**: Controls apps (like AppleScript) to take actions on your behalf when you ask.
-    - **Screen Recording**: Captures screen content so Omi can see what you're looking at and help contextually.
+    Keep permission explanations ultra-short and plain, with no technical jargon:
+    - **Microphone**: "I need this to summarize your meetings."
+    - **Notifications**: "I need this to proactively help you during the day."
+    - **Accessibility**: "I need this to understand which app you're using."
+    - **Automation**: "I need this to take actions for you when asked."
+    - **Screen Recording**: "I need this to understand what you're working on."
+    - **Files scan**: "I need this to learn your work context and be more helpful."
+
+    IMPORTANT for notifications:
+    - Before requesting notification permission, confirm the app is in Applications.
+    - If not in Applications, ask the user to move omi to Applications first, then retry.
 
     Order: microphone → notifications → accessibility → automation → screen_recording (last, needs restart).
     Skip already-granted permissions. If user clicks "Skip": say "No worries" and move to the next one. NEVER nag.
@@ -820,6 +825,7 @@ struct ChatPrompts {
     - Use first name sparingly (not every message)
     - React authentically to discoveries
     - Don't explain what Omi does — let them discover it naturally
+    - NEVER show technical details to users (no SQL, file paths, command lines, JSON, or tool names).
     """
 
     // MARK: - Onboarding Exploration (Parallel Background Session)

desktop/Desktop/Sources/OnboardingChatView.swift

@@ -92,6 +92,8 @@ struct OnboardingChatView: View {
     @State private var hasStarted: Bool = false
     @State private var onboardingCompleted: Bool = false
     @State private var quickReplyOptions: [String] = []
+    @State private var awaitingGoalInput: Bool = false
+    @State private var createdGoalTitles: Set<String> = []
     @State private var isGrantingPermission: Bool = false
     @State private var pendingPermissionType: String? = nil  // e.g. "microphone" — waiting for user to grant
     @FocusState private var isInputFocused: Bool
@@ -111,9 +113,19 @@ struct OnboardingChatView: View {
         VStack(spacing: 0) {
             // Header
             HStack {
-                Text("Setting up omi")
-                    .font(.system(size: 18, weight: .semibold))
-                    .foregroundColor(OmiColors.textPrimary)
+                if let logoImage = whiteTemplateLogoImage() {
+                    Image(nsImage: logoImage)
+                        .resizable()
+                        .renderingMode(.template)
+                        .foregroundColor(.white)
+                        .scaledToFit()
+                        .frame(width: 52, height: 18)
+                        .accessibilityLabel("omi")
+                } else {
+                    Text("omi")
+                        .font(.system(size: 18, weight: .semibold))
+                        .foregroundColor(.white)
+                }
 
                 Spacer()
 
@@ -141,12 +153,15 @@ struct OnboardingChatView: View {
                 ScrollView {
                     VStack(spacing: 16) {
                         ForEach(chatProvider.messages) { message in
-                                OnboardingChatBubble(message: message)
+                                OnboardingChatBubble(
+                                    message: message,
+                                    hidePermissionImages: !quickReplyOptions.isEmpty || pendingPermissionType != nil || awaitingGoalInput
+                                )
                                     .id(message.id)
                         }
 
                         // Parallel exploration card (appears after scan_files)
-                        if explorationRunning || (explorationCompleted && !explorationText.isEmpty) {
+                        if !shouldHideExplorationCard && (explorationRunning || (explorationCompleted && !explorationText.isEmpty)) {
                             ExplorationProfileCard(
                                 text: explorationText,
                                 isRunning: explorationRunning,
@@ -448,6 +463,12 @@ struct OnboardingChatView: View {
         }
         ChatToolExecutor.onQuickReplyOptions = { options in
             quickReplyOptions = options
+            if options.contains(where: { isTypeYourOwnOption($0) }) {
+                awaitingGoalInput = true
+            }
+        }
+        ChatToolExecutor.onQuickReplyQuestion = { question in
+            awaitingGoalInput = isGoalPriorityQuestion(question)
         }
         ChatToolExecutor.onKnowledgeGraphUpdated = { [weak graphViewModel] in
             guard let vm = graphViewModel else { return }
@@ -545,6 +566,9 @@ struct OnboardingChatView: View {
         ChatToolExecutor.resumeFollowup(with: text)
 
         Task {
+            if awaitingGoalInput {
+                await maybeCreateGoal(from: text, source: "typed")
+            }
             await chatProvider.sendMessage(text)
         }
     }
@@ -583,6 +607,8 @@ struct OnboardingChatView: View {
                 if result.contains("granted") {
                     // Granted immediately — tell the AI
                     await chatProvider.sendMessage("\(option) — done!")
+                } else if result.contains("move omi to /Applications first") {
+                    await chatProvider.sendMessage("Move omi to Applications, reopen it, then tap Grant Notifications again.")
                 } else {
                     // Pending — wait silently for the permission check timer to detect it
                     // The onChange handlers for appState.has*Permission will send the message
@@ -591,13 +617,93 @@ struct OnboardingChatView: View {
             }
         } else {
             // Regular quick reply — resume the blocked ask_followup tool, then send as message
+            let shouldCreateFromSelection = awaitingGoalInput && !isTypeYourOwnOption(option)
+            if shouldCreateFromSelection {
+                awaitingGoalInput = false
+            } else if isTypeYourOwnOption(option) {
+                awaitingGoalInput = true
+            }
             ChatToolExecutor.resumeFollowup(with: option)
             Task {
+                if shouldCreateFromSelection {
+                    await maybeCreateGoal(from: option, source: "selected")
+                }
                 await chatProvider.sendMessage(option)
             }
         }
     }
 
+    private var shouldHideExplorationCard: Bool {
+        !quickReplyOptions.isEmpty || pendingPermissionType != nil || awaitingGoalInput
+    }
+
+    private func whiteTemplateLogoImage() -> NSImage? {
+        guard
+            let logoURL = Bundle.resourceBundle.url(forResource: "omi_text_logo", withExtension: "png"),
+            let loadedLogoImage = NSImage(contentsOf: logoURL)
+        else {
+            return nil
+        }
+        let logoImage = loadedLogoImage.copy() as? NSImage ?? loadedLogoImage
+        logoImage.isTemplate = true
+        return logoImage
+    }
+
+    private func isGoalPriorityQuestion(_ text: String) -> Bool {
+        let lower = text.lowercased()
+        return lower.contains("top one goal")
+            || lower.contains("top goal")
+            || lower.contains("top priority")
+            || lower.contains("priority right now")
+    }
+
+    private func isTypeYourOwnOption(_ text: String) -> Bool {
+        let lower = text.lowercased()
+        return lower.contains("type my own") || lower.contains("i'll type my own") || lower.contains("i’ll type my own")
+    }
+
+    private func normalizedGoalTitle(_ text: String) -> String {
+        text
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .replacingOccurrences(of: "\n", with: " ")
+    }
+
+    private func shouldSkipGoalCreation(_ title: String) -> Bool {
+        if title.isEmpty {
+            return true
+        }
+        let lower = title.lowercased()
+        if lower == "skip" || lower == "done" || lower.contains("type my own") {
+            return true
+        }
+        return false
+    }
+
+    private func maybeCreateGoal(from rawText: String, source: String) async {
+        let title = normalizedGoalTitle(rawText)
+        guard !shouldSkipGoalCreation(title) else { return }
+
+            let dedupeKey = title.lowercased()
+            guard !createdGoalTitles.contains(dedupeKey) else { return }
+
+        do {
+            let goal = try await APIClient.shared.createGoal(
+                title: title,
+                description: "Added from onboarding",
+                goalType: .boolean,
+                targetValue: 1,
+                currentValue: 0,
+                source: "onboarding_\(source)"
+            )
+            _ = try? await GoalStorage.shared.syncServerGoal(goal)
+            createdGoalTitles.insert(dedupeKey)
+            awaitingGoalInput = false
+            log("OnboardingChat: Created goal from onboarding input: \(title)")
+        } catch {
+            logError("OnboardingChat: Failed to create goal from onboarding input", error: error)
+        }
+    }
+
     private func handleOnboardingComplete() {
         log("OnboardingChatView: Chat step complete, advancing to next onboarding step")
 
@@ -860,6 +966,7 @@ struct OnboardingChatView: View {
 
 struct OnboardingChatBubble: View {
     let message: ChatMessage
+    var hidePermissionImages: Bool = false
 
     /// Whether this AI message has any visible content (non-empty text or visible tool calls)
     private var hasVisibleContent: Bool {
@@ -930,7 +1037,12 @@ struct OnboardingChatBubble: View {
                             ForEach(message.contentBlocks) { block in
                                 switch block {
                                 case .toolCall(_, let name, let status, _, let input, _):
-                                    let indicator = OnboardingToolIndicator(toolName: name, status: status, input: input)
+                                    let indicator = OnboardingToolIndicator(
+                                        toolName: name,
+                                        status: status,
+                                        input: input,
+                                        hidePermissionImage: hidePermissionImages
+                                    )
                                     if !indicator.isHidden {
                                         indicator
                                     }
@@ -976,6 +1088,7 @@ struct OnboardingToolIndicator: View {
     let toolName: String
     let status: ToolCallStatus
     var input: ToolCallInput? = nil
+    var hidePermissionImage: Bool = false
 
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
@@ -995,7 +1108,7 @@ struct OnboardingToolIndicator: View {
             }
 
             // Show permission guide image automatically for scan_files and request_permission
-            if let permImage = permissionImageType {
+            if !hidePermissionImage, let permImage = permissionImageType {
                 OnboardingPermissionImage(permissionType: permImage)
             }
         }
@@ -1005,6 +1118,7 @@ struct OnboardingToolIndicator: View {
     /// Whether this tool should be hidden from the UI (e.g. ask_followup renders its own UI)
     var isHidden: Bool {
         cleanToolName == "ask_followup"
+            || cleanToolName == "save_knowledge_graph"
     }
 
     /// Strip MCP prefix from tool name (e.g. "mcp__omi-tools__scan_files" → "scan_files")
@@ -1040,17 +1154,13 @@ struct OnboardingToolIndicator: View {
         case "complete_onboarding":
             return status == .running ? "Finishing setup..." : "Setup complete"
         case "save_knowledge_graph":
-            return status == .running ? "Building knowledge graph..." : "Knowledge graph saved"
+            return status == .running ? "Updating your profile..." : "Profile updated"
         default:
-            if toolName.hasPrefix("WebSearch:") {
-                let query = String(toolName.dropFirst("WebSearch: ".count)).trimmingCharacters(in: CharacterSet(charactersIn: "\""))
-                return status == .running ? "Searching: \(query)" : "Searched: \(query)"
-            }
             if toolName == "WebSearch" || toolName.contains("search") || toolName.contains("web") {
-                return status == .running ? "Searching the web..." : "Web search complete"
+                return status == .running ? "Learning more about you..." : "Learned more about you"
             }
             if toolName.hasPrefix("WebFetch:") || toolName == "WebFetch" {
-                return status == .running ? "Reading webpage..." : "Webpage read"
+                return status == .running ? "Reading context..." : "Context updated"
             }
             return status == .running ? "Working..." : "Done"
         }