@qmediat.io/gemini-code-context-mcp 1.0.2 → 1.2.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 +87 -0
- package/dist/auth/credentials-store.d.ts.map +1 -1
- package/dist/auth/credentials-store.js +8 -2
- package/dist/auth/credentials-store.js.map +1 -1
- package/dist/cache/cache-manager.d.ts +31 -0
- package/dist/cache/cache-manager.d.ts.map +1 -1
- package/dist/cache/cache-manager.js +105 -0
- package/dist/cache/cache-manager.js.map +1 -1
- package/dist/cache/ttl-watcher.d.ts +2 -0
- package/dist/cache/ttl-watcher.d.ts.map +1 -1
- package/dist/cache/ttl-watcher.js +60 -25
- package/dist/cache/ttl-watcher.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +5 -1
- package/dist/config.js.map +1 -1
- package/dist/gemini/models.d.ts.map +1 -1
- package/dist/gemini/models.js +34 -25
- package/dist/gemini/models.js.map +1 -1
- package/dist/indexer/globs.d.ts +24 -1
- package/dist/indexer/globs.d.ts.map +1 -1
- package/dist/indexer/globs.js +70 -4
- package/dist/indexer/globs.js.map +1 -1
- package/dist/indexer/workspace-validation.d.ts +54 -0
- package/dist/indexer/workspace-validation.d.ts.map +1 -0
- package/dist/indexer/workspace-validation.js +206 -0
- package/dist/indexer/workspace-validation.js.map +1 -0
- package/dist/manifest/db.d.ts +50 -0
- package/dist/manifest/db.d.ts.map +1 -1
- package/dist/manifest/db.js +74 -1
- package/dist/manifest/db.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +7 -0
- package/dist/server.js.map +1 -1
- package/dist/tools/ask.tool.d.ts +25 -1
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +267 -27
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts +24 -1
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +188 -31
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/registry.d.ts +37 -6
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +30 -6
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/reindex.tool.d.ts.map +1 -1
- package/dist/tools/reindex.tool.js +10 -0
- package/dist/tools/reindex.tool.js.map +1 -1
- package/dist/tools/shared/thinking.d.ts +63 -0
- package/dist/tools/shared/thinking.d.ts.map +1 -0
- package/dist/tools/shared/thinking.js +62 -0
- package/dist/tools/shared/thinking.js.map +1 -0
- package/dist/utils/cost-estimator.d.ts +21 -0
- package/dist/utils/cost-estimator.d.ts.map +1 -1
- package/dist/utils/cost-estimator.js +43 -6
- package/dist/utils/cost-estimator.js.map +1 -1
- package/package.json +3 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,11 +9,12 @@
|
|
|
9
9
|
*/
|
|
10
10
|
import { z } from 'zod';
|
|
11
11
|
import { type ToolDefinition } from './registry.js';
|
|
12
|
-
export declare const codeInputSchema: z.ZodObject<{
|
|
12
|
+
export declare const codeInputSchema: z.ZodEffects<z.ZodObject<{
|
|
13
13
|
task: z.ZodString;
|
|
14
14
|
workspace: z.ZodOptional<z.ZodString>;
|
|
15
15
|
model: z.ZodOptional<z.ZodString>;
|
|
16
16
|
thinkingBudget: z.ZodOptional<z.ZodNumber>;
|
|
17
|
+
thinkingLevel: z.ZodOptional<z.ZodEnum<["MINIMAL", "LOW", "MEDIUM", "HIGH"]>>;
|
|
17
18
|
codeExecution: z.ZodOptional<z.ZodBoolean>;
|
|
18
19
|
expectEdits: z.ZodOptional<z.ZodBoolean>;
|
|
19
20
|
includeGlobs: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
@@ -25,6 +26,7 @@ export declare const codeInputSchema: z.ZodObject<{
|
|
|
25
26
|
includeGlobs?: string[] | undefined;
|
|
26
27
|
excludeGlobs?: string[] | undefined;
|
|
27
28
|
thinkingBudget?: number | undefined;
|
|
29
|
+
thinkingLevel?: "MINIMAL" | "LOW" | "MEDIUM" | "HIGH" | undefined;
|
|
28
30
|
codeExecution?: boolean | undefined;
|
|
29
31
|
expectEdits?: boolean | undefined;
|
|
30
32
|
}, {
|
|
@@ -34,6 +36,27 @@ export declare const codeInputSchema: z.ZodObject<{
|
|
|
34
36
|
includeGlobs?: string[] | undefined;
|
|
35
37
|
excludeGlobs?: string[] | undefined;
|
|
36
38
|
thinkingBudget?: number | undefined;
|
|
39
|
+
thinkingLevel?: "MINIMAL" | "LOW" | "MEDIUM" | "HIGH" | undefined;
|
|
40
|
+
codeExecution?: boolean | undefined;
|
|
41
|
+
expectEdits?: boolean | undefined;
|
|
42
|
+
}>, {
|
|
43
|
+
task: string;
|
|
44
|
+
model?: string | undefined;
|
|
45
|
+
workspace?: string | undefined;
|
|
46
|
+
includeGlobs?: string[] | undefined;
|
|
47
|
+
excludeGlobs?: string[] | undefined;
|
|
48
|
+
thinkingBudget?: number | undefined;
|
|
49
|
+
thinkingLevel?: "MINIMAL" | "LOW" | "MEDIUM" | "HIGH" | undefined;
|
|
50
|
+
codeExecution?: boolean | undefined;
|
|
51
|
+
expectEdits?: boolean | undefined;
|
|
52
|
+
}, {
|
|
53
|
+
task: string;
|
|
54
|
+
model?: string | undefined;
|
|
55
|
+
workspace?: string | undefined;
|
|
56
|
+
includeGlobs?: string[] | undefined;
|
|
57
|
+
excludeGlobs?: string[] | undefined;
|
|
58
|
+
thinkingBudget?: number | undefined;
|
|
59
|
+
thinkingLevel?: "MINIMAL" | "LOW" | "MEDIUM" | "HIGH" | undefined;
|
|
37
60
|
codeExecution?: boolean | undefined;
|
|
38
61
|
expectEdits?: boolean | undefined;
|
|
39
62
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AA0B7E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6CxB,CAAC;AAEL,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAyCxD,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,SAAS,CAma9C,CAAC"}
|
package/dist/tools/code.tool.js
CHANGED
|
@@ -10,13 +10,15 @@
|
|
|
10
10
|
import { createHash } from 'node:crypto';
|
|
11
11
|
import { resolve } from 'node:path';
|
|
12
12
|
import { z } from 'zod';
|
|
13
|
-
import {
|
|
13
|
+
import { isStaleCacheError, markCacheStale, prepareContext } from '../cache/cache-manager.js';
|
|
14
14
|
import { resolveModel } from '../gemini/models.js';
|
|
15
15
|
import { scanWorkspace } from '../indexer/workspace-scanner.js';
|
|
16
|
-
import {
|
|
16
|
+
import { WorkspaceValidationError, validateWorkspacePath, } from '../indexer/workspace-validation.js';
|
|
17
|
+
import { estimateCostUsd, estimatePreCallCostUsd, toMicrosUsd } from '../utils/cost-estimator.js';
|
|
17
18
|
import { logger } from '../utils/logger.js';
|
|
18
19
|
import { createProgressEmitter } from '../utils/progress.js';
|
|
19
20
|
import { errorResult, textResult } from './registry.js';
|
|
21
|
+
import { THINKING_LEVELS, THINKING_LEVEL_RESERVE } from './shared/thinking.js';
|
|
20
22
|
const SYSTEM_INSTRUCTION_CODE = [
|
|
21
23
|
'You are an expert software engineer. Generate production-quality, idiomatic code with proper error handling.',
|
|
22
24
|
'Match the existing code style and conventions visible in the provided workspace context.',
|
|
@@ -39,7 +41,8 @@ const SYSTEM_INSTRUCTION_CODE = [
|
|
|
39
41
|
'',
|
|
40
42
|
'Always explain briefly WHY a change is made before the edit block.',
|
|
41
43
|
].join('\n');
|
|
42
|
-
export const codeInputSchema = z
|
|
44
|
+
export const codeInputSchema = z
|
|
45
|
+
.object({
|
|
43
46
|
task: z.string().min(1).describe('Describe the coding task — what to build, refactor, or fix.'),
|
|
44
47
|
workspace: z.string().optional().describe('Workspace path (default: cwd).'),
|
|
45
48
|
model: z
|
|
@@ -52,7 +55,11 @@ export const codeInputSchema = z.object({
|
|
|
52
55
|
.min(0)
|
|
53
56
|
.max(65_536)
|
|
54
57
|
.optional()
|
|
55
|
-
.describe('
|
|
58
|
+
.describe('Explicit reasoning-token cap. Default (when both `thinkingBudget` and `thinkingLevel` are omitted): 16384 — a strong default for coding. Pass a positive integer to cap reasoning at that many tokens; `0` disables thinking (rejected by Gemini 3 Pro with 400). CAVEAT on Gemini 3 Pro: low positive values (empirically ≤256 with cached content) can cause the API to hang — use ≥4096 if you must bound it. For discrete-tier control on Gemini 3 use `thinkingLevel` instead — the two are mutually exclusive.'),
|
|
59
|
+
thinkingLevel: z
|
|
60
|
+
.enum(THINKING_LEVELS)
|
|
61
|
+
.optional()
|
|
62
|
+
.describe("Discrete reasoning tier for Gemini 3 family models — Google's recommended knob on those (ai.google.dev/gemini-api/docs/gemini-3). Values: `MINIMAL` (Flash-Lite only), `LOW`, `MEDIUM`, `HIGH` (Gemini 3 Pro's default). Gemini 2.5 models do NOT support this — use `thinkingBudget` instead. Mutually exclusive with `thinkingBudget`: passing both returns a validation error before we even hit Gemini (Gemini itself also rejects with 400 'cannot use both thinking_level and the legacy thinking_budget parameter')."),
|
|
56
63
|
codeExecution: z
|
|
57
64
|
.boolean()
|
|
58
65
|
.optional()
|
|
@@ -63,6 +70,13 @@ export const codeInputSchema = z.object({
|
|
|
63
70
|
.describe('Request OLD/NEW diff format in the response (default: true).'),
|
|
64
71
|
includeGlobs: z.array(z.string()).optional(),
|
|
65
72
|
excludeGlobs: z.array(z.string()).optional(),
|
|
73
|
+
})
|
|
74
|
+
.refine((data) => !(data.thinkingBudget !== undefined && data.thinkingLevel !== undefined), {
|
|
75
|
+
message: 'Cannot specify both `thinkingBudget` and `thinkingLevel` — they are mutually exclusive. Gemini rejects the combination with 400. Choose one: `thinkingLevel` (recommended for Gemini 3) or `thinkingBudget` (required on Gemini 2.5).',
|
|
76
|
+
// `path: []` (root-level error) reflects that the violation is the
|
|
77
|
+
// RELATION between two fields, not a problem with either field
|
|
78
|
+
// individually.
|
|
79
|
+
path: [],
|
|
66
80
|
});
|
|
67
81
|
const EDIT_REGEX = /\*\*FILE: (.+?)\*\*\s*\n```[^\n]*\n(?:OLD:\s*\n([\s\S]*?)\n)?NEW:\s*\n([\s\S]*?)\n```/g;
|
|
68
82
|
function parseEdits(text) {
|
|
@@ -105,17 +119,35 @@ export const codeTool = {
|
|
|
105
119
|
const started = Date.now();
|
|
106
120
|
const workspaceRoot = resolve(input.workspace ?? process.cwd());
|
|
107
121
|
const modelRequest = input.model ?? 'latest-pro-thinking';
|
|
108
|
-
const thinkingBudget = input.thinkingBudget ?? 16_384;
|
|
109
122
|
const expectEdits = input.expectEdits ?? true;
|
|
110
123
|
const codeExecution = input.codeExecution ?? false;
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
124
|
+
// Schema `.refine()` guarantees `thinkingBudget` and `thinkingLevel` are
|
|
125
|
+
// never both set. `usingThinkingLevel` is a single source of truth for
|
|
126
|
+
// the "is the caller driving reasoning via the discrete-tier knob?"
|
|
127
|
+
// predicate — used by the cost estimate, the emitter message, and the
|
|
128
|
+
// thinkingConfig shape below.
|
|
129
|
+
const usingThinkingLevel = input.thinkingLevel !== undefined;
|
|
130
|
+
// `code` keeps its pre-existing default of 16_384 for the `thinkingBudget`
|
|
131
|
+
// path (strong reasoning for coding out of the box — coding tasks
|
|
132
|
+
// genuinely benefit from it and callers rarely want to disable thinking).
|
|
133
|
+
// When the caller uses `thinkingLevel` instead, `thinkingBudget` stays
|
|
134
|
+
// undefined and we take the level branch below.
|
|
135
|
+
const thinkingBudget = usingThinkingLevel ? undefined : (input.thinkingBudget ?? 16_384);
|
|
136
|
+
let reservationId = null;
|
|
117
137
|
const emitter = createProgressEmitter(ctx.server, ctx.progressToken);
|
|
118
138
|
try {
|
|
139
|
+
// Workspace validation inside try → reported as a regular tool error
|
|
140
|
+
// (errorResult, "code failed: …") rather than an unhandled exception
|
|
141
|
+
// surfaced by the server-level handler.
|
|
142
|
+
try {
|
|
143
|
+
validateWorkspacePath(workspaceRoot);
|
|
144
|
+
}
|
|
145
|
+
catch (err) {
|
|
146
|
+
if (err instanceof WorkspaceValidationError) {
|
|
147
|
+
return errorResult(`code: ${err.message}`);
|
|
148
|
+
}
|
|
149
|
+
throw err;
|
|
150
|
+
}
|
|
119
151
|
emitter.emit(`resolving model '${modelRequest}'…`);
|
|
120
152
|
const resolved = await resolveModel(modelRequest, ctx.client);
|
|
121
153
|
emitter.emit(`scanning workspace ${workspaceRoot}…`);
|
|
@@ -125,6 +157,72 @@ export const codeTool = {
|
|
|
125
157
|
maxFiles: ctx.config.maxFilesPerWorkspace,
|
|
126
158
|
maxFileSizeBytes: ctx.config.maxFileSizeBytes,
|
|
127
159
|
});
|
|
160
|
+
// Hard cap on candidate output tokens (separate from `thinkingBudget`).
|
|
161
|
+
// Used both as the generateContent `maxOutputTokens` field and as the
|
|
162
|
+
// budget-reservation estimate, so the reservation is a true upper bound
|
|
163
|
+
// (Copilot review C7). 32k is generous for most code-edit responses;
|
|
164
|
+
// we clamp to the model's advertised limit if smaller.
|
|
165
|
+
const CODE_MAX_OUTPUT_TOKENS_DEFAULT = 32_768;
|
|
166
|
+
const maxOutputTokens = typeof resolved.outputTokenLimit === 'number' && resolved.outputTokenLimit > 0
|
|
167
|
+
? Math.min(CODE_MAX_OUTPUT_TOKENS_DEFAULT, resolved.outputTokenLimit)
|
|
168
|
+
: CODE_MAX_OUTPUT_TOKENS_DEFAULT;
|
|
169
|
+
// Gemini requires `thinkingBudget < maxOutputTokens` (the thinking pool
|
|
170
|
+
// is carved out of the candidate-output allowance). The hard cap above
|
|
171
|
+
// may clamp maxOutputTokens as low as the model's `outputTokenLimit`
|
|
172
|
+
// (e.g. 8_192 on Flash-lite). Clamp the effective thinkingBudget so
|
|
173
|
+
// the generateContent call never 400s on this invariant; reserve at
|
|
174
|
+
// least 1_024 tokens for the actual completion.
|
|
175
|
+
//
|
|
176
|
+
// Only meaningful on the thinkingBudget path — when the caller uses
|
|
177
|
+
// `thinkingLevel` instead, `thinkingBudget` is `undefined` and this
|
|
178
|
+
// value is ignored by the thinkingConfig builder below.
|
|
179
|
+
const effectiveThinkingBudget = thinkingBudget !== undefined && thinkingBudget > 0
|
|
180
|
+
? Math.max(0, Math.min(thinkingBudget, maxOutputTokens - 1024))
|
|
181
|
+
: 0;
|
|
182
|
+
// Cost-estimate thinking-token reserve — tier-aware when the caller
|
|
183
|
+
// uses `thinkingLevel`, exact-on-the-budget when they use
|
|
184
|
+
// `thinkingBudget`. Mirror of `ask.tool.ts` logic; see
|
|
185
|
+
// `THINKING_LEVEL_RESERVE` in `shared/thinking.ts` for the rationale
|
|
186
|
+
// behind the per-tier numbers and why HIGH falls through to the
|
|
187
|
+
// dynamic cap.
|
|
188
|
+
//
|
|
189
|
+
// Defensive clamp: tier reserves (MINIMAL=512, LOW=2048, MEDIUM=4096)
|
|
190
|
+
// are fixed constants, but `maxOutputTokens` can be clamped down to a
|
|
191
|
+
// resolved model's `outputTokenLimit`. A future small-cap model (say
|
|
192
|
+
// `outputTokenLimit: 4000`) would let MEDIUM's 4096 exceed the
|
|
193
|
+
// available headroom and over-estimate the budget reservation. Clamp
|
|
194
|
+
// every tier's reserve against the dynamic headroom so the upper
|
|
195
|
+
// bound stays coherent across model rollouts (PR #17 self-review F2).
|
|
196
|
+
const thinkingHeadroom = Math.max(0, maxOutputTokens - 1024);
|
|
197
|
+
const thinkingTokensForEstimate = input.thinkingLevel !== undefined
|
|
198
|
+
? Math.min(THINKING_LEVEL_RESERVE[input.thinkingLevel] ?? thinkingHeadroom, thinkingHeadroom)
|
|
199
|
+
: effectiveThinkingBudget;
|
|
200
|
+
// Atomic budget reservation — see ask.tool.ts for the full rationale.
|
|
201
|
+
// Estimate includes the thinking budget (billed as output tokens on Pro)
|
|
202
|
+
// PLUS the candidate output cap.
|
|
203
|
+
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
204
|
+
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
205
|
+
const estimateUsd = estimatePreCallCostUsd({
|
|
206
|
+
model: resolved.resolved,
|
|
207
|
+
workspaceBytes,
|
|
208
|
+
promptChars: input.task.length,
|
|
209
|
+
expectedOutputTokens: maxOutputTokens,
|
|
210
|
+
thinkingTokens: thinkingTokensForEstimate,
|
|
211
|
+
});
|
|
212
|
+
const reserve = ctx.manifest.reserveBudget({
|
|
213
|
+
workspaceRoot,
|
|
214
|
+
toolName: 'code',
|
|
215
|
+
model: resolved.resolved,
|
|
216
|
+
estimatedCostMicros: toMicrosUsd(estimateUsd),
|
|
217
|
+
dailyBudgetMicros: toMicrosUsd(ctx.config.dailyBudgetUsd),
|
|
218
|
+
nowMs: Date.now(),
|
|
219
|
+
});
|
|
220
|
+
if ('rejected' in reserve) {
|
|
221
|
+
const spentUsd = reserve.spentMicros / 1_000_000;
|
|
222
|
+
return errorResult(`Daily budget cap would be exceeded: spent $${spentUsd.toFixed(4)} + estimate $${estimateUsd.toFixed(4)} > cap $${ctx.config.dailyBudgetUsd.toFixed(2)}. Retry after UTC midnight, or raise \`GEMINI_DAILY_BUDGET_USD\`.`);
|
|
223
|
+
}
|
|
224
|
+
reservationId = reserve.id;
|
|
225
|
+
}
|
|
128
226
|
const systemPromptHash = createHash('sha256')
|
|
129
227
|
.update(SYSTEM_INSTRUCTION_CODE)
|
|
130
228
|
.digest('hex')
|
|
@@ -148,9 +246,28 @@ export const codeTool = {
|
|
|
148
246
|
const userPrompt = expectEdits
|
|
149
247
|
? `${input.task}\n\nRespond with your rationale and OLD/NEW diff blocks per the system instruction.`
|
|
150
248
|
: input.task;
|
|
249
|
+
const thinkingDescription = usingThinkingLevel
|
|
250
|
+
? `thinking-level=${input.thinkingLevel}`
|
|
251
|
+
: `thinking=${effectiveThinkingBudget}`;
|
|
151
252
|
emitter.emit(codeExecution
|
|
152
|
-
? `generating with
|
|
153
|
-
: `generating with
|
|
253
|
+
? `generating with ${thinkingDescription} + codeExecution…`
|
|
254
|
+
: `generating with ${thinkingDescription}…`);
|
|
255
|
+
// Two mutually-exclusive reasoning-control paths (enforced by schema
|
|
256
|
+
// `.refine()`):
|
|
257
|
+
// a) `thinkingLevel` set → cast to the SDK enum and pass through.
|
|
258
|
+
// Google's recommended path on Gemini 3. Rejected by Gemini 2.5.
|
|
259
|
+
// Cast rather than runtime enum-object lookup so a future SDK
|
|
260
|
+
// rename surfaces as a Gemini 400, not a silent `undefined`.
|
|
261
|
+
// b) `thinkingBudget` path (default 16_384, clamped above) → pass
|
|
262
|
+
// `thinkingBudget` as before.
|
|
263
|
+
// `includeThoughts: true` is unconditional so `thinkingSummary`
|
|
264
|
+
// extraction below always has material to find.
|
|
265
|
+
const thinkingConfig = usingThinkingLevel
|
|
266
|
+
? {
|
|
267
|
+
thinkingLevel: input.thinkingLevel,
|
|
268
|
+
includeThoughts: true,
|
|
269
|
+
}
|
|
270
|
+
: { thinkingBudget: effectiveThinkingBudget, includeThoughts: true };
|
|
154
271
|
// Gemini rejects generateContent({cachedContent, system_instruction|tools|tool_config})
|
|
155
272
|
// with 400. System instruction is baked into the cache at build time; tools
|
|
156
273
|
// (codeExecution) cannot be combined with a cache built without them. When
|
|
@@ -163,15 +280,19 @@ export const codeTool = {
|
|
|
163
280
|
const buildConfig = (cacheId) => {
|
|
164
281
|
if (canUseCache(cacheId) && cacheId) {
|
|
165
282
|
// With cache: system_instruction is baked in; thinkingConfig remains OK.
|
|
283
|
+
// `maxOutputTokens` couples with the budget reservation estimate
|
|
284
|
+
// so the reservation is a TRUE upper bound (Copilot review C7).
|
|
166
285
|
return {
|
|
167
286
|
cachedContent: cacheId,
|
|
168
|
-
thinkingConfig
|
|
287
|
+
thinkingConfig,
|
|
288
|
+
maxOutputTokens,
|
|
169
289
|
};
|
|
170
290
|
}
|
|
171
291
|
// Without cache (or cache bypassed for codeExecution): pass full config.
|
|
172
292
|
return {
|
|
173
293
|
systemInstruction: SYSTEM_INSTRUCTION_CODE,
|
|
174
|
-
thinkingConfig
|
|
294
|
+
thinkingConfig,
|
|
295
|
+
maxOutputTokens,
|
|
175
296
|
...(codeExecution ? { tools: [{ codeExecution: {} }] } : {}),
|
|
176
297
|
};
|
|
177
298
|
};
|
|
@@ -192,11 +313,10 @@ export const codeTool = {
|
|
|
192
313
|
if (activePrep.cacheId && isStaleCacheError(err)) {
|
|
193
314
|
logger.warn(`Gemini rejected cached content ${activePrep.cacheId}; invalidating and retrying once.`);
|
|
194
315
|
try {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
});
|
|
316
|
+
// Reset cache pointer only — preserve `files` rows so the rebuild
|
|
317
|
+
// reuses uploaded files via content-hash dedup instead of double-
|
|
318
|
+
// uploading. The Gemini-side cache is already dead.
|
|
319
|
+
markCacheStale({ manifest: ctx.manifest, workspaceRoot });
|
|
200
320
|
const rebuilt = await prepareContext({
|
|
201
321
|
client: ctx.client,
|
|
202
322
|
manifest: ctx.manifest,
|
|
@@ -266,16 +386,36 @@ export const codeTool = {
|
|
|
266
386
|
});
|
|
267
387
|
const costMicros = toMicrosUsd(cost);
|
|
268
388
|
const durationMs = Date.now() - started;
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
389
|
+
if (reservationId !== null) {
|
|
390
|
+
// Defensive: if `finalize` throws (disk full / lock contention), keep
|
|
391
|
+
// the reservation row so we don't lose all record of this billable
|
|
392
|
+
// call. Drop `reservationId` either way so the outer catch doesn't
|
|
393
|
+
// touch it.
|
|
394
|
+
try {
|
|
395
|
+
ctx.manifest.finalizeBudgetReservation(reservationId, {
|
|
396
|
+
cachedTokens: cached,
|
|
397
|
+
uncachedTokens: uncached,
|
|
398
|
+
costUsdMicro: costMicros,
|
|
399
|
+
durationMs,
|
|
400
|
+
});
|
|
401
|
+
}
|
|
402
|
+
catch (finalizeErr) {
|
|
403
|
+
logger.error(`code: finalizeBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate (${costMicros} micros). Error: ${String(finalizeErr)}`);
|
|
404
|
+
}
|
|
405
|
+
reservationId = null;
|
|
406
|
+
}
|
|
407
|
+
else {
|
|
408
|
+
ctx.manifest.insertUsageMetric({
|
|
409
|
+
workspaceRoot,
|
|
410
|
+
toolName: 'code',
|
|
411
|
+
model: resolved.resolved,
|
|
412
|
+
cachedTokens: cached,
|
|
413
|
+
uncachedTokens: uncached,
|
|
414
|
+
costUsdMicro: costMicros,
|
|
415
|
+
durationMs,
|
|
416
|
+
occurredAt: Date.now(),
|
|
417
|
+
});
|
|
418
|
+
}
|
|
279
419
|
if (scan.truncated) {
|
|
280
420
|
logger.warn(`workspace ${workspaceRoot} contains more files than GEMINI_CODE_CONTEXT_MAX_FILES (${ctx.config.maxFilesPerWorkspace}); the tail was dropped before indexing.`);
|
|
281
421
|
}
|
|
@@ -283,7 +423,15 @@ export const codeTool = {
|
|
|
283
423
|
resolvedModel: resolved.resolved,
|
|
284
424
|
requestedModel: resolved.requested,
|
|
285
425
|
contextWindow: resolved.inputTokenLimit,
|
|
286
|
-
thinkingBudget
|
|
426
|
+
// `thinkingBudget` echoes the clamped value actually sent on the
|
|
427
|
+
// wire; it's only meaningful on the budget path. On the
|
|
428
|
+
// `thinkingLevel` path nothing is sent for `thinkingBudget`, so we
|
|
429
|
+
// emit `null` (not `0`) — `0` is the wire sentinel for "thinking
|
|
430
|
+
// disabled" and reporting it here for a level-path call would lie
|
|
431
|
+
// to downstream audit / dashboard consumers (PR #17 self-review F1,
|
|
432
|
+
// 3-reviewer consensus: GPT + Copilot + Self). Matches `ask.tool.ts`.
|
|
433
|
+
thinkingBudget: usingThinkingLevel ? null : effectiveThinkingBudget,
|
|
434
|
+
thinkingLevel: input.thinkingLevel ?? null,
|
|
287
435
|
codeExecutionUsed: codeExecution,
|
|
288
436
|
cacheHit: activePrep.reused,
|
|
289
437
|
cacheRebuilt: activePrep.rebuilt || retriedOnStaleCache,
|
|
@@ -317,6 +465,15 @@ export const codeTool = {
|
|
|
317
465
|
}
|
|
318
466
|
catch (err) {
|
|
319
467
|
logger.error(`code failed: ${String(err)}`);
|
|
468
|
+
if (reservationId !== null) {
|
|
469
|
+
try {
|
|
470
|
+
ctx.manifest.cancelBudgetReservation(reservationId);
|
|
471
|
+
}
|
|
472
|
+
catch (cancelErr) {
|
|
473
|
+
logger.error(`code: cancelBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate. Error: ${String(cancelErr)}`);
|
|
474
|
+
}
|
|
475
|
+
reservationId = null;
|
|
476
|
+
}
|
|
320
477
|
return errorResult(`code failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
321
478
|
}
|
|
322
479
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.tool.js","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"code.tool.js","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/registry.d.ts
CHANGED
|
@@ -15,6 +15,18 @@ export interface ToolContext {
|
|
|
15
15
|
ttlWatcher: TtlWatcher;
|
|
16
16
|
progressToken: string | number | undefined;
|
|
17
17
|
}
|
|
18
|
+
/**
|
|
19
|
+
* MCP-compliant `tools[*].inputSchema` shape. The root MUST be `type: "object"`
|
|
20
|
+
* per the MCP protocol — strict clients (Claude Code, Claude Desktop) reject
|
|
21
|
+
* anything else. Extra keys (`$schema`, `additionalProperties`, `required`, …)
|
|
22
|
+
* pass through the index signature.
|
|
23
|
+
*/
|
|
24
|
+
export interface McpInputSchema {
|
|
25
|
+
type: 'object';
|
|
26
|
+
properties?: Record<string, unknown>;
|
|
27
|
+
required?: readonly string[];
|
|
28
|
+
[key: string]: unknown;
|
|
29
|
+
}
|
|
18
30
|
export interface ToolDefinition<TInput = unknown> {
|
|
19
31
|
name: string;
|
|
20
32
|
title: string;
|
|
@@ -35,11 +47,30 @@ export interface ToolResult {
|
|
|
35
47
|
export declare function textResult(text: string, structured?: Record<string, unknown>): ToolResult;
|
|
36
48
|
export declare function errorResult(message: string): ToolResult;
|
|
37
49
|
/**
|
|
38
|
-
*
|
|
39
|
-
* response.
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
50
|
+
* Build the `inputSchema` payload for a tool's entry in a `tools/list`
|
|
51
|
+
* response. Two non-negotiable constraints on the serialisation:
|
|
52
|
+
*
|
|
53
|
+
* 1. The `name` option is deliberately omitted. With `name` set,
|
|
54
|
+
* `zod-to-json-schema` wraps its output in `{ $ref, definitions }` — a
|
|
55
|
+
* shape that lacks the `type: "object"` the MCP spec mandates at the
|
|
56
|
+
* root. Strict clients (Claude Code, Claude Desktop) reject that with
|
|
57
|
+
* `Invalid input: expected "object"` and silently drop every tool from
|
|
58
|
+
* their namespace. This was the v1.0.0 / v1.0.1 ship-blocker fixed in
|
|
59
|
+
* PR #5.
|
|
60
|
+
*
|
|
61
|
+
* 2. `$refStrategy: 'none'` is required. MCP clients do not dereference
|
|
62
|
+
* `$ref` inside `inputSchema`, so any internal reference would leave
|
|
63
|
+
* the schema unresolvable on the client side. The trade-off is payload
|
|
64
|
+
* size when heavily-reused sub-schemas appear — acceptable for our
|
|
65
|
+
* workload, forced by spec anyway.
|
|
66
|
+
*
|
|
67
|
+
* The runtime assert is a belt-and-suspenders guard: `ToolDefinition.schema`
|
|
68
|
+
* is currently typed loosely as `z.ZodSchema<TInput>`, which permits
|
|
69
|
+
* non-object roots (unions, primitives, `ZodEffects`) to compile cleanly.
|
|
70
|
+
* `runServer()` exercises this helper on every tool at startup, so a
|
|
71
|
+
* malformed schema fails before the stdio transport accepts connections —
|
|
72
|
+
* much clearer than the silent tool-list rejection the spec-violation path
|
|
73
|
+
* produces. Compile-time narrowing is tracked in `docs/FOLLOW-UP-PRS.md`.
|
|
43
74
|
*/
|
|
44
|
-
export declare function buildToolInputSchema(tool: ToolDefinition<unknown>):
|
|
75
|
+
export declare function buildToolInputSchema(tool: ToolDefinition<unknown>): McpInputSchema;
|
|
45
76
|
//# sourceMappingURL=registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,UAAU;IACzB,gCAAgC;IAChC,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,CAKzF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAKvD;AAED
|
|
1
|
+
{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACxE,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,QAAQ,EAAE,UAAU,CAAC;IACrB,UAAU,EAAE,UAAU,CAAC;IACvB,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CAC5C;AAED;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,OAAO;IAC9C,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC5B,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,UAAU;IACzB,gCAAgC;IAChC,OAAO,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC/C,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,UAAU,CAKzF;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU,CAKvD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,cAAc,CASlF"}
|
package/dist/tools/registry.js
CHANGED
|
@@ -15,13 +15,37 @@ export function errorResult(message) {
|
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
17
|
/**
|
|
18
|
-
*
|
|
19
|
-
* response.
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
18
|
+
* Build the `inputSchema` payload for a tool's entry in a `tools/list`
|
|
19
|
+
* response. Two non-negotiable constraints on the serialisation:
|
|
20
|
+
*
|
|
21
|
+
* 1. The `name` option is deliberately omitted. With `name` set,
|
|
22
|
+
* `zod-to-json-schema` wraps its output in `{ $ref, definitions }` — a
|
|
23
|
+
* shape that lacks the `type: "object"` the MCP spec mandates at the
|
|
24
|
+
* root. Strict clients (Claude Code, Claude Desktop) reject that with
|
|
25
|
+
* `Invalid input: expected "object"` and silently drop every tool from
|
|
26
|
+
* their namespace. This was the v1.0.0 / v1.0.1 ship-blocker fixed in
|
|
27
|
+
* PR #5.
|
|
28
|
+
*
|
|
29
|
+
* 2. `$refStrategy: 'none'` is required. MCP clients do not dereference
|
|
30
|
+
* `$ref` inside `inputSchema`, so any internal reference would leave
|
|
31
|
+
* the schema unresolvable on the client side. The trade-off is payload
|
|
32
|
+
* size when heavily-reused sub-schemas appear — acceptable for our
|
|
33
|
+
* workload, forced by spec anyway.
|
|
34
|
+
*
|
|
35
|
+
* The runtime assert is a belt-and-suspenders guard: `ToolDefinition.schema`
|
|
36
|
+
* is currently typed loosely as `z.ZodSchema<TInput>`, which permits
|
|
37
|
+
* non-object roots (unions, primitives, `ZodEffects`) to compile cleanly.
|
|
38
|
+
* `runServer()` exercises this helper on every tool at startup, so a
|
|
39
|
+
* malformed schema fails before the stdio transport accepts connections —
|
|
40
|
+
* much clearer than the silent tool-list rejection the spec-violation path
|
|
41
|
+
* produces. Compile-time narrowing is tracked in `docs/FOLLOW-UP-PRS.md`.
|
|
23
42
|
*/
|
|
24
43
|
export function buildToolInputSchema(tool) {
|
|
25
|
-
|
|
44
|
+
const payload = zodToJsonSchema(tool.schema, { $refStrategy: 'none' });
|
|
45
|
+
if (payload.type !== 'object') {
|
|
46
|
+
throw new Error(`buildToolInputSchema: tool '${tool.name}' produced a non-object root schema ` +
|
|
47
|
+
`(type=${JSON.stringify(payload.type)}). MCP clients require type: "object" at the root.`);
|
|
48
|
+
}
|
|
49
|
+
return payload;
|
|
26
50
|
}
|
|
27
51
|
//# sourceMappingURL=registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/tools/registry.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AA2CrD,MAAM,UAAU,UAAU,CAAC,IAAY,EAAE,UAAoC;IAC3E,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACjC,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAC1C,OAAO,EAAE,IAAI;KACd,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAA6B;IAChE,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,CAA4B,CAAC;IAClG,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,+BAA+B,IAAI,CAAC,IAAI,sCAAsC;YAC5E,SAAS,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,oDAAoD,CAC5F,CAAC;IACJ,CAAC;IACD,OAAO,OAAyB,CAAC;AACnC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reindex.tool.d.ts","sourceRoot":"","sources":["../../src/tools/reindex.tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"reindex.tool.d.ts","sourceRoot":"","sources":["../../src/tools/reindex.tool.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AASxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAE7E,eAAO,MAAM,kBAAkB;;;;;;;;;EAM7B,CAAC;AAEH,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAE9D,eAAO,MAAM,WAAW,EAAE,cAAc,CAAC,YAAY,CAsDpD,CAAC"}
|