Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.
Rust agentai-agentapplecomputer-usecomputer-use-agentcontainerizationcuadesktop-automationhacktoberfestlumemacosmanusoperatorswiftvirtualizationvirtualization-frameworkwindowswindows-sandbox
fix(usage): price reserved resources (#7164)
r33drichards181dda2b6dd0
diff --git a/libs/fleet/backend/auth/flags_test.go b/libs/fleet/backend/auth/flags_test.goindex 725165592a..e7b89f5c77 100644--- a/libs/fleet/backend/auth/flags_test.go+++ b/libs/fleet/backend/auth/flags_test.go@@ -373,6 +373,30 @@ func TestEvalBillingEnabledDefaultsFalseAndReadsBooleanFlag(t *testing.T) {}}+func TestEvalUsagePricingReadsFlagsAndFallsBackPerValue(t *testing.T) {+ if err := featureflags.SetupProvider(context.Background(), "development", featureflags.AWSCredentials{}); err != nil {+ t.Fatal(err)+ }+ user := &User{ID: "user-1", AZP: "cyclops-cs-spa"}++ t.Setenv("CYCLOPS_CS_USAGE_VCPU_HOUR_PRICE_USD", "0.1")+ t.Setenv("CYCLOPS_CS_USAGE_MEMORY_GIB_HOUR_PRICE_USD", "0.2")+ pricing, err := EvalUsagePricing(context.Background(), user)+ if err != nil || pricing.VCPUHourUSD != 0.1 || pricing.MemoryGiBHourUSD != 0.2 {+ t.Fatalf("pricing = %#v, err = %v", pricing, err)+ }++ t.Setenv("CYCLOPS_CS_USAGE_VCPU_HOUR_PRICE_USD", "invalid")+ t.Setenv("CYCLOPS_CS_USAGE_MEMORY_GIB_HOUR_PRICE_USD", "0")+ pricing, err = EvalUsagePricing(context.Background(), user)+ if err == nil {+ t.Fatal("invalid pricing returned nil error")+ }+ if pricing.VCPUHourUSD != DefaultUsageVCPUHourPriceUSD || pricing.MemoryGiBHourUSD != DefaultUsageMemoryGiBHourPriceUSD {+ t.Fatalf("fallback pricing = %#v", pricing)+ }+}+func TestEvalChatEnabledFailsClosedForMalformedAllowlist(t *testing.T) {t.Setenv("CYCLOPS_CS_ADMIN_SUBS", `[]`)t.Setenv("CYCLOPS_CS_CHAT_SUBS", `not-json`)diff --git a/libs/fleet/backend/auth/middlewares.go b/libs/fleet/backend/auth/middlewares.goindex 985a857831..1c2a596ad2 100644--- a/libs/fleet/backend/auth/middlewares.go+++ b/libs/fleet/backend/auth/middlewares.go@@ -4,9 +4,11 @@ import ("context"_ "embed""encoding/json"+ "errors""fmt""log""log/slog"+ "math""net/http""strings""sync"@@ -133,6 +135,8 @@ const (chatAccessFlag = flagPrefix + "chat-access"chatSubsFlag = flagPrefix + "chat-subs"usageSubsFlag = flagPrefix + "usage-subs"+ usageVCPUHourPriceFlag = flagPrefix + "usage-vcpu-hour-price-usd"+ usageMemoryGiBHourPriceFlag = flagPrefix + "usage-memory-gib-hour-price-usd")type chatAccessMode string@@ -480,6 +484,47 @@ func evalUserDecision(ctx context.Context, user *User, query *rego.PreparedEvalQreturn v, nil}+const (+ DefaultUsageVCPUHourPriceUSD = 0.044625+ DefaultUsageMemoryGiBHourPriceUSD = 0.0223125+)++type UsagePricing struct {+ VCPUHourUSD float64+ MemoryGiBHourUSD float64+}++// EvalUsagePricing resolves billable reservation rates. Invalid or missing+// values fall back independently so one malformed flag cannot zero all costs.+func EvalUsagePricing(ctx context.Context, user *User) (UsagePricing, error) {+ ffClientOnce.Do(func() {+ ffClient = openfeature.NewClient("cyclops-cs-auth")+ })+ targetingKey := ""+ if user != nil {+ targetingKey = user.ID+ }+ evaluationContext := openfeature.NewEvaluationContext(targetingKey, nil)+ callCtx, cancel := context.WithTimeout(ctx, 3*time.Second)+ defer cancel()++ vcpu, vcpuErr := ffClient.FloatValue(callCtx, usageVCPUHourPriceFlag, DefaultUsageVCPUHourPriceUSD, evaluationContext)+ if vcpuErr != nil {+ vcpu = DefaultUsageVCPUHourPriceUSD+ } else if math.IsNaN(vcpu) || math.IsInf(vcpu, 0) || vcpu <= 0 {+ vcpuErr = fmt.Errorf("usage vCPU-hour price must be a positive finite number")+ vcpu = DefaultUsageVCPUHourPriceUSD+ }+ memory, memoryErr := ffClient.FloatValue(callCtx, usageMemoryGiBHourPriceFlag, DefaultUsageMemoryGiBHourPriceUSD, evaluationContext)+ if memoryErr != nil {+ memory = DefaultUsageMemoryGiBHourPriceUSD+ } else if math.IsNaN(memory) || math.IsInf(memory, 0) || memory <= 0 {+ memoryErr = fmt.Errorf("usage memory GiB-hour price must be a positive finite number")+ memory = DefaultUsageMemoryGiBHourPriceUSD+ }+ return UsagePricing{VCPUHourUSD: vcpu, MemoryGiBHourUSD: memory}, errors.Join(vcpuErr, memoryErr)+}+// EvalBillingEnabled resolves the billing UI flag for the authenticated user.// The flag defaults off so absent provider configuration never exposes billing.func EvalBillingEnabled(ctx context.Context, user *User) (bool, error) {diff --git a/libs/fleet/backend/docs/docs.go b/libs/fleet/backend/docs/docs.goindex 34769b933e..ae73186213 100644--- a/libs/fleet/backend/docs/docs.go+++ b/libs/fleet/backend/docs/docs.go@@ -1967,6 +1967,9 @@ const docTemplate = `{},"usage": {"type": "boolean"+ },+ "usage_pricing": {+ "$ref": "#/definitions/handlers.UsagePricingConfig"}}},@@ -2158,6 +2161,17 @@ const docTemplate = `{}}},+ "handlers.UsagePricingConfig": {+ "type": "object",+ "properties": {+ "memory_gib_hour_usd": {+ "type": "number"+ },+ "vcpu_hour_usd": {+ "type": "number"+ }+ }+ },"handlers.UserKeyResponse": {"type": "object","properties": {diff --git a/libs/fleet/backend/docs/swagger.json b/libs/fleet/backend/docs/swagger.jsonindex 0cb96e4382..464d8ba316 100644--- a/libs/fleet/backend/docs/swagger.json+++ b/libs/fleet/backend/docs/swagger.json@@ -1960,6 +1960,9 @@},"usage": {"type": "boolean"+ },+ "usage_pricing": {+ "$ref": "#/definitions/handlers.UsagePricingConfig"}}},@@ -2151,6 +2154,17 @@}}},+ "handlers.UsagePricingConfig": {+ "type": "object",+ "properties": {+ "memory_gib_hour_usd": {+ "type": "number"+ },+ "vcpu_hour_usd": {+ "type": "number"+ }+ }+ },"handlers.UserKeyResponse": {"type": "object","properties": {diff --git a/libs/fleet/backend/docs/swagger.yaml b/libs/fleet/backend/docs/swagger.yamlindex ef15194450..793f86ee13 100644--- a/libs/fleet/backend/docs/swagger.yaml+++ b/libs/fleet/backend/docs/swagger.yaml@@ -231,6 +231,8 @@ definitions:type: booleanusage:type: boolean+ usage_pricing:+ $ref: '#/definitions/handlers.UsagePricingConfig'type: objecthandlers.CreateFeatureFlagRequest:properties:@@ -355,6 +357,13 @@ definitions:value_type:$ref: '#/definitions/featureflags.ValueType'type: object+ handlers.UsagePricingConfig:+ properties:+ memory_gib_hour_usd:+ type: number+ vcpu_hour_usd:+ type: number+ type: objecthandlers.UserKeyResponse:properties:client_id:diff --git a/libs/fleet/backend/featureflagadmin/service.go b/libs/fleet/backend/featureflagadmin/service.goindex 23294a313e..10ea36c780 100644--- a/libs/fleet/backend/featureflagadmin/service.go+++ b/libs/fleet/backend/featureflagadmin/service.go@@ -5,8 +5,10 @@ import ("encoding/json""errors""fmt"+ "math""regexp""sort"+ "strconv""strings""time"@@ -153,10 +155,8 @@ func (s *Service) Create(ctx context.Context, actor Actor, input CreateInput) (freturn errors.Join(invalidValueError(err), err)}event.NewValue = &typed- if input.Key == "admin-subs" {- if err := validateAdminSubs(typed); err != nil {- return err- }+ if err := validateKnownFlag(input.Key, typed); err != nil {+ return err}parameter, err := s.store.Create(lockCtx, featureflags.Parameter{Name: path, Value: typed.Raw, Type: "String", Description: input.Description,@@ -213,10 +213,8 @@ func (s *Service) Update(ctx context.Context, actor Actor, key string, input Updreturn errors.Join(invalidValueError(err), err)}event.NewValue = &typed- if key == "admin-subs" {- if err := validateAdminSubs(typed); err != nil {- return err- }+ if err := validateKnownFlag(key, typed); err != nil {+ return err}parameter, err = s.store.Update(lockCtx, path, typed.Raw)if err != nil {@@ -364,6 +362,31 @@ func validateKey(key string) error {return nil}+func validateKnownFlag(key string, typed featureflags.TypedValue) error {+ switch key {+ case "admin-subs":+ return validateAdminSubs(typed)+ case "usage-vcpu-hour-price-usd", "usage-memory-gib-hour-price-usd":+ return validateUsagePrice(typed)+ default:+ return nil+ }+}++func validateUsagePrice(typed featureflags.TypedValue) error {+ if typed.Type != featureflags.ValueNumber {+ return &ServiceError{Code: "invalid_value", HTTPStatus: 422, Message: "usage prices must be positive numbers"}+ }+ value, err := strconv.ParseFloat(typed.Raw, 64)+ if err != nil {+ return errors.Join(&ServiceError{Code: "invalid_value", HTTPStatus: 422, Message: "usage prices must be positive numbers", Cause: err}, err)+ }+ if math.IsNaN(value) || math.IsInf(value, 0) || value <= 0 {+ return &ServiceError{Code: "invalid_value", HTTPStatus: 422, Message: "usage prices must be positive numbers"}+ }+ return nil+}+func validateAdminSubs(typed featureflags.TypedValue) error {if typed.Type != featureflags.ValueJSON {return &ServiceError{Code: "invalid_value", HTTPStatus: 422, Message: "admin-subs must be a JSON string array"}diff --git a/libs/fleet/backend/featureflagadmin/service_test.go b/libs/fleet/backend/featureflagadmin/service_test.goindex 3e1d4e70b5..dd29a4eaea 100644--- a/libs/fleet/backend/featureflagadmin/service_test.go+++ b/libs/fleet/backend/featureflagadmin/service_test.go@@ -665,3 +665,18 @@ func TestServiceNilStoreFailsClosed(t *testing.T) {assertServiceError(t, err, "unsupported_provider", 501)}}++func TestValidateKnownFlagRejectsInvalidUsagePrices(t *testing.T) {+ for _, typed := range []featureflags.TypedValue{+ {Type: featureflags.ValueString, Value: "0.1", Raw: "0.1"},+ {Type: featureflags.ValueNumber, Value: 0.0, Raw: "0"},+ {Type: featureflags.ValueNumber, Value: -1.0, Raw: "-1"},+ } {+ if err := validateKnownFlag("usage-vcpu-hour-price-usd", typed); err == nil {+ t.Fatalf("validateKnownFlag(%#v) error = nil", typed)+ }+ }+ if err := validateKnownFlag("usage-memory-gib-hour-price-usd", featureflags.TypedValue{Type: featureflags.ValueNumber, Value: 0.2, Raw: "0.2"}); err != nil {+ t.Fatalf("valid usage price: %v", err)+ }+}diff --git a/libs/fleet/backend/handlers/config.go b/libs/fleet/backend/handlers/config.goindex f6c81aa307..9aff3eca71 100644--- a/libs/fleet/backend/handlers/config.go+++ b/libs/fleet/backend/handlers/config.go@@ -9,15 +9,21 @@ import (// ConfigResponse is the payload returned by GET /api/config.// The frontend uses this to select the correct UI strategy (admin vs customer).+type UsagePricingConfig struct {+ VCPUHourUSD float64 `json:"vcpu_hour_usd"`+ MemoryGiBHourUSD float64 `json:"memory_gib_hour_usd"`+}+type ConfigResponse struct {// Admin is true when the caller is in input.flags.admin_subs (OPA-evaluated).// Non-admins get the customer view: infra-only nav (Nodes, Operator events)// is hidden in the SPA and the corresponding kubectl-proxy paths are denied// server-side by authz.rego.- Admin bool `json:"admin"`- Billing bool `json:"billing"`- Chat bool `json:"chat"`- Usage bool `json:"usage"`+ Admin bool `json:"admin"`+ Billing bool `json:"billing"`+ Chat bool `json:"chat"`+ Usage bool `json:"usage"`+ UsagePricing UsagePricingConfig `json:"usage_pricing"`}// GetConfig returns per-user feature flags evaluated by OPA.@@ -48,12 +54,10 @@ func (h Handlers) GetConfig(w http.ResponseWriter, r *http.Request) {billingEnabled = false}- usageEnabled, err := h.usageEnabled(ctx, user)+ pricing, err := h.usagePricing(ctx, user)if err != nil {- slog.WarnContext(ctx, "usage access eval failed; defaulting off", "err", err)- usageEnabled = false+ slog.WarnContext(ctx, "usage pricing flag eval failed; using defaults for invalid values", "err", err)}- usageEnabled = usageEnabled && h.Usage != nilchatEnabled, err := h.chatEnabled(ctx, user)if err != nil {@@ -62,5 +66,8 @@ func (h Handlers) GetConfig(w http.ResponseWriter, r *http.Request) {}chatEnabled = chatEnabled && h.Conversations != nil && h.Model != nil- writeJSON(w, http.StatusOK, ConfigResponse{Admin: isAdmin, Billing: billingEnabled, Chat: chatEnabled, Usage: usageEnabled})+ writeJSON(w, http.StatusOK, ConfigResponse{+ Admin: isAdmin, Billing: billingEnabled, Chat: chatEnabled, Usage: h.Usage != nil,+ UsagePricing: UsagePricingConfig{VCPUHourUSD: pricing.VCPUHourUSD, MemoryGiBHourUSD: pricing.MemoryGiBHourUSD},+ })}diff --git a/libs/fleet/backend/handlers/config_test.go b/libs/fleet/backend/handlers/config_test.goindex 313b4e1f44..c10d91deab 100644--- a/libs/fleet/backend/handlers/config_test.go+++ b/libs/fleet/backend/handlers/config_test.go@@ -58,37 +58,26 @@ func TestGetConfigReturnsEffectiveChatAccess(t *testing.T) {}}-func TestGetConfigReturnsEffectiveUsageAccess(t *testing.T) {- tests := []struct {- name string- provider UsageProvider- allowed bool- want bool- }{- {name: "available and allowed", provider: &fakeUsageProvider{}, allowed: true, want: true},- {name: "unavailable", allowed: true, want: false},- {name: "not allowed", provider: &fakeUsageProvider{}, allowed: false, want: false},+func TestGetConfigReturnsUsageAvailabilityAndPricing(t *testing.T) {+ h := Handlers{+ Usage: &fakeUsageProvider{},+ adminAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return false, nil },+ chatAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return false, nil },+ usagePricingEvaluator: func(context.Context, *auth.User) (auth.UsagePricing, error) {+ return auth.UsagePricing{VCPUHourUSD: 0.1, MemoryGiBHourUSD: 0.2}, nil+ },}-- for _, test := range tests {- t.Run(test.name, func(t *testing.T) {- h := Handlers{- Usage: test.provider,- usageAccessEvaluator: func(context.Context, *auth.User) (bool, error) {- return test.allowed, nil- },- adminAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return false, nil },- }- w := httptest.NewRecorder()- h.GetConfig(w, withUser(httptest.NewRequest(http.MethodGet, "/api/config", nil), &auth.User{ID: "user", AZP: "cyclops-cs-spa"}))- var response ConfigResponse- if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {- t.Fatal(err)- }- if response.Usage != test.want {- t.Fatalf("usage = %v, want %v", response.Usage, test.want)- }- })+ w := httptest.NewRecorder()+ h.GetConfig(w, withUser(httptest.NewRequest(http.MethodGet, "/api/config", nil), &auth.User{ID: "user", AZP: "cyclops-cs-spa"}))+ var response ConfigResponse+ if err := json.Unmarshal(w.Body.Bytes(), &response); err != nil {+ t.Fatal(err)+ }+ if !response.Usage {+ t.Fatal("usage provider was not reported available")+ }+ if response.UsagePricing.VCPUHourUSD != 0.1 || response.UsagePricing.MemoryGiBHourUSD != 0.2 {+ t.Fatalf("usage pricing = %#v", response.UsagePricing)}}diff --git a/libs/fleet/backend/handlers/handlers.go b/libs/fleet/backend/handlers/handlers.goindex 5af8067589..86afe90e15 100644--- a/libs/fleet/backend/handlers/handlers.go+++ b/libs/fleet/backend/handlers/handlers.go@@ -42,8 +42,8 @@ type Handlers struct {Features *FeaturesUsage usage.Provider- usageAccessEvaluator func(context.Context, *auth.User) (bool, error)- adminAccessEvaluator func(context.Context, *auth.User) (bool, error)+ adminAccessEvaluator func(context.Context, *auth.User) (bool, error)+ usagePricingEvaluator func(context.Context, *auth.User) (auth.UsagePricing, error)FeatureFlags *featureflagadmin.Service@@ -75,10 +75,10 @@ func New(admin *keycloak.Admin, cfg *config.Configuration) Handlers {}}-func (h Handlers) usageEnabled(ctx context.Context, user *auth.User) (bool, error) {- evaluator := h.usageAccessEvaluator+func (h Handlers) usagePricing(ctx context.Context, user *auth.User) (auth.UsagePricing, error) {+ evaluator := h.usagePricingEvaluatorif evaluator == nil {- evaluator = auth.EvalUsageEnabled+ evaluator = auth.EvalUsagePricing}return evaluator(ctx, user)}diff --git a/libs/fleet/backend/handlers/usage.go b/libs/fleet/backend/handlers/usage.goindex 5960fd5207..1ad612ba16 100644--- a/libs/fleet/backend/handlers/usage.go+++ b/libs/fleet/backend/handlers/usage.go@@ -4,7 +4,6 @@ import ("encoding/json""errors""io"- "log/slog""net/http""regexp""strings"@@ -75,14 +74,6 @@ func (h Handlers) authorizeUsage(w http.ResponseWriter, r *http.Request) (UsageQwriteErr(w, 400, "timeframe must be one of 24h, 7d, or 30d")return UsageQuery{}, "", false}- enabled, err := h.usageEnabled(ctx, u)- if err != nil || !enabled {- if err != nil {- slog.WarnContext(r.Context(), "usage access evaluation failed", "err", err)- }- writeErr(w, 403, "usage preview is not enabled")- return UsageQuery{}, "", false- }admin, err := h.isAdmin(ctx, u)if err != nil {admin = falsediff --git a/libs/fleet/backend/handlers/usage_test.go b/libs/fleet/backend/handlers/usage_test.goindex abc325c2c3..ec8b4e524f 100644--- a/libs/fleet/backend/handlers/usage_test.go+++ b/libs/fleet/backend/handlers/usage_test.go@@ -18,24 +18,28 @@ import (type fakeUsageProvider struct {overviewQuery UsageQuerydetailQuery UsagePoolQuery+ overviewCalls int+ detailCalls intoverviewErr errordetailErr error}func (f *fakeUsageProvider) Overview(_ context.Context, q UsageQuery) (UsageOverviewResponse, error) {+ f.overviewCalls++f.overviewQuery = qreturn UsageOverviewResponse{}, f.overviewErr}func (f *fakeUsageProvider) PoolDetail(_ context.Context, q UsagePoolQuery) (UsagePoolDetailResponse, error) {+ f.detailCalls++f.detailQuery = qreturn UsagePoolDetailResponse{}, f.detailErr}-func uh(p UsageProvider, e, a bool) Handlers {- return Handlers{Usage: p, usageAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return e, nil }, adminAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return a, nil }}+func uh(p UsageProvider, admin bool) Handlers {+ return Handlers{Usage: p, adminAccessEvaluator: func(context.Context, *auth.User) (bool, error) { return admin, nil }}}func TestGetUsageOverviewScopesAndValidates(t *testing.T) {p := &fakeUsageProvider{}- h := uh(p, true, false)+ h := uh(p, false)w := httptest.NewRecorder()h.GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=7d", nil), &auth.User{ID: "user"}))if w.Code != 200 || p.overviewQuery.Subject != "user" || p.overviewQuery.ActorSubject != "user" {@@ -50,20 +54,38 @@ func TestGetUsageOverviewScopesAndValidates(t *testing.T) {func TestUsageAdminViewAsPreservesActor(t *testing.T) {p := &fakeUsageProvider{}w := httptest.NewRecorder()- uh(p, true, true).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=30d&subject=customer", nil), &auth.User{ID: "admin"}))+ uh(p, true).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=30d&subject=customer", nil), &auth.User{ID: "admin"}))if w.Code != 200 || p.overviewQuery.ActorSubject != "admin" || p.overviewQuery.Subject != "customer" {t.Fatalf("%d %#v", w.Code, p.overviewQuery)}}-func TestUsageNonAdminOverrideDeniedAndMissingProvider503(t *testing.T) {+func TestUsageNonAdminOverrideDeniedBeforeProviderAccess(t *testing.T) {p := &fakeUsageProvider{}w := httptest.NewRecorder()- uh(p, true, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h&subject=other", nil), &auth.User{ID: "user"}))- if w.Code != 403 {- t.Fatalf("status=%d", w.Code)+ uh(p, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h&subject=other", nil), &auth.User{ID: "user"}))+ if got, want := w.Code, http.StatusForbidden; got != want {+ t.Fatalf("status=%d, want %d", got, want)+ }+ if got, want := w.Body.String(), "{\"error\":\"only administrators can select another subject\"}\n"; got != want {+ t.Fatalf("body=%q, want %q", got, want)+ }+ if p.overviewCalls != 0 {+ t.Fatalf("provider overview calls=%d, want 0", p.overviewCalls)}+w = httptest.NewRecorder()- uh(nil, true, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h", nil), &auth.User{ID: "user"}))+ uh(p, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=pool-a&subject=other", nil), &auth.User{ID: "user"}))+ if got, want := w.Code, http.StatusForbidden; got != want {+ t.Fatalf("pool status=%d, want %d", got, want)+ }+ if p.detailCalls != 0 {+ t.Fatalf("provider detail calls=%d, want 0", p.detailCalls)+ }+}++func TestUsageMissingProviderReturns503(t *testing.T) {+ w := httptest.NewRecorder()+ uh(nil, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h", nil), &auth.User{ID: "user"}))if w.Code != 503 {t.Fatalf("status=%d", w.Code)}@@ -71,19 +93,19 @@ func TestUsageNonAdminOverrideDeniedAndMissingProvider503(t *testing.T) {func TestUsagePoolValidationAndInterval(t *testing.T) {p := &fakeUsageProvider{}w := httptest.NewRecorder()- uh(p, true, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=pool-a", nil), &auth.User{ID: "user"}))+ uh(p, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=pool-a", nil), &auth.User{ID: "user"}))if w.Code != 200 || p.detailQuery.Interval != UsageIntervalHour {t.Fatalf("%d %#v", w.Code, p.detailQuery)}w = httptest.NewRecorder()- uh(p, true, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=../../x", nil), &auth.User{ID: "user"}))+ uh(p, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=../../x", nil), &auth.User{ID: "user"}))if w.Code != 400 {t.Fatalf("status=%d", w.Code)}}func TestRecordUsageBrowserTimingsValidatesPayload(t *testing.T) {- handler := uh(&fakeUsageProvider{}, true, false)+ handler := uh(&fakeUsageProvider{}, false)request := withUser(httptest.NewRequest(http.MethodPost, "/api/usage/browser-timings?timeframe=24h", strings.NewReader(`{"initial_load_ms":120,"dashboard_ready_ms":140}`)),&auth.User{ID: "user"},@@ -109,7 +131,7 @@ func TestUsageProviderErrorsAreRedacted(t *testing.T) {t.Run("mandatory source failure", func(t *testing.T) {p := &fakeUsageProvider{overviewErr: errors.New("postgres://[email protected]: source unavailable")}w := httptest.NewRecorder()- uh(p, true, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h", nil), &auth.User{ID: "user"}))+ uh(p, false).GetUsageOverview(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/overview?timeframe=24h", nil), &auth.User{ID: "user"}))if w.Code != http.StatusBadGateway {t.Fatalf("status = %d, want %d", w.Code, http.StatusBadGateway)}@@ -124,7 +146,7 @@ func TestUsageProviderErrorsAreRedacted(t *testing.T) {t.Run("missing pool", func(t *testing.T) {p := &fakeUsageProvider{detailErr: usage.ErrPoolNotFound}w := httptest.NewRecorder()- uh(p, true, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=pool-a", nil), &auth.User{ID: "user"}))+ uh(p, false).GetUsagePoolDetail(w, withUser(httptest.NewRequest(http.MethodGet, "/api/usage/pool?timeframe=24h&pool=pool-a", nil), &auth.User{ID: "user"}))if w.Code != http.StatusNotFound {t.Fatalf("status = %d, want %d", w.Code, http.StatusNotFound)}@@ -148,7 +170,7 @@ func TestUsagePoolDetailCreatesHandlerAndAuthorizationSpans(t *testing.T) {)response := httptest.NewRecorder()- uh(&fakeUsageProvider{}, true, false).GetUsagePoolDetail(response, request)+ uh(&fakeUsageProvider{}, false).GetUsagePoolDetail(response, request)root.End()if response.Code != http.StatusOK {diff --git a/libs/fleet/e2e/billing.spec.ts b/libs/fleet/e2e/billing.spec.tsindex 0b7d87b97d..57d00e5153 100644--- a/libs/fleet/e2e/billing.spec.ts+++ b/libs/fleet/e2e/billing.spec.ts@@ -1,12 +1,17 @@import { expect, test, type Page } from "@playwright/test";import { mockAuth } from "./fixtures/mock-api";-async function setBillingFlag(page: Page, billing: boolean) {+async function setBillingFlag(+ page: Page,+ billing: boolean,+ admin = false,+ usagePricing = { vcpu_hour_usd: 0.044625, memory_gib_hour_usd: 0.0223125 },+) {await page.unroute("**/api/config");await page.route("**/api/config", (route) =>route.fulfill({contentType: "application/json",- body: JSON.stringify({ admin: false, billing }),+ body: JSON.stringify({ admin, billing, usage_pricing: usagePricing }),}),);}@@ -42,36 +47,105 @@ async function mockResourceUsage(page: Page) {);}-test("usage appears in navigation when billing is enabled", async ({+test("usage appears without a billing flag or admin badge", async ({page,}) => {- await setBillingFlag(page, true);+ await setBillingFlag(page, false);await page.goto("/pools");await expect(page.getByRole("link", { name: "User API keys" })).toBeVisible();await expect(page.getByRole("link", { name: "Usage", exact: true })).toBeVisible();+ await expect(page.getByText("Admin", { exact: true })).toHaveCount(0);});-test("usage shows reserved resources and pool costs", async ({ page }) => {+test("usage shows reserved resources and calculated cost by pool", async ({ page }) => {await setBillingFlag(page, true);await mockResourceUsage(page);await page.goto("/usage");await expect(page.getByRole("button", { name: "Usage history range Last 24 hours" })).toBeVisible();- await expect(page.getByText("OpenCost incurred", { exact: true }).first()).toBeVisible();+ await expect(page.getByText("Cost", { exact: true }).first()).toBeVisible();const summary = page.getByLabel("Usage summary");- await expect(summary.getByText("$3.64")).toBeVisible();+ await expect(summary.getByText("$43.51")).toBeVisible();await expect(summary.getByText("Timeframe", { exact: true })).toHaveCount(0);await expect(summary.getByText("Data status", { exact: true })).toHaveCount(0);await expect(page.getByRole("columnheader")).toHaveCount(4);await expect(page.getByRole("cell", { name: "prod-web-fleet" })).toBeVisible();- await expect(page.getByRole("cell", { name: "$2.75" })).toBeVisible();+ await expect(page.getByRole("cell", { name: "240 core-h" })).toBeVisible();+ await expect(page.getByRole("cell", { name: "960 GiB-h" })).toBeVisible();+ await expect(page.getByRole("cell", { name: "$32.13" })).toBeVisible();+ await expect(page.getByText("OpenCost", { exact: false })).toHaveCount(0);await expect(page.locator(".usage-trend")).toHaveCount(0);});+test("usage cost uses pricing returned by api config", async ({ page }) => {+ await setBillingFlag(page, false, false, {+ vcpu_hour_usd: 0.1,+ memory_gib_hour_usd: 0.2,+ });+ await mockResourceUsage(page);+ await page.goto("/usage");+ await expect(page.getByLabel("Usage summary").getByText("$291.00")).toBeVisible();+ await expect(page.getByRole("cell", { name: "$216.00" })).toBeVisible();+});++test("usage subject lookup is visible only to admins", async ({ page }) => {+ await setBillingFlag(page, true);+ await mockResourceUsage(page);+ await page.goto("/usage");+ await expect(+ page.getByRole("heading", { name: "View usage by subject" }),+ ).toHaveCount(0);+});++test("admin can view and reset usage for another subject", async ({ page }) => {+ const targetSubject = "30a53246-881d-4f1a-8005-979f2a07933e";+ const requestedSubjects: Array<string | null> = [];+ const targetOverview = {+ ...usageOverview,+ pools: [+ {+ id: "preview:target-pool",+ name: "target-pool",+ cpu: { consumed: 1, provisioned: 12 },+ memory: { consumed: 4, provisioned: 48 },+ cost_usd: 0,+ },+ ],+ };++ await setBillingFlag(page, true, true);+ await page.route("**/api/usage/overview**", (route) => {+ const subject = new URL(route.request().url()).searchParams.get("subject");+ requestedSubjects.push(subject);+ return route.fulfill({+ json: subject === targetSubject ? targetOverview : usageOverview,+ });+ });++ await page.goto("/usage");+ await expect(+ page.getByRole("heading", { name: "View usage by subject" }),+ ).toBeVisible();+ await page+ .getByRole("textbox", { name: "User subject ID" })+ .fill(` ${targetSubject} `);+ await page.getByRole("button", { name: "View usage" }).click();++ await expect(page.getByText(`Showing usage for ${targetSubject}`)).toBeVisible();+ await expect(page.getByRole("cell", { name: "target-pool" })).toBeVisible();+ await expect.poll(() => requestedSubjects.at(-1)).toBe(targetSubject);++ await page.getByRole("button", { name: "Reset to my usage" }).click();+ await expect(page.getByText("Showing your usage")).toBeVisible();+ await expect(page.getByRole("cell", { name: "prod-web-fleet" })).toBeVisible();+ await expect.poll(() => requestedSubjects.at(-1)).toBeNull();+});+test("visual preview shows resource usage without authentication", async ({ page }) => {await page.goto("/usage?cua-visual-preview");- await expect(page.getByLabel("Usage summary").getByText("$37.47")).toBeVisible();+ await expect(page.getByLabel("Usage summary").getByText("$372.71")).toBeVisible();await expect(page.getByRole("button", { name: "Usage history range Last 24 hours" })).toBeVisible();await expect(page.getByRole("cell", { name: "browser-agent-fleet" })).toBeVisible();+ await expect(page.getByRole("cell", { name: "$179.93" })).toBeVisible();});test("usage has a useful empty state", async ({ page }) => {diff --git a/libs/fleet/e2e/fixtures/mock-api.ts b/libs/fleet/e2e/fixtures/mock-api.tsindex ff01658f38..2ed2341aee 100644--- a/libs/fleet/e2e/fixtures/mock-api.ts+++ b/libs/fleet/e2e/fixtures/mock-api.ts@@ -56,6 +56,7 @@ export interface MockFeatureFlags {billing?: boolean;chat?: boolean;usage?: boolean;+ usagePricing?: { vcpuHourUSD: number; memoryGiBHourUSD: number };}export interface MockAuthOptions {@@ -168,6 +169,10 @@ export async function mockAuth(billing: flags.billing ?? false,chat: flags.chat ?? false,usage: flags.usage ?? false,+ usage_pricing: {+ vcpu_hour_usd: flags.usagePricing?.vcpuHourUSD ?? 0.044625,+ memory_gib_hour_usd: flags.usagePricing?.memoryGiBHourUSD ?? 0.0223125,+ },}),});});diff --git a/libs/fleet/e2e/usage.performance.spec.ts b/libs/fleet/e2e/usage.performance.spec.tsindex 672ad5a2a1..f56e24cf39 100644--- a/libs/fleet/e2e/usage.performance.spec.ts+++ b/libs/fleet/e2e/usage.performance.spec.ts@@ -22,7 +22,7 @@ async function delayedJSON(route: Route, body: unknown) {test("measures Usage dashboard ready time", async ({ page }) => {const visualPreview = process.env.CYCLOPS_BROWSER_VISUAL_PREVIEW === "true"- if (!visualPreview) await mockAuth(page, { admin: false, billing: true })+ if (!visualPreview) await mockAuth(page, { admin: false, billing: false })let usageRequests = 0let browserTimings: Record<string, number> | null = nullawait page.route("**/api/usage/overview**", async (route) => {@@ -37,14 +37,14 @@ test("measures Usage dashboard ready time", async ({ page }) => {const started = performance.now()await page.goto(visualPreview ? "/usage?cua-visual-preview" : "/usage")await expect(- page.getByRole("heading", { name: "Reserved resources by pool" }),+ page.getByRole("heading", { name: "Cost by pool" }),).toBeVisible()const readyMS = performance.now() - startedawait expect.poll(() => browserTimings).not.toBeNull()console.log(`METRIC browser_ready_ms=${readyMS.toFixed(3)}`)console.log(`METRIC browser_usage_requests=${usageRequests}`)- expect(usageRequests).toBe(2)+ expect(usageRequests).toBe(1)expect(browserTimings?.initial_load_ms).toBeGreaterThanOrEqual(200)expect(browserTimings?.dashboard_ready_ms).toBeGreaterThanOrEqual(200)})diff --git a/libs/fleet/e2e/user-keys.spec.ts b/libs/fleet/e2e/user-keys.spec.tsindex 7538946471..7136d7b92a 100644--- a/libs/fleet/e2e/user-keys.spec.ts+++ b/libs/fleet/e2e/user-keys.spec.ts@@ -139,7 +139,7 @@ test.describe("User API keys", () => {).toBeVisible()await expect(page.getByText("Token URL")).not.toBeVisible()- await expect(page.getByText("Usage")).not.toBeVisible()+ await expect(page.getByRole("link", { name: "Usage", exact: true })).toBeVisible()// Dismiss the modalawait pagediff --git a/libs/fleet/src/App.tsx b/libs/fleet/src/App.tsxindex 506781eeb3..09ea04f246 100644--- a/libs/fleet/src/App.tsx+++ b/libs/fleet/src/App.tsx@@ -154,7 +154,7 @@ function ShellLayout({);const previousPath = useRef(location.pathname);const user = userInfo();- const { admin, billing, chat } = useFeatureFlags();+ const { admin, chat } = useFeatureFlags();const threadNavigation = useThreadNavigation();useEffect(() => {@@ -258,16 +258,7 @@ function ShellLayout({}}items={[{ type: "link", text: "Pools", href: "#/pools" },- ...(billing- ? [- {- type: "link" as const,- text: "Usage",- href: "#/usage",- info: <Badge color="blue">Admin</Badge>,- },- ]- : []),+ { type: "link", text: "Usage", href: "#/usage" },{ type: "link", text: "User API keys", href: "#/user-keys" },{ type: "link", text: "Settings", href: "#/settings" },...(admin@@ -335,7 +326,7 @@ export function App() {<Route path="/pools/:namespace/:name" element={<PoolDetail />} /><Route path="/user-keys" element={<UserApiKeys />} /><Route path="/settings" element={<Settings />} />- <Route path="/usage" element={<BillingUsageRoute />} />+ <Route path="/usage" element={<BillingUsagePage />} /><Route path="/agent" element={<ChatRoute />} /><Route path="/agent/archived" element={<ArchivedThreadsRoute />} /><Route path="/agent/:threadId" element={<ChatRoute />} />@@ -395,15 +386,3 @@ function ArchivedThreadsRoute() {);return chat ? <ArchivedThreads /> : <Navigate to="/pools" replace />;}--function BillingUsageRoute() {- const { billing, resolved } = useFeatureFlags();- if (!resolved) {- return (- <PageShell eyebrow="Billing" title="Usage">- <div className="usage-layout" />- </PageShell>- );- }- return billing ? <BillingUsagePage /> : <Navigate to="/settings" replace />;-}diff --git a/libs/fleet/src/components/FeatureFlagContext.tsx b/libs/fleet/src/components/FeatureFlagContext.tsxindex 7496171b23..b54707c3f2 100644--- a/libs/fleet/src/components/FeatureFlagContext.tsx+++ b/libs/fleet/src/components/FeatureFlagContext.tsx@@ -9,8 +9,15 @@ import {} from "react"import { fetchFeatureFlags, type FeatureFlags } from "../sdk/featureFlags"import { isLocalVisualPreview } from "../local-visual-preview"+import { DEFAULT_USAGE_PRICING } from "../usagePricing"-const DEFAULT_FLAGS: FeatureFlags = { admin: false, billing: false, chat: false, usage: false }+const DEFAULT_FLAGS: FeatureFlags = {+ admin: false,+ billing: false,+ chat: false,+ usage: false,+ usagePricing: DEFAULT_USAGE_PRICING,+}interface FeatureFlagContextValue extends FeatureFlags {resolved: boolean@@ -33,7 +40,7 @@ export function FeatureFlagProvider({ children }: { children: ReactNode }) {const visualPreview = isLocalVisualPreview()const [value, setValue] = useState<Omit<FeatureFlagContextValue, "refresh">>({...(visualPreview- ? { ...DEFAULT_FLAGS, billing: true, chat: true, usage: true }+ ? { ...DEFAULT_FLAGS, admin: true, billing: true, chat: true, usage: true }: DEFAULT_FLAGS),resolved: visualPreview,})diff --git a/libs/fleet/src/pages/BillingUsage.css b/libs/fleet/src/pages/BillingUsage.cssindex 0fb98078be..c9c9733554 100644--- a/libs/fleet/src/pages/BillingUsage.css+++ b/libs/fleet/src/pages/BillingUsage.css@@ -3,6 +3,53 @@gap: 20px;}+.usage-admin {+ display: grid;+ grid-template-columns: minmax(220px, 0.65fr) minmax(320px, 1fr);+ gap: 28px;+ align-items: end;+ margin-block-end: 20px;+ padding: 22px 24px;+ border: 1px solid var(--cua-color-border-subtle, rgba(255, 255, 255, 0.14));+ border-radius: var(--cua-radius-container, 12px);+ background:+ linear-gradient(120deg, rgba(255, 255, 255, 0.05), transparent 52%),+ var(--cua-color-surface-raised, #181818);+}++.usage-admin__copy h2,+.usage-admin__copy p {+ margin: 0;+}++.usage-admin__copy h2 {+ margin-block-start: 5px;+ color: var(--cua-dashboard-text, #f6f8fb);+ font-size: 19px;+ font-weight: 600;+ letter-spacing: -0.01em;+}++.usage-admin__copy > p:last-child {+ margin-block-start: 8px;+ color: var(--cua-color-text-muted, rgba(224, 230, 238, 0.68));+ font-size: 13px;+}++.usage-admin__controls {+ display: grid;+ grid-template-columns: minmax(260px, 1fr) auto;+ gap: 14px;+ align-items: end;+ min-width: 0;+}++.usage-admin__actions {+ display: flex;+ gap: 8px;+ padding-block-end: 1px;+}+.usage-summary {display: grid;grid-template-columns: repeat(3, minmax(0, 1fr));@@ -175,6 +222,20 @@}@media (max-width: 760px) {+ .usage-admin,+ .usage-admin__controls {+ grid-template-columns: 1fr;+ }++ .usage-admin {+ gap: 20px;+ padding: 18px 16px;+ }++ .usage-admin__actions {+ flex-wrap: wrap;+ }+.usage-summary {grid-template-columns: 1fr;}diff --git a/libs/fleet/src/pages/BillingUsage.tsx b/libs/fleet/src/pages/BillingUsage.tsxindex 6fff67ecab..510149f59c 100644--- a/libs/fleet/src/pages/BillingUsage.tsx+++ b/libs/fleet/src/pages/BillingUsage.tsx@@ -1,6 +1,9 @@+import FormField from "@cloudscape-design/components/form-field"+import Input from "@cloudscape-design/components/input"import Select from "@cloudscape-design/components/select"import { useCallback, useEffect, useMemo, useRef, useState } from "react"import { CuaButton } from "../components/CuaButton"+import { useFeatureFlags } from "../components/FeatureFlagContext"import { PageEmpty, PageError } from "../components/PageState"import { PageShell } from "../components/PageShell"import {@@ -9,6 +12,7 @@ import {type UsageTimeframe,} from "../sdk/usage"import "./BillingUsage.css"+import { reservedResourceCostUSD } from "../usagePricing"const rangeOptions = [{ label: "Last 24 hours", value: "24h" },@@ -29,6 +33,7 @@ const resourceFormatter = new Intl.NumberFormat(undefined, {function resourceHours(value: number, unit: "core-h" | "GiB-h") {return `${resourceFormatter.format(value)} ${unit}`}+function UsageSkeleton() {return (<div className="usage-skeleton" role="status" aria-label="Loading usage">@@ -47,18 +52,23 @@ function UsageSkeleton() {}export function BillingUsagePage() {+ const { admin, usagePricing } = useFeatureFlags()const [timeframe, setTimeframe] = useState<UsageTimeframe>("24h")+ const [subjectInput, setSubjectInput] = useState("")+ const [activeSubject, setActiveSubject] = useState<string | null>(null)+ const [subjectError, setSubjectError] = useState("")const [overview, setOverview] = useState<UsageOverviewResponse | null>(null)const [loading, setLoading] = useState(true)const [error, setError] = useState(false)const loadStarted = useRef(0)+ const requestedQuery = useRef<string | null>(null)const load = useCallback(async () => {loadStarted.current = performance.now()setLoading(true)setError(false)try {- const value = await usageApi.overview(timeframe)+ const value = await usageApi.overview(timeframe, activeSubject ?? undefined)const initialLoadMS = performance.now() - loadStarted.currentsetOverview(value)requestAnimationFrame(() => {@@ -78,26 +88,58 @@ export function BillingUsagePage() {} finally {setLoading(false)}- }, [timeframe])+ }, [activeSubject, timeframe])useEffect(() => {+ const query = `${timeframe}\0${activeSubject ?? ""}`+ if (requestedQuery.current === query) return+ requestedQuery.current = queryload()- }, [load])+ }, [activeSubject, load, timeframe])++ const viewSubjectUsage = () => {+ const subject = subjectInput.trim()+ if (!subject) {+ setSubjectError("Enter a user subject ID.")+ return+ }+ if (subject.length > 255) {+ setSubjectError("User subject ID must be 255 characters or fewer.")+ return+ }+ setSubjectError("")+ if (subject === activeSubject) {+ void load()+ return+ }+ setActiveSubject(subject)+ }++ const resetSubjectUsage = () => {+ setSubjectInput("")+ setSubjectError("")+ setActiveSubject(null)+ }const pools = useMemo(- () => [...(overview?.pools ?? [])].sort((left, right) =>- right.cpu.provisioned - left.cpu.provisioned ||- right.memory.provisioned - left.memory.provisioned ||- right.cost_usd - left.cost_usd- ),- [overview],+ () => (overview?.pools ?? [])+ .map(pool => ({+ ...pool,+ reservedCostUSD: reservedResourceCostUSD(+ pool.cpu.provisioned,+ pool.memory.provisioned,+ usagePricing,+ ),+ }))+ .sort((left, right) => right.reservedCostUSD - left.reservedCostUSD),+ [overview, usagePricing],)const totals = useMemo(() => pools.reduce((total, pool) => ({cpuProvisioned: total.cpuProvisioned + pool.cpu.provisioned,memoryProvisioned: total.memoryProvisioned + pool.memory.provisioned,- cost: total.cost + pool.cost_usd,+ cost: total.cost + pool.reservedCostUSD,}),{ cpuProvisioned: 0, memoryProvisioned: 0, cost: 0 },),@@ -117,6 +159,40 @@ export function BillingUsagePage() {/>}>+ {admin && (+ <section className="usage-admin" aria-labelledby="usage-admin-title">+ <div className="usage-admin__copy">+ <p className="usage-panel__eyebrow">Admin</p>+ <h2 id="usage-admin-title">View usage by subject</h2>+ <p>Load reserved-resource usage for any Keycloak user subject ID.</p>+ </div>+ <div className="usage-admin__controls">+ <FormField+ label="User subject ID"+ errorText={subjectError || undefined}+ description={activeSubject ? `Showing usage for ${activeSubject}` : "Showing your usage"}+ >+ <Input+ value={subjectInput}+ placeholder="30a53246-881d-4f1a-8005-979f2a07933e"+ onChange={({ detail }) => {+ setSubjectInput(detail.value)+ if (subjectError) setSubjectError("")+ }}+ onKeyDown={({ detail }) => {+ if (detail.key === "Enter") viewSubjectUsage()+ }}+ />+ </FormField>+ <div className="usage-admin__actions">+ <CuaButton tone="primary" onClick={viewSubjectUsage}>View usage</CuaButton>+ {activeSubject && (+ <CuaButton tone="secondary" onClick={resetSubjectUsage}>Reset to my usage</CuaButton>+ )}+ </div>+ </div>+ </section>+ )}{loading ? <UsageSkeleton /> : error ? (<PageError title="Usage is temporarily unavailable" action={<CuaButton tone="secondary" onClick={load}>Try again</CuaButton>}>We could not load resource cost data. Try again in a moment.@@ -141,9 +217,9 @@ export function BillingUsagePage() {<span>GiB-hours across the selected range</span></div><div className="usage-summary__metric">- <span className="usage-summary__label">OpenCost incurred</span>+ <span className="usage-summary__label">Cost</span><strong>{moneyFormatter.format(totals.cost)}</strong>- <span>Across {pools.length} {pools.length === 1 ? "pool" : "pools"}</span>+ <span>Reserved resources across {pools.length} {pools.length === 1 ? "pool" : "pools"}</span></div></section>@@ -151,17 +227,17 @@ export function BillingUsagePage() {<div className="usage-panel__heading"><div><p className="usage-panel__eyebrow">Breakdown</p>- <h2 id="usage-breakdown-title">Reserved resources by pool</h2>+ <h2 id="usage-breakdown-title">Cost by pool</h2></div></div><table className="usage-breakdown">- <caption className="cua-visually-hidden">Reserved resource hours and OpenCost by pool</caption>+ <caption className="cua-visually-hidden">Reserved resource hours and cost by pool</caption><thead><tr className="usage-breakdown__header"><th scope="col">Pool name</th><th scope="col">Reserved CPU</th><th scope="col">Reserved memory</th>- <th scope="col">OpenCost</th>+ <th scope="col">Cost</th></tr></thead><tbody>@@ -170,7 +246,7 @@ export function BillingUsagePage() {<td>{pool.name}</td><td data-label="Reserved CPU"><strong>{resourceHours(pool.cpu.provisioned, "core-h")}</strong></td><td data-label="Reserved memory"><strong>{resourceHours(pool.memory.provisioned, "GiB-h")}</strong></td>- <td data-label="OpenCost"><strong>{moneyFormatter.format(pool.cost_usd)}</strong></td>+ <td data-label="Cost"><strong>{moneyFormatter.format(pool.reservedCostUSD)}</strong></td></tr>))}</tbody>diff --git a/libs/fleet/src/sdk/featureFlags.ts b/libs/fleet/src/sdk/featureFlags.tsindex a4f714b5e0..895b1e00b7 100644--- a/libs/fleet/src/sdk/featureFlags.ts+++ b/libs/fleet/src/sdk/featureFlags.ts@@ -6,6 +6,7 @@// the backend's OPA policy, not just by hiding nav here.import { getToken } from "../auth/keycloak"+import { DEFAULT_USAGE_PRICING, type UsagePricing } from "../usagePricing"export interface FeatureFlags {/** Admin users see the full infra UI: Nodes and Operator events. */@@ -14,8 +15,10 @@ export interface FeatureFlags {billing: boolean/** Chat users can access persisted browser-bash conversations. */chat: boolean- /** Internal users can access the preview usage dashboard. */+ /** True when the backend usage provider is available. */usage: boolean+ /** Backend-resolved reservation prices from OpenFeature. */+ usagePricing: UsagePricing}let cache: FeatureFlags | null = null@@ -45,7 +48,12 @@ export async function fetchFeatureFlags(throw new Error(`feature flag config request failed: ${response.status}`)}- const data = (await response.json()) as Partial<FeatureFlags>+ const data = (await response.json()) as Partial<FeatureFlags> & {+ usage_pricing?: {+ vcpu_hour_usd?: number+ memory_gib_hour_usd?: number+ }+ }if (!data || typeof data !== "object") {throw new Error("feature flag config response must be an object")}@@ -54,12 +62,20 @@ export async function fetchFeatureFlags(billing: data.billing ?? false,chat: data.chat ?? false,usage: data.usage ?? false,+ usagePricing: {+ vcpuHourUSD: data.usage_pricing?.vcpu_hour_usd ?? DEFAULT_USAGE_PRICING.vcpuHourUSD,+ memoryGiBHourUSD: data.usage_pricing?.memory_gib_hour_usd ?? DEFAULT_USAGE_PRICING.memoryGiBHourUSD,+ },}if (typeof flags.admin !== "boolean" ||typeof flags.billing !== "boolean" ||typeof flags.chat !== "boolean" ||- typeof flags.usage !== "boolean"+ typeof flags.usage !== "boolean" ||+ !Number.isFinite(flags.usagePricing.vcpuHourUSD) ||+ flags.usagePricing.vcpuHourUSD <= 0 ||+ !Number.isFinite(flags.usagePricing.memoryGiBHourUSD) ||+ flags.usagePricing.memoryGiBHourUSD <= 0) {throw new Error("feature flag config response contains invalid values")}diff --git a/libs/fleet/src/usagePricing.ts b/libs/fleet/src/usagePricing.tsnew file mode 100644index 0000000000..abfe2e804f--- /dev/null+++ b/libs/fleet/src/usagePricing.ts@@ -0,0 +1,17 @@+export interface UsagePricing {+ vcpuHourUSD: number+ memoryGiBHourUSD: number+}++export const DEFAULT_USAGE_PRICING: UsagePricing = {+ vcpuHourUSD: 0.044625,+ memoryGiBHourUSD: 0.0223125,+}++export function reservedResourceCostUSD(+ cpuCoreHours: number,+ memoryGiBHours: number,+ pricing: UsagePricing = DEFAULT_USAGE_PRICING,+) {+ return cpuCoreHours * pricing.vcpuHourUSD + memoryGiBHours * pricing.memoryGiBHourUSD+}diff --git a/libs/fleet/tests/usage-pricing.test.ts b/libs/fleet/tests/usage-pricing.test.tsnew file mode 100644index 0000000000..09eb7107cc--- /dev/null+++ b/libs/fleet/tests/usage-pricing.test.ts@@ -0,0 +1,18 @@+import assert from "node:assert/strict"+import test from "node:test"+import {+ DEFAULT_USAGE_PRICING,+ reservedResourceCostUSD,+} from "../src/usagePricing.ts"++test("reservation pricing defaults to the current billable rates", () => {+ assert.equal(DEFAULT_USAGE_PRICING.vcpuHourUSD, 0.044625)+ assert.equal(DEFAULT_USAGE_PRICING.memoryGiBHourUSD, 0.0223125)+})++test("reservation cost uses runtime pricing", () => {+ assert.equal(+ reservedResourceCostUSD(28, 28, { vcpuHourUSD: 0.1, memoryGiBHourUSD: 0.2 }),+ 8.4,+ )+})