@join-pantheon/cli 0.24.4 → 0.25.0

package/helper/macos/menubar.swift

@@ -78,7 +78,9 @@ struct Item {
   /// "praneet · 2d ago · pantheon"
   var subtitle: String {
     var parts: [String] = []
-    if kind == "owed" { parts.append("you owe") } else if kind == "waiting" { parts.append(who) }
+    // 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) }
     return parts.joined(separator: " · ")
@@ -179,11 +181,30 @@ final class RowView: NSView {
   private var overCopy = false
   private var copied = false
 
+  private let titleLines: Int
+  private static let titleFont = NSFont.systemFont(ofSize: 13, weight: .medium)
+  private static let lineHeight: CGFloat = 17
+
+  /// How many lines this title needs, at most two. A one-line row truncated
+  /// mid-word ("Sid asked: Sid is asking: is this work in producti…") hid the
+  /// only part worth reading; two lines carry almost every real title whole.
+  static func lines(for text: String, width: CGFloat) -> Int {
+    let para = NSMutableParagraphStyle()
+    para.lineBreakMode = .byWordWrapping
+    let h = (text as NSString).boundingRect(
+      with: NSSize(width: width, height: .greatestFiniteMagnitude),
+      options: [.usesLineFragmentOrigin, .usesFontLeading],
+      attributes: [.font: titleFont, .paragraphStyle: para]).height
+    return max(1, min(2, Int(ceil(h / lineHeight))))
+  }
+
   init(item: Item, width: CGFloat, onOpen: @escaping (Item) -> Void, onCopy: @escaping (Item) -> Void) {
     self.item = item
     self.onOpen = onOpen
     self.onCopy = onCopy
-    super.init(frame: NSRect(x: 0, y: 0, width: width, height: item.subtitle.isEmpty ? 30 : 42))
+    self.titleLines = RowView.lines(for: item.title, width: width - 14 - 48)
+    let textHeight = CGFloat(titleLines) * RowView.lineHeight
+    super.init(frame: NSRect(x: 0, y: 0, width: width, height: textHeight + (item.subtitle.isEmpty ? 13 : 29)))
     setAccessibilityRole(.button)
     setAccessibilityLabel("\(item.title). \(item.subtitle). Return opens it; the button on the right copies the question.")
   }
@@ -191,6 +212,7 @@ final class RowView: NSView {
 
   private var copyRect: NSRect { NSRect(x: bounds.maxX - 42, y: bounds.midY - 12, width: 28, height: 24) }
 
+
   override func updateTrackingAreas() {
     super.updateTrackingAreas()
     for a in trackingAreas { removeTrackingArea(a) }
@@ -227,17 +249,25 @@ final class RowView: NSView {
     let fg: NSColor = selected ? .selectedMenuItemTextColor : .labelColor
     let dim: NSColor = selected ? NSColor.selectedMenuItemTextColor.withAlphaComponent(0.7) : .secondaryLabelColor
     let para = NSMutableParagraphStyle()
-    para.lineBreakMode = .byTruncatingTail
+    para.lineBreakMode = .byWordWrapping           // break between words, not inside one
+    para.lineSpacing = 0
+    let flat = NSMutableParagraphStyle()
+    flat.lineBreakMode = .byTruncatingTail
     let textWidth = bounds.width - 14 - 48
     let hasSub = !item.subtitle.isEmpty
-    let titleY = hasSub ? bounds.midY - 1 : bounds.midY - 8
-    NSAttributedString(string: item.title, attributes: [
-      .font: NSFont.systemFont(ofSize: 13, weight: .medium), .foregroundColor: fg, .paragraphStyle: para,
-    ]).draw(in: NSRect(x: 14, y: titleY, width: textWidth, height: 18))
+    let titleHeight = CGFloat(titleLines) * RowView.lineHeight
+    let titleY = bounds.maxY - 7 - 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)
     if hasSub {
       NSAttributedString(string: item.subtitle, attributes: [
-        .font: NSFont.systemFont(ofSize: 11), .foregroundColor: dim, .paragraphStyle: para,
-      ]).draw(in: NSRect(x: 14, y: bounds.midY - 17, width: textWidth, height: 15))
+        .font: NSFont.systemFont(ofSize: 11), .foregroundColor: dim, .paragraphStyle: flat,
+      ]).draw(in: NSRect(x: 14, y: bounds.minY + 6, width: textWidth, height: 14))
     }
 
     // the copy control
@@ -406,7 +436,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
           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) decisions" : "Review the decision") in \(state.surfaceName)", #selector(openAllDecisions)))
+          menu.addItem(makeItem(decisions.count > 1 ? "Review all \(decisions.count) in \(state.surfaceName)" : "Review it in \(state.surfaceName)", #selector(openAllDecisions)))
         }
       }
       menu.addItem(.separator())
@@ -826,7 +856,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     for item in items.prefix(6) {
       let mi = NSMenuItem(title: item.title, action: nil, keyEquivalent: "")
       mi.toolTip = item.detail
-      mi.view = RowView(item: item, width: 360,
+      mi.view = RowView(item: item, width: 430,
                         onOpen: { [weak self] it in self?.showDetail(it) },
                         onCopy: { [weak self] it in self?.copyPrompt(it) })
       menu.addItem(mi)

package/package.json

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