VW0: the view reads the trunk's source by the branch key and the per-branch value

Builds: design 47 G §305 (the state source is kept per watched branch), §431

Claude-Session: https://claude.ai/code/session_01JG73KEq4zoDfM9WtYpcQgZ

modules/mesh-delivery-view/cmd/mesh-delivery-view/integration_test.go

@@ -797,7 +797,7 @@ func TestProcessWholeSaysTheSourceRevisionIsDelivered(t *testing.T) {
 	want, _ := meshwantsclient.EncodeWant(meshwantsclient.Want{Fp: fp, Composed: "sha256:" + strings.Repeat("c", 64)})
 	failed, _ := nodeengineclient.EncodeHave(nodeengine.HaveByNodeModuleValue{Fp: fp, Phase: nodeengineclient.PhaseRunning, Health: nodeengineclient.HealthFailed})
 	good, _ := nodeengineclient.EncodeHave(nodeengine.HaveByNodeModuleValue{Fp: fp, Phase: nodeengineclient.PhaseRunning, Health: nodeengineclient.HealthOK})
-	src, _ := meshdeliveryclient.EncodeSource(meshdelivery.SourceByMainValue{Group: "feat/x", Heads: map[string]string{"novox/web": strings.Repeat("1", 40)}})
+	src, _ := meshdeliveryclient.EncodeSource(meshdelivery.SourceByBranchValue{Group: "feat/x", Heads: map[string]string{"novox/web": strings.Repeat("1", 40)}})
 	for bucket, kv := range map[string][]byte{view.ModulesBucket: mod} {
 		if _, err := kvs[bucket].Put(ctx, "web", kv); err != nil {
 			t.Fatal(err)
@@ -809,7 +809,7 @@ func TestProcessWholeSaysTheSourceRevisionIsDelivered(t *testing.T) {
 	if _, err := kvs[view.HaveBucket].Put(ctx, "ace.web", failed); err != nil {
 		t.Fatal(err)
 	}
-	rev, err := kvs[view.SourceBucket].Put(ctx, meshdeliveryclient.SourceMainKey, src)
+	rev, err := kvs[view.SourceBucket].Put(ctx, meshdeliveryclient.SourceKey("main"), src)
 	if err != nil {
 		t.Fatal(err)
 	}

modules/mesh-delivery-view/internal/view/names.go

@@ -3,6 +3,7 @@ package view
 import (
 	"fmt"
 
+	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient"
 	"git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
 	"git.novox.be/novox/mesh-delivery/sdk/trunk"
 	"git.novox.be/novox/mesh-sdk/go/keys"
@@ -88,3 +89,7 @@ func PackagesKey(module string) (string, error) {
 	}
 	return meshcatalog.PackagesByModuleKey(keys.EscapeName(module)), nil
 }
+
+// trunkSourceKey is the key of the gate's state source for the trunk, the watched branch `main` (design 47 G §305: the source
+// is kept per watched branch, meshdeliveryclient.SourceKey; the view's reads are of the trunk's).
+var trunkSourceKey = meshdeliveryclient.SourceKey("main")

modules/mesh-delivery-view/internal/view/reach.go

@@ -71,7 +71,7 @@ func (m *Model) applyHistory(e Entry) {
 		}
 		m.modHist[e.Key] = h
 	case SourceBucket:
-		if e.Key != meshdeliveryclient.SourceMainKey || e.Deleted || e.Revision == 0 {
+		if e.Key != trunkSourceKey || e.Deleted || e.Revision == 0 {
 			return
 		}
 		src, err := meshdeliveryclient.DecodeSource(e.Value)

modules/mesh-delivery-view/internal/view/reach_test.go

@@ -49,11 +49,11 @@ func TestTheViewDerivesHowFarEachRepositoryReached(t *testing.T) {
 		return append([]Entry{modIn(fpLater, commit, 12, to, true), modIn(fpLater, commit, 12, to, false)}, extra...)
 	}
 	src := func(rev uint64, webHead string) Entry {
-		v, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByMainValue{Group: "g", Heads: map[string]string{web: webHead, sdk: commitS}})
+		v, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByBranchValue{Group: "g", Heads: map[string]string{web: webHead, sdk: commitS}})
 		if err != nil {
 			t.Fatal(err)
 		}
-		return Entry{Bucket: SourceBucket, Key: meshdeliveryclient.SourceMainKey, Value: v, At: t0, Revision: rev, History: true}
+		return Entry{Bucket: SourceBucket, Key: trunkSourceKey, Value: v, At: t0, Revision: rev, History: true}
 	}
 	taken := func(repository, merge string) Entry {
 		key, _ := trunk.RepositoryKey(repository)
@@ -72,7 +72,7 @@ func TestTheViewDerivesHowFarEachRepositoryReached(t *testing.T) {
 	// web changed at A (fpOld) and at C (fpNew); mail first appeared at A. The source named A, B, then C as web's head.
 	world := func(t *testing.T) []Entry {
 		cur, _ := meshdeliveryclient.DecodeSource(src(12, commitC).Value)
-		current := Entry{Bucket: SourceBucket, Key: meshdeliveryclient.SourceMainKey, Revision: 12, At: t0}
+		current := Entry{Bucket: SourceBucket, Key: trunkSourceKey, Revision: 12, At: t0}
 		current.Value, _ = meshdeliveryclient.EncodeSource(cur)
 		return []Entry{src(10, commitA), src(11, commitB), src(12, commitC), current,
 			mod("web", fpOld, commitA, 10, true), modIn(fpNew, commitC, 12, in("t1", "mesh-sdk/go"), true), mod("mail", fpMail, commitA, 0, true),

modules/mesh-delivery-view/internal/view/tiers.go

@@ -13,7 +13,6 @@ import (
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshwatchdogsclient"
 	"git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient"
 	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
-	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshdeliveryclient"
 	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshwantsclient"
 	"git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
 	"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds"
@@ -83,7 +82,7 @@ func (r Reader) Tiers(revision uint64) (Tiers, error) {
 		if r.SourceState.GetEntry == nil {
 			return Tiers{}, fmt.Errorf("the gate's source cannot be read here: name the source revision")
 		}
-		_, rev, err := r.SourceState.GetEntry(meshdeliveryclient.SourceMainKey)
+		_, rev, err := r.SourceState.GetEntry(trunkSourceKey)
 		if err != nil {
 			return Tiers{}, fmt.Errorf("the gate's source: %w", err)
 		}

modules/mesh-delivery-view/internal/view/view.go

@@ -621,7 +621,7 @@ func (m *Model) apply(e Entry) {
 			delete(m.taken, e.Key)
 		}
 	case SourceBucket:
-		if e.Key != meshdeliveryclient.SourceMainKey {
+		if e.Key != trunkSourceKey {
 			return
 		}
 		if e.Deleted {

modules/mesh-delivery-view/internal/view/wants_test.go

@@ -61,11 +61,11 @@ func moduleE(t *testing.T, module, fp string) Entry {
 
 func sourceE(t *testing.T, revision uint64) Entry {
 	t.Helper()
-	v, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByMainValue{Group: "g", Heads: map[string]string{"novox/web": strings.Repeat("1", 40)}})
+	v, err := meshdeliveryclient.EncodeSource(meshdelivery.SourceByBranchValue{Group: "g", Heads: map[string]string{"novox/web": strings.Repeat("1", 40)}})
 	if err != nil {
 		t.Fatal(err)
 	}
-	return Entry{Bucket: SourceBucket, Key: meshdeliveryclient.SourceMainKey, Value: v, At: t0, Revision: revision}
+	return Entry{Bucket: SourceBucket, Key: trunkSourceKey, Value: v, At: t0, Revision: revision}
 }
 
 // 1906/D7 AC7: every want is a row beside the have of its node, with where it stands.