From b2db504ab2fb34c8a757fd73518ddde012342dba Mon Sep 17 00:00:00 2001
From: jochen <jschoubben@gmail.com>
Date: Thu, 5 Nov 2026 14:31:04 +0100
Subject: [PATCH] =?UTF-8?q?Build,=20image,=20node,=20distribution=20and=20?=
 =?UTF-8?q?gitea=20take=20parts,=20buildstep=20and=20composer=20from=20mes?=
 =?UTF-8?q?h-delivery-sdk;=20seatgen's=20client=20check=20allows=20a=20cli?=
 =?UTF-8?q?ent's=20own=20packages=20and=20its=20-go-module=20has=20no=20ro?=
 =?UTF-8?q?ot=20default;=20the=20build=20module=20writes=20its=20finding?=
 =?UTF-8?q?=20through=20the=20conditions=20client=20(K-4..K-20=20part;=20A?=
 =?UTF-8?q?DR=200634=20=C2=A73,=20=C2=A74,=20ADR=200635=20=C2=A74;=20issue?=
 =?UTF-8?q?=201966)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cmd/distribution-tools/main.go            |  2 +-
 modules/distribution/go.mod                   |  1 +
 .../distribution/internal/holder/transfer.go  |  2 +-
 .../gitea/cmd/package-registry/incoming.go    |  2 +-
 modules/gitea/cmd/package-registry/seats.go   |  2 +-
 modules/gitea/go.mod                          |  1 +
 modules/gitea/internal/packageseats/holder.go |  2 +-
 .../internal/packageseats/holder_test.go      |  2 +-
 .../mesh-build-go/buildstep/askrun_test.go    |  2 +-
 modules/mesh-build-go/buildstep/capacity.go   |  2 +-
 .../buildstep/cmd/seatgen/main.go             |  4 ++--
 .../buildstep/conformance/conformance.go      |  2 +-
 .../buildstep/conformance/conformance_test.go |  2 +-
 .../buildstep/conformance/leftrunning.go      |  2 +-
 modules/mesh-build-go/buildstep/go.mod        |  1 +
 modules/mesh-build-go/buildstep/gotest.go     |  2 +-
 .../mesh-build-go/buildstep/latepublish.go    |  2 +-
 modules/mesh-build-go/buildstep/narrow.go     |  2 +-
 .../mesh-build-go/buildstep/narrow_test.go    |  2 +-
 modules/mesh-build-go/buildstep/publish.go    |  2 +-
 modules/mesh-build-go/buildstep/pull.go       | 16 +++++++++++++---
 modules/mesh-build-go/buildstep/pull_test.go  |  2 +-
 .../buildstep/seatgen/clients.go              |  2 ++
 .../buildstep/seatgen/clients_test.go         | 13 +++++++++++--
 modules/mesh-build-go/buildstep/step.go       |  2 +-
 modules/mesh-build-go/buildstep/step_test.go  |  2 +-
 modules/mesh-build-go/buildstep/steptool.go   |  2 +-
 modules/mesh-build-go/buildstep/tap.go        |  2 +-
 modules/mesh-build-go/buildstep/trees.go      |  2 +-
 .../buildstep/trees_integration_test.go       |  2 +-
 modules/mesh-build-go/buildstep/trees_test.go |  2 +-
 .../mesh-build-go/cmd/mesh-build-go/asks.go   |  2 +-
 .../cmd/mesh-build-go/asks_test.go            |  2 +-
 .../cmd/mesh-build-go/compose.go              | 19 ++++++-------------
 .../mesh-build-go/compose_integration_test.go |  4 ++--
 .../cmd/mesh-build-go/compose_test.go         |  9 +++++----
 .../mesh-build-go/cmd/mesh-build-go/fetch.go  |  2 +-
 .../cmd/mesh-build-go/integration.go          |  2 +-
 .../cmd/mesh-build-go/kit_test.go             |  2 +-
 .../mesh-build-go/cmd/mesh-build-go/levels.go |  2 +-
 .../mesh-build-go/cmd/mesh-build-go/lint.go   |  2 +-
 .../mesh-build-go/cmd/mesh-build-go/module.go |  2 +-
 .../cmd/mesh-build-go/packages_shape_test.go  |  2 +-
 .../mesh-build-go/cmd/mesh-build-go/test.go   |  2 +-
 .../cmd/mesh-build-go/versions.go             |  6 +++---
 modules/mesh-build-go/go.mod                  |  1 +
 .../cmd/mesh-build-image/asks.go              |  2 +-
 .../cmd/mesh-build-image/asks_test.go         |  2 +-
 .../cmd/mesh-build-image/fetch.go             |  2 +-
 .../cmd/mesh-build-image/kit_test.go          |  2 +-
 .../cmd/mesh-build-image/module.go            |  2 +-
 modules/mesh-build-image/go.mod               |  1 +
 .../cmd/mesh-build-node/asks.go               |  2 +-
 .../cmd/mesh-build-node/asks_test.go          |  2 +-
 .../cmd/mesh-build-node/build.go              |  2 +-
 .../cmd/mesh-build-node/build_test.go         |  2 +-
 .../cmd/mesh-build-node/check.go              |  2 +-
 .../cmd/mesh-build-node/fetch.go              |  2 +-
 .../cmd/mesh-build-node/kit_test.go           |  2 +-
 .../cmd/mesh-build-node/module.go             |  2 +-
 modules/mesh-build-node/go.mod                |  1 +
 61 files changed, 97 insertions(+), 76 deletions(-)

