Merge pull request #19 from github/ui/users-license-summary

Add users license summary table

Author: asizikov

README.md

@@ -60,11 +60,11 @@ npm run preview
 3. The app will parse the report and compare request-based and AI Credits-based billing signals
 4. Explore the visualizations and data views to preview how future bills may look after the AI Credits transition
 
-Sample reports are available in the `examples/` directory. Older examples without `aiu_quantity` still load, but AI Credits will remain `0` for those rows.
+Sample reports are available in the `examples/` directory. Older examples without `aic_quantity` still load, but AI Credits will remain `0` for those rows.
 
 ## CSV Report Format
 
-The application expects CSV files with the following primary columns:
+The application expects CSV files with the following required columns:
 
 - `date` - ISO date (YYYY-MM-DD)
 - `username` - GitHub username
@@ -81,9 +81,13 @@ The application expects CSV files with the following primary columns:
 - `total_monthly_quota` - Monthly quota amount
 - `organization` - Organization slug
 - `cost_center_name` - Optional cost center identifier
-- `aiu_quantity` - AI Credits for the same usage row
 
-The viewer now supports both billing units. On `requests` rows, `quantity` and `applied_cost_per_quantity` drive PRU-based calculations, while `aiu_quantity` and `aiu_gross_amount` remain comparison values and stay `0` when those AI Credit fields are absent. On `ai-units` rows, Premium Requests and generic PRU gross/discount/net totals are counted as `0`; AI Credits are counted from the AI-specific credit fields (`aiu_quantity`, falling back to `quantity` only when the AI field is absent) and AI Credit gross cost comes from `aiu_gross_amount` (falling back to `gross_amount` only when the AI field is absent). Legacy token columns may still appear in older exports, but they are no longer used by the app.
+Newer exports may also include these AI Credit columns:
+
+- `aic_quantity` - AI Credits for the same usage row
+- `aic_gross_amount` - AI Credit gross cost for the same usage row
+
+The viewer now supports both billing units. On `requests` rows, `quantity` and `applied_cost_per_quantity` drive PRU-based calculations, while `aic_quantity` and `aic_gross_amount` remain comparison values and stay `0` when those AI Credit fields are absent. On `ai-units` rows, Premium Requests and generic PRU gross/discount/net totals are counted as `0`; AI Credits are counted from the AI-specific credit fields (`aic_quantity`, falling back to `quantity` only when the AI field is absent) and AI Credit gross cost comes from `aic_gross_amount` (falling back to `gross_amount` only when the AI field is absent).
 
 See [docs/report-format.md](docs/report-format.md) for detailed format specifications.
 

docs/report-format.md

@@ -2,7 +2,7 @@
 
 Source examples: files in `examples/`. Some existing sample exports still use the older token-oriented schema.
 
-## Primary columns used by the app
+## Required columns used by the app
 
 | Column | Type | Description |
 | --- | --- | --- |
@@ -21,21 +21,20 @@ Source examples: files in `examples/`. Some existing sample exports still use th
 | `total_monthly_quota` | number | Monthly quota for the user or plan applicable to the row. |
 | `organization` | string | Organization slug associated with the usage. |
 | `cost_center_name` | string | Optional cost center or tagging field. |
-| `aiu_quantity` | number | Same usage converted to AI Credits. |
-
-## Additional columns
+## Optional AI Credit columns
 
 | Column | Status | Notes |
 | --- | --- | --- |
-| `aiu_gross_amount` | Present in newer previews | Used for AI Credit gross cost when present. |
+| `aic_quantity` | Present in newer previews | Same usage converted to AI Credits. |
+| `aic_gross_amount` | Present in newer previews | Used for AI Credit gross cost when present. |
 | `total_input_tokens` | Legacy / optional | Older token-oriented export field; ignored by the app. |
 | `total_output_tokens` | Legacy / optional | Older token-oriented export field; ignored by the app. |
 | `total_cache_creation_tokens` | Legacy / optional | Older token-oriented export field; ignored by the app. |
 | `total_cache_read_tokens` | Legacy / optional | Older token-oriented export field; ignored by the app. |
 
 ## Notes
 - Header row is single-lined; subsequent rows are usage records. Values are comma-separated, double-quoted where needed.
-- Monetary fields are decimals. `aiu_quantity` may also be fractional.
+- Monetary fields are decimals. `aic_quantity` may also be fractional.
 - The app streams the file, treats the first row as the header, and counts subsequent data rows without loading the entire file into memory.
