@qmediat.io/gemini-code-context-mcp 1.21.0 → 1.22.1
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 +91 -1
- package/dist/cache/caching-mode.d.ts +40 -0
- package/dist/cache/caching-mode.d.ts.map +1 -0
- package/dist/cache/caching-mode.js +38 -0
- package/dist/cache/caching-mode.js.map +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +0 -1
- package/dist/config.js.map +1 -1
- package/dist/gemini/model-registry.d.ts +5 -0
- package/dist/gemini/model-registry.d.ts.map +1 -1
- package/dist/gemini/model-registry.js +70 -20
- package/dist/gemini/model-registry.js.map +1 -1
- package/dist/gemini/model-taxonomy.d.ts.map +1 -1
- package/dist/gemini/model-taxonomy.js +7 -0
- package/dist/gemini/model-taxonomy.js.map +1 -1
- package/dist/gemini/models.d.ts.map +1 -1
- package/dist/gemini/models.js +1 -0
- package/dist/gemini/models.js.map +1 -1
- package/dist/tools/ask-agentic.tool.d.ts.map +1 -1
- package/dist/tools/ask-agentic.tool.js +16 -13
- package/dist/tools/ask-agentic.tool.js.map +1 -1
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +10 -11
- 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 +11 -15
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/shared/abort-timeout.d.ts +6 -0
- package/dist/tools/shared/abort-timeout.d.ts.map +1 -1
- package/dist/tools/shared/abort-timeout.js +12 -5
- package/dist/tools/shared/abort-timeout.js.map +1 -1
- package/dist/tools/shared/stream-collector.js +1 -1
- package/dist/tools/shared/stream-collector.js.map +1 -1
- package/dist/tools/status.tool.d.ts.map +1 -1
- package/dist/tools/status.tool.js +2 -1
- package/dist/tools/status.tool.js.map +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/cost-estimator.d.ts +58 -4
- package/dist/utils/cost-estimator.d.ts.map +1 -1
- package/dist/utils/cost-estimator.js +218 -60
- package/dist/utils/cost-estimator.js.map +1 -1
- package/dist/utils/pricing-overrides.d.ts +10 -0
- package/dist/utils/pricing-overrides.d.ts.map +1 -0
- package/dist/utils/pricing-overrides.js +104 -0
- package/dist/utils/pricing-overrides.js.map +1 -0
- package/package.json +8 -2
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,94 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|
|
7
7
|
|
|
8
8
|
## [Unreleased]
|
|
9
9
|
|
|
10
|
+
## [1.22.1] - 2026-10-16
|
|
11
|
+
|
|
12
|
+
### Fixed
|
|
13
|
+
|
|
14
|
+
- The cost estimate and the recorded spend use the rates of Google's pricing page (read 2026-10-16, Standard tier) with
|
|
15
|
+
the dates they take effect, instead of a "conservative" later rate booked today: a row may carry `next` rates from a
|
|
16
|
+
UTC date on. A settled call is priced at the rate in force when it settles; a daily-budget reservation at the dearer
|
|
17
|
+
of the rates in force when it is made and when the call's timeout ends (each `ask_agentic` iteration on its own, with
|
|
18
|
+
its iteration timeout; a call without a timeout at each component's dearest rate in force from now on, overrides
|
|
19
|
+
included), so a call that crosses a price change
|
|
20
|
+
never settles above its reservation.
|
|
21
|
+
`gemini-4-argon` bills 2 / 10 / 0.1 USD per 1M input / output / cached tokens through 2026-11-30 and 4 / 20 / 0.2 from
|
|
22
|
+
2026-12-01 — this corrects 1.22.0's row, which booked the December rate from the start.
|
|
23
|
+
- Rows brought up to the page: `gemini-3.1-pro-preview` and `gemini-3-pro-preview` 4 / 18 / 0.4 (the > 200k-token tier;
|
|
24
|
+
the estimator does not see the prompt's size, so the dearer tier is the row), `gemini-2.5-pro` 2.5 / 15 / 0.25
|
|
25
|
+
(its > 200k tier), `gemini-3-flash-preview` 0.5 / 3 / 0.05, `gemini-3.1-flash-image-preview` 0.5 / 3, `gemini-2.5-flash`
|
|
26
|
+
cached 0.03, `gemini-2.5-flash-lite` cached 0.01.
|
|
27
|
+
- New rows: `gemini-3.8-flash`, `gemini-3.7-flash`, `gemini-3.6-flash` at 0.75 / 3.75 / 0.075 through 2026-12-31 and
|
|
28
|
+
1.5 / 7.5 / 0.15 from 2027-01-01; `gemini-3.5-flash-lite` at 0.3 / 2.5 / 0.03; `gemini-3.1-flash-lite` at 0.25 / 1.5 /
|
|
29
|
+
0.025, and `gemini-3.1-flash-lite-preview` at the same rates (the page prices the model once; it was 0.1 / 0.4).
|
|
30
|
+
`gemini-3.5-flash` has no row — the page does not list it — and prices at the `text-fast` bound.
|
|
31
|
+
- The rolling aliases are no longer priced as the 2.5 line, as 1.22.0's entry had it: on 2026-10-16 the response's
|
|
32
|
+
`modelVersion` showed `gemini-pro-latest` serving `gemini-3.1-pro-preview`, `gemini-flash-latest` `gemini-3.8-flash`
|
|
33
|
+
and `gemini-flash-lite-latest` `gemini-3.5-flash-lite`. See Changed for how an alias is priced now.
|
|
34
|
+
|
|
35
|
+
### Changed
|
|
36
|
+
|
|
37
|
+
- A rolling alias prices at the dearest rate of its measured target's category (Google may move an alias to a dearer
|
|
38
|
+
model between two measurements), never as a row of its own; an override keyed by the alias id wins, then an override
|
|
39
|
+
of its target.
|
|
40
|
+
- `GEMINI_PRICING_OVERRIDES` entries are validated when first read: an entry with a rate that is not a finite number
|
|
41
|
+
≥ 0, or a `next` without a `YYYY-MM-DD` `from` or without all three rates, is dropped with a warning naming the model
|
|
42
|
+
and the reason — a `from` that is not a real calendar day (`2026-13-01`) included, and a key `__proto__`
|
|
43
|
+
(until now it was taken as it came and could price every call at the later rate or book `NaN`); an
|
|
44
|
+
unparseable value is said, not ignored silently. A model id named like an Object prototype member (`constructor`) is
|
|
45
|
+
priced by the fallback instead of `NaN`.
|
|
46
|
+
- The bound for an unpriced text model or an alias is computed over the table with the overrides on top, so an override
|
|
47
|
+
that adds a dearer model of the category lifts it.
|
|
48
|
+
- The bound for an unpriced text model is the dearest rate its category has in force on the day, so the new rows raise
|
|
49
|
+
it: an unpriced `text-fast` model is priced at 0.75 / 3.75 (1.5 / 7.5 from 2027-01-01; was 0.3 / 2.5), an unpriced
|
|
50
|
+
`text-lite` one at 0.3 / 2.5 (was 0.1 / 0.4), an unpriced `text-reasoning` one at 4 / 18 / 0.4 (4 / 20 / 0.4 from
|
|
51
|
+
2026-12-01; was 4 / 20 / 0.875).
|
|
52
|
+
|
|
53
|
+
## [1.22.0] - 2026-10-16
|
|
54
|
+
|
|
55
|
+
### Added
|
|
56
|
+
|
|
57
|
+
- Gemini 4 codenames are classified: `gemini-4-argon` (and a point release such as `gemini-4.1-argon`) is
|
|
58
|
+
`text-reasoning` at the `premium` cost tier; an `-image` / `-tts` / `-live` variant keeps its specialised category and
|
|
59
|
+
an `-argon-lite` / `-argon-flash` variant its tier.
|
|
60
|
+
- `latest-pro`, `latest-pro-thinking` and `latest-vision` resolve to `gemini-4-argon` when the key lists it beside
|
|
61
|
+
`gemini-3.1-pro-preview`: the model list is ranked by the taxonomy's category and cost tier instead of a `pro` /
|
|
62
|
+
`flash` substring of the ID. The `status` listing leads with the text models.
|
|
63
|
+
- A price row for `gemini-4-argon`: 4 / 20 / 0.2 USD per 1M input / output / cached tokens, Google's rate from
|
|
64
|
+
2026-12-01. Through 2026-11-30 Google bills 2 / 10 / 0.1, so until then the estimate is 2× high — the conservative
|
|
65
|
+
side; `GEMINI_PRICING_OVERRIDES` gives the lower rate.
|
|
66
|
+
- `ask` and `code` report `cachingMode` (the mode the call ran with) and, when it differs from the one requested,
|
|
67
|
+
`cachingModeNote`; the `cachingMode` input's description says when `'explicit'` runs as `'implicit'`.
|
|
68
|
+
- `status` lists `supportsCaching` for each available model (and `no explicit cache` in its text listing).
|
|
69
|
+
|
|
70
|
+
### Fixed
|
|
71
|
+
|
|
72
|
+
- `ask` with `gemini-4-argon` no longer refuses the model as `unknown`.
|
|
73
|
+
- `latest-pro` / `latest-pro-thinking` / `latest-flash` / `latest-lite` no longer resolve to a rolling unversioned
|
|
74
|
+
`gemini-*-latest` alias (which Google points at an older model) when a versioned id is listed; a `-latest` id that
|
|
75
|
+
carries a version keeps its version rank.
|
|
76
|
+
- `latest-lite` (and every alias) picks a GA id before its `-preview` twin (`gemini-3.1-flash-lite` over
|
|
77
|
+
`gemini-3.1-flash-lite-preview`), and version numbers compare as numbers (`gemini-3.10-*` above `gemini-3.9-*`).
|
|
78
|
+
- `cachingMode: 'explicit'` on a model without `createCachedContent` (`gemini-4-argon`) no longer uploads the files and
|
|
79
|
+
attempts a cache that can only fail: the call runs implicit and says so.
|
|
80
|
+
- When `caches.create` fails and the files go without a cache, `ask` / `code` and the usage telemetry record
|
|
81
|
+
`cachingMode: 'implicit'` (with a `cachingModeNote` naming the failed create) instead of `explicit`: `explicit` now
|
|
82
|
+
means a Context Cache served the call.
|
|
83
|
+
- A model the price table does not list is priced by its taxonomy category instead of a `pro` / `flash` / `lite`
|
|
84
|
+
substring of its id: an unpriced text model gets the dearest rate the table knows for its category (text-reasoning
|
|
85
|
+
today: 4 / 20 input / output, 0.875 cached — until now 3.5 / 10.5 for a `-pro` id), any other model the
|
|
86
|
+
conservative rate of its cost tier (10.5 / 30 for a premium one).
|
|
87
|
+
- Price rows for Google's rolling aliases, as the model each points at today: `gemini-pro-latest` as `gemini-2.5-pro`,
|
|
88
|
+
`gemini-flash-latest` as `gemini-2.5-flash`, `gemini-flash-lite-latest` as `gemini-2.5-flash-lite`.
|
|
89
|
+
|
|
90
|
+
### Changed
|
|
91
|
+
|
|
92
|
+
- Development only: `npm run lint` checks the structure of the code with a shared preset beside Biome (ESLint with
|
|
93
|
+
Babel's TypeScript parser — TypeScript 7 has no JavaScript API for typescript-eslint —, jscpd for repeated blocks, a
|
|
94
|
+
ratchet that keeps the recorded baselines from growing); CI and the release verification run it. Twenty
|
|
95
|
+
`eslint-disable` comments that disabled nothing (no ESLint ran here) are gone. Nothing in the published package
|
|
96
|
+
changes.
|
|
97
|
+
|
|
10
98
|
## [1.21.0] - 2026-10-06
|
|
11
99
|
|
|
12
100
|
### Added
|
|
@@ -1642,6 +1730,8 @@ Integration-test-surfaced and review-surfaced fixes landed before the v1.0.0 rel
|
|
|
1642
1730
|
- MIME type simplified to `text/plain` for all files.
|
|
1643
1731
|
- Unit test coverage gaps for cache-manager / files-uploader / ttl-watcher / profile-loader / parseEdits tracked in [`docs/FOLLOW-UP-PRS.md`](docs/FOLLOW-UP-PRS.md).
|
|
1644
1732
|
|
|
1645
|
-
[Unreleased]: https://github.com/qmediat/gemini-code-context-mcp/compare/v1.
|
|
1733
|
+
[Unreleased]: https://github.com/qmediat/gemini-code-context-mcp/compare/v1.22.1...HEAD
|
|
1734
|
+
[1.22.1]: https://github.com/qmediat/gemini-code-context-mcp/compare/v1.22.0...v1.22.1
|
|
1735
|
+
[1.22.0]: https://github.com/qmediat/gemini-code-context-mcp/compare/v1.21.0...v1.22.0
|
|
1646
1736
|
[1.21.0]: https://github.com/qmediat/gemini-code-context-mcp/compare/v1.20.0...v1.21.0
|
|
1647
1737
|
[1.0.0]: https://github.com/qmediat/gemini-code-context-mcp/releases/tag/v1.0.0
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The caching mode a call actually runs with — the one decision `ask` and `code`
|
|
3
|
+
* share before `prepareContext`.
|
|
4
|
+
*/
|
|
5
|
+
import type { ResolvedModel } from '../types.js';
|
|
6
|
+
import type { ProgressEmitter } from '../utils/progress.js';
|
|
7
|
+
/** What `'explicit'` turns into when it cannot be honoured — appended to `ask` / `code`'s `cachingMode` description. */
|
|
8
|
+
export declare const CACHING_MODE_FALLBACK_DESCRIPTION = " A model without `createCachedContent` (`gemini-4-argon`) runs `'explicit'` as `'implicit'`, and a failed `caches.create` sends the files without a cache; either way the response says what ran in `cachingMode` and why in `cachingModeNote`.";
|
|
9
|
+
/** The caching mode a call runs with, and why it differs from the one requested. */
|
|
10
|
+
export interface CachingModeChoice {
|
|
11
|
+
readonly mode: 'explicit' | 'implicit';
|
|
12
|
+
/** Set when the requested mode could not be honoured; said to the caller and the log. */
|
|
13
|
+
readonly note: string | null;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* The caching mode a call actually runs with. A model that does not accept
|
|
17
|
+
* `caches.create` (no `createCachedContent` in its actions — `gemini-4-argon`)
|
|
18
|
+
* runs an `explicit` request as `implicit`: the files go inline and Gemini's
|
|
19
|
+
* implicit cache applies, with no upload and no create attempt that can only fail.
|
|
20
|
+
*/
|
|
21
|
+
export declare function cachingModeFor(requested: 'explicit' | 'implicit', model: ResolvedModel, emitter: ProgressEmitter): CachingModeChoice;
|
|
22
|
+
/** The caching mode a call ran with, as telemetry and the response record it. */
|
|
23
|
+
export type RanCachingMode = 'explicit' | 'implicit' | 'inline';
|
|
24
|
+
/** What ran, and why it differs from what was asked when it does. */
|
|
25
|
+
export interface RanCaching {
|
|
26
|
+
readonly mode: RanCachingMode;
|
|
27
|
+
readonly note: string | null;
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* The caching mode a prepared context actually ran with: a cache id means the
|
|
31
|
+
* Context Cache served the call (`explicit`); inline-only means the files went
|
|
32
|
+
* inline by choice (`implicit`) or by force (`inline`: no caching allowed, a
|
|
33
|
+
* workspace under the cache floor); neither means `caches.create` failed and the
|
|
34
|
+
* files went without a cache, which Gemini's implicit cache serves (`implicit`).
|
|
35
|
+
*/
|
|
36
|
+
export declare function cachingRan(prep: {
|
|
37
|
+
readonly cacheId: string | null;
|
|
38
|
+
readonly inlineOnly: boolean;
|
|
39
|
+
}, choice: CachingModeChoice): RanCaching;
|
|
40
|
+
//# sourceMappingURL=caching-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"caching-mode.d.ts","sourceRoot":"","sources":["../../src/cache/caching-mode.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAE5D,wHAAwH;AACxH,eAAO,MAAM,iCAAiC,oPACqM,CAAC;AAEpP,oFAAoF;AACpF,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IACvC,yFAAyF;IACzF,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,SAAS,EAAE,UAAU,GAAG,UAAU,EAClC,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,eAAe,GACvB,iBAAiB,CAMnB;AAED,iFAAiF;AACjF,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;AAEhE,qEAAqE;AACrE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAKD;;;;;;GAMG;AACH,wBAAgB,UAAU,CACxB,IAAI,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAA;CAAE,EACvE,MAAM,EAAE,iBAAiB,GACxB,UAAU,CAMZ"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The caching mode a call actually runs with — the one decision `ask` and `code`
|
|
3
|
+
* share before `prepareContext`.
|
|
4
|
+
*/
|
|
5
|
+
import { logger } from '../utils/logger.js';
|
|
6
|
+
/** What `'explicit'` turns into when it cannot be honoured — appended to `ask` / `code`'s `cachingMode` description. */
|
|
7
|
+
export const CACHING_MODE_FALLBACK_DESCRIPTION = " A model without `createCachedContent` (`gemini-4-argon`) runs `'explicit'` as `'implicit'`, and a failed `caches.create` sends the files without a cache; either way the response says what ran in `cachingMode` and why in `cachingModeNote`.";
|
|
8
|
+
/**
|
|
9
|
+
* The caching mode a call actually runs with. A model that does not accept
|
|
10
|
+
* `caches.create` (no `createCachedContent` in its actions — `gemini-4-argon`)
|
|
11
|
+
* runs an `explicit` request as `implicit`: the files go inline and Gemini's
|
|
12
|
+
* implicit cache applies, with no upload and no create attempt that can only fail.
|
|
13
|
+
*/
|
|
14
|
+
export function cachingModeFor(requested, model, emitter) {
|
|
15
|
+
if (requested !== 'explicit' || model.supportsCaching)
|
|
16
|
+
return { mode: requested, note: null };
|
|
17
|
+
const note = `cachingMode 'explicit' is not available for ${model.resolved} (no createCachedContent) — running implicit: files inline, Gemini's implicit cache applies.`;
|
|
18
|
+
emitter.emit(note);
|
|
19
|
+
logger.warn(note);
|
|
20
|
+
return { mode: 'implicit', note };
|
|
21
|
+
}
|
|
22
|
+
const CREATE_FAILED_NOTE = "cachingMode 'explicit': the Context Cache could not be created (caches.create failed) — the files went without a cache; Gemini's implicit cache applies.";
|
|
23
|
+
/**
|
|
24
|
+
* The caching mode a prepared context actually ran with: a cache id means the
|
|
25
|
+
* Context Cache served the call (`explicit`); inline-only means the files went
|
|
26
|
+
* inline by choice (`implicit`) or by force (`inline`: no caching allowed, a
|
|
27
|
+
* workspace under the cache floor); neither means `caches.create` failed and the
|
|
28
|
+
* files went without a cache, which Gemini's implicit cache serves (`implicit`).
|
|
29
|
+
*/
|
|
30
|
+
export function cachingRan(prep, choice) {
|
|
31
|
+
if (prep.cacheId !== null)
|
|
32
|
+
return { mode: 'explicit', note: choice.note };
|
|
33
|
+
if (prep.inlineOnly) {
|
|
34
|
+
return { mode: choice.mode === 'implicit' ? 'implicit' : 'inline', note: choice.note };
|
|
35
|
+
}
|
|
36
|
+
return { mode: 'implicit', note: CREATE_FAILED_NOTE };
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=caching-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"caching-mode.js","sourceRoot":"","sources":["../../src/cache/caching-mode.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG5C,wHAAwH;AACxH,MAAM,CAAC,MAAM,iCAAiC,GAC5C,iPAAiP,CAAC;AASpP;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAC5B,SAAkC,EAClC,KAAoB,EACpB,OAAwB;IAExB,IAAI,SAAS,KAAK,UAAU,IAAI,KAAK,CAAC,eAAe;QAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9F,MAAM,IAAI,GAAG,+CAA+C,KAAK,CAAC,QAAQ,8FAA8F,CAAC;IACzK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;AACpC,CAAC;AAWD,MAAM,kBAAkB,GACtB,0JAA0J,CAAC;AAE7J;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CACxB,IAAuE,EACvE,MAAyB;IAEzB,IAAI,IAAI,CAAC,OAAO,KAAK,IAAI;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IAC1E,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;QACpB,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;IACzF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;AACxD,CAAC"}
|
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;AAG1E,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,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;;;;;;OASG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;;;;;;;;;;;;;;;OAkBG;IACH,WAAW,EAAE,UAAU,GAAG,UAAU,CAAC;IACrC;;;;;OAKG;IACH,WAAW,EAAE,UAAU,GAAG,MAAM,CAAC;IACjC;2BACuB;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;OAUG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC7B;
|
|
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;AAG1E,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,oBAAoB,EAAE,OAAO,CAAC;IAC9B;;;;;;;;;OASG;IACH,WAAW,EAAE,OAAO,CAAC;IACrB;;;;;;;;;;;;;;;;;;OAkBG;IACH,WAAW,EAAE,UAAU,GAAG,UAAU,CAAC;IACrC;;;;;OAKG;IACH,WAAW,EAAE,UAAU,GAAG,MAAM,CAAC;IACjC;2BACuB;IACvB,MAAM,EAAE,OAAO,CAAC;IAChB;;;;;;;;;;OAUG;IACH,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAmED,wBAAgB,UAAU,IAAI,MAAM,CAiDnC;AAED;;2DAE2D;AAC3D,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,OAAO,CAEzE;AAED,+GAA+G;AAC/G,wBAAgB,kBAAkB,CAAC,MAAM,UAAQ,GAAG,UAAU,GAAG,MAAM,CAgBtE"}
|
package/dist/config.js
CHANGED
|
@@ -65,7 +65,6 @@ function readCachingModeEnv() {
|
|
|
65
65
|
// operators still see what they typed (`EXPLICITT`-style typos remain
|
|
66
66
|
// diagnosable), but multi-line forgery attempts collapse to a single
|
|
67
67
|
// safe log line.
|
|
68
|
-
// eslint-disable-next-line no-console
|
|
69
68
|
console.error(`[gemini-code-context-mcp] warning: GEMINI_CODE_CONTEXT_CACHING_MODE="${safeForLog(raw)}" is not a recognised value (expected 'explicit' or 'implicit'); falling back to 'implicit'.`);
|
|
70
69
|
return 'implicit';
|
|
71
70
|
}
|
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;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AA8G/C,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;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAAY;IAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC9B,IAAI,CAAC,GAAG;QAAE,OAAO,KAAK,CAAC;IACvB,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACnC,OAAO,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,CAAC;AAChE,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,kBAAkB;IACzB,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;IACzD,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,UAAU,CAAC;IACzC,oEAAoE;IACpE,oEAAoE;IACpE,qEAAqE;IACrE,uEAAuE;IACvE,sEAAsE;IACtE,oDAAoD;IACpD,MAAM,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACnC,IAAI,CAAC,KAAK,EAAE;QAAE,OAAO,UAAU,CAAC;IAChC,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,UAAU;QAAE,OAAO,CAAC,CAAC;IACnD,qEAAqE;IACrE,yEAAyE;IACzE,EAAE;IACF,+DAA+D;IAC/D,iEAAiE;IACjE,qEAAqE;IACrE,qEAAqE;IACrE,sEAAsE;IACtE,oEAAoE;IACpE,sEAAsE;IACtE,qEAAqE;IACrE,iBAAiB;IACjB,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,11 @@ export interface ModelInfo {
|
|
|
16
16
|
supportsThinking: boolean;
|
|
17
17
|
/** Inferred from input limit ≥ 100k — a heuristic for context-cache eligibility. */
|
|
18
18
|
supportsLongContext: boolean;
|
|
19
|
+
/**
|
|
20
|
+
* The model accepts `caches.create` (`supportedActions` lists `createCachedContent`).
|
|
21
|
+
* True when the API gives no action list, so a model is never refused on a missing field.
|
|
22
|
+
*/
|
|
23
|
+
supportsCaching: boolean;
|
|
19
24
|
}
|
|
20
25
|
export declare function listAvailableModels(client: GoogleGenAI, { force }?: {
|
|
21
26
|
force?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../src/gemini/model-registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"model-registry.d.ts","sourceRoot":"","sources":["../../src/gemini/model-registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAS,MAAM,eAAe,CAAC;AAgFxD,MAAM,WAAW,SAAS;IACxB,yDAAyD;IACzD,EAAE,EAAE,MAAM,CAAC;IACX,2EAA2E;IAC3E,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oFAAoF;IACpF,mBAAmB,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AA8BD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,WAAW,EACnB,EAAE,KAAK,EAAE,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAClC,OAAO,CAAC,SAAS,EAAE,CAAC,CAoBtB;AAED,iEAAiE;AACjE,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C"}
|
|
@@ -5,6 +5,68 @@
|
|
|
5
5
|
* tool call can force a refresh if the user upgrades their API tier mid-session.
|
|
6
6
|
*/
|
|
7
7
|
import { logger } from '../utils/logger.js';
|
|
8
|
+
import { categorizeModel, costTierOf, } from './model-taxonomy.js';
|
|
9
|
+
/**
|
|
10
|
+
* Google's unversioned `-latest` ids (`gemini-pro-latest`, `gemini-flash-latest`,
|
|
11
|
+
* `gemini-flash-lite-latest`) are rolling aliases whose target is never newer than
|
|
12
|
+
* the newest versioned id (the measured targets: `ALIAS_TARGET` in
|
|
13
|
+
* `utils/cost-estimator.ts`); the `latest-*` aliases here must pick a versioned
|
|
14
|
+
* model, so these rank after it.
|
|
15
|
+
* An id that carries a version digit is a versioned model whatever its suffix.
|
|
16
|
+
*/
|
|
17
|
+
function isRollingAlias(id) {
|
|
18
|
+
return /-latest$/i.test(id) && !/\d/.test(id);
|
|
19
|
+
}
|
|
20
|
+
/** Listing rank of each category: the text tiers first, unclassified last. */
|
|
21
|
+
const CATEGORY_RANK = {
|
|
22
|
+
'text-reasoning': 0,
|
|
23
|
+
'text-fast': 1,
|
|
24
|
+
'text-lite': 2,
|
|
25
|
+
agent: 3,
|
|
26
|
+
'image-generation': 4,
|
|
27
|
+
'audio-generation': 5,
|
|
28
|
+
'video-generation': 6,
|
|
29
|
+
embedding: 7,
|
|
30
|
+
unknown: 8,
|
|
31
|
+
};
|
|
32
|
+
/** Listing rank of each cost tier: the premium tier first, unclassified last. */
|
|
33
|
+
const TIER_RANK = {
|
|
34
|
+
premium: 0,
|
|
35
|
+
standard: 1,
|
|
36
|
+
budget: 2,
|
|
37
|
+
unknown: 3,
|
|
38
|
+
};
|
|
39
|
+
function rankKey(id) {
|
|
40
|
+
const base = id.replace(/-preview$/i, '');
|
|
41
|
+
return {
|
|
42
|
+
category: CATEGORY_RANK[categorizeModel(id)],
|
|
43
|
+
tier: TIER_RANK[costTierOf(id)],
|
|
44
|
+
rolling: Number(isRollingAlias(id)),
|
|
45
|
+
base,
|
|
46
|
+
preview: Number(base !== id),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Listing order: the taxonomy's category (the text tiers first, so the `status`
|
|
51
|
+
* listing leads with what `ask` / `code` can use), its cost tier (premium →
|
|
52
|
+
* standard → budget → unknown), versioned ids before rolling aliases, the base id
|
|
53
|
+
* descending with numeric segments compared as numbers (`3.10` above `3.9`), and a
|
|
54
|
+
* GA id before its `-preview` twin. Category and tier come from the taxonomy, not
|
|
55
|
+
* from a `pro` / `flash` substring, so a codename family (`gemini-4-argon`) ranks
|
|
56
|
+
* with its tier.
|
|
57
|
+
*/
|
|
58
|
+
function compareListing(ka, kb) {
|
|
59
|
+
if (ka.category !== kb.category)
|
|
60
|
+
return ka.category - kb.category;
|
|
61
|
+
if (ka.tier !== kb.tier)
|
|
62
|
+
return ka.tier - kb.tier;
|
|
63
|
+
if (ka.rolling !== kb.rolling)
|
|
64
|
+
return ka.rolling - kb.rolling;
|
|
65
|
+
const byBase = kb.base.localeCompare(ka.base, undefined, { numeric: true });
|
|
66
|
+
if (byBase !== 0)
|
|
67
|
+
return byBase;
|
|
68
|
+
return ka.preview - kb.preview;
|
|
69
|
+
}
|
|
8
70
|
function normalizeId(raw) {
|
|
9
71
|
if (!raw)
|
|
10
72
|
return '';
|
|
@@ -24,6 +86,7 @@ function toModelInfo(model) {
|
|
|
24
86
|
outputTokenLimit: outputLimit,
|
|
25
87
|
supportsThinking: model.thinking === true,
|
|
26
88
|
supportsLongContext: inputLimit !== null && inputLimit >= 100_000,
|
|
89
|
+
supportsCaching: model.supportedActions?.includes('createCachedContent') ?? true,
|
|
27
90
|
};
|
|
28
91
|
}
|
|
29
92
|
let cached = null;
|
|
@@ -40,27 +103,14 @@ export async function listAvailableModels(client, { force } = {}) {
|
|
|
40
103
|
if (info)
|
|
41
104
|
out.push(info);
|
|
42
105
|
}
|
|
43
|
-
//
|
|
44
|
-
out.
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
if (id.includes('flash'))
|
|
49
|
-
return 1;
|
|
50
|
-
if (id.includes('lite'))
|
|
51
|
-
return 2;
|
|
52
|
-
return 3;
|
|
53
|
-
};
|
|
54
|
-
const ra = tierRank(a.id);
|
|
55
|
-
const rb = tierRank(b.id);
|
|
56
|
-
if (ra !== rb)
|
|
57
|
-
return ra - rb;
|
|
58
|
-
return b.id.localeCompare(a.id);
|
|
59
|
-
});
|
|
60
|
-
cached = out;
|
|
106
|
+
// Decorate once: the key runs the taxonomy's regexes, so it is built per model, not per comparison.
|
|
107
|
+
const ranked = out.map((info) => ({ info, key: rankKey(info.id) }));
|
|
108
|
+
ranked.sort((a, b) => compareListing(a.key, b.key));
|
|
109
|
+
const sorted = ranked.map((r) => r.info);
|
|
110
|
+
cached = sorted;
|
|
61
111
|
cachedAt = now;
|
|
62
|
-
logger.debug(`model-registry: loaded ${
|
|
63
|
-
return
|
|
112
|
+
logger.debug(`model-registry: loaded ${sorted.length} models`);
|
|
113
|
+
return sorted;
|
|
64
114
|
}
|
|
65
115
|
/** Invalidate the in-process model cache — used by `reindex`. */
|
|
66
116
|
export function invalidateModelCache() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-registry.js","sourceRoot":"","sources":["../../src/gemini/model-registry.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"model-registry.js","sourceRoot":"","sources":["../../src/gemini/model-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-taxonomy.d.ts","sourceRoot":"","sources":["../../src/gemini/model-taxonomy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;GAIG;AACH,MAAM,MAAM,aAAa,GACrB,gBAAgB,GAChB,WAAW,GACX,WAAW,GACX,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,WAAW,GACX,OAAO,GACP,SAAS,CAAC;AAEd;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;CAClE;
|
|
1
|
+
{"version":3,"file":"model-taxonomy.d.ts","sourceRoot":"","sources":["../../src/gemini/model-taxonomy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH;;;;GAIG;AACH,MAAM,MAAM,aAAa,GACrB,gBAAgB,GAChB,WAAW,GACX,WAAW,GACX,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,WAAW,GACX,OAAO,GACP,SAAS,CAAC;AAEd;;;;GAIG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,iEAAiE;IACjE,QAAQ,CAAC,QAAQ,EAAE,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;CAClE;AAoGD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,CAM9D;AAED;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAKvE;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE;IAAE,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,GAClD,eAAe,CAuBjB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,aAAa,GAAG,OAAO,CAElE;AAED;;;;;;GAMG;AACH,qBAAa,0BAA2B,SAAQ,KAAK;IACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,SAAS,aAAa,EAAE,CAAC;IAEpD,YAAY,OAAO,EAAE;QACnB,OAAO,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,aAAa,CAAC;QAC9B,gBAAgB,EAAE,SAAS,aAAa,EAAE,CAAC;KAC5C,EAUA;CACF"}
|
|
@@ -86,6 +86,13 @@ const CATEGORY_RULES = [
|
|
|
86
86
|
// Flash (standard speed tier).
|
|
87
87
|
{ pattern: /^gemini-.*-flash/i, category: 'text-fast', costTier: 'standard' },
|
|
88
88
|
{ pattern: /-flash(?:-|$)/i, category: 'text-fast', costTier: 'standard' },
|
|
89
|
+
// Gemini 4 frontier models ship under a codename with no pro/flash token
|
|
90
|
+
// (`gemini-4-argon`, a later `gemini-4.1-argon`). Argon is the reasoning
|
|
91
|
+
// tier: thinking, 2 / 10 USD per 1M tokens — premium. Placed after every
|
|
92
|
+
// specialisation and after the lite / flash rules, so an `-image` / `-tts` /
|
|
93
|
+
// `-live` variant keeps its specialised category and an `-argon-lite` /
|
|
94
|
+
// `-argon-flash` variant its tier: the more specific tier wins.
|
|
95
|
+
{ pattern: /^gemini-4(?:\.\d+)?-argon(?:-|$)/i, category: 'text-reasoning', costTier: 'premium' },
|
|
89
96
|
// Pro (reasoning / premium tier). Only reaches here if no specialisation
|
|
90
97
|
// above claimed the model. The `^gemini-pro` rule previously at the end
|
|
91
98
|
// of this list was unreachable because `/-pro(?:-|$)/i` already matches
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-taxonomy.js","sourceRoot":"","sources":["../../src/gemini/model-taxonomy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-taxonomy.js","sourceRoot":"","sources":["../../src/gemini/model-taxonomy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/gemini/models.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAInB,MAAM,qBAAqB,CAAC;AAkD7B,QAAA,MAAM,OAAO;;iBAET,kBAAkB;iBAClB,WAAW,EAAE,sCAAsC;;;iBAGnD,kBAAkB;iBAClB,gBAAgB,UAAU,eAAe;iBACzC,WAAW,EAAE,4DAA4D;;;iBAGzE,kBAAkB;iBAClB,WAAW,EAAE,yCAAyC;;;iBAGtD,kBAAkB;iBAClB,WAAW,EAAE,0CAA0C;;;iBAGvD,kBAAkB;iBAClB,gBAAgB,UAAU,eAAe;iBACzC,WAAW,EAAE,yDAAyD;;CAE5B,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG,MAAM,OAAO,OAAO,CAAC;AAEzC,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,KAAK,CAErD;AAmCD;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CACtD;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/gemini/models.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGjD,OAAO,EACL,KAAK,eAAe,EACpB,KAAK,aAAa,EAInB,MAAM,qBAAqB,CAAC;AAkD7B,QAAA,MAAM,OAAO;;iBAET,kBAAkB;iBAClB,WAAW,EAAE,sCAAsC;;;iBAGnD,kBAAkB;iBAClB,gBAAgB,UAAU,eAAe;iBACzC,WAAW,EAAE,4DAA4D;;;iBAGzE,kBAAkB;iBAClB,WAAW,EAAE,yCAAyC;;;iBAGtD,kBAAkB;iBAClB,WAAW,EAAE,0CAA0C;;;iBAGvD,kBAAkB;iBAClB,gBAAgB,UAAU,eAAe;iBACzC,WAAW,EAAE,yDAAyD;;CAE5B,CAAC;AAE/C,MAAM,MAAM,KAAK,GAAG,MAAM,OAAO,OAAO,CAAC;AAEzC,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,KAAK,CAErD;AAmCD;;;;;;GAMG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;OAIG;IACH,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CACtD;AAED,wBAAsB,YAAY,CAChC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,aAAa,CAAC,CA0DxB;AAaD,wBAAgB,WAAW,IAAI,SAAS,KAAK,EAAE,CAE9C;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG;IAC3C,QAAQ,CAAC,kBAAkB,EAAE,SAAS,aAAa,EAAE,CAAC;IACtD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,gBAAgB,EAAE,OAAO,CAAC;IACnC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC,CAQA"}
|
package/dist/gemini/models.js
CHANGED
|
@@ -104,6 +104,7 @@ export async function resolveModel(requested, client, options = {}) {
|
|
|
104
104
|
outputTokenLimit: picked.outputTokenLimit,
|
|
105
105
|
category: picked.category,
|
|
106
106
|
capabilities: picked.capabilities,
|
|
107
|
+
supportsCaching: picked.supportsCaching,
|
|
107
108
|
});
|
|
108
109
|
const enforceCategory = (picked) => {
|
|
109
110
|
if (options.requiredCategory !== undefined &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/gemini/models.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/gemini/models.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask-agentic.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask-agentic.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAaH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAkBxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"ask-agentic.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask-agentic.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAaH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAkBxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAgB7E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6E9B,CAAC;AAEL,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,qBAAqB,CAAC,CAAC;AA8BpE;;;;;;;;;;;;;;;;;qEAiBqE;AACrE,wBAAgB,+BAA+B,IAAI,MAAM,CAUxD;AA0VD,eAAO,MAAM,cAAc,EAAE,cAAc,CAAC,eAAe,CAa1D,CAAC"}
|
|
@@ -34,13 +34,13 @@ import { resolveModel } from '../gemini/models.js';
|
|
|
34
34
|
import { abortableSleep, withNetworkRetry } from '../gemini/retry.js';
|
|
35
35
|
import { defaultMatchConfig } from '../indexer/globs.js';
|
|
36
36
|
import { WorkspaceValidationError, validateWorkspacePath, } from '../indexer/workspace-validation.js';
|
|
37
|
-
import { estimateCostUsd, toMicrosUsd } from '../utils/cost-estimator.js';
|
|
37
|
+
import { estimateCostUsd, estimateReservationUsd, toMicrosUsd } from '../utils/cost-estimator.js';
|
|
38
38
|
import { logger, safeForLog } from '../utils/logger.js';
|
|
39
39
|
import { createProgressEmitter } from '../utils/progress.js';
|
|
40
40
|
import { SandboxError, resolveInsideWorkspace, resolveWorkspaceRoot } from './agentic/sandbox.js';
|
|
41
41
|
import { findFilesExecutor, grepExecutor, listDirectoryExecutor, readFileExecutor, } from './agentic/workspace-tools.js';
|
|
42
42
|
import { errorResult, textResult } from './registry.js';
|
|
43
|
-
import { createTimeoutController, getTimeoutKind, isTimeoutAbort } from './shared/abort-timeout.js';
|
|
43
|
+
import { createTimeoutController, getTimeoutKind, isTimeoutAbort, resolveTotalTimeoutMs, } from './shared/abort-timeout.js';
|
|
44
44
|
import { collectStream } from './shared/stream-collector.js';
|
|
45
45
|
import { SYSTEM_INSTRUCTION_SAFETY_AGENTIC } from './shared/system-instruction-safety.js';
|
|
46
46
|
import { THINKING_LEVELS } from './shared/thinking.js';
|
|
@@ -596,17 +596,26 @@ async function executeAskAgenticBody(input, ctx, rawWorkspaceRoot, model, starte
|
|
|
596
596
|
// review by Grok (P0: budget bypass on agentic path).
|
|
597
597
|
const PER_ITERATION_INPUT_TOKENS = 50_000;
|
|
598
598
|
const PER_ITERATION_OUTPUT_TOKENS = typeof input.maxOutputTokens === 'number' ? input.maxOutputTokens : 4096;
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
599
|
+
// The longest an iteration (or the finalization pass) can run: the window
|
|
600
|
+
// each reservation covers.
|
|
601
|
+
const iterationCoverMs = resolveTotalTimeoutMs(input.iterationTimeoutMs, 'GEMINI_CODE_CONTEXT_AGENTIC_ITERATION_TIMEOUT_MS');
|
|
602
|
+
/** One pass's reservation, at the rates in force from now until its timeout. */
|
|
603
|
+
const reservedModel = resolved.resolved;
|
|
604
|
+
const passReservationUsd = (inputTokens) => estimateReservationUsd({
|
|
605
|
+
model: reservedModel,
|
|
606
|
+
uncachedInputTokens: inputTokens,
|
|
602
607
|
cachedInputTokens: 0,
|
|
603
608
|
outputTokens: PER_ITERATION_OUTPUT_TOKENS,
|
|
604
609
|
thinkingTokens: PER_ITERATION_OUTPUT_TOKENS,
|
|
605
|
-
});
|
|
610
|
+
}, iterationCoverMs);
|
|
606
611
|
const dailyBudgetEnforced = Number.isFinite(ctx.config.dailyBudgetUsd);
|
|
607
612
|
const tpmEnforced = ctx.config.tpmThrottleLimit > 0;
|
|
608
613
|
while (iterations < maxIterations) {
|
|
609
614
|
iterations += 1;
|
|
615
|
+
// Priced per iteration, covering the rates in force until its timeout: a
|
|
616
|
+
// loop that crosses a price change reserves at the new rate, so each
|
|
617
|
+
// reservation stays an upper bound of what its settlement books.
|
|
618
|
+
const perIterationCostUsd = passReservationUsd(PER_ITERATION_INPUT_TOKENS);
|
|
610
619
|
// Per-iteration budget reservation (mirrors ask.tool.ts). Each
|
|
611
620
|
// iteration is an independent generateContent billable, so each
|
|
612
621
|
// gets its own reservation/finalize pair. Budget ledger stays
|
|
@@ -1063,13 +1072,7 @@ async function executeAskAgenticBody(input, ctx, rawWorkspaceRoot, model, starte
|
|
|
1063
1072
|
const finalizationEstimate = lastIterationPromptTokens > 0
|
|
1064
1073
|
? lastIterationPromptTokens + lastToolResponseTokens + 5_000
|
|
1065
1074
|
: PER_ITERATION_INPUT_TOKENS;
|
|
1066
|
-
const finalizationCostUsd =
|
|
1067
|
-
model: resolved.resolved,
|
|
1068
|
-
uncachedInputTokens: finalizationEstimate,
|
|
1069
|
-
cachedInputTokens: 0,
|
|
1070
|
-
outputTokens: PER_ITERATION_OUTPUT_TOKENS,
|
|
1071
|
-
thinkingTokens: PER_ITERATION_OUTPUT_TOKENS,
|
|
1072
|
-
});
|
|
1075
|
+
const finalizationCostUsd = passReservationUsd(finalizationEstimate);
|
|
1073
1076
|
if (dailyBudgetEnforced) {
|
|
1074
1077
|
const reserve = ctx.manifest.reserveBudget({
|
|
1075
1078
|
workspaceRoot,
|