resolved merge conflicts

This commit is contained in:
Raza Rauf
2026-02-04 03:27:32 +05:00
parent 234d13ac08
commit d4d94471f0
2 changed files with 1 additions and 6 deletions

View File

@@ -2,11 +2,11 @@
* Tests for context usage estimation utilities
*/
import { describe, it, expect } from 'vitest';
import {
estimateContextUsage,
calculateContextTokens,
estimateAccumulatedGrowth,
estimateAccumulatedGrowth,
DEFAULT_CONTEXT_WINDOWS,
} from '../../../renderer/utils/contextUsage';
import type { UsageStats } from '../../../shared/types';

View File

@@ -69,9 +69,6 @@ export function calculateContextTokens(
return (
(stats.inputTokens || 0) + (stats.cacheCreationInputTokens || 0) + (stats.outputTokens || 0)
);
return (
(stats.inputTokens || 0) + (stats.cacheCreationInputTokens || 0) + (stats.outputTokens || 0)
);
}
// Claude models: total input = uncached + cache-hit + newly-cached
@@ -79,8 +76,6 @@ export function calculateContextTokens(
return (
(stats.inputTokens || 0) +
(stats.cacheReadInputTokens || 0) +
(stats.cacheCreationInputTokens || 0)(stats.inputTokens || 0) +
(stats.cacheReadInputTokens || 0) +
(stats.cacheCreationInputTokens || 0)
);
}