@qmediat.io/gemini-code-context-mcp 1.12.2 → 1.14.0
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/CHANGELOG.md +174 -0
- package/dist/cache/cache-manager.d.ts +20 -0
- package/dist/cache/cache-manager.d.ts.map +1 -1
- package/dist/cache/cache-manager.js +120 -19
- package/dist/cache/cache-manager.js.map +1 -1
- package/dist/cache/files-uploader.d.ts.map +1 -1
- package/dist/cache/files-uploader.js +57 -30
- package/dist/cache/files-uploader.js.map +1 -1
- package/dist/config.d.ts +31 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +42 -0
- package/dist/config.js.map +1 -1
- package/dist/indexer/workspace-scanner.d.ts +63 -0
- package/dist/indexer/workspace-scanner.d.ts.map +1 -1
- package/dist/indexer/workspace-scanner.js +66 -7
- package/dist/indexer/workspace-scanner.js.map +1 -1
- package/dist/manifest/db.d.ts +101 -0
- package/dist/manifest/db.d.ts.map +1 -1
- package/dist/manifest/db.js +231 -10
- package/dist/manifest/db.js.map +1 -1
- package/dist/tools/ask.tool.d.ts +10 -0
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +42 -1
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts +10 -0
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +40 -1
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/reindex.tool.d.ts.map +1 -1
- package/dist/tools/reindex.tool.js +4 -0
- package/dist/tools/reindex.tool.js.map +1 -1
- package/dist/tools/status.tool.d.ts.map +1 -1
- package/dist/tools/status.tool.js +46 -0
- package/dist/tools/status.tool.js.map +1 -1
- package/dist/types.d.ts +36 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/logger.js +0 -0
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/run-pool.d.ts +15 -0
- package/dist/utils/run-pool.d.ts.map +1 -0
- package/dist/utils/run-pool.js +36 -0
- package/dist/utils/run-pool.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/manifest/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../../src/manifest/db.ts"],"names":[],"mappings":"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"}
|
package/dist/manifest/db.js
CHANGED
|
@@ -31,6 +31,13 @@ CREATE TABLE IF NOT EXISTS files (
|
|
|
31
31
|
file_id TEXT,
|
|
32
32
|
uploaded_at INTEGER,
|
|
33
33
|
expires_at INTEGER,
|
|
34
|
+
-- v1.13.0+: scan-memo columns. Allow re-using a stored content_hash when
|
|
35
|
+
-- the file's mtime + size haven't changed since the last scan, skipping
|
|
36
|
+
-- the read+SHA256 cost for ~95% of files on a typical warm code-review.
|
|
37
|
+
-- Nullable for rows written before v1.13.0; the scanner forces a fresh
|
|
38
|
+
-- hash whenever either column is null.
|
|
39
|
+
mtime_ms INTEGER,
|
|
40
|
+
size INTEGER,
|
|
34
41
|
PRIMARY KEY (workspace_root, relpath),
|
|
35
42
|
FOREIGN KEY (workspace_root) REFERENCES workspaces(workspace_root) ON DELETE CASCADE
|
|
36
43
|
);
|
|
@@ -46,7 +53,15 @@ CREATE TABLE IF NOT EXISTS usage_metrics (
|
|
|
46
53
|
uncached_tokens INTEGER,
|
|
47
54
|
cost_usd_micro INTEGER,
|
|
48
55
|
duration_ms INTEGER NOT NULL,
|
|
49
|
-
occurred_at INTEGER NOT NULL
|
|
56
|
+
occurred_at INTEGER NOT NULL,
|
|
57
|
+
-- v1.13.0+: caching-mode telemetry. caching_mode records whether this
|
|
58
|
+
-- call used "explicit" (caches.create) or "implicit" (Gemini's automatic
|
|
59
|
+
-- cache for 2.5+/3 Pro). cached_content_token_count mirrors
|
|
60
|
+
-- usage_metadata.cachedContentTokenCount from the Gemini response and
|
|
61
|
+
-- is used by the status tool to compute cache-hit rate. Nullable for
|
|
62
|
+
-- rows written before v1.13.0 (treated as "explicit" for aggregations).
|
|
63
|
+
caching_mode TEXT,
|
|
64
|
+
cached_content_token_count INTEGER
|
|
50
65
|
);
|
|
51
66
|
|
|
52
67
|
CREATE INDEX IF NOT EXISTS idx_usage_occurred_at ON usage_metrics(occurred_at);
|
|
@@ -92,8 +107,30 @@ function rowToFile(row) {
|
|
|
92
107
|
fileId: row.file_id ?? null,
|
|
93
108
|
uploadedAt: row.uploaded_at ?? null,
|
|
94
109
|
expiresAt: row.expires_at ?? null,
|
|
110
|
+
mtimeMs: row.mtime_ms ?? null,
|
|
111
|
+
size: row.size ?? null,
|
|
95
112
|
};
|
|
96
113
|
}
|
|
114
|
+
/**
|
|
115
|
+
* v1.13.0+ additive column migrations. Each invocation runs `ALTER TABLE …
|
|
116
|
+
* ADD COLUMN` for one new column and swallows the "duplicate column name"
|
|
117
|
+
* error so the call is idempotent — re-running the binary on an already-
|
|
118
|
+
* migrated DB is a no-op. Every other SQLite error rethrows so genuine
|
|
119
|
+
* schema corruption surfaces.
|
|
120
|
+
*
|
|
121
|
+
* SQLite has no `ADD COLUMN IF NOT EXISTS`, hence the catch dance.
|
|
122
|
+
*/
|
|
123
|
+
function addColumnIfMissing(db, table, column, type) {
|
|
124
|
+
try {
|
|
125
|
+
db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${type}`);
|
|
126
|
+
}
|
|
127
|
+
catch (err) {
|
|
128
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
129
|
+
if (msg.includes('duplicate column name'))
|
|
130
|
+
return;
|
|
131
|
+
throw err;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
97
134
|
export class ManifestDb {
|
|
98
135
|
db;
|
|
99
136
|
constructor(pathOverride) {
|
|
@@ -105,6 +142,15 @@ export class ManifestDb {
|
|
|
105
142
|
this.db.pragma('synchronous = NORMAL');
|
|
106
143
|
this.db.pragma('foreign_keys = ON');
|
|
107
144
|
this.db.exec(SCHEMA_SQL);
|
|
145
|
+
// v1.13.0 additive migrations. `CREATE TABLE IF NOT EXISTS` above defines
|
|
146
|
+
// the post-1.13 schema for fresh DBs; for DBs already created by v1.12.x
|
|
147
|
+
// these `ADD COLUMN` calls bring the existing tables up to spec. Both
|
|
148
|
+
// calls are no-ops on a fresh DB (the columns already exist) thanks to
|
|
149
|
+
// `addColumnIfMissing`'s duplicate-column swallow.
|
|
150
|
+
addColumnIfMissing(this.db, 'files', 'mtime_ms', 'INTEGER');
|
|
151
|
+
addColumnIfMissing(this.db, 'files', 'size', 'INTEGER');
|
|
152
|
+
addColumnIfMissing(this.db, 'usage_metrics', 'caching_mode', 'TEXT');
|
|
153
|
+
addColumnIfMissing(this.db, 'usage_metrics', 'cached_content_token_count', 'INTEGER');
|
|
108
154
|
const meta = this.db.prepare('SELECT value FROM schema_meta WHERE key = ?').get('version');
|
|
109
155
|
if (!meta) {
|
|
110
156
|
this.db
|
|
@@ -149,17 +195,94 @@ export class ManifestDb {
|
|
|
149
195
|
.all(workspaceRoot);
|
|
150
196
|
return rows.map(rowToFile);
|
|
151
197
|
}
|
|
198
|
+
/**
|
|
199
|
+
* v1.13.0+ memo-seeder. Used by `prepareContext`'s inline / implicit /
|
|
200
|
+
* small-workspace branches — those paths skip the uploader entirely (which
|
|
201
|
+
* is the only writer of `upsertFile`), so without this the scan memo would
|
|
202
|
+
* silently degrade to cold every call (every file re-hashes — defeating
|
|
203
|
+
* the v1.13.0 perf headline).
|
|
204
|
+
*
|
|
205
|
+
* Conditional preservation of `file_id` / `uploaded_at` / `expires_at`
|
|
206
|
+
* (round-3 fix for the v1.13.0 silent-corruption HIGH found by Gemini /
|
|
207
|
+
* GPT / Copilot in the round-2 review):
|
|
208
|
+
*
|
|
209
|
+
* - **content_hash UNCHANGED** → preserve the upload metadata. A prior
|
|
210
|
+
* explicit-cache run uploaded these bytes to Files API; a switch back
|
|
211
|
+
* to `cachingMode: 'explicit'` should hit dedup and skip re-upload.
|
|
212
|
+
* - **content_hash CHANGED** → null out `file_id` / `uploaded_at` /
|
|
213
|
+
* `expires_at`. The previous fileId points to an upload of OLD bytes
|
|
214
|
+
* on Google's servers; preserving it would let `findFileRowByHash`
|
|
215
|
+
* return that stale fileId for the NEW content — silently feeding
|
|
216
|
+
* OLD bytes into Gemini under the file's NEW relpath.
|
|
217
|
+
*
|
|
218
|
+
* The pre-fix version preserved unconditionally, locking in a stale-fileId
|
|
219
|
+
* row whenever an edit landed between an explicit run and an implicit run.
|
|
220
|
+
* Two corruption scenarios were reachable:
|
|
221
|
+
* (A) same-relpath self-corruption: file edited mid-session, subsequent
|
|
222
|
+
* explicit run reuses the stale fileId for the changed file.
|
|
223
|
+
* (B) cross-file leak: a different file with the same NEW content_hash
|
|
224
|
+
* hits the dedup query and gets routed through the stale fileId.
|
|
225
|
+
*
|
|
226
|
+
* The CASE-based clear closes both. Confirmed by /6step round-3 analysis:
|
|
227
|
+
* `findFileRowByHash` returns rows where `content_hash = ?` and `file_id IS
|
|
228
|
+
* NOT NULL` — the conditional null-out ensures any stale fileId is gone
|
|
229
|
+
* BEFORE the dedup query could return it.
|
|
230
|
+
*/
|
|
231
|
+
refreshFileFingerprints(rows) {
|
|
232
|
+
if (rows.length === 0)
|
|
233
|
+
return;
|
|
234
|
+
// SQL semantics anchored by an empirical better-sqlite3 probe (round-3
|
|
235
|
+
// verification, /tmp/coderev/.../round3-verify-sixstep.md finding #2):
|
|
236
|
+
//
|
|
237
|
+
// - `files.X` in the SET clause references the OLD (pre-conflict) row
|
|
238
|
+
// value, so `files.content_hash <> excluded.content_hash` correctly
|
|
239
|
+
// compares OLD vs NEW. Confirmed by probe.
|
|
240
|
+
// - The conditional CASE columns are listed BEFORE the unconditional
|
|
241
|
+
// `content_hash = excluded.content_hash` overwrite — but per SQLite
|
|
242
|
+
// UPDATE semantics, all RHS expressions are evaluated using OLD row
|
|
243
|
+
// values regardless of column order, so order is purely cosmetic.
|
|
244
|
+
//
|
|
245
|
+
// Defensive `COALESCE(files.content_hash, '')` guard: SQL `NULL <> 'x'`
|
|
246
|
+
// is NULL (falsy), which would let the CASE fall into the ELSE branch
|
|
247
|
+
// and PRESERVE a stale fileId paired with the new content_hash — exactly
|
|
248
|
+
// the corruption shape this fix closes. Schema declares `content_hash
|
|
249
|
+
// TEXT NOT NULL` so today the NULL case is unreachable, but if a future
|
|
250
|
+
// migration ever relaxes the constraint or a botched manual DB edit
|
|
251
|
+
// produces a NULL content_hash, the COALESCE forces the comparison to
|
|
252
|
+
// succeed (`'' <> 'new-hash'` → TRUE) and the stale fileId is cleared.
|
|
253
|
+
// Defense-in-depth, zero runtime cost.
|
|
254
|
+
const stmt = this.db.prepare(`INSERT INTO files(
|
|
255
|
+
workspace_root, relpath, content_hash, file_id, uploaded_at, expires_at,
|
|
256
|
+
mtime_ms, size
|
|
257
|
+
) VALUES (?, ?, ?, NULL, NULL, NULL, ?, ?)
|
|
258
|
+
ON CONFLICT(workspace_root, relpath) DO UPDATE SET
|
|
259
|
+
file_id = CASE WHEN COALESCE(files.content_hash, '') <> excluded.content_hash THEN NULL ELSE files.file_id END,
|
|
260
|
+
uploaded_at = CASE WHEN COALESCE(files.content_hash, '') <> excluded.content_hash THEN NULL ELSE files.uploaded_at END,
|
|
261
|
+
expires_at = CASE WHEN COALESCE(files.content_hash, '') <> excluded.content_hash THEN NULL ELSE files.expires_at END,
|
|
262
|
+
content_hash = excluded.content_hash,
|
|
263
|
+
mtime_ms = excluded.mtime_ms,
|
|
264
|
+
size = excluded.size`);
|
|
265
|
+
const tx = this.db.transaction((batch) => {
|
|
266
|
+
for (const r of batch) {
|
|
267
|
+
stmt.run(r.workspaceRoot, r.relpath, r.contentHash, r.mtimeMs, r.size);
|
|
268
|
+
}
|
|
269
|
+
});
|
|
270
|
+
tx(rows);
|
|
271
|
+
}
|
|
152
272
|
upsertFile(file) {
|
|
153
273
|
this.db
|
|
154
274
|
.prepare(`INSERT INTO files(
|
|
155
|
-
workspace_root, relpath, content_hash, file_id, uploaded_at, expires_at
|
|
156
|
-
|
|
275
|
+
workspace_root, relpath, content_hash, file_id, uploaded_at, expires_at,
|
|
276
|
+
mtime_ms, size
|
|
277
|
+
) VALUES (?, ?, ?, ?, ?, ?, ?, ?)
|
|
157
278
|
ON CONFLICT(workspace_root, relpath) DO UPDATE SET
|
|
158
279
|
content_hash = excluded.content_hash,
|
|
159
280
|
file_id = excluded.file_id,
|
|
160
281
|
uploaded_at = excluded.uploaded_at,
|
|
161
|
-
expires_at = excluded.expires_at
|
|
162
|
-
|
|
282
|
+
expires_at = excluded.expires_at,
|
|
283
|
+
mtime_ms = excluded.mtime_ms,
|
|
284
|
+
size = excluded.size`)
|
|
285
|
+
.run(file.workspaceRoot, file.relpath, file.contentHash, file.fileId, file.uploadedAt, file.expiresAt, file.mtimeMs ?? null, file.size ?? null);
|
|
163
286
|
}
|
|
164
287
|
deleteFile(workspaceRoot, relpath) {
|
|
165
288
|
this.db
|
|
@@ -189,9 +312,10 @@ export class ManifestDb {
|
|
|
189
312
|
this.db
|
|
190
313
|
.prepare(`INSERT INTO usage_metrics(
|
|
191
314
|
workspace_root, tool_name, model, cached_tokens, uncached_tokens,
|
|
192
|
-
cost_usd_micro, duration_ms, occurred_at
|
|
193
|
-
|
|
194
|
-
|
|
315
|
+
cost_usd_micro, duration_ms, occurred_at,
|
|
316
|
+
caching_mode, cached_content_token_count
|
|
317
|
+
) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`)
|
|
318
|
+
.run(metric.workspaceRoot, metric.toolName, metric.model, metric.cachedTokens, metric.uncachedTokens, metric.costUsdMicro, metric.durationMs, metric.occurredAt, metric.cachingMode ?? null, metric.cachedContentTokenCount ?? null);
|
|
195
319
|
}
|
|
196
320
|
/**
|
|
197
321
|
* Atomically check the daily budget and — if there's headroom — reserve
|
|
@@ -260,9 +384,10 @@ export class ManifestDb {
|
|
|
260
384
|
const safeDurationMs = Math.max(1, data.durationMs);
|
|
261
385
|
this.db
|
|
262
386
|
.prepare(`UPDATE usage_metrics
|
|
263
|
-
SET cached_tokens = ?, uncached_tokens = ?, cost_usd_micro = ?, duration_ms =
|
|
387
|
+
SET cached_tokens = ?, uncached_tokens = ?, cost_usd_micro = ?, duration_ms = ?,
|
|
388
|
+
caching_mode = ?, cached_content_token_count = ?
|
|
264
389
|
WHERE id = ?`)
|
|
265
|
-
.run(data.cachedTokens, data.uncachedTokens, data.costUsdMicro, safeDurationMs, reservationId);
|
|
390
|
+
.run(data.cachedTokens, data.uncachedTokens, data.costUsdMicro, safeDurationMs, data.cachingMode ?? null, data.cachedContentTokenCount ?? null, reservationId);
|
|
266
391
|
}
|
|
267
392
|
/**
|
|
268
393
|
* Drop a reservation row when the tool call failed before producing any
|
|
@@ -326,5 +451,101 @@ export class ManifestDb {
|
|
|
326
451
|
last24hCostMicros: last24h.total,
|
|
327
452
|
};
|
|
328
453
|
}
|
|
454
|
+
/**
|
|
455
|
+
* v1.13.0+: caching telemetry aggregation for the `status` tool.
|
|
456
|
+
*
|
|
457
|
+
* Surfaces caching mode adoption, implicit-cache hit rate (when applicable),
|
|
458
|
+
* and explicit-cache rebuild count over the last 24 h. Hit rate is computed
|
|
459
|
+
* as `sum(cached_content_token_count) / (sum(cached_content_token_count) +
|
|
460
|
+
* sum(uncached_tokens))` across implicit-mode calls — the ratio of input
|
|
461
|
+
* tokens that Gemini's automatic implicit cache served vs the ones we paid
|
|
462
|
+
* full input rate for. Settled rows only (`duration_ms > 0`) so in-flight
|
|
463
|
+
* reservations don't skew the hit rate downward.
|
|
464
|
+
*
|
|
465
|
+
* `mode` is the dominant caching mode in the window:
|
|
466
|
+
* - `'explicit'` if all metric rows used explicit (or no caching mode set)
|
|
467
|
+
* - `'implicit'` if all metric rows used implicit
|
|
468
|
+
* - `'inline'` if all metric rows used the forced-inline path (e.g.
|
|
469
|
+
* `code({ codeExecution: true })` — the user requested
|
|
470
|
+
* explicit but the runtime forbade `cachedContent` + tools
|
|
471
|
+
* simultaneously). Distinguished from `'explicit'` so the
|
|
472
|
+
* v1.14.0 default-flip telemetry isn't biased toward
|
|
473
|
+
* "explicit adoption" by codeExecution traffic.
|
|
474
|
+
* - `'mixed'` if 2+ of the above modes appear (operator changed
|
|
475
|
+
* defaults mid-day, codeExecution + non-codeExecution
|
|
476
|
+
* traffic, etc.)
|
|
477
|
+
* - `null` if no calls in the window
|
|
478
|
+
*
|
|
479
|
+
* Rows older than v1.13.0 lack `caching_mode` (NULL) and are treated as
|
|
480
|
+
* `'explicit'` for the dominant-mode tally.
|
|
481
|
+
*
|
|
482
|
+
* Upgrade-day note (v1.12.x → v1.13.0): if pre-upgrade calls landed inside
|
|
483
|
+
* the 24h window AND post-upgrade traffic is exclusively forced-inline
|
|
484
|
+
* (e.g. `code({ codeExecution: true })`), `mode` returns `'mixed'` because
|
|
485
|
+
* the legacy NULL rows COALESCE into the explicit tally. This self-corrects
|
|
486
|
+
* once the legacy rows fall out of the 24h window. Operators surprised by
|
|
487
|
+
* `'mixed'` post-upgrade should look at `inlineCallCount` and
|
|
488
|
+
* `explicitRebuildCount` to confirm the actual post-upgrade traffic shape.
|
|
489
|
+
*/
|
|
490
|
+
cacheStatsLast24h(nowMs) {
|
|
491
|
+
const since = nowMs - 24 * 3600 * 1000;
|
|
492
|
+
// Restricted to `ask` + `code` rows: those are the calls that flow through
|
|
493
|
+
// `prepareContext` and have a meaningful caching mode. `ask_agentic` (NULL
|
|
494
|
+
// caching_mode by design — no workspace cache) and `cache.create` (infra
|
|
495
|
+
// rebuild marker — counted separately below) are excluded so they don't
|
|
496
|
+
// skew the dominant-mode tally toward 'explicit'.
|
|
497
|
+
const row = this.db
|
|
498
|
+
.prepare(`SELECT
|
|
499
|
+
COUNT(*) AS call_count,
|
|
500
|
+
COALESCE(SUM(CASE WHEN COALESCE(caching_mode, 'explicit') = 'explicit' THEN 1 ELSE 0 END), 0) AS explicit_count,
|
|
501
|
+
COALESCE(SUM(CASE WHEN caching_mode = 'implicit' THEN 1 ELSE 0 END), 0) AS implicit_count,
|
|
502
|
+
COALESCE(SUM(CASE WHEN caching_mode = 'inline' THEN 1 ELSE 0 END), 0) AS inline_count,
|
|
503
|
+
COALESCE(SUM(CASE WHEN caching_mode = 'implicit' AND COALESCE(cached_content_token_count, 0) > 0 THEN 1 ELSE 0 END), 0) AS implicit_hit_count,
|
|
504
|
+
COALESCE(SUM(CASE WHEN caching_mode = 'implicit' THEN cached_content_token_count ELSE 0 END), 0) AS implicit_cached_tokens,
|
|
505
|
+
COALESCE(SUM(CASE WHEN caching_mode = 'implicit' THEN uncached_tokens ELSE 0 END), 0) AS implicit_uncached_tokens
|
|
506
|
+
FROM usage_metrics
|
|
507
|
+
WHERE occurred_at >= ? AND duration_ms > 0
|
|
508
|
+
AND tool_name IN ('ask', 'code')`)
|
|
509
|
+
.get(since);
|
|
510
|
+
// `tool_name = 'cache.create'` rows are emitted by cache-manager when a
|
|
511
|
+
// fresh `caches.create` call lands on the explicit path. Counting them
|
|
512
|
+
// gives the operator a direct rebuild tally — the v1.13.0 motivation for
|
|
513
|
+
// pivoting toward implicit caching is to drive this number toward zero.
|
|
514
|
+
const rebuilds = this.db
|
|
515
|
+
.prepare(`SELECT COUNT(*) AS n FROM usage_metrics
|
|
516
|
+
WHERE occurred_at >= ? AND duration_ms > 0 AND tool_name = 'cache.create'`)
|
|
517
|
+
.get(since);
|
|
518
|
+
// Dominant mode: 'mixed' if 2+ of the three actual modes appear; else the
|
|
519
|
+
// one mode that did. v1.13.0 round-2 (FN2 fix) widened this to include
|
|
520
|
+
// 'inline' alongside 'explicit' / 'implicit'.
|
|
521
|
+
const explicitN = row.explicit_count;
|
|
522
|
+
const implicitN = row.implicit_count;
|
|
523
|
+
const inlineN = row.inline_count;
|
|
524
|
+
const presentModes = [explicitN > 0, implicitN > 0, inlineN > 0].filter(Boolean).length;
|
|
525
|
+
let mode;
|
|
526
|
+
if (row.call_count === 0)
|
|
527
|
+
mode = null;
|
|
528
|
+
else if (presentModes >= 2)
|
|
529
|
+
mode = 'mixed';
|
|
530
|
+
else if (implicitN > 0)
|
|
531
|
+
mode = 'implicit';
|
|
532
|
+
else if (inlineN > 0)
|
|
533
|
+
mode = 'inline';
|
|
534
|
+
else
|
|
535
|
+
mode = 'explicit';
|
|
536
|
+
const denom = row.implicit_cached_tokens + row.implicit_uncached_tokens;
|
|
537
|
+
const implicitHitRate = denom > 0 ? row.implicit_cached_tokens / denom : 0;
|
|
538
|
+
return {
|
|
539
|
+
mode,
|
|
540
|
+
callCount: row.call_count,
|
|
541
|
+
implicitCallsTotal: row.implicit_count,
|
|
542
|
+
implicitCallsWithHit: row.implicit_hit_count,
|
|
543
|
+
implicitCachedTokens: row.implicit_cached_tokens,
|
|
544
|
+
implicitUncachedTokens: row.implicit_uncached_tokens,
|
|
545
|
+
implicitHitRate,
|
|
546
|
+
explicitRebuildCount: rebuilds.n,
|
|
547
|
+
inlineCallCount: row.inline_count,
|
|
548
|
+
};
|
|
549
|
+
}
|
|
329
550
|
}
|
|
330
551
|
//# sourceMappingURL=db.js.map
|
package/dist/manifest/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/manifest/db.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,QAA2C,MAAM,gBAAgB,CAAC;AAEzE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpE,MAAM,cAAc,GAAG,GAAG,CAAC;AAE3B,6GAA6G;AAC7G,MAAM,UAAU,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6ClB,CAAC;AAEF,SAAS,cAAc,CAAC,GAA4B;IAClD,MAAM,UAAU,GAAG,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1E,IAAI,OAAO,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;IAChG,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,wEAAwE;QACxE,kEAAkE;QAClE,oEAAoE;QACpE,MAAM,CAAC,IAAI,CACT,qDAAqD,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,KAAK,MAAM,CAAC,GAAG,CAAC,oBAAoB,CACpH,CAAC;QACF,OAAO,GAAG,EAAE,CAAC;IACf,CAAC;IACD,OAAO;QACL,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;QACzC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;QACjC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC;QACxB,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC,kBAAkB,IAAI,EAAE,CAAC;QACtD,OAAO,EAAG,GAAG,CAAC,QAA0B,IAAI,IAAI;QAChD,cAAc,EAAG,GAAG,CAAC,gBAAkC,IAAI,IAAI;QAC/D,OAAO;QACP,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;QACjC,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;KAClC,CAAC;AACJ,CAAC;AAED,SAAS,SAAS,CAAC,GAA4B;IAC7C,OAAO;QACL,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;QACzC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC;QAC5B,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC;QACrC,MAAM,EAAG,GAAG,CAAC,OAAyB,IAAI,IAAI;QAC9C,UAAU,EAAG,GAAG,CAAC,WAA6B,IAAI,IAAI;QACtD,SAAS,EAAG,GAAG,CAAC,UAA4B,IAAI,IAAI;KACrD,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,UAAU;IACJ,EAAE,CAAe;IAElC,YAAY,YAAqB;QAC/B,MAAM,MAAM,GAAG,YAAY,IAAI,cAAc,EAAE,CAAC;QAChD,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,eAAe,EAAE,CAAC;QAC1E,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,EAAE,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QACrC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;QAEpC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzB,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3F,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,IAAI,CAAC,EAAE;iBACJ,OAAO,CAAC,mDAAmD,CAAC;iBAC5D,GAAG,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,KAAK;QACH,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC;IAED,YAAY,CAAC,aAAqB;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CAAC,mDAAmD,CAAC;aAC5D,GAAG,CAAC,aAAa,CAAwC,CAAC;QAC7D,OAAO,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,eAAe,CAAC,EAAgB;QAC9B,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;;;;;4CAWoC,CACrC;aACA,GAAG,CACF,EAAE,CAAC,aAAa,EAChB,EAAE,CAAC,SAAS,EACZ,EAAE,CAAC,KAAK,EACR,EAAE,CAAC,gBAAgB,EACnB,EAAE,CAAC,OAAO,EACV,EAAE,CAAC,cAAc,EACjB,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,EAC1B,EAAE,CAAC,SAAS,EACZ,EAAE,CAAC,SAAS,CACb,CAAC;IACN,CAAC;IAED,eAAe,CAAC,aAAqB;QACnC,0EAA0E;QAC1E,sEAAsE;QACtE,8DAA8D;QAC9D,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,iDAAiD,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IACxF,CAAC;IAED,QAAQ,CAAC,aAAqB;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE;aACjB,OAAO,CAAC,+DAA+D,CAAC;aACxE,GAAG,CAAC,aAAa,CAA8B,CAAC;QACnD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC7B,CAAC;IAED,UAAU,CAAC,IAAa;QACtB,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;;;;;4CAOoC,CACrC;aACA,GAAG,CACF,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,SAAS,CACf,CAAC;IACN,CAAC;IAED,UAAU,CAAC,aAAqB,EAAE,OAAe;QAC/C,IAAI,CAAC,EAAE;aACJ,OAAO,CAAC,4DAA4D,CAAC;aACrE,GAAG,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACjC,CAAC;IAED,0EAA0E;IAC1E,gBAAgB,CAAC,aAAqB,EAAE,WAAmB,EAAE,KAAa;QACxE,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QACtE,OAAO,GAAG,EAAE,MAAM,IAAI,IAAI,CAAC;IAC7B,CAAC;IAED;;;;OAIG;IACH,iBAAiB,CAAC,aAAqB,EAAE,WAAmB,EAAE,KAAa;QACzE,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;iBAGS,CACV;aACA,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAwC,CAAC;QACjF,OAAO,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;IAED,iBAAiB,CAAC,MAAsB;QACtC,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;;2CAGmC,CACpC;aACA,GAAG,CACF,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,cAAc,EACrB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,UAAU,EACjB,MAAM,CAAC,UAAU,CAClB,CAAC;IACN,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACH,aAAa,CAAC,IAOb;QAGC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,aAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,WAAW,CAC7B,GAEuF,EAAE;YACvF,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;iBAChB,OAAO,CACN,4FAA4F,CAC7F;iBACA,GAAG,CAAC,OAAO,CAAsB,CAAC;YACrC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;YAC7B,IAAI,KAAK,GAAG,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC9D,OAAO;oBACL,QAAQ,EAAE,IAAI;oBACd,WAAW,EAAE,KAAK;oBAClB,SAAS,EAAE,IAAI,CAAC,iBAAiB;oBACjC,cAAc,EAAE,IAAI,CAAC,mBAAmB;iBACzC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE;iBACnB,OAAO,CACN;;;+CAGmC,CACpC;iBACA,GAAG,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5F,OAAO,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,CAAC,CACF,CAAC;QAEF,yEAAyE;QACzE,oEAAoE;QACpE,iEAAiE;QACjE,OAAO,GAAG,CAAC,SAAS,EAAE,CAAC;IACzB,CAAC;IAED;;;OAGG;IACH,yBAAyB,CACvB,aAAqB,EACrB,IAKC;QAED,qEAAqE;QACrE,iEAAiE;QACjE,mEAAmE;QACnE,+DAA+D;QAC/D,oEAAoE;QACpE,yEAAyE;QACzE,qEAAqE;QACrE,uEAAuE;QACvE,+DAA+D;QAC/D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,EAAE;aACJ,OAAO,CACN;;sBAEc,CACf;aACA,GAAG,CACF,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,YAAY,EACjB,cAAc,EACd,aAAa,CACd,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,uBAAuB,CAAC,aAAqB;QAC3C,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC/E,CAAC;IAED;;;2EAGuE;IACvE,gBAAgB,CAAC,KAAa;QAC5B,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,aAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN,4FAA4F,CAC7F;aACA,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,CAAsB,CAAC;QACrD,OAAO,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;IACxB,CAAC;IAED;;;;;;;;;;OAUG;IACH,4BAA4B,CAAC,KAAa;QACxC,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;QACtC,aAAa,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN,gHAAgH,CACjH;aACA,GAAG,CAAC,aAAa,CAAC,OAAO,EAAE,CAAsB,CAAC;QACrD,OAAO,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,kEAAkE;IAClE,cAAc,CAAC,aAAqB;QAgBlC,MAAM,GAAG,GAAG,IAAI,CAAC,EAAE;aAChB,OAAO,CACN;;;;;;qDAM6C,CAC9C;aACA,GAAG,CAAC,aAAa,CAMnB,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE;aACpB,OAAO,CACN;uDAC+C,CAChD;aACA,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAsB,CAAC;QAE1E,OAAO;YACL,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,iBAAiB,EAAE,GAAG,CAAC,YAAY;YACnC,mBAAmB,EAAE,GAAG,CAAC,cAAc;YACvC,eAAe,EAAE,GAAG,CAAC,UAAU;YAC/B,sBAAsB,EAAE,GAAG,CAAC,SAAS;YACrC,iBAAiB,EAAE,OAAO,CAAC,KAAK;SACjC,CAAC;IACJ,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../src/manifest/db.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/ask.tool.d.ts
CHANGED
|
@@ -20,6 +20,8 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
20
20
|
timeoutMs: z.ZodOptional<z.ZodNumber>;
|
|
21
21
|
stallMs: z.ZodOptional<z.ZodNumber>;
|
|
22
22
|
preflightMode: z.ZodOptional<z.ZodEnum<["heuristic", "exact", "auto"]>>;
|
|
23
|
+
cachingMode: z.ZodOptional<z.ZodEnum<["explicit", "implicit"]>>;
|
|
24
|
+
forceRescan: z.ZodOptional<z.ZodBoolean>;
|
|
23
25
|
onWorkspaceTooLarge: z.ZodOptional<z.ZodEnum<["error", "fallback-to-agentic"]>>;
|
|
24
26
|
}, "strip", z.ZodTypeAny, {
|
|
25
27
|
prompt: string;
|
|
@@ -34,6 +36,8 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
34
36
|
noCache?: boolean | undefined;
|
|
35
37
|
stallMs?: number | undefined;
|
|
36
38
|
preflightMode?: "exact" | "heuristic" | "auto" | undefined;
|
|
39
|
+
cachingMode?: "explicit" | "implicit" | undefined;
|
|
40
|
+
forceRescan?: boolean | undefined;
|
|
37
41
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
38
42
|
}, {
|
|
39
43
|
prompt: string;
|
|
@@ -48,6 +52,8 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
48
52
|
noCache?: boolean | undefined;
|
|
49
53
|
stallMs?: number | undefined;
|
|
50
54
|
preflightMode?: "exact" | "heuristic" | "auto" | undefined;
|
|
55
|
+
cachingMode?: "explicit" | "implicit" | undefined;
|
|
56
|
+
forceRescan?: boolean | undefined;
|
|
51
57
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
52
58
|
}>, {
|
|
53
59
|
prompt: string;
|
|
@@ -62,6 +68,8 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
62
68
|
noCache?: boolean | undefined;
|
|
63
69
|
stallMs?: number | undefined;
|
|
64
70
|
preflightMode?: "exact" | "heuristic" | "auto" | undefined;
|
|
71
|
+
cachingMode?: "explicit" | "implicit" | undefined;
|
|
72
|
+
forceRescan?: boolean | undefined;
|
|
65
73
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
66
74
|
}, {
|
|
67
75
|
prompt: string;
|
|
@@ -76,6 +84,8 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
76
84
|
noCache?: boolean | undefined;
|
|
77
85
|
stallMs?: number | undefined;
|
|
78
86
|
preflightMode?: "exact" | "heuristic" | "auto" | undefined;
|
|
87
|
+
cachingMode?: "explicit" | "implicit" | undefined;
|
|
88
|
+
forceRescan?: boolean | undefined;
|
|
79
89
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
80
90
|
}>;
|
|
81
91
|
export type AskInput = z.infer<typeof askInputSchema>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAsC7E,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAKH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAcxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAsC7E,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqGvB,CAAC;AAEL,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,OAAO,EAAE,cAAc,CAAC,QAAQ,CAa5C,CAAC"}
|
package/dist/tools/ask.tool.js
CHANGED
|
@@ -12,7 +12,7 @@ import { isStaleCacheError, markCacheStale, prepareContext } from '../cache/cach
|
|
|
12
12
|
import { resolveModel } from '../gemini/models.js';
|
|
13
13
|
import { abortableSleep, withNetworkRetry } from '../gemini/retry.js';
|
|
14
14
|
import { countForPreflight } from '../gemini/token-counter.js';
|
|
15
|
-
import { scanWorkspace } from '../indexer/workspace-scanner.js';
|
|
15
|
+
import { buildScanMemo, scanWorkspace } from '../indexer/workspace-scanner.js';
|
|
16
16
|
import { WorkspaceValidationError, validateWorkspacePath, } from '../indexer/workspace-validation.js';
|
|
17
17
|
import { estimateCostUsd, estimatePreCallCostUsd, toMicrosUsd } from '../utils/cost-estimator.js';
|
|
18
18
|
import { logger, safeForLog } from '../utils/logger.js';
|
|
@@ -108,6 +108,14 @@ export const askInputSchema = z
|
|
|
108
108
|
.enum(['heuristic', 'exact', 'auto'])
|
|
109
109
|
.optional()
|
|
110
110
|
.describe("Token-count strategy for the WORKSPACE_TOO_LARGE preflight (v1.10.0+). `'heuristic'` = bytes/4 fast estimate (skips API call; coarse — undercounts dense Unicode by 30-50%). `'exact'` = always call Gemini's `countTokens` (free, no quota share with `generateContent`; ~hundreds of ms per call; cached per (filesHash + prompt + model) — `filesHash` is post-glob-filter so changing globs that resolve to different files invalidates automatically). `'auto'` (default, recommended) = heuristic when the workspace is well under 50% of the model's input limit; exact when near the cliff where accuracy matters. Use `'exact'` in CI / tests where you want predictable, accurate behaviour regardless of size."),
|
|
111
|
+
cachingMode: z
|
|
112
|
+
.enum(['explicit', 'implicit'])
|
|
113
|
+
.optional()
|
|
114
|
+
.describe("Cache strategy for the workspace context. **`'implicit'` (default since v1.14.0)** skips `caches.create` entirely; file content is sent inline every call and Gemini 2.5+/3 Pro applies its automatic implicit caching on the repeated workspace prefix when prefix matches across calls. Optimised for the review→edit→review workflow — no 60–180 s rebuild wait when files change between queries. **`'explicit'`** builds a Gemini Context Cache via `caches.create` — guaranteed ~75% discount on cached input tokens, but pays the rebuild cost on every file change. Use explicit when you need predictable per-call costs more than warm-path latency; the trade-off is documented in Gemini's docs as 'no cost saving guarantee' for implicit caching. Hit rate is observable via `status.structuredContent.caching.implicitHitRate`. Operator-level override available via env `GEMINI_CODE_CONTEXT_CACHING_MODE`."),
|
|
115
|
+
forceRescan: z
|
|
116
|
+
.boolean()
|
|
117
|
+
.optional()
|
|
118
|
+
.describe('Bypass the v1.13.0 scan memo and re-hash every file in the workspace (default `false`). The scan memo skips per-file SHA256 when `mtime_ms` and `size` match the previously-stored values — typically ~95% of files on a warm rescan, cutting scan wall-clock by ≥10× on large workspaces. Set this when you suspect the manifest is stale (e.g. files mutated outside the dev workflow, NTP clock-skew, or you ran `git checkout` on a directory tree). Equivalent to setting env `GEMINI_CODE_CONTEXT_FORCE_RESCAN=true` for a single call.'),
|
|
111
119
|
onWorkspaceTooLarge: z
|
|
112
120
|
.enum(['error', 'fallback-to-agentic'])
|
|
113
121
|
.optional()
|
|
@@ -185,11 +193,18 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
185
193
|
});
|
|
186
194
|
resolvedModelKey = resolved.resolved;
|
|
187
195
|
emitter.emit(`scanning workspace ${workspaceRoot}…`);
|
|
196
|
+
// v1.13.0 — build the scan memo from previously-stored file rows so the
|
|
197
|
+
// scanner can skip re-hashing files whose mtime+size haven't changed.
|
|
198
|
+
// First-run on a new workspace produces an empty map (= every file
|
|
199
|
+
// hashes), which matches pre-v1.13 behaviour.
|
|
200
|
+
const scanMemo = buildScanMemo(ctx.manifest.getFiles(workspaceRoot));
|
|
188
201
|
const scan = await scanWorkspace(workspaceRoot, {
|
|
189
202
|
...(input.includeGlobs !== undefined ? { includeGlobs: input.includeGlobs } : {}),
|
|
190
203
|
...(input.excludeGlobs !== undefined ? { excludeGlobs: input.excludeGlobs } : {}),
|
|
191
204
|
maxFiles: ctx.config.maxFilesPerWorkspace,
|
|
192
205
|
maxFileSizeBytes: ctx.config.maxFileSizeBytes,
|
|
206
|
+
manifestMemo: scanMemo,
|
|
207
|
+
forceRescan: input.forceRescan === true || ctx.config.forceRescan === true,
|
|
193
208
|
});
|
|
194
209
|
// Output-cap strategy (v1.4.0): three-layer precedence.
|
|
195
210
|
//
|
|
@@ -541,6 +556,15 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
541
556
|
.update(SYSTEM_INSTRUCTION_Q_AND_A)
|
|
542
557
|
.digest('hex')
|
|
543
558
|
.slice(0, 16);
|
|
559
|
+
// v1.14.0 — `cachingMode` default flipped to `'implicit'`: Gemini 2.5+/3
|
|
560
|
+
// Pro applies its automatic implicit caching to repeated workspace prefixes,
|
|
561
|
+
// eliminating the 60–180 s `caches.create` rebuild wait on the
|
|
562
|
+
// review→edit→review path. Per-call `input.cachingMode` always wins;
|
|
563
|
+
// env-level override `GEMINI_CODE_CONTEXT_CACHING_MODE` lets operators force
|
|
564
|
+
// `'explicit'` when they need predictable per-call billing more than
|
|
565
|
+
// warm-path speed. Telemetry on the actual mode (vs requested) is computed
|
|
566
|
+
// AFTER `prepareContext` returns from `activePrep.inlineOnly` — see FN2 fix.
|
|
567
|
+
const requestedCachingMode = input.cachingMode ?? ctx.config.cachingMode;
|
|
544
568
|
const ctxPrep = await prepareContext({
|
|
545
569
|
client: ctx.client,
|
|
546
570
|
manifest: ctx.manifest,
|
|
@@ -554,6 +578,8 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
554
578
|
allowCaching: !input.noCache && scan.files.length > 0,
|
|
555
579
|
// v1.12.1 — let `timeoutMs` interrupt the upload phase too.
|
|
556
580
|
signal: abortSignal,
|
|
581
|
+
// v1.13.0 — opt-in implicit caching path (skip caches.create).
|
|
582
|
+
cachingMode: requestedCachingMode,
|
|
557
583
|
});
|
|
558
584
|
// TPM throttle reservation — placed HERE (after `prepareContext`,
|
|
559
585
|
// immediately before `generateContent`) so the reservation's `tsMs`
|
|
@@ -711,6 +737,8 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
711
737
|
allowCaching: !input.noCache && scan.files.length > 0,
|
|
712
738
|
// v1.12.1 — propagate signal into stale-cache rebuild too.
|
|
713
739
|
signal: abortSignal,
|
|
740
|
+
// v1.13.0 — keep cachingMode consistent across happy + retry paths.
|
|
741
|
+
cachingMode: requestedCachingMode,
|
|
714
742
|
});
|
|
715
743
|
// Cancel the original throttle reservation — its `tsMs` was
|
|
716
744
|
// stamped at first-dispatch time, which is now seconds in the
|
|
@@ -803,6 +831,15 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
803
831
|
thinkingTokens: thinking,
|
|
804
832
|
});
|
|
805
833
|
const costMicros = toMicrosUsd(cost);
|
|
834
|
+
// v1.13.0 round-2 (FN2 fix): see code.tool.ts for the full rationale.
|
|
835
|
+
// - cacheId !== null → 'explicit'
|
|
836
|
+
// - inlineOnly && implicit-requested → 'implicit'
|
|
837
|
+
// - inlineOnly && other → 'inline' (forced — noCache, below cacheMinTokens)
|
|
838
|
+
const effectiveCachingMode = activePrep.inlineOnly
|
|
839
|
+
? requestedCachingMode === 'implicit'
|
|
840
|
+
? 'implicit'
|
|
841
|
+
: 'inline'
|
|
842
|
+
: 'explicit';
|
|
806
843
|
const durationMs = Date.now() - started;
|
|
807
844
|
if (reservationId !== null) {
|
|
808
845
|
// The finalize UPDATE on a row we just inserted should be infallible
|
|
@@ -818,6 +855,8 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
818
855
|
uncachedTokens: uncached,
|
|
819
856
|
costUsdMicro: costMicros,
|
|
820
857
|
durationMs,
|
|
858
|
+
cachingMode: effectiveCachingMode,
|
|
859
|
+
cachedContentTokenCount: cached,
|
|
821
860
|
});
|
|
822
861
|
}
|
|
823
862
|
catch (finalizeErr) {
|
|
@@ -835,6 +874,8 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
835
874
|
costUsdMicro: costMicros,
|
|
836
875
|
durationMs,
|
|
837
876
|
occurredAt: Date.now(),
|
|
877
|
+
cachingMode: effectiveCachingMode,
|
|
878
|
+
cachedContentTokenCount: cached,
|
|
838
879
|
});
|
|
839
880
|
}
|
|
840
881
|
if (scan.truncated) {
|