agentix-cli 0.54.0 → 0.56.0

package/apps/mac-voice/Sources/AgentXVoice/AgentClient.swift

@@ -126,6 +126,32 @@ enum AgentClient {
         return (200..<300).contains(http.statusCode)
     }
 
+    /// Who is speaking and who waits, from the daemon's speaking queue.
+    struct QueueState: Decodable {
+        struct Item: Decodable { let agentId: String? }
+        let playing: Item?
+        let waiting: [Item]
+    }
+
+    /// The speaking queue now, or nil when the daemon cannot be reached.
+    static func queueState() async -> QueueState? {
+        guard let url = URL(string: "\(Config.daemonURL)/voice/queue") else { return nil }
+        var req = URLRequest(url: url)
+        req.timeoutInterval = 2
+        guard let (data, _) = try? await URLSession.shared.data(for: req) else { return nil }
+        return try? JSONDecoder().decode(QueueState.self, from: data)
+    }
+
+    /// The agent the words are addressed to ("Writer, …"), or `target`.
+    /// The daemon matches names, so the widget and config never disagree.
+    /// Never throws: no daemon means nobody else to address.
+    static func address(_ text: String, target: String) async -> String {
+        guard let (data, _) = try? await post("/voice/address", ["text": text, "target": target], timeout: 2) else { return target }
+        struct Reply: Decodable { let agentId: String? }
+        let id = (try? JSONDecoder().decode(Reply.self, from: data))?.agentId ?? ""
+        return id.isEmpty ? target : id
+    }
+
     private static func post(_ path: String, _ body: [String: Any], timeout: TimeInterval) async throws -> (Data, URLResponse) {
         var req = URLRequest(url: URL(string: "\(Config.daemonURL)\(path)")!)
         req.httpMethod = "POST"
@@ -141,6 +167,9 @@ enum AgentClient {
         let name: String?
         /// Tasks running now.
         let active: Int?
+        /// "#RRGGBB": presence.color, else derived from the id. Older
+        /// daemons send none, and the app derives it the same way.
+        let color: String?
         var label: String { name ?? id }
     }
 

package/apps/mac-voice/Sources/AgentXVoice/Config.swift

@@ -28,6 +28,13 @@ enum Config {
         set { UserDefaults.standard.set(newValue, forKey: "showPill") }
     }
 
+    /// The orb overlay while listening, thinking and speaking. On by
+    /// default; off brings back the pill for those states.
+    static var showOrb: Bool {
+        get { UserDefaults.standard.object(forKey: "showOrb") as? Bool ?? true }
+        set { UserDefaults.standard.set(newValue, forKey: "showOrb") }
+    }
+
     /// The agent actually answering: `agentID`, else `chosenAgentID`, else
     /// the daemon's default (AgentClient.resolveAgent). Progress follows it.
     @MainActor static var effectiveAgentID: String = ""

package/apps/mac-voice/Sources/AgentXVoice/Orb.swift

@@ -0,0 +1,311 @@
+import AppKit
+import SwiftUI
+
+/// The Siri-style overlay: an orb in the agent's colour that listens,
+/// thinks and speaks, with a line of words under it.
+///
+/// Built from SwiftUI's own gradients, no animation library. The orb only
+/// moves while it is on screen: hidden, its timeline is paused and the
+/// microphone level is no longer read, so an idle assistant costs nothing.
+/// With Reduce Motion on it is a still picture that changes between
+/// states, never a loop.
+@MainActor
+final class OrbModel: ObservableObject {
+    enum Phase: Equatable { case hidden, listening, thinking, speaking }
+
+    @Published var phase: Phase = .hidden
+    /// 0…1: the microphone while listening.
+    @Published var level: Double = 0
+    @Published var tint = NSColor(srgbRed: 0.078, green: 0.722, blue: 0.651, alpha: 1)
+    @Published var name = ""
+    /// What was heard, or what is being said.
+    @Published var line = ""
+    /// The step the agent is on, and for how long.
+    @Published var status = ""
+    @Published var reduceMotion = NSWorkspace.shared.accessibilityDisplayShouldReduceMotion
+}
+
+struct OrbView: View {
+    @ObservedObject var model: OrbModel
+    @Environment(\.colorScheme) private var scheme
+
+    /// The agent's colour, lifted in dark mode so the name stays readable.
+    private var nameColor: Color {
+        guard scheme == .dark, let c = model.tint.usingColorSpace(.sRGB) else { return Color(nsColor: model.tint) }
+        var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+        c.getHue(&h, saturation: &s, brightness: &b, alpha: &a)
+        return Color(nsColor: NSColor(hue: h, saturation: s * 0.55, brightness: min(1, b + 0.35), alpha: 1))
+    }
+
+    var body: some View {
+        VStack(spacing: 8) {
+            orb.frame(width: 96, height: 96).padding(.top, 4)
+            if !model.name.isEmpty {
+                Text(model.name.uppercased())
+                    .font(.system(size: 10.5, weight: .semibold, design: .monospaced))
+                    .tracking(0.8)
+                    .foregroundStyle(nameColor)
+            }
+            if !model.line.isEmpty {
+                Text(model.line)
+                    .font(.system(size: 13, weight: .medium))
+                    .foregroundStyle(.primary)
+                    .multilineTextAlignment(.center)
+                    .lineLimit(3)
+                    .truncationMode(.head)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+            if !model.status.isEmpty {
+                Text(model.status)
+                    .font(.system(size: 11))
+                    .foregroundStyle(.secondary)
+                    .lineLimit(1)
+                    .truncationMode(.middle)
+            }
+        }
+        .padding(.horizontal, 18)
+        .padding(.vertical, 14)
+        .frame(width: OrbOverlay.width)
+        .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 22, style: .continuous))
+        .overlay(RoundedRectangle(cornerRadius: 22, style: .continuous)
+            .strokeBorder(Color.primary.opacity(0.08), lineWidth: 1))
+        .frame(maxHeight: .infinity, alignment: .top)
+    }
+
+    private var orb: some View {
+        let still = model.reduceMotion
+        let paused = still || model.phase == .hidden
+        return TimelineView(.animation(minimumInterval: 1.0 / 30, paused: paused)) { context in
+            OrbBody(t: paused ? 0 : context.date.timeIntervalSinceReferenceDate,
+                    phase: model.phase, level: model.level, tint: model.tint, still: still)
+        }
+        .accessibilityLabel(Text(accessibilityText))
+    }
+
+    private var accessibilityText: String {
+        switch model.phase {
+        case .hidden: return ""
+        case .listening: return "Listening"
+        case .thinking: return "Thinking"
+        case .speaking: return "Speaking"
+        }
+    }
+}
+
+/// One frame of the orb at time `t`.
+struct OrbBody: View {
+    let t: Double
+    let phase: OrbModel.Phase
+    let level: Double
+    let tint: NSColor
+    /// Reduce Motion: a still orb, sized and shaded by state alone.
+    let still: Bool
+
+    /// How much the orb swells and glows, 0…1.
+    private var energy: Double {
+        switch phase {
+        case .hidden: return 0
+        case .listening: return still ? 0.45 : 0.12 + 0.88 * level
+        case .thinking: return still ? 0.2 : 0.22 + 0.08 * sin(t * 2.2)
+        case .speaking: return still ? 0.7 : OrbMath.speakingEnvelope(at: t)
+        }
+    }
+
+    /// How fast the colours drift.
+    private var speed: Double {
+        switch phase {
+        case .hidden: return 0
+        case .listening: return 0.5 + level * 1.5
+        case .thinking: return 1.3
+        case .speaking: return 0.9
+        }
+    }
+
+    var body: some View {
+        let scale = 0.78 + 0.22 * energy
+        ZStack {
+            Circle()
+                .fill(Color(nsColor: tint).opacity(0.28 + 0.32 * energy))
+                .blur(radius: 10 + 12 * energy)
+                .scaleEffect(scale * 1.08)
+            fill
+                .clipShape(Circle())
+                .scaleEffect(scale)
+            // Thinking reads as a slow ring going round; the other states
+            // as a soft rim.
+            if phase == .thinking {
+                Circle()
+                    .trim(from: 0, to: 0.28)
+                    .stroke(Color.white.opacity(0.75), style: StrokeStyle(lineWidth: 2.2, lineCap: .round))
+                    .rotationEffect(.radians(still ? -.pi / 2 : t * 3.1))
+                    .scaleEffect(scale * 0.86)
+            } else {
+                Circle()
+                    .strokeBorder(Color.white.opacity(0.3 + 0.25 * energy), lineWidth: 1)
+                    .scaleEffect(scale)
+            }
+        }
+    }
+
+    @ViewBuilder private var fill: some View {
+        let shades = palette
+        if #available(macOS 15, *) {
+            MeshGradient(width: 3, height: 3, points: meshPoints, colors: [
+                shades[0], shades[1], shades[2],
+                shades[3], shades[4], shades[1],
+                shades[2], shades[3], shades[0],
+            ])
+        } else {
+            // macOS 14: two gradients stand in for the mesh.
+            ZStack {
+                AngularGradient(colors: [shades[0], shades[2], shades[3], shades[1], shades[0]],
+                                center: .center, angle: .radians(t * speed))
+                RadialGradient(colors: [shades[4], shades[4].opacity(0)],
+                               center: UnitPoint(x: 0.5 + 0.12 * cos(t * speed), y: 0.5 + 0.12 * sin(t * speed)),
+                               startRadius: 2, endRadius: 44)
+            }
+        }
+    }
+
+    /// Corners fixed, edges sway, the centre wanders further when there
+    /// is more energy. `still` keeps the resting grid.
+    private var meshPoints: [SIMD2<Float>] {
+        let s = still ? 0 : t * speed
+        let reach = Float(0.08 + 0.14 * energy)
+        func sway(_ phase: Double) -> Float { Float(sin(s + phase)) * reach * 0.6 }
+        return [
+            [0, 0], [0.5 + sway(0.3), 0], [1, 0],
+            [0, 0.5 + sway(1.1)],
+            [0.5 + Float(cos(s * 1.3)) * reach, 0.5 + Float(sin(s * 1.7)) * reach],
+            [1, 0.5 + sway(2.3)],
+            [0, 1], [0.5 + sway(3.7), 1], [1, 1],
+        ]
+    }
+
+    /// Five shades around the agent's colour: lighter, deeper and two
+    /// neighbouring hues, and a bright core that grows with the voice.
+    private var palette: [Color] {
+        let base = tint.usingColorSpace(.sRGB) ?? tint
+        var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+        base.getHue(&h, saturation: &s, brightness: &b, alpha: &a)
+        // Thinking turns the hues slowly; the others hold them.
+        let drift = phase == .thinking && !still ? CGFloat(sin(t * 0.8)) * 0.04 : 0
+        func shade(_ dh: CGFloat, _ ds: CGFloat, _ db: CGFloat) -> Color {
+            var hue = (h + dh + drift).truncatingRemainder(dividingBy: 1)
+            if hue < 0 { hue += 1 }
+            return Color(nsColor: NSColor(hue: hue, saturation: min(1, max(0, s + ds)),
+                                          brightness: min(1, max(0, b + db)), alpha: 1))
+        }
+        let core = CGFloat(0.12 + 0.3 * energy)
+        return [
+            shade(0, 0, 0),
+            shade(0.07, -0.05, 0.08),
+            shade(-0.06, 0.05, -0.12),
+            shade(0.13, -0.1, 0.02),
+            shade(0.02, -0.35 * core * 2, core),
+        ]
+    }
+}
+
+/// The window the orb lives in: floating, on every Space, click-through
+/// and never key, so the app in front keeps the keyboard.
+private final class OrbPanel: NSPanel {
+    override var canBecomeKey: Bool { false }
+    override var canBecomeMain: Bool { false }
+}
+
+@MainActor
+final class OrbOverlay {
+    static let width: CGFloat = 300
+    private static let height: CGFloat = 250
+
+    let model = OrbModel()
+    private let panel: NSPanel
+    private let host: NSHostingView<OrbView>
+    private var levelTimer: Timer?
+    private var motionObserver: NSObjectProtocol?
+
+    /// The microphone's RMS level, read while listening. Set by the app.
+    var levelSource: (() -> Float)?
+
+    init() {
+        panel = OrbPanel(contentRect: NSRect(x: 0, y: 0, width: Self.width, height: Self.height),
+                         styleMask: [.borderless, .nonactivatingPanel],
+                         backing: .buffered, defer: true)
+        panel.isFloatingPanel = true
+        panel.level = .floating
+        panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary, .ignoresCycle]
+        panel.isOpaque = false
+        panel.backgroundColor = .clear
+        panel.hasShadow = false
+        panel.ignoresMouseEvents = true
+        panel.hidesOnDeactivate = false
+        host = NSHostingView(rootView: OrbView(model: model))
+        host.frame = NSRect(x: 0, y: 0, width: Self.width, height: Self.height)
+        panel.contentView = host
+
+        let model = self.model
+        motionObserver = NSWorkspace.shared.notificationCenter.addObserver(
+            forName: NSWorkspace.accessibilityDisplayOptionsDidChangeNotification,
+            object: nil, queue: .main) { _ in
+            MainActor.assumeIsolated {
+                model.reduceMotion = NSWorkspace.shared.accessibilityDisplayShouldReduceMotion
+            }
+        }
+    }
+
+    var isVisible: Bool { panel.isVisible }
+
+    /// Where the orb's card ends on screen, for the answer card to sit
+    /// under. Nil while hidden.
+    var contentFrame: NSRect? {
+        guard panel.isVisible else { return nil }
+        let h = min(Self.height, host.fittingSize.height)
+        return NSRect(x: panel.frame.minX, y: panel.frame.maxY - h, width: Self.width, height: h)
+    }
+
+    func show(_ phase: OrbModel.Phase, name: String, tint: NSColor, line: String, status: String) {
+        guard phase != .hidden else { hide(); return }
+        model.name = name
+        model.tint = tint
+        model.line = line
+        model.status = status
+        if model.phase != phase {
+            model.phase = phase
+            if phase != .listening { model.level = 0 }
+        }
+        watchLevel()
+        if !panel.isVisible {
+            position()
+            panel.orderFrontRegardless()
+        }
+    }
+
+    func hide() {
+        model.phase = .hidden
+        model.level = 0
+        watchLevel()
+        panel.orderOut(nil)
+    }
+
+    /// Top right, under the menu bar, where macOS puts Siri.
+    private func position() {
+        guard let screen = NSScreen.main else { return }
+        let v = screen.visibleFrame
+        panel.setFrameOrigin(NSPoint(x: v.maxX - Self.width - 16, y: v.maxY - Self.height - 10))
+    }
+
+    /// The microphone is read only while listening, on screen, with
+    /// motion allowed.
+    private func watchLevel() {
+        let wanted = model.phase == .listening && !model.reduceMotion && levelSource != nil
+        if !wanted { levelTimer?.invalidate(); levelTimer = nil; return }
+        guard levelTimer == nil else { return }
+        levelTimer = Timer.scheduledTimer(withTimeInterval: 1.0 / 20, repeats: true) { [weak self] _ in
+            MainActor.assumeIsolated {
+                guard let self, let read = self.levelSource else { return }
+                self.model.level = OrbMath.smooth(self.model.level, toward: OrbMath.level(fromRMS: read()))
+            }
+        }
+    }
+}

