Merge branch 'feat/47-G-fix11-b5g3' into feat/47-G-join11

node-tools/internal/console/approvals.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"strings"
 
-	"github.com/novox/mesh-tools/node-tools/internal/approval"
+	"git.novox.be/novox/mesh-sdk/go/approval"
 )
 
 // verbApprovals is the mesh MCP server's tool that reads and steers what the gate asked on this machine (design 46

node-tools/internal/console/wait.go

@@ -21,7 +21,7 @@ import (
 	"git.novox.be/novox/mesh-sdk/go/buscompose"
 	"git.novox.be/novox/mesh-sdk/go/catalogue"
 
-	"github.com/novox/mesh-tools/node-tools/internal/approval"
+	"git.novox.be/novox/mesh-sdk/go/approval"
 )
 
 // WaitDefault is how long a wait lasts when no timeout is given, and WaitLongest the most it may last

node-tools/internal/console/wait_test.go

@@ -19,11 +19,12 @@ import (
 	"git.novox.be/novox/mesh-delivery/contracts/go/clients/meshcatalogclient"
 	catalogseat "git.novox.be/novox/mesh-delivery/contracts/go/seats/meshcatalog"
 	stdio "git.novox.be/novox/mesh-sdk/go"
+	"git.novox.be/novox/mesh-sdk/go/approval"
 	"git.novox.be/novox/mesh-sdk/go/seatdef"
 	"github.com/nats-io/nats-server/v2/server"
 	"github.com/nats-io/nats.go"
+	runnerapproval "github.com/novox/mesh-tools/node-tools/internal/approval"
 
-	"github.com/novox/mesh-tools/node-tools/internal/approval"
 	"github.com/novox/mesh-tools/node-tools/internal/bus"
 	mt "github.com/novox/mesh-tools/node-tools/internal/meshtest"
 )
@@ -400,13 +401,14 @@ func newGatedWaits(t *testing.T, s *Surface, mesh *mt.Mesh, build string) *gated
 		"emits": []any{"message"}, "needs-approval": []any{"message"},
 		"streams": []any{map[string]any{"name": "inbox", "events": []any{"inbox.*"}, "grant": map[string]any{"subscribe": []any{"x"}}}}}}}},
 		records: mesh.Bucket(t, "operator-channel-asks"), say: connect(t, "messenger", "")}
+	state := mt.NewState()
 	gate := approval.New(approval.Deps{Node: "desk", Runner: "node-tools", Build: build, Catalog: gw.cat, Wait: gw.cat.wait,
-		State: mt.NewState(), Holder: func(string) (bool, error) { return true, nil },
+		State: state, Holder: func(string) (bool, error) { return true, nil },
 		Hear: func(ctx context.Context, subjects []string, within time.Duration, match func(json.RawMessage) bool) (bool, error) {
 			_, ok, _, err := s.conn.HearFirst(ctx, subjects, within, match)
 			return ok, err
 		},
-		Publish: func(module, subject string, body any, id string) error {
+		Channel: &operatorchannelclient.GateChannel{State: state, KeyPrefix: "desk.", Publish: func(module, subject string, body any, id string) error {
 			a, ok := body.(opseat.Ask)
 			if subject != opseat.AcceptSubjectAsk(module) || !ok {
 				return nil
@@ -418,15 +420,15 @@ func newGatedWaits(t *testing.T, s *Surface, mesh *mt.Mesh, build string) *gated
 				Expires: a.Expires, Opened: operatorchannelclient.FormatTime(time.Now()), OfferedOn: []string{"telegram"}})
 			return nil
 		},
-		Record: func(module, id string) (*stdio.StateEntry, error) {
-			e, err := gw.records.Get(module + "." + id)
-			if errors.Is(err, nats.ErrKeyNotFound) {
-				return nil, nil
-			} else if err != nil {
-				return nil, err
-			}
-			return &stdio.StateEntry{Key: e.Key(), Value: e.Value(), Revision: e.Revision()}, nil
-		}})
+			ReadRecord: func(module, id string) (*stdio.StateEntry, error) {
+				e, err := gw.records.Get(module + "." + id)
+				if errors.Is(err, nats.ErrKeyNotFound) {
+					return nil, nil
+				} else if err != nil {
+					return nil, err
+				}
+				return &stdio.StateEntry{Key: e.Key(), Value: e.Value(), Revision: e.Revision()}, nil
+			}}})
 	gw.surface = NewSurface(s.conn, busSource{s.conn}, "desk.node-tools")
 	gw.surface.Approvals = gateApprovals{gate}
 	return gw
@@ -496,14 +498,20 @@ func (c *waitCatalog) wait(within time.Duration) error {
 	return c.Ready()
 }
 func (c *waitCatalog) Revision() string { return "7" }
-func (c *waitCatalog) Served(string) (catalogseat.CatalogEntry, bool, string) {
-	return catalogseat.CatalogEntry{}, false, "not-found"
+func (c *waitCatalog) Served(string) (approval.Entry, bool, string) {
+	return approval.Entry{}, false, "not-found"
 }
-func (c *waitCatalog) Newest(string) (catalogseat.CatalogEntry, bool) {
-	return catalogseat.CatalogEntry{}, false
+func (c *waitCatalog) Newest(string) (approval.Entry, bool) {
+	return approval.Entry{}, false
 }
 func (c *waitCatalog) Definitions() map[string]seatdef.Definition { return nil }
-func (c *waitCatalog) Entries() []catalogseat.CatalogEntry        { return c.entries }
+func (c *waitCatalog) Entries() []approval.Entry {
+	var out []approval.Entry
+	for _, e := range c.entries {
+		out = append(out, runnerapproval.Entry(e))
+	}
+	return out
+}
 
 // The mesh MCP server announces seven tools (ADR 0367 v13): ADR 0195's five, mesh_runtimes and mesh_wait, its timeout bounded.
 func TestMeshWaitIsAnnouncedAmongSeven(t *testing.T) {