Merge pull request #685 from rajbos/rajbos/new-copilot-pricing-model

Add GitHub Copilot AI-Credit pricing alongside provider pricing

Author: rajbos

cli/src/commands/usage.ts

@@ -107,7 +107,10 @@ function printPeriodStats(
 	console.log(`  Avg tokens/session:    ${chalk.bold(formatTokens(stats.avgTokensPerSession))}`);
 
 	if (options.cost && stats.estimatedCost > 0) {
-		console.log(`  Estimated cost:        ${chalk.green('$' + stats.estimatedCost.toFixed(4))}`);
+		console.log(`  Estimated cost (est.): ${chalk.green('$' + stats.estimatedCost.toFixed(4))}  ${chalk.dim('(provider API rates)')}`);
+		if ((stats.estimatedCostCopilot ?? 0) > 0) {
+			console.log(`  Estimated cost (TBB):  ${chalk.green('$' + (stats.estimatedCostCopilot ?? 0).toFixed(4))}  ${chalk.dim('(Copilot AI Credits)')}`);
+		}
 	}
 
 	// Model breakdown

cli/src/helpers.ts

@@ -437,6 +437,7 @@ export async function calculateDetailedStats(
 		period.treesEquivalent = period.co2 / CO2_ABSORPTION_PER_TREE_PER_YEAR;
 		period.waterUsage = (period.tokens / 1000) * WATER_USAGE_PER_1K_TOKENS;
 		period.estimatedCost = calculateEstimatedCost(period.modelUsage, modelPricing);
+		period.estimatedCostCopilot = calculateEstimatedCost(period.modelUsage, modelPricing, 'copilot');
 	}
 
 	return {

vscode-extension/src/README.md

@@ -46,12 +46,45 @@ Contains pricing information for AI models, including input and output token cos
       "cacheCreationCostPerMillion": 2.1875,
       "category": "Model category",
       "tier": "standard|premium|unknown",
-      "multiplier": 1
+      "multiplier": 1,
+      "copilotPricing": {
+        "inputCostPerMillion": 1.75,
+        "cachedInputCostPerMillion": 0.175,
+        "cacheCreationCostPerMillion": 2.1875,
+        "outputCostPerMillion": 14.0,
+        "releaseStatus": "GA",
+        "category": "Versatile"
+      }
     }
   }
 }
 ```
 
+**Provider vs. GitHub Copilot pricing**
+
+The top-level `inputCostPerMillion` / `outputCostPerMillion` / cache fields
+represent the **direct provider/API price** (OpenAI, Anthropic, Google, xAI, …).
+The optional `copilotPricing` block represents **GitHub Copilot's published
+per-token AI Credit rates**
+(<https://docs.github.com/en/copilot/reference/copilot-billing/models-and-pricing>,
+1 AI credit = $0.01). Both are computed in parallel by `calculateEstimatedCost`:
+
+```ts
+calculateEstimatedCost(usage, pricing);             // provider/API cost (default)
+calculateEstimatedCost(usage, pricing, 'copilot');  // GitHub Copilot AI-Credit cost
+```
+
+When a model has no `copilotPricing` block the `'copilot'` source falls back to
+the provider rates as a proxy — this means the Copilot cost is never
+*under-reported* due to a missing entry, it just won't reflect the (often
+identical) GitHub-published rate explicitly.
+
+> ℹ️ **Caching note.** Copilot Chat session logs do not (yet) expose a
+> cached-read / cache-creation token breakdown, so the Copilot cost falls back
+> to the full input rate for those sources. Adapters that *do* surface cache
+> tokens (Claude Desktop, Claude Code, OpenCode) automatically benefit from the
+> reduced cached-input rates in `copilotPricing`.
+
 **Cache pricing fields (optional):**
 
 | Field | Description |

vscode-extension/src/extension.ts

@@ -1332,7 +1332,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 			tooltip.appendMarkdown(`📅 Today  \n`);
 			tooltip.appendMarkdown(`|                 |  |\n|-----------------------|-------|\n`);
 			tooltip.appendMarkdown(`| Tokens :                | ${detailedStats.today.tokens.toLocaleString()} |\n`);
-			tooltip.appendMarkdown(`| Estimated cost :             | $ ${detailedStats.today.estimatedCost.toFixed(4)} |\n`);
+			tooltip.appendMarkdown(`| Estimated cost (est.) :      | $ ${detailedStats.today.estimatedCost.toFixed(2)} |\n`);
+			tooltip.appendMarkdown(`| Estimated cost (TBB) :       | $ ${(detailedStats.today.estimatedCostCopilot ?? 0).toFixed(2)} |\n`);
 			tooltip.appendMarkdown(`| CO₂ estimated :              | ${detailedStats.today.co2.toFixed(2)} grams |\n`);
 			tooltip.appendMarkdown(`| Water estimated :           | ${detailedStats.today.waterUsage.toFixed(3)} liters |\n`);
 			tooltip.appendMarkdown(`| Sessions :             | ${detailedStats.today.sessions} |\n`);
@@ -1345,7 +1346,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 			tooltip.appendMarkdown(`📊 Last 30 Days  \n`);
 			tooltip.appendMarkdown(`|                 |  |\n|-----------------------|-------|\n`);
 			tooltip.appendMarkdown(`| Tokens :                | ${detailedStats.last30Days.tokens.toLocaleString()} |\n`);
-			tooltip.appendMarkdown(`| Estimated cost :             | $ ${detailedStats.last30Days.estimatedCost.toFixed(4)} |\n`);
+			tooltip.appendMarkdown(`| Estimated cost (est.) :      | $ ${detailedStats.last30Days.estimatedCost.toFixed(2)} |\n`);
+			tooltip.appendMarkdown(`| Estimated cost (TBB) :       | $ ${(detailedStats.last30Days.estimatedCostCopilot ?? 0).toFixed(2)} |\n`);
 			tooltip.appendMarkdown(`| CO₂ estimated :              | ${detailedStats.last30Days.co2.toFixed(2)} grams |\n`);
 			tooltip.appendMarkdown(`| Water estimated :           | ${detailedStats.last30Days.waterUsage.toFixed(3)} liters |\n`);
 			tooltip.appendMarkdown(`| Sessions :             | ${detailedStats.last30Days.sessions} |\n`);
@@ -1354,6 +1356,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 			// Footer
 			tooltip.appendMarkdown('\n---\n');
 			tooltip.appendMarkdown('*Cost estimates based on actual input/output token ratios.*  \n');
+			tooltip.appendMarkdown('*(est.) = provider API market rates, for reference only.*  \n');
+			tooltip.appendMarkdown('*(TBB) = Copilot AI Credit rates — what Copilot will bill you.*  \n');
 			tooltip.appendMarkdown('*Updates automatically every 5 minutes.*');
 
 			this.statusBarItem.tooltip = tooltip;
@@ -1811,6 +1815,11 @@ class CopilotTokenTracker implements vscode.Disposable {
 		const lastMonthCost = this.calculateEstimatedCost(lastMonthStats.modelUsage);
 		const last30DaysCost = this.calculateEstimatedCost(last30DaysStats.modelUsage);
 
+		const todayCostCopilot = this.calculateEstimatedCost(todayStats.modelUsage, 'copilot');
+		const monthCostCopilot = this.calculateEstimatedCost(monthStats.modelUsage, 'copilot');
+		const lastMonthCostCopilot = this.calculateEstimatedCost(lastMonthStats.modelUsage, 'copilot');
+		const last30DaysCostCopilot = this.calculateEstimatedCost(last30DaysStats.modelUsage, 'copilot');
+
 		const result: DetailedStats = {
 			today: {
 				tokens: todayStats.tokens,
@@ -1825,7 +1834,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 				co2: todayCo2,
 				treesEquivalent: todayCo2 / this.co2AbsorptionPerTreePerYear,
 				waterUsage: todayWater,
-				estimatedCost: todayCost
+				estimatedCost: todayCost,
+				estimatedCostCopilot: todayCostCopilot
 			},
 			month: {
 				tokens: monthStats.tokens,
@@ -1840,7 +1850,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 				co2: monthCo2,
 				treesEquivalent: monthCo2 / this.co2AbsorptionPerTreePerYear,
 				waterUsage: monthWater,
-				estimatedCost: monthCost
+				estimatedCost: monthCost,
+				estimatedCostCopilot: monthCostCopilot
 			},
 			lastMonth: {
 				tokens: lastMonthStats.tokens,
@@ -1855,7 +1866,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 				co2: lastMonthCo2,
 				treesEquivalent: lastMonthCo2 / this.co2AbsorptionPerTreePerYear,
 				waterUsage: lastMonthWater,
-				estimatedCost: lastMonthCost
+				estimatedCost: lastMonthCost,
+				estimatedCostCopilot: lastMonthCostCopilot
 			},
 			last30Days: {
 				tokens: last30DaysStats.tokens,
@@ -1870,7 +1882,8 @@ class CopilotTokenTracker implements vscode.Disposable {
 				co2: last30DaysCo2,
 				treesEquivalent: last30DaysCo2 / this.co2AbsorptionPerTreePerYear,
 				waterUsage: last30DaysWater,
-				estimatedCost: last30DaysCost
+				estimatedCost: last30DaysCost,
+				estimatedCostCopilot: last30DaysCostCopilot
 			},
 			lastUpdated: now
 		};
@@ -3825,8 +3838,8 @@ usageAnalysis: undefined
 		return { responseText, thinkingText, toolCalls, mcpTools };
 	}
 
-	public calculateEstimatedCost(modelUsage: ModelUsage): number {
-		return _calculateEstimatedCost(modelUsage, this.modelPricing);
+	public calculateEstimatedCost(modelUsage: ModelUsage, pricingSource: 'provider' | 'copilot' = 'provider'): number {
+		return _calculateEstimatedCost(modelUsage, this.modelPricing, pricingSource);
 	}