package/apps/mac-voice/Sources/AgentXVoice/OrbMath.swift

@@ -0,0 +1,57 @@
+import Foundation
+
+/// The numbers behind the orb, kept free of AppKit and SwiftUI so the
+/// tests can check them without a window.
+enum OrbMath {
+    /// The palette the daemon derives an agent's colour from when
+    /// `presence.color` is unset. Same list, same order and same hash as
+    /// `presenceLook` in src/voice/presence.ts, so the orb matches the
+    /// agent's on-screen cursor even when /agents sends no colour.
+    static let palette = ["#7C3AED", "#DB2777", "#EA580C", "#0D9488",
+                          "#2563EB", "#65A30D", "#C026D3", "#0891B2"]
+
+    /// The colour for an agent: the daemon's when it sent one, else the
+    /// hash of the id.
+    static func colorHex(agentID: String, configured: String?) -> String {
+        if let c = configured, parseHex(c) != nil { return c }
+        var h: UInt32 = 0
+        // JS iterates code points and takes charCodeAt(0) of each: the
+        // first UTF-16 unit. Identical for every ASCII id.
+        for scalar in agentID.unicodeScalars {
+            let unit = UInt32(String(scalar).utf16.first ?? 0)
+            h = h &* 31 &+ unit
+        }
+        return palette[Int(h % UInt32(palette.count))]
+    }
+
+    /// "#RRGGBB" as 0…1 components, or nil when it is not that.
+    static func parseHex(_ s: String) -> (r: Double, g: Double, b: Double)? {
+        guard s.count == 7, s.hasPrefix("#"), let v = UInt32(s.dropFirst(), radix: 16) else { return nil }
+        return (Double((v >> 16) & 0xFF) / 255, Double((v >> 8) & 0xFF) / 255, Double(v & 0xFF) / 255)
+    }
+
+    /// Microphone RMS (about 0.005 in a quiet room, 0.02 for a voice,
+    /// 0.2 when shouting) to 0…1. Square root, because loudness is heard
+    /// roughly that way: linear made normal speech barely move the orb.
+    static func level(fromRMS rms: Float) -> Double {
+        guard rms.isFinite, rms > 0.004 else { return 0 }
+        return min(1, Double((rms - 0.004).squareRoot()) * 3.2)
+    }
+
+    /// A speech-like rise and fall at time `t`, 0.15…1: syllables at about
+    /// five a second under a slower phrase swell. The daemon plays the
+    /// answer, so the app cannot meter it; this keeps the orb talking in
+    /// rhythm without pretending to be a level meter.
+    static func speakingEnvelope(at t: Double) -> Double {
+        let syllable = abs(sin(t * 15.7))
+        let phrase = 0.55 + 0.45 * sin(t * 1.9 + 0.7)
+        let jitter = 0.5 + 0.5 * sin(t * 37.3 + sin(t * 3.1))
+        return 0.15 + 0.85 * syllable * phrase * (0.7 + 0.3 * jitter)
+    }
+
+    /// Smooth toward `target`: fast attack, slower release, as the
+    /// recorder does, so the orb swells with a word and settles after it.
+    static func smooth(_ current: Double, toward target: Double) -> Double {
+        target > current ? current + (target - current) * 0.6 : current + (target - current) * 0.2
+    }
+}

