feat(macos): merge the native Mac app into v2.2

BisonNotes AI/BisonNotes AI.xcodeproj/xcshareddata/xcschemes/BisonNotes AI ControlsExtension.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2610"
+   LastUpgradeVersion = "2660"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

BisonNotes AI/BisonNotes AI.xcodeproj/xcshareddata/xcschemes/BisonNotes AI Watch App (Complication).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2610"
+   LastUpgradeVersion = "2660"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

BisonNotes AI/BisonNotes AI.xcodeproj/xcshareddata/xcschemes/BisonNotes AI Watch App.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2610"
+   LastUpgradeVersion = "2660"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

BisonNotes AI/BisonNotes AI.xcodeproj/xcshareddata/xcschemes/BisonNotes AI macOS.xcscheme

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2660"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "AC0000000000000000000010"
+               BuildableName = "BisonNotes AI.app"
+               BlueprintName = "BisonNotes AI macOS"
+               ReferencedContainer = "container:BisonNotes AI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AC0000000000000000000010"
+            BuildableName = "BisonNotes AI.app"
+            BlueprintName = "BisonNotes AI macOS"
+            ReferencedContainer = "container:BisonNotes AI.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "AC0000000000000000000010"
+            BuildableName = "BisonNotes AI.app"
+            BlueprintName = "BisonNotes AI macOS"
+            ReferencedContainer = "container:BisonNotes AI.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

BisonNotes AI/BisonNotes AI.xcodeproj/xcshareddata/xcschemes/BisonNotes AI.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "2610"
+   LastUpgradeVersion = "2660"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"

BisonNotes AI/BisonNotes AI/AISettingsView.swift

