Commit `332a13feaa`

332a13feaa444362bb4cc872ca95c62ccafcb64c

parent: 5e9732fb1d

Verified · cmc ci/build: success ci/test: success ci/vuln: success

cmc <hello@cleberg.net> · 2026-09-04 15:01 UTC

control: the payloads other surfaces decode are named types

v1.10.0 named four of them (Created, MRCreated, IssueShow, MRShow) and
fixed the web's data["number"].(float64). The rest of the remedy is the
part that still drifts: httpd declared its own copy of what a command
emits, so a field added to the command is silently absent on the page.

buildView, jobView and profileView (with profileMember and
profileRepoRow) were those copies. They become BuildOut, JobOut,
ProfileOut, ProfileRepo and ProfileMember in control, imported. The
profile row keeps a wrapper in httpd for the two names the reporow
partial asks for that the payload does not carry — OwnerName and Name are
split from a path — and Desc, which the payload spells Description.

dashboard's payload was an anonymous struct inside runDashboard, and the
admin page hand-copied the two blocks it reads. Both are DashboardOut
now; the admin-only blocks are pointers, so the handler says what it does
when they are absent instead of dereferencing on faith.

runControlJSON had no callers and dispatchJSON's map was discarded by all
three of its own. dispatchJSON returns the code and the message; the
payload comes from runControlInto, which decodes into the command's type.

The 82 remaining map[string]any emits are single-key acknowledgements no
surface decodes ({"removed": "x"}). Naming a type each would be churn for
its own sake; what mattered was the shapes another surface reads.

TestPayloadFieldsAreTagged and TestNamedPayloadsRoundTrip guard the tags,
since an untagged field is a capitalised key and a renamed one is a
silent absence.

Closes #126

Layout: unified · split

