@google/gemini-cli-core 0.67.0 → 0.69.0-nightly.20261105.g1fe22af5f
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -24
- package/dist/docs/changelogs/index.md +24 -0
- package/dist/docs/changelogs/latest.md +83 -90
- package/dist/docs/changelogs/preview.md +89 -87
- package/dist/docs/cli/sandbox.md +8 -2
- package/dist/docs/cli/themes.md +6 -3
- package/dist/docs/extensions/releasing.md +32 -0
- package/dist/docs/reference/commands.md +4 -0
- package/dist/docs/reference/configuration.md +2 -10
- package/dist/google-gemini-cli-core-0.69.0-nightly.20261104.g89e9d25d6.tgz +0 -0
- package/dist/src/availability/autoRoutingFallback.integration.test.js +95 -2
- package/dist/src/availability/autoRoutingFallback.integration.test.js.map +1 -1
- package/dist/src/availability/errorClassification.d.ts +2 -0
- package/dist/src/availability/errorClassification.js +8 -0
- package/dist/src/availability/errorClassification.js.map +1 -1
- package/dist/src/availability/errorClassification.test.d.ts +6 -0
- package/dist/src/availability/errorClassification.test.js +56 -0
- package/dist/src/availability/errorClassification.test.js.map +1 -0
- package/dist/src/availability/policyHelpers.test.js +8 -1
- package/dist/src/availability/policyHelpers.test.js.map +1 -1
- package/dist/src/code_assist/oauth2.test.js +4 -1
- package/dist/src/code_assist/oauth2.test.js.map +1 -1
- package/dist/src/code_assist/server.js +24 -15
- package/dist/src/code_assist/server.js.map +1 -1
- package/dist/src/code_assist/server.test.js +165 -0
- package/dist/src/code_assist/server.test.js.map +1 -1
- package/dist/src/config/config.js +1 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +4 -1
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/defaultModelConfigs.js +1 -7
- package/dist/src/config/defaultModelConfigs.js.map +1 -1
- package/dist/src/config/models.d.ts +2 -1
- package/dist/src/config/models.js +20 -7
- package/dist/src/config/models.js.map +1 -1
- package/dist/src/config/models.test.js +43 -1
- package/dist/src/config/models.test.js.map +1 -1
- package/dist/src/core/baseLlmClient.js +15 -0
- package/dist/src/core/baseLlmClient.js.map +1 -1
- package/dist/src/core/baseLlmClient.test.js +37 -0
- package/dist/src/core/baseLlmClient.test.js.map +1 -1
- package/dist/src/core/client.js +26 -1
- package/dist/src/core/client.js.map +1 -1
- package/dist/src/core/client.test.js +8 -3
- package/dist/src/core/client.test.js.map +1 -1
- package/dist/src/core/geminiChat.js +29 -4
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +80 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/fallback/handler.js +13 -5
- package/dist/src/fallback/handler.js.map +1 -1
- package/dist/src/fallback/handler.test.js +30 -2
- package/dist/src/fallback/handler.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/generated/git-commit.js.map +1 -1
- package/dist/src/ide/process-utils.integration.test.d.ts +6 -0
- package/dist/src/ide/process-utils.integration.test.js +276 -0
- package/dist/src/ide/process-utils.integration.test.js.map +1 -0
- package/dist/src/ide/process-utils.js +69 -20
- package/dist/src/ide/process-utils.js.map +1 -1
- package/dist/src/ide/process-utils.test.js +161 -18
- package/dist/src/ide/process-utils.test.js.map +1 -1
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +1 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/prompts/utils.js +4 -4
- package/dist/src/prompts/utils.js.map +1 -1
- package/dist/src/prompts/utils.test.js +22 -0
- package/dist/src/prompts/utils.test.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js +1 -1
- package/dist/src/routing/strategies/defaultStrategy.js.map +1 -1
- package/dist/src/routing/strategies/defaultStrategy.test.js +14 -0
- package/dist/src/routing/strategies/defaultStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.js +3 -2
- package/dist/src/routing/strategies/fallbackStrategy.js.map +1 -1
- package/dist/src/routing/strategies/fallbackStrategy.test.js +32 -0
- package/dist/src/routing/strategies/fallbackStrategy.test.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js +1 -1
- package/dist/src/routing/strategies/overrideStrategy.js.map +1 -1
- package/dist/src/routing/strategies/overrideStrategy.test.js +11 -0
- package/dist/src/routing/strategies/overrideStrategy.test.js.map +1 -1
- package/dist/src/services/executionLifecycleService.d.ts +7 -1
- package/dist/src/services/executionLifecycleService.js +9 -2
- package/dist/src/services/executionLifecycleService.js.map +1 -1
- package/dist/src/services/executionLifecycleService.test.js +27 -0
- package/dist/src/services/executionLifecycleService.test.js.map +1 -1
- package/dist/src/services/gitService.js +136 -2
- package/dist/src/services/gitService.js.map +1 -1
- package/dist/src/services/gitService.test.js +208 -3
- package/dist/src/services/gitService.test.js.map +1 -1
- package/dist/src/services/modelConfigService.test.js +23 -0
- package/dist/src/services/modelConfigService.test.js.map +1 -1
- package/dist/src/services/sessionSummaryService.js +5 -2
- package/dist/src/services/sessionSummaryService.js.map +1 -1
- package/dist/src/services/sessionSummaryService.test.js +18 -0
- package/dist/src/services/sessionSummaryService.test.js.map +1 -1
- package/dist/src/services/shellExecutionService.d.ts +2 -1
- package/dist/src/services/shellExecutionService.js +15 -5
- package/dist/src/services/shellExecutionService.js.map +1 -1
- package/dist/src/services/shellExecutionService.test.js +22 -2
- package/dist/src/services/shellExecutionService.test.js.map +1 -1
- package/dist/src/services/usageAggregator.d.ts +61 -0
- package/dist/src/services/usageAggregator.js +379 -0
- package/dist/src/services/usageAggregator.js.map +1 -0
- package/dist/src/services/usageAggregator.test.d.ts +6 -0
- package/dist/src/services/usageAggregator.test.js +257 -0
- package/dist/src/services/usageAggregator.test.js.map +1 -0
- package/dist/src/tools/ask-user.js +2 -1
- package/dist/src/tools/ask-user.js.map +1 -1
- package/dist/src/tools/ask-user.test.js +28 -0
- package/dist/src/tools/ask-user.test.js.map +1 -1
- package/dist/src/tools/glob.js +19 -4
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +91 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/mcp-client.test.js +48 -0
- package/dist/src/tools/mcp-client.test.js.map +1 -1
- package/dist/src/tools/shellBackgroundTools.test.js +4 -0
- package/dist/src/tools/shellBackgroundTools.test.js.map +1 -1
- package/dist/src/tools/write-file.js +1 -1
- package/dist/src/tools/write-file.js.map +1 -1
- package/dist/src/tools/write-file.test.js +18 -0
- package/dist/src/tools/write-file.test.js.map +1 -1
- package/dist/src/utils/editCorrector.js +12 -12
- package/dist/src/utils/editCorrector.js.map +1 -1
- package/dist/src/utils/editCorrector.test.js +16 -0
- package/dist/src/utils/editCorrector.test.js.map +1 -1
- package/dist/src/utils/envExpansion.js +9 -4
- package/dist/src/utils/envExpansion.js.map +1 -1
- package/dist/src/utils/envExpansion.test.js +58 -0
- package/dist/src/utils/envExpansion.test.js.map +1 -1
- package/dist/src/utils/events.d.ts +1 -0
- package/dist/src/utils/events.js.map +1 -1
- package/dist/src/utils/fileUtils.js +39 -19
- package/dist/src/utils/fileUtils.js.map +1 -1
- package/dist/src/utils/fileUtils.test.js +284 -0
- package/dist/src/utils/fileUtils.test.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.js +36 -5
- package/dist/src/utils/filesearch/fileSearch.js.map +1 -1
- package/dist/src/utils/filesearch/fileSearch.test.js +146 -0
- package/dist/src/utils/filesearch/fileSearch.test.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.js +3 -2
- package/dist/src/utils/ignorePathUtils.js.map +1 -1
- package/dist/src/utils/ignorePathUtils.test.js +20 -1
- package/dist/src/utils/ignorePathUtils.test.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.js +13 -10
- package/dist/src/utils/llm-edit-fixer.js.map +1 -1
- package/dist/src/utils/llm-edit-fixer.test.js +30 -0
- package/dist/src/utils/llm-edit-fixer.test.js.map +1 -1
- package/dist/src/utils/summarizer.js +7 -3
- package/dist/src/utils/summarizer.js.map +1 -1
- package/dist/src/utils/summarizer.test.js +14 -0
- package/dist/src/utils/summarizer.test.js.map +1 -1
- package/dist/src/utils/textUtils.d.ts +7 -0
- package/dist/src/utils/textUtils.js +157 -0
- package/dist/src/utils/textUtils.js.map +1 -1
- package/dist/src/utils/textUtils.test.js +41 -1
- package/dist/src/utils/textUtils.test.js.map +1 -1
- package/dist/src/voice/whisperModelManager.d.ts +4 -1
- package/dist/src/voice/whisperModelManager.js +175 -8
- package/dist/src/voice/whisperModelManager.js.map +1 -1
- package/dist/src/voice/whisperModelManager.test.d.ts +6 -0
- package/dist/src/voice/whisperModelManager.test.js +514 -0
- package/dist/src/voice/whisperModelManager.test.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,379 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import * as fs from 'node:fs';
|
|
7
|
+
import * as path from 'node:path';
|
|
8
|
+
import * as readline from 'node:readline';
|
|
9
|
+
export const DEFAULT_HEATMAP_WINDOW_DAYS = 196;
|
|
10
|
+
export const INVALID_HEATMAP_DATE_ERROR = "Invalid date format. Expected YYYY-MM-DD, 'today', or 'yesterday'.";
|
|
11
|
+
const MS_PER_UTC_DAY = 86_400_000;
|
|
12
|
+
const DATE_KEY_PATTERN = /^(\d{4})-(\d{2})-(\d{2})$/;
|
|
13
|
+
function isPlainRecord(value) {
|
|
14
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
15
|
+
}
|
|
16
|
+
function toNonNegativeNumber(value) {
|
|
17
|
+
if (typeof value === 'number' && Number.isFinite(value)) {
|
|
18
|
+
return Math.max(0, value);
|
|
19
|
+
}
|
|
20
|
+
return 0;
|
|
21
|
+
}
|
|
22
|
+
function toExplicitTotal(value) {
|
|
23
|
+
if (typeof value === 'number' && Number.isFinite(value)) {
|
|
24
|
+
return Math.max(0, value);
|
|
25
|
+
}
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Formats a Date instance into a system-local YYYY-MM-DD date key.
|
|
30
|
+
*/
|
|
31
|
+
export function formatLocalDateKey(date) {
|
|
32
|
+
const year = String(date.getFullYear()).padStart(4, '0');
|
|
33
|
+
const month = String(date.getMonth() + 1).padStart(2, '0');
|
|
34
|
+
const day = String(date.getDate()).padStart(2, '0');
|
|
35
|
+
return `${year}-${month}-${day}`;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Parses and validates a strict YYYY-MM-DD calendar date key into UTC midnight
|
|
39
|
+
* milliseconds. Rejects out-of-range calendar dates such as 2026-02-31.
|
|
40
|
+
*/
|
|
41
|
+
export function parseDateKeyToUtcMs(dateKey) {
|
|
42
|
+
const match = DATE_KEY_PATTERN.exec(dateKey);
|
|
43
|
+
if (!match) {
|
|
44
|
+
return null;
|
|
45
|
+
}
|
|
46
|
+
const year = Number.parseInt(match[1], 10);
|
|
47
|
+
const month = Number.parseInt(match[2], 10);
|
|
48
|
+
const day = Number.parseInt(match[3], 10);
|
|
49
|
+
if (month < 1 || month > 12 || day < 1 || day > 31) {
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
const utcMs = Date.UTC(year, month - 1, day);
|
|
53
|
+
const check = new Date(utcMs);
|
|
54
|
+
if (check.getUTCFullYear() !== year ||
|
|
55
|
+
check.getUTCMonth() + 1 !== month ||
|
|
56
|
+
check.getUTCDate() !== day) {
|
|
57
|
+
return null;
|
|
58
|
+
}
|
|
59
|
+
return utcMs;
|
|
60
|
+
}
|
|
61
|
+
function formatUtcMsAsDateKey(utcMs) {
|
|
62
|
+
const d = new Date(utcMs);
|
|
63
|
+
const year = String(d.getUTCFullYear()).padStart(4, '0');
|
|
64
|
+
const month = String(d.getUTCMonth() + 1).padStart(2, '0');
|
|
65
|
+
const day = String(d.getUTCDate()).padStart(2, '0');
|
|
66
|
+
return `${year}-${month}-${day}`;
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* Adds or subtracts whole calendar days from a validated YYYY-MM-DD key using
|
|
70
|
+
* UTC calendar arithmetic so Daylight Saving Time transitions never drift.
|
|
71
|
+
*/
|
|
72
|
+
export function addCalendarDays(dateKey, deltaDays) {
|
|
73
|
+
const utcMs = parseDateKeyToUtcMs(dateKey);
|
|
74
|
+
if (utcMs === null) {
|
|
75
|
+
return dateKey;
|
|
76
|
+
}
|
|
77
|
+
return formatUtcMsAsDateKey(utcMs + deltaDays * MS_PER_UTC_DAY);
|
|
78
|
+
}
|
|
79
|
+
/**
|
|
80
|
+
* Computes exact whole-day distance (`endDateKey - startDateKey`) between two
|
|
81
|
+
* validated YYYY-MM-DD keys without DST drift.
|
|
82
|
+
*/
|
|
83
|
+
export function diffCalendarDays(startDateKey, endDateKey) {
|
|
84
|
+
const startMs = parseDateKeyToUtcMs(startDateKey);
|
|
85
|
+
const endMs = parseDateKeyToUtcMs(endDateKey);
|
|
86
|
+
if (startMs === null || endMs === null) {
|
|
87
|
+
return null;
|
|
88
|
+
}
|
|
89
|
+
return Math.round((endMs - startMs) / MS_PER_UTC_DAY);
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* Validates and resolves optional `/stats heatmap [today|yesterday|YYYY-MM-DD]`
|
|
93
|
+
* arguments without touching filesystem paths.
|
|
94
|
+
*/
|
|
95
|
+
export function resolveHeatmapDateArg(rawArg, referenceDate = new Date()) {
|
|
96
|
+
const trimmed = rawArg.trim();
|
|
97
|
+
if (!trimmed) {
|
|
98
|
+
return { ok: true, date: undefined };
|
|
99
|
+
}
|
|
100
|
+
const normalized = trimmed.toLowerCase();
|
|
101
|
+
const todayKey = formatLocalDateKey(referenceDate);
|
|
102
|
+
if (normalized === 'today') {
|
|
103
|
+
return { ok: true, date: todayKey };
|
|
104
|
+
}
|
|
105
|
+
if (normalized === 'yesterday') {
|
|
106
|
+
return { ok: true, date: addCalendarDays(todayKey, -1) };
|
|
107
|
+
}
|
|
108
|
+
if (parseDateKeyToUtcMs(trimmed) !== null) {
|
|
109
|
+
return { ok: true, date: trimmed };
|
|
110
|
+
}
|
|
111
|
+
return { ok: false, error: INVALID_HEATMAP_DATE_ERROR };
|
|
112
|
+
}
|
|
113
|
+
function extractPluckedTurn(item, nextAnonKey) {
|
|
114
|
+
if (!isPlainRecord(item)) {
|
|
115
|
+
return null;
|
|
116
|
+
}
|
|
117
|
+
const fields = item;
|
|
118
|
+
if (typeof fields.timestamp !== 'string' || !fields.timestamp.trim()) {
|
|
119
|
+
return null;
|
|
120
|
+
}
|
|
121
|
+
const parsedTimestamp = new Date(fields.timestamp);
|
|
122
|
+
if (Number.isNaN(parsedTimestamp.getTime())) {
|
|
123
|
+
return null;
|
|
124
|
+
}
|
|
125
|
+
const rawTokensRecord = isPlainRecord(fields.tokens)
|
|
126
|
+
? fields.tokens
|
|
127
|
+
: isPlainRecord(fields.tokensSummary)
|
|
128
|
+
? fields.tokensSummary
|
|
129
|
+
: null;
|
|
130
|
+
if (!rawTokensRecord) {
|
|
131
|
+
return null;
|
|
132
|
+
}
|
|
133
|
+
const tokenFields = rawTokensRecord;
|
|
134
|
+
const inputTokens = toNonNegativeNumber(tokenFields.input ?? tokenFields.inputTokens);
|
|
135
|
+
const outputTokens = toNonNegativeNumber(tokenFields.output ?? tokenFields.outputTokens);
|
|
136
|
+
const cachedTokens = toNonNegativeNumber(tokenFields.cached ?? tokenFields.cachedTokens);
|
|
137
|
+
const thoughtsTokens = toNonNegativeNumber(tokenFields.thoughts);
|
|
138
|
+
const toolTokens = toNonNegativeNumber(tokenFields.tool);
|
|
139
|
+
const explicitTotal = toExplicitTotal(tokenFields.total) ??
|
|
140
|
+
toExplicitTotal(tokenFields.totalTokens);
|
|
141
|
+
const totalTokens = explicitTotal ?? inputTokens + outputTokens + thoughtsTokens + toolTokens;
|
|
142
|
+
const model = typeof fields.model === 'string' && fields.model.trim().length > 0
|
|
143
|
+
? fields.model.trim()
|
|
144
|
+
: undefined;
|
|
145
|
+
const key = typeof fields.id === 'string' && fields.id.length > 0
|
|
146
|
+
? fields.id
|
|
147
|
+
: nextAnonKey();
|
|
148
|
+
return {
|
|
149
|
+
key,
|
|
150
|
+
usage: {
|
|
151
|
+
dateKey: formatLocalDateKey(parsedTimestamp),
|
|
152
|
+
inputTokens,
|
|
153
|
+
outputTokens,
|
|
154
|
+
cachedTokens,
|
|
155
|
+
totalTokens,
|
|
156
|
+
model,
|
|
157
|
+
},
|
|
158
|
+
};
|
|
159
|
+
}
|
|
160
|
+
async function listJsonlRecordingFiles(chatsDir) {
|
|
161
|
+
let entries;
|
|
162
|
+
try {
|
|
163
|
+
entries = await fs.promises.readdir(chatsDir, { withFileTypes: true });
|
|
164
|
+
}
|
|
165
|
+
catch {
|
|
166
|
+
return [];
|
|
167
|
+
}
|
|
168
|
+
const jsonlFiles = [];
|
|
169
|
+
for (const entry of entries) {
|
|
170
|
+
if (entry.isFile() && entry.name.endsWith('.jsonl')) {
|
|
171
|
+
jsonlFiles.push(path.join(chatsDir, entry.name));
|
|
172
|
+
}
|
|
173
|
+
else if (entry.isDirectory()) {
|
|
174
|
+
// Subagent recordings live one directory level under chats/<parentSessionId>/*.jsonl.
|
|
175
|
+
const subDir = path.join(chatsDir, entry.name);
|
|
176
|
+
try {
|
|
177
|
+
const subEntries = await fs.promises.readdir(subDir, {
|
|
178
|
+
withFileTypes: true,
|
|
179
|
+
});
|
|
180
|
+
for (const subEntry of subEntries) {
|
|
181
|
+
if (subEntry.isFile() && subEntry.name.endsWith('.jsonl')) {
|
|
182
|
+
jsonlFiles.push(path.join(subDir, subEntry.name));
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
catch {
|
|
187
|
+
// Ignore unreadable subdirectories gracefully.
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
}
|
|
191
|
+
jsonlFiles.sort();
|
|
192
|
+
return jsonlFiles;
|
|
193
|
+
}
|
|
194
|
+
async function collectFileTurnUsages(filePath) {
|
|
195
|
+
const perFileTurns = new Map();
|
|
196
|
+
let detectedSessionId;
|
|
197
|
+
let anonCounter = 0;
|
|
198
|
+
const nextAnonKey = () => `__anon_${anonCounter++}`;
|
|
199
|
+
const fileStream = fs.createReadStream(filePath, { encoding: 'utf-8' });
|
|
200
|
+
const rl = readline.createInterface({
|
|
201
|
+
input: fileStream,
|
|
202
|
+
crlfDelay: Infinity,
|
|
203
|
+
});
|
|
204
|
+
try {
|
|
205
|
+
for await (const line of rl) {
|
|
206
|
+
if (!line.trim()) {
|
|
207
|
+
continue;
|
|
208
|
+
}
|
|
209
|
+
try {
|
|
210
|
+
const parsed = JSON.parse(line);
|
|
211
|
+
if (!isPlainRecord(parsed)) {
|
|
212
|
+
continue;
|
|
213
|
+
}
|
|
214
|
+
const fields = parsed;
|
|
215
|
+
if (typeof fields.sessionId === 'string' &&
|
|
216
|
+
fields.sessionId.trim().length > 0) {
|
|
217
|
+
detectedSessionId = fields.sessionId.trim();
|
|
218
|
+
}
|
|
219
|
+
if (isPlainRecord(fields.$set)) {
|
|
220
|
+
const setFields = fields.$set;
|
|
221
|
+
if (typeof setFields.sessionId === 'string' &&
|
|
222
|
+
setFields.sessionId.trim().length > 0) {
|
|
223
|
+
detectedSessionId = setFields.sessionId.trim();
|
|
224
|
+
}
|
|
225
|
+
if (Array.isArray(setFields.messages)) {
|
|
226
|
+
for (const msg of setFields.messages) {
|
|
227
|
+
const extracted = extractPluckedTurn(msg, nextAnonKey);
|
|
228
|
+
if (extracted) {
|
|
229
|
+
perFileTurns.set(extracted.key, extracted.usage);
|
|
230
|
+
}
|
|
231
|
+
}
|
|
232
|
+
}
|
|
233
|
+
continue;
|
|
234
|
+
}
|
|
235
|
+
if (Array.isArray(fields.messages)) {
|
|
236
|
+
for (const msg of fields.messages) {
|
|
237
|
+
const extracted = extractPluckedTurn(msg, nextAnonKey);
|
|
238
|
+
if (extracted) {
|
|
239
|
+
perFileTurns.set(extracted.key, extracted.usage);
|
|
240
|
+
}
|
|
241
|
+
}
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
const extracted = extractPluckedTurn(parsed, nextAnonKey);
|
|
245
|
+
if (extracted) {
|
|
246
|
+
perFileTurns.set(extracted.key, extracted.usage);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
catch {
|
|
250
|
+
// Skip corrupt or incomplete JSONL lines gracefully.
|
|
251
|
+
continue;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
catch {
|
|
256
|
+
// Ignore per-file stream errors so remaining session logs still aggregate.
|
|
257
|
+
}
|
|
258
|
+
finally {
|
|
259
|
+
rl.close();
|
|
260
|
+
fileStream.destroy();
|
|
261
|
+
}
|
|
262
|
+
return {
|
|
263
|
+
sessionKey: detectedSessionId ?? filePath,
|
|
264
|
+
turns: perFileTurns.values(),
|
|
265
|
+
};
|
|
266
|
+
}
|
|
267
|
+
function computeHeatmapMetrics(usageMap, sessionsByDate, windowDays, referenceDate) {
|
|
268
|
+
const activeDates = Array.from(usageMap.entries())
|
|
269
|
+
.filter(([, summary]) => summary.totalTokens > 0)
|
|
270
|
+
.map(([dateKey]) => dateKey)
|
|
271
|
+
.sort();
|
|
272
|
+
let longestStreak = 0;
|
|
273
|
+
let runningStreak = 0;
|
|
274
|
+
let prevDateKey = null;
|
|
275
|
+
for (const dateKey of activeDates) {
|
|
276
|
+
if (prevDateKey !== null && diffCalendarDays(prevDateKey, dateKey) === 1) {
|
|
277
|
+
runningStreak += 1;
|
|
278
|
+
}
|
|
279
|
+
else {
|
|
280
|
+
runningStreak = 1;
|
|
281
|
+
}
|
|
282
|
+
if (runningStreak > longestStreak) {
|
|
283
|
+
longestStreak = runningStreak;
|
|
284
|
+
}
|
|
285
|
+
prevDateKey = dateKey;
|
|
286
|
+
}
|
|
287
|
+
const todayKey = formatLocalDateKey(referenceDate);
|
|
288
|
+
const yesterdayKey = addCalendarDays(todayKey, -1);
|
|
289
|
+
const hasUsageOnDate = (key) => (usageMap.get(key)?.totalTokens ?? 0) > 0;
|
|
290
|
+
let currentStreak = 0;
|
|
291
|
+
let cursorKey = hasUsageOnDate(todayKey)
|
|
292
|
+
? todayKey
|
|
293
|
+
: hasUsageOnDate(yesterdayKey)
|
|
294
|
+
? yesterdayKey
|
|
295
|
+
: null;
|
|
296
|
+
while (cursorKey !== null && hasUsageOnDate(cursorKey)) {
|
|
297
|
+
currentStreak += 1;
|
|
298
|
+
cursorKey = addCalendarDays(cursorKey, -1);
|
|
299
|
+
}
|
|
300
|
+
let totalWindowTokens = 0;
|
|
301
|
+
let totalWindowTurns = 0;
|
|
302
|
+
const windowSessions = new Set();
|
|
303
|
+
if (windowDays > 0) {
|
|
304
|
+
const cutoffKey = addCalendarDays(todayKey, -(windowDays - 1));
|
|
305
|
+
for (const [dateKey, summary] of usageMap.entries()) {
|
|
306
|
+
if (dateKey >= cutoffKey && dateKey <= todayKey) {
|
|
307
|
+
totalWindowTokens += summary.totalTokens;
|
|
308
|
+
totalWindowTurns += summary.turns;
|
|
309
|
+
const dateSessions = sessionsByDate.get(dateKey);
|
|
310
|
+
if (dateSessions) {
|
|
311
|
+
for (const sessionKey of dateSessions) {
|
|
312
|
+
windowSessions.add(sessionKey);
|
|
313
|
+
}
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
return {
|
|
319
|
+
dailyUsage: usageMap,
|
|
320
|
+
totalWindowTokens,
|
|
321
|
+
totalWindowSessions: windowSessions.size,
|
|
322
|
+
totalWindowTurns,
|
|
323
|
+
currentStreak,
|
|
324
|
+
longestStreak,
|
|
325
|
+
};
|
|
326
|
+
}
|
|
327
|
+
/**
|
|
328
|
+
* Streams `.jsonl` chat recordings under `chatsDir` asynchronously to compute
|
|
329
|
+
* daily token usage summaries, rolling window totals, and usage streaks.
|
|
330
|
+
*/
|
|
331
|
+
export async function aggregateUsageFromRecordings(chatsDir, windowDays = DEFAULT_HEATMAP_WINDOW_DAYS, referenceDate = new Date()) {
|
|
332
|
+
const usageMap = new Map();
|
|
333
|
+
if (!chatsDir.trim()) {
|
|
334
|
+
return {
|
|
335
|
+
dailyUsage: usageMap,
|
|
336
|
+
totalWindowTokens: 0,
|
|
337
|
+
totalWindowSessions: 0,
|
|
338
|
+
totalWindowTurns: 0,
|
|
339
|
+
currentStreak: 0,
|
|
340
|
+
longestStreak: 0,
|
|
341
|
+
};
|
|
342
|
+
}
|
|
343
|
+
const files = await listJsonlRecordingFiles(chatsDir);
|
|
344
|
+
const sessionsByDate = new Map();
|
|
345
|
+
for (const filePath of files) {
|
|
346
|
+
const { sessionKey, turns } = await collectFileTurnUsages(filePath);
|
|
347
|
+
for (const turn of turns) {
|
|
348
|
+
const entry = usageMap.get(turn.dateKey) ?? {
|
|
349
|
+
date: turn.dateKey,
|
|
350
|
+
totalTokens: 0,
|
|
351
|
+
inputTokens: 0,
|
|
352
|
+
outputTokens: 0,
|
|
353
|
+
cachedTokens: 0,
|
|
354
|
+
turns: 0,
|
|
355
|
+
sessions: 0,
|
|
356
|
+
modelBreakdown: {},
|
|
357
|
+
};
|
|
358
|
+
entry.inputTokens += turn.inputTokens;
|
|
359
|
+
entry.outputTokens += turn.outputTokens;
|
|
360
|
+
entry.cachedTokens += turn.cachedTokens;
|
|
361
|
+
entry.totalTokens += turn.totalTokens;
|
|
362
|
+
entry.turns += 1;
|
|
363
|
+
if (turn.model) {
|
|
364
|
+
entry.modelBreakdown[turn.model] =
|
|
365
|
+
(entry.modelBreakdown[turn.model] ?? 0) + turn.totalTokens;
|
|
366
|
+
}
|
|
367
|
+
let dateSessions = sessionsByDate.get(turn.dateKey);
|
|
368
|
+
if (!dateSessions) {
|
|
369
|
+
dateSessions = new Set();
|
|
370
|
+
sessionsByDate.set(turn.dateKey, dateSessions);
|
|
371
|
+
}
|
|
372
|
+
dateSessions.add(sessionKey);
|
|
373
|
+
entry.sessions = dateSessions.size;
|
|
374
|
+
usageMap.set(turn.dateKey, entry);
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
return computeHeatmapMetrics(usageMap, sessionsByDate, windowDays, referenceDate);
|
|
378
|
+
}
|
|
379
|
+
//# sourceMappingURL=usageAggregator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"usageAggregator.js","sourceRoot":"","sources":["../../../src/services/usageAggregator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,257 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import fsSync from 'node:fs';
|
|
7
|
+
import * as fs from 'node:fs/promises';
|
|
8
|
+
import * as os from 'node:os';
|
|
9
|
+
import * as path from 'node:path';
|
|
10
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
11
|
+
import { INVALID_HEATMAP_DATE_ERROR, addCalendarDays, aggregateUsageFromRecordings, diffCalendarDays, formatLocalDateKey, parseDateKeyToUtcMs, resolveHeatmapDateArg, } from './usageAggregator.js';
|
|
12
|
+
describe('usageAggregator', () => {
|
|
13
|
+
let tempDir;
|
|
14
|
+
beforeEach(async () => {
|
|
15
|
+
vi.stubEnv('TZ', 'UTC');
|
|
16
|
+
tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-heatmap-test-'));
|
|
17
|
+
});
|
|
18
|
+
afterEach(async () => {
|
|
19
|
+
vi.restoreAllMocks();
|
|
20
|
+
vi.unstubAllEnvs();
|
|
21
|
+
await fs.rm(tempDir, { recursive: true, force: true });
|
|
22
|
+
});
|
|
23
|
+
describe('calendar date helpers & validation', () => {
|
|
24
|
+
it('validates real calendar dates and rejects invalid or rollover dates', () => {
|
|
25
|
+
expect(parseDateKeyToUtcMs('2026-11-03')).not.toBeNull();
|
|
26
|
+
expect(parseDateKeyToUtcMs('2024-02-29')).not.toBeNull(); // Leap year
|
|
27
|
+
expect(parseDateKeyToUtcMs('2025-02-29')).toBeNull(); // Non-leap year
|
|
28
|
+
expect(parseDateKeyToUtcMs('2026-02-31')).toBeNull();
|
|
29
|
+
expect(parseDateKeyToUtcMs('2026-13-01')).toBeNull();
|
|
30
|
+
expect(parseDateKeyToUtcMs('../chats/session')).toBeNull();
|
|
31
|
+
});
|
|
32
|
+
it('adds and diffs calendar days without DST drift', () => {
|
|
33
|
+
vi.stubEnv('TZ', 'America/Los_Angeles');
|
|
34
|
+
expect(addCalendarDays('2026-03-08', 1)).toBe('2026-03-09');
|
|
35
|
+
expect(addCalendarDays('2026-11-01', 1)).toBe('2026-11-02');
|
|
36
|
+
expect(addCalendarDays('2026-11-02', -1)).toBe('2026-11-01');
|
|
37
|
+
expect(diffCalendarDays('2026-03-07', '2026-03-09')).toBe(2);
|
|
38
|
+
expect(diffCalendarDays('2024-02-28', '2024-03-01')).toBe(2);
|
|
39
|
+
});
|
|
40
|
+
it('resolves today, yesterday, YYYY-MM-DD, and rejects invalid arguments', () => {
|
|
41
|
+
const ref = new Date('2026-11-03T15:30:00.000Z');
|
|
42
|
+
expect(resolveHeatmapDateArg('', ref)).toEqual({
|
|
43
|
+
ok: true,
|
|
44
|
+
date: undefined,
|
|
45
|
+
});
|
|
46
|
+
expect(resolveHeatmapDateArg(' today ', ref)).toEqual({
|
|
47
|
+
ok: true,
|
|
48
|
+
date: '2026-11-03',
|
|
49
|
+
});
|
|
50
|
+
expect(resolveHeatmapDateArg('YESTERDAY', ref)).toEqual({
|
|
51
|
+
ok: true,
|
|
52
|
+
date: '2026-11-02',
|
|
53
|
+
});
|
|
54
|
+
expect(resolveHeatmapDateArg('2026-10-15', ref)).toEqual({
|
|
55
|
+
ok: true,
|
|
56
|
+
date: '2026-10-15',
|
|
57
|
+
});
|
|
58
|
+
expect(resolveHeatmapDateArg('2026-02-30', ref)).toEqual({
|
|
59
|
+
ok: false,
|
|
60
|
+
error: INVALID_HEATMAP_DATE_ERROR,
|
|
61
|
+
});
|
|
62
|
+
expect(resolveHeatmapDateArg('../../etc/passwd', ref)).toEqual({
|
|
63
|
+
ok: false,
|
|
64
|
+
error: INVALID_HEATMAP_DATE_ERROR,
|
|
65
|
+
});
|
|
66
|
+
});
|
|
67
|
+
it('normalizes UTC ISO timestamps into local date keys', () => {
|
|
68
|
+
vi.stubEnv('TZ', 'America/New_York');
|
|
69
|
+
// 2026-11-03T02:30:00Z is 2026-11-02 21:30 EST
|
|
70
|
+
expect(formatLocalDateKey(new Date('2026-11-03T02:30:00.000Z'))).toBe('2026-11-02');
|
|
71
|
+
});
|
|
72
|
+
});
|
|
73
|
+
describe('aggregateUsageFromRecordings', () => {
|
|
74
|
+
it('returns an empty dataset when directory is missing or has no .jsonl files', async () => {
|
|
75
|
+
const existsSyncSpy = vi.spyOn(fsSync, 'existsSync');
|
|
76
|
+
const blankResult = await aggregateUsageFromRecordings(' ');
|
|
77
|
+
expect(blankResult.dailyUsage.size).toBe(0);
|
|
78
|
+
expect(blankResult.totalWindowTokens).toBe(0);
|
|
79
|
+
const missingPath = path.join(tempDir, 'does-not-exist');
|
|
80
|
+
const missingResult = await aggregateUsageFromRecordings(missingPath);
|
|
81
|
+
expect(missingResult.dailyUsage.size).toBe(0);
|
|
82
|
+
expect(missingResult.totalWindowTokens).toBe(0);
|
|
83
|
+
expect(missingResult.totalWindowSessions).toBe(0);
|
|
84
|
+
expect(missingResult.totalWindowTurns).toBe(0);
|
|
85
|
+
expect(missingResult.currentStreak).toBe(0);
|
|
86
|
+
expect(missingResult.longestStreak).toBe(0);
|
|
87
|
+
const notesFilePath = path.join(tempDir, 'notes.txt');
|
|
88
|
+
await fs.writeFile(notesFilePath, 'ignored');
|
|
89
|
+
const nonDirResult = await aggregateUsageFromRecordings(notesFilePath);
|
|
90
|
+
expect(nonDirResult.dailyUsage.size).toBe(0);
|
|
91
|
+
const emptyResult = await aggregateUsageFromRecordings(tempDir);
|
|
92
|
+
expect(emptyResult.dailyUsage.size).toBe(0);
|
|
93
|
+
expect(existsSyncSpy).not.toHaveBeenCalled();
|
|
94
|
+
});
|
|
95
|
+
it('aggregates MessageRecord.tokens, deduplicates repeated message IDs, and skips corrupt lines', async () => {
|
|
96
|
+
const sessionA = path.join(tempDir, 'session-a.jsonl');
|
|
97
|
+
const linesA = [
|
|
98
|
+
JSON.stringify({
|
|
99
|
+
sessionId: 'sess-a',
|
|
100
|
+
projectHash: 'hash',
|
|
101
|
+
startTime: '2026-11-01T10:00:00.000Z',
|
|
102
|
+
}),
|
|
103
|
+
// Initial message snapshot without tokens
|
|
104
|
+
JSON.stringify({
|
|
105
|
+
id: 'msg-1',
|
|
106
|
+
type: 'gemini',
|
|
107
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
108
|
+
content: 'Hello',
|
|
109
|
+
tokens: null,
|
|
110
|
+
model: 'gemini-2.5-pro',
|
|
111
|
+
}),
|
|
112
|
+
// Updated snapshot after recordMessageTokens
|
|
113
|
+
JSON.stringify({
|
|
114
|
+
id: 'msg-1',
|
|
115
|
+
type: 'gemini',
|
|
116
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
117
|
+
content: 'Hello',
|
|
118
|
+
tokens: { input: 100, output: 50, cached: 20, total: 150 },
|
|
119
|
+
model: 'gemini-2.5-pro',
|
|
120
|
+
}),
|
|
121
|
+
// Repeated snapshot after recordToolCalls with same ID — must NOT double count
|
|
122
|
+
JSON.stringify({
|
|
123
|
+
id: 'msg-1',
|
|
124
|
+
type: 'gemini',
|
|
125
|
+
timestamp: '2026-11-01T10:01:00.000Z',
|
|
126
|
+
content: 'Hello',
|
|
127
|
+
toolCalls: [{ id: 'tc-1', name: 'read_file', args: {} }],
|
|
128
|
+
tokens: { input: 100, output: 50, cached: 20, total: 150 },
|
|
129
|
+
model: 'gemini-2.5-pro',
|
|
130
|
+
}),
|
|
131
|
+
'{corrupt json line from interrupted write',
|
|
132
|
+
'',
|
|
133
|
+
JSON.stringify({
|
|
134
|
+
id: 'msg-bad-ts',
|
|
135
|
+
type: 'gemini',
|
|
136
|
+
timestamp: 'not-a-timestamp',
|
|
137
|
+
tokens: { input: 999, output: 999, cached: 0, total: 1998 },
|
|
138
|
+
}),
|
|
139
|
+
// Second turn in same session on same day with different model
|
|
140
|
+
JSON.stringify({
|
|
141
|
+
id: 'msg-2',
|
|
142
|
+
type: 'gemini',
|
|
143
|
+
timestamp: '2026-11-01T12:00:00.000Z',
|
|
144
|
+
tokens: { input: 200, output: 100, cached: 50, total: 300 },
|
|
145
|
+
model: 'gemini-2.5-flash',
|
|
146
|
+
}),
|
|
147
|
+
];
|
|
148
|
+
await fs.writeFile(sessionA, linesA.join('\n') + '\n');
|
|
149
|
+
// Second session + nested subagent directory on same and next day
|
|
150
|
+
const sessionB = path.join(tempDir, 'session-b.jsonl');
|
|
151
|
+
await fs.writeFile(sessionB, [
|
|
152
|
+
JSON.stringify({ sessionId: 'sess-b', projectHash: 'hash' }),
|
|
153
|
+
JSON.stringify({
|
|
154
|
+
id: 'msg-b1',
|
|
155
|
+
type: 'gemini',
|
|
156
|
+
timestamp: '2026-11-01T18:00:00.000Z',
|
|
157
|
+
tokensSummary: {
|
|
158
|
+
inputTokens: 40,
|
|
159
|
+
outputTokens: 10,
|
|
160
|
+
cachedTokens: 5,
|
|
161
|
+
},
|
|
162
|
+
model: 'gemini-2.5-pro',
|
|
163
|
+
}),
|
|
164
|
+
JSON.stringify({
|
|
165
|
+
id: 'msg-b2',
|
|
166
|
+
type: 'gemini',
|
|
167
|
+
timestamp: '2026-11-02T09:00:00.000Z',
|
|
168
|
+
tokens: { input: 300, output: 200, cached: 100, total: 500 },
|
|
169
|
+
model: 'gemini-2.5-pro',
|
|
170
|
+
}),
|
|
171
|
+
].join('\n') + '\n');
|
|
172
|
+
const subagentDir = path.join(tempDir, 'sess-b');
|
|
173
|
+
await fs.mkdir(subagentDir);
|
|
174
|
+
await fs.writeFile(path.join(subagentDir, 'subagent-1.jsonl'), [
|
|
175
|
+
JSON.stringify({ sessionId: 'sub-1', projectHash: 'hash' }),
|
|
176
|
+
JSON.stringify({
|
|
177
|
+
id: 'msg-sub-1',
|
|
178
|
+
type: 'gemini',
|
|
179
|
+
timestamp: '2026-11-02T09:05:00.000Z',
|
|
180
|
+
tokens: { input: 50, output: 25, cached: 0, total: 75 },
|
|
181
|
+
model: 'gemini-2.5-flash',
|
|
182
|
+
}),
|
|
183
|
+
].join('\n') + '\n');
|
|
184
|
+
const refDate = new Date('2026-11-03T10:00:00.000Z');
|
|
185
|
+
const result = await aggregateUsageFromRecordings(tempDir, 196, refDate);
|
|
186
|
+
const nov1 = result.dailyUsage.get('2026-11-01');
|
|
187
|
+
expect(nov1).toEqual({
|
|
188
|
+
date: '2026-11-01',
|
|
189
|
+
inputTokens: 340,
|
|
190
|
+
outputTokens: 160,
|
|
191
|
+
cachedTokens: 75,
|
|
192
|
+
totalTokens: 500,
|
|
193
|
+
turns: 3,
|
|
194
|
+
sessions: 2,
|
|
195
|
+
modelBreakdown: {
|
|
196
|
+
'gemini-2.5-pro': 200,
|
|
197
|
+
'gemini-2.5-flash': 300,
|
|
198
|
+
},
|
|
199
|
+
});
|
|
200
|
+
const nov2 = result.dailyUsage.get('2026-11-02');
|
|
201
|
+
expect(nov2).toEqual({
|
|
202
|
+
date: '2026-11-02',
|
|
203
|
+
inputTokens: 350,
|
|
204
|
+
outputTokens: 225,
|
|
205
|
+
cachedTokens: 100,
|
|
206
|
+
totalTokens: 575,
|
|
207
|
+
turns: 2,
|
|
208
|
+
sessions: 2,
|
|
209
|
+
modelBreakdown: {
|
|
210
|
+
'gemini-2.5-pro': 500,
|
|
211
|
+
'gemini-2.5-flash': 75,
|
|
212
|
+
},
|
|
213
|
+
});
|
|
214
|
+
// Today (2026-11-03) has 0 usage, but yesterday (2026-11-02) + 2026-11-01 had usage -> streak = 2
|
|
215
|
+
expect(result.currentStreak).toBe(2);
|
|
216
|
+
expect(result.longestStreak).toBe(2);
|
|
217
|
+
expect(result.totalWindowTokens).toBe(1075);
|
|
218
|
+
// sess-a, sess-b (shared across both days), and sub-1 -> 3 unique sessions, 5 turns
|
|
219
|
+
expect(result.totalWindowSessions).toBe(3);
|
|
220
|
+
expect(result.totalWindowTurns).toBe(5);
|
|
221
|
+
});
|
|
222
|
+
it('calculates longest historical streak separately from current streak and excludes out-of-window tokens', async () => {
|
|
223
|
+
const logPath = path.join(tempDir, 'history.jsonl');
|
|
224
|
+
const records = [
|
|
225
|
+
// 4-day historical streak outside 10-day window
|
|
226
|
+
'2026-01-10T12:00:00.000Z',
|
|
227
|
+
'2026-01-11T12:00:00.000Z',
|
|
228
|
+
'2026-01-12T12:00:00.000Z',
|
|
229
|
+
'2026-01-13T12:00:00.000Z',
|
|
230
|
+
// Current 2-day streak ending today
|
|
231
|
+
'2026-11-02T12:00:00.000Z',
|
|
232
|
+
'2026-11-03T12:00:00.000Z',
|
|
233
|
+
].map((timestamp, idx) => JSON.stringify({
|
|
234
|
+
id: `turn-${idx}`,
|
|
235
|
+
type: 'gemini',
|
|
236
|
+
timestamp,
|
|
237
|
+
tokens: { input: 80, output: 20, cached: 0, total: 100 },
|
|
238
|
+
}));
|
|
239
|
+
// Zero-token record between streaks must NOT bridge or extend streaks
|
|
240
|
+
records.push(JSON.stringify({
|
|
241
|
+
id: 'zero-turn',
|
|
242
|
+
type: 'gemini',
|
|
243
|
+
timestamp: '2026-11-01T12:00:00.000Z',
|
|
244
|
+
tokens: { input: 0, output: 0, cached: 0, total: 0 },
|
|
245
|
+
}));
|
|
246
|
+
await fs.writeFile(logPath, records.join('\n') + '\n');
|
|
247
|
+
const refDate = new Date('2026-11-03T20:00:00.000Z');
|
|
248
|
+
const result = await aggregateUsageFromRecordings(tempDir, 10, refDate);
|
|
249
|
+
expect(result.longestStreak).toBe(4);
|
|
250
|
+
expect(result.currentStreak).toBe(2);
|
|
251
|
+
expect(result.totalWindowTokens).toBe(200);
|
|
252
|
+
expect(result.totalWindowSessions).toBe(1);
|
|
253
|
+
expect(result.totalWindowTurns).toBe(3);
|
|
254
|
+
});
|
|
255
|
+
});
|
|
256
|
+
});
|
|
257
|
+
//# sourceMappingURL=usageAggregator.test.js.map
|