@j0hanz/filesystem-mcp 2.1.8 → 2.3.0

package/dist/core/search.js

@@ -1,7 +1,6 @@
 import { stat as fsStat, readFile } from 'node:fs/promises';
 import { basename } from 'node:path';
 import { RE2 } from '@adguard/re2-wasm';
-import { StopReasonTracker } from './concurrency.js';
 import { globEntries } from './glob.js';
 import { escapeRegexLiteral } from './primitives.js';
 import { getMaxTextFileSize } from './util.js';
@@ -134,12 +133,13 @@ export async function searchContent(directory, pattern, options, pathGuard) {
         const matches = [];
         const maxResults = options.maxResults ?? 100;
         const maxFileSize = getMaxTextFileSize();
+        const context = options.context ?? 0;
         const entries = globEntries({
             cwd: directory,
             pattern: options.filePattern ?? '**/*',
-            excludePatterns: options.excludePatterns ?? [],
             includeHidden: Boolean(options.includeHidden),
-            respectGitignore: Boolean(options.respectGitignore),
+            skipIgnored: Boolean(options.skipIgnored),
+            ...(options.signal ? { signal: options.signal } : {}),
             maxDepth: options.maxDepth ?? 100,
             suppressErrors: true,
         });
@@ -168,6 +168,9 @@ export async function searchContent(directory, pattern, options, pathGuard) {
             try {
                 const content = await readFile(entry.path, { encoding: 'utf-8', signal: options.signal });
                 const lines = content.split('\n');
+                // A trailing newline splits into a phantom empty last element; context
+                // must not report it as a line the file has.
+                const lineCount = content.endsWith('\n') ? lines.length - 1 : lines.length;
                 let matchedFile = false;
                 for (let i = 0; i < lines.length; i++) {
                     const line = lines[i];
@@ -185,6 +188,12 @@ export async function searchContent(directory, pattern, options, pathGuard) {
                             column: found.column,
                             content: line,
                             matchCount: found.count,
+                            ...(context > 0
+                                ? {
+                                    before: lines.slice(Math.max(0, i - context), i),
+                                    after: lines.slice(i + 1, Math.min(lineCount, i + 1 + context)),
+                                }
+                                : {}),
                         });
                         if (matches.length >= maxResults)
                             break;
@@ -204,14 +213,10 @@ export async function searchContent(directory, pattern, options, pathGuard) {
                 // ignore read errors (e.g. binary files)
             }
         }
-        const tracker = new StopReasonTracker();
-        if (matches.length >= maxResults)
-            tracker.hitMaxResults();
-        if (counters.stoppedByAbort)
-            tracker.hitAbort();
-        // resolve() is StoppedReason | undefined, but this scan only records
-        // maxResults/timeout stops (see the summary type's narrowing note).
-        const stoppedReason = tracker.resolve();
+        // The result cap is the definite cause even when the abort fired on the same
+        // iteration, matching StopReasonTracker's precedence for the two stops this
+        // scan can record (see the summary type's narrowing note).
+        const stoppedReason = matches.length >= maxResults ? 'maxResults' : counters.stoppedByAbort ? 'timeout' : undefined;
         return {
             basePath: directory,
             matches,
@@ -219,7 +224,7 @@ export async function searchContent(directory, pattern, options, pathGuard) {
                 matchingLines,
                 filesScanned,
                 filesMatched,
-                truncated: tracker.truncated,
+                truncated: stoppedReason !== undefined,
                 skippedInaccessible: counters.skippedInaccessible,
                 skippedTooLarge,
                 ...(stoppedReason ? { stoppedReason } : {}),
@@ -249,14 +254,14 @@ async function* guardedEntries(entries, pathGuard, signal, counters) {
         yield entry;
     }
 }
-export async function searchFiles(directory, pattern, excludePatterns, options, pathGuard) {
+export async function searchFiles(directory, pattern, options, pathGuard) {
     const maxResults = options.maxResults ?? 100;
     const entries = globEntries({
         cwd: directory,
         pattern,
-        excludePatterns,
         includeHidden: Boolean(options.includeHidden),
-        respectGitignore: Boolean(options.respectGitignore),
+        skipIgnored: Boolean(options.skipIgnored),
+        ...(options.signal ? { signal: options.signal } : {}),
         maxDepth: options.maxDepth ?? 100,
         suppressErrors: true,
     });
@@ -277,21 +282,15 @@ export async function searchFiles(directory, pattern, excludePatterns, options,
     else {
         results.sort((a, b) => a.path.localeCompare(b.path));
     }
-    const tracker = new StopReasonTracker();
-    if (results.length >= maxResults)
-        tracker.hitMaxResults();
-    if (counters.stoppedByAbort)
-        tracker.hitAbort();
-    // resolve() is StoppedReason | undefined, but this scan only records
-    // maxResults/timeout stops (see the summary type's narrowing note).
-    const stoppedReason = tracker.resolve();
+    // Same precedence as above: the result cap wins over a same-iteration abort.
+    const stoppedReason = results.length >= maxResults ? 'maxResults' : counters.stoppedByAbort ? 'timeout' : undefined;
     return {
         basePath: directory,
         results,
         summary: {
             matched: results.length,
             filesScanned,
-            truncated: tracker.truncated,
+            truncated: stoppedReason !== undefined,
             skippedInaccessible: counters.skippedInaccessible,
             ...(stoppedReason ? { stoppedReason } : {}),
         },

package/dist/core/search.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/core/search.ts"],"names":[],"mappings":"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","sourcesContent":["import { stat as fsStat, readFile } from 'node:fs/promises';\nimport { basename } from 'node:path';\n\nimport type { RE2ExecArray } from '@adguard/re2-wasm';\nimport { RE2 } from '@adguard/re2-wasm';\n\nimport { StopReasonTracker } from './concurrency.js';\nimport { globEntries, type GlobEntry } from './glob.js';\nimport type { PathGuard } from './path.js';\nimport { escapeRegexLiteral } from './primitives.js';\nimport { getMaxTextFileSize } from './util.js';\n\ninterface SearchResult {\n  file: string;\n  line: number;\n  /** 0-indexed column of the first occurrence on the line. */\n  column: number;\n  content: string;\n  matchCount?: number;\n}\n\nexport type Regex = RE2;\nexport interface RegexCompileOptions {\n  caseSensitive?: boolean;\n}\n\n/** Occurrence-counting bound, so one pathological line cannot spin forever. */\nconst MAX_MATCHES_PER_LINE = 100_000;\n\n/**\n * Compile a pattern on RE2 rather than on V8's irregexp.\n *\n * Patterns arrive from the MCP client, so a backtracking engine would let one\n * request pin the event loop with no way out: an abort signal cannot preempt a\n * synchronous `exec`, and on stdio that wedges the whole server. RE2 matches in\n * time linear in the input and cannot backtrack at all, so the hazard is gone\n * rather than bounded.\n *\n * RE2 rejects the constructs the tool schema documents as unsupported —\n * lookahead, lookbehind, backreferences — with its own {@link SyntaxError},\n * which the tool layer turns into a normal tool error. It always matches in\n * Unicode mode and requires the `u` flag to say so.\n *\n * Every compiled pattern owns memory in re2-wasm's fixed 16 MB heap, which\n * `ALLOW_MEMORY_GROWTH` is off for. re2-wasm never frees it and a\n * FinalizationRegistry does not keep up (V8 sees no pressure from the wasm\n * heap), so exhaustion is an emscripten `abort()` that kills regex search for\n * the rest of the process. Every caller MUST pass the result to\n * {@link freeRegex} when it is done with it.\n */\nexport function compileRegex(pattern: string, options: RegexCompileOptions = {}): Regex {\n  const flags = options.caseSensitive ? 'gu' : 'giu';\n  try {\n    return new RE2(pattern, flags);\n  } catch (error) {\n    if (!(error instanceof SyntaxError)) throw error;\n    throw new SyntaxError(\n      `${error.message} — lookahead, lookbehind, and backreferences are not supported.`,\n      { cause: error },\n    );\n  }\n}\n\n/**\n * Release a compiled pattern's wasm memory. re2-wasm exposes no disposal of its\n * own, so this reaches the embind handle it holds privately; a version that\n * renames the field degrades to the pre-existing leak rather than throwing.\n * Idempotent — a second call on an already-freed handle is swallowed. Using a\n * {@link Regex} after freeing it is undefined behaviour in the wasm heap, so\n * free only in a `finally` that owns the compile.\n */\nexport function freeRegex(regex: Regex | undefined): void {\n  const handle = (regex as unknown as { wrapper?: { delete?: () => void } } | undefined)?.wrapper;\n  try {\n    handle?.delete?.();\n  } catch {\n    // already deleted, or a re2-wasm build without embind disposal\n  }\n}\n\nexport interface RegexMatch {\n  /** The matched text. */\n  text: string;\n  /** Capture groups, 1-indexed in the pattern, 0-indexed here. */\n  groups: (string | undefined)[];\n  /** Named capture groups, when the pattern declares any. */\n  named: Record<string, string> | undefined;\n  /** Start offset in UTF-16 code units — usable with `String.prototype.slice`. */\n  start: number;\n  /** End offset in UTF-16 code units. */\n  end: number;\n}\n\n/** Code-point length of `text`, i.e. its UTF-16 length minus its surrogate pairs. */\nfunction codePointLength(text: string): number {\n  let length = 0;\n  for (let i = 0; i < text.length; i++) {\n    if ((text.charCodeAt(i) & 0xfc00) === 0xd800 && (text.charCodeAt(i + 1) & 0xfc00) === 0xdc00) {\n      i++;\n    }\n    length++;\n  }\n  return length;\n}\n\n/**\n * Iterate a global pattern's non-overlapping matches with offsets JS can use.\n *\n * re2-wasm reports `index` and `lastIndex` in **code points**, while every JS\n * string operation indexes in UTF-16 code units. The two agree only until the\n * first astral character (most emoji), past which every offset is short by one\n * per surrogate pair — slicing on the raw index cuts into the middle of\n * neighbouring text. Its `lastIndex` bookkeeping is worse still: it adds the\n * match's UTF-16 length to a code-point index, so an astral character inside a\n * match can skip the next one. This is the single place that corrects both; no\n * caller should read `match.index` or `regex.lastIndex` directly.\n *\n * Zero-length matches (e.g. `a*`) advance by one code point so they cannot loop\n * forever. The regex is global and shared across calls, so `lastIndex` is reset\n * on entry.\n */\nexport function* execMatches(regex: Regex, text: string): Generator<RegexMatch, undefined> {\n  regex.lastIndex = 0;\n  // Cursor into `text`, carried forward across matches: RE2 reports them in\n  // ascending order, so the walk is O(text) in total rather than per match.\n  let cursorCp = 0;\n  let cursorU16 = 0;\n  let match: RE2ExecArray | null;\n  while ((match = regex.exec(text)) !== null) {\n    while (cursorCp < match.index && cursorU16 < text.length) {\n      const isPair =\n        (text.charCodeAt(cursorU16) & 0xfc00) === 0xd800 &&\n        (text.charCodeAt(cursorU16 + 1) & 0xfc00) === 0xdc00;\n      cursorU16 += isPair ? 2 : 1;\n      cursorCp++;\n    }\n    const matched = match[0] ?? '';\n    const start = cursorU16;\n    yield {\n      text: matched,\n      groups: match.slice(1),\n      named: match.groups,\n      start,\n      end: start + matched.length,\n    };\n    // Own the advance rather than trusting the wrapper's mixed-unit arithmetic.\n    regex.lastIndex = match.index + (matched.length === 0 ? 1 : codePointLength(matched));\n  }\n}\n\n/**\n * Find non-overlapping occurrences of a global regex in a single line, reporting\n * the first match's column alongside the count.\n */\nfunction findLineMatches(\n  regex: Regex,\n  line: string,\n): { count: number; column: number } | undefined {\n  let count = 0;\n  let column = -1;\n  for (const match of execMatches(regex, line)) {\n    if (column === -1) column = match.start;\n    count++;\n    if (count >= MAX_MATCHES_PER_LINE) break;\n  }\n  return count > 0 ? { count, column } : undefined;\n}\n\nexport interface SearchContentOptions {\n  caseSensitive?: boolean;\n  isRegex?: boolean;\n  maxResults?: number;\n  filePattern?: string;\n  excludePatterns?: string[];\n  respectGitignore?: boolean;\n  includeHidden?: boolean;\n  maxDepth?: number;\n  signal?: AbortSignal;\n}\n\nexport interface SearchContentOutcome {\n  basePath: string;\n  matches: SearchResult[];\n  summary: {\n    /**\n     * Matching *lines*, one per entry in `matches` — not pattern occurrences.\n     * A line with three occurrences counts once here and reports 3 in its own\n     * `SearchResult.matchCount`.\n     */\n    matchingLines: number;\n    filesScanned: number;\n    filesMatched: number;\n    truncated: boolean;\n    /** Files the guard rejected or that could not be stat'd. */\n    skippedInaccessible: number;\n    /** Files skipped unread because they exceed maxFileSize. */\n    skippedTooLarge: number;\n    /**\n     * `StoppedReason` narrowed to the stops these scans can produce: both call\n     * only `hitMaxResults`/`hitAbort` (see concurrency.ts) — never\n     * `hitMaxFiles`, which belongs to `replace_text`'s per-file cap.\n     */\n    stoppedReason?: 'maxResults' | 'timeout';\n  };\n}\n\nexport async function searchContent(\n  directory: string,\n  pattern: string,\n  options: SearchContentOptions,\n  pathGuard: PathGuard,\n): Promise<SearchContentOutcome> {\n  const regex = compileRegex(options.isRegex ? pattern || '' : escapeRegexLiteral(pattern || ''), {\n    caseSensitive: Boolean(options.caseSensitive),\n  });\n  try {\n    const matches: SearchResult[] = [];\n    const maxResults = options.maxResults ?? 100;\n    const maxFileSize = getMaxTextFileSize();\n\n    const entries = globEntries({\n      cwd: directory,\n      pattern: options.filePattern ?? '**/*',\n      excludePatterns: options.excludePatterns ?? [],\n      includeHidden: Boolean(options.includeHidden),\n      respectGitignore: Boolean(options.respectGitignore),\n      maxDepth: options.maxDepth ?? 100,\n      suppressErrors: true,\n    });\n\n    let filesScanned = 0;\n    let filesMatched = 0;\n    let matchingLines = 0;\n    let skippedTooLarge = 0;\n    const counters = { skippedInaccessible: 0, stoppedByAbort: false };\n\n    for await (const entry of guardedEntries(entries, pathGuard, options.signal, counters)) {\n      if (matches.length >= maxResults) break;\n\n      // Skip oversized files before reading to avoid unbounded memory use. Count\n      // them: \"no matches\" for a reason other than the pattern must be visible.\n      try {\n        const stats = await fsStat(entry.path);\n        if (stats.size > maxFileSize) {\n          skippedTooLarge++;\n          continue;\n        }\n      } catch {\n        counters.skippedInaccessible++;\n        continue;\n      }\n\n      filesScanned++;\n\n      try {\n        const content = await readFile(entry.path, { encoding: 'utf-8', signal: options.signal });\n        const lines = content.split('\\n');\n        let matchedFile = false;\n        for (let i = 0; i < lines.length; i++) {\n          const line = lines[i];\n          if (line === undefined) continue;\n          // One scan per line: findLineMatches resets lastIndex itself, so it\n          // doubles as the \"does this line match\" test.\n          const found = findLineMatches(regex, line);\n          if (found) {\n            matchedFile = true;\n            matchingLines++;\n            matches.push({\n              file: entry.path,\n              line: i + 1,\n              column: found.column,\n              content: line,\n              matchCount: found.count,\n            });\n            if (matches.length >= maxResults) break;\n          }\n        }\n        if (matchedFile) filesMatched++;\n      } catch {\n        // A read failure while the signal is aborted IS the abort, not an\n        // unreadable file — stop rather than spend another iteration and then\n        // report a cut-short scan as complete.\n        if (options.signal?.aborted) {\n          counters.stoppedByAbort = true;\n          break;\n        }\n        // ignore read errors (e.g. binary files)\n      }\n    }\n\n    const tracker = new StopReasonTracker();\n    if (matches.length >= maxResults) tracker.hitMaxResults();\n    if (counters.stoppedByAbort) tracker.hitAbort();\n    // resolve() is StoppedReason | undefined, but this scan only records\n    // maxResults/timeout stops (see the summary type's narrowing note).\n    const stoppedReason = tracker.resolve() as 'maxResults' | 'timeout' | undefined;\n\n    return {\n      basePath: directory,\n      matches,\n      summary: {\n        matchingLines,\n        filesScanned,\n        filesMatched,\n        truncated: tracker.truncated,\n        skippedInaccessible: counters.skippedInaccessible,\n        skippedTooLarge,\n        ...(stoppedReason ? { stoppedReason } : {}),\n      },\n    };\n  } finally {\n    freeRegex(regex);\n  }\n}\n\nasync function* guardedEntries(\n  entries: AsyncIterable<GlobEntry>,\n  pathGuard: PathGuard,\n  signal: AbortSignal | undefined,\n  counters: { skippedInaccessible: number; stoppedByAbort: boolean },\n): AsyncGenerator<GlobEntry> {\n  // The signal carries both client cancellation and the tool's search timeout,\n  // so an abort means \"return what we have, marked incomplete\" rather than\n  // throw — but it must never be reported as a finished scan.\n  for await (const entry of entries) {\n    if (signal?.aborted) {\n      counters.stoppedByAbort = true;\n      return;\n    }\n    try {\n      await pathGuard.validateExistingPath(entry.path);\n    } catch {\n      counters.skippedInaccessible++;\n      continue;\n    }\n    yield entry;\n  }\n}\n\nexport async function searchFiles(\n  directory: string,\n  pattern: string,\n  excludePatterns: string[],\n  options: {\n    maxResults?: number;\n    includeHidden?: boolean;\n    sortBy?: 'name' | 'path';\n    respectGitignore?: boolean;\n    maxDepth?: number;\n    signal?: AbortSignal;\n  },\n  pathGuard: PathGuard,\n): Promise<{\n  basePath: string;\n  results: { path: string }[];\n  summary: {\n    matched: number;\n    filesScanned: number;\n    truncated: boolean;\n    skippedInaccessible: number;\n    /** Narrowed like SearchContentOutcome's — scans never hit `hitMaxFiles`. */\n    stoppedReason?: 'maxResults' | 'timeout';\n  };\n}> {\n  const maxResults = options.maxResults ?? 100;\n  const entries = globEntries({\n    cwd: directory,\n    pattern,\n    excludePatterns,\n    includeHidden: Boolean(options.includeHidden),\n    respectGitignore: Boolean(options.respectGitignore),\n    maxDepth: options.maxDepth ?? 100,\n    suppressErrors: true,\n  });\n  const results: { path: string }[] = [];\n  let filesScanned = 0;\n  const counters = { skippedInaccessible: 0, stoppedByAbort: false };\n\n  for await (const entry of guardedEntries(entries, pathGuard, options.signal, counters)) {\n    if (results.length >= maxResults) break;\n    filesScanned++;\n    results.push({ path: entry.path });\n  }\n\n  // Sorting — only name / path are supported; size / modified were removed\n  // (the glob never collected stats, so they were always undefined).\n  if (options.sortBy === 'name') {\n    results.sort((a, b) => basename(a.path).localeCompare(basename(b.path)));\n  } else {\n    results.sort((a, b) => a.path.localeCompare(b.path));\n  }\n\n  const tracker = new StopReasonTracker();\n  if (results.length >= maxResults) tracker.hitMaxResults();\n  if (counters.stoppedByAbort) tracker.hitAbort();\n  // resolve() is StoppedReason | undefined, but this scan only records\n  // maxResults/timeout stops (see the summary type's narrowing note).\n  const stoppedReason = tracker.resolve() as 'maxResults' | 'timeout' | undefined;\n\n  return {\n    basePath: directory,\n    results,\n    summary: {\n      matched: results.length,\n      filesScanned,\n      truncated: tracker.truncated,\n      skippedInaccessible: counters.skippedInaccessible,\n      ...(stoppedReason ? { stoppedReason } : {}),\n    },\n  };\n}\n"]}
+{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/core/search.ts"],"names":[],"mappings":"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","sourcesContent":["import { stat as fsStat, readFile } from 'node:fs/promises';\nimport { basename } from 'node:path';\n\nimport type { RE2ExecArray } from '@adguard/re2-wasm';\nimport { RE2 } from '@adguard/re2-wasm';\n\nimport { globEntries, type GlobEntry } from './glob.js';\nimport type { PathGuard } from './path.js';\nimport { escapeRegexLiteral } from './primitives.js';\nimport { getMaxTextFileSize } from './util.js';\n\ninterface SearchResult {\n  file: string;\n  line: number;\n  /** 0-indexed column of the first occurrence on the line. */\n  column: number;\n  content: string;\n  matchCount?: number;\n  /** Up to `context` lines either side of the match; absent when context is 0. */\n  before?: string[];\n  after?: string[];\n}\n\nexport type Regex = RE2;\nexport interface RegexCompileOptions {\n  caseSensitive?: boolean;\n}\n\n/** Occurrence-counting bound, so one pathological line cannot spin forever. */\nconst MAX_MATCHES_PER_LINE = 100_000;\n\n/**\n * Compile a pattern on RE2 rather than on V8's irregexp.\n *\n * Patterns arrive from the MCP client, so a backtracking engine would let one\n * request pin the event loop with no way out: an abort signal cannot preempt a\n * synchronous `exec`, and on stdio that wedges the whole server. RE2 matches in\n * time linear in the input and cannot backtrack at all, so the hazard is gone\n * rather than bounded.\n *\n * RE2 rejects the constructs the tool schema documents as unsupported —\n * lookahead, lookbehind, backreferences — with its own {@link SyntaxError},\n * which the tool layer turns into a normal tool error. It always matches in\n * Unicode mode and requires the `u` flag to say so.\n *\n * Every compiled pattern owns memory in re2-wasm's fixed 16 MB heap, which\n * `ALLOW_MEMORY_GROWTH` is off for. re2-wasm never frees it and a\n * FinalizationRegistry does not keep up (V8 sees no pressure from the wasm\n * heap), so exhaustion is an emscripten `abort()` that kills regex search for\n * the rest of the process. Every caller MUST pass the result to\n * {@link freeRegex} when it is done with it.\n */\nexport function compileRegex(pattern: string, options: RegexCompileOptions = {}): Regex {\n  const flags = options.caseSensitive ? 'gu' : 'giu';\n  try {\n    return new RE2(pattern, flags);\n  } catch (error) {\n    if (!(error instanceof SyntaxError)) throw error;\n    throw new SyntaxError(\n      `${error.message} — lookahead, lookbehind, and backreferences are not supported.`,\n      { cause: error },\n    );\n  }\n}\n\n/**\n * Release a compiled pattern's wasm memory. re2-wasm exposes no disposal of its\n * own, so this reaches the embind handle it holds privately; a version that\n * renames the field degrades to the pre-existing leak rather than throwing.\n * Idempotent — a second call on an already-freed handle is swallowed. Using a\n * {@link Regex} after freeing it is undefined behaviour in the wasm heap, so\n * free only in a `finally` that owns the compile.\n */\nexport function freeRegex(regex: Regex | undefined): void {\n  const handle = (regex as unknown as { wrapper?: { delete?: () => void } } | undefined)?.wrapper;\n  try {\n    handle?.delete?.();\n  } catch {\n    // already deleted, or a re2-wasm build without embind disposal\n  }\n}\n\nexport interface RegexMatch {\n  /** The matched text. */\n  text: string;\n  /** Capture groups, 1-indexed in the pattern, 0-indexed here. */\n  groups: (string | undefined)[];\n  /** Named capture groups, when the pattern declares any. */\n  named: Record<string, string> | undefined;\n  /** Start offset in UTF-16 code units — usable with `String.prototype.slice`. */\n  start: number;\n  /** End offset in UTF-16 code units. */\n  end: number;\n}\n\n/** Code-point length of `text`, i.e. its UTF-16 length minus its surrogate pairs. */\nfunction codePointLength(text: string): number {\n  let length = 0;\n  for (let i = 0; i < text.length; i++) {\n    if ((text.charCodeAt(i) & 0xfc00) === 0xd800 && (text.charCodeAt(i + 1) & 0xfc00) === 0xdc00) {\n      i++;\n    }\n    length++;\n  }\n  return length;\n}\n\n/**\n * Iterate a global pattern's non-overlapping matches with offsets JS can use.\n *\n * re2-wasm reports `index` and `lastIndex` in **code points**, while every JS\n * string operation indexes in UTF-16 code units. The two agree only until the\n * first astral character (most emoji), past which every offset is short by one\n * per surrogate pair — slicing on the raw index cuts into the middle of\n * neighbouring text. Its `lastIndex` bookkeeping is worse still: it adds the\n * match's UTF-16 length to a code-point index, so an astral character inside a\n * match can skip the next one. This is the single place that corrects both; no\n * caller should read `match.index` or `regex.lastIndex` directly.\n *\n * Zero-length matches (e.g. `a*`) advance by one code point so they cannot loop\n * forever. The regex is global and shared across calls, so `lastIndex` is reset\n * on entry.\n */\nexport function* execMatches(regex: Regex, text: string): Generator<RegexMatch, undefined> {\n  regex.lastIndex = 0;\n  // Cursor into `text`, carried forward across matches: RE2 reports them in\n  // ascending order, so the walk is O(text) in total rather than per match.\n  let cursorCp = 0;\n  let cursorU16 = 0;\n  let match: RE2ExecArray | null;\n  while ((match = regex.exec(text)) !== null) {\n    while (cursorCp < match.index && cursorU16 < text.length) {\n      const isPair =\n        (text.charCodeAt(cursorU16) & 0xfc00) === 0xd800 &&\n        (text.charCodeAt(cursorU16 + 1) & 0xfc00) === 0xdc00;\n      cursorU16 += isPair ? 2 : 1;\n      cursorCp++;\n    }\n    const matched = match[0] ?? '';\n    const start = cursorU16;\n    yield {\n      text: matched,\n      groups: match.slice(1),\n      named: match.groups,\n      start,\n      end: start + matched.length,\n    };\n    // Own the advance rather than trusting the wrapper's mixed-unit arithmetic.\n    regex.lastIndex = match.index + (matched.length === 0 ? 1 : codePointLength(matched));\n  }\n}\n\n/**\n * Find non-overlapping occurrences of a global regex in a single line, reporting\n * the first match's column alongside the count.\n */\nfunction findLineMatches(\n  regex: Regex,\n  line: string,\n): { count: number; column: number } | undefined {\n  let count = 0;\n  let column = -1;\n  for (const match of execMatches(regex, line)) {\n    if (column === -1) column = match.start;\n    count++;\n    if (count >= MAX_MATCHES_PER_LINE) break;\n  }\n  return count > 0 ? { count, column } : undefined;\n}\n\nexport interface SearchContentOptions {\n  caseSensitive?: boolean;\n  isRegex?: boolean;\n  maxResults?: number;\n  filePattern?: string;\n  skipIgnored?: boolean;\n  includeHidden?: boolean;\n  maxDepth?: number;\n  /** Lines of context to carry either side of each match; 0 (default) carries none. */\n  context?: number;\n  signal?: AbortSignal;\n}\n\nexport interface SearchContentOutcome {\n  basePath: string;\n  matches: SearchResult[];\n  summary: {\n    /**\n     * Matching *lines*, one per entry in `matches` — not pattern occurrences.\n     * A line with three occurrences counts once here and reports 3 in its own\n     * `SearchResult.matchCount`.\n     */\n    matchingLines: number;\n    filesScanned: number;\n    filesMatched: number;\n    truncated: boolean;\n    /** Files the guard rejected or that could not be stat'd. */\n    skippedInaccessible: number;\n    /** Files skipped unread because they exceed maxFileSize. */\n    skippedTooLarge: number;\n    /**\n     * `StoppedReason` narrowed to the stops these scans can produce: both call\n     * only `hitMaxResults`/`hitAbort` (see concurrency.ts) — never\n     * `hitMaxFiles`, which belongs to `replace_text`'s per-file cap.\n     */\n    stoppedReason?: 'maxResults' | 'timeout';\n  };\n}\n\nexport async function searchContent(\n  directory: string,\n  pattern: string,\n  options: SearchContentOptions,\n  pathGuard: PathGuard,\n): Promise<SearchContentOutcome> {\n  const regex = compileRegex(options.isRegex ? pattern || '' : escapeRegexLiteral(pattern || ''), {\n    caseSensitive: Boolean(options.caseSensitive),\n  });\n  try {\n    const matches: SearchResult[] = [];\n    const maxResults = options.maxResults ?? 100;\n    const maxFileSize = getMaxTextFileSize();\n    const context = options.context ?? 0;\n\n    const entries = globEntries({\n      cwd: directory,\n      pattern: options.filePattern ?? '**/*',\n      includeHidden: Boolean(options.includeHidden),\n      skipIgnored: Boolean(options.skipIgnored),\n      ...(options.signal ? { signal: options.signal } : {}),\n      maxDepth: options.maxDepth ?? 100,\n      suppressErrors: true,\n    });\n\n    let filesScanned = 0;\n    let filesMatched = 0;\n    let matchingLines = 0;\n    let skippedTooLarge = 0;\n    const counters = { skippedInaccessible: 0, stoppedByAbort: false };\n\n    for await (const entry of guardedEntries(entries, pathGuard, options.signal, counters)) {\n      if (matches.length >= maxResults) break;\n\n      // Skip oversized files before reading to avoid unbounded memory use. Count\n      // them: \"no matches\" for a reason other than the pattern must be visible.\n      try {\n        const stats = await fsStat(entry.path);\n        if (stats.size > maxFileSize) {\n          skippedTooLarge++;\n          continue;\n        }\n      } catch {\n        counters.skippedInaccessible++;\n        continue;\n      }\n\n      filesScanned++;\n\n      try {\n        const content = await readFile(entry.path, { encoding: 'utf-8', signal: options.signal });\n        const lines = content.split('\\n');\n        // A trailing newline splits into a phantom empty last element; context\n        // must not report it as a line the file has.\n        const lineCount = content.endsWith('\\n') ? lines.length - 1 : lines.length;\n        let matchedFile = false;\n        for (let i = 0; i < lines.length; i++) {\n          const line = lines[i];\n          if (line === undefined) continue;\n          // One scan per line: findLineMatches resets lastIndex itself, so it\n          // doubles as the \"does this line match\" test.\n          const found = findLineMatches(regex, line);\n          if (found) {\n            matchedFile = true;\n            matchingLines++;\n            matches.push({\n              file: entry.path,\n              line: i + 1,\n              column: found.column,\n              content: line,\n              matchCount: found.count,\n              ...(context > 0\n                ? {\n                    before: lines.slice(Math.max(0, i - context), i),\n                    after: lines.slice(i + 1, Math.min(lineCount, i + 1 + context)),\n                  }\n                : {}),\n            });\n            if (matches.length >= maxResults) break;\n          }\n        }\n        if (matchedFile) filesMatched++;\n      } catch {\n        // A read failure while the signal is aborted IS the abort, not an\n        // unreadable file — stop rather than spend another iteration and then\n        // report a cut-short scan as complete.\n        if (options.signal?.aborted) {\n          counters.stoppedByAbort = true;\n          break;\n        }\n        // ignore read errors (e.g. binary files)\n      }\n    }\n\n    // The result cap is the definite cause even when the abort fired on the same\n    // iteration, matching StopReasonTracker's precedence for the two stops this\n    // scan can record (see the summary type's narrowing note).\n    const stoppedReason =\n      matches.length >= maxResults ? 'maxResults' : counters.stoppedByAbort ? 'timeout' : undefined;\n\n    return {\n      basePath: directory,\n      matches,\n      summary: {\n        matchingLines,\n        filesScanned,\n        filesMatched,\n        truncated: stoppedReason !== undefined,\n        skippedInaccessible: counters.skippedInaccessible,\n        skippedTooLarge,\n        ...(stoppedReason ? { stoppedReason } : {}),\n      },\n    };\n  } finally {\n    freeRegex(regex);\n  }\n}\n\nasync function* guardedEntries(\n  entries: AsyncIterable<GlobEntry>,\n  pathGuard: PathGuard,\n  signal: AbortSignal | undefined,\n  counters: { skippedInaccessible: number; stoppedByAbort: boolean },\n): AsyncGenerator<GlobEntry> {\n  // The signal carries both client cancellation and the tool's search timeout,\n  // so an abort means \"return what we have, marked incomplete\" rather than\n  // throw — but it must never be reported as a finished scan.\n  for await (const entry of entries) {\n    if (signal?.aborted) {\n      counters.stoppedByAbort = true;\n      return;\n    }\n    try {\n      await pathGuard.validateExistingPath(entry.path);\n    } catch {\n      counters.skippedInaccessible++;\n      continue;\n    }\n    yield entry;\n  }\n}\n\nexport async function searchFiles(\n  directory: string,\n  pattern: string,\n  options: {\n    maxResults?: number;\n    includeHidden?: boolean;\n    sortBy?: 'name' | 'path';\n    skipIgnored?: boolean;\n    maxDepth?: number;\n    signal?: AbortSignal;\n  },\n  pathGuard: PathGuard,\n): Promise<{\n  basePath: string;\n  results: { path: string }[];\n  summary: {\n    matched: number;\n    filesScanned: number;\n    truncated: boolean;\n    skippedInaccessible: number;\n    /** Narrowed like SearchContentOutcome's — scans never hit `hitMaxFiles`. */\n    stoppedReason?: 'maxResults' | 'timeout';\n  };\n}> {\n  const maxResults = options.maxResults ?? 100;\n  const entries = globEntries({\n    cwd: directory,\n    pattern,\n    includeHidden: Boolean(options.includeHidden),\n    skipIgnored: Boolean(options.skipIgnored),\n    ...(options.signal ? { signal: options.signal } : {}),\n    maxDepth: options.maxDepth ?? 100,\n    suppressErrors: true,\n  });\n  const results: { path: string }[] = [];\n  let filesScanned = 0;\n  const counters = { skippedInaccessible: 0, stoppedByAbort: false };\n\n  for await (const entry of guardedEntries(entries, pathGuard, options.signal, counters)) {\n    if (results.length >= maxResults) break;\n    filesScanned++;\n    results.push({ path: entry.path });\n  }\n\n  // Sorting — only name / path are supported; size / modified were removed\n  // (the glob never collected stats, so they were always undefined).\n  if (options.sortBy === 'name') {\n    results.sort((a, b) => basename(a.path).localeCompare(basename(b.path)));\n  } else {\n    results.sort((a, b) => a.path.localeCompare(b.path));\n  }\n\n  // Same precedence as above: the result cap wins over a same-iteration abort.\n  const stoppedReason =\n    results.length >= maxResults ? 'maxResults' : counters.stoppedByAbort ? 'timeout' : undefined;\n\n  return {\n    basePath: directory,\n    results,\n    summary: {\n      matched: results.length,\n      filesScanned,\n      truncated: stoppedReason !== undefined,\n      skippedInaccessible: counters.skippedInaccessible,\n      ...(stoppedReason ? { stoppedReason } : {}),\n    },\n  };\n}\n"]}

package/dist/core/sensitive.d.ts

@@ -1,6 +1,8 @@
 export declare class SensitiveMatcher {
-    private readonly patterns;
-    constructor(patterns?: readonly string[]);
+    private readonly builtin;
+    private readonly operator;
+    private readonly allow;
+    constructor(patterns?: readonly string[], allow?: readonly string[]);
     isSensitive(filePath: string): boolean;
 }
 //# sourceMappingURL=sensitive.d.ts.map

package/dist/core/sensitive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sensitive.d.ts","sourceRoot":"","sources":["../../src/core/sensitive.ts"],"names":[],"mappings":"AAiJA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;gBAElC,QAAQ,GAAE,SAAS,MAAM,EAA6B;IAIlE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAWvC"}
+{"version":3,"file":"sensitive.d.ts","sourceRoot":"","sources":["../../src/core/sensitive.ts"],"names":[],"mappings":"AAoUA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAqB;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAqB;gBAK/B,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,SAAS,MAAM,EAAE;IAanE,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;CAcvC"}

package/dist/core/sensitive.js

@@ -8,27 +8,178 @@ import { normalize, posix, sep } from 'node:path';
 import { cli } from './config.js';
 import { IS_WINDOWS, isAlpha, parseTrueEnvFlag, toPosixPath } from './primitives.js';
 const CHAR_COLON = 58;
-const CHAR_FORWARD_SLASH = 47;
 function normalizeForMatch(input) {
     // Always lowercase for case-insensitive denylist matching on all platforms.
-    return toPosixPath(normalize(input)).toLowerCase();
+    // normalize() preserves the double leading slash of UNC paths
+    // (//server/share/...) on Windows; collapse it to one so the compiled
+    // patterns — which carry no leading slash — still match their segments.
+    return toPosixPath(normalize(input)).toLowerCase().replace(/^\/+/u, '/');
 }
-function isWindowsAbsolutePosixPath(normalizedPattern) {
-    return (normalizedPattern.length >= 3 &&
-        normalizedPattern.charCodeAt(1) === CHAR_COLON &&
-        normalizedPattern.charCodeAt(2) === CHAR_FORWARD_SLASH &&
-        isAlpha(normalizedPattern.charCodeAt(0)));
+// posix.matchesGlob runs with dot:false semantics and does not honor a dot
+// option at all (verified on Node 24): '*' and '**' never match dot-leading
+// path segments, so a deny of `secrets/**` silently let `secrets/.env`
+// through — fail-open against exactly the hidden files this list exists to
+// guard. Compile our own matcher instead. Supported metacharacters: '*'
+// (any run within a segment), '**' (any run of whole segments), '?' (one
+// char), '[...]' classes, and '{a,b}' alternation; everything else is
+// literal, and dot-leading segments match like any other.
+const escapeRegExp = (text) => text.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+// Character classes can carry '{', '}' and ',' as members, so every scanner
+// below must skip a class's interior. classEnd returns the index of the ']'
+// closing the class opened at openIdx, or -1 when unclosed (then '[' is a
+// literal, matching globToRegExp's fallback). A ']' right after '[' or the
+// '!' negation is a literal member, per glob syntax.
+function classEnd(glob, openIdx) {
+    let i = openIdx + 1;
+    if (glob[i] === '!')
+        i++;
+    if (glob[i] === ']')
+        i++;
+    while (i < glob.length && glob[i] !== ']')
+        i++;
+    return i < glob.length ? i : -1;
 }
-function compilePatternGlobs(normalizedPattern) {
-    const globs = new Set([normalizedPattern]);
-    const isRooted = normalizedPattern.startsWith('**/') || isWindowsAbsolutePosixPath(normalizedPattern);
-    if (!isRooted) {
-        const withoutRoot = normalizedPattern.replace(/^\/+/, '');
-        if (withoutRoot) {
-            globs.add(`**/${withoutRoot}`);
+function expandBraces(glob) {
+    // First '{' outside any [...] class.
+    let open = -1;
+    for (let i = 0; i < glob.length; i++) {
+        const char = glob[i] ?? '';
+        if (char === '[') {
+            const end = classEnd(glob, i);
+            if (end !== -1)
+                i = end;
+        }
+        else if (char === '{') {
+            open = i;
+            break;
+        }
+    }
+    if (open === -1)
+        return [glob];
+    // Pair the outer '{' with ITS matching '}' — indexOf would grab the inner
+    // group's closer and produce garbage like 'data/x}/secret'. Then split the
+    // body on depth-0 commas so nested groups stay intact for the recursion.
+    let depth = 0;
+    let close = -1;
+    for (let i = open; i < glob.length; i++) {
+        const char = glob[i] ?? '';
+        if (char === '[') {
+            const end = classEnd(glob, i);
+            if (end !== -1) {
+                i = end;
+                continue;
+            }
+        }
+        if (char === '{')
+            depth++;
+        else if (char === '}') {
+            depth--;
+            if (depth === 0) {
+                close = i;
+                break;
+            }
+        }
+    }
+    if (close === -1)
+        return [glob];
+    const prefix = glob.slice(0, open);
+    const suffix = glob.slice(close + 1);
+    const body = glob.slice(open + 1, close);
+    const parts = [];
+    let start = 0;
+    depth = 0;
+    for (let i = 0; i < body.length; i++) {
+        const char = body[i] ?? '';
+        if (char === '[') {
+            const end = classEnd(body, i);
+            if (end !== -1) {
+                i = end;
+                continue;
+            }
+        }
+        if (char === '{')
+            depth++;
+        else if (char === '}')
+            depth--;
+        else if (char === ',' && depth === 0) {
+            parts.push(body.slice(start, i));
+            start = i + 1;
         }
     }
-    return Array.from(globs);
+    parts.push(body.slice(start));
+    return parts.flatMap((part) => expandBraces(`${prefix}${part}${suffix}`));
+}
+function globToRegExp(glob) {
+    const segments = glob.split('/');
+    let source = '';
+    for (let i = 0; i < segments.length; i++) {
+        const segment = segments[i] ?? '';
+        const last = i === segments.length - 1;
+        if (segment === '**') {
+            source += last ? '(?:.*)?' : '(?:[^/]+/)*';
+            continue;
+        }
+        for (let j = 0; j < segment.length; j++) {
+            const char = segment[j] ?? '';
+            if (char === '*') {
+                while (segment[j + 1] === '*')
+                    j++;
+                source += '[^/]*';
+            }
+            else if (char === '?') {
+                source += '[^/]';
+            }
+            else if (char === '[') {
+                // Same classEnd rule the scanners use: a ']' right after '[' (or
+                // after the '!' negation) is a literal member, not the closer.
+                const close = classEnd(segment, j);
+                if (close !== -1) {
+                    // Pass the class through, flipping glob '!' negation to '^' and
+                    // escaping backslashes so no body can make new RegExp throw. A
+                    // leading ']' must be escaped or the 'u' flag parses '[]a]' as an
+                    // empty class followed by stray literals; a leading '^' is a
+                    // literal member (glob negation is '!' only), unescaped it would
+                    // negate the class and relieve more than the operator named.
+                    let body = segment.slice(j + 1, close).replace(/\\/gu, '\\\\');
+                    const negated = body.startsWith('!');
+                    if (negated)
+                        body = body.slice(1);
+                    if (body.startsWith(']') || body.startsWith('^'))
+                        body = `\\${body}`;
+                    source += `[${negated ? '^' : ''}${body}]`;
+                    j = close;
+                }
+                else {
+                    source += escapeRegExp(char);
+                }
+            }
+            else {
+                source += escapeRegExp(char);
+            }
+        }
+        if (!last)
+            source += '/';
+    }
+    // Candidates are absolute paths but patterns carry no leading '/', so the
+    // anchor optionally eats the root slash — `**/` then reaches from any
+    // parent, exactly as matchesGlob's globstar did. '$' is strict in
+    // JavaScript (it matches end-of-input only, unlike PCRE's, which also
+    // matches before a final newline), so an exact-name pattern can never
+    // match a '.env\n' lookalike. The 's' flag makes the terminal-`**` `.`
+    // match newlines too: filenames can contain them, and a deny ending in
+    // '/**' must not fail open on 'secrets/plan\nnotes'.
+    return new RegExp(`^/?${source}$`, 'su');
+}
+function compilePatternGlobs(normalizedPattern) {
+    // A leading '/' (POSIX-absolute) is rooted like a Windows drive path:
+    // aliasing '/abs/secret' as '**/abs/secret' would also match
+    // 'other/abs/secret', and on the allow side that is over-relief. The
+    // drive-letter regex is safe on [a-z] because normalizeForMatch lowercased.
+    const isRooted = normalizedPattern.startsWith('/') ||
+        normalizedPattern.startsWith('**/') ||
+        /^[a-z]:\//u.test(normalizedPattern);
+    const withoutRoot = isRooted ? '' : normalizedPattern.replace(/^\/+/, '');
+    return withoutRoot ? [normalizedPattern, `**/${withoutRoot}`] : [normalizedPattern];
 }
 function toPatternSet(patterns) {
     const pathGlobs = new Set();
@@ -38,8 +189,11 @@ function toPatternSet(patterns) {
         const normalized = normalizeForMatch(pattern);
         const matchesPath = normalized.includes('/');
         const target = matchesPath ? pathGlobs : nameGlobs;
-        for (const glob of matchesPath ? compilePatternGlobs(normalized) : [normalized]) {
-            target.add(glob);
+        const globs = matchesPath ? compilePatternGlobs(normalized) : [normalized];
+        for (const glob of globs) {
+            for (const expanded of expandBraces(glob)) {
+                target.add(globToRegExp(expanded));
+            }
         }
     }
     return {
@@ -48,13 +202,7 @@ function toPatternSet(patterns) {
     };
 }
 function matchesAnyGlob(globs, candidate) {
-    if (globs.length === 0)
-        return false;
-    for (const glob of globs) {
-        if (posix.matchesGlob(candidate, glob))
-            return true;
-    }
-    return false;
+    return globs.some((glob) => glob.test(candidate));
 }
 // Strip NTFS alternate-data-stream suffixes (the ":stream" after a segment)
 // before denylist matching, so `.env:secret` is caught as `.env`. Preserves the
@@ -99,36 +247,106 @@ const DEFAULT_SENSITIVE_PATTERNS = [
     '*id_rsa*',
     '*id_dsa*',
 ];
-function buildSensitivePatterns() {
+// Built-ins and operator-supplied deny entries live in separate tiers because
+// they answer to different relief switches: an allow entry (FS_ALLOWLIST /
+// --allow) can lift a built-in hit, but never an explicit deny.
+// Split an env pattern list on commas and newlines at brace depth 0 only and
+// outside any [...] class, so documented syntax like '*.{pem,key}' or
+// 'x[1,2].env' survives as one pattern instead of tearing apart.
+function splitPatternList(value) {
+    const naive = () => value
+        .split(/,|\n/u)
+        .map((t) => t.trim())
+        .filter((t) => t.length > 0);
+    const parts = [];
+    let depth = 0;
+    let start = 0;
+    let unbalanced = false;
+    for (let i = 0; i < value.length; i++) {
+        const char = value[i] ?? '';
+        if (char === '[') {
+            const end = classEnd(value, i);
+            if (end !== -1) {
+                i = end;
+                continue;
+            }
+        }
+        if (char === '{')
+            depth++;
+        else if (char === '}') {
+            if (depth === 0)
+                unbalanced = true;
+            else
+                depth--;
+        }
+        else if (depth === 0 && (char === ',' || char === '\n')) {
+            parts.push(value.slice(start, i));
+            start = i + 1;
+        }
+    }
+    // An unbalanced brace would swallow every separator behind it into one
+    // bogus literal pattern and silently drop the real entries — '{bad,
+    // secrets/**' must not lose 'secrets/**'. A typo'd brace costs the brace
+    // pattern only: fall back to the naive split.
+    if (unbalanced || depth !== 0)
+        return naive();
+    parts.push(value.slice(start));
+    return parts.map((t) => t.trim()).filter((t) => t.length > 0);
+}
+function buildDenyTiers() {
     const allowSensitive = cli.allowSensitive ?? parseTrueEnvFlag(process.env['FS_ALLOW_SENSITIVE'], 'FS_ALLOW_SENSITIVE');
-    const envValue = process.env['FS_DENYLIST'];
-    const envDenylist = envValue
-        ? envValue
-            .split(/[,\n]/u)
-            .map((t) => t.trim())
-            .filter((t) => t.length > 0)
+    const envDenylist = process.env['FS_DENYLIST']
+        ? splitPatternList(process.env['FS_DENYLIST'])
         : [];
     const flagDenylist = cli.denyPatterns ?? [];
     // FS_ALLOW_SENSITIVE suppresses built-ins only; deny entries (env and --deny)
     // always apply. Set-dedupe so a pattern in both sources matches once.
-    return [
-        ...(allowSensitive ? [] : DEFAULT_SENSITIVE_PATTERNS),
-        ...new Set([...envDenylist, ...flagDenylist]),
-    ];
+    return {
+        builtin: allowSensitive ? [] : DEFAULT_SENSITIVE_PATTERNS,
+        operator: [...new Set([...envDenylist, ...flagDenylist])],
+    };
 }
+function buildAllowPatterns() {
+    const envAllowlist = process.env['FS_ALLOWLIST']
+        ? splitPatternList(process.env['FS_ALLOWLIST'])
+        : [];
+    const flagAllowlist = cli.allowPatterns ?? [];
+    return [...new Set([...envAllowlist, ...flagAllowlist])];
+}
+const EMPTY_PATTERN_SET = { pathGlobs: [], nameGlobs: [] };
 export class SensitiveMatcher {
-    patterns;
-    constructor(patterns = buildSensitivePatterns()) {
-        this.patterns = toPatternSet(patterns);
+    builtin;
+    operator;
+    allow;
+    // An explicit pattern list (tests, custom guards) is one relievable tier;
+    // the default construction splits built-ins from operator-supplied
+    // FS_DENYLIST/--deny entries, which allow entries can never lift.
+    constructor(patterns, allow) {
+        if (patterns !== undefined || allow !== undefined) {
+            this.builtin = toPatternSet(patterns ?? []);
+            this.operator = EMPTY_PATTERN_SET;
+            this.allow = toPatternSet(allow ?? []);
+        }
+        else {
+            const tiers = buildDenyTiers();
+            this.builtin = toPatternSet(tiers.builtin);
+            this.operator = toPatternSet(tiers.operator);
+            this.allow = toPatternSet(buildAllowPatterns());
+        }
     }
     isSensitive(filePath) {
-        if (this.patterns.pathGlobs.length === 0 && this.patterns.nameGlobs.length === 0) {
-            return false;
-        }
         const pathToCheck = IS_WINDOWS ? stripAlternateDataStreams(filePath) : filePath;
         const normalizedPath = normalizeForMatch(pathToCheck);
-        return (matchesAnyGlob(this.patterns.pathGlobs, normalizedPath) ||
-            matchesAnyGlob(this.patterns.nameGlobs, posix.basename(normalizedPath)));
+        const name = posix.basename(normalizedPath);
+        const matches = (set) => matchesAnyGlob(set.pathGlobs, normalizedPath) || matchesAnyGlob(set.nameGlobs, name);
+        // Explicit deny entries (FS_DENYLIST/--deny) always apply.
+        if (matches(this.operator))
+            return true;
+        if (!matches(this.builtin))
+            return false;
+        // A built-in hit is lifted only by an allow entry that matches the same
+        // normalized candidate — a pattern that matches nothing relieves nothing.
+        return !matches(this.allow);
     }
 }
 //# sourceMappingURL=sensitive.js.map