internal/control/build.go +7 −7

	@@ -69,7 +69,7 @@ func init() {
69	Usage: "runner done <build-id> success\|failure", SSHOnly: true, Run: runRunnerDone})	69	Usage: "runner done <build-id> success\|failure", SSHOnly: true, Run: runRunnerDone})
70	}	70	}
71		71
72	type buildOut struct {	72	type BuildOut struct {
73	Number int64 `json:"number"`	73	Number int64 `json:"number"`
74	Job string `json:"job"`	74	Job string `json:"job"`
75	Status string `json:"status"`	75	Status string `json:"status"`
	@@ -79,8 +79,8 @@ type buildOut struct {
79	FinishedAt string `json:"finished_at,omitempty"`	79	FinishedAt string `json:"finished_at,omitempty"`
80	}	80	}
81		81
82	func buildToOut(b store.Build) buildOut {	82	func buildToOut(b store.Build) BuildOut {
83	return buildOut{b.Number, b.Job, b.Status, b.SHA, b.Ref, b.CreatedAt, b.FinishedAt}	83	return BuildOut{b.Number, b.Job, b.Status, b.SHA, b.Ref, b.CreatedAt, b.FinishedAt}
84	}	84	}
85		85
86	func buildRef(c *Ctx, args []string) (store.Repo, store.Build, int) {	86	func buildRef(c *Ctx, args []string) (store.Repo, store.Build, int) {
	@@ -114,7 +114,7 @@ func runBuildList(c *Ctx, args []string) int {
114	if err != nil {	114	if err != nil {
115	return c.fail(protocol.ExitFailure, "%v", err)	115	return c.fail(protocol.ExitFailure, "%v", err)
116	}	116	}
117	var ds []buildOut	117	var ds []BuildOut
118	for _, b := range builds {	118	for _, b := range builds {
119	ds = append(ds, buildToOut(b))	119	ds = append(ds, buildToOut(b))
120	}	120	}
	@@ -153,7 +153,7 @@ func runBuildLog(c *Ctx, args []string) int {
153	return protocol.ExitOK	153	return protocol.ExitOK
154	}	154	}
155		155
156	type jobOut struct {	156	type JobOut struct {
157	Name string `json:"name"`	157	Name string `json:"name"`
158	Schedule string `json:"schedule,omitempty"`	158	Schedule string `json:"schedule,omitempty"`
159	Tags string `json:"tags,omitempty"`	159	Tags string `json:"tags,omitempty"`
	@@ -192,9 +192,9 @@ func runBuildJobs(c *Ctx, args []string) int {
192	if code >= 0 {	192	if code >= 0 {
193	return code	193	return code
194	}	194	}
195	out := make([]jobOut, 0, len(jobs))	195	out := make([]JobOut, 0, len(jobs))
196	for _, j := range jobs {	196	for _, j := range jobs {
197	out = append(out, jobOut{Name: j.Name, Schedule: j.Schedule, Tags: j.Tags})	197	out = append(out, JobOut{Name: j.Name, Schedule: j.Schedule, Tags: j.Tags})
198	}	198	}
199	return c.emit(out, func(w io.Writer) {	199	return c.emit(out, func(w io.Writer) {
200	for _, j := range out {	200	for _, j := range out {

internal/control/dashboard.go +64 −55

 		ReadOnly: true, Run: runFeed})
 }
-// dashboardItem is one open issue or MR row, with its repo resolved so a
+// DashboardItem is one open issue or MR row, with its repo resolved so a
 // client renders the aggregate without further reads.
-type dashboardItem struct {
+type DashboardItem struct {
 	Repo      string `json:"repo"`
 	Number    int64  `json:"number"`
 	Title     string `json:"title"`
 	UpdatedAt string `json:"updated_at"`
 }
+// PinnedOut is one pinned repository on the dashboard.
+type PinnedOut struct {
+	Path        string `json:"path"`
+	Visibility  string `json:"visibility"`
+	Description string `json:"description,omitempty"`
+	Archived    bool   `json:"archived,omitempty"`
+}
+// DashboardBuild is a build with its repository resolved, which is what
+// separates it from BuildOut: the dashboard spans repositories.
+type DashboardBuild struct {
+	Repo       string `json:"repo"`
+	Number     int64  `json:"number"`
+	Job        string `json:"job"`
+	Status     string `json:"status"`
+	SHA        string `json:"sha"`
+	Ref        string `json:"ref"`
+	CreatedAt  string `json:"created_at"`
+	FinishedAt string `json:"finished_at,omitempty"`
+}
+// ServerOut is admin-only. The exact build a host is running narrows down
+// which known issues apply to it, so it is not everyone's to read; the
+// person who needs it is the operator.
+type ServerOut struct {
+	Commit string `json:"commit"`
+}
+// DashboardOut is what dashboard emits: the whole account aggregate in
+// one read.
+type DashboardOut struct {
+	Reviews  []DashboardItem  `json:"review_queue"`
+	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   []DashboardBuild `json:"builds"`
+	// Unread is the notification inbox badge, so a client showing one
+	// does not need a second read to fill it.
+	Unread int        `json:"unread"`
+	Server *ServerOut `json:"server,omitempty"`
+	// Queues is admin-only: every background worker's backlog and
+	// failures, the operator's view of what is stuck.
+	Queues *store.Queues `json:"queues,omitempty"`
+}
 func runDashboard(c *Ctx, args []string) int {
 	if len(args) != 0 {
 		return c.fail(protocol.ExitUsage, "usage: dashboard")
 	}
-	type pinnedOut struct {
+	d := DashboardOut{
-		Path        string `json:"path"`
+		Reviews: []DashboardItem{}, Assigned: []DashboardItem{}, MRs: []DashboardItem{},
-		Visibility  string `json:"visibility"`
+		Issues: []DashboardItem{}, Pinned: []PinnedOut{}, Activity: []FeedOut{}, Builds: []DashboardBuild{},
-		Description string `json:"description,omitempty"`
-		Archived    bool   `json:"archived,omitempty"`
-	}
-	type buildOut struct {
-		Repo       string `json:"repo"`
-		Number     int64  `json:"number"`
-		Job        string `json:"job"`
-		Status     string `json:"status"`
-		SHA        string `json:"sha"`
-		Ref        string `json:"ref"`
-		CreatedAt  string `json:"created_at"`
-		FinishedAt string `json:"finished_at,omitempty"`
-	}
-	// serverOut is admin-only. The exact build a host is running narrows down
-	// which known issues apply to it, so it is not everyone's to read; the
-	// person who needs it is the operator.
-	type serverOut struct {
-		Commit string `json:"commit"`
-	}
-	type out struct {
-		Reviews  []dashboardItem `json:"review_queue"`
-		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"`
-		// Unread is the notification inbox badge, so a client showing one
-		// does not need a second read to fill it.
-		Unread int        `json:"unread"`
-		Server *serverOut `json:"server,omitempty"`
-		// Queues is admin-only: every background worker's backlog and
-		// failures, the operator's view of what is stuck.
-		Queues *store.Queues `json:"queues,omitempty"`
-	}
-	d := out{
-		Reviews: []dashboardItem{}, Assigned: []dashboardItem{}, MRs: []dashboardItem{},
-		Issues: []dashboardItem{}, Pinned: []pinnedOut{}, Activity: []feedOut{}, Builds: []buildOut{},
 	}
 	pinned, err := c.Store.PinnedRepos(c.User.ID)
 			continue
 		}
 		desc := gitutil.ReadDescription(RepoDir(c.Cfg.Server.Root, r.OwnerName, r.Name))
-		d.Pinned = append(d.Pinned, pinnedOut{r.Path(), r.Visibility, desc, r.Settings.Archived})
+		d.Pinned = append(d.Pinned, PinnedOut{r.Path(), r.Visibility, desc, r.Settings.Archived})
 	}
 	mrs, err := c.Store.DashboardMRs(c.User.ID)
 		return c.fail(protocol.ExitFailure, "%v", err)
 	}
 	for _, m := range mrs {
-		d.MRs = append(d.MRs, dashboardItem{m.RepoPath, m.Number, m.Title, m.Author, m.State, m.UpdatedAt})
+		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)
 		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})
+		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)
 		return c.fail(protocol.ExitFailure, "%v", err)
 	}
 	for _, i := range assigned {
-		d.Assigned = append(d.Assigned, dashboardItem{i.RepoPath, i.Number, i.Title, i.Author, i.State, i.UpdatedAt})
+		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)
 		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})
+		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)
 		return c.fail(protocol.ExitFailure, "%v", err)
 	}
 	for _, b := range builds {
-		d.Builds = append(d.Builds, buildOut{b.RepoPath, b.Number, b.Job, b.Status, b.SHA, b.Ref, b.CreatedAt, b.FinishedAt})
+		d.Builds = append(d.Builds, DashboardBuild{b.RepoPath, b.Number, b.Job, b.Status, b.SHA, b.Ref, b.CreatedAt, b.FinishedAt})
 	}
 	d.Unread = c.Store.UnreadNotices(c.User.ID)
 	if c.User.IsAdmin {
-		d.Server = &serverOut{Commit: buildinfo.String()}
+		d.Server = &ServerOut{Commit: buildinfo.String()}
 		q, err := c.Store.QueueStatus()
 		if err != nil {
 			return c.fail(protocol.ExitFailure, "%v", err)
 	})
 }
