agentix-cli 0.181.0 → 0.182.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/apps/mac-voice/Sources/AgentXVoice/Config.swift +9 -0
- package/apps/mac-voice/Sources/AgentXVoice/MiniOrbs.swift +19 -6
- package/apps/mac-voice/Sources/AgentXVoice/OpenRequests.swift +260 -0
- package/apps/mac-voice/Sources/AgentXVoice/Panel.swift +72 -5
- package/apps/mac-voice/Sources/AgentXVoice/PillBusy.swift +22 -4
- package/apps/mac-voice/Sources/AgentXVoice/PillPlacement.swift +24 -0
- package/apps/mac-voice/Sources/AgentXVoice/RequestsWindow.swift +401 -0
- package/apps/mac-voice/Sources/AgentXVoice/SettingsWindow.swift +1 -0
- package/apps/mac-voice/Sources/AgentXVoice/StatusMenu.swift +22 -1
- package/apps/mac-voice/Sources/AgentXVoice/main.swift +263 -4
- package/dist/{App-UXX5TGFF.js → App-XWSSUYKF.js} +2 -2
- package/dist/{ChatApp-X635NOAE.js → ChatApp-UT2BRHYE.js} +2 -2
- package/dist/{absorb-eval-4ZPDWNBA.js → absorb-eval-SFGUURBD.js} +2 -2
- package/dist/{adapter-Z23K544D.js → adapter-UHR7FVM7.js} +2 -2
- package/dist/{agent-OBRH5BJZ.js → agent-5NTFSCEO.js} +2 -2
- package/dist/{board-dashboard-KZ43CMZQ.js → board-dashboard-7HIME2W4.js} +2090 -2248
- package/dist/board-dashboard-7HIME2W4.js.map +1 -0
- package/dist/{chunk-SDINSYTN.js → chunk-343MPMLD.js} +2 -2
- package/dist/{chunk-WKU7YFDV.js → chunk-4KNHLHE3.js} +2 -2
- package/dist/{chunk-WZUY7VGL.js → chunk-4WSJKKSA.js} +2 -2
- package/dist/{chunk-5RSTB45Q.js → chunk-5NGQQOVK.js} +2 -2
- package/dist/{chunk-FRVFRWFN.js → chunk-5YG2ZQQW.js} +2 -2
- package/dist/{chunk-N6VBEITO.js → chunk-7PQQZC6B.js} +2 -2
- package/dist/{chunk-N6VBEITO.js.map → chunk-7PQQZC6B.js.map} +1 -1
- package/dist/{chunk-7RVJWLIP.js → chunk-7WGJZLVJ.js} +2 -2
- package/dist/{chunk-CF7CPE7K.js → chunk-BY3AUZYM.js} +2 -2
- package/dist/{chunk-LQS27HSV.js → chunk-CTNZVRPA.js} +4 -4
- package/dist/chunk-CTNZVRPA.js.map +1 -0
- package/dist/{chunk-IRZYRLXQ.js → chunk-FDX4IGLK.js} +2 -2
- package/dist/{chunk-SD6UDSXV.js → chunk-FYFJ7IQJ.js} +2 -2
- package/dist/{chunk-HBQRVCLU.js → chunk-GEFZMDDX.js} +2 -2
- package/dist/{chunk-TZ7GB7FI.js → chunk-H2KOXGDX.js} +2 -2
- package/dist/{chunk-UFUQQ5J5.js → chunk-IFHVAHQM.js} +2 -2
- package/dist/{chunk-LZY6YN2J.js → chunk-IGBW4VVM.js} +2 -2
- package/dist/{chunk-OYCMFCME.js → chunk-JNWXHOJE.js} +2 -2
- package/dist/{chunk-KOY3EOPH.js → chunk-MD2HCGSC.js} +36 -36
- package/dist/chunk-MD2HCGSC.js.map +1 -0
- package/dist/{chunk-PCWXHXTM.js → chunk-NIPMVM3G.js} +2 -2
- package/dist/{chunk-DOBTHQ32.js → chunk-NRUUT5TL.js} +2 -2
- package/dist/{chunk-ZBM24D2Y.js → chunk-OKADR5QO.js} +4 -4
- package/dist/chunk-OKADR5QO.js.map +1 -0
- package/dist/{chunk-IYITREE5.js → chunk-QB6UPODO.js} +2 -2
- package/dist/{chunk-VK3M3TVL.js → chunk-QGNV2HA4.js} +3 -3
- package/dist/chunk-QGNV2HA4.js.map +1 -0
- package/dist/{chunk-DUZOHLTF.js → chunk-R3CDFSNF.js} +67 -67
- package/dist/chunk-R3CDFSNF.js.map +1 -0
- package/dist/{chunk-HMEFQL5P.js → chunk-RDWDDPBI.js} +4 -3
- package/dist/chunk-RDWDDPBI.js.map +1 -0
- package/dist/{chunk-FRR6DRLY.js → chunk-UMHN33JQ.js} +2 -2
- package/dist/{chunk-UOIEKYRR.js → chunk-XHJ5SVO5.js} +242 -242
- package/dist/chunk-XHJ5SVO5.js.map +1 -0
- package/dist/chunk-XI2HH5NR.js +36 -0
- package/dist/chunk-XI2HH5NR.js.map +1 -0
- package/dist/{chunk-J56YGKUO.js → chunk-Y4TVCWWF.js} +2 -2
- package/dist/{chunk-33DLG4I2.js → chunk-Y5TBOMHY.js} +5 -5
- package/dist/{chunk-UHTIZCKU.js → chunk-YSPBVLTZ.js} +2 -2
- package/dist/{chunk-NI2XD6P3.js → chunk-YX4R2VGD.js} +2 -2
- package/dist/{chunk-U5S6IP7Z.js → chunk-Z4XVPGPZ.js} +3 -3
- package/dist/{chunk-DMCMV4UJ.js → chunk-ZRALOFEG.js} +2 -2
- package/dist/cli.js +1 -1
- package/dist/{client-ILPJFCTF.js → client-SQMU25PS.js} +2 -2
- package/dist/{config-JVWOL233.js → config-56NBA4SF.js} +2 -2
- package/dist/{config-mutate-WYCHP6VK.js → config-mutate-PD4O3HZ7.js} +2 -2
- package/dist/config-mutator-ITL64FBW.js +2 -0
- package/dist/{contributions-XD66HYWE.js → contributions-DKTJ623L.js} +2 -2
- package/dist/{doctor-CGZ56DYP.js → doctor-OI6GJZR5.js} +2 -2
- package/dist/{follow-up-tool-HPET6LZW.js → follow-up-tool-DYSLS6ZI.js} +2 -2
- package/dist/{grants-Z332LOTO.js → grants-FY2TIT7I.js} +2 -2
- package/dist/{hub-L5FFJPS3.js → hub-4HDMTSR7.js} +2 -2
- package/dist/index.d.ts +317 -216
- package/dist/index.js +1 -1
- package/dist/processes-M7YPWX7H.js +2 -0
- package/dist/{program-XM3X7HIL.js → program-4GDIWCDM.js} +259 -259
- package/dist/program-4GDIWCDM.js.map +1 -0
- package/dist/{promote-XI6W27JK.js → promote-3272TZNI.js} +2 -2
- package/dist/{query-MGG5QKNC.js → query-7XM6V4QG.js} +2 -2
- package/dist/{query-settings-CALZYYWD.js → query-settings-HHVBIIVQ.js} +2 -2
- package/dist/{registry-XJWSLJ4O.js → registry-QL3AM3UH.js} +2 -2
- package/dist/{request-planner-JCRGGJUO.js → request-planner-WNEDEA7X.js} +2 -2
- package/dist/{review-candidates-OEBEEAEZ.js → review-candidates-TGPDJMWJ.js} +2 -2
- package/dist/{routing-CGH54RYG.js → routing-ALXY25NE.js} +2 -2
- package/dist/schedule-tool-22UBZXCG.js +2 -0
- package/dist/{scheduler-2K5YEV2U.js → scheduler-5PHNW243.js} +2 -2
- package/dist/{seat-DEL5YUOS.js → seat-ZYVVEILY.js} +2 -2
- package/dist/{select-MRTWSI7U.js → select-6QLEV6AC.js} +2 -2
- package/dist/{set-enabled-XTDCFCZY.js → set-enabled-SYYTKJPC.js} +2 -2
- package/dist/{sprint-tool-N7WPDX5J.js → sprint-tool-PYVHPHR2.js} +2 -2
- package/dist/{tool-BQEJOTF3.js → tool-GIYOYXXM.js} +2 -2
- package/dist/{tool-NZTJZDSB.js → tool-TDOUM3BJ.js} +2 -2
- package/dist/{tool-KZHWJ7BC.js → tool-ZKZ4KYJT.js} +2 -2
- package/dist/{wiki-YERCKD3E.js → wiki-ZRGLGMII.js} +2 -2
- package/dist/wiki-enrich-CTID7JQW.js +2 -0
- package/package.json +1 -1
- package/dist/board-dashboard-KZ43CMZQ.js.map +0 -1
- package/dist/chunk-5LPCJZKI.js +0 -36
- package/dist/chunk-5LPCJZKI.js.map +0 -1
- package/dist/chunk-DUZOHLTF.js.map +0 -1
- package/dist/chunk-HMEFQL5P.js.map +0 -1
- package/dist/chunk-KOY3EOPH.js.map +0 -1
- package/dist/chunk-LQS27HSV.js.map +0 -1
- package/dist/chunk-UOIEKYRR.js.map +0 -1
- package/dist/chunk-VK3M3TVL.js.map +0 -1
- package/dist/chunk-ZBM24D2Y.js.map +0 -1
- package/dist/config-mutator-DKNHE6VP.js +0 -2
- package/dist/processes-EWARF6ZW.js +0 -2
- package/dist/program-XM3X7HIL.js.map +0 -1
- package/dist/schedule-tool-UM3CAPDX.js +0 -2
- package/dist/wiki-enrich-K54LGNU3.js +0 -2
- /package/dist/{App-UXX5TGFF.js.map → App-XWSSUYKF.js.map} +0 -0
- /package/dist/{ChatApp-X635NOAE.js.map → ChatApp-UT2BRHYE.js.map} +0 -0
- /package/dist/{absorb-eval-4ZPDWNBA.js.map → absorb-eval-SFGUURBD.js.map} +0 -0
- /package/dist/{adapter-Z23K544D.js.map → adapter-UHR7FVM7.js.map} +0 -0
- /package/dist/{agent-OBRH5BJZ.js.map → agent-5NTFSCEO.js.map} +0 -0
- /package/dist/{chunk-SDINSYTN.js.map → chunk-343MPMLD.js.map} +0 -0
- /package/dist/{chunk-WKU7YFDV.js.map → chunk-4KNHLHE3.js.map} +0 -0
- /package/dist/{chunk-WZUY7VGL.js.map → chunk-4WSJKKSA.js.map} +0 -0
- /package/dist/{chunk-5RSTB45Q.js.map → chunk-5NGQQOVK.js.map} +0 -0
- /package/dist/{chunk-FRVFRWFN.js.map → chunk-5YG2ZQQW.js.map} +0 -0
- /package/dist/{chunk-7RVJWLIP.js.map → chunk-7WGJZLVJ.js.map} +0 -0
- /package/dist/{chunk-CF7CPE7K.js.map → chunk-BY3AUZYM.js.map} +0 -0
- /package/dist/{chunk-IRZYRLXQ.js.map → chunk-FDX4IGLK.js.map} +0 -0
- /package/dist/{chunk-SD6UDSXV.js.map → chunk-FYFJ7IQJ.js.map} +0 -0
- /package/dist/{chunk-HBQRVCLU.js.map → chunk-GEFZMDDX.js.map} +0 -0
- /package/dist/{chunk-TZ7GB7FI.js.map → chunk-H2KOXGDX.js.map} +0 -0
- /package/dist/{chunk-UFUQQ5J5.js.map → chunk-IFHVAHQM.js.map} +0 -0
- /package/dist/{chunk-LZY6YN2J.js.map → chunk-IGBW4VVM.js.map} +0 -0
- /package/dist/{chunk-OYCMFCME.js.map → chunk-JNWXHOJE.js.map} +0 -0
- /package/dist/{chunk-PCWXHXTM.js.map → chunk-NIPMVM3G.js.map} +0 -0
- /package/dist/{chunk-DOBTHQ32.js.map → chunk-NRUUT5TL.js.map} +0 -0
- /package/dist/{chunk-IYITREE5.js.map → chunk-QB6UPODO.js.map} +0 -0
- /package/dist/{chunk-FRR6DRLY.js.map → chunk-UMHN33JQ.js.map} +0 -0
- /package/dist/{chunk-J56YGKUO.js.map → chunk-Y4TVCWWF.js.map} +0 -0
- /package/dist/{chunk-33DLG4I2.js.map → chunk-Y5TBOMHY.js.map} +0 -0
- /package/dist/{chunk-UHTIZCKU.js.map → chunk-YSPBVLTZ.js.map} +0 -0
- /package/dist/{chunk-NI2XD6P3.js.map → chunk-YX4R2VGD.js.map} +0 -0
- /package/dist/{chunk-U5S6IP7Z.js.map → chunk-Z4XVPGPZ.js.map} +0 -0
- /package/dist/{chunk-DMCMV4UJ.js.map → chunk-ZRALOFEG.js.map} +0 -0
- /package/dist/{client-ILPJFCTF.js.map → client-SQMU25PS.js.map} +0 -0
- /package/dist/{config-JVWOL233.js.map → config-56NBA4SF.js.map} +0 -0
- /package/dist/{config-mutate-WYCHP6VK.js.map → config-mutate-PD4O3HZ7.js.map} +0 -0
- /package/dist/{config-mutator-DKNHE6VP.js.map → config-mutator-ITL64FBW.js.map} +0 -0
- /package/dist/{contributions-XD66HYWE.js.map → contributions-DKTJ623L.js.map} +0 -0
- /package/dist/{doctor-CGZ56DYP.js.map → doctor-OI6GJZR5.js.map} +0 -0
- /package/dist/{follow-up-tool-HPET6LZW.js.map → follow-up-tool-DYSLS6ZI.js.map} +0 -0
- /package/dist/{grants-Z332LOTO.js.map → grants-FY2TIT7I.js.map} +0 -0
- /package/dist/{hub-L5FFJPS3.js.map → hub-4HDMTSR7.js.map} +0 -0
- /package/dist/{processes-EWARF6ZW.js.map → processes-M7YPWX7H.js.map} +0 -0
- /package/dist/{promote-XI6W27JK.js.map → promote-3272TZNI.js.map} +0 -0
- /package/dist/{query-MGG5QKNC.js.map → query-7XM6V4QG.js.map} +0 -0
- /package/dist/{query-settings-CALZYYWD.js.map → query-settings-HHVBIIVQ.js.map} +0 -0
- /package/dist/{registry-XJWSLJ4O.js.map → registry-QL3AM3UH.js.map} +0 -0
- /package/dist/{request-planner-JCRGGJUO.js.map → request-planner-WNEDEA7X.js.map} +0 -0
- /package/dist/{review-candidates-OEBEEAEZ.js.map → review-candidates-TGPDJMWJ.js.map} +0 -0
- /package/dist/{routing-CGH54RYG.js.map → routing-ALXY25NE.js.map} +0 -0
- /package/dist/{schedule-tool-UM3CAPDX.js.map → schedule-tool-22UBZXCG.js.map} +0 -0
- /package/dist/{scheduler-2K5YEV2U.js.map → scheduler-5PHNW243.js.map} +0 -0
- /package/dist/{seat-DEL5YUOS.js.map → seat-ZYVVEILY.js.map} +0 -0
- /package/dist/{select-MRTWSI7U.js.map → select-6QLEV6AC.js.map} +0 -0
- /package/dist/{set-enabled-XTDCFCZY.js.map → set-enabled-SYYTKJPC.js.map} +0 -0
- /package/dist/{sprint-tool-N7WPDX5J.js.map → sprint-tool-PYVHPHR2.js.map} +0 -0
- /package/dist/{tool-BQEJOTF3.js.map → tool-GIYOYXXM.js.map} +0 -0
- /package/dist/{tool-NZTJZDSB.js.map → tool-TDOUM3BJ.js.map} +0 -0
- /package/dist/{tool-KZHWJ7BC.js.map → tool-ZKZ4KYJT.js.map} +0 -0
- /package/dist/{wiki-YERCKD3E.js.map → wiki-ZRGLGMII.js.map} +0 -0
- /package/dist/{wiki-enrich-K54LGNU3.js.map → wiki-enrich-CTID7JQW.js.map} +0 -0
|
@@ -0,0 +1,401 @@
|
|
|
1
|
+
import AppKit
|
|
2
|
+
import SwiftUI
|
|
3
|
+
|
|
4
|
+
/// The open-requests list (#1455): one row per request the widget has
|
|
5
|
+
/// sent, beside the pill.
|
|
6
|
+
///
|
|
7
|
+
/// It opens three ways. Hovering the pill for half a second opens it for
|
|
8
|
+
/// as long as the pointer is on the pill or the list. A click on the mini
|
|
9
|
+
/// orbs or on "1 new", or ⌘⌥O, opens it until Esc or a click elsewhere,
|
|
10
|
+
/// with the keyboard in it: ↑ ↓ move, Return picks, Esc hides. Picking a
|
|
11
|
+
/// row is the app's to do (`onPick`). What the rows say comes from
|
|
12
|
+
/// OpenRequests.swift, which is tested without a window.
|
|
13
|
+
///
|
|
14
|
+
/// A floating non-activating panel like the pill, so opening it never
|
|
15
|
+
/// takes the keyboard from the app in front unless the owner asked for
|
|
16
|
+
/// the keyboard (a click or the shortcut).
|
|
17
|
+
final class RequestsWindow: NSPanel {
|
|
18
|
+
enum Mode {
|
|
19
|
+
/// Opened by hovering the pill: goes when the pointer leaves both.
|
|
20
|
+
case hover
|
|
21
|
+
/// Opened by a click or the shortcut: stays until Esc or a click
|
|
22
|
+
/// elsewhere, and holds the keyboard.
|
|
23
|
+
case pinned
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
let model = RequestsModel()
|
|
27
|
+
/// Nil while the list is hidden.
|
|
28
|
+
private(set) var mode: Mode?
|
|
29
|
+
var isOpen: Bool { mode != nil }
|
|
30
|
+
/// The list is above the pill: its newest row at the bottom, next to it.
|
|
31
|
+
private(set) var above = true
|
|
32
|
+
|
|
33
|
+
/// The rows now, the newest last when true. Set by the app.
|
|
34
|
+
var rows: (_ newestLast: Bool) -> [RequestsModel.Row] = { _ in [] }
|
|
35
|
+
/// Where the pill is, to stand beside it and to stay open over it.
|
|
36
|
+
var pillFrame: () -> NSRect = { .zero }
|
|
37
|
+
|
|
38
|
+
static let width: CGFloat = 360
|
|
39
|
+
/// The header, one row, and the padding under the last row.
|
|
40
|
+
private static let headerHeight: CGFloat = 40
|
|
41
|
+
private static let rowHeight: CGFloat = 52
|
|
42
|
+
private static let bottomPadding: CGFloat = 8
|
|
43
|
+
private static let emptyHeight: CGFloat = 92
|
|
44
|
+
|
|
45
|
+
/// Counts the thinking clocks while the list shows.
|
|
46
|
+
private var tick: Timer?
|
|
47
|
+
/// The pointer left: hide in a moment unless it comes back.
|
|
48
|
+
private var leaveCheck: DispatchWorkItem?
|
|
49
|
+
|
|
50
|
+
init() {
|
|
51
|
+
let frame = NSRect(x: 0, y: 0, width: Self.width, height: Self.emptyHeight)
|
|
52
|
+
super.init(contentRect: frame, styleMask: [.borderless, .nonactivatingPanel],
|
|
53
|
+
backing: .buffered, defer: false)
|
|
54
|
+
isFloatingPanel = true
|
|
55
|
+
level = .floating
|
|
56
|
+
collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .stationary]
|
|
57
|
+
isOpaque = false
|
|
58
|
+
backgroundColor = .clear
|
|
59
|
+
hasShadow = true
|
|
60
|
+
hidesOnDeactivate = false
|
|
61
|
+
becomesKeyOnlyIfNeeded = false
|
|
62
|
+
setAccessibilityLabel("Open requests")
|
|
63
|
+
|
|
64
|
+
let surface = Surface(frame: frame)
|
|
65
|
+
contentView = surface
|
|
66
|
+
let host = RequestsHost(rootView: RequestsView(model: model))
|
|
67
|
+
host.frame = surface.bounds
|
|
68
|
+
host.autoresizingMask = [.width, .height]
|
|
69
|
+
surface.addSubview(host)
|
|
70
|
+
surface.addTrackingArea(NSTrackingArea(rect: .zero,
|
|
71
|
+
options: [.mouseEnteredAndExited, .activeAlways, .inVisibleRect],
|
|
72
|
+
owner: self, userInfo: nil))
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
// Borderless panels refuse key status unless told otherwise. The list
|
|
76
|
+
// takes it only when opened by a click or the shortcut.
|
|
77
|
+
override var canBecomeKey: Bool { true }
|
|
78
|
+
|
|
79
|
+
// MARK: Open and close
|
|
80
|
+
|
|
81
|
+
/// Show the list beside the pill. Hovering never turns a list opened
|
|
82
|
+
/// by a click or the shortcut back into one that closes by itself.
|
|
83
|
+
/// `select`: the row the keyboard starts on, when opened for it.
|
|
84
|
+
@MainActor
|
|
85
|
+
func open(_ mode: Mode, select: Int? = nil) {
|
|
86
|
+
leaveCheck?.cancel()
|
|
87
|
+
leaveCheck = nil
|
|
88
|
+
if self.mode != .pinned { self.mode = mode }
|
|
89
|
+
if mode == .pinned {
|
|
90
|
+
model.keyboard = select != nil
|
|
91
|
+
if let select { model.selected = select }
|
|
92
|
+
}
|
|
93
|
+
reload()
|
|
94
|
+
orderFrontRegardless()
|
|
95
|
+
if self.mode == .pinned { makeKey() }
|
|
96
|
+
if tick == nil {
|
|
97
|
+
tick = Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
|
|
98
|
+
Task { @MainActor [weak self] in self?.reload() }
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
@MainActor
|
|
104
|
+
func dismissList() {
|
|
105
|
+
guard mode != nil else { return }
|
|
106
|
+
mode = nil
|
|
107
|
+
tick?.invalidate()
|
|
108
|
+
tick = nil
|
|
109
|
+
leaveCheck?.cancel()
|
|
110
|
+
leaveCheck = nil
|
|
111
|
+
model.keyboard = false
|
|
112
|
+
model.selected = nil
|
|
113
|
+
orderOut(nil)
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/// The rows again, and the list's size and place for them. Cheap:
|
|
117
|
+
/// SwiftUI redraws only what changed.
|
|
118
|
+
@MainActor
|
|
119
|
+
func reload() {
|
|
120
|
+
guard mode != nil else { return }
|
|
121
|
+
let pill = pillFrame()
|
|
122
|
+
let count = rows(true).count
|
|
123
|
+
let height = count == 0 ? Self.emptyHeight
|
|
124
|
+
: Self.headerHeight + CGFloat(count) * Self.rowHeight + Self.bottomPadding
|
|
125
|
+
let screen = NSScreen.screens.first { $0.frame.intersects(pill) } ?? NSScreen.main ?? NSScreen.screens.first
|
|
126
|
+
guard let visible = screen?.visibleFrame else { return }
|
|
127
|
+
let spot = PillPlacement.list(width: Self.width, height: height, pill: pill, visible: visible)
|
|
128
|
+
above = spot.above
|
|
129
|
+
let fresh = rows(above)
|
|
130
|
+
if model.rows != fresh { model.rows = fresh }
|
|
131
|
+
if let s = model.selected, !fresh.contains(where: { $0.id == s }) { model.selected = nil }
|
|
132
|
+
if frame != spot.frame { setFrame(spot.frame, display: true) }
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/// The pointer left the pill or the list. A list opened by hovering
|
|
136
|
+
/// goes a moment later, unless the pointer is back on either.
|
|
137
|
+
@MainActor
|
|
138
|
+
func pointerLeft() {
|
|
139
|
+
guard mode == .hover else { return }
|
|
140
|
+
leaveCheck?.cancel()
|
|
141
|
+
let check = DispatchWorkItem { [weak self] in
|
|
142
|
+
MainActor.assumeIsolated {
|
|
143
|
+
guard let self, self.mode == .hover else { return }
|
|
144
|
+
let at = NSEvent.mouseLocation
|
|
145
|
+
if self.frame.contains(at) || self.pillFrame().contains(at) { return }
|
|
146
|
+
self.dismissList()
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
leaveCheck = check
|
|
150
|
+
DispatchQueue.main.asyncAfter(deadline: .now() + 0.4, execute: check)
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
override func mouseEntered(with event: NSEvent) {
|
|
154
|
+
MainActor.assumeIsolated {
|
|
155
|
+
leaveCheck?.cancel()
|
|
156
|
+
leaveCheck = nil
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
override func mouseExited(with event: NSEvent) {
|
|
161
|
+
MainActor.assumeIsolated { pointerLeft() }
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
/// A click elsewhere: a list opened by a click or the shortcut goes.
|
|
165
|
+
override func resignKey() {
|
|
166
|
+
super.resignKey()
|
|
167
|
+
MainActor.assumeIsolated {
|
|
168
|
+
if mode == .pinned { dismissList() }
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
// MARK: Keyboard
|
|
173
|
+
|
|
174
|
+
/// ↑ ↓ Return and Esc, taken before SwiftUI sees them, so the list
|
|
175
|
+
/// answers the same keys whatever has focus inside it.
|
|
176
|
+
override func sendEvent(_ event: NSEvent) {
|
|
177
|
+
if event.type == .keyDown, MainActor.assumeIsolated({ key(event) }) { return }
|
|
178
|
+
super.sendEvent(event)
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
@MainActor
|
|
182
|
+
private func key(_ event: NSEvent) -> Bool {
|
|
183
|
+
let ids = model.rows.map(\.id)
|
|
184
|
+
switch event.keyCode {
|
|
185
|
+
case 125, 126: // ↓ ↑
|
|
186
|
+
model.keyboard = true
|
|
187
|
+
model.selected = OpenRequests.move(model.selected, by: event.keyCode == 125 ? 1 : -1, in: ids)
|
|
188
|
+
return true
|
|
189
|
+
case 36, 76: // Return, Enter
|
|
190
|
+
guard let id = model.selected else { return true }
|
|
191
|
+
model.onPick?(id)
|
|
192
|
+
return true
|
|
193
|
+
case 53: // Esc
|
|
194
|
+
dismissList()
|
|
195
|
+
return true
|
|
196
|
+
default:
|
|
197
|
+
return false
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
/// The row the keyboard is on, while the list shows: the talk key then
|
|
202
|
+
/// talks to its agent.
|
|
203
|
+
@MainActor
|
|
204
|
+
var selectedRow: Int? { isOpen ? model.selected : nil }
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
/// Takes the first click even while the list is not the key window, so a
|
|
208
|
+
/// row picked from a list opened by hovering is picked at once.
|
|
209
|
+
private final class RequestsHost: NSHostingView<RequestsView> {
|
|
210
|
+
override func acceptsFirstMouse(for event: NSEvent?) -> Bool { true }
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
/// What the list shows. Rows are made by the app from OpenRequests.
|
|
214
|
+
@MainActor
|
|
215
|
+
final class RequestsModel: ObservableObject {
|
|
216
|
+
struct Row: Identifiable, Equatable {
|
|
217
|
+
enum Cue: Equatable { case waiting, thinking, ready, heard, failed }
|
|
218
|
+
let id: Int
|
|
219
|
+
let name: String
|
|
220
|
+
/// "Thinking, 1:12", "Answer ready", "Heard", "Couldn’t answer".
|
|
221
|
+
let state: String
|
|
222
|
+
/// The first words of the request.
|
|
223
|
+
let words: String
|
|
224
|
+
/// "now", "2 min".
|
|
225
|
+
let ago: String
|
|
226
|
+
let cue: Cue
|
|
227
|
+
/// An answer or a failure not seen yet: a blue dot and a bold name.
|
|
228
|
+
let isNew: Bool
|
|
229
|
+
let tint: NSColor
|
|
230
|
+
let colors: [NSColor]?
|
|
231
|
+
/// The whole row, as VoiceOver reads it.
|
|
232
|
+
let voiceOver: String
|
|
233
|
+
/// What picking it does, for VoiceOver: "Listen", "Show the
|
|
234
|
+
/// answer", "See why"; nil while there is nothing to hear yet.
|
|
235
|
+
let action: String?
|
|
236
|
+
}
|
|
237
|
+
|
|
238
|
+
@Published var rows: [Row] = []
|
|
239
|
+
/// The row the keyboard is on.
|
|
240
|
+
@Published var selected: Int?
|
|
241
|
+
/// The keyboard is in the list: the selected row has a ring.
|
|
242
|
+
@Published var keyboard = false
|
|
243
|
+
/// A row was clicked, or Return pressed on it. Set by the app.
|
|
244
|
+
var onPick: ((Int) -> Void)?
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
struct RequestsView: View {
|
|
248
|
+
@ObservedObject var model: RequestsModel
|
|
249
|
+
|
|
250
|
+
var body: some View {
|
|
251
|
+
VStack(alignment: .leading, spacing: 0) {
|
|
252
|
+
HStack(spacing: 8) {
|
|
253
|
+
Text("Open requests")
|
|
254
|
+
.font(.system(size: 13, weight: .bold))
|
|
255
|
+
if !model.rows.isEmpty {
|
|
256
|
+
Text("\(model.rows.count)")
|
|
257
|
+
.font(.system(size: 11, weight: .bold).monospacedDigit())
|
|
258
|
+
.foregroundStyle(.secondary)
|
|
259
|
+
.padding(.horizontal, 7)
|
|
260
|
+
.background(Capsule().fill(Color.primary.opacity(0.08)))
|
|
261
|
+
}
|
|
262
|
+
Spacer(minLength: 0)
|
|
263
|
+
Text("⌘⌥O")
|
|
264
|
+
.font(.system(size: 11))
|
|
265
|
+
.foregroundStyle(.secondary)
|
|
266
|
+
.accessibilityLabel("Shortcut: Command Option O")
|
|
267
|
+
}
|
|
268
|
+
.padding(.horizontal, 14)
|
|
269
|
+
.frame(height: 40)
|
|
270
|
+
.accessibilityElement(children: .combine)
|
|
271
|
+
.accessibilityAddTraits(.isHeader)
|
|
272
|
+
|
|
273
|
+
if model.rows.isEmpty {
|
|
274
|
+
VStack(alignment: .leading, spacing: 2) {
|
|
275
|
+
Text("Nothing open")
|
|
276
|
+
.font(.system(size: 13, weight: .semibold))
|
|
277
|
+
Text("Hold ⌥Space and ask any agent.")
|
|
278
|
+
.font(.system(size: 12))
|
|
279
|
+
.foregroundStyle(.secondary)
|
|
280
|
+
}
|
|
281
|
+
.padding(.horizontal, 14)
|
|
282
|
+
.accessibilityElement(children: .combine)
|
|
283
|
+
} else {
|
|
284
|
+
ScrollViewReader { scroller in
|
|
285
|
+
ScrollView(.vertical) {
|
|
286
|
+
VStack(spacing: 0) {
|
|
287
|
+
ForEach(model.rows) { row in
|
|
288
|
+
RequestRow(row: row,
|
|
289
|
+
selected: model.selected == row.id,
|
|
290
|
+
ring: model.keyboard && model.selected == row.id,
|
|
291
|
+
pick: { model.onPick?(row.id) })
|
|
292
|
+
.id(row.id)
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
.padding(.horizontal, 6)
|
|
296
|
+
.padding(.bottom, 8)
|
|
297
|
+
}
|
|
298
|
+
.onChange(of: model.selected) { _, id in
|
|
299
|
+
if let id { scroller.scrollTo(id) }
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .top)
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
/// One request: its agent's orb, name and state, the first words of the
|
|
309
|
+
/// request, and how long ago it was sent.
|
|
310
|
+
struct RequestRow: View {
|
|
311
|
+
let row: RequestsModel.Row
|
|
312
|
+
let selected: Bool
|
|
313
|
+
/// The keyboard is on this row.
|
|
314
|
+
let ring: Bool
|
|
315
|
+
let pick: () -> Void
|
|
316
|
+
@State private var hovering = false
|
|
317
|
+
|
|
318
|
+
/// The "not heard" blue, lighter in dark so it reads on the dark pill.
|
|
319
|
+
static let blue = Color(nsColor: NSColor(name: nil) { look in
|
|
320
|
+
look.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
|
|
321
|
+
? NSColor(srgbRed: 0.478, green: 0.635, blue: 1, alpha: 1) // #7aa2ff
|
|
322
|
+
: NSColor(srgbRed: 0.114, green: 0.306, blue: 0.847, alpha: 1) // #1d4ed8
|
|
323
|
+
})
|
|
324
|
+
/// "Couldn’t answer", readable on both themes.
|
|
325
|
+
static let red = Color(nsColor: NSColor(name: nil) { look in
|
|
326
|
+
look.bestMatch(from: [.darkAqua, .aqua]) == .darkAqua
|
|
327
|
+
? NSColor(srgbRed: 1, green: 0.561, blue: 0.529, alpha: 1) // #ff8f87
|
|
328
|
+
: NSColor(srgbRed: 0.706, green: 0.137, blue: 0.094, alpha: 1) // #b42318
|
|
329
|
+
})
|
|
330
|
+
|
|
331
|
+
var body: some View {
|
|
332
|
+
HStack(spacing: 10) {
|
|
333
|
+
MiniOrb(orb: orb, t: 0, still: true)
|
|
334
|
+
.frame(width: PillBusy.diameter, height: PillBusy.diameter)
|
|
335
|
+
.scaleEffect(1.4)
|
|
336
|
+
.frame(width: 22, height: 22)
|
|
337
|
+
VStack(alignment: .leading, spacing: 1) {
|
|
338
|
+
HStack(spacing: 6) {
|
|
339
|
+
if row.isNew {
|
|
340
|
+
Circle().fill(Self.blue).frame(width: 8, height: 8)
|
|
341
|
+
}
|
|
342
|
+
Text(row.name)
|
|
343
|
+
.font(.system(size: 13, weight: row.isNew ? .bold : .semibold))
|
|
344
|
+
.lineLimit(1)
|
|
345
|
+
Text("· " + row.state)
|
|
346
|
+
.font(.system(size: 11.5, weight: row.cue == .ready || row.cue == .failed ? .semibold : .regular))
|
|
347
|
+
.foregroundStyle(stateColor)
|
|
348
|
+
.lineLimit(1)
|
|
349
|
+
}
|
|
350
|
+
Text(row.words)
|
|
351
|
+
.font(.system(size: 12))
|
|
352
|
+
.foregroundStyle(.secondary)
|
|
353
|
+
.lineLimit(1)
|
|
354
|
+
.truncationMode(.tail)
|
|
355
|
+
}
|
|
356
|
+
Spacer(minLength: 4)
|
|
357
|
+
Text(row.ago)
|
|
358
|
+
.font(.system(size: 11))
|
|
359
|
+
.foregroundStyle(.secondary)
|
|
360
|
+
}
|
|
361
|
+
.padding(.horizontal, 8)
|
|
362
|
+
.frame(maxWidth: .infinity, minHeight: 52, maxHeight: 52, alignment: .leading)
|
|
363
|
+
.background(RoundedRectangle(cornerRadius: 10, style: .continuous)
|
|
364
|
+
.fill(Color.primary.opacity(hovering || selected ? 0.06 : 0)))
|
|
365
|
+
.overlay(RoundedRectangle(cornerRadius: 10, style: .continuous)
|
|
366
|
+
.strokeBorder(Self.blue, lineWidth: ring ? 2 : 0))
|
|
367
|
+
.contentShape(Rectangle())
|
|
368
|
+
.onHover { hovering = $0 }
|
|
369
|
+
.onTapGesture(perform: pick)
|
|
370
|
+
.accessibilityElement(children: .ignore)
|
|
371
|
+
.accessibilityLabel(row.voiceOver)
|
|
372
|
+
.accessibilityAddTraits(row.action == nil ? [] : .isButton)
|
|
373
|
+
.accessibilityActions {
|
|
374
|
+
if let action = row.action {
|
|
375
|
+
Button(action, action: pick)
|
|
376
|
+
}
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
private var stateColor: Color {
|
|
381
|
+
switch row.cue {
|
|
382
|
+
case .ready: return Self.blue
|
|
383
|
+
case .failed: return Self.red
|
|
384
|
+
case .waiting, .thinking, .heard: return .secondary
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
|
|
388
|
+
/// The row's orb is the pill's mini orb, still, with the same cues.
|
|
389
|
+
private var orb: MiniOrbsModel.Orb {
|
|
390
|
+
let activity: PillBusy.Activity
|
|
391
|
+
switch row.cue {
|
|
392
|
+
case .thinking: activity = .thinking
|
|
393
|
+
case .ready: activity = .ready
|
|
394
|
+
case .failed: activity = .failed
|
|
395
|
+
// Waiting, or heard: the small dimmed dot, with no ring.
|
|
396
|
+
case .waiting, .heard: activity = .queued
|
|
397
|
+
}
|
|
398
|
+
return MiniOrbsModel.Orb(agentID: "\(row.id)", activity: activity, queued: 0,
|
|
399
|
+
tint: row.tint, colors: row.colors, tooltip: row.voiceOver)
|
|
400
|
+
}
|
|
401
|
+
}
|
|
@@ -367,6 +367,7 @@ private struct GeneralTab: View {
|
|
|
367
367
|
HotkeyField(title: "Stop every voice", value: nonOptional(\.stop, draft.general.hotkeys.stop), optional: false, model: model, id: "stop")
|
|
368
368
|
HotkeyField(title: "Smart paste", value: nonOptional(\.paste, draft.general.hotkeys.paste), optional: false, model: model, id: "paste")
|
|
369
369
|
LabeledContent("Open the menu", value: HotkeySpec.display(draft.menuHotkey))
|
|
370
|
+
LabeledContent("Open requests", value: HotkeySpec.display("cmd+opt+o"))
|
|
370
371
|
} header: {
|
|
371
372
|
Text("Shortcuts")
|
|
372
373
|
} footer: {
|
|
@@ -37,6 +37,15 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
37
37
|
didSet { rebuild(); watchQueue(force: true); onActivity?() }
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
+
/// Agents with an answer waiting to be heard (#1455). Set by the app.
|
|
41
|
+
var ready: [String] = [] {
|
|
42
|
+
didSet { if ready != oldValue { rebuild() } }
|
|
43
|
+
}
|
|
44
|
+
/// An agent's own shortcut as shown ("⌃⌥2"), or nil. Set by the app.
|
|
45
|
+
var shortcut: (String) -> String? = { _ in nil }
|
|
46
|
+
/// "Open requests…": the list, with the keyboard in it.
|
|
47
|
+
var onOpenRequests: (() -> Void)?
|
|
48
|
+
|
|
40
49
|
/// Set by the app.
|
|
41
50
|
var onStop: (() -> Void)?
|
|
42
51
|
/// Who holds the floor (#924): a row says so, with a way to take it back.
|
|
@@ -139,6 +148,7 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
139
148
|
case .error: ("exclamationmark.triangle", "Error")
|
|
140
149
|
case .ringing: ("phone.arrow.down.left.fill", "Incoming call")
|
|
141
150
|
case .onCall: ("phone.fill", "On a call")
|
|
151
|
+
case .note: ("waveform", "Idle")
|
|
142
152
|
}
|
|
143
153
|
guard item.button?.toolTip != "AgentX Voice — \(label)" else { return }
|
|
144
154
|
let image = NSImage(systemSymbolName: symbol, accessibilityDescription: "AgentX Voice: \(label)")
|
|
@@ -188,6 +198,7 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
188
198
|
// More than one: the rest wait for the answer in flight.
|
|
189
199
|
parts.append(asked > 1 ? "thinking (+\(asked - 1) asked)" : "thinking")
|
|
190
200
|
}
|
|
201
|
+
if ready.contains(id) { parts.append("answer ready") }
|
|
191
202
|
if parts.isEmpty && active > 0 { parts.append("working") }
|
|
192
203
|
let queued = queue?.waiting.filter { $0.agentId == id }.count ?? 0
|
|
193
204
|
if queued > 0 { parts.append("queued \(queued)") }
|
|
@@ -221,7 +232,9 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
221
232
|
if agents.isEmpty { menu.addItem(disabled("No agents configured")) }
|
|
222
233
|
for (i, agent) in agents.enumerated() {
|
|
223
234
|
// Digits pick an agent while the menu is open.
|
|
224
|
-
|
|
235
|
+
// Its own shortcut, when it has one: hold it to ask this agent.
|
|
236
|
+
let keys = shortcut(agent.id).map { " \($0)" } ?? ""
|
|
237
|
+
let row = action(agent.label + " · " + state(of: agent) + keys, #selector(pick(_:)),
|
|
225
238
|
key: i < 9 ? "\(i + 1)" : "", modifiers: [])
|
|
226
239
|
row.representedObject = agent.id
|
|
227
240
|
row.state = agent.id == target ? .on : .off
|
|
@@ -248,6 +261,12 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
248
261
|
recent.addItems(to: menu, name: name(of:))
|
|
249
262
|
|
|
250
263
|
menu.addItem(.separator())
|
|
264
|
+
menu.addItem(action("Open requests…", #selector(openRequests), key: "o", modifiers: [.command, .option]))
|
|
265
|
+
// Answers wait as "not heard" until picked (#1455); ticked, they play
|
|
266
|
+
// as soon as they are back, as before.
|
|
267
|
+
let atOnce = action("Play answers at once", #selector(togglePlayAtOnce), key: "")
|
|
268
|
+
atOnce.state = Config.playAnswersAtOnce ? .on : .off
|
|
269
|
+
menu.addItem(atOnce)
|
|
251
270
|
if let held = floor.menuTitle(now: Date().timeIntervalSince1970) {
|
|
252
271
|
menu.addItem(disabled(held))
|
|
253
272
|
menu.addItem(action("Take the floor back", #selector(takeFloorBack), key: ""))
|
|
@@ -323,6 +342,8 @@ final class StatusMenu: NSObject, NSMenuDelegate {
|
|
|
323
342
|
}
|
|
324
343
|
|
|
325
344
|
@objc private func stop() { onStop?() }
|
|
345
|
+
@objc private func openRequests() { onOpenRequests?() }
|
|
346
|
+
@objc private func togglePlayAtOnce() { Config.playAnswersAtOnce.toggle(); rebuild() }
|
|
326
347
|
@objc private func takeFloorBack() { onTakeFloorBack?() }
|
|
327
348
|
|
|
328
349
|
@objc private func toggleHold() {
|