@qmediat.io/gemini-code-context-mcp 1.23.1 → 1.24.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 +72 -1
- package/README.md +1 -1
- package/dist/cache/ttl-watcher.d.ts +29 -0
- package/dist/cache/ttl-watcher.d.ts.map +1 -1
- package/dist/cache/ttl-watcher.js +104 -43
- package/dist/cache/ttl-watcher.js.map +1 -1
- package/dist/gemini/client.d.ts +7 -0
- package/dist/gemini/client.d.ts.map +1 -1
- package/dist/gemini/client.js +8 -1
- package/dist/gemini/client.js.map +1 -1
- package/dist/gemini/long-decode.d.ts +153 -0
- package/dist/gemini/long-decode.d.ts.map +1 -0
- package/dist/gemini/long-decode.js +178 -0
- package/dist/gemini/long-decode.js.map +1 -0
- package/dist/gemini/model-registry.d.ts +2 -0
- package/dist/gemini/model-registry.d.ts.map +1 -1
- package/dist/gemini/model-registry.js +5 -2
- package/dist/gemini/model-registry.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/gemini/retry.d.ts +8 -0
- package/dist/gemini/retry.d.ts.map +1 -1
- package/dist/gemini/retry.js +33 -1
- package/dist/gemini/retry.js.map +1 -1
- package/dist/tools/ask-agentic.tool.d.ts.map +1 -1
- package/dist/tools/ask-agentic.tool.js +10 -12
- 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 +168 -379
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts +6 -0
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +146 -286
- 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 -0
- package/dist/tools/shared/abort-timeout.js.map +1 -1
- package/dist/tools/shared/call-ledger.d.ts +73 -0
- package/dist/tools/shared/call-ledger.d.ts.map +1 -0
- package/dist/tools/shared/call-ledger.js +115 -0
- package/dist/tools/shared/call-ledger.js.map +1 -0
- package/dist/tools/shared/context-decode.d.ts +77 -0
- package/dist/tools/shared/context-decode.d.ts.map +1 -0
- package/dist/tools/shared/context-decode.js +125 -0
- package/dist/tools/shared/context-decode.js.map +1 -0
- package/dist/tools/shared/continuation.d.ts +124 -0
- package/dist/tools/shared/continuation.d.ts.map +1 -0
- package/dist/tools/shared/continuation.js +302 -0
- package/dist/tools/shared/continuation.js.map +1 -0
- package/dist/tools/shared/dispatch-throttle.d.ts +43 -0
- package/dist/tools/shared/dispatch-throttle.d.ts.map +1 -0
- package/dist/tools/shared/dispatch-throttle.js +65 -0
- package/dist/tools/shared/dispatch-throttle.js.map +1 -0
- package/dist/tools/shared/settle-call.d.ts +63 -0
- package/dist/tools/shared/settle-call.d.ts.map +1 -0
- package/dist/tools/shared/settle-call.js +55 -0
- package/dist/tools/shared/settle-call.js.map +1 -0
- package/dist/tools/shared/stream-collector.d.ts +7 -0
- package/dist/tools/shared/stream-collector.d.ts.map +1 -1
- package/dist/tools/shared/stream-collector.js +5 -1
- package/dist/tools/shared/stream-collector.js.map +1 -1
- package/dist/tools/shared/thinking.d.ts +41 -11
- package/dist/tools/shared/thinking.d.ts.map +1 -1
- package/dist/tools/shared/thinking.js +62 -9
- package/dist/tools/shared/thinking.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 +17 -0
- package/dist/utils/cost-estimator.d.ts.map +1 -1
- package/dist/utils/cost-estimator.js +15 -2
- package/dist/utils/cost-estimator.js.map +1 -1
- package/package.json +4 -3
|
@@ -0,0 +1,178 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Long decode — the facts of Gemini 4's continuation protocol and the output cap a call runs under.
|
|
3
|
+
*
|
|
4
|
+
* Google's reference (docs.cloud.google.com/vertex-ai/generative-ai/docs/model-reference/gemini): on a Gemini 4
|
|
5
|
+
* model a response that reaches the per-request decode limit stops with `finishReason: CONTINUATION` and a
|
|
6
|
+
* `continuationToken`; the ORIGINAL request sent again with `continuationToken` set to the latest token continues
|
|
7
|
+
* it, up to 1 048 576 decoded tokens in total. Thinking tokens count against the decode, and every request bills
|
|
8
|
+
* its whole input again: the prompt plus everything decoded before it.
|
|
9
|
+
*/
|
|
10
|
+
import { logger } from '../utils/logger.js';
|
|
11
|
+
import { categorizeModel, isTextGenCategory } from './model-taxonomy.js';
|
|
12
|
+
/** The most a Gemini 4 decode can produce over all its requests. */
|
|
13
|
+
export const LONG_DECODE_TOTAL_TOKENS = 1_048_576;
|
|
14
|
+
/** The most one streaming request decodes before it stops with `CONTINUATION` (a non-streaming one: 32 768). */
|
|
15
|
+
export const LONG_DECODE_STREAM_REQUEST_TOKENS = 65_536;
|
|
16
|
+
/** A text model of the Gemini 4 family (`gemini-4-<codename>`, `gemini-4.1-<codename>`, their `-preview` twins). */
|
|
17
|
+
const GEMINI_4_ID = /^gemini-4(?:\.\d+)?-/i;
|
|
18
|
+
/**
|
|
19
|
+
* The total a decode of `modelId` may reach through continuation, or `null` for a model without long decode. Long
|
|
20
|
+
* decode runs on the Gemini Developer API only: on Vertex AI every model is clamped to its per-request limit,
|
|
21
|
+
* whatever the shape of its id. The model registry carries it beside the advertised input and output limits.
|
|
22
|
+
*/
|
|
23
|
+
export function longDecodeTokenLimitOf(modelId, backend) {
|
|
24
|
+
if (backend !== 'developer' || !GEMINI_4_ID.test(modelId))
|
|
25
|
+
return null;
|
|
26
|
+
return isTextGenCategory(categorizeModel(modelId)) ? LONG_DECODE_TOTAL_TOKENS : null;
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Input a continuation request bills beyond the prompt and the tokens decoded before it. Measured on
|
|
30
|
+
* gemini-4-hydrogen in two runs: +125 tokens (99 712-token prompt, request 2 billed 165 373) and +89; reserved at
|
|
31
|
+
* twice the larger, rounded up.
|
|
32
|
+
*/
|
|
33
|
+
export const CONTINUATION_REQUEST_OVERHEAD_TOKENS = 256;
|
|
34
|
+
/**
|
|
35
|
+
* The caller's cap is clamped to the model's per-request limit, or — on a model with long decode — to its long
|
|
36
|
+
* decode total. Without a caller's cap nothing goes on the wire (one request, the model's default), unless the
|
|
37
|
+
* operator forces the per-request limit.
|
|
38
|
+
*/
|
|
39
|
+
export function resolveOutputCap(inputs) {
|
|
40
|
+
const perRequest = typeof inputs.outputTokenLimit === 'number' && inputs.outputTokenLimit > 0
|
|
41
|
+
? inputs.outputTokenLimit
|
|
42
|
+
: inputs.fallbackLimit;
|
|
43
|
+
const ceiling = Math.max(perRequest, inputs.longDecodeTokenLimit ?? 0);
|
|
44
|
+
const wire = inputs.requested !== undefined
|
|
45
|
+
? Math.min(inputs.requested, ceiling)
|
|
46
|
+
: inputs.forceMax
|
|
47
|
+
? perRequest
|
|
48
|
+
: undefined;
|
|
49
|
+
const effective = wire ?? perRequest;
|
|
50
|
+
return {
|
|
51
|
+
wire,
|
|
52
|
+
effective,
|
|
53
|
+
perRequest,
|
|
54
|
+
ceiling,
|
|
55
|
+
maxRequests: maxDecodeRequests(effective, perRequest),
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* The cap of a long decode bounded by the model's input window W. Request k sends the prompt P again plus every token
|
|
60
|
+
* decoded before it, and the client opens no further request once the decoded tokens reached the cap: under a cap of
|
|
61
|
+
* at most W − P − O no request's input passes W. The premise — the API refuses a continuation request whose prompt
|
|
62
|
+
* plus decoded tokens pass W — is assumed, not measured: the repository holds a measurement of what a continuation
|
|
63
|
+
* request bills, none of a refusal at the window (docs/FOLLOW-UP-PRS.md T41).
|
|
64
|
+
*
|
|
65
|
+
* The cap is never cut below one request's limit — the first request sends the prompt alone, which the preflight
|
|
66
|
+
* bounds. A cut that leaves several requests keeps the caller's `wire`: the client stops the decode at `effective`,
|
|
67
|
+
* after `maxRequests`. A cut that leaves one request sends the cut value as `maxOutputTokens`, so the server holds it
|
|
68
|
+
* (a stop at it is `MAX_TOKENS`) — one streaming request would otherwise decode past it. Without a counted prompt or
|
|
69
|
+
* an advertised window nothing is cut.
|
|
70
|
+
*/
|
|
71
|
+
export function boundByInputWindow(cap, promptTokens, inputTokenLimit) {
|
|
72
|
+
if (cap.maxRequests <= 1 || promptTokens === undefined || inputTokenLimit === null) {
|
|
73
|
+
return { cap, cut: null };
|
|
74
|
+
}
|
|
75
|
+
const room = inputTokenLimit - promptTokens - CONTINUATION_REQUEST_OVERHEAD_TOKENS;
|
|
76
|
+
const most = Math.min(cap.ceiling, Math.max(room, cap.perRequest));
|
|
77
|
+
if (cap.effective <= most)
|
|
78
|
+
return { cap, cut: null };
|
|
79
|
+
const maxRequests = maxDecodeRequests(most, cap.perRequest);
|
|
80
|
+
return {
|
|
81
|
+
cap: {
|
|
82
|
+
wire: maxRequests === 1 ? most : cap.wire,
|
|
83
|
+
effective: most,
|
|
84
|
+
perRequest: cap.perRequest,
|
|
85
|
+
ceiling: most,
|
|
86
|
+
maxRequests,
|
|
87
|
+
},
|
|
88
|
+
cut: { from: cap.effective, to: most, inputTokenLimit },
|
|
89
|
+
};
|
|
90
|
+
}
|
|
91
|
+
/** The progress and log line of a cut cap. */
|
|
92
|
+
export function describeInputWindowCut(cut) {
|
|
93
|
+
const n = (v) => v.toLocaleString('en-US');
|
|
94
|
+
return `maxOutputTokens cut from ${n(cut.from)} to ${n(cut.to)}: each continuation request sends the prompt again plus everything decoded before it, and the model's ${n(cut.inputTokenLimit)}-token input window holds no more`;
|
|
95
|
+
}
|
|
96
|
+
/**
|
|
97
|
+
* The cap a call's decode runs under: a long decode never sends a continuation request past the model's input
|
|
98
|
+
* window (`boundByInputWindow`). A cut is said on the call's progress channel and in the log.
|
|
99
|
+
*/
|
|
100
|
+
export function capThatRuns(call) {
|
|
101
|
+
const bounded = boundByInputWindow(call.cap, call.promptTokens, call.inputTokenLimit);
|
|
102
|
+
if (bounded.cut === null)
|
|
103
|
+
return bounded;
|
|
104
|
+
const note = `${call.tool}: ${describeInputWindowCut(bounded.cut)}`;
|
|
105
|
+
call.emit(note);
|
|
106
|
+
logger.warn(note);
|
|
107
|
+
return bounded;
|
|
108
|
+
}
|
|
109
|
+
/** The answer the output cap keeps beside a thinking budget: Gemini requires `thinkingBudget < maxOutputTokens`. */
|
|
110
|
+
export const ANSWER_RESERVE_TOKENS = 1_024;
|
|
111
|
+
/**
|
|
112
|
+
* The refusal of a caller's positive `thinkingBudget` that leaves less than the answer reserve under the caller's own
|
|
113
|
+
* `maxOutputTokens` (`cap`: what that cap became under the model's limits) — refused, never clamped to 0, which
|
|
114
|
+
* Gemini 3 Pro answers with a 400 that hides the cause. `null` when it fits, or the caller set either one not.
|
|
115
|
+
*/
|
|
116
|
+
export function thinkingBudgetRefusal(budget, requestedCap, cap) {
|
|
117
|
+
if (budget === undefined || budget <= 0 || requestedCap === undefined)
|
|
118
|
+
return null;
|
|
119
|
+
const least = budget + ANSWER_RESERVE_TOKENS;
|
|
120
|
+
if (cap >= least)
|
|
121
|
+
return null;
|
|
122
|
+
return `thinkingBudget (${budget}) + ${ANSWER_RESERVE_TOKENS}-token answer reserve exceeds maxOutputTokens (${cap}). Raise \`maxOutputTokens\` to at least ${least}, or lower \`thinkingBudget\`.`;
|
|
123
|
+
}
|
|
124
|
+
/**
|
|
125
|
+
* The count mode the preflight runs in. A decode that may take more than one request bills its prompt once per
|
|
126
|
+
* request, so the budget reservation takes the exact count (`countTokens`) whatever mode was asked for; a
|
|
127
|
+
* one-request call keeps the caller's mode.
|
|
128
|
+
*/
|
|
129
|
+
export function preflightModeFor(requested, cap) {
|
|
130
|
+
return cap.maxRequests > 1 ? 'exact' : requested;
|
|
131
|
+
}
|
|
132
|
+
/** The requests a decode of `cap` tokens may take when each request decodes up to `perRequest` tokens. */
|
|
133
|
+
export function maxDecodeRequests(cap, perRequest) {
|
|
134
|
+
if (perRequest <= 0)
|
|
135
|
+
return 1;
|
|
136
|
+
return Math.max(1, Math.ceil(cap / perRequest));
|
|
137
|
+
}
|
|
138
|
+
/** The most one streaming request of a model with per-request limit `perRequest` decodes (M). */
|
|
139
|
+
function streamRequestTokens(perRequest) {
|
|
140
|
+
return Math.max(perRequest, LONG_DECODE_STREAM_REQUEST_TOKENS);
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
* The input tokens the continuation requests bill again, at most, for a prompt of `promptTokens` tokens:
|
|
144
|
+
*
|
|
145
|
+
* R = ceil(C / L) requests (the client stops there; L = the per-request limit)
|
|
146
|
+
* M = max(L, 65 536) the most one streaming request decodes
|
|
147
|
+
* O = CONTINUATION_REQUEST_OVERHEAD_TOKENS what a continuation request bills beyond the two terms below
|
|
148
|
+
* re-billed input = Σ_{k=1..R−1} (P + min(k·M, C) + O)
|
|
149
|
+
*
|
|
150
|
+
* Request k sends the prompt P again plus the tokens decoded before it, which are at most k·M and below the cap C
|
|
151
|
+
* (the client opens no request once the decoded tokens reached C). The first request's prompt is not part of this
|
|
152
|
+
* sum.
|
|
153
|
+
*/
|
|
154
|
+
export function continuationInputTokens(promptTokens, cap, perRequest) {
|
|
155
|
+
const requests = maxDecodeRequests(cap, perRequest);
|
|
156
|
+
const perRequestCeiling = streamRequestTokens(perRequest);
|
|
157
|
+
let total = 0;
|
|
158
|
+
for (let k = 1; k < requests; k++) {
|
|
159
|
+
total +=
|
|
160
|
+
promptTokens + Math.min(k * perRequestCeiling, cap) + CONTINUATION_REQUEST_OVERHEAD_TOKENS;
|
|
161
|
+
}
|
|
162
|
+
return total;
|
|
163
|
+
}
|
|
164
|
+
/**
|
|
165
|
+
* The most a decode of cap C produces (thinking and answer). One request honours `maxOutputTokens` = C. Over several
|
|
166
|
+
* requests C stays the bound only while Google holds `maxOutputTokens` over the whole chain, which the client cannot
|
|
167
|
+
* check: it stops after a request ends, once the decoded tokens reached C, so a server that holds the cap per
|
|
168
|
+
* request lets the last request run up to one request's decode past it — at most C + M − 1, and never more than
|
|
169
|
+
* R requests of M.
|
|
170
|
+
*/
|
|
171
|
+
export function decodedTokensBound(cap, perRequest) {
|
|
172
|
+
const requests = maxDecodeRequests(cap, perRequest);
|
|
173
|
+
if (requests === 1)
|
|
174
|
+
return cap;
|
|
175
|
+
const perRequestCeiling = streamRequestTokens(perRequest);
|
|
176
|
+
return Math.min(requests * perRequestCeiling, cap + perRequestCeiling - 1);
|
|
177
|
+
}
|
|
178
|
+
//# sourceMappingURL=long-decode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"long-decode.js","sourceRoot":"","sources":["../../src/gemini/long-decode.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ export interface ModelInfo {
|
|
|
13
13
|
displayName: string;
|
|
14
14
|
inputTokenLimit: number | null;
|
|
15
15
|
outputTokenLimit: number | null;
|
|
16
|
+
/** The total a decode may reach through continuation requests (Gemini 4: 1 048 576); `null` without long decode. */
|
|
17
|
+
longDecodeTokenLimit: number | null;
|
|
16
18
|
supportsThinking: boolean;
|
|
17
19
|
/** Inferred from input limit ≥ 100k — a heuristic for context-cache eligibility. */
|
|
18
20
|
supportsLongContext: 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;AA6FxD,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,oHAAoH;IACpH,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,gBAAgB,EAAE,OAAO,CAAC;IAC1B,oFAAoF;IACpF,mBAAmB,EAAE,OAAO,CAAC;IAC7B;;;OAGG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AA+BD,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,WAAW,EACnB,EAAE,KAAK,EAAE,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAA;CAAO,GAClC,OAAO,CAAC,SAAS,EAAE,CAAC,CAqBtB;AAED,iEAAiE;AACjE,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C"}
|
|
@@ -5,6 +5,7 @@
|
|
|
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 { longDecodeTokenLimitOf } from './long-decode.js';
|
|
8
9
|
import { categorizeModel, codenameRank, costTierOf, } from './model-taxonomy.js';
|
|
9
10
|
/**
|
|
10
11
|
* Google's unversioned `-latest` ids (`gemini-pro-latest`, `gemini-flash-latest`,
|
|
@@ -81,7 +82,7 @@ function normalizeId(raw) {
|
|
|
81
82
|
return '';
|
|
82
83
|
return raw.replace(/^models\//, '').trim();
|
|
83
84
|
}
|
|
84
|
-
function toModelInfo(model) {
|
|
85
|
+
function toModelInfo(model, backend) {
|
|
85
86
|
const id = normalizeId(model.name);
|
|
86
87
|
if (id.length === 0)
|
|
87
88
|
return null;
|
|
@@ -93,6 +94,7 @@ function toModelInfo(model) {
|
|
|
93
94
|
displayName: model.displayName ?? id,
|
|
94
95
|
inputTokenLimit: inputLimit,
|
|
95
96
|
outputTokenLimit: outputLimit,
|
|
97
|
+
longDecodeTokenLimit: longDecodeTokenLimitOf(id, backend),
|
|
96
98
|
supportsThinking: model.thinking === true,
|
|
97
99
|
supportsLongContext: inputLimit !== null && inputLimit >= 100_000,
|
|
98
100
|
supportsCaching: model.supportedActions?.includes('createCachedContent') ?? true,
|
|
@@ -106,9 +108,10 @@ export async function listAvailableModels(client, { force } = {}) {
|
|
|
106
108
|
if (!force && cached && now - cachedAt < TTL_MS)
|
|
107
109
|
return cached;
|
|
108
110
|
const pager = await client.models.list();
|
|
111
|
+
const backend = client.vertexai === true ? 'vertex' : 'developer';
|
|
109
112
|
const out = [];
|
|
110
113
|
for await (const model of pager) {
|
|
111
|
-
const info = toModelInfo(model);
|
|
114
|
+
const info = toModelInfo(model, backend);
|
|
112
115
|
if (info)
|
|
113
116
|
out.push(info);
|
|
114
117
|
}
|
|
@@ -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;AAC5C,OAAO,EAGL,eAAe,EACf,YAAY,EACZ,UAAU,GACX,MAAM,qBAAqB,CAAC;AAE7B;;;;;;;GAOG;AACH,SAAS,cAAc,CAAC,EAAU;IAChC,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,8EAA8E;AAC9E,MAAM,aAAa,GAA4C;IAC7D,gBAAgB,EAAE,CAAC;IACnB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,CAAC;IACR,kBAAkB,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC;IACZ,OAAO,EAAE,CAAC;CACX,CAAC;AAEF,iFAAiF;AACjF,MAAM,SAAS,GAA0D;IACvE,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;CACX,CAAC;AAeF,SAAS,OAAO,CAAC,EAAU;IACzB,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC1C,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI;QACJ,OAAO,EAAE,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QAC1D,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,cAAc,CAAC,EAAW,EAAE,EAAW;IAC9C,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IAClE,IAAI,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;IAClD,IAAI,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAC9D,IAAI,EAAE,CAAC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,IAAI,SAAS,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACtC,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAChC,OAAO,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;AACjC,CAAC;
|
|
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;AAC5C,OAAO,EAAmB,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAGL,eAAe,EACf,YAAY,EACZ,UAAU,GACX,MAAM,qBAAqB,CAAC;AAE7B;;;;;;;GAOG;AACH,SAAS,cAAc,CAAC,EAAU;IAChC,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,8EAA8E;AAC9E,MAAM,aAAa,GAA4C;IAC7D,gBAAgB,EAAE,CAAC;IACnB,WAAW,EAAE,CAAC;IACd,WAAW,EAAE,CAAC;IACd,KAAK,EAAE,CAAC;IACR,kBAAkB,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC;IACrB,kBAAkB,EAAE,CAAC;IACrB,SAAS,EAAE,CAAC;IACZ,OAAO,EAAE,CAAC;CACX,CAAC;AAEF,iFAAiF;AACjF,MAAM,SAAS,GAA0D;IACvE,OAAO,EAAE,CAAC;IACV,QAAQ,EAAE,CAAC;IACX,MAAM,EAAE,CAAC;IACT,OAAO,EAAE,CAAC;CACX,CAAC;AAeF,SAAS,OAAO,CAAC,EAAU;IACzB,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IAC1C,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC5C,IAAI,EAAE,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QAC/B,OAAO,EAAE,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QACnC,IAAI;QACJ,OAAO,EAAE,2BAA2B,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QAC1D,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC;QAC5B,OAAO,EAAE,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,cAAc,CAAC,EAAW,EAAE,EAAW;IAC9C,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ;QAAE,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IAClE,IAAI,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC;IAClD,IAAI,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;IAC9D,IAAI,EAAE,CAAC,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC,QAAQ,KAAK,CAAC,EAAE,CAAC;QAC3C,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACrF,IAAI,SAAS,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACtC,IAAI,EAAE,CAAC,QAAQ,KAAK,EAAE,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAC,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;IACpE,CAAC;IACD,MAAM,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5E,IAAI,MAAM,KAAK,CAAC;QAAE,OAAO,MAAM,CAAC;IAChC,OAAO,EAAE,CAAC,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC;AACjC,CAAC;AAsBD,SAAS,WAAW,CAAC,GAAuB;IAC1C,IAAI,CAAC,GAAG;QAAE,OAAO,EAAE,CAAC;IACpB,OAAO,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC7C,CAAC;AAED,SAAS,WAAW,CAAC,KAAY,EAAE,OAAmB;IACpD,MAAM,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEjC,MAAM,UAAU,GAAG,OAAO,KAAK,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,MAAM,WAAW,GAAG,OAAO,KAAK,CAAC,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,CAAC;IAE/F,OAAO;QACL,EAAE;QACF,YAAY,EAAE,KAAK,CAAC,IAAI,IAAI,UAAU,EAAE,EAAE;QAC1C,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;QACpC,eAAe,EAAE,UAAU;QAC3B,gBAAgB,EAAE,WAAW;QAC7B,oBAAoB,EAAE,sBAAsB,CAAC,EAAE,EAAE,OAAO,CAAC;QACzD,gBAAgB,EAAE,KAAK,CAAC,QAAQ,KAAK,IAAI;QACzC,mBAAmB,EAAE,UAAU,KAAK,IAAI,IAAI,UAAU,IAAI,OAAO;QACjE,eAAe,EAAE,KAAK,CAAC,gBAAgB,EAAE,QAAQ,CAAC,qBAAqB,CAAC,IAAI,IAAI;KACjF,CAAC;AACJ,CAAC;AAED,IAAI,MAAM,GAAuB,IAAI,CAAC;AACtC,IAAI,QAAQ,GAAG,CAAC,CAAC;AACjB,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAAmB,EACnB,EAAE,KAAK,EAAE,GAAwB,EAAE;IAEnC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,GAAG,GAAG,QAAQ,GAAG,MAAM;QAAE,OAAO,MAAM,CAAC;IAE/D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IACzC,MAAM,OAAO,GAAe,MAAM,CAAC,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC;IAC9E,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACzC,IAAI,IAAI;YAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,oGAAoG;IACpG,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,GAAG,MAAM,CAAC;IAChB,QAAQ,GAAG,GAAG,CAAC;IACf,MAAM,CAAC,KAAK,CAAC,0BAA0B,MAAM,CAAC,MAAM,SAAS,CAAC,CAAC;IAC/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,iEAAiE;AACjE,MAAM,UAAU,oBAAoB;IAClC,MAAM,GAAG,IAAI,CAAC;IACd,QAAQ,GAAG,CAAC,CAAC;AACf,CAAC"}
|
|
@@ -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,CA2DxB;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
|
@@ -102,6 +102,7 @@ export async function resolveModel(requested, client, options = {}) {
|
|
|
102
102
|
fallbackApplied,
|
|
103
103
|
inputTokenLimit: picked.inputTokenLimit,
|
|
104
104
|
outputTokenLimit: picked.outputTokenLimit,
|
|
105
|
+
longDecodeTokenLimit: picked.longDecodeTokenLimit,
|
|
105
106
|
category: picked.category,
|
|
106
107
|
capabilities: picked.capabilities,
|
|
107
108
|
supportsCaching: picked.supportsCaching,
|
|
@@ -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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"}
|
package/dist/gemini/retry.d.ts
CHANGED
|
@@ -72,6 +72,14 @@ export declare function isTransientNetworkError(err: unknown): boolean;
|
|
|
72
72
|
* error shape they would have seen without retry wrapping.
|
|
73
73
|
*/
|
|
74
74
|
export declare function withNetworkRetry<T>(fn: () => Promise<T>, options?: NetworkRetryOptions): Promise<T>;
|
|
75
|
+
/** Throws the signal's reason (or synthesised AbortError) if aborted. */
|
|
76
|
+
export declare function throwIfAborted(signal: AbortSignal | undefined): void;
|
|
77
|
+
/**
|
|
78
|
+
* `work`'s outcome, or a rejection with the abort reason as soon as `signal` fires — whichever comes first. The
|
|
79
|
+
* caller is released at the abort even when `work` itself never settles; `work` runs on, its late outcome ignored
|
|
80
|
+
* (a late rejection is handled, never unhandled).
|
|
81
|
+
*/
|
|
82
|
+
export declare function abortable<T>(work: Promise<T>, signal: AbortSignal | undefined): Promise<T>;
|
|
75
83
|
/**
|
|
76
84
|
* `setTimeout(resolve, ms)` that also rejects with the abort reason when
|
|
77
85
|
* `signal` fires. Without abort awareness, a 9s backoff sleep — or worse, a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/gemini/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,MAAM,WAAW,mBAAmB;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,kFAAkF;IAClF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3D;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAUD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAuB7D;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,CAAC,CAAC,CAsCZ;
|
|
1
|
+
{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/gemini/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,MAAM,WAAW,mBAAmB;IAClC,+EAA+E;IAC/E,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,kFAAkF;IAClF,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,mFAAmF;IACnF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAC;IAC3D;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;CAC/B;AAUD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAuB7D;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CAAC,CAAC,EACtC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,CAAC,CAAC,CAsCZ;AAED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,CAEpE;AAQD;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CA2B1F;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBzF"}
|
package/dist/gemini/retry.js
CHANGED
|
@@ -117,7 +117,7 @@ export async function withNetworkRetry(fn, options = {}) {
|
|
|
117
117
|
throw lastErr;
|
|
118
118
|
}
|
|
119
119
|
/** Throws the signal's reason (or synthesised AbortError) if aborted. */
|
|
120
|
-
function throwIfAborted(signal) {
|
|
120
|
+
export function throwIfAborted(signal) {
|
|
121
121
|
if (signal?.aborted)
|
|
122
122
|
throwAbortReason(signal);
|
|
123
123
|
}
|
|
@@ -127,6 +127,38 @@ function throwAbortReason(signal) {
|
|
|
127
127
|
throw reason;
|
|
128
128
|
throw new DOMException('Operation aborted', 'AbortError');
|
|
129
129
|
}
|
|
130
|
+
/**
|
|
131
|
+
* `work`'s outcome, or a rejection with the abort reason as soon as `signal` fires — whichever comes first. The
|
|
132
|
+
* caller is released at the abort even when `work` itself never settles; `work` runs on, its late outcome ignored
|
|
133
|
+
* (a late rejection is handled, never unhandled).
|
|
134
|
+
*/
|
|
135
|
+
export function abortable(work, signal) {
|
|
136
|
+
if (signal === undefined)
|
|
137
|
+
return work;
|
|
138
|
+
return new Promise((resolve, reject) => {
|
|
139
|
+
const onAbort = () => {
|
|
140
|
+
try {
|
|
141
|
+
throwAbortReason(signal);
|
|
142
|
+
}
|
|
143
|
+
catch (err) {
|
|
144
|
+
reject(err);
|
|
145
|
+
}
|
|
146
|
+
};
|
|
147
|
+
if (signal.aborted) {
|
|
148
|
+
onAbort();
|
|
149
|
+
work.catch(() => undefined);
|
|
150
|
+
return;
|
|
151
|
+
}
|
|
152
|
+
signal.addEventListener('abort', onAbort, { once: true });
|
|
153
|
+
work.then((value) => {
|
|
154
|
+
signal.removeEventListener('abort', onAbort);
|
|
155
|
+
resolve(value);
|
|
156
|
+
}, (err) => {
|
|
157
|
+
signal.removeEventListener('abort', onAbort);
|
|
158
|
+
reject(err);
|
|
159
|
+
});
|
|
160
|
+
});
|
|
161
|
+
}
|
|
130
162
|
/**
|
|
131
163
|
* `setTimeout(resolve, ms)` that also rejects with the abort reason when
|
|
132
164
|
* `signal` fires. Without abort awareness, a 9s backoff sleep — or worse, a
|
package/dist/gemini/retry.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/gemini/retry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"retry.js","sourceRoot":"","sources":["../../src/gemini/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAuBH;;;;GAIG;AACH,MAAM,kBAAkB,GACtB,8IAA8I,CAAC;AAEjJ;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAY;IAClD,IAAI,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAE1C,sCAAsC;IACtC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,KAAK,CAAC;IAE5C,0EAA0E;IAC1E,wEAAwE;IACxE,yCAAyC;IACzC,IAAI,OAAQ,GAA4B,CAAC,MAAM,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE3E,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAa,GAA2B,CAAC,KAAK,CAAC;IAC1D,MAAM,YAAY,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,SAAS,GACb,KAAK,KAAK,IAAI;QACd,OAAO,KAAK,KAAK,QAAQ;QACzB,OAAQ,KAA4B,CAAC,IAAI,KAAK,QAAQ;QACpD,CAAC,CAAE,KAA0B,CAAC,IAAI;QAClC,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,kBAAkB,CAAC,IAAI,CAAC,GAAG,OAAO,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC,CAAC;AAC5E,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,EAAoB,EACpB,OAAO,GAAwB,EAAE;IAEjC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,sEAAsE;IACtE,2CAA2C;IAC3C,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvB,IAAI,OAAgB,CAAC;IACrB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC;QACrD,IAAI,CAAC;YACH,OAAO,MAAM,EAAE,EAAE,CAAC;QACpB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,GAAG,GAAG,CAAC;YACd,sEAAsE;YACtE,oEAAoE;YACpE,qEAAqE;YACrE,mEAAmE;YACnE,uEAAuE;YACvE,mEAAmE;YACnE,qEAAqE;YACrE,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;gBACpB,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;YACD,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC1D,IAAI,MAAM,EAAE,OAAO;oBAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;gBAC9C,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAChC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YAC5C,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;gBAChB,MAAM,cAAc,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;IACH,CAAC;IACD,uEAAuE;IACvE,MAAM,OAAO,CAAC;AAChB,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,cAAc,CAAC,MAA+B;IAC5D,IAAI,MAAM,EAAE,OAAO;QAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC;AAED,SAAS,gBAAgB,CAAC,MAAmB;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7B,IAAI,MAAM,YAAY,KAAK;QAAE,MAAM,MAAM,CAAC;IAC1C,MAAM,IAAI,YAAY,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC;AAC5D,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAI,IAAgB,EAAE,MAA+B;IAC5E,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACtC,OAAO,IAAI,OAAO,CAAI,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,IAAI,CAAC;gBACH,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC;QACF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,IAAI,CACP,CAAC,KAAK,EAAE,EAAE;YACR,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,EACD,CAAC,GAAY,EAAE,EAAE;YACf,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,CAAC,CAAC;QACd,CAAC,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,cAAc,CAAC,EAAU,EAAE,MAA+B;IACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,IAAI,CAAC;gBACH,gBAAgB,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,MAAM,EAAE,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO,EAAE,CAAC;QACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QACP,MAAM,OAAO,GAAG,GAAG,EAAE;YACnB,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,IAAI,CAAC;gBACH,IAAI,MAAM;oBAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,CAAC;QACH,CAAC,CAAC;QACF,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -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;
|
|
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;AAmBxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAiB7E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;iBA6E9B,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"}
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
import { resolve } from 'node:path';
|
|
31
31
|
import { ApiError, FunctionCallingConfigMode, Type as GeminiType } from '@google/genai';
|
|
32
32
|
import { z } from 'zod';
|
|
33
|
+
import { thinkingBudgetRefusal } from '../gemini/long-decode.js';
|
|
33
34
|
import { resolveModel } from '../gemini/models.js';
|
|
34
35
|
import { abortableSleep, withNetworkRetry } from '../gemini/retry.js';
|
|
35
36
|
import { defaultMatchConfig } from '../indexer/globs.js';
|
|
@@ -41,6 +42,7 @@ import { SandboxError, resolveInsideWorkspace, resolveWorkspaceRoot } from './ag
|
|
|
41
42
|
import { findFilesExecutor, grepExecutor, listDirectoryExecutor, readFileExecutor, } from './agentic/workspace-tools.js';
|
|
42
43
|
import { errorResult, textResult } from './registry.js';
|
|
43
44
|
import { createTimeoutController, getTimeoutKind, isTimeoutAbort, resolveTotalTimeoutMs, } from './shared/abort-timeout.js';
|
|
45
|
+
import { billedInputTokens } from './shared/call-ledger.js';
|
|
44
46
|
import { collectStream } from './shared/stream-collector.js';
|
|
45
47
|
import { SYSTEM_INSTRUCTION_SAFETY_AGENTIC } from './shared/system-instruction-safety.js';
|
|
46
48
|
import { THINKING_LEVEL_FIELD } from './shared/thinking.js';
|
|
@@ -503,15 +505,10 @@ async function executeAskAgenticBody(input, ctx, rawWorkspaceRoot, model, starte
|
|
|
503
505
|
...(input.includeGlobs !== undefined ? { includeGlobs: input.includeGlobs } : {}),
|
|
504
506
|
...(input.excludeGlobs !== undefined ? { excludeGlobs: input.excludeGlobs } : {}),
|
|
505
507
|
});
|
|
506
|
-
//
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
if (typeof input.thinkingBudget === 'number' &&
|
|
511
|
-
input.thinkingBudget > 0 &&
|
|
512
|
-
typeof input.maxOutputTokens === 'number' &&
|
|
513
|
-
input.maxOutputTokens < input.thinkingBudget + 1024) {
|
|
514
|
-
return errorResult(`ask_agentic: thinkingBudget (${input.thinkingBudget}) + 1024-token answer reserve exceeds maxOutputTokens (${input.maxOutputTokens}). Raise maxOutputTokens to at least ${input.thinkingBudget + 1024}, or lower thinkingBudget.`, {
|
|
508
|
+
// Refused locally, so the model never answers a 400 "thinking exceeds output budget".
|
|
509
|
+
const budgetRefusal = thinkingBudgetRefusal(input.thinkingBudget, input.maxOutputTokens, input.maxOutputTokens ?? 0);
|
|
510
|
+
if (budgetRefusal !== null) {
|
|
511
|
+
return errorResult(`ask_agentic: ${budgetRefusal}`, {
|
|
515
512
|
errorCode: 'UNKNOWN',
|
|
516
513
|
retryable: false,
|
|
517
514
|
subReason: 'INVALID_THINKING_OUTPUT_COMBO',
|
|
@@ -534,6 +531,9 @@ async function executeAskAgenticBody(input, ctx, rawWorkspaceRoot, model, starte
|
|
|
534
531
|
tools: [{ functionDeclarations: buildFunctionDeclarations() }],
|
|
535
532
|
thinkingConfig,
|
|
536
533
|
...(input.maxOutputTokens !== undefined ? { maxOutputTokens: input.maxOutputTokens } : {}),
|
|
534
|
+
// One request per model call: a response that stops with `CONTINUATION` is never continued here (long decode
|
|
535
|
+
// is `ask` / `code` only, `shared/continuation.ts`).
|
|
536
|
+
automaticContinuation: false,
|
|
537
537
|
};
|
|
538
538
|
const conversation = [{ role: 'user', parts: [{ text: input.prompt }] }];
|
|
539
539
|
/** Call-signature → state, for content-aware no-progress detection.
|
|
@@ -1257,9 +1257,7 @@ async function executeAskAgenticBody(input, ctx, rawWorkspaceRoot, model, starte
|
|
|
1257
1257
|
// `finalizationEstimate` (correct) but throttle.release passed 0,
|
|
1258
1258
|
// mutating the TPM window entry to 0 — under-throttling subsequent
|
|
1259
1259
|
// calls. Sharing the same fallback keeps both releases symmetric.
|
|
1260
|
-
const billedUncachedTokens = finalizationUsage.promptTokenCount
|
|
1261
|
-
? finalizationUsage.promptTokenCount
|
|
1262
|
-
: finalizationEstimate;
|
|
1260
|
+
const billedUncachedTokens = billedInputTokens(finalizationUsage.promptTokenCount, finalizationEstimate);
|
|
1263
1261
|
if (finalizationReservationId !== null) {
|
|
1264
1262
|
// If parse-after-await threw, finalizationUsage is still {0,0,0}.
|
|
1265
1263
|
// Fall back to `finalizationEstimate` for billing — under-billing
|