@qmediat.io/gemini-code-context-mcp 1.8.0 → 1.10.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 +69 -0
- package/dist/cache/cache-manager.d.ts.map +1 -1
- package/dist/cache/cache-manager.js +8 -8
- package/dist/cache/cache-manager.js.map +1 -1
- package/dist/cache/files-uploader.js +2 -2
- package/dist/cache/files-uploader.js.map +1 -1
- package/dist/cache/ttl-watcher.js +3 -3
- package/dist/cache/ttl-watcher.js.map +1 -1
- package/dist/gemini/token-counter.d.ts +129 -0
- package/dist/gemini/token-counter.d.ts.map +1 -0
- package/dist/gemini/token-counter.js +317 -0
- package/dist/gemini/token-counter.js.map +1 -0
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/indexer/globs.d.ts +14 -0
- package/dist/indexer/globs.d.ts.map +1 -1
- package/dist/indexer/globs.js +17 -0
- package/dist/indexer/globs.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/tools/agentic/sandbox.d.ts +26 -1
- package/dist/tools/agentic/sandbox.d.ts.map +1 -1
- package/dist/tools/agentic/sandbox.js.map +1 -1
- package/dist/tools/agentic/workspace-tools.d.ts +5 -4
- package/dist/tools/agentic/workspace-tools.d.ts.map +1 -1
- package/dist/tools/agentic/workspace-tools.js +148 -56
- package/dist/tools/agentic/workspace-tools.js.map +1 -1
- package/dist/tools/ask-agentic.tool.d.ts +10 -0
- package/dist/tools/ask-agentic.tool.d.ts.map +1 -1
- package/dist/tools/ask-agentic.tool.js +55 -12
- package/dist/tools/ask-agentic.tool.js.map +1 -1
- package/dist/tools/ask.tool.d.ts +13 -8
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +62 -13
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts +13 -8
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +43 -8
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/utils/logger.d.ts +37 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +0 -0
- package/dist/utils/logger.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,75 @@ All notable changes to `@qmediat.io/gemini-code-context-mcp` will be documented
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [1.10.0] - 2026-04-28
|
|
9
|
+
|
|
10
|
+
### Added — accurate `countTokens`-based preflight (Phase 2 of the v1.9.0 plan; T17 closure)
|
|
11
|
+
|
|
12
|
+
The v1.5.0 workspace-size preflight used `Math.ceil(bytes/4)` as a token estimate. That heuristic undercounts dense Unicode (CJK, emoji, minified JS) by 30-50 % — a workspace estimated as "fits" can in fact exceed `inputTokenLimit`, the request fires, Gemini returns `400 INVALID_ARGUMENT`, and the user has paid for the round-trip plus the eager Files API upload that preceded it. v1.10.0 replaces the heuristic with a two-tier strategy that calls Gemini's `models.countTokens` API for an exact count when accuracy matters, and falls back gracefully when the API is unavailable.
|
|
13
|
+
|
|
14
|
+
- **New module** `src/gemini/token-counter.ts` exporting `countForPreflight()` — a two-tier preflight token counter:
|
|
15
|
+
- **Tier 1 — heuristic gate (fast path).** If the `bytes/4 + prompt/4` estimate is well under the cliff (< 50 % of the model's `inputTokenLimit`), skip the API call and accept the heuristic. Saves a round-trip on small repos that obviously fit. The 50 % cutoff guarantees we never trust the heuristic near the threshold.
|
|
16
|
+
- **Tier 2 — exact count.** Otherwise call `client.models.countTokens({ model, contents })` with the same payload shape we'll send to `generateContent`. Use `totalTokens` for the threshold check. Per the v1.9.0 probe (run against a paid key, results documented in the v1.10.0 internal plan), `countTokens` is billed at $0, shares no RPM quota with `generateContent` (30 calls in 2.9 s, zero 429s), and accepts at least 7 MB payloads (1.8M-token workspaces fit comfortably).
|
|
17
|
+
- **In-process LRU cache.** Keyed on `SHA256(filesHash + promptHash + model)` — `filesHash` is already computed by the workspace scanner POST-glob-filter, so two glob configs that resolve to the same file set share the cache key (no separate `globsHash` axis needed; including one would only cause unnecessary cache misses on equivalent glob expressions). 256-entry capacity (~20 KB resident). TTL = process lifetime; no manifest persistence needed because the upstream `filesHash` already covers staleness.
|
|
18
|
+
- **`SYSTEM_INSTRUCTION_RESERVE = 1 000` tokens.** The Gemini Developer API rejects `systemInstruction` on `countTokens` (probe Q3) — the SDK exposes the field but the wire-level API returns a 400. We add 1 000 tokens to the comparison threshold to cover system instructions + tool declarations that the exact count misses on the Developer API path. Vertex API behaviour pending verification; the reserve is a conservative upper bound for both tiers.
|
|
19
|
+
- **Graceful degradation.** On any API failure (HTTP 429 / 500 / network error / SDK shape mismatch / non-numeric `totalTokens`), log warn (with all interpolated values flowing through `safeForLog` per v1.9.0) and fall back to `Math.ceil(bytes / 3)` — a 1.33× safety multiplier vs the legacy heuristic, sized to cover the empirical 30-50 % CJK undercount. Never throws; never makes the user re-run.
|
|
20
|
+
- **New `preflightMode` schema field on `ask` and `code`:** `'heuristic'` | `'exact'` | `'auto'` (default `'auto'`). `'heuristic'` and `'exact'` are escape hatches for users who want predictable behaviour (CI pipelines, deterministic tests) or want to skip the API round-trip cost. `'auto'` matches today's behaviour for small repos and adds the exact-count guard for repos near the cliff.
|
|
21
|
+
- **New structured-content metadata fields on success and on `WORKSPACE_TOO_LARGE`:** `tokenCountMethod: 'heuristic' | 'exact' | 'fallback'`, `rawTokenCount: number` (the count before `SYSTEM_INSTRUCTION_RESERVE` is added on the `'exact'` path), and `tokenCountCacheHit: boolean` (whether an `'exact'` count came from the in-process LRU rather than a fresh API round-trip). Visible in tool output for orchestrators that want to make policy decisions on which path produced the count.
|
|
22
|
+
- **`AbortSignal` threading through preflight (T17 follow-up).** The user's `timeoutMs` `AbortController` (v1.6.0) is now wired into `countForPreflight` and onward into `client.models.countTokens` via the SDK's `CountTokensConfig.abortSignal`. Pre-v1.10.0 fix the preflight phase ignored the timeout — a hung `countTokens` request could outlast the user's stated wall-clock budget. On cancellation the SDK throws `AbortError`, which `countForPreflight` RE-THROWS (rather than swallowing as a `bytes/3` fallback) so the caller's outer `try/catch` maps it to `errorCode: 'TIMEOUT'` immediately — preventing the `ask` flow from continuing to eager Files API upload after the user already asked us to abort. Non-abort errors (429, network, malformed response) still take the graceful-degradation path.
|
|
23
|
+
- **Defensive payload-size cap on tier-2.** When the projected `contents` payload would exceed 32 MB, the tier-2 path skips the API and falls back to the `bytes/3` heuristic. The cap accounting uses **UTF-8 byte length** (not `string.length`, which counts UTF-16 code units and would let CJK / emoji content slip past the bound by 2-3×), and the projected size is checked **before** materializing the unreadable-file `'a'.repeat(file.size)` placeholder so a single huge unreadable file can't OOM the process before the cap fires. The prompt's UTF-8 byte length is also included in the accounting (a giant prompt against a small workspace would otherwise evade the cap). Today's defaults (`maxFilesPerWorkspace: 2_000`, `maxFileSizeBytes: 1_000_000`) plus the heuristic-tier gate keep typical workspaces well below this cap; the bound future-proofs against config bumps and adversarial inputs.
|
|
24
|
+
- **`countForPreflight` payload shape now matches `cache-manager`.** Pre-v1.10.0 fix the preflight payload used a `// {relpath}\n${text}` separator while the real `generateContent` send (`buildContentFromUploaded` / `buildInlineContentFromDisk` in `cache-manager.ts`) uses `\n\n--- FILE: {relpath} ---\n${text}\n`. The divergence systematically undercounted exact tokens by ~6-8 per file (~10 k tokens drift on a 1.5 k-file workspace), letting some near-cliff workspaces slip past the preflight only to be 400'd by Gemini after the eager upload. The token-counter now uses the same marker the real call sees.
|
|
25
|
+
- **35 tests** in `test/unit/token-counter.test.ts` (was 23, +12): the original tier-1 / tier-2 / cache / fallback / payload-shape coverage, plus pin tests for the new `cacheHit` field across all four paths, the `AbortSignal` plumbing (provided / omitted / abort fires graceful fallback), the 32 MB payload cap, the `'auto'` mode boundary at exactly the 50 % cutoff (strict `<`), 256-entry LRU eviction at capacity overflow, and concurrent-call behaviour (two parallel calls on the same key both miss the cache today; pinned so any future in-flight de-dupe is a deliberate, observable change).
|
|
26
|
+
|
|
27
|
+
### Changed — `WORKSPACE_TOO_LARGE` is now exact, not heuristic
|
|
28
|
+
|
|
29
|
+
Pre-v1.10.0, `structuredContent.estimatedInputTokens` was always the `bytes/4` heuristic. v1.10.0 reports the exact `countTokens` result on the tier-2 path — meaning a CJK-heavy repo that previously slipped past the v1.5.0 guard and hit a Gemini 400 is now caught client-side with an actionable error before any billable round-trip fires. Users on `preflightMode: 'heuristic'` (opt-in) or workspaces below the 50 % auto cutoff retain the old behaviour. **No breaking schema change** — `estimatedInputTokens` field shape unchanged; only its accuracy improves on the relevant code path.
|
|
30
|
+
|
|
31
|
+
### Notes
|
|
32
|
+
|
|
33
|
+
- The v1.5.0 failure mode (where an undercounting heuristic let oversized workspaces pass preflight, then `prepareContext` eagerly uploaded to Files API, then `generateContent` returned 400 INVALID_ARGUMENT — wasting bandwidth on a guaranteed-to-fail call) is closed for the heuristic-vs-real-count axis in v1.10.0 but the eager-upload code path itself remains; the architectural close (`ask` → `ask_agentic` auto-fallback on `WORKSPACE_TOO_LARGE` so the agentic loop reads files only as needed instead of uploading the whole workspace eagerly) is Phase 3, tracked for a subsequent release.
|
|
34
|
+
- Phase 4 (heartbeat-aware stall detector replacing the wall-clock `timeoutMs` semantics) deferred to a subsequent release.
|
|
35
|
+
- Zero breaking changes. All schema fields additive and optional. The `preflightMode` field defaults to `'auto'` which preserves the v1.9.0 fast path on small repos.
|
|
36
|
+
|
|
37
|
+
## [1.9.0] - 2026-04-27
|
|
38
|
+
|
|
39
|
+
### Added — `ask_agentic` glob parity with `ask`/`code` (Phase 1 of the v1.9.0 plan)
|
|
40
|
+
|
|
41
|
+
`ask_agentic`'s input schema now accepts the same `includeGlobs` / `excludeGlobs` shape as `ask` / `code`. Every executor (`list_directory`, `find_files`, `read_file`, `grep`) honours the user's filters: refused paths surface as `SandboxError` with codes `EXCLUDED_DIR` / `EXCLUDED_FILE` (new) and the four executors share one filtering predicate (`isFileIncluded` / `isPathExcluded` from `src/indexer/globs.ts`) with the eager scanner — agentic / eager divergence closed.
|
|
42
|
+
|
|
43
|
+
This is the prerequisite for the v1.x roadmap's `ask` → `ask_agentic` auto-fallback on `WORKSPACE_TOO_LARGE` (separate release, separate plan): without consistent glob honouring, a fallback would silently drop user-supplied excludes — a privacy regression. Phase 1 closes that.
|
|
44
|
+
|
|
45
|
+
- **Schema**: `includeGlobs?: string[]` and `excludeGlobs?: string[]` on `ask_agentic` (mirrors of `ask`/`code` shape and docstring).
|
|
46
|
+
- **Executors**: `listDirectoryExecutor`, `findFilesExecutor`, `readFileExecutor`, `grepExecutor` accept an optional `matchConfig?: MatchConfig` parameter. When omitted, `defaultMatchConfig({})` is used — backwards compatible with pre-v1.9.0 test call-sites and direct callers.
|
|
47
|
+
- **Top-level dir gate** (Phase 1.1 hardening, /6step finding): `list_directory` and `grep` (when `pathPrefix` given) now check `isPathExcluded(target.relpath, config)` BEFORE `readdir` / walk fires, throwing `SandboxError('EXCLUDED_DIR')` on hit. Without this gate the model could probe path existence by comparing success vs `NOT_FOUND` from `resolveInsideWorkspace` (the sandbox layer only checks `DEFAULT_EXCLUDE_DIRS`, not user globs).
|
|
48
|
+
- **Privacy-aware error messages** (Phase 1.1 hardening): `EXCLUDED_FILE` and `EXCLUDED_DIR` use a generic `.message` that does NOT echo the excluded path — closes the existence-probe oracle via error-string differential. The path is preserved on `SandboxError.requestedPath` for ops logging only. `NON_SOURCE_FILE` retains the path in its message (different threat model — that's a "wrong tool" signal, not privacy-bearing).
|
|
49
|
+
- **Single source of truth for include-extension matching** (Phase 1.1 hardening): new `matchesAnyIncludeExtension(relpath, config)` exported from `src/indexer/globs.ts`. `isFileIncluded` delegates to it; `readFileExecutor` uses it for the `NON_SOURCE_FILE` vs `EXCLUDED_FILE` discriminator. Drift-proof — any future change to include-pattern matching updates one function, not two.
|
|
50
|
+
|
|
51
|
+
### Added — log-injection defense via `safeForLog` helper (Phase 1.3, project-wide)
|
|
52
|
+
|
|
53
|
+
A `/6step` audit on Phase 1.2 surfaced that the new debug logger interpolated model-controlled values directly via template strings — a `\n` in the value forges a fake one-line log record (log injection). The pattern was pre-existing across 16 logger call sites in the codebase. v1.9.0 closes the entire pattern, not just the new line.
|
|
54
|
+
|
|
55
|
+
- **New export** `safeForLog(value: unknown): string` from `src/utils/logger.ts`. Escapes `\n`, `\r`, `\t`, and the rest of the C0 control range as `\\n` / `\\r` / `\\t` / `\\xNN`. UTF-8 above the C0 range (emoji, CJK, accents) preserved untouched. Hard-caps each value at 2 000 chars with deterministic `…[+N more]` overflow suffix to prevent multi-MB error bodies from pinning a single log line at megabytes.
|
|
56
|
+
- **Migrated** every untrusted-input logger interpolation across the project — 16 pre-existing call sites + 1 new (the `agentic dispatch refused` debug line introduced in this release) = **17 logger calls in 8 files** now wrap untrusted values in `safeForLog`: `server.ts`, `index.ts`, `ask*.tool.ts`, `code.tool.ts`, `cache-manager.ts`, `files-uploader.ts`, `ttl-watcher.ts`, `ask-agentic.tool.ts`. Logger calls with internal-only values (numeric counts, validated signal names, validated model IDs) left as-is.
|
|
57
|
+
- **18 new tests** in `test/unit/logger.test.ts` pinning the threat model: log-injection escapes, flood-defense truncation, type coverage (`Error` / `null` / `undefined` / `number` / `boolean` / `object` dispatch), and safety-under-repeated-application (the helper documents that re-applying never introduces new injection vectors but is NOT byte-for-byte idempotent on inputs straddling the truncation cap — a corrected docstring claim caught by Phase 1.3's audit).
|
|
58
|
+
|
|
59
|
+
### Added — `agentic dispatch refused` debug log (Phase 1.2)
|
|
60
|
+
|
|
61
|
+
When an agentic tool call is refused (`EXCLUDED_FILE` / `EXCLUDED_DIR` / etc.), the dispatcher now writes a one-line debug log to stderr containing `tool=<name> code=<sandbox-code> requestedPath=<path>`. The user-visible (LLM-facing) error message stays generic to close the existence-probe oracle; this debug line gives operators a way to map "user reports my file is being blocked" to a specific path without writing custom instrumentation. **Path disclosure here is opt-in** via `GEMINI_CODE_CONTEXT_LOG_LEVEL=debug` — see the new note in [`docs/configuration.md`](./docs/configuration.md). All interpolated values flow through `safeForLog`.
|
|
62
|
+
|
|
63
|
+
### Documentation
|
|
64
|
+
|
|
65
|
+
- **[`docs/configuration.md`](./docs/configuration.md)** — `GEMINI_CODE_CONTEXT_LOG_LEVEL` entry expanded with explicit guidance on the debug-level path disclosure and the `safeForLog` escape contract.
|
|
66
|
+
- **[`docs/ACCEPTED-RISKS.md`](./docs/ACCEPTED-RISKS.md)** — new entry documenting the symlink-bypass on user `excludeGlobs`. The user-supplied path is realpath-resolved before glob matching, so a symlink whose name matches an exclude but whose target doesn't (or vice versa) bypasses the user's filter via filesystem topology. Threat narrow (requires intentional symlink + matching exclude pattern + cooperative model), and `AGENTIC_SECRET_BASENAMES` still catches canonical secret names regardless of how the path was reached. Documented with revisit triggers and three available mitigations.
|
|
67
|
+
|
|
68
|
+
### Tests
|
|
69
|
+
|
|
70
|
+
568 → 598 (+30): glob-honouring contract pinned for all four executors (Phase 1, +8); top-level dir gate + privacy-aware error message + asymmetry pinned (Phase 1.1, +4); `safeForLog` threat-model coverage (Phase 1.3, +18). Phase 1.2 added no new tests — the existing Phase 1.1 `requestedPath` assertion now retroactively pins a load-bearing contract once Phase 1.2's `logger.debug` started consuming the field.
|
|
71
|
+
|
|
72
|
+
### Notes
|
|
73
|
+
|
|
74
|
+
- Zero breaking changes. All schema fields are additive and optional. All new error codes are additive to the `SandboxError` union (`EXCLUDED_FILE`, `EXCLUDED_DIR` are new; existing codes unchanged). Pre-v1.9.0 tests and direct executor callers see identical behaviour when no `matchConfig` is passed.
|
|
75
|
+
- `ask` → `ask_agentic` auto-fallback (Phase 3 of the original v1.9.0 plan), `countTokens` accurate preflight (Phase 2), and the heartbeat-aware stall detector (Phase 4) ship in subsequent v1.x releases — Phase 1 is the privacy-hardening foundation those future releases depend on.
|
|
76
|
+
|
|
8
77
|
## [1.8.0] - 2026-04-27
|
|
9
78
|
|
|
10
79
|
### Added — T6: SIGTERM graceful-drain for in-flight tool calls
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../src/cache/cache-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAQ,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAE9E,MAAM,WAAW,eAAe;IAC9B,gFAAgF;IAChF,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;;;;OAKG;IACH,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sDAAsD;IACtD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB;AA4ID,wBAAsB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAajF;
|
|
1
|
+
{"version":3,"file":"cache-manager.d.ts","sourceRoot":"","sources":["../../src/cache/cache-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,WAAW,EAAQ,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAgB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,KAAK,YAAY,EAAwB,MAAM,qBAAqB,CAAC;AAE9E,MAAM,WAAW,eAAe;IAC9B,gFAAgF;IAChF,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B;;;;;OAKG;IACH,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB;;;OAGG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,sDAAsD;IACtD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,OAAO,EAAE,eAAe,CAAC;IACzB,YAAY,EAAE,OAAO,CAAC;CACvB;AA4ID,wBAAsB,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,CAajF;AA4ND;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,IAAI,CAAC,CAuDhB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE;IACnC,QAAQ,EAAE,UAAU,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CASP;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAMvD"}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
* the consecutive-user-role-violation risk on stricter Gemini models.
|
|
19
19
|
*/
|
|
20
20
|
import { readFile } from 'node:fs/promises';
|
|
21
|
-
import { logger } from '../utils/logger.js';
|
|
21
|
+
import { logger, safeForLog } from '../utils/logger.js';
|
|
22
22
|
import { uploadWorkspaceFiles } from './files-uploader.js';
|
|
23
23
|
function ttlString(seconds) {
|
|
24
24
|
return `${Math.max(60, Math.floor(seconds))}s`;
|
|
@@ -121,7 +121,7 @@ async function buildInlineContentFromDisk(scan) {
|
|
|
121
121
|
content = await readFile(f.absolutePath, 'utf8');
|
|
122
122
|
}
|
|
123
123
|
catch (err) {
|
|
124
|
-
logger.warn(`failed to read ${f.relpath}: ${
|
|
124
|
+
logger.warn(`failed to read ${safeForLog(f.relpath)}: ${safeForLog(err)}`);
|
|
125
125
|
continue;
|
|
126
126
|
}
|
|
127
127
|
parts.push({ text: `\n\n--- FILE: ${f.relpath} ---\n${content}\n` });
|
|
@@ -225,7 +225,7 @@ async function doPrepareContext(opts) {
|
|
|
225
225
|
// Google's side). Reordering from the previous build->reuse order was
|
|
226
226
|
// flagged by GPT review.
|
|
227
227
|
if (isUsableExistingCache(existing, scan, model, systemPromptHash, now)) {
|
|
228
|
-
logger.debug(`cache hit: ${existing?.cacheId}`);
|
|
228
|
+
logger.debug(`cache hit: ${safeForLog(existing?.cacheId)}`);
|
|
229
229
|
return {
|
|
230
230
|
cacheId: existing?.cacheId ?? null,
|
|
231
231
|
cacheExpiresAt: existing?.cacheExpiresAt ?? null,
|
|
@@ -296,10 +296,10 @@ async function doPrepareContext(opts) {
|
|
|
296
296
|
if (existing?.cacheId) {
|
|
297
297
|
try {
|
|
298
298
|
await client.caches.delete({ name: existing.cacheId });
|
|
299
|
-
logger.debug(`deleted stale cache ${existing.cacheId} before rebuild`);
|
|
299
|
+
logger.debug(`deleted stale cache ${safeForLog(existing.cacheId)} before rebuild`);
|
|
300
300
|
}
|
|
301
301
|
catch (err) {
|
|
302
|
-
logger.debug(`pre-rebuild cache delete (${existing.cacheId}) failed: ${
|
|
302
|
+
logger.debug(`pre-rebuild cache delete (${safeForLog(existing.cacheId)}) failed: ${safeForLog(err)}`);
|
|
303
303
|
}
|
|
304
304
|
}
|
|
305
305
|
// 7) Build a new cache.
|
|
@@ -345,7 +345,7 @@ async function doPrepareContext(opts) {
|
|
|
345
345
|
};
|
|
346
346
|
}
|
|
347
347
|
catch (err) {
|
|
348
|
-
logger.warn(`cache build failed — falling back to inline parts: ${
|
|
348
|
+
logger.warn(`cache build failed — falling back to inline parts: ${safeForLog(err)}`);
|
|
349
349
|
manifest.upsertWorkspace({
|
|
350
350
|
workspaceRoot: scan.workspaceRoot,
|
|
351
351
|
filesHash: scan.filesHash,
|
|
@@ -391,7 +391,7 @@ export async function invalidateWorkspaceCache(args) {
|
|
|
391
391
|
await args.client.caches.delete({ name: ws.cacheId });
|
|
392
392
|
}
|
|
393
393
|
catch (err) {
|
|
394
|
-
logger.debug(`cache delete (${ws.cacheId}) failed: ${
|
|
394
|
+
logger.debug(`cache delete (${safeForLog(ws.cacheId)}) failed: ${safeForLog(err)}`);
|
|
395
395
|
}
|
|
396
396
|
}
|
|
397
397
|
// De-duplicate fileIds: the manifest's `files` table can have multiple
|
|
@@ -426,7 +426,7 @@ export async function invalidateWorkspaceCache(args) {
|
|
|
426
426
|
await args.client.files.delete({ name: deleteName });
|
|
427
427
|
}
|
|
428
428
|
catch (err) {
|
|
429
|
-
logger.debug(`files.delete (${deleteName}, stored as ${id}) failed: ${
|
|
429
|
+
logger.debug(`files.delete (${safeForLog(deleteName)}, stored as ${safeForLog(id)}) failed: ${safeForLog(err)}`);
|
|
430
430
|
}
|
|
431
431
|
}
|
|
432
432
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-manager.js","sourceRoot":"","sources":["../../src/cache/cache-manager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cache-manager.js","sourceRoot":"","sources":["../../src/cache/cache-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* block on serial HTTP round-trips.
|
|
15
15
|
*/
|
|
16
16
|
import { basename } from 'node:path';
|
|
17
|
-
import { logger } from '../utils/logger.js';
|
|
17
|
+
import { logger, safeForLog } from '../utils/logger.js';
|
|
18
18
|
const FILES_API_TTL_MS = 47 * 3600 * 1000; // 1 h safety margin before 48 h auto-delete
|
|
19
19
|
/**
|
|
20
20
|
* Files are unsafe to reuse when Google is about to delete them. A cache build
|
|
@@ -155,7 +155,7 @@ export async function uploadWorkspaceFiles(args) {
|
|
|
155
155
|
const file = files[i];
|
|
156
156
|
if (r?.status === 'rejected' && file) {
|
|
157
157
|
const message = r.reason instanceof Error ? r.reason.message : String(r.reason);
|
|
158
|
-
logger.warn(`upload failed for ${file.relpath}: ${message}`);
|
|
158
|
+
logger.warn(`upload failed for ${safeForLog(file.relpath)}: ${safeForLog(message)}`);
|
|
159
159
|
failures.push({ relpath: file.relpath, error: message });
|
|
160
160
|
}
|
|
161
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files-uploader.js","sourceRoot":"","sources":["../../src/cache/files-uploader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAKrC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"files-uploader.js","sourceRoot":"","sources":["../../src/cache/files-uploader.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* with a new `ttl` value. We only refresh caches that were used in the last
|
|
6
6
|
* 10 minutes — cold workspaces are allowed to expire.
|
|
7
7
|
*/
|
|
8
|
-
import { logger } from '../utils/logger.js';
|
|
8
|
+
import { logger, safeForLog } from '../utils/logger.js';
|
|
9
9
|
const TICK_MS = 5 * 60 * 1000; // 5 minutes
|
|
10
10
|
const HOT_WINDOW_MS = 10 * 60 * 1000; // used in last 10 minutes
|
|
11
11
|
const REFRESH_IF_EXPIRES_WITHIN_MS = 15 * 60 * 1000;
|
|
@@ -80,7 +80,7 @@ export class TtlWatcher {
|
|
|
80
80
|
});
|
|
81
81
|
const newExpires = now + entry.ttlSeconds * 1000;
|
|
82
82
|
this.manifest.upsertWorkspace({ ...ws, cacheExpiresAt: newExpires, updatedAt: now });
|
|
83
|
-
logger.debug(`refreshed TTL for ${entry.cacheId}`);
|
|
83
|
+
logger.debug(`refreshed TTL for ${safeForLog(entry.cacheId)}`);
|
|
84
84
|
}
|
|
85
85
|
catch (err) {
|
|
86
86
|
// Evict the entry when Gemini reports the cache is gone (deleted
|
|
@@ -97,7 +97,7 @@ export class TtlWatcher {
|
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
99
|
else {
|
|
100
|
-
logger.debug(`ttl refresh failed for ${entry.cacheId}: ${
|
|
100
|
+
logger.debug(`ttl refresh failed for ${safeForLog(entry.cacheId)}: ${safeForLog(err)}`);
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ttl-watcher.js","sourceRoot":"","sources":["../../src/cache/ttl-watcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ttl-watcher.js","sourceRoot":"","sources":["../../src/cache/ttl-watcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Two-tier token counter for the `ask` / `code` workspace-size preflight
|
|
3
|
+
* (v1.10.0+, T17 closure).
|
|
4
|
+
*
|
|
5
|
+
* The original v1.5.0 preflight used `Math.ceil(bytes/4)` as a heuristic for
|
|
6
|
+
* input-token count. That heuristic undercounts dense Unicode (CJK, emoji,
|
|
7
|
+
* minified JS) by 30-50 % — a workspace estimated as "fits" can in fact
|
|
8
|
+
* exceed `inputTokenLimit`, the request fires, Gemini returns
|
|
9
|
+
* `400 INVALID_ARGUMENT`, and the user has paid for the round-trip plus the
|
|
10
|
+
* eager Files API upload that preceded it. Real money on a guaranteed-to-
|
|
11
|
+
* fail call. Tracked as T17 in `docs/FOLLOW-UP-PRS.md`.
|
|
12
|
+
*
|
|
13
|
+
* This module replaces the heuristic with a two-tier strategy:
|
|
14
|
+
*
|
|
15
|
+
* Tier 1 — heuristic gate (fast path).
|
|
16
|
+
* Compute `bytes/4 + prompt/4` as before. If the estimate is well under
|
|
17
|
+
* the cliff (50 % of the model's input limit), skip the API call and
|
|
18
|
+
* proceed. Saves a round-trip on small repos that obviously fit.
|
|
19
|
+
*
|
|
20
|
+
* Tier 2 — exact count.
|
|
21
|
+
* Otherwise call `client.models.countTokens({ model, contents })` with
|
|
22
|
+
* the same payload shape we'll send to `generateContent`. Use the
|
|
23
|
+
* returned `totalTokens` for the threshold check. countTokens is
|
|
24
|
+
* billed at zero (per Google docs and the v1.9.0 probe — see
|
|
25
|
+
* `.claude/local-PLAN-v1.10.0.md`) and shares NO RPM quota with
|
|
26
|
+
* `generateContent` (probe Q1 — 30 calls in 2.9 s, zero 429s).
|
|
27
|
+
*
|
|
28
|
+
* Cache.
|
|
29
|
+
* `LRUCache<string, number>` (in-process, simple). Key:
|
|
30
|
+
* `SHA256(filesHash + promptHash + model)`. `filesHash` is computed
|
|
31
|
+
* post-glob-filter by `scanWorkspace`, so it already encodes the
|
|
32
|
+
* filtered file set — including a separate `globsHash` axis would be
|
|
33
|
+
* redundant (and risk join-collision via different glob arrays
|
|
34
|
+
* serializing to the same string). TTL = process lifetime; no manifest
|
|
35
|
+
* persistence.
|
|
36
|
+
*
|
|
37
|
+
* Graceful degradation.
|
|
38
|
+
* On `countTokens` failure (HTTP error, network, SDK shape mismatch),
|
|
39
|
+
* log warn and fall back to `Math.ceil(bytes / 3)` (1.33× safety
|
|
40
|
+
* multiplier — covers the empirical 30-50 % CJK undercount). Never
|
|
41
|
+
* hard-fail on count failure; never make the user re-run.
|
|
42
|
+
*
|
|
43
|
+
* **Q3 mitigation (probe finding):** `countTokens` does NOT count
|
|
44
|
+
* `systemInstruction` on the Gemini Developer API path (SDK exposes the
|
|
45
|
+
* field, API rejects it). The exact count returned therefore underestimates
|
|
46
|
+
* the actual `generateContent` input by the size of `systemInstruction` +
|
|
47
|
+
* tool declarations. We add `SYSTEM_INSTRUCTION_RESERVE` (1 000 tokens)
|
|
48
|
+
* to the count before comparing against the threshold — losing 1 000
|
|
49
|
+
* tokens of headroom on a 1 M-token model is < 1 % impact.
|
|
50
|
+
*/
|
|
51
|
+
import type { GoogleGenAI } from '@google/genai';
|
|
52
|
+
import type { ScannedFile } from '../indexer/workspace-scanner.js';
|
|
53
|
+
/** Token reserve added to the count before the threshold comparison
|
|
54
|
+
* (`effectiveTokens = rawTokens + SYSTEM_INSTRUCTION_RESERVE`). Accounts for
|
|
55
|
+
* `systemInstruction` + tool declarations that `countTokens` doesn't count
|
|
56
|
+
* on the Gemini Developer API path. The 1 000-token reserve is generous —
|
|
57
|
+
* empirical agentic `systemInstruction` is ~600 tokens; tool declarations
|
|
58
|
+
* for the four `ask_agentic` functions are ~200-400 tokens. `ask` and
|
|
59
|
+
* `code` typically pass no system instruction so the reserve is pure
|
|
60
|
+
* safety margin there.
|
|
61
|
+
*
|
|
62
|
+
* Applied ONLY on the `'exact'` path (fresh-API and cache-hit). Skipped on
|
|
63
|
+
* `'heuristic'` (already coarse — adding the reserve to a coarse number
|
|
64
|
+
* pretends we know more than we do) and on `'fallback'` (`bytes/3` already
|
|
65
|
+
* carries 33 % over-pad which absorbs the reserve and then some). */
|
|
66
|
+
export declare const SYSTEM_INSTRUCTION_RESERVE = 1000;
|
|
67
|
+
export type TokenCountMethod = 'heuristic' | 'exact' | 'fallback';
|
|
68
|
+
export interface PreflightTokenResult {
|
|
69
|
+
/** The count we'll compare against `inputTokenLimit × workspaceGuardRatio`. */
|
|
70
|
+
effectiveTokens: number;
|
|
71
|
+
/** Which path produced the count. Surfaces in tool metadata. */
|
|
72
|
+
method: TokenCountMethod;
|
|
73
|
+
/** Raw count from the source — for diagnostics. Differs from
|
|
74
|
+
* `effectiveTokens` by `SYSTEM_INSTRUCTION_RESERVE` ONLY on the `'exact'`
|
|
75
|
+
* path (fresh-API and cache-hit). Equal to `effectiveTokens` on
|
|
76
|
+
* `'heuristic'` and `'fallback'` paths (the coarse heuristic and
|
|
77
|
+
* `bytes/3` over-pad respectively absorb the reserve as slop, so adding
|
|
78
|
+
* it twice would double-count). */
|
|
79
|
+
rawTokens: number;
|
|
80
|
+
/** Whether the `'exact'` count came from the in-process LRU cache rather
|
|
81
|
+
* than a fresh `countTokens` API call. `false` on every non-`'exact'`
|
|
82
|
+
* path. Surfaces in tool metadata so operators can distinguish "we paid
|
|
83
|
+
* the API round-trip" from "we hit the LRU." */
|
|
84
|
+
cacheHit: boolean;
|
|
85
|
+
}
|
|
86
|
+
/** Inputs to the preflight count. Mirror what `ask` / `code` already
|
|
87
|
+
* compute internally. */
|
|
88
|
+
export interface PreflightInput {
|
|
89
|
+
files: ScannedFile[];
|
|
90
|
+
prompt: string;
|
|
91
|
+
model: string;
|
|
92
|
+
/** Stable hash of the workspace's filtered file set + content. Already
|
|
93
|
+
* computed by `scanWorkspace` post-glob-filter, so two glob configs
|
|
94
|
+
* resolving to the same files share the same hash — no separate
|
|
95
|
+
* `globsHash` axis needed. */
|
|
96
|
+
filesHash: string;
|
|
97
|
+
/** Optional override of the heuristic-vs-exact cutoff. */
|
|
98
|
+
preflightMode?: 'heuristic' | 'exact' | 'auto';
|
|
99
|
+
/** The model's advertised input token limit. The cutoff fraction is
|
|
100
|
+
* applied to this. */
|
|
101
|
+
inputTokenLimit: number;
|
|
102
|
+
/** Wall-clock abort signal threaded into the SDK's `countTokens`
|
|
103
|
+
* `config.abortSignal`. When the caller's `timeoutMs` budget fires (or
|
|
104
|
+
* any upstream cancellation), the SDK's HTTP request is aborted and the
|
|
105
|
+
* `AbortError` is RE-THROWN to the caller (so the outer tool's catch
|
|
106
|
+
* can map it to `errorCode: 'TIMEOUT'`). Non-abort errors still fall
|
|
107
|
+
* through to the `bytes/3` graceful-degradation path. Optional; omit
|
|
108
|
+
* for callers without timeout semantics. */
|
|
109
|
+
signal?: AbortSignal;
|
|
110
|
+
}
|
|
111
|
+
/** Public for tests. Reset state between cases. */
|
|
112
|
+
export declare function clearTokenCounterCache(): void;
|
|
113
|
+
/**
|
|
114
|
+
* Two-tier preflight token count for `ask` / `code`.
|
|
115
|
+
*
|
|
116
|
+
* Decision:
|
|
117
|
+
* - `preflightMode: 'heuristic'` → always use `bytes/4` (fast, coarse)
|
|
118
|
+
* - `preflightMode: 'exact'` → always call countTokens, fall back to
|
|
119
|
+
* `bytes/3` on API failure
|
|
120
|
+
* - `preflightMode: 'auto'` → heuristic if `<50 %` of limit, else exact
|
|
121
|
+
* - omitted → same as `'auto'`
|
|
122
|
+
*
|
|
123
|
+
* Returns `{effectiveTokens, method, rawTokens}` — `effectiveTokens` is what
|
|
124
|
+
* the caller compares against `inputTokenLimit × guardRatio`. `method`
|
|
125
|
+
* surfaces in structured-content metadata so the orchestrator and the user
|
|
126
|
+
* can see which path produced the count.
|
|
127
|
+
*/
|
|
128
|
+
export declare function countForPreflight(client: GoogleGenAI, input: PreflightInput): Promise<PreflightTokenResult>;
|
|
129
|
+
//# sourceMappingURL=token-counter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-counter.d.ts","sourceRoot":"","sources":["../../src/gemini/token-counter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAIH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAGnE;;;;;;;;;;;;qEAYqE;AACrE,eAAO,MAAM,0BAA0B,OAAQ,CAAC;AA6BhD,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,OAAO,GAAG,UAAU,CAAC;AAElE,MAAM,WAAW,oBAAoB;IACnC,+EAA+E;IAC/E,eAAe,EAAE,MAAM,CAAC;IACxB,gEAAgE;IAChE,MAAM,EAAE,gBAAgB,CAAC;IACzB;;;;;uCAKmC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB;;;oDAGgD;IAChD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;yBACyB;AACzB,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd;;;kCAG8B;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,0DAA0D;IAC1D,aAAa,CAAC,EAAE,WAAW,GAAG,OAAO,GAAG,MAAM,CAAC;IAC/C;0BACsB;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;;gDAM4C;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA0CD,mDAAmD;AACnD,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAqBD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,oBAAoB,CAAC,CAsL/B"}
|