diff --git a/modules/claude-code/cmd/claude-code/claude_code_test.go b/modules/claude-code/cmd/claude-code/claude_code_test.go index 82f8630a4..7674cc348 100644 --- a/modules/claude-code/cmd/claude-code/claude_code_test.go +++ b/modules/claude-code/cmd/claude-code/claude_code_test.go @@ -11,6 +11,7 @@ import ( "testing" "time" + stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) @@ -728,7 +729,10 @@ func TestTheFirstViewOfTheBindingIsApplied(t *testing.T) { Reads []string } _ = json.Unmarshal(raw, &m) - if !slices.Contains(m.Consumes, BindingChanged) || !slices.Contains(m.Consumes, SecretChanged) || + // The manager says each change as binding.changed. (design 47 G A-134), and the bus consumer this module's + // consumes is composed into hands it only what an entry names, so an entry naming binding.changed alone hears none. + hears := slices.ContainsFunc(m.Consumes, func(c string) bool { return stdio.TopicMatches(c, BindingChanged+".g14") }) + if !hears || !slices.Contains(m.Consumes, SecretChanged) || !slices.Contains(m.Invokes, SeatVerb("bindings")) || !slices.Contains(m.Invokes, VaultGet) || len(m.Reads) != 0 { t.Fatalf("the manifest consumes %v, invokes %v, reads %v", m.Consumes, m.Invokes, m.Reads) } diff --git a/modules/claude-code/cmd/claude-code/config_test.go b/modules/claude-code/cmd/claude-code/config_test.go index f66d79469..35a3c43ed 100644 --- a/modules/claude-code/cmd/claude-code/config_test.go +++ b/modules/claude-code/cmd/claude-code/config_test.go @@ -281,7 +281,7 @@ func TestTheManifestListsEveryToolServed(t *testing.T) { // notice goes out on the operator channel's notify (design 47 G GR8). if !slices.Equal(m.Invokes, []string{"seat:mesh-hand-acts.warranted", "seat:mesh-hand-acts.hand-act", "seat:mesh-catalog.seat-definitions", RevisionVerb, RegistrationsVerb, SourceVerb, AssignmentsTool, SeatVerb("bindings"), SeatVerb("current"), VaultGet, "seat:operator-channel.notify"}) || len(m.Reads) != 0 || - !slices.Equal(m.Consumes, []string{"mesh-catalog.catalog-revision", "mesh-catalog.registration-changed", "mesh-delivery.source-moved", "mesh-delivery-assigner.views.assignments", "mesh-catalog.seat-definition-changed", "mesh-catalog.seat-definition-removed", "mesh-conditions.findings-asked", HoldingsAsked, BindingChanged, SecretChanged}) { + !slices.Equal(m.Consumes, []string{"mesh-catalog.catalog-revision", "mesh-catalog.registration-changed", "mesh-delivery.source-moved", "mesh-delivery-assigner.views.assignments", "mesh-catalog.seat-definition-changed", "mesh-catalog.seat-definition-removed", "mesh-conditions.findings-asked", HoldingsAsked, BindingChanged + ".*", SecretChanged}) { t.Errorf("invokes = %v, reads = %v, consumes = %v", m.Invokes, m.Reads, m.Consumes) } if src, _ := os.ReadFile("proposals.go"); !strings.Contains(string(src), `"seat:mesh-hand-acts.warranted"`) || diff --git a/modules/claude-code/module.json b/modules/claude-code/module.json index 7d598df57..73ae6b48b 100644 --- a/modules/claude-code/module.json +++ b/modules/claude-code/module.json @@ -63,7 +63,7 @@ "mesh-catalog.seat-definition-removed", "mesh-conditions.findings-asked", "claude-licence-manager.holdings.asked", - "claude-licence-manager.binding.changed", + "claude-licence-manager.binding.changed.*", "mesh-vault.secret-changed" ], "state": [ diff --git a/modules/mesh-vault/cmd/mesh-vault/licencebindings_test.go b/modules/mesh-vault/cmd/mesh-vault/licencebindings_test.go index 403c03d58..fe32bdd6d 100644 --- a/modules/mesh-vault/cmd/mesh-vault/licencebindings_test.go +++ b/modules/mesh-vault/cmd/mesh-vault/licencebindings_test.go @@ -12,6 +12,7 @@ import ( "testing" "time" + stdio "git.novox.be/novox/mesh-sdk/go" "git.novox.be/novox/mesh-sdk/go/views" ) @@ -133,7 +134,10 @@ func TestTheFirstViewOfTheLicenceBindingsIsKept(t *testing.T) { for _, st := range m.State { kept = kept || string(st) == `"`+LicenceBindingsState+`"` } - if !slices.Contains(m.Invokes, LicenceBindingsVerb) || !slices.Contains(m.Consumes, BindingChangedEvent) || !kept { + // The manager says each change as binding.changed. (design 47 G A-134), and the bus consumer the vault's + // consumes is composed into hands it only what an entry names, so an entry naming binding.changed alone hears none. + hears := slices.ContainsFunc(m.Consumes, func(c string) bool { return stdio.TopicMatches(c, BindingChangedEvent+".g14") }) + if !slices.Contains(m.Invokes, LicenceBindingsVerb) || !hears || !kept { t.Fatalf("the manifest invokes %v, consumes %v, keeps %s", m.Invokes, m.Consumes, m.State) } } diff --git a/modules/mesh-vault/module.json b/modules/mesh-vault/module.json index bbf58cfb5..c49df2aa9 100644 --- a/modules/mesh-vault/module.json +++ b/modules/mesh-vault/module.json @@ -240,6 +240,6 @@ "consumes": [ "mesh-delivery-assigner.views.assignments", "mesh-conditions.findings-asked", - "claude-licence-manager.binding.changed" + "claude-licence-manager.binding.changed.*" ] }