diff --git a/modules/distribution/cmd/distribution-tools/main.go b/modules/distribution/cmd/distribution-tools/main.go
index 0eec28ea4..b8a89cf84 100644
--- a/modules/distribution/cmd/distribution-tools/main.go
+++ b/modules/distribution/cmd/distribution-tools/main.go
@@ -20,10 +20,10 @@ import (
 
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient"
 	reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/health"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 
 	"distribution/internal/holder"
 )
diff --git a/modules/distribution/go.mod b/modules/distribution/go.mod
index 2440a8444..4a7a87706 100644
--- a/modules/distribution/go.mod
+++ b/modules/distribution/go.mod
@@ -3,6 +3,7 @@ module distribution
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261104174359-05b3e2e1b94f
diff --git a/modules/distribution/internal/holder/transfer.go b/modules/distribution/internal/holder/transfer.go
index 180520793..aaa75418c 100644
--- a/modules/distribution/internal/holder/transfer.go
+++ b/modules/distribution/internal/holder/transfer.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient"
-	"git.novox.be/novox/mesh-sdk/go/parts"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 )
 
 // The bounds of incoming (design 51 *Publishing*, ADR 0611): a part is at most 1 MiB, a transfer with no part for 24
diff --git a/modules/gitea/cmd/package-registry/incoming.go b/modules/gitea/cmd/package-registry/incoming.go
index 3473dab36..fb0984bde 100644
--- a/modules/gitea/cmd/package-registry/incoming.go
+++ b/modules/gitea/cmd/package-registry/incoming.go
@@ -10,8 +10,8 @@ import (
 	"os"
 	"strings"
 
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 
 	"gitea/internal/packageseats"
 )
diff --git a/modules/gitea/cmd/package-registry/seats.go b/modules/gitea/cmd/package-registry/seats.go
index 578035bbb..f924d9d6d 100644
--- a/modules/gitea/cmd/package-registry/seats.go
+++ b/modules/gitea/cmd/package-registry/seats.go
@@ -30,10 +30,10 @@ import (
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient"
 	goreg "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry"
 	npmreg "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/health"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 
 	"gitea/internal/packageseats"
 )
diff --git a/modules/gitea/go.mod b/modules/gitea/go.mod
index eaea427ec..831e581b7 100644
--- a/modules/gitea/go.mod
+++ b/modules/gitea/go.mod
@@ -3,6 +3,7 @@ module gitea
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/provisioning/go/clients/meshprovisionerclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry v0.0.0-00010101000000-000000000000
diff --git a/modules/gitea/internal/packageseats/holder.go b/modules/gitea/internal/packageseats/holder.go
index 3cfa7feb3..2450607c6 100644
--- a/modules/gitea/internal/packageseats/holder.go
+++ b/modules/gitea/internal/packageseats/holder.go
@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 )
 
 // The seats the forge module holds.
diff --git a/modules/gitea/internal/packageseats/holder_test.go b/modules/gitea/internal/packageseats/holder_test.go
index 1b6837ed5..e8e9bdc14 100644
--- a/modules/gitea/internal/packageseats/holder_test.go
+++ b/modules/gitea/internal/packageseats/holder_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshhandactsclient"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 )
 
 type memObjects map[string][]byte
diff --git a/modules/mesh-build-go/buildstep/askrun_test.go b/modules/mesh-build-go/buildstep/askrun_test.go
index fb75f23f2..3b02e1ba4 100644
--- a/modules/mesh-build-go/buildstep/askrun_test.go
+++ b/modules/mesh-build-go/buildstep/askrun_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"slices"
 	"strings"
 	"testing"
