feat(refinery): implement Beads-native merge queue processing (gt-3x1)
Replace branch discovery with Beads queue in Engineer: - ProcessMR: full merge execution (fetch, conflict check, merge, test, push) - handleSuccess: close MR and source issue, notify worker - handleFailure: reopen MR, assign to worker, send failure notification - Helper functions: gitRun, gitOutput, runTests, pushWithRetry, checkConflicts The Engineer now: - Polls for merge-requests via bd ready --type=merge-request - Claims MRs by setting status to in_progress - Processes merges with conflict detection and test execution - Closes MRs and source issues on success - Assigns back to workers on failure with appropriate notifications 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
@@ -2,14 +2,18 @@
|
||||
package refinery
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/steveyegge/gastown/internal/beads"
|
||||
"github.com/steveyegge/gastown/internal/mail"
|
||||
"github.com/steveyegge/gastown/internal/rig"
|
||||
)
|
||||
|
||||
@@ -256,14 +260,8 @@ func (e *Engineer) processOnce(ctx context.Context) error {
|
||||
|
||||
// 6. Handle result
|
||||
if result.Success {
|
||||
// Close with merged reason
|
||||
reason := fmt.Sprintf("merged: %s", result.MergeCommit)
|
||||
if err := e.beads.CloseWithReason(reason, mr.ID); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to close MR %s: %v\n", mr.ID, err)
|
||||
}
|
||||
fmt.Printf("[Engineer] ✓ Merged: %s\n", mr.ID)
|
||||
e.handleSuccess(mr, result)
|
||||
} else {
|
||||
// Failure handling (detailed implementation in gt-3x1.4)
|
||||
e.handleFailure(mr, result)
|
||||
}
|
||||
|
||||
@@ -280,7 +278,7 @@ type ProcessResult struct {
|
||||
}
|
||||
|
||||
// ProcessMR processes a single merge request.
|
||||
// This is a placeholder that will be fully implemented in gt-3x1.2.
|
||||
// It performs: fetch, conflict check, merge, test, push.
|
||||
func (e *Engineer) ProcessMR(ctx context.Context, mr *beads.Issue) ProcessResult {
|
||||
// Parse MR fields from description
|
||||
mrFields := beads.ParseMRFields(mr)
|
||||
@@ -291,31 +289,404 @@ func (e *Engineer) ProcessMR(ctx context.Context, mr *beads.Issue) ProcessResult
|
||||
}
|
||||
}
|
||||
|
||||
// For now, just log what we would do
|
||||
// Full implementation in gt-3x1.2: Fetch and conflict check
|
||||
fmt.Printf("[Engineer] Would process:\n")
|
||||
fmt.Printf(" Branch: %s\n", mrFields.Branch)
|
||||
fmt.Printf(" Target: %s\n", mrFields.Target)
|
||||
fmt.Printf(" Worker: %s\n", mrFields.Worker)
|
||||
// Use config target if MR target is empty
|
||||
targetBranch := mrFields.Target
|
||||
if targetBranch == "" {
|
||||
targetBranch = e.config.TargetBranch
|
||||
}
|
||||
|
||||
// Return failure for now - actual implementation in gt-3x1.2
|
||||
fmt.Printf("[Engineer] Processing MR:\n")
|
||||
fmt.Printf(" Branch: %s\n", mrFields.Branch)
|
||||
fmt.Printf(" Target: %s\n", targetBranch)
|
||||
fmt.Printf(" Worker: %s\n", mrFields.Worker)
|
||||
fmt.Printf(" Source Issue: %s\n", mrFields.SourceIssue)
|
||||
|
||||
// 1. Fetch the source branch
|
||||
fmt.Printf("[Engineer] Fetching origin/%s...\n", mrFields.Branch)
|
||||
if err := e.gitRun("fetch", "origin", mrFields.Branch); err != nil {
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("fetch failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Checkout target branch and pull latest
|
||||
fmt.Printf("[Engineer] Checking out %s...\n", targetBranch)
|
||||
if err := e.gitRun("checkout", targetBranch); err != nil {
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("checkout target failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
// Pull latest (ignore errors - might be up to date)
|
||||
_ = e.gitRun("pull", "origin", targetBranch)
|
||||
|
||||
// 3. Check for conflicts before merging (dry-run merge)
|
||||
fmt.Printf("[Engineer] Checking for conflicts...\n")
|
||||
if conflicts := e.checkConflicts(mrFields.Branch, targetBranch); conflicts != "" {
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("merge conflict: %s", conflicts),
|
||||
Conflict: true,
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Merge the branch
|
||||
fmt.Printf("[Engineer] Merging origin/%s...\n", mrFields.Branch)
|
||||
mergeMsg := fmt.Sprintf("Merge %s: %s", mrFields.Branch, mr.Title)
|
||||
if err := e.gitRun("merge", "--no-ff", "-m", mergeMsg, "origin/"+mrFields.Branch); err != nil {
|
||||
errStr := err.Error()
|
||||
if strings.Contains(errStr, "CONFLICT") || strings.Contains(errStr, "conflict") {
|
||||
// Abort the merge
|
||||
_ = e.gitRun("merge", "--abort")
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: "merge conflict during merge",
|
||||
Conflict: true,
|
||||
}
|
||||
}
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("merge failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
// 5. Run tests if configured
|
||||
if e.config.RunTests && e.config.TestCommand != "" {
|
||||
fmt.Printf("[Engineer] Running tests: %s\n", e.config.TestCommand)
|
||||
if err := e.runTests(e.config.TestCommand); err != nil {
|
||||
// Reset to before merge
|
||||
_ = e.gitRun("reset", "--hard", "HEAD~1")
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("tests failed: %v", err),
|
||||
TestsFailed: true,
|
||||
}
|
||||
}
|
||||
fmt.Println("[Engineer] Tests passed")
|
||||
}
|
||||
|
||||
// 6. Push to origin with retry
|
||||
fmt.Printf("[Engineer] Pushing to origin/%s...\n", targetBranch)
|
||||
if err := e.pushWithRetry(targetBranch); err != nil {
|
||||
// Reset to before merge
|
||||
_ = e.gitRun("reset", "--hard", "HEAD~1")
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: fmt.Sprintf("push failed: %v", err),
|
||||
}
|
||||
}
|
||||
|
||||
// 7. Get merge commit SHA
|
||||
mergeCommit, err := e.gitOutput("rev-parse", "HEAD")
|
||||
if err != nil {
|
||||
mergeCommit = "unknown" // Non-fatal, continue
|
||||
}
|
||||
|
||||
// 8. Delete source branch if configured
|
||||
if e.config.DeleteMergedBranches {
|
||||
fmt.Printf("[Engineer] Deleting merged branch origin/%s...\n", mrFields.Branch)
|
||||
_ = e.gitRun("push", "origin", "--delete", mrFields.Branch)
|
||||
}
|
||||
|
||||
fmt.Printf("[Engineer] ✓ Merged successfully at %s\n", mergeCommit)
|
||||
return ProcessResult{
|
||||
Success: false,
|
||||
Error: "ProcessMR not fully implemented (see gt-3x1.2)",
|
||||
Success: true,
|
||||
MergeCommit: mergeCommit,
|
||||
}
|
||||
}
|
||||
|
||||
// checkConflicts checks if merging branch into target would cause conflicts.
|
||||
// Returns empty string if no conflicts, or a description of conflicts.
|
||||
func (e *Engineer) checkConflicts(branch, target string) string {
|
||||
// Use git merge-tree to check for conflicts without actually merging
|
||||
// First get the merge base
|
||||
mergeBase, err := e.gitOutput("merge-base", target, "origin/"+branch)
|
||||
if err != nil {
|
||||
return fmt.Sprintf("failed to find merge base: %v", err)
|
||||
}
|
||||
|
||||
// Check for conflicts using merge-tree
|
||||
cmd := exec.Command("git", "merge-tree", mergeBase, target, "origin/"+branch)
|
||||
cmd.Dir = e.workDir
|
||||
output, _ := cmd.Output()
|
||||
|
||||
// merge-tree outputs conflict markers if there are conflicts
|
||||
if strings.Contains(string(output), "<<<<<<") ||
|
||||
strings.Contains(string(output), "changed in both") {
|
||||
return "files modified in both branches"
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
|
||||
// gitRun executes a git command.
|
||||
func (e *Engineer) gitRun(args ...string) error {
|
||||
cmd := exec.Command("git", args...)
|
||||
cmd.Dir = e.workDir
|
||||
|
||||
var stderr bytes.Buffer
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
errMsg := strings.TrimSpace(stderr.String())
|
||||
if errMsg != "" {
|
||||
return fmt.Errorf("%s", errMsg)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// gitOutput executes a git command and returns stdout.
|
||||
func (e *Engineer) gitOutput(args ...string) (string, error) {
|
||||
cmd := exec.Command("git", args...)
|
||||
cmd.Dir = e.workDir
|
||||
|
||||
var stdout, stderr bytes.Buffer
|
||||
cmd.Stdout = &stdout
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
errMsg := strings.TrimSpace(stderr.String())
|
||||
if errMsg != "" {
|
||||
return "", fmt.Errorf("%s", errMsg)
|
||||
}
|
||||
return "", err
|
||||
}
|
||||
|
||||
return strings.TrimSpace(stdout.String()), nil
|
||||
}
|
||||
|
||||
// runTests executes the test command.
|
||||
func (e *Engineer) runTests(testCmd string) error {
|
||||
parts := strings.Fields(testCmd)
|
||||
if len(parts) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
cmd := exec.Command(parts[0], parts[1:]...)
|
||||
cmd.Dir = e.workDir
|
||||
|
||||
var stderr bytes.Buffer
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
if err := cmd.Run(); err != nil {
|
||||
return fmt.Errorf("%s: %s", err, strings.TrimSpace(stderr.String()))
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// pushWithRetry pushes to the target branch with exponential backoff retry.
|
||||
func (e *Engineer) pushWithRetry(targetBranch string) error {
|
||||
const maxRetries = 3
|
||||
const baseDelay = 1 * time.Second
|
||||
|
||||
var lastErr error
|
||||
delay := baseDelay
|
||||
|
||||
for attempt := 0; attempt <= maxRetries; attempt++ {
|
||||
if attempt > 0 {
|
||||
fmt.Printf("[Engineer] Push retry %d/%d after %v\n", attempt, maxRetries, delay)
|
||||
time.Sleep(delay)
|
||||
delay *= 2 // Exponential backoff
|
||||
}
|
||||
|
||||
err := e.gitRun("push", "origin", targetBranch)
|
||||
if err == nil {
|
||||
return nil // Success
|
||||
}
|
||||
lastErr = err
|
||||
}
|
||||
|
||||
return fmt.Errorf("push failed after %d retries: %v", maxRetries, lastErr)
|
||||
}
|
||||
|
||||
// handleFailure handles a failed merge request.
|
||||
// This is a placeholder that will be fully implemented in gt-3x1.4.
|
||||
// It reopens the MR, assigns back to worker, and sends notification.
|
||||
func (e *Engineer) handleFailure(mr *beads.Issue, result ProcessResult) {
|
||||
// Reopen the MR (back to open status for rework)
|
||||
mrFields := beads.ParseMRFields(mr)
|
||||
|
||||
// Determine failure type and appropriate label
|
||||
var failureLabel string
|
||||
var failureSubject string
|
||||
var failureBody string
|
||||
|
||||
if result.Conflict {
|
||||
failureLabel = "needs-rebase"
|
||||
failureSubject = fmt.Sprintf("Rebase needed: %s", mr.ID)
|
||||
target := e.config.TargetBranch
|
||||
if mrFields != nil && mrFields.Target != "" {
|
||||
target = mrFields.Target
|
||||
}
|
||||
failureBody = fmt.Sprintf(`Your merge request has conflicts with %s.
|
||||
|
||||
Please rebase your changes:
|
||||
git fetch origin
|
||||
git rebase origin/%s
|
||||
git push -f
|
||||
|
||||
Then resubmit with: gt mq submit
|
||||
|
||||
MR: %s
|
||||
Error: %s`, target, target, mr.ID, result.Error)
|
||||
} else if result.TestsFailed {
|
||||
failureLabel = "needs-fix"
|
||||
failureSubject = fmt.Sprintf("Tests failed: %s", mr.ID)
|
||||
failureBody = fmt.Sprintf(`Your merge request failed tests.
|
||||
|
||||
Please fix the failing tests and resubmit.
|
||||
|
||||
MR: %s
|
||||
Error: %s`, mr.ID, result.Error)
|
||||
} else {
|
||||
failureLabel = "needs-fix"
|
||||
failureSubject = fmt.Sprintf("Merge failed: %s", mr.ID)
|
||||
failureBody = fmt.Sprintf(`Your merge request failed to merge.
|
||||
|
||||
MR: %s
|
||||
Error: %s
|
||||
|
||||
Please investigate and resubmit.`, mr.ID, result.Error)
|
||||
}
|
||||
|
||||
// 1. Reopen the MR (back to open status for rework)
|
||||
open := "open"
|
||||
if err := e.beads.Update(mr.ID, beads.UpdateOptions{Status: &open}); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to reopen MR %s: %v\n", mr.ID, err)
|
||||
}
|
||||
|
||||
// 2. Assign back to worker if we know who they are
|
||||
if mrFields != nil && mrFields.Worker != "" {
|
||||
// Format worker as full address (e.g., "gastown/Nux")
|
||||
workerAddr := mrFields.Worker
|
||||
if mrFields.Rig != "" && !strings.Contains(workerAddr, "/") {
|
||||
workerAddr = mrFields.Rig + "/" + mrFields.Worker
|
||||
}
|
||||
if err := e.beads.Update(mr.ID, beads.UpdateOptions{Assignee: &workerAddr}); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to assign MR %s to %s: %v\n", mr.ID, workerAddr, err)
|
||||
}
|
||||
}
|
||||
|
||||
// 3. Add failure label (note: beads doesn't support labels yet, log for now)
|
||||
fmt.Printf("[Engineer] Would add label: %s\n", failureLabel)
|
||||
// TODO: When beads supports labels: e.beads.AddLabel(mr.ID, failureLabel)
|
||||
|
||||
// 4. Send notification to worker
|
||||
if mrFields != nil && mrFields.Worker != "" {
|
||||
e.notifyWorkerFailure(mrFields, failureSubject, failureBody)
|
||||
}
|
||||
|
||||
// Log the failure
|
||||
fmt.Printf("[Engineer] ✗ Failed: %s - %s\n", mr.ID, result.Error)
|
||||
|
||||
// Full failure handling (assign back to worker, labels) in gt-3x1.4
|
||||
}
|
||||
|
||||
// notifyWorkerFailure sends a failure notification to the worker.
|
||||
func (e *Engineer) notifyWorkerFailure(mrFields *beads.MRFields, subject, body string) {
|
||||
if mrFields == nil || mrFields.Worker == "" {
|
||||
return
|
||||
}
|
||||
|
||||
// Determine worker address
|
||||
workerAddr := mrFields.Worker
|
||||
if mrFields.Rig != "" && !strings.Contains(workerAddr, "/") {
|
||||
workerAddr = mrFields.Rig + "/" + mrFields.Worker
|
||||
}
|
||||
|
||||
router := mail.NewRouter(e.workDir)
|
||||
msg := &mail.Message{
|
||||
From: e.rig.Name + "/refinery",
|
||||
To: workerAddr,
|
||||
Subject: subject,
|
||||
Body: body,
|
||||
Priority: mail.PriorityHigh,
|
||||
}
|
||||
|
||||
if err := router.Send(msg); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to notify worker %s: %v\n", workerAddr, err)
|
||||
}
|
||||
}
|
||||
|
||||
// handleSuccess handles a successful merge.
|
||||
// It closes the MR, closes the source issue, and notifies the worker.
|
||||
func (e *Engineer) handleSuccess(mr *beads.Issue, result ProcessResult) {
|
||||
mrFields := beads.ParseMRFields(mr)
|
||||
|
||||
// 1. Update MR description with merge commit SHA
|
||||
if mrFields != nil {
|
||||
mrFields.MergeCommit = result.MergeCommit
|
||||
mrFields.CloseReason = "merged"
|
||||
newDesc := beads.SetMRFields(mr, mrFields)
|
||||
if err := e.beads.Update(mr.ID, beads.UpdateOptions{Description: &newDesc}); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to update MR %s with merge commit: %v\n", mr.ID, err)
|
||||
}
|
||||
}
|
||||
|
||||
// 2. Close the MR with merged reason
|
||||
reason := fmt.Sprintf("merged: %s", result.MergeCommit)
|
||||
if err := e.beads.CloseWithReason(reason, mr.ID); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to close MR %s: %v\n", mr.ID, err)
|
||||
}
|
||||
|
||||
// 3. Close the source issue (the work item that was merged)
|
||||
if mrFields != nil && mrFields.SourceIssue != "" {
|
||||
sourceReason := fmt.Sprintf("Merged in %s at %s", mr.ID, result.MergeCommit)
|
||||
if err := e.beads.CloseWithReason(sourceReason, mrFields.SourceIssue); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to close source issue %s: %v\n", mrFields.SourceIssue, err)
|
||||
} else {
|
||||
fmt.Printf("[Engineer] Closed source issue: %s\n", mrFields.SourceIssue)
|
||||
}
|
||||
}
|
||||
|
||||
// 4. Notify worker of success
|
||||
if mrFields != nil && mrFields.Worker != "" {
|
||||
e.notifyWorkerSuccess(mrFields, mr, result)
|
||||
}
|
||||
|
||||
fmt.Printf("[Engineer] ✓ Merged: %s\n", mr.ID)
|
||||
}
|
||||
|
||||
// notifyWorkerSuccess sends a success notification to the worker.
|
||||
func (e *Engineer) notifyWorkerSuccess(mrFields *beads.MRFields, mr *beads.Issue, result ProcessResult) {
|
||||
if mrFields == nil || mrFields.Worker == "" {
|
||||
return
|
||||
}
|
||||
|
||||
// Determine worker address
|
||||
workerAddr := mrFields.Worker
|
||||
if mrFields.Rig != "" && !strings.Contains(workerAddr, "/") {
|
||||
workerAddr = mrFields.Rig + "/" + mrFields.Worker
|
||||
}
|
||||
|
||||
// Determine target branch
|
||||
target := e.config.TargetBranch
|
||||
if mrFields.Target != "" {
|
||||
target = mrFields.Target
|
||||
}
|
||||
|
||||
subject := fmt.Sprintf("Work merged: %s", mr.ID)
|
||||
body := fmt.Sprintf(`Your work has been merged successfully!
|
||||
|
||||
Branch: %s
|
||||
Target: %s
|
||||
Merge commit: %s
|
||||
|
||||
Issue: %s
|
||||
Thank you for your contribution!`, mrFields.Branch, target, result.MergeCommit, mrFields.SourceIssue)
|
||||
|
||||
router := mail.NewRouter(e.workDir)
|
||||
msg := &mail.Message{
|
||||
From: e.rig.Name + "/refinery",
|
||||
To: workerAddr,
|
||||
Subject: subject,
|
||||
Body: body,
|
||||
Priority: mail.PriorityNormal,
|
||||
}
|
||||
|
||||
if err := router.Send(msg); err != nil {
|
||||
fmt.Printf("[Engineer] Warning: failed to notify worker %s: %v\n", workerAddr, err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user