Node-engine: the have, the node's facts, the record, the health report and the data items are the seat's contract types, written through the node-engine client; the interim bridge is gone (Have group, ADR 0634 §1, §4; issue 1966)

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

cmd/mesh-host/healthowed_test.go

@@ -3,15 +3,15 @@ package main
 import (
 	"context"
 	"errors"
+	"git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient"
+	"git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
+	"github.com/novox/mesh-host/internal/link"
+	"github.com/novox/mesh-host/internal/liveness"
 	"path/filepath"
 	"strings"
 	"sync"
 	"testing"
 	"time"
-
-	"git.novox.be/novox/mesh-sdk/go/delivery"
-	"github.com/novox/mesh-host/internal/link"
-	"github.com/novox/mesh-host/internal/liveness"
 )
 
 // owedBus is a link that takes reports and statements and keeps a have bucket in memory.
@@ -44,10 +44,10 @@ func (b *owedBus) Set(_ context.Context, key string, value []byte, revision uint
 	return nil
 }
 
-func (b *owedBus) have(key string) (delivery.Have, bool) {
+func (b *owedBus) have(key string) (nodeengine.HaveByNodeModuleValue, bool) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
-	h, err := delivery.DecodeHave(b.kv[key])
+	h, err := nodeengineclient.DecodeHave(b.kv[key])
 	return h, err == nil
 }
 
@@ -66,19 +66,19 @@ func TestAModuleWithNothingLongRunningIsOkWithinALookOfItsApply(t *testing.T) {
 	}
 	fact := link.ModuleFact{Module: "xorg", FP: "src2:" + strings.Repeat("a", 64), Composed: "sha256:" + strings.Repeat("b", 64)}
 	applying := fact
-	applying.Phase = string(delivery.PhaseApplying)
+	applying.Phase = string(nodeengineclient.PhaseApplying)
 	queue.NoteModule(ctx, applying)
 	go judgeWhatRuns(ctx, j, queue, func(string) {}, nil, nil)
 	// The facts look inside the apply, while the module is still applying.
 	queue.SayFacts(ctx, link.Report{Health: &link.Health{Contract: link.LivenessContract, At: time.Now().UTC()}})
