cre-1601: on 1st round make prior outcome wantShards equal to the current data from the arbiter

Author: mchain0

pkg/workflows/ring/plugin.go

@@ -173,15 +173,6 @@ func (p *Plugin) getHealthyShards(shardHealth map[uint32]int) []uint32 {
 }
 
 func (p *Plugin) Outcome(_ context.Context, outctx ocr3types.OutcomeContext, _ types.Query, aos []types.AttributedObservation) (ocr3types.Outcome, error) {
-	// Bootstrap with 1 shard on first round; subsequent rounds build on prior outcome
-	prior := &pb.Outcome{}
-	if outctx.PreviousOutcome == nil {
-		prior.Routes = map[string]*pb.WorkflowRoute{}
-		prior.State = &pb.RoutingState{Id: outctx.SeqNr, State: &pb.RoutingState_RoutableShards{RoutableShards: 1}}
-	} else if err := proto.Unmarshal(outctx.PreviousOutcome, prior); err != nil {
-		return nil, err
-	}
-
 	currentShardHealth, allWorkflows, nows, wantShardVotes := p.collectShardInfo(aos)
 	p.lggr.Infow("RingOCR Outcome collect shard info", "currentShardHealth", currentShardHealth, "wantShardVotes", wantShardVotes)
 
@@ -202,6 +193,15 @@ func (p *Plugin) Outcome(_ context.Context, outctx ocr3types.OutcomeContext, _ t
 	slices.Sort(votes)
 	wantShards := votes[len(votes)/2]
 
+	// Bootstrap from Arbiter's current shard count on 1st round; subsequent rounds build on prior outcome
+	prior := &pb.Outcome{}
+	if outctx.PreviousOutcome == nil {
+		prior.Routes = map[string]*pb.WorkflowRoute{}
+		prior.State = &pb.RoutingState{Id: outctx.SeqNr, State: &pb.RoutingState_RoutableShards{RoutableShards: wantShards}}
+	} else if err := proto.Unmarshal(outctx.PreviousOutcome, prior); err != nil {
+		return nil, err
+	}
+
 	allWorkflows = uniqueSorted(allWorkflows)
 
 	healthyShards := p.getHealthyShards(currentShardHealth)

pkg/workflows/ring/plugin_test.go

@@ -131,7 +131,9 @@ func TestPlugin_Outcome(t *testing.T) {
 
 		// Check consensus results
 		require.NotNil(t, outcomeProto.State)
-		require.Equal(t, intialSeqNr+1, outcomeProto.State.Id, "ID should match SeqNr")
+		// When bootstrapping without PreviousOutcome, we use wantShards from observations (3)
+		// Since consensus wantShards (3) equals bootstrap shards, no transition needed - ID stays the same
+		require.Equal(t, intialSeqNr, outcomeProto.State.Id, "ID should match SeqNr (no transition needed)")
 		t.Logf("Outcome - ID: %d, HealthyShards: %v", outcomeProto.State.Id, outcomeProto.State.GetRoutableShards())
 		t.Logf("Workflows assigned: %d", len(outcomeProto.Routes))