diff --git a/modules/mesh-build-go/buildstep/capacity.go b/modules/mesh-build-go/buildstep/capacity.go
index d545fb305..14fa874d0 100644
--- a/modules/mesh-build-go/buildstep/capacity.go
+++ b/modules/mesh-build-go/buildstep/capacity.go
@@ -1,7 +1,7 @@
 package buildstep
 
 import (
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 
 	"encoding/json"
 	"fmt"
diff --git a/modules/mesh-build-go/buildstep/cmd/seatgen/main.go b/modules/mesh-build-go/buildstep/cmd/seatgen/main.go
index 9cd41717a..1aca2a3d1 100644
--- a/modules/mesh-build-go/buildstep/cmd/seatgen/main.go
+++ b/modules/mesh-build-go/buildstep/cmd/seatgen/main.go
@@ -13,8 +13,8 @@ import (
 
 func main() {
 	check := flag.Bool("check", false, "compare instead of writing: name every path out of step")
-	goModule := flag.String("go-module", "git.novox.be/novox/mesh-contracts/go", "the generated Go tree's module path")
-	tsPackage := flag.String("ts-package", "@novox/mesh-contracts", "the generated TypeScript package's name")
+	goModule := flag.String("go-module", "", "the generated Go tree's module path, such as git.novox.be/novox/mesh-contracts/<folder>/go (there is no root module)")
+	tsPackage := flag.String("ts-package", "", "the generated TypeScript package's name, such as @novox/mesh-contracts-<folder>")
 	flag.Parse()
 	dir := flag.Arg(0)
 	m, err := seatgen.Load(dir, *goModule, *tsPackage)
diff --git a/modules/mesh-build-go/buildstep/conformance/conformance.go b/modules/mesh-build-go/buildstep/conformance/conformance.go
index 78596ff26..97de1fef5 100644
--- a/modules/mesh-build-go/buildstep/conformance/conformance.go
+++ b/modules/mesh-build-go/buildstep/conformance/conformance.go
@@ -15,7 +15,7 @@ import (
 	"strings"
 	"testing"
 
-	"git.novox.be/novox/mesh-sdk/go/buildstep"
+	"git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // The runners the kit holds output of.
diff --git a/modules/mesh-build-go/buildstep/conformance/conformance_test.go b/modules/mesh-build-go/buildstep/conformance/conformance_test.go
index 0e1745d91..4fd3b8d1a 100644
--- a/modules/mesh-build-go/buildstep/conformance/conformance_test.go
+++ b/modules/mesh-build-go/buildstep/conformance/conformance_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // The failure contract (issue 1901): the SDK's own parsers keep it on every captured case of the kit (1901/AC6); the
diff --git a/modules/mesh-build-go/buildstep/conformance/leftrunning.go b/modules/mesh-build-go/buildstep/conformance/leftrunning.go
index a8812c4d2..1bd8fddee 100644
--- a/modules/mesh-build-go/buildstep/conformance/leftrunning.go
+++ b/modules/mesh-build-go/buildstep/conformance/leftrunning.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
+	"git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	"git.novox.be/novox/mesh-sdk/go/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-go/buildstep/go.mod b/modules/mesh-build-go/buildstep/go.mod
index 29ccd59a3..edd3078cb 100644
--- a/modules/mesh-build-go/buildstep/go.mod
+++ b/modules/mesh-build-go/buildstep/go.mod
@@ -3,6 +3,7 @@ module git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/clients/containerimageregistryclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/clients/gopackageregistryclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/clients/npmpackageregistryclient v0.0.0-00010101000000-000000000000
diff --git a/modules/mesh-build-go/buildstep/gotest.go b/modules/mesh-build-go/buildstep/gotest.go
index 0f6b59bb1..9c15d72c2 100644
--- a/modules/mesh-build-go/buildstep/gotest.go
+++ b/modules/mesh-build-go/buildstep/gotest.go
@@ -8,7 +8,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"fmt"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"regexp"
 	"slices"
 	"strings"
diff --git a/modules/mesh-build-go/buildstep/latepublish.go b/modules/mesh-build-go/buildstep/latepublish.go
index ff77aa9be..dbf0aaf77 100644
--- a/modules/mesh-build-go/buildstep/latepublish.go
+++ b/modules/mesh-build-go/buildstep/latepublish.go
@@ -19,9 +19,9 @@ import (
 	"time"
 
 	reg "git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 	stdio "git.novox.be/novox/mesh-sdk/go"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
-	"git.novox.be/novox/mesh-sdk/go/parts"
 )
 
 // NumberedPattern is the event type a build module consumes for the late publish, as its manifest's `consumes` names it.
diff --git a/modules/mesh-build-go/buildstep/narrow.go b/modules/mesh-build-go/buildstep/narrow.go
index b2980dc78..02066491f 100644
--- a/modules/mesh-build-go/buildstep/narrow.go
+++ b/modules/mesh-build-go/buildstep/narrow.go
@@ -2,7 +2,7 @@ package buildstep
 
 import (
 	"fmt"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"os"
 	"path"
 	"path/filepath"
diff --git a/modules/mesh-build-go/buildstep/narrow_test.go b/modules/mesh-build-go/buildstep/narrow_test.go
index 135bc6df8..621debfbc 100644
--- a/modules/mesh-build-go/buildstep/narrow_test.go
+++ b/modules/mesh-build-go/buildstep/narrow_test.go
@@ -1,7 +1,7 @@
 package buildstep
 
 import (
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"os"
 	"path/filepath"
 	"sort"
diff --git a/modules/mesh-build-go/buildstep/publish.go b/modules/mesh-build-go/buildstep/publish.go
index a573bed91..06e080ae8 100644
--- a/modules/mesh-build-go/buildstep/publish.go
+++ b/modules/mesh-build-go/buildstep/publish.go
@@ -23,7 +23,7 @@ import (
 	goseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/gopackageregistry"
 	npmseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/npmpackageregistry"
 	ociseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/ociartifactregistry"
-	"git.novox.be/novox/mesh-sdk/go/parts"
+	"git.novox.be/novox/mesh-delivery/sdk/parts"
 )
 
 // The registry seats a build module publishes on.
diff --git a/modules/mesh-build-go/buildstep/pull.go b/modules/mesh-build-go/buildstep/pull.go
index b7e54ac6d..7647bab54 100644
--- a/modules/mesh-build-go/buildstep/pull.go
+++ b/modules/mesh-build-go/buildstep/pull.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"sort"
 	"strings"
 	"sync"
@@ -513,7 +513,7 @@ func (p *Puller) next(ctx context.Context, wait time.Duration) (*Pulled, error)
 // message: the asker puts the ask again under a new id (issue 890). A message whose decline cannot be written is handed
 // back, as one whose start cannot be.
 func (p *Puller) decline(msg *Pulled, ask delivery.StepAsk, lacks []string) {
-	step, key, err := begin(p.Put, p.Node, ask.Kind+" ask", ask.ID, sdkstep.AskWhat(ask))
+	step, key, err := begin(p.Put, p.Node, ask.Kind+" ask", ask.ID, sdkstep.AskWhat(askRead(ask)))
 	if err == nil {
 		why := Refuse("the ask %s needs %s, and %s lacks %s: it is left to a node that has it", ask.ID,
 			strings.Join(ask.Needs, ", "), p.Node, strings.Join(lacks, ", "))
@@ -585,7 +585,7 @@ func (p *Puller) take(ctx context.Context, msg *Pulled) {
 		p.decline(msg, ask, lacks)
 		return
 	}
-	step, key, err := begin(p.Put, p.Node, ask.Kind+" ask", ask.ID, sdkstep.AskWhat(ask))
+	step, key, err := begin(p.Put, p.Node, ask.Kind+" ask", ask.ID, sdkstep.AskWhat(askRead(ask)))
 	if err != nil {
 		p.logf("the ask %s cannot start on %s: %v", ask.ID, p.Node, err)
 		_ = msg.Nak()
@@ -797,3 +797,13 @@ func (p *Puller) capacityFrom(c stdio.ProvisionChange) (int, string) {
 	}
 	return n, ""
 }
+
+// askRead is the part of an ask that mesh-delivery-sdk's AskWhat reads, taken from the ask's own layout (the part
+// build-step's StepAsk is the same JSON).
+func askRead(ask delivery.StepAsk) sdkstep.Ask {
+	var out sdkstep.Ask
+	if raw, err := json.Marshal(ask); err == nil {
+		_ = json.Unmarshal(raw, &out)
+	}
+	return out
+}
diff --git a/modules/mesh-build-go/buildstep/pull_test.go b/modules/mesh-build-go/buildstep/pull_test.go
index 086b15527..9258b5d0e 100644
--- a/modules/mesh-build-go/buildstep/pull_test.go
+++ b/modules/mesh-build-go/buildstep/pull_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/modules/mesh-build-go/buildstep/seatgen/clients.go b/modules/mesh-build-go/buildstep/seatgen/clients.go
index db370e2fc..7a83a0106 100644
--- a/modules/mesh-build-go/buildstep/seatgen/clients.go
+++ b/modules/mesh-build-go/buildstep/seatgen/clients.go
@@ -112,6 +112,8 @@ func checkClient(dir, at, seat string, m *Module) ([]string, error) {
 			case !strings.Contains(strings.SplitN(path, "/", 2)[0], "."):
 			case path == own:
 			case path == RuntimeModule || strings.HasPrefix(path, RuntimeModule+"/"):
+			case path == ClientGoModule(m.GoModule, seat) || strings.HasPrefix(path, ClientGoModule(m.GoModule, seat)+"/"):
+				// the client's own packages: a client may be several packages of its module
 			case strings.HasPrefix(path, m.GoModule+"/clients/"):
 				out = append(out, r+": imports "+path+", another seat's client (ADR 0625 §4)")
 			case path == m.GoModule || strings.HasPrefix(path, m.GoModule+"/"):
diff --git a/modules/mesh-build-go/buildstep/seatgen/clients_test.go b/modules/mesh-build-go/buildstep/seatgen/clients_test.go
index b3999a2fd..787636ba3 100644
--- a/modules/mesh-build-go/buildstep/seatgen/clients_test.go
+++ b/modules/mesh-build-go/buildstep/seatgen/clients_test.go
@@ -24,10 +24,10 @@ import (
 	"context"
 
 	"example.org/contracts/go/seats/aregistry"
-	"git.novox.be/novox/mesh-sdk/go/parts"
+	"git.novox.be/novox/mesh-sdk/go/keys"
 )
 
-func Publish(ctx context.Context) string { _ = parts.MaxChunk; return "seat:" + aregistry.Seat + ".publish" }
+func Publish(ctx context.Context) string { _ = keys.EscapeName; return "seat:" + aregistry.Seat + ".publish" }
 `
 	const ts = `,{"name":"ts-aregistry","kind":"package","language":"typescript","paths":["ts/seats/aregistry"]},
 {"name":"ts-bregistry","kind":"package","language":"typescript","paths":["ts/seats/bregistry"]}`
@@ -59,6 +59,15 @@ func Publish(ctx context.Context) string { _ = parts.MaxChunk; return "seat:" +
 {"name":"ts-onestore","kind":"package","language":"typescript","paths":["ts/seats/onestore"]}]}}`,
 			[]string{"module.json: no npm package artifact ts-bregistry", "module.json: the artifact ts-aregistry's paths are [ts], not [ts/seats/aregistry]",
 				"module.json: the npm package artifact ts-onestore is no seat's"}},
+		{"a client using its own sub-package, which is no other seat's client", map[string]string{
+			"go/clients/aregistryclient/go.mod": "module example.org/contracts/go/clients/aregistryclient\n",
+			"go/clients/aregistryclient/client.go": `package aregistryclient
+
+import "example.org/contracts/go/clients/aregistryclient/provider"
+
+var _ = provider.X
+`,
+		}, artifacts(clientArtifact), nil},
 		{"a client of no seat defined whole, and one not a module of its own", map[string]string{
 			"go/clients/onestoreclient/x.go":    "package onestoreclient\n",
 			"go/clients/aregistryclient/go.mod": "module example.org/contracts/go\n",
diff --git a/modules/mesh-build-go/buildstep/step.go b/modules/mesh-build-go/buildstep/step.go
index ede19129d..39f85bebf 100644
--- a/modules/mesh-build-go/buildstep/step.go
+++ b/modules/mesh-build-go/buildstep/step.go
@@ -12,7 +12,7 @@ import (
 	"log"
 	"time"
 
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-go/buildstep/step_test.go b/modules/mesh-build-go/buildstep/step_test.go
index f802872d5..3e011788e 100644
--- a/modules/mesh-build-go/buildstep/step_test.go
+++ b/modules/mesh-build-go/buildstep/step_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"sync"
 	"testing"
 	"time"
diff --git a/modules/mesh-build-go/buildstep/steptool.go b/modules/mesh-build-go/buildstep/steptool.go
index be1a1eef6..078fe1ed2 100644
--- a/modules/mesh-build-go/buildstep/steptool.go
+++ b/modules/mesh-build-go/buildstep/steptool.go
@@ -1,7 +1,7 @@
 package buildstep
 
 import (
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 
 	stdio "git.novox.be/novox/mesh-sdk/go"
 )
diff --git a/modules/mesh-build-go/buildstep/tap.go b/modules/mesh-build-go/buildstep/tap.go
index 7151ece16..2c3d5e488 100644
--- a/modules/mesh-build-go/buildstep/tap.go
+++ b/modules/mesh-build-go/buildstep/tap.go
@@ -5,7 +5,7 @@ package buildstep
 // earlier file, which is what node's default reporter left the first fifteen lines of.
 
 import (
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"regexp"
 	"strings"
 )
diff --git a/modules/mesh-build-go/buildstep/trees.go b/modules/mesh-build-go/buildstep/trees.go
index fb41c758b..b47fef658 100644
--- a/modules/mesh-build-go/buildstep/trees.go
+++ b/modules/mesh-build-go/buildstep/trees.go
@@ -10,7 +10,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
diff --git a/modules/mesh-build-go/buildstep/trees_integration_test.go b/modules/mesh-build-go/buildstep/trees_integration_test.go
index 2b9f458f0..0cbc52f6b 100644
--- a/modules/mesh-build-go/buildstep/trees_integration_test.go
+++ b/modules/mesh-build-go/buildstep/trees_integration_test.go
@@ -4,7 +4,7 @@ package buildstep
 
 import (
 	"context"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"reflect"
 	"strings"
 	"testing"
diff --git a/modules/mesh-build-go/buildstep/trees_test.go b/modules/mesh-build-go/buildstep/trees_test.go
index 2747a9dbf..6b83536cf 100644
--- a/modules/mesh-build-go/buildstep/trees_test.go
+++ b/modules/mesh-build-go/buildstep/trees_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"os"
 	"path/filepath"
 	"reflect"
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks.go b/modules/mesh-build-go/cmd/mesh-build-go/asks.go
index 25dcb8eb2..f71a1ba1f 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/asks.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/asks.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go b/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go
index 29c2100ff..f1e0517b3 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/asks_test.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose.go b/modules/mesh-build-go/cmd/mesh-build-go/compose.go
index 50bf32963..20c1fa557 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/compose.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/compose.go
@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	stdio "git.novox.be/novox/mesh-sdk/go"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
 	"git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient"
-	"git.novox.be/novox/mesh-sdk/go/composer"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
+	"git.novox.be/novox/mesh-delivery/sdk/composer"
+	stdio "git.novox.be/novox/mesh-sdk/go"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/views"
 )
@@ -80,22 +80,15 @@ func askManifest(key string) (json.RawMessage, error) {
 	return askManifestVia(stdio.Ask, meshconditionsclient.FindingWriter{State: stdio.State("findings")}, time.Now, key)
 }
 
-func askManifestVia(ask func(string, any) (json.RawMessage, error), findings interface {
-	Put(string, []byte) error
-	Delete(string) error
-}, now func() time.Time, key string) (json.RawMessage, error) {
+func askManifestVia(ask func(string, any) (json.RawMessage, error), findings views.FindingWriter, now func() time.Time, key string) (json.RawMessage, error) {
 	st := views.Status{Owner: delivery.IndexerModule, Tool: ManifestsTool, State: "manifests", Asked: now().UTC()}
 	raw, err := ask(ManifestsTool, map[string]any{"key": key})
 	if err != nil {
 		st.Error = err.Error()
-		if k, v, ferr := views.UnansweredFinding("mesh-build-go", st, now()); ferr == nil {
-			_ = findings.Put(k, v)
-		}
+		_ = findings.Put(views.UnansweredFinding("mesh-build-go", st, now()))
 		return nil, err
 	}
-	if k, _, ferr := views.UnansweredFinding("mesh-build-go", st, now()); ferr == nil {
-		_ = findings.Delete(k)
-	}
+	_ = findings.Delete(views.UnansweredFinding("mesh-build-go", st, now()))
 	var a struct {
 		Found bool            `json:"found"`
 		Value json.RawMessage `json:"value"`
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go
index bf249d332..5ef7f6c09 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_integration_test.go
@@ -17,8 +17,8 @@ import (
 	"github.com/nats-io/nats.go/jetstream"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
-	"git.novox.be/novox/mesh-sdk/go/composer"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
+	"git.novox.be/novox/mesh-delivery/sdk/composer"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 	"git.novox.be/novox/mesh-sdk/go/testbus"
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go
index e38e5a856..0f9d6dece 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/compose_test.go
@@ -11,10 +11,11 @@ import (
 	"testing"
 	"time"
 
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
-	"git.novox.be/novox/mesh-sdk/go/composer"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
+	"git.novox.be/novox/mesh-delivery/sdk/composer"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
+	"git.novox.be/novox/mesh-sdk/go/views"
 )
 
 // nodeEngineComposer is the composer command of the node-engine's repository, whose Go module is at its root (ADR 0593 §7):
@@ -149,8 +150,8 @@ func TestAnIndexerThatDoesNotAnswerIsAFinding(t *testing.T) {
 
 type mapFindings map[string][]byte
 
-func (m mapFindings) Put(k string, v []byte) error { m[k] = v; return nil }
-func (m mapFindings) Delete(k string) error        { delete(m, k); return nil }
+func (m mapFindings) Put(f views.Finding) error    { m[f.ID+"."+f.Kind] = []byte(f.Summary); return nil }
+func (m mapFindings) Delete(f views.Finding) error { delete(m, f.ID+"."+f.Kind); return nil }
 
 // ADR 0593 §7 (C9): a compose ask naming the node-engine's repository builds its composer command in the Go module at the
 // repository's root, under a key of that repository, commit and package, and runs the program over the request with its
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/fetch.go b/modules/mesh-build-go/cmd/mesh-build-go/fetch.go
index 20642e2bd..361cef2c1 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/fetch.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/fetch.go
@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/integration.go b/modules/mesh-build-go/cmd/mesh-build-go/integration.go
index 8342aace9..f71b6a562 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/integration.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/integration.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // The integration level's bounds (ADR 0445 §3).
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go
index 054ff4f48..9dee83e26 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/kit_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // 1901/AC7: the module's own parse path (readGoTest, then the level's judging) keeps the failure contract on every captured
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/levels.go b/modules/mesh-build-go/cmd/mesh-build-go/levels.go
index a6266f888..bfc2a1d7a 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/levels.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/levels.go
@@ -12,7 +12,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // The two levels (ADR 0445 §2).
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/lint.go b/modules/mesh-build-go/cmd/mesh-build-go/lint.go
index 086a739d6..8a9f4fc1c 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/lint.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/lint.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/module.go b/modules/mesh-build-go/cmd/mesh-build-go/module.go
index b17384e65..6a4b7265e 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/module.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/module.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 	"git.novox.be/novox/mesh-sdk/go/health"
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go b/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go
index fbb9ae92a..11e3b7001 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/packages_shape_test.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/test.go b/modules/mesh-build-go/cmd/mesh-build-go/test.go
index 1e0d86f3a..879a284d2 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/test.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/test.go
@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
diff --git a/modules/mesh-build-go/cmd/mesh-build-go/versions.go b/modules/mesh-build-go/cmd/mesh-build-go/versions.go
index 9e0507887..d63adbe28 100644
--- a/modules/mesh-build-go/cmd/mesh-build-go/versions.go
+++ b/modules/mesh-build-go/cmd/mesh-build-go/versions.go
@@ -31,7 +31,7 @@ import (
 	"strings"
 	"sync"
 
-	"git.novox.be/novox/mesh-sdk/go/delivery"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // TakenVersion is what the fetch built a directory against for one asked package: the asked commit, the version its go.mod
@@ -59,7 +59,7 @@ type downloadInfo struct {
 // asked package its go.mod requires. A package go.mod replaces is built as go.mod says, and said. A version that can be
 // neither fetched nor found among the forge's pull request heads fails the fetch, naming it. pins serialises the
 // placements a workspace's directories share.
-func (m *Module) takeVersions(ctx context.Context, root, dir, d string, asked delivery.PackageVersions, pins *sync.Mutex) ([]TakenVersion, error) {
+func (m *Module) takeVersions(ctx context.Context, root, dir, d string, asked sdkstep.PackageVersions, pins *sync.Mutex) ([]TakenVersion, error) {
 	raw, err := os.ReadFile(filepath.Join(dir, "go.mod"))
 	if err != nil {
 		return nil, nil
@@ -102,7 +102,7 @@ func (m *Module) takeVersion(ctx context.Context, root, dir string, tv *TakenVer
 		return err
 	}
 	pinsDir := filepath.Dir(modfile)
-	tagged := delivery.PackageSemver.MatchString(tv.Asked)
+	tagged := sdkstep.PackageSemver.MatchString(tv.Asked)
 	r := m.Run(ctx, m.goEnv(), "go", "-C", pinsDir, "mod", "download", "-json", tv.Package+"@"+tv.Asked)
 	var info downloadInfo
 	_ = json.Unmarshal([]byte(r.Stdout), &info)
diff --git a/modules/mesh-build-go/go.mod b/modules/mesh-build-go/go.mod
index ac7260e7c..af61acc8f 100644
--- a/modules/mesh-build-go/go.mod
+++ b/modules/mesh-build-go/go.mod
@@ -3,6 +3,7 @@ module meshbuildgo
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0
diff --git a/modules/mesh-build-image/cmd/mesh-build-image/asks.go b/modules/mesh-build-image/cmd/mesh-build-image/asks.go
index 75c58dae0..678493d8d 100644
--- a/modules/mesh-build-image/cmd/mesh-build-image/asks.go
+++ b/modules/mesh-build-image/cmd/mesh-build-image/asks.go
@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go b/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go
index 565f40ac9..679a7ed0d 100644
--- a/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go
+++ b/modules/mesh-build-image/cmd/mesh-build-image/asks_test.go
@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-image/cmd/mesh-build-image/fetch.go b/modules/mesh-build-image/cmd/mesh-build-image/fetch.go
index ed6dde815..92ecb60c5 100644
--- a/modules/mesh-build-image/cmd/mesh-build-image/fetch.go
+++ b/modules/mesh-build-image/cmd/mesh-build-image/fetch.go
@@ -14,7 +14,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 var (
diff --git a/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go b/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go
index 480a11820..2285829cb 100644
--- a/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go
+++ b/modules/mesh-build-image/cmd/mesh-build-image/kit_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 )
 
 // 1890/AC7: the module's own start sweep (endLeftRunning, as main runs it) keeps the conformance kit's left-running
diff --git a/modules/mesh-build-image/cmd/mesh-build-image/module.go b/modules/mesh-build-image/cmd/mesh-build-image/module.go
index 515efdc20..c31cba22b 100644
--- a/modules/mesh-build-image/cmd/mesh-build-image/module.go
+++ b/modules/mesh-build-image/cmd/mesh-build-image/module.go
@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 	"git.novox.be/novox/mesh-sdk/go/health"
diff --git a/modules/mesh-build-image/go.mod b/modules/mesh-build-image/go.mod
index f2dfc1238..f5288beab 100644
--- a/modules/mesh-build-image/go.mod
+++ b/modules/mesh-build-image/go.mod
@@ -3,6 +3,7 @@ module meshbuildimage
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0
 	git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261104174359-05b3e2e1b94f
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/asks.go b/modules/mesh-build-node/cmd/mesh-build-node/asks.go
index dad04a1d7..ef6037ec5 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/asks.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/asks.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	stdio "git.novox.be/novox/mesh-sdk/go"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go b/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go
index 0c7386fd0..6478684c5 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/asks_test.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/build.go b/modules/mesh-build-node/cmd/mesh-build-node/build.go
index e6a4750dc..cc838fc3b 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/build.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/build.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 )
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/build_test.go b/modules/mesh-build-node/cmd/mesh-build-node/build_test.go
index 767042f0f..43fe83cc0 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/build_test.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/build_test.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"testing"
 
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/check.go b/modules/mesh-build-node/cmd/mesh-build-node/check.go
index f632563d9..298874677 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/check.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/check.go
@@ -21,7 +21,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/fetch.go b/modules/mesh-build-node/cmd/mesh-build-node/fetch.go
index 1414dea53..b21361a4a 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/fetch.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/fetch.go
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go b/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go
index f18771389..c4d0201f0 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/kit_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep/conformance"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 )
 
diff --git a/modules/mesh-build-node/cmd/mesh-build-node/module.go b/modules/mesh-build-node/cmd/mesh-build-node/module.go
index 92075c579..09c8df399 100644
--- a/modules/mesh-build-node/cmd/mesh-build-node/module.go
+++ b/modules/mesh-build-node/cmd/mesh-build-node/module.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep"
-	sdkstep "git.novox.be/novox/mesh-sdk/go/buildstep"
+	sdkstep "git.novox.be/novox/mesh-delivery/sdk/buildstep"
 	"git.novox.be/novox/mesh-sdk/go/delivery"
 	"git.novox.be/novox/mesh-sdk/go/forgekey"
 	"git.novox.be/novox/mesh-sdk/go/health"
diff --git a/modules/mesh-build-node/go.mod b/modules/mesh-build-node/go.mod
index a51e70113..63269c655 100644
--- a/modules/mesh-build-node/go.mod
+++ b/modules/mesh-build-node/go.mod
@@ -3,6 +3,7 @@ module meshbuildnode
 go 1.26.0
 
 require (
+	git.novox.be/novox/mesh-delivery/sdk v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-delivery/contracts/go/seats/containerimageregistry v0.0.0-00010101000000-000000000000
 	git.novox.be/novox/mesh-catalog/modules/mesh-build-go/buildstep v0.0.0
 	git.novox.be/novox/mesh-sdk/go v0.1.14-0.20261104174359-05b3e2e1b94f