04dd267492
- Add DisplayMessage/DisplayMessageDefault to tmux package for non-disruptive status line notifications - Change mail send to always notify recipients (not just high priority) - Use display-message instead of send-keys to avoid disrupting agent input - Support notifications for mayor, polecat, and refinery sessions Closes gt-7lt 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
111 lines
2.9 KiB
Go
111 lines
2.9 KiB
Go
package mail
|
|
|
|
import (
|
|
"bytes"
|
|
"errors"
|
|
"fmt"
|
|
"os/exec"
|
|
"strings"
|
|
|
|
"github.com/steveyegge/gastown/internal/tmux"
|
|
)
|
|
|
|
// Router handles message delivery via beads.
|
|
type Router struct {
|
|
workDir string // directory to run bd commands in
|
|
tmux *tmux.Tmux
|
|
}
|
|
|
|
// NewRouter creates a new mail router.
|
|
// workDir should be a directory containing a .beads database.
|
|
func NewRouter(workDir string) *Router {
|
|
return &Router{
|
|
workDir: workDir,
|
|
tmux: tmux.NewTmux(),
|
|
}
|
|
}
|
|
|
|
// Send delivers a message via beads message.
|
|
func (r *Router) Send(msg *Message) error {
|
|
// Convert addresses to beads identities
|
|
toIdentity := addressToIdentity(msg.To)
|
|
fromIdentity := addressToIdentity(msg.From)
|
|
|
|
// Build command: bd message send <recipient> <body> -s <subject>
|
|
args := []string{"message", "send", toIdentity, msg.Body,
|
|
"-s", msg.Subject,
|
|
}
|
|
|
|
// Add importance flag for high priority
|
|
if msg.Priority == PriorityHigh {
|
|
args = append(args, "--importance", "high")
|
|
}
|
|
|
|
cmd := exec.Command("bd", args...)
|
|
cmd.Env = append(cmd.Environ(), "BEADS_AGENT_NAME="+fromIdentity)
|
|
cmd.Dir = r.workDir
|
|
|
|
var stderr bytes.Buffer
|
|
cmd.Stderr = &stderr
|
|
|
|
if err := cmd.Run(); err != nil {
|
|
errMsg := strings.TrimSpace(stderr.String())
|
|
if errMsg != "" {
|
|
return errors.New(errMsg)
|
|
}
|
|
return fmt.Errorf("sending message: %w", err)
|
|
}
|
|
|
|
// Always notify recipient if they have an active session
|
|
r.notifyRecipient(msg)
|
|
|
|
return nil
|
|
}
|
|
|
|
// GetMailbox returns a Mailbox for the given address.
|
|
func (r *Router) GetMailbox(address string) (*Mailbox, error) {
|
|
return NewMailboxFromAddress(address, r.workDir), nil
|
|
}
|
|
|
|
// notifyRecipient sends a notification to a recipient's tmux session.
|
|
// Uses display-message for non-disruptive notification.
|
|
// Supports mayor/, rig/polecat, and rig/refinery addresses.
|
|
func (r *Router) notifyRecipient(msg *Message) error {
|
|
sessionID := addressToSessionID(msg.To)
|
|
if sessionID == "" {
|
|
return nil // Unable to determine session ID
|
|
}
|
|
|
|
// Check if session exists
|
|
hasSession, err := r.tmux.HasSession(sessionID)
|
|
if err != nil || !hasSession {
|
|
return nil // No active session, skip notification
|
|
}
|
|
|
|
// Display notification in status line (non-disruptive)
|
|
notification := fmt.Sprintf("[MAIL] From %s: %s", msg.From, msg.Subject)
|
|
return r.tmux.DisplayMessageDefault(sessionID, notification)
|
|
}
|
|
|
|
// addressToSessionID converts a mail address to a tmux session ID.
|
|
// Returns empty string if address format is not recognized.
|
|
func addressToSessionID(address string) string {
|
|
// Mayor address: "mayor/" or "mayor"
|
|
if strings.HasPrefix(address, "mayor") {
|
|
return "gt-mayor"
|
|
}
|
|
|
|
// Rig-based address: "rig/target"
|
|
parts := strings.SplitN(address, "/", 2)
|
|
if len(parts) != 2 || parts[1] == "" {
|
|
return ""
|
|
}
|
|
|
|
rig := parts[0]
|
|
target := parts[1]
|
|
|
|
// Polecat: gt-rig-polecat
|
|
// Refinery: gt-rig-refinery (if refinery has its own session)
|
|
return fmt.Sprintf("gt-%s-%s", rig, target)
|
|
}
|