package/apps/mac-voice/Sources/AgentXVoice/Panel.swift

@@ -51,6 +51,10 @@ final class Panel: NSPanel {
     /// Stay on screen when idle. Off: the pill shows only while active.
     var alwaysVisible = false
 
+    /// The orb overlay shows listening, thinking and speaking, so the
+    /// pill stays out of the way then; it still shows idle and errors.
+    var yieldsActiveStates = false
+
     /// Told of every state rendered, so the menu-bar icon can follow.
     var onRender: ((State) -> Void)?
 
@@ -107,6 +111,14 @@ final class Panel: NSPanel {
         /// Idle is an invitation and belongs in meta type; everything else
         /// is a running commentary and belongs in body type.
         var isMeta: Bool { if case .idle = self { return true }; return false }
+
+        /// Listening, thinking or speaking: what the orb shows.
+        var isActive: Bool {
+            switch self {
+            case .idle, .error: return false
+            default: return true
+            }
+        }
     }
 
     /// Called when the pill is clicked. Set by the app.
@@ -208,7 +220,8 @@ final class Panel: NSPanel {
             setText(named(state))
         }
 
-        if state.isMeta && !alwaysVisible { orderOut(nil) } else { orderFrontRegardless() }
+        let yield = yieldsActiveStates && state.isActive
+        if (state.isMeta && !alwaysVisible) || yield { orderOut(nil) } else { orderFrontRegardless() }
         onRender?(state)
     }
 

