Merge branch 'main' into dependabot/npm_and_yarn/npm-dependencies-5e687ba2ad

Author: rajbos

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: "20"
           cache: 'npm'

.github/workflows/deploy-to-pages.yml

@@ -38,7 +38,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: "20"
           cache: 'npm'
@@ -69,7 +69,7 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v5
 
       - name: Smoke Test - Check CSV Upload Button
         run: |

.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v6
         with:
           node-version: '22.x'
           registry-url: 'https://registry.npmjs.org'
@@ -34,7 +34,7 @@ jobs:
           token: ${{ secrets.RELEASE_GITHUB_PAT }}
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v6
         with:
           go-version: '1.21'
 
@@ -46,7 +46,7 @@ jobs:
           ./build/build-release.sh
           
       - name: Create Release and Upload Assets
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: ./spark-sdk-dist.zip
         env:

.github/workflows/tag-rajbos.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Tag rajbos on new issue or PR
-        uses: devops-actions/issue-comment-tag@v0.1.8
+        uses: devops-actions/issue-comment-tag@v0.1.10
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           team: rajbos

src/lib/utils.ts

@@ -251,7 +251,12 @@ export function getModelUsageSummary(data: CopilotUsageData[]): ModelUsageSummar
     }
 
     // Calculate excess cost
-    groupedSummary[key].excessCost = groupedSummary[key].exceedingRequests * groupedSummary[key].multiplier * EXCESS_REQUEST_COST;
+    // Free models (multiplier = 0) have no excess cost
+    if (groupedSummary[key].multiplier === 0) {
+      groupedSummary[key].excessCost = 0;
+    } else {
+      groupedSummary[key].excessCost = groupedSummary[key].exceedingRequests * EXCESS_REQUEST_COST;
+    }
   });
 
   // Convert to array and sort by total requests (descending)
@@ -396,7 +401,7 @@ export const MODEL_MULTIPLIERS: Record<string, number> = {
 };
 
 // Default models that should be grouped
-export const DEFAULT_MODELS = ['GPT-4o', 'GPT-4.1', 'gpt-4o-2024-11-20', 'gpt-4.1-2025-04-14'];
+export const DEFAULT_MODELS = ['GPT-4o', 'GPT-4.1', 'GPT-5 mini', 'gpt-4o-2024-11-20', 'gpt-4.1-2025-04-14'];
 
 function normalizeModelName(model: string): string {
   return model.replace(/^Auto:\s*/, '').trim();
@@ -952,13 +957,13 @@ export function getExpectedExcessCost(data: CopilotUsageData[], plan: string = C
 
     const numDays = datesForAverage.length;
 
-    // Project extra requests per model over remaining days and apply cost multiplier
+    // Project extra requests per model over remaining days
     Object.entries(modelTotals).forEach(([model, total]) => {
       const multiplier = getModelMultiplier(model);
       if (multiplier === 0) return; // Free models have no cost
       const dailyAvg = total / numDays;
       const projectedExtra = dailyAvg * remainingDays;
-      totalExpectedCost += projectedExtra * multiplier * EXCESS_REQUEST_COST;
+      totalExpectedCost += projectedExtra * EXCESS_REQUEST_COST;
     });
   });
 

src/test/model-info-limits.test.ts

@@ -98,14 +98,15 @@ describe('Model Info and Limits Feature', () => {
     expect(defaultGroup).toBeDefined();
 
     if (defaultGroup) {
-      // 50 exceeding requests * 0x multiplier * $0.04 = $0.00
-      expect(defaultGroup.excessCost).toBe(50 * 0 * EXCESS_REQUEST_COST);
+      // Default models are free (multiplier = 0), so excess cost is always $0.00
+      // even if there are exceeding requests
+      expect(defaultGroup.excessCost).toBe(0);
     }
-    
+
     const o3Model = result.find(item => item.model === 'o3-mini-2025-01-31');
     if (o3Model) {
-      // 10 exceeding requests * 0.33x multiplier * $0.04 = $0.132
-      expect(o3Model.excessCost).toBe(10 * 0.33 * EXCESS_REQUEST_COST);
+      // 10 exceeding requests * $0.04 = $0.40
+      expect(o3Model.excessCost).toBe(10 * EXCESS_REQUEST_COST);
     }
   });