diff --git a/cmd/bd/ready.go b/cmd/bd/ready.go index 90307206a..53625a293 100644 --- a/cmd/bd/ready.go +++ b/cmd/bd/ready.go @@ -55,6 +55,7 @@ This is useful for agents executing molecules to see which steps can run next.`, molTypeStr, _ := cmd.Flags().GetString("mol-type") prettyFormat, _ := cmd.Flags().GetBool("pretty") includeDeferred, _ := cmd.Flags().GetBool("include-deferred") + includeEphemeral, _ := cmd.Flags().GetBool("include-ephemeral") rigOverride, _ := cmd.Flags().GetString("rig") var molType *types.MolType if molTypeStr != "" { @@ -86,7 +87,8 @@ This is useful for agents executing molecules to see which steps can run next.`, SortPolicy: types.SortPolicy(sortPolicy), Labels: labels, LabelsAny: labelsAny, - IncludeDeferred: includeDeferred, // GH#820: respect --include-deferred flag + IncludeDeferred: includeDeferred, // GH#820: respect --include-deferred flag + IncludeEphemeral: includeEphemeral, // bd-i5k5x: allow ephemeral issues (e.g., merge-requests) } // Use Changed() to properly handle P0 (priority=0) if cmd.Flags().Changed("priority") { @@ -378,6 +380,7 @@ func init() { readyCmd.Flags().String("mol-type", "", "Filter by molecule type: swarm, patrol, or work") readyCmd.Flags().Bool("pretty", false, "Display issues in a tree format with status/priority symbols") readyCmd.Flags().Bool("include-deferred", false, "Include issues with future defer_until timestamps") + readyCmd.Flags().Bool("include-ephemeral", false, "Include ephemeral issues (wisps) in results") readyCmd.Flags().Bool("gated", false, "Find molecules ready for gate-resume dispatch") readyCmd.Flags().String("rig", "", "Query a different rig's database (e.g., --rig gastown, --rig gt-, --rig gt)") rootCmd.AddCommand(readyCmd) diff --git a/internal/storage/dolt/dolt_test.go b/internal/storage/dolt/dolt_test.go index d1f372da9..9d86b451f 100644 --- a/internal/storage/dolt/dolt_test.go +++ b/internal/storage/dolt/dolt_test.go @@ -1417,6 +1417,45 @@ func TestDoltStoreGetReadyWork(t *testing.T) { if !foundReady { t.Error("expected ready issue to be in ready work") } + + // Test ephemeral filtering: create an ephemeral issue + ephemeral := &types.Issue{ + ID: "test-ephemeral", + Title: "Ephemeral Task", + Status: types.StatusOpen, + Priority: 1, + IssueType: types.TypeTask, + Ephemeral: true, + } + if err := store.CreateIssue(ctx, ephemeral, "tester"); err != nil { + t.Fatalf("failed to create ephemeral issue: %v", err) + } + + // Default filter should exclude ephemeral + readyDefault, err := store.GetReadyWork(ctx, types.WorkFilter{}) + if err != nil { + t.Fatalf("failed to get ready work (default): %v", err) + } + for _, issue := range readyDefault { + if issue.ID == ephemeral.ID { + t.Error("expected ephemeral issue to be excluded by default") + } + } + + // IncludeEphemeral should include it + readyWithEph, err := store.GetReadyWork(ctx, types.WorkFilter{IncludeEphemeral: true}) + if err != nil { + t.Fatalf("failed to get ready work (include-ephemeral): %v", err) + } + foundEphemeral := false + for _, issue := range readyWithEph { + if issue.ID == ephemeral.ID { + foundEphemeral = true + } + } + if !foundEphemeral { + t.Error("expected ephemeral issue to be included when IncludeEphemeral=true") + } } // TestCloseWithTimeout tests the close timeout helper function diff --git a/internal/storage/dolt/queries.go b/internal/storage/dolt/queries.go index b8d5d7c70..9f4d63a26 100644 --- a/internal/storage/dolt/queries.go +++ b/internal/storage/dolt/queries.go @@ -290,8 +290,10 @@ func (s *DoltStore) GetReadyWork(ctx context.Context, filter types.WorkFilter) ( } whereClauses := []string{ statusClause, - "(ephemeral = 0 OR ephemeral IS NULL)", // Exclude wisps by ephemeral flag - "(pinned = 0 OR pinned IS NULL)", // Exclude pinned issues (context markers, not work) + "(pinned = 0 OR pinned IS NULL)", // Exclude pinned issues (context markers, not work) + } + if !filter.IncludeEphemeral { + whereClauses = append(whereClauses, "(ephemeral = 0 OR ephemeral IS NULL)") } args := []interface{}{} if filter.Status != "" { diff --git a/internal/types/types.go b/internal/types/types.go index 9e22ee061..19f458df5 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1012,6 +1012,11 @@ type WorkFilter struct { // Time-based deferral filtering (GH#820) IncludeDeferred bool // If true, include issues with future defer_until timestamps + // Ephemeral issue filtering + // By default, GetReadyWork excludes ephemeral issues (wisps). + // Set to true to include them (e.g., for merge-request processing). + IncludeEphemeral bool + // Molecule step filtering // By default, GetReadyWork excludes mol/wisp steps (IDs containing -mol- or -wisp-) // Set to true for internal callers that need to see mol steps (e.g., findGateReadyMolecules)