package/apps/mac-voice/Sources/AgentXVoice/ResultCard.swift

@@ -22,6 +22,10 @@ final class ResultCard: NSPanel {
     private let links = NSStackView()
     private let thumb = NSImageView()
 
+    /// The orb's frame on screen while it shows, for the card to slide in
+    /// under it. Nil: the card sits above the pill. Set by the app.
+    var anchor: (() -> NSRect?)?
+
     init() {
         super.init(contentRect: NSRect(x: 0, y: 0, width: 380, height: 260),
                    styleMask: [.titled, .closable, .resizable, .utilityWindow, .nonactivatingPanel],
@@ -125,8 +129,35 @@ final class ResultCard: NSPanel {
         }
 
         if let c = contentView { layout(c) }
-        positionAboveWidget()
+        if let orb = anchor?() {
+            slideIn(under: orb)
+        } else {
+            positionAboveWidget()
+            orderFrontRegardless()
+        }
+    }
+
+    /// Under the orb, right edges aligned, sliding down into place. With
+    /// Reduce Motion it simply appears there.
+    @MainActor
+    private func slideIn(under orb: NSRect) {
+        let target = NSPoint(x: orb.maxX - frame.width, y: orb.minY - frame.height - 8)
+        let wasVisible = isVisible
+        guard !wasVisible, !NSWorkspace.shared.accessibilityDisplayShouldReduceMotion else {
+            setFrameOrigin(target)
+            alphaValue = 1
+            orderFrontRegardless()
+            return
+        }
+        setFrameOrigin(NSPoint(x: target.x, y: target.y + 18))
+        alphaValue = 0
         orderFrontRegardless()
+        NSAnimationContext.runAnimationGroup { ctx in
+            ctx.duration = 0.28
+            ctx.timingFunction = Brand.ease
+            animator().setFrameOrigin(target)
+            animator().alphaValue = 1
+        }
     }
 
     @objc private func openLink(_ sender: NSButton) {
@@ -139,6 +170,7 @@ final class ResultCard: NSPanel {
         guard let screen = NSScreen.main else { return }
         let v = screen.visibleFrame
         setFrameOrigin(NSPoint(x: v.maxX - frame.width - 24, y: v.minY + 24 + 54 + 10))
+        alphaValue = 1
     }
 
     override var canBecomeKey: Bool { true }

package/apps/mac-voice/Sources/AgentXVoice/StatusMenu.swift

@@ -7,7 +7,8 @@ import AppKit
 @MainActor
 final class StatusMenu: NSObject, NSMenuDelegate {
     let menu = NSMenu()
-    private let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.squareLength)
+    /// Variable width: the badge with the number of queued lines sits beside the icon.
+    private let item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
 
     private enum Roster {
         case loading
@@ -19,12 +20,21 @@ final class StatusMenu: NSObject, NSMenuDelegate {
     private var roster = Roster.loading
     /// Reopen the menu once the retry's answer is in.
     private var reopenAfterRefresh = false
+    /// The daemon's speaking queue, polled while anything is in flight.
+    private var queue: AgentClient.QueueState?
+    private var queuePoll: Timer?
+
+    /// Questions this widget has in flight, per agent. Set by the app.
+    var thinking: [String: Int] = [:] {
+        didSet { rebuild(); watchQueue(force: true) }
+    }
 
     /// Set by the app.
     var onStop: (() -> Void)?
     var onHoldChanged: ((Bool) -> Void)?
     var onTargetChanged: ((String) -> Void)?
     var onPillChanged: ((Bool) -> Void)?
+    var onOrbChanged: ((Bool) -> Void)?
 
     override init() {
         super.init()
@@ -41,6 +51,16 @@ final class StatusMenu: NSObject, NSMenuDelegate {
         return agents.first { $0.id == id }?.label ?? id
     }
 
+    /// The agent's colour for the orb: what the daemon sent, else the
+    /// one derived from its id, which is the same colour.
+    func color(of id: String) -> NSColor {
+        var configured: String?
+        if case .loaded(let agents) = roster { configured = agents.first { $0.id == id }?.color }
+        let hex = OrbMath.colorHex(agentID: id, configured: configured)
+        guard let c = OrbMath.parseHex(hex) else { return Brand.accent }
+        return NSColor(srgbRed: c.r, green: c.g, blue: c.b, alpha: 1)
+    }
+
     /// Open the menu from the keyboard.
     func open() { item.button?.performClick(nil) }
 
@@ -48,7 +68,9 @@ final class StatusMenu: NSObject, NSMenuDelegate {
         Task {
             let agents = await AgentClient.agents()
             roster = agents.map { .loaded($0) } ?? .down
+            queue = await AgentClient.queueState()
             rebuild()
+            showBadge()
             if reopenAfterRefresh { reopenAfterRefresh = false; open() }
         }
     }
@@ -69,6 +91,48 @@ final class StatusMenu: NSObject, NSMenuDelegate {
         item.button?.toolTip = "AgentX Voice — \(label)"
     }
 
+    /// The number of lines waiting to be spoken, beside the icon.
+    private func showBadge() {
+        let n = queue?.waiting.count ?? 0
+        item.button?.imagePosition = .imageLeading
+        item.button?.title = n > 0 ? "\(n)" : ""
+    }
+
+    /// Poll the queue only while there is something to show: a question in
+    /// flight, or lines playing or waiting. `force` starts it whatever the
+    /// last poll saw: an answer that just came back is about to be queued,
+    /// so the poll carries on until it has been seen through.
+    private func watchQueue(force: Bool = false) {
+        let active = force || !thinking.isEmpty || queue?.playing != nil || !(queue?.waiting.isEmpty ?? true)
+        if !active { queuePoll?.invalidate(); queuePoll = nil; return }
+        guard queuePoll == nil else { return }
+        queuePoll = Timer.scheduledTimer(withTimeInterval: 2, repeats: true) { _ in
+            Task { @MainActor [weak self] in
+                guard let self else { return }
+                self.queue = await AgentClient.queueState()
+                self.rebuild()
+                self.showBadge()
+                self.watchQueue()
+            }
+        }
+    }
+
+    /// "thinking", "speaking", "queued 2", or both, for one agent's row.
+    private func state(of agent: AgentClient.AgentInfo) -> String {
+        var parts: [String] = []
+        // Speaking one answer and thinking on the next are both true at once.
+        if queue?.playing?.agentId == agent.id { parts.append("speaking") }
+        let asked = thinking[agent.id, default: 0]
+        if asked > 0 {
+            // More than one: the rest wait for the answer in flight.
+            parts.append(asked > 1 ? "thinking (+\(asked - 1) asked)" : "thinking")
+        }
+        if parts.isEmpty && (agent.active ?? 0) > 0 { parts.append("working") }
+        let queued = queue?.waiting.filter { $0.agentId == agent.id }.count ?? 0
+        if queued > 0 { parts.append("queued \(queued)") }
+        return parts.isEmpty ? "idle" : parts.joined(separator: " · ")
+    }
+
     // MARK: NSMenuDelegate
 
     /// Show what is known now and refresh underneath; the open menu
@@ -95,9 +159,8 @@ final class StatusMenu: NSObject, NSMenuDelegate {
             menu.addItem(NSMenuItem.sectionHeader(title: pinned ? "Agent (set by AGENTX_VOICE_AGENT)" : "Talk to"))
             if agents.isEmpty { menu.addItem(disabled("No agents configured")) }
             for (i, agent) in agents.enumerated() {
-                let busy = (agent.active ?? 0) > 0
                 // Digits pick an agent while the menu is open.
-                let row = action(agent.label + (busy ? "  · working" : "  · idle"), #selector(pick(_:)),
+                let row = action(agent.label + "  · " + state(of: agent), #selector(pick(_:)),
                                  key: i < 9 ? "\(i + 1)" : "", modifiers: [])
                 row.representedObject = agent.id
                 row.state = agent.id == target ? .on : .off
@@ -114,6 +177,9 @@ final class StatusMenu: NSObject, NSMenuDelegate {
         let pill = action("Show floating pill", #selector(togglePill), key: "")
         pill.state = Config.showPill ? .on : .off
         menu.addItem(pill)
+        let orb = action("Show orb", #selector(toggleOrb), key: "")
+        orb.state = Config.showOrb ? .on : .off
+        menu.addItem(orb)
 
         menu.addItem(.separator())
         menu.addItem(action("Settings…", #selector(openSettings), key: ","))
@@ -163,6 +229,11 @@ final class StatusMenu: NSObject, NSMenuDelegate {
         onPillChanged?(Config.showPill)
     }
 
+    @objc private func toggleOrb() {
+        Config.showOrb.toggle()
+        onOrbChanged?(Config.showOrb)
+    }
+
     @objc private func openSettings() { openDashboard("/admin") }
     @objc private func openHistory() { openDashboard("/activity") }