Restore convoy add command and feed deduplication logic
Accidentally included staged reverts in previous commit. Restoring: - convoyAddCmd for 'gt convoy add' command - Event filtering/deduplication in feed model 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -107,6 +107,20 @@ Examples:
|
|||||||
RunE: runConvoyList,
|
RunE: runConvoyList,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var convoyAddCmd = &cobra.Command{
|
||||||
|
Use: "add <convoy-id> <issue-id> [issue-id...]",
|
||||||
|
Short: "Add issues to an existing convoy",
|
||||||
|
Long: `Add issues to an existing convoy.
|
||||||
|
|
||||||
|
If the convoy is closed, it will be automatically reopened.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
gt convoy add hq-cv-abc gt-new-issue
|
||||||
|
gt convoy add hq-cv-abc gt-issue1 gt-issue2 gt-issue3`,
|
||||||
|
Args: cobra.MinimumNArgs(2),
|
||||||
|
RunE: runConvoyAdd,
|
||||||
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
// Create flags
|
// Create flags
|
||||||
convoyCreateCmd.Flags().StringVar(&convoyMolecule, "molecule", "", "Associated molecule ID")
|
convoyCreateCmd.Flags().StringVar(&convoyMolecule, "molecule", "", "Associated molecule ID")
|
||||||
@@ -124,6 +138,7 @@ func init() {
|
|||||||
convoyCmd.AddCommand(convoyCreateCmd)
|
convoyCmd.AddCommand(convoyCreateCmd)
|
||||||
convoyCmd.AddCommand(convoyStatusCmd)
|
convoyCmd.AddCommand(convoyStatusCmd)
|
||||||
convoyCmd.AddCommand(convoyListCmd)
|
convoyCmd.AddCommand(convoyListCmd)
|
||||||
|
convoyCmd.AddCommand(convoyAddCmd)
|
||||||
|
|
||||||
rootCmd.AddCommand(convoyCmd)
|
rootCmd.AddCommand(convoyCmd)
|
||||||
}
|
}
|
||||||
@@ -222,6 +237,86 @@ func runConvoyCreate(cmd *cobra.Command, args []string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func runConvoyAdd(cmd *cobra.Command, args []string) error {
|
||||||
|
convoyID := args[0]
|
||||||
|
issuesToAdd := args[1:]
|
||||||
|
|
||||||
|
townBeads, err := getTownBeadsDir()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validate convoy exists and get its status
|
||||||
|
showArgs := []string{"show", convoyID, "--json"}
|
||||||
|
showCmd := exec.Command("bd", showArgs...)
|
||||||
|
showCmd.Dir = townBeads
|
||||||
|
var stdout bytes.Buffer
|
||||||
|
showCmd.Stdout = &stdout
|
||||||
|
|
||||||
|
if err := showCmd.Run(); err != nil {
|
||||||
|
return fmt.Errorf("convoy '%s' not found", convoyID)
|
||||||
|
}
|
||||||
|
|
||||||
|
var convoys []struct {
|
||||||
|
ID string `json:"id"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Status string `json:"status"`
|
||||||
|
Type string `json:"issue_type"`
|
||||||
|
}
|
||||||
|
if err := json.Unmarshal(stdout.Bytes(), &convoys); err != nil {
|
||||||
|
return fmt.Errorf("parsing convoy data: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(convoys) == 0 {
|
||||||
|
return fmt.Errorf("convoy '%s' not found", convoyID)
|
||||||
|
}
|
||||||
|
|
||||||
|
convoy := convoys[0]
|
||||||
|
|
||||||
|
// Verify it's actually a convoy type
|
||||||
|
if convoy.Type != "convoy" {
|
||||||
|
return fmt.Errorf("'%s' is not a convoy (type: %s)", convoyID, convoy.Type)
|
||||||
|
}
|
||||||
|
|
||||||
|
// If convoy is closed, reopen it
|
||||||
|
reopened := false
|
||||||
|
if convoy.Status == "closed" {
|
||||||
|
reopenArgs := []string{"update", convoyID, "--status=open"}
|
||||||
|
reopenCmd := exec.Command("bd", reopenArgs...)
|
||||||
|
reopenCmd.Dir = townBeads
|
||||||
|
if err := reopenCmd.Run(); err != nil {
|
||||||
|
return fmt.Errorf("couldn't reopen convoy: %w", err)
|
||||||
|
}
|
||||||
|
reopened = true
|
||||||
|
fmt.Printf("%s Reopened convoy %s\n", style.Bold.Render("↺"), convoyID)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add 'tracks' relations for each issue
|
||||||
|
addedCount := 0
|
||||||
|
for _, issueID := range issuesToAdd {
|
||||||
|
depArgs := []string{"dep", "add", convoyID, issueID, "--type=tracks"}
|
||||||
|
depCmd := exec.Command("bd", depArgs...)
|
||||||
|
depCmd.Dir = townBeads
|
||||||
|
|
||||||
|
if err := depCmd.Run(); err != nil {
|
||||||
|
style.PrintWarning("couldn't add %s: %v", issueID, err)
|
||||||
|
} else {
|
||||||
|
addedCount++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Output
|
||||||
|
if reopened {
|
||||||
|
fmt.Println()
|
||||||
|
}
|
||||||
|
fmt.Printf("%s Added %d issue(s) to convoy 🚚 %s\n", style.Bold.Render("✓"), addedCount, convoyID)
|
||||||
|
if addedCount > 0 {
|
||||||
|
fmt.Printf(" Issues: %s\n", strings.Join(issuesToAdd[:addedCount], ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func runConvoyStatus(cmd *cobra.Command, args []string) error {
|
func runConvoyStatus(cmd *cobra.Command, args []string) error {
|
||||||
townBeads, err := getTownBeadsDir()
|
townBeads, err := getTownBeadsDir()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -281,6 +281,11 @@ func (m *Model) addEvent(e Event) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Filter out events with empty bead IDs (malformed mutations)
|
||||||
|
if e.Type == "update" && e.Target == "" {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Filter out noisy agent session updates from the event feed.
|
// Filter out noisy agent session updates from the event feed.
|
||||||
// Agent session molecules (like gt-gastown-crew-joe) update frequently
|
// Agent session molecules (like gt-gastown-crew-joe) update frequently
|
||||||
// for status tracking. These updates are visible in the agent tree,
|
// for status tracking. These updates are visible in the agent tree,
|
||||||
@@ -293,6 +298,18 @@ func (m *Model) addEvent(e Event) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Deduplicate rapid updates to the same bead within 2 seconds.
|
||||||
|
// This prevents spam when multiple deps/labels are added to one issue.
|
||||||
|
if e.Type == "update" && e.Target != "" && len(m.events) > 0 {
|
||||||
|
lastEvent := m.events[len(m.events)-1]
|
||||||
|
if lastEvent.Type == "update" && lastEvent.Target == e.Target {
|
||||||
|
// Same bead updated within 2 seconds - skip duplicate
|
||||||
|
if e.Time.Sub(lastEvent.Time) < 2*time.Second {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add to event feed
|
// Add to event feed
|
||||||
m.events = append(m.events, e)
|
m.events = append(m.events, e)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user