@join-pantheon/cli 0.31.0 → 0.31.2-rc.1

package/helper/macos/menubar.swift

@@ -26,7 +26,11 @@ guard argv.count >= 2 else {
   fputs("usage: pantheon-tray <path-to-pantheon> [poll-seconds]\n", stderr)
   exit(64)
 }
-let pantheonBin = argv[1]
+/// `pantheon-tray render <path-to-pantheon> <out.png>`: draw the board from tray-status into
+/// a PNG and exit — the layout can be checked without anyone clicking the icon.
+/// PANTHEON_TRAY_OPEN="handling,waiting,…" opens those counted lines in the picture.
+let renderTo: String? = argv.count >= 4 && argv[1] == "render" ? argv[3] : nil
+let pantheonBin = renderTo != nil ? argv[2] : argv[1]
 let pollSeconds = argv.count >= 3 ? (Double(argv[2]) ?? 15) : 15
 
 struct TrayState {
@@ -72,8 +76,21 @@ struct Item {
   let decider: String
   /// one-click answers for a question this machine asked its own person (may a teammate wake it, may runs use commands)
   var choices: [(label: String, answer: String)] = []
+  /// where the board draws it (tray.ts arrangeBoard): now (a card), handling, waiting, older
+  var lane: String = ""
+  /// what else this card stands for — the teammate's request a decision is holding up
+  var context: String = ""
+  /// a session of this person's has claimed it (handling: an agent is on it, not just queued)
+  var claimed: Bool = false
+  /// a delivery this person's agent committed to — theirs, not a teammate's request
+  var promise: Bool = false
 
   var isDecision: Bool { kind == "decision" }
+  /// A tray-status from before lanes — or with a lane this helper does not know —
+  /// draws as it did before lanes: a decision or owed row is a card, a wait is not.
+  /// An unknown lane must never hide a row.
+  var effectiveLane: String { Item.lanes.contains(lane) ? lane : (kind == "waiting" ? "waiting" : "now") }
+  static let lanes: Set<String> = ["now", "handling", "waiting", "older"]
   var heading: String {
     switch kind {
     case "decision": return "Needs your decision"
@@ -87,10 +104,17 @@ struct Item {
     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) }
+    // Who has it, by where the board put it: a card is on this person; a handled row is an agent's.
+    if kind == "owed" {
+      parts.append(promise ? "your agent committed to it" : effectiveLane == "handling" ? (claimed ? "your agent is on it" : "your worker picks it up") : "waiting on you")
+    } else if !who.isEmpty { parts.append(who) }
     if when > 0 { parts.append(Item.age(when)) }
     if showSpace && !space.isEmpty { parts.append(space) }
-    return parts.joined(separator: " · ")
+    let head = parts.joined(separator: " · ")
+    // The request a decision is holding up, said once, after who and when.
+    guard !context.isEmpty else { return head }
+    let c = context.count > 70 ? String(context.prefix(69)) + "…" : context
+    return head + " · for: " + c
   }
   static func age(_ ms: Double) -> String {
     let secs = max(0, Date().timeIntervalSince1970 - ms / 1000)
@@ -161,7 +185,11 @@ func fetchState() -> TrayState {
       choices: (i["choices"] as? [[String: Any]] ?? []).compactMap { c in
         guard let l = c["label"] as? String, let a = c["answer"] as? String else { return nil }
         return (label: l, answer: a)
-      }
+      },
+      lane: i["lane"] as? String ?? "",
+      context: i["context"] as? String ?? "",
+      claimed: i["claimed"] as? Bool ?? false,
+      promise: i["promise"] as? Bool ?? false
     ))
   }
   for d in (j["decisions"] as? [[String: Any]] ?? []) {
@@ -186,6 +214,29 @@ func fetchState() -> TrayState {
  * loop, and hit-testing two zones in one view is far more predictable there than
  * nesting buttons inside an NSMenuItem.
  */
+/// "Later": a card put away until tomorrow morning, on this machine only — a
+/// view preference, never an answer. Kept in the menu bar's own defaults.
+enum Later {
+  private static let key = "pantheon.later"
+  /// The ids put away and not yet due, with when they come back (seconds since 1970).
+  static func active() -> [String: Double] {
+    let now = Date().timeIntervalSince1970
+    let all = (UserDefaults.standard.dictionary(forKey: key) as? [String: Double]) ?? [:]
+    let live = all.filter { $0.value > now }
+    if live.count != all.count { UserDefaults.standard.set(live, forKey: key) }
+    return live
+  }
+  /// Back at 9:00 tomorrow, local time.
+  static func snooze(_ id: String) {
+    let cal = Calendar.current
+    let tomorrow = cal.date(byAdding: .day, value: 1, to: Date()) ?? Date().addingTimeInterval(86_400)
+    let at = cal.date(bySettingHour: 9, minute: 0, second: 0, of: tomorrow) ?? tomorrow
+    var all = active(); all[id] = at.timeIntervalSince1970
+    UserDefaults.standard.set(all, forKey: key)
+  }
+  static func bring(_ id: String) { var all = active(); all.removeValue(forKey: id); UserDefaults.standard.set(all, forKey: key) }
+}
+
 final class RowView: NSView {
   private let item: Item
   private let onOpen: (Item) -> Void
@@ -232,13 +283,13 @@ final class RowView: NSView {
     return max(1, min(3, Int(ceil(h / lineHeight))))
   }
 
-  init(item: Item, width: CGFloat, inTeamSection: Bool = false, onOpen: @escaping (Item) -> Void, onCopy: @escaping (Item) -> Void) {
+  init(item: Item, width: CGFloat, inTeamSection: Bool = false, showSpace: Bool? = nil, onOpen: @escaping (Item) -> Void, onCopy: @escaping (Item) -> Void) {
     self.item = item
     self.onOpen = onOpen
     self.onCopy = onCopy
     self.leading = inTeamSection ? 26 : 12
     self.dot = inTeamSection && item.isDecision
-    self.sub = item.subtitle(showSpace: !inTeamSection)
+    self.sub = item.subtitle(showSpace: 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 + (sub.isEmpty ? 13 : 29)))
@@ -379,6 +430,48 @@ final class HeaderView: NSView {
   }
 }
 
+/// A team's section on a board that spans several teams: a mark in the team's own
+/// colour, its name, and how much of it needs this person — so each team reads as
+/// its own block, not a suffix on every row.
+final class BoardSpacer: NSView {
+  init(height: CGFloat, width: CGFloat) { super.init(frame: NSRect(x: 0, y: 0, width: width, height: height)); autoresizingMask = [.width] }
+  required init?(coder: NSCoder) { return nil }
+}
+
+final class TeamHeaderView: NSView {
+  private let name: String
+  private let detail: String
+  private let tint: NSColor
+  init(name: String, detail: String, tint: NSColor, width: CGFloat) {
+    self.name = name; self.detail = detail; self.tint = tint
+    super.init(frame: NSRect(x: 0, y: 0, width: width, height: 30))
+    autoresizingMask = [.width]
+    setAccessibilityRole(.staticText)
+    setAccessibilityLabel("\(name): \(detail)")
+  }
+  required init?(coder: NSCoder) { return nil }
+  static let tints: [NSColor] = [
+    NSColor(calibratedRed: 0.32, green: 0.74, blue: 0.76, alpha: 1),
+    NSColor(calibratedRed: 0.85, green: 0.74, blue: 0.42, alpha: 1),
+    NSColor(calibratedRed: 0.89, green: 0.57, blue: 0.42, alpha: 1),
+    NSColor(calibratedRed: 0.62, green: 0.56, blue: 0.86, alpha: 1),
+    NSColor(calibratedRed: 0.52, green: 0.78, blue: 0.52, alpha: 1),
+  ]
+  override func draw(_ dirtyRect: NSRect) {
+    let band = NSRect(x: 6, y: bounds.minY + 2, width: bounds.width - 12, height: bounds.height - 4)
+    tint.withAlphaComponent(0.10).setFill()
+    NSBezierPath(roundedRect: band, xRadius: 6, yRadius: 6).fill()
+    tint.setFill()
+    NSBezierPath(roundedRect: NSRect(x: 12, y: bounds.midY - 6, width: 4, height: 12), xRadius: 2, yRadius: 2).fill()
+    let para = NSMutableParagraphStyle(); para.lineBreakMode = .byTruncatingTail
+    NSAttributedString(string: name.uppercased(), attributes: [.font: NSFont.systemFont(ofSize: 11.5, weight: .bold), .kern: 0.6, .foregroundColor: NSColor.labelColor, .paragraphStyle: para])
+      .draw(in: NSRect(x: 24, y: bounds.midY - 8, width: bounds.width * 0.6, height: 16))
+    let r = NSMutableParagraphStyle(); r.alignment = .right
+    NSAttributedString(string: detail, attributes: [.font: NSFont.systemFont(ofSize: 12), .foregroundColor: NSColor.secondaryLabelColor, .paragraphStyle: r])
+      .draw(in: NSRect(x: bounds.maxX - 14 - 220, y: bounds.midY - 8, width: 220, height: 16))
+  }
+}
+
 /*
  * The board: an opaque, dark panel under the icon.
  *
@@ -469,6 +562,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   func applicationDidFinishLaunching(_ note: Notification) {
     NSApp.setActivationPolicy(.accessory)
     item = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
+    // (After the item exists: the board reads its button for placement.)
+    if let out = renderTo { renderBoard(to: out); exit(0) }
     let menu = NSMenu()
     menu.delegate = self
     classicMenu = menu
@@ -519,12 +614,24 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
 
   private var classicMenu: NSMenu?
   private var boardPanel: BoardPanel?
+  /// which of the board's counted lines are open ("handling", "waiting", "older", "later", "more")
+  private var boardOpen: Set<String> = []
   private var boardSignature = ""
   private var boardMonitor: Any?
   static let boardWidth: CGFloat = 470
 
+  /// The cards: what needs this person now, less what they put away for later.
+  /// The badge, the tooltip and both boards' headers all count these, so they agree.
+  private var boardCards: [Item] {
+    let later = Later.active()
+    return state.items.filter { $0.effectiveLane == "now" && later[$0.id] == nil }
+  }
+
   private func signature() -> String {
-    "\(state.items.map { $0.id }.joined(separator: ","))|\(state.decisions.count)|\(state.online)|\(state.members)|\(state.workerRunning)|\(state.relayOk)|\(actionError ?? "")|\(workerAction ?? "")"
+    // Everything the board draws from, not just which ids: a row moving lane (out
+    // of the worker's window), a new repeat, a claim, or a Later coming due all
+    // change what an open board must show.
+    "\(state.items.map { "\($0.id):\($0.effectiveLane):\($0.claimed):\($0.context)" }.joined(separator: ","))|\(Later.active().keys.sorted().joined(separator: ","))|\(state.decisions.count)|\(state.online)|\(state.members)|\(state.workerRunning)|\(state.relayOk)|\(actionError ?? "")|\(workerAction ?? "")"
   }
 
   @objc private func iconClicked(_ sender: Any?) {
@@ -557,6 +664,54 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     item.button?.highlight(false)
   }
 
+  /// One card as a row of the classic menu.
+  private func menuRow(_ it: Item, showSpace: Bool) -> NSMenuItem {
+    let mi = NSMenuItem(title: it.title, action: nil, keyEquivalent: "")
+    mi.toolTip = it.detail
+    mi.view = RowView(item: it, width: RowView.rowWidth, showSpace: showSpace,
+                      onOpen: { [weak self] x in self?.showDetail(x) },
+                      onCopy: { [weak self] x in self?.copyPrompt(x) })
+    return mi
+  }
+
+  /// Open or close one of the board's counted lines, and redraw.
+  private func toggleBoardLine(_ key: String) {
+    if boardOpen.contains(key) { boardOpen.remove(key) } else { boardOpen.insert(key) }
+    rebuildBoard()
+  }
+
+  /// The board as it would open now, drawn into a PNG (render mode, above).
+  func renderBoard(to path: String) {
+    state = fetchState()
+    hasLoaded = true
+    boardOpen = Set((ProcessInfo.processInfo.environment["PANTHEON_TRAY_OPEN"] ?? "").split(separator: ",").map(String.init))
+    let panel = makeBoardPanel()
+    boardPanel = panel
+    rebuildBoard()
+    var target: NSView? = panel.contentView
+    // PANTHEON_TRAY_PANEL=sent draws the first card's detail panel just after a
+    // reply was sent — the state that overlapped (2 Oct) — instead of the board.
+    if ProcessInfo.processInfo.environment["PANTHEON_TRAY_PANEL"] == "sent", let first = state.items.first(where: { $0.isDecision }) {
+      showDetail(first)
+      panelReplyManually()
+      setStatus("Answered — it is no longer waiting on you.")
+      exitReplyMode()
+      panelRetract?.isHidden = false
+      panelStatusRow?.isHidden = false
+      refitPanel()
+      target = detailPanel?.contentView
+    }
+    // PANTHEON_TRAY_PANEL=open draws the first card's panel once its full text has loaded.
+    if ProcessInfo.processInfo.environment["PANTHEON_TRAY_PANEL"] == "open", let first = state.items.first(where: { $0.isDecision }) {
+      showDetail(first)
+      RunLoop.main.run(until: Date().addingTimeInterval(2.5))
+      target = detailPanel?.contentView
+    }
+    guard let view = target, let rep = view.bitmapImageRepForCachingDisplay(in: view.bounds) else { return }
+    view.cacheDisplay(in: view.bounds, to: rep)
+    try? rep.representation(using: .png, properties: [:])?.write(to: URL(fileURLWithPath: path))
+  }
+
   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)
@@ -595,52 +750,69 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     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")
+      note("Unable to check Pantheon status"); note("Open More below: Refresh now, or Check connection")
     } 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"
+      // One board, no noise (tray.ts arrangeBoard): every card is something this
+      // person has to do, each once, across every team; the rest is one line each,
+      // opened on demand. No cap — nothing that needs them is hidden.
+      let multi = state.spaces.count > 1
+      let later = Later.active()
+      let cards = boardCards
+      let putAway = state.items.filter { $0.effectiveLane == "now" && later[$0.id] != nil }
+      let handling = state.items.filter { $0.effectiveLane == "handling" }
+      let waiting = state.items.filter { $0.effectiveLane == "waiting" }
+      let older = state.items.filter { $0.effectiveLane == "older" }
+      let need = cards.isEmpty ? "Nothing needs you" : "\(cards.count) need\(cards.count == 1 ? "s" : "") you"
+      let where_ = multi ? "\(state.spaces.count) teams" : state.space
       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) }
+      // The heading already says nothing needs you: said again only what it does not.
+      if cards.isEmpty && state.decisionsOk && handling.isEmpty && waiting.isEmpty && older.isEmpty && putAway.isEmpty {
+        note("All clear — nothing open for your agents either")
+      }
+      // One block per team when there are several (Sid, 2 Oct: "it should
+      // differentiate each space — here it's all dumped together"): the team's
+      // header in its own colour, its cards, then its own counted lines. One team
+      // keeps the plain board. (Plain loops: a local closure capturing both `rows`
+      // and a weak self crashed the optimised build.)
+      let teams: [String] = multi ? state.spaces : [""]
+      for (ti, team) in teams.enumerated() {
+        let mine = { (xs: [Item]) in multi ? xs.filter { $0.space == team } : xs }
+        let tCards = mine(cards), tHandling = mine(handling), tWaiting = mine(waiting), tOlder = mine(older), tLater = mine(putAway)
+        if multi {
+          let restCount = tHandling.count + tWaiting.count + tOlder.count + tLater.count
+          let detail = !tCards.isEmpty ? "\(tCards.count) need\(tCards.count == 1 ? "s" : "") you" : restCount > 0 ? "nothing needs you" : "all clear"
+          if ti > 0 { rows.append(BoardSpacer(height: 6, width: w)) }
+          rows.append(TeamHeaderView(name: team, detail: detail, tint: TeamHeaderView.tints[ti % TeamHeaderView.tints.count], width: w))
         }
-      } 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)
+        for it in tCards { rows.append(RowView(item: it, width: w, showSpace: false, onOpen: openRow, onCopy: copyRow)) }
+        let lanes: [(key: String, title: String, items: [Item])] = [
+          ("handling", "Your agents are handling · \(tHandling.count)", tHandling),
+          ("waiting", "Waiting on teammates · \(tWaiting.count)", tWaiting),
+          ("older", "Older than a week · \(tOlder.count)", tOlder),
+          ("later", "Later · \(tLater.count)", tLater),
+        ]
+        if !multi && lanes.contains(where: { !$0.items.isEmpty }) { sep() }
+        for lane in lanes where !lane.items.isEmpty {
+          let key = multi ? "\(lane.key)|\(team)" : lane.key
+          let open = boardOpen.contains(key)
+          rows.append(ActionRow(lane.title, hint: open ? "hide" : "show", width: w, onClick: { [weak self] in self?.toggleBoardLine(key) }))
+          // Indented under their line, so an opened lane never reads as more cards.
+          if open { for it in lane.items { rows.append(RowView(item: it, width: w, inTeamSection: true, showSpace: false, onOpen: openRow, onCopy: copyRow)) } }
         }
       }
-      if !decisions.isEmpty {
+      // The prompt it hands over asks about every question waiting on this person,
+      // put away or not, so the count is of all of them.
+      if state.decisions.count > 1 {
         sep()
-        act(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", "") { [weak self] in self?.openAllDecisions() }
+        act("Review all \(state.decisions.count) questions in \(state.surfaceName)", "") { [weak self] in self?.openAllDecisions() }
       }
       sep()
       if let action = workerAction { note(action) }
@@ -650,12 +822,16 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
     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() }
+    // The terminal tools, out of the way until asked for.
+    let moreOpen = boardOpen.contains("more")
+    rows.append(ActionRow("More", hint: moreOpen ? "hide" : "version \(state.version)", width: w, onClick: { [weak self] in self?.toggleBoardLine("more") }))
+    if moreOpen {
+      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() }
+      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 }
@@ -728,9 +904,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let mode: MarkMode = !state.configured || !state.relayOk ? .off : state.workerRunning ? .full : .idle
     item.button?.image = markImage(mode)
     let unknown = hasLoaded && (!state.reachable || (state.configured && !state.decisionsOk))
-    item.button?.title = actionError != nil ? " !" : state.decisions.isEmpty ? (unknown ? " !" : "") : " \(state.decisions.count)\(unknown ? "+" : "")"
+    let need = hasLoaded ? boardCards.count : 0
+    item.button?.title = actionError != nil ? " !" : need == 0 ? (unknown ? " !" : "") : " \(need)\(unknown ? "+" : "")"
     item.button?.imagePosition = .imageLeading
-    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"
+    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" : need == 0 ? "Nothing needs you" : "\(need) need\(need == 1 ? "s" : "") you"
     item.button?.toolTip = "Pantheon — " + (actionError ?? summary)
     item.button?.setAccessibilityLabel("Pantheon — " + (actionError ?? summary))
   }
@@ -755,65 +932,46 @@ 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"
-        : "Connection unavailable · \(state.unavailableSpaces.joined(separator: ", "))")
+      // The same board as the panel (rebuildBoard), as a menu: the cards, then the
+      // rest as a submenu each.
+      let multi = state.spaces.count > 1
+      let later = Later.active()
+      let cards = boardCards
+      let putAway = state.items.filter { $0.effectiveLane == "now" && later[$0.id] != nil }
+      let handling = state.items.filter { $0.effectiveLane == "handling" }
+      let waiting = state.items.filter { $0.effectiveLane == "waiting" }
+      let older = state.items.filter { $0.effectiveLane == "older" }
+      let summary = NSMenuItem(title: state.member, action: nil, keyEquivalent: "")
+      summary.isEnabled = false
+      summary.view = HeaderView(lead: cards.isEmpty ? "Nothing needs you" : "\(cards.count) need\(cards.count == 1 ? "s" : "") you",
+                                rest: "\(state.member) · " + (multi ? "\(state.spaces.count) teams" : state.space) + " · " + (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: ", "))") }
+      if !state.decisionsOk { info("Some of this could not be checked — the list may be incomplete") }
       menu.addItem(.separator())
-      if !state.decisionsOk {
-        info("Some of this could not be checked")
-        info("Refresh to try again — the list may be incomplete")
+      let row = { (it: Item) -> NSMenuItem in self.menuRow(it, showSpace: multi) }
+      for it in cards { menu.addItem(row(it)) }
+      if cards.isEmpty && state.decisionsOk && handling.isEmpty && waiting.isEmpty && older.isEmpty && putAway.isEmpty {
+        info("All clear — nothing open for your agents either")
       }
-      if state.items.isEmpty {
-        if state.decisionsOk { info("Nothing open — nothing needs you, nothing owed either way") }
-      } else {
-        addRows(menu, decisions.count == 1 ? "1 decision needs you" : "\(decisions.count) decisions need you", decisions)
-        addRows(menu, owed.count == 1 ? "You owe 1 thing" : "You owe \(owed.count) things", owed)
-        // Grouped by person, because "waiting on praneet" is what someone
-        // actually wants to know before they chase it.
-        for who in orderedPeers(waiting) {
-          let theirs = waiting.filter { $0.who == who }
-          addRows(menu, theirs.count == 1 ? "Waiting on \(who)" : "Waiting on \(who) · \(theirs.count)", theirs)
-        }
-        if !decisions.isEmpty {
-          menu.addItem(makeItem(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", #selector(openAllDecisions)))
-        }
+      let lanes: [(String, [Item])] = [
+        ("Your agents are handling · \(handling.count)", handling),
+        ("Waiting on teammates · \(waiting.count)", waiting),
+        ("Older than a week · \(older.count)", older),
+        ("Later · \(putAway.count)", putAway),
+      ].filter { !$0.1.isEmpty }
+      if !lanes.isEmpty { menu.addItem(.separator()) }
+      for (title, items) in lanes {
+        let mi = NSMenuItem(title: title, action: nil, keyEquivalent: "")
+        let sub = NSMenu()
+        for it in items { sub.addItem(row(it)) }
+        mi.submenu = sub
+        menu.addItem(mi)
       }
+      if state.decisions.count > 1 {
+        menu.addItem(.separator())
+        menu.addItem(makeItem("Review all \(state.decisions.count) questions 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")
@@ -860,6 +1018,10 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private var panelText: NSTextView?
   private var panelBodyHeight: NSLayoutConstraint?
   private var panelHeadline: NSTextField?
+  private var panelEyebrow: NSTextField?
+  /// The decision's own stated options ("(a) … (b) …"), as one-click answers.
+  private var panelOptions: NSStackView?
+  private var panelOptionList: [(key: String, text: String)] = []
   private var panelRendered: NSAttributedString?     // the act laid out for a person
   private var panelRaw: String = ""                  // the act exactly as it was sent
   private var panelShowingRaw = false
@@ -956,12 +1118,26 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     guard let tv = panelText else { return }
     tv.textStorage?.setAttributedString(text)
     panelBodyHeight?.constant = bodyHeight(text, width: width)
-    if let p = detailPanel {
-      p.contentView?.layoutSubtreeIfNeeded()
-      let h = min(max((p.contentView?.fittingSize.height ?? 420) + 30, 300), 680)
-      let f = p.frame
-      p.setFrame(NSRect(x: f.minX, y: f.maxY - h, width: f.width, height: h), display: true, animate: false)
+    refitPanel()
+  }
+
+  /// The panel is measured again whenever a row shows or hides — the reply box,
+  /// the status line, Retract, the buttons coming back. It was sized once, when it
+  /// opened, so after a send the status row and the returning buttons outgrew it
+  /// and AppKit drew them on top of each other (2 Oct). The top edge stays put; past
+  /// the tallest panel, the body gives up height before anything can overlap.
+  private func refitPanel() {
+    guard let p = detailPanel, let v = p.contentView else { return }
+    v.layoutSubtreeIfNeeded()
+    var need = v.fittingSize.height + 30
+    if need > 680, let bh = panelBodyHeight {
+      bh.constant = max(80, bh.constant - (need - 680))
+      v.layoutSubtreeIfNeeded()
+      need = v.fittingSize.height + 30
     }
+    let h = min(max(need, 300), 680)
+    let f = p.frame
+    p.setFrame(NSRect(x: f.minX, y: f.maxY - h, width: f.width, height: h), display: true, animate: false)
   }
 
   /**
@@ -972,7 +1148,8 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private func loadDetail(_ item: Item, width: CGFloat) {
     guard !item.ref.isEmpty else { return }
     DispatchQueue.global().async {
-      let r = run(pantheonBin, ["tray-detail", item.ref], timeout: 20)
+      // The item's own team, so a decision in another team is found and shown whole.
+      let r = run(pantheonBin, ["tray-detail", item.ref] + (item.space.isEmpty ? [] : ["--space", item.space]), timeout: 20)
       guard let out = r?.out, r?.code == 0,
             let data = out.data(using: .utf8),
             let j = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
@@ -981,8 +1158,34 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       let rendered = self.render(blocks)
       let raw = j["raw"] as? String ?? ""
       let headline = j["headline"] as? String ?? ""
+      let asker = j["asker"] as? String ?? ""
+      let options: [(key: String, text: String)] = (j["options"] as? [[String: Any]] ?? []).compactMap { o in
+        guard let k = o["key"] as? String, let t = o["text"] as? String else { return nil }
+        return (key: k, text: t)
+      }
       DispatchQueue.main.async {
         guard self.panelItem?.id == item.id else { return }
+        // Who is asking, said plainly: "from your worker", never "sid escalated" to sid.
+        if !asker.isEmpty, let eye = self.panelEyebrow, !eye.stringValue.contains("FROM ") { eye.stringValue += "  ·  FROM " + asker.uppercased() }
+        if item.isDecision && item.choices.isEmpty && options.count >= 2, let box = self.panelOptions {
+          self.panelOptionList = options
+          box.arrangedSubviews.forEach { $0.removeFromSuperview() }
+          let note = NSTextField(labelWithString: "Answer with one of its options:")
+          note.font = .systemFont(ofSize: 12, weight: .medium)
+          note.textColor = .secondaryLabelColor
+          box.addArrangedSubview(note)
+          for (n, o) in options.enumerated() {
+            let title = "(\(o.key)) " + (o.text.count > 78 ? String(o.text.prefix(77)) + "…" : o.text)
+            let b = NSButton(title: title, target: self, action: #selector(self.panelChooseOption(_:)))
+            b.bezelStyle = .rounded
+            b.tag = n
+            b.keyEquivalent = ""
+            b.toolTip = "Sends \"(\(o.key)) \(o.text)\" as your answer"
+            box.addArrangedSubview(b)
+          }
+          box.isHidden = false
+          self.refitPanel()
+        }
         self.panelRendered = rendered
         self.panelRaw = raw
         self.panelRawButton?.isHidden = raw.isEmpty
@@ -1039,6 +1242,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     if item.when > 0 { eyebrow += "  ·  " + Item.age(item.when) }
     if !item.space.isEmpty { eyebrow += "  ·  " + item.space }
     let eye = label(eyebrow, size: 11, weight: .semibold, color: .secondaryLabelColor, width: inner)
+    panelEyebrow = eye
     stack.addArrangedSubview(eye)
     let headline = label(item.headline, size: 17, weight: .semibold, color: .labelColor, width: inner)
     panelHeadline = headline
@@ -1195,6 +1399,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     rows.spacing = 8
     rows.translatesAutoresizingMaskIntoConstraints = false
 
+    // The decision's own options, filled in once its full text has loaded.
+    if item.isDecision && item.choices.isEmpty {
+      let opts = NSStackView()
+      opts.orientation = .vertical
+      opts.alignment = .leading
+      opts.spacing = 6
+      opts.isHidden = true
+      panelOptions = opts
+      rows.addArrangedSubview(opts)
+    }
+
     // A question this machine asked its own person: answered in one click, here.
     if item.isDecision && !item.choices.isEmpty {
       let row0 = NSStackView()
@@ -1219,6 +1434,12 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     if item.isDecision {
       row1.addArrangedSubview(button("Mark done", #selector(panelDone), "Tells the agent you settled this in person, so it stops asking."))
     }
+    // Put away until tomorrow morning, on this machine — nothing is sent.
+    if item.effectiveLane == "now" {
+      let away = Later.active()[item.id] != nil
+      row1.addArrangedSubview(button(away ? "Bring back" : "Later", #selector(panelLater),
+        away ? "Puts it back on the board now." : "Puts it away until 9:00 tomorrow, on this machine only. Nothing is sent; it is still owed."))
+    }
     row1.addArrangedSubview(button("Show the thread", #selector(panelThread), "Every act in this goal, in Terminal, from the team's folder."))
     rows.addArrangedSubview(row1)
 
@@ -1274,6 +1495,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelStatus?.stringValue = text
     panelStatus?.isHidden = text.isEmpty
     panelStatusRow?.isHidden = text.isEmpty && (panelRetract?.isHidden ?? true)
+    refitPanel()
   }
 
   @objc private func panelClose() {
@@ -1294,6 +1516,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelReplyKind = nil
     panelSendButton = nil
     panelRetract = nil
+    panelEyebrow = nil
+    panelOptions = nil
+    panelOptionList = []
     panelLastSent = ""
     panelRaw = ""
     panelShowingRaw = false
@@ -1319,7 +1544,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelReplyRow?.isHidden = false
     if let c = panelBodyHeight, c.constant > 140 { c.constant -= 20 }
     panelRetract?.isHidden = true
-    setStatus("")
+    setStatus("")   // refits
     if let tv = panelReply { detailPanel?.makeFirstResponder(tv) }
   }
   @objc private func panelCancelReply() { exitReplyMode() }
@@ -1330,6 +1555,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelReplyButton?.isHidden = false
     panelReplyButton?.keyEquivalent = "\r"
     if let c = panelBodyHeight, c.constant > 0 { c.constant += 20 }
+    refitPanel()
   }
 
   /// What a person may send on this item. Answer only on their own decision:
@@ -1366,6 +1592,30 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     }
   }
 
+  /// One of the decision's stated options, sent as its ANSWER — the same local path a typed answer takes.
+  @objc private func panelChooseOption(_ sender: NSButton) {
+    guard let item = panelItem, sender.tag >= 0, sender.tag < panelOptionList.count else { return }
+    let o = panelOptionList[sender.tag]
+    var payload: [String: Any] = ["action": "reply", "kind": "ANSWER", "body": "(\(o.key)) \(o.text)", "goal": item.goal, "space": item.space, "decision": item.id]
+    if !item.ref.isEmpty { payload["act"] = item.ref }
+    guard writeAction(payload) else { setStatus("Could not write the action. Use Reply manually instead."); return }
+    setStatus("Answering…")
+    panelOptions?.arrangedSubviews.forEach { ($0 as? NSButton)?.isEnabled = false }
+    DispatchQueue.global().async {
+      let r = run(pantheonBin, ["explain", "--queued"], timeout: 25)
+      DispatchQueue.main.async {
+        let out = (r?.out ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        if r?.code == 0 {
+          self.setStatus("Answered (\(o.key)) — it is no longer waiting on you.")
+          self.refresh()
+        } else {
+          self.panelOptions?.arrangedSubviews.forEach { ($0 as? NSButton)?.isEnabled = true }
+          self.setStatus(out.hasPrefix("not sent: ") ? String(out.dropFirst("not sent: ".count)) : "the relay could not be reached")
+        }
+      }
+    }
+  }
+
   /// Send the words in the box as the chosen act. The CLI does the sending and
   /// prints "sent KIND id=… seq=…" or "not sent: why" on stdout; both are shown.
   @objc private func panelSend(_ sender: Any?) {
@@ -1395,7 +1645,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
           self.setStatus(what)
           self.exitReplyMode()
           self.panelRetract?.isHidden = false
-          DispatchQueue.main.asyncAfter(deadline: .now() + 60) { [weak self] in self?.panelRetract?.isHidden = true }
+          self.panelStatusRow?.isHidden = false
+          self.refitPanel()
+          DispatchQueue.main.asyncAfter(deadline: .now() + 60) { [weak self] in
+            self?.panelRetract?.isHidden = true
+            self?.panelStatusRow?.isHidden = (self?.panelStatus?.stringValue.isEmpty ?? true)
+            self?.refitPanel()
+          }
           self.refresh()
         } else {
           let why = out.hasPrefix("not sent: ") ? String(out.dropFirst("not sent: ".count)) : "the relay could not be reached"
@@ -1421,7 +1677,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         if r?.code == 0 {
           self.panelLastSent = ""
           self.panelRetract?.isHidden = true
-          self.setStatus("Retracted.")
+          self.setStatus("Retracted.")   // refits
           self.refresh()
         } else {
           let out = (r?.out ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
@@ -1441,6 +1697,13 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     showThread(item)
   }
   /// Answer the decision as handled, with no terminal — the same action the alert's Done takes.
+  @objc private func panelLater() {
+    guard let item = panelItem else { return }
+    if Later.active()[item.id] != nil { Later.bring(item.id) } else { Later.snooze(item.id) }
+    detailPanel?.close()
+    if boardPanel?.isVisible == true { rebuildBoard() }
+  }
+
   @objc private func panelDone() {
     guard let item = panelItem, item.isDecision else { return }
     setStatus("Marking it done…")