-- Current calculations support both row types: on `requests` rows, `quantity` and `applied_cost_per_quantity` describe PRU usage while `aiu_quantity` and `aiu_gross_amount` remain reference/comparison values and stay `0` when the AI Credit fields are absent; on `ai-units` rows, Premium Requests and generic PRU gross/discount/net totals are counted as `0`, while AI Credits and AI Credit gross cost are taken from the AI-specific fields (`aiu_quantity` / `aiu_gross_amount`, with fallback to `quantity` / `gross_amount` only when those AI-specific fields are absent).
-- Reports without `aiu_quantity` still load, but AI Credit summaries will display `0`.
+- Current calculations support both row types: on `requests` rows, `quantity` and `applied_cost_per_quantity` describe PRU usage while `aic_quantity` and `aic_gross_amount` remain reference/comparison values and stay `0` when those AI Credit fields are absent; on `ai-units` rows, Premium Requests and generic PRU gross/discount/net totals are counted as `0`, while AI Credits and AI Credit gross cost are taken from the AI-specific fields (`aic_quantity` / `aic_gross_amount`, with fallback to `quantity` / `gross_amount` only when those AI-specific fields are absent).
+- Reports without `aic_quantity` still load, but AI Credit summaries will display `0`.

src/App.css

@@ -435,7 +435,7 @@
   color: #6366f1;
 }
 
