Merge b6/registry into the registry milestone's join (issue 1966)

node-tools/internal/console/address.go

@@ -321,7 +321,7 @@ func indexOn(conn *bus.Conn, src Source, held announce.Known, before func(announ
 
 	// What should have answered: every assignment of a module that declares tools. Silence is named;
 	// a module with no tools is never a name here.
-	x.Replaces = replacesOf(catalogue.DefaultSeats(), recorded)
+	x.Replaces = replacesOf(catalogue.Seats(), recorded)
 	for _, m := range recorded {
 		if !m.Tools {
 			continue

node-tools/internal/console/manifest_waits_test.go

@@ -36,8 +36,8 @@ func TestTheManifestNamesTheFirstFamiliesOneByOne(t *testing.T) {
 		}
 	}
 	// A wait is no consumer (ADR 0367 §2): what it consumes is the four views families of its first views (ADR 0615 §5, issue
-	// 1966 TLS-5), and nothing else.
-	wantConsumes := []string{"mesh-delivery-assigner.views.placement", "mesh-delivery-assigner.views.seat-holders",
+	// 1966 TLS-5) and the two events of the seat that serves the seat list (ADR 0636 §4), and nothing else.
+	wantConsumes := []string{"mesh-catalog.seat-definition-changed", "mesh-catalog.seat-definition-removed", "mesh-delivery-assigner.views.placement", "mesh-delivery-assigner.views.seat-holders",
 		"mesh-delivery-indexer.views.manifests", "mesh-delivery-indexer.views.modules"}
 	if !reflect.DeepEqual(m.Consumes, wantConsumes) {
 		t.Errorf("the tool runner consumes %v, want %v", m.Consumes, wantConsumes)

node-tools/internal/console/mcp.go

@@ -75,7 +75,7 @@ func (s *Surface) seatsAnswer() map[string]any {
 	placed, err := seatHoldersOn(s.src)
 	x := &index{Placed: placed}
 	seats := []map[string]any{}
-	for _, st := range catalogue.DefaultSeats() {
+	for _, st := range catalogue.Seats() {
 		holders := x.placedHolders(st.Name, "")
 		if holders == nil {
 			holders = []delivery.SeatHolder{}

node-tools/internal/console/search_test.go

@@ -46,7 +46,7 @@ func meshToSearch(t *testing.T) *index {
 			Description: does, Subject: "mesh.mod.docker.tool." + tool + ".anchor"})
 	}
 	x, _, _ := indexOfEndpoints(endpoints)
-	x.Replaces = replacesOf(catalogue.DefaultSeats(), []recordedModule{{Module: "docker", On: []string{"anchor"}, Tools: true,
+	x.Replaces = replacesOf(catalogue.Seats(), []recordedModule{{Module: "docker", On: []string{"anchor"}, Tools: true,
 		Replaces: map[string][]string{"docker_list": {"docker ps"}, "docker_logs": {"docker logs"}, "docker_restart": {"docker restart"}}}})
 	return x
 }

node-tools/internal/console/seats_for_tests_test.go

@@ -0,0 +1,10 @@
+package console
+
+import (
+	"git.novox.be/novox/mesh-sdk/go/catalogue"
+	"git.novox.be/novox/mesh-sdk/go/seatlist/seatlisttest"
+)
+
+// The seats the tests describe are given to catalogue as the tool runner gives the ones it read from the bus
+// (novox/hq ADR 0635 §1); catalogue compiles none.
+func init() { catalogue.UseSeats(catalogue.SeatsFromDefinitions(seatlisttest.Definitions())) }