agentix-cli 0.103.2 → 0.103.3

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

@@ -7,8 +7,9 @@ import AppKit
 /// The answering agent can send it to something on screen, which it
 /// marks (#482). Chosen with `voice.look`; the orb stays the default.
 ///
-/// It reacts and never interrupts: its window takes no keys, no clicks
-/// but a drag of its body with ⌘ held, and never comes forward by itself.
+/// It reacts and never interrupts: its window takes no keys and never
+/// comes forward by itself. It takes a drag of its body with ⌘ held, and
+/// idle with no bubble a click and a right-click on its body (#579).
 /// With Reduce Motion on, or "Animated orb" off in the menu, it is a
 /// still picture that changes between states and stays where it rests.
 @MainActor
@@ -72,6 +73,15 @@ final class CharacterHost {
     /// Carried by the pointer: where the pointer took hold, and where it
     /// stood then, which is not where it rests once it has stepped aside.
     private var carried: (from: NSPoint, rest: CGPoint)?
+    /// Idle with no bubble, a click on it talks and a right-click opens
+    /// the menu, as on the pill (#579). Set by the app.
+    var onClick: (() -> Void)?
+    var contextMenu: (() -> NSMenu)?
+    private var clickable: Bool {
+        CharacterMath.clickable(activity, asked: asked, sent: guide.showing != nil, bubble: bubbleFrame != nil)
+    }
+    /// The press that carries it began as a click.
+    private var pressed = false
     /// What the answering agent sent it to show (#482), and its mark.
     private let guide = CharacterGuide()
     /// Sent somewhere, and what its bubble says there (#562).
@@ -102,6 +112,10 @@ final class CharacterHost {
         window.ignoresMouseEvents = true
         window.contentView = view
         view.onDrag = { [weak self] phase in self?.drag(phase) }
+        view.onMenu = { [weak self] event in
+            guard let self, let menu = self.contextMenu?() else { return }
+            NSMenu.popUpContextMenu(menu, with: event, for: self.view)
+        }
         view.unit = Self.diameter / 100
         view.edge = CGPoint(x: Self.size.width / 2, y: Self.size.height - Self.ground)
         motionObserver = NSWorkspace.shared.notificationCenter.addObserver(
@@ -206,12 +220,13 @@ final class CharacterHost {
         self.timer = timer
     }
 
-    /// It takes the pointer only to be moved: on its body, with ⌘ held.
-    /// Any other click goes through it to the window behind.
+    /// It takes the pointer on its body: with ⌘ held to be moved, and
+    /// idle with no bubble to be clicked. Any other click goes through it
+    /// to the window behind.
     private func aim() {
         // The button came up where no event told of it.
         if carried != nil && NSEvent.pressedMouseButtons & 1 == 0 { drop() }
-        let take = carried != nil || (NSEvent.modifierFlags.contains(.command) && body.contains(pointerSource()))
+        let take = carried != nil || ((clickable || NSEvent.modifierFlags.contains(.command)) && body.contains(pointerSource()))
         if window.ignoresMouseEvents == take { window.ignoresMouseEvents = !take }
     }
 
@@ -219,20 +234,26 @@ final class CharacterHost {
         switch phase {
         case .began:
             let mouse = pointerSource()
+            pressed = clickable
             if body.contains(mouse) { guide.end(glide: false); onGuide?(); carried = (mouse, CGPoint(x: body.midX, y: rest.y)) }
         case .moved:
             if carried != nil { tick() }
         case .ended:
             if carried != nil { tick() }
-            drop()
+            drop(click: pressed)
         }
     }
 
-    /// Let go: where it was carried to is kept. A click alone moves nothing.
-    private func drop() {
+    /// Let go: where it was carried to is kept. A click alone moves
+    /// nothing; on a character that could be clicked, it talks.
+    private func drop(click: Bool = false) {
         guard let was = carried else { return }
         carried = nil
-        guard pointerSource() != was.from else { return }
+        let now = pointerSource()
+        guard hypot(now.x - was.from.x, now.y - was.from.y) >= 4 else {
+            if click { onClick?() }
+            return
+        }
         place = rest
         Config.characterPlace = rest
     }
@@ -287,7 +308,7 @@ final class CharacterHost {
                 edges = strolls && Config.playMode ? Meets.edges(of: Meets.windows(), band: (top - Self.head)...top) : []
             }
             frame = sim.step(to: now,
-                             CharacterSim.Input(activity: activity, level: level, pointer: pointer, held: held, sent: guide.showing != nil, asked: asked, strolls: strolls,
+                             CharacterSim.Input(activity: activity, level: level, pointer: pointer, held: held, clickable: clickable, sent: guide.showing != nil, asked: asked, strolls: strolls,
                                                 edges: edges, shows: bubbleShows?() ?? false, plays: Config.playMode, animates: quiet ? 0 : animates, down: NSEvent.pressedMouseButtons & 1 != 0,
                                                 home: home, range: Double(spot.ends.lowerBound)...Double(spot.ends.upperBound)))
         }

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

@@ -44,6 +44,12 @@ enum CharacterMath {
         }
     }
 
+    /// It can be clicked (#579): idle, where it rests, with no bubble to
+    /// click in its place. Then it waits for the pointer and takes the click.
+    static func clickable(_ activity: Activity, asked: Mood?, sent: Bool, bubble: Bool) -> Bool {
+        activity == .idle && asked == nil && !sent && !bubble
+    }
+
     /// The state it goes through on the way from `from` to `to`, if any:
     /// it notices you before it listens and when it wakes, and nods once
     /// it has heard you.

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

@@ -78,10 +78,11 @@ struct CharacterSim {
         // The pointer comes close: out of its way. Left alone: back home,
         // unless the pointer is resting there.
         let near = input.pointer.map { abs($0.x - x) < reach && abs($0.y) < tall } ?? false
+        let held = input.held || (input.clickable && near)
         // Idle with play mode on, a game with the pointer comes first.
         // Sent to show something, it does not play.
         var game = PointerPlay.Out()
-        if input.plays && !input.sent && !input.held && !input.shows && mood == .idle && input.activity == .idle {
+        if input.plays && !input.sent && !held && !input.shows && mood == .idle && input.activity == .idle {
             game = play.step(now, dt, x: x, pointer: input.pointer, down: input.down, range: input.range)
         } else {
             play.stop(now, down: input.down)
@@ -91,7 +92,7 @@ struct CharacterSim {
             restSince = now
             // The stroll is over: sent home again, it rests there.
             strolled = 0; strollTo = 0; strollNext = nil
-        } else if input.held {
+        } else if held {
             target = x
             awayUntil = max(awayUntil, now + Self.awayFor)
         } else if let to = game.target {
@@ -133,7 +134,7 @@ struct CharacterSim {
         if let at = pending, now >= at { pending = nil; go(goal, now) }
         var pose = change.pose(at: now)
         // Idle, left alone and standing: a small animation now and then.
-        let alone = mood == .idle && input.activity == .idle && input.asked == nil && !input.sent && !input.held && !input.shows
+        let alone = mood == .idle && input.activity == .idle && input.asked == nil && !input.sent && !held && !input.shows
             && !near && game == PointerPlay.Out() && play.game == nil && abs(speed) < 40 && strolled == 0 && strollTo == 0
         let own = idle.step(now, dt, free: alone, gap: input.animates, dozeIn: restSince + Self.dozeAfter - now)
 

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

@@ -12,6 +12,9 @@ extension CharacterSim {
         /// The pointer is on its speech bubble: it stays where it is, so
         /// the bubble is not pulled from under the pointer.
         var held = false
+        /// It can be clicked (`CharacterMath.clickable`): it waits for a
+        /// pointer that comes close, and plays no game with it (#579).
+        var clickable = false
         /// The answering agent sent it to show something (#482): it goes
         /// to `home` at once, awake, whatever the pointer did before.
         var sent = false

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

@@ -12,15 +12,18 @@ final class CharacterView: NSView {
     /// Its speech bubble in this window, origin bottom-left; nil while hidden.
     var bubble: NSRect?
 
-    /// A drag of its body. Its window takes the mouse for nothing else.
+    /// A press on its body: a drag, or a click when it did not move.
     enum Drag { case began, moved, ended }
     var onDrag: ((Drag) -> Void)?
+    /// A right-click on its body.
+    var onMenu: ((NSEvent) -> Void)?
 
     override var isFlipped: Bool { true }
     override func acceptsFirstMouse(for event: NSEvent?) -> Bool { true }
     override func mouseDown(with event: NSEvent) { onDrag?(.began) }
     override func mouseDragged(with event: NSEvent) { onDrag?(.moved) }
     override func mouseUp(with event: NSEvent) { onDrag?(.ended) }
+    override func rightMouseDown(with event: NSEvent) { onMenu?(event) }
 
     override func draw(_ dirtyRect: NSRect) {
         guard let ctx = NSGraphicsContext.current?.cgContext else { return }

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

@@ -477,6 +477,8 @@ final class App: NSObject, NSApplicationDelegate {
 
         registerHotkeys()
         panel.onClick = { [weak self] in self?.toggleListening() }
+        character.onClick = { [weak self] in self?.toggleListening() }
+        character.contextMenu = { [weak self] in self?.statusMenu.menu ?? NSMenu() }
         statusMenu.onSettings = { [weak self] in self?.settingsWindow.show() }
         settingsWindow.model.onSaved = { [weak self] saved in self?.apply(saved) }
         // While a shortcut field waits for keys, ours stand aside so the

package/dist/{agent-MUGC4RZP.js → agent-NPE76XHC.js}

@@ -1,2 +1,2 @@
-import{A as a,B as b,C as c}from"./chunk-HVPRCHRG.js";import"./chunk-SFQUP3BP.js";import"./chunk-QOYAX2FT.js";import"./chunk-5MUJZODV.js";import"./chunk-7I7IEX4S.js";import"./chunk-JHCI6XCJ.js";import"./chunk-DSYKYZMT.js";import"./chunk-QIJLFPWE.js";export{a as createAgentContext,b as generate,c as generateStream};
-//# sourceMappingURL=agent-MUGC4RZP.js.map
+import{A as a,B as b,C as c}from"./chunk-MZQQVT3G.js";import"./chunk-SFQUP3BP.js";import"./chunk-QOYAX2FT.js";import"./chunk-5MUJZODV.js";import"./chunk-7I7IEX4S.js";import"./chunk-JHCI6XCJ.js";import"./chunk-DSYKYZMT.js";import"./chunk-QIJLFPWE.js";export{a as createAgentContext,b as generate,c as generateStream};
+//# sourceMappingURL=agent-NPE76XHC.js.map