@join-pantheon/cli 0.23.0 → 0.23.2

package/dist/tray.js

@@ -41,6 +41,7 @@ export function writeTrayCommands(home = CONFIG_DIR) {
         ["pantheon-doctor.command", `${JSON.stringify(bin)} doctor`],
         ["pantheon-approvals.command", `${JSON.stringify(bin)} approvals`],
         ["pantheon-explain.command", `${JSON.stringify(bin)} explain --queued`],
+        ["pantheon-details.command", `${JSON.stringify(bin)} explain --queued`],
     ]) {
         const file = join(dir, name);
         const keep = name === "pantheon-explain.command" ? "" : `\necho\nread -s -k '?press any key to close '`;
@@ -74,8 +75,7 @@ async function getJson(url) {
         clearTimeout(t);
     }
 }
-export async function trayStatus(cfg = load()) {
-    const f = loadAll();
+export async function trayStatus(cfg = load(), f = loadAll()) {
     const ms = Object.values(f?.spaces ?? {});
     if (f && ms.length > 1) {
         const parts = await Promise.all(ms.map((m) => trayStatusOne(configFor(f, m, null))));

package/dist/worker.js

@@ -11,7 +11,9 @@ import { agentHookStates, repairHook } from "./notify.js";
 import { fence, assess } from "./untrusted.js";
 import { allowed, recordRun } from "./spend.js";
 import { loadProfile, reservedDecisionsNote } from "./profile.js";
-import { clip, workerDoneNotice } from "./brief.js";
+import { clip } from "./brief.js";
+import { composeWorker } from "./notice.js";
+import { installedTools } from "./notifier.js";
 import { loadPersonas, matchPersona, personaByName, personaMatches, effectivePolicy, personaBrief, describePersona, } from "./persona.js";
 import { isContinuationFor, LIMITS, shouldDeferToHuman } from "./protocol.js";
 const git = (cwd, ...args) => execFileSync("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
@@ -538,6 +540,7 @@ export class Worker {
         }
         const reserved = reservedDecisionsNote(loadProfile(this.cfg));
         const brief = makeBrief(branch) + baseNote(baseRef, baseSha) + (reserved ? `\n\n${reserved}` : "");
+        const startedAt = Date.now();
         writeFileSync(join(worktree, ".pantheon-task.md"), brief);
         let command;
         let args;
@@ -587,17 +590,10 @@ export class Worker {
             at: Date.now(), goal: o.goal, obligation: o.id, ok,
             triggeredBy, summary,
         }, this.opts.home);
-        if (!ok && this.opts.notify) {
+        if (this.opts.notify && (!ok || loadProfile(this.cfg).notifications?.worker_done)) {
             try {
-                const n = workerDoneNotice({ ok, triggeredBy, summary });
-                this.opts.notify({ title: n.title, subtitle: n.subtitle, body: n.body, eyebrow: "Pantheon · needs attention" });
-            }
-            catch { }
-        }
-        else if (ok && this.opts.notify && loadProfile(this.cfg).notifications?.worker_done) {
-            try {
-                const n = workerDoneNotice({ ok, triggeredBy, summary });
-                this.opts.notify({ title: n.title, subtitle: n.subtitle, body: n.body, eyebrow: "Pantheon · worker finished" });
+                const reply = client.mineSince(startedAt, o.goal).pop() ?? null;
+                this.opts.notify(composeWorker({ ok, triggeredBy, obligationBody: o.body, goal: o.goal ? client.goals.get(o.goal) : undefined, reply, obligationRef: o.ref }, { tools: installedTools(), preferred: loadProfile(this.cfg).agent.primary_surface }));
             }
             catch { }
         }
@@ -694,6 +690,8 @@ export class Worker {
                 this.opts.log(`! self-upgrade failed: ${e.message}`);
             }
             if (result.ok && !result.alreadyCurrent && result.to === result.from) {
+                delete policy.attempts.self_upgrade;
+                savePolicy(policy, home);
                 this.opts.log(`* self-upgrade: the registry does not serve ${relayPkg} yet (installed ${result.to}); will check again`);
                 return;
             }

package/helper/macos/main.swift

@@ -1,9 +1,22 @@
 /*
- * Pantheon decision HUD.
+ * Pantheon notification HUD.
  *
  * A small, unsigned AppKit panel instead of a Notification Center or
- * AppleScript notification. Clicking it activates the agent surface selected
- * in the human's Pantheon profile. It owns no state and exits after 20 seconds.
+ * AppleScript notification. It answers the four things a person needs in a
+ * glance — who, what happened, what to do, where — and offers three actions:
+ *
+ *   Open in <tool> ▾   launches the chosen agent CLI with the question pre-filled
+ *                      (the choice becomes the default), through a .command file
+ *                      Terminal runs — no automation permission needed
+ *   Show details       prints the act and the decision in Terminal
+ *   Dismiss / ×        closes
+ *
+ * It owns no state. Everything it needs arrives as one JSON document:
+ *
+ *   pantheon-hud post --json '<notice json>'
+ *
+ * The older positional form is still accepted so a freshly upgraded CLI and a
+ * not-yet-rebuilt helper (or the reverse) keep working during an upgrade:
  *
  *   pantheon-hud post <title> <body> <activate-bundle-id> [ready-prompt]
  */
@@ -12,73 +25,138 @@ import AppKit
 let args = CommandLine.arguments
 
 if args.count == 2, args[1] == "version" {
-  print("1")
+  print("2")
   exit(0)
 }
 
-guard args.count >= 5, args[1] == "post" else {
-  fputs("usage: pantheon-hud post <title> <body> <activate-bundle-id> [ready-prompt]\n", stderr)
+struct Tool: Decodable { let id: String; let label: String }
+struct Primary: Decodable { let label: String; let `default`: String; let tools: [Tool]; let prompt: String }
+struct Details: Decodable { let act: String?; let decision: String? }
+struct Notice: Decodable {
+  let kind: String
+  let who: String
+  let avatar: String?
+  let heading: String
+  let context: String
+  let body: String
+  let ttl: Double
+  let sound: Bool
+  let primary: Primary?
+  let details: Details?
+  /** where to write the chosen action and which .command files to open — supplied by the CLI */
+  let bin_dir: String
+}
+
+var notice: Notice
+var legacyBundle: String? = nil
+var legacyPrompt = ""
+
+if args.count >= 4, args[1] == "post", args[2] == "--json", let data = args[3].data(using: .utf8), let n = try? JSONDecoder().decode(Notice.self, from: data) {
+  notice = n
+} else if args.count >= 5, args[1] == "post" {
+  // Legacy: <title> <body> <bundle> [prompt]. Shown in the new layout with a single "Open" action that activates the bundle.
+  let eyebrow = ProcessInfo.processInfo.environment["PANTHEON_HUD_EYEBROW"] ?? "Pantheon"
+  legacyBundle = args[4]
+  legacyPrompt = args.count >= 6 ? args[5] : ""
+  let json = """
+  {"kind":"legacy","who":\(jsonString(eyebrow)),"heading":\(jsonString(args[2])),"context":"","body":\(jsonString(args[3])),"ttl":20,"sound":false,"primary":null,"details":null,"bin_dir":""}
+  """
+  notice = try! JSONDecoder().decode(Notice.self, from: json.data(using: .utf8)!)
+} else {
+  fputs("usage: pantheon-hud post --json '<notice>'  |  pantheon-hud post <title> <body> <bundle-id> [prompt]\n", stderr)
   exit(64)
 }
 
-let eventTitle = args[2]
-let eventBody = args[3]
-let activateBundle = args[4]
-let readyPrompt = args.count >= 6 ? args[5] : ""
+func jsonString(_ s: String) -> String {
+  let d = try! JSONSerialization.data(withJSONObject: [s])
+  let arr = String(data: d, encoding: .utf8)!
+  return String(arr.dropFirst().dropLast())
+}
 
 private func label(_ text: String, font: NSFont, colour: NSColor, lines: Int) -> NSTextField {
   let field = NSTextField(wrappingLabelWithString: text)
   field.font = font
   field.textColor = colour
   field.maximumNumberOfLines = lines
-  field.lineBreakMode = .byTruncatingTail
+  field.lineBreakMode = lines > 1 ? .byWordWrapping : .byTruncatingTail
+  field.cell?.truncatesLastVisibleLine = true
   field.translatesAutoresizingMaskIntoConstraints = false
+  field.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
+  // Without this a wrapping label under Auto Layout lays out as one truncated line.
+  field.preferredMaxLayoutWidth = 420 - 32
   return field
 }
 
-final class ActionView: NSView {
-  override func hitTest(_ point: NSPoint) -> NSView? {
-    bounds.contains(point) ? self : nil
-  }
+final class AppDelegate: NSObject, NSApplicationDelegate {
+  private var panel: NSPanel?
+  private var timer: DispatchWorkItem?
+  private var hovering = false
 
-  override func mouseDown(with event: NSEvent) {
-    if !readyPrompt.isEmpty {
-      let pasteboard = NSPasteboard.general
-      pasteboard.clearContents()
-      pasteboard.setString(readyPrompt, forType: .string)
-    }
-    if let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: activateBundle) {
-      let config = NSWorkspace.OpenConfiguration()
-      config.activates = true
-      NSWorkspace.shared.openApplication(at: url, configuration: config) { _, _ in
-        NSApp.terminate(nil)
-      }
-    } else {
-      NSApp.terminate(nil)
+  // MARK: actions
+
+  /// Write what was chosen for `pantheon explain --queued`, then open the .command that runs it in Terminal.
+  private func act(_ payload: [String: Any], command: String) {
+    guard !notice.bin_dir.isEmpty else { return }
+    let dir = URL(fileURLWithPath: notice.bin_dir)
+    if let data = try? JSONSerialization.data(withJSONObject: payload) {
+      try? data.write(to: dir.appendingPathComponent(".hud-action.json"), options: .atomic)
     }
+    NSWorkspace.shared.open(dir.appendingPathComponent(command))
+    NSApp.terminate(nil)
   }
-}
 
-final class AppDelegate: NSObject, NSApplicationDelegate {
-  private var panel: NSPanel?
+  @objc func openTool(_ sender: NSMenuItem) {
+    guard let p = notice.primary else { return }
+    let tool = (sender.representedObject as? String) ?? p.default
+    act(["action": "open", "tool": tool, "prompt": p.prompt, "decision": notice.details?.decision as Any, "act": notice.details?.act as Any].compactMapValues { $0 is NSNull ? nil : $0 }, command: "pantheon-explain.command")
+  }
+
+  @objc func openDefault(_ sender: Any?) {
+    guard let p = notice.primary else { return }
+    act(["action": "open", "tool": p.default, "prompt": p.prompt, "decision": notice.details?.decision as Any, "act": notice.details?.act as Any].compactMapValues { $0 is NSNull ? nil : $0 }, command: "pantheon-explain.command")
+  }
+
+  @objc func showDetails(_ sender: Any?) {
+    act(["action": "details", "act": notice.details?.act as Any, "decision": notice.details?.decision as Any].compactMapValues { $0 is NSNull ? nil : $0 }, command: "pantheon-details.command")
+  }
+
+  @objc func legacyOpen(_ sender: Any?) {
+    if !legacyPrompt.isEmpty { NSPasteboard.general.clearContents(); NSPasteboard.general.setString(legacyPrompt, forType: .string) }
+    if let b = legacyBundle, let url = NSWorkspace.shared.urlForApplication(withBundleIdentifier: b) {
+      let config = NSWorkspace.OpenConfiguration(); config.activates = true
+      NSWorkspace.shared.openApplication(at: url, configuration: config) { _, _ in NSApp.terminate(nil) }
+    } else { NSApp.terminate(nil) }
+  }
+
+  @objc func dismiss(_ sender: Any?) { NSApp.terminate(nil) }
+
+  // MARK: timing — a hover pauses the fade; ttl 0 stays until acted on
+
+  private func schedule() {
+    timer?.cancel()
+    guard notice.ttl > 0 else { return }
+    let item = DispatchWorkItem { [weak self] in if self?.hovering == false { NSApp.terminate(nil) } else { self?.schedule() } }
+    timer = item
+    DispatchQueue.main.asyncAfter(deadline: .now() + notice.ttl, execute: item)
+  }
+
+  // MARK: layout
 
   func applicationDidFinishLaunching(_ notification: Notification) {
     NSApp.setActivationPolicy(.accessory)
 
-    let width: CGFloat = 400
-    let height: CGFloat = 170
-    let panel = NSPanel(
-      contentRect: NSRect(x: 0, y: 0, width: width, height: height),
-      styleMask: [.borderless, .nonactivatingPanel],
-      backing: .buffered,
-      defer: false
-    )
+    let width: CGFloat = 420
+    let hasContext = !notice.context.isEmpty
+    // Height follows the content: measured after the constraints are in place, so a
+    // five-line body gets five lines and a one-line body leaves no empty band.
+    let panel = NSPanel(contentRect: NSRect(x: 0, y: 0, width: width, height: 200), styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
     panel.isOpaque = false
     panel.backgroundColor = .clear
     panel.hasShadow = true
     panel.level = .floating
     panel.collectionBehavior = [.canJoinAllSpaces, .fullScreenAuxiliary, .transient]
     panel.hidesOnDeactivate = false
+    panel.isMovableByWindowBackground = true
 
     let effect = NSVisualEffectView(frame: panel.contentView?.bounds ?? .zero)
     effect.autoresizingMask = [.width, .height]
@@ -89,32 +167,109 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
     effect.layer?.cornerRadius = 16
     effect.layer?.masksToBounds = true
 
-    let root = ActionView(frame: effect.bounds)
-    root.autoresizingMask = [.width, .height]
+    let root = HoverView(frame: effect.bounds)
+    root.translatesAutoresizingMaskIntoConstraints = false
+    root.onHover = { [weak self] inside in self?.hovering = inside }
     effect.addSubview(root)
 
-    let eyebrowText = ProcessInfo.processInfo.environment["PANTHEON_HUD_EYEBROW"] ?? "Decision needed"
-    let eyebrow = label(eyebrowText, font: .systemFont(ofSize: 10, weight: .semibold), colour: .secondaryLabelColor, lines: 1)
-    let title = label(eventTitle, font: .systemFont(ofSize: 16, weight: .semibold), colour: .labelColor, lines: 2)
-    let body = label(eventBody, font: .systemFont(ofSize: 13), colour: .secondaryLabelColor, lines: 3)
-    let actionText = readyPrompt.isEmpty ? "Open your agent →" : "Open your agent · question copied →"
-    let action = label(actionText, font: .systemFont(ofSize: 12, weight: .semibold), colour: .controlAccentColor, lines: 1)
-
-    for view in [eyebrow, title, body, action] { root.addSubview(view) }
-    NSLayoutConstraint.activate([
-      eyebrow.leadingAnchor.constraint(equalTo: root.leadingAnchor, constant: 18),
-      eyebrow.topAnchor.constraint(equalTo: root.topAnchor, constant: 16),
-      title.leadingAnchor.constraint(equalTo: eyebrow.leadingAnchor),
-      title.topAnchor.constraint(equalTo: eyebrow.bottomAnchor, constant: 7),
-      title.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -18),
-      body.leadingAnchor.constraint(equalTo: eyebrow.leadingAnchor),
-      body.topAnchor.constraint(equalTo: title.bottomAnchor, constant: 6),
-      body.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -18),
-      action.leadingAnchor.constraint(equalTo: eyebrow.leadingAnchor),
-      action.bottomAnchor.constraint(equalTo: root.bottomAnchor, constant: -15),
-    ])
+    let who = label(notice.who, font: .systemFont(ofSize: 12, weight: .medium), colour: .secondaryLabelColor, lines: 1)
+    let heading = label(notice.heading, font: .systemFont(ofSize: 16, weight: .semibold), colour: .labelColor, lines: 1)
+    let context = label(notice.context, font: .systemFont(ofSize: 12, weight: .medium), colour: .tertiaryLabelColor, lines: 1)
+    let body = label(notice.body, font: .systemFont(ofSize: 13), colour: .secondaryLabelColor, lines: 3)
+
+    let close = NSButton(title: "×", target: self, action: #selector(dismiss(_:)))
+    close.isBordered = false
+    close.font = .systemFont(ofSize: 15, weight: .medium)
+    close.contentTintColor = .tertiaryLabelColor
+    close.translatesAutoresizingMaskIntoConstraints = false
+    close.setAccessibilityLabel("Dismiss")
+
+    for view in [who, heading, body, close] { root.addSubview(view) }
+    if hasContext { root.addSubview(context) }
+
+    var constraints: [NSLayoutConstraint] = [
+      root.widthAnchor.constraint(equalToConstant: width),
+      root.leadingAnchor.constraint(equalTo: effect.leadingAnchor), root.trailingAnchor.constraint(equalTo: effect.trailingAnchor),
+      root.topAnchor.constraint(equalTo: effect.topAnchor), root.bottomAnchor.constraint(equalTo: effect.bottomAnchor),
+      who.leadingAnchor.constraint(equalTo: root.leadingAnchor, constant: 16),
+      who.topAnchor.constraint(equalTo: root.topAnchor, constant: 16),
+      who.trailingAnchor.constraint(lessThanOrEqualTo: close.leadingAnchor, constant: -8),
+      close.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -12),
+      close.topAnchor.constraint(equalTo: root.topAnchor, constant: 10),
+      heading.leadingAnchor.constraint(equalTo: who.leadingAnchor),
+      heading.topAnchor.constraint(equalTo: who.bottomAnchor, constant: 10),
+      heading.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -16),
+      body.leadingAnchor.constraint(equalTo: who.leadingAnchor),
+      body.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -16),
+    ]
+    if hasContext {
+      constraints += [
+        context.leadingAnchor.constraint(equalTo: who.leadingAnchor),
+        context.topAnchor.constraint(equalTo: heading.bottomAnchor, constant: 2),
+        context.trailingAnchor.constraint(equalTo: root.trailingAnchor, constant: -16),
+        body.topAnchor.constraint(equalTo: context.bottomAnchor, constant: 6),
+      ]
+    } else {
+      constraints.append(body.topAnchor.constraint(equalTo: heading.bottomAnchor, constant: 6))
+    }
+
+    // actions
+    if let p = notice.primary {
+      let pull = NSPopUpButton(frame: .zero, pullsDown: true)
+      pull.translatesAutoresizingMaskIntoConstraints = false
+      pull.bezelStyle = .rounded
+      pull.font = .systemFont(ofSize: 12, weight: .semibold)
+      pull.addItem(withTitle: p.label)                       // the visible title of a pull-down is its first item
+      for t in p.tools {
+        let mi = NSMenuItem(title: "Open in \(t.label)\(t.id == p.default ? "  (default)" : "")", action: #selector(openTool(_:)), keyEquivalent: "")
+        mi.target = self
+        mi.representedObject = t.id
+        pull.menu?.addItem(mi)
+      }
+      root.addSubview(pull)
+      constraints += [
+        pull.leadingAnchor.constraint(equalTo: who.leadingAnchor),
+        pull.topAnchor.constraint(equalTo: body.bottomAnchor, constant: 16),
+        pull.bottomAnchor.constraint(equalTo: root.bottomAnchor, constant: -14),
+        pull.widthAnchor.constraint(greaterThanOrEqualToConstant: 170),
+      ]
+      var trailing: NSView = pull
+      if notice.details != nil {
+        let d = NSButton(title: "Show details", target: self, action: #selector(showDetails(_:)))
+        d.isBordered = false; d.font = .systemFont(ofSize: 12, weight: .medium); d.contentTintColor = .controlAccentColor
+        d.translatesAutoresizingMaskIntoConstraints = false
+        root.addSubview(d)
+        constraints += [d.leadingAnchor.constraint(equalTo: pull.trailingAnchor, constant: 14), d.centerYAnchor.constraint(equalTo: pull.centerYAnchor)]
+        trailing = d
+      }
+      let dis = NSButton(title: "Dismiss", target: self, action: #selector(dismiss(_:)))
+      dis.isBordered = false; dis.font = .systemFont(ofSize: 12); dis.contentTintColor = .secondaryLabelColor
+      dis.translatesAutoresizingMaskIntoConstraints = false
+      root.addSubview(dis)
+      constraints += [dis.leadingAnchor.constraint(equalTo: trailing.trailingAnchor, constant: 14), dis.centerYAnchor.constraint(equalTo: pull.centerYAnchor)]
+    } else if notice.details != nil || legacyBundle != nil {
+      let main = NSButton(title: legacyBundle != nil ? "Open your agent" : "Show details", target: self, action: legacyBundle != nil ? #selector(legacyOpen(_:)) : #selector(showDetails(_:)))
+      main.bezelStyle = .rounded; main.font = .systemFont(ofSize: 12, weight: .semibold)
+      main.translatesAutoresizingMaskIntoConstraints = false
+      let dis = NSButton(title: "Dismiss", target: self, action: #selector(dismiss(_:)))
+      dis.isBordered = false; dis.font = .systemFont(ofSize: 12); dis.contentTintColor = .secondaryLabelColor
+      dis.translatesAutoresizingMaskIntoConstraints = false
+      root.addSubview(main); root.addSubview(dis)
+      constraints += [
+        main.leadingAnchor.constraint(equalTo: who.leadingAnchor), main.topAnchor.constraint(equalTo: body.bottomAnchor, constant: 16), main.bottomAnchor.constraint(equalTo: root.bottomAnchor, constant: -14),
+        dis.leadingAnchor.constraint(equalTo: main.trailingAnchor, constant: 14), dis.centerYAnchor.constraint(equalTo: main.centerYAnchor),
+      ]
+    }
+    if notice.primary == nil && notice.details == nil && legacyBundle == nil {
+      constraints.append(body.bottomAnchor.constraint(equalTo: root.bottomAnchor, constant: -16))
+    }
+    NSLayoutConstraint.activate(constraints)
 
     panel.contentView = effect
+    effect.layoutSubtreeIfNeeded()
+    let height = max(120, root.fittingSize.height)
+    panel.setContentSize(NSSize(width: width, height: height))
+    effect.frame = NSRect(x: 0, y: 0, width: width, height: height)
     guard let screen = NSScreen.main ?? NSScreen.screens.first else { NSApp.terminate(nil); return }
     let visible = screen.visibleFrame
     let target = NSPoint(x: visible.maxX - width - 18, y: visible.maxY - height - 18)
@@ -126,11 +281,22 @@ final class AppDelegate: NSObject, NSApplicationDelegate {
       panel.animator().alphaValue = 1
       panel.animator().setFrameOrigin(target)
     }
-    NSSound(named: "Glass")?.play()
-
+    if notice.sound { NSSound(named: "Glass")?.play() }
     self.panel = panel
-    DispatchQueue.main.asyncAfter(deadline: .now() + 20) { NSApp.terminate(nil) }
+    schedule()
+  }
+}
+
+/// Tracks the pointer so a notification being read does not fade under it.
+final class HoverView: NSView {
+  var onHover: ((Bool) -> Void)?
+  override func updateTrackingAreas() {
+    super.updateTrackingAreas()
+    for a in trackingAreas { removeTrackingArea(a) }
+    addTrackingArea(NSTrackingArea(rect: bounds, options: [.mouseEnteredAndExited, .activeAlways, .inVisibleRect], owner: self, userInfo: nil))
   }
+  override func mouseEntered(with event: NSEvent) { onHover?(true) }
+  override func mouseExited(with event: NSEvent) { onHover?(false) }
 }
 
 let app = NSApplication.shared

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.23.0",
+  "version": "0.23.2",
   "description": "Let your coding agent collaborate directly with your teammates' agents — ask, agree an interface, and deliver, without a human relaying messages.",
   "type": "module",
   "bin": {