sr status: show AWS Bedrock spend and rate limits (#67)

Append a compact Bedrock block (today/7d/30d/all-time spend + throttled(429)
count) to the sr status output for a remote server. Extracts the bedrock-cost
fetch from sr_spend.go into fetchBedrockSummary and reuses it; stays silent on
servers with no Bedrock activity.

Author: lawrencecchen

cmd/subrouter/sr_server.go

@@ -523,6 +523,7 @@ func (r srRunner) serverStatus(ctx context.Context, store srServerStore, name st
 		rows := usageRowsFromServerUsageStatuses(usage)
 		fmt.Fprintf(r.out, "Server: %s (%s)\n", server.Name, server.URL)
 		displayUsageRows(r.out, rows, false)
+		r.printBedrockStatus(ctx, server)
 		return nil
 	}
 	res, err := r.fetchServerAccountsResponse(ctx, server)

cmd/subrouter/sr_server_test.go

@@ -94,12 +94,19 @@ func TestSRServerStatusSendsAdminToken(t *testing.T) {
 		out:    &out,
 		errOut: &out,
 		client: &http.Client{Transport: srRoundTripFunc(func(req *http.Request) (*http.Response, error) {
-			if req.URL.Path != "/_subrouter/usage-status" {
-				t.Fatalf("path = %s, want /_subrouter/usage-status", req.URL.Path)
-			}
 			if got := req.Header.Get("Authorization"); got != "Bearer secret-token" {
 				t.Fatalf("Authorization = %q", got)
 			}
+			if req.URL.Path == "/_subrouter/bedrock-cost" {
+				return &http.Response{
+					StatusCode: http.StatusOK,
+					Header:     make(http.Header),
+					Body:       io.NopCloser(bytes.NewReader([]byte(`{"requests":0,"throttled":0}`))),
+				}, nil
+			}
+			if req.URL.Path != "/_subrouter/usage-status" {
+				t.Fatalf("path = %s, want /_subrouter/usage-status", req.URL.Path)
+			}
 			body, _ := json.Marshal([]remoteServerUsageStatus{{
 				ID:                 "acct@example.com",
 				Provider:           accounts.ProviderCodex,
@@ -305,6 +312,15 @@ func TestSRDefaultOutputUsesDefaultRemoteServerStatus(t *testing.T) {
 		out:     &out,
 		errOut:  &out,
 		client: &http.Client{Transport: srRoundTripFunc(func(req *http.Request) (*http.Response, error) {
+			// status also queries bedrock-cost for the spend/rate-limit block;
+			// return an empty summary so it stays silent here.
+			if req.URL.Path == "/_subrouter/bedrock-cost" {
+				return &http.Response{
+					StatusCode: http.StatusOK,
+					Header:     make(http.Header),
+					Body:       io.NopCloser(bytes.NewReader([]byte(`{"requests":0,"throttled":0}`))),
+				}, nil
+			}
 			if req.URL.Path != "/_subrouter/usage-status" {
 				t.Fatalf("path = %s, want /_subrouter/usage-status", req.URL.Path)
 			}

cmd/subrouter/sr_spend.go

@@ -31,18 +31,12 @@ type bedrockCostSummaryView struct {
 	ByModel          map[string]bedrockModelAggView `json:"by_model"`
 }
 
-// spend reports AWS Bedrock spend tracked by the default Subrouter server.
-func (r srRunner) spend(ctx context.Context) error {
-	server, ok, err := r.defaultRemoteServer()
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return fmt.Errorf("sr spend needs a default Subrouter server; run '%s server use <name>'", r.programOrSubrouter())
-	}
+// fetchBedrockSummary pulls the server's AWS Bedrock cost/throttle summary.
+func (r srRunner) fetchBedrockSummary(ctx context.Context, server srServerConfig) (bedrockCostSummaryView, error) {
+	var summary bedrockCostSummaryView
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, server.URL+"/_subrouter/bedrock-cost", nil)
 	if err != nil {
-		return err
+		return summary, err
 	}
 	addServerAdminAuth(req, server)
 	client := r.client
@@ -51,14 +45,51 @@ func (r srRunner) spend(ctx context.Context) error {
 	}
 	res, err := client.Do(req)
 	if err != nil {
-		return err
+		return summary, err
 	}
 	defer res.Body.Close()
 	if res.StatusCode < 200 || res.StatusCode >= 300 {
-		return fmt.Errorf("bedrock cost fetch failed: %s", res.Status)
+		return summary, fmt.Errorf("bedrock cost fetch failed: %s", res.Status)
 	}
-	var summary bedrockCostSummaryView
 	if err := json.NewDecoder(res.Body).Decode(&summary); err != nil {
+		return summary, err
+	}
+	return summary, nil
+}
+
+// printBedrockStatus appends a compact AWS Bedrock spend + rate-limit block to
+// `sr` status. It stays silent on servers with no Bedrock activity (or old
+// servers missing the endpoint) so it never clutters non-Bedrock status output.
+func (r srRunner) printBedrockStatus(ctx context.Context, server srServerConfig) {
+	summary, err := r.fetchBedrockSummary(ctx, server)
+	if err != nil {
+		return
+	}
+	if summary.Requests == 0 && summary.Throttled == 0 {
+		return
+	}
+	fmt.Fprintln(r.out)
+	fmt.Fprintf(r.out, "AWS Bedrock spend     today $%s · 7d $%s · 30d $%s · all-time $%s (%d req)\n",
+		fmtUSD4(summary.TodayUSD), fmtUSD4(summary.Week7dUSD), fmtUSD4(summary.Month30dUSD),
+		fmtUSD4(summary.TotalUSD), summary.Requests)
+	limits := fmt.Sprintf("throttled(429) %d", summary.Throttled)
+	if summary.Throttled > 0 && summary.LastThrottle != "" {
+		limits += " · last " + summary.LastThrottle
+	}
+	fmt.Fprintf(r.out, "AWS Bedrock limits    %s\n", limits)
+}
+
+// spend reports AWS Bedrock spend tracked by the default Subrouter server.
+func (r srRunner) spend(ctx context.Context) error {
+	server, ok, err := r.defaultRemoteServer()
+	if err != nil {
+		return err
+	}
+	if !ok {
+		return fmt.Errorf("sr spend needs a default Subrouter server; run '%s server use <name>'", r.programOrSubrouter())
+	}
+	summary, err := r.fetchBedrockSummary(ctx, server)
+	if err != nil {
 		return err
 	}