EE-S2: the waits list goes from the manifest and the membership (issue 1966)

The tool runner hears every event, so no manifest names the families a session
may wait on and no membership issues them: Manifest.Waits, Users.Waits, the
type Wait, Membership.Waits and WaitIssued go. A stored manifest still carrying
waits is read without it; the baseline keeps word:waits as retired.

Builds: design 34 every-event §2, §3, §4

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

go/buscompose/users.go

@@ -22,9 +22,6 @@ type Declared struct {
 	Watches []Seat
 	// Invokes are the tools it calls, `<module>.<tool>` or `*` (novox/hq ADR 0152).
 	Invokes []string
-	// Waits are the event families a session may wait on through the tool runner, the tool runner's module's
-	// alone (novox/hq ADR 0367 §2): its account subscribes them for a call, through no consumer.
-	Waits []Wait
 	// State is the state it keeps, each a bucket its instances write (novox/hq ADR 0201).
 	State []Bucket
 	// Logs are the logs it keeps, each a stream its instances append to (novox/hq ADR 0297).

go/buscompose/waits.go

@@ -1,18 +0,0 @@
-package buscompose
-
-// Wait is one event family the tool runner's module declares: its name as the manifest gives it, and the
-// emitter — a seat or a module — and the event, as the inventory resolved them.
-type Wait struct {
-	// Name is the family as the manifest names it, `<emitter>.<event>`: what a session asks for.
-	Name    string
-	Emitter string
-	// Seat says the emitter is a seat, whose events live under the seat's namespace (novox/hq ADR 0121).
-	Seat bool
-	// Event is the event, with any further token the subject carries: `decided.claude-code`, the asker of a
-	// seat that names it last (ADR 0259 §3).
-	Event string
-	// Last names what the seat's event subject ends in — "kind" for a kinded bench, "asker" for a seat naming
-	// its caller (ADR 0259 §3) — and is empty for an event that ends at its name. A family needing it is waited
-	// on with it given, and refused without.
-	Last string
-}

go/catalogue/invokes_test.go

@@ -39,6 +39,11 @@ func TestAManifestMaySayWhatItInvokes(t *testing.T) {
 	if back, _ := json.Marshal(runner); !strings.Contains(string(back), `"tool-runner":true`) {
 		t.Errorf("a tool runner written back as %s", back)
 	}
+	// EE-S2/AC1: the tool runner names no events to wait on any more (novox/hq ADR 0670 §2): a stored manifest still
+	// carrying `waits` is read without it, the word named unknown (design 34 every-event §2).
+	if old, err := decodeForTest([]byte(`{"module":"node-tools","version":"1","tool-runner":true,"waits":["a.b"]}`)); err != nil || !strings.Contains(old.UnknownField(), `"waits"`) {
+		t.Errorf("a manifest carrying waits: %v, unknown %q", err, old.UnknownField())
+	}
 	other, _ := decodeForTest([]byte(`{"module":"node-tools","version":"1"}`))
 	if got, ok := ToolRunnerOf([]Manifest{other, runner}); !ok || got.Module != "any-name" {
 		t.Errorf("the tool runner found is %q, %v: by what it says, never by its name", got.Module, ok)

go/catalogue/manifest.go

@@ -587,13 +587,6 @@ type Manifest struct {
 	// person's account (design 25 §7) already had the same shape.
 	Invokes []string `json:"invokes,omitempty"`
 
-	// Waits are the event families a session may wait on through the mesh MCP server's `mesh_wait`, each
-	// `<emitter>.<event>` as `consumes` names one, a seat's or a module's (novox/hq ADR 0367 §2). Only the tool
-	// runner's module declares them, one by one and never by a wildcard. **A grant apart from `consumes`**: the
-	// controller grants the tool runner's account a plain subscription on those subjects alone, with no
-	// durable consumer, and issues the same list in its membership; no call or setting adds one (§6).
-	Waits []string `json:"waits,omitempty"`
-
 	// State is the current state this module keeps on the bus, by local name: each a key-value
 	// bucket the controller creates, which every instance of the module writes and reads
 	// (novox/hq ADR 0201). Not history — that is an event — and never a secret, sealed or not.
@@ -812,7 +805,7 @@ type Manifest struct {
 	OwnSecrets OwnSecrets `json:"own-secrets,omitempty"`
 
 	// ToolRunner says this module is the node's tool runner (issue 774): the one program on each node that loads every
-	// assigned module's tools bundle, served by its runtime process and the only module that may declare `waits`. Said by
+	// assigned module's tools bundle, served by its runtime process. Said by
 	// the module, never by a name in mesh-sdk.
 	ToolRunner bool `json:"tool-runner,omitempty"`
 

go/catalogue/own_manifest_test.go

@@ -49,8 +49,9 @@ func TestOwnManifestUsesNoWordTheRunningControllerRefuses(t *testing.T) {
 		}
 	}
 	// The two seats the milestone renamed (ADR 0634 §9) are read by their new names; a node-engine built with the baseline
-	// reads the old ones, and a manifest of the new names is the milestone's to deliver after the engines.
-	renamed := []string{"seat:mesh-enrolment", "seat:mesh-placement"}
+	// reads the old ones, and a manifest of the new names is the milestone's to deliver after the engines. The word
+	// `waits` is no longer read: novox/hq ADR 0670 §2 retired it.
+	renamed := []string{"seat:mesh-enrolment", "seat:mesh-placement", "word:waits"}
 	for _, b := range baseline {
 		if !slices.Contains(reads, b) && !slices.Contains(renamed, b) {
 			t.Errorf("the baseline's %s is no reader capability of this contract", b)

go/catalogue/waits_test.go

@@ -1,17 +0,0 @@
-package catalogue
-
-import (
-	"testing"
-)
-
-// novox/hq ADR 0367 §2: the tool runner's module names, one by one, the event families a session may wait on.
-func TestTheToolRunnerMayNameTheEventsASessionWaitsOn(t *testing.T) {
-	m, err := decodeForTest([]byte(`{"module":"node-tools","version":"1",` +
-		`"waits":["mesh-knowledge.reviewed","operator-channel.decided.claude-code"]}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(m.Waits) != 2 || m.Waits[1] != "operator-channel.decided.claude-code" {
-		t.Fatalf("waits not read: %v", m.Waits)
-	}
-}

go/membership/membership.go

@@ -61,8 +61,6 @@ type Membership struct {
 	// Streams are this module's own streams, Hears the module streams it hears (novox/hq ADR 0363).
 	Streams []StreamIssued `json:"streams,omitempty"`
 	Hears   []HeardIssued  `json:"hears,omitempty"`
-	// Waits are the event families a session may wait on through the mesh MCP server (novox/hq ADR 0367 §2).
-	Waits []WaitIssued `json:"waits,omitempty"`
 	// Bindings are the module's bus state as the bus module created it, one per entry its manifest asks for in
 	// `requires` (novox/hq ADR 0595 §1, §7): written by the grants part when it hears the bus module's `created`.
 	Bindings []BusBinding `json:"bindings,omitempty"`
@@ -174,12 +172,6 @@ type HeardIssued struct {
 	Consumer string `json:"consumer"`
 }
 
-// WaitIssued is one family as a membership issues it: the name a session asks for, and its subject.
-type WaitIssued struct {
-	Event   string `json:"event"`
-	Subject string `json:"subject"`
-}
-
 // StateIssued is the state this membership issues its module's code by a local name, and whether it does: what every
 // runtime that serves a module's state calls reads, so no reader keeps a second copy of the rule (novox/hq issue 1966).
 // An entry of the old `state` list wins (ADR 0201); otherwise a binding of a key-value entry the module asks for in