Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/fixed-16617-review-activity.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- The Activity Monitor preserves settled review and CI verdicts on the current head as observations age, and review tooltips list each perspective’s verdict and finding with the observation age ([#16617](https://github.com/hivecommons/hive/issues/16617)).
62 changes: 60 additions & 2 deletions src/pkg/dashboard/stage_tracker_activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,18 @@ type StageTrackerActivity struct {
// the swarm's expected set for this PR (configured perspectives plus any
// extra one dispatched or reported for the head), Done the ones with a
// verdict for the current head.
PerspectivesDone int `json:"perspectives_done,omitempty"`
PerspectivesTotal int `json:"perspectives_total,omitempty"`
PerspectivesDone int `json:"perspectives_done,omitempty"`
PerspectivesTotal int `json:"perspectives_total,omitempty"`
Perspectives []StageTrackerPerspective `json:"perspectives,omitempty"`
}

// StageTrackerPerspective describes the latest bundle verdict for one perspective
// on the current head, preserving dissent across reviewers. Summary is the
// first finding, when one was reported.
type StageTrackerPerspective struct {
Name string `json:"name"`
Verdict string `json:"verdict"`
Summary string `json:"summary"`
}

const trackerActivityFreshWindow = 2 * time.Minute
Expand Down Expand Up @@ -439,6 +449,37 @@ func trackerLatestBundleVerdicts(bundle *evidence.Bundle) []evidence.Verdict {
return out
}

func trackerReviewPerspectives(bundle *evidence.Bundle) []StageTrackerPerspective {
latest := map[string]evidence.Verdict{}
for _, verdict := range trackerLatestBundleVerdicts(bundle) {
if verdict.Perspective == "" {
continue
}
previous, ok := latest[verdict.Perspective]
// Each backend/model has its own current verdict. An approval by
// another reviewer must not hide dissent that still blocks the head.
if !ok || (previous.Verdict == "approve" && verdict.Verdict != "approve") ||
((previous.Verdict == "approve") == (verdict.Verdict == "approve") && verdict.RecordedAt.After(previous.RecordedAt)) {
latest[verdict.Perspective] = verdict
}
}
names := make([]string, 0, len(latest))
for name := range latest {
names = append(names, name)
}
slices.Sort(names)
out := make([]StageTrackerPerspective, 0, len(names))
for _, name := range names {
v := latest[name]
p := StageTrackerPerspective{Name: name, Verdict: v.Verdict}
if len(v.Findings) > 0 {
p.Summary = v.Findings[0].Summary
}
out = append(out, p)
}
return out
}

func trackerBundleApproves(bundle *evidence.Bundle, agg *review.Aggregate) bool {
latest := trackerLatestBundleVerdicts(bundle)
if len(latest) == 0 || len(agg.Perspectives) == 0 {
Expand Down Expand Up @@ -515,6 +556,7 @@ func stageTrackerReviewActivity(pr github.PullRequest, bundle *evidence.Bundle,
qualify := stageTrackerRepoQualifier(status)
if bundle != nil && trackerHeadMatches(pr.Repo, pr.Number, pr.HeadSHA, bundle.Repo, bundle.Number, bundle.HeadSHA) {
out.Source, out.ObservedAt = "verified-review-bundle", timePtr(bundle.UpdatedAt)
out.Perspectives = trackerReviewPerspectives(bundle)
for _, verdict := range trackerLatestBundleVerdicts(bundle) {
if !verdict.RecordedAt.IsZero() && (out.Since == nil || verdict.RecordedAt.After(*out.Since)) {
at := verdict.RecordedAt
Expand Down Expand Up @@ -639,6 +681,22 @@ func stageTrackerReviewActivity(pr github.PullRequest, bundle *evidence.Bundle,
break
}
}
if out.State == "changes_requested" || out.State == "human_decision" {
for _, perspective := range out.Perspectives {
if perspective.Verdict == "changes_requested" || perspective.Verdict == "reject" || perspective.Verdict == "requires_human" {
mark := "✗"
if perspective.Verdict == "requires_human" {
mark = "requires human"
}
out.Caption += " · " + perspective.Name + " " + mark
if perspective.Summary != "" {
out.Caption += ": " + perspective.Summary
}
break
}
}
}

return out
}

Expand Down
101 changes: 99 additions & 2 deletions src/pkg/dashboard/stage_tracker_activity.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ function fn(source, name) {
assert.ok(match, name);
return match[0];
}
const esc = text => String(text).replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('"', '&quot;');
// Mirrors production esc(): newlines flatten to spaces.
const esc = text => String(text).replaceAll('&', '&amp;').replaceAll('<', '&lt;').replaceAll('"', '&quot;').replaceAll('\n', ' ');
const globals = `
const STAGE_TRACKER_PATH = [0, 10, 20, 30, 50, 80];
const STAGE_TRACKER_TERMINAL = 110;
Expand Down Expand Up @@ -561,7 +562,7 @@ test('old-head or stale observations cannot fabricate running/completion, but do
} else {
assert.match(cells.ci, /active ham-current[^]*CI \?\/\? · running</, mode + ': the last observed state still reads in words');
assert.match(cells.review, /done ham-current[^]*data-verdict="pass"[^]*Review: Review approved · /, mode + ': an approval of this head stays done, freshness only in the tooltip');
assert.match(cells.review, mode === 'stale' ? /stale · / : /observation time unknown/);
assert.match(cells.review, mode === 'stale' ? /observed 5m ago/ : /observation time unknown/);
}
}
});
Expand Down Expand Up @@ -855,3 +856,99 @@ test('#16484: the three screenshot rows — both tracks lit with counts, swarm r
assert.match(cell, /<svg /);
}
});

test('settled current-head verdicts keep one known caption at every observation age', () => {
for (const [kind, state, caption] of [
['review', 'approved', 'Review approved'],
['review', 'changes_requested', 'Review findings · correctness ✗: handle the stale verdict'],
['review', 'human_decision', 'Review findings · needs owner sign-off'],
['ci', 'passing', 'CI green'],
['ci', 'failing', 'CI failing · build red'],
]) {
for (const observed of [new Date(now - 15 * 60000).toISOString(), undefined, 'invalid', new Date(now + 60000).toISOString()]) {
const a = { ...activity(state, caption), observed_at: observed };
const item = { kind: 'pr', head: 'head', [kind + '_activity']: a };
const html = track(item, kind, {}, false, now);
assert.match(html, /data-display-state="known"/);
assert.ok(html.includes(caption), state + ': caption preserved');
assert.doesNotMatch(html, /activity unknown|last observed|data-motion/);
if (observed === undefined || observed === 'invalid') assert.match(html, /observation time unknown/);
else if (Date.parse(observed) > now) assert.match(html, /observation time in future/);
else assert.match(html, /observed 15m ago/);
item.head = 'new-head';
const pushed = track(item, kind, {}, false, now);
assert.match(pushed, /data-display-state="unknown"/);
assert.doesNotMatch(pushed, /data-verdict=|correctness|build red/);
}
}
});

test('motion needs a fresh observation even when the backend active flag is cached', () => {
for (const [kind, state] of [['review', 'reviewing'], ['review', 'adjudicating'], ['review', 'assigned'], ['review', 'unassigned'], ['review', 'waiting_ci'], ['ci', 'running'], ['ci', 'queued'], ['ci', 'waiting_ci']]) {
for (const observed of [new Date(now - 15 * 60000).toISOString(), undefined, new Date(now + 60000).toISOString()]) {
const item = { kind: 'pr', head: 'head', [kind + '_activity']: { ...activity(state, 'Work observed', true), observed_at: observed } };
const html = track(item, kind, {}, false, now);
assert.match(html, /data-display-state="unknown"/);
assert.match(html, /activity unknown/);
assert.doesNotMatch(html, /data-motion/);
}
}
});

test('review tooltip lists escaped perspective verdicts before current-head provenance', () => {
const summary = '<img src=x onerror="bad()"> & check the current head';
const caption = 'Review findings · correctness ✗: ' + summary;
const item = { kind: 'pr', head: 'head', review_activity: {
...activity('changes_requested', caption), source: 'verified-review-bundle',
observed_at: new Date(now - 15 * 60000).toISOString(), blocker: summary,
perspectives: [
{ name: 'correctness', verdict: 'changes_requested', summary },
{ name: 'security', verdict: 'approve', summary: '' },
{ name: 'quality', verdict: 'reject', summary: 'explain the edge case' },
],
} };
const html = track(item, 'review', {}, false, now);
const tip = html.match(/role="tooltip">([^]*?)<\/span>/)[1];
assert.ok(tip.includes(esc(caption) + '<br>correctness ✗: ' + esc(summary)));
assert.match(tip, /<br>security ✓<br>quality ✗: explain the edge case<br>head head · verified-review-bundle · observed 15m ago/);
assert.doesNotMatch(html, /<img|activity unknown|last observed/);
assert.ok(html.includes(' security ✓ quality ✗: explain the edge case head head'), 'accessible title flattens the same perspective lines');
item.head = 'new-head';
assert.doesNotMatch(track(item, 'review', {}, false, now), /correctness|security|edge case|verified-review-bundle|<img|&lt;img/);
});

test('human perspective explains a settled or adopted decision without leaking into unknown motion', () => {
const a = { ...activity('human_decision', 'Review findings · needs owner sign-off'),
observed_at: new Date(now - 15 * 60000).toISOString(),
perspectives: [{ name: 'correctness', verdict: 'requires_human', summary: 'Choose whether to keep the API break' }] };
const item = { kind: 'pr', head: 'head', review_activity: a };
for (const state of ['human_decision', 'changes_requested']) {
a.state = state;
const html = track(item, 'review', {}, false, now);
assert.match(html, /correctness requires human: Choose whether to keep the API break<br>correctness requires human: Choose whether to keep the API break<br>head/);
assert.doesNotMatch(html, /activity unknown|last observed/);
}
for (const state of ['reviewing', 'unknown']) {
a.state = state;
a.caption = 'Review activity unknown';
const html = track(item, 'review', {}, false, now);
assert.match(html, /data-display-state="unknown"/);
assert.doesNotMatch(html, /correctness|API break|requires human/);
}
});

test('a settled failing CI verdict preserves fresh motion from other running checks', () => {
const item = { kind: 'pr', head: 'head', ci_activity: {
...activity('failing', 'CI failing · build red · other checks still running', true),
checks_failed: 1, checks_total: 2, checks_failing: ['build'],
} };
const fresh = track(item, 'ci', {}, false, now);
assert.match(fresh, /data-activity-state="failing"/);
assert.match(fresh, /data-display-state="known"/);
assert.match(fresh, /data-motion="active"/);
const stale = track(item, 'ci', {}, false, now + 15 * 60000);
assert.match(stale, /data-activity-state="failing"/);
assert.match(stale, /data-display-state="known"/);
assert.match(stale, /observed 15m ago/);
assert.doesNotMatch(stale, /data-motion|activity unknown|last observed/);
});
57 changes: 57 additions & 0 deletions src/pkg/dashboard/stage_tracker_activity_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package dashboard

import (
"encoding/json"
"os/exec"
"reflect"
"strings"
"testing"
"time"
Expand Down Expand Up @@ -485,3 +487,58 @@ func TestStageTrackerActivityReviewPerspectiveCounts(t *testing.T) {
t.Fatalf("old-head evidence leaked into counts: %d/%d", got.PerspectivesDone, got.PerspectivesTotal)
}
}

func TestStageTrackerReviewPerspectiveDetails(t *testing.T) {
now := time.Date(2026, 11, 4, 3, 0, 0, 0, time.UTC)
observed := now.Add(-15 * time.Minute)
pr := github.PullRequest{Repo: "org/repo", Number: 7, HeadSHA: "head"}
bundle := &evidence.Bundle{Repo: pr.Repo, Number: pr.Number, HeadSHA: pr.HeadSHA, UpdatedAt: observed,
Verdicts: []evidence.Verdict{
{Perspective: "security", Verdict: "approve", RecordedAt: observed},
{Perspective: "correctness", Backend: "old", Verdict: "approve", RecordedAt: observed.Add(-time.Minute)},
{Perspective: "correctness", Backend: "new", Verdict: "changes_requested", RecordedAt: observed,
Findings: []evidence.Finding{{Summary: "do not discard the settled verdict"}}},
{Perspective: "quality", Verdict: "changes_requested", RecordedAt: observed.Add(-time.Minute),
Findings: []evidence.Finding{{Summary: "superseded finding"}}},
{Perspective: "quality", Verdict: "approve", RecordedAt: observed},
{Verdict: "reject", RecordedAt: observed},
}}
want := []StageTrackerPerspective{
{Name: "correctness", Verdict: "changes_requested", Summary: "do not discard the settled verdict"},
{Name: "quality", Verdict: "approve"},
{Name: "security", Verdict: "approve"},
}
for _, verdict := range []review.Verdict{"changes_requested", "requires_human"} {
agg := &review.Aggregate{Repo: pr.Repo, Number: pr.Number, HeadSHA: pr.HeadSHA, Verdict: verdict}
got := stageTrackerReviewActivity(pr, bundle, agg, review.DispatchState{}, nil, now)
if !reflect.DeepEqual(got.Perspectives, want) || !strings.Contains(got.Caption, "correctness ✗: do not discard the settled verdict") || got.Active {
t.Fatalf("settled review lost its current-head perspective details: %+v", got)
}
data, err := json.Marshal(got)
if err != nil || !strings.Contains(string(data), `"perspectives":[{"name":"correctness","verdict":"changes_requested","summary":"do not discard the settled verdict"}`) {
t.Fatalf("perspective wire fields missing: %s, %v", data, err)
}
}
bundle.Verdicts[2].Verdict = "requires_human"
agg := &review.Aggregate{Repo: pr.Repo, Number: pr.Number, HeadSHA: pr.HeadSHA, Verdict: "requires_human"}
got := stageTrackerReviewActivity(pr, bundle, agg, review.DispatchState{}, nil, now)
if got.State != "human_decision" || !strings.Contains(got.Caption, "correctness requires human: do not discard the settled verdict") || got.Perspectives[0].Verdict != "requires_human" {
t.Fatalf("human perspective was not explained: %+v", got)
}
bundle.Verdicts[2].Verdict = "changes_requested"
// Approval from another backend must not replace still-current dissent.
bundle.Verdicts = append(bundle.Verdicts, evidence.Verdict{Perspective: "correctness", Backend: "z", Verdict: "approve", RecordedAt: observed.Add(time.Minute)})
if got := trackerReviewPerspectives(bundle); !reflect.DeepEqual(got, want) {
t.Fatalf("newer approval from another backend hid a finding: %+v", got)
}
for _, other := range []github.PullRequest{
{Repo: pr.Repo, Number: pr.Number, HeadSHA: "new-head"},
{Repo: "other/repo", Number: pr.Number, HeadSHA: pr.HeadSHA},
{Repo: pr.Repo, Number: 8, HeadSHA: pr.HeadSHA},
} {
got := stageTrackerReviewActivity(other, bundle, nil, review.DispatchState{}, nil, now)
if got.State != "unknown" || len(got.Perspectives) != 0 || strings.Contains(got.Caption, "correctness") {
t.Fatalf("unrelated review details leaked: %+v", got)
}
}
}
Loading
Loading