Skip to content

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

perf(overlay): commit hide before any post-stop state work

altic-devebcc71ab1cc3
diff --git a/Sources/Fluid/Services/MenuBarManager.swift b/Sources/Fluid/Services/MenuBarManager.swift
index 20fbefa1..ce8bd0fe 100644
--- a/Sources/Fluid/Services/MenuBarManager.swift
+++ b/Sources/Fluid/Services/MenuBarManager.swift
@@ -452,7 +452,18 @@ final class MenuBarManager: NSObject, ObservableObject, NSMenuDelegate {
self.overlayBench("finish_hide_request closingAnimation=\(SettingsStore.shared.overlayClosingAnimationEnabled)")
NotchOverlayManager.shared.hide()
let windowHideReturnedAt = ProcessInfo.processInfo.systemUptime
- self.flushDeferredStoppedRecordingState()
+ // The status item refresh is a WindowServer fence; keep it out of the
+ // transaction that removes the overlay.
+ CATransaction.setCompletionBlock { [weak self] in
+ MainActor.assumeIsolated {
+ let refreshStartedAt = ProcessInfo.processInfo.systemUptime
+ self?.flushDeferredStoppedRecordingState()
+ DebugLogger.shared.info(
+ "HIDE_NOW postCommitMenuRefreshUs=\(Int((ProcessInfo.processInfo.systemUptime - refreshStartedAt) * 1_000_000))",
+ source: "StopTiming"
+ )
+ }
+ }
DebugLogger.shared.info(
"HIDE_NOW windowHideUs=\(Int((windowHideReturnedAt - startedAt) * 1_000_000)) " +
"menuRefreshUs=\(Int((ProcessInfo.processInfo.systemUptime - windowHideReturnedAt) * 1_000_000))",
diff --git a/Sources/Fluid/Services/NotchOverlayManager.swift b/Sources/Fluid/Services/NotchOverlayManager.swift
index afcbd31c..5c784c3e 100644
--- a/Sources/Fluid/Services/NotchOverlayManager.swift
+++ b/Sources/Fluid/Services/NotchOverlayManager.swift
@@ -356,22 +356,24 @@ final class NotchOverlayManager {
waiters.forEach { $0.resume(returning: .hidden) }
Self.overlayBench("hide_immediate_complete elapsedMs=\(Self.elapsedMs(since: startedAt))")
- Task { @MainActor [weak self] in
- var cleanupTrace = OverlayCloseTrace("manager.deferredCleanup")
- cleanupTrace.mark("scheduledDelay", since: startedAt)
- defer { cleanupTrace.finish() }
- await Task.yield()
- cleanupTrace.mark("yield")
- guard let self, self.generation == currentGeneration else { return }
- ActiveAppMonitor.shared.stopMonitoring()
- cleanupTrace.mark("stopMonitoring")
- NotchContentState.shared.setProcessing(false)
- cleanupTrace.mark("processingFalse")
- NotchContentState.shared.updateTranscription("")
- cleanupTrace.mark("clearTranscription")
- NotchContentState.shared.setSpokenSendIndicatorState(.hidden)
- cleanupTrace.mark("clearIndicator")
- Self.overlayBench("hide_immediate_cleanup_complete")
+ // Runs after the hide transaction is committed so state churn cannot
+ // delay the panel leaving the screen.
+ CATransaction.setCompletionBlock { [weak self] in
+ MainActor.assumeIsolated {
+ var cleanupTrace = OverlayCloseTrace("manager.postCommitCleanup")
+ cleanupTrace.mark("commitDelay", since: startedAt)
+ defer { cleanupTrace.finish() }
+ guard let self, self.generation == currentGeneration else { return }
+ ActiveAppMonitor.shared.stopMonitoring()
+ cleanupTrace.mark("stopMonitoring")
+ NotchContentState.shared.setProcessing(false)
+ cleanupTrace.mark("processingFalse")
+ NotchContentState.shared.updateTranscription("")
+ cleanupTrace.mark("clearTranscription")
+ NotchContentState.shared.setSpokenSendIndicatorState(.hidden)
+ cleanupTrace.mark("clearIndicator")
+ Self.overlayBench("hide_immediate_cleanup_complete")
+ }
}
}
diff --git a/Sources/Fluid/Views/BottomOverlayView.swift b/Sources/Fluid/Views/BottomOverlayView.swift
index 57b0bf08..b72a297b 100644
--- a/Sources/Fluid/Views/BottomOverlayView.swift
+++ b/Sources/Fluid/Views/BottomOverlayView.swift
@@ -208,6 +208,12 @@ final class BottomOverlayWindowController {
self.window?.setAccessibilityElement(true)
self.window?.ignoresMouseEvents = false
self.window?.alphaValue = 1
+ CATransaction.setCompletionBlock {
+ DebugLogger.shared.info(
+ "SHOW_COMMIT elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - startedAt) * 1000).rounded()))",
+ source: "StopTiming"
+ )
+ }
self.window?.orderFrontRegardless()
self.window?.contentView?.displayIfNeeded()
self.window?.displayIfNeeded()
@@ -269,6 +275,24 @@ final class BottomOverlayWindowController {
self.window?.alphaValue = 0
self.window?.setAccessibilityChildren([])
self.window?.setAccessibilityElement(false)
+ // Everything below runs after the transaction carrying alpha 0 has been
+ // committed to WindowServer, so SwiftUI state churn and the
+ // ignoresMouseEvents fence can never delay the visual removal.
+ CATransaction.setCompletionBlock { [weak self] in
+ MainActor.assumeIsolated {
+ DebugLogger.shared.info(
+ "HIDE_COMMIT elapsedMs=\(Int(((ProcessInfo.processInfo.systemUptime - startedAt) * 1000).rounded()))",
+ source: "StopTiming"
+ )
+ guard let self, self.presentationGeneration == currentGeneration else { return }
+ var cleanupTrace = OverlayCloseTrace("bottom.postCommitCleanup")
+ defer { cleanupTrace.finish() }
+ self.clearPresentationStateAfterImmediateHide()
+ cleanupTrace.mark("clearState")
+ self.window?.ignoresMouseEvents = true
+ cleanupTrace.mark("ignoreMouse")
+ }
+ }
DebugLogger.shared.info(
"HIDE_NOW hideUs=\(Int((ProcessInfo.processInfo.systemUptime - startedAt) * 1_000_000)) " +
"windowVisible=\(self.window?.isVisible == true)",
@@ -280,21 +304,6 @@ final class BottomOverlayWindowController {
Self.overlayBench(
"bottom_hide_immediate_complete elapsedMs=\(Self.elapsedMs(since: startedAt)) visible=\(self.window?.isVisible == true)"
)
-
- // State cleanup is not user-visible and must not hold up text insertion
- // or the next shortcut. It never touches the window frame or ordering.
- Task { @MainActor [weak self] in
- var cleanupTrace = OverlayCloseTrace("bottom.deferredCleanup")
- cleanupTrace.mark("scheduledDelay", since: startedAt)
- await Task.yield()
- cleanupTrace.mark("yield")
- defer { cleanupTrace.finish() }
- guard let self, self.presentationGeneration == currentGeneration else { return }
- self.clearPresentationStateAfterImmediateHide()
- cleanupTrace.mark("clearState")
- self.window?.ignoresMouseEvents = true
- cleanupTrace.mark("ignoreMouse")
- }
}
private func clearPresentationStateAfterImmediateHide() {