@qmediat.io/gemini-code-context-mcp 1.23.0 → 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 +94 -1
- package/README.md +36 -227
- package/dist/auth/profile-loader.js +1 -1
- package/dist/auth/profile-loader.js.map +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 +5 -3
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* How an `ask` / `code` call settles — the one place both tools do it, so they book the same way and return the same
|
|
3
|
+
* fields.
|
|
4
|
+
*
|
|
5
|
+
* - An answer: the ledger books every completed request at what it billed; a stop at the output cap with no text is
|
|
6
|
+
* an `OUTPUT_CAP` error with the usage, the model, the tier and the finish reason.
|
|
7
|
+
* - A failure: a 429's retry hint seeds the per-minute throttle, the ledger keeps what the completed requests billed
|
|
8
|
+
* and releases the rest (all of it when none completed), and the request's per-minute reservation is dropped.
|
|
9
|
+
*/
|
|
10
|
+
import { billedUsage, recordBilledCall, settleFailedCall, usageFields, } from './call-ledger.js';
|
|
11
|
+
import { OUTPUT_CAP_ERROR_CODE, answerFinish, emptyAtOutputCap, } from './thinking.js';
|
|
12
|
+
import { isGemini429, parseRetryDelayMs } from './throttle.js';
|
|
13
|
+
/** Book the answered call at what its requests billed, and say whether it stopped at the cap with no answer. */
|
|
14
|
+
export function settleAnswer(call) {
|
|
15
|
+
const billed = billedUsage(call.completed.usage(), call.entry.model, call.entry.serviceTier);
|
|
16
|
+
recordBilledCall(call.manifest, call.reservationId, call.entry, billed, call.durationMs);
|
|
17
|
+
const usage = usageFields(billed, call.response.continuationHops);
|
|
18
|
+
const finish = answerFinish(call.response);
|
|
19
|
+
const cutFields = inputWindowCutFields(call.cut);
|
|
20
|
+
const starved = emptyAtOutputCap(call.response, billed.thinkingTokens, call.cap, call.cut);
|
|
21
|
+
const outputCapStop = starved === null
|
|
22
|
+
? null
|
|
23
|
+
: {
|
|
24
|
+
message: starved,
|
|
25
|
+
fields: {
|
|
26
|
+
errorCode: OUTPUT_CAP_ERROR_CODE,
|
|
27
|
+
retryable: false,
|
|
28
|
+
resolvedModel: call.entry.model,
|
|
29
|
+
serviceTier: call.entry.serviceTier,
|
|
30
|
+
finishReason: finish.finishReason,
|
|
31
|
+
...usage,
|
|
32
|
+
...cutFields,
|
|
33
|
+
},
|
|
34
|
+
};
|
|
35
|
+
return { usage, finish, cutFields, outputCapStop };
|
|
36
|
+
}
|
|
37
|
+
function inputWindowCutFields(cut) {
|
|
38
|
+
return cut === null ? {} : { outputCapCutByInputWindow: cut };
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* Settle a failed call; its usage when completed requests were billed, else `null`. The retry hint is read only from
|
|
42
|
+
* a real `ApiError` with status 429 (`isGemini429`): text a prompt can echo never reaches the throttle. A ledger write
|
|
43
|
+
* that throws is logged by `settleFailedCall` and never replaces the call's own error.
|
|
44
|
+
*/
|
|
45
|
+
export function settleFailure(settlement) {
|
|
46
|
+
const { err, model } = settlement;
|
|
47
|
+
const retryDelayMs = isGemini429(err) ? parseRetryDelayMs(err.message) : null;
|
|
48
|
+
if (retryDelayMs !== null && model !== null) {
|
|
49
|
+
settlement.throttle.recordRetryHint(model, retryDelayMs);
|
|
50
|
+
}
|
|
51
|
+
const usage = settleFailedCall(settlement.manifest, settlement.failed);
|
|
52
|
+
settlement.dispatch.cancel();
|
|
53
|
+
return usage;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=settle-call.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settle-call.js","sourceRoot":"","sources":["../../../src/tools/shared/settle-call.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,EAIL,WAAW,EACX,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,GACZ,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAGL,qBAAqB,EACrB,YAAY,EACZ,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAoB,WAAW,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAiCjF,gHAAgH;AAChH,MAAM,UAAU,YAAY,CAAC,IAAkB;IAC7C,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC7F,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACzF,MAAM,KAAK,GAAG,WAAW,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAClE,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3F,MAAM,aAAa,GACjB,OAAO,KAAK,IAAI;QACd,CAAC,CAAC,IAAI;QACN,CAAC,CAAC;YACE,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE;gBACN,SAAS,EAAE,qBAAqB;gBAChC,SAAS,EAAE,KAAK;gBAChB,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;gBAC/B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW;gBACnC,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,GAAG,KAAK;gBACR,GAAG,SAAS;aACb;SACF,CAAC;IACR,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,oBAAoB,CAAC,GAA0B;IACtD,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,yBAAyB,EAAE,GAAG,EAAE,CAAC;AAChE,CAAC;AAaD;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,UAAgC;IAC5D,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAClC,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAC9E,IAAI,YAAY,KAAK,IAAI,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC5C,UAAU,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAC3D,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IACvE,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC7B,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -70,6 +70,8 @@
|
|
|
70
70
|
* branch invalidates and opens a NEW full stream. Discards partial.
|
|
71
71
|
*/
|
|
72
72
|
import type { GenerateContentResponse } from '@google/genai';
|
|
73
|
+
/** The thought summary a response carries is cut to this many characters. */
|
|
74
|
+
export declare const THOUGHTS_SUMMARY_MAX_CHARS = 1200;
|
|
73
75
|
export interface StreamCollectorOptions {
|
|
74
76
|
/** Per-call abort (T19). Threading through here means we drop chunks the
|
|
75
77
|
* moment timeout fires, not after the next one comes through. */
|
|
@@ -108,6 +110,11 @@ export interface CollectedResponse {
|
|
|
108
110
|
/** Wall-clock timestamps for first/last chunk arrival (Date.now() values). */
|
|
109
111
|
readonly firstChunkAt: number | null;
|
|
110
112
|
readonly lastChunkAt: number | null;
|
|
113
|
+
/**
|
|
114
|
+
* The latest `continuationToken` the first candidate carried (Gemini 4 long decode: the stream ended with
|
|
115
|
+
* `finishReason: CONTINUATION`, or passed a checkpoint); `null` when no chunk carried one.
|
|
116
|
+
*/
|
|
117
|
+
readonly continuationToken: string | null;
|
|
111
118
|
}
|
|
112
119
|
/**
|
|
113
120
|
* Drive an `AsyncGenerator<GenerateContentResponse>` to completion and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-collector.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/stream-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAEH,OAAO,KAAK,EAAa,uBAAuB,EAAQ,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"stream-collector.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/stream-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAEH,OAAO,KAAK,EAAa,uBAAuB,EAAQ,MAAM,eAAe,CAAC;AAG9E,6EAA6E;AAC7E,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAE/C,MAAM,WAAW,sBAAsB;IACrC;qEACiE;IACjE,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B;;sEAEkE;IAClE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD;gFAC4E;IAC5E,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IACxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,iBAAiB;IAChC,yCAAyC;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC,YAAY,CAAC,CAAC;IAC3D,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,uBAAuB,CAAC,eAAe,CAAC,CAAC;IACjE,4EAA4E;IAC5E,QAAQ,CAAC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,mEAAmE;IACnE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,8EAA8E;IAC9E,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,cAAc,CAAC,uBAAuB,CAAC,EAC/C,IAAI,GAAE,sBAA2B,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAuR5B"}
|
|
@@ -70,7 +70,8 @@
|
|
|
70
70
|
* branch invalidates and opens a NEW full stream. Discards partial.
|
|
71
71
|
*/
|
|
72
72
|
const DEFAULT_THOUGHT_EMIT_THROTTLE_MS = 1500;
|
|
73
|
-
|
|
73
|
+
/** The thought summary a response carries is cut to this many characters. */
|
|
74
|
+
export const THOUGHTS_SUMMARY_MAX_CHARS = 1200;
|
|
74
75
|
/**
|
|
75
76
|
* Drive an `AsyncGenerator<GenerateContentResponse>` to completion and
|
|
76
77
|
* collect the deltas into a single response shape.
|
|
@@ -115,6 +116,7 @@ export async function collectStream(stream, opts = {}) {
|
|
|
115
116
|
// synthesise the returned `lastCandidates`.
|
|
116
117
|
const scaffoldsByIndex = new Map();
|
|
117
118
|
let lastUsageMetadata;
|
|
119
|
+
let continuationToken = null;
|
|
118
120
|
let chunkCount = 0;
|
|
119
121
|
let firstChunkAt = null;
|
|
120
122
|
let lastChunkAt = null;
|
|
@@ -276,6 +278,7 @@ export async function collectStream(stream, opts = {}) {
|
|
|
276
278
|
}
|
|
277
279
|
}
|
|
278
280
|
}
|
|
281
|
+
continuationToken = chunk.candidates?.[0]?.continuationToken ?? continuationToken;
|
|
279
282
|
// usageMetadata appears on the final chunk; keep last-write-wins.
|
|
280
283
|
if (chunk.usageMetadata) {
|
|
281
284
|
lastUsageMetadata = chunk.usageMetadata;
|
|
@@ -341,6 +344,7 @@ export async function collectStream(stream, opts = {}) {
|
|
|
341
344
|
chunkCount,
|
|
342
345
|
firstChunkAt,
|
|
343
346
|
lastChunkAt,
|
|
347
|
+
continuationToken,
|
|
344
348
|
};
|
|
345
349
|
}
|
|
346
350
|
//# sourceMappingURL=stream-collector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-collector.js","sourceRoot":"","sources":["../../../src/tools/shared/stream-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsEG;AAIH,MAAM,gCAAgC,GAAG,IAAI,CAAC;AAC9C,MAAM,0BAA0B,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"stream-collector.js","sourceRoot":"","sources":["../../../src/tools/shared/stream-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* call sites (and any future reasoning-capable tool we add).
|
|
10
10
|
*/
|
|
11
11
|
import { z } from 'zod';
|
|
12
|
+
import { type InputWindowCut } from '../../gemini/long-decode.js';
|
|
12
13
|
/**
|
|
13
14
|
* Accepted values for `thinkingLevel` on both `ask` and `code`. Uppercased
|
|
14
15
|
* to match `ThinkingLevel` enum members in `@google/genai` — we pass the
|
|
@@ -65,21 +66,50 @@ export type ThinkingLevelLiteral = (typeof THINKING_LEVELS)[number];
|
|
|
65
66
|
* decides to spend); a subsequent call will see the larger measured cost
|
|
66
67
|
* in the budget ledger.
|
|
67
68
|
*
|
|
68
|
-
* HIGH and XHIGH intentionally map to `null` →
|
|
69
|
-
*
|
|
70
|
-
*
|
|
71
|
-
* duplicate.
|
|
69
|
+
* HIGH and XHIGH intentionally map to `null` → `thinkingReserve`
|
|
70
|
+
* substitutes the cap that runs minus the answer reserve, so the value
|
|
71
|
+
* tracks each call's actual output cap rather than a hard-coded duplicate.
|
|
72
72
|
*/
|
|
73
73
|
export declare const THINKING_LEVEL_RESERVE: Record<ThinkingLevelLiteral, number | null>;
|
|
74
|
-
/**
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
*/
|
|
79
|
-
|
|
74
|
+
/** A positive `thinkingBudget` clamped below the cap that runs, keeping the answer reserve beside it. */
|
|
75
|
+
export declare function thinkingBudgetUnder(cap: CapThatRan, budget: number): number;
|
|
76
|
+
/** The `errorCode` of a call that ended at the output cap with no answer. */
|
|
77
|
+
export declare const OUTPUT_CAP_ERROR_CODE = "OUTPUT_CAP";
|
|
78
|
+
/** The part of a decoded response these checks read. */
|
|
79
|
+
interface FinishedResponse {
|
|
80
80
|
readonly text: string;
|
|
81
81
|
readonly candidates?: readonly {
|
|
82
82
|
finishReason?: unknown;
|
|
83
83
|
}[] | undefined;
|
|
84
|
-
}
|
|
84
|
+
}
|
|
85
|
+
/** The output cap that ran (`OutputCap`): its value, the model's per-request limit and the most a caller may ask. */
|
|
86
|
+
export interface CapThatRan {
|
|
87
|
+
readonly effective: number;
|
|
88
|
+
readonly perRequest: number;
|
|
89
|
+
readonly ceiling: number;
|
|
90
|
+
}
|
|
91
|
+
/**
|
|
92
|
+
* The thinking tokens a budget reservation counts for a call whose output runs under `cap` (the cap that runs, after
|
|
93
|
+
* the input window's cut, so a cut call reserves no more than it can decode): a `thinkingLevel`'s tier reserve, all
|
|
94
|
+
* the cap leaves beside the answer reserve for a dynamic or model-default budget (`-1` / `null`: Gemini 3 Pro and the
|
|
95
|
+
* Gemini 4 models think without being asked), else the budget itself. A tier reserve is clamped to that headroom, so a
|
|
96
|
+
* small-cap model never reserves more thinking than it can decode.
|
|
97
|
+
*/
|
|
98
|
+
export declare function thinkingReserve(level: ThinkingLevelLiteral | undefined, budget: number | null, cap: CapThatRan): number;
|
|
99
|
+
/** How a call's answer ended: the last request's finish reason and whether the text was cut at the output cap. */
|
|
100
|
+
export interface AnswerFinish {
|
|
101
|
+
readonly finishReason: string | null;
|
|
102
|
+
/** The answer has text and stopped at the cap (`MAX_TOKENS`, or a long decode ended at its limits on `CONTINUATION`). */
|
|
103
|
+
readonly truncated: boolean;
|
|
104
|
+
}
|
|
105
|
+
export declare function answerFinish(response: FinishedResponse): AnswerFinish;
|
|
106
|
+
/**
|
|
107
|
+
* A call that ended at the output cap with no answer: the model's thinking used the cap (thinking tokens count
|
|
108
|
+
* against `maxOutputTokens`, and Gemini 4 Carbon / Hydrogen and the 3.x Pro models think without being asked), in
|
|
109
|
+
* one request (`MAX_TOKENS`) or over a long decode stopped at its limits (`CONTINUATION`). The message names the
|
|
110
|
+
* cause and the remedy that fits the cap that ran and the cut the input window made to it (`null`: none); `null` for
|
|
111
|
+
* any call that produced text or stopped for another reason.
|
|
112
|
+
*/
|
|
113
|
+
export declare function emptyAtOutputCap(response: FinishedResponse, thinkingTokens: number, cap: CapThatRan, cut: InputWindowCut | null): string | null;
|
|
114
|
+
export {};
|
|
85
115
|
//# sourceMappingURL=thinking.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thinking.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/thinking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"thinking.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/thinking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAEzF;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,eAAe,YAAI,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAMtF,sHAAsH;AACtH,eAAO,MAAM,oBAAoB;;;;;;GAGM,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAM9E,CAAC;AAEF,yGAAyG;AACzG,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3E;AAED,6EAA6E;AAC7E,eAAO,MAAM,qBAAqB,eAAe,CAAC;AAKlD,wDAAwD;AACxD,UAAU,gBAAgB;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS;QAAE,YAAY,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,GAAG,SAAS,CAAC;CACzE;AAED,qHAAqH;AACrH,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,oBAAoB,GAAG,SAAS,EACvC,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,GAAG,EAAE,UAAU,GACd,MAAM,CAKR;AAED,kHAAkH;AAClH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,yHAAyH;IACzH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY,CAMrE;AA2BD;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,gBAAgB,EAC1B,cAAc,EAAE,MAAM,EACtB,GAAG,EAAE,UAAU,EACf,GAAG,EAAE,cAAc,GAAG,IAAI,GACzB,MAAM,GAAG,IAAI,CAIf"}
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
* call sites (and any future reasoning-capable tool we add).
|
|
10
10
|
*/
|
|
11
11
|
import { z } from 'zod';
|
|
12
|
+
import { ANSWER_RESERVE_TOKENS } from '../../gemini/long-decode.js';
|
|
12
13
|
/**
|
|
13
14
|
* Accepted values for `thinkingLevel` on both `ask` and `code`. Uppercased
|
|
14
15
|
* to match `ThinkingLevel` enum members in `@google/genai` — we pass the
|
|
@@ -58,10 +59,9 @@ export const THINKING_LEVEL_FIELD = z
|
|
|
58
59
|
* decides to spend); a subsequent call will see the larger measured cost
|
|
59
60
|
* in the budget ledger.
|
|
60
61
|
*
|
|
61
|
-
* HIGH and XHIGH intentionally map to `null` →
|
|
62
|
-
*
|
|
63
|
-
*
|
|
64
|
-
* duplicate.
|
|
62
|
+
* HIGH and XHIGH intentionally map to `null` → `thinkingReserve`
|
|
63
|
+
* substitutes the cap that runs minus the answer reserve, so the value
|
|
64
|
+
* tracks each call's actual output cap rather than a hard-coded duplicate.
|
|
65
65
|
*/
|
|
66
66
|
export const THINKING_LEVEL_RESERVE = {
|
|
67
67
|
MINIMAL: 512,
|
|
@@ -70,15 +70,68 @@ export const THINKING_LEVEL_RESERVE = {
|
|
|
70
70
|
HIGH: null,
|
|
71
71
|
XHIGH: null,
|
|
72
72
|
};
|
|
73
|
+
/** A positive `thinkingBudget` clamped below the cap that runs, keeping the answer reserve beside it. */
|
|
74
|
+
export function thinkingBudgetUnder(cap, budget) {
|
|
75
|
+
return Math.max(0, Math.min(budget, cap.effective - ANSWER_RESERVE_TOKENS));
|
|
76
|
+
}
|
|
77
|
+
/** The `errorCode` of a call that ended at the output cap with no answer. */
|
|
78
|
+
export const OUTPUT_CAP_ERROR_CODE = 'OUTPUT_CAP';
|
|
79
|
+
/** The finish reasons of a call that ended at the output cap: one request's cap, or a long decode cut at its limits. */
|
|
80
|
+
const AT_OUTPUT_CAP = new Set(['MAX_TOKENS', 'CONTINUATION']);
|
|
81
|
+
/**
|
|
82
|
+
* The thinking tokens a budget reservation counts for a call whose output runs under `cap` (the cap that runs, after
|
|
83
|
+
* the input window's cut, so a cut call reserves no more than it can decode): a `thinkingLevel`'s tier reserve, all
|
|
84
|
+
* the cap leaves beside the answer reserve for a dynamic or model-default budget (`-1` / `null`: Gemini 3 Pro and the
|
|
85
|
+
* Gemini 4 models think without being asked), else the budget itself. A tier reserve is clamped to that headroom, so a
|
|
86
|
+
* small-cap model never reserves more thinking than it can decode.
|
|
87
|
+
*/
|
|
88
|
+
export function thinkingReserve(level, budget, cap) {
|
|
89
|
+
const headroom = Math.max(0, cap.effective - ANSWER_RESERVE_TOKENS);
|
|
90
|
+
if (level !== undefined)
|
|
91
|
+
return Math.min(THINKING_LEVEL_RESERVE[level] ?? headroom, headroom);
|
|
92
|
+
if (budget === null || budget === -1)
|
|
93
|
+
return headroom;
|
|
94
|
+
return budget;
|
|
95
|
+
}
|
|
96
|
+
export function answerFinish(response) {
|
|
97
|
+
const stopped = response.candidates?.[0]?.finishReason;
|
|
98
|
+
return {
|
|
99
|
+
finishReason: typeof stopped === 'string' ? stopped : null,
|
|
100
|
+
truncated: response.text.trim() !== '' && AT_OUTPUT_CAP.has(stopped),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
const LOWER_THE_THINKING = 'lower the thinking: `thinkingLevel: "LOW"` / a smaller `thinkingBudget`';
|
|
104
|
+
const tokenCount = (n) => n.toLocaleString('en-US');
|
|
105
|
+
/**
|
|
106
|
+
* What the caller can change after a stop at `cap`: raise the cap where the model allows more, else the thinking — and,
|
|
107
|
+
* under a cap the input window cut, the size of the prompt, which decides what that window leaves.
|
|
108
|
+
*/
|
|
109
|
+
function capRemedy(cap, cut) {
|
|
110
|
+
if (cut !== null) {
|
|
111
|
+
return `The model's ${tokenCount(cut.inputTokenLimit)}-token input window left ${tokenCount(cut.to)} output tokens for this prompt (the cap was cut from ${tokenCount(cut.from)}): ${LOWER_THE_THINKING}, or send a smaller workspace.`;
|
|
112
|
+
}
|
|
113
|
+
if (cap.effective < cap.perRequest) {
|
|
114
|
+
return `Raise \`maxOutputTokens\` (it was ${tokenCount(cap.effective)}; the model allows ${tokenCount(cap.perRequest)} per request), or ${LOWER_THE_THINKING}.`;
|
|
115
|
+
}
|
|
116
|
+
if (cap.effective >= cap.ceiling) {
|
|
117
|
+
return `The cap is the most this model allows (${tokenCount(cap.ceiling)}): ${LOWER_THE_THINKING}.`;
|
|
118
|
+
}
|
|
119
|
+
if (cap.effective === cap.perRequest) {
|
|
120
|
+
return `Ask for \`maxOutputTokens\` above ${tokenCount(cap.perRequest)} (up to ${tokenCount(cap.ceiling)}): on this model the decode then continues in further requests. Or ${LOWER_THE_THINKING}.`;
|
|
121
|
+
}
|
|
122
|
+
return `Raise \`maxOutputTokens\` above ${tokenCount(cap.effective)} (up to ${tokenCount(cap.ceiling)}), or ${LOWER_THE_THINKING}.`;
|
|
123
|
+
}
|
|
73
124
|
/**
|
|
74
125
|
* A call that ended at the output cap with no answer: the model's thinking used the cap (thinking tokens count
|
|
75
|
-
* against `maxOutputTokens`, and Gemini 4 Carbon / Hydrogen and the 3.x Pro models think without being asked)
|
|
76
|
-
*
|
|
126
|
+
* against `maxOutputTokens`, and Gemini 4 Carbon / Hydrogen and the 3.x Pro models think without being asked), in
|
|
127
|
+
* one request (`MAX_TOKENS`) or over a long decode stopped at its limits (`CONTINUATION`). The message names the
|
|
128
|
+
* cause and the remedy that fits the cap that ran and the cut the input window made to it (`null`: none); `null` for
|
|
129
|
+
* any call that produced text or stopped for another reason.
|
|
77
130
|
*/
|
|
78
|
-
export function emptyAtOutputCap(response, thinkingTokens) {
|
|
131
|
+
export function emptyAtOutputCap(response, thinkingTokens, cap, cut) {
|
|
79
132
|
const stopped = response.candidates?.[0]?.finishReason;
|
|
80
|
-
if (response.text.trim() !== '' || stopped
|
|
133
|
+
if (response.text.trim() !== '' || !AT_OUTPUT_CAP.has(stopped))
|
|
81
134
|
return null;
|
|
82
|
-
return `the model stopped at the output cap before writing an answer (thinking used ${thinkingTokens} tokens of it; the call was billed).
|
|
135
|
+
return `the model stopped at the output cap before writing an answer (thinking used ${tokenCount(thinkingTokens)} tokens of it; the call was billed). ${capRemedy(cap, cut)}`;
|
|
83
136
|
}
|
|
84
137
|
//# sourceMappingURL=thinking.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"thinking.js","sourceRoot":"","sources":["../../../src/tools/shared/thinking.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"thinking.js","sourceRoot":"","sources":["../../../src/tools/shared/thinking.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -22,6 +22,8 @@ export interface ResolvedModel {
|
|
|
22
22
|
inputTokenLimit: number | null;
|
|
23
23
|
/** Output token limit advertised by the model. */
|
|
24
24
|
outputTokenLimit: number | null;
|
|
25
|
+
/** The total a decode may reach through continuation requests; `null` for a model without long decode. */
|
|
26
|
+
longDecodeTokenLimit: number | null;
|
|
25
27
|
/**
|
|
26
28
|
* Functional taxonomy classification of the resolved model. Tools bind
|
|
27
29
|
* to a required category via `resolveModel(..., { requiredCategory })`
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,0CAA0C;AAC1C,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,sDAAsD;AACtD,MAAM,WAAW,aAAa;IAC5B,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,eAAe,EAAE,OAAO,CAAC;IACzB,iDAAiD;IACjD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kDAAkD;IAClD,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,4BAA4B,EAAE,aAAa,CAAC;IAC7D;;;OAGG;IACH,YAAY,EAAE,OAAO,4BAA4B,EAAE,eAAe,CAAC;IACnE,sGAAsG;IACtG,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,yDAAyD;AACzD,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8CAA8C;AAC9C,MAAM,WAAW,OAAO;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,2CAA2C;AAC3C,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IACxD;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED,yEAAyE;AACzE,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,0CAA0C;AAC1C,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAE1D,sDAAsD;AACtD,MAAM,WAAW,aAAa;IAC5B,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,6CAA6C;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,+EAA+E;IAC/E,eAAe,EAAE,OAAO,CAAC;IACzB,iDAAiD;IACjD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kDAAkD;IAClD,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,0GAA0G;IAC1G,oBAAoB,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,4BAA4B,EAAE,aAAa,CAAC;IAC7D;;;OAGG;IACH,YAAY,EAAE,OAAO,4BAA4B,EAAE,eAAe,CAAC;IACnE,sGAAsG;IACtG,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,yDAAyD;AACzD,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,8CAA8C;AAC9C,MAAM,WAAW,OAAO;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,2CAA2C;AAC3C,MAAM,WAAW,cAAc;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;OAaG;IACH,WAAW,CAAC,EAAE,UAAU,GAAG,UAAU,GAAG,QAAQ,GAAG,IAAI,CAAC;IACxD;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzC;AAED,yEAAyE;AACzE,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB"}
|
|
@@ -84,8 +84,20 @@ export interface PreCallEstimateInputs {
|
|
|
84
84
|
promptChars: number;
|
|
85
85
|
/** Input tokens beyond the workspace and the prompt (the attachments), counted by Gemini. */
|
|
86
86
|
extraInputTokens?: number | undefined;
|
|
87
|
+
/**
|
|
88
|
+
* The preflight's count of the whole request input, when it ran: the reservation takes the larger of it and the
|
|
89
|
+
* bytes/4 heuristic, which undercounts dense text and is billed once per request of a long decode.
|
|
90
|
+
*/
|
|
91
|
+
countedInputTokens?: number | undefined;
|
|
87
92
|
/** Upper bound on output tokens (tool-specific default). */
|
|
88
93
|
expectedOutputTokens: number;
|
|
94
|
+
/**
|
|
95
|
+
* The model's per-request output limit, for a call whose cap (`expectedOutputTokens`) is above it on a model with
|
|
96
|
+
* long decode: the continuation requests bill the prompt again plus what was decoded before them
|
|
97
|
+
* (`continuationInputTokens`), and the estimate adds that input; its output is the decode's bound
|
|
98
|
+
* (`decodedTokensBound`).
|
|
99
|
+
*/
|
|
100
|
+
perRequestOutputTokens?: number | undefined;
|
|
89
101
|
/** Thinking budget, passed through as extra output tokens. */
|
|
90
102
|
thinkingTokens?: number;
|
|
91
103
|
/** The call's timeout in ms (`null`: none): the reservation covers the rates of that window. */
|
|
@@ -93,6 +105,11 @@ export interface PreCallEstimateInputs {
|
|
|
93
105
|
/** When the reservation is made. Defaults to now. */
|
|
94
106
|
at?: Date | undefined;
|
|
95
107
|
}
|
|
108
|
+
/**
|
|
109
|
+
* The input one request of a call is reserved at — and billed at when it reports no usage: the larger of the bytes/4
|
|
110
|
+
* heuristic and the preflight's count, when it ran (the heuristic undercounts dense text).
|
|
111
|
+
*/
|
|
112
|
+
export declare function requestInputTokens(heuristic: number, counted: number | undefined): number;
|
|
96
113
|
/**
|
|
97
114
|
* Pre-call cost estimate used by the budget-reservation path. Charges
|
|
98
115
|
* the workspace content at the UNCACHED rate on purpose — on the first
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cost-estimator.d.ts","sourceRoot":"","sources":["../../src/utils/cost-estimator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"cost-estimator.d.ts","sourceRoot":"","sources":["../../src/utils/cost-estimator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* row stays an upper bound. An unpriced id takes the dearest row of its category.
|
|
9
9
|
* `GEMINI_PRICING_OVERRIDES` (JSON, keyed by model id) replaces a row at run time.
|
|
10
10
|
*/
|
|
11
|
+
import { continuationInputTokens, decodedTokensBound } from '../gemini/long-decode.js';
|
|
11
12
|
import { categorizeModel, costTierOf, isTextGenCategory } from '../gemini/model-taxonomy.js';
|
|
12
13
|
import { parsePricingOverrides } from './pricing-overrides.js';
|
|
13
14
|
const FLASH_3X = {
|
|
@@ -256,6 +257,13 @@ export function estimateReservationUsd(input, coverMs) {
|
|
|
256
257
|
export function toMicrosUsd(dollars) {
|
|
257
258
|
return Math.round(dollars * 1_000_000);
|
|
258
259
|
}
|
|
260
|
+
/**
|
|
261
|
+
* The input one request of a call is reserved at — and billed at when it reports no usage: the larger of the bytes/4
|
|
262
|
+
* heuristic and the preflight's count, when it ran (the heuristic undercounts dense text).
|
|
263
|
+
*/
|
|
264
|
+
export function requestInputTokens(heuristic, counted) {
|
|
265
|
+
return Math.max(heuristic, counted ?? 0);
|
|
266
|
+
}
|
|
259
267
|
/**
|
|
260
268
|
* Pre-call cost estimate used by the budget-reservation path. Charges
|
|
261
269
|
* the workspace content at the UNCACHED rate on purpose — on the first
|
|
@@ -268,12 +276,17 @@ export function toMicrosUsd(dollars) {
|
|
|
268
276
|
export function estimatePreCallCostUsd(input) {
|
|
269
277
|
const workspaceTokens = Math.ceil(Math.max(0, input.workspaceBytes) / 4);
|
|
270
278
|
const promptTokens = Math.ceil(Math.max(0, input.promptChars) / 4);
|
|
279
|
+
const heuristicInput = workspaceTokens + promptTokens + Math.max(0, input.extraInputTokens ?? 0);
|
|
280
|
+
const requestInput = requestInputTokens(heuristicInput, input.countedInputTokens);
|
|
281
|
+
const outputCap = Math.max(0, input.expectedOutputTokens);
|
|
282
|
+
const perRequest = input.perRequestOutputTokens;
|
|
283
|
+
const continuationInput = perRequest === undefined ? 0 : continuationInputTokens(requestInput, outputCap, perRequest);
|
|
271
284
|
const call = {
|
|
272
285
|
model: input.model,
|
|
273
286
|
serviceTier: input.serviceTier,
|
|
274
|
-
uncachedInputTokens:
|
|
287
|
+
uncachedInputTokens: requestInput + continuationInput,
|
|
275
288
|
cachedInputTokens: 0,
|
|
276
|
-
outputTokens:
|
|
289
|
+
outputTokens: perRequest === undefined ? outputCap : decodedTokensBound(outputCap, perRequest),
|
|
277
290
|
at: input.at,
|
|
278
291
|
...(input.thinkingTokens !== undefined ? { thinkingTokens: input.thinkingTokens } : {}),
|
|
279
292
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cost-estimator.js","sourceRoot":"","sources":["../../src/utils/cost-estimator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;
|
|
1
|
+
{"version":3,"file":"cost-estimator.js","sourceRoot":"","sources":["../../src/utils/cost-estimator.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.24.0",
|
|
4
4
|
"mcpName": "io.github.qmediat/gemini-code-context-mcp",
|
|
5
5
|
"description": "MCP server that gives Claude Code and other MCP hosts long-context memory of a codebase through Gemini's 1M-token window: `ask`/`code` send the scanned workspace with implicit caching by default or an explicit Context Cache on request; `ask_agentic` reads files on demand for repos beyond the limit.",
|
|
6
6
|
"keywords": [
|
|
@@ -49,11 +49,13 @@
|
|
|
49
49
|
"lint": "biome check src test && eslint . && jscpd --config .jscpd.json && node lint/baseline-ratchet.mjs --duplicates .jscpd-report/jscpd-report.json",
|
|
50
50
|
"format": "biome format --write src test",
|
|
51
51
|
"typecheck": "tsc --noEmit",
|
|
52
|
-
"
|
|
52
|
+
"check:supports": "node scripts/check-supports.mjs",
|
|
53
|
+
"check:addresses": "node scripts/check-addresses.mjs",
|
|
54
|
+
"prepublishOnly": "npm run check:supports && npm run check:addresses && npm run lint && npm run typecheck && npm run test && npm run build",
|
|
53
55
|
"inspector": "npx @modelcontextprotocol/inspector node dist/index.js"
|
|
54
56
|
},
|
|
55
57
|
"dependencies": {
|
|
56
|
-
"@google/genai": "^
|
|
58
|
+
"@google/genai": "^3.4.0",
|
|
57
59
|
"@modelcontextprotocol/sdk": "^1.32.0",
|
|
58
60
|
"better-sqlite3": "^13.0.3",
|
|
59
61
|
"zod": "^4.6.7"
|