fix: show Multiple (pending) when competing submissions exist

Both browse and detail views now count main claimer + upstream PRs as
candidates. When total candidates > 1, claimed_by shows "Multiple
(pending)" instead of just the main claimer.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: julianknutsen

internal/api/types.go

@@ -292,8 +292,24 @@ func toDetailResponse(d *sdk.DetailResult, mode string) *DetailResponse {
 		})
 	}
 
+	itemJSON := toWantedItemJSON(d.Item)
+	// If there are competing upstream submissions, overlay claimed_by to
+	// reflect the full set of candidates (main claimer + upstream PRs).
+	if itemJSON != nil && len(upstreamPRs) > 0 {
+		mainClaimer := itemJSON.ClaimedBy
+		totalCandidates := len(upstreamPRs)
+		if mainClaimer != "" {
+			totalCandidates++
+		}
+		if totalCandidates > 1 {
+			itemJSON.ClaimedBy = "Multiple (pending)"
+		} else if upstreamPRs[0].ClaimedBy != "" {
+			itemJSON.ClaimedBy = upstreamPRs[0].ClaimedBy + " (pending)"
+		}
+	}
+
 	return &DetailResponse{
-		Item:          toWantedItemJSON(d.Item),
+		Item:          itemJSON,
 		Completion:    toCompletionJSON(d.Completion),
 		Stamp:         toStampJSON(d.Stamp),
 		Branch:        d.Branch,

internal/sdk/reads.go

@@ -80,21 +80,23 @@ func (c *Client) Browse(filter commons.BrowseFilter) (*BrowseResult, error) {
 				best = p
 			}
 		}
-		// Only overlay if upstream state is further than current.
+		// Only overlay status if upstream state is further than current.
 		if stateRank[best.Status] > stateRank[items[i].Status] {
 			items[i].Status = best.Status
-			if len(pending) > 1 {
-				items[i].ClaimedBy = "Multiple (pending)"
-			} else if best.ClaimedBy != "" {
-				items[i].ClaimedBy = best.ClaimedBy + " (pending)"
-			}
-		} else if items[i].ClaimedBy == "" && best.RigHandle != "" {
-			// Status not further, but no claimed_by yet — show rig handle.
-			if len(pending) > 1 {
-				items[i].ClaimedBy = "Multiple (pending)"
-			} else {
-				items[i].ClaimedBy = best.RigHandle + " (pending)"
-			}
+		}
+		// Overlay claimed_by to reflect the full set of candidates
+		// (main claimer + upstream PRs).
+		totalCandidates := len(pending)
+		if items[i].ClaimedBy != "" {
+			totalCandidates++
+		}
+		switch {
+		case totalCandidates > 1:
+			items[i].ClaimedBy = "Multiple (pending)"
+		case best.ClaimedBy != "":
+			items[i].ClaimedBy = best.ClaimedBy + " (pending)"
+		case best.RigHandle != "":
+			items[i].ClaimedBy = best.RigHandle + " (pending)"
 		}
 	}
 

internal/sdk/sdk_test.go

@@ -855,10 +855,10 @@ func TestBrowse_PendingFurthestState(t *testing.T) {
 	t.Error("w-1 not found in results")
 }
 
-func TestBrowse_PendingClaimedBy_PreservesExisting(t *testing.T) {
+func TestBrowse_PendingClaimedBy_MultipleWithExisting(t *testing.T) {
 	db := newFakeDB()
 	// In PR mode, branch overlays set ClaimedBy before upstream merge.
-	// Verify upstream doesn't overwrite branch-overlay ClaimedBy.
+	// When there's also an upstream PR, both are candidates → "Multiple (pending)".
 	db.seedItem(fakeItem{ID: "w-1", Title: "Fix bug", Status: "open", Priority: 1, PostedBy: "alice", EffortLevel: "medium"})
 	db.branches["wl/bob/w-1"] = true
 	db.branchItems["wl/bob/w-1"] = map[string]*fakeItem{
@@ -883,9 +883,9 @@ func TestBrowse_PendingClaimedBy_PreservesExisting(t *testing.T) {
 
 	for _, item := range result.Items {
 		if item.ID == "w-1" {
-			// Branch overlay set ClaimedBy="bob"; upstream with same rank should NOT overwrite.
-			if item.ClaimedBy != "bob" {
-				t.Errorf("w-1: expected ClaimedBy='bob' (from branch overlay), got %q", item.ClaimedBy)
+			// bob (branch overlay) + charlie (upstream) = 2 candidates.
+			if item.ClaimedBy != "Multiple (pending)" {
+				t.Errorf("w-1: expected ClaimedBy='Multiple (pending)', got %q", item.ClaimedBy)
 			}
 			return
 		}