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
fix(meetings): detect Meet calls in Safari and Chrome
altic-devc46af86ac0c0
diff --git a/Sources/Fluid/Services/Meeting/MeetingAutoDetectSignals.swift b/Sources/Fluid/Services/Meeting/MeetingAutoDetectSignals.swiftindex d27a59da..169f95c5 100644--- a/Sources/Fluid/Services/Meeting/MeetingAutoDetectSignals.swift+++ b/Sources/Fluid/Services/Meeting/MeetingAutoDetectSignals.swift@@ -36,6 +36,12 @@ protocol WorkspaceEventsProviding: AnyObject {/// candidates at startup.func start(isRegistryApp: @escaping (String) -> Bool, onBackfill: @escaping ([WorkspaceEvent]) -> Void)func stop()+ /// The app in front right now; nil when unknown (tests) or when no app is frontmost.+ var frontmostProcessID: Int32? { get }+}++extension WorkspaceEventsProviding {+ var frontmostProcessID: Int32? { nil }}nonisolated struct MicActivityEdge: Sendable, Equatable {@@ -178,6 +184,7 @@ extension DetectionActivityGate {@MainActorfinal class WorkspaceEventsMonitor: WorkspaceEventsProviding {var onEvent: ((WorkspaceEvent) -> Void)?+ var frontmostProcessID: Int32? { NSWorkspace.shared.frontmostApplication?.processIdentifier }private var observers: [NSObjectProtocol] = []@@ -715,8 +722,11 @@ final class CGWindowSnapshotProvider: WindowSnapshotProviding {@MainActorfinal class AXBrowserTabReader: BrowserTabReading {private static let messagingTimeoutSeconds: Float = 0.3- private static let maxDepth = 4+ /// Safari nests its web area about six levels below the window (split group, tab group,+ /// groups, scroll area); Chrome and Edge sit shallower. Chrome-side subtrees are skipped by role.+ private static let maxDepth = 9private static let maxChildrenPerLevel = 24+ nonisolated private static let skippedRoles: Set<String> = ["AXToolbar", "AXMenuBar", "AXMenu", "AXPopUpButton", "AXButton", "AXTextField", "AXStaticText", "AXImage"]private static let circuitBreakerThreshold = 2private let queue = DispatchQueue(label: "com.fluidvoice.meeting.autodetect.ax", qos: .utility)@@ -724,7 +734,10 @@ final class AXBrowserTabReader: BrowserTabReading {private var trippedBundleIdentifiers: Set<String> = []func frontmostTabURL(bundleIdentifier: String, processID: Int32) async -> BrowserTabURL? {- guard !self.trippedBundleIdentifiers.contains(bundleIdentifier) else { return nil }+ guard !self.trippedBundleIdentifiers.contains(bundleIdentifier) else {+ DebugLogger.shared.log("browser-url-read outcome=tripped bundle=\(bundleIdentifier)", source: "MeetingAutoDetector")+ return nil+ }let outcome = await withCheckedContinuation { (continuation: CheckedContinuation<ReadOutcome, Never>) inself.queue.async {@@ -735,8 +748,11 @@ final class AXBrowserTabReader: BrowserTabReading {switch outcome {case let .found(url):self.timeoutCounts[bundleIdentifier] = 0+ let inCall = MeetingInCallURLMatcher.isInCallURL(host: url.host, path: url.path)+ DebugLogger.shared.log("browser-url-read outcome=found host=\(inCall ? url.host : "other") in-call=\(inCall) bundle=\(bundleIdentifier)", source: "MeetingAutoDetector")return url- case .notFound:+ case let .notFound(detail):+ DebugLogger.shared.log("browser-url-read outcome=not-found detail=\(detail) trusted=\(AXIsProcessTrusted()) bundle=\(bundleIdentifier)", source: "MeetingAutoDetector")return nilcase .timedOut:let count = (self.timeoutCounts[bundleIdentifier] ?? 0) + 1@@ -744,13 +760,14 @@ final class AXBrowserTabReader: BrowserTabReading {if count >= Self.circuitBreakerThreshold {self.trippedBundleIdentifiers.insert(bundleIdentifier)}+ DebugLogger.shared.log("browser-url-read outcome=timed-out count=\(count) bundle=\(bundleIdentifier)", source: "MeetingAutoDetector")return nil}}private enum ReadOutcome {case found(BrowserTabURL)- case notFound+ case notFound(String)case timedOut}@@ -762,11 +779,12 @@ final class AXBrowserTabReader: BrowserTabReading {var windowValue: CFTypeRef?let windowStatus = AXUIElementCopyAttributeValue(appElement, kAXFocusedWindowAttribute as CFString, &windowValue)guard windowStatus != .cannotComplete else { return .timedOut }- guard windowStatus == .success, let window = windowValue else { return .notFound }+ guard windowStatus == .success, let window = windowValue else { return .notFound("focused-window status=\(windowStatus.rawValue)") }// swiftlint:disable:next force_castlet windowElement = window as! AXUIElement- if let urlString = self.stringAttribute(windowElement, attribute: "AXDocument"), let url = self.parse(urlString) {+ let document = self.stringAttribute(windowElement, attribute: "AXDocument")+ if let document, let url = self.parse(document) {return .found(url)}@@ -774,7 +792,7 @@ final class AXBrowserTabReader: BrowserTabReading {if let found = self.breadthFirstFindWebAreaURL(root: windowElement, depth: 0, timedOut: &timedOut) {return .found(found)}- return timedOut ? .timedOut : .notFound+ return timedOut ? .timedOut : .notFound("document=\(document == nil ? "nil" : "set") webarea=miss")}nonisolated private static func breadthFirstFindWebAreaURL(root: AXUIElement, depth: Int, timedOut: inout Bool) -> BrowserTabURL? {@@ -784,18 +802,22 @@ final class AXBrowserTabReader: BrowserTabReading {if status == .cannotComplete { timedOut = true; return nil }guard status == .success, let children = childrenValue as? [AXUIElement] else { return nil }+ var containers: [AXUIElement] = []for child in children.prefix(Self.maxChildrenPerLevel) {- if let role = self.stringAttribute(child, attribute: kAXRoleAttribute as String), role == "AXWebArea",- let urlString = self.stringAttribute(child, attribute: "AXURL"),- let url = self.parse(urlString)- {- return url+ let role = self.stringAttribute(child, attribute: kAXRoleAttribute as String) ?? ""+ if role == "AXWebArea" {+ if let urlString = self.stringAttribute(child, attribute: "AXURL"), let url = self.parse(urlString) {+ return url+ }+ continue}+ if !Self.skippedRoles.contains(role) { containers.append(child) }}- for child in children.prefix(Self.maxChildrenPerLevel) {+ for child in containers {if let found = self.breadthFirstFindWebAreaURL(root: child, depth: depth + 1, timedOut: &timedOut) {return found}+ if timedOut { return nil }}return nil}diff --git a/Sources/Fluid/Services/Meeting/MeetingAutoDetector.swift b/Sources/Fluid/Services/Meeting/MeetingAutoDetector.swiftindex 260427e5..e375e0b1 100644--- a/Sources/Fluid/Services/Meeting/MeetingAutoDetector.swift+++ b/Sources/Fluid/Services/Meeting/MeetingAutoDetector.swift@@ -25,6 +25,19 @@ final class MeetingAutoDetector {var pid: Int32var tier: MeetingDetectionTiervar cta: PromptCTA = .record+ /// Browser tier only: the meeting service behind the tab, e.g. "Google Meet".+ var serviceName: String? = nil+ }++ static func serviceName(forEvidenceKey key: String) -> String? {+ guard key.hasPrefix("url:") else { return nil }+ let host = key.dropFirst(4).split(separator: "/").first.map(String.init)?.lowercased() ?? ""+ if host == "meet.google.com" { return "Google Meet" }+ if host.hasSuffix("zoom.us") { return "Zoom" }+ if host.hasPrefix("teams.") { return "Microsoft Teams" }+ if host.contains("whereby.com") { return "Whereby" }+ if host == "meet.jit.si" { return "Jitsi" }+ return nil}enum PromptCTA: String, Equatable, Sendable { case record, setup }@@ -245,8 +258,8 @@ final class MeetingAutoDetector {}}- /// Backfill only arms known-running apps; it never seeds mic/frontmost timestamps, so an- /// already-in-progress meeting can never be retroactively confirmed from this alone.+ /// Backfill only arms known-running apps; it never seeds mic/frontmost timestamps. A backfilled+ /// app is only stamped frontmost later, at a mic edge while it is actually in front.func handleBackfill(_ events: [WorkspaceEvent]) {for event in events {guard let tier = MeetingAppRegistry.tier(forBundleIdentifier: event.bundleIdentifier) else { continue }@@ -283,8 +296,16 @@ final class MeetingAutoDetector {return}self.lastMicReleaseAt = nil+ let frontmostPID = self.workspaceEvents.frontmostProcessIDfor pid in self.records.keys {- guard let record = self.records[pid], self.isFrontmostNearEdge(record, edge: now) else { continue }+ guard var record = self.records[pid] else { continue }+ // A browser the user has been sitting in for minutes (Calendar → Meet) never re-activates;+ // being in front at the moment the mic opens is equally strong evidence.+ if frontmostPID == pid, !self.isFrontmostNearEdge(record, edge: now) {+ record.lastFrontmostAt = now+ self.records[pid] = record+ }+ guard self.isFrontmostNearEdge(record, edge: now) else { continue }self.records[pid]?.audioEvidenceAt = nowself.records[pid]?.audioEvidenceSource = .deviceDebugLogger.shared.log("audio-evidence-begin path=device bundle=\(record.bundleIdentifier)", source: "MeetingAutoDetector")@@ -495,6 +516,7 @@ final class MeetingAutoDetector {private func attemptConfirm(pid: Int32, at now: Date) {guard let record = self.records[pid],+ record.tier == .nativeTier1 ? self.isNativeDetectionEnabled() : self.isBrowserDetectionEnabled(),let audioEvidenceAt = record.audioEvidenceAt,let audioEvidenceSource = record.audioEvidenceSource,let windowEvidenceAt = record.windowEvidenceAt,@@ -555,7 +577,7 @@ final class MeetingAutoDetector {DebugLogger.shared.log("confirm-accepted bundle=\(record.bundleIdentifier)", source: "MeetingAutoDetector")DebugLogger.shared.log("prompt-requested bundle=\(record.bundleIdentifier)", source: "MeetingAutoDetector")let cta: PromptCTA = readiness == .ready ? .record : .setup- self.onPromptRequested?(PromptRequest(episodeID: episode.id, bundleIdentifier: episode.bundleIdentifier, pid: pid, tier: episode.tier, cta: cta))+ self.onPromptRequested?(PromptRequest(episodeID: episode.id, bundleIdentifier: episode.bundleIdentifier, pid: pid, tier: episode.tier, cta: cta, serviceName: Self.serviceName(forEvidenceKey: evidenceKey)))}private func logConfirmRejected(_ reason: String, bundleIdentifier: String) {