Review of issue 977: keep the plan's own order for its gates, hold a group only for a composed mesh-delivery, keep mark-ready one release, compare with the batch's start, fail a lone cycle (issue 977)

internal/catalogue/delivery_seat.go

@@ -84,6 +84,17 @@ func deliveryVerbs() []Verb {
 				"dry":        "\"true\": what it would retire, changing nothing"}, []string{"why"}, "dry"),
 			// Added after the seat's holder shipped (novox/hq issue 313): optional until mesh-delivery serves it.
 			Optional: true},
+		{Name: "mark-ready", Description: "A reviewer's word that a delivery's head is approved: the holder puts the " +
+			"label mesh/ready on its pull request and then writes \"ready at <head>\", the order the forge counts, " +
+			"as the mesh's own forge account, naming who reviewed it and why. Refused when the delivery's commit is " +
+			"no longer its pull request's head. mesh-delivery then merges it once its checks pass (novox/hq ADR 0364).",
+			Input: schema(map[string]string{"id": "the delivery's id (owner/repository@commit): the head reviewed",
+				"reviewed-by": "who reviewed it, as who@node", "why": "the review's verdict in a line"},
+				[]string{"id", "reviewed-by", "why"}),
+			// Kept one more release, optional (novox/hq issue 1022): mesh-delivery no longer serves it, but the manifest
+			// it still has on the mesh does until its catalogue member merges, and a seat refuses a holder that serves
+			// a verb it does not promise. The next release removes this entry.
+			Optional: true},
 	}
 }
 

internal/catalogue/delivery_seat_test.go

@@ -133,3 +133,32 @@ func TestTheDeliverySeatPromisesTimesOptionally(t *testing.T) {
 		t.Fatalf("a holder serving times: %v", err)
 	}
 }
+
+// The seat still promises `mark-ready`, optionally, for one more release (issue 1022); it was added by novox/hq issue 913: `mark-ready`, with the delivery's id, who reviewed it
+// and why, so a reviewer marks a pull request through one audited verb, label and comment in the order the forge
+// counts, instead of two raw forge calls. Added after the holder shipped, it is optional.
+func TestTheDeliverySeatPromisesMarkReadyOptionally(t *testing.T) {
+	seat, _ := SeatNamed(DeliverySeat)
+	var mark *Verb
+	for i := range seat.Serves {
+		if seat.Serves[i].Name == "mark-ready" {
+			mark = &seat.Serves[i]
+		}
+	}
+	if mark == nil || !mark.Optional {
+		t.Fatalf("the delivery seat promises %v, mark-ready optionally", VerbNames(seat.Serves))
+	}
+	if req, _ := mark.Input["required"].([]string); !reflect.DeepEqual(req, []string{"id", "reviewed-by", "why"}) {
+		t.Errorf("mark-ready requires %v, wanted id, reviewed-by and why", req)
+	}
+	var without []string
+	for _, v := range VerbNames(seat.Serves) {
+		if v != "mark-ready" {
+			without = append(without, v)
+		}
+	}
+	m := Manifest{Module: "mesh-delivery", Claims: []Claim{{Name: DeliverySeat, Scope: ScopeMesh, Serves: without}}}
+	if err := CanHold(m, seat); err != nil {
+		t.Fatalf("a holder without mark-ready yet: %v", err)
+	}
+}

internal/inventory/plans.go

@@ -205,6 +205,10 @@ func (p Plan) Batch() bool { return p.State == PlanAssembling || p.State == Plan
 
 // PlanDelivery is what a walk waits for and what came of the wait (novox/hq ADR 0239).
 type PlanDelivery struct {
+	// Order are the edges the plan's own order was drawn with (novox/hq ADR 0419): verb before caller, version skew,
+	// engine before controller. Kept on the plan because the catalogue's graph does not hold them, and the plan's gates
+	// (a later tier waits for the earlier to be applied) are read from them.
+	Order []Edge `json:"order,omitempty"`
 	// Awaits is who must say the walk may start: the seat whose holder owns the delivery.
 	Awaits string `json:"awaits"`
 	// Go is when it was let go, By by whom (the seat's holder, or a person's name) and Why.

internal/link/build.go

@@ -148,7 +148,8 @@ type CheckRequest struct {
 	// 0406 §4): with the head, what the pull request's key says the current check is for, and what a waiting request
 	// is dropped by and a running check stopped by when the key moves.
 	Trunk string `json:"trunk,omitempty"`
-	// Ready says the pull request is marked ready (ADR 0406 §3): its check is queued before every other check.
+	// Ready says mesh-delivery wants this check queued before every other check (ADR 0406 §3); there is no ready mark
+	// any more (issue 1022).
 	Ready bool `json:"ready,omitempty"`
 	// Composed says the pull request is a member of a delivery group whose gate is the composed check's (novox/hq ADR
 	// 0403 clause 1): this check runs the repository's own merge-check.sh alone, and its gate layer is not run.