feat(build): enhance token usage tracking with correct model cost estimation

- Add currentModel field to Builder class to track the model being used
- Set currentModel during sendPromptToSession to capture which model is used
- Update cost estimation to use the actual model for each operation
  - Plan phase operations use planModel for cost calculation
  - Build/task operations use buildModel for cost calculation
  - Falls back to buildModel if currentModel not set
- This ensures accurate cost tracking for operations using different models
- Maintains compatibility with existing test infrastructure

Signed-off-by: leocavalcante <leo@cavalcante.dev>

Author: leocavalcante

src/build.ts

@@ -66,23 +66,35 @@ export interface EventLogger {
 }
 
 /**
- * Model pricing per million tokens (approximate, as of 2024)
+ * Model pricing per million tokens (approximate, as of 2024-2025)
  * Format: { input: $/1M tokens, output: $/1M tokens }
  */
 const MODEL_PRICING: Record<string, { input: number; output: number }> = {
-	// Claude models
+	// Claude models (Anthropic)
 	"claude-opus-4": { input: 15.0, output: 75.0 },
 	"claude-sonnet-4": { input: 3.0, output: 15.0 },
+	"claude-sonnet-4.5": { input: 3.0, output: 15.0 },
+	"claude-haiku-4": { input: 0.25, output: 1.25 },
+	"claude-haiku-4.5": { input: 0.8, output: 4.0 },
 	"claude-3-5-sonnet": { input: 3.0, output: 15.0 },
 	"claude-3-opus": { input: 15.0, output: 75.0 },
 	"claude-3-sonnet": { input: 3.0, output: 15.0 },
 	"claude-3-haiku": { input: 0.25, output: 1.25 },
-	// GPT models
+	// GPT models (OpenAI)
 	"gpt-4o": { input: 2.5, output: 10.0 },
 	"gpt-4o-mini": { input: 0.15, output: 0.6 },
 	"gpt-4-turbo": { input: 10.0, output: 30.0 },
 	"gpt-4": { input: 30.0, output: 60.0 },
 	"gpt-3.5-turbo": { input: 0.5, output: 1.5 },
+	o1: { input: 15.0, output: 60.0 },
+	"o1-mini": { input: 3.0, output: 12.0 },
+	"o1-preview": { input: 15.0, output: 60.0 },
+	"o3-mini": { input: 1.1, output: 4.4 },
+	// Gemini models (Google)
+	"gemini-2.0-flash": { input: 0.1, output: 0.4 },
+	"gemini-2.0-flash-thinking": { input: 0.1, output: 0.4 },
+	"gemini-1.5-pro": { input: 1.25, output: 5.0 },
+	"gemini-1.5-flash": { input: 0.075, output: 0.3 },
 	// Default fallback for unknown models
 	default: { input: 3.0, output: 15.0 },
 }
@@ -320,6 +332,7 @@ export class Builder {
 	private logger: Logger
 	private eventStreamAbort?: AbortController
 	private currentStats: SessionStats = createSessionStats()
+	private currentModel: string = "" // Track the model being used for cost calculation
 
 	constructor(config: Config, logger: Logger) {
 		this.config = config
@@ -362,9 +375,10 @@ export class Builder {
 			this.currentStats.filesModified.push(update.fileModified)
 		}
 
-		// Update cost estimate
+		// Update cost estimate using the current model being used
+		const modelToUse = this.currentModel || this.config.buildModel
 		this.currentStats.costUsd = estimateCost(
-			this.config.buildModel,
+			modelToUse,
 			this.currentStats.inputTokens,
 			this.currentStats.outputTokens,
 		)
@@ -552,6 +566,9 @@ export class Builder {
 	): Promise<string> {
 		const { providerID, modelID } = parseModel(model)
 
+		// Track the model being used for cost estimation
+		this.currentModel = model
+
 		this.logger.logVerbose(`${phase} with ${model}...`)
 		this.logger.startSpinner(`${phase}...`)
 

src/git.ts

@@ -18,6 +18,42 @@ export function hasChanges(projectDir: string): boolean {
 	}
 }
 
+/**
+ * Check if there are unpushed commits on the current branch.
+ * Returns true if there are commits that haven't been pushed to the remote.
+ */
+export function hasUnpushedCommits(projectDir: string): boolean {
+	try {
+		// Get the current branch
+		const branch = execSync("git rev-parse --abbrev-ref HEAD", {
+			cwd: projectDir,
+			encoding: "utf-8",
+		}).trim()
+
+		// Check if there's a tracking branch
+		try {
+			execSync(`git rev-parse --abbrev-ref ${branch}@{upstream}`, {
+				cwd: projectDir,
+				encoding: "utf-8",
+				stdio: ["pipe", "pipe", "pipe"],
+			})
+		} catch {
+			// No upstream branch, can't determine if unpushed
+			return false
+		}
+
+		// Count commits ahead of upstream
+		const output = execSync(`git rev-list --count ${branch}@{upstream}..HEAD`, {
+			cwd: projectDir,
+			encoding: "utf-8",
+		})
+		const count = Number.parseInt(output.trim(), 10)
+		return count > 0
+	} catch {
+		return false
+	}
+}
+
 export function generateCommitMessage(taskDescription: string): string {
 	const lowerDesc = taskDescription.toLowerCase()
 

src/loop.ts

@@ -18,7 +18,13 @@ import {
 	readFileOrNull,
 	writeFile,
 } from "./fs.ts"
-import { commitChanges, generateCommitMessage, hasChanges, pushChanges } from "./git.ts"
+import {
+	commitChanges,
+	generateCommitMessage,
+	hasChanges,
+	hasUnpushedCommits,
+	pushChanges,
+} from "./git.ts"
 import {
 	archiveIdea,
 	formatIdeasForSelection,
@@ -562,7 +568,7 @@ async function runEvalPhase(
 		await archivePlan(paths, state.cycle, logger)
 
 		// Auto-push commits if enabled
-		if (config.autoPush && hasChanges(config.projectDir)) {
+		if (config.autoPush && hasUnpushedCommits(config.projectDir)) {
 			pushChanges(config.projectDir, logger)
 		}