@qmediat.io/gemini-code-context-mcp 1.8.0 → 1.10.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 +69 -0
- package/dist/cache/cache-manager.d.ts.map +1 -1
- package/dist/cache/cache-manager.js +8 -8
- package/dist/cache/cache-manager.js.map +1 -1
- package/dist/cache/files-uploader.js +2 -2
- package/dist/cache/files-uploader.js.map +1 -1
- package/dist/cache/ttl-watcher.js +3 -3
- package/dist/cache/ttl-watcher.js.map +1 -1
- package/dist/gemini/token-counter.d.ts +129 -0
- package/dist/gemini/token-counter.d.ts.map +1 -0
- package/dist/gemini/token-counter.js +317 -0
- package/dist/gemini/token-counter.js.map +1 -0
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/indexer/globs.d.ts +14 -0
- package/dist/indexer/globs.d.ts.map +1 -1
- package/dist/indexer/globs.js +17 -0
- package/dist/indexer/globs.js.map +1 -1
- package/dist/server.js +2 -2
- package/dist/server.js.map +1 -1
- package/dist/tools/agentic/sandbox.d.ts +26 -1
- package/dist/tools/agentic/sandbox.d.ts.map +1 -1
- package/dist/tools/agentic/sandbox.js.map +1 -1
- package/dist/tools/agentic/workspace-tools.d.ts +5 -4
- package/dist/tools/agentic/workspace-tools.d.ts.map +1 -1
- package/dist/tools/agentic/workspace-tools.js +148 -56
- package/dist/tools/agentic/workspace-tools.js.map +1 -1
- package/dist/tools/ask-agentic.tool.d.ts +10 -0
- package/dist/tools/ask-agentic.tool.d.ts.map +1 -1
- package/dist/tools/ask-agentic.tool.js +55 -12
- package/dist/tools/ask-agentic.tool.js.map +1 -1
- package/dist/tools/ask.tool.d.ts +13 -8
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +62 -13
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts +13 -8
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +43 -8
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/utils/logger.d.ts +37 -0
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +0 -0
- package/dist/utils/logger.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,317 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Two-tier token counter for the `ask` / `code` workspace-size preflight
|
|
3
|
+
* (v1.10.0+, T17 closure).
|
|
4
|
+
*
|
|
5
|
+
* The original v1.5.0 preflight used `Math.ceil(bytes/4)` as a heuristic for
|
|
6
|
+
* input-token count. That heuristic undercounts dense Unicode (CJK, emoji,
|
|
7
|
+
* minified JS) by 30-50 % — a workspace estimated as "fits" can in fact
|
|
8
|
+
* exceed `inputTokenLimit`, the request fires, Gemini returns
|
|
9
|
+
* `400 INVALID_ARGUMENT`, and the user has paid for the round-trip plus the
|
|
10
|
+
* eager Files API upload that preceded it. Real money on a guaranteed-to-
|
|
11
|
+
* fail call. Tracked as T17 in `docs/FOLLOW-UP-PRS.md`.
|
|
12
|
+
*
|
|
13
|
+
* This module replaces the heuristic with a two-tier strategy:
|
|
14
|
+
*
|
|
15
|
+
* Tier 1 — heuristic gate (fast path).
|
|
16
|
+
* Compute `bytes/4 + prompt/4` as before. If the estimate is well under
|
|
17
|
+
* the cliff (50 % of the model's input limit), skip the API call and
|
|
18
|
+
* proceed. Saves a round-trip on small repos that obviously fit.
|
|
19
|
+
*
|
|
20
|
+
* Tier 2 — exact count.
|
|
21
|
+
* Otherwise call `client.models.countTokens({ model, contents })` with
|
|
22
|
+
* the same payload shape we'll send to `generateContent`. Use the
|
|
23
|
+
* returned `totalTokens` for the threshold check. countTokens is
|
|
24
|
+
* billed at zero (per Google docs and the v1.9.0 probe — see
|
|
25
|
+
* `.claude/local-PLAN-v1.10.0.md`) and shares NO RPM quota with
|
|
26
|
+
* `generateContent` (probe Q1 — 30 calls in 2.9 s, zero 429s).
|
|
27
|
+
*
|
|
28
|
+
* Cache.
|
|
29
|
+
* `LRUCache<string, number>` (in-process, simple). Key:
|
|
30
|
+
* `SHA256(filesHash + promptHash + model)`. `filesHash` is computed
|
|
31
|
+
* post-glob-filter by `scanWorkspace`, so it already encodes the
|
|
32
|
+
* filtered file set — including a separate `globsHash` axis would be
|
|
33
|
+
* redundant (and risk join-collision via different glob arrays
|
|
34
|
+
* serializing to the same string). TTL = process lifetime; no manifest
|
|
35
|
+
* persistence.
|
|
36
|
+
*
|
|
37
|
+
* Graceful degradation.
|
|
38
|
+
* On `countTokens` failure (HTTP error, network, SDK shape mismatch),
|
|
39
|
+
* log warn and fall back to `Math.ceil(bytes / 3)` (1.33× safety
|
|
40
|
+
* multiplier — covers the empirical 30-50 % CJK undercount). Never
|
|
41
|
+
* hard-fail on count failure; never make the user re-run.
|
|
42
|
+
*
|
|
43
|
+
* **Q3 mitigation (probe finding):** `countTokens` does NOT count
|
|
44
|
+
* `systemInstruction` on the Gemini Developer API path (SDK exposes the
|
|
45
|
+
* field, API rejects it). The exact count returned therefore underestimates
|
|
46
|
+
* the actual `generateContent` input by the size of `systemInstruction` +
|
|
47
|
+
* tool declarations. We add `SYSTEM_INSTRUCTION_RESERVE` (1 000 tokens)
|
|
48
|
+
* to the count before comparing against the threshold — losing 1 000
|
|
49
|
+
* tokens of headroom on a 1 M-token model is < 1 % impact.
|
|
50
|
+
*/
|
|
51
|
+
import { createHash } from 'node:crypto';
|
|
52
|
+
import { readFile } from 'node:fs/promises';
|
|
53
|
+
import { logger, safeForLog } from '../utils/logger.js';
|
|
54
|
+
/** Token reserve added to the count before the threshold comparison
|
|
55
|
+
* (`effectiveTokens = rawTokens + SYSTEM_INSTRUCTION_RESERVE`). Accounts for
|
|
56
|
+
* `systemInstruction` + tool declarations that `countTokens` doesn't count
|
|
57
|
+
* on the Gemini Developer API path. The 1 000-token reserve is generous —
|
|
58
|
+
* empirical agentic `systemInstruction` is ~600 tokens; tool declarations
|
|
59
|
+
* for the four `ask_agentic` functions are ~200-400 tokens. `ask` and
|
|
60
|
+
* `code` typically pass no system instruction so the reserve is pure
|
|
61
|
+
* safety margin there.
|
|
62
|
+
*
|
|
63
|
+
* Applied ONLY on the `'exact'` path (fresh-API and cache-hit). Skipped on
|
|
64
|
+
* `'heuristic'` (already coarse — adding the reserve to a coarse number
|
|
65
|
+
* pretends we know more than we do) and on `'fallback'` (`bytes/3` already
|
|
66
|
+
* carries 33 % over-pad which absorbs the reserve and then some). */
|
|
67
|
+
export const SYSTEM_INSTRUCTION_RESERVE = 1_000;
|
|
68
|
+
/** Heuristic-vs-exact tier boundary. Below this fraction of the model's
|
|
69
|
+
* input-token limit, we skip the countTokens API call and accept the
|
|
70
|
+
* heuristic's coarse estimate. The 50 % cutoff ensures we never depend on
|
|
71
|
+
* heuristic accuracy near the cliff (where `bytes/4` undercount could push
|
|
72
|
+
* a "fits" past `inputTokenLimit`). Above 50 %, the marginal cost of one
|
|
73
|
+
* countTokens API call (~hundreds of ms) is worth paying for accuracy. */
|
|
74
|
+
const HEURISTIC_CUTOFF_FRACTION = 0.5;
|
|
75
|
+
/** LRU cache size. Each entry is `<sha-hex-key, number>` ≈ 80 bytes; 256
|
|
76
|
+
* entries is ~20 KB resident. Plenty for typical workflow patterns
|
|
77
|
+
* (handful of workspaces × handful of distinct prompts). */
|
|
78
|
+
const LRU_MAX_ENTRIES = 256;
|
|
79
|
+
/** Defensive cap on the assembled tier-2 `contents` payload (file content
|
|
80
|
+
* concatenation). The v1.9.0 probe Q2 confirmed countTokens accepts at
|
|
81
|
+
* least 7 MB; we set the bound conservatively above that with headroom for
|
|
82
|
+
* future SDK / API changes. When the assembled payload would exceed this
|
|
83
|
+
* cap, we skip the API call and fall through to the `bytes/3` fallback —
|
|
84
|
+
* counter intuitively, a heuristic is more reliable than a request that's
|
|
85
|
+
* about to 413. Today's defaults (`maxFilesPerWorkspace: 2_000`,
|
|
86
|
+
* `maxFileSizeBytes: 1_000_000`) cap worst-case workspace at ~2 GB, but
|
|
87
|
+
* the heuristic-tier gate (50 % of `inputTokenLimit`) means tier-2 only
|
|
88
|
+
* sees workspaces approaching `inputTokenLimit × 4` raw bytes (~4 MB on a
|
|
89
|
+
* 1 M-token model). The cap is a future-proof defensive measure, not a
|
|
90
|
+
* limit you're expected to hit. */
|
|
91
|
+
const MAX_TIER_2_PAYLOAD_BYTES = 32 * 1024 * 1024; // 32 MB
|
|
92
|
+
/** Simple LRU implemented atop `Map`'s insertion-order semantics. Two
|
|
93
|
+
* primitive ops: `get` (touch on hit), `set` (evict oldest if over cap).
|
|
94
|
+
* Avoids pulling in `lru-cache` for ~30 LOC of need. */
|
|
95
|
+
class SimpleLRU {
|
|
96
|
+
capacity;
|
|
97
|
+
map;
|
|
98
|
+
constructor(capacity) {
|
|
99
|
+
this.capacity = capacity;
|
|
100
|
+
this.map = new Map();
|
|
101
|
+
}
|
|
102
|
+
get(key) {
|
|
103
|
+
const v = this.map.get(key);
|
|
104
|
+
if (v === undefined)
|
|
105
|
+
return undefined;
|
|
106
|
+
// Touch — move to most-recent end of insertion order.
|
|
107
|
+
this.map.delete(key);
|
|
108
|
+
this.map.set(key, v);
|
|
109
|
+
return v;
|
|
110
|
+
}
|
|
111
|
+
set(key, value) {
|
|
112
|
+
if (this.map.has(key))
|
|
113
|
+
this.map.delete(key);
|
|
114
|
+
this.map.set(key, value);
|
|
115
|
+
// Evict oldest if over capacity.
|
|
116
|
+
while (this.map.size > this.capacity) {
|
|
117
|
+
const oldest = this.map.keys().next().value;
|
|
118
|
+
if (oldest === undefined)
|
|
119
|
+
break;
|
|
120
|
+
this.map.delete(oldest);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/** Test-only — exposed so unit tests can verify cache hit/miss. */
|
|
124
|
+
size() {
|
|
125
|
+
return this.map.size;
|
|
126
|
+
}
|
|
127
|
+
/** Test-only — clear all entries. */
|
|
128
|
+
clear() {
|
|
129
|
+
this.map.clear();
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
const cache = new SimpleLRU(LRU_MAX_ENTRIES);
|
|
133
|
+
/** Public for tests. Reset state between cases. */
|
|
134
|
+
export function clearTokenCounterCache() {
|
|
135
|
+
cache.clear();
|
|
136
|
+
}
|
|
137
|
+
function buildCacheKey(input) {
|
|
138
|
+
const promptHash = createHash('sha256').update(input.prompt).digest('hex');
|
|
139
|
+
return createHash('sha256')
|
|
140
|
+
.update(`${input.filesHash}|${promptHash}|${input.model}`)
|
|
141
|
+
.digest('hex');
|
|
142
|
+
}
|
|
143
|
+
function computeHeuristic(files, prompt) {
|
|
144
|
+
const workspaceBytes = files.reduce((sum, f) => sum + f.size, 0);
|
|
145
|
+
return Math.ceil(workspaceBytes / 4) + Math.ceil(prompt.length / 4);
|
|
146
|
+
}
|
|
147
|
+
function computeFallback(files, prompt) {
|
|
148
|
+
// 1.33× safety multiplier vs heuristic — covers empirical 30-50 % CJK
|
|
149
|
+
// undercount when the API call fails and we have no exact count.
|
|
150
|
+
const workspaceBytes = files.reduce((sum, f) => sum + f.size, 0);
|
|
151
|
+
return Math.ceil(workspaceBytes / 3) + Math.ceil(prompt.length / 3);
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Two-tier preflight token count for `ask` / `code`.
|
|
155
|
+
*
|
|
156
|
+
* Decision:
|
|
157
|
+
* - `preflightMode: 'heuristic'` → always use `bytes/4` (fast, coarse)
|
|
158
|
+
* - `preflightMode: 'exact'` → always call countTokens, fall back to
|
|
159
|
+
* `bytes/3` on API failure
|
|
160
|
+
* - `preflightMode: 'auto'` → heuristic if `<50 %` of limit, else exact
|
|
161
|
+
* - omitted → same as `'auto'`
|
|
162
|
+
*
|
|
163
|
+
* Returns `{effectiveTokens, method, rawTokens}` — `effectiveTokens` is what
|
|
164
|
+
* the caller compares against `inputTokenLimit × guardRatio`. `method`
|
|
165
|
+
* surfaces in structured-content metadata so the orchestrator and the user
|
|
166
|
+
* can see which path produced the count.
|
|
167
|
+
*/
|
|
168
|
+
export async function countForPreflight(client, input) {
|
|
169
|
+
const heuristicCount = computeHeuristic(input.files, input.prompt);
|
|
170
|
+
const mode = input.preflightMode ?? 'auto';
|
|
171
|
+
// Pure-heuristic mode bypasses the API entirely. No reserve added —
|
|
172
|
+
// the heuristic is already a coarse estimate; users opting into this
|
|
173
|
+
// mode prioritize predictability over accuracy.
|
|
174
|
+
if (mode === 'heuristic') {
|
|
175
|
+
return {
|
|
176
|
+
effectiveTokens: heuristicCount,
|
|
177
|
+
method: 'heuristic',
|
|
178
|
+
rawTokens: heuristicCount,
|
|
179
|
+
cacheHit: false,
|
|
180
|
+
};
|
|
181
|
+
}
|
|
182
|
+
// Auto-tier decision: if the heuristic count is well under the cliff,
|
|
183
|
+
// skip the API call. The cutoff fraction (0.5) ensures we never trust
|
|
184
|
+
// the heuristic near the threshold.
|
|
185
|
+
if (mode === 'auto' && heuristicCount < input.inputTokenLimit * HEURISTIC_CUTOFF_FRACTION) {
|
|
186
|
+
return {
|
|
187
|
+
effectiveTokens: heuristicCount,
|
|
188
|
+
method: 'heuristic',
|
|
189
|
+
rawTokens: heuristicCount,
|
|
190
|
+
cacheHit: false,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
// Exact mode (or auto + near-cliff). Try the cache first.
|
|
194
|
+
const cacheKey = buildCacheKey(input);
|
|
195
|
+
const cached = cache.get(cacheKey);
|
|
196
|
+
if (cached !== undefined) {
|
|
197
|
+
return {
|
|
198
|
+
effectiveTokens: cached + SYSTEM_INSTRUCTION_RESERVE,
|
|
199
|
+
method: 'exact',
|
|
200
|
+
rawTokens: cached,
|
|
201
|
+
cacheHit: true,
|
|
202
|
+
};
|
|
203
|
+
}
|
|
204
|
+
const fileParts = [];
|
|
205
|
+
const FILE_MARKER_OVERHEAD = '\n\n--- FILE: ---\n\n'.length; // 18 bytes (ASCII) — the bytes added by the marker template, excluding `relpath` and `text` themselves.
|
|
206
|
+
let assembledBytes = 0;
|
|
207
|
+
for (const file of input.files) {
|
|
208
|
+
// Pre-check the cap against projected bytes BEFORE doing the I/O or
|
|
209
|
+
// allocating the placeholder. Defends against a single huge file
|
|
210
|
+
// (e.g. operator bumps `maxFileSizeBytes` past 32 MB) — would have
|
|
211
|
+
// allocated a `file.size`-long placeholder string before the
|
|
212
|
+
// post-allocation cap check fired on the next iteration.
|
|
213
|
+
const projectedBytes = assembledBytes + file.size + Buffer.byteLength(file.relpath, 'utf8') + FILE_MARKER_OVERHEAD;
|
|
214
|
+
if (projectedBytes > MAX_TIER_2_PAYLOAD_BYTES) {
|
|
215
|
+
logger.warn(`countTokens preflight payload would exceed ${MAX_TIER_2_PAYLOAD_BYTES} bytes; falling back to heuristic × 1.33 (projected ${projectedBytes} bytes after ${fileParts.length} of ${input.files.length} files)`);
|
|
216
|
+
const fallback = computeFallback(input.files, input.prompt);
|
|
217
|
+
return {
|
|
218
|
+
effectiveTokens: fallback,
|
|
219
|
+
method: 'fallback',
|
|
220
|
+
rawTokens: fallback,
|
|
221
|
+
cacheHit: false,
|
|
222
|
+
};
|
|
223
|
+
}
|
|
224
|
+
let text;
|
|
225
|
+
try {
|
|
226
|
+
text = await readFile(file.absolutePath, 'utf8');
|
|
227
|
+
}
|
|
228
|
+
catch {
|
|
229
|
+
// File missing / unreadable / non-utf8 binary: substitute a
|
|
230
|
+
// placeholder of equivalent byte length. Gemini tokenizer
|
|
231
|
+
// undercounts vs real source, but the heuristic-vs-exact tier
|
|
232
|
+
// gate already avoided sending workspaces with much headroom
|
|
233
|
+
// through this path.
|
|
234
|
+
text = 'a'.repeat(file.size);
|
|
235
|
+
}
|
|
236
|
+
fileParts.push({ text: `\n\n--- FILE: ${file.relpath} ---\n${text}\n` });
|
|
237
|
+
assembledBytes +=
|
|
238
|
+
Buffer.byteLength(text, 'utf8') +
|
|
239
|
+
Buffer.byteLength(file.relpath, 'utf8') +
|
|
240
|
+
FILE_MARKER_OVERHEAD;
|
|
241
|
+
}
|
|
242
|
+
// Include the prompt in the cap accounting — a giant prompt could push
|
|
243
|
+
// the assembled payload past the cap even when file content stays under it.
|
|
244
|
+
const promptBytes = Buffer.byteLength(input.prompt, 'utf8');
|
|
245
|
+
if (assembledBytes + promptBytes > MAX_TIER_2_PAYLOAD_BYTES) {
|
|
246
|
+
logger.warn(`countTokens preflight payload exceeded ${MAX_TIER_2_PAYLOAD_BYTES} bytes after adding prompt; falling back to heuristic × 1.33 (assembled ${assembledBytes} files + ${promptBytes} prompt = ${assembledBytes + promptBytes} bytes)`);
|
|
247
|
+
const fallback = computeFallback(input.files, input.prompt);
|
|
248
|
+
return {
|
|
249
|
+
effectiveTokens: fallback,
|
|
250
|
+
method: 'fallback',
|
|
251
|
+
rawTokens: fallback,
|
|
252
|
+
cacheHit: false,
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
const contents = [
|
|
256
|
+
{ role: 'user', parts: [...fileParts, { text: input.prompt }] },
|
|
257
|
+
];
|
|
258
|
+
// NOTE: we deliberately don't pass `config.systemInstruction` even when
|
|
259
|
+
// it's available. The Gemini Developer API rejects it on countTokens
|
|
260
|
+
// (probe Q3); the Vertex API accepts it. Rather than branching on auth
|
|
261
|
+
// tier, we accept the undercount and add `SYSTEM_INSTRUCTION_RESERVE`
|
|
262
|
+
// to the count — uniform behaviour across both tiers.
|
|
263
|
+
//
|
|
264
|
+
// The `signal` (when provided by the caller's `timeoutMs`) flows in via
|
|
265
|
+
// `config.abortSignal` per the SDK's `CountTokensConfig`. Cancellation
|
|
266
|
+
// RE-THROWS the `AbortError` so the caller's outer `try/catch` (which
|
|
267
|
+
// maps it to `errorCode: 'TIMEOUT'`) sees it; non-abort errors (429,
|
|
268
|
+
// network, malformed response) still fall through to the `bytes/3`
|
|
269
|
+
// graceful-degradation path.
|
|
270
|
+
try {
|
|
271
|
+
const response = await client.models.countTokens({
|
|
272
|
+
model: input.model,
|
|
273
|
+
contents,
|
|
274
|
+
...(input.signal !== undefined ? { config: { abortSignal: input.signal } } : {}),
|
|
275
|
+
});
|
|
276
|
+
const totalTokens = response.totalTokens;
|
|
277
|
+
if (typeof totalTokens !== 'number' || !Number.isFinite(totalTokens) || totalTokens < 0) {
|
|
278
|
+
// Defensive: countTokens response shape is documented but we've
|
|
279
|
+
// observed SDK quirks. If the field is missing or malformed, fall
|
|
280
|
+
// back rather than throwing — the user's `ask` shouldn't fail
|
|
281
|
+
// because of a probe-time API hiccup.
|
|
282
|
+
logger.warn(`countTokens returned unexpected totalTokens=${safeForLog(totalTokens)} for model=${safeForLog(input.model)}; falling back to heuristic`);
|
|
283
|
+
const fallback = computeFallback(input.files, input.prompt);
|
|
284
|
+
return {
|
|
285
|
+
effectiveTokens: fallback,
|
|
286
|
+
method: 'fallback',
|
|
287
|
+
rawTokens: fallback,
|
|
288
|
+
cacheHit: false,
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
cache.set(cacheKey, totalTokens);
|
|
292
|
+
return {
|
|
293
|
+
effectiveTokens: totalTokens + SYSTEM_INSTRUCTION_RESERVE,
|
|
294
|
+
method: 'exact',
|
|
295
|
+
rawTokens: totalTokens,
|
|
296
|
+
cacheHit: false,
|
|
297
|
+
};
|
|
298
|
+
}
|
|
299
|
+
catch (err) {
|
|
300
|
+
// If the user-supplied signal fired, propagate the abort instead of
|
|
301
|
+
// swallowing it as a fallback. Otherwise the caller's `timeoutMs`
|
|
302
|
+
// budget is silently extended — `ask` would proceed to eager Files
|
|
303
|
+
// API upload before the abort eventually lands on `generateContent`,
|
|
304
|
+
// wasting bandwidth/compute the user explicitly asked us to abort.
|
|
305
|
+
if (input.signal?.aborted)
|
|
306
|
+
throw err;
|
|
307
|
+
logger.warn(`countTokens preflight failed for model=${safeForLog(input.model)}: ${safeForLog(err)} — falling back to heuristic × 1.33 (safety multiplier for the empirical 30-50% CJK undercount)`);
|
|
308
|
+
const fallback = computeFallback(input.files, input.prompt);
|
|
309
|
+
return {
|
|
310
|
+
effectiveTokens: fallback,
|
|
311
|
+
method: 'fallback',
|
|
312
|
+
rawTokens: fallback,
|
|
313
|
+
cacheHit: false,
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
//# sourceMappingURL=token-counter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-counter.js","sourceRoot":"","sources":["../../src/gemini/token-counter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;;;;;;;;;;qEAYqE;AACrE,MAAM,CAAC,MAAM,0BAA0B,GAAG,KAAK,CAAC;AAEhD;;;;;0EAK0E;AAC1E,MAAM,yBAAyB,GAAG,GAAG,CAAC;AAEtC;;4DAE4D;AAC5D,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B;;;;;;;;;;;mCAWmC;AACnC,MAAM,wBAAwB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ;AAiD3D;;wDAEwD;AACxD,MAAM,SAAS;IACI,QAAQ,CAAS;IACjB,GAAG,CAAY;IAChC,YAAY,QAAgB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAE,CAAC;IACvB,CAAC;IACD,GAAG,CAAC,GAAM;QACR,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,CAAC,KAAK,SAAS;YAAE,OAAO,SAAS,CAAC;QACtC,sDAAsD;QACtD,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,CAAC,CAAC;IACX,CAAC;IACD,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,iCAAiC;QACjC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;YAC5C,IAAI,MAAM,KAAK,SAAS;gBAAE,MAAM;YAChC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IACD,mEAAmE;IACnE,IAAI;QACF,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;IACvB,CAAC;IACD,qCAAqC;IACrC,KAAK;QACH,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;CACF;AAED,MAAM,KAAK,GAAG,IAAI,SAAS,CAAiB,eAAe,CAAC,CAAC;AAE7D,mDAAmD;AACnD,MAAM,UAAU,sBAAsB;IACpC,KAAK,CAAC,KAAK,EAAE,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,KAAqB;IAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3E,OAAO,UAAU,CAAC,QAAQ,CAAC;SACxB,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,IAAI,UAAU,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;SACzD,MAAM,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CAAC,KAAoB,EAAE,MAAc;IAC5D,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,SAAS,eAAe,CAAC,KAAoB,EAAE,MAAc;IAC3D,sEAAsE;IACtE,iEAAiE;IACjE,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAmB,EACnB,KAAqB;IAErB,MAAM,cAAc,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,IAAI,MAAM,CAAC;IAE3C,oEAAoE;IACpE,qEAAqE;IACrE,gDAAgD;IAChD,IAAI,IAAI,KAAK,WAAW,EAAE,CAAC;QACzB,OAAO;YACL,eAAe,EAAE,cAAc;YAC/B,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,sEAAsE;IACtE,sEAAsE;IACtE,oCAAoC;IACpC,IAAI,IAAI,KAAK,MAAM,IAAI,cAAc,GAAG,KAAK,CAAC,eAAe,GAAG,yBAAyB,EAAE,CAAC;QAC1F,OAAO;YACL,eAAe,EAAE,cAAc;YAC/B,MAAM,EAAE,WAAW;YACnB,SAAS,EAAE,cAAc;YACzB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,0DAA0D;IAC1D,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACtC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO;YACL,eAAe,EAAE,MAAM,GAAG,0BAA0B;YACpD,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,MAAM;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC;IACJ,CAAC;IAsBD,MAAM,SAAS,GAA4B,EAAE,CAAC;IAC9C,MAAM,oBAAoB,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC,wGAAwG;IACtK,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC/B,oEAAoE;QACpE,iEAAiE;QACjE,mEAAmE;QACnE,6DAA6D;QAC7D,yDAAyD;QACzD,MAAM,cAAc,GAClB,cAAc,GAAG,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,oBAAoB,CAAC;QAC9F,IAAI,cAAc,GAAG,wBAAwB,EAAE,CAAC;YAC9C,MAAM,CAAC,IAAI,CACT,8CAA8C,wBAAwB,uDAAuD,cAAc,gBAAgB,SAAS,CAAC,MAAM,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,SAAS,CAC9M,CAAC;YACF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,OAAO;gBACL,eAAe,EAAE,QAAQ;gBACzB,MAAM,EAAE,UAAU;gBAClB,SAAS,EAAE,QAAQ;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC;QAED,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QACnD,CAAC;QAAC,MAAM,CAAC;YACP,4DAA4D;YAC5D,0DAA0D;YAC1D,8DAA8D;YAC9D,6DAA6D;YAC7D,qBAAqB;YACrB,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,iBAAiB,IAAI,CAAC,OAAO,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC;QACzE,cAAc;YACZ,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;gBAC/B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC;gBACvC,oBAAoB,CAAC;IACzB,CAAC;IAED,uEAAuE;IACvE,4EAA4E;IAC5E,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,IAAI,cAAc,GAAG,WAAW,GAAG,wBAAwB,EAAE,CAAC;QAC5D,MAAM,CAAC,IAAI,CACT,0CAA0C,wBAAwB,2EAA2E,cAAc,YAAY,WAAW,aAAa,cAAc,GAAG,WAAW,SAAS,CACrO,CAAC;QACF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO;YACL,eAAe,EAAE,QAAQ;YACzB,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAED,MAAM,QAAQ,GAAyB;QACrC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,SAAS,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE;KAChE,CAAC;IAEF,wEAAwE;IACxE,qEAAqE;IACrE,uEAAuE;IACvE,sEAAsE;IACtE,sDAAsD;IACtD,EAAE;IACF,wEAAwE;IACxE,uEAAuE;IACvE,sEAAsE;IACtE,qEAAqE;IACrE,mEAAmE;IACnE,6BAA6B;IAC7B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;YAC/C,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,QAAQ;YACR,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACjF,CAAC,CAAC;QACH,MAAM,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QACzC,IAAI,OAAO,WAAW,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC,EAAE,CAAC;YACxF,gEAAgE;YAChE,kEAAkE;YAClE,8DAA8D;YAC9D,sCAAsC;YACtC,MAAM,CAAC,IAAI,CACT,+CAA+C,UAAU,CAAC,WAAW,CAAC,cAAc,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CACzI,CAAC;YACF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,OAAO;gBACL,eAAe,EAAE,QAAQ;gBACzB,MAAM,EAAE,UAAU;gBAClB,SAAS,EAAE,QAAQ;gBACnB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QACjC,OAAO;YACL,eAAe,EAAE,WAAW,GAAG,0BAA0B;YACzD,MAAM,EAAE,OAAO;YACf,SAAS,EAAE,WAAW;YACtB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,oEAAoE;QACpE,kEAAkE;QAClE,mEAAmE;QACnE,qEAAqE;QACrE,mEAAmE;QACnE,IAAI,KAAK,CAAC,MAAM,EAAE,OAAO;YAAE,MAAM,GAAG,CAAC;QACrC,MAAM,CAAC,IAAI,CACT,0CAA0C,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,UAAU,CAAC,GAAG,CAAC,iGAAiG,CACvL,CAAC;QACF,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5D,OAAO;YACL,eAAe,EAAE,QAAQ;YACzB,MAAM,EAAE,UAAU;YAClB,SAAS,EAAE,QAAQ;YACnB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* init Interactive secure setup (writes ~/.config/qmediat/credentials).
|
|
7
7
|
* (none) Start the MCP server on stdio.
|
|
8
8
|
*/
|
|
9
|
-
import { logger } from './utils/logger.js';
|
|
9
|
+
import { logger, safeForLog } from './utils/logger.js';
|
|
10
10
|
async function main() {
|
|
11
11
|
const [, , subcommand, ...rest] = process.argv;
|
|
12
12
|
if (subcommand === 'init') {
|
|
@@ -46,7 +46,7 @@ async function main() {
|
|
|
46
46
|
void rest;
|
|
47
47
|
}
|
|
48
48
|
main().catch((err) => {
|
|
49
|
-
logger.error(`fatal: ${
|
|
49
|
+
logger.error(`fatal: ${safeForLog(err)}`);
|
|
50
50
|
if (err instanceof Error && err.stack) {
|
|
51
51
|
process.stderr.write(`${err.stack}\n`);
|
|
52
52
|
}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AACA;;;;;;GAMG;AAEH,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEvD,KAAK,UAAU,IAAI;IACjB,MAAM,CAAC,EAAE,AAAD,EAAG,UAAU,EAAE,GAAG,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAE/C,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,CAAC;QAC3D,MAAM,OAAO,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;QAC5E,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB;YACE,6EAA6E;YAC7E,EAAE;YACF,QAAQ;YACR,iFAAiF;YACjF,iFAAiF;YACjF,EAAE;YACF,cAAc;YACd,qGAAqG;YACrG,oEAAoE;YACpE,gFAAgF;YAChF,wDAAwD;YACxD,sFAAsF;YACtF,+EAA+E;YAC/E,8EAA8E;YAC9E,EAAE;YACF,0DAA0D;YAC1D,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;QACF,OAAO;IACT,CAAC;IAED,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,UAAU,IAAI,CAAC,CAAC;QAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;IAClD,MAAM,SAAS,EAAE,CAAC;IAElB,+CAA+C;IAC/C,KAAK,IAAI,CAAC;AACZ,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE;IAC5B,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC1C,IAAI,GAAG,YAAY,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACtC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
|
package/dist/indexer/globs.d.ts
CHANGED
|
@@ -150,5 +150,19 @@ export declare function isPathExcluded(relpath: string, config: MatchConfig): bo
|
|
|
150
150
|
* on both sides on each call.
|
|
151
151
|
*/
|
|
152
152
|
export declare function isFileIncluded(relpath: string, config: MatchConfig): boolean;
|
|
153
|
+
/**
|
|
154
|
+
* The "is this file's name covered by an include pattern?" half of
|
|
155
|
+
* `isFileIncluded`. Extracted (v1.9.0) so consumers that already know the
|
|
156
|
+
* path is not under any exclude can reuse the include-side logic without
|
|
157
|
+
* re-implementing it locally — `readFileExecutor` was the offender, with a
|
|
158
|
+
* verbatim copy of the loop below to discriminate `NON_SOURCE_FILE` (no
|
|
159
|
+
* include-extension match) from `EXCLUDED_FILE` (include-extension match
|
|
160
|
+
* but excluded by some other rule).
|
|
161
|
+
*
|
|
162
|
+
* Single source of truth for include-side matching. Drift-proof: any future
|
|
163
|
+
* change to how include patterns map (case-fold, regex, new bucket types,
|
|
164
|
+
* etc.) updates one function, not two.
|
|
165
|
+
*/
|
|
166
|
+
export declare function matchesAnyIncludeExtension(relpath: string, config: MatchConfig): boolean;
|
|
153
167
|
export {};
|
|
154
168
|
//# sourceMappingURL=globs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globs.d.ts","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAoFvD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAoEjD,CAAC;AAEF,uGAAuG;AACvG,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAwBvD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAAqB,CAAC;AAE9E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gCAAgC,EAAE,WAAW,CAAC,MAAM,CAEhE,CAAC;AACF,eAAO,MAAM,0BAA0B,EAAE,WAAW,CAAC,MAAM,CAE1D,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B;;;;;;;OAOG;IACH,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AA0BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,KAAK,aAAa,GACd;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAuD1E;AAED,wBAAgB,kBAAkB,CAChC,KAAK,GAAE;IAAE,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GACjF,WAAW,CA0Bb;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAS5E;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"globs.d.ts","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,yEAAyE;AACzE,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAoFvD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,MAAM,EAoEjD,CAAC;AAEF,uGAAuG;AACvG,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAwBvD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,eAAO,MAAM,0BAA0B,EAAE,SAAS,MAAM,EAAqB,CAAC;AAE9E;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,gCAAgC,EAAE,WAAW,CAAC,MAAM,CAEhE,CAAC;AACF,eAAO,MAAM,0BAA0B,EAAE,WAAW,CAAC,MAAM,CAE1D,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IAC/B;;;;;;;OAOG;IACH,iBAAiB,EAAE,SAAS,MAAM,EAAE,CAAC;IACrC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AA0BD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,KAAK,aAAa,GACd;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnC;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI,CAuD1E;AAED,wBAAgB,kBAAkB,CAChC,KAAK,GAAE;IAAE,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GACjF,WAAW,CA0Bb;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAS5E;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAqB5E;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,GAAG,OAAO,CAaxF"}
|
package/dist/indexer/globs.js
CHANGED
|
@@ -401,6 +401,23 @@ export function isFileIncluded(relpath, config) {
|
|
|
401
401
|
if (filenameLower.endsWith(ext.toLowerCase()))
|
|
402
402
|
return false;
|
|
403
403
|
}
|
|
404
|
+
return matchesAnyIncludeExtension(relpath, config);
|
|
405
|
+
}
|
|
406
|
+
/**
|
|
407
|
+
* The "is this file's name covered by an include pattern?" half of
|
|
408
|
+
* `isFileIncluded`. Extracted (v1.9.0) so consumers that already know the
|
|
409
|
+
* path is not under any exclude can reuse the include-side logic without
|
|
410
|
+
* re-implementing it locally — `readFileExecutor` was the offender, with a
|
|
411
|
+
* verbatim copy of the loop below to discriminate `NON_SOURCE_FILE` (no
|
|
412
|
+
* include-extension match) from `EXCLUDED_FILE` (include-extension match
|
|
413
|
+
* but excluded by some other rule).
|
|
414
|
+
*
|
|
415
|
+
* Single source of truth for include-side matching. Drift-proof: any future
|
|
416
|
+
* change to how include patterns map (case-fold, regex, new bucket types,
|
|
417
|
+
* etc.) updates one function, not two.
|
|
418
|
+
*/
|
|
419
|
+
export function matchesAnyIncludeExtension(relpath, config) {
|
|
420
|
+
const filenameLower = (relpath.includes('/') ? relpath.slice(relpath.lastIndexOf('/') + 1) : relpath).toLowerCase();
|
|
404
421
|
for (const ext of config.includeExtensions) {
|
|
405
422
|
const extLower = ext.toLowerCase();
|
|
406
423
|
if (ext.startsWith('.')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globs.js","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"globs.js","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -21,7 +21,7 @@ import { ManifestDb } from './manifest/db.js';
|
|
|
21
21
|
import { TOOLS } from './tools/index.js';
|
|
22
22
|
import { buildToolInputSchema, errorResult, } from './tools/registry.js';
|
|
23
23
|
import { createTpmThrottle } from './tools/shared/throttle.js';
|
|
24
|
-
import { logger } from './utils/logger.js';
|
|
24
|
+
import { logger, safeForLog } from './utils/logger.js';
|
|
25
25
|
import { readFileSync } from 'node:fs';
|
|
26
26
|
import { dirname as pathDirname, join as pathJoin } from 'node:path';
|
|
27
27
|
import { fileURLToPath } from 'node:url';
|
|
@@ -158,7 +158,7 @@ export async function runServer() {
|
|
|
158
158
|
}
|
|
159
159
|
catch (err) {
|
|
160
160
|
const message = err instanceof Error ? err.message : String(err);
|
|
161
|
-
logger.error(`tool '${name}' threw: ${message}`);
|
|
161
|
+
logger.error(`tool '${safeForLog(name)}' threw: ${safeForLog(message)}`);
|
|
162
162
|
return errorResult(`${name} threw: ${message}`);
|
|
163
163
|
}
|
|
164
164
|
})();
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EACL,qBAAqB,EAErB,sBAAsB,GACvB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACzC,OAAO,EAGL,oBAAoB,EACpB,WAAW,GACZ,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,32 @@
|
|
|
20
20
|
* Codex PR #20 review #2 flagged that `resolve+startsWith` is symlink-
|
|
21
21
|
* unsafe. This module implements `realpath + root jail` per that feedback.
|
|
22
22
|
*/
|
|
23
|
-
|
|
23
|
+
/**
|
|
24
|
+
* Where each code fires (v1.9.0 — keep this map current as new throw sites
|
|
25
|
+
* are added):
|
|
26
|
+
*
|
|
27
|
+
* PATH_TRAVERSAL — sandbox.ts (jail violation: symlink escape, abs path outside)
|
|
28
|
+
* SECRET_DENYLIST — sandbox.ts (basename / extension / dir on hardcoded secret list)
|
|
29
|
+
* EXCLUDED_DIR — sandbox.ts (DEFAULT_EXCLUDE_DIRS hit, line ~302)
|
|
30
|
+
* AND workspace-tools.ts top-level gates (v1.9.0+):
|
|
31
|
+
* listDirectoryExecutor + grepExecutor's pathPrefix,
|
|
32
|
+
* when the requested dir matches user-supplied excludeGlobs
|
|
33
|
+
* EXCLUDED_FILE — workspace-tools.ts (v1.9.0+): readFileExecutor when
|
|
34
|
+
* the file is excluded by user globs (filename / extension
|
|
35
|
+
* / dir-prefix). Generic message — no path leak.
|
|
36
|
+
* EXCLUDED_FILENAME — sandbox.ts (DEFAULT_EXCLUDE_FILE_NAMES hit, line ~321)
|
|
37
|
+
* NON_SOURCE_FILE — workspace-tools.ts: readFileExecutor when no
|
|
38
|
+
* include-extension matches (path retained — different
|
|
39
|
+
* threat model from EXCLUDED_FILE)
|
|
40
|
+
* NOT_A_DIRECTORY — workspace-tools.ts (listDir / grep when target is a file)
|
|
41
|
+
* NOT_FOUND — sandbox.ts (resolveInsideWorkspace, missing path)
|
|
42
|
+
* AND workspace-tools.ts (executor-side fs errors)
|
|
43
|
+
* NOT_INSIDE_ROOT — sandbox.ts (jail violation, in-workspace check)
|
|
44
|
+
* INVALID_INPUT — workspace-tools.ts (empty pattern, malformed regex)
|
|
45
|
+
*
|
|
46
|
+
* If you add a new throw site for an existing code, update this map.
|
|
47
|
+
*/
|
|
48
|
+
export type SandboxErrorCode = 'PATH_TRAVERSAL' | 'SECRET_DENYLIST' | 'EXCLUDED_DIR' | 'EXCLUDED_FILE' | 'EXCLUDED_FILENAME' | 'NON_SOURCE_FILE' | 'NOT_A_DIRECTORY' | 'NOT_FOUND' | 'NOT_INSIDE_ROOT' | 'INVALID_INPUT';
|
|
24
49
|
export declare class SandboxError extends Error {
|
|
25
50
|
readonly code: SandboxErrorCode;
|
|
26
51
|
readonly requestedPath: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAyDH,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,GAChB,iBAAiB,GACjB,cAAc,GACd,mBAAmB,GACnB,iBAAiB,GACjB,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,eAAe,CAAC;AAmDpB,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;gBACnB,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAM3E;AAED;;wCAEwC;AACxC,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU7E;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA6IpD"}
|
|
1
|
+
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAyDH;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,gBAAgB,GACxB,gBAAgB,GAChB,iBAAiB,GACjB,cAAc,GACd,eAAe,GACf,mBAAmB,GACnB,iBAAiB,GACjB,iBAAiB,GACjB,WAAW,GACX,iBAAiB,GACjB,eAAe,CAAC;AAmDpB,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;gBACnB,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;CAM3E;AAED;;wCAEwC;AACxC,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAU7E;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;IAAE,YAAY,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CA6IpD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAEhG;;;;;;;4DAO4D;AAC5D,MAAM,wBAAwB,GAAsB;IAClD,MAAM;IACN,YAAY;IACZ,kBAAkB;IAClB,iBAAiB;IACjB,WAAW;IACX,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,WAAW;IACX,aAAa;IACb,kBAAkB;IAClB,cAAc;IACd,cAAc;IACd,aAAa;IACb,sBAAsB;CACvB,CAAC;AAEF,2EAA2E;AAC3E,MAAM,8BAA8B,GAAwB,IAAI,GAAG,CACjE,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CACrD,CAAC;AAEF;gFACgF;AAChF,MAAM,yBAAyB,GAAsB;IACnD,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,WAAW;IACX,MAAM;IACN,MAAM;IACN,OAAO;CACR,CAAC;
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAEhG;;;;;;;4DAO4D;AAC5D,MAAM,wBAAwB,GAAsB;IAClD,MAAM;IACN,YAAY;IACZ,kBAAkB;IAClB,iBAAiB;IACjB,WAAW;IACX,cAAc;IACd,QAAQ;IACR,QAAQ;IACR,SAAS;IACT,kBAAkB;IAClB,WAAW;IACX,aAAa;IACb,kBAAkB;IAClB,cAAc;IACd,cAAc;IACd,aAAa;IACb,sBAAsB;CACvB,CAAC;AAEF,2EAA2E;AAC3E,MAAM,8BAA8B,GAAwB,IAAI,GAAG,CACjE,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CACrD,CAAC;AAEF;gFACgF;AAChF,MAAM,yBAAyB,GAAsB;IACnD,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,WAAW;IACX,MAAM;IACN,MAAM;IACN,OAAO;CACR,CAAC;AAuCF;;;;;;;;;GASG;AACH,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CACtD;IACE,MAAM;IACN,MAAM;IACN,QAAQ;IACR,MAAM;IACN,OAAO;IACP,SAAS;IACT,YAAY;IACZ,MAAM;IACN,SAAS;IACT,QAAQ;IACR,gBAAgB;IAChB,eAAe;IACf,WAAW;CACZ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAC9B,CAAC;AAEF,8EAA8E;AAC9E,0EAA0E;AAC1E,0EAA0E;AAC1E,wEAAwE;AACxE,qEAAqE;AACrE,qEAAqE;AACrE,0EAA0E;AAC1E,wDAAwD;AACxD,8EAA8E;AAE9E,SAAS,QAAQ,CAAC,IAAY,EAAE,SAAiB;IAC/C,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IACpC,sEAAsE;IACtE,wEAAwE;IACxE,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,IAAI,GAAG,OAAO,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,SAAS,OAAO,CAAC,CAAS;IACxB,OAAO,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC1D,CAAC;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAmB;IACvB,aAAa,CAAS;IAC/B,YAAY,IAAsB,EAAE,OAAe,EAAE,aAAqB;QACxE,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;CACF;AAED;;wCAEwC;AACxC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,SAAiB;IAC1D,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,YAAY,CACpB,WAAW,EACX,mDAAmD,SAAS,KAAK,MAAM,CAAC,GAAG,CAAC,GAAG,EAC/E,SAAS,CACV,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,aAAqB,EACrB,QAAgB;IAEhB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,YAAY,CAAC,gBAAgB,EAAE,wBAAwB,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC;IACD,wDAAwD;IACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,MAAM,IAAI,YAAY,CAAC,gBAAgB,EAAE,kCAAkC,EAAE,QAAQ,CAAC,CAAC;IACzF,CAAC;IAED,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IAElD,2EAA2E;IAC3E,wEAAwE;IACxE,uEAAuE;IACvE,6BAA6B;IAC7B,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,CAAC;IACvC,CAAC;IAAC,MAAM,CAAC;QACP,sEAAsE;QACtE,qEAAqE;QACrE,oEAAoE;QACpE,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,gBAAgB,GAAkB,IAAI,CAAC;QAC3C,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YACnC,IAAI,IAAI,KAAK,MAAM;gBAAE,MAAM,CAAC,sBAAsB;YAClD,MAAM,GAAG,IAAI,CAAC;YACd,IAAI,CAAC;gBACH,gBAAgB,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;gBAC1C,MAAM;YACR,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB;YACpB,CAAC;QACH,CAAC;QACD,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,YAAY,CAAC,WAAW,EAAE,kCAAkC,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC9F,CAAC;QACD,uEAAuE;QACvE,gEAAgE;QAChE,kEAAkE;QAClE,iDAAiD;QACjD,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,gBAAgB,CAAC,EAAE,CAAC;YAC/C,MAAM,IAAI,YAAY,CACpB,gBAAgB,EAChB,gCAAgC,QAAQ,EAAE,EAC1C,QAAQ,CACT,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,YAAY,CAAC,WAAW,EAAE,wBAAwB,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpF,CAAC;IAED,iFAAiF;IACjF,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,YAAY,CACpB,gBAAgB,EAChB,8DAA8D,QAAQ,EAAE,EACxE,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEvD,gEAAgE;IAChE,qEAAqE;IACrE,uEAAuE;IACvE,qEAAqE;IACrE,qEAAqE;IACrE,qEAAqE;IACrE,qEAAqE;IACrE,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IACrC,IAAI,8BAA8B,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAClD,MAAM,IAAI,YAAY,CACpB,iBAAiB,EACjB,yCAAyC,IAAI,EAAE,EAC/C,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,yBAAyB,EAAE,CAAC;QAC5C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,YAAY,CACpB,iBAAiB,EACjB,0CAA0C,IAAI,EAAE,EAChD,QAAQ,CACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,8EAA8E;IAC9E,0EAA0E;IAC1E,oEAAoE;IACpE,0BAA0B;IAC1B,EAAE;IACF,wEAAwE;IACxE,oEAAoE;IACpE,oEAAoE;IACpE,uDAAuD;IACvD,EAAE;IACF,0EAA0E;IAC1E,sEAAsE;IACtE,sEAAsE;IACtE,gDAAgD;IAChD,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACnC,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,KAAK,GACT,QAAQ,KAAK,QAAQ;YACrB,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,GAAG,CAAC;YACnC,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK;YAAE,SAAS;QACrB,MAAM,IAAI,GAAqB,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC;YAC9D,CAAC,CAAC,iBAAiB;YACnB,CAAC,CAAC,cAAc,CAAC;QACnB,MAAM,MAAM,GACV,IAAI,KAAK,iBAAiB;YACxB,CAAC,CAAC,8CAA8C,GAAG,EAAE;YACrD,CAAC,CAAC,QAAQ,KAAK,QAAQ;gBACrB,CAAC,CAAC,kCAAkC,GAAG,EAAE;gBACzC,CAAC,CAAC,sCAAsC,GAAG,EAAE,CAAC;QACpD,MAAM,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IACD,iEAAiE;IACjE,mEAAmE;IACnE,gEAAgE;IAChE,yEAAyE;IACzE,gEAAgE;IAChE,+DAA+D;IAC/D,+DAA+D;IAC/D,sDAAsD;IACtD,IAAI,gCAAgC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,YAAY,CACpB,mBAAmB,EACnB,qCAAqC,IAAI,EAAE,EAC3C,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;AAClD,CAAC"}
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
* Together these protect the per-iteration token budget from a single
|
|
19
19
|
* minified bundle or a massive listing burning output tokens on one call.
|
|
20
20
|
*/
|
|
21
|
+
import { type MatchConfig } from '../../indexer/globs.js';
|
|
21
22
|
export interface DirEntry {
|
|
22
23
|
relpath: string;
|
|
23
24
|
type: 'file' | 'dir';
|
|
@@ -34,7 +35,7 @@ export interface ListDirectoryResult {
|
|
|
34
35
|
* dirs and denylisted filenames are silently omitted; the model sees only
|
|
35
36
|
* paths it is allowed to ask for via `read_file` / `grep`.
|
|
36
37
|
*/
|
|
37
|
-
export declare function listDirectoryExecutor(workspaceRoot: string, relPath: string): Promise<ListDirectoryResult>;
|
|
38
|
+
export declare function listDirectoryExecutor(workspaceRoot: string, relPath: string, matchConfig?: MatchConfig): Promise<ListDirectoryResult>;
|
|
38
39
|
export interface FindFilesResult {
|
|
39
40
|
pattern: string;
|
|
40
41
|
matches: string[];
|
|
@@ -47,7 +48,7 @@ export interface FindFilesResult {
|
|
|
47
48
|
* sees paths it couldn't `read_file` on anyway — avoids a foot-gun where
|
|
48
49
|
* the model tries to open a secret it saw in a `find_files` response).
|
|
49
50
|
*/
|
|
50
|
-
export declare function findFilesExecutor(workspaceRoot: string, pattern: string): Promise<FindFilesResult>;
|
|
51
|
+
export declare function findFilesExecutor(workspaceRoot: string, pattern: string, matchConfig?: MatchConfig): Promise<FindFilesResult>;
|
|
51
52
|
export interface ReadFileResult {
|
|
52
53
|
relpath: string;
|
|
53
54
|
content: string;
|
|
@@ -68,7 +69,7 @@ export interface ReadFileResult {
|
|
|
68
69
|
* - Omit both → return the first `DEFAULT_READ_LINE_LIMIT` lines, up to
|
|
69
70
|
* `MAX_READ_BYTES`, whichever hits first.
|
|
70
71
|
*/
|
|
71
|
-
export declare function readFileExecutor(workspaceRoot: string, relPath: string, startLine?: number, endLine?: number): Promise<ReadFileResult>;
|
|
72
|
+
export declare function readFileExecutor(workspaceRoot: string, relPath: string, startLine?: number, endLine?: number, matchConfig?: MatchConfig): Promise<ReadFileResult>;
|
|
72
73
|
export interface GrepMatch {
|
|
73
74
|
relpath: string;
|
|
74
75
|
line: number;
|
|
@@ -91,7 +92,7 @@ export interface GrepResult {
|
|
|
91
92
|
* - each match line truncated to 500 chars (guard against minified
|
|
92
93
|
* lines flooding the payload)
|
|
93
94
|
*/
|
|
94
|
-
export declare function grepExecutor(workspaceRoot: string, pattern: string, pathPrefix?: string): Promise<GrepResult>;
|
|
95
|
+
export declare function grepExecutor(workspaceRoot: string, pattern: string, pathPrefix?: string, matchConfig?: MatchConfig): Promise<GrepResult>;
|
|
95
96
|
/** Export knobs for tests to reference without re-declaring numeric values. */
|
|
96
97
|
export declare const AGENTIC_LIMITS: Readonly<{
|
|
97
98
|
readonly MAX_READ_BYTES: 200000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-tools.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;
|
|
1
|
+
{"version":3,"file":"workspace-tools.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,OAAO,EACL,KAAK,WAAW,EAKjB,MAAM,wBAAwB,CAAC;AAqIhC,MAAM,WAAW,QAAQ;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,mBAAmB,CAAC,CAyF9B;AAMD,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,eAAe,CAAC,CAkE1B;AAMD,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,gBAAgB,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC;IAC7C,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,wBAAsB,gBAAgB,CACpC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,SAAS,CAAC,EAAE,MAAM,EAClB,OAAO,CAAC,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,cAAc,CAAC,CA4IzB;AAMD,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAChC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,UAAU,CAAC,CAqJrB;AAED,+EAA+E;AAC/E,eAAO,MAAM,cAAc;;;;;;;EAOhB,CAAC"}
|