@@ -256,18 +256,21 @@ struct AISettingsView: View {
     }
 
     var body: some View {
-        NavigationStack {
+        Group {
             settingsContent
                 .navigationTitle("AI Settings")
                 .navigationBarTitleDisplayMode(.inline)
                 .toolbar {
+                    #if !os(macOS)
                     ToolbarItem(placement: .navigationBarTrailing) {
                         Button("Done") {
                             dismiss()
                         }
                     }
+                    #endif
                 }
         }
+        .platformSettingsNavigation()
         .alert("Regeneration Complete", isPresented: $viewModel.regenerationManager.showingRegenerationAlert) {
             Button("OK") { viewModel.regenerationManager.regenerationResults = nil }
         } message: {
@@ -299,6 +302,42 @@ struct AISettingsView: View {
         } message: {
             Text(errorHandler.currentError?.localizedDescription ?? "An unknown error occurred.")
         }
+        #if os(macOS)
+        .navigationDestination(isPresented: $showingOllamaSettings) {
+            OllamaSettingsView(onConfigurationChanged: {
+                self.refreshEngineStatuses()
+            })
+        }
+        .navigationDestination(isPresented: $showingOpenAISettings) {
+            OpenAISummarizationSettingsView(onConfigurationChanged: {
+                Task { refreshEngineStatuses() }
+            })
+        }
+        .navigationDestination(isPresented: $showingOpenAICompatibleSettings) {
+            OpenAICompatibleSettingsView(onConfigurationChanged: {
+                Task { refreshEngineStatuses() }
+            })
+        }
+        .navigationDestination(isPresented: $showingGoogleAIStudioSettings) {
+            GoogleAIStudioSettingsView(onConfigurationChanged: {
+                Task { refreshEngineStatuses() }
+            })
+        }
+        .navigationDestination(isPresented: $showingMistralAISettings) {
+            MistralAISettingsView(onConfigurationChanged: {
+                Task { refreshEngineStatuses() }
+            })
+        }
+        .navigationDestination(isPresented: $showingAWSBedrockSettings) {
+            AWSBedrockSettingsView()
+        }
+        .navigationDestination(isPresented: $showingOnDeviceLLMSettings) {
+            OnDeviceLLMSettingsView()
+        }
+        .navigationDestination(isPresented: $showingMLXSwiftSettings) {
+            MLXSwiftSettingsView()
+        }
+        #else
         .sheet(isPresented: $showingOllamaSettings) {
             OllamaSettingsView(onConfigurationChanged: {
                 self.refreshEngineStatuses()
@@ -337,7 +376,8 @@ struct AISettingsView: View {
                 MLXSwiftSettingsView()
             }
         }
-        .fullScreenCover(isPresented: $showingMistralOnboarding) {
+        #endif
+        .platformFullScreenCover(isPresented: $showingMistralOnboarding) {
             MistralOnboardingView(onSetupComplete: {
                 refreshEngineStatuses()
             })

BisonNotes AI/BisonNotes AI/AWSBedrockSettingsView.swift

@@ -41,7 +41,7 @@ struct AWSBedrockSettingsView: View {
     }
 
     var body: some View {
-        NavigationStack {
+        PlatformSettingsNavigationStack {
             Form {
                 headerSection
 
@@ -54,6 +54,7 @@ struct AWSBedrockSettingsView: View {
                     documentationSection
                 }
             }
+            .nativeMacSettingsFormStyle()
             .scrollContentBackground(.hidden)
             .background(Color(.systemGroupedBackground))
             .navigationTitle("AWS Bedrock Settings")

BisonNotes AI/BisonNotes AI/AWSSettingsView.swift

@@ -30,7 +30,7 @@ struct AWSSettingsView: View {
     ]
 
     var body: some View {
-        NavigationStack {
+        PlatformSettingsNavigationStack {
             Form {
                 Section(header: Text("AWS Transcribe")) {
                     VStack(alignment: .leading, spacing: 8) {
@@ -196,6 +196,7 @@ struct AWSSettingsView: View {
                     Link("AWS IAM Setup Guide", destination: URL(string: "https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html")!)
                 }
             }
+            .nativeMacSettingsFormStyle()
             .scrollContentBackground(.hidden)
             .background(Color(.systemGroupedBackground))
             .navigationTitle("AWS Settings")

BisonNotes AI/BisonNotes AI/AppDelegate.swift

@@ -6,18 +6,24 @@
 //  Phase 6: Notification Action Handling
 //
 
+#if canImport(UIKit)
 import UIKit
+#else
+import AppKit
+#endif
 import UserNotifications
 import MetricKit
 
-class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDelegate, MXMetricManagerSubscriber {
+/// Platform-neutral app-delegate logic (notification actions, MetricKit,
+/// badge clearing). The platform-specific AppDelegate subclasses below only
+/// differ in the launch callback that triggers `completeLaunchSetup()`.
+class AppDelegateCore: NSObject, UNUserNotificationCenterDelegate, MXMetricManagerSubscriber {
 
     // Reference to AudioRecorderViewModel for handling resume actions
     // This will be set by the main app
     static weak var recorderViewModel: AudioRecorderViewModel?
 
-    func application(_ application: UIApplication,
-                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
+    func completeLaunchSetup() {
         // Set notification delegate
         UNUserNotificationCenter.current().delegate = self
 
@@ -28,8 +34,6 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
         AppLog.shared.markLaunch()
 
         NSLog("✅ AppDelegate initialized - notification delegate set")
-
-        return true
     }
 
     // MARK: - MetricKit
@@ -101,7 +105,7 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
 
         if categoryIdentifier == "RESUME_RECORDING" {
             Task { @MainActor in
-                guard let recorderVM = AppDelegate.recorderViewModel else {
+                guard let recorderVM = AppDelegateCore.recorderViewModel else {
                     AppLog.shared.general("AudioRecorderViewModel not available for notification action", level: .error)
                     completionHandler()
                     return
@@ -139,10 +143,24 @@ class AppDelegate: NSObject, UIApplicationDelegate, UNUserNotificationCenterDele
                                 willPresent notification: UNNotification,
                                 withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
         // Show notification even when app is in foreground
-        if #available(iOS 14.0, *) {
-            completionHandler([.banner, .sound, .badge])
-        } else {
-            completionHandler([.alert, .sound, .badge])
-        }
+        completionHandler([.banner, .sound, .badge])
+    }
+}
+
+#if canImport(UIKit)
+class AppDelegate: AppDelegateCore, UIApplicationDelegate {
+
+    func application(_ application: UIApplication,
+                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
+        completeLaunchSetup()
+        return true
+    }
+}
+#else
+class AppDelegate: AppDelegateCore, NSApplicationDelegate {
+
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        completeLaunchSetup()
     }
 }
+#endif

BisonNotes AI/BisonNotes AI/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -29,6 +29,66 @@
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"
+    },
+    {
+      "filename" : "AppIcon-mac-16x16.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "AppIcon-mac-16x16@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16"
+    },
+    {
+      "filename" : "AppIcon-mac-32x32.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "AppIcon-mac-32x32@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32"
+    },
+    {
+      "filename" : "AppIcon-mac-128x128.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "AppIcon-mac-128x128@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128"
+    },
+    {
+      "filename" : "AppIcon-mac-256x256.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "AppIcon-mac-256x256@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256"
+    },
+    {
+      "filename" : "AppIcon-mac-512x512.png",
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512"
+    },
+    {
+      "filename" : "AppIcon-mac-512x512@2x.png",
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512"
     }
   ],
   "info" : {