relay-flow 0.2.7-alpha → 0.2.9-alpha

package/cmd/relay-flow/repo_registration.go

@@ -0,0 +1,454 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"path/filepath"
+	"strings"
+
+	"github.com/charmbracelet/huh"
+	"github.com/rajpopat27/relay-flow/internal/config"
+	"github.com/rajpopat27/relay-flow/internal/repo"
+	"github.com/rajpopat27/relay-flow/internal/runner"
+	"github.com/rajpopat27/relay-flow/internal/server"
+	"github.com/rajpopat27/relay-flow/internal/task"
+)
+
+const addRepositorySelection = -1
+
+func repoSelectionOptions(candidates []runner.RepoCandidate) []huh.Option[int] {
+	options := make([]huh.Option[int], 0, len(candidates)+1)
+	for i, candidate := range candidates {
+		label := strings.TrimSpace(candidate.Name)
+		if label == "" {
+			label = candidate.Path
+		}
+		options = append(options, huh.NewOption(label+"  ("+candidate.Path+")", i))
+	}
+	options = append(options, huh.NewOption("[+] Add repository", addRepositorySelection))
+	return options
+}
+
+func canonicalRepoPath(path string) string {
+	path = strings.TrimSpace(path)
+	if path == "" {
+		return ""
+	}
+	absolute, err := filepath.Abs(path)
+	if err != nil {
+		return filepath.Clean(path)
+	}
+	absolute = filepath.Clean(absolute)
+	if resolved, err := filepath.EvalSymlinks(absolute); err == nil {
+		return filepath.Clean(resolved)
+	}
+	return absolute
+}
+
+func selectedRepoPaths(candidates []runner.RepoCandidate, selected []int) []string {
+	paths := make([]string, 0, len(selected))
+	seen := map[string]bool{}
+	for _, index := range selected {
+		if index < 0 || index >= len(candidates) {
+			continue
+		}
+		path := canonicalRepoPath(candidates[index].Path)
+		if path == "" || seen[path] {
+			continue
+		}
+		seen[path] = true
+		paths = append(paths, path)
+	}
+	return paths
+}
+
+func selectedRepoIndices(candidates []runner.RepoCandidate, paths []string) []int {
+	wanted := map[string]bool{}
+	for _, path := range paths {
+		if path != "" {
+			wanted[path] = true
+		}
+	}
+	selected := make([]int, 0, len(wanted))
+	for i, candidate := range candidates {
+		if wanted[canonicalRepoPath(candidate.Path)] {
+			selected = append(selected, i)
+		}
+	}
+	return selected
+}
+
+func candidateAtPath(candidates []runner.RepoCandidate, path string) bool {
+	path = canonicalRepoPath(path)
+	for _, candidate := range candidates {
+		if canonicalRepoPath(candidate.Path) == path {
+			return true
+		}
+	}
+	return false
+}
+
+func mergeRepoCandidateNames(candidates []runner.RepoCandidate, names map[string]string) []runner.RepoCandidate {
+	out := make([]runner.RepoCandidate, len(candidates))
+	copy(out, candidates)
+	for i := range out {
+		if name := names[canonicalRepoPath(out[i].Path)]; name != "" {
+			out[i].Name = name
+		}
+	}
+	return out
+}
+
+func validateAddedRepo(candidate runner.RepoCandidate, candidates []runner.RepoCandidate, registered []repo.Info) error {
+	candidate.Name = strings.TrimSpace(candidate.Name)
+	candidate.Path = canonicalRepoPath(candidate.Path)
+	if candidate.Path == "" {
+		return fmt.Errorf("repository path is required")
+	}
+	if candidate.Name == "" {
+		return fmt.Errorf("repository name is required")
+	}
+	for _, existing := range candidates {
+		if canonicalRepoPath(existing.Path) == candidate.Path {
+			return fmt.Errorf("repository path %q is already discovered as %q", candidate.Path, existing.Name)
+		}
+		if strings.TrimSpace(existing.Name) == candidate.Name {
+			return fmt.Errorf("repository name %q is already discovered", candidate.Name)
+		}
+	}
+	for _, existing := range registered {
+		if canonicalRepoPath(existing.Path) == candidate.Path {
+			return fmt.Errorf("repository path %q is already registered as %q", candidate.Path, existing.Name)
+		}
+		if strings.TrimSpace(existing.Name) == candidate.Name {
+			return fmt.Errorf("repository name %q is already registered", candidate.Name)
+		}
+	}
+	return nil
+}
+
+func promptAddedRepo() (runner.RepoCandidate, error) {
+	var path, name string
+	pathInput := huh.NewInput().Title("Repository path").Value(&path).Validate(func(value string) error {
+		if strings.TrimSpace(value) == "" {
+			return fmt.Errorf("repository path is required")
+		}
+		return nil
+	})
+	nameInput := huh.NewInput().Title("Registered name").Value(&name).Validate(func(value string) error {
+		if strings.TrimSpace(value) == "" {
+			return fmt.Errorf("repository name is required")
+		}
+		return nil
+	})
+	if err := huh.NewForm(huh.NewGroup(pathInput, nameInput)).Run(); err != nil {
+		return runner.RepoCandidate{}, err
+	}
+	return runner.RepoCandidate{Name: strings.TrimSpace(name), Path: canonicalRepoPath(path)}, nil
+}
+
+type repoSelectionPrompt func([]runner.RepoCandidate, []int) ([]int, error)
+type repoAddPrompt func() (runner.RepoCandidate, error)
+
+func selectReposInteractive(ctx context.Context, c *server.Client, candidates []runner.RepoCandidate, registered []repo.Info) ([]runner.RepoCandidate, []int, error) {
+	return selectReposInteractiveWithPrompts(ctx, c, candidates, registered, promptRepoSelection, promptAddedRepo)
+}
+
+func promptRepoSelection(candidates []runner.RepoCandidate, selected []int) ([]int, error) {
+	pick := huh.NewForm(huh.NewGroup(repoMultiSelect(repoSelectionOptions(candidates), &selected)))
+	if err := pick.Run(); err != nil {
+		return nil, err
+	}
+	return selected, nil
+}
+
+func selectReposInteractiveWithPrompts(ctx context.Context, c *server.Client, candidates []runner.RepoCandidate, registered []repo.Info, selectPrompt repoSelectionPrompt, addPrompt repoAddPrompt) ([]runner.RepoCandidate, []int, error) {
+	selectedPaths := []string{}
+	nameOverrides := map[string]string{}
+	addedCandidates := []runner.RepoCandidate{}
+	for {
+		candidates = mergeRepoCandidateNames(candidates, nameOverrides)
+		selected, err := selectPrompt(candidates, selectedRepoIndices(candidates, selectedPaths))
+		if err != nil {
+			return nil, nil, err
+		}
+		selectedPaths = selectedRepoPaths(candidates, selected)
+		add := false
+		for _, value := range selected {
+			if value == addRepositorySelection {
+				add = true
+				break
+			}
+		}
+		if !add {
+			if len(selectedPaths) == 0 {
+				return nil, nil, fmt.Errorf("select at least one repository")
+			}
+			return candidates, selectedRepoIndices(candidates, selectedPaths), nil
+		}
+
+		added, err := addPrompt()
+		if err != nil {
+			return nil, nil, err
+		}
+		knownCandidates := append(append([]runner.RepoCandidate(nil), candidates...), addedCandidates...)
+		if err := validateAddedRepo(added, knownCandidates, registered); err != nil {
+			return nil, nil, err
+		}
+		if err := c.EnsureRepo(ctx, added); err != nil {
+			return nil, nil, fmt.Errorf("ensure repository %q: %w", added.Name, err)
+		}
+		path := canonicalRepoPath(added.Path)
+		nameOverrides[path] = added.Name
+		addedCandidates = append(addedCandidates, added)
+		selectedPaths = append(selectedPaths, path)
+
+		refreshed, err := c.DiscoverRepos(ctx)
+		if err != nil {
+			return nil, nil, err
+		}
+		refreshed = mergeRepoCandidateNames(refreshed, nameOverrides)
+		// Preserve selected entries across a runner refresh even if the
+		// external runner's listing is briefly eventually consistent.
+		for _, old := range candidates {
+			oldPath := canonicalRepoPath(old.Path)
+			if containsPath(selectedPaths, oldPath) && !candidateAtPath(refreshed, oldPath) {
+				refreshed = append(refreshed, old)
+			}
+		}
+		if !candidateAtPath(refreshed, path) {
+			refreshed = append(refreshed, added)
+		}
+		candidates = refreshed
+	}
+}
+
+func containsPath(paths []string, want string) bool {
+	for _, path := range paths {
+		if path == want {
+			return true
+		}
+	}
+	return false
+}
+
+// loadRepoRegistration asks the selected task plugin for the fields needed by
+// registration. A second pass lets a plugin expose dependent choices after a
+// value such as a project has been supplied.
+func loadRepoRegistration(ctx context.Context, c *server.Client, supplied kvFlags) (task.Registration, error) {
+	initial, err := c.RepoRegistrationFields(ctx, nil)
+	if err != nil {
+		return task.Registration{}, err
+	}
+	if len(supplied) == 0 {
+		return initial, nil
+	}
+	dependent, err := c.RepoRegistrationFields(ctx, flatRegistrationValues(supplied))
+	if err != nil {
+		return task.Registration{}, err
+	}
+	return mergeRegistration(initial, dependent), nil
+}
+
+func flatRegistrationValues(values kvFlags) config.RawValues {
+	out := make(config.RawValues, len(values))
+	for key, value := range values {
+		out[key] = value
+	}
+	return out
+}
+
+func mergeRegistration(first, second task.Registration) task.Registration {
+	fields := make([]task.RegistrationField, 0, len(first.Fields)+len(second.Fields))
+	positions := map[string]int{}
+	for _, field := range append(append([]task.RegistrationField(nil), first.Fields...), second.Fields...) {
+		if index, ok := positions[field.Key]; ok {
+			fields[index] = field
+			continue
+		}
+		positions[field.Key] = len(fields)
+		fields = append(fields, field)
+	}
+	return task.Registration{Fields: fields}
+}
+
+// promptRepoRegistration renders only metadata returned by the task plugin.
+// The core CLI does not know which values are Jira statuses or how they are
+// validated.
+func promptRepoRegistration(reg task.Registration, values kvFlags) error {
+	for _, field := range reg.Fields {
+		if field.Derived || values[field.Key] != "" {
+			continue
+		}
+		title := field.Title
+		if title == "" {
+			title = field.Key
+		}
+		if len(field.Options) > 0 {
+			selected := field.Default
+			if err := huh.NewForm(huh.NewGroup(
+				huh.NewSelect[string]().Title(title).Options(registrationSelectOptions(field)...).Value(&selected),
+			)).Run(); err != nil {
+				return err
+			}
+			if strings.TrimSpace(selected) == "" {
+				return fmt.Errorf("task field %q requires a value", field.Key)
+			}
+			values[field.Key] = selected
+			continue
+		}
+		value := field.Default
+		input := huh.NewInput().Title(title).Value(&value).Validate(func(value string) error {
+			if strings.TrimSpace(value) == "" {
+				return fmt.Errorf("%s is required", title)
+			}
+			return nil
+		})
+		if err := huh.NewForm(huh.NewGroup(input)).Run(); err != nil {
+			return err
+		}
+		values[field.Key] = value
+	}
+	return nil
+}
+
+func registrationSelectOptions(field task.RegistrationField) []huh.Option[string] {
+	options := make([]huh.Option[string], 0, len(field.Options)+1)
+	if field.Default == "" {
+		// Huh selects the first option when Enter is pressed. Keep an explicit
+		// empty choice first so a missing conventional default cannot silently
+		// become the first real Jira status.
+		options = append(options, huh.NewOption("Select a value...", ""))
+	}
+	for _, option := range field.Options {
+		options = append(options, huh.NewOption(option, option))
+	}
+	return options
+}
+
+func registrationTaskConfig(reg task.Registration, supplied kvFlags, repoName string) (config.RawValues, error) {
+	known := make(map[string]task.RegistrationField, len(reg.Fields))
+	for _, field := range reg.Fields {
+		if strings.TrimSpace(field.Key) == "" {
+			return nil, errorsForRegistration("task plugin returned an empty registration key")
+		}
+		if _, exists := known[field.Key]; exists {
+			return nil, errorsForRegistration(fmt.Sprintf("duplicate task registration key %q", field.Key))
+		}
+		known[field.Key] = field
+	}
+	out := config.RawValues{}
+	for key, value := range supplied {
+		field, ok := known[key]
+		if !ok {
+			return nil, errorsForRegistration(fmt.Sprintf("unknown task key %q", key))
+		}
+		if field.Derived {
+			return nil, errorsForRegistration(fmt.Sprintf("task key %q is derived and cannot be overridden", key))
+		}
+		if strings.TrimSpace(value) == "" {
+			return nil, errorsForRegistration(fmt.Sprintf("task key %q requires a non-empty value", key))
+		}
+		if len(field.Options) > 0 && !containsRegistrationOption(field.Options, value) {
+			return nil, errorsForRegistration(fmt.Sprintf("task key %q value %q is not one of the available choices", key, value))
+		}
+		if err := setRegistrationValue(out, key, value); err != nil {
+			return nil, err
+		}
+	}
+	for _, field := range reg.Fields {
+		if field.Derived {
+			if err := setRegistrationValue(out, field.Key, repoName); err != nil {
+				return nil, err
+			}
+			continue
+		}
+		if registrationValue(out, field.Key) == "" {
+			return nil, errorsForRegistration(fmt.Sprintf("missing required task key %q", field.Key))
+		}
+	}
+	return out, nil
+}
+
+func errorsForRegistration(message string) error { return fmt.Errorf("%s", message) }
+
+func containsRegistrationOption(options []string, value string) bool {
+	for _, option := range options {
+		if option == value {
+			return true
+		}
+	}
+	return false
+}
+
+func registrationValue(values config.RawValues, key string) string {
+	parts := strings.Split(key, ".")
+	var current any = map[string]any(values)
+	for _, part := range parts {
+		var next map[string]any
+		switch value := current.(type) {
+		case map[string]any:
+			next = value
+		case config.RawValues:
+			next = map[string]any(value)
+		default:
+			return ""
+		}
+		value, ok := next[part]
+		if !ok {
+			return ""
+		}
+		current = value
+	}
+	value, _ := current.(string)
+	return strings.TrimSpace(value)
+}
+
+func setRegistrationValue(values config.RawValues, key, value string) error {
+	parts := strings.Split(key, ".")
+	if len(parts) == 0 || parts[0] == "" {
+		return errorsForRegistration("task plugin returned an invalid registration key")
+	}
+	current := values
+	for _, part := range parts[:len(parts)-1] {
+		if part == "" {
+			return errorsForRegistration(fmt.Sprintf("task plugin returned an invalid registration key %q", key))
+		}
+		existing, ok := current[part]
+		if !ok {
+			nested := map[string]any{}
+			current[part] = nested
+			current = nested
+			continue
+		}
+		var nested map[string]any
+		switch typed := existing.(type) {
+		case map[string]any:
+			nested = typed
+		case config.RawValues:
+			nested = map[string]any(typed)
+			current[part] = nested
+		default:
+			return errorsForRegistration(fmt.Sprintf("task registration key %q conflicts with another value", key))
+		}
+		current = nested
+	}
+	current[parts[len(parts)-1]] = value
+	return nil
+}
+
+func registerSelectedReposDynamic(ctx context.Context, c *server.Client, candidates []runner.RepoCandidate, selected []int, reg task.Registration, values kvFlags) error {
+	for _, index := range selected {
+		candidate := candidates[index]
+		taskCfg, err := registrationTaskConfig(reg, values, candidate.Name)
+		if err != nil {
+			return fmt.Errorf("%s: %w", candidate.Name, err)
+		}
+		info, err := c.RegisterRepo(ctx, repo.RegisterInput{Name: candidate.Name, Path: candidate.Path, TaskConfig: taskCfg})
+		if err != nil {
+			return fmt.Errorf("%s: %w", candidate.Name, err)
+		}
+		fmt.Println(info.Name)
+	}
+	return nil
+}

