* fix(ready): exclude molecule steps from bd ready by default (GH#1239) Add ID prefix constants (IDPrefixMol, IDPrefixWisp) to types.go as single source of truth. Update pour.go and wisp.go to use these constants. GetReadyWork now excludes issues with -mol- in their ID when no explicit type filter is specified. Users can still see mol steps with --type=task. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(ready): config-driven ID pattern exclusion (GH#1239) Add ready.exclude_id_patterns config for excluding IDs from bd ready. Default patterns: -mol-, -wisp- (molecule steps and wisps). Changes: - Add IncludeMolSteps to WorkFilter for internal callers - Update findGateReadyMolecules and getMoleculeCurrentStep to use it - Make exclusion patterns config-driven via ready.exclude_id_patterns - Remove hardcoded MolStepIDPattern() in favor of config - Add test for custom patterns (e.g., gastown's -role-) Usage: bd config set ready.exclude_id_patterns "-mol-,-wisp-,-role-" Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * docs: remove -role- example from ready.go comments Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * docs: remove GH#1239 references from code comments Issue references belong in commit messages, not code. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
287 lines
9.0 KiB
Go
287 lines
9.0 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/beads/internal/types"
|
|
"github.com/steveyegge/beads/internal/ui"
|
|
"github.com/steveyegge/beads/internal/utils"
|
|
)
|
|
|
|
// pourCmd is a top-level command for instantiating protos as persistent mols.
|
|
//
|
|
// In the molecular chemistry metaphor:
|
|
// - Proto (solid) -> pour -> Mol (liquid)
|
|
// - Pour creates persistent, auditable work in .beads/
|
|
var pourCmd = &cobra.Command{
|
|
Use: "pour <proto-id>",
|
|
Short: "Instantiate a proto as a persistent mol (solid -> liquid)",
|
|
Long: `Pour a proto into a persistent mol - like pouring molten metal into a mold.
|
|
|
|
This is the chemistry-inspired command for creating PERSISTENT work from templates.
|
|
The resulting mol lives in .beads/ (permanent storage) and is synced with git.
|
|
|
|
Phase transition: Proto (solid) -> pour -> Mol (liquid)
|
|
|
|
WHEN TO USE POUR vs WISP:
|
|
pour (liquid): Persistent work that needs audit trail
|
|
- Feature implementations spanning multiple sessions
|
|
- Work you may need to reference later
|
|
- Anything worth preserving in git history
|
|
|
|
wisp (vapor): Ephemeral work that auto-cleans up
|
|
- Release workflows (one-time execution)
|
|
- Patrol cycles (deacon, witness, refinery)
|
|
- Health checks and diagnostics
|
|
- Any operational workflow without audit value
|
|
|
|
TIP: Formulas can specify phase:"vapor" to recommend wisp usage.
|
|
If you pour a vapor-phase formula, you'll get a warning.
|
|
|
|
Examples:
|
|
bd mol pour mol-feature --var name=auth # Persistent feature work
|
|
bd mol pour mol-review --var pr=123 # Persistent code review`,
|
|
Args: cobra.ExactArgs(1),
|
|
Run: runPour,
|
|
}
|
|
|
|
func runPour(cmd *cobra.Command, args []string) {
|
|
CheckReadonly("pour")
|
|
|
|
ctx := rootCtx
|
|
|
|
// Pour requires direct store access for cloning
|
|
if store == nil {
|
|
if daemonClient != nil {
|
|
fmt.Fprintf(os.Stderr, "Error: pour requires direct database access\n")
|
|
fmt.Fprintf(os.Stderr, "Hint: use --no-daemon flag: bd --no-daemon pour %s ...\n", args[0])
|
|
} else {
|
|
fmt.Fprintf(os.Stderr, "Error: no database connection\n")
|
|
}
|
|
os.Exit(1)
|
|
}
|
|
|
|
dryRun, _ := cmd.Flags().GetBool("dry-run")
|
|
varFlags, _ := cmd.Flags().GetStringArray("var")
|
|
assignee, _ := cmd.Flags().GetString("assignee")
|
|
attachFlags, _ := cmd.Flags().GetStringSlice("attach")
|
|
attachType, _ := cmd.Flags().GetString("attach-type")
|
|
|
|
// Parse variables
|
|
vars := make(map[string]string)
|
|
for _, v := range varFlags {
|
|
parts := strings.SplitN(v, "=", 2)
|
|
if len(parts) != 2 {
|
|
fmt.Fprintf(os.Stderr, "Error: invalid variable format '%s', expected 'key=value'\n", v)
|
|
os.Exit(1)
|
|
}
|
|
vars[parts[0]] = parts[1]
|
|
}
|
|
|
|
// Try to load as formula first (ephemeral proto - gt-4v1eo)
|
|
// If that fails, fall back to loading from DB (legacy proto beads)
|
|
var subgraph *TemplateSubgraph
|
|
var protoID string
|
|
isFormula := false
|
|
|
|
// Try to cook formula inline (gt-4v1eo: ephemeral protos)
|
|
// This works for any valid formula name, not just "mol-" prefixed ones
|
|
// Pass vars for step condition filtering (bd-7zka.1)
|
|
sg, err := resolveAndCookFormulaWithVars(args[0], nil, vars)
|
|
if err == nil {
|
|
subgraph = sg
|
|
protoID = sg.Root.ID
|
|
isFormula = true
|
|
|
|
// Warn if formula recommends vapor phase (bd-mol cleanup)
|
|
if sg.Phase == "vapor" {
|
|
fmt.Fprintf(os.Stderr, "%s Formula %q recommends vapor phase (ephemeral)\n", ui.RenderWarn("⚠"), args[0])
|
|
fmt.Fprintf(os.Stderr, " Consider using: bd mol wisp %s", args[0])
|
|
for _, v := range varFlags {
|
|
fmt.Fprintf(os.Stderr, " --var %s", v)
|
|
}
|
|
fmt.Fprintf(os.Stderr, "\n")
|
|
fmt.Fprintf(os.Stderr, " Pour creates persistent issues that sync to git.\n")
|
|
fmt.Fprintf(os.Stderr, " Wisp creates ephemeral issues that auto-cleanup.\n\n")
|
|
}
|
|
}
|
|
|
|
if subgraph == nil {
|
|
// Try to load as existing proto bead (legacy path)
|
|
resolvedID, err := utils.ResolvePartialID(ctx, store, args[0])
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error: %s not found as formula or proto ID\n", args[0])
|
|
os.Exit(1)
|
|
}
|
|
protoID = resolvedID
|
|
|
|
// Verify it's a proto
|
|
protoIssue, err := store.GetIssue(ctx, protoID)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error loading proto %s: %v\n", protoID, err)
|
|
os.Exit(1)
|
|
}
|
|
if !isProto(protoIssue) {
|
|
fmt.Fprintf(os.Stderr, "Error: %s is not a proto (missing '%s' label)\n", protoID, MoleculeLabel)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// Load the proto subgraph from DB
|
|
subgraph, err = loadTemplateSubgraph(ctx, store, protoID)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error loading proto: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
}
|
|
|
|
_ = isFormula // For future use (e.g., logging)
|
|
|
|
// Resolve and load attached protos
|
|
type attachmentInfo struct {
|
|
id string
|
|
issue *types.Issue
|
|
subgraph *TemplateSubgraph
|
|
}
|
|
var attachments []attachmentInfo
|
|
for _, attachArg := range attachFlags {
|
|
attachID, err := utils.ResolvePartialID(ctx, store, attachArg)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error resolving attachment ID %s: %v\n", attachArg, err)
|
|
os.Exit(1)
|
|
}
|
|
attachIssue, err := store.GetIssue(ctx, attachID)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error loading attachment %s: %v\n", attachID, err)
|
|
os.Exit(1)
|
|
}
|
|
if !isProto(attachIssue) {
|
|
fmt.Fprintf(os.Stderr, "Error: %s is not a proto (missing '%s' label)\n", attachID, MoleculeLabel)
|
|
os.Exit(1)
|
|
}
|
|
attachSubgraph, err := loadTemplateSubgraph(ctx, store, attachID)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error loading attachment subgraph %s: %v\n", attachID, err)
|
|
os.Exit(1)
|
|
}
|
|
attachments = append(attachments, attachmentInfo{
|
|
id: attachID,
|
|
issue: attachIssue,
|
|
subgraph: attachSubgraph,
|
|
})
|
|
}
|
|
|
|
// Apply variable defaults from formula
|
|
vars = applyVariableDefaults(vars, subgraph)
|
|
|
|
// Check for missing required variables (those without defaults)
|
|
requiredVars := extractRequiredVariables(subgraph)
|
|
for _, attach := range attachments {
|
|
attachVars := extractRequiredVariables(attach.subgraph)
|
|
for _, v := range attachVars {
|
|
found := false
|
|
for _, rv := range requiredVars {
|
|
if rv == v {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
requiredVars = append(requiredVars, v)
|
|
}
|
|
}
|
|
}
|
|
var missingVars []string
|
|
for _, v := range requiredVars {
|
|
if _, ok := vars[v]; !ok {
|
|
missingVars = append(missingVars, v)
|
|
}
|
|
}
|
|
if len(missingVars) > 0 {
|
|
fmt.Fprintf(os.Stderr, "Error: missing required variables: %s\n", strings.Join(missingVars, ", "))
|
|
fmt.Fprintf(os.Stderr, "Provide them with: --var %s=<value>\n", missingVars[0])
|
|
os.Exit(1)
|
|
}
|
|
|
|
if dryRun {
|
|
fmt.Printf("\nDry run: would pour %d issues from proto %s\n\n", len(subgraph.Issues), protoID)
|
|
fmt.Printf("Storage: permanent (.beads/)\n\n")
|
|
for _, issue := range subgraph.Issues {
|
|
newTitle := substituteVariables(issue.Title, vars)
|
|
suffix := ""
|
|
if issue.ID == subgraph.Root.ID && assignee != "" {
|
|
suffix = fmt.Sprintf(" (assignee: %s)", assignee)
|
|
}
|
|
fmt.Printf(" - %s (from %s)%s\n", newTitle, issue.ID, suffix)
|
|
}
|
|
if len(attachments) > 0 {
|
|
fmt.Printf("\nAttachments (%s bonding):\n", attachType)
|
|
for _, attach := range attachments {
|
|
fmt.Printf(" + %s (%d issues)\n", attach.issue.Title, len(attach.subgraph.Issues))
|
|
}
|
|
}
|
|
return
|
|
}
|
|
|
|
// Spawn as persistent mol (ephemeral=false)
|
|
// Use mol prefix for distinct visual recognition (see types.IDPrefixMol)
|
|
result, err := spawnMolecule(ctx, store, subgraph, vars, assignee, actor, false, types.IDPrefixMol)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error pouring proto: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
// Attach bonded protos
|
|
totalAttached := 0
|
|
if len(attachments) > 0 {
|
|
spawnedMol, err := store.GetIssue(ctx, result.NewEpicID)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error loading spawned mol: %v\n", err)
|
|
os.Exit(1)
|
|
}
|
|
|
|
for _, attach := range attachments {
|
|
// pour command always creates persistent (Wisp=false) issues
|
|
bondResult, err := bondProtoMol(ctx, store, attach.issue, spawnedMol, attachType, vars, "", actor, false, true)
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "Error attaching %s: %v\n", attach.id, err)
|
|
os.Exit(1)
|
|
}
|
|
totalAttached += bondResult.Spawned
|
|
}
|
|
}
|
|
|
|
// Schedule auto-flush
|
|
markDirtyAndScheduleFlush()
|
|
|
|
if jsonOutput {
|
|
type pourResult struct {
|
|
*InstantiateResult
|
|
Attached int `json:"attached"`
|
|
Phase string `json:"phase"`
|
|
}
|
|
outputJSON(pourResult{result, totalAttached, "liquid"})
|
|
return
|
|
}
|
|
|
|
fmt.Printf("%s Poured mol: created %d issues\n", ui.RenderPass("✓"), result.Created)
|
|
fmt.Printf(" Root issue: %s\n", result.NewEpicID)
|
|
fmt.Printf(" Phase: liquid (persistent in .beads/)\n")
|
|
if totalAttached > 0 {
|
|
fmt.Printf(" Attached: %d issues from %d protos\n", totalAttached, len(attachments))
|
|
}
|
|
}
|
|
|
|
func init() {
|
|
// Pour command flags
|
|
pourCmd.Flags().StringArray("var", []string{}, "Variable substitution (key=value)")
|
|
pourCmd.Flags().Bool("dry-run", false, "Preview what would be created")
|
|
pourCmd.Flags().String("assignee", "", "Assign the root issue to this agent/user")
|
|
pourCmd.Flags().StringSlice("attach", []string{}, "Proto to attach after spawning (repeatable)")
|
|
pourCmd.Flags().String("attach-type", types.BondTypeSequential, "Bond type for attachments: sequential, parallel, or conditional")
|
|
|
|
molCmd.AddCommand(pourCmd)
|
|
}
|