@qmediat.io/gemini-code-context-mcp 1.0.1 → 1.0.3
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 +49 -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/indexer/globs.d.ts +24 -1
- package/dist/indexer/globs.d.ts.map +1 -1
- package/dist/indexer/globs.js +52 -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 +173 -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 +9 -6
- package/dist/server.js.map +1 -1
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +123 -25
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +111 -28
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/registry.d.ts +39 -0
- package/dist/tools/registry.d.ts.map +1 -1
- package/dist/tools/registry.js +35 -0
- 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/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
package/dist/tools/ask.tool.js
CHANGED
|
@@ -8,14 +8,25 @@
|
|
|
8
8
|
import { createHash } from 'node:crypto';
|
|
9
9
|
import { resolve } from 'node:path';
|
|
10
10
|
import { z } from 'zod';
|
|
11
|
-
import {
|
|
11
|
+
import { isStaleCacheError, markCacheStale, prepareContext } from '../cache/cache-manager.js';
|
|
12
12
|
import { resolveModel } from '../gemini/models.js';
|
|
13
13
|
import { scanWorkspace } from '../indexer/workspace-scanner.js';
|
|
14
|
-
import {
|
|
14
|
+
import { WorkspaceValidationError, validateWorkspacePath, } from '../indexer/workspace-validation.js';
|
|
15
|
+
import { estimateCostUsd, estimatePreCallCostUsd, toMicrosUsd } from '../utils/cost-estimator.js';
|
|
15
16
|
import { logger } from '../utils/logger.js';
|
|
16
17
|
import { createProgressEmitter } from '../utils/progress.js';
|
|
17
18
|
import { errorResult, textResult } from './registry.js';
|
|
18
19
|
const SYSTEM_INSTRUCTION_Q_AND_A = 'You are a senior software engineer analysing a codebase. Be precise, reference specific file paths and line numbers, and cite evidence from the provided files rather than guessing. If the answer is not derivable from the context, say so.';
|
|
20
|
+
/**
|
|
21
|
+
* Hard cap on Gemini's response size for `ask`. Used both as the
|
|
22
|
+
* `maxOutputTokens` field on the generateContent config (so the model
|
|
23
|
+
* actually stops there) and as the `expectedOutputTokens` value passed to
|
|
24
|
+
* `estimatePreCallCostUsd` for the budget reservation. Coupling them is
|
|
25
|
+
* the point: the reservation becomes a true upper bound, not a guess that
|
|
26
|
+
* can be exceeded silently. Q&A answers rarely need more than ~8k tokens;
|
|
27
|
+
* if the resolved model advertises a smaller limit, we use that instead.
|
|
28
|
+
*/
|
|
29
|
+
const ASK_MAX_OUTPUT_TOKENS_DEFAULT = 8192;
|
|
19
30
|
export const askInputSchema = z.object({
|
|
20
31
|
prompt: z.string().min(1).describe('The question or analysis request.'),
|
|
21
32
|
workspace: z
|
|
@@ -45,15 +56,24 @@ export const askTool = {
|
|
|
45
56
|
const started = Date.now();
|
|
46
57
|
const workspaceRoot = resolve(input.workspace ?? process.cwd());
|
|
47
58
|
const model = input.model ?? ctx.config.defaultModel;
|
|
48
|
-
|
|
49
|
-
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
50
|
-
const spentToday = ctx.manifest.todaysCostMicros(Date.now()) / 1_000_000;
|
|
51
|
-
if (spentToday >= ctx.config.dailyBudgetUsd) {
|
|
52
|
-
return errorResult(`Daily budget cap reached ($${spentToday.toFixed(4)} ≥ $${ctx.config.dailyBudgetUsd.toFixed(2)}). Calls will resume after UTC midnight, or raise \`GEMINI_DAILY_BUDGET_USD\`.`);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
59
|
+
let reservationId = null;
|
|
55
60
|
const emitter = createProgressEmitter(ctx.server, ctx.progressToken);
|
|
56
61
|
try {
|
|
62
|
+
// Workspace path validation lives INSIDE the try so a
|
|
63
|
+
// `WorkspaceValidationError` is reported as a regular tool error
|
|
64
|
+
// (errorResult, "ask failed: …") rather than an unhandled tool
|
|
65
|
+
// exception logged by the server-level handler. Both arrive at the
|
|
66
|
+
// user as text, but only the inside-try path keeps logs tidy and the
|
|
67
|
+
// user-facing prefix consistent with other validation failures.
|
|
68
|
+
try {
|
|
69
|
+
validateWorkspacePath(workspaceRoot);
|
|
70
|
+
}
|
|
71
|
+
catch (err) {
|
|
72
|
+
if (err instanceof WorkspaceValidationError) {
|
|
73
|
+
return errorResult(`ask: ${err.message}`);
|
|
74
|
+
}
|
|
75
|
+
throw err;
|
|
76
|
+
}
|
|
57
77
|
emitter.emit(`resolving model '${model}'…`);
|
|
58
78
|
const resolved = await resolveModel(model, ctx.client);
|
|
59
79
|
emitter.emit(`scanning workspace ${workspaceRoot}…`);
|
|
@@ -63,6 +83,41 @@ export const askTool = {
|
|
|
63
83
|
maxFiles: ctx.config.maxFilesPerWorkspace,
|
|
64
84
|
maxFileSizeBytes: ctx.config.maxFileSizeBytes,
|
|
65
85
|
});
|
|
86
|
+
// Hard cap on output tokens: bound the reservation estimate and the
|
|
87
|
+
// actual generateContent request to the same value, so the budget
|
|
88
|
+
// reservation is a TRUE upper bound (Copilot review C6). If the
|
|
89
|
+
// resolved model's advertised limit is smaller than our default,
|
|
90
|
+
// honour that — Gemini would clamp it anyway.
|
|
91
|
+
const maxOutputTokens = typeof resolved.outputTokenLimit === 'number' && resolved.outputTokenLimit > 0
|
|
92
|
+
? Math.min(ASK_MAX_OUTPUT_TOKENS_DEFAULT, resolved.outputTokenLimit)
|
|
93
|
+
: ASK_MAX_OUTPUT_TOKENS_DEFAULT;
|
|
94
|
+
// Atomic budget reservation. Happens AFTER scan (so the estimate is
|
|
95
|
+
// accurate) but BEFORE any billable upload or generateContent call.
|
|
96
|
+
// Concurrent tool calls cannot all pass a pre-check and then
|
|
97
|
+
// collectively overshoot the cap: `reserveBudget` uses a
|
|
98
|
+
// `BEGIN IMMEDIATE` SQLite transaction that serialises check-and-insert.
|
|
99
|
+
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
100
|
+
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
101
|
+
const estimateUsd = estimatePreCallCostUsd({
|
|
102
|
+
model: resolved.resolved,
|
|
103
|
+
workspaceBytes,
|
|
104
|
+
promptChars: input.prompt.length,
|
|
105
|
+
expectedOutputTokens: maxOutputTokens,
|
|
106
|
+
});
|
|
107
|
+
const reserve = ctx.manifest.reserveBudget({
|
|
108
|
+
workspaceRoot,
|
|
109
|
+
toolName: 'ask',
|
|
110
|
+
model: resolved.resolved,
|
|
111
|
+
estimatedCostMicros: toMicrosUsd(estimateUsd),
|
|
112
|
+
dailyBudgetMicros: toMicrosUsd(ctx.config.dailyBudgetUsd),
|
|
113
|
+
nowMs: Date.now(),
|
|
114
|
+
});
|
|
115
|
+
if ('rejected' in reserve) {
|
|
116
|
+
const spentUsd = reserve.spentMicros / 1_000_000;
|
|
117
|
+
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\`.`);
|
|
118
|
+
}
|
|
119
|
+
reservationId = reserve.id;
|
|
120
|
+
}
|
|
66
121
|
const systemPromptHash = createHash('sha256')
|
|
67
122
|
.update(SYSTEM_INSTRUCTION_Q_AND_A)
|
|
68
123
|
.digest('hex')
|
|
@@ -86,7 +141,13 @@ export const askTool = {
|
|
|
86
141
|
// The system instruction was already baked into the cache at build time
|
|
87
142
|
// (see cache-manager.ts:322 `cacheConfig.systemInstruction`), so we must
|
|
88
143
|
// OMIT it on the generate call when a cached context is active.
|
|
89
|
-
|
|
144
|
+
// `maxOutputTokens` is set on every generateContent call so the budget
|
|
145
|
+
// reservation's `expectedOutputTokens` (derived from the same value) is
|
|
146
|
+
// a true upper bound — without this cap, a runaway response could
|
|
147
|
+
// exceed the reserved estimate and silently overshoot `dailyBudgetUsd`.
|
|
148
|
+
const buildConfig = (cacheId) => cacheId
|
|
149
|
+
? { cachedContent: cacheId, maxOutputTokens }
|
|
150
|
+
: { systemInstruction: SYSTEM_INSTRUCTION_Q_AND_A, maxOutputTokens };
|
|
90
151
|
const buildContents = (cacheId, inline) => cacheId ? input.prompt : [...inline, { role: 'user', parts: [{ text: input.prompt }] }];
|
|
91
152
|
// Track the prepared-context used for the FINAL successful call. Starts
|
|
92
153
|
// pointing at the initial ctxPrep; retry branch below reassigns to the
|
|
@@ -110,11 +171,11 @@ export const askTool = {
|
|
|
110
171
|
if (activePrep.cacheId && isStaleCacheError(err)) {
|
|
111
172
|
logger.warn(`Gemini rejected cached content ${activePrep.cacheId}; invalidating and retrying once.`);
|
|
112
173
|
try {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
});
|
|
174
|
+
// Reset the cache pointer only — keep `files` rows so the rebuild
|
|
175
|
+
// can reuse uploaded files via content-hash dedup instead of
|
|
176
|
+
// re-uploading. The Gemini-side cache is already dead (that's
|
|
177
|
+
// what triggered this branch), so no `caches.delete` needed.
|
|
178
|
+
markCacheStale({ manifest: ctx.manifest, workspaceRoot });
|
|
118
179
|
const rebuilt = await prepareContext({
|
|
119
180
|
client: ctx.client,
|
|
120
181
|
manifest: ctx.manifest,
|
|
@@ -165,16 +226,39 @@ export const askTool = {
|
|
|
165
226
|
});
|
|
166
227
|
const costMicros = toMicrosUsd(cost);
|
|
167
228
|
const durationMs = Date.now() - started;
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
229
|
+
if (reservationId !== null) {
|
|
230
|
+
// The finalize UPDATE on a row we just inserted should be infallible
|
|
231
|
+
// in practice, but a disk-full / lock-contention edge could throw.
|
|
232
|
+
// If it does, we'd rather keep the reservation row (estimate stays
|
|
233
|
+
// billed, slight overcharge) than let the outer catch CANCEL it
|
|
234
|
+
// — cancelling would erase any record of this billable, completed
|
|
235
|
+
// call. Either way, drop `reservationId` so the outer catch doesn't
|
|
236
|
+
// touch it.
|
|
237
|
+
try {
|
|
238
|
+
ctx.manifest.finalizeBudgetReservation(reservationId, {
|
|
239
|
+
cachedTokens: cached,
|
|
240
|
+
uncachedTokens: uncached,
|
|
241
|
+
costUsdMicro: costMicros,
|
|
242
|
+
durationMs,
|
|
243
|
+
});
|
|
244
|
+
}
|
|
245
|
+
catch (finalizeErr) {
|
|
246
|
+
logger.error(`ask: finalizeBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate (${costMicros} micros). Error: ${String(finalizeErr)}`);
|
|
247
|
+
}
|
|
248
|
+
reservationId = null;
|
|
249
|
+
}
|
|
250
|
+
else {
|
|
251
|
+
ctx.manifest.insertUsageMetric({
|
|
252
|
+
workspaceRoot,
|
|
253
|
+
toolName: 'ask',
|
|
254
|
+
model: resolved.resolved,
|
|
255
|
+
cachedTokens: cached,
|
|
256
|
+
uncachedTokens: uncached,
|
|
257
|
+
costUsdMicro: costMicros,
|
|
258
|
+
durationMs,
|
|
259
|
+
occurredAt: Date.now(),
|
|
260
|
+
});
|
|
261
|
+
}
|
|
178
262
|
if (scan.truncated) {
|
|
179
263
|
logger.warn(`workspace ${workspaceRoot} contains more files than GEMINI_CODE_CONTEXT_MAX_FILES (${ctx.config.maxFilesPerWorkspace}); the tail was dropped before indexing.`);
|
|
180
264
|
}
|
|
@@ -206,6 +290,20 @@ export const askTool = {
|
|
|
206
290
|
}
|
|
207
291
|
catch (err) {
|
|
208
292
|
logger.error(`ask failed: ${String(err)}`);
|
|
293
|
+
// Release any unconsumed budget reservation so the failed call's
|
|
294
|
+
// estimate doesn't eat into future headroom for today. Wrap in its
|
|
295
|
+
// own try/catch — better-sqlite3 can throw SQLITE_BUSY or I/O errors
|
|
296
|
+
// and we must not let a rollback-time DB failure replace the real
|
|
297
|
+
// tool error the user is waiting on.
|
|
298
|
+
if (reservationId !== null) {
|
|
299
|
+
try {
|
|
300
|
+
ctx.manifest.cancelBudgetReservation(reservationId);
|
|
301
|
+
}
|
|
302
|
+
catch (cancelErr) {
|
|
303
|
+
logger.error(`ask: cancelBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate. Error: ${String(cancelErr)}`);
|
|
304
|
+
}
|
|
305
|
+
reservationId = null;
|
|
306
|
+
}
|
|
209
307
|
return errorResult(`ask failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
210
308
|
}
|
|
211
309
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,GACf,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAuB,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE7E,MAAM,0BAA0B,GAC9B,+OAA+O,CAAC;AAElP,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IACvE,SAAS,EAAE,CAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,4EAA4E,CAAC;IACzF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,oHAAoH,CACrH;IACH,YAAY,EAAE,CAAC;SACZ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACjB,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;IAClE,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wCAAwC,CAAC;IAC/F,OAAO,EAAE,CAAC;SACP,OAAO,EAAE;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,yEAAyE,CAAC;CACvF,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,OAAO,GAA6B;IAC/C,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,YAAY;IACnB,WAAW,EACT,+KAA+K;IACjL,MAAM,EAAE,cAAc;IAEtB,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QAErD,oBAAoB;QACpB,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/C,MAAM,UAAU,GAAG,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,SAAS,CAAC;YACzE,IAAI,UAAU,IAAI,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;gBAC5C,OAAO,WAAW,CAChB,8BAA8B,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,gFAAgF,CAC/K,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAEvD,OAAO,CAAC,IAAI,CAAC,sBAAsB,aAAa,GAAG,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE;gBAC9C,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBACzC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;aAC9C,CAAC,CAAC;YAEH,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC1C,MAAM,CAAC,0BAA0B,CAAC;iBAClC,MAAM,CAAC,KAAK,CAAC;iBACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAEhB,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC;gBACnC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI;gBACJ,KAAK,EAAE,QAAQ;gBACf,gBAAgB;gBAChB,iBAAiB,EAAE,0BAA0B;gBAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe;gBACtC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc;gBACzC,OAAO;gBACP,YAAY,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;aACtD,CAAC,CAAC;YAEH,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrC,iFAAiF;YACjF,sEAAsE;YACtE,kFAAkF;YAClF,wEAAwE;YACxE,yEAAyE;YACzE,gEAAgE;YAChE,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAyB,EAAE,CACpE,OAAO,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,CAAC;YAC3F,MAAM,aAAa,GAAG,CACpB,OAAsB,EACtB,MAAqC,EACjB,EAAE,CACtB,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAE1F,wEAAwE;YACxE,uEAAuE;YACvE,2EAA2E;YAC3E,IAAI,UAAU,GAAG,OAAO,CAAC;YACzB,IAAI,mBAAmB,GAAG,KAAK,CAAC;YAChC,IAAI,QAAiC,CAAC;YACtC,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;oBACjD,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC;oBACtE,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;iBACxC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,sEAAsE;gBACtE,sEAAsE;gBACtE,wEAAwE;gBACxE,qEAAqE;gBACrE,6DAA6D;gBAC7D,IAAI,UAAU,CAAC,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,MAAM,CAAC,IAAI,CACT,kCAAkC,UAAU,CAAC,OAAO,mCAAmC,CACxF,CAAC;oBACF,IAAI,CAAC;wBACH,MAAM,wBAAwB,CAAC;4BAC7B,MAAM,EAAE,GAAG,CAAC,MAAM;4BAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;4BACtB,aAAa;yBACd,CAAC,CAAC;wBACH,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC;4BACnC,MAAM,EAAE,GAAG,CAAC,MAAM;4BAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;4BACtB,IAAI;4BACJ,KAAK,EAAE,QAAQ;4BACf,gBAAgB;4BAChB,iBAAiB,EAAE,0BAA0B;4BAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe;4BACtC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc;4BACzC,OAAO;4BACP,YAAY,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;yBACtD,CAAC,CAAC;wBACH,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;4BACjD,KAAK,EAAE,QAAQ,CAAC,QAAQ;4BACxB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC;4BAChE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;yBACrC,CAAC,CAAC;wBACH,UAAU,GAAG,OAAO,CAAC;wBACrB,mBAAmB,GAAG,IAAI,CAAC;oBAC7B,CAAC;oBAAC,OAAO,QAAQ,EAAE,CAAC;wBAClB,gEAAgE;wBAChE,2DAA2D;wBAC3D,wBAAwB;wBACxB,MAAM,IAAI,KAAK,CACb,uCACE,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAChE,EAAE,EACF,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACvB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACxF,CAAC;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC;YACrC,MAAM,MAAM,GACV,OAAO,KAAK,EAAE,uBAAuB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;YACzF,MAAM,UAAU,GAAG,OAAO,KAAK,EAAE,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;YAClD,MAAM,MAAM,GACV,OAAO,KAAK,EAAE,oBAAoB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,QAAQ,GAAG,OAAO,KAAK,EAAE,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG,eAAe,CAAC;gBAC3B,KAAK,EAAE,QAAQ,CAAC,QAAQ;gBACxB,mBAAmB,EAAE,QAAQ;gBAC7B,iBAAiB,EAAE,MAAM;gBACzB,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;aACzB,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YAErC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YACxC,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBAC7B,aAAa;gBACb,QAAQ,EAAE,KAAK;gBACf,KAAK,EAAE,QAAQ,CAAC,QAAQ;gBACxB,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;gBACxB,YAAY,EAAE,UAAU;gBACxB,UAAU;gBACV,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;aACvB,CAAC,CAAC;YAEH,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CACT,aAAa,aAAa,4DAA4D,GAAG,CAAC,MAAM,CAAC,oBAAoB,0CAA0C,CAChK,CAAC;YACJ,CAAC;YAED,MAAM,QAAQ,GAAG;gBACf,aAAa,EAAE,QAAQ,CAAC,QAAQ;gBAChC,cAAc,EAAE,QAAQ,CAAC,SAAS;gBAClC,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,aAAa,EAAE,QAAQ,CAAC,eAAe;gBACvC,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;gBACxB,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;gBACxB,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,KAAK;gBACjD,QAAQ,EAAE,UAAU,CAAC,MAAM;gBAC3B,YAAY,EAAE,UAAU,CAAC,OAAO,IAAI,mBAAmB;gBACvD,mBAAmB;gBACnB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBAC/B,oBAAoB,EAAE,IAAI,CAAC,eAAe;gBAC1C,iBAAiB,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW;gBAClD,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC;oBACrC,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;oBAC9D,CAAC,CAAC,EAAE,CAAC;gBACP,kBAAkB,EAAE,IAAI,CAAC,SAAS;gBAClC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBAC5C,UAAU;aACX,CAAC;YAEF,OAAO,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,eAAe,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3C,OAAO,WAAW,CAAC,eAAe,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
1
|
+
{"version":3,"file":"ask.tool.js","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC9F,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAClG,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAuB,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE7E,MAAM,0BAA0B,GAC9B,+OAA+O,CAAC;AAElP;;;;;;;;GAQG;AACH,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IACvE,SAAS,EAAE,CAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,4EAA4E,CAAC;IACzF,KAAK,EAAE,CAAC;SACL,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,oHAAoH,CACrH;IACH,YAAY,EAAE,CAAC;SACZ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;SACjB,QAAQ,EAAE;SACV,QAAQ,CAAC,qDAAqD,CAAC;IAClE,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,wCAAwC,CAAC;IAC/F,OAAO,EAAE,CAAC;SACP,OAAO,EAAE;SACT,QAAQ,EAAE;SACV,QAAQ,CAAC,yEAAyE,CAAC;CACvF,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,OAAO,GAA6B;IAC/C,IAAI,EAAE,KAAK;IACX,KAAK,EAAE,YAAY;IACnB,WAAW,EACT,+KAA+K;IACjL,MAAM,EAAE,cAAc;IAEtB,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAChE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;QAErD,IAAI,aAAa,GAAkB,IAAI,CAAC;QACxC,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QACrE,IAAI,CAAC;YACH,sDAAsD;YACtD,iEAAiE;YACjE,+DAA+D;YAC/D,mEAAmE;YACnE,qEAAqE;YACrE,gEAAgE;YAChE,IAAI,CAAC;gBACH,qBAAqB,CAAC,aAAa,CAAC,CAAC;YACvC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,GAAG,YAAY,wBAAwB,EAAE,CAAC;oBAC5C,OAAO,WAAW,CAAC,QAAQ,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5C,CAAC;gBACD,MAAM,GAAG,CAAC;YACZ,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,oBAAoB,KAAK,IAAI,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;YAEvD,OAAO,CAAC,IAAI,CAAC,sBAAsB,aAAa,GAAG,CAAC,CAAC;YACrD,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE;gBAC9C,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACjF,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBACzC,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,gBAAgB;aAC9C,CAAC,CAAC;YAEH,oEAAoE;YACpE,kEAAkE;YAClE,gEAAgE;YAChE,iEAAiE;YACjE,8CAA8C;YAC9C,MAAM,eAAe,GACnB,OAAO,QAAQ,CAAC,gBAAgB,KAAK,QAAQ,IAAI,QAAQ,CAAC,gBAAgB,GAAG,CAAC;gBAC5E,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,6BAA6B,EAAE,QAAQ,CAAC,gBAAgB,CAAC;gBACpE,CAAC,CAAC,6BAA6B,CAAC;YAEpC,oEAAoE;YACpE,oEAAoE;YACpE,6DAA6D;YAC7D,yDAAyD;YACzD,yEAAyE;YACzE,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC/C,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACtE,MAAM,WAAW,GAAG,sBAAsB,CAAC;oBACzC,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,cAAc;oBACd,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM;oBAChC,oBAAoB,EAAE,eAAe;iBACtC,CAAC,CAAC;gBACH,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,aAAa,CAAC;oBACzC,aAAa;oBACb,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,mBAAmB,EAAE,WAAW,CAAC,WAAW,CAAC;oBAC7C,iBAAiB,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC;oBACzD,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE;iBAClB,CAAC,CAAC;gBACH,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;oBAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC;oBACjD,OAAO,WAAW,CAChB,8CAA8C,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,gBAAgB,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,mEAAmE,CAC1N,CAAC;gBACJ,CAAC;gBACD,aAAa,GAAG,OAAO,CAAC,EAAE,CAAC;YAC7B,CAAC;YAED,MAAM,gBAAgB,GAAG,UAAU,CAAC,QAAQ,CAAC;iBAC1C,MAAM,CAAC,0BAA0B,CAAC;iBAClC,MAAM,CAAC,KAAK,CAAC;iBACb,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAEhB,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC;gBACnC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,IAAI;gBACJ,KAAK,EAAE,QAAQ;gBACf,gBAAgB;gBAChB,iBAAiB,EAAE,0BAA0B;gBAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe;gBACtC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc;gBACzC,OAAO;gBACP,YAAY,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;aACtD,CAAC,CAAC;YAEH,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrC,iFAAiF;YACjF,sEAAsE;YACtE,kFAAkF;YAClF,wEAAwE;YACxE,yEAAyE;YACzE,gEAAgE;YAChE,uEAAuE;YACvE,wEAAwE;YACxE,kEAAkE;YAClE,wEAAwE;YACxE,MAAM,WAAW,GAAG,CAAC,OAAsB,EAAyB,EAAE,CACpE,OAAO;gBACL,CAAC,CAAC,EAAE,aAAa,EAAE,OAAO,EAAE,eAAe,EAAE;gBAC7C,CAAC,CAAC,EAAE,iBAAiB,EAAE,0BAA0B,EAAE,eAAe,EAAE,CAAC;YACzE,MAAM,aAAa,GAAG,CACpB,OAAsB,EACtB,MAAqC,EACjB,EAAE,CACtB,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAE1F,wEAAwE;YACxE,uEAAuE;YACvE,2EAA2E;YAC3E,IAAI,UAAU,GAAG,OAAO,CAAC;YACzB,IAAI,mBAAmB,GAAG,KAAK,CAAC;YAChC,IAAI,QAAiC,CAAC;YACtC,IAAI,CAAC;gBACH,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;oBACjD,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,cAAc,CAAC;oBACtE,MAAM,EAAE,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC;iBACxC,CAAC,CAAC;YACL,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,sEAAsE;gBACtE,sEAAsE;gBACtE,wEAAwE;gBACxE,qEAAqE;gBACrE,6DAA6D;gBAC7D,IAAI,UAAU,CAAC,OAAO,IAAI,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;oBACjD,MAAM,CAAC,IAAI,CACT,kCAAkC,UAAU,CAAC,OAAO,mCAAmC,CACxF,CAAC;oBACF,IAAI,CAAC;wBACH,kEAAkE;wBAClE,6DAA6D;wBAC7D,8DAA8D;wBAC9D,6DAA6D;wBAC7D,cAAc,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;wBAC1D,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC;4BACnC,MAAM,EAAE,GAAG,CAAC,MAAM;4BAClB,QAAQ,EAAE,GAAG,CAAC,QAAQ;4BACtB,IAAI;4BACJ,KAAK,EAAE,QAAQ;4BACf,gBAAgB;4BAChB,iBAAiB,EAAE,0BAA0B;4BAC7C,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe;4BACtC,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,cAAc;4BACzC,OAAO;4BACP,YAAY,EAAE,CAAC,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;yBACtD,CAAC,CAAC;wBACH,QAAQ,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC;4BACjD,KAAK,EAAE,QAAQ,CAAC,QAAQ;4BACxB,QAAQ,EAAE,aAAa,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,CAAC;4BAChE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;yBACrC,CAAC,CAAC;wBACH,UAAU,GAAG,OAAO,CAAC;wBACrB,mBAAmB,GAAG,IAAI,CAAC;oBAC7B,CAAC;oBAAC,OAAO,QAAQ,EAAE,CAAC;wBAClB,gEAAgE;wBAChE,2DAA2D;wBAC3D,wBAAwB;wBACxB,MAAM,IAAI,KAAK,CACb,uCACE,QAAQ,YAAY,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAChE,EAAE,EACF,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC;YAED,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;gBACvB,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,CAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACxF,CAAC;YAED,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC;YACrC,MAAM,MAAM,GACV,OAAO,KAAK,EAAE,uBAAuB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC,CAAC;YACzF,MAAM,UAAU,GAAG,OAAO,KAAK,EAAE,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;YAC5F,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,GAAG,MAAM,CAAC,CAAC;YAClD,MAAM,MAAM,GACV,OAAO,KAAK,EAAE,oBAAoB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,QAAQ,GAAG,OAAO,KAAK,EAAE,kBAAkB,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9F,MAAM,IAAI,GAAG,eAAe,CAAC;gBAC3B,KAAK,EAAE,QAAQ,CAAC,QAAQ;gBACxB,mBAAmB,EAAE,QAAQ;gBAC7B,iBAAiB,EAAE,MAAM;gBACzB,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;aACzB,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YAErC,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YACxC,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,qEAAqE;gBACrE,mEAAmE;gBACnE,mEAAmE;gBACnE,gEAAgE;gBAChE,kEAAkE;gBAClE,oEAAoE;gBACpE,YAAY;gBACZ,IAAI,CAAC;oBACH,GAAG,CAAC,QAAQ,CAAC,yBAAyB,CAAC,aAAa,EAAE;wBACpD,YAAY,EAAE,MAAM;wBACpB,cAAc,EAAE,QAAQ;wBACxB,YAAY,EAAE,UAAU;wBACxB,UAAU;qBACX,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,WAAW,EAAE,CAAC;oBACrB,MAAM,CAAC,KAAK,CACV,gDAAgD,aAAa,yCAAyC,UAAU,oBAAoB,MAAM,CAAC,WAAW,CAAC,EAAE,CAC1J,CAAC;gBACJ,CAAC;gBACD,aAAa,GAAG,IAAI,CAAC;YACvB,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,QAAQ,CAAC,iBAAiB,CAAC;oBAC7B,aAAa;oBACb,QAAQ,EAAE,KAAK;oBACf,KAAK,EAAE,QAAQ,CAAC,QAAQ;oBACxB,YAAY,EAAE,MAAM;oBACpB,cAAc,EAAE,QAAQ;oBACxB,YAAY,EAAE,UAAU;oBACxB,UAAU;oBACV,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE;iBACvB,CAAC,CAAC;YACL,CAAC;YAED,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,MAAM,CAAC,IAAI,CACT,aAAa,aAAa,4DAA4D,GAAG,CAAC,MAAM,CAAC,oBAAoB,0CAA0C,CAChK,CAAC;YACJ,CAAC;YAED,MAAM,QAAQ,GAAG;gBACf,aAAa,EAAE,QAAQ,CAAC,QAAQ;gBAChC,cAAc,EAAE,QAAQ,CAAC,SAAS;gBAClC,eAAe,EAAE,QAAQ,CAAC,eAAe;gBACzC,aAAa,EAAE,QAAQ,CAAC,eAAe;gBACvC,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;gBACxB,YAAY,EAAE,MAAM;gBACpB,cAAc,EAAE,QAAQ;gBACxB,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,GAAG,KAAK;gBACjD,QAAQ,EAAE,UAAU,CAAC,MAAM;gBAC3B,YAAY,EAAE,UAAU,CAAC,OAAO,IAAI,mBAAmB;gBACvD,mBAAmB;gBACnB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM;gBAC/B,oBAAoB,EAAE,IAAI,CAAC,eAAe;gBAC1C,iBAAiB,EAAE,UAAU,CAAC,QAAQ,CAAC,WAAW;gBAClD,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,WAAW,GAAG,CAAC;oBACrC,CAAC,CAAC,EAAE,cAAc,EAAE,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;oBAC9D,CAAC,CAAC,EAAE,CAAC;gBACP,kBAAkB,EAAE,IAAI,CAAC,SAAS;gBAClC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,oBAAoB;gBAC5C,UAAU;aACX,CAAC;YAEF,OAAO,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,eAAe,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC3C,iEAAiE;YACjE,mEAAmE;YACnE,qEAAqE;YACrE,kEAAkE;YAClE,qCAAqC;YACrC,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;gBAC3B,IAAI,CAAC;oBACH,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,aAAa,CAAC,CAAC;gBACtD,CAAC;gBAAC,OAAO,SAAS,EAAE,CAAC;oBACnB,MAAM,CAAC,KAAK,CACV,8CAA8C,aAAa,gDAAgD,MAAM,CAAC,SAAS,CAAC,EAAE,CAC/H,CAAC;gBACJ,CAAC;gBACD,aAAa,GAAG,IAAI,CAAC;YACvB,CAAC;YACD,OAAO,WAAW,CAAC,eAAe,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACxF,CAAC;gBAAS,CAAC;YACT,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAyB7E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8B1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAyCxD,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"code.tool.d.ts","sourceRoot":"","sources":["../../src/tools/code.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,OAAO,EAAE,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AAyB7E,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;EA8B1B,CAAC;AAEH,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAyCxD,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,SAAS,CA8V9C,CAAC"}
|
package/dist/tools/code.tool.js
CHANGED
|
@@ -10,10 +10,11 @@
|
|
|
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';
|
|
@@ -108,14 +109,21 @@ export const codeTool = {
|
|
|
108
109
|
const thinkingBudget = input.thinkingBudget ?? 16_384;
|
|
109
110
|
const expectEdits = input.expectEdits ?? true;
|
|
110
111
|
const codeExecution = input.codeExecution ?? false;
|
|
111
|
-
|
|
112
|
-
const spentToday = ctx.manifest.todaysCostMicros(Date.now()) / 1_000_000;
|
|
113
|
-
if (spentToday >= ctx.config.dailyBudgetUsd) {
|
|
114
|
-
return errorResult(`Daily budget cap reached ($${spentToday.toFixed(4)} ≥ $${ctx.config.dailyBudgetUsd.toFixed(2)}).`);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
112
|
+
let reservationId = null;
|
|
117
113
|
const emitter = createProgressEmitter(ctx.server, ctx.progressToken);
|
|
118
114
|
try {
|
|
115
|
+
// Workspace validation inside try → reported as a regular tool error
|
|
116
|
+
// (errorResult, "code failed: …") rather than an unhandled exception
|
|
117
|
+
// surfaced by the server-level handler.
|
|
118
|
+
try {
|
|
119
|
+
validateWorkspacePath(workspaceRoot);
|
|
120
|
+
}
|
|
121
|
+
catch (err) {
|
|
122
|
+
if (err instanceof WorkspaceValidationError) {
|
|
123
|
+
return errorResult(`code: ${err.message}`);
|
|
124
|
+
}
|
|
125
|
+
throw err;
|
|
126
|
+
}
|
|
119
127
|
emitter.emit(`resolving model '${modelRequest}'…`);
|
|
120
128
|
const resolved = await resolveModel(modelRequest, ctx.client);
|
|
121
129
|
emitter.emit(`scanning workspace ${workspaceRoot}…`);
|
|
@@ -125,6 +133,49 @@ export const codeTool = {
|
|
|
125
133
|
maxFiles: ctx.config.maxFilesPerWorkspace,
|
|
126
134
|
maxFileSizeBytes: ctx.config.maxFileSizeBytes,
|
|
127
135
|
});
|
|
136
|
+
// Hard cap on candidate output tokens (separate from `thinkingBudget`).
|
|
137
|
+
// Used both as the generateContent `maxOutputTokens` field and as the
|
|
138
|
+
// budget-reservation estimate, so the reservation is a true upper bound
|
|
139
|
+
// (Copilot review C7). 32k is generous for most code-edit responses;
|
|
140
|
+
// we clamp to the model's advertised limit if smaller.
|
|
141
|
+
const CODE_MAX_OUTPUT_TOKENS_DEFAULT = 32_768;
|
|
142
|
+
const maxOutputTokens = typeof resolved.outputTokenLimit === 'number' && resolved.outputTokenLimit > 0
|
|
143
|
+
? Math.min(CODE_MAX_OUTPUT_TOKENS_DEFAULT, resolved.outputTokenLimit)
|
|
144
|
+
: CODE_MAX_OUTPUT_TOKENS_DEFAULT;
|
|
145
|
+
// Gemini requires `thinkingBudget < maxOutputTokens` (the thinking pool
|
|
146
|
+
// is carved out of the candidate-output allowance). The tool schema
|
|
147
|
+
// allows thinkingBudget up to 65_536 and defaults to 16_384, but the
|
|
148
|
+
// hard cap above may clamp maxOutputTokens as low as the model's
|
|
149
|
+
// `outputTokenLimit` (e.g. 8_192 on Flash-lite). Clamp the effective
|
|
150
|
+
// thinkingBudget so the generateContent call never 400s on this
|
|
151
|
+
// invariant; reserve at least 1_024 tokens for the actual completion.
|
|
152
|
+
const effectiveThinkingBudget = thinkingBudget > 0 ? Math.max(0, Math.min(thinkingBudget, maxOutputTokens - 1024)) : 0;
|
|
153
|
+
// Atomic budget reservation — see ask.tool.ts for the full rationale.
|
|
154
|
+
// Estimate includes the thinking budget (billed as output tokens on Pro)
|
|
155
|
+
// PLUS the candidate output cap.
|
|
156
|
+
if (Number.isFinite(ctx.config.dailyBudgetUsd)) {
|
|
157
|
+
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
158
|
+
const estimateUsd = estimatePreCallCostUsd({
|
|
159
|
+
model: resolved.resolved,
|
|
160
|
+
workspaceBytes,
|
|
161
|
+
promptChars: input.task.length,
|
|
162
|
+
expectedOutputTokens: maxOutputTokens,
|
|
163
|
+
thinkingTokens: effectiveThinkingBudget,
|
|
164
|
+
});
|
|
165
|
+
const reserve = ctx.manifest.reserveBudget({
|
|
166
|
+
workspaceRoot,
|
|
167
|
+
toolName: 'code',
|
|
168
|
+
model: resolved.resolved,
|
|
169
|
+
estimatedCostMicros: toMicrosUsd(estimateUsd),
|
|
170
|
+
dailyBudgetMicros: toMicrosUsd(ctx.config.dailyBudgetUsd),
|
|
171
|
+
nowMs: Date.now(),
|
|
172
|
+
});
|
|
173
|
+
if ('rejected' in reserve) {
|
|
174
|
+
const spentUsd = reserve.spentMicros / 1_000_000;
|
|
175
|
+
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\`.`);
|
|
176
|
+
}
|
|
177
|
+
reservationId = reserve.id;
|
|
178
|
+
}
|
|
128
179
|
const systemPromptHash = createHash('sha256')
|
|
129
180
|
.update(SYSTEM_INSTRUCTION_CODE)
|
|
130
181
|
.digest('hex')
|
|
@@ -149,8 +200,8 @@ export const codeTool = {
|
|
|
149
200
|
? `${input.task}\n\nRespond with your rationale and OLD/NEW diff blocks per the system instruction.`
|
|
150
201
|
: input.task;
|
|
151
202
|
emitter.emit(codeExecution
|
|
152
|
-
? `generating with thinking=${
|
|
153
|
-
: `generating with thinking=${
|
|
203
|
+
? `generating with thinking=${effectiveThinkingBudget} + codeExecution…`
|
|
204
|
+
: `generating with thinking=${effectiveThinkingBudget}…`);
|
|
154
205
|
// Gemini rejects generateContent({cachedContent, system_instruction|tools|tool_config})
|
|
155
206
|
// with 400. System instruction is baked into the cache at build time; tools
|
|
156
207
|
// (codeExecution) cannot be combined with a cache built without them. When
|
|
@@ -163,15 +214,19 @@ export const codeTool = {
|
|
|
163
214
|
const buildConfig = (cacheId) => {
|
|
164
215
|
if (canUseCache(cacheId) && cacheId) {
|
|
165
216
|
// With cache: system_instruction is baked in; thinkingConfig remains OK.
|
|
217
|
+
// `maxOutputTokens` couples with the budget reservation estimate
|
|
218
|
+
// so the reservation is a TRUE upper bound (Copilot review C7).
|
|
166
219
|
return {
|
|
167
220
|
cachedContent: cacheId,
|
|
168
|
-
thinkingConfig: { thinkingBudget, includeThoughts: true },
|
|
221
|
+
thinkingConfig: { thinkingBudget: effectiveThinkingBudget, includeThoughts: true },
|
|
222
|
+
maxOutputTokens,
|
|
169
223
|
};
|
|
170
224
|
}
|
|
171
225
|
// Without cache (or cache bypassed for codeExecution): pass full config.
|
|
172
226
|
return {
|
|
173
227
|
systemInstruction: SYSTEM_INSTRUCTION_CODE,
|
|
174
|
-
thinkingConfig: { thinkingBudget, includeThoughts: true },
|
|
228
|
+
thinkingConfig: { thinkingBudget: effectiveThinkingBudget, includeThoughts: true },
|
|
229
|
+
maxOutputTokens,
|
|
175
230
|
...(codeExecution ? { tools: [{ codeExecution: {} }] } : {}),
|
|
176
231
|
};
|
|
177
232
|
};
|
|
@@ -192,11 +247,10 @@ export const codeTool = {
|
|
|
192
247
|
if (activePrep.cacheId && isStaleCacheError(err)) {
|
|
193
248
|
logger.warn(`Gemini rejected cached content ${activePrep.cacheId}; invalidating and retrying once.`);
|
|
194
249
|
try {
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
});
|
|
250
|
+
// Reset cache pointer only — preserve `files` rows so the rebuild
|
|
251
|
+
// reuses uploaded files via content-hash dedup instead of double-
|
|
252
|
+
// uploading. The Gemini-side cache is already dead.
|
|
253
|
+
markCacheStale({ manifest: ctx.manifest, workspaceRoot });
|
|
200
254
|
const rebuilt = await prepareContext({
|
|
201
255
|
client: ctx.client,
|
|
202
256
|
manifest: ctx.manifest,
|
|
@@ -266,16 +320,36 @@ export const codeTool = {
|
|
|
266
320
|
});
|
|
267
321
|
const costMicros = toMicrosUsd(cost);
|
|
268
322
|
const durationMs = Date.now() - started;
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
323
|
+
if (reservationId !== null) {
|
|
324
|
+
// Defensive: if `finalize` throws (disk full / lock contention), keep
|
|
325
|
+
// the reservation row so we don't lose all record of this billable
|
|
326
|
+
// call. Drop `reservationId` either way so the outer catch doesn't
|
|
327
|
+
// touch it.
|
|
328
|
+
try {
|
|
329
|
+
ctx.manifest.finalizeBudgetReservation(reservationId, {
|
|
330
|
+
cachedTokens: cached,
|
|
331
|
+
uncachedTokens: uncached,
|
|
332
|
+
costUsdMicro: costMicros,
|
|
333
|
+
durationMs,
|
|
334
|
+
});
|
|
335
|
+
}
|
|
336
|
+
catch (finalizeErr) {
|
|
337
|
+
logger.error(`code: finalizeBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate (${costMicros} micros). Error: ${String(finalizeErr)}`);
|
|
338
|
+
}
|
|
339
|
+
reservationId = null;
|
|
340
|
+
}
|
|
341
|
+
else {
|
|
342
|
+
ctx.manifest.insertUsageMetric({
|
|
343
|
+
workspaceRoot,
|
|
344
|
+
toolName: 'code',
|
|
345
|
+
model: resolved.resolved,
|
|
346
|
+
cachedTokens: cached,
|
|
347
|
+
uncachedTokens: uncached,
|
|
348
|
+
costUsdMicro: costMicros,
|
|
349
|
+
durationMs,
|
|
350
|
+
occurredAt: Date.now(),
|
|
351
|
+
});
|
|
352
|
+
}
|
|
279
353
|
if (scan.truncated) {
|
|
280
354
|
logger.warn(`workspace ${workspaceRoot} contains more files than GEMINI_CODE_CONTEXT_MAX_FILES (${ctx.config.maxFilesPerWorkspace}); the tail was dropped before indexing.`);
|
|
281
355
|
}
|
|
@@ -283,7 +357,7 @@ export const codeTool = {
|
|
|
283
357
|
resolvedModel: resolved.resolved,
|
|
284
358
|
requestedModel: resolved.requested,
|
|
285
359
|
contextWindow: resolved.inputTokenLimit,
|
|
286
|
-
thinkingBudget,
|
|
360
|
+
thinkingBudget: effectiveThinkingBudget,
|
|
287
361
|
codeExecutionUsed: codeExecution,
|
|
288
362
|
cacheHit: activePrep.reused,
|
|
289
363
|
cacheRebuilt: activePrep.rebuilt || retriedOnStaleCache,
|
|
@@ -317,6 +391,15 @@ export const codeTool = {
|
|
|
317
391
|
}
|
|
318
392
|
catch (err) {
|
|
319
393
|
logger.error(`code failed: ${String(err)}`);
|
|
394
|
+
if (reservationId !== null) {
|
|
395
|
+
try {
|
|
396
|
+
ctx.manifest.cancelBudgetReservation(reservationId);
|
|
397
|
+
}
|
|
398
|
+
catch (cancelErr) {
|
|
399
|
+
logger.error(`code: cancelBudgetReservation failed for id=${reservationId}; reservation row keeps the estimate. Error: ${String(cancelErr)}`);
|
|
400
|
+
}
|
|
401
|
+
reservationId = null;
|
|
402
|
+
}
|
|
320
403
|
return errorResult(`code failed: ${err instanceof Error ? err.message : String(err)}`);
|
|
321
404
|
}
|
|
322
405
|
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;
|
|
@@ -34,4 +46,31 @@ export interface ToolResult {
|
|
|
34
46
|
}
|
|
35
47
|
export declare function textResult(text: string, structured?: Record<string, unknown>): ToolResult;
|
|
36
48
|
export declare function errorResult(message: string): ToolResult;
|
|
49
|
+
/**
|
|
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`.
|
|
74
|
+
*/
|
|
75
|
+
export declare function buildToolInputSchema(tool: ToolDefinition<unknown>): McpInputSchema;
|
|
37
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;
|
|
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
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Tool registry — each MCP tool implements this common contract.
|
|
3
3
|
*/
|
|
4
|
+
import { zodToJsonSchema } from 'zod-to-json-schema';
|
|
4
5
|
export function textResult(text, structured) {
|
|
5
6
|
return {
|
|
6
7
|
content: [{ type: 'text', text }],
|
|
@@ -13,4 +14,38 @@ export function errorResult(message) {
|
|
|
13
14
|
isError: true,
|
|
14
15
|
};
|
|
15
16
|
}
|
|
17
|
+
/**
|
|
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`.
|
|
42
|
+
*/
|
|
43
|
+
export function buildToolInputSchema(tool) {
|
|
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;
|
|
50
|
+
}
|
|
16
51
|
//# sourceMappingURL=registry.js.map
|