-.aiu-callout {
+.aic-callout {
   font-size: 15px;
   font-weight: 700;
   background: #ffffff;
@@ -659,7 +659,7 @@
   color: #1f2328;
 }
 
-.comparison-card__big-number--aiu {
+.comparison-card__big-number--aic {
   color: #2da44e;
 }
 
@@ -1085,7 +1085,7 @@ td.cost-centers-view__num {
   opacity: 0.7;
 }
 
-.products-view__legendSwatch--aiu {
+.products-view__legendSwatch--aic {
   background: #54aeff;
 }
 
@@ -1156,7 +1156,7 @@ td.cost-centers-view__num {
   background: rgba(207, 34, 46, 0.7);
 }
 
-.products-view__barFill--aiu {
+.products-view__barFill--aic {
   background: #54aeff;
 }
 
@@ -1172,7 +1172,7 @@ td.cost-centers-view__num {
   color: #cf222e;
 }
 
-.products-view__barValue--aiu {
+.products-view__barValue--aic {
   color: #0969da;
 }
 
@@ -1281,6 +1281,24 @@ td.cost-centers-view__num {
   color: #636c76;
 }
 
+.users-view__summaryWrap {
+  margin-bottom: 16px;
+}
+
+.users-view__summaryTable th.users-view__num {
+  text-align: right;
+}
+
+.users-view__license {
+  font-weight: 500;
+  color: #1f2328;
+}
+
+.users-view__license--total,
+.users-view__num--total {
+  font-weight: 600;
+}
+
 .users-view__search {
   border: 1px solid #d1d9e0;
   border-radius: 6px;

src/App.tsx

@@ -18,38 +18,26 @@ import { ProductUsageAggregator, type ProductUsageResult } from './pipeline/aggr
 import { CostCenterAggregator, type CostCenterResult } from './pipeline/aggregators/costCenterAggregator'
 import { OrganizationAggregator, type OrganizationResult } from './pipeline/aggregators/organizationAggregator'
 import { UserUsageAggregator, type UserUsageResult } from './pipeline/aggregators/userUsageAggregator'
+import { getMonthlyAicEntitlements } from './pipeline/aicEntitlements'
 import { runPipeline } from './pipeline/runPipeline'
 import { fillDataForRange } from './utils/fillDataForRange'
-import { formatAiu, formatUsd } from './utils/format'
+import { formatAic, formatUsd } from './utils/format'
 
 type Status = 'idle' | 'processing' | 'done'
 
 function createEmptyDailyUsage(date: string): DailyUsageData {
   return {
     date,
     requests: 0,
-    aiuQuantity: 0,
+    aicQuantity: 0,
     grossAmount: 0,
-    aiuGrossAmount: 0,
+    aicGrossAmount: 0,
     aicNetAmount: 0,
     discountAmount: 0,
     netAmount: 0,
   }
 }
 
-// Current pooled AI Credits estimate based on Copilot plan assumptions in the billing export:
-// quota >= 300 => 3,000 included credits, quota >= 1,000 => 7,000 included credits.
-const INCLUDED_AIC_BY_MONTHLY_QUOTA = [
-  { minimumQuota: 1000, includedCredits: 7000 },
-  { minimumQuota: 300, includedCredits: 3000 },
-] as const
-
-function getIncludedAicCredits(totalMonthlyQuota: number): number {
-  return INCLUDED_AIC_BY_MONTHLY_QUOTA.find((plan) => totalMonthlyQuota >= plan.minimumQuota)?.includedCredits ?? 0
-}
-
-
-
 function App() {
   const [status, setStatus] = useState<Status>('idle')
   const [quickStats, setQuickStats] = useState<QuickStatsResult | null>(null)
@@ -190,24 +178,24 @@ function App() {
   const overviewTotals = dailyUsageData.reduce(
     (totals, day) => {
       totals.requests += day.requests
-      totals.aiuQuantity += day.aiuQuantity
+      totals.aicQuantity += day.aicQuantity
       totals.grossAmount += day.grossAmount
-      totals.aiuGrossAmount += day.aiuGrossAmount
+      totals.aicGrossAmount += day.aicGrossAmount
       totals.discountAmount += day.discountAmount
       totals.netAmount += day.netAmount
       return totals
     },
-    { requests: 0, aiuQuantity: 0, grossAmount: 0, aiuGrossAmount: 0, aicNetAmount: 0, discountAmount: 0, netAmount: 0 },
+    { requests: 0, aicQuantity: 0, grossAmount: 0, aicGrossAmount: 0, aicNetAmount: 0, discountAmount: 0, netAmount: 0 },
   )
 
-  const pooledAicCredits = (userUsage?.users ?? []).reduce((sum, user) => sum + getIncludedAicCredits(user.totalMonthlyQuota), 0)
+  const pooledAicCredits = (userUsage?.users ?? []).reduce((sum, user) => sum + getMonthlyAicEntitlements(user.totalMonthlyQuota), 0)
 
   const aicDiscountRate =
-    overviewTotals.aiuQuantity > 0
-      ? Math.min(pooledAicCredits / overviewTotals.aiuQuantity, 1)
+    overviewTotals.aicQuantity > 0
+      ? Math.min(pooledAicCredits / overviewTotals.aicQuantity, 1)
       : 0
-  const aicDiscount = aicDiscountRate * overviewTotals.aiuGrossAmount
-  const aicNetAmount = Math.max(overviewTotals.aiuGrossAmount - aicDiscount, 0)
+  const aicDiscount = aicDiscountRate * overviewTotals.aicGrossAmount
+  const aicNetAmount = Math.max(overviewTotals.aicGrossAmount - aicDiscount, 0)
 
   return (
     <div className={`app ${hasReport ? 'app--review' : ''}`}>
@@ -392,7 +380,7 @@ function App() {
                     <div className="context-banner">
                       <h2 className="context-banner__title">GitHub Copilot is moving to token-based billing</h2>
                       <p className="context-banner__body">
-                        Starting May 1, 2026, Copilot usage will be measured in AI Credits (AICs) instead of Premium Requests (PRUs). <strong className="aiu-callout">1 AIC = $0.01.</strong> This preview shows what your usage would look like under the new pricing.
+                        Starting May 1, 2026, Copilot usage will be measured in AI Credits (AICs) instead of Premium Requests (PRUs). <strong className="aic-callout">1 AIC = $0.01.</strong> This preview shows what your usage would look like under the new pricing.
                       </p>
                       {fileName && (
                         <p className="context-banner__note">
@@ -414,10 +402,23 @@ function App() {
                       const periodLabel = rangeStart
                         ? new Date(rangeStart + 'T00:00:00').toLocaleString('en-US', { month: 'long', year: 'numeric' })
                         : null
-                      return savings > 0 && periodLabel ? (
+                      return periodLabel ? (
                         <p className="comparison-framing">
-                          Your <strong>{periodLabel}</strong> usage would cost{' '}
-                          <strong>{formatUsd(savings)} less</strong> under token-based pricing
+                          {savings > 0 ? (
+                            <>
+                              Your <strong>{periodLabel}</strong> usage would cost{' '}
+                              <strong>{formatUsd(savings)} less</strong> under token-based pricing
+                            </>
+                          ) : savings < 0 ? (
+                            <>
+                              Your <strong>{periodLabel}</strong> usage would cost{' '}
+                              <strong>{formatUsd(Math.abs(savings))} more</strong> under token-based pricing
+                            </>
+                          ) : (
+                            <>
+                              Your <strong>{periodLabel}</strong> usage cost would be the same under token-based pricing
+                            </>
+                          )}
                         </p>
                       ) : null
                     })()}
@@ -445,13 +446,13 @@ function App() {
                       </div>
                       <div className="card comparison-card">
                         <div className="comparison-card__label">Token-based billing (AICs)</div>
-                        <div className="comparison-card__big-number comparison-card__big-number--aiu">{formatUsd(aicNetAmount)}</div>
-                        <div className="comparison-card__period">{formatAiu(overviewTotals.aiuQuantity)} AICs</div>
+                        <div className="comparison-card__big-number comparison-card__big-number--aic">{formatUsd(aicNetAmount)}</div>
+                        <div className="comparison-card__period">{formatAic(overviewTotals.aicQuantity)} AICs</div>
                         <div className="comparison-card__rate">1 AIC = $0.01</div>
                         <div className="comparison-card__breakdown">
                           <div className="comparison-card__breakdown-row">
                             <span>Gross cost</span>
-                            <span>{formatUsd(overviewTotals.aiuGrossAmount)}</span>
+                            <span>{formatUsd(overviewTotals.aicGrossAmount)}</span>
                           </div>
                           <div className="comparison-card__breakdown-row comparison-card__breakdown-row--muted">
                             <span>Included credits discount</span>
@@ -479,7 +480,7 @@ function App() {
                           {
                             label: 'AI Credits',
                             color: '#22c55e',
-                            data: filledDailyUsageData.map((day) => day.aiuQuantity),
+                            data: filledDailyUsageData.map((day) => day.aicQuantity),
                             yAxisID: 'y1',
                           },
                         ]}
@@ -498,7 +499,7 @@ function App() {
                           {
                             label: 'AIC Gross Cost',
                             color: '#54aeff',
-                            data: filledDailyUsageData.map((day) => day.aiuGrossAmount),
+                            data: filledDailyUsageData.map((day) => day.aicGrossAmount),
                             yAxisID: 'y',
                           },
                         ]}

src/pipeline/aggregators/costCenterAggregator.ts

@@ -6,17 +6,17 @@ export type CostTotals = {
   grossAmount: number
   discountAmount: number
   netAmount: number
-  aiuQuantity: number
-  aiuGrossAmount: number
+  aicQuantity: number
+  aicGrossAmount: number
   aicNetAmount: number
 }
 
 export type CostCenterUserTotals = {
   requests: number
   grossAmount: number
   netAmount: number
-  aiuQuantity: number
-  aiuGrossAmount: number
+  aicQuantity: number
+  aicGrossAmount: number
   aicNetAmount: number
 }
 
@@ -47,8 +47,8 @@ function createCostTotals(): CostTotals {
     grossAmount: 0,
     discountAmount: 0,
     netAmount: 0,
-    aiuQuantity: 0,
-    aiuGrossAmount: 0,
+    aicQuantity: 0,
+    aicGrossAmount: 0,
     aicNetAmount: 0,
   }
 }
@@ -64,7 +64,7 @@ function ensureTotals(map: Map<string, CostTotals>, key: string): CostTotals {
 function ensureUserTotals(map: Map<string, CostCenterUserTotals>, key: string): CostCenterUserTotals {
   const existing = map.get(key)
   if (existing) return existing
-  const created: CostCenterUserTotals = { requests: 0, grossAmount: 0, netAmount: 0, aiuQuantity: 0, aiuGrossAmount: 0, aicNetAmount: 0 }
+  const created: CostCenterUserTotals = { requests: 0, grossAmount: 0, netAmount: 0, aicQuantity: 0, aicGrossAmount: 0, aicNetAmount: 0 }
   map.set(key, created)
   return created
 }
@@ -97,32 +97,32 @@ export class CostCenterAggregator implements Aggregator<TokenUsageRecord, CostCe
 
     if (username) costCenter.users.add(username)
 
-    const { requests, grossAmount, discountAmount, netAmount, aiuQuantity, aiuGrossAmount, aicNetAmount } = getUsageMetrics(record)
+    const { requests, grossAmount, discountAmount, netAmount, aicQuantity, aicGrossAmount, aicNetAmount } = getUsageMetrics(record)
 
     costCenter.totals.requests += requests
     costCenter.totals.grossAmount += grossAmount
     costCenter.totals.discountAmount += discountAmount
     costCenter.totals.netAmount += netAmount
-    costCenter.totals.aiuQuantity += aiuQuantity
-    costCenter.totals.aiuGrossAmount += aiuGrossAmount
+    costCenter.totals.aicQuantity += aicQuantity
+    costCenter.totals.aicGrossAmount += aicGrossAmount
     costCenter.totals.aicNetAmount += aicNetAmount
 
     const byModel = ensureTotals(costCenter.totalsByModel, model)
     byModel.requests += requests
     byModel.grossAmount += grossAmount
     byModel.discountAmount += discountAmount
     byModel.netAmount += netAmount
-    byModel.aiuQuantity += aiuQuantity
-    byModel.aiuGrossAmount += aiuGrossAmount
+    byModel.aicQuantity += aicQuantity
+    byModel.aicGrossAmount += aicGrossAmount
     byModel.aicNetAmount += aicNetAmount
 
     if (username) {
       const byUser = ensureUserTotals(costCenter.totalsByUser, username)
       byUser.requests += requests
       byUser.grossAmount += grossAmount
       byUser.netAmount += netAmount
-      byUser.aiuQuantity += aiuQuantity
-      byUser.aiuGrossAmount += aiuGrossAmount
+      byUser.aicQuantity += aicQuantity
+      byUser.aicGrossAmount += aicGrossAmount
       byUser.aicNetAmount += aicNetAmount
     }
   }