Commit `3467efe33e`

3467efe33e77598a1e70eba482953deac3dec989

parent: 160fc0ec2b

Verified · cmc ci/build: success

cmc <hello@cleberg.net> · 2026-08-27 19:52 UTC

control: align dashboard aggregate with web

Layout: unified · split

e2e/dashboard_test.go +28 −2

 }
 // The dashboard control command returns the same aggregate as the web
-// dashboard — pinned repos, open MRs, assigned issues, recent builds — in
+// dashboard — review queue, assigned/open work, pins, and activity — in
-// one read.
+// one read. Builds remain for clients that already consume them.
 func TestDashboardCommand(t *testing.T) {
 	inst := startInstance(t)
 	aliceKey := inst.newKey(t, "alice")
 	}
 	var env2 struct {
 		Data struct {
+			Reviews []struct {
+				Repo   string `json:"repo"`
+				Number int64  `json:"number"`
+				Title  string `json:"title"`
+			} `json:"review_queue"`
 			Pinned []struct {
 				Path string `json:"path"`
 			} `json:"pinned"`
 				Number int64  `json:"number"`
 				Title  string `json:"title"`
 			} `json:"assigned_issues"`
+			Issues []struct {
+				Repo   string `json:"repo"`
+				Number int64  `json:"number"`
+				Title  string `json:"title"`
+			} `json:"open_issues"`
+			Activity []struct {
+				Repo  string `json:"repo"`
+				Actor string `json:"actor"`
+				Kind  string `json:"kind"`
+			} `json:"recent_activity"`
 			Builds []struct {
 				Repo   string `json:"repo"`
 				Job    string `json:"job"`
 		d.MRs[0].Title != "from bob" || d.MRs[0].Author != "bob" || d.MRs[0].State != "open" {
 		t.Fatalf("open_mrs = %+v", d.MRs)
 	}
+	if len(d.Reviews) != 1 || d.Reviews[0].Repo != "alice/app" || d.Reviews[0].Number != 1 ||
+		d.Reviews[0].Title != "from bob" {
+		t.Fatalf("review_queue = %+v", d.Reviews)
+	}
 	if len(d.Assigned) != 1 || d.Assigned[0].Repo != "alice/app" || d.Assigned[0].Number != 1 ||
 		d.Assigned[0].Title != "todo one" {
 		t.Fatalf("assigned_issues = %+v", d.Assigned)
 	}
+	if len(d.Issues) != 1 || d.Issues[0].Repo != "alice/app" || d.Issues[0].Number != 1 ||
+		d.Issues[0].Title != "todo one" {
+		t.Fatalf("open_issues = %+v", d.Issues)
+	}
+	if len(d.Activity) == 0 || d.Activity[0].Repo != "alice/app" {
+		t.Fatalf("recent_activity = %+v", d.Activity)
+	}
 	// Both pushes hit main and feat; each queues the ci.yml job.
 	if len(d.Builds) == 0 || d.Builds[0].Repo != "alice/app" || d.Builds[0].Job != "test" ||
 		d.Builds[0].Status != "pending" {

internal/control/dashboard.go +71 −27

 func init() {
 	register(Command{Path: []string{"dashboard"},
-		Summary:  "one read for the account dashboard: pinned repos, open MRs, assigned issues, recent builds",
+		Summary:  "one read for the account dashboard: review queue, assigned and open work, pins, activity, builds",
 		ReadOnly: true, Run: runDashboard})
 	register(Command{Path: []string{"feed"},
 		Summary:  "activity on repositories you can reach: feed [--limit <n>] [--cursor <c>]",
 		FinishedAt string `json:"finished_at,omitempty"`
 	}
 	type out struct {
-		Pinned   []pinnedOut     `json:"pinned"`
+		Reviews  []dashboardItem `json:"review_queue"`
-		MRs      []dashboardItem `json:"open_mrs"`
 		Assigned []dashboardItem `json:"assigned_issues"`
+		MRs      []dashboardItem `json:"open_mrs"`
+		Issues   []dashboardItem `json:"open_issues"`
+		Pinned   []pinnedOut     `json:"pinned"`
+		Activity []feedOut       `json:"recent_activity"`
 		Builds   []buildOut      `json:"builds"`
 	}
-	d := out{Pinned: []pinnedOut{}, MRs: []dashboardItem{}, Assigned: []dashboardItem{}, Builds: []buildOut{}}
+	d := out{
+		Reviews: []dashboardItem{}, Assigned: []dashboardItem{}, MRs: []dashboardItem{},
+		Issues: []dashboardItem{}, Pinned: []pinnedOut{}, Activity: []feedOut{}, Builds: []buildOut{},
+	}
 	pinned, err := c.Store.PinnedRepos(c.User.ID)
 	if err != nil {
 		d.MRs = append(d.MRs, dashboardItem{m.RepoPath, m.Number, m.Title, m.Author, m.State, m.UpdatedAt})
 	}
+	reviews, err := c.Store.ReviewQueue(c.User.ID)
+	if err != nil {
+		return c.fail(protocol.ExitFailure, "%v", err)
+	}
+	for _, m := range reviews {
+		d.Reviews = append(d.Reviews, dashboardItem{m.RepoPath, m.Number, m.Title, m.Author, m.State, m.UpdatedAt})
+	}
 	assigned, err := c.Store.AssignedIssues(c.User.ID)
 	if err != nil {
 		return c.fail(protocol.ExitFailure, "%v", err)
 		d.Assigned = append(d.Assigned, dashboardItem{i.RepoPath, i.Number, i.Title, i.Author, i.State, i.UpdatedAt})
 	}
+	issues, err := c.Store.DashboardIssues(c.User.ID)
+	if err != nil {
+		return c.fail(protocol.ExitFailure, "%v", err)
+	}
+	for _, i := range issues {
+		d.Issues = append(d.Issues, dashboardItem{i.RepoPath, i.Number, i.Title, i.Author, i.State, i.UpdatedAt})
+	}
+	events, err := c.Store.RecentEvents(c.User.ID, 20, 0)
+	if err != nil {
+		return c.fail(protocol.ExitFailure, "%v", err)
+	}
+	d.Activity = feedOutputs(events)
 	builds, err := c.Store.RecentBuilds(c.User.ID, 20)
 	if err != nil {
 		return c.fail(protocol.ExitFailure, "%v", err)
 	}
 	return c.emit(d, func(w io.Writer) {
+		fmt.Fprintln(w, "waiting on your review:")
+		printDashboardItems(w, d.Reviews, "!")
+		fmt.Fprintln(w, "assigned to you:")
+		printDashboardItems(w, d.Assigned, "#")
+		fmt.Fprintln(w, "open merge requests:")
+		printDashboardItems(w, d.MRs, "!")
+		fmt.Fprintln(w, "open issues:")
+		printDashboardItems(w, d.Issues, "#")
 		fmt.Fprintln(w, "pinned:")
 		for _, p := range d.Pinned {
 			mark := ""
 			}
 			fmt.Fprintf(w, "  %s\t%s\t%s%s\n", p.Path, p.Visibility, p.Description, mark)
 		}
-		fmt.Fprintln(w, "open merge requests:")
+		fmt.Fprintln(w, "recent activity:")
-		for _, m := range d.MRs {
+		for _, e := range d.Activity {
-			fmt.Fprintf(w, "  %s!%d\t%s\t%s\n", m.Repo, m.Number, m.Title, m.Author)
+			fmt.Fprintf(w, "  %s\t%s\t%s\t%s\t%s\n", e.CreatedAt, e.Actor, e.Kind, e.Repo, string(e.Data))
-		}
-		fmt.Fprintln(w, "assigned issues:")
-		for _, i := range d.Assigned {
-			fmt.Fprintf(w, "  %s#%d\t%s\t%s\n", i.Repo, i.Number, i.Title, i.Author)
 		}
 		fmt.Fprintln(w, "builds:")
 		for _, b := range d.Builds {
 	})
 }
+func printDashboardItems(w io.Writer, items []dashboardItem, marker string) {
+	for _, item := range items {
+		fmt.Fprintf(w, "  %s%s%d\t%s\t%s\n", item.Repo, marker, item.Number, item.Title, item.Author)
+	}
+}
 // feedDefaultLimit caps a bare `feed` call; pagination reaches further
 // back.
 const feedDefaultLimit = 50
+type feedOut struct {
+	ID        int64           `json:"id"`
+	Repo      string          `json:"repo"`
+	Actor     string          `json:"actor,omitempty"`
+	Kind      string          `json:"kind"`
+	Data      json.RawMessage `json:"data,omitempty"`
+	CreatedAt string          `json:"created_at"`
+}
+func feedOutputs(events []store.FeedEvent) []feedOut {
+	ds := make([]feedOut, 0, len(events))
+	for _, e := range events {
+		d := feedOut{ID: e.ID, Repo: e.RepoPath, Actor: e.Actor, Kind: e.Kind, CreatedAt: e.CreatedAt}
+		if json.Valid([]byte(e.Data)) {
+			d.Data = json.RawMessage(e.Data)
+		}
+		ds = append(ds, d)
+	}
+	return ds
+}
 func runFeed(c *Ctx, args []string) int {
 	rest, p, code := parsePageFlags(c, args, "feed", true)
 	if code >= 0 {
 	events, next := trimPage(p, events, "feed", func(e store.FeedEvent) string {
 		return strconv.FormatInt(e.ID, 10)
 	})
-	type feedOut struct {
+	ds := feedOutputs(events)
-		ID        int64           `json:"id"`
-		Repo      string          `json:"repo"`
-		Actor     string          `json:"actor,omitempty"`
-		Kind      string          `json:"kind"`
-		Data      json.RawMessage `json:"data,omitempty"`
-		CreatedAt string          `json:"created_at"`
-	}
-	var ds []feedOut
-	for _, e := range events {
-		d := feedOut{ID: e.ID, Repo: e.RepoPath, Actor: e.Actor, Kind: e.Kind, CreatedAt: e.CreatedAt}
-		if json.Valid([]byte(e.Data)) {
-			d.Data = json.RawMessage(e.Data)
-		}
-		ds = append(ds, d)
-	}
 	return c.emitPage(p, ds, next, func(w io.Writer) {
 		for _, d := range ds {
 			fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", d.CreatedAt, d.Actor, d.Kind, d.Repo, string(d.Data))

Commit 3467efe33e

Commit `3467efe33e`