diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go
index a1f9db6a..9c949810 100644
--- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go
+++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/integration_test.go
@@ -197,11 +197,11 @@ const trunkHead = "3333333333333333333333333333333333333333"
 // trunk writes the gate's source.main naming head as novox/mesh-catalog's trunk head, and answers its revision.
 func (b *bed) trunk(t *testing.T, head string) uint64 {
 	t.Helper()
-	data, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByMainValue{V: keys.Version, Group: "g", Heads: map[string]string{"novox/mesh-catalog": head}})
+	data, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByBranchValue{V: keys.Version, Group: "g", Heads: map[string]string{"novox/mesh-catalog": head}})
 	if err != nil {
 		t.Fatal(err)
 	}
-	rev, err := b.source.Put(b.ctx, meshdeliveryclient.SourceMainKey, data)
+	rev, err := b.source.Put(b.ctx, meshdeliveryclient.SourceKey("main"), data)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/optional.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/optional.go
index 09324c26..87ba0c67 100644
--- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/optional.go
+++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/optional.go
@@ -6,8 +6,6 @@ import (
 	"sync"
 
 	"github.com/nats-io/nats.go/jetstream"
-
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient"
 )
 
 // **A part does not stop for a bucket it can work without** (mesh-sdk process.EssentialBucket, OptionalBucket) (novox/hq issue 1945, met twice on 2026-10-25: the builder of
@@ -43,7 +41,7 @@ func (t *trunkSource) ensure() error {
 	if err != nil {
 		return fmt.Errorf("the bucket %s cannot be read (%v)", sourceBucket, err)
 	}
-	w, err := kv.Watch(t.ctx, meshdeliveryclient.SourceMainKey, jetstream.IncludeHistory())
+	w, err := kv.WatchAll(t.ctx, jetstream.IncludeHistory()) // every watched branch's key: a revision names its head whichever branch it is of (design 47 G §15)
 	if err != nil {
 		return fmt.Errorf("the bucket %s cannot be watched (%v)", sourceBucket, err)
 	}