-	if h, _ := bus.have("n1.xorg"); h.Health != delivery.HealthUnknown {
+	if h, _ := bus.have("n1.xorg"); h.Health != nodeengineclient.HealthUnknown {
 		t.Fatalf("judged while applying: %+v", h)
 	}
 	queue.NoteModule(ctx, fact)
 	deadline := time.Now().Add(2 * time.Second) // well within one look (liveness.LookEvery, 15 s)
 	for {
 		h, _ := bus.have("n1.xorg")
-		if h.Phase == delivery.PhaseRunning && h.Health == delivery.HealthOK {
+		if h.Phase == nodeengineclient.PhaseRunning && h.Health == nodeengineclient.HealthOK {
 			return
 		}
 		if time.Now().After(deadline) {

cmd/mesh-host/main.go

@@ -1413,7 +1413,7 @@ func healthAsReported(st liveness.Statement, ns *network.Statement) *link.Health
 		h.Network = &link.NetworkHealth{State: ns.State, Since: ns.Since.UTC(), Parts: []link.NetworkPart{}}
 		for _, p := range ns.Parts {
 			h.Network.Parts = append(h.Network.Parts, link.NetworkPart{Part: p.Part, State: p.State, Reason: p.Reason,
-				Said: p.Said, Writer: p.Writer, Owner: p.Owner, Toward: p.Toward, Since: p.Since.UTC(), Streak: p.Streak})
+				Said: p.Said, Writer: p.Writer, Owner: p.Owner, Toward: p.Toward, Since: p.Since.UTC(), Streak: int64(p.Streak)})
 		}
 	}
 	return h

cmd/mesh-host/nodeagent.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient"
 	nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
 	"github.com/novox/mesh-host/internal/compositions"
 	"os"
@@ -86,7 +87,7 @@ func (h sessionHaves) Read(ctx context.Context, module string) (agent.Have, bool
 	if !ok {
 		return agent.Have{}, false
 	}
-	return agent.Have{Module: module, FP: got.FP, Composed: got.Composed, Phase: string(got.Phase), Detail: got.Detail,
+	return agent.Have{Module: module, FP: got.Fp, Composed: got.Composed, Phase: string(got.Phase), Detail: got.Detail,
 		Sealed: got.SealedAt}, true
 }
 
@@ -104,24 +105,24 @@ func (h sessionHaves) ReadErr(ctx context.Context, module string) (agent.Have, b
 	if !ok || err != nil {
 		return agent.Have{}, false, err
 	}
-	return agent.Have{Module: module, FP: got.FP, Composed: got.Composed, Phase: string(got.Phase), Detail: got.Detail,
+	return agent.Have{Module: module, FP: got.Fp, Composed: got.Composed, Phase: string(got.Phase), Detail: got.Detail,
 		Sealed: got.SealedAt}, true, nil
 }
 
 func (h sessionHaves) Write(ctx context.Context, x agent.Have) {
 	if x.Module == agent.NodeModule {
 		// The node's own key holds its facts and the digest of the composition it runs.
-		if x.Phase == "" || x.Phase == string(delivery.PhaseRunning) {
+		if x.Phase == "" || x.Phase == string(nodeengineclient.PhaseRunning) {
 			h.session.NoteNode(ctx, x.Composed, x.Sealed)
 		}
 		return
 	}
 	phase := x.Phase
-	if phase == string(delivery.PhaseRunning) {
+	if phase == string(nodeengineclient.PhaseRunning) {
 		phase = ""
 	}
 	h.session.NoteModule(ctx, link.ModuleFact{Module: x.Module, FP: x.FP, Composed: x.Composed, Phase: phase,
-		Failed: phase == string(delivery.PhaseFailed), Detail: shorten(x.Detail), Judgement: x.Judgement, Waits: x.Waits,
+		Failed: phase == string(nodeengineclient.PhaseFailed), Detail: shorten(x.Detail), Judgement: x.Judgement, Waits: x.Waits,
 		BuildAlone: x.BuildAlone, Kept: x.Kept, Sealed: x.Sealed, PullWait: x.PullWait})
 }
 
@@ -653,7 +654,7 @@ func nodeAgent(ctx context.Context, opts options, signer ed25519.PublicKey, trus
 		composerNow.Store(composer) // what the verb compose asks a pass of, this run's alone
 		env.Composed, env.SelfComposed, env.Policy, env.ComposedToday = composer, true, composer.Policy, composer.ComposedToday
 		env.HoldsData = composer.HoldsData // what runs from the kept declaration says Data as its manifest does
-		session.NoteComposes(linked, delivery.ComposesOwn, "it composes its own modules, and applies no composition made elsewhere")
+		session.NoteComposes(linked, nodeengineclient.ComposesOwn, "it composes its own modules, and applies no composition made elsewhere")
 		ag = agent.New(env)
 		own.set(ag)
 		current.set(ag)

cmd/mesh-host/nodeagent_integration_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	nodeengine "git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
+	"github.com/novox/mesh-host/internal/buckets"
 	engcomp "github.com/novox/mesh-host/internal/compositions"
 	"os"
 	"path/filepath"
@@ -136,7 +137,7 @@ func newItBedAs(t *testing.T, perms nodegrant.Permissions) *itBed {
 		into    *nats.KeyValue
 		history uint8
 	}{{delivery.AssignerWantsBucket, &b.wants, 8}, {composedBucket, &b.composed, engcomp.History},
-		{delivery.HaveBucket, &b.haves, delivery.HaveHistory}} {
+		{buckets.Have, &b.haves, buckets.HaveHistory}} {
 		kv, err := b.js.CreateKeyValue(&nats.KeyValueConfig{Bucket: c.name, History: c.history})
 		if err != nil {
 			t.Fatal(err)
@@ -200,13 +201,13 @@ func (b *itBed) file(module string) string {
 	return string(got)
 }
 
-func (b *itBed) have(module string) delivery.Have {
-	key, _ := delivery.HaveKey(itNode, module)
+func (b *itBed) have(module string) nodeengine.HaveByNodeModuleValue {
+	key, _ := nec.HaveKey(itNode, module)
 	e, err := b.haves.Get(key)
 	if err != nil {
-		return delivery.Have{}
+		return nodeengine.HaveByNodeModuleValue{}
 	}
-	h, _ := delivery.DecodeHave(e.Value())
+	h, _ := nec.DecodeHave(e.Value())
 	return h
 }
 
@@ -293,11 +294,11 @@ func h8once(t *testing.T, b *itBed, resolved, candidates nats.KeyValue, place []
 	if settled == 0 {
 		t.Fatal("feat-x was never answered")
 	}
-	hkey, _ := delivery.HaveKey(itNode, "web")
+	hkey, _ := nec.HaveKey(itNode, "web")
 	for _, detail := range []string{"its tool web_health: no link to the bus is open", "its tool web_health: no answer within 10s"} {
 		h := b.have("web")
-		h.Health, h.Detail = delivery.HealthFailed, detail
-		raw, err := delivery.EncodeHave(h)
+		h.Health, h.Detail = nec.HealthFailed, detail
+		raw, err := nec.EncodeHave(h)
 		if err != nil {
 			t.Fatal(err)
 		}
@@ -334,15 +335,15 @@ func h8once(t *testing.T, b *itBed, resolved, candidates nats.KeyValue, place []
 // composes its own.
 func h8back(t *testing.T, b *itBed, placement, resolved, candidates nats.KeyValue, hkey string) {
 	t.Helper()
-	node := func() delivery.HaveNode {
+	node := func() nodeengine.HaveByNodeNodeValue {
 		e, err := b.haves.Get(hkey)
 		if err != nil {
-			return delivery.HaveNode{}
+			return nodeengine.HaveByNodeNodeValue{}
 		}
-		n, _ := delivery.DecodeHaveNode(e.Value())
+		n, _ := nec.DecodeHaveNode(e.Value())
 		return n
 	}
-	if n := node(); n.Composes != delivery.ComposesOwn {
+	if n := node(); n.Composes != nec.ComposesOwn {
 		t.Errorf("a node composing its own says it composes %q", n.Composes)
 	}
 	craw, err := delivery.EncodePlacementCandidate(delivery.PlacementCandidate{Proposal: "revert-x"})
@@ -377,10 +378,10 @@ func h8back(t *testing.T, b *itBed, placement, resolved, candidates nats.KeyValu
 	b.mu.Lock()
 	said := strings.Join(b.said, "\n")
 	b.mu.Unlock()
-	if n := node(); n.Composes != delivery.ComposesOwn || strings.Contains(said, "applying the controller's compositions") {
+	if n := node(); n.Composes != nec.ComposesOwn || strings.Contains(said, "applying the controller's compositions") {
 		t.Errorf("without its placement the node turned to the controller's compositions: %q", n.Composes)
 	}
-	if h := b.have("web"); h.Composed != ran || h.Phase == delivery.PhaseFailed || b.file("web") != "greeting=salut\n" {
+	if h := b.have("web"); h.Composed != ran || h.Phase == nec.PhaseFailed || b.file("web") != "greeting=salut\n" {
 		t.Errorf("without its placement what runs moved: %+v, %q", h, b.file("web"))
 	}
 }
@@ -422,12 +423,12 @@ func h8(t *testing.T, b *itBed, checkBuild bool) (func(), h8state) {
 	fp := fpIt("a")
 	modv, _ := delivery.EncodeModule(delivery.Module{FP2: fp, Manifest: digest, Repository: "novox/web", Commit: strings.Repeat("1", 40)})
 	place, _ := delivery.EncodePlacement(delivery.Placement{Node: itNode, Modules: []delivery.PlacedModule{{Module: "web"}}})
-	rec, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: itNode, Capabilities: []string{"service-manager", "package-manager"}}})
+	rec, _ := nec.EncodeHaveNode(nodeengine.HaveByNodeNodeValue{Record: &nodeengine.NodeRecord{Node: itNode, Capabilities: []string{"service-manager", "package-manager"}}})
 	// it1 in one key per module and node (research 072 row 37), it2 in the form before: a node reads both.
 	pkey, _ := delivery.PlacementNodeKey(itNode)
 	places, _ := delivery.PlacementValues(delivery.Placement{Node: itNode, Modules: []delivery.PlacedModule{{Module: "web"}}})
 	place = places[pkey]
-	hkey, _ := delivery.HaveNodeKey(itNode)
+	hkey, _ := nec.HaveNodeKey(itNode)
 	// A provider on it2 serving from its own config value: a mail domain, which it1's composition settles.
 	mailer := `{"module":"mailer","version":"1","config":{"domain":{"type":"string","description":"the mail domain","required":true}},` +
 		`"provides":[{"name":"smtp","scope":"mesh"}],"serves":{"smtp":{"port":587,"domain":"${config:domain}"}}}`
@@ -436,9 +437,9 @@ func h8(t *testing.T, b *itBed, checkBuild bool) (func(), h8state) {
 	mlkey, _ := delivery.ManifestsKey(mdigest)
 	mlmod, _ := delivery.EncodeModule(delivery.Module{FP2: fpIt("b"), Manifest: mdigest, Repository: "novox/mailer", Commit: strings.Repeat("2", 40)})
 	place2, _ := delivery.EncodePlacement(delivery.Placement{Node: "it2", Modules: []delivery.PlacedModule{{Module: "mailer"}}})
-	rec2, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: "it2", Capabilities: []string{"service-manager"}}})
+	rec2, _ := nec.EncodeHaveNode(nodeengine.HaveByNodeNodeValue{Record: &nodeengine.NodeRecord{Node: "it2", Capabilities: []string{"service-manager"}}})
 	pkey2, _ := delivery.LegacyPlacementKey("it2")
-	hkey2, _ := delivery.HaveNodeKey("it2")
+	hkey2, _ := nec.HaveNodeKey("it2")
 	buildKey, _ := delivery.BuilderBuildKey("web", fp)
 	done, _ := delivery.EncodeBuilderBuild(delivery.BuilderBuild{State: delivery.BuildDone, Manifest: digest,
 		Artifacts: []delivery.BuiltArtifact{{Name: "files", Kind: "archive", Reference: "artifact-store://web/files/blobs/" + fpDigest("f"), Digest: fpDigest("f")}}})
@@ -503,7 +504,7 @@ func h8rest(t *testing.T, b *itBed, resolved, candidates nats.KeyValue, hkey str
 	t.Helper()
 	within(t, 2*time.Second, "the have does not name the build", func() bool {
 		h := b.have("web")
-		return h.FP == fp && h.Composed != "" && h.Phase == delivery.PhaseRunning
+		return h.Fp == fp && h.Composed != "" && h.Phase == nec.PhaseRunning
 	})
 	// ADR 0593 §6: the node publishes what it composed in its composition state, under its own grant: web at the build
 	// its want names, with the digest its have names (the plan left out of it), and the node's own.
@@ -527,7 +528,7 @@ func h8rest(t *testing.T, b *itBed, resolved, candidates nats.KeyValue, hkey str
 	within(t, 3*time.Second, "a changed config value was not composed and applied again", func() bool { return b.file("web") == "greeting=salut\n" })
 	within(t, 2*time.Second, "the have does not name the revision", func() bool {
 		h := b.have("web")
-		return h.FP == fp && h.Composed != first && h.Phase == delivery.PhaseRunning
+		return h.Fp == fp && h.Composed != first && h.Phase == nec.PhaseRunning
 	})
 
 	// The node says its facts (its record, as the test wrote it), then a candidate equal to its placement is written: the
@@ -551,7 +552,7 @@ func h8rest(t *testing.T, b *itBed, resolved, candidates nats.KeyValue, hkey str
 		if err != nil {
 			return false
 		}
-		n, err := delivery.DecodeHaveNode(e.Value())
+		n, err := nec.DecodeHaveNode(e.Value())
 		wire, _ := json.Marshal(n.Candidates["feat-x"])
 		_ = json.Unmarshal(wire, &answer)
 		return err == nil && answer.Proposal == "feat-x" && n.Record != nil
@@ -787,13 +788,13 @@ func TestNatsTheBusServerIsTakenOverAndReplacedOnlyWhenItsBuildChangesIt(t *test
 			t.Fatal(err)
 		}
 	}
-	rec, _ := delivery.EncodeHaveNode(delivery.HaveNode{Record: &delivery.NodeRecord{Node: itNode,
+	rec, _ := nec.EncodeHaveNode(nodeengine.HaveByNodeNodeValue{Record: &nodeengine.NodeRecord{Node: itNode,
 		Capabilities: []string{"service-manager", "package-manager", "container-runtime"}}})
-	hkey, _ := delivery.HaveNodeKey(itNode)
+	hkey, _ := nec.HaveNodeKey(itNode)
 	places, _ := delivery.PlacementValues(delivery.Placement{Node: itNode, Modules: []delivery.PlacedModule{{Module: "nats"}}})
 	// The have the engine wrote of the folded bus: the old-form build, no fingerprint.
-	natsHave, _ := delivery.HaveKey(itNode, "nats")
-	oldHave, _ := delivery.EncodeHave(delivery.Have{Build: "build-1792674595610176744", Phase: delivery.PhaseRunning, Health: delivery.HealthOK})
+	natsHave, _ := nec.HaveKey(itNode, "nats")
+	oldHave, _ := nec.EncodeHave(nodeengine.HaveByNodeModuleValue{Build: "build-1792674595610176744", Phase: nec.PhaseRunning, Health: nec.HealthOK})
 	for key, value := range map[string][]byte{hkey: rec, natsHave: oldHave} {
 		if _, err := b.haves.Put(key, value); err != nil {
 			t.Fatal(err)
@@ -848,7 +849,7 @@ func TestNatsTheBusServerIsTakenOverAndReplacedOnlyWhenItsBuildChangesIt(t *test
 	within(t, 10*time.Second, "the bus module's first want was not applied", func() bool {
 		h := b.have("nats")
 		got, _ := os.ReadFile(conf)
-		return h.FP == first && h.Phase == delivery.PhaseRunning && string(got) == "listen: new\n"
+		return h.Fp == first && h.Phase == nec.PhaseRunning && string(got) == "listen: new\n"
 	})
 	if moved := runtime.moved(server); len(moved) != 0 || runtime.containers[server] != made {
 		t.Fatalf("the first want moved the bus server its build does not change: %v", moved)
@@ -871,10 +872,10 @@ func TestNatsTheBusServerIsTakenOverAndReplacedOnlyWhenItsBuildChangesIt(t *test
 	busWant(delivery.Want{FP: next, Self: true})
 	within(t, 10*time.Second, "the build that changes the server was not applied", func() bool {
 		h := b.have("nats")
-		if h.Phase == delivery.PhaseWaitingYes && h.Waits != "" {
+		if h.Phase == nec.PhaseWaitingYes && h.Waits != "" {
 			busWant(delivery.Want{FP: next, Self: true, Yes: h.Waits})
 		}
-		return h.FP == next && h.Phase == delivery.PhaseRunning
+		return h.Fp == next && h.Phase == nec.PhaseRunning
 	})
 	var runs int
 	for _, a := range runtime.moved(server) {

cmd/mesh-host/trust.go

@@ -7,6 +7,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient"
+	"git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
 	"os"
 	"path/filepath"
 	"strings"
@@ -193,7 +195,7 @@ func placedAllHave(ctx context.Context, session *link.Session, node string) (boo
 	if err != nil {
 		return false, err.Error()
 	}
-	return allHave(p, func(module string) (delivery.Have, bool, error) {
+	return allHave(p, func(module string) (nodeengine.HaveByNodeModuleValue, bool, error) {
 		return session.ReadHaveErr(ctx, module)
 	})
 }
@@ -226,7 +228,7 @@ func placedModules(node string, values map[string][]byte) (delivery.Placement, e
 // declaration is the one record of what runs of it: retired then, the node's own composed it as nothing and refused to
 // remove what runs (issue 774, 2026-10-30 19:43: systemd-resolved on shanks, nats and restic on novox, each node's own
 // apply refused from then on).
-func allHave(p delivery.Placement, has func(module string) (delivery.Have, bool, error)) (bool, string) {
+func allHave(p delivery.Placement, has func(module string) (nodeengine.HaveByNodeModuleValue, bool, error)) (bool, string) {
 	if len(p.Modules) == 0 {
 		return false, "the seat mesh-placement places no module here"
 	}
@@ -240,7 +242,7 @@ func allHave(p delivery.Placement, has func(module string) (delivery.Have, bool,
 		}
 		// A module the mesh provides (mesh-wireguard) never has a fingerprint: the node's own composes it from the manifest
 		// mesh-sdk provides (delivery.ProvidedManifest), never from the kept declaration, so it keeps no read.
-		if h.Phase != delivery.PhaseRemoved && !strings.HasPrefix(h.FP, delivery.SourcePrefix2) && !delivery.ProvidedByMesh(m.Module) {
+		if h.Phase != nodeengineclient.PhaseRemoved && !strings.HasPrefix(h.Fp, delivery.SourcePrefix2) && !delivery.ProvidedByMesh(m.Module) {
 			return false, m.Module + " runs at a build of the old form (" + h.Build + "), which only the kept declaration records"
 		}
 	}

cmd/mesh-host/whatruns_test.go

@@ -5,6 +5,8 @@ import (
 	"crypto/ed25519"
 	"encoding/json"
 	"errors"
+	"git.novox.be/novox/mesh-contracts/go/clients/nodeengineclient"
+	"git.novox.be/novox/mesh-contracts/go/seats/nodeengine"
 	engcomp "github.com/novox/mesh-host/internal/compositions"
 	"path/filepath"
 	"sort"
@@ -120,24 +122,24 @@ func TestDeclaredNowReadsWhatRunsWhenTheAgentIsRunning(t *testing.T) {
 	placed := delivery.Placement{Node: "n1", Modules: []delivery.PlacedModule{{Module: "zsh"}, {Module: "lemurs"}}}
 	// Issue 774, 2026-10-30 19:43: a have naming only a build of the old form (systemd-resolved on shanks, folded in the
 	// node's own) keeps the kept declaration read, since it is the one record of what runs of it.
-	newForm := delivery.Have{FP: delivery.SourcePrefix2 + strings.Repeat("a", 64), Phase: delivery.PhaseRunning}
-	oldForm := delivery.Have{Build: "build-1791404191702719760", Phase: delivery.PhaseRunning}
+	newForm := nodeengine.HaveByNodeModuleValue{Fp: delivery.SourcePrefix2 + strings.Repeat("a", 64), Phase: nodeengineclient.PhaseRunning}
+	oldForm := nodeengine.HaveByNodeModuleValue{Build: "build-1791404191702719760", Phase: nodeengineclient.PhaseRunning}
 	for _, row := range []struct {
 		name string
-		has  map[string]delivery.Have
+		has  map[string]nodeengine.HaveByNodeModuleValue
 		want bool
 	}{
-		{"every placed module has a have of the new form", map[string]delivery.Have{"zsh": newForm, "lemurs": newForm}, true},
-		{"one has none yet", map[string]delivery.Have{"zsh": newForm}, false},
-		{"one runs at a build of the old form", map[string]delivery.Have{"zsh": newForm, "lemurs": oldForm}, false},
+		{"every placed module has a have of the new form", map[string]nodeengine.HaveByNodeModuleValue{"zsh": newForm, "lemurs": newForm}, true},
+		{"one has none yet", map[string]nodeengine.HaveByNodeModuleValue{"zsh": newForm}, false},
+		{"one runs at a build of the old form", map[string]nodeengine.HaveByNodeModuleValue{"zsh": newForm, "lemurs": oldForm}, false},
 	} {
-		if got, why := allHave(placed, func(m string) (delivery.Have, bool, error) { h, ok := row.has[m]; return h, ok, nil }); got != row.want {
+		if got, why := allHave(placed, func(m string) (nodeengine.HaveByNodeModuleValue, bool, error) { h, ok := row.has[m]; return h, ok, nil }); got != row.want {
 			t.Errorf("%s: %v (%s)", row.name, got, why)
 		}
 	}
 	// The module the mesh provides never has a fingerprint, and keeps no read (review of issue 774).
 	withWireguard := delivery.Placement{Node: "n1", Modules: []delivery.PlacedModule{{Module: "zsh"}, {Module: overlay.Name}}}
-	if got, why := allHave(withWireguard, func(m string) (delivery.Have, bool, error) {
+	if got, why := allHave(withWireguard, func(m string) (nodeengine.HaveByNodeModuleValue, bool, error) {
 		if m == overlay.Name {
 			return oldForm, true, nil
 		}