Sources/battery_probe/main.swift

@@ -1,54 +1,35 @@
 import Foundation
 import IOBluetooth
 
-let isPowerOn = (IOBluetoothHostController.default()?.powerState == kBluetoothHCIPowerStateON)
+func runProbe() {
-print("POWER:\(isPowerOn ? 1 : 0)")
+    guard let paired = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] else { return }
-
+    for dev in paired where dev.isConnected() {
-guard isPowerOn else {
-    exit(0)
-}
-
-typealias IntFn = @convention(c) (AnyObject, Selector) -> Int
-
-func getInt(_ target: AnyObject, _ selName: String) -> Int? {
-    let sel = Selector((selName))
-    if target.responds(to: sel) {
-        let imp = target.method(for: sel)
-        let fn = unsafeBitCast(imp, to: IntFn.self)
-        let v = fn(target, sel)
-        if v > 0 && v <= 100 { return v }
-    }
-    return nil
-}
-
-if let paired = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] {
-    let selPeer = Selector(("peer"))
-    for dev in paired {
         let addr = dev.addressString ?? ""
-        let name = dev.nameOrAddress ?? ""
+        let sel = Selector(("batteryPercentSingle"))
-        let connected = dev.isConnected()
+        if dev.responds(to: sel) {
-        
+            let imp = dev.method(for: sel)
-        var single = getInt(dev, "batteryPercentSingle") ?? getInt(dev, "headsetBattery")
+            typealias IntFn = @convention(c) (AnyObject, Selector) -> Int
-        var left = getInt(dev, "batteryPercentLeft")
+            let fn = unsafeBitCast(imp, to: IntFn.self)
-        var right = getInt(dev, "batteryPercentRight")
+            let val = fn(dev, sel)
-        var bCase = getInt(dev, "batteryPercentCase")
+            if val > 0 && val <= 100 {
-        var combined = getInt(dev, "batteryPercentCombined")
+                print("\(addr):\(val)")
-        
+                continue
-        if dev.responds(to: selPeer),
+            }
-           let peer = dev.perform(selPeer)?.takeUnretainedValue() as? NSObject {
-            if single == nil { single = getInt(peer, "batteryPercentSingle") ?? getInt(peer, "headsetBattery") }
-            if left == nil { left = getInt(peer, "batteryPercentLeft") }
-            if right == nil { right = getInt(peer, "batteryPercentRight") }
-            if bCase == nil { bCase = getInt(peer, "batteryPercentCase") }
-            if combined == nil { combined = getInt(peer, "batteryPercentCombined") }
         }
         
-        let sStr = single.map(String.init) ?? "-1"
+        let selPeer = Selector(("peer"))
-        let lStr = left.map(String.init) ?? "-1"
+        if dev.responds(to: selPeer),
-        let rStr = right.map(String.init) ?? "-1"
+           let peer = dev.perform(selPeer)?.takeUnretainedValue() as? NSObject,
-        let cStr = bCase.map(String.init) ?? "-1"
+           peer.responds(to: sel) {
-        let combStr = combined.map(String.init) ?? "-1"
+            let imp = peer.method(for: sel)
-        
+            typealias IntFn = @convention(c) (AnyObject, Selector) -> Int
-        print("DEV:\(addr):\(name):\(connected ? 1 : 0):\(sStr):\(lStr):\(rStr):\(cStr):\(combStr)")
+            let fn = unsafeBitCast(imp, to: IntFn.self)
+            let val = fn(peer, sel)
+            if val > 0 && val <= 100 {
+                print("\(addr):\(val)")
+            }
+        }
     }
 }
+
+runProbe()

Sources/blts_tracker/BLTSTrackerApp.swift

@@ -28,51 +28,38 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
     
     private static func runBatteryProbe() {
-        let isPowerOn = (IOBluetoothHostController.default()?.powerState == kBluetoothHCIPowerStateON)
-        print("POWER:\(isPowerOn ? 1 : 0)")
-        guard isPowerOn else { exit(0) }
-        
         typealias IntGetter = @convention(c) (AnyObject, Selector) -> Int
-        func getInt(_ target: AnyObject, _ selName: String) -> Int? {
+        let selSingle = Selector(("batteryPercentSingle"))
-            let sel = Selector((selName))
+        let selPeer = Selector(("peer"))
-            if target.responds(to: sel) {
-                let imp = target.method(for: sel)
-                let fn = unsafeBitCast(imp, to: IntGetter.self)
-                let v = fn(target, sel)
-                if v > 0 && v <= 100 { return v }
-            }
-            return nil
-        }
         
         if let paired = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] {
-            let selPeer = Selector(("peer"))
+            for dev in paired where dev.isConnected() {
-            for dev in paired {
                 let addr = dev.addressString ?? ""
-                let name = dev.nameOrAddress ?? ""
+                var batt: Int? = nil
-                let connected = dev.isConnected()
                 
-                var single = getInt(dev, "batteryPercentSingle") ?? getInt(dev, "headsetBattery")
+                if dev.responds(to: selSingle) {
-                var left = getInt(dev, "batteryPercentLeft")
+                    let imp = dev.method(for: selSingle)
-                var right = getInt(dev, "batteryPercentRight")
+                    let fn = unsafeBitCast(imp, to: IntGetter.self)
-                var bCase = getInt(dev, "batteryPercentCase")
+                    let val = fn(dev, selSingle)
-                var combined = getInt(dev, "batteryPercentCombined")
+                    if val > 0 && val <= 100 {
-                
+                        batt = val
-                if dev.responds(to: selPeer),
+                    }
-                   let peer = dev.perform(selPeer)?.takeUnretainedValue() as? NSObject {
-                    if single == nil { single = getInt(peer, "batteryPercentSingle") ?? getInt(peer, "headsetBattery") }
-                    if left == nil { left = getInt(peer, "batteryPercentLeft") }
-                    if right == nil { right = getInt(peer, "batteryPercentRight") }
-                    if bCase == nil { bCase = getInt(peer, "batteryPercentCase") }
-                    if combined == nil { combined = getInt(peer, "batteryPercentCombined") }
                 }
                 
-                let sStr = single.map(String.init) ?? "-1"
+                if batt == nil, dev.responds(to: selPeer),
-                let lStr = left.map(String.init) ?? "-1"
+                   let peer = dev.perform(selPeer)?.takeUnretainedValue() as? NSObject,
-                let rStr = right.map(String.init) ?? "-1"
+                   peer.responds(to: selSingle) {
-                let cStr = bCase.map(String.init) ?? "-1"
+                    let imp = peer.method(for: selSingle)
-                let combStr = combined.map(String.init) ?? "-1"
+                    let fn = unsafeBitCast(imp, to: IntGetter.self)
+                    let val = fn(peer, selSingle)
+                    if val > 0 && val <= 100 {
+                        batt = val
+                    }
+                }
                 
-                print("DEV:\(addr):\(name):\(connected ? 1 : 0):\(sStr):\(lStr):\(rStr):\(cStr):\(combStr)")
+                if let b = batt {
+                    print("\(addr):\(b)")
+                }
             }
         }
     }
@@ -107,8 +94,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         // Start active tracking
         tracker.startTracking()
         
-        // Regular safety UI sync timer in AppDelegate
+        // Direct main thread timer in AppDelegate for guaranteed 1-second UI refresh
         let t = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { [weak self] _ in
+            self?.tracker.updateDeviceList()
             self?.updateStatusItem()
         }
         RunLoop.main.add(t, forMode: .common)
@@ -135,9 +123,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
             return
         }
         
-        let isPowerOn = tracker.isBluetoothPoweredOn
+        // Find best active device (either marked active or any connected device with battery data)
         let active = tracker.activeHeadphone ?? tracker.devices.first(where: { $0.isConnected && $0.primaryBatteryPercent != nil })
-        let isConn = isPowerOn && (active?.isConnected == true)
+        let isConn = active?.isConnected == true
         let percent = tracker.currentBatteryPercent ?? active?.primaryBatteryPercent
         
         if button.image == nil || button.image?.accessibilityDescription != "Bluetooth Battery" {
@@ -148,7 +136,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         if isConn, let p = percent, p > 0 {
             button.title = " \(p)%"
         } else {
-            // When Bluetooth is off or headphones disconnected: show ONLY the headphones icon
             button.title = ""
         }
         
@@ -156,7 +143,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         button.needsLayout = true
         button.needsDisplay = true
         
-        let logLine = "[\(Date())] Dev: \(active?.name ?? "none") | Conn: \(isConn) | Power: \(isPowerOn) | Battery: \(percent.map(String.init) ?? "nil") | Title: '\(button.title)'\n"
+        let logLine = "[\(Date())] Dev: \(active?.name ?? "none") | Conn: \(isConn) | Battery: \(percent.map(String.init) ?? "nil") | Title: '\(button.title)'\n"
         if let data = logLine.data(using: .utf8) {
             if let handle = try? FileHandle(forWritingTo: URL(fileURLWithPath: "/tmp/blts_live.log")) {
                 handle.seekToEndOfFile()
@@ -175,14 +162,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     private func buildMenu(_ menu: NSMenu) {
         menu.removeAllItems()
         
-        let isPowerOn = tracker.isBluetoothPoweredOn
         let active = tracker.activeHeadphone ?? tracker.devices.first(where: { $0.isConnected && $0.primaryBatteryPercent != nil })
-        
+        if let dev = active, dev.isConnected {
-        if !isPowerOn {
-            let item = NSMenuItem(title: "⚠️ Bluetooth выключен", action: nil, keyEquivalent: "")
-            item.isEnabled = false
-            menu.addItem(item)
-        } else if let dev = active, dev.isConnected {
             let batt = tracker.currentBatteryPercent ?? dev.primaryBatteryPercent
             let percentStr = batt != nil ? "\(batt!)%" : "Подключено"
             let titleItem = NSMenuItem(title: "🎧 \(dev.name): \(percentStr)", action: nil, keyEquivalent: "")

Sources/blts_tracker/Services/BluetoothTracker.swift

@@ -15,19 +15,38 @@ public final class BluetoothTracker: ObservableObject {
     @Published public var currentBatteryPercent: Int?
     @Published public var currentDeviceName: String = ""
     @Published public var isConnected: Bool = false
-    @Published public var isBluetoothPoweredOn: Bool = true
     
     private var timerSource: DispatchSourceTimer?
     private var knownBatteries: [String: Int] = [:]
+    
+    private typealias VoidFn = @convention(c) (AnyObject, Selector) -> Void
+    private typealias IntBatteryGetter = @convention(c) (AnyObject, Selector) -> Int
     private typealias BoolGetter = @convention(c) (AnyObject, Selector) -> Bool
     
-    public static func checkBluetoothPower() -> Bool {
+    private func syncFromServer(device: IOBluetoothDevice) {
-        guard let controller = IOBluetoothHostController.default() else { return false }
+        let selUpdate = Selector(("updateFromServer"))
-        return controller.powerState == kBluetoothHCIPowerStateON
+        if device.responds(to: selUpdate) {
+            let imp = device.method(for: selUpdate)
+            let fn = unsafeBitCast(imp, to: VoidFn.self)
+            fn(device, selUpdate)
+        }
+        
+        // Force CoreBluetooth coordinator to purge cached peers and query bluetoothd
+        if let cls = NSClassFromString("IOBluetoothCoreBluetoothCoordinator") as? NSObject.Type,
+           let coord = cls.perform(Selector(("sharedInstance")))?.takeUnretainedValue() as? NSObject,
+           let mgr = coord.perform(Selector(("classicManager")))?.takeUnretainedValue() as? NSObject {
+            let selOrphan = Selector(("orphanClassicPeers"))
+            if mgr.responds(to: selOrphan) {
+                _ = mgr.perform(selOrphan)
+            }
+            let selReq = Selector(("sendLocalDeviceStateRequest"))
+            if mgr.responds(to: selReq) {
+                _ = mgr.perform(selReq)
+            }
+        }
     }
     
     public init() {
-        self.isBluetoothPoweredOn = BluetoothTracker.checkBluetoothPower()
         setupBluetoothListeners()
         startTracking()
     }
@@ -41,16 +60,12 @@ public final class BluetoothTracker: ObservableObject {
         updateDeviceList()
         pollSubprocessProbe()
         
-        // Strict 1.0s timer for probe monitoring (with zero-flicker authoritative updates)
+        // Kernel-level DispatchSourceTimer: strictly 1 second interval
         let timer = DispatchSource.makeTimerSource(flags: .strict, queue: DispatchQueue.main)
         timer.schedule(deadline: .now() + 1.0, repeating: 1.0, leeway: .milliseconds(50))
         timer.setEventHandler { [weak self] in
-            guard let self = self else { return }
+            self?.updateDeviceList()
-            if !BluetoothTracker.checkBluetoothPower() {
+            self?.pollSubprocessProbe()
-                self.applyPowerOffState()
-            } else {
-                self.pollSubprocessProbe()
-            }
         }
         timer.resume()
         self.timerSource = timer
@@ -63,43 +78,28 @@ public final class BluetoothTracker: ObservableObject {
     
     private var isProbeRunning = false
     
-    private func resolveProbeBinary() -> (String, [String])? {
-        // 1. Same directory as current executable
-        if let exeDir = Bundle.main.executableURL?.deletingLastPathComponent().path {
-            let dedicated = "\(exeDir)/battery_probe"
-            if FileManager.default.isExecutableFile(atPath: dedicated) {
-                return (dedicated, [])
-            }
-        }
-        
-        // 2. App bundle path in project directory
-        let bundleProbe = "/Users/autli/Documents/blts_tracker/BLTS Tracker.app/Contents/MacOS/battery_probe"
-        if FileManager.default.isExecutableFile(atPath: bundleProbe) {
-            return (bundleProbe, [])
-        }
-        
-        // 3. Current executable only if named blts_tracker
-        if let exePath = Bundle.main.executablePath,
-           exePath.hasSuffix("blts_tracker"),
-           FileManager.default.isExecutableFile(atPath: exePath) {
-            return (exePath, ["--battery-probe"])
-        }
-        
-        return nil
-    }
-    
     public func pollSubprocessProbe() {
         guard !isProbeRunning else { return }
         
-        if !BluetoothTracker.checkBluetoothPower() {
+        var probeBin: String? = nil
-            applyPowerOffState()
+        var probeArgs: [String] = []
-            return
+        
+        if let exeDir = Bundle.main.executableURL?.deletingLastPathComponent().path {
+            let dedicated = "\(exeDir)/battery_probe"
+            if FileManager.default.isExecutableFile(atPath: dedicated) {
+                probeBin = dedicated
+            }
         }
         
-        guard let (binary, probeArgs) = resolveProbeBinary() else { return }
+        if probeBin == nil, let exePath = Bundle.main.executablePath, FileManager.default.isExecutableFile(atPath: exePath) {
+            probeBin = exePath
+            probeArgs = ["--battery-probe"]
+        }
+        
+        guard let binary = probeBin else { return }
         
         isProbeRunning = true
-        DispatchQueue.global(qos: .userInitiated).async { [weak self] in
+        DispatchQueue.global(qos: .utility).async { [weak self] in
             defer { self?.isProbeRunning = false }
             let proc = Process()
             proc.executableURL = URL(fileURLWithPath: binary)
@@ -108,10 +108,21 @@ public final class BluetoothTracker: ObservableObject {
             proc.standardOutput = pipe
             do {
                 try proc.run()
-                let data = pipe.fileHandleForReading.readDataToEndOfFile()
                 proc.waitUntilExit()
+                let data = pipe.fileHandleForReading.readDataToEndOfFile()
                 if let output = String(data: data, encoding: .utf8), !output.isEmpty {
-                    self?.parseProbeOutput(output)
+                    var parsed: [String: Int] = [:]
+                    for line in output.components(separatedBy: .newlines) {
+                        let parts = line.split(separator: ":")
+                        if parts.count == 2, let b = Int(parts[1]) {
+                            parsed[String(parts[0])] = b
+                        }
+                    }
+                    if !parsed.isEmpty {
+                        DispatchQueue.main.async {
+                            self?.applyProbeBatteries(parsed)
+                        }
+                    }
                 }
             } catch {
                 // Ignore probe errors
@@ -119,182 +130,27 @@ public final class BluetoothTracker: ObservableObject {
         }
     }
     
-    private struct ProbeDev {
+    private func applyProbeBatteries(_ probeResults: [String: Int]) {
-        let address: String
-        let name: String
-        let isConnected: Bool
-        let singleBattery: Int?
-        let leftBattery: Int?
-        let rightBattery: Int?
-        let caseBattery: Int?
-        let combinedBattery: Int?
-    }
-    
-    private func parseProbeOutput(_ output: String) {
-        var powerOn: Bool = true
-        var devMap: [String: ProbeDev] = [:]
-        
-        for line in output.components(separatedBy: .newlines) {
-            let trimmed = line.trimmingCharacters(in: .whitespacesAndNewlines)
-            if trimmed.hasPrefix("POWER:") {
-                let val = trimmed.replacingOccurrences(of: "POWER:", with: "")
-                powerOn = (val == "1")
-            } else if trimmed.hasPrefix("DEV:") {
-                let parts = trimmed.split(separator: ":", omittingEmptySubsequences: false)
-                if parts.count >= 8 {
-                    let addr = String(parts[1])
-                    let name = String(parts[2])
-                    let conn = parts[3] == "1"
-                    let single = Int(parts[4]).flatMap { $0 > 0 && $0 <= 100 ? $0 : nil }
-                    let left = Int(parts[5]).flatMap { $0 > 0 && $0 <= 100 ? $0 : nil }
-                    let right = Int(parts[6]).flatMap { $0 > 0 && $0 <= 100 ? $0 : nil }
-                    let bCase = Int(parts[7]).flatMap { $0 > 0 && $0 <= 100 ? $0 : nil }
-                    let comb = (parts.count > 8 ? Int(parts[8]) : nil).flatMap { $0 > 0 && $0 <= 100 ? $0 : nil }
-                    
-                    devMap[addr] = ProbeDev(
-                        address: addr,
-                        name: name,
-                        isConnected: conn,
-                        singleBattery: single,
-                        leftBattery: left,
-                        rightBattery: right,
-                        caseBattery: bCase,
-                        combinedBattery: comb
-                    )
-                }
-            }
-        }
-        
-        let applyBlock = { [weak self] in
-            guard let self = self else { return }
-            if !powerOn {
-                self.applyPowerOffState()
-            } else {
-                self.applyProbeDevices(devMap)
-            }
-        }
-        
-        if Thread.isMainThread {
-            applyBlock()
-        } else {
-            DispatchQueue.main.async(execute: applyBlock)
-        }
-    }
-    
-    private func applyPowerOffState() {
         var changed = false
-        if self.isBluetoothPoweredOn {
-            self.isBluetoothPoweredOn = false
-            changed = true
-        }
-        if self.isConnected {
-            self.isConnected = false
-            changed = true
-        }
-        if self.currentBatteryPercent != nil {
-            self.currentBatteryPercent = nil
-            changed = true
-        }
-        if !self.currentDeviceName.isEmpty {
-            self.currentDeviceName = ""
-            changed = true
-        }
-        if self.activeHeadphone != nil {
-            self.activeHeadphone = nil
-            changed = true
-        }
-        self.knownBatteries.removeAll()
-        for i in 0..<self.devices.count {
-            if self.devices[i].isConnected {
-                self.devices[i].isConnected = false
-                changed = true
-            }
-            if self.devices[i].singleBattery != nil {
-                self.devices[i].singleBattery = nil
-                changed = true
-            }
-        }
-        if changed {
-            self.objectWillChange.send()
-            NotificationCenter.default.post(name: BluetoothTracker.didUpdateNotification, object: self)
-        }
-    }
-    
-    private func applyProbeDevices(_ devMap: [String: ProbeDev]) {
-        var changed = false
-        if !self.isBluetoothPoweredOn {
-            self.isBluetoothPoweredOn = true
-            changed = true
-        }
-        
         for i in 0..<devices.count {
-            let addr = devices[i].address
+            if let fresh = probeResults[devices[i].address], fresh > 0 && fresh <= 100 {
-            if let p = devMap[addr] {
+                if devices[i].singleBattery != fresh {
-                if devices[i].isConnected != p.isConnected {
+                    devices[i].singleBattery = fresh
-                    devices[i].isConnected = p.isConnected
+                    knownBatteries[devices[i].address] = fresh
                     changed = true
                 }
-                if p.isConnected {
-                    if let fresh = p.singleBattery, fresh > 0 && fresh <= 100 {
-                        if devices[i].singleBattery != fresh {
-                            devices[i].singleBattery = fresh
-                            knownBatteries[addr] = fresh
-                            changed = true
-                        }
-                    }
-                    if let l = p.leftBattery, devices[i].leftBattery != l {
-                        devices[i].leftBattery = l
-                        changed = true
-                    }
-                    if let r = p.rightBattery, devices[i].rightBattery != r {
-                        devices[i].rightBattery = r
-                        changed = true
-                    }
-                    if let c = p.caseBattery, devices[i].caseBattery != c {
-                        devices[i].caseBattery = c
-                        changed = true
-                    }
-                    if let comb = p.combinedBattery, devices[i].combinedBattery != comb {
-                        devices[i].combinedBattery = comb
-                        changed = true
-                    }
-                } else {
-                    knownBatteries.removeValue(forKey: addr)
-                    if devices[i].singleBattery != nil {
-                        devices[i].singleBattery = nil
-                        changed = true
-                    }
-                }
             }
         }
         
-        // Enrich connected devices from IOKit
+        if let active = activeHeadphone, let fresh = probeResults[active.address], fresh > 0 && fresh <= 100 {
-        enrichFromIORegistry(devices: &devices)
+            if activeHeadphone?.singleBattery != fresh {
-        
+                activeHeadphone?.singleBattery = fresh
-        let foundActive = devices.first(where: { $0.isConnected && $0.isAudioDevice })
+                changed = true
-            ?? devices.first(where: { $0.isConnected })
+            }
-        
+            if currentBatteryPercent != fresh {
-        if activeHeadphone?.address != foundActive?.address {
+                currentBatteryPercent = fresh
-            activeHeadphone = foundActive
+                changed = true
-            changed = true
+            }
-        }
-        
-        let newPercent = foundActive?.primaryBatteryPercent
-        if currentBatteryPercent != newPercent {
-            currentBatteryPercent = newPercent
-            changed = true
-        }
-        
-        let newName = foundActive?.name ?? ""
-        if currentDeviceName != newName {
-            currentDeviceName = newName
-            changed = true
-        }
-        
-        let newConn = foundActive?.isConnected == true
-        if isConnected != newConn {
-            isConnected = newConn
-            changed = true
         }
         
         if changed {
@@ -304,11 +160,9 @@ public final class BluetoothTracker: ObservableObject {
     }
     
     public func refreshNow() {
-        if !BluetoothTracker.checkBluetoothPower() {
+        updateDeviceList()
-            applyPowerOffState()
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { [weak self] in
-        } else {
+            self?.updateDeviceList()
-            updateDeviceList()
-            pollSubprocessProbe()
         }
     }
     
@@ -329,57 +183,66 @@ public final class BluetoothTracker: ObservableObject {
                 name: NSNotification.Name(name),
                 object: nil
             )
+            DistributedNotificationCenter.default().addObserver(
+                self,
+                selector: #selector(handleBluetoothChange),
+                name: NSNotification.Name(name),
+                object: nil
+            )
         }
-        
-        DistributedNotificationCenter.default().addObserver(
-            self,
-            selector: #selector(handleBluetoothChange),
-            name: NSNotification.Name("com.apple.Bluetooth.status"),
-            object: nil
-        )
     }
     
     @objc private func handleBluetoothChange() {
-        refreshNow()
+        DispatchQueue.main.async { [weak self] in
+            self?.updateDeviceList()
+        }
+        for delay in [0.2, 0.5, 1.0, 1.5, 2.0] {
+            DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+                self?.updateDeviceList()
+            }
+        }
     }
     
     public func updateDeviceList() {
-        let powerOn = BluetoothTracker.checkBluetoothPower()
-        self.isBluetoothPoweredOn = powerOn
-        
-        if !powerOn {
-            applyPowerOffState()
-            return
-        }
-        
         var updatedList: [BluetoothDeviceModel] = []
+        let activeAudioName = getActiveCoreAudioDeviceName()
         
-        // 1. Scan IOBluetooth paired devices catalogue
+        // 1. Scan IOBluetooth paired devices
         if let pairedDevices = IOBluetoothDevice.pairedDevices() as? [IOBluetoothDevice] {
             for pairedDev in pairedDevices {
                 let address = pairedDev.addressString ?? UUID().uuidString
-                let name = pairedDev.nameOrAddress ?? "Unknown Device"
+                let device = IOBluetoothDevice(addressString: address) ?? pairedDev
-                let majorClass = UInt32(pairedDev.deviceClassMajor)
+                let name = device.nameOrAddress ?? pairedDev.nameOrAddress ?? "Unknown Device"
-                let minorClass = UInt32(pairedDev.deviceClassMinor)
+                
-                let isAudio = (majorClass == 4) || isLikelyHeadphones(name: name, minorClass: minorClass, majorClass: majorClass)
+                // Actively sync latest attributes from bluetoothd
+                syncFromServer(device: device)
+                if device !== pairedDev {
+                    syncFromServer(device: pairedDev)
+                }
+                
+                let isAudioOutput = activeAudioName != nil && (
+                    name.caseInsensitiveCompare(activeAudioName!) == .orderedSame ||
+                    activeAudioName!.localizedCaseInsensitiveContains(name) ||
+                    name.localizedCaseInsensitiveContains(activeAudioName!)
+                )
+                let isConnected = device.isConnected() || pairedDev.isConnected() || isAudioOutput
+                
+                let majorClass = UInt32(device.deviceClassMajor)
+                let minorClass = UInt32(device.deviceClassMinor)
+                let isAudio = (majorClass == 4) || isLikelyHeadphones(name: name, minorClass: minorClass, majorClass: majorClass) || isAudioOutput
                 
                 var isMulti = false
                 let selMulti = Selector(("isMultiBatteryDevice"))
-                if pairedDev.responds(to: selMulti) {
+                if device.responds(to: selMulti) {
-                    let imp = pairedDev.method(for: selMulti)
+                    let imp = device.method(for: selMulti)
                     let fn = unsafeBitCast(imp, to: BoolGetter.self)
-                    isMulti = fn(pairedDev, selMulti)
+                    isMulti = fn(device, selMulti)
                 }
                 
-                // IMPORTANT: Strictly preserve isConnected and battery from the authoritative probe!
-                // NEVER query stale in-process IOBluetoothDevice ivars to avoid flickering!
-                let existing = self.devices.first(where: { $0.address == address })
-                let isConn = existing?.isConnected ?? false
-                
                 var model = BluetoothDeviceModel(
                     name: name,
                     address: address,
-                    isConnected: isConn,
+                    isConnected: isConnected,
                     isAudioDevice: isAudio,
                     isMultiBattery: isMulti,
                     majorClass: majorClass,
@@ -387,19 +250,20 @@ public final class BluetoothTracker: ObservableObject {
                     lastUpdated: Date()
                 )
                 
-                if isConn {
+                if isConnected {
-                    model.singleBattery = existing?.singleBattery
+                    extractBatteryLevels(from: device, fallbackDevice: pairedDev, into: &model, isMulti: isMulti)
-                    model.leftBattery = existing?.leftBattery
+                } else {
-                    model.rightBattery = existing?.rightBattery
+                    knownBatteries.removeValue(forKey: address)
-                    model.caseBattery = existing?.caseBattery
-                    model.combinedBattery = existing?.combinedBattery
                 }
                 
                 updatedList.append(model)
             }
         }
         
-        // 2. Sort: Connected audio first
+        // 2. IOKit Registry enrich
+        enrichFromIORegistry(devices: &updatedList)
+        
+        // 3. Sort: Connected audio first
         updatedList.sort { d1, d2 in
             if d1.isConnected != d2.isConnected {
                 return d1.isConnected && !d2.isConnected
@@ -410,18 +274,29 @@ public final class BluetoothTracker: ObservableObject {
             return d1.name.localizedCaseInsensitiveCompare(d2.name) == .orderedAscending
         }
         
-        self.devices = updatedList
-        
         let foundActive = updatedList.first(where: { $0.isConnected && $0.isAudioDevice })
             ?? updatedList.first(where: { $0.isConnected })
         
-        self.activeHeadphone = foundActive
+        let newPercent = foundActive?.primaryBatteryPercent
-        self.currentBatteryPercent = foundActive?.primaryBatteryPercent
+        let newName = foundActive?.name ?? ""
-        self.currentDeviceName = foundActive?.name ?? ""
+        let newConnected = foundActive?.isConnected == true
-        self.isConnected = (foundActive?.isConnected == true)
         
-        self.objectWillChange.send()
+        let applyUpdate = { [weak self] in
-        NotificationCenter.default.post(name: BluetoothTracker.didUpdateNotification, object: self)
+            guard let self = self else { return }
+            self.objectWillChange.send()
+            self.devices = updatedList
+            self.activeHeadphone = foundActive
+            self.currentBatteryPercent = newPercent
+            self.currentDeviceName = newName
+            self.isConnected = newConnected
+            NotificationCenter.default.post(name: BluetoothTracker.didUpdateNotification, object: self)
+        }
+        
+        if Thread.isMainThread {
+            applyUpdate()
+        } else {
+            DispatchQueue.main.async(execute: applyUpdate)
+        }
     }
     
     public func getActiveCoreAudioDeviceName() -> String? {
@@ -484,6 +359,64 @@ public final class BluetoothTracker: ObservableObject {
         return false
     }
     
+    private func extractBatteryLevels(from device: IOBluetoothDevice, fallbackDevice: IOBluetoothDevice? = nil, into model: inout BluetoothDeviceModel, isMulti: Bool) {
+        func getBatteryValue(from dev: IOBluetoothDevice, selectorName: String) -> Int? {
+            let sel = Selector((selectorName))
+            if dev.responds(to: sel) {
+                let imp = dev.method(for: sel)
+                let fn = unsafeBitCast(imp, to: IntBatteryGetter.self)
+                let val = fn(dev, sel)
+                if val > 0 && val <= 100 {
+                    return val
+                }
+            }
+            
+            let selPeer = Selector(("peer"))
+            if dev.responds(to: selPeer),
+               let peer = dev.perform(selPeer)?.takeUnretainedValue() as? NSObject {
+                let pSel = Selector((selectorName))
+                if peer.responds(to: pSel) {
+                    let imp = peer.method(for: pSel)
+                    let fn = unsafeBitCast(imp, to: IntBatteryGetter.self)
+                    let val = fn(peer, pSel)
+                    if val > 0 && val <= 100 {
+                        return val
+                    }
+                }
+            }
+            return nil
+        }
+        
+        func query(selectorName: String) -> Int? {
+            return getBatteryValue(from: device, selectorName: selectorName)
+                ?? (fallbackDevice != nil ? getBatteryValue(from: fallbackDevice!, selectorName: selectorName) : nil)
+        }
+        
+        let addr = model.address
+        
+        if isMulti {
+            model.leftBattery = query(selectorName: "batteryPercentLeft")
+            model.rightBattery = query(selectorName: "batteryPercentRight")
+            model.caseBattery = query(selectorName: "batteryPercentCase")
+            model.combinedBattery = query(selectorName: "batteryPercentCombined")
+            model.singleBattery = query(selectorName: "batteryPercentSingle") ?? query(selectorName: "headsetBattery")
+        } else {
+            if let probeBatt = knownBatteries[addr], probeBatt > 0 && probeBatt <= 100 {
+                model.singleBattery = probeBatt
+            } else {
+                let single = query(selectorName: "batteryPercentSingle")
+                    ?? query(selectorName: "headsetBattery")
+                    ?? query(selectorName: "batteryPercentCombined")
+                    ?? query(selectorName: "batteryPercentLeft")
+                    ?? query(selectorName: "batteryPercentRight")
+                if let single = single {
+                    knownBatteries[addr] = single
+                    model.singleBattery = single
+                }
+            }
+        }
+    }
+    
     private func enrichFromIORegistry(devices: inout [BluetoothDeviceModel]) {
         let matching = IOServiceMatching("AppleDeviceManagementHIDEventService")
         var iterator: io_iterator_t = 0
@@ -506,9 +439,6 @@ public final class BluetoothTracker: ObservableObject {
                 let battCase = dict["BatteryPercentCase"] as? Int
                 
                 for i in 0..<devices.count {
-                    // Only enrich if the device is actually connected!
-                    guard devices[i].isConnected else { continue }
-                    
                     let matchByName = prodName != nil && devices[i].name.caseInsensitiveCompare(prodName!) == .orderedSame
                     let matchByAddr = addr != nil && devices[i].address.replacingOccurrences(of: "-", with: ":").caseInsensitiveCompare(addr!.replacingOccurrences(of: "-", with: ":")) == .orderedSame