@join-pantheon/cli 0.25.1 → 0.25.3

package/helper/macos/menubar.swift

@@ -50,6 +50,8 @@ struct TrayState {
   var decisionsPrompt = ""
   var decisions: [(id: String, body: String, detail: String, prompt: String)] = []
   var items: [Item] = []
+  /// every team this machine is in, joined order; more than one and the board is drawn per team
+  var spaces: [String] = []
   var version = ""
 }
 
@@ -75,14 +77,15 @@ struct Item {
     default: return "Waiting on \(who)"
     }
   }
-  /// "praneet · 2d ago · pantheon"
-  var subtitle: String {
+  /// "praneet · 2d ago · pantheon" — or without the team, when the section heading already says it
+  var subtitle: String { subtitle(showSpace: true) }
+  func subtitle(showSpace: Bool) -> String {
     var parts: [String] = []
     // Who is asking, on every kind. A decision row used to say only "11h ago",
     // which is the one fact a reader could already guess.
     if kind == "owed" { parts.append("you owe") } else if !who.isEmpty { parts.append(who) }
     if when > 0 { parts.append(Item.age(when)) }
-    if !space.isEmpty { parts.append(space) }
+    if showSpace && !space.isEmpty { parts.append(space) }
     return parts.joined(separator: " · ")
   }
   static func age(_ ms: Double) -> String {
@@ -136,6 +139,7 @@ func fetchState() -> TrayState {
   s.surfaceName = j["surface_name"] as? String ?? "agent"
   s.surfaceBundleID = j["surface_bundle_id"] as? String ?? ""
   s.decisionsPrompt = j["decisions_prompt"] as? String ?? ""
+  s.spaces = j["spaces"] as? [String] ?? []
   for i in (j["items"] as? [[String: Any]] ?? []) {
     s.items.append(Item(
       id: i["id"] as? String ?? "",
@@ -182,9 +186,24 @@ final class RowView: NSView {
   private var copied = false
 
   private let titleLines: Int
-  /// The menu is the board people read every day; 430 wrapped a plain sentence
-  /// onto two lines and truncated a decision. 520 carries ~40% more per line.
-  static let rowWidth: CGFloat = 520
+  /// Inside a team section rows are indented and a decision carries a dot — "what needs
+  /// you" is then read off the dots, since the kind headings are gone. Single-team
+  /// boards keep their headings and neither.
+  private let leading: CGFloat
+  private let dot: Bool
+  private let sub: String
+  /// The row's MINIMUM width — the menu is at least this wide. The row then
+  /// stretches to the menu's real width (macOS adds its own trailing column
+  /// for submenu chevrons), so the copy control sits at the edge instead of
+  /// floating fifty points left of it over a blank gutter, which is what a
+  /// fixed-width row did at every width we tried.
+  static let rowWidth: CGFloat = 430
+  /// The width the menu actually gave the last row drawn. Rows are 430 wide until the
+  /// menu stretches them (a trailing column for submenu chevrons, ~35pt here); a title
+  /// measured at 430 that then fits one line at 465 left a blank line above its
+  /// subtitle. So heights are measured against the width last seen, and the first open
+  /// of a session — before any row has been drawn — splits any leftover evenly instead.
+  static var knownWidth: CGFloat?
   private static let titleFont = NSFont.systemFont(ofSize: 13, weight: .medium)
   private static let lineHeight: CGFloat = 17
 
@@ -204,15 +223,19 @@ final class RowView: NSView {
     return max(1, min(3, Int(ceil(h / lineHeight))))
   }
 
-  init(item: Item, width: CGFloat, onOpen: @escaping (Item) -> Void, onCopy: @escaping (Item) -> Void) {
+  init(item: Item, width: CGFloat, inTeamSection: Bool = false, onOpen: @escaping (Item) -> Void, onCopy: @escaping (Item) -> Void) {
     self.item = item
     self.onOpen = onOpen
     self.onCopy = onCopy
-    self.titleLines = RowView.lines(for: item.title, width: width - RowView.textInsets)
+    self.leading = inTeamSection ? 26 : 12
+    self.dot = inTeamSection && item.isDecision
+    self.sub = item.subtitle(showSpace: !inTeamSection)
+    self.titleLines = RowView.lines(for: item.title, width: (RowView.knownWidth ?? width) - RowView.textInsets - (leading - 12))
     let textHeight = CGFloat(titleLines) * RowView.lineHeight
-    super.init(frame: NSRect(x: 0, y: 0, width: width, height: textHeight + (item.subtitle.isEmpty ? 13 : 29)))
+    super.init(frame: NSRect(x: 0, y: 0, width: width, height: textHeight + (sub.isEmpty ? 13 : 29)))
+    autoresizingMask = [.width]                    // fill the menu: the text runs to the control, the control to the edge
     setAccessibilityRole(.button)
-    setAccessibilityLabel("\(item.title). \(item.subtitle). Return opens it; the button on the right copies the question.")
+    setAccessibilityLabel("\(item.title). \(sub). Return opens it; the button on the right copies the question.")
   }
   required init?(coder: NSCoder) { return nil }
 
@@ -261,21 +284,33 @@ final class RowView: NSView {
     para.lineSpacing = 0
     let flat = NSMutableParagraphStyle()
     flat.lineBreakMode = .byTruncatingTail
-    let textWidth = bounds.width - RowView.textInsets
-    let hasSub = !item.subtitle.isEmpty
-    let titleHeight = CGFloat(titleLines) * RowView.lineHeight
-    let titleY = bounds.maxY - 7 - titleHeight
+    let textWidth = bounds.width - RowView.textInsets - (leading - 12)
+    if RowView.knownWidth != bounds.width { RowView.knownWidth = bounds.width }
+    let hasSub = !sub.isEmpty
+    // Lay out for the lines the title really needs at this width. Whatever the row
+    // was allocated beyond that is split above and below, so title and subtitle
+    // stay together and the row reads as slightly taller, never as a gap.
+    let actual = min(titleLines, RowView.lines(for: item.title, width: textWidth))
+    let titleHeight = CGFloat(actual) * RowView.lineHeight
+    let spare = (CGFloat(titleLines) - CGFloat(actual)) * RowView.lineHeight / 2
+    let titleY = bounds.maxY - 7 - spare - titleHeight
     let cell = NSTextFieldCell()                   // gives the last visible line its ellipsis
     cell.attributedStringValue = NSAttributedString(string: item.title, attributes: [
       .font: RowView.titleFont, .foregroundColor: fg, .paragraphStyle: para,
     ])
     cell.truncatesLastVisibleLine = true
     cell.wraps = true
-    cell.drawInterior(withFrame: NSRect(x: 12, y: titleY, width: textWidth, height: titleHeight), in: self)
+    cell.drawInterior(withFrame: NSRect(x: leading, y: titleY, width: textWidth, height: titleHeight), in: self)
     if hasSub {
-      NSAttributedString(string: item.subtitle, attributes: [
+      NSAttributedString(string: sub, attributes: [
         .font: NSFont.systemFont(ofSize: 11), .foregroundColor: dim, .paragraphStyle: flat,
-      ]).draw(in: NSRect(x: 14, y: bounds.minY + 6, width: textWidth, height: 14))
+      ]).draw(in: NSRect(x: leading + 2, y: bounds.minY + 6 + spare, width: textWidth, height: 14))
+    }
+    if dot {
+      // the one mark that says "this needs you", where the kind heading used to;
+      // centred on the title's first line
+      (selected ? NSColor.selectedMenuItemTextColor : NSColor.systemBlue).setFill()
+      NSBezierPath(ovalIn: NSRect(x: 12, y: titleY + titleHeight - RowView.lineHeight / 2 - 3, width: 6, height: 6)).fill()
     }
 
     // the copy control
@@ -303,6 +338,115 @@ final class RowView: NSView {
   }
 }
 
+/// A section heading or summary line drawn by us, not as a disabled menu item.
+/// A disabled item is rendered dim by the system whatever colour it is given, so
+/// the team names and "2 need you" — the words a person scans for — were the
+/// faintest text in the menu. This draws the lead in the reading colour and the
+/// rest one step down, at the same left edge as the rows' dots.
+final class HeaderView: NSView {
+  private let lead: String
+  private let rest: String
+  private let bright: Bool
+  init(lead: String, rest: String, width: CGFloat, bright: Bool = true) {
+    self.lead = lead; self.rest = rest; self.bright = bright
+    super.init(frame: NSRect(x: 0, y: 0, width: width, height: 22))
+    autoresizingMask = [.width]
+  }
+  required init?(coder: NSCoder) { return nil }
+  override func draw(_ dirtyRect: NSRect) {
+    let text = NSMutableAttributedString(string: lead, attributes: [
+      .font: NSFont.systemFont(ofSize: 12, weight: .semibold),
+      .foregroundColor: bright ? NSColor.labelColor : NSColor.secondaryLabelColor,
+    ])
+    if !rest.isEmpty {
+      text.append(NSAttributedString(string: "   " + rest, attributes: [
+        .font: NSFont.systemFont(ofSize: 12, weight: .regular),
+        .foregroundColor: NSColor.labelColor.withAlphaComponent(0.72),
+      ]))
+    }
+    let para = NSMutableParagraphStyle(); para.lineBreakMode = .byTruncatingTail
+    text.addAttribute(.paragraphStyle, value: para, range: NSRange(location: 0, length: text.length))
+    text.draw(in: NSRect(x: 12, y: bounds.minY + 3, width: bounds.width - 24, height: 16))
+  }
+}
+
+/*
+ * The board: an opaque, dark panel under the icon.
+ *
+ * It was an NSMenu. A menu is translucent by the system's decision — the
+ * wallpaper tints it, the text sits on whatever is behind it — and there is no
+ * switch to make one opaque. The person reading this every day asked for the
+ * clarity of a dark card, the way Cursor's notification list is drawn; that is a
+ * panel, not a menu. The rows and headings are the same views the menu used; the
+ * panel gives them a solid background, a fixed width, and one click to dismiss.
+ * A right-click on the icon still opens the classic menu — keyboard users and
+ * anything that ever goes wrong with the panel have a way in.
+ */
+final class BoardPanel: NSPanel {
+  var onEscape: (() -> Void)?
+  override var canBecomeKey: Bool { true }
+  override func cancelOperation(_ sender: Any?) { onEscape?() }
+}
+
+final class BoardBackground: NSView {
+  override func draw(_ dirtyRect: NSRect) {
+    let path = NSBezierPath(roundedRect: bounds.insetBy(dx: 0.5, dy: 0.5), xRadius: 12, yRadius: 12)
+    NSColor(calibratedWhite: 0.115, alpha: 1).setFill()
+    path.fill()
+    NSColor(calibratedWhite: 1, alpha: 0.13).setStroke()
+    path.lineWidth = 1
+    path.stroke()
+  }
+}
+
+/// A one-line action or note in the board: a title, an optional trailing hint,
+/// a hover highlight when it does something, and nothing at all when it does not.
+final class ActionRow: NSView {
+  private let title: String
+  private let hint: String
+  private let onClick: (() -> Void)?
+  private var hovering = false
+  init(_ title: String, hint: String = "", width: CGFloat, onClick: (() -> Void)? = nil) {
+    self.title = title; self.hint = hint; self.onClick = onClick
+    super.init(frame: NSRect(x: 0, y: 0, width: width, height: 26))
+    autoresizingMask = [.width]
+    if onClick != nil { setAccessibilityRole(.button); setAccessibilityLabel(title) }
+  }
+  required init?(coder: NSCoder) { return nil }
+  override func updateTrackingAreas() {
+    super.updateTrackingAreas()
+    for a in trackingAreas { removeTrackingArea(a) }
+    if onClick != nil { addTrackingArea(NSTrackingArea(rect: bounds, options: [.mouseEnteredAndExited, .activeAlways], owner: self, userInfo: nil)) }
+  }
+  override func mouseEntered(with e: NSEvent) { hovering = true; needsDisplay = true }
+  override func mouseExited(with e: NSEvent) { hovering = false; needsDisplay = true }
+  override func mouseUp(with e: NSEvent) { onClick?() }
+  override func draw(_ dirtyRect: NSRect) {
+    if hovering {
+      NSColor.selectedContentBackgroundColor.setFill()
+      NSBezierPath(roundedRect: bounds.insetBy(dx: 5, dy: 1), xRadius: 5, yRadius: 5).fill()
+    }
+    let fg: NSColor = onClick == nil ? .secondaryLabelColor : hovering ? .selectedMenuItemTextColor : .labelColor
+    let para = NSMutableParagraphStyle(); para.lineBreakMode = .byTruncatingTail
+    NSAttributedString(string: title, attributes: [.font: NSFont.systemFont(ofSize: 13), .foregroundColor: fg, .paragraphStyle: para])
+      .draw(in: NSRect(x: 12, y: bounds.midY - 8, width: bounds.width - 24 - (hint.isEmpty ? 0 : 80), height: 17))
+    if !hint.isEmpty {
+      let h = NSMutableParagraphStyle(); h.alignment = .right
+      NSAttributedString(string: hint, attributes: [.font: NSFont.systemFont(ofSize: 12), .foregroundColor: hovering ? NSColor.selectedMenuItemTextColor.withAlphaComponent(0.8) : NSColor.tertiaryLabelColor, .paragraphStyle: h])
+        .draw(in: NSRect(x: bounds.maxX - 12 - 160, y: bounds.midY - 8, width: 160, height: 17))
+    }
+  }
+}
+
+final class BoardSeparator: NSView {
+  init(width: CGFloat) { super.init(frame: NSRect(x: 0, y: 0, width: width, height: 9)); autoresizingMask = [.width] }
+  required init?(coder: NSCoder) { return nil }
+  override func draw(_ dirtyRect: NSRect) {
+    NSColor(calibratedWhite: 1, alpha: 0.12).setFill()
+    NSRect(x: 12, y: bounds.midY, width: bounds.width - 24, height: 1).fill()
+  }
+}
+
 final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private var item: NSStatusItem!
   private var state = TrayState()
@@ -318,7 +462,11 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
     let menu = NSMenu()
     menu.delegate = self
-    item.menu = menu
+    classicMenu = menu
+    // Left click: the board. Right click: the classic menu, which stays exactly as it was.
+    item.button?.target = self
+    item.button?.action = #selector(iconClicked(_:))
+    item.button?.sendAction(on: [.leftMouseUp, .rightMouseUp])
     paint()
     refresh()
     timer = Timer.scheduledTimer(withTimeInterval: pollSeconds, repeats: true) { [weak self] _ in
@@ -337,8 +485,172 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         self.refreshing = false
         self.paint()
         if !self.menuOpen, let menu = self.item.menu { self.menuNeedsUpdate(menu) }
+        // The board redraws only when what it shows has changed, so a poll never
+        // pulls a row out from under the pointer for nothing.
+        if self.boardPanel?.isVisible == true && self.boardSignature != self.signature() { self.rebuildBoard() }
+      }
+    }
+  }
+
+  // MARK: the board
+
+  private var classicMenu: NSMenu?
+  private var boardPanel: BoardPanel?
+  private var boardSignature = ""
+  private var boardMonitor: Any?
+  static let boardWidth: CGFloat = 470
+
+  private func signature() -> String {
+    "\(state.items.map { $0.id }.joined(separator: ","))|\(state.decisions.count)|\(state.online)|\(state.members)|\(state.workerRunning)|\(state.relayOk)|\(actionError ?? "")|\(workerAction ?? "")"
+  }
+
+  @objc private func iconClicked(_ sender: Any?) {
+    if NSApp.currentEvent?.type == .rightMouseUp, let menu = classicMenu {
+      closeBoard()
+      item.menu = menu
+      item.button?.performClick(nil)
+      item.menu = nil
+      return
+    }
+    if boardPanel?.isVisible == true { closeBoard() } else { openBoard() }
+  }
+
+  private func openBoard() {
+    refresh()
+    let panel = boardPanel ?? makeBoardPanel()
+    boardPanel = panel
+    rebuildBoard()
+    positionBoard(panel)
+    panel.makeKeyAndOrderFront(nil)
+    item.button?.highlight(true)
+    // A click anywhere else closes it, the way a menu closes — but without a menu's
+    // grip on the event loop, so the rest of the Mac keeps working while it is up.
+    boardMonitor = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseDown, .rightMouseDown, .otherMouseDown]) { [weak self] _ in self?.closeBoard() }
+  }
+
+  func closeBoard() {
+    if let m = boardMonitor { NSEvent.removeMonitor(m); boardMonitor = nil }
+    boardPanel?.orderOut(nil)
+    item.button?.highlight(false)
+  }
+
+  private func makeBoardPanel() -> BoardPanel {
+    let panel = BoardPanel(contentRect: NSRect(x: 0, y: 0, width: AppDelegate.boardWidth, height: 200),
+                           styleMask: [.borderless, .nonactivatingPanel], backing: .buffered, defer: false)
+    panel.isOpaque = false
+    panel.backgroundColor = .clear
+    panel.hasShadow = true
+    panel.level = .popUpMenu
+    panel.isReleasedWhenClosed = false
+    panel.hidesOnDeactivate = false
+    panel.appearance = NSAppearance(named: .darkAqua)       // the dark card, whatever the system is set to
+    panel.onEscape = { [weak self] in self?.closeBoard() }
+    panel.contentView = BoardBackground(frame: panel.contentRect(forFrameRect: panel.frame))
+    return panel
+  }
+
+  private func positionBoard(_ panel: BoardPanel) {
+    guard let button = item.button, let win = button.window, let screen = win.screen ?? NSScreen.main else { return }
+    let anchor = win.convertToScreen(button.convert(button.bounds, to: nil))
+    let size = panel.frame.size
+    var x = anchor.midX - size.width / 2
+    x = max(screen.visibleFrame.minX + 8, min(x, screen.visibleFrame.maxX - size.width - 8))
+    let y = anchor.minY - 6 - size.height
+    panel.setFrameOrigin(NSPoint(x: x, y: y))
+  }
+
+  /// Everything the classic menu shows, laid out as a card: the summary, one
+  /// section per team (or the kind headings for a single team), then the actions.
+  private func rebuildBoard() {
+    guard let panel = boardPanel, let bg = panel.contentView else { return }
+    boardSignature = signature()
+    bg.subviews.forEach { $0.removeFromSuperview() }
+    let w = AppDelegate.boardWidth
+    var rows: [NSView] = []
+    let note = { (text: String) in rows.append(ActionRow(text, width: w)) }
+    let act = { (text: String, hint: String, f: @escaping () -> Void) in rows.append(ActionRow(text, hint: hint, width: w, onClick: { [weak self] in self?.closeBoard(); f() })) }
+    let sep = { rows.append(BoardSeparator(width: w)) }
+    let openRow: (Item) -> Void = { [weak self] it in self?.closeBoard(); self?.showDetail(it) }
+    let copyRow: (Item) -> Void = { [weak self] it in self?.copyPrompt(it) }
+    let section = { (title: String, detail: String, items: [Item], team: Bool) in
+      guard !items.isEmpty else { return }
+      rows.append(HeaderView(lead: title, rest: detail, width: w, bright: team))
+      for it in items.prefix(team ? 8 : 6) { rows.append(RowView(item: it, width: w, inTeamSection: team, onOpen: openRow, onCopy: copyRow)) }
+      if items.count > (team ? 8 : 6) { rows.append(ActionRow("…and \(items.count - (team ? 8 : 6)) more", width: w)) }
+    }
+
+    if !hasLoaded {
+      note("Checking Pantheon…")
+    } else if !state.reachable {
+      note("Unable to check Pantheon status"); note("Try Refresh now, or Check connection below")
+    } else if !state.configured {
+      note("Connect with your team"); note("Run pantheon start, or join with an invite link")
+    } else {
+      let teams = state.spaces.count > 1 ? state.spaces : []
+      let decisions = state.items.filter { $0.kind == "decision" }
+      let owed = state.items.filter { $0.kind == "owed" }
+      let waiting = state.items.filter { $0.kind == "waiting" }
+      let need = decisions.isEmpty ? "Nothing needs you" : "\(decisions.count) need\(decisions.count == 1 ? "s" : "") you"
+      let where_ = teams.isEmpty ? state.space : "\(teams.count) teams"
+      rows.append(HeaderView(lead: need, rest: "\(state.member) · \(where_) · " + (state.relayOk ? "\(state.online) of \(state.members) online" : "connection unavailable"), width: w))
+      if !state.relayOk { note("Could not reach: \(state.unavailableSpaces.joined(separator: ", "))") }
+      if !state.decisionsOk { note("Some of this could not be checked — the list may be incomplete") }
+      sep()
+      if !teams.isEmpty {
+        for (i, team) in teams.enumerated() {
+          if i > 0 { sep() }
+          let mine = state.items.filter { $0.space == team }
+          let ordered = mine.filter { $0.kind == "decision" } + mine.filter { $0.kind == "owed" } + mine.filter { $0.kind == "waiting" }
+          if state.unavailableSpaces.contains(team) { rows.append(HeaderView(lead: team, rest: "could not be checked", width: w, bright: false)) }
+          else if ordered.isEmpty { rows.append(HeaderView(lead: team, rest: "nothing open", width: w, bright: false)) }
+          else { section(team, counts(ordered), ordered, true) }
+        }
+      } else if state.items.isEmpty {
+        if state.decisionsOk { note("Nothing open — nothing needs you, nothing owed either way") }
+      } else {
+        section(decisions.count == 1 ? "1 decision needs you" : "\(decisions.count) decisions need you", "", decisions, false)
+        section(owed.count == 1 ? "You owe 1 thing" : "You owe \(owed.count) things", "", owed, false)
+        for who in orderedPeers(waiting) {
+          let theirs = waiting.filter { $0.who == who }
+          section(theirs.count == 1 ? "Waiting on \(who)" : "Waiting on \(who) · \(theirs.count)", "", theirs, false)
+        }
+      }
+      if !decisions.isEmpty {
+        sep()
+        act(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", "") { [weak self] in self?.openAllDecisions() }
       }
+      sep()
+      if let action = workerAction { note(action) }
+      else if state.workerRunning { act("Pause unattended work", state.workerState) { [weak self] in self?.pauseWorker() } }
+      else if state.workerInstalled { act("Resume unattended work", "paused") { [weak self] in self?.resumeWorker() } }
+      else { note("Unattended work is not set up — pantheon service install worker") }
     }
+    if let error = actionError { sep(); note(error) }
+    sep()
+    act("Open status in Terminal", "") { [weak self] in self?.openStatus() }
+    act("Check connection in Terminal", "version \(state.version)") { [weak self] in self?.openDoctor() }
+    act("View decision details in Terminal", "") { [weak self] in self?.openApprovals() }
+    act("Refresh now", "") { [weak self] in self?.refresh() }
+    sep()
+    act("Quit pantheon menu bar", "") { [weak self] in self?.quit() }
+
+    // Lay the rows out top to bottom at their own heights, in a card no taller than the screen.
+    let total = rows.reduce(CGFloat(16)) { $0 + $1.frame.height }
+    let maxH = (panel.screen ?? NSScreen.main)?.visibleFrame.height ?? 900
+    let height = min(total, maxH - 24)
+    panel.setContentSize(NSSize(width: w, height: height))
+    bg.frame = NSRect(x: 0, y: 0, width: w, height: height)
+    let doc = NSView(frame: NSRect(x: 0, y: 0, width: w, height: total))
+    var y = total - 8
+    for v in rows { y -= v.frame.height; v.frame = NSRect(x: 0, y: y, width: w, height: v.frame.height); doc.addSubview(v) }
+    let scroll = NSScrollView(frame: NSRect(x: 0, y: 0, width: w, height: height))
+    scroll.drawsBackground = false
+    scroll.hasVerticalScroller = total > height
+    scroll.documentView = doc
+    scroll.autoresizingMask = [.width, .height]
+    bg.addSubview(scroll)
+    if total > height { doc.scroll(NSPoint(x: 0, y: total)) }   // start at the top
+    if panel.isVisible { positionBoard(panel) }
   }
 
   // Keep targets stable while a person is navigating the menu. The badge can
@@ -420,6 +732,41 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       info("Connect with your team")
       info("Run pantheon start, or join with an invite link")
     } else {
+      let teams = state.spaces.count > 1 ? state.spaces : []
+      let decisions = state.items.filter { $0.kind == "decision" }
+      let owed = state.items.filter { $0.kind == "owed" }
+      let waiting = state.items.filter { $0.kind == "waiting" }
+      if !teams.isEmpty {
+        // Several teams: the board is drawn per team, and "what needs you" is read
+        // off the dots. One mixed list with the team as a grey suffix on every row
+        // was the version a person with two teams called impossible to follow.
+        let summary = NSMenuItem(title: state.member, action: nil, keyEquivalent: "")
+        summary.isEnabled = false
+        summary.view = HeaderView(lead: decisions.isEmpty ? "Nothing needs you" : "\(decisions.count) need\(decisions.count == 1 ? "s" : "") you",
+                                  rest: "\(state.member) · \(teams.count) teams · " + (state.relayOk ? "\(state.online) of \(state.members) online" : "connection unavailable"),
+                                  width: RowView.rowWidth)
+        menu.addItem(summary)
+        if !state.relayOk { info("Could not reach: \(state.unavailableSpaces.joined(separator: ", "))") }
+        menu.addItem(.separator())
+        for (index, team) in teams.enumerated() {
+          if index > 0 { menu.addItem(.separator()) }
+          let rows = state.items.filter { $0.space == team }
+          let ordered = rows.filter { $0.kind == "decision" } + rows.filter { $0.kind == "owed" } + rows.filter { $0.kind == "waiting" }
+          if state.unavailableSpaces.contains(team) {
+            let h = NSMenuItem(title: team, action: nil, keyEquivalent: ""); h.isEnabled = false
+            h.view = HeaderView(lead: team, rest: "could not be checked", width: RowView.rowWidth, bright: false); menu.addItem(h)
+          } else if ordered.isEmpty {
+            let h = NSMenuItem(title: team, action: nil, keyEquivalent: ""); h.isEnabled = false
+            h.view = HeaderView(lead: team, rest: "nothing open", width: RowView.rowWidth, bright: false); menu.addItem(h)
+          } else {
+            addRows(menu, team, ordered, team: true, detail: counts(ordered))
+          }
+        }
+        if !decisions.isEmpty {
+          menu.addItem(.separator())
+          menu.addItem(makeItem(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", #selector(openAllDecisions)))
+        }
+      } else {
       info("\(state.member) · \(state.space)")
       info(state.relayOk
         ? "Connected · \(state.online) of \(state.members) members online"
@@ -429,9 +776,6 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         info("Some of this could not be checked")
         info("Refresh to try again — the list may be incomplete")
       }
-      let decisions = state.items.filter { $0.kind == "decision" }
-      let owed = state.items.filter { $0.kind == "owed" }
-      let waiting = state.items.filter { $0.kind == "waiting" }
       if state.items.isEmpty {
         if state.decisionsOk { info("Nothing open — nothing needs you, nothing owed either way") }
       } else {
@@ -447,6 +791,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
           menu.addItem(makeItem(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", #selector(openAllDecisions)))
         }
       }
+      }
       menu.addItem(.separator())
       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) }
@@ -852,30 +1197,49 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
 
   /// A titled group of rows. Six at most: a menu is for triage, and anything
   /// deeper belongs in `pantheon brief`, which the last row opens.
-  private func addRows(_ menu: NSMenu, _ title: String, _ items: [Item]) {
+  private func addRows(_ menu: NSMenu, _ title: String, _ items: [Item], team: Bool = false, detail: String = "") {
     guard !items.isEmpty else { return }
     let header = NSMenuItem(title: title, action: nil, keyEquivalent: "")
     header.isEnabled = false
-    header.attributedTitle = NSAttributedString(string: title, attributes: [
-      .font: NSFont.systemFont(ofSize: 11, weight: .semibold),
-      .foregroundColor: NSColor.secondaryLabelColor,
-    ])
+    if team {
+      // A team heading is drawn by us: the name in the reading colour, the counts
+      // a step down — a disabled item would render both as the dimmest text here.
+      header.view = HeaderView(lead: title, rest: detail, width: RowView.rowWidth)
+    } else {
+      header.attributedTitle = NSAttributedString(string: title, attributes: [
+        .font: NSFont.systemFont(ofSize: 11, weight: .semibold),
+        .foregroundColor: NSColor.secondaryLabelColor,
+      ])
+    }
     menu.addItem(header)
-    for item in items.prefix(6) {
+    for item in items.prefix(team ? 8 : 6) {
       let mi = NSMenuItem(title: item.title, action: nil, keyEquivalent: "")
       mi.toolTip = item.detail
-      mi.view = RowView(item: item, width: RowView.rowWidth,
+      mi.view = RowView(item: item, width: RowView.rowWidth, inTeamSection: team,
                         onOpen: { [weak self] it in self?.showDetail(it) },
                         onCopy: { [weak self] it in self?.copyPrompt(it) })
       menu.addItem(mi)
     }
-    if items.count > 6 {
-      let more = NSMenuItem(title: "…and \(items.count - 6) more", action: nil, keyEquivalent: "")
+    let shown = team ? 8 : 6
+    if items.count > shown {
+      let more = NSMenuItem(title: "…and \(items.count - shown) more", action: nil, keyEquivalent: "")
       more.isEnabled = false
       menu.addItem(more)
     }
   }
 
+  /// "5 need you · 1 owed · 2 waiting" — only the parts that are not zero.
+  private func counts(_ rows: [Item]) -> String {
+    let need = rows.filter { $0.kind == "decision" }.count
+    let owed = rows.filter { $0.kind == "owed" }.count
+    let waiting = rows.filter { $0.kind == "waiting" }.count
+    var parts: [String] = []
+    if need > 0 { parts.append("\(need) need\(need == 1 ? "s" : "") you") }
+    if owed > 0 { parts.append("\(owed) owed") }
+    if waiting > 0 { parts.append("\(waiting) waiting") }
+    return parts.joined(separator: " · ")
+  }
+
   private func makeItem(_ title: String, _ sel: Selector) -> NSMenuItem {
     let mi = NSMenuItem(title: title, action: sel, keyEquivalent: "")
     mi.target = self

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "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": {