fix: address PR review feedback

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

Author: asizikov

README.md

@@ -64,7 +64,7 @@ Sample reports are available in the `examples/` directory. Older examples withou
 
 ## 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,6 +81,9 @@ 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
+
+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
 

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,12 +21,11 @@ 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. |
-| `aic_quantity` | number | Same usage converted to AI Credits. |
-
-## Additional columns
+## Optional AI Credit columns
 
 | Column | Status | Notes |
 | --- | --- | --- |
+| `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. |

src/App.tsx

@@ -18,6 +18,7 @@ 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 { formatAic, formatUsd } from './utils/format'
@@ -37,19 +38,6 @@ function createEmptyDailyUsage(date: string): DailyUsageData {
   }
 }
 
-// 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)
@@ -200,7 +188,7 @@ function App() {
     { 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.aicQuantity > 0

src/pipeline/aicEntitlements.ts

@@ -7,15 +7,24 @@ import {
 } from './parser'
 import { streamLines } from './streamer'
 
-const BUSINESS_MONTHLY_QUOTA = 300
-const ENTERPRISE_MONTHLY_QUOTA = 1000
+export const BUSINESS_MONTHLY_QUOTA = 300
+export const ENTERPRISE_MONTHLY_QUOTA = 1000
 
-const BUSINESS_MONTHLY_AIC_ENTITLEMENTS = 3000
-const ENTERPRISE_MONTHLY_AIC_ENTITLEMENTS = 7000
+export const BUSINESS_MONTHLY_AIC_ENTITLEMENTS = 3000
+export const ENTERPRISE_MONTHLY_AIC_ENTITLEMENTS = 7000
+
+export type AicEntitlementTier = 'business' | 'enterprise' | null
+
+export function getAicEntitlementTier(totalMonthlyQuota: number): AicEntitlementTier {
+  if (totalMonthlyQuota >= ENTERPRISE_MONTHLY_QUOTA) return 'enterprise'
+  if (totalMonthlyQuota >= BUSINESS_MONTHLY_QUOTA) return 'business'
+  return null
+}
 
 export function getMonthlyAicEntitlements(totalMonthlyQuota: number): number {
-  if (totalMonthlyQuota === ENTERPRISE_MONTHLY_QUOTA) return ENTERPRISE_MONTHLY_AIC_ENTITLEMENTS
-  if (totalMonthlyQuota === BUSINESS_MONTHLY_QUOTA) return BUSINESS_MONTHLY_AIC_ENTITLEMENTS
+  const tier = getAicEntitlementTier(totalMonthlyQuota)
+  if (tier === 'enterprise') return ENTERPRISE_MONTHLY_AIC_ENTITLEMENTS
+  if (tier === 'business') return BUSINESS_MONTHLY_AIC_ENTITLEMENTS
   return 0
 }
 
@@ -60,14 +69,14 @@ export class PooledAicEntitlementAllocator {
       return record
     }
 
-    const coveredQuantity = Math.min(aicQuantity, this.remainingEntitlements)
-    this.remainingEntitlements = Math.max(this.remainingEntitlements - coveredQuantity, 0)
-
     if (aicGrossAmount <= 0) {
       record.aic_net_amount = aicGrossAmount
       return record
     }
 
+    const coveredQuantity = Math.min(aicQuantity, this.remainingEntitlements)
+    this.remainingEntitlements = Math.max(this.remainingEntitlements - coveredQuantity, 0)
+
     const uncoveredRatio = Math.max(aicQuantity - coveredQuantity, 0) / aicQuantity
     record.aic_net_amount = aicGrossAmount * uncoveredRatio
     return record
@@ -76,4 +85,4 @@ export class PooledAicEntitlementAllocator {
   remaining(): number {
     return this.remainingEntitlements
   }
-}
+}

src/views/UsersView.tsx

@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react'
 import type { ChangeEvent } from 'react'
 import type { UserUsage } from '../pipeline/aggregators/userUsageAggregator'
-import { getMonthlyAicEntitlements } from '../pipeline/aicEntitlements'
+import { getAicEntitlementTier, getMonthlyAicEntitlements } from '../pipeline/aicEntitlements'
 import { formatAic } from '../utils/format'
 import { Trie } from '../utils/trie'
 
@@ -28,14 +28,15 @@ export function UsersView({ users, onSelectUser }: UsersViewProps) {
     ]
 
     users.forEach((user) => {
+      const tier = getAicEntitlementTier(user.totalMonthlyQuota)
       const includedAic = getMonthlyAicEntitlements(user.totalMonthlyQuota)
 
-      if (includedAic === 3000) {
+      if (tier === 'business') {
         summary[0].users += 1
         summary[0].includedAic += includedAic
       }
 
-      if (includedAic === 7000) {
+      if (tier === 'enterprise') {
         summary[1].users += 1
         summary[1].includedAic += includedAic
       }