Skip to content

Self-hosted workflows for coding-agent delivery. Orchestrate CodeBuddy, Codex and Claude Code with scripts and human approval gates. Includes Local workflows for coding assistants.

【架构优化】从 alignBaseline 中拆出执行机器对齐结果判定 runnerAlignOutcome (#687)

fx-kurumi97b3cdc2f29a
diff --git a/internal/engine/runner_align.go b/internal/engine/runner_align.go
index 8b203b7a..5ee43bce 100644
--- a/internal/engine/runner_align.go
+++ b/internal/engine/runner_align.go
@@ -82,6 +82,13 @@ func (e *Engine) alignBaseline(repository domain.RepositoryContext, gitToken str
if err != nil {
return err
}
+ return runnerAlignOutcome(final, integrate, strings.TrimSpace(repository.DefaultBranch))
+}
+
+// runnerAlignOutcome turns a finished align_baseline runner task into the
+// error alignBaseline reports: the runner's failure, a decode error, an
+// AlignConflictError when the branches diverged, or nil on a clean merge.
+func runnerAlignOutcome(final domain.RunnerTask, integrate, defaultBranch string) error {
if final.Status != domain.RunnerTaskSuccess {
msg := strings.TrimSpace(final.Error)
if msg == "" {
@@ -94,7 +101,7 @@ func (e *Engine) alignBaseline(repository domain.RepositoryContext, gitToken str
return fmt.Errorf("decode align result: %w", err)
}
if len(result.Conflicts) > 0 {
- return &AlignConflictError{Integrate: integrate, Default: strings.TrimSpace(repository.DefaultBranch), Files: result.Conflicts, Blocks: result.Blocks}
+ return &AlignConflictError{Integrate: integrate, Default: defaultBranch, Files: result.Conflicts, Blocks: result.Blocks}
}
return nil
}
diff --git a/internal/engine/runner_align_outcome_test.go b/internal/engine/runner_align_outcome_test.go
new file mode 100644
index 00000000..f39ddc45
--- /dev/null
+++ b/internal/engine/runner_align_outcome_test.go
@@ -0,0 +1,72 @@
+package engine
+
+import (
+ "errors"
+ "reflect"
+ "strings"
+ "testing"
+
+ "agentflow/internal/domain"
+)
+
+func TestRunnerAlignOutcomeCleanMerge(t *testing.T) {
+ for _, result := range []string{`{}`, `{"head":"abc123"}`} {
+ final := domain.RunnerTask{Status: domain.RunnerTaskSuccess, Result: result}
+ if err := runnerAlignOutcome(final, "integrate", "main"); err != nil {
+ t.Fatalf("result %s: err = %v, want nil", result, err)
+ }
+ }
+}
+
+func TestRunnerAlignOutcomeRunnerFailure(t *testing.T) {
+ cases := []struct {
+ name string
+ task domain.RunnerTask
+ want string
+ }{
+ {"runner error", domain.RunnerTask{Status: domain.RunnerTaskFailed, Error: " git fetch failed \n"}, "git fetch failed"},
+ {"failed fallback", domain.RunnerTask{Status: domain.RunnerTaskFailed}, "align_baseline failed on runner"},
+ {"canceled fallback", domain.RunnerTask{Status: domain.RunnerTaskCanceled, Error: " "}, "align_baseline canceled on runner"},
+ }
+ for _, tc := range cases {
+ t.Run(tc.name, func(t *testing.T) {
+ err := runnerAlignOutcome(tc.task, "integrate", "main")
+ if err == nil || err.Error() != tc.want {
+ t.Fatalf("err = %v, want %q", err, tc.want)
+ }
+ var conflict *AlignConflictError
+ if errors.As(err, &conflict) {
+ t.Fatalf("runner failure must not be an AlignConflictError")
+ }
+ })
+ }
+}
+
+func TestRunnerAlignOutcomeInvalidResult(t *testing.T) {
+ final := domain.RunnerTask{Status: domain.RunnerTaskSuccess, Result: "not json"}
+ err := runnerAlignOutcome(final, "integrate", "main")
+ if err == nil || !strings.HasPrefix(err.Error(), "decode align result: ") {
+ t.Fatalf("err = %v, want decode align result error", err)
+ }
+}
+
+func TestRunnerAlignOutcomeConflict(t *testing.T) {
+ final := domain.RunnerTask{
+ Status: domain.RunnerTaskSuccess,
+ Result: `{"head":"abc","conflicts":["a.go","b.go"],"blocks":[{"file":"a.go","ours":"x","theirs":"y"}]}`,
+ }
+ err := runnerAlignOutcome(final, "agentflow/integrate", "main")
+ var conflict *AlignConflictError
+ if !errors.As(err, &conflict) {
+ t.Fatalf("err = %v, want *AlignConflictError", err)
+ }
+ want := &AlignConflictError{
+ Integrate: "agentflow/integrate",
+ Default: "main",
+ Files: []string{"a.go", "b.go"},
+ Blocks: []domain.ConflictBlock{{File: "a.go", Ours: "x", Theirs: "y"}},
+ }
+ if !reflect.DeepEqual(conflict, want) {
+ t.Fatalf("conflict = %+v, want %+v", conflict, want)
+ }
+}