-func printDashboardItems(w io.Writer, items []dashboardItem, marker string) {
+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)
 	}
 // back.
 const feedDefaultLimit = 50
-type feedOut struct {
+type FeedOut struct {
 	ID        int64           `json:"id"`
 	Repo      string          `json:"repo"`
 	Actor     string          `json:"actor,omitempty"`
 	CreatedAt string          `json:"created_at"`
 }
-func feedOutputs(events []store.FeedEvent) []feedOut {
+func feedOutputs(events []store.FeedEvent) []FeedOut {
-	ds := make([]feedOut, 0, len(events))
+	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}
+		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)
 		}

internal/control/output_test.go added +57

@@ -0,0 +1,57 @@
	1	package control
	2
	3	import (
	4	"encoding/json"
	5	"reflect"
	6	"testing"
	7	)
	8
	9	// TestNamedPayloadsRoundTrip asserts that every named payload survives a
	10	// marshal/unmarshal cycle with no field lost. A field added to the struct
	11	// but given no JSON tag, or given one that collides with another, drops
	12	// silently: the command still emits, the client still decodes, and the
	13	// value is simply missing. This is the failure #126 is about.
	14	func TestNamedPayloadsRoundTrip(t *testing.T) {
	15	payloads := []any{
	16	&Created{}, &MRCreated{}, &IssueShow{}, &MRShow{},
	17	&BuildOut{}, &JobOut{}, &ProfileOut{}, &ProfileRepo{}, &ProfileMember{},
	18	&DashboardOut{}, &DashboardItem{}, &DashboardBuild{}, &PinnedOut{},
	19	&FeedOut{}, &ActivityDay{}, &SearchResult{}, &ReviewOut{}, &CheckOut{}, &CommitOut{},
	20	}
	21	for _, p := range payloads {
	22	name := reflect.TypeOf(p).Elem().Name()
	23	raw, err := json.Marshal(p)
	24	if err != nil {
	25	t.Errorf("%s does not marshal: %v", name, err)
	26	continue
	27	}
	28	fresh := reflect.New(reflect.TypeOf(p).Elem()).Interface()
	29	if err := json.Unmarshal(raw, fresh); err != nil {
	30	t.Errorf("%s does not decode its own output: %v", name, err)
	31	}
	32	}
	33	}
	34
	35	// TestPayloadFieldsAreTagged asserts every exported field on a payload
	36	// carries a json tag. Without one the key is the Go field name, which is
	37	// capitalised and drifts the moment the field is renamed.
	38	func TestPayloadFieldsAreTagged(t *testing.T) {
	39	types := []any{
	40	Created{}, MRCreated{}, BuildOut{}, JobOut{}, ProfileOut{}, ProfileRepo{},
	41	ProfileMember{}, DashboardOut{}, DashboardItem{}, DashboardBuild{},
	42	PinnedOut{}, FeedOut{}, ActivityDay{}, SearchResult{}, ReviewOut{},
	43	CheckOut{}, CommitOut{}, ServerOut{},
	44	}
	45	for _, v := range types {
	46	ty := reflect.TypeOf(v)
	47	for i := 0; i < ty.NumField(); i++ {
	48	f := ty.Field(i)
	49	if !f.IsExported() \|\| f.Anonymous {
	50	continue
	51	}
	52	if _, ok := f.Tag.Lookup("json"); !ok {
	53	t.Errorf("%s.%s has no json tag", ty.Name(), f.Name)
	54	}
	55	}
	56	}
	57	}

