@join-pantheon/cli 0.22.0 → 0.23.0

package/helper/macos/menubar.swift

@@ -26,6 +26,8 @@ let pollSeconds = argv.count >= 3 ? (Double(argv[2]) ?? 15) : 15
 struct TrayState {
   var configured = false
   var reachable = false          // did tray-status itself run and parse
+  var decisionsOk = false
+  var unavailableSpaces: [String] = []
   var relayOk = false
   var space = ""
   var member = ""
@@ -40,7 +42,7 @@ struct TrayState {
   var surfaceName = "agent"
   var surfaceBundleID = ""
   var decisionsPrompt = ""
-  var decisions: [(id: String, body: String, prompt: String)] = []
+  var decisions: [(id: String, body: String, detail: String, prompt: String)] = []
   var version = ""
 }
 
@@ -70,6 +72,8 @@ func fetchState() -> TrayState {
   s.reachable = true
   s.configured = j["configured"] as? Bool ?? false
   s.version = j["version"] as? String ?? ""
+  s.decisionsOk = j["decisions_ok"] as? Bool ?? false
+  s.unavailableSpaces = j["unavailable_spaces"] as? [String] ?? []
   s.relayOk = j["relay_ok"] as? Bool ?? false
   s.space = j["space"] as? String ?? ""
   s.member = j["member"] as? String ?? ""
@@ -88,6 +92,7 @@ func fetchState() -> TrayState {
     s.decisions.append((
       id: d["id"] as? String ?? "",
       body: d["body"] as? String ?? "",
+      detail: d["detail"] as? String ?? d["body"] as? String ?? "",
       prompt: d["prompt"] as? String ?? ""
     ))
   }
@@ -98,6 +103,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private var item: NSStatusItem!
   private var state = TrayState()
   private var timer: Timer?
+  private var refreshing = false
+  private var menuOpen = false
+  private var hasLoaded = false
+  private var workerAction: String?
+  private var actionError: String?
 
   func applicationDidFinishLaunching(_ note: Notification) {
     NSApp.setActivationPolicy(.accessory)
@@ -105,6 +115,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let menu = NSMenu()
     menu.delegate = self
     item.menu = menu
+    paint()
     refresh()
     timer = Timer.scheduledTimer(withTimeInterval: pollSeconds, repeats: true) { [weak self] _ in
       self?.refresh()
@@ -112,12 +123,25 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   }
 
   @objc func refresh() {
+    guard !refreshing else { return }
+    refreshing = true
     DispatchQueue.global().async {
       let next = fetchState()
-      DispatchQueue.main.async { self.state = next; self.paint() }
+      DispatchQueue.main.async {
+        self.state = next
+        self.hasLoaded = true
+        self.refreshing = false
+        self.paint()
+        if !self.menuOpen, let menu = self.item.menu { self.menuNeedsUpdate(menu) }
+      }
     }
   }
 
+  // Keep targets stable while a person is navigating the menu. The badge can
+  // refresh immediately; refreshed rows appear on the next opening.
+  func menuWillOpen(_ menu: NSMenu) { menuOpen = true; refresh() }
+  func menuDidClose(_ menu: NSMenu) { menuOpen = false }
+
   enum MarkMode { case full, idle, off }
 
   /// The Three Stones mark — the product's own logo, the same three arcs the
@@ -164,68 +188,87 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private func paint() {
     let mode: MarkMode = !state.configured || !state.relayOk ? .off : state.workerRunning ? .full : .idle
     item.button?.image = markImage(mode)
-    item.button?.title = state.decisions.isEmpty ? "" : " \(state.decisions.count)"
+    let unknown = hasLoaded && (!state.reachable || (state.configured && !state.decisionsOk))
+    item.button?.title = actionError != nil ? " !" : state.decisions.isEmpty ? (unknown ? " !" : "") : " \(state.decisions.count)\(unknown ? "+" : "")"
     item.button?.imagePosition = .imageLeading
-    item.button?.toolTip = state.configured
-      ? "pantheon — \(state.member) in \(state.space)\(state.relayOk ? "" : " (relay unreachable)")"
-      : "pantheon — not joined to a space yet"
+    let summary = !hasLoaded ? "Checking status…" : !state.reachable ? "Unable to check status" : !state.configured ? "Not joined to a team yet" : !state.decisionsOk ? "Unable to check every decision" : state.decisions.isEmpty ? "No decisions need your input" : "\(state.decisions.count) decisions need your input"
+    item.button?.toolTip = "Pantheon — " + (actionError ?? summary)
+    item.button?.setAccessibilityLabel("Pantheon — " + (actionError ?? summary))
   }
 
   func menuNeedsUpdate(_ menu: NSMenu) {
     menu.removeAllItems()
     let info = { (text: String) in
-      let mi = NSMenuItem(title: text, action: nil, keyEquivalent: ""); mi.isEnabled = false
+      let title = text.count > 110 ? String(text.prefix(109)) + "…" : text
+      let mi = NSMenuItem(title: title, action: nil, keyEquivalent: "")
+      mi.isEnabled = false
+      mi.toolTip = text
+      mi.attributedTitle = NSAttributedString(string: title, attributes: [.foregroundColor: NSColor.labelColor])
       menu.addItem(mi)
     }
 
-    if !state.reachable {
-      info("pantheon CLI is not answering")
-      info("check: \(pantheonBin)")
+    if !hasLoaded {
+      info("Checking Pantheon…")
+    } else if !state.reachable {
+      info("Unable to check Pantheon status")
+      info("Try Refresh now, or Check connection below")
     } else if !state.configured {
-      info("Not joined to a space yet")
-      info("Run `pantheon start` or `pantheon join <invite>`")
+      info("Connect with your team")
+      info("Run pantheon start, or join with an invite link")
     } else {
-      info("\(state.member) in \(state.space)  ·  v\(state.version)")
+      info("\(state.member) · \(state.space)")
       info(state.relayOk
-        ? "Relay reachable  ·  \(state.online) of \(state.members) members online"
-        : "Relay unreachable — peers cannot reach you")
-      info("\(state.workerRunning ? "●" : "○") Unattended work \(state.workerRunning ? "on" : "off")   " +
-           "\(state.notifierRunning ? "●" : "○") Alerts   \(state.hookOn ? "●" : "○") Wake hook")
-      if !state.workerState.isEmpty {
-        info("Worker: " + String(state.workerState.prefix(80)))
-      }
-
+        ? "Connected · \(state.online) of \(state.members) members online"
+        : "Connection unavailable · \(state.unavailableSpaces.joined(separator: ", "))")
       menu.addItem(.separator())
+      if !state.decisionsOk {
+        info("Some decisions could not be checked")
+        info("Refresh to try again. The count may be incomplete.")
+      }
       if state.decisions.isEmpty {
-        info("You are all caught up")
+        if state.decisionsOk { info("No decisions need your input") }
       } else {
         let noun = state.decisions.count == 1 ? "decision needs" : "decisions need"
         info("\(state.decisions.count) \(noun) your input")
-        info("Choose one — your agent opens with the question already asked")
         for d in state.decisions.prefix(5) {
-          let item = makeItem(String(d.body.prefix(100)), #selector(openDecision(_:)))
-          item.representedObject = [d.id, d.prompt]
-          menu.addItem(item)
+          let decision = makeItem(d.body.count > 72 ? String(d.body.prefix(71)) + "…" : d.body, #selector(openDecision(_:)))
+          decision.toolTip = d.detail
+          decision.representedObject = [d.id, d.prompt]
+          menu.addItem(decision)
         }
-        if state.decisions.count > 1 {
-          menu.addItem(makeItem("Explain all in \(state.surfaceName)", #selector(openAllDecisions)))
-        }
-        menu.addItem(makeItem("View all decision details", #selector(openApprovals)))
+        menu.addItem(makeItem("\(state.decisions.count > 5 ? "Review all \(state.decisions.count) decisions" : "Review decisions") in \(state.surfaceName)", #selector(openAllDecisions)))
       }
-
       menu.addItem(.separator())
-      if state.workerRunning {
+      info(state.workerRunning ? "Unattended work is on" : state.workerInstalled ? "Unattended work is paused" : "Unattended work is not set up")
+      if !state.workerState.isEmpty && state.workerRunning { info(state.workerState) }
+      if let action = workerAction {
+        info(action)
+      } else if state.workerRunning {
         menu.addItem(makeItem("Pause unattended work", #selector(pauseWorker)))
       } else if state.workerInstalled {
         menu.addItem(makeItem("Resume unattended work", #selector(resumeWorker)))
       } else {
-        info("Unattended work not set up (pantheon service install worker)")
+        info("Set up with pantheon service install worker")
       }
     }
+    if let error = actionError {
+      menu.addItem(.separator())
+      info(error)
+    }
 
+    let details = NSMenuItem(title: "Diagnostics", action: nil, keyEquivalent: "")
+    let submenu = NSMenu()
+    for text in ["Version \(state.version)", "Alerts: \(state.notifierRunning ? "running" : "off")", "Wake hook: \(state.hookOn ? "installed" : "off")"] {
+      let row = NSMenuItem(title: text, action: nil, keyEquivalent: "")
+      row.isEnabled = false
+      submenu.addItem(row)
+    }
+    submenu.addItem(makeItem("View decision details in Terminal", #selector(openApprovals)))
+    details.submenu = submenu
+    menu.addItem(details)
     menu.addItem(.separator())
     menu.addItem(makeItem("Open status in Terminal", #selector(openStatus)))
-    menu.addItem(makeItem("Run doctor in Terminal", #selector(openDoctor)))
+    menu.addItem(makeItem("Check connection in Terminal", #selector(openDoctor)))
     menu.addItem(makeItem("Refresh now", #selector(refreshNow)))
     menu.addItem(.separator())
     menu.addItem(makeItem("Quit pantheon menu bar", #selector(quit)))
@@ -237,15 +280,26 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     return mi
   }
 
+  private func changeWorker(_ title: String, path: String, args: [String]) {
+    guard workerAction == nil else { return }
+    workerAction = title
+    actionError = nil
+    paint()
+    if let menu = item.menu { menuNeedsUpdate(menu) }
+    DispatchQueue.global().async {
+      let result = run(path, args)
+      DispatchQueue.main.async {
+        self.workerAction = nil
+        if result?.code != 0 { self.reportFailure("Could not change unattended work. Check connection in Terminal.") }
+        self.refresh()
+      }
+    }
+  }
   @objc private func pauseWorker() {
-    DispatchQueue.global().async { _ = run(pantheonBin, ["stop", "worker"]); self.refresh() }
+    changeWorker("Pausing unattended work…", path: pantheonBin, args: ["stop", "worker"])
   }
   @objc private func resumeWorker() {
-    let plist = state.workerPlist
-    DispatchQueue.global().async {
-      _ = run("/bin/launchctl", ["load", "-w", plist])
-      self.refresh()
-    }
+    changeWorker("Resuming unattended work…", path: "/bin/launchctl", args: ["load", "-w", state.workerPlist])
   }
   // .command files are written by `pantheon menubar` next to the tray binary;
   // Terminal owns running them, so an unsigned accessory app never needs
@@ -273,13 +327,26 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
     let dir = (Bundle.main.executablePath as NSString?)?.deletingLastPathComponent
       ?? URL(fileURLWithPath: CommandLine.arguments[0]).deletingLastPathComponent().path
-    try? id.write(toFile: dir + "/.explain-id", atomically: true, encoding: .utf8)
-    openCommand("pantheon-explain.command")
+    do {
+      try id.write(toFile: dir + "/.explain-id", atomically: true, encoding: .utf8)
+      openCommand("pantheon-explain.command")
+    } catch {
+      reportFailure("Could not open your agent. The question is copied; paste it into your agent.")
+    }
   }
   private func openCommand(_ name: String) {
     let dir = (Bundle.main.executablePath as NSString?)?.deletingLastPathComponent
       ?? URL(fileURLWithPath: CommandLine.arguments[0]).deletingLastPathComponent().path
-    NSWorkspace.shared.open(URL(fileURLWithPath: dir + "/" + name))
+    if !NSWorkspace.shared.open(URL(fileURLWithPath: dir + "/" + name)) {
+      reportFailure("Could not open Terminal. Run pantheon doctor to check your setup.")
+    } else {
+      actionError = nil
+      paint()
+    }
+  }
+  private func reportFailure(_ message: String) {
+    actionError = message
+    paint()
   }
   @objc private func refreshNow() { refresh() }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.22.0",
+  "version": "0.23.0",
   "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": {
@@ -13,7 +13,7 @@
     "build": "rm -rf dist && tsc -p .",
     "dev": "tsc -p . --watch",
     "relay": "node dist/cli.js relay",
-    "test": "PANTHEON_HOME=\"$(mktemp -d)\" node --test --test-force-exit dist/test/*.test.js",
+    "test": "PANTHEON_HOME=\"$(mktemp -d)\" HOME=\"$(mktemp -d)\" node --test --test-force-exit dist/test/*.test.js",
     "prepare": "npm run build",
     "prepublishOnly": "npm run build && npm test",
     "start": "node dist/cli.js relay"