update for new status field from api

Author: skarim

cmd/merge.go

@@ -325,7 +325,7 @@ func runMergeInteractive(cfg *config.Config, client github.ClientOps, stackNumbe
 		return nil
 	case out.Failed:
 		cfg.Errorf("merge failed: %s", out.Message)
-		cfg.Printf("The stack is atomic, so nothing was merged.")
+		cfg.Printf("Stack merges are atomic, so nothing was merged.")
 		return mergeFailureExit(out.Message)
 	case out.WatchStopped:
 		cfg.Infof("Stopped watching. Merge is still in progress. Check the pull requests on GitHub.")
@@ -353,10 +353,15 @@ func runMergeHeadless(cfg *config.Config, client github.ClientOps, base string,
 		return ErrAPIFailure
 	}
 
-	if res.Merged {
+	if res.IsMerged() {
 		mergedSuccess(cfg, list, base, res.Details.SHA)
 		return nil
 	}
+	if res.IsFailed() {
+		cfg.Errorf("merge failed: %s", res.Details.Message)
+		cfg.Printf("Stack merges are atomic, so nothing was merged.")
+		return mergeFailureExit(res.Details.Message)
+	}
 
 	uuid := res.Details.UUID
 	if uuid == "" {
@@ -380,13 +385,13 @@ func runMergeHeadless(cfg *config.Config, client github.ClientOps, base string,
 			cfg.Errorf("failed to check merge status: %s", err)
 			return ErrAPIFailure
 		}
-		if status.Merged {
+		if status.IsMerged() {
 			mergedSuccess(cfg, list, base, status.Details.SHA)
 			return nil
 		}
-		if !status.Queued {
+		if status.IsFailed() {
 			cfg.Errorf("merge failed: %s", status.Details.Message)
-			cfg.Printf("The stack is atomic, so nothing was merged.")
+			cfg.Printf("Stack merges are atomic, so nothing was merged.")
 			return mergeFailureExit(status.Details.Message)
 		}
 	}
@@ -416,9 +421,15 @@ func mergeFuncs(client github.ClientOps) (mergeview.SubmitFunc, mergeview.PollFu
 }
 
 func toMergeStatus(res *github.AsyncMergeResult) mergeview.MergeStatus {
+	status := mergeview.StatusPending
+	switch {
+	case res.IsMerged():
+		status = mergeview.StatusMerged
+	case res.IsFailed():
+		status = mergeview.StatusFailed
+	}
 	return mergeview.MergeStatus{
-		Queued:  res.Queued,
-		Merged:  res.Merged,
+		Status:  status,
 		Message: res.Details.Message,
 		UUID:    res.Details.UUID,
 		SHA:     res.Details.SHA,

cmd/merge_test.go

@@ -93,10 +93,10 @@ func TestRunMerge_NoArg_MergesWholeStack(t *testing.T) {
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
 			gotPR, gotMethod = pr, method
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 		GetAsyncMergeResultFn: func(pr int, uuid string) (*github.AsyncMergeResult, error) {
-			return &github.AsyncMergeResult{Merged: true, Details: github.AsyncMergeDetails{SHA: "abc1234"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusMerged, Details: github.AsyncMergeDetails{SHA: "abc1234"}}, nil
 		},
 	}
 
@@ -119,7 +119,7 @@ func TestRunMerge_StackNumberArg(t *testing.T) {
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
 			gotPR = pr
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 	}
 
@@ -144,7 +144,7 @@ func TestRunMerge_PRNumberArg(t *testing.T) {
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
 			gotPR = pr
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 	}
 
@@ -166,7 +166,7 @@ func TestRunMerge_SquashFlag(t *testing.T) {
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
 			gotMethod = method
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 	}
 
@@ -314,10 +314,10 @@ func TestRunMerge_PollFailedConflict(t *testing.T) {
 			return remoteStack(7, "main", openStackPR(1, "b1"), openStackPR(2, "b2")), nil
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 		GetAsyncMergeResultFn: func(pr int, uuid string) (*github.AsyncMergeResult, error) {
-			return &github.AsyncMergeResult{Queued: false, Merged: false, Details: github.AsyncMergeDetails{Message: "Merge conflict: could not merge."}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusFailed, Details: github.AsyncMergeDetails{Message: "Merge conflict: could not merge."}}, nil
 		},
 	}
 
@@ -336,7 +336,7 @@ func TestRunMerge_AlreadyMergedOnSubmit(t *testing.T) {
 			return remoteStack(7, "main", openStackPR(1, "b1"), openStackPR(2, "b2")), nil
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
-			return &github.AsyncMergeResult{Merged: true, Details: github.AsyncMergeDetails{SHA: "abc"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusMerged, Details: github.AsyncMergeDetails{SHA: "abc"}}, nil
 		},
 	}
 
@@ -428,7 +428,7 @@ func TestRunMerge_DefaultMethodFallsBackToAllowed(t *testing.T) {
 		},
 		MergeStackAsyncFn: func(pr int, method string) (*github.AsyncMergeResult, error) {
 			gotMethod = method
-			return &github.AsyncMergeResult{Queued: true, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
+			return &github.AsyncMergeResult{Status: github.AsyncMergeStatusPending, Details: github.AsyncMergeDetails{UUID: "u"}}, nil
 		},
 	}
 

internal/github/merge_async.go

@@ -65,9 +65,9 @@ func (c RepoMergeConfig) Allows(method string) bool {
 }
 
 // AsyncMergeDetails is the polymorphic "details" object shared by the submit and
-// poll responses. Fields are populated based on the current state: a queued
-// request carries UUID/MergeMethod/ExpectedHeadSHA, an already-merged result
-// carries SHA, and a failed/not-mergeable result carries only Message.
+// poll responses. Fields are populated based on the current state: a pending
+// request carries UUID/MergeMethod/ExpectedHeadSHA, a merged result carries SHA,
+// and a failed/not-mergeable result carries only Message.
 type AsyncMergeDetails struct {
 	Message         string `json:"message"`
 	UUID            string `json:"uuid"`
@@ -77,18 +77,33 @@ type AsyncMergeDetails struct {
 }
 
 // AsyncMergeResult is the response body returned by both the submit and poll
-// async merge endpoints. The Queued/Merged flags distinguish an enqueued merge
-// (202) from an already-merged pull request (200).
+// async merge endpoints. Status is one of the AsyncMergeStatus* values:
+// "pending" (running in the background), "merged" (completed), or "failed".
 type AsyncMergeResult struct {
-	Queued  bool              `json:"queued"`
-	Merged  bool              `json:"merged"`
+	Status  string            `json:"status"`
 	Details AsyncMergeDetails `json:"details"`
 }
 
-// InProgress reports whether the merge is still queued (running in the
-// background).
-func (r *AsyncMergeResult) InProgress() bool {
-	return r != nil && r.Queued && !r.Merged
+// Async merge status values returned in the response's "status" field.
+const (
+	AsyncMergeStatusPending = "pending"
+	AsyncMergeStatusMerged  = "merged"
+	AsyncMergeStatusFailed  = "failed"
+)
+
+// IsMerged reports whether the merge completed successfully.
+func (r *AsyncMergeResult) IsMerged() bool {
+	return r != nil && r.Status == AsyncMergeStatusMerged
+}
+
+// IsFailed reports whether the merge was attempted but did not complete.
+func (r *AsyncMergeResult) IsFailed() bool {
+	return r != nil && r.Status == AsyncMergeStatusFailed
+}
+
+// IsPending reports whether the merge is still running in the background.
+func (r *AsyncMergeResult) IsPending() bool {
+	return r != nil && r.Status == AsyncMergeStatusPending
 }
 
 // RepoMergeConfig fetches the repository's allowed merge methods and the

internal/github/merge_async_test.go

@@ -50,7 +50,7 @@ func testAsyncClient(t *testing.T, status int, respBody string, rec *recordedReq
 
 func TestMergeStackAsync_Accepted(t *testing.T) {
 	var rec recordedRequest
-	body := `{"queued":true,"merged":false,"details":{"message":"Merge request enqueued.","uuid":"u-1","merge_method":"squash","expected_head_sha":"abc"}}`
+	body := `{"status":"pending","details":{"message":"Merge request enqueued.","uuid":"u-1","merge_method":"squash","expected_head_sha":"abc"}}`
 	c := testAsyncClient(t, http.StatusAccepted, body, &rec)
 
 	res, err := c.MergeStackAsync(42, "squash")
@@ -60,33 +60,32 @@ func TestMergeStackAsync_Accepted(t *testing.T) {
 	assert.Equal(t, "/repos/o/r/pulls/42/merge-async", rec.path)
 	assert.JSONEq(t, `{"merge_method":"squash"}`, rec.body)
 
-	assert.True(t, res.Queued)
-	assert.False(t, res.Merged)
+	assert.True(t, res.IsPending())
+	assert.False(t, res.IsMerged())
 	assert.Equal(t, "u-1", res.Details.UUID)
 	assert.Equal(t, "squash", res.Details.MergeMethod)
-	assert.True(t, res.InProgress())
 }
 
 func TestMergeStackAsync_AlreadyMerged(t *testing.T) {
-	body := `{"queued":false,"merged":true,"details":{"message":"Pull request is already merged.","sha":"deadbeef"}}`
+	body := `{"status":"merged","details":{"message":"Pull request is already merged.","sha":"deadbeef"}}`
 	res, err := testAsyncClient(t, http.StatusOK, body, nil).MergeStackAsync(42, "merge")
 	require.NoError(t, err)
-	assert.True(t, res.Merged)
+	assert.True(t, res.IsMerged())
 	assert.Equal(t, "deadbeef", res.Details.SHA)
 }
 
 func TestMergeStackAsync_ExistingRequestConflict(t *testing.T) {
 	// The go-gh REST client discards the 409 body, so we can't recover the
 	// existing UUID; the request surfaces as a clear "already exists" error.
-	_, err := testAsyncClient(t, http.StatusConflict, `{"queued":true,"merged":false,"details":{"uuid":"u-2"}}`, nil).MergeStackAsync(42, "merge")
+	_, err := testAsyncClient(t, http.StatusConflict, `{"status":"pending","details":{"uuid":"u-2"}}`, nil).MergeStackAsync(42, "merge")
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "already exists")
 }
 
 func TestMergeStackAsync_NotMergeable(t *testing.T) {
 	// A 400 preflight failure is reported as a clear error (the specific
 	// details.message isn't recoverable through the REST client).
-	_, err := testAsyncClient(t, http.StatusBadRequest, `{"queued":false,"merged":false,"details":{"message":"Pull request is closed."}}`, nil).MergeStackAsync(42, "merge")
+	_, err := testAsyncClient(t, http.StatusBadRequest, `{"status":"failed","details":{"message":"Pull request is closed."}}`, nil).MergeStackAsync(42, "merge")
 	require.Error(t, err)
 	assert.Contains(t, err.Error(), "can no longer be merged")
 }
@@ -106,12 +105,11 @@ func TestGetAsyncMergeResult_States(t *testing.T) {
 	tests := []struct {
 		name       string
 		body       string
-		wantQueued bool
-		wantMerged bool
+		wantStatus string
 	}{
-		{"pending", `{"queued":true,"merged":false,"details":{"message":"Merge request is in progress.","uuid":"u","merge_method":"merge","expected_head_sha":"abc"}}`, true, false},
-		{"merged", `{"queued":false,"merged":true,"details":{"message":"Pull request was merged.","sha":"abc"}}`, false, true},
-		{"failed", `{"queued":false,"merged":false,"details":{"message":"Merge conflict."}}`, false, false},
+		{"pending", `{"status":"pending","details":{"message":"Merge request is in progress.","uuid":"u","merge_method":"merge","expected_head_sha":"abc"}}`, AsyncMergeStatusPending},
+		{"merged", `{"status":"merged","details":{"message":"Pull request was merged.","sha":"abc"}}`, AsyncMergeStatusMerged},
+		{"failed", `{"status":"failed","details":{"message":"Merge conflict."}}`, AsyncMergeStatusFailed},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -120,8 +118,7 @@ func TestGetAsyncMergeResult_States(t *testing.T) {
 			require.NoError(t, err)
 			assert.Equal(t, http.MethodGet, rec.method)
 			assert.Equal(t, "/repos/o/r/pulls/42/merge-async/u", rec.path)
-			assert.Equal(t, tt.wantQueued, res.Queued)
-			assert.Equal(t, tt.wantMerged, res.Merged)
+			assert.Equal(t, tt.wantStatus, res.Status)
 		})
 	}
 }
@@ -150,12 +147,24 @@ func TestRepoMergeConfig_AllowedMethods(t *testing.T) {
 	assert.Empty(t, empty.AllowedMethods())
 }
 
-func TestAsyncMergeResult_InProgress(t *testing.T) {
-	assert.True(t, (&AsyncMergeResult{Queued: true}).InProgress())
-	assert.False(t, (&AsyncMergeResult{Queued: true, Merged: true}).InProgress())
-	assert.False(t, (&AsyncMergeResult{}).InProgress())
+func TestAsyncMergeResult_Status(t *testing.T) {
+	pending := &AsyncMergeResult{Status: AsyncMergeStatusPending}
+	assert.True(t, pending.IsPending())
+	assert.False(t, pending.IsMerged())
+	assert.False(t, pending.IsFailed())
+
+	merged := &AsyncMergeResult{Status: AsyncMergeStatusMerged}
+	assert.True(t, merged.IsMerged())
+	assert.False(t, merged.IsPending())
+
+	failed := &AsyncMergeResult{Status: AsyncMergeStatusFailed}
+	assert.True(t, failed.IsFailed())
+	assert.False(t, failed.IsMerged())
+
 	var nilRes *AsyncMergeResult
-	assert.False(t, nilRes.InProgress())
+	assert.False(t, nilRes.IsPending())
+	assert.False(t, nilRes.IsMerged())
+	assert.False(t, nilRes.IsFailed())
 }
 
 // sanity check that the submit body omits merge_method when empty.

internal/github/mock_client.go

@@ -135,7 +135,7 @@ func (m *MockClient) MergeStackAsync(prNumber int, method string) (*AsyncMergeRe
 		return m.MergeStackAsyncFn(prNumber, method)
 	}
 	return &AsyncMergeResult{
-		Queued: true,
+		Status: AsyncMergeStatusPending,
 		Details: AsyncMergeDetails{
 			Message:     "Merge request enqueued.",
 			UUID:        "mock-uuid",
@@ -149,7 +149,7 @@ func (m *MockClient) GetAsyncMergeResult(prNumber int, uuid string) (*AsyncMerge
 		return m.GetAsyncMergeResultFn(prNumber, uuid)
 	}
 	return &AsyncMergeResult{
-		Merged: true,
+		Status: AsyncMergeStatusMerged,
 		Details: AsyncMergeDetails{
 			Message: "Pull request was merged.",
 			SHA:     "mockmergesha",

internal/tui/mergeview/model.go

@@ -262,15 +262,19 @@ func (m Model) handleSubmitDone(msg submitDoneMsg) (tea.Model, tea.Cmd) {
 	m.status = msg.status
 	m.message = msg.status.Message
 
-	switch {
-	case msg.status.Merged:
+	switch msg.status.Status {
+	case StatusMerged:
 		m.merged = true
 		return m.finish()
-	case msg.status.Queued && msg.status.UUID != "":
-		// Enqueued (or an existing request adopted): start polling.
-		return m, m.pollTickCmd()
+	case StatusFailed:
+		m.failed = true
+		return m.finish()
 	default:
-		// Not queued and not merged: the PR could not be merged (e.g. 400).
+		// Pending (enqueued, or an existing request adopted): poll if we have a
+		// UUID; otherwise this is unexpected, so treat it as a failure.
+		if msg.status.UUID != "" {
+			return m, m.pollTickCmd()
+		}
 		m.failed = true
 		return m.finish()
 	}
@@ -287,15 +291,16 @@ func (m Model) handlePollDone(msg pollDoneMsg) (tea.Model, tea.Cmd) {
 	m.status = msg.status
 	m.message = msg.status.Message
 
-	switch {
-	case msg.status.Merged:
+	switch msg.status.Status {
+	case StatusMerged:
 		m.merged = true
 		return m.finish()
-	case msg.status.Queued:
-		return m, m.pollTickCmd()
-	default:
+	case StatusFailed:
 		m.failed = true
 		return m.finish()
+	default:
+		// Still pending: keep polling.
+		return m, m.pollTickCmd()
 	}
 }