@join-pantheon/cli 0.26.4 → 0.27.0

package/helper/macos/menubar.swift

@@ -68,6 +68,8 @@ struct Item {
   let goal: String
   let ref: String
   let space: String
+  /// whose human must decide this: this member for their own decision, the teammate for theirs, "" when it is not a decision
+  let decider: String
 
   var isDecision: Bool { kind == "decision" }
   var heading: String {
@@ -152,7 +154,8 @@ func fetchState() -> TrayState {
       when: (i["when"] as? Double) ?? Double(i["when"] as? Int ?? 0),
       goal: i["goal"] as? String ?? "",
       ref: i["ref"] as? String ?? "",
-      space: i["space"] as? String ?? ""
+      space: i["space"] as? String ?? "",
+      decider: i["decider"] as? String ?? ""
     ))
   }
   for d in (j["decisions"] as? [[String: Any]] ?? []) {
@@ -840,7 +843,17 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   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
-  private var panelRawToggle: NSButton?
+  private var panelRawButton: NSButton?              // "Original text" / "Laid out", shown only when the two differ
+  private var panelButtons: NSStackView?             // the action row; hidden while replying
+  private var panelReplyRow: NSStackView?            // the reply box; shown only in reply mode
+  private var panelCancel: NSButton?
+  private var panelReplyButton: NSButton?           // the primary action, hidden while replying
+  private var panelStatusRow: NSStackView?           // collapses when there is nothing to say
+  private var panelReply: NSTextView?                // the person's own words
+  private var panelReplyKind: NSPopUpButton?         // Answer / Note / Ask back
+  private var panelSendButton: NSButton?
+  private var panelRetract: NSButton?                // the undo, for a minute after a send
+  private var panelLastSent: String = ""             // act id of what was just sent
 
   private func label(_ text: String, size: CGFloat, weight: NSFont.Weight, color: NSColor, width: CGFloat) -> NSTextField {
     let l = NSTextField(labelWithString: text)
@@ -951,7 +964,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
         guard self.panelItem?.id == item.id else { return }
         self.panelRendered = rendered
         self.panelRaw = raw
-        self.panelRawToggle?.isHidden = raw.isEmpty
+        self.panelRawButton?.isHidden = raw.isEmpty
         if !headline.isEmpty { self.panelHeadline?.stringValue = headline }
         if !self.panelShowingRaw && rendered.length > 0 { self.showBody(rendered, width: width) }
       }
@@ -962,7 +975,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   @objc private func panelToggleRaw() {
     guard let item = panelItem else { return }
     panelShowingRaw.toggle()
-    panelRawToggle?.title = panelShowingRaw ? "Show it laid out" : "Show it as sent"
+    panelRawButton?.title = panelShowingRaw ? "Laid out" : "Original text"
     let width: CGFloat = 620 - 52
     if panelShowingRaw { showBody(plain(panelRaw.isEmpty ? item.detail : panelRaw), width: width) }
     else if let r = panelRendered { showBody(r, width: width) }
@@ -1037,42 +1050,161 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     if !item.goal.isEmpty { meta += "  ·  goal \(item.goal)" }
     stack.addArrangedSubview(label(meta, size: 11, weight: .regular, color: .tertiaryLabelColor, width: inner))
 
-    let status = label("", size: 11, weight: .medium, color: .secondaryLabelColor, width: inner)
+    // Whose decision this is, said before the box that answers it. Your own
+    // answer to a teammate's decision lands as an act and settles nothing, so the
+    // panel offers Answer only to the person it is waiting on.
+    let owner: String = item.isDecision ? "Yours to decide."
+      : !item.decider.isEmpty ? "\(item.decider)'s to decide. You can add a note or ask back."
+      : item.kind == "owed" ? "Your agent owes this. You can add a note or ask back."
+      : "Waiting on \(item.who). You can add a note or ask back."
+    let ownerRow = NSStackView()
+    ownerRow.orientation = .horizontal
+    ownerRow.alignment = .centerY
+    ownerRow.spacing = 10
+    ownerRow.translatesAutoresizingMaskIntoConstraints = false
+    let ownerLabel = label(owner, size: 12, weight: .medium, color: .secondaryLabelColor, width: inner - 170)
+    ownerLabel.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    ownerRow.addArrangedSubview(ownerLabel)
+    let ownerSpacer = NSView()
+    ownerSpacer.translatesAutoresizingMaskIntoConstraints = false
+    ownerSpacer.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    ownerRow.addArrangedSubview(ownerSpacer)
+    // The one action that is the person's own voice, set apart from the rest and
+    // reachable with Return. Pressing it only opens the box; nothing is sent.
+    let replyBtn = NSButton(title: "Reply manually", target: self, action: #selector(panelReplyManually))
+    replyBtn.bezelStyle = .rounded
+    replyBtn.keyEquivalent = "\r"
+    replyBtn.setContentCompressionResistancePriority(.required, for: .horizontal)
+    replyBtn.toolTip = "Type your own answer, note or question. Nothing is drafted for you, and nothing is sent until you press Send."
+    panelReplyButton = replyBtn
+    ownerRow.addArrangedSubview(replyBtn)
+    ownerRow.widthAnchor.constraint(equalToConstant: inner).isActive = true
+    if let idLine = stack.arrangedSubviews.last { stack.setCustomSpacing(6, after: idLine) }
+    stack.addArrangedSubview(ownerRow)
+    // Clear air between the person's own action and the rest: a rule, with room
+    // on both sides, so the blue button is not read as part of the row below.
+    stack.setCustomSpacing(22, after: ownerRow)
+    let rule = NSBox()
+    rule.boxType = .separator
+    rule.translatesAutoresizingMaskIntoConstraints = false
+    rule.widthAnchor.constraint(equalToConstant: inner).isActive = true
+    stack.addArrangedSubview(rule)
+    stack.setCustomSpacing(22, after: rule)
+
+    // The reply, in the person's own words: one popup for what it is, the box,
+    // one Send. Return sends; Shift-Return makes a new line.
+    let replyRow = NSStackView()
+    replyRow.orientation = .horizontal
+    replyRow.alignment = .top
+    replyRow.spacing = 8
+    replyRow.translatesAutoresizingMaskIntoConstraints = false
+    let kinds = NSPopUpButton(frame: .zero, pullsDown: false)
+    for k in replyKinds(item) { kinds.addItem(withTitle: k) }
+    kinds.toolTip = "Answer settles it and the agent continues. Note goes on the record and settles nothing. Ask back puts a question to the agent that raised it."
+    kinds.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+    panelReplyKind = kinds
+    replyRow.addArrangedSubview(kinds)
+    let replyScroll = NSScrollView()
+    replyScroll.hasVerticalScroller = false
+    replyScroll.borderType = .bezelBorder
+    replyScroll.translatesAutoresizingMaskIntoConstraints = false
+    let reply = NSTextView()
+    reply.isEditable = true
+    reply.isRichText = false
+    reply.font = .systemFont(ofSize: 13)
+    reply.textContainerInset = NSSize(width: 4, height: 6)
+    reply.isVerticallyResizable = true
+    reply.isHorizontallyResizable = false
+    reply.autoresizingMask = [.width]
+    reply.textContainer?.widthTracksTextView = true
+    reply.delegate = self
+    replyScroll.documentView = reply
+    replyScroll.heightAnchor.constraint(equalToConstant: 58).isActive = true
+    replyScroll.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    panelReply = reply
+    replyRow.addArrangedSubview(replyScroll)
+    let send = NSButton(title: "Send", target: self, action: #selector(panelSend(_:)))
+    send.bezelStyle = .rounded
+    send.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+    panelSendButton = send
+    replyRow.addArrangedSubview(send)
+    let cancel = NSButton(title: "Cancel", target: self, action: #selector(panelCancelReply))
+    cancel.bezelStyle = .rounded
+    cancel.setContentHuggingPriority(.defaultHigh, for: .horizontal)
+    cancel.toolTip = "Back to the buttons. Your words stay in the box."
+    panelCancel = cancel
+    replyRow.addArrangedSubview(cancel)
+    replyRow.widthAnchor.constraint(equalToConstant: inner).isActive = true
+    panelReplyRow = replyRow
+    stack.addArrangedSubview(replyRow)
+    replyRow.isHidden = true
+
+    // What happened, and the undo for a slip: Retract shows for a minute after a send.
+    let statusRow = NSStackView()
+    statusRow.orientation = .horizontal
+    statusRow.spacing = 10
+    statusRow.translatesAutoresizingMaskIntoConstraints = false
+    let status = label("", size: 11, weight: .medium, color: .secondaryLabelColor, width: inner - 90)
     status.isHidden = true
     panelStatus = status
-    stack.addArrangedSubview(status)
-
-    let row = NSStackView()
-    row.orientation = .horizontal
-    row.spacing = 10
-    row.translatesAutoresizingMaskIntoConstraints = false
-    let open = NSButton(title: "Open in \(state.surfaceName)", target: self, action: #selector(panelOpen))
-    open.bezelStyle = .rounded
-    open.keyEquivalent = "\r"
-    row.addArrangedSubview(open)
-    let copy = NSButton(title: "Copy the question", target: self, action: #selector(panelCopy))
-    copy.bezelStyle = .rounded
-    row.addArrangedSubview(copy)
+    statusRow.addArrangedSubview(status)
+    let retract = NSButton(title: "Retract", target: self, action: #selector(panelRetractAction))
+    retract.bezelStyle = .rounded
+    retract.controlSize = .small
+    retract.toolTip = "Withdraws what you just sent. Your words stay in the record as retracted."
+    retract.isHidden = true
+    panelRetract = retract
+    statusRow.addArrangedSubview(retract)
+    panelStatusRow = statusRow
+    stack.addArrangedSubview(statusRow)
+    statusRow.isHidden = true
+
+    // Two rows: what to do about it, then what to do with the text. Every
+    // button refuses to compress, so the labels are always whole.
+    func button(_ title: String, _ sel: Selector, _ tip: String) -> NSButton {
+      let b = NSButton(title: title, target: self, action: sel)
+      b.bezelStyle = .rounded
+      b.toolTip = tip
+      b.setContentCompressionResistancePriority(.required, for: .horizontal)
+      return b
+    }
+    let rows = NSStackView()
+    rows.orientation = .vertical
+    rows.alignment = .leading
+    rows.spacing = 8
+    rows.translatesAutoresizingMaskIntoConstraints = false
+
+    let row1 = NSStackView()
+    row1.orientation = .horizontal
+    row1.spacing = 10
+    row1.addArrangedSubview(button("Explain in \(state.surfaceName)", #selector(panelOpen),
+      "Opens \(state.surfaceName) in the team's folder and asks it to lay out your options. It will not decide or reply for you."))
     if item.isDecision {
-      let done = NSButton(title: "Mark done", target: self, action: #selector(panelDone))
-      done.bezelStyle = .rounded
-      done.toolTip = "Answer it as handled, so it stops asking"
-      row.addArrangedSubview(done)
+      row1.addArrangedSubview(button("Mark done", #selector(panelDone), "Tells the agent you settled this in person, so it stops asking."))
     }
-    let thread = NSButton(title: "Show the thread", target: self, action: #selector(panelThread))
-    thread.bezelStyle = .rounded
-    row.addArrangedSubview(thread)
-    let rawToggle = NSButton(title: "Show it as sent", target: self, action: #selector(panelToggleRaw))
-    rawToggle.bezelStyle = .rounded
-    rawToggle.toolTip = "The act exactly as your teammate's agent wrote it"
+    row1.addArrangedSubview(button("Show the thread", #selector(panelThread), "Every act in this goal, in Terminal, from the team's folder."))
+    rows.addArrangedSubview(row1)
+
+    let row2 = NSStackView()
+    row2.orientation = .horizontal
+    row2.spacing = 10
+    row2.addArrangedSubview(button("Copy the question", #selector(panelCopy), "Copies the question and its context as text, for an email or a message."))
+    let rawToggle = button("Original text", #selector(panelToggleRaw), "Exactly as the agent wrote it, before Pantheon laid it out.")
     rawToggle.isHidden = true
-    panelRawToggle = rawToggle
-    row.addArrangedSubview(rawToggle)
-    let close = NSButton(title: "Close", target: self, action: #selector(panelClose))
-    close.bezelStyle = .rounded
+    panelRawButton = rawToggle
+    row2.addArrangedSubview(rawToggle)
+    let spacer = NSView()
+    spacer.translatesAutoresizingMaskIntoConstraints = false
+    spacer.setContentHuggingPriority(.defaultLow, for: .horizontal)
+    row2.addArrangedSubview(spacer)
+    let close = button("Close", #selector(panelClose), "Nothing changes.")
     close.keyEquivalent = "\u{1b}"
-    row.addArrangedSubview(close)
-    stack.addArrangedSubview(row)
+    row2.addArrangedSubview(close)
+    row2.widthAnchor.constraint(equalToConstant: inner).isActive = true
+    rows.addArrangedSubview(row2)
+
+    panelButtons = rows
+    stack.addArrangedSubview(rows)
 
     NSLayoutConstraint.activate([
       stack.leadingAnchor.constraint(equalTo: effect.leadingAnchor, constant: 26),
@@ -1080,7 +1212,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
       stack.topAnchor.constraint(equalTo: effect.topAnchor, constant: 36),
       stack.bottomAnchor.constraint(equalTo: effect.bottomAnchor, constant: -22),
       scroll.widthAnchor.constraint(equalTo: stack.widthAnchor),
-      row.widthAnchor.constraint(lessThanOrEqualTo: stack.widthAnchor),
+      rows.widthAnchor.constraint(lessThanOrEqualTo: stack.widthAnchor),
     ])
     let bh = scroll.heightAnchor.constraint(equalToConstant: bodyHeight(plain(item.detail), width: inner))
     bh.isActive = true
@@ -1104,6 +1236,7 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
   private func setStatus(_ text: String) {
     panelStatus?.stringValue = text
     panelStatus?.isHidden = text.isEmpty
+    panelStatusRow?.isHidden = text.isEmpty && (panelRetract?.isHidden ?? true)
   }
 
   @objc private func panelClose() {
@@ -1114,14 +1247,120 @@ final class AppDelegate: NSObject, NSApplicationDelegate, NSMenuDelegate {
     panelItem = nil
     panelHeadline = nil
     panelRendered = nil
-    panelRawToggle = nil
+    panelRawButton = nil
+    panelButtons = nil
+    panelReplyRow = nil
+    panelCancel = nil
+    panelReplyButton = nil
+    panelStatusRow = nil
+    panelReply = nil
+    panelReplyKind = nil
+    panelSendButton = nil
+    panelRetract = nil
+    panelLastSent = ""
     panelRaw = ""
     panelShowingRaw = false
   }
+  /// The question as text — what a person pasting into an email or a message
+  /// wants. The agent prompt still rides with Explain, which copies it as a
+  /// fallback when the agent cannot be opened.
   @objc private func panelCopy() {
     guard let item = panelItem else { return }
-    copyPrompt(item)
-    setStatus("Copied. Paste it into your agent.")
+    let pb = NSPasteboard.general
+    pb.clearContents()
+    pb.setString(item.headline + "\n\n" + plain(panelRaw.isEmpty ? item.detail : panelRaw).string, forType: .string)
+    setStatus("Copied the question.")
+  }
+
+  /// Reply mode: the buttons step aside and only the box remains, with Cancel to
+  /// bring them back. The body gives up a little height so the panel stays put.
+  @objc private func panelReplyManually() {
+    panelButtons?.isHidden = true
+    panelReplyButton?.isHidden = true
+    panelReplyButton?.keyEquivalent = ""
+    panelSendButton?.keyEquivalent = "\r"
+    panelReplyRow?.isHidden = false
+    if let c = panelBodyHeight, c.constant > 140 { c.constant -= 20 }
+    panelRetract?.isHidden = true
+    setStatus("")
+    if let tv = panelReply { detailPanel?.makeFirstResponder(tv) }
+  }
+  @objc private func panelCancelReply() { exitReplyMode() }
+  private func exitReplyMode() {
+    panelReplyRow?.isHidden = true
+    panelSendButton?.keyEquivalent = ""
+    panelButtons?.isHidden = false
+    panelReplyButton?.isHidden = false
+    panelReplyButton?.keyEquivalent = "\r"
+    if let c = panelBodyHeight, c.constant > 0 { c.constant += 20 }
+  }
+
+  /// What a person may send on this item. Answer only on their own decision:
+  /// anyone else's answer would land as an act and settle nothing.
+  private func replyKinds(_ item: Item) -> [String] {
+    item.isDecision ? ["Answer", "Note", "Ask back"] : ["Note", "Ask back"]
+  }
+  private func kindCode(_ title: String?) -> String {
+    switch title { case "Answer": return "ANSWER"; case "Ask back": return "ASK"; default: return "NOTE" }
+  }
+
+  /// 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?) {
+    guard let item = panelItem, let tv = panelReply else { return }
+    let text = tv.string.trimmingCharacters(in: .whitespacesAndNewlines)
+    if text.isEmpty { setStatus("Type your reply first."); return }
+    let kind = kindCode(panelReplyKind?.titleOfSelectedItem)
+    var payload: [String: Any] = ["action": "reply", "kind": kind, "body": text, "goal": item.goal, "space": item.space]
+    if item.isDecision { payload["decision"] = item.id }
+    if !item.ref.isEmpty { payload["act"] = item.ref }
+    guard writeAction(payload) else { setStatus("Could not write the action. Use Show the thread instead."); return }
+    setStatus("Sending…")
+    panelSendButton?.isEnabled = false
+    DispatchQueue.global().async {
+      let r = run(pantheonBin, ["explain", "--queued"], timeout: 25)
+      DispatchQueue.main.async {
+        self.panelSendButton?.isEnabled = true
+        let out = (r?.out ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+        if r?.code == 0, let idTok = out.split(separator: " ").first(where: { $0.hasPrefix("id=") }) {
+          self.panelLastSent = String(idTok.dropFirst(3))
+          tv.string = ""
+          let what = kind == "ANSWER" ? "Answered — it is no longer waiting on you." : kind == "ASK" ? "Asked — the agent that raised this owes you a reply." : "Noted — it stays waiting."
+          self.setStatus(what)
+          self.exitReplyMode()
+          self.panelRetract?.isHidden = false
+          DispatchQueue.main.asyncAfter(deadline: .now() + 60) { [weak self] in self?.panelRetract?.isHidden = true }
+          self.refresh()
+        } else {
+          let why = out.hasPrefix("not sent: ") ? String(out.dropFirst("not sent: ".count)) : "the relay could not be reached"
+          self.setStatus("Not sent — \(why) Your words are still in the box.")
+        }
+      }
+    }
+  }
+
+  /// The undo. RETRACT withdraws the act; the record keeps it as retracted.
+  @objc private func panelRetractAction() {
+    guard !panelLastSent.isEmpty else { return }
+    let id = panelLastSent
+    guard writeAction(["action": "retract", "act": id]) else { setStatus("Could not write the action."); return }
+    setStatus("Retracting…")
+    panelRetract?.isEnabled = false
+    DispatchQueue.global().async {
+      let r = run(pantheonBin, ["explain", "--queued"], timeout: 25)
+      DispatchQueue.main.async {
+        self.panelRetract?.isEnabled = true
+        if r?.code == 0 {
+          self.panelLastSent = ""
+          self.panelRetract?.isHidden = true
+          self.setStatus("Retracted.")
+          self.refresh()
+        } else {
+          let out = (r?.out ?? "").trimmingCharacters(in: .whitespacesAndNewlines)
+          self.setStatus("Could not retract — \(out.hasPrefix("not sent: ") ? String(out.dropFirst("not sent: ".count)) : "the relay could not be reached")")
+        }
+      }
+    }
   }
   @objc private func panelOpen() {
     guard let item = panelItem else { return }
@@ -1328,3 +1567,12 @@ let app = NSApplication.shared
 let delegate = AppDelegate()
 app.delegate = delegate
 app.run()
+
+extension AppDelegate: NSTextViewDelegate {
+  func textView(_ textView: NSTextView, doCommandBy commandSelector: Selector) -> Bool {
+    guard textView === panelReply, commandSelector == #selector(NSResponder.insertNewline(_:)) else { return false }
+    if NSApp.currentEvent?.modifierFlags.contains(.shift) == true { return false }
+    panelSend(nil)
+    return true
+  }
+}

package/package.json

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