feat: handle merge conflicts better

Author: yjp20

pkg/cmd/build.go

@@ -7,18 +7,15 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"slices"
 	"strings"
 
 	tea "github.com/charmbracelet/bubbletea"
 	cbuild "github.com/stainless-api/stainless-api-cli/pkg/components/build"
 	"github.com/stainless-api/stainless-api-cli/pkg/console"
 	"github.com/stainless-api/stainless-api-cli/pkg/stainlessutils"
-
 	"github.com/stainless-api/stainless-api-go"
 	"github.com/stainless-api/stainless-api-go/option"
 	"github.com/stainless-api/stainless-api-go/shared"
-
 	"github.com/tidwall/gjson"
 	"github.com/urfave/cli/v3"
 )
@@ -253,15 +250,13 @@ func (c buildCompletionModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return c, cmd
 }
 
-var GOOD_COMMIT_CONCLUSIONS = []string{"error", "warning", "note", "success"}
-
 func (c buildCompletionModel) IsCompleted() bool {
 	b := stainlessutils.NewBuild(c.Build.Build)
 	for _, target := range b.Languages() {
 		buildTarget := b.BuildTarget(target)
 
 		var downloadIsCompleted = true
-		if buildTarget.IsCommitCompleted() && slices.Contains(GOOD_COMMIT_CONCLUSIONS, buildTarget.Commit.Completed.Conclusion) {
+		if buildTarget.IsCommitCompleted() && stainlessutils.IsGoodCommitConclusion(buildTarget.Commit.Completed.Conclusion) {
 			if download, ok := c.Build.Downloads[target]; ok {
 				if download.Status != "completed" {
 					downloadIsCompleted = false

pkg/components/build/model.go

@@ -111,8 +111,7 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			}
 
 			// Start download when the commit step is done, and m.Downloads[target] is specified
-			status, _, conclusion := buildTarget.StepInfo("commit")
-			downloadable := status == "completed" && conclusion != "fatal"
+			downloadable := buildTarget.IsCommitCompleted() && buildTarget.IsGoodCommitConclusion()
 			if download, ok := m.Downloads[target]; ok && downloadable && download.Status == "not_started" {
 				download.Status = "in_progress"
 				cmds = append(cmds, m.downloadTarget(target))

pkg/components/build/view.go

@@ -100,14 +100,18 @@ func ViewStepSymbol(status, conclusion string) string {
 		return yellowStyle.Render("●")
 	case "completed":
 		switch conclusion {
-		case "success":
+		case "success", "note":
 			return greenStyle.Render("✓")
-		case "failure":
-			return redStyle.Render("✗")
 		case "warning":
 			return yellowStyle.Render("⚠")
+		case "error":
+			return redStyle.Render("⚠")
+		case "fatal":
+			return redStyle.Render("✗")
+		case "merge_conflict", "upstream_merge_conflict":
+			return yellowStyle.Render("m")
 		default:
-			return greenStyle.Render("✓")
+			return grayStyle.Render(conclusion)
 		}
 	default:
 		return grayStyle.Render("○")

pkg/stainlessutils/stainlessutils.go

@@ -2,6 +2,7 @@ package stainlessutils
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/stainless-api/stainless-api-go"
 	"github.com/tidwall/gjson"
@@ -12,6 +13,12 @@ type Build struct {
 	stainless.Build
 }
 
+var GOOD_COMMIT_CONCLUSIONS = []string{"error", "warning", "note", "success"}
+
+func IsGoodCommitConclusion(conclusion string) bool {
+	return slices.Contains(GOOD_COMMIT_CONCLUSIONS, conclusion)
+}
+
 // NewBuild creates a new Build wrapper
 func NewBuild(build stainless.Build) *Build {
 	return &Build{Build: build}
@@ -182,7 +189,18 @@ func (bt *BuildTarget) StepInfo(step string) (status, url, conclusion string) {
 		status = u.Status
 		if u.Status == "completed" {
 			conclusion = u.Completed.Conclusion
-			url = fmt.Sprintf("https://github.com/%s/%s/commit/%s", u.Completed.Commit.Repo.Owner, u.Completed.Commit.Repo.Name, u.Completed.Commit.Sha)
+			// Use merge conflict PR URL if available, otherwise use commit URL
+			if u.Completed.JSON.MergeConflictPr.Valid() {
+				url = fmt.Sprintf("https://github.com/%s/%s/pull/%.0f",
+					u.Completed.MergeConflictPr.Repo.Owner,
+					u.Completed.MergeConflictPr.Repo.Name,
+					u.Completed.MergeConflictPr.Number)
+			} else if u.Completed.JSON.Commit.Valid() {
+				url = fmt.Sprintf("https://github.com/%s/%s/commit/%s",
+					u.Completed.Commit.Repo.Owner,
+					u.Completed.Commit.Repo.Name,
+					u.Completed.Commit.Sha)
+			}
 		}
 	}
 	if u, ok := stepUnion.(stainless.CheckStepUnion); ok {
@@ -232,6 +250,11 @@ func (bt *BuildTarget) IsCommitCompleted() bool {
 	return status == "completed"
 }
 
+func (bt *BuildTarget) IsGoodCommitConclusion() bool {
+	_, _, conclusion := bt.StepInfo("commit")
+	return IsGoodCommitConclusion(conclusion)
+}
+
 func (bt *BuildTarget) IsCommitFailed() bool {
 	status, _, conclusion := bt.StepInfo("commit")
 	return status == "completed" && conclusion == "fatal"