diff --git a/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go b/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go index ac295944b..3a7852b72 100644 --- a/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go +++ b/modules/mesh-knowledge/cmd/mesh-knowledge/manifest_test.go @@ -84,9 +84,15 @@ func TestItDeclaresAndHoldsTheKnowledgeBaseSeatOnceForTheMesh(t *testing.T) { } if !reflect.DeepEqual(m.Invokes, []string{"seat:issue-tracker.reserve", "claude-code.claude_code_judge", "records.records_status", "records.records_list", "records.records_read", "seat:operator-channel.notify", "seat:issue-tracker.list", "seat:issue-tracker.get", - "seat:issue-tracker.milestones", "seat:issue-tracker.changes", "seat:mesh-delivery.deliveries", "seat:mesh-delivery.show", "seat:mesh-delivery.groups", "seat:operator-channel.asks", "seat:mesh-hand-acts.hand-act"}) { + "seat:issue-tracker.milestones", "seat:issue-tracker.changes", "seat:mesh-delivery.deliveries", "seat:mesh-delivery.show", "seat:operator-channel.asks", "seat:mesh-hand-acts.hand-act"}) { t.Fatalf("invokes %v", m.Invokes) } + // The overview keeps no delivery block (design 47 H, H-A-125): it hears no merge, transition or pipeline's end. + for _, e := range m.Consumes { + if strings.HasPrefix(e, "git.") || strings.HasPrefix(e, "mesh-delivery") || strings.HasPrefix(e, "mesh-pipeline-runner.") { + t.Errorf("it consumes %s, and the overview shows no deliveries", e) + } + } src := "" for _, f := range []string{"main.go", "hq.go", "progress.go", "progress_since.go", "milestones.go", "overview.go", "tools.go"} { src += readFile(t, f) @@ -282,7 +288,7 @@ func TestItAsksForItsBusStateInTheTypedForm(t *testing.T) { // overviewConsumes are the events the overview page hears, in the order the manifest lists them. func overviewConsumes() []string { var out []string - for _, s := range []string{SourceTracker, SourceDelivery, SourceAsks} { + for _, s := range []string{SourceTracker, SourceAsks} { out = append(out, OverviewEvents[s]...) } return out diff --git a/modules/mesh-knowledge/cmd/mesh-knowledge/overview.go b/modules/mesh-knowledge/cmd/mesh-knowledge/overview.go index 88bbf9a39..0a8985729 100644 --- a/modules/mesh-knowledge/cmd/mesh-knowledge/overview.go +++ b/modules/mesh-knowledge/cmd/mesh-knowledge/overview.go @@ -2,9 +2,9 @@ package main // The overview page (novox/hq to-be 55 §11, ADR 0616): one read-only page for the operator with three blocks: every design in // progress with its milestones and their issues; the decisions and research efforts accepted in the last seven days and those -// waiting; and what waits on the operator (records waiting for an Approve, the operator channel's open asks, the delivery -// groups waiting). Built from mesh paths alone: the module's own ledger, and three other modules' verbs for the first view and -// their events after it. It never polls: a source is asked again only when it is marked unanswered, on a bounded backoff. +// waiting; and what waits on the operator (records waiting for an Approve, the operator channel's open asks). No delivery +// block: the deliveries are another module's state, read through the status view (design 47 H, H-A-125). Built from mesh +// paths alone: the module's own ledger, and two other modules' verbs for the first view and their events after it. It never polls: a source is asked again only when it is marked unanswered, on a bounded backoff. import ( "encoding/json" @@ -19,24 +19,21 @@ import ( // The sources of the page, besides the module's own ledger. const ( - SourceTracker = "issue-tracker" - SourceDelivery = "mesh-delivery" - SourceAsks = "operator-channel" + SourceTracker = "issue-tracker" + SourceAsks = "operator-channel" ) // The verbs of the first view, and the events that keep each source current. const ( TrackerMilestonesVerb = "seat:issue-tracker.milestones" TrackerListVerb = "seat:issue-tracker.list" - DeliveryGroupsVerb = "seat:mesh-delivery.groups" AsksVerb = "seat:operator-channel.asks" ) // OverviewEvents are the events the page consumes, by source, as the manifest declares them. var OverviewEvents = map[string][]string{ - SourceTracker: {"mesh-issues.opened", "mesh-issues.moved", "mesh-issues.milestone-set", "mesh-issues.milestone-moved"}, - SourceDelivery: {"git.pull-merged", "mesh-delivery-gate.transition", "mesh-pipeline-runner.group-ended"}, - SourceAsks: {"messenger.offered", "messenger.closed"}, + SourceTracker: {"mesh-issues.opened", "mesh-issues.moved", "mesh-issues.milestone-set", "mesh-issues.milestone-moved"}, + SourceAsks: {"messenger.offered", "messenger.closed"}, } // The unanswered marks: a verb that did not answer, or a subscription that missed its heartbeat. @@ -123,7 +120,6 @@ type OverviewModel struct { type OperatorBlock struct { Records []RecordRow `json:"records"` Asks []askRow `json:"asks"` - Groups []groupRow `json:"delivery-groups"` } // Overview is the page's model in memory, kept by events. @@ -136,7 +132,6 @@ type Overview struct { mu sync.Mutex milestones map[string]trackerMilestone issues map[int]trackerRow - groups map[string]groupRow asks map[string]askRow state map[string]*SourceState rebuilt time.Time @@ -147,8 +142,8 @@ type Overview struct { // NewOverview is a model with no source answered: Start asks each source's verb once. func NewOverview(ask SeatAsk, records func() ([]*Entry, error), now func() time.Time) *Overview { o := &Overview{Ask: ask, Records: records, Now: now, milestones: map[string]trackerMilestone{}, issues: map[int]trackerRow{}, - groups: map[string]groupRow{}, asks: map[string]askRow{}, state: map[string]*SourceState{}, verbCalls: map[string]int{}} - for _, s := range []string{SourceTracker, SourceDelivery, SourceAsks} { + asks: map[string]askRow{}, state: map[string]*SourceState{}, verbCalls: map[string]int{}} + for _, s := range []string{SourceTracker, SourceAsks} { o.state[s] = &SourceState{Name: s} } return o @@ -234,19 +229,6 @@ func (o *Overview) rebuildLocked(source string) error { for _, r := range rows { o.issues[r.Number] = r } - case SourceDelivery: - raw, err := call(DeliveryGroupsVerb, map[string]any{}) - if err != nil { - return fail(err.Error()) - } - var gs []groupRow - if err := rowsOf(raw, &gs, "groups"); err != nil { - return fail("groups answered something else: " + err.Error()) - } - o.groups = map[string]groupRow{} - for _, g := range gs { - o.groups[g.ID] = g - } case SourceAsks: raw, err := call(AsksVerb, map[string]any{}) if err != nil { @@ -279,7 +261,7 @@ func (o *Overview) sourceNames() []string { // Start is the first view: every source's verb asked once. A verb that does not answer marks its source. func (o *Overview) Start() { - for _, s := range []string{SourceTracker, SourceDelivery, SourceAsks} { + for _, s := range []string{SourceTracker, SourceAsks} { _ = o.Rebuild(s) } } @@ -339,16 +321,11 @@ func (o *Overview) Heard(source, event string, body json.RawMessage) { Number int `json:"number"` Status string `json:"status"` To string `json:"to"` - State string `json:"state"` Title string `json:"title"` Design int `json:"design"` ID string `json:"id"` - Group string `json:"group"` - Branch string `json:"branch"` Outcome string `json:"outcome"` Issues []int `json:"issues"` - Members []string `json:"members"` - Why string `json:"why"` Key string `json:"key"` Asker string `json:"asker"` Headline string `json:"headline"` @@ -381,22 +358,6 @@ func (o *Overview) Heard(source, event string, body json.RawMessage) { m.Status = firstNonEmpty(f.To, f.Status, m.Status) o.milestones[k] = m } - case SourceDelivery: - id := firstNonEmpty(f.Group, f.ID) - switch name { - case "pull-merged": - // A merged pull request leaves the group named by its head branch (a group's id is its branch name): it waits for - // the operator no longer (design 47 G §431). - delete(o.groups, f.Branch) - case "transition": - if g, ok := o.groups[id]; ok { - g.State = firstNonEmpty(f.To, f.State, g.State) - g.Why = firstNonEmpty(f.Why, g.Why) - o.groups[id] = g - } - case "group-ended": - delete(o.groups, id) - } case SourceAsks: switch name { case "offered": @@ -481,12 +442,6 @@ func (o *Overview) Model() (*OverviewModel, error) { m.Operator.Asks = append(m.Operator.Asks, a) } sort.Slice(m.Operator.Asks, func(i, j int) bool { return m.Operator.Asks[i].Key < m.Operator.Asks[j].Key }) - for _, g := range o.groups { - if g.State != "merged" { - m.Operator.Groups = append(m.Operator.Groups, g) - } - } - sort.Slice(m.Operator.Groups, func(i, j int) bool { return m.Operator.Groups[i].ID < m.Operator.Groups[j].ID }) for _, n := range o.sourceNames() { m.Sources = append(m.Sources, *o.state[n]) } diff --git a/modules/mesh-knowledge/cmd/mesh-knowledge/overview_test.go b/modules/mesh-knowledge/cmd/mesh-knowledge/overview_test.go index 646ac6f92..37023e142 100644 --- a/modules/mesh-knowledge/cmd/mesh-knowledge/overview_test.go +++ b/modules/mesh-knowledge/cmd/mesh-knowledge/overview_test.go @@ -25,7 +25,6 @@ func newOverviewWorld(t *testing.T) *overviewWorld { w := &overviewWorld{now: time.Date(2026, 11, 4, 12, 0, 0, 0, time.UTC), fail: map[string]bool{}, answers: map[string]string{ TrackerMilestonesVerb: `{"milestones":[{"design":47,"id":"1","outcome":"A merge is never dropped","status":"open","issues":[973,525]},{"design":47,"id":"2","outcome":"Done thing","status":"done","issues":[1]}]}`, TrackerListVerb: `[{"number":973,"title":"The window","status":"fixing"},{"number":525,"title":"The queue","status":"open"}]`, - DeliveryGroupsVerb: `[{"id":"fix/a","state":"held","why":"a member is held","members":["x@1"]},{"id":"fix/b","state":"checking","members":["y@2"]}]`, AsksVerb: `{"asks":[{"key":"mesh-knowledge.1","asker":"mesh-knowledge","headline":"Approve ADR 0301","state":"open","offered_on":["telegram"]},{"key":"ask-0","asker":"x","headline":"old","state":"answered"}]}`, }} w.o = NewOverview(func(key string, body any) (json.RawMessage, error) { @@ -45,8 +44,8 @@ func recordEntry(n int, status, date string, accepted time.Time, mut func(*Recor return &Entry{Current: r, CurrentVersion: 1, Versions: 1} } -// The page's model (ADR 0616 §1-3, AC P1): three blocks built from the ledger, the tracker's milestones and issues, the delivery -// groups and the operator channel's asks; events change the blocks and ask no verb; a record accepted eight days before the +// The page's model (ADR 0616 §1-3, AC P1): three blocks built from the ledger, the tracker's milestones and issues and the +// operator channel's asks, and no delivery block (design 47 H, H-A-125); events change the blocks and ask no verb; a record accepted eight days before the // answer is not in the seven-day block, with no event between. func TestThePageModelHasThreeBlocksKeptByEventsAndAsksNoVerbAgain(t *testing.T) { w := newOverviewWorld(t) @@ -68,28 +67,25 @@ func TestThePageModelHasThreeBlocksKeptByEventsAndAsksNoVerbAgain(t *testing.T) t.Fatalf("the design block: %+v", m.Designs) } if len(m.Accepted) != 2 || len(m.Waiting) != 2 || len(m.Operator.Records) != 1 || m.Operator.Records[0].Record != "ADR 0303" || - len(m.Operator.Asks) != 1 || m.Operator.Asks[0].Key != "mesh-knowledge.1" || len(m.Operator.Groups) != 2 { + len(m.Operator.Asks) != 1 || m.Operator.Asks[0].Key != "mesh-knowledge.1" || len(m.Sources) != 2 { t.Fatalf("%+v", m) } asked := map[string]int{} - for _, v := range []string{TrackerMilestonesVerb, TrackerListVerb, DeliveryGroupsVerb, AsksVerb} { + for _, v := range []string{TrackerMilestonesVerb, TrackerListVerb, AsksVerb} { asked[v] = w.o.Calls(v) } // Events change the blocks. - w.o.Heard(SourceDelivery, "git.pull-merged", json.RawMessage(`{"repository":"novox/y","number":2,"branch":"fix/b"}`)) - w.o.Heard(SourceDelivery, "mesh-delivery-gate.transition", json.RawMessage(`{"group":"fix/a","to":"approved"}`)) w.o.Heard(SourceAsks, "messenger.offered", json.RawMessage(`{"id":"2","asker":"mesh-delivery","headline":"Approve the group","channels":["telegram"]}`)) w.o.Heard(SourceTracker, "mesh-issues.opened", json.RawMessage(`{"number":1999,"title":"New","status":"open"}`)) w.o.Heard(SourceTracker, "mesh-issues.milestone-moved", json.RawMessage(`{"design":47,"id":"1","to":"done","issues":[973,525,1999]}`)) m, _ = w.o.Model() - if len(m.Operator.Groups) != 1 || m.Operator.Groups[0].State != "approved" || len(m.Operator.Asks) != 2 || len(m.Designs) != 0 { + if len(m.Operator.Asks) != 2 || len(m.Designs) != 0 { t.Fatalf("after the events: %+v", m) } - w.o.Heard(SourceDelivery, "mesh-pipeline-runner.group-ended", json.RawMessage(`{"group":"fix/a","branch":"main","outcome":"passed"}`)) w.o.Heard(SourceAsks, "messenger.closed", json.RawMessage(`{"id":"1","asker":"mesh-knowledge","how":"answered"}`)) m, _ = w.o.Model() - if len(m.Operator.Groups) != 0 || len(m.Operator.Asks) != 1 || m.Operator.Asks[0].Key != "mesh-delivery.2" { - t.Fatalf("after the group ended and the ask closed: %+v", m.Operator) + if len(m.Operator.Asks) != 1 || m.Operator.Asks[0].Key != "mesh-delivery.2" { + t.Fatalf("after the ask closed: %+v", m.Operator) } for v, n := range asked { if w.o.Calls(v) != n { @@ -109,56 +105,56 @@ func TestThePageModelHasThreeBlocksKeptByEventsAndAsksNoVerbAgain(t *testing.T) // next event; the model as a tool equals the page's model; the re-read tool asks one source and records the hand act. func TestASourceThatDoesNotAnswerIsSaidAndAskedAgainOnABackoff(t *testing.T) { w := newOverviewWorld(t) - w.fail[DeliveryGroupsVerb] = true + w.fail[AsksVerb] = true w.o.Start() m, _ := w.o.Model() - var delivery SourceState + var asks SourceState for _, s := range m.Sources { - if s.Name == SourceDelivery { - delivery = s + if s.Name == SourceAsks { + asks = s } } - if delivery.Answered || delivery.Mark == nil || delivery.Mark.Cause != MarkVerb || len(m.Operator.Groups) != 0 || !strings.Contains(delivery.Mark.Why, "no answer in time") { - t.Fatalf("%+v", delivery) + if asks.Answered || asks.Mark == nil || asks.Mark.Cause != MarkVerb || len(m.Operator.Asks) != 0 || !strings.Contains(asks.Mark.Why, "no answer in time") { + t.Fatalf("%+v", asks) } if len(m.Designs) != 1 { t.Fatalf("another source's block was lost: %+v", m.Designs) } // Asked again on the backoff alone: 10 s, then doubling, at most 5 minutes; no other source is asked. - calls := w.o.Calls(DeliveryGroupsVerb) + calls := w.o.Calls(AsksVerb) if got := w.o.Due(); len(got) != 0 { t.Fatalf("asked before the backoff ran out: %v", got) } var waits []time.Duration for i := 0; i < 8; i++ { before := w.now - w.now = w.o.state[SourceDelivery].Mark.Next + w.now = w.o.state[SourceAsks].Mark.Next waits = append(waits, w.now.Sub(before)) - if got := w.o.Due(); len(got) != 1 || got[0] != SourceDelivery { + if got := w.o.Due(); len(got) != 1 || got[0] != SourceAsks { t.Fatalf("%v", got) } } - if waits[0] != BackoffFrom || waits[1] != 2*BackoffFrom || waits[7] != BackoffMost || w.o.Calls(DeliveryGroupsVerb) != calls+8 || w.o.Calls(AsksVerb) != 1 { - t.Fatalf("waits %v, delivery asked %d, asks asked %d", waits, w.o.Calls(DeliveryGroupsVerb), w.o.Calls(AsksVerb)) + if waits[0] != BackoffFrom || waits[1] != 2*BackoffFrom || waits[7] != BackoffMost || w.o.Calls(AsksVerb) != calls+8 || w.o.Calls(TrackerListVerb) != 1 { + t.Fatalf("waits %v, asks asked %d, tracker asked %d", waits, w.o.Calls(AsksVerb), w.o.Calls(TrackerListVerb)) } // Its first answer rebuilds the block and clears the mark. - w.fail[DeliveryGroupsVerb] = false - w.now = w.o.state[SourceDelivery].Mark.Next + w.fail[AsksVerb] = false + w.now = w.o.state[SourceAsks].Mark.Next w.o.Due() m, _ = w.o.Model() - if len(w.o.Unanswered()) != 0 || len(m.Operator.Groups) != 2 { + if len(w.o.Unanswered()) != 0 || len(m.Operator.Asks) != 1 { t.Fatalf("%+v", m) } // A subscription that goes silent marks the source from the subscription and asks nothing while it is silent. asked := w.o.Calls(AsksVerb) w.now = w.now.Add(HeartbeatWithin + time.Second) - if got := w.o.Silent(); len(got) != 3 { + if got := w.o.Silent(); len(got) != 2 { t.Fatalf("%v", got) } if got := w.o.Due(); len(got) != 0 || w.o.Calls(AsksVerb) != asked { t.Fatalf("a silent subscription was asked: %v", got) } - if u := w.o.Unanswered(); len(u) != 3 || u[0].Mark.Cause != MarkSubscription { + if u := w.o.Unanswered(); len(u) != 2 || u[0].Mark.Cause != MarkSubscription { t.Fatalf("%+v", u) } // Its next event (or heartbeat) makes the module ask the verb once, and that answer clears the mark. @@ -167,19 +163,19 @@ func TestASourceThatDoesNotAnswerIsSaidAndAskedAgainOnABackoff(t *testing.T) { t.Fatalf("asked %d, mark %+v", w.o.Calls(AsksVerb), w.o.state[SourceAsks].Mark) } // An unanswered verb then turns the mark into one from the verb. - w.fail[DeliveryGroupsVerb] = true - w.o.Heard(SourceDelivery, "", nil) - if mk := w.o.state[SourceDelivery].Mark; mk == nil || mk.Cause != MarkVerb { + w.fail[TrackerMilestonesVerb] = true + w.o.Heard(SourceTracker, "", nil) + if mk := w.o.state[SourceTracker].Mark; mk == nil || mk.Cause != MarkVerb { t.Fatalf("%+v", mk) } // The runtime's word on the module's consumer (stdio.OnHeartbeat): a missed heartbeat marks every subscribed source // at once, before the bound passes, with the runtime's why; the next beat asks each verb once and clears the marks. - w.fail[DeliveryGroupsVerb] = false - w.now = w.o.state[SourceDelivery].Mark.Next + w.fail[TrackerMilestonesVerb] = false + w.now = w.o.state[SourceTracker].Mark.Next w.o.Due() asked = w.o.Calls(AsksVerb) w.o.Beat(stdio.Heartbeat{At: w.now, Missed: true, Why: "the bus's heartbeat stopped arriving"}) - if u := w.o.Unanswered(); len(u) != 3 || u[0].Mark.Cause != MarkSubscription || !strings.Contains(u[0].Mark.Why, "stopped arriving") { + if u := w.o.Unanswered(); len(u) != 2 || u[0].Mark.Cause != MarkSubscription || !strings.Contains(u[0].Mark.Why, "stopped arriving") { t.Fatalf("a missed heartbeat marked %+v", u) } w.o.Beat(stdio.Heartbeat{At: w.now}) @@ -218,12 +214,12 @@ func TestThePagesModelIsAToolAndItsRereadIsAHandAct(t *testing.T) { } // The re-read asks the one source and no other, and records itself. before := map[string]int{} - for _, v := range []string{TrackerListVerb, DeliveryGroupsVerb, AsksVerb} { + for _, v := range []string{TrackerListVerb, AsksVerb} { before[v] = w.o.Calls(v) } w.fail[AsksVerb] = true res, err := callTool(t, tools, RereadTool, map[string]any{"source": SourceAsks, "why": "the page showed it stale"}) - if err != nil || res["answered"] != false || w.o.Calls(AsksVerb) != before[AsksVerb]+1 || w.o.Calls(DeliveryGroupsVerb) != before[DeliveryGroupsVerb] || w.o.Calls(TrackerListVerb) != before[TrackerListVerb] { + if err != nil || res["answered"] != false || w.o.Calls(AsksVerb) != before[AsksVerb]+1 || w.o.Calls(TrackerListVerb) != before[TrackerListVerb] { t.Fatalf("%v %v", err, res) } if len(acts) != 1 || acts[0] != "seat:mesh-hand-acts.hand-act" { diff --git a/modules/mesh-knowledge/cmd/mesh-knowledge/page.go b/modules/mesh-knowledge/cmd/mesh-knowledge/page.go index 2279a37ae..bd73ff881 100644 --- a/modules/mesh-knowledge/cmd/mesh-knowledge/page.go +++ b/modules/mesh-knowledge/cmd/mesh-knowledge/page.go @@ -88,13 +88,11 @@ code{font-size:.9em}.src{display:inline-block;margin-right:1rem} {{if .Waiting}}
None.
{{end}}The operator channel does not answer: the asks below are not complete (last answer {{clock .Last}}).
{{end}}{{if and (eq .Name "mesh-delivery") (not .Answered)}}Delivery does not answer: the groups below are not complete (last answer {{clock .Last}}).
{{end}}{{end}} +{{range .Sources}}{{if and (eq .Name "operator-channel") (not .Answered)}}The operator channel does not answer: the asks below are not complete (last answer {{clock .Last}}).
{{end}}{{end}}None.
{{end}}None.
{{end}} -{{.ID}} {{.State}}{{if .Why}}: {{.Why}}{{end}}None.
{{end}}