UX changes for notch presentation and DynamicNotchKit pin update

Sources/Fluid/ContentView.swift

@@ -314,27 +314,34 @@ struct ContentView: View {
 
             // Set up notch click callback for expanding command conversation
             NotchOverlayManager.shared.onNotchClicked = {
+                guard NotchOverlayManager.shared.canHandleNotchCommandTap else { return }
                 // When notch is clicked in command mode, show expanded conversation
-                if !NotchContentState.shared.commandConversationHistory.isEmpty {
+                if NotchOverlayManager.shared.canShowExpandedCommandOutput,
+                   !NotchContentState.shared.commandConversationHistory.isEmpty
+                {
                     NotchOverlayManager.shared.showExpandedCommandOutput()
                 }
             }
 
             // Set up command mode callbacks for notch
             NotchOverlayManager.shared.onCommandFollowUp = { [weak commandModeService] text in
+                guard NotchOverlayManager.shared.allowsCommandNotchActions else { return }
                 await commandModeService?.processFollowUpCommand(text)
             }
 
             // Chat management callbacks
             NotchOverlayManager.shared.onNewChat = { [weak commandModeService] in
+                guard NotchOverlayManager.shared.allowsCommandNotchActions else { return }
                 commandModeService?.createNewChat()
             }
 
             NotchOverlayManager.shared.onSwitchChat = { [weak commandModeService] chatID in
+                guard NotchOverlayManager.shared.allowsCommandNotchActions else { return }
                 commandModeService?.switchToChat(id: chatID)
             }
 
             NotchOverlayManager.shared.onClearChat = { [weak commandModeService] in
+                guard NotchOverlayManager.shared.allowsCommandNotchActions else { return }
                 commandModeService?.deleteCurrentChat()
             }
 
@@ -1777,12 +1784,12 @@ struct ContentView: View {
 
         self.clearActiveRecordingMode()
 
-        // Show "Transcribing..." state before calling stop() to keep overlay visible.
+        // Show "Transcribing" state before calling stop() to keep overlay visible.
         // The asr.stop() call performs the final transcription which can take a moment
         // (especially for slower models like Whisper Medium/Large).
         DebugLogger.shared.debug("Showing transcription processing state", source: "ContentView")
         self.menuBarManager.setProcessing(true)
-        NotchOverlayManager.shared.updateTranscriptionText("Transcribing...")
+        NotchOverlayManager.shared.updateTranscriptionText("Transcribing")
 
         // Give SwiftUI a chance to render the processing state before we do heavier work
         // (ASR finalization + optional AI post-processing).
@@ -1799,6 +1806,7 @@ struct ContentView: View {
             DebugLogger.shared.debug("Transcription returned empty text", source: "ContentView")
             // Hide processing state when returning early
             self.menuBarManager.setProcessing(false)
+            NotchOverlayManager.shared.hide()
             return
         }
 
@@ -1877,7 +1885,7 @@ struct ContentView: View {
             let postProcessingStart = Date()
 
             // Update overlay text to show we're now refining (processing already true)
-            NotchOverlayManager.shared.updateTranscriptionText("Refining...")
+            NotchOverlayManager.shared.updateTranscriptionText("Refining")
 
             // Ensure the status label becomes visible immediately.
             await Task.yield()
@@ -2040,6 +2048,10 @@ struct ContentView: View {
                 ]
             )
         }
+
+        if !didTypeExternally {
+            NotchOverlayManager.shared.hide()
+        }
     }
 
     private func currentDictationOutputRouteForHotkeyStop() -> DictationOutputRoute {

Sources/Fluid/Persistence/SettingsStore.swift

@@ -1350,6 +1350,22 @@ final class SettingsStore: ObservableObject {
         }
     }
 
+    /// Internal presentation modes for the top notch overlay.
+    /// This is intentionally separate from bottom overlay sizing.
+    enum NotchPresentationMode: String, CaseIterable, Codable {
+        case standard
+        case minimal
+
+        var displayName: String {
+            switch self {
+            case .standard:
+                return "Standard Notch"
+            case .minimal:
+                return "Compact"
+            }
+        }
+    }
+
     /// Where the recording overlay appears (default: bottom)
     var overlayPosition: OverlayPosition {
         get {
@@ -1366,6 +1382,22 @@ final class SettingsStore: ObservableObject {
         }
     }
 
+    /// Internal-only top notch presentation mode. No public settings UI yet.
+    var notchPresentationMode: NotchPresentationMode {
+        get {
+            guard let raw = self.defaults.string(forKey: Keys.notchPresentationMode),
+                  let mode = NotchPresentationMode(rawValue: raw)
+            else {
+                return .standard
+            }
+            return mode
+        }
+        set {
+            objectWillChange.send()
+            self.defaults.set(newValue.rawValue, forKey: Keys.notchPresentationMode)
+        }
+    }
+
     /// Vertical offset for the bottom overlay (distance from bottom of screen/dock)
     var overlayBottomOffset: Double {
         get {
@@ -3625,6 +3657,7 @@ private extension SettingsStore {
 
         // Overlay Position
         static let overlayPosition = "OverlayPosition"
+        static let notchPresentationMode = "NotchPresentationMode"
         static let overlayBottomOffset = "OverlayBottomOffset"
         static let overlayBottomOffsetMigratedTo50 = "OverlayBottomOffsetMigratedTo50"
         static let overlaySize = "OverlaySize"

Sources/Fluid/Services/CommandModeService.swift

@@ -33,6 +33,10 @@ final class CommandModeService: ObservableObject {
         self.loadCurrentChatFromStore()
     }
 
+    private var shouldSyncCommandNotchState: Bool {
+        self.enableNotchOutput && NotchOverlayManager.shared.shouldSyncCommandConversationToNotch
+    }
+
     private func loadCurrentChatFromStore() {
         if let session = chatStore.currentSession {
             self.currentChatID = session.id
@@ -278,6 +282,10 @@ final class CommandModeService: ObservableObject {
 
     /// Sync conversation history to NotchContentState
     private func syncToNotchState() {
+        guard self.shouldSyncCommandNotchState else {
+            return
+        }
+
         NotchContentState.shared.clearCommandOutput()
 
         for msg in self.conversationHistory {
@@ -308,7 +316,7 @@ final class CommandModeService: ObservableObject {
         self.saveCurrentChat()
 
         // Push to notch
-        if self.enableNotchOutput {
+        if self.shouldSyncCommandNotchState {
             NotchContentState.shared.addCommandMessage(role: .user, content: text)
             NotchContentState.shared.setCommandProcessing(true)
         }
@@ -322,14 +330,18 @@ final class CommandModeService: ObservableObject {
 
         // Add to both histories
         self.conversationHistory.append(Message(role: .user, content: text))
-        NotchContentState.shared.addCommandMessage(role: .user, content: text)
+        if self.shouldSyncCommandNotchState {
+            NotchContentState.shared.addCommandMessage(role: .user, content: text)
+        }
 
         // Auto-save after adding user message
         self.saveCurrentChat()
 
         self.isProcessing = true
         self.didRequireConfirmationThisRun = false
-        NotchContentState.shared.setCommandProcessing(true)
+        if self.shouldSyncCommandNotchState {
+            NotchContentState.shared.setCommandProcessing(true)
+        }
 
         await self.processNextTurn()
     }
@@ -374,7 +386,7 @@ final class CommandModeService: ObservableObject {
             self.captureCommandRunCompleted(success: false)
 
             // Push to notch
-            if self.enableNotchOutput {
+            if self.shouldSyncCommandNotchState {
                 NotchContentState.shared.addCommandMessage(role: .assistant, content: errorMsg)
                 NotchContentState.shared.setCommandProcessing(false)
                 self.showExpandedNotchIfNeeded()
@@ -386,7 +398,7 @@ final class CommandModeService: ObservableObject {
         self.currentStep = .thinking("Analyzing...")
 
         // Push status to notch
-        if self.enableNotchOutput {
+        if self.shouldSyncCommandNotchState {
             NotchContentState.shared.addCommandMessage(role: .status, content: "Thinking...")
         }
 
@@ -414,7 +426,7 @@ final class CommandModeService: ObservableObject {
                 ))
 
                 // Push step to notch
-                if self.enableNotchOutput {
+                if self.shouldSyncCommandNotchState {
                     let statusText = tc.purpose ?? self.stepDescription(for: stepType)
                     NotchContentState.shared.addCommandMessage(role: .status, content: statusText)
                 }
@@ -432,7 +444,7 @@ final class CommandModeService: ObservableObject {
                     self.currentStep = nil
 
                     // Push confirmation needed to notch
-                    if self.enableNotchOutput {
+                    if self.shouldSyncCommandNotchState {
                         NotchContentState.shared.addCommandMessage(role: .status, content: "⚠️ Confirmation needed in Command Mode window")
                         NotchContentState.shared.setCommandProcessing(false)
                     }
@@ -464,7 +476,7 @@ final class CommandModeService: ObservableObject {
                 self.captureCommandRunCompleted(success: isFinal)
 
                 // Push final response to notch and show expanded view
-                if self.enableNotchOutput {
+                if self.shouldSyncCommandNotchState {
                     NotchContentState.shared.updateCommandStreamingText("") // Clear streaming
                     NotchContentState.shared.addCommandMessage(role: .assistant, content: response.content)
                     NotchContentState.shared.setCommandProcessing(false)
@@ -488,7 +500,7 @@ final class CommandModeService: ObservableObject {
             self.captureCommandRunCompleted(success: false)
 
             // Push error to notch
-            if self.enableNotchOutput {
+            if self.shouldSyncCommandNotchState {
                 NotchContentState.shared.addCommandMessage(role: .assistant, content: errorMsg)
                 NotchContentState.shared.setCommandProcessing(false)
                 self.showExpandedNotchIfNeeded()
@@ -530,7 +542,8 @@ final class CommandModeService: ObservableObject {
 
     /// Show expanded notch output if there's content to display
     private func showExpandedNotchIfNeeded() {
-        guard self.enableNotchOutput else { return }
+        guard self.shouldSyncCommandNotchState else { return }
+        guard NotchOverlayManager.shared.canShowExpandedCommandOutput else { return }
         guard !NotchContentState.shared.commandConversationHistory.isEmpty else { return }
 
         // Show the expanded notch
@@ -913,7 +926,7 @@ final class CommandModeService: ObservableObject {
                         self.streamingText = fullContent
 
                         // Push to notch for real-time display
-                        if self.enableNotchOutput {
+                        if self.shouldSyncCommandNotchState {
                             NotchContentState.shared.updateCommandStreamingText(fullContent)
                         }
                     }
@@ -929,7 +942,7 @@ final class CommandModeService: ObservableObject {
         let fullContent = self.streamingBuffer.joined()
         if !fullContent.isEmpty {
             self.streamingText = fullContent
-            if self.enableNotchOutput {
+            if self.shouldSyncCommandNotchState {
                 NotchContentState.shared.updateCommandStreamingText(fullContent)
             }
         }
@@ -946,7 +959,7 @@ final class CommandModeService: ObservableObject {
         self.thinkingBuffer = [] // Clear thinking buffer
 
         // Clear notch streaming text as well
-        if self.enableNotchOutput {
+        if self.shouldSyncCommandNotchState {
             NotchContentState.shared.updateCommandStreamingText("")
         }
 

Sources/Fluid/Services/MenuBarManager.swift

@@ -44,6 +44,8 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
     // Track pending overlay operations to prevent spam
     private var pendingShowOperation: DispatchWorkItem?
     private var pendingHideOperation: DispatchWorkItem?
+    private var pendingProcessingShowOperation: DispatchWorkItem?
+    private let processingVisualDelay: DispatchTimeInterval = .milliseconds(100)
 
     // Subscription for forwarding audio levels to expanded command notch
     private var expandedModeAudioSubscription: AnyCancellable?
@@ -87,9 +89,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
             .receive(on: DispatchQueue.main)
             .sink { [weak self] newText in
                 guard self != nil else { return }
-                // CRITICAL FIX: Check if streaming preview is enabled before updating notch
-                // The "Show Live Preview" toggle in Preferences should control this behavior
-                if SettingsStore.shared.enableStreamingPreview {
+                if NotchOverlayManager.shared.shouldShowOrTrackLivePreviewText {
                     NotchOverlayManager.shared.updateTranscriptionText(newText)
                 }
             }
@@ -107,7 +107,6 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
         // Prevent rapid state changes that could cause cycles
         guard self.overlayVisible != isRunning else { return }
 
-        let delay: DispatchTimeInterval = .milliseconds(30)
         if isRunning {
             // Cancel any pending hide operation
             self.pendingHideOperation?.cancel()
@@ -119,7 +118,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
             if NotchOverlayManager.shared.isCommandOutputExpanded {
                 // Only keep expanded notch if this is a command mode recording (follow-up)
                 // For other modes (dictation, rewrite), close it and show regular notch
-                if self.currentOverlayMode == .command {
+                if self.currentOverlayMode == .command, NotchOverlayManager.shared.supportsCommandNotchUI {
                     // Enable recording visualization in the expanded notch
                     NotchContentState.shared.setRecordingInExpandedMode(true)
 
@@ -143,7 +142,10 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
 
                 // Double-check expanded notch isn't showing (could have changed during delay)
                 // But only block if we're in command mode
-                if NotchOverlayManager.shared.isCommandOutputExpanded && self.currentOverlayMode == .command {
+                if NotchOverlayManager.shared.isCommandOutputExpanded,
+                   self.currentOverlayMode == .command,
+                   NotchOverlayManager.shared.supportsCommandNotchUI
+                {
                     self.pendingShowOperation = nil
                     return
                 }
@@ -157,7 +159,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
                 self.pendingShowOperation = nil
             }
             self.pendingShowOperation = showItem
-            DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: showItem)
+            DispatchQueue.main.async(execute: showItem)
         } else {
             // Cancel any pending show operation
             self.pendingShowOperation?.cancel()
@@ -191,7 +193,7 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
                 self.pendingHideOperation = nil
             }
             self.pendingHideOperation = hideItem
-            DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: hideItem)
+            DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(30), execute: hideItem)
         }
     }
 
@@ -211,11 +213,22 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
         self.isProcessingActive = processing
 
         if processing {
+            self.pendingProcessingShowOperation?.cancel()
             // Cancel any pending hide - we want to keep the overlay visible for AI processing
             self.pendingHideOperation?.cancel()
             self.pendingHideOperation = nil
             self.overlayVisible = true
+
+            let showItem = DispatchWorkItem { [weak self] in
+                guard let self = self, self.isProcessingActive else { return }
+                NotchOverlayManager.shared.setProcessing(true)
+                self.pendingProcessingShowOperation = nil
+            }
+            self.pendingProcessingShowOperation = showItem
+            DispatchQueue.main.asyncAfter(deadline: .now() + self.processingVisualDelay, execute: showItem)
         } else {
+            self.pendingProcessingShowOperation?.cancel()
+            self.pendingProcessingShowOperation = nil
             // When processing ends, schedule the hide (unless expanded output is showing)
             self.overlayVisible = false
 
@@ -240,8 +253,9 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
             }
             self.pendingHideOperation = hideItem
             DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(100), execute: hideItem)
+            NotchOverlayManager.shared.setProcessing(false)
+            return
         }
-        NotchOverlayManager.shared.setProcessing(processing)
     }
 
     private func setupMenuBarSafely() {