From cb04302e7b47e0c25f8bf3aa3f32586ed05bc9ab Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Wed, 17 Dec 2025 19:45:47 -0800 Subject: [PATCH] Revert "fix: use 'bd message' instead of 'bd mail' for agent messaging" This reverts commit 56d30e189657cea3629b57477035508ae5100ca3. --- internal/mail/mailbox.go | 8 ++++---- internal/mail/router.go | 14 ++++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/mail/mailbox.go b/internal/mail/mailbox.go index d9554824..14dd7b77 100644 --- a/internal/mail/mailbox.go +++ b/internal/mail/mailbox.go @@ -72,8 +72,8 @@ func (m *Mailbox) List() ([]*Message, error) { } func (m *Mailbox) listBeads() ([]*Message, error) { - // bd message inbox --json - cmd := exec.Command("bd", "message", "inbox", "--json") + // bd mail inbox --json + cmd := exec.Command("bd", "mail", "inbox", "--json") cmd.Dir = m.workDir cmd.Env = append(cmd.Environ(), "BD_IDENTITY="+m.identity) @@ -173,7 +173,7 @@ func (m *Mailbox) Get(id string) (*Message, error) { } func (m *Mailbox) getBeads(id string) (*Message, error) { - cmd := exec.Command("bd", "message", "read", id, "--json") + cmd := exec.Command("bd", "mail", "read", id, "--json") cmd.Dir = m.workDir var stdout, stderr bytes.Buffer @@ -221,7 +221,7 @@ func (m *Mailbox) MarkRead(id string) error { } func (m *Mailbox) markReadBeads(id string) error { - cmd := exec.Command("bd", "message", "ack", id) + cmd := exec.Command("bd", "mail", "ack", id) cmd.Dir = m.workDir var stderr bytes.Buffer diff --git a/internal/mail/router.go b/internal/mail/router.go index a6c17e3c..08268ada 100644 --- a/internal/mail/router.go +++ b/internal/mail/router.go @@ -25,20 +25,22 @@ func NewRouter(workDir string) *Router { } } -// Send delivers a message via beads message. +// Send delivers a message via beads mail. 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 -s - // Note: sender identity comes from BEADS_AGENT_NAME env var - args := []string{"message", "send", toIdentity, msg.Body, + // Build command: bd mail send -s -m --identity + args := []string{"mail", "send", toIdentity, "-s", msg.Subject, + "-m", msg.Body, + "--identity", fromIdentity, } - // Add importance flag for high priority + // Add --urgent flag for high priority if msg.Priority == PriorityHigh { - args = append(args, "--importance", "urgent") + args = append(args, "--urgent") } cmd := exec.Command("bd", args...)