refactor: standardize AI credit naming

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: asizikov

README.md

@@ -84,7 +84,7 @@ The application expects CSV files with the following primary 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). Legacy `aiu_*` column names from older exports are still accepted during parsing, but they are no longer the documented format.
+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

@@ -39,4 +39,3 @@ Source examples: files in `examples/`. Some existing sample exports still use th
 - 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 `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`.
-- Older exports that still use legacy `aiu_quantity` / `aiu_gross_amount` headers are accepted as parser fallbacks.

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;
 }
 

src/App.tsx

@@ -20,17 +20,17 @@ import { OrganizationAggregator, type OrganizationResult } from './pipeline/aggr
 import { UserUsageAggregator, type UserUsageResult } from './pipeline/aggregators/userUsageAggregator'
 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,
@@ -190,24 +190,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 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 +392,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">
@@ -445,13 +445,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 +479,7 @@ function App() {
                           {
                             label: 'AI Credits',
                             color: '#22c55e',
-                            data: filledDailyUsageData.map((day) => day.aiuQuantity),
+                            data: filledDailyUsageData.map((day) => day.aicQuantity),
                             yAxisID: 'y1',
                           },
                         ]}
@@ -498,7 +498,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
     }
   }

src/pipeline/aggregators/dailyUsageAggregator.ts

@@ -4,9 +4,9 @@ import { getUsageMetrics, type TokenUsageRecord } from '../parser'
 export interface DailyUsageData {
   date: string
   requests: number
-  aiuQuantity: number
+  aicQuantity: number
   grossAmount: number
-  aiuGrossAmount: number
+  aicGrossAmount: number
   aicNetAmount: number
   discountAmount: number
   netAmount: number
@@ -25,13 +25,13 @@ export class DailyUsageAggregator implements Aggregator<TokenUsageRecord, DailyU
 
     const existing = this.dataByDate.get(date)
 
-    const { requests, aiuQuantity, grossAmount, aiuGrossAmount, aicNetAmount, discountAmount, netAmount } = getUsageMetrics(record)
+    const { requests, aicQuantity, grossAmount, aicGrossAmount, aicNetAmount, discountAmount, netAmount } = getUsageMetrics(record)
 
     if (existing) {
       existing.requests += requests
-      existing.aiuQuantity += aiuQuantity
+      existing.aicQuantity += aicQuantity
       existing.grossAmount += grossAmount
-      existing.aiuGrossAmount += aiuGrossAmount
+      existing.aicGrossAmount += aicGrossAmount
       existing.aicNetAmount += aicNetAmount
       existing.discountAmount += discountAmount
       existing.netAmount += netAmount
@@ -41,9 +41,9 @@ export class DailyUsageAggregator implements Aggregator<TokenUsageRecord, DailyU
     this.dataByDate.set(date, {
       date,
       requests,
-      aiuQuantity,
+      aicQuantity,
       grossAmount,
-      aiuGrossAmount,
+      aicGrossAmount,
       aicNetAmount,
       discountAmount,
       netAmount,

src/pipeline/aggregators/modelUsageAggregator.ts

@@ -4,19 +4,19 @@ import { getUsageMetrics, type TokenUsageHeader, type TokenUsageRecord } from '.
 export type ModelDailyUsageData = {
   date: string
   requests: number
-  aiuQuantity: number
+  aicQuantity: number
   grossAmount: number
-  aiuGrossAmount: number
+  aicGrossAmount: number
   aicNetAmount: number
   discountAmount: number
   netAmount: number
 }
 
 export type ModelUsageTotals = {
   requests: number
-  aiuQuantity: number
+  aicQuantity: number
   grossAmount: number
-  aiuGrossAmount: number
+  aicGrossAmount: number
   aicNetAmount: number
   discountAmount: number
   netAmount: number
@@ -40,9 +40,9 @@ function ensureDay(model: ModelInternal, date: string): ModelDailyUsageData {
   const created: ModelDailyUsageData = {
     date,
     requests: 0,
-    aiuQuantity: 0,
+    aicQuantity: 0,
     grossAmount: 0,
-    aiuGrossAmount: 0,
+    aicGrossAmount: 0,
     aicNetAmount: 0,
     discountAmount: 0,
     netAmount: 0,
@@ -70,9 +70,9 @@ export class ModelUsageAggregator implements Aggregator<TokenUsageRecord, ModelU
         byDate: new Map(),
         totals: {
           requests: 0,
-          aiuQuantity: 0,
+          aicQuantity: 0,
           grossAmount: 0,
-          aiuGrossAmount: 0,
+          aicGrossAmount: 0,
           aicNetAmount: 0,
           discountAmount: 0,
           netAmount: 0,
@@ -81,21 +81,21 @@ export class ModelUsageAggregator implements Aggregator<TokenUsageRecord, ModelU
       this.byModel.set(modelName, model)
     }
 
-    const { requests, aiuQuantity, grossAmount, aiuGrossAmount, aicNetAmount, discountAmount, netAmount } = getUsageMetrics(record)
+    const { requests, aicQuantity, grossAmount, aicGrossAmount, aicNetAmount, discountAmount, netAmount } = getUsageMetrics(record)
 
     const day = ensureDay(model, date)
     day.requests += requests
-    day.aiuQuantity += aiuQuantity
+    day.aicQuantity += aicQuantity
     day.grossAmount += grossAmount
-    day.aiuGrossAmount += aiuGrossAmount
+    day.aicGrossAmount += aicGrossAmount
     day.aicNetAmount += aicNetAmount
     day.discountAmount += discountAmount
     day.netAmount += netAmount
 
     model.totals.requests += requests
-    model.totals.aiuQuantity += aiuQuantity
+    model.totals.aicQuantity += aicQuantity
     model.totals.grossAmount += grossAmount
-    model.totals.aiuGrossAmount += aiuGrossAmount
+    model.totals.aicGrossAmount += aicGrossAmount
     model.totals.aicNetAmount += aicNetAmount
     model.totals.discountAmount += discountAmount
     model.totals.netAmount += netAmount