@qmediat.io/gemini-code-context-mcp 1.20.0 → 1.22.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +94 -1
- package/README.md +1 -1
- package/dist/cache/caching-mode.d.ts +40 -0
- package/dist/cache/caching-mode.d.ts.map +1 -0
- package/dist/cache/caching-mode.js +38 -0
- package/dist/cache/caching-mode.js.map +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +0 -1
- package/dist/config.js.map +1 -1
- package/dist/gemini/model-registry.d.ts +5 -0
- package/dist/gemini/model-registry.d.ts.map +1 -1
- package/dist/gemini/model-registry.js +69 -20
- package/dist/gemini/model-registry.js.map +1 -1
- package/dist/gemini/model-taxonomy.d.ts.map +1 -1
- package/dist/gemini/model-taxonomy.js +7 -0
- package/dist/gemini/model-taxonomy.js.map +1 -1
- package/dist/gemini/models.d.ts.map +1 -1
- package/dist/gemini/models.js +1 -0
- package/dist/gemini/models.js.map +1 -1
- package/dist/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.map +1 -1
- package/dist/tools/ask.tool.js +14 -11
- package/dist/tools/ask.tool.js.map +1 -1
- package/dist/tools/code.tool.d.ts.map +1 -1
- package/dist/tools/code.tool.js +13 -15
- package/dist/tools/code.tool.js.map +1 -1
- package/dist/tools/shared/stream-collector.js +1 -1
- package/dist/tools/shared/stream-collector.js.map +1 -1
- package/dist/tools/status.tool.d.ts.map +1 -1
- package/dist/tools/status.tool.js +2 -1
- package/dist/tools/status.tool.js.map +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/cost-estimator.d.ts.map +1 -1
- package/dist/utils/cost-estimator.js +54 -14
- package/dist/utils/cost-estimator.js.map +1 -1
- package/package.json +13 -7
package/dist/indexer/globs.js
CHANGED
|
@@ -92,31 +92,10 @@ export const DEFAULT_INCLUDE_EXTENSIONS = [
|
|
|
92
92
|
'.gql',
|
|
93
93
|
];
|
|
94
94
|
/**
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
* Matched by `isPathExcluded` (below) against the workspace-relative POSIX path
|
|
98
|
-
* in three modes: exact equality, `${dir}/` prefix, and `/${dir}/` substring.
|
|
99
|
-
* Entries are therefore typically directory *basenames* (`node_modules`,
|
|
100
|
-
* `.ssh`), but multi-segment fragments like `.config/gcloud` also match
|
|
101
|
-
* correctly — the matcher sees the full relative path, not just `dirent.name`.
|
|
102
|
-
*
|
|
103
|
-
* Two classes of entries:
|
|
104
|
-
* - **Build / cache artefacts** — indexing them wastes tokens on derived output
|
|
105
|
-
* (no value to Gemini).
|
|
106
|
-
* - **Secret-bearing directories** (`.ssh`, `.aws`, `.gnupg`, `.kube`, …) — if a
|
|
107
|
-
* user or prompt-injected agent points `workspace` at `$HOME`, we refuse to
|
|
108
|
-
* even walk these even if `workspace-validation.ts` is bypassed. Defense in
|
|
109
|
-
* depth against credential exfiltration through the Files API upload path.
|
|
110
|
-
*
|
|
111
|
-
* Entries here are ALWAYS excluded: `isFileIncluded` checks `isPathExcluded`
|
|
112
|
-
* first, and `defaultMatchConfig` only ever APPENDS extra excludes supplied by
|
|
113
|
-
* the caller. Tool-level `includeGlobs` cannot re-include a directory that is
|
|
114
|
-
* in this list — if a repo has a legitimately-named dir that collides with
|
|
115
|
-
* one of these, the fix is to rename the dir or fork the list, not to try to
|
|
116
|
-
* punch through via `includeGlobs`.
|
|
95
|
+
* Dependencies, build output, caches and tool state. A FILE named like one of the non-dot entries is a file, not
|
|
96
|
+
* that directory (`script/build` is a script) — unless a caller's own `excludeGlobs` names it.
|
|
117
97
|
*/
|
|
118
|
-
|
|
119
|
-
// Dependencies / build output
|
|
98
|
+
const BUILD_OUTPUT_DIRS = [
|
|
120
99
|
'node_modules',
|
|
121
100
|
'dist',
|
|
122
101
|
'build',
|
|
@@ -142,16 +121,14 @@ export const DEFAULT_EXCLUDE_DIRS = [
|
|
|
142
121
|
'.gradle',
|
|
143
122
|
'.idea',
|
|
144
123
|
'.vscode',
|
|
145
|
-
|
|
124
|
+
// `bin/` is NOT here: in Node, Ruby, Python and shell-tool repos it holds source (CLIs, scripts). .NET's build output
|
|
125
|
+
// under it is excluded by `isDotnetBuildOutput`; Java's `bin/` holds `.class` files, which the extension filter drops.
|
|
146
126
|
'obj',
|
|
147
127
|
'.DS_Store',
|
|
148
128
|
'.terraform',
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
'.svn',
|
|
153
|
-
'.jj',
|
|
154
|
-
// Secret-bearing directories — never index, never upload.
|
|
129
|
+
];
|
|
130
|
+
/** Secret-bearing directories — never index, never upload; a path that names one is refused whatever it is. */
|
|
131
|
+
const SECRET_DIRS = [
|
|
155
132
|
'.ssh',
|
|
156
133
|
'.aws',
|
|
157
134
|
'.gnupg',
|
|
@@ -165,6 +142,42 @@ export const DEFAULT_EXCLUDE_DIRS = [
|
|
|
165
142
|
'.config/gcloud',
|
|
166
143
|
'.config/azure',
|
|
167
144
|
'Keychains', // macOS: `Library/Keychains`
|
|
145
|
+
];
|
|
146
|
+
/**
|
|
147
|
+
* Path fragments excluded regardless of depth.
|
|
148
|
+
*
|
|
149
|
+
* Matched by `isPathExcluded` (below) against the workspace-relative POSIX path
|
|
150
|
+
* by `pathHitsDir`: a path UNDER the directory (`${dir}/` prefix, `/${dir}/` substring) is excluded whatever it is,
|
|
151
|
+
* and so is a path that NAMES it (exact equality, `/${dir}` suffix) — except a FILE named like one of the default
|
|
152
|
+
* build/cache directories here, which is a file (a `#!` script called `script/build` or `bin/release`).
|
|
153
|
+
* Entries are therefore typically directory *basenames* (`node_modules`,
|
|
154
|
+
* `.ssh`), but multi-segment fragments like `.config/gcloud` also match
|
|
155
|
+
* correctly — the matcher sees the full relative path, not just `dirent.name`.
|
|
156
|
+
*
|
|
157
|
+
* Two classes of entries:
|
|
158
|
+
* - **Build / cache artefacts** — indexing them wastes tokens on derived output
|
|
159
|
+
* (no value to Gemini).
|
|
160
|
+
* - **Secret-bearing directories** (`.ssh`, `.aws`, `.gnupg`, `.kube`, …) — if a
|
|
161
|
+
* user or prompt-injected agent points `workspace` at `$HOME`, we refuse to
|
|
162
|
+
* even walk these even if `workspace-validation.ts` is bypassed. Defense in
|
|
163
|
+
* depth against credential exfiltration through the Files API upload path.
|
|
164
|
+
*
|
|
165
|
+
* Entries here are ALWAYS excluded: `isFileIncluded` checks `isPathExcluded`
|
|
166
|
+
* first, and `defaultMatchConfig` only ever APPENDS extra excludes supplied by
|
|
167
|
+
* the caller. Tool-level `includeGlobs` cannot re-include a directory that is
|
|
168
|
+
* in this list — if a repo has a legitimately-named dir that collides with
|
|
169
|
+
* one of these, the fix is to rename the dir or fork the list, not to try to
|
|
170
|
+
* punch through via `includeGlobs`.
|
|
171
|
+
*/
|
|
172
|
+
export const DEFAULT_EXCLUDE_DIRS = [
|
|
173
|
+
...BUILD_OUTPUT_DIRS,
|
|
174
|
+
// VCS internals
|
|
175
|
+
'.git',
|
|
176
|
+
'.hg',
|
|
177
|
+
'.svn',
|
|
178
|
+
'.jj',
|
|
179
|
+
// Secret-bearing directories — never index, never upload.
|
|
180
|
+
...SECRET_DIRS,
|
|
168
181
|
// Home-level user directories — defense in depth. If a caller somehow
|
|
169
182
|
// ends up scanning `$HOME` despite `validateWorkspacePath`'s home-reject
|
|
170
183
|
// (e.g. a symlinked sibling that points back at home, or a future MCP
|
|
@@ -249,7 +262,6 @@ export const DEFAULT_EXCLUDE_EXTENSIONS = ['.tsbuildinfo'];
|
|
|
249
262
|
* casing on case-insensitive FS slipped through filtering.
|
|
250
263
|
*/
|
|
251
264
|
export const DEFAULT_EXCLUDE_FILE_NAMES_LOWER = new Set(DEFAULT_EXCLUDE_FILE_NAMES.map((s) => s.toLowerCase()));
|
|
252
|
-
export const DEFAULT_EXCLUDE_DIRS_LOWER = new Set(DEFAULT_EXCLUDE_DIRS.map((s) => s.toLowerCase()));
|
|
253
265
|
/**
|
|
254
266
|
* Normalise an `includeGlobs` entry. Accepts three shapes per the tool schema:
|
|
255
267
|
* - `.ext` → literal extension suffix (matched via `endsWith`)
|
|
@@ -352,6 +364,7 @@ export function defaultMatchConfig(extra = {}) {
|
|
|
352
364
|
excludeDirs: [...DEFAULT_EXCLUDE_DIRS, ...extraDirs],
|
|
353
365
|
excludeExtensions: [...DEFAULT_EXCLUDE_EXTENSIONS, ...extraExtsExclude],
|
|
354
366
|
excludeFileNames: [...DEFAULT_EXCLUDE_FILE_NAMES, ...extraFileNames],
|
|
367
|
+
callerExcludeDirsLower: new Set(extraDirs.map((d) => d.toLowerCase())),
|
|
355
368
|
};
|
|
356
369
|
}
|
|
357
370
|
/**
|
|
@@ -361,18 +374,51 @@ export function defaultMatchConfig(extra = {}) {
|
|
|
361
374
|
* lowercasing to the agentic sandbox path but missed this eager-path mirror —
|
|
362
375
|
* PR #24 round-4 review (Gemini P1) closed that gap.
|
|
363
376
|
*/
|
|
364
|
-
export function isPathExcluded(relpath, config) {
|
|
377
|
+
export function isPathExcluded(relpath, config, kind) {
|
|
365
378
|
const relLower = relpath.toLowerCase();
|
|
366
379
|
for (const dir of config.excludeDirs) {
|
|
367
380
|
const dirLower = dir.toLowerCase();
|
|
368
|
-
if (relLower
|
|
369
|
-
return true;
|
|
370
|
-
if (relLower.startsWith(`${dirLower}/`))
|
|
371
|
-
return true;
|
|
372
|
-
if (relLower.includes(`/${dirLower}/`))
|
|
381
|
+
if (pathHitsDir(relLower, dirLower, kind, config.callerExcludeDirsLower.has(dirLower)))
|
|
373
382
|
return true;
|
|
374
383
|
}
|
|
375
|
-
return
|
|
384
|
+
return isDotnetBuildOutput(relLower, kind);
|
|
385
|
+
}
|
|
386
|
+
/**
|
|
387
|
+
* The secret-bearing entries of `DEFAULT_EXCLUDE_DIRS`, lowercased. A path that names one is refused whatever it is
|
|
388
|
+
* (a file called `.ssh` too), and the agentic sandbox reports such a hit as `SECRET_DENYLIST`, not `EXCLUDED_DIR`, so
|
|
389
|
+
* an audit can tell "tried to read secrets" from "tried to read build output".
|
|
390
|
+
*/
|
|
391
|
+
export const SECRET_EXCLUDE_DIRS = new Set(SECRET_DIRS.map((s) => s.toLowerCase()));
|
|
392
|
+
/**
|
|
393
|
+
* The build/cache directories a script could be named after, lowercased: `BUILD_OUTPUT_DIRS` without the dot-names (a
|
|
394
|
+
* dotfile is never an extensionless script; `.git` / `.DS_Store` files stay hidden). A FILE named like one of them is
|
|
395
|
+
* a file — `script/build` is a script, not the `build` directory. Every other entry — VCS, secret-bearing, home-level
|
|
396
|
+
* and a caller's own `excludeGlobs` — still matches a file of that name.
|
|
397
|
+
*/
|
|
398
|
+
const BUILD_DIR_NAMES_LOWER = new Set(BUILD_OUTPUT_DIRS.map((d) => d.toLowerCase()).filter((d) => !d.startsWith('.')));
|
|
399
|
+
/**
|
|
400
|
+
* Does a lowercased relative path hit the lowercased directory `dirLower`, at the root or nested? A path under it
|
|
401
|
+
* always does; so does a path that names it (`pkg/node_modules`), so a listing never offers a directory whose every
|
|
402
|
+
* file would be refused — unless the path is a file named like a default build/cache directory (`script/build`)
|
|
403
|
+
* that no caller exclude names (`callerEntry`). Shared by `isPathExcluded` and the agentic sandbox.
|
|
404
|
+
*/
|
|
405
|
+
export function pathHitsDir(relLower, dirLower, kind, callerEntry = false) {
|
|
406
|
+
if (relLower.startsWith(`${dirLower}/`) || relLower.includes(`/${dirLower}/`))
|
|
407
|
+
return true;
|
|
408
|
+
if (kind === 'file' && !callerEntry && BUILD_DIR_NAMES_LOWER.has(dirLower))
|
|
409
|
+
return false;
|
|
410
|
+
return relLower === dirLower || relLower.endsWith(`/${dirLower}`);
|
|
411
|
+
}
|
|
412
|
+
/** `Debug` / `Release` directly under a `bin/` or one platform level below it (`bin/x64/Debug`) — .NET build output. */
|
|
413
|
+
const DOTNET_OUTPUT_DIR = /(?:^|\/)bin\/(?:[^/]+\/)?(?:debug|release)(?:\/|$)/;
|
|
414
|
+
const DOTNET_OUTPUT_FILE = /(?:^|\/)bin\/(?:[^/]+\/)?(?:debug|release)\//;
|
|
415
|
+
/**
|
|
416
|
+
* .NET writes its build output to `bin/<Configuration>` or `bin/<Platform>/<Configuration>`, with `.json` and `.xml`
|
|
417
|
+
* copies the extension filter would keep. A `bin/` of scripts keeps its files, a `#!` script called `release` among
|
|
418
|
+
* them; a `bin/debug/` directory of scripts in a non-.NET repo is the price of this rule.
|
|
419
|
+
*/
|
|
420
|
+
export function isDotnetBuildOutput(relLower, kind) {
|
|
421
|
+
return (kind === 'dir' ? DOTNET_OUTPUT_DIR : DOTNET_OUTPUT_FILE).test(relLower);
|
|
376
422
|
}
|
|
377
423
|
/**
|
|
378
424
|
* Case-insensitive file-include check. Everything (filename vs each
|
|
@@ -382,7 +428,7 @@ export function isPathExcluded(relpath, config) {
|
|
|
382
428
|
* on both sides on each call.
|
|
383
429
|
*/
|
|
384
430
|
export function isFileIncluded(relpath, config) {
|
|
385
|
-
if (isPathExcluded(relpath, config))
|
|
431
|
+
if (isPathExcluded(relpath, config, 'file'))
|
|
386
432
|
return false;
|
|
387
433
|
const filename = relpath.includes('/') ? relpath.slice(relpath.lastIndexOf('/') + 1) : relpath;
|
|
388
434
|
const filenameLower = filename.toLowerCase();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"globs.js","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,yEAAyE;AACzE,MAAM,CAAC,MAAM,0BAA0B,GAAsB;IAC3D,UAAU;IACV,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,OAAO;IACP,OAAO;IACP,OAAO;IACP,SAAS;IACT,MAAM;IACN,QAAQ;IACR,UAAU;IACV,KAAK;IACL,KAAK;IACL,KAAK;IACL,KAAK;IACL,OAAO;IACP,KAAK;IACL,MAAM;IACN,QAAQ;IACR,KAAK;IACL,KAAK;IACL,QAAQ;IACR,IAAI;IACJ,KAAK;IACL,MAAM;IACN,KAAK;IACL,MAAM;IACN,IAAI;IACJ,IAAI;IACJ,MAAM;IACN,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,MAAM;IACN,OAAO;IACP,KAAK;IACL,MAAM;IACN,MAAM;IACN,MAAM;IACN,gBAAgB;IAChB,OAAO;IACP,QAAQ;IACR,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,cAAc;IACd,MAAM;IACN,gBAAgB;IAChB,KAAK;IACL,OAAO;IACP,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,YAAY;IACZ,UAAU;IACV,KAAK;IACL,KAAK;IACL,MAAM;IACN,eAAe;IACf,KAAK;IACL,MAAM;IACN,MAAM;IACN,OAAO;IACP,MAAM;IACN,MAAM;IACN,MAAM;IACN,SAAS;IACT,UAAU;IACV,MAAM;CACP,CAAC;AAEF
|
|
1
|
+
{"version":3,"file":"globs.js","sourceRoot":"","sources":["../../src/indexer/globs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type MatchConfig } from './globs.js';
|
|
2
|
+
/**
|
|
3
|
+
* A file with no extension whose first two bytes are `#!` is a script — `bin/review`, `scripts/deploy` — and counts
|
|
4
|
+
* as source although no include extension names it. A dotfile (`.env`, `.npmrc`) is never one: its name is all
|
|
5
|
+
* "extension" and the secret and config rules decide it.
|
|
6
|
+
*/
|
|
7
|
+
export declare function isExtensionless(relpath: string): boolean;
|
|
8
|
+
/**
|
|
9
|
+
* Whether the file starts with `#!`. False for a file that is not a readable `#!` script — no `#!`, unreadable,
|
|
10
|
+
* a directory, a named pipe — and the caller then treats it as not source. `O_NONBLOCK` keeps a named pipe from
|
|
11
|
+
* blocking the open and the read (a no-op for a regular file; absent on Windows, which has no pipes in the tree).
|
|
12
|
+
*/
|
|
13
|
+
export declare function startsWithShebang(absolutePath: string): Promise<boolean>;
|
|
14
|
+
/**
|
|
15
|
+
* The include rule every path that indexes or reads files uses: `isFileIncluded` (excluded directories, file names
|
|
16
|
+
* and extensions; an include extension or filename), or an extensionless script under no excluded directory.
|
|
17
|
+
*/
|
|
18
|
+
export declare function isSourceFile(absolutePath: string, relpath: string, config: MatchConfig): Promise<boolean>;
|
|
19
|
+
//# sourceMappingURL=source-files.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-files.d.ts","sourceRoot":"","sources":["../../src/indexer/source-files.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,WAAW,EAAkC,MAAM,YAAY,CAAC;AAE9E;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGxD;AAiBD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB9E;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,OAAO,CAAC,CAMlB"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { constants } from 'node:fs';
|
|
2
|
+
import { open } from 'node:fs/promises';
|
|
3
|
+
import { logger, safeForLog } from '../utils/logger.js';
|
|
4
|
+
import { isFileIncluded, isPathExcluded } from './globs.js';
|
|
5
|
+
/**
|
|
6
|
+
* A file with no extension whose first two bytes are `#!` is a script — `bin/review`, `scripts/deploy` — and counts
|
|
7
|
+
* as source although no include extension names it. A dotfile (`.env`, `.npmrc`) is never one: its name is all
|
|
8
|
+
* "extension" and the secret and config rules decide it.
|
|
9
|
+
*/
|
|
10
|
+
export function isExtensionless(relpath) {
|
|
11
|
+
const base = baseName(relpath);
|
|
12
|
+
return base.length > 0 && !base.startsWith('.') && !base.includes('.');
|
|
13
|
+
}
|
|
14
|
+
function baseName(relpath) {
|
|
15
|
+
return relpath.slice(relpath.lastIndexOf('/') + 1);
|
|
16
|
+
}
|
|
17
|
+
/** Errors that mean "not a script" (gone, a directory, a pipe, socket or device) — every other one is logged. */
|
|
18
|
+
const NOT_A_SCRIPT_ERRORS = new Set([
|
|
19
|
+
'ENOENT',
|
|
20
|
+
'ENOTDIR',
|
|
21
|
+
'EISDIR',
|
|
22
|
+
'EAGAIN',
|
|
23
|
+
'ENXIO',
|
|
24
|
+
'ESPIPE',
|
|
25
|
+
'EINVAL',
|
|
26
|
+
]);
|
|
27
|
+
/**
|
|
28
|
+
* Whether the file starts with `#!`. False for a file that is not a readable `#!` script — no `#!`, unreadable,
|
|
29
|
+
* a directory, a named pipe — and the caller then treats it as not source. `O_NONBLOCK` keeps a named pipe from
|
|
30
|
+
* blocking the open and the read (a no-op for a regular file; absent on Windows, which has no pipes in the tree).
|
|
31
|
+
*/
|
|
32
|
+
export async function startsWithShebang(absolutePath) {
|
|
33
|
+
let handle;
|
|
34
|
+
try {
|
|
35
|
+
handle = await open(absolutePath, constants.O_RDONLY | (constants.O_NONBLOCK ?? 0));
|
|
36
|
+
// Never read a pipe, socket or device: a read consumes what another process queued there (and a pipe holding
|
|
37
|
+
// `#!` would pass for a script). fstat on the open handle, so nothing can be swapped in between.
|
|
38
|
+
if (!(await handle.stat()).isFile())
|
|
39
|
+
return false;
|
|
40
|
+
const buf = Buffer.alloc(2);
|
|
41
|
+
const { bytesRead } = await handle.read(buf, 0, 2, null); // from the start; a pipe has no position
|
|
42
|
+
return bytesRead === 2 && buf[0] === 0x23 && buf[1] === 0x21;
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
const code = err.code;
|
|
46
|
+
if (code !== undefined && !NOT_A_SCRIPT_ERRORS.has(code)) {
|
|
47
|
+
logger.warn(`treated as not source, cannot read its first bytes (${code}): ${safeForLog(absolutePath)}`);
|
|
48
|
+
}
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
finally {
|
|
52
|
+
await handle?.close();
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* The include rule every path that indexes or reads files uses: `isFileIncluded` (excluded directories, file names
|
|
57
|
+
* and extensions; an include extension or filename), or an extensionless script under no excluded directory.
|
|
58
|
+
*/
|
|
59
|
+
export async function isSourceFile(absolutePath, relpath, config) {
|
|
60
|
+
if (isFileIncluded(relpath, config))
|
|
61
|
+
return true;
|
|
62
|
+
if (!isExtensionless(relpath) || isPathExcluded(relpath, config, 'file'))
|
|
63
|
+
return false;
|
|
64
|
+
const base = baseName(relpath);
|
|
65
|
+
if (config.excludeFileNames.some((n) => n.toLowerCase() === base.toLowerCase()))
|
|
66
|
+
return false;
|
|
67
|
+
return startsWithShebang(absolutePath);
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=source-files.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"source-files.js","sourceRoot":"","sources":["../../src/indexer/source-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,17 @@ export interface ScanResult {
|
|
|
85
85
|
* touching every file).
|
|
86
86
|
*/
|
|
87
87
|
memoHitCount: number;
|
|
88
|
+
/**
|
|
89
|
+
* v1.21.0+: what the scan left out, so a caller can tell "the code is not there" from "the code was not indexed":
|
|
90
|
+
* the excluded directories it met (relative paths, sorted, at most `EXCLUDED_DIRS_REPORTED`), how many it met in
|
|
91
|
+
* all (`excludedDirsTotal` > `excludedDirs.length` = the list is cut) and the count of files that are neither
|
|
92
|
+
* source by extension nor a readable `#!` script.
|
|
93
|
+
*/
|
|
94
|
+
excludedDirs: string[];
|
|
95
|
+
excludedDirsTotal: number;
|
|
96
|
+
skippedNonSource: number;
|
|
88
97
|
}
|
|
98
|
+
/** How many excluded directories a scan names; `excludedDirsTotal` counts them all. */
|
|
99
|
+
export declare const EXCLUDED_DIRS_REPORTED = 50;
|
|
89
100
|
export declare function scanWorkspace(workspaceRoot: string, options: ScanOptions): Promise<ScanResult>;
|
|
90
101
|
//# sourceMappingURL=workspace-scanner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-scanner.d.ts","sourceRoot":"","sources":["../../src/indexer/workspace-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-scanner.d.ts","sourceRoot":"","sources":["../../src/indexer/workspace-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAM3C;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAWlF;AAcD;;;;;;;;;GASG;AACH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,YAAY,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;IAClD;;;;OAIG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,6EAA6E;IAC7E,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,YAAY,EAAE,MAAM,CAAC;IACrB;;;;;OAKG;IACH,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,uFAAuF;AACvF,eAAO,MAAM,sBAAsB,KAAK,CAAC;AA2CzC,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,UAAU,CAAC,CAwFrB"}
|
|
@@ -12,8 +12,9 @@
|
|
|
12
12
|
import { readdir, stat } from 'node:fs/promises';
|
|
13
13
|
import { join, sep as pathSep, relative } from 'node:path';
|
|
14
14
|
import { runPool } from '../utils/run-pool.js';
|
|
15
|
-
import { defaultMatchConfig,
|
|
15
|
+
import { defaultMatchConfig, isPathExcluded } from './globs.js';
|
|
16
16
|
import { hashFile, mergeHashes } from './hasher.js';
|
|
17
|
+
import { isSourceFile } from './source-files.js';
|
|
17
18
|
/**
|
|
18
19
|
* v1.13.0+: build the per-file fingerprint map the scanner consults to skip
|
|
19
20
|
* re-hashing. Rows lacking `mtimeMs` or `size` (pre-1.13 manifests, or rows
|
|
@@ -44,24 +45,32 @@ export function buildScanMemo(rows) {
|
|
|
44
45
|
function toPosix(p) {
|
|
45
46
|
return pathSep === '/' ? p : p.split(pathSep).join('/');
|
|
46
47
|
}
|
|
47
|
-
|
|
48
|
+
/** How many excluded directories a scan names; `excludedDirsTotal` counts them all. */
|
|
49
|
+
export const EXCLUDED_DIRS_REPORTED = 50;
|
|
50
|
+
async function walk(root, currentDir, config, state) {
|
|
48
51
|
const entries = await readdir(currentDir, { withFileTypes: true });
|
|
49
52
|
for (const entry of entries) {
|
|
50
53
|
const absolutePath = join(currentDir, entry.name);
|
|
51
54
|
const rel = toPosix(relative(root, absolutePath));
|
|
52
55
|
if (entry.isDirectory()) {
|
|
53
|
-
if (isPathExcluded(rel, config))
|
|
56
|
+
if (isPathExcluded(rel, config, 'dir')) {
|
|
57
|
+
state.excludedDirsTotal += 1;
|
|
58
|
+
if (state.excludedDirs.length < EXCLUDED_DIRS_REPORTED)
|
|
59
|
+
state.excludedDirs.push(rel);
|
|
54
60
|
continue;
|
|
55
|
-
|
|
61
|
+
}
|
|
62
|
+
await walk(root, absolutePath, config, state);
|
|
56
63
|
continue;
|
|
57
64
|
}
|
|
58
65
|
if (entry.isFile()) {
|
|
59
|
-
if (!
|
|
66
|
+
if (!(await isSourceFile(absolutePath, rel, config))) {
|
|
67
|
+
state.skippedNonSource += 1;
|
|
60
68
|
continue;
|
|
61
|
-
|
|
69
|
+
}
|
|
70
|
+
if (state.seen.has(rel))
|
|
62
71
|
continue;
|
|
63
|
-
seen.add(rel);
|
|
64
|
-
acc.push(absolutePath);
|
|
72
|
+
state.seen.add(rel);
|
|
73
|
+
state.acc.push(absolutePath);
|
|
65
74
|
}
|
|
66
75
|
}
|
|
67
76
|
}
|
|
@@ -72,8 +81,15 @@ export async function scanWorkspace(workspaceRoot, options) {
|
|
|
72
81
|
if (options.excludeGlobs !== undefined)
|
|
73
82
|
matchOpts.excludeGlobs = options.excludeGlobs;
|
|
74
83
|
const config = defaultMatchConfig(matchOpts);
|
|
75
|
-
const
|
|
76
|
-
|
|
84
|
+
const state = {
|
|
85
|
+
acc: [],
|
|
86
|
+
seen: new Set(),
|
|
87
|
+
excludedDirs: [],
|
|
88
|
+
excludedDirsTotal: 0,
|
|
89
|
+
skippedNonSource: 0,
|
|
90
|
+
};
|
|
91
|
+
await walk(workspaceRoot, workspaceRoot, config, state);
|
|
92
|
+
const absolutes = state.acc;
|
|
77
93
|
absolutes.sort();
|
|
78
94
|
const truncated = absolutes.length > options.maxFiles;
|
|
79
95
|
const picked = truncated ? absolutes.slice(0, options.maxFiles) : absolutes;
|
|
@@ -131,6 +147,9 @@ export async function scanWorkspace(workspaceRoot, options) {
|
|
|
131
147
|
skippedTooLarge,
|
|
132
148
|
truncated,
|
|
133
149
|
memoHitCount,
|
|
150
|
+
excludedDirs: state.excludedDirs.sort(),
|
|
151
|
+
excludedDirsTotal: state.excludedDirsTotal,
|
|
152
|
+
skippedNonSource: state.skippedNonSource,
|
|
134
153
|
};
|
|
135
154
|
}
|
|
136
155
|
//# sourceMappingURL=workspace-scanner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-scanner.js","sourceRoot":"","sources":["../../src/indexer/workspace-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAoB,kBAAkB,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"workspace-scanner.js","sourceRoot":"","sources":["../../src/indexer/workspace-scanner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,GAAG,IAAI,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE3D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAoB,kBAAkB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAwB;IACpD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC9C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,SAAS;QAC9E,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE;YACpB,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;GAOG;AACH,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;AAoFD,uFAAuF;AACvF,MAAM,CAAC,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAUzC,KAAK,UAAU,IAAI,CACjB,IAAY,EACZ,UAAkB,EAClB,MAAmB,EACnB,KAAgB;IAEhB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACnE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC;QAElD,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;gBACvC,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAC;gBAC7B,IAAI,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,sBAAsB;oBAAE,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrF,SAAS;YACX,CAAC;YACD,MAAM,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;YAC9C,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC;YACnB,IAAI,CAAC,CAAC,MAAM,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;gBACrD,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC;gBAC5B,SAAS;YACX,CAAC;YACD,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACpB,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,aAAqB,EACrB,OAAoB;IAEpB,MAAM,SAAS,GAA2E,EAAE,CAAC;IAC7F,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS;QAAE,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IACtF,IAAI,OAAO,CAAC,YAAY,KAAK,SAAS;QAAE,SAAS,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;IACtF,MAAM,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAc;QACvB,GAAG,EAAE,EAAE;QACP,IAAI,EAAE,IAAI,GAAG,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,CAAC;QACpB,gBAAgB,EAAE,CAAC;KACpB,CAAC;IACF,MAAM,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC;IAC5B,SAAS,CAAC,IAAI,EAAE,CAAC;IAEjB,MAAM,SAAS,GAAG,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IACtD,MAAM,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAE5E,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;IACpE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;IAQ/D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAgB,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE;QACvF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,IAAI,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC;YAC1C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,OAAO,GACX,SAAS,KAAK,SAAS;YACvB,SAAS,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO;YACnC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC;QAChC,MAAM,IAAI,GAAG,OAAO;YAClB,CAAC,CAAE,SAA2B,CAAC,WAAW;YAC1C,CAAC,CAAC,MAAM,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QACxC,OAAO;YACL,IAAI,EAAE;gBACJ,OAAO,EAAE,GAAG;gBACZ,YAAY;gBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,WAAW,EAAE,IAAI;gBACjB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,OAAO;aACR;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,sEAAsE;IACtE,qEAAqE;IACrE,wEAAwE;IACxE,mEAAmE;IACnE,MAAM,KAAK,GAAkB,EAAE,CAAC;IAChC,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,MAAM,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QAC1F,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;QAC3B,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;YACvB,eAAe,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO;YAAE,YAAY,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAE/F,OAAO;QACL,aAAa;QACb,KAAK;QACL,SAAS;QACT,eAAe;QACf,SAAS;QACT,YAAY;QACZ,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE;QACvC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB;QAC1C,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACzC,CAAC;AACJ,CAAC"}
|
|
@@ -20,6 +20,7 @@
|
|
|
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 { type PathKind } from '../../indexer/globs.js';
|
|
23
24
|
/**
|
|
24
25
|
* Where each code fires (v1.9.0 — keep this map current as new throw sites
|
|
25
26
|
* are added):
|
|
@@ -73,8 +74,11 @@ export declare function resolveWorkspaceRoot(rootInput: string): Promise<string>
|
|
|
73
74
|
* missing-file error for a valid path inside the root still surfaces as
|
|
74
75
|
* `NOT_FOUND` once the parent resolves.
|
|
75
76
|
*/
|
|
76
|
-
export declare function resolveInsideWorkspace(workspaceRoot: string, relOrAbs: string): Promise<
|
|
77
|
+
export declare function resolveInsideWorkspace(workspaceRoot: string, relOrAbs: string): Promise<ResolvedPath>;
|
|
78
|
+
/** A path inside the workspace, resolved: what it is decides whether it can be an excluded directory itself. */
|
|
79
|
+
export interface ResolvedPath {
|
|
77
80
|
absolutePath: string;
|
|
78
81
|
relpath: string;
|
|
79
|
-
|
|
82
|
+
kind: PathKind;
|
|
83
|
+
}
|
|
80
84
|
//# sourceMappingURL=sandbox.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;
|
|
1
|
+
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/tools/agentic/sandbox.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAIH,OAAO,EAGL,KAAK,QAAQ,EAId,MAAM,wBAAwB,CAAC;AAqDhC;;;;;;;;;;;;;;;;;;;;;;;;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;AAuBpB,qBAAa,YAAa,SAAQ,KAAK;IACrC,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,YAAY,IAAI,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAKzE;CACF;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,YAAY,CAAC,CAmJvB;AAED,gHAAgH;AAChH,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,QAAQ,CAAC;CAChB"}
|
|
@@ -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":"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"}
|
|
@@ -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"}
|