package/cmd/relay-flow/serve.go

@@ -565,8 +565,11 @@ func (d *serveDeps) RegisterNodeSession(ctx context.Context, registration runsvc
 func (d *serveDeps) DiscoverRepos(ctx context.Context) ([]runner.RepoCandidate, error) {
 	return d.repos.Discover(ctx)
 }
-func (d *serveDeps) TaskFields(context.Context) ([]string, error) {
-	return d.repos.RequiredRepoKeys(), nil
+func (d *serveDeps) EnsureRepo(ctx context.Context, candidate runner.RepoCandidate) error {
+	return d.repos.EnsureRepo(ctx, candidate.Name, candidate.Path)
+}
+func (d *serveDeps) TaskRegistrationFields(ctx context.Context, values config.RawValues) ([]task.RegistrationField, error) {
+	return d.repos.RegistrationFields(ctx, values)
 }
 func (d *serveDeps) RegisterRepo(ctx context.Context, input repo.RegisterInput) (repo.Info, error) {
 	info, err := d.repos.Register(ctx, input)

package/examples/config-reference.yaml

@@ -101,6 +101,13 @@ repos:
       # relay-flow repo name during repo registration.
       project: PAY
       component: payments
+      # These must be valid statuses in the PAY project. Interactive
+      # registration discovers them; scripted registration passes the same
+      # three keys with --set.
+      statusDefaults:
+        start: To Do
+        work: In Progress
+        end: Done
 
       # Optional repo-level overrides inherit into workflows and nodes.
       # assignee: relay-bot@example.com

package/go.mod

@@ -3,6 +3,7 @@ module github.com/rajpopat27/relay-flow
 go 1.26.0
 
 require (
+	github.com/charmbracelet/huh/spinner v0.0.0-20260223110133-9dc45e34a40b
 	github.com/cschleiden/go-workflows v1.4.2
 	github.com/google/renameio/v2 v2.0.1
 	github.com/google/uuid v1.6.0
@@ -16,6 +17,9 @@ require (
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/clipperhouse/displaywidth v0.9.0 // indirect
+	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20260825221802-da73d73af1c5 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260825221802-da73d73af1c5 // indirect
@@ -27,15 +31,15 @@ require (
 	github.com/benbjohnson/clock v1.3.0 // indirect
 	github.com/catppuccin/go v0.3.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect
-	github.com/charmbracelet/bubbletea v1.3.6 // indirect
-	github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
+	github.com/charmbracelet/bubbles v1.0.0 // indirect
+	github.com/charmbracelet/bubbletea v1.3.10 // indirect
+	github.com/charmbracelet/colorprofile v0.4.1 // indirect
 	github.com/charmbracelet/huh v1.0.0
 	github.com/charmbracelet/lipgloss v1.1.0 // indirect
-	github.com/charmbracelet/x/ansi v0.9.3 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6 // indirect
+	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
 	github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect
-	github.com/charmbracelet/x/term v0.2.1 // indirect
+	github.com/charmbracelet/x/term v0.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
@@ -52,10 +56,10 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/jellydator/ttlcache/v3 v3.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.20
 	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.19 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect

package/go.sum

@@ -14,20 +14,22 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 h1:JFgG/xnwFfbezlUnFMJy0nusZvytYysV4SCS2cYbvws=
-github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7/go.mod h1:ISC1gtLcVilLOf23wvTfoQuYbW2q0JevFxPfUzZ9Ybw=
-github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU=
-github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs=
-github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk=
+github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
+github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
+github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
+github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
+github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
+github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
 github.com/charmbracelet/huh v1.0.0 h1:wOnedH8G4qzJbmhftTqrpppyqHakl/zbbNdXIWJyIxw=
 github.com/charmbracelet/huh v1.0.0/go.mod h1:5YVc+SlZ1IhQALxRPpkGwwEKftN/+OlJlnJYlDRFqN4=
+github.com/charmbracelet/huh/spinner v0.0.0-20260223110133-9dc45e34a40b h1:deQbW7eR/gYwkXonGX6a1now6H6f8v4kfv0OIKECu0I=
+github.com/charmbracelet/huh/spinner v0.0.0-20260223110133-9dc45e34a40b/go.mod h1:Y68nuKJuC/Q2lmiq18EkHWkVWi2VGLrwaOfOyPKLkkE=
 github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
 github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
-github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
-github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k=
-github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs=
+github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
+github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
+github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
+github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
 github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U=
 github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ=
 github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
@@ -36,12 +38,18 @@ github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payR
 github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
 github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4=
 github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ=
-github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ=
-github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg=
+github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
+github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
 github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
 github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
 github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI=
 github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4=
+github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
+github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
+github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/cschleiden/go-workflows v1.4.2 h1:s7wgx3iKvFmwJVzB7wSuUFqbplcpCUGrn8u1J4/T+2c=
@@ -98,14 +106,14 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
-github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
-github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
@@ -124,7 +132,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=

package/internal/execution/goworkflows/engine_test.go

@@ -187,7 +187,7 @@ func TestRunBeginsAtStartAndFollowsEntryEdge(t *testing.T) {
 
 	wf := linearWorkflow(false)
 	node := wf.Nodes["coding"]
-	node.NudgePrompt = "Continue {{ticket}} at {{node}}. Valid next steps: {{nextSteps}}."
+	node.NudgePrompt = "Continue {{ticket}} at {{node}} in {{mailbox}}. Valid next steps: {{nextSteps}}."
 	wf.Nodes["coding"] = node
 	rid, err := startRun(engine, wf)
 	if err != nil {
@@ -221,8 +221,8 @@ func TestRunBeginsAtStartAndFollowsEntryEdge(t *testing.T) {
 	if call.NudgeTemplate != node.NudgePrompt {
 		t.Fatalf("nudge passed to harness = %q, want raw template %q", call.NudgeTemplate, node.NudgePrompt)
 	}
-	if call.Data.Ticket != "PAY-101" || call.Data.Workflow != wf.Name || call.Data.Repo != "payments" || call.Data.Node != "coding" || call.Data.NextSteps == "" {
-		t.Fatalf("nudge prompt data = %+v, want current workflow values", call.Data)
+	if call.Data.Ticket != "PAY-101" || call.Data.Workflow != wf.Name || call.Data.Repo != "payments" || call.Data.Node != "coding" || call.Data.Mailbox != "PAY-101-coding" || call.Data.NextSteps == "" {
+		t.Fatalf("nudge prompt data = %+v, want current workflow and mailbox values", call.Data)
 	}
 
 	// Pre-edge gate: before following the start edge the run ensures the

package/internal/harness/opencode/opencode_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/rajpopat27/relay-flow/internal/workflow"
 )
 
-const configuredPlugin = "relay-flow-plugin@0.2.7-alpha"
+const configuredPlugin = "relay-flow-plugin@0.2.9-alpha"
 
 func TestBuildCommandArgv(t *testing.T) {
 	t.Setenv("RELAY_FLOW_HOME", "/var/lib/relay-flow-test")
@@ -71,12 +71,12 @@ func TestRenderPromptTemplatesExposeAllValues(t *testing.T) {
 		Node: "review", NodeType: workflow.NodeHITL, Agent: "build", NodeDescription: "Review it.",
 		NextSteps: "end (when: approved)", Mailbox: "PAY-234",
 	}
-	nudge := "nudge {{taskSystem}}|{{ticket}}|{{workflow}}|{{repo}}|{{node}}|{{nextSteps}}"
+	nudge := "nudge {{taskSystem}}|{{ticket}}|{{workflow}}|{{repo}}|{{node}}|{{mailbox}}|{{nextSteps}}"
 	initial, err := h.RenderPrompt(harness.PromptInitial, data, nudge)
 	if err != nil {
 		t.Fatal(err)
 	}
-	wantInitial := "initial linear|PAY-101|basicFlow|payments|review|hitl|build|Review it.|end (when: approved)|PAY-234\n\nReturn the complete report directly. Relay-flow will show a native TUI approval dialog after the report is valid. Do not use OpenCode's Question tool for relay-flow approval.\n\nnudge linear|PAY-101|basicFlow|payments|review|end (when: approved)"
+	wantInitial := "initial linear|PAY-101|basicFlow|payments|review|hitl|build|Review it.|end (when: approved)|PAY-234\n\nReturn the complete report directly. Relay-flow will show a native TUI approval dialog after the report is valid. Do not use OpenCode's Question tool for relay-flow approval.\n\nnudge linear|PAY-101|basicFlow|payments|review|PAY-234|end (when: approved)"
 	if initial != wantInitial {
 		t.Fatalf("initial prompt = %q, want %q", initial, wantInitial)
 	}
@@ -84,7 +84,7 @@ func TestRenderPromptTemplatesExposeAllValues(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if want := "feedback PAY-234\n\nReturn the complete report directly. Relay-flow will show a native TUI approval dialog after the report is valid. Do not use OpenCode's Question tool for relay-flow approval.\n\nnudge linear|PAY-101|basicFlow|payments|review|end (when: approved)"; feedback != want {
+	if want := "feedback PAY-234\n\nReturn the complete report directly. Relay-flow will show a native TUI approval dialog after the report is valid. Do not use OpenCode's Question tool for relay-flow approval.\n\nnudge linear|PAY-101|basicFlow|payments|review|PAY-234|end (when: approved)"; feedback != want {
 		t.Fatalf("feedback prompt = %q, want %q", feedback, want)
 	}
 }