johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: migrate gt mail to use bd v0.32.0 issue commands

Browse Source 
bd v0.32.0 removed mail commands. Updated gt mail to use:
- bd list --type message (inbox)
- bd show (read)
- bd close (delete/ack)
- bd create --type message (send)

Sender/thread/reply-to now stored in labels and extracted on read.
Added --pinned flag (blocked by bd pin bug gt-zr0a).

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-12-20 20:11:09 -08:00
parent b3ef048c28
commit 57917521e6
5 changed files with 96 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
internal/mail/mailbox.go
View File

@@ -72,10 +72,13 @@ func (m *Mailbox) List() ([]*Message, error) {
}
func (m *Mailbox) listBeads() ([]*Message, error) {
// bd mail inbox --json
cmd := exec.Command("bd", "mail", "inbox", "--json")
// bd list --type message --assignee <identity> --status open --json
cmd := exec.Command("bd", "list",
"--type", "message",
"--assignee", m.identity,
"--status", "open",
"--json")
cmd.Dir = m.workDir
cmd.Env = append(cmd.Environ(), "BD_IDENTITY="+m.identity)
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
@@ -205,7 +208,8 @@ func (m *Mailbox) Get(id string) (*Message, error) {
}
func (m *Mailbox) getBeads(id string) (*Message, error) {
cmd := exec.Command("bd", "mail", "read", id, "--json")
// bd show <id> --json
cmd := exec.Command("bd", "show", id, "--json")
cmd.Dir = m.workDir
var stdout, stderr bytes.Buffer
@@ -223,12 +227,16 @@ func (m *Mailbox) getBeads(id string) (*Message, error) {
return nil, err
}
var bm BeadsMessage
if err := json.Unmarshal(stdout.Bytes(), &bm); err != nil {
// bd show returns an array with one element
var beadsMsgs []BeadsMessage
if err := json.Unmarshal(stdout.Bytes(), &beadsMsgs); err != nil {
return nil, err
}
if len(beadsMsgs) == 0 {
return nil, ErrMessageNotFound
}
return bm.ToMessage(), nil
return beadsMsgs[0].ToMessage(), nil
}
func (m *Mailbox) getLegacy(id string) (*Message, error) {
@@ -253,7 +261,8 @@ func (m *Mailbox) MarkRead(id string) error {
}
func (m *Mailbox) markReadBeads(id string) error {
cmd := exec.Command("bd", "mail", "ack", id)
// bd close <id> - close the message issue to mark as read/acknowledged
cmd := exec.Command("bd", "close", id, "-r", "acknowledged")
cmd.Dir = m.workDir
var stderr bytes.Buffer
@@ -421,10 +430,13 @@ func (m *Mailbox) ListByThread(threadID string) ([]*Message, error) {
}
func (m *Mailbox) listByThreadBeads(threadID string) ([]*Message, error) {
// bd message thread <thread-id> --json
cmd := exec.Command("bd", "message", "thread", threadID, "--json")
// bd list --type message --label thread:<thread-id> --json
// Threads are stored as labels on message issues
cmd := exec.Command("bd", "list",
"--type", "message",
"--label", "thread:"+threadID,
"--json")
cmd.Dir = m.workDir
cmd.Env = append(cmd.Environ(), "BD_IDENTITY="+m.identity)
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout

55
internal/mail/router.go
View File

@@ -25,42 +25,49 @@ func NewRouter(workDir string) *Router {
}
}
// Send delivers a message via beads message.
// Send delivers a message via beads create.
func (r *Router) Send(msg *Message) error {
// Convert addresses to beads identities
toIdentity := addressToIdentity(msg.To)
fromIdentity := addressToIdentity(msg.From)
// Build command: bd mail send <recipient> -s <subject> -m <body>
args := []string{"mail", "send", toIdentity,
"-s", msg.Subject,
"-m", msg.Body,
// Build labels for sender and thread
labels := []string{"from:" + fromIdentity}
if msg.ThreadID != "" {
labels = append(labels, "thread:"+msg.ThreadID)
}
if msg.ReplyTo != "" {
labels = append(labels, "reply-to:"+msg.ReplyTo)
}
if msg.Type != "" && msg.Type != TypeNotification {
labels = append(labels, "msg-type:"+string(msg.Type))
}
// Build command: bd create --type message --assignee <to> --title <subject> -d <body>
args := []string{"create",
"--type", "message",
"--assignee", toIdentity,
"--title", msg.Subject,
"-d", msg.Body,
}
// Add priority flag
beadsPriority := PriorityToBeads(msg.Priority)
args = append(args, "--priority", fmt.Sprintf("%d", beadsPriority))
// Add message type if set
if msg.Type != "" && msg.Type != TypeNotification {
args = append(args, "--type", string(msg.Type))
// Add labels
if len(labels) > 0 {
args = append(args, "--labels", strings.Join(labels, ","))
}
// Add thread ID if set
if msg.ThreadID != "" {
args = append(args, "--thread-id", msg.ThreadID)
}
// Add reply-to if set
if msg.ReplyTo != "" {
args = append(args, "--reply-to", msg.ReplyTo)
}
// Add --silent to get just the issue ID
args = append(args, "--silent")
cmd := exec.Command("bd", args...)
cmd.Env = append(cmd.Environ(), "BEADS_AGENT_NAME="+fromIdentity)
cmd.Dir = r.workDir
var stderr bytes.Buffer
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
if err := cmd.Run(); err != nil {
@@ -71,6 +78,16 @@ func (r *Router) Send(msg *Message) error {
return fmt.Errorf("sending message: %w", err)
}
// Get the created issue ID
issueID := strings.TrimSpace(stdout.String())
// Pin the message if requested
if msg.Pinned && issueID != "" {
pinCmd := exec.Command("bd", "pin", issueID)
pinCmd.Dir = r.workDir
_ = pinCmd.Run() // Best effort - don't fail if pin fails
}
// Notify recipient if they have an active session
_ = r.notifyRecipient(msg)

36
internal/mail/types.go
View File

@@ -4,6 +4,7 @@ package mail
import (
"crypto/rand"
"encoding/hex"
"strings"
"time"
)
@@ -145,20 +146,18 @@ func generateThreadID() string {
return "thread-" + hex.EncodeToString(b)
}
// BeadsMessage represents a message as returned by bd mail commands.
// BeadsMessage represents a message as returned by bd list/show commands.
// Sender, thread, reply-to, and message type are stored in labels.
type BeadsMessage struct {
ID string `json:"id"`
Title string `json:"title"` // Subject
Description string `json:"description"` // Body
Sender string `json:"sender"` // From identity
Assignee string `json:"assignee"` // To identity
Priority int `json:"priority"` // 0=urgent, 1=high, 2=normal, 3=low
Status string `json:"status"` // open=unread, closed=read
Pinned bool `json:"pinned"` // Persistent context marker
CreatedAt time.Time `json:"created_at"`
Type string `json:"type,omitempty"` // Message type
ThreadID string `json:"thread_id,omitempty"` // Thread identifier
ReplyTo string `json:"reply_to,omitempty"` // Original message ID
Labels []string `json:"labels"` // Contains from:, thread:, reply-to:, msg-type:
}
// ToMessage converts a BeadsMessage to a GGT Message.
@@ -176,16 +175,29 @@ func (bm *BeadsMessage) ToMessage() *Message {
priority = PriorityNormal
}
// Convert message type, default to notification
// Extract sender, thread, reply-to, and type from labels
var sender, threadID, replyTo string
msgType := TypeNotification
switch MessageType(bm.Type) {
case TypeTask, TypeScavenge, TypeReply:
msgType = MessageType(bm.Type)
for _, label := range bm.Labels {
switch {
case strings.HasPrefix(label, "from:"):
sender = strings.TrimPrefix(label, "from:")
case strings.HasPrefix(label, "thread:"):
threadID = strings.TrimPrefix(label, "thread:")
case strings.HasPrefix(label, "reply-to:"):
replyTo = strings.TrimPrefix(label, "reply-to:")
case strings.HasPrefix(label, "msg-type:"):
t := strings.TrimPrefix(label, "msg-type:")
switch MessageType(t) {
case TypeTask, TypeScavenge, TypeReply:
msgType = MessageType(t)
}
}
}
return &Message{
ID: bm.ID,
From: identityToAddress(bm.Sender),
From: identityToAddress(sender),
To: identityToAddress(bm.Assignee),
Subject: bm.Title,
Body: bm.Description,
@@ -194,8 +206,8 @@ func (bm *BeadsMessage) ToMessage() *Message {
Pinned: bm.Pinned,
Priority: priority,
Type: msgType,
ThreadID: bm.ThreadID,
ReplyTo: bm.ReplyTo,
ThreadID: threadID,
ReplyTo: replyTo,
}
}