sr: restart account numbering per provider group in status view

The bare 'sr' status view numbered accounts continuously across providers
(1..27). Restart at 1 for each group (Codex 1..N, Claude 1..M, etc.) so each
category's count is obvious. The interactive switch picker keeps global
numbering because it selects an account by that index; per-group numbering is a
new display-only mode used by the status view.

Author: lawrencecchen

cmd/subrouter/sr.go

@@ -1602,13 +1602,26 @@ func displayUsageRows(out io.Writer, rows []srUsageRow, numbered bool) {
 		return
 	}
 	colored := colorEnabled(out)
-	displayUsageRowsGrid(out, rows, numbered, colored)
+	displayUsageRowsGrid(out, rows, numbered, false, colored)
 }
 
-func displayUsageRowsGrid(out io.Writer, rows []srUsageRow, numbered bool, colored bool) {
+// displayUsageRowsPerGroup renders the table with numbering that restarts at 1
+// for each provider group. Use for the informational status view; the switch
+// picker keeps global numbering because it selects an account by that index.
+func displayUsageRowsPerGroup(out io.Writer, rows []srUsageRow) {
+	if len(rows) == 0 {
+		fmt.Fprintln(out, "No accounts configured. Run 'subrouter add' to add one.")
+		return
+	}
+	colored := colorEnabled(out)
+	displayUsageRowsGrid(out, rows, true, true, colored)
+}
+
+func displayUsageRowsGrid(out io.Writer, rows []srUsageRow, numbered, perGroupNumbers bool, colored bool) {
 	fmt.Fprintln(out)
 	currentGroup := ""
 	accountRowIndex := 0
+	groupRowIndex := 0
 	for i, row := range rows {
 		group := usageProviderLabel(row)
 		columns := usageGridColumns(out, numbered, usageProvider(row))
@@ -1622,16 +1635,22 @@ func displayUsageRowsGrid(out io.Writer, rows []srUsageRow, numbered bool, color
 			}, colored, "")
 			printUsageGridSeparator(out, columns, colored)
 			currentGroup = group
+			groupRowIndex = 0
 		}
 		rowIndex := ""
 		if numbered {
-			rowIndex = strconv.Itoa(i + 1)
+			if perGroupNumbers {
+				rowIndex = strconv.Itoa(groupRowIndex + 1)
+			} else {
+				rowIndex = strconv.Itoa(i + 1)
+			}
 		}
 		values := usageGridValues(row, rowIndex)
 		printUsageGridLine(out, columns, func(col usageGridColumn) usageGridCell {
 			return values[col.Key]
 		}, colored, usageGridRowStyle(accountRowIndex))
 		accountRowIndex++
+		groupRowIndex++
 	}
 	fmt.Fprintln(out)
 	if usageRowsHaveErrors(rows) {

cmd/subrouter/sr_reset_gto_test.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"regexp"
 	"strings"
 	"testing"
 	"time"
@@ -186,3 +187,33 @@ func TestPrintResetCredits(t *testing.T) {
 		t.Fatalf("totals wrong: %q", got)
 	}
 }
+
+func TestDisplayUsageRowsPerGroupRestartsNumbering(t *testing.T) {
+	rem := 1
+	rows := []srUsageRow{
+		{email: "codexone@x.com", provider: accounts.ProviderCodex, authMode: accounts.AuthModeOAuth, complimentaryReset: &accounts.ComplimentaryResetInfo{Known: true, Remaining: &rem}},
+		{email: "codextwo@x.com", provider: accounts.ProviderCodex, authMode: accounts.AuthModeOAuth},
+		{email: "claudeprof", provider: accounts.ProviderClaude},
+	}
+	var out bytes.Buffer
+	displayUsageRowsPerGroup(&out, rows)
+	ansi := regexp.MustCompile(`\x1b\[[0-9;]*m`)
+	nums := map[string]string{}
+	for _, line := range strings.Split(ansi.ReplaceAllString(out.String(), ""), "\n") {
+		fields := strings.Fields(line)
+		if len(fields) < 2 {
+			continue
+		}
+		for _, e := range []string{"codexone@x.com", "codextwo@x.com", "claudeprof"} {
+			if strings.Contains(line, e) {
+				nums[e] = fields[0]
+			}
+		}
+	}
+	if nums["codexone@x.com"] != "1" || nums["codextwo@x.com"] != "2" {
+		t.Fatalf("codex numbering = %v, want 1,2", nums)
+	}
+	if nums["claudeprof"] != "1" {
+		t.Fatalf("claude numbering = %q, want restart at 1", nums["claudeprof"])
+	}
+}

cmd/subrouter/sr_server.go

@@ -522,7 +522,7 @@ func (r srRunner) serverStatus(ctx context.Context, store srServerStore, name st
 	if available {
 		rows := usageRowsFromServerUsageStatuses(usage)
 		fmt.Fprintf(r.out, "Server: %s (%s)\n", server.Name, server.URL)
-		displayUsageRows(r.out, rows, true)
+		displayUsageRowsPerGroup(r.out, rows)
 		printAccountCountSummary(r.out, rows)
 		r.printBedrockStatus(ctx, server)
 		return nil