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

package/helper/macos/menubar.swift

@@ -82,6 +82,8 @@ struct Item {
   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 —
@@ -104,7 +106,7 @@ struct Item {
     // which is the one fact a reader could already guess.
     // 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(effectiveLane == "handling" ? (claimed ? "your agent is on it" : "your worker picks it up") : "waiting on you")
+      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) }
@@ -186,7 +188,8 @@ func fetchState() -> TrayState {
       },
       lane: i["lane"] as? String ?? "",
       context: i["context"] as? String ?? "",
-      claimed: i["claimed"] as? Bool ?? false
+      claimed: i["claimed"] as? Bool ?? false,
+      promise: i["promise"] as? Bool ?? false
     ))
   }
   for d in (j["decisions"] as? [[String: Any]] ?? []) {
@@ -427,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.
  *
@@ -643,7 +688,26 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     let panel = makeBoardPanel()
     boardPanel = panel
     rebuildBoard()
-    guard let view = panel.contentView, let rep = view.bitmapImageRepForCachingDisplay(in: view.bounds) else { return }
+    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))
   }
@@ -709,26 +773,40 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       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()
-      for it in cards { rows.append(RowView(item: it, width: w, showSpace: multi, onOpen: openRow, onCopy: copyRow)) }
       // 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")
       }
-      // The rest, counted: a line each, opened in place. (A plain loop: a local
-      // closure capturing both `rows` and a weak self crashed the optimised build.)
-      let lanes: [(key: String, title: String, items: [Item])] = [
-        ("handling", "Your agents are handling · \(handling.count)", handling),
-        ("waiting", "Waiting on teammates · \(waiting.count)", waiting),
-        ("older", "Older than a week · \(older.count)", older),
-        ("later", "Later · \(putAway.count)", putAway),
-      ]
-      if lanes.contains(where: { !$0.items.isEmpty }) { sep() }
-      for lane in lanes where !lane.items.isEmpty {
-        let open = boardOpen.contains(lane.key)
-        let key = lane.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: multi, onOpen: openRow, onCopy: copyRow)) } }
+      // 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))
+        }
+        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)) } }
+        }
       }
       // 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.
@@ -940,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
@@ -1036,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)
   }
 
   /**
@@ -1052,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],
@@ -1061,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
@@ -1119,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
@@ -1275,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()
@@ -1360,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() {
@@ -1380,6 +1516,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelReplyKind = nil
     panelSendButton = nil
     panelRetract = nil
+    panelEyebrow = nil
+    panelOptions = nil
+    panelOptionList = []
     panelLastSent = ""
     panelRaw = ""
     panelShowingRaw = false
@@ -1405,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() }
@@ -1416,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:
@@ -1452,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?) {
@@ -1481,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"
@@ -1507,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)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@join-pantheon/cli",
-  "version": "0.31.1",
+  "version": "0.31.2-rc.1",
   "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": {