@qmediat.io/gemini-code-context-mcp 1.19.0 → 1.21.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 +79 -1
- package/README.md +2 -2
- package/dist/attachments.d.ts +65 -0
- package/dist/attachments.d.ts.map +1 -0
- package/dist/attachments.js +253 -0
- package/dist/attachments.js.map +1 -0
- package/dist/gemini/model-taxonomy.js +5 -5
- package/dist/gemini/model-taxonomy.js.map +1 -1
- package/dist/gemini/token-counter.d.ts +4 -0
- package/dist/gemini/token-counter.d.ts.map +1 -1
- package/dist/gemini/token-counter.js +2 -1
- package/dist/gemini/token-counter.js.map +1 -1
- package/dist/indexer/globs.d.ts +27 -3
- package/dist/indexer/globs.d.ts.map +1 -1
- package/dist/indexer/globs.js +86 -40
- package/dist/indexer/globs.js.map +1 -1
- package/dist/indexer/source-files.d.ts +19 -0
- package/dist/indexer/source-files.d.ts.map +1 -0
- package/dist/indexer/source-files.js +69 -0
- package/dist/indexer/source-files.js.map +1 -0
- package/dist/indexer/workspace-scanner.d.ts +11 -0
- package/dist/indexer/workspace-scanner.d.ts.map +1 -1
- package/dist/indexer/workspace-scanner.js +29 -10
- package/dist/indexer/workspace-scanner.js.map +1 -1
- package/dist/tools/agentic/sandbox.d.ts +6 -2
- package/dist/tools/agentic/sandbox.d.ts.map +1 -1
- package/dist/tools/agentic/sandbox.js +21 -35
- package/dist/tools/agentic/sandbox.js.map +1 -1
- package/dist/tools/agentic/workspace-tools.d.ts.map +1 -1
- package/dist/tools/agentic/workspace-tools.js +34 -30
- package/dist/tools/agentic/workspace-tools.js.map +1 -1
- package/dist/tools/ask.tool.d.ts +5 -0
- package/dist/tools/ask.tool.d.ts.map +1 -1
- package/dist/tools/ask.tool.js +122 -3
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.js +3 -0
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/utils/cost-estimator.d.ts +2 -0
- package/dist/utils/cost-estimator.d.ts.map +1 -1
- package/dist/utils/cost-estimator.js +1 -1
- package/dist/utils/cost-estimator.js.map +1 -1
- package/package.json +6 -6
|
@@ -20,9 +20,9 @@
|
|
|
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
|
-
import { realpath } from 'node:fs/promises';
|
|
23
|
+
import { realpath, stat } from 'node:fs/promises';
|
|
24
24
|
import { basename, sep as pathSep, relative, resolve } from 'node:path';
|
|
25
|
-
import { DEFAULT_EXCLUDE_DIRS, DEFAULT_EXCLUDE_FILE_NAMES_LOWER } from '../../indexer/globs.js';
|
|
25
|
+
import { DEFAULT_EXCLUDE_DIRS, DEFAULT_EXCLUDE_FILE_NAMES_LOWER, SECRET_EXCLUDE_DIRS, isDotnetBuildOutput, pathHitsDir, } from '../../indexer/globs.js';
|
|
26
26
|
/** Filename-basename entries that NEVER leak through `read_file`. Even when
|
|
27
27
|
* the path resolves safely under the workspace root, any of these basenames
|
|
28
28
|
* is a hard reject — protects against secrets dropped into the project by
|
|
@@ -69,31 +69,6 @@ const AGENTIC_SECRET_EXTENSIONS = [
|
|
|
69
69
|
'.ppk',
|
|
70
70
|
'.ovpn',
|
|
71
71
|
];
|
|
72
|
-
/**
|
|
73
|
-
* Directories that carry sensitive material and should trip the
|
|
74
|
-
* `SECRET_DENYLIST` error code (not the generic `EXCLUDED_DIR`). The
|
|
75
|
-
* distinction matters for observability: a downstream audit log tracing
|
|
76
|
-
* "model tried to read secrets" vs. "model tried to read a generated
|
|
77
|
-
* dist file" can filter on the error code. Functionally both are
|
|
78
|
-
* rejected, so security posture is identical.
|
|
79
|
-
*
|
|
80
|
-
* Introduced in PR #24 round-3 self-review finding #7.
|
|
81
|
-
*/
|
|
82
|
-
const SECRET_EXCLUDE_DIRS = new Set([
|
|
83
|
-
'.ssh',
|
|
84
|
-
'.aws',
|
|
85
|
-
'.gnupg',
|
|
86
|
-
'.gpg',
|
|
87
|
-
'.kube',
|
|
88
|
-
'.docker',
|
|
89
|
-
'.1password',
|
|
90
|
-
'.pki',
|
|
91
|
-
'.gcloud',
|
|
92
|
-
'.azure',
|
|
93
|
-
'.config/gcloud',
|
|
94
|
-
'.config/azure',
|
|
95
|
-
'Keychains',
|
|
96
|
-
].map((s) => s.toLowerCase()));
|
|
97
72
|
// ---------------------------------------------------------------------------
|
|
98
73
|
// Path-compare helpers (declared at the top of the file so no function is
|
|
99
74
|
// referenced before its declaration in source order — a defensive tidy-up
|
|
@@ -239,21 +214,21 @@ export async function resolveInsideWorkspace(workspaceRoot, relOrAbs) {
|
|
|
239
214
|
// tried to exfiltrate" from "this dir is just boring build output" in
|
|
240
215
|
// observability. Functionally both are blocked.
|
|
241
216
|
const relLower = rel.toLowerCase();
|
|
217
|
+
const kind = await kindOf(resolved, relOrAbs);
|
|
242
218
|
for (const dir of DEFAULT_EXCLUDE_DIRS) {
|
|
243
219
|
const dirLower = dir.toLowerCase();
|
|
244
|
-
|
|
245
|
-
relLower.startsWith(`${dirLower}/`) ||
|
|
246
|
-
relLower.includes(`/${dirLower}/`);
|
|
247
|
-
if (!isHit)
|
|
220
|
+
if (!pathHitsDir(relLower, dirLower, kind))
|
|
248
221
|
continue;
|
|
249
222
|
const code = SECRET_EXCLUDE_DIRS.has(dirLower)
|
|
250
223
|
? 'SECRET_DENYLIST'
|
|
251
224
|
: 'EXCLUDED_DIR';
|
|
252
225
|
const detail = code === 'SECRET_DENYLIST'
|
|
253
226
|
? `path is inside a secret-bearing directory: ${dir}`
|
|
254
|
-
: relLower === dirLower
|
|
255
|
-
? `path is
|
|
256
|
-
:
|
|
227
|
+
: !(relLower === dirLower || relLower.endsWith(`/${dirLower}`))
|
|
228
|
+
? `path is inside excluded directory: ${dir}`
|
|
229
|
+
: kind === 'dir'
|
|
230
|
+
? `path is an excluded directory: ${dir}`
|
|
231
|
+
: `path is a file named like an excluded directory: ${dir}`;
|
|
257
232
|
throw new SandboxError(code, detail, relOrAbs);
|
|
258
233
|
}
|
|
259
234
|
// And one more pass over DEFAULT_EXCLUDE_FILE_NAMES — lockfiles,
|
|
@@ -267,6 +242,17 @@ export async function resolveInsideWorkspace(workspaceRoot, relOrAbs) {
|
|
|
267
242
|
if (DEFAULT_EXCLUDE_FILE_NAMES_LOWER.has(lowerBase)) {
|
|
268
243
|
throw new SandboxError('EXCLUDED_FILENAME', `filename on default exclude list: ${base}`, relOrAbs);
|
|
269
244
|
}
|
|
270
|
-
|
|
245
|
+
if (isDotnetBuildOutput(relLower, kind)) {
|
|
246
|
+
throw new SandboxError('EXCLUDED_DIR', 'path is .NET build output (bin/…/Debug or Release)', relOrAbs);
|
|
247
|
+
}
|
|
248
|
+
return { absolutePath: resolved, relpath: rel, kind };
|
|
249
|
+
}
|
|
250
|
+
async function kindOf(resolved, relOrAbs) {
|
|
251
|
+
try {
|
|
252
|
+
return (await stat(resolved)).isDirectory() ? 'dir' : 'file';
|
|
253
|
+
}
|
|
254
|
+
catch {
|
|
255
|
+
throw new SandboxError('NOT_FOUND', `path does not exist: ${relOrAbs}`, relOrAbs);
|
|
256
|
+
}
|
|
271
257
|
}
|
|
272
258
|
//# sourceMappingURL=sandbox.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACxE,OAAO,EACL,oBAAoB,EACpB,gCAAgC,EAEhC,mBAAmB,EACnB,mBAAmB,EACnB,WAAW,GACZ,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;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,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,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,oBAAoB,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACnC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC;YAAE,SAAS;QACrD,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,CAAC,CAAC,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,QAAQ,EAAE,CAAC,CAAC;gBAC7D,CAAC,CAAC,sCAAsC,GAAG,EAAE;gBAC7C,CAAC,CAAC,IAAI,KAAK,KAAK;oBACd,CAAC,CAAC,kCAAkC,GAAG,EAAE;oBACzC,CAAC,CAAC,oDAAoD,GAAG,EAAE,CAAC;QACpE,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,IAAI,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,YAAY,CACpB,cAAc,EACd,oDAAoD,EACpD,QAAQ,CACT,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;AACxD,CAAC;AASD,KAAK,UAAU,MAAM,CAAC,QAAgB,EAAE,QAAgB;IACtD,IAAI,CAAC;QACH,OAAO,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC;IAC/D,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,YAAY,CAAC,WAAW,EAAE,wBAAwB,QAAQ,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpF,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-tools.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,OAAO,
|
|
1
|
+
{"version":3,"file":"workspace-tools.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAKH,OAAO,EAAE,KAAK,WAAW,EAAsC,MAAM,wBAAwB,CAAC;AAsI9F,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,CA+IzB;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"}
|
|
@@ -20,7 +20,8 @@
|
|
|
20
20
|
*/
|
|
21
21
|
import { readFile, readdir, realpath, stat } from 'node:fs/promises';
|
|
22
22
|
import { join } from 'node:path';
|
|
23
|
-
import { defaultMatchConfig,
|
|
23
|
+
import { defaultMatchConfig, isPathExcluded } from '../../indexer/globs.js';
|
|
24
|
+
import { isSourceFile } from '../../indexer/source-files.js';
|
|
24
25
|
import { SandboxError, resolveInsideWorkspace } from './sandbox.js';
|
|
25
26
|
/**
|
|
26
27
|
* Build a `MatchConfig` honouring the caller's `includeGlobs`/`excludeGlobs`
|
|
@@ -51,7 +52,7 @@ function resolveMatchConfig(matchConfig) {
|
|
|
51
52
|
* true, which is correct for indexing but wrong for listing.
|
|
52
53
|
*/
|
|
53
54
|
function isFileExcludedByConfig(relpath, basename, config) {
|
|
54
|
-
if (isPathExcluded(relpath, config))
|
|
55
|
+
if (isPathExcluded(relpath, config, 'file'))
|
|
55
56
|
return true;
|
|
56
57
|
const lowerBase = basename.toLowerCase();
|
|
57
58
|
for (const name of config.excludeFileNames) {
|
|
@@ -160,7 +161,7 @@ export async function listDirectoryExecutor(workspaceRoot, relPath, matchConfig)
|
|
|
160
161
|
// Generic message — no path interpolation — to avoid the same
|
|
161
162
|
// existence-leak via error string (see Finding #2 for the file-level
|
|
162
163
|
// analogue).
|
|
163
|
-
if (target.relpath && isPathExcluded(target.relpath, config)) {
|
|
164
|
+
if (target.relpath && isPathExcluded(target.relpath, config, target.kind)) {
|
|
164
165
|
throw new SandboxError('EXCLUDED_DIR', 'directory is excluded by configured policy', relPath);
|
|
165
166
|
}
|
|
166
167
|
let rawEntries;
|
|
@@ -194,7 +195,7 @@ export async function listDirectoryExecutor(workspaceRoot, relPath, matchConfig)
|
|
|
194
195
|
// Skip excluded directories (user never gets to recurse into them).
|
|
195
196
|
// Defaults (`node_modules`, `.git`, …) are merged into `config.excludeDirs`
|
|
196
197
|
// by `defaultMatchConfig`; user `excludeGlobs` (dir-shaped) add to it.
|
|
197
|
-
if (isDir && isPathExcluded(childRel, config))
|
|
198
|
+
if (isDir && isPathExcluded(childRel, config, 'dir'))
|
|
198
199
|
continue;
|
|
199
200
|
// Skip files the user's excludes filter out — exclude-side ONLY.
|
|
200
201
|
// Deliberately NOT requiring include-extension match: `list_directory`
|
|
@@ -276,7 +277,7 @@ export async function findFilesExecutor(workspaceRoot, pattern, matchConfig) {
|
|
|
276
277
|
// Honour user `excludeGlobs` dir entries in addition to defaults
|
|
277
278
|
// — `isPathExcluded` checks the full nested path, so multi-segment
|
|
278
279
|
// globs like `src/vendor` work even when we hit them mid-walk.
|
|
279
|
-
if (isPathExcluded(childRel, config))
|
|
280
|
+
if (isPathExcluded(childRel, config, 'dir'))
|
|
280
281
|
continue;
|
|
281
282
|
await walk(join(currentAbs, entry.name), childRel, depth + 1);
|
|
282
283
|
continue;
|
|
@@ -285,9 +286,9 @@ export async function findFilesExecutor(workspaceRoot, pattern, matchConfig) {
|
|
|
285
286
|
continue;
|
|
286
287
|
// Unified filter: covers default filename / extension excludes,
|
|
287
288
|
// user `excludeGlobs` filename / extension entries, AND requires
|
|
288
|
-
// an include-extension match (default + user)
|
|
289
|
-
// eager scanner uses — no agentic / eager divergence.
|
|
290
|
-
if (!
|
|
289
|
+
// an include-extension match (default + user) or a `#!` script.
|
|
290
|
+
// Same predicate the eager scanner uses — no agentic / eager divergence.
|
|
291
|
+
if (!(await isSourceFile(join(currentAbs, entry.name), childRel, config)))
|
|
291
292
|
continue;
|
|
292
293
|
if (!regex.test(childRel))
|
|
293
294
|
continue;
|
|
@@ -331,35 +332,38 @@ export async function readFileExecutor(workspaceRoot, relPath, startLine, endLin
|
|
|
331
332
|
// the more specific "extension not allowed at all" sub-case so callers
|
|
332
333
|
// can still distinguish "explicitly excluded by your config" from
|
|
333
334
|
// "default-rejected source-set membership".
|
|
334
|
-
if (!
|
|
335
|
-
//
|
|
336
|
-
//
|
|
337
|
-
//
|
|
338
|
-
//
|
|
339
|
-
// "wrong-tool" territory
|
|
340
|
-
//
|
|
341
|
-
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
// oracle for paths the user explicitly excluded. The third
|
|
345
|
-
// `SandboxError` argument (`relPath`) is preserved either way for
|
|
346
|
-
// internal logging via `requestedPath`.
|
|
347
|
-
if (!matchesAnyIncludeExtension(target.relpath, config)) {
|
|
348
|
-
throw new SandboxError('NON_SOURCE_FILE', `file extension not in allowed source set: ${target.relpath}`, relPath);
|
|
335
|
+
if (!(await isSourceFile(target.absolutePath, target.relpath, config))) {
|
|
336
|
+
// Two failure modes. A file a rule excludes (a caller's `excludeGlobs`, a default exclude: directory, filename
|
|
337
|
+
// or extension) gets a generic message with NO path (v1.9.0 Finding #2) — whatever its extension — so the error
|
|
338
|
+
// string can't be used as an existence oracle for paths the user explicitly excluded. Any other refused file is
|
|
339
|
+
// structurally non-source (binary, image, a file without `#!`): the path stays in the message, the model needs
|
|
340
|
+
// to know which file it asked for is "wrong-tool" territory. The third `SandboxError` argument (`relPath`) is
|
|
341
|
+
// kept either way for internal logging via `requestedPath`.
|
|
342
|
+
const fileName = target.relpath.slice(target.relpath.lastIndexOf('/') + 1);
|
|
343
|
+
if (isFileExcludedByConfig(target.relpath, fileName, config)) {
|
|
344
|
+
throw new SandboxError('EXCLUDED_FILE', 'file is excluded by configured policy', relPath);
|
|
349
345
|
}
|
|
350
|
-
throw new SandboxError('
|
|
346
|
+
throw new SandboxError('NON_SOURCE_FILE', `file extension not in allowed source set, and not a readable #! script: ${target.relpath}`, relPath);
|
|
351
347
|
}
|
|
352
348
|
// Stat first so we never allocate a >200MB Buffer for a minified bundle.
|
|
353
349
|
// Files larger than 5× MAX_READ_BYTES (1MB) get rejected with a
|
|
354
350
|
// metadata-only response so the model can skip them instead of DOSing
|
|
355
351
|
// the process. Reported in PR #24 review by GPT.
|
|
356
352
|
let totalBytes;
|
|
353
|
+
let regularFile;
|
|
357
354
|
try {
|
|
358
|
-
|
|
355
|
+
const st = await stat(target.absolutePath);
|
|
356
|
+
totalBytes = st.size;
|
|
357
|
+
regularFile = st.isFile();
|
|
359
358
|
}
|
|
360
359
|
catch (err) {
|
|
361
360
|
throw new SandboxError('NOT_FOUND', `stat failed: ${String(err)}`, relPath);
|
|
362
361
|
}
|
|
362
|
+
// A named pipe, socket or device with a source extension (`pipe.ts`) passes the source rule; reading it could
|
|
363
|
+
// block forever. The scan and find/grep skip such entries by their dirent type; read_file has only the path.
|
|
364
|
+
if (!regularFile) {
|
|
365
|
+
throw new SandboxError('NON_SOURCE_FILE', `not a regular file: ${target.relpath}`, relPath);
|
|
366
|
+
}
|
|
363
367
|
const HARD_FILE_SIZE_LIMIT = 5 * MAX_READ_BYTES; // 1MB
|
|
364
368
|
if (totalBytes > HARD_FILE_SIZE_LIMIT) {
|
|
365
369
|
// NOTE: the startLine/endLine slicing logic further below is gated on
|
|
@@ -483,7 +487,7 @@ export async function grepExecutor(workspaceRoot, pattern, pathPrefix, matchConf
|
|
|
483
487
|
// excludes but NOT in DEFAULT_EXCLUDE_DIRS) succeeds-with-zero-results
|
|
484
488
|
// when the dir exists vs throws NOT_FOUND when it doesn't — same
|
|
485
489
|
// existence-probe oracle. Generic message, no path leak.
|
|
486
|
-
if (resolved.relpath && isPathExcluded(resolved.relpath, config)) {
|
|
490
|
+
if (resolved.relpath && isPathExcluded(resolved.relpath, config, resolved.kind)) {
|
|
487
491
|
throw new SandboxError('EXCLUDED_DIR', 'pathPrefix is excluded by configured policy', pathPrefix);
|
|
488
492
|
}
|
|
489
493
|
try {
|
|
@@ -536,7 +540,7 @@ export async function grepExecutor(workspaceRoot, pattern, pathPrefix, matchConf
|
|
|
536
540
|
// they explicitly excluded — and grep returns matched LINES, so
|
|
537
541
|
// a regex like `password|secret|api_key` could leak content from
|
|
538
542
|
// an excluded `internal-config/` dir straight into the model.
|
|
539
|
-
if (isPathExcluded(childRel, config))
|
|
543
|
+
if (isPathExcluded(childRel, config, 'dir'))
|
|
540
544
|
continue;
|
|
541
545
|
await walk(join(currentAbs, entry.name), childRel, depth + 1);
|
|
542
546
|
continue;
|
|
@@ -544,9 +548,9 @@ export async function grepExecutor(workspaceRoot, pattern, pathPrefix, matchConf
|
|
|
544
548
|
if (!entry.isFile())
|
|
545
549
|
continue;
|
|
546
550
|
// Unified filter — same predicate as `findFilesExecutor` and the
|
|
547
|
-
// eager scanner. Honours default + user excludes; requires include
|
|
548
|
-
// extension. v1.9.0 closes the agentic / eager divergence.
|
|
549
|
-
if (!
|
|
551
|
+
// eager scanner. Honours default + user excludes; requires an include
|
|
552
|
+
// extension or a `#!` script. v1.9.0 closes the agentic / eager divergence.
|
|
553
|
+
if (!(await isSourceFile(join(currentAbs, entry.name), childRel, config)))
|
|
550
554
|
continue;
|
|
551
555
|
// Read full file (bounded by MAX_READ_BYTES via soft stat check).
|
|
552
556
|
const absFile = join(currentAbs, entry.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-tools.js","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workspace-tools.js","sourceRoot":"","sources":["../../../src/tools/agentic/workspace-tools.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/ask.tool.d.ts
CHANGED
|
@@ -22,6 +22,7 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
22
22
|
stallMs: z.ZodOptional<z.ZodNumber>;
|
|
23
23
|
preflightMode: z.ZodOptional<z.ZodEnum<["heuristic", "exact", "auto"]>>;
|
|
24
24
|
serviceTier: z.ZodOptional<z.ZodEnum<["standard", "flex"]>>;
|
|
25
|
+
attachments: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
|
|
25
26
|
cachingMode: z.ZodOptional<z.ZodEnum<["explicit", "implicit"]>>;
|
|
26
27
|
forceRescan: z.ZodOptional<z.ZodBoolean>;
|
|
27
28
|
onWorkspaceTooLarge: z.ZodOptional<z.ZodEnum<["error", "fallback-to-agentic"]>>;
|
|
@@ -39,6 +40,7 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
39
40
|
stallMs?: number | undefined;
|
|
40
41
|
preflightMode?: "auto" | "exact" | "heuristic" | undefined;
|
|
41
42
|
serviceTier?: "flex" | "standard" | undefined;
|
|
43
|
+
attachments?: string[] | undefined;
|
|
42
44
|
cachingMode?: "explicit" | "implicit" | undefined;
|
|
43
45
|
forceRescan?: boolean | undefined;
|
|
44
46
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
@@ -56,6 +58,7 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
56
58
|
stallMs?: number | undefined;
|
|
57
59
|
preflightMode?: "auto" | "exact" | "heuristic" | undefined;
|
|
58
60
|
serviceTier?: "flex" | "standard" | undefined;
|
|
61
|
+
attachments?: string[] | undefined;
|
|
59
62
|
cachingMode?: "explicit" | "implicit" | undefined;
|
|
60
63
|
forceRescan?: boolean | undefined;
|
|
61
64
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
@@ -73,6 +76,7 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
73
76
|
stallMs?: number | undefined;
|
|
74
77
|
preflightMode?: "auto" | "exact" | "heuristic" | undefined;
|
|
75
78
|
serviceTier?: "flex" | "standard" | undefined;
|
|
79
|
+
attachments?: string[] | undefined;
|
|
76
80
|
cachingMode?: "explicit" | "implicit" | undefined;
|
|
77
81
|
forceRescan?: boolean | undefined;
|
|
78
82
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
@@ -90,6 +94,7 @@ export declare const askInputSchema: z.ZodEffects<z.ZodObject<{
|
|
|
90
94
|
stallMs?: number | undefined;
|
|
91
95
|
preflightMode?: "auto" | "exact" | "heuristic" | undefined;
|
|
92
96
|
serviceTier?: "flex" | "standard" | undefined;
|
|
97
|
+
attachments?: string[] | undefined;
|
|
93
98
|
cachingMode?: "explicit" | "implicit" | undefined;
|
|
94
99
|
forceRescan?: boolean | undefined;
|
|
95
100
|
onWorkspaceTooLarge?: "error" | "fallback-to-agentic" | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"ask.tool.d.ts","sourceRoot":"","sources":["../../src/tools/ask.tool.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAWH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AA2BxB,OAAO,EAAuB,KAAK,cAAc,EAA2B,MAAM,eAAe,CAAC;AA8DlG,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4GvB,CAAC;AAEL,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAEtD,eAAO,MAAM,OAAO,EAAE,cAAc,CAAC,QAAQ,CAa5C,CAAC"}
|
package/dist/tools/ask.tool.js
CHANGED
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
import { createHash } from 'node:crypto';
|
|
10
10
|
import { resolve } from 'node:path';
|
|
11
11
|
import { z } from 'zod';
|
|
12
|
+
import { AttachmentError, AttachmentTokensUncountedError, INLINE_REQUEST_LIMIT_BYTES, MAX_ATTACHMENTS, MAX_ATTACHMENTS_TOTAL_BYTES, MAX_ATTACHMENT_BYTES, countAttachmentTokens, inlineRequestBytes, inspectAttachments, readAttachments, } from '../attachments.js';
|
|
12
13
|
import { isStaleCacheError, markCacheStale, prepareContext } from '../cache/cache-manager.js';
|
|
13
14
|
import { resolveModel } from '../gemini/models.js';
|
|
14
15
|
import { abortableSleep, withNetworkRetry } from '../gemini/retry.js';
|
|
@@ -127,6 +128,10 @@ export const askInputSchema = z
|
|
|
127
128
|
.optional()
|
|
128
129
|
.describe("Token-count strategy for the WORKSPACE_TOO_LARGE preflight (v1.10.0+). `'heuristic'` = bytes/4 fast estimate (skips API call; coarse — undercounts dense Unicode by 30-50%). `'exact'` = always call Gemini's `countTokens` (free, no quota share with `generateContent`; ~hundreds of ms per call; cached per (filesHash + prompt + model) — `filesHash` is post-glob-filter so changing globs that resolve to different files invalidates automatically). `'auto'` (default, recommended) = heuristic when the workspace is well under 50% of the model's input limit; exact when near the cliff where accuracy matters. Use `'exact'` in CI / tests where you want predictable, accurate behaviour regardless of size."),
|
|
129
130
|
serviceTier: z.enum(['standard', 'flex']).optional().describe(SERVICE_TIER_DESCRIPTION),
|
|
131
|
+
attachments: z
|
|
132
|
+
.array(z.string().min(1)) // the count cap is inspectAttachments' (ATTACHMENT_INVALID), not the schema's
|
|
133
|
+
.optional()
|
|
134
|
+
.describe(`Local image or PDF files (png, jpg, jpeg, webp, pdf; up to ${MAX_ATTACHMENTS}, ${MAX_ATTACHMENT_BYTES / 1024 / 1024} MB each, ${MAX_ATTACHMENTS_TOTAL_BYTES / 1024 / 1024} MB together) sent inline before the question — a screenshot of the bug, a diagram, a spec. Paths are inside the workspace (relative to it or absolute; a symlink is refused, the sandbox's secret rules apply, the first bytes must match the type). They belong to THIS question only, never to the workspace cache. Their tokens are counted by Gemini (one free countTokens call) and enter the size preflight, the budget reservation and the TPM throttle; a count that cannot be obtained refuses the call (ATTACHMENT_TOKENS_UNCOUNTED — retryable after a transient failure: no status, 429, 5xx; not after 401/403/404; a 400 means Gemini refused the parts: ATTACHMENT_INVALID). The model must support vision (ATTACHMENTS_UNSUPPORTED otherwise); a bad file is ATTACHMENT_INVALID, never retryable, and costs nothing. Not available with the ask_agentic fallback.`),
|
|
130
135
|
cachingMode: z
|
|
131
136
|
.enum(['explicit', 'implicit'])
|
|
132
137
|
.optional()
|
|
@@ -160,6 +165,78 @@ export const askTool = {
|
|
|
160
165
|
return executeAskBody(input, ctx, workspaceRoot, model, started);
|
|
161
166
|
},
|
|
162
167
|
};
|
|
168
|
+
/** The attachments of one call: inspected, read and counted by Gemini, in that order — a refused file is never read,
|
|
169
|
+
* a file that fails to read is never counted, and nothing has been reserved yet. */
|
|
170
|
+
async function prepareAttachments(client, paths, workspaceRoot, model, signal) {
|
|
171
|
+
const attached = await inspectAttachments(paths, workspaceRoot);
|
|
172
|
+
const { parts, bytes } = await readAttachments(attached, signal);
|
|
173
|
+
const tokens = await countAttachmentTokens(client, model, parts, signal);
|
|
174
|
+
return { attached, parts, bytes, tokens };
|
|
175
|
+
}
|
|
176
|
+
/** The attachments of one call, or the refusal that ends it: a model without vision, a bad file (never retryable),
|
|
177
|
+
* a count Gemini could not give. Nothing has been scanned or reserved yet. */
|
|
178
|
+
async function attachmentsOrRefusal(client, paths, resolved, serviceTier, workspaceRoot, signal) {
|
|
179
|
+
const meta = { serviceTier, resolvedModel: resolved.resolved };
|
|
180
|
+
if (paths.length > 0 && !resolved.capabilities.supportsVision) {
|
|
181
|
+
return {
|
|
182
|
+
refusal: errorResult(`ask: ${paths.length} attachment(s) given, but ${safeForLog(resolved.resolved)} does not support vision — use \`latest-vision\` or a model that lists it`, { errorCode: 'ATTACHMENTS_UNSUPPORTED', retryable: false, ...meta }),
|
|
183
|
+
};
|
|
184
|
+
}
|
|
185
|
+
try {
|
|
186
|
+
return {
|
|
187
|
+
prepared: await prepareAttachments(client, paths, workspaceRoot, resolved.resolved, signal),
|
|
188
|
+
};
|
|
189
|
+
}
|
|
190
|
+
catch (err) {
|
|
191
|
+
if (!(err instanceof AttachmentError) && !(err instanceof AttachmentTokensUncountedError))
|
|
192
|
+
throw err;
|
|
193
|
+
return {
|
|
194
|
+
refusal: errorResult(`ask: ${err.message}`, {
|
|
195
|
+
errorCode: err.code,
|
|
196
|
+
retryable: err.retryable,
|
|
197
|
+
...meta,
|
|
198
|
+
}),
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
/** The bytes of one workspace file as the request carries it: its body and its `--- FILE: <relpath> ---` marker. */
|
|
203
|
+
const FILE_MARKER_BYTES = '\n\n--- FILE: ---\n\n'.length;
|
|
204
|
+
function inlineFileBytes(files) {
|
|
205
|
+
return files.reduce((sum, f) => sum + f.size + Buffer.byteLength(f.relpath, 'utf8') + FILE_MARKER_BYTES, 0);
|
|
206
|
+
}
|
|
207
|
+
/** Google's inline request limit holds whatever the caching mode (an explicit cache may not be built and the call
|
|
208
|
+
* then runs inline): the refusal, before any reservation, when a conservative size of the request — the attachments
|
|
209
|
+
* encoded, the workspace bodies with their markers, the prompt, the system instruction, the JSON framing — crosses
|
|
210
|
+
* it; nothing otherwise. */
|
|
211
|
+
function inlineRequestRefusal(prepared, files, prompt, serviceTier) {
|
|
212
|
+
if (prepared.attached.length === 0)
|
|
213
|
+
return undefined;
|
|
214
|
+
const textBytes = inlineFileBytes(files) +
|
|
215
|
+
Buffer.byteLength(prompt, 'utf8') +
|
|
216
|
+
Buffer.byteLength(SYSTEM_INSTRUCTION_Q_AND_A, 'utf8');
|
|
217
|
+
const requestBytes = inlineRequestBytes(prepared.attached.map((a) => a.bytes), textBytes, files.length + 2);
|
|
218
|
+
if (requestBytes <= INLINE_REQUEST_LIMIT_BYTES)
|
|
219
|
+
return undefined;
|
|
220
|
+
return errorResult(`ask: the inline request would carry ${requestBytes} bytes (the attachments base64-encoded, the workspace with its file markers, the prompt, the system instruction and the JSON framing), above Google's ${INLINE_REQUEST_LIMIT_BYTES}-byte limit for inline data; use fewer or smaller attachments, or narrow the workspace with includeGlobs / excludeGlobs`, {
|
|
221
|
+
errorCode: 'REQUEST_TOO_LARGE',
|
|
222
|
+
retryable: false,
|
|
223
|
+
serviceTier,
|
|
224
|
+
...attachmentMetadata(prepared),
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
/** `structuredContent` fields of a call with attachments; nothing on a call without. */
|
|
228
|
+
function attachmentMetadata(prepared) {
|
|
229
|
+
if (prepared.attached.length === 0)
|
|
230
|
+
return {};
|
|
231
|
+
return {
|
|
232
|
+
attachments: prepared.attached.map((a) => ({
|
|
233
|
+
path: a.path,
|
|
234
|
+
mimeType: a.mimeType,
|
|
235
|
+
bytes: a.bytes,
|
|
236
|
+
})),
|
|
237
|
+
attachmentTokens: prepared.tokens,
|
|
238
|
+
};
|
|
239
|
+
}
|
|
163
240
|
async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
164
241
|
let reservationId = null;
|
|
165
242
|
// `-1` signals "no reservation held" (distinct from 0 which is a valid
|
|
@@ -229,6 +306,13 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
229
306
|
resolvedModel: resolved.resolved,
|
|
230
307
|
});
|
|
231
308
|
}
|
|
309
|
+
// Attachments ride with the prompt as inline parts. Inspected, read and counted here — before the scan, the
|
|
310
|
+
// preflight, the budget reservation and the throttle: a bad file costs nothing.
|
|
311
|
+
const attachmentsOutcome = await attachmentsOrRefusal(ctx.client, input.attachments ?? [], resolved, serviceTier, workspaceRoot, abortSignal);
|
|
312
|
+
if ('refusal' in attachmentsOutcome)
|
|
313
|
+
return attachmentsOutcome.refusal;
|
|
314
|
+
const attachments = attachmentsOutcome.prepared;
|
|
315
|
+
const attachmentTokens = attachments.tokens;
|
|
232
316
|
emitter.emit(`scanning workspace ${workspaceRoot}…`);
|
|
233
317
|
// v1.13.0 — build the scan memo from previously-stored file rows so the
|
|
234
318
|
// scanner can skip re-hashing files whose mtime+size haven't changed.
|
|
@@ -345,7 +429,10 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
345
429
|
// Tier 2 = real `countTokens` call when near the cliff). Closes T17
|
|
346
430
|
// (`bytes/4` undercount on dense Unicode). See `src/gemini/token-counter.ts`.
|
|
347
431
|
const workspaceBytes = scan.files.reduce((sum, f) => sum + f.size, 0);
|
|
348
|
-
const estimatedInputTokens = Math.ceil(workspaceBytes / 4) + Math.ceil(input.prompt.length / 4);
|
|
432
|
+
const estimatedInputTokens = Math.ceil(workspaceBytes / 4) + Math.ceil(input.prompt.length / 4) + attachmentTokens;
|
|
433
|
+
const inlineRefusal = inlineRequestRefusal(attachments, scan.files, input.prompt, serviceTier);
|
|
434
|
+
if (inlineRefusal !== undefined)
|
|
435
|
+
return inlineRefusal;
|
|
349
436
|
// v1.5.0 preflight (rebuilt in v1.10.0 on top of `countTokens`) — refuse
|
|
350
437
|
// immediately if the estimated input doesn't fit under the model's
|
|
351
438
|
// advertised `inputTokenLimit * workspaceGuardRatio`. Before this
|
|
@@ -380,6 +467,7 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
380
467
|
filesHash: scan.filesHash,
|
|
381
468
|
...(input.preflightMode !== undefined ? { preflightMode: input.preflightMode } : {}),
|
|
382
469
|
inputTokenLimit: contextWindow,
|
|
470
|
+
extraTokens: attachmentTokens, // weighs on the heuristic-vs-exact decision, added to the count below
|
|
383
471
|
// Thread the user's `timeoutMs` AbortSignal so a hung countTokens
|
|
384
472
|
// call doesn't bleed past the user's stated wall-clock budget. The
|
|
385
473
|
// SDK's `CountTokensConfig` accepts `abortSignal`; on cancellation
|
|
@@ -388,6 +476,8 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
388
476
|
// maps it to `errorCode: 'TIMEOUT'` immediately.
|
|
389
477
|
signal: abortSignal,
|
|
390
478
|
});
|
|
479
|
+
// the attachments' tokens, counted by Gemini, join the count whichever way it was made: the window must hold them
|
|
480
|
+
preflight = { ...preflight, effectiveTokens: preflight.effectiveTokens + attachmentTokens };
|
|
391
481
|
const threshold = Math.floor(contextWindow * ctx.config.workspaceGuardRatio);
|
|
392
482
|
if (preflight.effectiveTokens > threshold) {
|
|
393
483
|
const pctDisplay = Math.round(ctx.config.workspaceGuardRatio * 100);
|
|
@@ -399,6 +489,15 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
399
489
|
// workspace) and re-translates `timeoutMs` to `iterationTimeoutMs`
|
|
400
490
|
// (per-iteration cap; total wall-clock can be N × that). Cost +
|
|
401
491
|
// timing shape genuinely changes — opt-in is the right default.
|
|
492
|
+
if (input.onWorkspaceTooLarge === 'fallback-to-agentic' &&
|
|
493
|
+
attachments.attached.length > 0) {
|
|
494
|
+
return errorResult('ask: the workspace is too large for the eager path and `attachments` cannot follow the ask_agentic fallback (it sends no inline parts); drop the attachments or narrow the workspace', {
|
|
495
|
+
errorCode: 'WORKSPACE_TOO_LARGE',
|
|
496
|
+
retryable: false,
|
|
497
|
+
serviceTier,
|
|
498
|
+
...attachmentMetadata(attachments),
|
|
499
|
+
});
|
|
500
|
+
}
|
|
402
501
|
if (input.onWorkspaceTooLarge === 'fallback-to-agentic') {
|
|
403
502
|
if (serviceTier === 'flex') {
|
|
404
503
|
const note = 'ask: the ask_agentic fallback has no service tier — this call runs standard, not flex';
|
|
@@ -547,9 +646,13 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
547
646
|
structuredContent: wrappedStructured,
|
|
548
647
|
};
|
|
549
648
|
}
|
|
550
|
-
|
|
649
|
+
const attachmentsNote = attachments.attached.length > 0
|
|
650
|
+
? ' — it carries no attachments: drop them, or narrow the workspace and ask again'
|
|
651
|
+
: '';
|
|
652
|
+
return errorResult(`Workspace too large: ~${preflight.effectiveTokens.toLocaleString()} input tokens (${preflight.method} count) exceeds ${threshold.toLocaleString()} (${pctDisplay}% of ${resolved.resolved}'s ${contextWindow.toLocaleString()} context window). Best option: use \`mcp__gemini-code-context__ask_agentic\` — same model, but it reads only the files it needs via sandboxed tool calls (no eager repo upload)${attachmentsNote}. Or set \`onWorkspaceTooLarge: 'fallback-to-agentic'\` on \`ask\` to have the server route automatically. Other options: (a) pass \`excludeGlobs\` to filter large/generated files — supports \`*.ext\` patterns, filenames, and directory paths, (b) narrow with \`includeGlobs\`, (c) switch to a larger-context model, or (d) split the workspace into subdirectories.`, {
|
|
551
653
|
errorCode: 'WORKSPACE_TOO_LARGE',
|
|
552
654
|
serviceTier,
|
|
655
|
+
...attachmentMetadata(attachments),
|
|
553
656
|
retryable: false,
|
|
554
657
|
estimatedInputTokens: preflight.effectiveTokens,
|
|
555
658
|
tokenCountMethod: preflight.method,
|
|
@@ -575,6 +678,7 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
575
678
|
const estimateUsd = estimatePreCallCostUsd({
|
|
576
679
|
model: resolved.resolved,
|
|
577
680
|
serviceTier,
|
|
681
|
+
extraInputTokens: attachmentTokens,
|
|
578
682
|
workspaceBytes,
|
|
579
683
|
promptChars: input.prompt.length,
|
|
580
684
|
// Budget reservation uses the effective cap (explicit-user-cap
|
|
@@ -716,7 +820,16 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
716
820
|
...tierField,
|
|
717
821
|
};
|
|
718
822
|
};
|
|
719
|
-
|
|
823
|
+
// The user turn: the attachments first, the question last; with a cache the turn still carries the parts.
|
|
824
|
+
const userTurn = {
|
|
825
|
+
role: 'user',
|
|
826
|
+
parts: [...attachments.parts, { text: input.prompt }],
|
|
827
|
+
};
|
|
828
|
+
const buildContents = (cacheId, inline) => {
|
|
829
|
+
if (cacheId)
|
|
830
|
+
return attachments.parts.length === 0 ? input.prompt : [userTurn];
|
|
831
|
+
return [...inline, userTurn];
|
|
832
|
+
};
|
|
720
833
|
// Track the prepared-context used for the FINAL successful call. Starts
|
|
721
834
|
// pointing at the initial ctxPrep; retry branch below reassigns to the
|
|
722
835
|
// rebuilt PreparedContext so post-call markHot + metadata reflect reality.
|
|
@@ -942,6 +1055,7 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
942
1055
|
resolvedModel: resolved.resolved,
|
|
943
1056
|
requestedModel: resolved.requested,
|
|
944
1057
|
serviceTier,
|
|
1058
|
+
...attachmentMetadata(attachments),
|
|
945
1059
|
fallbackApplied: resolved.fallbackApplied,
|
|
946
1060
|
modelCategory: resolved.category,
|
|
947
1061
|
modelCostTier: resolved.capabilities.costTier,
|
|
@@ -959,6 +1073,11 @@ async function executeAskBody(input, ctx, workspaceRoot, model, started) {
|
|
|
959
1073
|
inlineOnly: activePrep.inlineOnly,
|
|
960
1074
|
filesIndexed: scan.files.length,
|
|
961
1075
|
filesSkippedTooLarge: scan.skippedTooLarge,
|
|
1076
|
+
// v1.21.0+: what the scan left out — the excluded directories it met and the files that are neither source by
|
|
1077
|
+
// extension nor a `#!` script — so a caller can tell "not in the workspace" from "not indexed".
|
|
1078
|
+
excludedDirs: scan.excludedDirs,
|
|
1079
|
+
excludedDirsTotal: scan.excludedDirsTotal,
|
|
1080
|
+
filesSkippedNonSource: scan.skippedNonSource,
|
|
962
1081
|
filesUploadFailed: activePrep.uploaded.failedCount,
|
|
963
1082
|
...(activePrep.uploaded.failedCount > 0
|
|
964
1083
|
? { uploadFailures: activePrep.uploaded.failures.slice(0, 5) }
|