@qmediat.io/gemini-code-context-mcp 1.2.0 → 1.3.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 +43 -0
- package/dist/config.d.ts +12 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +8 -0
- package/dist/config.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +6 -0
- package/dist/server.js.map +1 -1
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +69 -1
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +46 -1
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/registry.d.ts +24 -0
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +27 -1
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/shared/throttle.d.ts +121 -0
- package/dist/tools/shared/throttle.d.ts.map +1 -0
- package/dist/tools/shared/throttle.js +357 -0
- package/dist/tools/shared/throttle.js.map +1 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,49 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [1.3.0] — 2026-04-20
|
|
11
|
+
|
|
12
|
+
Reviewer-workflow unblock release. Two fixes that turn the MCP from "works on the happy path" into "actually usable for back-to-back `/coderev`-style pipelines": a client-side TPM (tokens-per-minute) throttle preflight, and a wire-format fix that lets MCP sub-agents extract tool output text.
|
|
13
|
+
|
|
14
|
+
Without these, a second `ask` or `code` call against a workspace with ~100k cached tokens hit Gemini's Tier 1 paid quota of 100_000 input tokens/minute and 429'd the call after Google had already billed for it (per `@google/genai` SDK: "AbortSignal is a client-only operation … you will still be charged"). And any sub-agent orchestration that made decisions on tool response text silently saw empty output, because Claude Code (and other MCP hosts) consume only `structuredContent` when present — `content[0].text` was invisible on the sub-agent path, even though the main conversation UI rendered it fine.
|
|
15
|
+
|
|
16
|
+
### Added
|
|
17
|
+
|
|
18
|
+
- **`GEMINI_CODE_CONTEXT_TPM_THROTTLE_LIMIT` env var** (default `80_000`, `0` disables). Client-side tokens-per-minute ceiling per resolved model. `ask` and `code` now call `throttle.reserve(model, estimatedInputTokens)` after the daily-budget reservation but BEFORE `generateContent`; if the call would push the rolling 60-second window past the cap, the tool sleeps (emitting a `throttle: waiting Ns for TPM window…` progress message) before issuing the request. Default leaves ~20% headroom under the observed Tier 1 paid limit of 100_000 tokens/min for Gemini 3 Pro. Raise it on higher tiers, lower on shared quota pools, or set `0` to disable entirely (relies on Gemini's 429 behaviour alone). Cached tokens count toward this limit — empirically confirmed.
|
|
19
|
+
- **`src/tools/shared/throttle.ts`** — new shared module implementing the `reserve` / `release` / `cancel` reservation lifecycle. The primary API is reservation-based, not a read-only `shouldDelay` peek, because MCP's async `CallToolRequestSchema` handler dispatches concurrent tool calls — a peek-only API lets two callers observe the same pre-peek window and both proceed, collectively overshooting the cap. `reserve` inserts a provisional `WindowEntry` immediately at `now + delayMs` so concurrent reserves see each other's footprint. Multi-entry eviction math iterates oldest-first until remaining sum + estimate ≤ limit, then waits for the last-evicted entry to age out (the naïve "wait for just the oldest" implementation under-delays whenever ≥2 large entries remain in-window). Backward clock handled via a throttle-level `lastObservedNowMs` floor (using `entry.tsMs` for the clamp breaks multi-entry math when a future-dated provisional exists). Tests in `test/unit/throttle.test.ts` (33 cases, fake timers).
|
|
20
|
+
- **`RESPONSE_TEXT_KEY` constant** exported from `src/tools/registry.ts` — canonical key (`"responseText"`) under which MCP clients consuming `structuredContent` can reliably find the tool's primary narrative response. Consumers can `import { RESPONSE_TEXT_KEY }` rather than hard-coding the string.
|
|
21
|
+
|
|
22
|
+
### Fixed
|
|
23
|
+
|
|
24
|
+
- **Sub-agent tool-result extraction via `structuredContent.responseText`.** `textResult()` and `errorResult()` now always emit `structuredContent` with a `responseText` field mirroring the narrative string. The primary `content: [{type:'text', text}]` path stays for MCP spec compliance and for hosts (Claude Code's main conversation UI) that render it — duplicating a few-KB string across both surfaces costs effectively nothing vs losing the whole response on sub-agent paths that read only `structuredContent`. Before this fix, three reviewer-agent runs of `/coderev` against PR #17 returned "API success but text not surfaced" because Gemini generated the review text and we billed for it, but every downstream consumer (`reindex`, `clear`, `status`, `ask`, `code`) whose response shape included `structuredContent` shadowed `content[].text` on the sub-agent tool-result parser. 8 tests in `test/unit/registry-text-result.test.ts` lock in the invariant (both success and error paths, mirror-equality, caller-override semantics).
|
|
25
|
+
- **Error responses now surface detail to sub-agents.** `errorResult(message)` additionally sets `structuredContent.responseText = message` so orchestrations that make decisions on error text (e.g. "did the tool say `daily budget cap exceeded` vs `Gemini 500`?") can extract it. `isError: true` still signals failure; `responseText` carries detail. Parallel to the success-path fix.
|
|
26
|
+
|
|
27
|
+
### Changed
|
|
28
|
+
|
|
29
|
+
- **`ToolContext` gained a `throttle: TpmThrottle` field.** Per-server-process singleton instantiated in `runServer()` from `config.tpmThrottleLimit`. No caller-visible change — consumers that build a `ToolContext` directly (internal tests only) must add the field.
|
|
30
|
+
|
|
31
|
+
### Reviewer notes (not a code change)
|
|
32
|
+
|
|
33
|
+
- **Phase 1 of this PR was rewritten in response to a 3-way code review.** The original throttle design was a peek-only `shouldDelay` API with single-entry-eviction math. Grok (`grok-4.20-beta-0309-reasoning`) flagged two HIGH findings in `/coderev` + `/6step` analysis: (1) multi-entry eviction under-delays when ≥2 large entries remain in-window; (2) TOCTOU race between `shouldDelay` and `record` across the `await sleep()` + `await generateContent()` boundary. Both fixed before the module ever integrated with `ask`/`code`.
|
|
34
|
+
- **A second round of review on the integrated PR (Copilot + GPT `gpt-5.3-codex` + Grok + Gemini `gemini-3.1-pro-preview`) surfaced four more correctness fixes shipped in this release:**
|
|
35
|
+
- **Sorted-array invariant** (Copilot + Grok + Gemini — HIGH). `reserve` previously used `push` to append; a `delayMs = 0` reservation arriving after a future-dated provisional (hint-driven or eviction-driven delay) produced a smaller `tsMs` than the provisional, leaving the array unsorted. `prune`'s head-only fast-path silently skipped expired entries buried mid-array (empirically demonstrated: `reserve(79999)` returned `delayMs=46000` when the correct answer was `0`). Fixed via binary-search `insertSortedByTsMs`. Three regression tests lock it in.
|
|
36
|
+
- **Reserve timing pre-prepareContext** (GPT + Grok — MEDIUM). `reserve` was called BEFORE `prepareContext`, so on cold-cache calls (30–60s upload + `caches.create`) the reservation's `tsMs` aged out of our window before Gemini's per-minute quota counter caught up. Gap of ~30–60s where our throttle said "clear" but Gemini's didn't. Fixed by moving `reserve` to immediately before `generateContent`. Trade-off: two concurrent cold-cache callers both finish `prepareContext` before one backs off at `reserve` — mostly idempotent via file-hash dedup, minor upload duplication.
|
|
37
|
+
- **Retry-hint extend-only** (Gemini — MEDIUM). `recordRetryHint` used to blindly overwrite any existing hint. A shorter hint replacing a longer one let the next reserve compute a smaller `tsMs` than entries appended under the longer hint — same ordering break as the sorted-insert fix, different trigger. `recordRetryHint` now keeps the longer expiry when both exist.
|
|
38
|
+
- **Release lifecycle** (GPT — LOW). `release` previously left the reservation id in `reservationIndex`, so a late `cancel` on an already-released id silently removed an accounted entry from the window. `release` now deletes the id at the end, making double-`release` and `cancel`-after-`release` safe no-ops.
|
|
39
|
+
- **Randomised jitter** (Gemini — LOW). The `JITTER_MS` constant was 2_000 ms — every concurrent waiter evicting the same entry computed an identical wait and woke at the same millisecond, re-creating the thundering herd the jitter was meant to avoid. Now randomised in `[1_000, 3_000]` ms via `computeJitterMs()`.
|
|
40
|
+
- 7 new regression tests (40 total, up from 33) covering each of the above paths.
|
|
41
|
+
- Disputed severity on the wire-format `structuredContent` always-emit (Grok CRITICAL / Gemini acceptable / GPT nit / self-review LOW). No observable MCP-host break was constructed; shipping as-is with the additive-only semantics called out in `### Fixed` above.
|
|
42
|
+
- **Retry-hint parsing from Gemini 429 response bodies (`retryInfo.retryDelay`) is a follow-up (T22a).** The throttle module exposes `recordRetryHint(model, retryDelayMs)` but this PR does NOT wire it up from the `ask`/`code` catch blocks — the preflight `reserve` path delivers ~95% of the value, and parsing the retry hint out of `@google/genai`'s error message text is unstructured and brittle without a dedicated harness.
|
|
43
|
+
- **A third round of review (same 4 reviewers, commit `c097ad9`) surfaced one more correctness fix and four cosmetic cleanups — all shipped in this release:**
|
|
44
|
+
- **Stale-cache retry re-reservation** (GPT — MEDIUM). The round-2 fix moved `reserve` to after `prepareContext` for first dispatch, but the stale-cache retry branch was still reusing the original reservation — whose `tsMs` was stamped before the first (failed) dispatch. After the ~15s rebuild, the retry's tokens hit Gemini's quota counter at a time our window already had tagged as "expired soon". 15s gap re-introduced. Fixed by extracting `reserveForDispatch()` helper and calling `cancel + reserveForDispatch` inside the stale-cache retry branch before the second `generateContent`. Symmetric in `ask.tool.ts` and `code.tool.ts`. New throttle-level regression test locks it in.
|
|
45
|
+
- **`shouldDelay` pure vs jittered split** (Gemini — LOW). Previously `shouldDelay` inherited the random jitter from `computeWindowDelay`, so diagnostic polling saw bouncing values for unchanged state. Split into `computeWindowDelayPure` (used by `shouldDelay`) and `computeWindowDelay` (used by `reserve`, applies jitter only when actual waiting is needed).
|
|
46
|
+
- **`computeJitterMs()` range now `[1000, 3000]` inclusive** (Copilot — NIT). Previous formula `Math.floor(Math.random() * (MAX - MIN))` capped at 2999; `+ 1` in the multiplier width makes `JITTER_MAX_MS` reachable. Docstring + test comment aligned.
|
|
47
|
+
- **Explicit shorter-hint no-op assertion** (Grok — NIT). Added a direct `expect(r2.delayMs).toBeGreaterThan(5_000)` to the existing downgrade test so the extend-only semantics are guarded by a boolean invariant, not just an implicit delay range.
|
|
48
|
+
- Deferred to follow-ups (T22b, T23a — see `docs/FOLLOW-UP-PRS.md`): ask/code integration tests + `ToolResult.structuredContent` type narrowing. Both are LOW/NIT; no blockers.
|
|
49
|
+
- Disputed-severity items held as-shipped: wire-format `textResult` always-emit `structuredContent` (Grok CRITICAL vs 3-of-4 acceptable — no observable MCP-host break, ship additive-only with CHANGELOG callout); reserve-after-prepareContext cold-cache duplication (Grok CRITICAL vs documented trade-off — `prepareContext` coalesces via per-workspace mutex, so real duplication is minor).
|
|
50
|
+
- FPs confirmed by `/6step`: forward NTP leaps (Grok agrees FP), early-validation cancel leak (`-1` sentinel covers all paths), `sanitizeTokens` daily-budget path (scan + Zod + reserve-internal sanitize suffice), `finally` around cancel (no unguarded `return` between reserve and release).
|
|
51
|
+
- 41 throttle tests total (up from 40 in round-2) — new stale-cache-retry regression. 185 total PR tests (up from 184). Lint + typecheck + build all green.
|
|
52
|
+
|
|
10
53
|
## [1.2.0] — 2026-04-20
|
|
11
54
|
|
|
12
55
|
Reasoning-control release. Two big additions + one security fix. The `ask` and `code` tools now support Google's full Gemini 3 reasoning surface: discrete-tier `thinkingLevel` (MINIMAL/LOW/MEDIUM/HIGH, Google's recommended knob on 3.x) alongside the existing `thinkingBudget` integer. The two knobs are mutually exclusive at the schema boundary (Gemini rejects the combination with 400 anyway). `ask` also gets dynamic-thinking by default — omitting both fields makes the model use its native default path (HIGH on Gemini 3 Pro) rather than the "legacy" explicit-budget path Google flags as "may result in unexpected performance". And the model-alias resolver now rejects non-text-gen `pro` families (nano-banana image-gen, lyria music-gen, deep-research agent, customtools variant) that were sneaking in under the `latest-pro` alias and routing text requests through the image-tier quota bucket.
|
package/dist/config.d.ts
CHANGED
|
@@ -20,6 +20,18 @@ export interface Config {
|
|
|
20
20
|
maxFileSizeBytes: number;
|
|
21
21
|
/** Opt-in anonymous usage telemetry (count per tool, no payloads). */
|
|
22
22
|
telemetryEnabled: boolean;
|
|
23
|
+
/**
|
|
24
|
+
* Client-side TPM (tokens-per-minute) throttle ceiling, per resolved model.
|
|
25
|
+
* `0` disables the throttle entirely; positive integer caps how many input
|
|
26
|
+
* tokens (cached + uncached) we'll let fly to Gemini inside any 60-second
|
|
27
|
+
* window before delaying the next call. Default `80_000` leaves ~20%
|
|
28
|
+
* headroom under Gemini's observed Tier 1 paid limit of 100_000 tokens/min
|
|
29
|
+
* for Gemini 3 Pro; raise if your key is on a higher tier, lower if you
|
|
30
|
+
* share a quota pool with another app. See `src/tools/shared/throttle.ts`
|
|
31
|
+
* for the reservation protocol and `docs/FOLLOW-UP-PRS.md` T22 for the
|
|
32
|
+
* full rationale.
|
|
33
|
+
*/
|
|
34
|
+
tpmThrottleLimit: number;
|
|
23
35
|
}
|
|
24
36
|
export declare function loadConfig(): Config;
|
|
25
37
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,0BAA0B,CAAC;AAE1E,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,2CAA2C;IAC3C,gBAAgB,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,gBAAgB,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAe,MAAM,0BAA0B,CAAC;AAE1E,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,YAAY,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;OAKG;IACH,cAAc,EAAE,MAAM,CAAC;IACvB,uDAAuD;IACvD,oBAAoB,EAAE,MAAM,CAAC;IAC7B,2CAA2C;IAC3C,gBAAgB,EAAE,MAAM,CAAC;IACzB,sEAAsE;IACtE,gBAAgB,EAAE,OAAO,CAAC;IAC1B;;;;;;;;;;OAUG;IACH,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAgBD,wBAAgB,UAAU,IAAI,MAAM,CAkCnC"}
|
package/dist/config.js
CHANGED
|
@@ -24,6 +24,13 @@ export function loadConfig() {
|
|
|
24
24
|
// `GEMINI_CODE_CONTEXT_DEFAULT_MODEL=latest-pro` (or a literal model ID).
|
|
25
25
|
const defaultModel = process.env.GEMINI_CODE_CONTEXT_DEFAULT_MODEL ?? auth.defaultModel ?? 'latest-pro-thinking';
|
|
26
26
|
const dailyBudget = readFloatEnv('GEMINI_DAILY_BUDGET_USD', auth.dailyBudgetUsd ?? Number.POSITIVE_INFINITY);
|
|
27
|
+
// TPM throttle: clamp to a non-negative integer. Negative / non-finite
|
|
28
|
+
// env values (`-1`, `"foo"`) fall back to the 80k default rather than
|
|
29
|
+
// silently disabling the throttle — operator intent when setting an
|
|
30
|
+
// invalid value is almost certainly "use the default", not "turn it off"
|
|
31
|
+
// (which has its own explicit `0` sentinel).
|
|
32
|
+
const tpmThrottleRaw = readIntEnv('GEMINI_CODE_CONTEXT_TPM_THROTTLE_LIMIT', 80_000);
|
|
33
|
+
const tpmThrottleLimit = tpmThrottleRaw >= 0 ? tpmThrottleRaw : 80_000;
|
|
27
34
|
return {
|
|
28
35
|
auth,
|
|
29
36
|
defaultModel,
|
|
@@ -33,6 +40,7 @@ export function loadConfig() {
|
|
|
33
40
|
maxFilesPerWorkspace: readIntEnv('GEMINI_CODE_CONTEXT_MAX_FILES', 2000),
|
|
34
41
|
maxFileSizeBytes: readIntEnv('GEMINI_CODE_CONTEXT_MAX_FILE_SIZE', 1_000_000),
|
|
35
42
|
telemetryEnabled: process.env.GEMINI_CODE_CONTEXT_TELEMETRY === 'true',
|
|
43
|
+
tpmThrottleLimit,
|
|
36
44
|
};
|
|
37
45
|
}
|
|
38
46
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAqB,WAAW,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAqB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAkC1E,SAAS,UAAU,CAAC,IAAY,EAAE,QAAgB;IAChD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC9C,MAAM,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACnC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC3C,CAAC;AAED,SAAS,YAAY,CAAC,IAAY,EAAE,QAAgB;IAClD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC9C,MAAM,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AAC3C,CAAC;AAED,MAAM,UAAU,UAAU;IACxB,MAAM,IAAI,GAAG,WAAW,EAAE,CAAC;IAE3B,uEAAuE;IACvE,4EAA4E;IAC5E,6EAA6E;IAC7E,0EAA0E;IAC1E,MAAM,YAAY,GAChB,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,IAAI,CAAC,YAAY,IAAI,qBAAqB,CAAC;IAE9F,MAAM,WAAW,GAAG,YAAY,CAC9B,yBAAyB,EACzB,IAAI,CAAC,cAAc,IAAI,MAAM,CAAC,iBAAiB,CAChD,CAAC;IAEF,uEAAuE;IACvE,sEAAsE;IACtE,oEAAoE;IACpE,yEAAyE;IACzE,6CAA6C;IAC7C,MAAM,cAAc,GAAG,UAAU,CAAC,wCAAwC,EAAE,MAAM,CAAC,CAAC;IACpF,MAAM,gBAAgB,GAAG,cAAc,IAAI,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC;IAEvE,OAAO;QACL,IAAI;QACJ,YAAY;QACZ,cAAc,EAAE,WAAW;QAC3B,eAAe,EAAE,UAAU,CAAC,uCAAuC,EAAE,IAAI,CAAC;QAC1E,cAAc,EAAE,UAAU,CAAC,sCAAsC,EAAE,IAAI,CAAC;QACxE,oBAAoB,EAAE,UAAU,CAAC,+BAA+B,EAAE,IAAI,CAAC;QACvE,gBAAgB,EAAE,UAAU,CAAC,mCAAmC,EAAE,SAAS,CAAC;QAC5E,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B,KAAK,MAAM;QACtE,gBAAgB;KACjB,CAAC;AACJ,CAAC"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AA4CH,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CA2G/C"}
|
package/dist/server.js
CHANGED
|
@@ -10,6 +10,7 @@ import { createGeminiClient } from './gemini/client.js';
|
|
|
10
10
|
import { ManifestDb } from './manifest/db.js';
|
|
11
11
|
import { TOOLS } from './tools/index.js';
|
|
12
12
|
import { buildToolInputSchema, errorResult, } from './tools/registry.js';
|
|
13
|
+
import { createTpmThrottle } from './tools/shared/throttle.js';
|
|
13
14
|
import { logger } from './utils/logger.js';
|
|
14
15
|
import { readFileSync } from 'node:fs';
|
|
15
16
|
import { dirname as pathDirname, join as pathJoin } from 'node:path';
|
|
@@ -45,6 +46,10 @@ export async function runServer() {
|
|
|
45
46
|
const client = createGeminiClient(config.auth.profile);
|
|
46
47
|
const ttlWatcher = new TtlWatcher(client, manifest);
|
|
47
48
|
ttlWatcher.start();
|
|
49
|
+
// Singleton throttle shared across every tool invocation. State is in-memory
|
|
50
|
+
// only — a server restart clears the window (acceptable: startup is rare and
|
|
51
|
+
// a first 429 re-seeds `recordRetryHint`). `tpmThrottleLimit === 0` disables.
|
|
52
|
+
const throttle = createTpmThrottle(config.tpmThrottleLimit);
|
|
48
53
|
const server = new Server({ name: SERVER_NAME, version: SERVER_VERSION }, {
|
|
49
54
|
capabilities: {
|
|
50
55
|
tools: { listChanged: false },
|
|
@@ -79,6 +84,7 @@ export async function runServer() {
|
|
|
79
84
|
manifest,
|
|
80
85
|
ttlWatcher,
|
|
81
86
|
progressToken,
|
|
87
|
+
throttle,
|
|
82
88
|
};
|
|
83
89
|
try {
|
|
84
90
|
const result = await tool.execute(parse.data, ctx);
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EACL,qBAAqB,EAErB,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAGL,oBAAoB,EACpB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,WAAW,GAAG,qCAAqC,CAAC;AAC1D;;;;GAIG;AACH,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE;IACnC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;QACrD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAyB,CAAC;QAC9E,OAAO,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC,CAAC,EAAE,CAAC;AAEL,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,CAAC,IAAI,CACT,YAAY,WAAW,KAAK,cAAc,WAAW,MAAM,CAAC,IAAI,CAAC,MAAM,UAAU,MAAM,CAAC,IAAI,CAAC,cAAc,oBAAoB,MAAM,CAAC,YAAY,GAAG,CACtJ,CAAC;IAEF,yEAAyE;IACzE,2EAA2E;IAC3E,2EAA2E;IAC3E,oEAAoE;IACpE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,UAAU,EAAE,CAAC;IAClC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACpD,UAAU,CAAC,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAmC7E,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CvB,CAAC;AAEL,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,OAAO,EAAE,cAAc,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAmC7E,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8CvB,CAAC;AAEL,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,OAAO,EAAE,cAAc,CAAC,QAAQ,CAme5C,CAAC"}
|
package/dist/tools/ask.tool.js
CHANGED
|
@@ -94,6 +94,9 @@ export const askTool = {
|
|
|
94
94
|
const workspaceRoot = resolve(input.workspace ?? process.cwd());
|
|
95
95
|
const model = input.model ?? ctx.config.defaultModel;
|
|
96
96
|
let reservationId = null;
|
|
97
|
+
// `-1` signals "no reservation held" (distinct from 0 which is a valid
|
|
98
|
+
// releaseId). Mirrors the pattern used by `reservationId`.
|
|
99
|
+
let throttleReservationId = -1;
|
|
97
100
|
const emitter = createProgressEmitter(ctx.server, ctx.progressToken);
|
|
98
101
|
try {
|
|
99
102
|
// Workspace path validation lives INSIDE the try so a
|
|
@@ -175,13 +178,21 @@ export const askTool = {
|
|
|
175
178
|
: effectiveThinkingBudget === null || effectiveThinkingBudget === -1
|
|
176
179
|
? Math.max(0, maxOutputTokens - 1024)
|
|
177
180
|
: effectiveThinkingBudget;
|
|
181
|
+
// Estimated input-token count drives both the daily-budget reservation
|
|
182
|
+
// (dollars) and the TPM throttle reservation (rate). Hoisted here so
|
|
183
|
+
// both consumers share one fingerprint — no drift between what the $
|
|
184
|
+
// ledger thinks we'll spend and what the rate-limiter thinks we'll
|
|
185
|
+
// send to Gemini. Matches `estimatePreCallCostUsd`'s `Math.ceil(bytes/4)`
|
|
186
|
+
// tokenisation on purpose; see `docs/FOLLOW-UP-PRS.md` T17 for the
|
|
187
|
+
// known UTF-8 / CJK undercount.
|
|
188
|
+
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
189
|
+
const estimatedInputTokens = Math.ceil(workspaceBytes / 4) + Math.ceil(input.prompt.length / 4);
|
|
178
190
|
// Atomic budget reservation. Happens AFTER scan (so the estimate is
|
|
179
191
|
// accurate) but BEFORE any billable upload or generateContent call.
|
|
180
192
|
// Concurrent tool calls cannot all pass a pre-check and then
|
|
181
193
|
// collectively overshoot the cap: `reserveBudget` uses a
|
|
182
194
|
// `BEGIN IMMEDIATE` SQLite transaction that serialises check-and-insert.
|
|
183
195
|
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
184
|
-
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
185
196
|
const estimateUsd = estimatePreCallCostUsd({
|
|
186
197
|
model: resolved.resolved,
|
|
187
198
|
workspaceBytes,
|
|
@@ -219,6 +230,31 @@ export const askTool = {
|
|
|
219
230
|
emitter,
|
|
220
231
|
allowCaching: !input.noCache && scan.files.length > 0,
|
|
221
232
|
});
|
|
233
|
+
// TPM throttle reservation — placed HERE (after `prepareContext`,
|
|
234
|
+
// immediately before `generateContent`) so the reservation's `tsMs`
|
|
235
|
+
// accurately reflects when tokens hit Gemini's quota counter. An
|
|
236
|
+
// earlier reserve (before `prepareContext`) would stamp `tsMs`
|
|
237
|
+
// minutes before actual dispatch on cold-cache calls; our window
|
|
238
|
+
// would then expire before Gemini's, leaving a gap where we admit
|
|
239
|
+
// concurrent calls that bust Gemini's per-minute quota. Trade-off:
|
|
240
|
+
// two concurrent cold-cache callers will both complete
|
|
241
|
+
// `prepareContext` before one backs off at `reserve` — mostly
|
|
242
|
+
// idempotent via file-hash dedup, minor upload duplication.
|
|
243
|
+
//
|
|
244
|
+
// Extracted into a helper so the stale-cache retry branch can
|
|
245
|
+
// cancel-and-re-reserve with an accurate tsMs rather than reusing a
|
|
246
|
+
// stale reservation stamped before the first (failed) dispatch.
|
|
247
|
+
const reserveForDispatch = async () => {
|
|
248
|
+
if (ctx.config.tpmThrottleLimit <= 0)
|
|
249
|
+
return;
|
|
250
|
+
const reservation = ctx.throttle.reserve(resolved.resolved, estimatedInputTokens);
|
|
251
|
+
throttleReservationId = reservation.releaseId;
|
|
252
|
+
if (reservation.delayMs > 0) {
|
|
253
|
+
emitter.emit(`throttle: waiting ${Math.ceil(reservation.delayMs / 1000)}s for TPM window…`);
|
|
254
|
+
await new Promise((resolveSleep) => setTimeout(resolveSleep, reservation.delayMs));
|
|
255
|
+
}
|
|
256
|
+
};
|
|
257
|
+
await reserveForDispatch();
|
|
222
258
|
emitter.emit(usingThinkingLevel
|
|
223
259
|
? `generating response (thinking-level=${input.thinkingLevel})…`
|
|
224
260
|
: effectiveThinkingBudget === null
|
|
@@ -313,6 +349,18 @@ export const askTool = {
|
|
|
313
349
|
emitter,
|
|
314
350
|
allowCaching: !input.noCache && scan.files.length > 0,
|
|
315
351
|
});
|
|
352
|
+
// Cancel the original throttle reservation — its `tsMs` was
|
|
353
|
+
// stamped at first-dispatch time, which is now seconds in the
|
|
354
|
+
// past (the rebuild took real time). Re-reserve fresh so the
|
|
355
|
+
// retry's tsMs reflects when the retry call actually hits
|
|
356
|
+
// Gemini's quota counter. Without this, our window would expire
|
|
357
|
+
// locally before Gemini's, leaving a gap where concurrent
|
|
358
|
+
// callers bust the per-minute limit (PR #19 round-2 GPT review).
|
|
359
|
+
if (throttleReservationId !== -1) {
|
|
360
|
+
ctx.throttle.cancel(throttleReservationId);
|
|
361
|
+
throttleReservationId = -1;
|
|
362
|
+
}
|
|
363
|
+
await reserveForDispatch();
|
|
316
364
|
response = await ctx.client.models.generateContent({
|
|
317
365
|
model: resolved.resolved,
|
|
318
366
|
contents: buildContents(rebuilt.cacheId, rebuilt.inlineContents),
|
|
@@ -356,6 +404,15 @@ export const askTool = {
|
|
|
356
404
|
const uncached = Math.max(0, inputTotal - cached);
|
|
357
405
|
const output = typeof usage?.candidatesTokenCount === 'number' ? usage.candidatesTokenCount : 0;
|
|
358
406
|
const thinking = typeof usage?.thoughtsTokenCount === 'number' ? usage.thoughtsTokenCount : 0;
|
|
407
|
+
// Finalise the throttle reservation with Gemini's actual
|
|
408
|
+
// `promptTokenCount` — includes cached tokens, which DO count against
|
|
409
|
+
// the per-minute quota (empirically confirmed 2026-04-20). If actual
|
|
410
|
+
// < estimate, subsequent reserves see the freed headroom; if >, they
|
|
411
|
+
// back off accordingly.
|
|
412
|
+
if (throttleReservationId !== -1) {
|
|
413
|
+
ctx.throttle.release(throttleReservationId, inputTotal);
|
|
414
|
+
throttleReservationId = -1;
|
|
415
|
+
}
|
|
359
416
|
const cost = estimateCostUsd({
|
|
360
417
|
model: resolved.resolved,
|
|
361
418
|
uncachedInputTokens: uncached,
|
|
@@ -446,6 +503,17 @@ export const askTool = {
|
|
|
446
503
|
}
|
|
447
504
|
reservationId = null;
|
|
448
505
|
}
|
|
506
|
+
// Drop the TPM reservation on any failure path. If Gemini actually
|
|
507
|
+
// consumed quota server-side before failing, our window under-counts
|
|
508
|
+
// — acceptable: a subsequent 429 with `retryDelay` would re-seed
|
|
509
|
+
// via `recordRetryHint` (wiring of that hint-parse is tracked in
|
|
510
|
+
// T22a follow-up, not shipped here). The alternative (release with
|
|
511
|
+
// estimate) over-counts when the call never reached Gemini at all,
|
|
512
|
+
// which is more common.
|
|
513
|
+
if (throttleReservationId !== -1) {
|
|
514
|
+
ctx.throttle.cancel(throttleReservationId);
|
|
515
|
+
throttleReservationId = -1;
|
|
516
|
+
}
|
|
449
517
|
return errorResult(`ask failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
450
518
|
}
|
|
451
519
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AA0B7E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxB,CAAC;AAEL,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAyCxD,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AA0B7E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxB,CAAC;AAEL,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAyCxD,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,SAAS,CAod9C,CAAC"}
|
package/dist/tools/code.tool.js
CHANGED
|
@@ -134,6 +134,8 @@ export const codeTool = {
|
|
|
134
134
|
// undefined and we take the level branch below.
|
|
135
135
|
const thinkingBudget = usingThinkingLevel ? undefined : (input.thinkingBudget ?? 16_384);
|
|
136
136
|
let reservationId = null;
|
|
137
|
+
// `-1` signals "no reservation held". Mirror of ask.tool.ts.
|
|
138
|
+
let throttleReservationId = -1;
|
|
137
139
|
const emitter = createProgressEmitter(ctx.server, ctx.progressToken);
|
|
138
140
|
try {
|
|
139
141
|
// Workspace validation inside try → reported as a regular tool error
|
|
@@ -197,11 +199,15 @@ export const codeTool = {
|
|
|
197
199
|
const thinkingTokensForEstimate = input.thinkingLevel !== undefined
|
|
198
200
|
? Math.min(THINKING_LEVEL_RESERVE[input.thinkingLevel] ?? thinkingHeadroom, thinkingHeadroom)
|
|
199
201
|
: effectiveThinkingBudget;
|
|
202
|
+
// Shared input-token fingerprint for budget + TPM throttle (see
|
|
203
|
+
// ask.tool.ts for the rationale — same `Math.ceil(bytes/4)` tokenisation
|
|
204
|
+
// used by `estimatePreCallCostUsd`).
|
|
205
|
+
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
206
|
+
const estimatedInputTokens = Math.ceil(workspaceBytes / 4) + Math.ceil(input.task.length / 4);
|
|
200
207
|
// Atomic budget reservation — see ask.tool.ts for the full rationale.
|
|
201
208
|
// Estimate includes the thinking budget (billed as output tokens on Pro)
|
|
202
209
|
// PLUS the candidate output cap.
|
|
203
210
|
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
204
|
-
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
205
211
|
const estimateUsd = estimatePreCallCostUsd({
|
|
206
212
|
model: resolved.resolved,
|
|
207
213
|
workspaceBytes,
|
|
@@ -243,6 +249,25 @@ export const codeTool = {
|
|
|
243
249
|
// to embed alongside the prompt.
|
|
244
250
|
allowCaching: scan.files.length > 0 && !codeExecution,
|
|
245
251
|
});
|
|
252
|
+
// TPM throttle — placed AFTER `prepareContext`, immediately before
|
|
253
|
+
// `generateContent`, so the reservation's `tsMs` accurately reflects
|
|
254
|
+
// when tokens hit Gemini's quota counter. See ask.tool.ts for the
|
|
255
|
+
// full rationale and the cold-cache-timing concern it fixes.
|
|
256
|
+
//
|
|
257
|
+
// Extracted into a helper so the stale-cache retry branch can
|
|
258
|
+
// cancel-and-re-reserve with an accurate tsMs rather than reusing a
|
|
259
|
+
// stale reservation.
|
|
260
|
+
const reserveForDispatch = async () => {
|
|
261
|
+
if (ctx.config.tpmThrottleLimit <= 0)
|
|
262
|
+
return;
|
|
263
|
+
const reservation = ctx.throttle.reserve(resolved.resolved, estimatedInputTokens);
|
|
264
|
+
throttleReservationId = reservation.releaseId;
|
|
265
|
+
if (reservation.delayMs > 0) {
|
|
266
|
+
emitter.emit(`throttle: waiting ${Math.ceil(reservation.delayMs / 1000)}s for TPM window…`);
|
|
267
|
+
await new Promise((resolveSleep) => setTimeout(resolveSleep, reservation.delayMs));
|
|
268
|
+
}
|
|
269
|
+
};
|
|
270
|
+
await reserveForDispatch();
|
|
246
271
|
const userPrompt = expectEdits
|
|
247
272
|
? `${input.task}\n\nRespond with your rationale and OLD/NEW diff blocks per the system instruction.`
|
|
248
273
|
: input.task;
|
|
@@ -329,6 +354,15 @@ export const codeTool = {
|
|
|
329
354
|
emitter,
|
|
330
355
|
allowCaching: scan.files.length > 0 && !codeExecution,
|
|
331
356
|
});
|
|
357
|
+
// Cancel stale reservation (tsMs was stamped before first
|
|
358
|
+
// dispatch, now seconds old after rebuild) and re-reserve so
|
|
359
|
+
// the retry's tsMs matches actual dispatch time. Mirror of
|
|
360
|
+
// ask.tool.ts — see rationale there.
|
|
361
|
+
if (throttleReservationId !== -1) {
|
|
362
|
+
ctx.throttle.cancel(throttleReservationId);
|
|
363
|
+
throttleReservationId = -1;
|
|
364
|
+
}
|
|
365
|
+
await reserveForDispatch();
|
|
332
366
|
response = await ctx.client.models.generateContent({
|
|
333
367
|
model: resolved.resolved,
|
|
334
368
|
contents: buildContents(rebuilt.cacheId, rebuilt.inlineContents),
|
|
@@ -377,6 +411,12 @@ export const codeTool = {
|
|
|
377
411
|
const uncached = Math.max(0, inputTotal - cached);
|
|
378
412
|
const output = typeof usage?.candidatesTokenCount === 'number' ? usage.candidatesTokenCount : 0;
|
|
379
413
|
const thinking = typeof usage?.thoughtsTokenCount === 'number' ? usage.thoughtsTokenCount : 0;
|
|
414
|
+
// Finalise TPM throttle reservation with actual input tokens
|
|
415
|
+
// (cached + uncached — both count toward Gemini's per-minute quota).
|
|
416
|
+
if (throttleReservationId !== -1) {
|
|
417
|
+
ctx.throttle.release(throttleReservationId, inputTotal);
|
|
418
|
+
throttleReservationId = -1;
|
|
419
|
+
}
|
|
380
420
|
const cost = estimateCostUsd({
|
|
381
421
|
model: resolved.resolved,
|
|
382
422
|
uncachedInputTokens: uncached,
|
|
@@ -474,6 +514,11 @@ export const codeTool = {
|
|
|
474
514
|
}
|
|
475
515
|
reservationId = null;
|
|
476
516
|
}
|
|
517
|
+
// Drop TPM reservation on failure — mirror of ask.tool.ts rationale.
|
|
518
|
+
if (throttleReservationId !== -1) {
|
|
519
|
+
ctx.throttle.cancel(throttleReservationId);
|
|
520
|
+
throttleReservationId = -1;
|
|
521
|
+
}
|
|
477
522
|
return errorResult(`code failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
478
523
|
}
|
|
479
524
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.tool.js","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"code.tool.js","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/registry.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ import type { z } from 'zod';
|
|
|
7
7
|
import type { TtlWatcher } from '../cache/ttl-watcher.js';
|
|
8
8
|
import type { Config } from '../config.js';
|
|
9
9
|
import type { ManifestDb } from '../manifest/db.js';
|
|
10
|
+
import type { TpmThrottle } from './shared/throttle.js';
|
|
10
11
|
export interface ToolContext {
|
|
11
12
|
server: Server;
|
|
12
13
|
config: Config;
|
|
@@ -14,6 +15,14 @@ export interface ToolContext {
|
|
|
14
15
|
manifest: ManifestDb;
|
|
15
16
|
ttlWatcher: TtlWatcher;
|
|
16
17
|
progressToken: string | number | undefined;
|
|
18
|
+
/**
|
|
19
|
+
* Per-server-process TPM throttle singleton. Tools should call
|
|
20
|
+
* `throttle.reserve(resolvedModel, estimatedInputTokens)` AFTER the daily-
|
|
21
|
+
* budget reservation but BEFORE `generateContent`, then `release` on
|
|
22
|
+
* success with the actual `promptTokenCount` or `cancel` on any pre-
|
|
23
|
+
* dispatch failure. See `src/tools/shared/throttle.ts`.
|
|
24
|
+
*/
|
|
25
|
+
throttle: TpmThrottle;
|
|
17
26
|
}
|
|
18
27
|
/**
|
|
19
28
|
* MCP-compliant `tools[*].inputSchema` shape. The root MUST be `type: "object"`
|
|
@@ -44,6 +53,21 @@ export interface ToolResult {
|
|
|
44
53
|
structuredContent?: Record<string, unknown>;
|
|
45
54
|
isError?: boolean;
|
|
46
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Canonical key under which MCP clients consuming `structuredContent` can
|
|
58
|
+
* reliably find the tool's primary narrative response. MCP hosts that
|
|
59
|
+
* render `content[]` (Claude Code's main conversation UI) are unaffected;
|
|
60
|
+
* hosts that consume ONLY `structuredContent` (Claude Code's sub-agent
|
|
61
|
+
* tool-result parser as of 2026-04, and likely other headless pipelines)
|
|
62
|
+
* otherwise silently lose the response text. Duplicating a few-KB string
|
|
63
|
+
* across `content[0].text` and `structuredContent.responseText` costs
|
|
64
|
+
* effectively nothing vs losing the whole response to a single-consumer
|
|
65
|
+
* wire-format gap (2026-04-20: three reviewer-agent runs of `/coderev`
|
|
66
|
+
* returned "API success but text not surfaced"). This mirror MUST remain
|
|
67
|
+
* invariant across every tool's response — sub-agent orchestrations depend
|
|
68
|
+
* on a single, predictable extraction path.
|
|
69
|
+
*/
|
|
70
|
+
export declare const RESPONSE_TEXT_KEY = "responseText";
|
|
47
71
|
export declare function textResult(text: string, structured?: Record<string, unknown>): ToolResult;
|
|
48
72
|
export declare function errorResult(message: string): ToolResult;
|
|
49
73
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;IAC3C;;;;;;OAMG;IACH,QAAQ,EAAE,WAAW,CAAC;CACvB;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,UAAU;IACzB,gCAAgC;IAChC,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,iBAAiB,iBAAiB,CAAC;AAEhD,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,CAUzF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAWvD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,cAAc,CASlF"}
|
package/dist/tools/registry.js
CHANGED
|
@@ -2,15 +2,41 @@
|
|
|
2
2
|
* Tool registry — each MCP tool implements this common contract.
|
|
3
3
|
*/
|
|
4
4
|
import { zodToJsonSchema } from 'zod-to-json-schema';
|
|
5
|
+
/**
|
|
6
|
+
* Canonical key under which MCP clients consuming `structuredContent` can
|
|
7
|
+
* reliably find the tool's primary narrative response. MCP hosts that
|
|
8
|
+
* render `content[]` (Claude Code's main conversation UI) are unaffected;
|
|
9
|
+
* hosts that consume ONLY `structuredContent` (Claude Code's sub-agent
|
|
10
|
+
* tool-result parser as of 2026-04, and likely other headless pipelines)
|
|
11
|
+
* otherwise silently lose the response text. Duplicating a few-KB string
|
|
12
|
+
* across `content[0].text` and `structuredContent.responseText` costs
|
|
13
|
+
* effectively nothing vs losing the whole response to a single-consumer
|
|
14
|
+
* wire-format gap (2026-04-20: three reviewer-agent runs of `/coderev`
|
|
15
|
+
* returned "API success but text not surfaced"). This mirror MUST remain
|
|
16
|
+
* invariant across every tool's response — sub-agent orchestrations depend
|
|
17
|
+
* on a single, predictable extraction path.
|
|
18
|
+
*/
|
|
19
|
+
export const RESPONSE_TEXT_KEY = 'responseText';
|
|
5
20
|
export function textResult(text, structured) {
|
|
6
21
|
return {
|
|
7
22
|
content: [{ type: 'text', text }],
|
|
8
|
-
|
|
23
|
+
// Always emit `structuredContent` with `responseText` even when the
|
|
24
|
+
// caller didn't pass a structured payload — the invariant that
|
|
25
|
+
// sub-agents rely on is "any tool response has `.structuredContent.responseText`",
|
|
26
|
+
// not "only tools that pass metadata do". The caller's keys, if any,
|
|
27
|
+
// spread in first so our canonical `responseText` wins on collision.
|
|
28
|
+
structuredContent: { ...(structured ?? {}), [RESPONSE_TEXT_KEY]: text },
|
|
9
29
|
};
|
|
10
30
|
}
|
|
11
31
|
export function errorResult(message) {
|
|
12
32
|
return {
|
|
13
33
|
content: [{ type: 'text', text: message }],
|
|
34
|
+
// Mirror the error text under `responseText` for the same reason
|
|
35
|
+
// `textResult` does: sub-agents extracting tool output parse
|
|
36
|
+
// `structuredContent` only, so without this the failure message is
|
|
37
|
+
// invisible to any orchestration that makes decisions on error text.
|
|
38
|
+
// `isError: true` still signals failure; `responseText` carries detail.
|
|
39
|
+
structuredContent: { [RESPONSE_TEXT_KEY]: message },
|
|
14
40
|
isError: true,
|
|
15
41
|
};
|
|
16
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAoDrD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,cAAc,CAAC;AAEhD,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAoC;IAC3E,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,oEAAoE;QACpE,+DAA+D;QAC/D,mFAAmF;QACnF,qEAAqE;QACrE,qEAAqE;QACrE,iBAAiB,EAAE,EAAE,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC,iBAAiB,CAAC,EAAE,IAAI,EAAE;KACxE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC1C,iEAAiE;QACjE,6DAA6D;QAC7D,mEAAmE;QACnE,qEAAqE;QACrE,wEAAwE;QACxE,iBAAiB,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,OAAO,EAAE;QACnD,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA6B;IAChE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAA4B,CAAC;IAClG,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,IAAI,sCAAsC;YAC5E,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAC5F,CAAC;IACJ,CAAC;IACD,OAAO,OAAyB,CAAC;AACnC,CAAC"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Client-side TPM (tokens-per-minute) throttle for Gemini API calls.
|
|
3
|
+
*
|
|
4
|
+
* Google enforces a per-minute input-token quota on paid Tier 1 Gemini 3 Pro
|
|
5
|
+
* at 100_000 tokens/minute/model/project (per AI Studio dashboard, subject
|
|
6
|
+
* to change). Without a client-side preflight we discover the limit only
|
|
7
|
+
* when Gemini returns 429 `RESOURCE_EXHAUSTED` — by which point the call
|
|
8
|
+
* is already billed (per `@google/genai@1.50.x` genai.d.ts: "AbortSignal
|
|
9
|
+
* is a client-only operation … you will still be charged").
|
|
10
|
+
*
|
|
11
|
+
* The module keeps an in-memory sliding 60-second window of recent input-
|
|
12
|
+
* token usage per resolved model. The primary API is a three-method
|
|
13
|
+
* reservation lifecycle — `reserve` / `release` / `cancel` — because a
|
|
14
|
+
* read-only "peek" API (the obvious design) has a TOCTOU race: between
|
|
15
|
+
* `peek()` → `await sleep()` → `await generateContent()` → `record()`, a
|
|
16
|
+
* concurrent MCP tool call observes the same pre-peek window and both
|
|
17
|
+
* callers proceed, collectively overshooting the quota.
|
|
18
|
+
*
|
|
19
|
+
* `reserve` solves the race by inserting a provisional `WindowEntry` with
|
|
20
|
+
* the caller's ESTIMATE at the moment the reservation is taken (plus the
|
|
21
|
+
* computed delay) — so subsequent concurrent `reserve` calls see the
|
|
22
|
+
* provisional entry and back off. When the call completes, `release`
|
|
23
|
+
* overwrites the estimate with actual token usage; on failure, `cancel`
|
|
24
|
+
* removes the provisional entry so it doesn't keep blocking future calls.
|
|
25
|
+
*
|
|
26
|
+
* Multi-entry eviction math: when the window is over-limit, we find the
|
|
27
|
+
* smallest index `k` such that evicting `entries[0..k]` drops the remaining
|
|
28
|
+
* sum enough to admit the new estimate. Waiting for JUST the oldest entry
|
|
29
|
+
* to expire (the naïve design this module replaced) under-delays whenever
|
|
30
|
+
* two or more large entries are still inside the window after that oldest
|
|
31
|
+
* one ages out.
|
|
32
|
+
*
|
|
33
|
+
* Sorted-array invariant: `entries[model]` is always kept sorted ascending
|
|
34
|
+
* by `tsMs`. `reserve` uses binary-search insertion (not `push`) because
|
|
35
|
+
* future-dated provisionals (hint-driven or window-eviction-driven delay)
|
|
36
|
+
* can produce tsMs values that are out-of-order relative to a subsequent
|
|
37
|
+
* `delayMs = 0` reservation. Without sorted-insert, `prune`'s head-only
|
|
38
|
+
* fast-path silently skips expired entries buried mid-array, causing
|
|
39
|
+
* over-throttle; and `computeWindowDelay`'s oldest-first eviction picks
|
|
40
|
+
* the wrong `entries[k].tsMs` to wait for. Empirically demonstrated during
|
|
41
|
+
* PR #19 code review (Copilot + Grok + Gemini independently flagged).
|
|
42
|
+
*
|
|
43
|
+
* Retry-hint extend-only: `recordRetryHint` keeps the LONGER of existing
|
|
44
|
+
* and new expiry. Allowing a shorter hint to replace a longer one would
|
|
45
|
+
* let a future reserve compute a smaller `tsMs` than an entry previously
|
|
46
|
+
* appended under the longer hint — same ordering break as above via a
|
|
47
|
+
* different trigger path.
|
|
48
|
+
*
|
|
49
|
+
* Deliberate non-goals (tracked in docs/FOLLOW-UP-PRS.md T22 follow-ups):
|
|
50
|
+
* - Cross-process coordination. State is per-server-process, not shared
|
|
51
|
+
* across multiple MCP instances keyed on the same API key.
|
|
52
|
+
* - Persistence across restarts. The window is rebuilt from zero each
|
|
53
|
+
* server boot; a rapid restart during heavy usage can briefly exceed
|
|
54
|
+
* the limit until the window saturates again. Acceptable: startup is
|
|
55
|
+
* rare and the first 429 would re-teach us via `recordRetryHint`.
|
|
56
|
+
* - Server-side cancellation of in-flight Gemini calls. The throttle is
|
|
57
|
+
* preflight-only; it never aborts a `generateContent` in progress.
|
|
58
|
+
*/
|
|
59
|
+
export interface TpmReservation {
|
|
60
|
+
/** Milliseconds the caller must sleep before issuing the `generateContent`
|
|
61
|
+
* call. `0` means proceed immediately. */
|
|
62
|
+
readonly delayMs: number;
|
|
63
|
+
/** Opaque handle for `release` / `cancel`. Forget it and the provisional
|
|
64
|
+
* entry ages out of the window at `reservedAt + 60s` without updating
|
|
65
|
+
* to actuals — safe (errs on over-throttle) but leaves the estimate in
|
|
66
|
+
* the window longer than needed. */
|
|
67
|
+
readonly releaseId: number;
|
|
68
|
+
}
|
|
69
|
+
export interface TpmThrottle {
|
|
70
|
+
/**
|
|
71
|
+
* Reserve capacity for a planned `generateContent` call. Always returns
|
|
72
|
+
* a reservation — even when the throttle is disabled or the estimate
|
|
73
|
+
* exceeds the cap (in which case `delayMs === 0` and the provisional
|
|
74
|
+
* entry is still inserted so concurrent callers see our footprint).
|
|
75
|
+
*
|
|
76
|
+
* The reservation is provisional at `reserve` time: its token count is
|
|
77
|
+
* the caller's estimate. Always pair with exactly ONE of:
|
|
78
|
+
* - `release(id, actual)` on a successful Gemini response, or
|
|
79
|
+
* - `cancel(id)` on any failure BEFORE the call reached Gemini.
|
|
80
|
+
*
|
|
81
|
+
* Forgetting both is not a correctness bug — the provisional entry ages
|
|
82
|
+
* out naturally — but it leaves the estimate in the window for up to
|
|
83
|
+
* 60 seconds, potentially over-throttling future calls.
|
|
84
|
+
*/
|
|
85
|
+
reserve(model: string, estimatedInputTokens: number, nowMs?: number): TpmReservation;
|
|
86
|
+
/**
|
|
87
|
+
* Finalise a reservation with the actual input tokens Gemini reports
|
|
88
|
+
* (pass the full `promptTokenCount`, cached + uncached — both count
|
|
89
|
+
* toward Gemini's per-minute budget, empirically confirmed 2026-04-20).
|
|
90
|
+
* No-op if `releaseId` is unknown (already released, or throttle reset).
|
|
91
|
+
*/
|
|
92
|
+
release(releaseId: number, actualInputTokens: number, nowMs?: number): void;
|
|
93
|
+
/**
|
|
94
|
+
* Drop a reservation's provisional entry. Call on any failure that did
|
|
95
|
+
* not reach Gemini's billing path (validation error before dispatch,
|
|
96
|
+
* network error, local exception). No-op if `releaseId` is unknown.
|
|
97
|
+
*/
|
|
98
|
+
cancel(releaseId: number): void;
|
|
99
|
+
/**
|
|
100
|
+
* Peek the delay the next call would receive WITHOUT inserting a new
|
|
101
|
+
* `WindowEntry`. Exposed for diagnostics, tests, and progress-message
|
|
102
|
+
* rendering — NOT as the primary throttle API, because it has the
|
|
103
|
+
* TOCTOU race this module was written to eliminate.
|
|
104
|
+
*
|
|
105
|
+
* Not strictly side-effect-free: this call opportunistically `prune`s
|
|
106
|
+
* expired entries and advances the `lastObservedNowMs` floor. Both are
|
|
107
|
+
* normalisation, not state *changes* to the throttle's contract — the
|
|
108
|
+
* window's token accounting is unchanged by any number of peeks.
|
|
109
|
+
*/
|
|
110
|
+
shouldDelay(model: string, estimatedInputTokens: number, nowMs?: number): number;
|
|
111
|
+
/**
|
|
112
|
+
* Store a `retryInfo.retryDelay` hint extracted from a Gemini 429
|
|
113
|
+
* response. Google's hint is typically more accurate than our clock
|
|
114
|
+
* (we've seen 2–16s hints where our pure-window calculation returned
|
|
115
|
+
* 40+ seconds), so we use `max(computed, hint)` in `reserve` while
|
|
116
|
+
* the hint is active. Auto-expires at `now + retryDelayMs`.
|
|
117
|
+
*/
|
|
118
|
+
recordRetryHint(model: string, retryDelayMs: number, nowMs?: number): void;
|
|
119
|
+
}
|
|
120
|
+
export declare function createTpmThrottle(limitTokensPerMinute: number): TpmThrottle;
|
|
121
|
+
//# sourceMappingURL=throttle.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/throttle.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AAiDH,MAAM,WAAW,cAAc;IAC7B;8CAC0C;IAC1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;wCAGoC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,WAAW;IAC1B;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC;IAErF;;;;;OAKG;IACH,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE5E;;;;OAIG;IACH,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAEhC;;;;;;;;;;OAUG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEjF;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5E;AAED,wBAAgB,iBAAiB,CAAC,oBAAoB,EAAE,MAAM,GAAG,WAAW,CA8O3E"}
|
|
@@ -0,0 +1,357 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Client-side TPM (tokens-per-minute) throttle for Gemini API calls.
|
|
3
|
+
*
|
|
4
|
+
* Google enforces a per-minute input-token quota on paid Tier 1 Gemini 3 Pro
|
|
5
|
+
* at 100_000 tokens/minute/model/project (per AI Studio dashboard, subject
|
|
6
|
+
* to change). Without a client-side preflight we discover the limit only
|
|
7
|
+
* when Gemini returns 429 `RESOURCE_EXHAUSTED` — by which point the call
|
|
8
|
+
* is already billed (per `@google/genai@1.50.x` genai.d.ts: "AbortSignal
|
|
9
|
+
* is a client-only operation … you will still be charged").
|
|
10
|
+
*
|
|
11
|
+
* The module keeps an in-memory sliding 60-second window of recent input-
|
|
12
|
+
* token usage per resolved model. The primary API is a three-method
|
|
13
|
+
* reservation lifecycle — `reserve` / `release` / `cancel` — because a
|
|
14
|
+
* read-only "peek" API (the obvious design) has a TOCTOU race: between
|
|
15
|
+
* `peek()` → `await sleep()` → `await generateContent()` → `record()`, a
|
|
16
|
+
* concurrent MCP tool call observes the same pre-peek window and both
|
|
17
|
+
* callers proceed, collectively overshooting the quota.
|
|
18
|
+
*
|
|
19
|
+
* `reserve` solves the race by inserting a provisional `WindowEntry` with
|
|
20
|
+
* the caller's ESTIMATE at the moment the reservation is taken (plus the
|
|
21
|
+
* computed delay) — so subsequent concurrent `reserve` calls see the
|
|
22
|
+
* provisional entry and back off. When the call completes, `release`
|
|
23
|
+
* overwrites the estimate with actual token usage; on failure, `cancel`
|
|
24
|
+
* removes the provisional entry so it doesn't keep blocking future calls.
|
|
25
|
+
*
|
|
26
|
+
* Multi-entry eviction math: when the window is over-limit, we find the
|
|
27
|
+
* smallest index `k` such that evicting `entries[0..k]` drops the remaining
|
|
28
|
+
* sum enough to admit the new estimate. Waiting for JUST the oldest entry
|
|
29
|
+
* to expire (the naïve design this module replaced) under-delays whenever
|
|
30
|
+
* two or more large entries are still inside the window after that oldest
|
|
31
|
+
* one ages out.
|
|
32
|
+
*
|
|
33
|
+
* Sorted-array invariant: `entries[model]` is always kept sorted ascending
|
|
34
|
+
* by `tsMs`. `reserve` uses binary-search insertion (not `push`) because
|
|
35
|
+
* future-dated provisionals (hint-driven or window-eviction-driven delay)
|
|
36
|
+
* can produce tsMs values that are out-of-order relative to a subsequent
|
|
37
|
+
* `delayMs = 0` reservation. Without sorted-insert, `prune`'s head-only
|
|
38
|
+
* fast-path silently skips expired entries buried mid-array, causing
|
|
39
|
+
* over-throttle; and `computeWindowDelay`'s oldest-first eviction picks
|
|
40
|
+
* the wrong `entries[k].tsMs` to wait for. Empirically demonstrated during
|
|
41
|
+
* PR #19 code review (Copilot + Grok + Gemini independently flagged).
|
|
42
|
+
*
|
|
43
|
+
* Retry-hint extend-only: `recordRetryHint` keeps the LONGER of existing
|
|
44
|
+
* and new expiry. Allowing a shorter hint to replace a longer one would
|
|
45
|
+
* let a future reserve compute a smaller `tsMs` than an entry previously
|
|
46
|
+
* appended under the longer hint — same ordering break as above via a
|
|
47
|
+
* different trigger path.
|
|
48
|
+
*
|
|
49
|
+
* Deliberate non-goals (tracked in docs/FOLLOW-UP-PRS.md T22 follow-ups):
|
|
50
|
+
* - Cross-process coordination. State is per-server-process, not shared
|
|
51
|
+
* across multiple MCP instances keyed on the same API key.
|
|
52
|
+
* - Persistence across restarts. The window is rebuilt from zero each
|
|
53
|
+
* server boot; a rapid restart during heavy usage can briefly exceed
|
|
54
|
+
* the limit until the window saturates again. Acceptable: startup is
|
|
55
|
+
* rare and the first 429 would re-teach us via `recordRetryHint`.
|
|
56
|
+
* - Server-side cancellation of in-flight Gemini calls. The throttle is
|
|
57
|
+
* preflight-only; it never aborts a `generateContent` in progress.
|
|
58
|
+
*/
|
|
59
|
+
const WINDOW_MS = 60_000;
|
|
60
|
+
/**
|
|
61
|
+
* Randomised jitter padded onto computed wait times so a cluster of
|
|
62
|
+
* concurrent waiters evicting the same entry don't all compute the
|
|
63
|
+
* identical wait and wake at the same millisecond — which would re-create
|
|
64
|
+
* the burst they were trying to avoid. Range picked for a human-noticeable
|
|
65
|
+
* spread (≥1 s) without inflating typical waits excessively (≤3 s).
|
|
66
|
+
*
|
|
67
|
+
* `computeJitterMs` is a function (not a constant) because `Math.random()`
|
|
68
|
+
* MUST be evaluated per-caller — a module-scope `const` would be
|
|
69
|
+
* deterministic, which is exactly the thundering-herd bug Gemini flagged
|
|
70
|
+
* during PR #19 review.
|
|
71
|
+
*/
|
|
72
|
+
const JITTER_MIN_MS = 1_000;
|
|
73
|
+
const JITTER_MAX_MS = 3_000;
|
|
74
|
+
/**
|
|
75
|
+
* Uniformly distributed integer in `[JITTER_MIN_MS, JITTER_MAX_MS]` —
|
|
76
|
+
* BOTH endpoints inclusive. The `+ 1` in the multiplier width ensures
|
|
77
|
+
* `JITTER_MAX_MS` is reachable (without it, `Math.floor` clamps to
|
|
78
|
+
* `MAX - 1`, producing the `[1000, 2999]` off-by-one Copilot flagged in
|
|
79
|
+
* the PR #19 round-2 review).
|
|
80
|
+
*/
|
|
81
|
+
function computeJitterMs() {
|
|
82
|
+
return JITTER_MIN_MS + Math.floor(Math.random() * (JITTER_MAX_MS - JITTER_MIN_MS + 1));
|
|
83
|
+
}
|
|
84
|
+
export function createTpmThrottle(limitTokensPerMinute) {
|
|
85
|
+
if (!Number.isFinite(limitTokensPerMinute) || limitTokensPerMinute < 0) {
|
|
86
|
+
throw new Error(`createTpmThrottle: limit must be a non-negative finite number, got ${limitTokensPerMinute}`);
|
|
87
|
+
}
|
|
88
|
+
const disabled = limitTokensPerMinute === 0;
|
|
89
|
+
const windows = new Map();
|
|
90
|
+
const hints = new Map();
|
|
91
|
+
const reservationIndex = new Map();
|
|
92
|
+
let nextReservationId = 1;
|
|
93
|
+
/**
|
|
94
|
+
* Highest `nowMs` ever observed from a public-method call. Used to clamp
|
|
95
|
+
* backwards-jumping clocks (NTP correction, VM suspend/resume) — when
|
|
96
|
+
* the caller supplies a `nowMs` smaller than what we already know to have
|
|
97
|
+
* happened, we pin to our floor. Tracked separately from `entry.tsMs`
|
|
98
|
+
* because entries can be FUTURE-dated (a provisional reservation with
|
|
99
|
+
* `delayMs > 0` inserts at `now + delayMs`), and using those to clamp
|
|
100
|
+
* would pin "now" past the current real-time into scheduled-call time —
|
|
101
|
+
* which breaks multi-entry eviction math by making all past entries look
|
|
102
|
+
* like they've already aged out.
|
|
103
|
+
*/
|
|
104
|
+
let lastObservedNowMs = Number.NEGATIVE_INFINITY;
|
|
105
|
+
function effectiveNow(nowMs) {
|
|
106
|
+
// Guard against non-finite caller input (NaN, ±Infinity). Consistent with
|
|
107
|
+
// `sanitizeTokens`' "coerce rather than crash/deadlock" philosophy:
|
|
108
|
+
// passing `Number.NEGATIVE_INFINITY` would otherwise poison
|
|
109
|
+
// `lastObservedNowMs` and cause every subsequent call to compute
|
|
110
|
+
// delays of +Infinity. Fall back to `Date.now()` — the same value
|
|
111
|
+
// the public-API defaults use when `nowMs` is omitted.
|
|
112
|
+
const candidate = Number.isFinite(nowMs) ? nowMs : Date.now();
|
|
113
|
+
const clamped = candidate > lastObservedNowMs ? candidate : lastObservedNowMs;
|
|
114
|
+
lastObservedNowMs = clamped;
|
|
115
|
+
return clamped;
|
|
116
|
+
}
|
|
117
|
+
function prune(model, nowMs) {
|
|
118
|
+
const existing = windows.get(model);
|
|
119
|
+
if (!existing || existing.length === 0)
|
|
120
|
+
return [];
|
|
121
|
+
const cutoff = nowMs - WINDOW_MS;
|
|
122
|
+
// Fast path: nothing expired → return the array as-is without allocating.
|
|
123
|
+
// Entries are append-sorted by tsMs (chronological), so the head is oldest.
|
|
124
|
+
const first = existing[0];
|
|
125
|
+
if (first && first.tsMs > cutoff)
|
|
126
|
+
return existing;
|
|
127
|
+
const kept = [];
|
|
128
|
+
for (const e of existing) {
|
|
129
|
+
if (e.tsMs > cutoff) {
|
|
130
|
+
kept.push(e);
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
// Drop expired reservations from the ID index too — otherwise a late
|
|
134
|
+
// release/cancel would silently resurrect or mutate a stale entry.
|
|
135
|
+
reservationIndex.delete(e.id);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
138
|
+
if (kept.length === 0) {
|
|
139
|
+
windows.delete(model);
|
|
140
|
+
return [];
|
|
141
|
+
}
|
|
142
|
+
windows.set(model, kept);
|
|
143
|
+
return kept;
|
|
144
|
+
}
|
|
145
|
+
function activeHint(model, nowMs) {
|
|
146
|
+
const hint = hints.get(model);
|
|
147
|
+
if (!hint)
|
|
148
|
+
return null;
|
|
149
|
+
if (hint.expiresAtMs <= nowMs) {
|
|
150
|
+
hints.delete(model);
|
|
151
|
+
return null;
|
|
152
|
+
}
|
|
153
|
+
return hint;
|
|
154
|
+
}
|
|
155
|
+
/**
|
|
156
|
+
* Compute the PURE (un-jittered) delay needed before a call estimated at
|
|
157
|
+
* `estimate` tokens can fit under `limitTokensPerMinute`, given the
|
|
158
|
+
* current `entries`.
|
|
159
|
+
*
|
|
160
|
+
* Returns `0` when the call fits immediately. Returns `0` when `estimate`
|
|
161
|
+
* alone exceeds the limit — sleeping forever would deadlock the tool;
|
|
162
|
+
* Gemini will either accept (actual < estimate) or 429, at which point
|
|
163
|
+
* `recordRetryHint` seeds the hint path.
|
|
164
|
+
*
|
|
165
|
+
* Otherwise: find the smallest `k` such that evicting `entries[0..k]`
|
|
166
|
+
* leaves `sum(entries[k+1..]) + estimate <= limit`, and wait just long
|
|
167
|
+
* enough for `entries[k]` to age out of the 60s window.
|
|
168
|
+
*
|
|
169
|
+
* Jitter is NOT applied here — that's the caller's responsibility. See
|
|
170
|
+
* `computeWindowDelay` for the jittered variant used by `reserve`, and
|
|
171
|
+
* `shouldDelay` for the un-jittered peek used by diagnostics.
|
|
172
|
+
*/
|
|
173
|
+
function computeWindowDelayPure(entries, estimate, nowMs) {
|
|
174
|
+
let sum = 0;
|
|
175
|
+
for (const e of entries)
|
|
176
|
+
sum += e.tokens;
|
|
177
|
+
if (sum + estimate <= limitTokensPerMinute)
|
|
178
|
+
return 0;
|
|
179
|
+
if (estimate >= limitTokensPerMinute)
|
|
180
|
+
return 0;
|
|
181
|
+
// Iterate oldest-first, evict one entry at a time, stop when remaining
|
|
182
|
+
// tail + estimate fits. Since entries are chronological (tsMs ascending),
|
|
183
|
+
// evicting `entries[k]` also evicts everything older (they're already
|
|
184
|
+
// past their 60s age when `entries[k]` is).
|
|
185
|
+
let remaining = sum;
|
|
186
|
+
for (let k = 0; k < entries.length; k++) {
|
|
187
|
+
const e = entries[k];
|
|
188
|
+
if (!e)
|
|
189
|
+
break; // TS narrowing, unreachable given loop bound
|
|
190
|
+
remaining -= e.tokens;
|
|
191
|
+
if (remaining + estimate <= limitTokensPerMinute) {
|
|
192
|
+
const wait = e.tsMs + WINDOW_MS - nowMs;
|
|
193
|
+
return Math.max(0, wait);
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
// Unreachable in practice: `estimate < limit` (checked above) means
|
|
197
|
+
// evicting ALL entries (remaining=0) always fits. Return 0 defensively.
|
|
198
|
+
return 0;
|
|
199
|
+
}
|
|
200
|
+
/**
|
|
201
|
+
* Jittered variant of `computeWindowDelayPure`. Used by `reserve` so that
|
|
202
|
+
* concurrent waiters evicting the same entry wake at slightly different
|
|
203
|
+
* times instead of thundering back into generateContent simultaneously.
|
|
204
|
+
* Pure delay of `0` stays `0` — jitter only applies when there's actual
|
|
205
|
+
* waiting to do.
|
|
206
|
+
*/
|
|
207
|
+
function computeWindowDelay(entries, estimate, nowMs) {
|
|
208
|
+
const pure = computeWindowDelayPure(entries, estimate, nowMs);
|
|
209
|
+
return pure === 0 ? 0 : pure + computeJitterMs();
|
|
210
|
+
}
|
|
211
|
+
return {
|
|
212
|
+
reserve(model, estimatedInputTokens, nowMs = Date.now()) {
|
|
213
|
+
if (disabled) {
|
|
214
|
+
// Return a no-op reservation that cancel/release will accept. We
|
|
215
|
+
// don't index it — lookups short-circuit on the disabled path.
|
|
216
|
+
return { delayMs: 0, releaseId: -1 };
|
|
217
|
+
}
|
|
218
|
+
const now = effectiveNow(nowMs);
|
|
219
|
+
const estimate = sanitizeTokens(estimatedInputTokens);
|
|
220
|
+
const entries = prune(model, now);
|
|
221
|
+
let delayMs = computeWindowDelay(entries, estimate, now);
|
|
222
|
+
const hint = activeHint(model, now);
|
|
223
|
+
if (hint) {
|
|
224
|
+
const hintDelayMs = Math.max(0, hint.expiresAtMs - now);
|
|
225
|
+
if (hintDelayMs > delayMs)
|
|
226
|
+
delayMs = hintDelayMs;
|
|
227
|
+
}
|
|
228
|
+
const id = nextReservationId++;
|
|
229
|
+
const entry = {
|
|
230
|
+
id,
|
|
231
|
+
tsMs: now + delayMs,
|
|
232
|
+
tokens: estimate,
|
|
233
|
+
};
|
|
234
|
+
// Sorted-insert by tsMs ascending. Append-order is NOT a reliable
|
|
235
|
+
// proxy for chronological tsMs order — a `delayMs = 0` reservation
|
|
236
|
+
// arriving after a future-dated provisional (hint-driven or
|
|
237
|
+
// eviction-driven delay) has a smaller tsMs than the provisional's.
|
|
238
|
+
// Without sorted-insert the head-only fast-path in `prune` silently
|
|
239
|
+
// skips expired entries buried mid-array and `computeWindowDelay`'s
|
|
240
|
+
// oldest-first eviction picks the wrong entry to wait for.
|
|
241
|
+
insertSortedByTsMs(entries, entry);
|
|
242
|
+
windows.set(model, entries);
|
|
243
|
+
reservationIndex.set(id, { model, entry });
|
|
244
|
+
return { delayMs, releaseId: id };
|
|
245
|
+
},
|
|
246
|
+
release(releaseId, actualInputTokens, nowMs = Date.now()) {
|
|
247
|
+
if (disabled || releaseId < 0)
|
|
248
|
+
return;
|
|
249
|
+
const ref = reservationIndex.get(releaseId);
|
|
250
|
+
if (!ref)
|
|
251
|
+
return;
|
|
252
|
+
const actual = sanitizeTokens(actualInputTokens);
|
|
253
|
+
// Mutate the entry in place so the window sum reflects reality for
|
|
254
|
+
// future `reserve` callers. Leave tsMs unchanged: the call happened
|
|
255
|
+
// at the reservation's effective time regardless of how long the
|
|
256
|
+
// response took to arrive.
|
|
257
|
+
ref.entry.tokens = actual;
|
|
258
|
+
// Delete from the index AFTER mutating so a duplicate `release` or a
|
|
259
|
+
// late `cancel` on the same id becomes a safe no-op — without this,
|
|
260
|
+
// `cancel(alreadyReleasedId)` would remove the already-accounted
|
|
261
|
+
// entry from the window and under-throttle subsequent callers. The
|
|
262
|
+
// entry itself remains in `windows[model]` to count against the
|
|
263
|
+
// running window until it ages out naturally.
|
|
264
|
+
reservationIndex.delete(releaseId);
|
|
265
|
+
// Opportunistically prune while we have a nowMs — amortises cleanup
|
|
266
|
+
// cost across release calls and avoids relying solely on future
|
|
267
|
+
// `reserve` calls for the same model.
|
|
268
|
+
prune(ref.model, effectiveNow(nowMs));
|
|
269
|
+
},
|
|
270
|
+
cancel(releaseId) {
|
|
271
|
+
if (disabled || releaseId < 0)
|
|
272
|
+
return;
|
|
273
|
+
const ref = reservationIndex.get(releaseId);
|
|
274
|
+
if (!ref)
|
|
275
|
+
return;
|
|
276
|
+
reservationIndex.delete(releaseId);
|
|
277
|
+
const existing = windows.get(ref.model);
|
|
278
|
+
if (!existing)
|
|
279
|
+
return;
|
|
280
|
+
const filtered = existing.filter((e) => e.id !== releaseId);
|
|
281
|
+
if (filtered.length === 0)
|
|
282
|
+
windows.delete(ref.model);
|
|
283
|
+
else
|
|
284
|
+
windows.set(ref.model, filtered);
|
|
285
|
+
},
|
|
286
|
+
shouldDelay(model, estimatedInputTokens, nowMs = Date.now()) {
|
|
287
|
+
if (disabled)
|
|
288
|
+
return 0;
|
|
289
|
+
const now = effectiveNow(nowMs);
|
|
290
|
+
const estimate = sanitizeTokens(estimatedInputTokens);
|
|
291
|
+
const entries = prune(model, now);
|
|
292
|
+
// Peek uses the PURE delay — callers polling for progress-bar
|
|
293
|
+
// updates or diagnostics would otherwise see bouncing values for
|
|
294
|
+
// unchanged state, which `computeWindowDelay`'s random jitter
|
|
295
|
+
// introduces for `reserve`'s thundering-herd avoidance.
|
|
296
|
+
const windowDelay = computeWindowDelayPure(entries, estimate, now);
|
|
297
|
+
const hint = activeHint(model, now);
|
|
298
|
+
const hintDelay = hint ? Math.max(0, hint.expiresAtMs - now) : 0;
|
|
299
|
+
return Math.max(windowDelay, hintDelay);
|
|
300
|
+
},
|
|
301
|
+
recordRetryHint(model, retryDelayMs, nowMs = Date.now()) {
|
|
302
|
+
if (disabled)
|
|
303
|
+
return;
|
|
304
|
+
if (!Number.isFinite(retryDelayMs) || retryDelayMs <= 0)
|
|
305
|
+
return;
|
|
306
|
+
const now = effectiveNow(nowMs);
|
|
307
|
+
const newExpiresAtMs = now + retryDelayMs;
|
|
308
|
+
// Extend-only: a shorter hint replacing a longer one would produce
|
|
309
|
+
// a `reserve` that computes a smaller `tsMs` than entries already
|
|
310
|
+
// appended under the longer hint, breaking the sorted-array
|
|
311
|
+
// invariant. Keep the longer expiry when both exist — even if the
|
|
312
|
+
// new hint's `retryDelayMs` is smaller numerically, the wall-clock
|
|
313
|
+
// expiry monotonically increases.
|
|
314
|
+
const existing = hints.get(model);
|
|
315
|
+
if (existing && existing.expiresAtMs >= newExpiresAtMs)
|
|
316
|
+
return;
|
|
317
|
+
hints.set(model, { expiresAtMs: newExpiresAtMs, retryDelayMs });
|
|
318
|
+
},
|
|
319
|
+
};
|
|
320
|
+
}
|
|
321
|
+
/** Coerce non-finite / negative token values to 0 so callers with bad
|
|
322
|
+
* instrumentation data can't crash the throttle. A 0-token reservation
|
|
323
|
+
* still takes an ID (for lifecycle symmetry) but contributes nothing. */
|
|
324
|
+
function sanitizeTokens(n) {
|
|
325
|
+
if (!Number.isFinite(n) || n <= 0)
|
|
326
|
+
return 0;
|
|
327
|
+
return n;
|
|
328
|
+
}
|
|
329
|
+
/**
|
|
330
|
+
* Insert `entry` into `entries` at the position that keeps the array
|
|
331
|
+
* sorted ascending by `tsMs`. Binary-search for the insertion point;
|
|
332
|
+
* `splice` to insert. O(log n) compares + O(n) shift, same asymptotic
|
|
333
|
+
* cost as `push + sort` but with a smaller constant factor on the
|
|
334
|
+
* append-to-end fast path (the common case when clocks and delays are
|
|
335
|
+
* monotonic).
|
|
336
|
+
*/
|
|
337
|
+
function insertSortedByTsMs(entries, entry) {
|
|
338
|
+
// Common case: new entry is latest. Skip the binary search.
|
|
339
|
+
const last = entries[entries.length - 1];
|
|
340
|
+
if (!last || entry.tsMs >= last.tsMs) {
|
|
341
|
+
entries.push(entry);
|
|
342
|
+
return;
|
|
343
|
+
}
|
|
344
|
+
let lo = 0;
|
|
345
|
+
let hi = entries.length;
|
|
346
|
+
while (lo < hi) {
|
|
347
|
+
const mid = (lo + hi) >>> 1;
|
|
348
|
+
const probe = entries[mid];
|
|
349
|
+
// `probe` is defined because `mid < hi <= entries.length`.
|
|
350
|
+
if (probe && probe.tsMs <= entry.tsMs)
|
|
351
|
+
lo = mid + 1;
|
|
352
|
+
else
|
|
353
|
+
hi = mid;
|
|
354
|
+
}
|
|
355
|
+
entries.splice(lo, 0, entry);
|
|
356
|
+
}
|
|
357
|
+
//# sourceMappingURL=throttle.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../../src/tools/shared/throttle.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@qmediat.io/gemini-code-context-mcp",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "MCP server that gives Claude Code persistent memory of your codebase, backed by Gemini's 2M-token context. Drop-in upgrade over the abandoned gemini-mcp-tool.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"mcp",
|