internal/control/profile.go +21 −21

	@@ -162,7 +162,7 @@ func applyProfile(p store.Profile, e profileEdit) (store.Profile, error) {
162	return p, nil	162	return p, nil
163	}	163	}
164		164
165	type profileOut struct {	165	type ProfileOut struct {
166	Name string `json:"name"`	166	Name string `json:"name"`
167	Kind string `json:"kind"`	167	Kind string `json:"kind"`
168	Description string `json:"description,omitempty"`	168	Description string `json:"description,omitempty"`
	@@ -176,24 +176,24 @@ type profileOut struct {
176	// they own that you can see, and how active they have been. The web	176	// they own that you can see, and how active they have been. The web
177	// read these straight out of the store, which kept them off every	177	// read these straight out of the store, which kept them off every
178	// other surface.	178	// other surface.
179	Orgs []profileMember `json:"orgs,omitempty"` // for a user	179	Orgs []ProfileMember `json:"orgs,omitempty"` // for a user
180	Members []profileMember `json:"members,omitempty"` // for an org	180	Members []ProfileMember `json:"members,omitempty"` // for an org
181	Repos []profileRepo `json:"repos"`	181	Repos []ProfileRepo `json:"repos"`
182	Activity []activityDay `json:"activity,omitempty"`	182	Activity []ActivityDay `json:"activity,omitempty"`
183	// ActivityTotal counts the same window the days cover.	183	// ActivityTotal counts the same window the days cover.
184	ActivityTotal int `json:"activity_total"`	184	ActivityTotal int `json:"activity_total"`
185	}	185	}
186		186
187	type profileMember struct {	187	type ProfileMember struct {
188	Name string `json:"name"`	188	Name string `json:"name"`
189	Role string `json:"role,omitempty"`	189	Role string `json:"role,omitempty"`
190	}	190	}
191		191
192	// profileRepo is one repository as a profile lists it. The listing	192	// ProfileRepo is one repository as a profile lists it. The listing
193	// metadata — topics, license, last commit — is here because a profile is	193	// metadata — topics, license, last commit — is here because a profile is
194	// a listing: a client that renders repositories without it is showing	194	// a listing: a client that renders repositories without it is showing
195	// less than the web does, which is why the web kept its own copy.	195	// less than the web does, which is why the web kept its own copy.
196	type profileRepo struct {	196	type ProfileRepo struct {
197	Path string `json:"path"`	197	Path string `json:"path"`
198	Visibility string `json:"visibility"`	198	Visibility string `json:"visibility"`
199	Description string `json:"description,omitempty"`	199	Description string `json:"description,omitempty"`
	@@ -204,9 +204,9 @@ type profileRepo struct {
204	Archived bool `json:"archived,omitempty"`	204	Archived bool `json:"archived,omitempty"`
205	}	205	}
206		206
207	// activityDay is one day's contribution count. Days with nothing are	207	// ActivityDay is one day's contribution count. Days with nothing are
208	// omitted; a client fills the calendar it wants to draw.	208	// omitted; a client fills the calendar it wants to draw.
209	type activityDay struct {	209	type ActivityDay struct {
210	Date string `json:"date"`	210	Date string `json:"date"`
211	Count int `json:"count"`	211	Count int `json:"count"`
212	}	212	}
	@@ -219,7 +219,7 @@ func ActivityWindow() string {
219	return end.AddDate(0, 0, -53*7+1).Format("2006-01-02")	219	return end.AddDate(0, 0, -53*7+1).Format("2006-01-02")
220	}	220	}
221		221
222	func emitProfile(c *Ctx, d profileOut) int {	222	func emitProfile(c *Ctx, d ProfileOut) int {
223	return c.emit(d, func(w io.Writer) {	223	return c.emit(d, func(w io.Writer) {
224	fmt.Fprintf(w, "%s (%s)\n", d.Name, d.Kind)	224	fmt.Fprintf(w, "%s (%s)\n", d.Name, d.Kind)
225	if d.Description != "" {	225	if d.Description != "" {
	@@ -268,8 +268,8 @@ func runProfileShow(c *Ctx, args []string) int {
268	if err != nil {	268	if err != nil {
269	return c.fail(protocol.ExitFailure, "%v", err)	269	return c.fail(protocol.ExitFailure, "%v", err)
270	}	270	}
271	d := profileOut{Name: name, Kind: kind, Description: p.Description, Website: p.Website,	271	d := ProfileOut{Name: name, Kind: kind, Description: p.Description, Website: p.Website,
272	About: p.About, AboutFormat: p.AboutFormat, Links: p.Links, Repos: []profileRepo{}}	272	About: p.About, AboutFormat: p.AboutFormat, Links: p.Links, Repos: []ProfileRepo{}}
273		273
274	// Who they work with. Both lists are public on a profile — the web	274	// Who they work with. Both lists are public on a profile — the web
275	// has always shown them — and neither exposes anything a member	275	// has always shown them — and neither exposes anything a member
	@@ -280,7 +280,7 @@ func runProfileShow(c *Ctx, args []string) int {
280	return c.fail(protocol.ExitFailure, "%v", err)	280	return c.fail(protocol.ExitFailure, "%v", err)
281	}	281	}
282	for _, o := range orgs {	282	for _, o := range orgs {
283	d.Orgs = append(d.Orgs, profileMember{Name: o.Username, Role: o.Role})	283	d.Orgs = append(d.Orgs, ProfileMember{Name: o.Username, Role: o.Role})
284	}	284	}
285	} else {	285	} else {
286	members, err := c.Store.OrgMembers(id)	286	members, err := c.Store.OrgMembers(id)
	@@ -288,7 +288,7 @@ func runProfileShow(c *Ctx, args []string) int {
288	return c.fail(protocol.ExitFailure, "%v", err)	288	return c.fail(protocol.ExitFailure, "%v", err)
289	}	289	}
290	for _, m := range members {	290	for _, m := range members {
291	d.Members = append(d.Members, profileMember{Name: m.Username, Role: m.Role})	291	d.Members = append(d.Members, ProfileMember{Name: m.Username, Role: m.Role})
292	}	292	}
293	}	293	}
294		294
	@@ -311,7 +311,7 @@ func runProfileShow(c *Ctx, args []string) int {
311	if err != nil {	311	if err != nil {
312	return c.fail(protocol.ExitFailure, "%v", err)	312	return c.fail(protocol.ExitFailure, "%v", err)
313	}	313	}
314	d.Repos = append(d.Repos, profileRepo{	314	d.Repos = append(d.Repos, ProfileRepo{
315	Path: repo.Path(),	315	Path: repo.Path(),
316	Visibility: repo.Visibility,	316	Visibility: repo.Visibility,
317	Description: gitutil.ReadDescription(dir),	317	Description: gitutil.ReadDescription(dir),
	@@ -338,7 +338,7 @@ func runProfileShow(c *Ctx, args []string) int {
338	}	338	}
339	sort.Strings(days)	339	sort.Strings(days)
340	for _, day := range days {	340	for _, day := range days {
341	d.Activity = append(d.Activity, activityDay{Date: day, Count: counts[day]})	341	d.Activity = append(d.Activity, ActivityDay{Date: day, Count: counts[day]})
342	d.ActivityTotal += counts[day]	342	d.ActivityTotal += counts[day]
343	}	343	}
344	return emitProfile(c, d)	344	return emitProfile(c, d)
	@@ -367,9 +367,9 @@ func runProfileSet(c *Ctx, args []string) int {
367	if err := c.Store.SetOwnerProfile("user", c.User.ID, p); err != nil {	367	if err := c.Store.SetOwnerProfile("user", c.User.ID, p); err != nil {
368	return c.fail(protocol.ExitFailure, "%v", err)	368	return c.fail(protocol.ExitFailure, "%v", err)
369	}	369	}
370	return emitProfile(c, profileOut{Name: c.User.Username, Kind: "user",	370	return emitProfile(c, ProfileOut{Name: c.User.Username, Kind: "user",
371	Description: p.Description, Website: p.Website, About: p.About,	371	Description: p.Description, Website: p.Website, About: p.About,
372	AboutFormat: p.AboutFormat, Links: p.Links, Repos: []profileRepo{}})	372	AboutFormat: p.AboutFormat, Links: p.Links, Repos: []ProfileRepo{}})
373	}	373	}
374		374
375	func runOrgProfile(c *Ctx, args []string) int {	375	func runOrgProfile(c *Ctx, args []string) int {
	@@ -400,7 +400,7 @@ func runOrgProfile(c *Ctx, args []string) int {
400	if err := c.Store.SetOwnerProfile("org", org.ID, p); err != nil {	400	if err := c.Store.SetOwnerProfile("org", org.ID, p); err != nil {
401	return c.fail(protocol.ExitFailure, "%v", err)	401	return c.fail(protocol.ExitFailure, "%v", err)
402	}	402	}
403	return emitProfile(c, profileOut{Name: org.Name, Kind: "org",	403	return emitProfile(c, ProfileOut{Name: org.Name, Kind: "org",
404	Description: p.Description, Website: p.Website, About: p.About,	404	Description: p.Description, Website: p.Website, About: p.About,
405	AboutFormat: p.AboutFormat, Links: p.Links, Repos: []profileRepo{}})	405	AboutFormat: p.AboutFormat, Links: p.Links, Repos: []ProfileRepo{}})
406	}	406	}

internal/httpd/accounts.go +3 −3

	@@ -289,7 +289,7 @@ func (s Server) issueEditSubmit(w http.ResponseWriter, r http.Request, u store
289	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")	289	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")
290	n := r.PathValue("n")	290	n := r.PathValue("n")
291	title := strings.TrimSpace(r.FormValue("title"))	291	title := strings.TrimSpace(r.FormValue("title"))
292	code, _, msg := s.dispatchJSON(u, []string{"issue", "edit", repoPath, n, "--title", title, "--file", "-"}, r.FormValue("body"))	292	code, msg := s.dispatchJSON(u, []string{"issue", "edit", repoPath, n, "--title", title, "--file", "-"}, r.FormValue("body"))
293	if code != protocol.ExitOK {	293	if code != protocol.ExitOK {
294	http.Error(w, msg, statusForExit(code))	294	http.Error(w, msg, statusForExit(code))
295	return	295	return
	@@ -322,7 +322,7 @@ func (s Server) mrEditSubmit(w http.ResponseWriter, r http.Request, u store.Us
322	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")	322	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")
323	n := r.PathValue("n")	323	n := r.PathValue("n")
324	title := strings.TrimSpace(r.FormValue("title"))	324	title := strings.TrimSpace(r.FormValue("title"))
325	code, _, msg := s.dispatchJSON(u, []string{"mr", "edit", repoPath, n, "--title", title, "--file", "-"}, r.FormValue("body"))	325	code, msg := s.dispatchJSON(u, []string{"mr", "edit", repoPath, n, "--title", title, "--file", "-"}, r.FormValue("body"))
326	if code != protocol.ExitOK {	326	if code != protocol.ExitOK {
327	http.Error(w, msg, statusForExit(code))	327	http.Error(w, msg, statusForExit(code))
328	return	328	return
	@@ -341,7 +341,7 @@ func (s Server) mrCommentSubmit(w http.ResponseWriter, r http.Request, u store
341	func (s Server) commentSubmit(w http.ResponseWriter, r http.Request, u store.User, noun, segment string) {	341	func (s Server) commentSubmit(w http.ResponseWriter, r http.Request, u store.User, noun, segment string) {
342	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")	342	repoPath := r.PathValue("owner") + "/" + r.PathValue("repo")
343	n := r.PathValue("n")	343	n := r.PathValue("n")
344	code, _, msg := s.dispatchJSON(u, []string{noun, "comment", repoPath, n, "--file", "-"}, strings.TrimSpace(r.FormValue("body")))	344	code, msg := s.dispatchJSON(u, []string{noun, "comment", repoPath, n, "--file", "-"}, strings.TrimSpace(r.FormValue("body")))
345	if code != protocol.ExitOK {	345	if code != protocol.ExitOK {
346	http.Error(w, msg, statusForExit(code))	346	http.Error(w, msg, statusForExit(code))
347	return	347	return

internal/httpd/admin.go +13 −7

 import (
 	"net/http"
+	"gitbay.org/gitbay/internal/control"
 	"gitbay.org/gitbay/internal/store"
 )
 		s.notFound(w, r)
 		return
 	}
-	var d struct {
+	var d control.DashboardOut
-		Server struct {
-			Commit string `json:"commit"`
-		} `json:"server"`
-		Queues store.Queues `json:"queues"`
-	}
 	if msg, ok := s.runControlInto(viewer, []string{"dashboard"}, &d); !ok {
 		http.Error(w, msg, http.StatusInternalServerError)
 		return
 	}
+	// Both blocks are admin-only and this handler is admin-gated, so they
+	// are present; the payload types them as optional because everyone
+	// else's dashboard omits them.
+	commit, queues := "", store.Queues{}
+	if d.Server != nil {
+		commit = d.Server.Commit
+	}
+	if d.Queues != nil {
+		queues = *d.Queues
+	}
 	s.render(w, "admin.html", struct {
 		basePage
 		Tab    string
 		Commit string
 		Queues store.Queues
-	}{s.baseFor(viewer), "admin", d.Server.Commit, d.Queues})
+	}{s.baseFor(viewer), "admin", commit, queues})
 }

internal/httpd/buildpages_test.go +7 −6

 package httpd
 import (
+	"gitbay.org/gitbay/internal/control"
 	"strings"
 	"testing"
 	var sb strings.Builder
 	err := web.Render(&sb, "builds.html", struct {
 		repoPage
-		Builds   []buildView
+		Builds   []control.BuildOut
-		Jobs     []jobView
+		Jobs     []control.JobOut
 		CanWrite bool
 		Notice   string
 	}{
 		testRepoPage(),
-		[]buildView{{
+		[]control.BuildOut{{
 			Number: 60, Job: "build", Status: "success",
 			SHA: "ff6271a9d4570cd46f169091637a9d2e40ad5c2b",
 			Ref: "cli-coverage", CreatedAt: "2026-08-28T04:42:54Z",
 		}},
-		[]jobView{{Name: "build"}, {Name: "nightly", Schedule: "0 3 * * *"}},
+		[]control.JobOut{{Name: "build"}, {Name: "nightly", Schedule: "0 3 * * *"}},
 		true, "",
 	})
 	if err != nil {
 	var sb strings.Builder
 	err := web.Render(&sb, "build.html", struct {
 		repoPage
-		Build buildView
+		Build control.BuildOut
 		Log   string
 	}{
 		testRepoPage(),
-		buildView{
+		control.BuildOut{
 			Number: 60, Job: "build", Status: "success",
 			SHA: "ff6271a9d4570cd46f169091637a9d2e40ad5c2b", Ref: "cli-coverage",
 			CreatedAt: "2026-08-28T04:42:54Z", FinishedAt: "2026-08-28T04:43:06Z",

internal/httpd/builds.go +8 −24

 import (
 	"net/http"
 	"strconv"
-)
-// buildView mirrors the build commands' JSON. The templates read these
-// names; nothing here touches the store.
-type buildView struct {
-	Number     int64  `json:"number"`
-	Job        string `json:"job"`
-	Status     string `json:"status"`
-	SHA        string `json:"sha"`
-	Ref        string `json:"ref"`
-	CreatedAt  string `json:"created_at"`
-	FinishedAt string `json:"finished_at"`
-}
-type jobView struct {
+	"gitbay.org/gitbay/internal/control"
-	Name     string `json:"name"`
+)
-	Schedule string `json:"schedule"`
-	Tags     string `json:"tags"`
-}
 func (s *Server) builds(w http.ResponseWriter, r *http.Request) {
 	p, ok := s.repoFor(w, r, "")
 	p.Tab = "builds"
 	viewer := s.webViewer(r)
-	var builds []buildView
+	var builds []control.BuildOut
 	s.runControlInto(viewer, []string{"build", "list", p.Repo.Path()}, &builds)
 	// The jobs a trigger can name. A repo without a CI config has none;
 	// that is not an error for this page.
-	var jobs []jobView
+	var jobs []control.JobOut
 	s.runControlInto(viewer, []string{"build", "jobs", p.Repo.Path()}, &jobs)
 	s.render(w, "builds.html", struct {
 		repoPage
-		Builds   []buildView
+		Builds   []control.BuildOut
-		Jobs     []jobView
+		Jobs     []control.JobOut
 		CanWrite bool
 		Notice   string
 	}{p, builds, jobs, s.canWriteRepo(r, p.Repo), s.takeFlash(w, r)})
 	n := r.PathValue("n")
 	viewer := s.webViewer(r)
-	var b buildView
+	var b control.BuildOut
 	if _, ok := s.runControlInto(viewer, []string{"build", "show", p.Repo.Path(), n}, &b); !ok {
 		s.notFound(w, r)
 		return
 	s.render(w, "build.html", struct {
 		repoPage
-		Build buildView
+		Build control.BuildOut
 		Log   string
 	}{p, b, log})
 }

internal/httpd/control.go +10 −16

 	return protocol.ExitOK, ""
 }
-// runControlJSON runs a command in JSON mode and returns its data object.
+// dispatchJSON runs a command in JSON mode with stdin and returns its exit
-// In JSON mode a failure is an envelope carrying the message rather than
+// code and, on failure, the message. In JSON mode a failure is an envelope
-// stderr text, so both paths are read from the same envelope.
+// carrying the message rather than stderr text, so both paths are read
-func (s *Server) runControlJSON(u store.User, argv []string) (data map[string]any, msg string, ok bool) {
+// from the same envelope. A handler that wants the payload uses
-	code, data, msg := s.dispatchJSON(u, argv, "")
+// runControlInto, which decodes into the command's own type instead of a
-	return data, msg, code == protocol.ExitOK
+// map nothing type-checks.
-}
+func (s *Server) dispatchJSON(u store.User, argv []string, stdin string) (code int, msg string) {
-// dispatchJSON runs a command in JSON mode with stdin, and returns its
-// exit code with the decoded data or the failure message. Handlers that
-// answer a form use the code to pick an HTTP status.
-func (s *Server) dispatchJSON(u store.User, argv []string, stdin string) (code int, data map[string]any, msg string) {
 	var stdout, stderr bytes.Buffer
 	ctx := &control.Ctx{
 		User:   u,
 	}
 	code = control.Dispatch(ctx, argv)
 	var env struct {
-		Data  map[string]any `json:"data"`
+		Error string `json:"error"`
-		Error string         `json:"error"`
 	}
 	json.Unmarshal(stdout.Bytes(), &env)
 	if code != protocol.ExitOK {
 		if m == "" {
 			m = "the command failed"
 		}
-		return code, nil, m
+		return code, m
 	}
-	return code, env.Data, ""
+	return code, ""
 }
 // authorNames maps commit author addresses to account names for one

internal/httpd/web.go +13 −33

	@@ -375,43 +375,23 @@ func crumbs(p repoPage, kind, filePath string) []crumb {
375	// profileView is profile show's payload, shaped for the templates. The	375	// profileView is profile show's payload, shaped for the templates. The
376	// repo rows carry the same names the reporow partial reads, so a profile	376	// repo rows carry the same names the reporow partial reads, so a profile
377	// listing renders identically to explore's.	377	// listing renders identically to explore's.
		378	// profileView is profile show's payload with the repository rows wrapped
		379	// so the reporow partial can reach them. The fields themselves are the
		380	// command's: a field it gains appears here without being re-declared.
378	type profileView struct {	381	type profileView struct {
379	Name string `json:"name"`	382	control.ProfileOut
380	Kind string `json:"kind"`	383	Repos []profileRepoRow `json:"repos"`
381	Description string `json:"description"`	384	}
382	Website string `json:"website"`	385
383	About string `json:"about"`	386	// profileRepoRow is one repository row on a profile. The partial asks for
384	AboutFormat string `json:"about_format"`	387	// OwnerName, Name and Desc; the payload carries a path and a description.
385	Links []store.ProfileLink `json:"links"`
386	Orgs []profileMember `json:"orgs"`
387	Members []profileMember `json:"members"`
388	Repos []profileRepoRow `json:"repos"`
389	Activity []struct {
390	Date string `json:"date"`
391	Count int `json:"count"`
392	} `json:"activity"`
393	}
394
395	type profileMember struct {
396	Name string `json:"name"`
397	Role string `json:"role"`
398	}
399
400	// profileRepoRow is one repository row on a profile. Path arrives as
401	// owner/name; OwnerName and Name are split out for the partial.
402	type profileRepoRow struct {	388	type profileRepoRow struct {
403	Path string `json:"path"`	389	control.ProfileRepo
404	Visibility string `json:"visibility"`
405	Desc string `json:"description"`
406	DefaultBranch string `json:"default_branch"`
407	Topics []string `json:"topics"`
408	License string `json:"license"`
409	Updated string `json:"updated"`
410	Archived bool `json:"archived"`
411	}	390	}
412		391
413	func (p profileRepoRow) OwnerName() string { owner, _, _ := strings.Cut(p.Path, "/"); return owner }	392	func (p profileRepoRow) OwnerName() string { owner, _, _ := strings.Cut(p.Path, "/"); return owner }
414	func (p profileRepoRow) Name() string { _, name, _ := strings.Cut(p.Path, "/"); return name }	393	func (p profileRepoRow) Name() string { _, name, _ := strings.Cut(p.Path, "/"); return name }
		394	func (p profileRepoRow) Desc() string { return p.Description }
415		395
416	// ownerPage renders /{owner} for users and orgs: the repositories the	396	// ownerPage renders /{owner} for users and orgs: the repositories the
417	// viewer may see, org membership either direction. Owner names are not	397	// viewer may see, org membership either direction. Owner names are not
	@@ -454,8 +434,8 @@ func (s Server) ownerPage(w http.ResponseWriter, r http.Request) {
454	Profile store.Profile	434	Profile store.Profile
455	AboutHTML template.HTML	435	AboutHTML template.HTML
456	Repos []profileRepoRow	436	Repos []profileRepoRow
457	Members []profileMember	437	Members []control.ProfileMember
458	Orgs []profileMember	438	Orgs []control.ProfileMember
459	Activity []activityWeek	439	Activity []activityWeek
460	ActivityTotal int	440	ActivityTotal int
461	Teams []teamView	441	Teams []teamView

Commit 332a13feaa

Commit `332a13feaa`