Detect and clean stale POLECAT_DONE messages (#913)
* fix(witness): detect and ignore stale POLECAT_DONE messages Add timestamp validation to prevent witness from nuking newly spawned polecat sessions when processing stale POLECAT_DONE messages from previous sessions. - Add isStalePolecatDone() to compare message timestamp vs session created time - If message timestamp < session created time, message is stale and ignored - Add unit tests for timestamp parsing and stale detection logic Fixes #909 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(mail): add --stale flag to gt mail archive Add ability to archive stale messages (sent before current session started). This prevents old messages from cycling forever in patrol inbox. Changes: - Add --stale and --dry-run flags to gt mail archive - Move stale detection helpers to internal/session/stale.go for reuse - Add ParseAddress to parse mail addresses into AgentIdentity - Add SessionCreatedAt to get tmux session start time Usage: gt mail archive --stale # Archive all stale messages gt mail archive --stale --dry-run # Preview what would be archived Co-Authored-By: GPT-5.2 Codex <noreply@openai.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com> Co-authored-by: GPT-5.2 Codex <noreply@openai.com>
This commit is contained in:
Artem Bambalov
GitHub
@@ -42,6 +42,10 @@ var (
|
||||
|
||||
// Clear flags
|
||||
mailClearAll bool
|
||||
|
||||
// Archive flags
|
||||
mailArchiveStale bool
|
||||
mailArchiveDryRun bool
|
||||
)
|
||||
|
||||
var mailCmd = &cobra.Command{
|
||||
@@ -196,16 +200,22 @@ Examples:
|
||||
}
|
||||
|
||||
var mailArchiveCmd = &cobra.Command{
|
||||
Use: "archive <message-id> [message-id...]",
|
||||
Use: "archive [message-id...]",
|
||||
Short: "Archive messages",
|
||||
Long: `Archive one or more messages.
|
||||
|
||||
Removes the messages from your inbox by closing them in beads.
|
||||
|
||||
Use --stale to archive messages sent before your current session started.
|
||||
|
||||
Examples:
|
||||
gt mail archive hq-abc123
|
||||
gt mail archive hq-abc123 hq-def456 hq-ghi789`,
|
||||
Args: cobra.MinimumNArgs(1),
|
||||
gt mail archive hq-abc123
|
||||
gt mail archive hq-abc123 hq-def456 hq-ghi789
|
||||
gt mail archive --stale
|
||||
gt mail archive --stale --dry-run`,
|
||||
Args: func(cmd *cobra.Command, args []string) error {
|
||||
return nil
|
||||
},
|
||||
RunE: runMailArchive,
|
||||
}
|
||||
|
||||
@@ -487,6 +497,10 @@ func init() {
|
||||
// Clear flags
|
||||
mailClearCmd.Flags().BoolVar(&mailClearAll, "all", false, "Clear all messages (default behavior)")
|
||||
|
||||
// Archive flags
|
||||
mailArchiveCmd.Flags().BoolVar(&mailArchiveStale, "stale", false, "Archive messages sent before session start")
|
||||
mailArchiveCmd.Flags().BoolVarP(&mailArchiveDryRun, "dry-run", "n", false, "Show what would be archived without archiving")
|
||||
|
||||
// Add subcommands
|
||||
mailCmd.AddCommand(mailSendCmd)
|
||||
mailCmd.AddCommand(mailInboxCmd)
|
||||
|
||||
25
internal/cmd/mail_archive_test.go
Normal file
25
internal/cmd/mail_archive_test.go
Normal file
@@ -0,0 +1,25 @@
|
||||
package cmd
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/gastown/internal/mail"
|
||||
)
|
||||
|
||||
func TestStaleMessagesForSession(t *testing.T) {
|
||||
sessionStart := time.Date(2026, 1, 24, 2, 0, 0, 0, time.UTC)
|
||||
messages := []*mail.Message{
|
||||
{ID: "msg-1", Subject: "Older", Timestamp: sessionStart.Add(-2 * time.Minute)},
|
||||
{ID: "msg-2", Subject: "Newer", Timestamp: sessionStart.Add(2 * time.Minute)},
|
||||
{ID: "msg-3", Subject: "Equal", Timestamp: sessionStart},
|
||||
}
|
||||
|
||||
stale := staleMessagesForSession(messages, sessionStart)
|
||||
if len(stale) != 1 {
|
||||
t.Fatalf("expected 1 stale message, got %d", len(stale))
|
||||
}
|
||||
if stale[0].Message.ID != "msg-1" {
|
||||
t.Fatalf("expected msg-1 stale, got %s", stale[0].Message.ID)
|
||||
}
|
||||
}
|
||||
@@ -7,9 +7,11 @@ import (
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/steveyegge/gastown/internal/mail"
|
||||
"github.com/steveyegge/gastown/internal/session"
|
||||
"github.com/steveyegge/gastown/internal/style"
|
||||
)
|
||||
|
||||
@@ -289,6 +291,23 @@ func runMailArchive(cmd *cobra.Command, args []string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if mailArchiveStale {
|
||||
if len(args) > 0 {
|
||||
return errors.New("--stale cannot be combined with message IDs")
|
||||
}
|
||||
return runMailArchiveStale(mailbox, address)
|
||||
}
|
||||
if len(args) == 0 {
|
||||
return errors.New("message ID required unless using --stale")
|
||||
}
|
||||
if mailArchiveDryRun {
|
||||
fmt.Printf("%s Would archive %d message(s)\n", style.Dim.Render("(dry-run)"), len(args))
|
||||
for _, msgID := range args {
|
||||
fmt.Printf(" %s\n", style.Dim.Render(msgID))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Archive all specified messages
|
||||
archived := 0
|
||||
var errors []string
|
||||
@@ -318,6 +337,87 @@ func runMailArchive(cmd *cobra.Command, args []string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
type staleMessage struct {
|
||||
Message *mail.Message
|
||||
Reason string
|
||||
}
|
||||
|
||||
func runMailArchiveStale(mailbox *mail.Mailbox, address string) error {
|
||||
identity, err := session.ParseAddress(address)
|
||||
if err != nil {
|
||||
return fmt.Errorf("determining session for %s: %w", address, err)
|
||||
}
|
||||
|
||||
sessionName := identity.SessionName()
|
||||
if sessionName == "" {
|
||||
return fmt.Errorf("could not determine session name for %s", address)
|
||||
}
|
||||
|
||||
sessionStart, err := session.SessionCreatedAt(sessionName)
|
||||
if err != nil {
|
||||
return fmt.Errorf("getting session start time for %s: %w", sessionName, err)
|
||||
}
|
||||
|
||||
messages, err := mailbox.List()
|
||||
if err != nil {
|
||||
return fmt.Errorf("listing messages: %w", err)
|
||||
}
|
||||
|
||||
staleMessages := staleMessagesForSession(messages, sessionStart)
|
||||
if mailArchiveDryRun {
|
||||
if len(staleMessages) == 0 {
|
||||
fmt.Printf("%s No stale messages found\n", style.Success.Render("✓"))
|
||||
return nil
|
||||
}
|
||||
fmt.Printf("%s Would archive %d stale message(s):\n", style.Dim.Render("(dry-run)"), len(staleMessages))
|
||||
for _, stale := range staleMessages {
|
||||
fmt.Printf(" %s %s\n", style.Dim.Render(stale.Message.ID), stale.Message.Subject)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
if len(staleMessages) == 0 {
|
||||
fmt.Printf("%s No stale messages to archive\n", style.Success.Render("✓"))
|
||||
return nil
|
||||
}
|
||||
|
||||
archived := 0
|
||||
var errors []string
|
||||
for _, stale := range staleMessages {
|
||||
if err := mailbox.Delete(stale.Message.ID); err != nil {
|
||||
errors = append(errors, fmt.Sprintf("%s: %v", stale.Message.ID, err))
|
||||
} else {
|
||||
archived++
|
||||
}
|
||||
}
|
||||
|
||||
if len(errors) > 0 {
|
||||
fmt.Printf("%s Archived %d/%d stale messages\n", style.Bold.Render("⚠"), archived, len(staleMessages))
|
||||
for _, e := range errors {
|
||||
fmt.Printf(" Error: %s\n", e)
|
||||
}
|
||||
return fmt.Errorf("failed to archive %d stale messages", len(errors))
|
||||
}
|
||||
|
||||
if archived == 1 {
|
||||
fmt.Printf("%s Stale message archived\n", style.Bold.Render("✓"))
|
||||
} else {
|
||||
fmt.Printf("%s Archived %d stale messages\n", style.Bold.Render("✓"), archived)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func staleMessagesForSession(messages []*mail.Message, sessionStart time.Time) []staleMessage {
|
||||
var staleMessages []staleMessage
|
||||
for _, msg := range messages {
|
||||
stale, reason := session.StaleReasonForTimes(msg.Timestamp, sessionStart)
|
||||
if stale {
|
||||
staleMessages = append(staleMessages, staleMessage{Message: msg, Reason: reason})
|
||||
}
|
||||
}
|
||||
return staleMessages
|
||||
}
|
||||
|
||||
func runMailMarkRead(cmd *cobra.Command, args []string) error {
|
||||
// Determine which inbox
|
||||
address := detectSender()
|
||||
|
||||
Reference in New Issue
Block a user