fix: address additional PR review feedback

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

Author: asizikov

.github/workflows/pages.yml

@@ -15,7 +15,7 @@ concurrency:
 
 env:
   CI: true
-  NODE_VERSION: '24'
+  NODE_VERSION: '20'
 
 defaults:
   run:
@@ -28,8 +28,6 @@ jobs:
     timeout-minutes: 15
     permissions:
       contents: read
-      pages: write
-      id-token: write
     steps:
       - name: Checkout repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -51,14 +49,39 @@ jobs:
         run: npm run test
 
       - name: Configure GitHub Pages
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+        run: npm run build
+
+  pages-artifact:
+    name: Prepare Pages artifact
+    if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 15
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Set up Node.js
+        uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          cache: 'npm'
+          cache-dependency-path: package-lock.json
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Configure GitHub Pages
         uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5
 
       - name: Build production bundle
         run: npm run build
 
       - name: Upload Pages artifact
-        if: github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
         uses: actions/upload-pages-artifact@56afc609e74202658d3ffba0e8f6dda462b719fa # v3
         with:
           path: dist
@@ -70,7 +93,7 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
-    needs: build
+    needs: pages-artifact
     timeout-minutes: 10
     permissions:
       pages: write

src/App.tsx

@@ -338,7 +338,6 @@ function App() {
                 dailyUsageData={dailyUsageData}
                 rangeStart={rangeStart}
                 rangeEnd={rangeEnd}
-                pooledAicCredits={pooledAicCredits}
               />
             ) : activeView === 'models' ? (
               modelUsage && modelUsage.models.length > 0 ? (

src/components/UploadPage.tsx

@@ -33,7 +33,7 @@ export function UploadPage({
         </svg>
         <h1 className="upload-screen__title">Copilot Billing Preview</h1>
         <p className="upload-screen__subtitle">
-          GitHub is moving to <strong>AI Credit based billing</strong> for Copilot. Starting May 2026, usage
+          GitHub is moving to <strong>AI Credits-based billing</strong> for Copilot. Starting May 2026, usage
           will be measured in AI Credits (AICs) instead of Premium Requests (PRUs). This tool helps you
           understand how the change will impact your bill.
         </p>

src/views/CostCentersView.tsx

@@ -19,7 +19,7 @@ type CostCenterRow = {
 function getTopRows(entries: [string, CostTotals | CostCenterUserTotals][]): CostCenterRow[] {
   return entries
     .map(([label, totals]) => ({ label, totals }))
-    .sort((a, b) => b.totals.netAmount - a.totals.netAmount)
+    .sort((a, b) => Math.max(b.totals.netAmount, b.totals.aicNetAmount) - Math.max(a.totals.netAmount, a.totals.aicNetAmount))
     .slice(0, MAX_DETAIL_ROWS)
 }
 
@@ -98,16 +98,16 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult;
               {savings > 0 ? (
                 <>
                   <strong>{selectedCostCenterName}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}
-                  <strong>{formatUsd(savings)} less</strong> under AI Credit based billing
+                  <strong>{formatUsd(savings)} less</strong> under AI Credits-based billing
                 </>
               ) : savings < 0 ? (
                 <>
                   <strong>{selectedCostCenterName}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}
-                  <strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credit based billing
+                  <strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credits-based billing
                 </>
               ) : (
                 <>
-                  <strong>{selectedCostCenterName}</strong>'s <strong>{periodLabel}</strong> usage cost would be the same under AI Credit based billing
+                  <strong>{selectedCostCenterName}</strong>'s <strong>{periodLabel}</strong> usage cost would be the same under AI Credits-based billing
                 </>
               )}
             </p>
@@ -135,7 +135,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult;
               </div>
             </div>
             <div className="card comparison-card">
-              <div className="comparison-card__label">AI Credit based billing (AICs)</div>
+              <div className="comparison-card__label">AI Credits-based billing (AICs)</div>
               <div className="comparison-card__big-number comparison-card__big-number--aic">{formatUsd(totals.aicNetAmount)}</div>
               <div className="comparison-card__period">{formatAic(totals.aicQuantity)} AICs</div>
               <div className="comparison-card__rate">1 AIC = $0.01</div>
@@ -162,7 +162,7 @@ export function CostCentersView({ data, rangeStart }: { data: CostCenterResult;
         <div className="entitlement-banner__body">
           <strong className="entitlement-banner__title">Pooled entitlements are coming</strong>
           <p className="entitlement-banner__text">
-            Under AI Credit based billing, entitlements will be pooled across all licensed users in your organization. No more unused capacity going to waste from idle users.
+            Under AI Credits-based billing, entitlements will be pooled across all licensed users in your organization. No more unused capacity going to waste from idle users.
           </p>
         </div>
         <a

src/views/FaqView.tsx

@@ -3,7 +3,7 @@ const FAQ_ITEMS: { question: string; answer: string }[] = [
     question:
       'Why do I see two rows with one Premium Request to the same model that cost different amounts of AI Credits?',
     answer:
-      'Not every request is the same. Saying "Hi" or "Thank you" to Claude Opus 4.6 costs 3 PRUs but consumes very few tokens (AI Credits) — that\'s a waste. At the same time, a complex and detailed plan implementation can run for a long time and consume a lot of AI Credits. AI Credit based billing reflects the actual work done, so short trivial exchanges become cheaper while long, intensive tasks are billed by what they truly consume.',
+      'Not every request is the same. Saying "Hi" or "Thank you" to Claude Opus 4.6 costs 3 PRUs but consumes very few tokens (AI Credits) — that\'s a waste. At the same time, a complex and detailed plan implementation can run for a long time and consume a lot of AI Credits. AI Credits-based billing reflects the actual work done, so short trivial exchanges become cheaper while long, intensive tasks are billed by what they truly consume.',
   },
 ]
 

src/views/ModelsView.tsx

@@ -97,11 +97,11 @@ export function ModelsView({ modelUsage, aicDiscountRate, rangeStart, rangeEnd }
             {periodLabel && (
               <p className="comparison-framing">
                 {savings > 0 ? (
-                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}<strong>{formatUsd(savings)} less</strong> under AI Credit based billing</>
+                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}<strong>{formatUsd(savings)} less</strong> under AI Credits-based billing</>
                 ) : savings < 0 ? (
-                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}<strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credit based billing</>
+                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage would cost{' '}<strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credits-based billing</>
                 ) : (
-                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage cost would be the same under AI Credit based billing</>
+                  <><strong>{selectedModel}</strong>'s <strong>{periodLabel}</strong> usage cost would be the same under AI Credits-based billing</>
                 )}
               </p>
             )}
@@ -128,7 +128,7 @@ export function ModelsView({ modelUsage, aicDiscountRate, rangeStart, rangeEnd }
                 </div>
               </div>
               <div className="card comparison-card">
-                <div className="comparison-card__label">AI Credit based billing (AICs)</div>
+                <div className="comparison-card__label">AI Credits-based billing (AICs)</div>
                 <div className="comparison-card__big-number comparison-card__big-number--aic">{formatUsd(selectedModelAicNetAmount)}</div>
                 <div className="comparison-card__period">{formatAic(selectedModelTotals.aicQuantity)} AICs</div>
                 <div className="comparison-card__rate">1 AIC = $0.01</div>

src/views/OverviewView.tsx

@@ -2,15 +2,13 @@ import { DualAxisLineChart } from '../components'
 import type { DailyUsageData } from '../pipeline/aggregators/dailyUsageAggregator'
 import { fillDataForRange } from '../utils/fillDataForRange'
 import { formatAic, formatUsd } from '../utils/format'
-import { calculateOverviewAicDiscountRate } from '../utils/overviewBilling'
 
 type OverviewViewProps = {
   error: string | null
   fileName: string | null
   dailyUsageData: DailyUsageData[]
   rangeStart: string | null
   rangeEnd: string | null
-  pooledAicCredits: number
 }
 
 function createEmptyDailyUsage(date: string): DailyUsageData {
@@ -32,7 +30,6 @@ export function OverviewView({
   dailyUsageData,
   rangeStart,
   rangeEnd,
-  pooledAicCredits,
 }: OverviewViewProps) {
   const filledDailyUsageData = fillDataForRange(dailyUsageData, rangeStart, rangeEnd, createEmptyDailyUsage)
 
@@ -42,16 +39,16 @@ export function OverviewView({
       totals.aicQuantity += day.aicQuantity
       totals.grossAmount += day.grossAmount
       totals.aicGrossAmount += day.aicGrossAmount
+      totals.aicNetAmount += day.aicNetAmount
       totals.discountAmount += day.discountAmount
       totals.netAmount += day.netAmount
       return totals
     },
     { requests: 0, aicQuantity: 0, grossAmount: 0, aicGrossAmount: 0, aicNetAmount: 0, discountAmount: 0, netAmount: 0 },
   )
 
-  const aicDiscountRate = calculateOverviewAicDiscountRate(dailyUsageData, pooledAicCredits)
-  const aicDiscount = aicDiscountRate * overviewTotals.aicGrossAmount
-  const aicNetAmount = Math.max(overviewTotals.aicGrossAmount - aicDiscount, 0)
+  const aicNetAmount = overviewTotals.aicNetAmount
+  const aicDiscount = Math.max(overviewTotals.aicGrossAmount - aicNetAmount, 0)
   const periodLabel = rangeStart
     ? new Date(rangeStart + 'T00:00:00').toLocaleString('en-US', { month: 'long', year: 'numeric' })
     : null
@@ -70,13 +67,13 @@ export function OverviewView({
       {dailyUsageData.length > 0 && (
         <section>
           <div className="context-banner">
-            <h2 className="context-banner__title">GitHub Copilot is moving to AI Credit based billing</h2>
+            <h2 className="context-banner__title">GitHub Copilot is moving to AI Credits-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="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">
-                Note: This is a preview estimate based on your uploaded report ({fileName}). Actual bills under AI Credit based billing may differ based on model mix and final pricing.
+                Note: This is a preview estimate based on your uploaded report ({fileName}). Actual bills under AI Credits-based billing may differ based on model mix and final pricing.
               </p>
             )}
             <a
@@ -85,7 +82,7 @@ export function OverviewView({
               target="_blank"
               rel="noopener noreferrer"
             >
-              Learn more about AI Credit based billing &rarr;
+              Learn more about AI Credits-based billing &rarr;
             </a>
           </div>
 
@@ -94,16 +91,16 @@ export function OverviewView({
               {savings > 0 ? (
                 <>
                   Your <strong>{periodLabel}</strong> usage would cost{' '}
-                  <strong>{formatUsd(savings)} less</strong> under AI Credit based billing
+                  <strong>{formatUsd(savings)} less</strong> under AI Credits-based billing
                 </>
               ) : savings < 0 ? (
                 <>
                   Your <strong>{periodLabel}</strong> usage would cost{' '}
-                  <strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credit based billing
+                  <strong>{formatUsd(Math.abs(savings))} more</strong> under AI Credits-based billing
                 </>
               ) : (
                 <>
-                  Your <strong>{periodLabel}</strong> usage cost would be the same under AI Credit based billing
+                  Your <strong>{periodLabel}</strong> usage cost would be the same under AI Credits-based billing
                 </>
               )}
             </p>
@@ -131,7 +128,7 @@ export function OverviewView({
               </div>
             </div>
             <div className="card comparison-card">
-              <div className="comparison-card__label">AI Credit based billing (AICs)</div>
+              <div className="comparison-card__label">AI Credits-based billing (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>
@@ -198,7 +195,7 @@ export function OverviewView({
             <div className="entitlement-banner__body">
               <strong className="entitlement-banner__title">Pooled entitlements are coming</strong>
               <p className="entitlement-banner__text">
-                Under AI Credit based billing, entitlements will be pooled across all licensed users in your organization. No more unused capacity going to waste from idle users.
+                Under AI Credits-based billing, entitlements will be pooled across all licensed users in your organization. No more unused capacity going to waste from idle users.
               </p>
             </div>
             <a
@@ -231,7 +228,7 @@ export function OverviewView({
               </div>
               <div className="next-steps__card">
                 <h3 className="next-steps__card-title">Read the docs</h3>
-                <p className="next-steps__card-body">Learn how AI Credit based billing works and how to plan for the transition.</p>
+                <p className="next-steps__card-body">Learn how AI Credits-based billing works and how to plan for the transition.</p>
                 <a href="https://docs.github.com/billing" className="next-steps__cta" target="_blank" rel="noopener noreferrer">View documentation &rarr;</a>
               </div>
             </div>

src/views/ReportGuideView.tsx

@@ -62,7 +62,7 @@ const SAMPLE_ROW_2_ANNOTATIONS: { index: number; label: string; note: string }[]
   {
     index: 4,
     label: 'model',
-    note: '"GPT-4.1" — a Base Model with a 0× PRU Multiplier. Requests to Base Models were not included in billing reports before AI Credit based billing, but now appear because every model consumes AI Credits (AICs).',
+    note: '"GPT-4.1" — a Base Model with a 0× PRU Multiplier. Requests to Base Models were not included in billing reports before AI Credits-based billing, but now appear because every model consumes AI Credits (AICs).',
   },
   {
     index: 5,
@@ -88,12 +88,12 @@ const SAMPLE_ROW_2_ANNOTATIONS: { index: number; label: string; note: string }[]
   {
     index: 15,
     label: 'aic_quantity',
-    note: '≈ 24.9 AICs consumed. Under AI Credit based billing, even Base Models consume AI Credits proportional to actual token usage.',
+    note: '≈ 24.9 AICs consumed. Under AI Credits-based billing, even Base Models consume AI Credits proportional to actual token usage.',
   },
   {
     index: 16,
     label: 'aic_gross_amount',
-    note: '≈ $0.249 (24.9 AICs × $0.01). This is what the same usage would cost under AI Credit based billing.',
+    note: '≈ $0.249 (24.9 AICs × $0.01). This is what the same usage would cost under AI Credits-based billing.',
   },
 ]
 
@@ -136,12 +136,12 @@ const SAMPLE_ROW_1_ANNOTATIONS: { index: number; label: string; note: string }[]
   {
     index: 15,
     label: 'aic_quantity',
-    note: '≈ 3.107 AICs — the AI Credit based billing equivalent of this request. AICs represent the actual tokens consumed.',
+    note: '≈ 3.107 AICs — the AI Credits-based billing equivalent of this request. AICs represent the actual tokens consumed.',
   },
   {
     index: 16,
     label: 'aic_gross_amount',
-    note: '≈ $0.031 (3.107 AICs × $0.01). Under AI Credit based billing this request would cost roughly $0.03.',
+    note: '≈ $0.031 (3.107 AICs × $0.01). Under AI Credits-based billing this request would cost roughly $0.03.',
   },
 ]
 
@@ -202,7 +202,7 @@ export function ReportGuideView() {
           <strong>Claude Haiku 4.5</strong> in <strong>Auto</strong> mode. Auto-mode selection applies a 10% PRU
           discount, so 0.9 PRUs were billed at $0.04 each — a gross PRU cost of <strong>$0.036</strong>. The user's
           1,000 PRU/month entitlement covers this in full, so the net PRU charge is <strong>$0.00</strong>. Under
-          AI Credit based billing, the same request would cost approximately <strong>$0.031</strong> (≈ 3.1 AICs at $0.01
+          AI Credits-based billing, the same request would cost approximately <strong>$0.031</strong> (≈ 3.1 AICs at $0.01
           each).
         </p>
 
@@ -215,7 +215,7 @@ export function ReportGuideView() {
           On <strong>11 March 2026</strong>, user <strong>mona</strong> made <strong>≈ 25 requests</strong> to{' '}
           <strong>GPT-4.1</strong>, a Base Model. Because Base Models carry a <strong>0× PRU Multiplier</strong>, the
           gross PRU cost is <strong>$0.00</strong> and this usage would not have appeared in the billing report under
-          the old model. Under AI Credit based billing, however, the same usage consumed <strong>≈ 24.9 AICs</strong> at
+          the old model. Under AI Credits-based billing, however, the same usage consumed <strong>≈ 24.9 AICs</strong> at
           $0.01 each, producing an AI Credit based cost of approximately <strong>$0.249</strong>.
         </p>