Fastest and only macOS Dictation app with on-device STT and custom trained AI enhancement model. Windows, iOS testflight! Android, Linux waitlist open! A local Wispr Flow alternative. Follow https://x.com/fluidvoiceapp for more
Make hotkey mode switching deterministic across dictate/edit/command
altic-devabdc977aa8e0
diff --git a/Sources/Fluid/ContentView.swift b/Sources/Fluid/ContentView.swiftindex f58f59c2..93d66e02 100644--- a/Sources/Fluid/ContentView.swift+++ b/Sources/Fluid/ContentView.swift@@ -38,6 +38,13 @@ enum SidebarItem: Hashable {// NOTE: Streaming and AI response parsing is now handled by LLMClientstruct ContentView: View {+ private enum ActiveRecordingMode: String {+ case none+ case dictate+ case edit+ case command+ }+@EnvironmentObject private var appServices: AppServices@StateObject private var mouseTracker = MousePositionTracker()@StateObject private var commandModeService = CommandModeService()@@ -64,6 +71,7 @@ struct ContentView: View {@State private var isRewriteModeShortcutEnabled: Bool = SettingsStore.shared.rewriteModeShortcutEnabled@State private var isRecordingForRewrite: Bool = false // Track if current recording is for rewrite mode@State private var isRecordingForCommand: Bool = false // Track if current recording is for command mode+ @State private var activeRecordingMode: ActiveRecordingMode = .none@State private var isRecordingShortcut = false@State private var isRecordingCommandModeShortcut = false@State private var isRecordingRewriteShortcut = false@@ -507,11 +515,11 @@ struct ContentView: View {if !newValue {self.isRecordingCommandModeShortcut = false- if self.isRecordingForCommand {+ if self.activeRecordingMode == .command {if self.asr.isRunning {Task { await self.asr.stopWithoutTranscription() }}- self.isRecordingForCommand = false+ self.clearActiveRecordingMode()self.menuBarManager.setOverlayMode(.dictation)}}@@ -523,11 +531,11 @@ struct ContentView: View {if !newValue {self.isRecordingRewriteShortcut = false- if self.isRecordingForRewrite {+ if self.activeRecordingMode == .edit {if self.asr.isRunning {Task { await self.asr.stopWithoutTranscription() }}- self.isRecordingForRewrite = false+ self.clearActiveRecordingMode()self.rewriteModeService.clearState()self.menuBarManager.setOverlayMode(.dictation)}@@ -1499,21 +1507,15 @@ struct ContentView: View {DebugLogger.shared.debug("stopAndProcessTranscription called", source: "ContentView")// Check if we're in rewrite or command mode- let wasRewriteMode = self.isRecordingForRewrite- let wasCommandMode = self.isRecordingForCommand+ let modeAtStop = self.activeRecordingMode+ let wasRewriteMode = modeAtStop == .edit || self.isRecordingForRewrite+ let wasCommandMode = modeAtStop == .command || self.isRecordingForCommandDebugLogger.shared.info(- "Routing decision snapshot | rewrite=\(wasRewriteMode) | command=\(wasCommandMode) | overlay=\(NotchContentState.shared.mode.rawValue)",+ "Routing decision snapshot | activeMode=\(modeAtStop.rawValue) | rewrite=\(wasRewriteMode) | command=\(wasCommandMode) | overlay=\(NotchContentState.shared.mode.rawValue)",source: "ContentView")- if wasRewriteMode {- self.isRecordingForRewrite = false- // Don't reset overlay mode here - let it stay colored until it hides- }- if wasCommandMode {- self.isRecordingForCommand = false- // Don't reset overlay mode here - let it stay colored until it hides- }+ self.clearActiveRecordingMode()// Show "Transcribing..." state before calling stop() to keep overlay visible.// The asr.stop() call performs the final transcription which can take a moment@@ -1785,18 +1787,36 @@ struct ContentView: View {}}+ private func setActiveRecordingMode(_ mode: ActiveRecordingMode) {+ self.activeRecordingMode = mode+ switch mode {+ case .none, .dictate:+ self.isRecordingForCommand = false+ self.isRecordingForRewrite = false+ case .edit:+ self.isRecordingForCommand = false+ self.isRecordingForRewrite = true+ case .command:+ self.isRecordingForCommand = true+ self.isRecordingForRewrite = false+ }+ }++ private func clearActiveRecordingMode() {+ self.setActiveRecordingMode(.none)+ }+private func handleLivePromptModeSwitch(_ mode: SettingsStore.PromptMode) {guard !NotchContentState.shared.isProcessing else { return }switch mode.normalized {case .dictate:- guard self.isRecordingForRewrite || NotchContentState.shared.mode != .dictation else { return }- self.isRecordingForRewrite = false+ guard self.activeRecordingMode != .dictate || NotchContentState.shared.mode != .dictation else { return }+ self.setActiveRecordingMode(.dictate)self.rewriteModeService.clearState()self.menuBarManager.setOverlayMode(.dictation)case .edit:- guard self.isRecordingForRewrite == false || NotchContentState.shared.mode == .dictation else { return }- self.isRecordingForRewrite = true- self.isRecordingForCommand = false+ guard self.activeRecordingMode != .edit || NotchContentState.shared.mode == .dictation else { return }+ self.setActiveRecordingMode(.edit)let hasOriginal = !self.rewriteModeService.originalText.trimmingCharacters(in: .whitespacesAndNewlines).isEmptylet hasContext = !self.rewriteModeService.selectedContextText.trimmingCharacters(in: .whitespacesAndNewlines).isEmptyif !hasOriginal, !hasContext {@@ -1808,9 +1828,8 @@ struct ContentView: View {}self.menuBarManager.setOverlayMode(.edit)case .write, .rewrite:- guard self.isRecordingForRewrite == false || NotchContentState.shared.mode == .dictation else { return }- self.isRecordingForRewrite = true- self.isRecordingForCommand = false+ guard self.activeRecordingMode != .edit || NotchContentState.shared.mode == .dictation else { return }+ self.setActiveRecordingMode(.edit)let hasOriginal = !self.rewriteModeService.originalText.trimmingCharacters(in: .whitespacesAndNewlines).isEmptylet hasContext = !self.rewriteModeService.selectedContextText.trimmingCharacters(in: .whitespacesAndNewlines).isEmptyif !hasOriginal, !hasContext {@@ -1828,16 +1847,13 @@ struct ContentView: View {guard !NotchContentState.shared.isProcessing else { return }switch mode {case .dictation:- self.isRecordingForCommand = falseself.handleLivePromptModeSwitch(.dictate)case .edit, .write, .rewrite:- self.isRecordingForCommand = falseself.handleLivePromptModeSwitch(.edit)case .command:- guard self.isRecordingForCommand == false || NotchContentState.shared.mode != .command else { return }- self.isRecordingForRewrite = false+ guard self.activeRecordingMode != .command || NotchContentState.shared.mode != .command else { return }self.rewriteModeService.clearState()- self.isRecordingForCommand = true+ self.setActiveRecordingMode(.command)self.menuBarManager.setOverlayMode(.command)}}@@ -1862,6 +1878,8 @@ struct ContentView: View {// Capture app context at start to avoid mismatches if the user switches apps mid-sessionprivate func startRecording() {+ self.setActiveRecordingMode(.dictate)+// Ensure normal dictation mode is set (command/rewrite modes set their own)if !self.isRecordingForCommand, !self.isRecordingForRewrite {self.menuBarManager.setOverlayMode(.dictation)@@ -2107,6 +2125,20 @@ struct ContentView: View {startRecordingCallback: {self.startRecording()},+ dictationModeCallback: {+ DebugLogger.shared.info("Dictate mode triggered", source: "ContentView")+ self.setActiveRecordingMode(.dictate)+ self.rewriteModeService.clearState()+ self.menuBarManager.setOverlayMode(.dictation)++ guard !self.asr.isRunning else { return }+ if SettingsStore.shared.enableTranscriptionSounds {+ TranscriptionSoundPlayer.shared.playStartSound()+ }+ Task {+ await self.asr.start()+ }+ },stopAndProcessCallback: {await self.stopAndProcessTranscription()},@@ -2114,11 +2146,13 @@ struct ContentView: View {DebugLogger.shared.info("Command mode triggered", source: "ContentView")// Set flag so stopAndProcessTranscription knows to process as command- self.isRecordingForCommand = true+ self.setActiveRecordingMode(.command)// Set overlay mode to commandself.menuBarManager.setOverlayMode(.command)+ guard !self.asr.isRunning else { return }+// Start recording immediately for the commandDebugLogger.shared.info("Starting voice recording for command",@@ -2153,7 +2187,9 @@ struct ContentView: View {}// Set flag so stopAndProcessTranscription knows to process as rewrite- self.isRecordingForRewrite = true+ self.setActiveRecordingMode(.edit)++ guard !self.asr.isRunning else { return }// Start recording immediately for the edit instructionDebugLogger.shared.info("Starting voice recording for edit mode", source: "ContentView")@@ -2163,6 +2199,15 @@ struct ContentView: View {Task {await self.asr.start()}+ },+ isDictateRecordingProvider: {+ self.activeRecordingMode == .dictate+ },+ isCommandRecordingProvider: {+ self.activeRecordingMode == .command+ },+ isRewriteRecordingProvider: {+ self.activeRecordingMode == .edit})@@ -2183,13 +2228,8 @@ struct ContentView: View {}// Reset recording mode flags- if self.isRecordingForCommand {- self.isRecordingForCommand = false- self.menuBarManager.setOverlayMode(.dictation)- handled = true- }- if self.isRecordingForRewrite {- self.isRecordingForRewrite = false+ if self.activeRecordingMode != .none {+ self.clearActiveRecordingMode()self.menuBarManager.setOverlayMode(.dictation)handled = true}diff --git a/Sources/Fluid/Services/GlobalHotkeyManager.swift b/Sources/Fluid/Services/GlobalHotkeyManager.swiftindex dfdab457..fb9568ed 100644--- a/Sources/Fluid/Services/GlobalHotkeyManager.swift+++ b/Sources/Fluid/Services/GlobalHotkeyManager.swift@@ -37,9 +37,13 @@ final class GlobalHotkeyManager: NSObject {private var commandModeShortcutEnabled: Boolprivate var rewriteModeShortcutEnabled: Boolprivate var startRecordingCallback: (() async -> Void)?+ private var dictationModeCallback: (() async -> Void)?private var stopAndProcessCallback: (() async -> Void)?private var commandModeCallback: (() async -> Void)?private var rewriteModeCallback: (() async -> Void)?+ private var isDictateRecordingProvider: (() -> Bool)?+ private var isCommandRecordingProvider: (() -> Bool)?+ private var isRewriteRecordingProvider: (() -> Bool)?private var cancelCallback: (() -> Bool)? // Returns true if handledprivate var pressAndHoldMode: Bool = SettingsStore.shared.pressAndHoldMode@@ -104,9 +108,13 @@ final class GlobalHotkeyManager: NSObject {commandModeShortcutEnabled: Bool,rewriteModeShortcutEnabled: Bool,startRecordingCallback: (() async -> Void)? = nil,+ dictationModeCallback: (() async -> Void)? = nil,stopAndProcessCallback: (() async -> Void)? = nil,commandModeCallback: (() async -> Void)? = nil,- rewriteModeCallback: (() async -> Void)? = nil+ rewriteModeCallback: (() async -> Void)? = nil,+ isDictateRecordingProvider: (() -> Bool)? = nil,+ isCommandRecordingProvider: (() -> Bool)? = nil,+ isRewriteRecordingProvider: (() -> Bool)? = nil) {self.asrService = asrServiceself.shortcut = shortcut@@ -115,9 +123,13 @@ final class GlobalHotkeyManager: NSObject {self.commandModeShortcutEnabled = commandModeShortcutEnabledself.rewriteModeShortcutEnabled = rewriteModeShortcutEnabledself.startRecordingCallback = startRecordingCallback+ self.dictationModeCallback = dictationModeCallbackself.stopAndProcessCallback = stopAndProcessCallbackself.commandModeCallback = commandModeCallbackself.rewriteModeCallback = rewriteModeCallback+ self.isDictateRecordingProvider = isDictateRecordingProvider+ self.isCommandRecordingProvider = isCommandRecordingProvider+ self.isRewriteRecordingProvider = isRewriteRecordingProvidersuper.init()self.initializeWithDelay()@@ -366,8 +378,13 @@ final class GlobalHotkeyManager: NSObject {} else {// Toggle mode: press to start, press again to stopif self.asrService.isRunning {- DebugLogger.shared.info("Command mode shortcut pressed while recording - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()+ if self.isCommandRecordingProvider?() ?? false {+ DebugLogger.shared.info("Command mode shortcut pressed in Command mode - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ } else {+ DebugLogger.shared.info("Command mode shortcut pressed while recording - switching mode", source: "GlobalHotkeyManager")+ self.triggerCommandMode()+ }} else {DebugLogger.shared.info("Command mode shortcut triggered - starting", source: "GlobalHotkeyManager")self.triggerCommandMode()@@ -389,8 +406,13 @@ final class GlobalHotkeyManager: NSObject {} else {// Toggle mode: press to start, press again to stopif self.asrService.isRunning {- DebugLogger.shared.info("Rewrite mode shortcut pressed while recording - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()+ if self.isRewriteRecordingProvider?() ?? false {+ DebugLogger.shared.info("Rewrite mode shortcut pressed in Edit mode - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ } else {+ DebugLogger.shared.info("Rewrite mode shortcut pressed while recording - switching mode", source: "GlobalHotkeyManager")+ self.triggerRewriteMode()+ }} else {DebugLogger.shared.info("Rewrite mode shortcut triggered - starting", source: "GlobalHotkeyManager")self.triggerRewriteMode()@@ -405,10 +427,42 @@ final class GlobalHotkeyManager: NSObject {if self.pressAndHoldMode {if !self.isKeyPressed {self.isKeyPressed = true- self.startRecordingIfNeeded()+ if self.asrService.isRunning {+ let isSameMode = self.isDictateRecordingProvider?() ?? false+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate | active=\(isSameMode ? "dictate" : "other") | asrRunning=true | action=\(isSameMode ? "stop" : "switch")",+ source: "GlobalHotkeyManager"+ )+ if !isSameMode {+ self.triggerDictationMode()+ }+ } else {+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate | active=none | asrRunning=false | action=start",+ source: "GlobalHotkeyManager"+ )+ self.startRecordingIfNeeded()+ }}} else {- self.toggleRecording()+ if self.asrService.isRunning {+ let isSameMode = self.isDictateRecordingProvider?() ?? false+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate | active=\(isSameMode ? "dictate" : "other") | asrRunning=true | action=\(isSameMode ? "stop" : "switch")",+ source: "GlobalHotkeyManager"+ )+ if isSameMode {+ self.stopRecordingIfNeeded()+ } else {+ self.triggerDictationMode()+ }+ } else {+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate | active=none | asrRunning=false | action=start",+ source: "GlobalHotkeyManager"+ )+ self.triggerDictationMode()+ }}return nil}@@ -498,8 +552,13 @@ final class GlobalHotkeyManager: NSObject {} else if wasCleanPress {// Toggle mode: only trigger on release if no other key was pressedif self.asrService.isRunning {- DebugLogger.shared.info("Command mode modifier released (toggle) - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()+ if self.isCommandRecordingProvider?() ?? false {+ DebugLogger.shared.info("Command mode modifier released (toggle, same mode) - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ } else {+ DebugLogger.shared.info("Command mode modifier released (toggle, switch mode) - switching", source: "GlobalHotkeyManager")+ self.triggerCommandMode()+ }} else {DebugLogger.shared.info("Command mode modifier released (toggle) - starting", source: "GlobalHotkeyManager")self.triggerCommandMode()@@ -572,8 +631,13 @@ final class GlobalHotkeyManager: NSObject {} else if wasCleanPress {// Toggle mode: only trigger on release if no other key was pressedif self.asrService.isRunning {- DebugLogger.shared.info("Rewrite mode modifier released (toggle) - stopping", source: "GlobalHotkeyManager")- self.stopRecordingIfNeeded()+ if self.isRewriteRecordingProvider?() ?? false {+ DebugLogger.shared.info("Rewrite mode modifier released (toggle, same mode) - stopping", source: "GlobalHotkeyManager")+ self.stopRecordingIfNeeded()+ } else {+ DebugLogger.shared.info("Rewrite mode modifier released (toggle, switch mode) - switching", source: "GlobalHotkeyManager")+ self.triggerRewriteMode()+ }} else {DebugLogger.shared.info("Rewrite mode modifier released (toggle) - starting", source: "GlobalHotkeyManager")self.triggerRewriteMode()@@ -637,7 +701,24 @@ final class GlobalHotkeyManager: NSObject {}} else if wasCleanPress {// Toggle mode: only trigger on release if no other key was pressed- self.toggleRecording()+ if self.asrService.isRunning {+ let isSameMode = self.isDictateRecordingProvider?() ?? false+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate(mod) | active=\(isSameMode ? "dictate" : "other") | asrRunning=true | action=\(isSameMode ? "stop" : "switch")",+ source: "GlobalHotkeyManager"+ )+ if isSameMode {+ self.stopRecordingIfNeeded()+ } else {+ self.triggerDictationMode()+ }+ } else {+ DebugLogger.shared.info(+ "Hotkey route | pressed=dictate(mod) | active=none | asrRunning=false | action=start",+ source: "GlobalHotkeyManager"+ )+ self.triggerDictationMode()+ }} else {DebugLogger.shared.debug("Transcription modifier released but another key was pressed - ignoring", source: "GlobalHotkeyManager")}@@ -668,6 +749,20 @@ final class GlobalHotkeyManager: NSObject {}}+ private func triggerDictationMode() {+ Task { @MainActor [weak self] in+ guard let self = self else { return }+ DebugLogger.shared.info("Dictate mode hotkey triggered", source: "GlobalHotkeyManager")+ if let callback = self.dictationModeCallback {+ await callback()+ } else if let startCallback = self.startRecordingCallback {+ await startCallback()+ } else {+ await self.asrService.start()+ }+ }+ }+func enablePressAndHoldMode(_ enable: Bool) {self.pressAndHoldMode = enableif !enable, self.isKeyPressed {diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swiftindex faa2851f..b1b89a1e 100644--- a/Sources/Fluid/Views/BottomOverlayView.swift+++ b/Sources/Fluid/Views/BottomOverlayView.swift@@ -9,6 +9,19 @@ import AppKitimport Combineimport SwiftUI+private enum OverlayShortcutResolver {+ static func shortcutDisplay(for mode: OverlayMode, settings: SettingsStore = .shared) -> String {+ switch mode {+ case .dictation:+ return settings.hotkeyShortcut.displayString+ case .edit, .write, .rewrite:+ return settings.rewriteModeHotkeyShortcut.displayString+ case .command:+ return settings.commandModeHotkeyShortcut.displayString+ }+ }+}+// MARK: - Bottom Overlay Window Controller@MainActor@@ -29,7 +42,7 @@ final class BottomOverlayWindowController {}NotificationCenter.default.addObserver(forName: NSNotification.Name("OverlaySizeChanged"), object: nil, queue: .main) { [weak self] _ inTask { @MainActor [weak self] in- self?.updateSizeAndPosition()+ self?.scheduleSizeAndPositionUpdate(after: 0)}}}@@ -109,6 +122,10 @@ final class BottomOverlayWindowController {}func refreshSizeForContent() {+ self.scheduleSizeAndPositionUpdate()+ }++ private func scheduleSizeAndPositionUpdate(after delay: TimeInterval = 0.03) {self.pendingResizeWorkItem?.cancel()// Debounce rapid streaming updates to avoid resize thrash.@@ -116,7 +133,7 @@ final class BottomOverlayWindowController {self?.updateSizeAndPosition()}self.pendingResizeWorkItem = resizeWorkItem- DispatchQueue.main.asyncAfter(deadline: .now() + 0.03, execute: resizeWorkItem)+ DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: resizeWorkItem)}/// Update window size based on current SwiftUI content and re-position@@ -800,6 +817,7 @@ final class BottomOverlayModeMenuController {private struct BottomOverlayModeMenuView: View {@ObservedObject private var contentState = NotchContentState.shared+ @ObservedObject private var settings = SettingsStore.sharedlet maxWidth: CGFloatlet onHoverChanged: (Bool) -> Void@@ -849,6 +867,7 @@ private struct BottomOverlayModeMenuView: View {@ViewBuilderprivate func modeRow(_ title: String, mode: OverlayMode, rowID: String) -> some View {let isSelected = self.normalizedOverlayMode == mode+ let shortcut = OverlayShortcutResolver.shortcutDisplay(for: mode, settings: self.settings)Button(action: {guard !self.contentState.isProcessing else { return }@@ -859,6 +878,15 @@ private struct BottomOverlayModeMenuView: View {Text(title).font(.system(size: 15, weight: .semibold))Spacer()+ if !shortcut.isEmpty {+ Text(shortcut)+ .font(.system(size: 11, weight: .semibold))+ .foregroundStyle(.white.opacity(0.7))+ .padding(.horizontal, 6)+ .padding(.vertical, 2)+ .background(Color.white.opacity(0.08))+ .clipShape(Capsule())+ }if isSelected {Image(systemName: "checkmark").font(.system(size: 10, weight: .semibold))@@ -1126,6 +1154,7 @@ private struct PromptSelectorAnchorReader: NSViewRepresentable {struct BottomOverlayView: View {@ObservedObject private var contentState = NotchContentState.shared@ObservedObject private var appServices = AppServices.shared+ @ObservedObject private var activeAppMonitor = ActiveAppMonitor.shared@ObservedObject private var settings = SettingsStore.shared@Environment(\.theme) private var theme@State private var isHoveringModeChip = false@@ -1149,6 +1178,7 @@ struct BottomOverlayView: View {let barSpacing: CGFloatlet minBarHeight: CGFloatlet maxBarHeight: CGFloat+ let containerWidth: CGFloatlet overlayWidth: CGFloatlet overlayHeight: CGFloatlet previewBoxHeight: CGFloat@@ -1173,6 +1203,7 @@ struct BottomOverlayView: View {barSpacing: 3.5,minBarHeight: 5,maxBarHeight: 16,+ containerWidth: 200,overlayWidth: 300,overlayHeight: 124,previewBoxHeight: 0,@@ -1195,6 +1226,7 @@ struct BottomOverlayView: View {barSpacing: 4.5,minBarHeight: 6,maxBarHeight: 28,+ containerWidth: 340,overlayWidth: 380,overlayHeight: 156,previewBoxHeight: 0,@@ -1217,6 +1249,7 @@ struct BottomOverlayView: View {barSpacing: 6.0,minBarHeight: 8,maxBarHeight: 44,+ containerWidth: 600,overlayWidth: 600,overlayHeight: 288,previewBoxHeight: 92,@@ -1557,8 +1590,8 @@ struct BottomOverlayView: View {self.modeSelectorViewself.promptSelectorView}- .frame(maxWidth: .infinity, alignment: .leading)- .padding(.leading, self.layout.hPadding)+ .frame(maxWidth: .infinity, alignment: .center)+ .padding(.horizontal, self.layout.hPadding)}VStack(spacing: self.layout.vPadding / 2) {@@ -1674,7 +1707,9 @@ struct BottomOverlayView: View {// Waveform + Mode label rowHStack(spacing: self.layout.hPadding / 1.5) {// Target app icon (the app where text will be typed)- if self.settings.overlaySize != .small, let appIcon = contentState.targetAppIcon {+ let appIcon = self.contentState.targetAppIcon ?? self.activeAppMonitor.activeAppIcon+ if appIcon != nil || !self.appServices.asr.isAsrReady &&+ (self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel) {let showModelLoading = !self.appServices.asr.isAsrReady &&(self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel)VStack(spacing: 2) {@@ -1682,12 +1717,16 @@ struct BottomOverlayView: View {ProgressView().controlSize(.mini)}- Image(nsImage: appIcon)- .resizable()- .aspectRatio(contentMode: .fit)- .frame(width: self.layout.iconSize, height: self.layout.iconSize)- .clipShape(RoundedRectangle(cornerRadius: self.layout.iconSize / 4))+ if let appIcon = appIcon {+ Image(nsImage: appIcon)+ .resizable()+ .aspectRatio(contentMode: .fit)+ .frame(width: self.layout.iconSize, height: self.layout.iconSize)+ .clipShape(RoundedRectangle(cornerRadius: self.layout.iconSize / 4))+ }}+ .frame(width: self.layout.iconSize, height: self.layout.iconSize)+ .opacity((appIcon != nil || self.appServices.asr.isLoadingModel || self.appServices.asr.isDownloadingModel) ? 1 : 0)}// Waveform visualization@@ -1713,10 +1752,10 @@ struct BottomOverlayView: View {}}}- }+ }.padding(.horizontal, self.layout.hPadding).padding(.vertical, self.layout.vPadding)- .frame(maxWidth: .infinity, alignment: .topLeading)+ .frame(maxWidth: .infinity, alignment: .center).background(ZStack {// Solid pitch black background@@ -1741,10 +1780,13 @@ struct BottomOverlayView: View {.frame(maxWidth: .infinity, alignment: .top)}.frame(- width: self.layout.usesFixedCanvas ? self.layout.overlayWidth : nil,+ width: self.layout.usesFixedCanvas ? self.layout.overlayWidth : self.layout.containerWidth,height: self.layout.usesFixedCanvas ? self.layout.overlayHeight : nil,alignment: .top)+ .onChange(of: self.settings.overlaySize) { _, _ in+ BottomOverlayWindowController.shared.refreshSizeForContent()+ }.onChange(of: self.contentState.cachedPreviewText) { _, _ inif !self.layout.usesFixedCanvas {BottomOverlayWindowController.shared.refreshSizeForContent()