@j0hanz/filesystem-context-mcp 1.3.1 → 1.3.2

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.
Files changed (77) hide show
  1. package/dist/index.js +6 -0
  2. package/dist/index.js.map +1 -1
  3. package/dist/lib/file-operations/list-directory-helpers.d.ts +5 -0
  4. package/dist/lib/file-operations/list-directory-helpers.d.ts.map +1 -1
  5. package/dist/lib/file-operations/list-directory-helpers.js +29 -17
  6. package/dist/lib/file-operations/list-directory-helpers.js.map +1 -1
  7. package/dist/lib/file-operations/list-directory.d.ts.map +1 -1
  8. package/dist/lib/file-operations/list-directory.js +5 -1
  9. package/dist/lib/file-operations/list-directory.js.map +1 -1
  10. package/dist/lib/file-operations/read-multiple-files.d.ts.map +1 -1
  11. package/dist/lib/file-operations/read-multiple-files.js +33 -12
  12. package/dist/lib/file-operations/read-multiple-files.js.map +1 -1
  13. package/dist/lib/file-operations/search/context-manager.d.ts +2 -0
  14. package/dist/lib/file-operations/search/context-manager.d.ts.map +1 -1
  15. package/dist/lib/file-operations/search/context-manager.js +22 -8
  16. package/dist/lib/file-operations/search/context-manager.js.map +1 -1
  17. package/dist/lib/file-operations/search/engine-stream.d.ts.map +1 -1
  18. package/dist/lib/file-operations/search/engine-stream.js +85 -8
  19. package/dist/lib/file-operations/search/engine-stream.js.map +1 -1
  20. package/dist/lib/file-operations/search/file-processor.d.ts.map +1 -1
  21. package/dist/lib/file-operations/search/file-processor.js +11 -4
  22. package/dist/lib/file-operations/search/file-processor.js.map +1 -1
  23. package/dist/lib/file-operations/search/types.d.ts +2 -0
  24. package/dist/lib/file-operations/search/types.d.ts.map +1 -1
  25. package/dist/lib/file-operations/search-files-helpers.d.ts.map +1 -1
  26. package/dist/lib/file-operations/search-files-helpers.js +91 -14
  27. package/dist/lib/file-operations/search-files-helpers.js.map +1 -1
  28. package/dist/lib/fs-helpers/abort.d.ts +3 -0
  29. package/dist/lib/fs-helpers/abort.d.ts.map +1 -0
  30. package/dist/lib/fs-helpers/abort.js +15 -0
  31. package/dist/lib/fs-helpers/abort.js.map +1 -0
  32. package/dist/lib/fs-helpers/concurrency.d.ts.map +1 -1
  33. package/dist/lib/fs-helpers/concurrency.js +17 -3
  34. package/dist/lib/fs-helpers/concurrency.js.map +1 -1
  35. package/dist/lib/fs-helpers/readers/head-file.d.ts +1 -1
  36. package/dist/lib/fs-helpers/readers/head-file.d.ts.map +1 -1
  37. package/dist/lib/fs-helpers/readers/head-file.js +6 -3
  38. package/dist/lib/fs-helpers/readers/head-file.js.map +1 -1
  39. package/dist/lib/fs-helpers/readers/line-range.d.ts +1 -1
  40. package/dist/lib/fs-helpers/readers/line-range.d.ts.map +1 -1
  41. package/dist/lib/fs-helpers/readers/line-range.js +17 -3
  42. package/dist/lib/fs-helpers/readers/line-range.js.map +1 -1
  43. package/dist/lib/fs-helpers/readers/read-buffer.d.ts +1 -1
  44. package/dist/lib/fs-helpers/readers/read-buffer.d.ts.map +1 -1
  45. package/dist/lib/fs-helpers/readers/read-buffer.js +13 -1
  46. package/dist/lib/fs-helpers/readers/read-buffer.js.map +1 -1
  47. package/dist/lib/fs-helpers/readers/read-file-content.d.ts +4 -1
  48. package/dist/lib/fs-helpers/readers/read-file-content.d.ts.map +1 -1
  49. package/dist/lib/fs-helpers/readers/read-file-content.js +5 -5
  50. package/dist/lib/fs-helpers/readers/read-file-content.js.map +1 -1
  51. package/dist/lib/fs-helpers/readers/read-file.d.ts +3 -0
  52. package/dist/lib/fs-helpers/readers/read-file.d.ts.map +1 -1
  53. package/dist/lib/fs-helpers/readers/read-file.js +22 -5
  54. package/dist/lib/fs-helpers/readers/read-file.js.map +1 -1
  55. package/dist/lib/fs-helpers/readers/tail-file.d.ts +1 -1
  56. package/dist/lib/fs-helpers/readers/tail-file.d.ts.map +1 -1
  57. package/dist/lib/fs-helpers/readers/tail-file.js +6 -3
  58. package/dist/lib/fs-helpers/readers/tail-file.js.map +1 -1
  59. package/dist/lib/fs-helpers/readers.d.ts +1 -1
  60. package/dist/lib/fs-helpers/readers.d.ts.map +1 -1
  61. package/dist/lib/fs-helpers/readers.js +1 -1
  62. package/dist/lib/fs-helpers/readers.js.map +1 -1
  63. package/dist/lib/fs-helpers.d.ts +1 -1
  64. package/dist/lib/fs-helpers.d.ts.map +1 -1
  65. package/dist/lib/fs-helpers.js +1 -1
  66. package/dist/lib/fs-helpers.js.map +1 -1
  67. package/dist/tools/read-file.d.ts.map +1 -1
  68. package/dist/tools/read-file.js +13 -2
  69. package/dist/tools/read-file.js.map +1 -1
  70. package/dist/tools/read-multiple-files.d.ts.map +1 -1
  71. package/dist/tools/read-multiple-files.js +11 -1
  72. package/dist/tools/read-multiple-files.js.map +1 -1
  73. package/dist/tools/shared/abort.d.ts +5 -0
  74. package/dist/tools/shared/abort.d.ts.map +1 -0
  75. package/dist/tools/shared/abort.js +41 -0
  76. package/dist/tools/shared/abort.js.map +1 -0
  77. package/package.json +1 -1
package/dist/index.js CHANGED
@@ -43,6 +43,12 @@ process.on('SIGTERM', () => {
43
43
  process.on('SIGINT', () => {
44
44
  void shutdown('SIGINT');
45
45
  });
46
+ process.stdin.on('end', () => {
47
+ void shutdown('stdin end');
48
+ });
49
+ process.stdin.on('close', () => {
50
+ void shutdown('stdin close');
51
+ });
46
52
  main().catch((error) => {
47
53
  console.error('Fatal error:', error instanceof Error ? error.message : String(error));
48
54
  process.exit(1);
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,IAAI,YAAmC,CAAC;AACxC,IAAI,eAAe,GAAG,KAAK,CAAC;AAE5B,KAAK,UAAU,QAAQ,CAAC,MAAc;IACpC,IAAI,eAAe;QAAE,OAAO;IAC5B,eAAe,GAAG,IAAI,CAAC;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,EAAE,mBAAmB,CAAC,CAAC;IAExB,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CACX,mBAAmB,MAAM,IAAI,EAC7B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;IAEpD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,6BAA6B,CAAC,WAAW,CAAC,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CACX,uDAAuD,QAAQ,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE,GAAG,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;IACvE,YAAY,GAAG,MAAM,CAAC;IACtB,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;IACzB,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;IACxB,KAAK,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC9B,OAAO,CAAC,KAAK,CACX,cAAc,EACd,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEnE,MAAM,mBAAmB,GAAG,IAAI,CAAC;AACjC,IAAI,YAAmC,CAAC;AACxC,IAAI,eAAe,GAAG,KAAK,CAAC;AAE5B,KAAK,UAAU,QAAQ,CAAC,MAAc;IACpC,IAAI,eAAe;QAAE,OAAO;IAC5B,eAAe,GAAG,IAAI,CAAC;IAEvB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;QAC5B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,EAAE,mBAAmB,CAAC,CAAC;IAExB,IAAI,CAAC;QACH,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,CACX,mBAAmB,MAAM,IAAI,EAC7B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;IACJ,CAAC;YAAS,CAAC;QACT,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,MAAM,SAAS,EAAE,CAAC;IAEpD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,6BAA6B,CAAC,WAAW,CAAC,CAAC;QACjD,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,KAAK,CACX,uDAAuD,QAAQ,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,EAAE,GAAG,CAC1G,CAAC;IACJ,CAAC;IAED,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;IACvE,YAAY,GAAG,MAAM,CAAC;IACtB,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;AAC5B,CAAC;AAED,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;IACzB,KAAK,QAAQ,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;IACxB,KAAK,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC1B,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;IAC3B,KAAK,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;IAC7B,KAAK,QAAQ,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC,CAAC,CAAC;AAEH,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAc,EAAE,EAAE;IAC9B,OAAO,CAAC,KAAK,CACX,cAAc,EACd,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC,CAAC"}
@@ -1,3 +1,4 @@
1
+ import type { Minimatch } from 'minimatch';
1
2
  import type { DirectoryEntry } from '../../config/types.js';
2
3
  interface ListDirectoryState {
3
4
  entries: DirectoryEntry[];
@@ -16,14 +17,18 @@ export interface ListDirectoryConfig {
16
17
  recursive: boolean;
17
18
  includeHidden: boolean;
18
19
  excludePatterns: string[];
20
+ excludeMatchers: Minimatch[];
19
21
  maxDepth: number;
20
22
  maxEntries?: number;
21
23
  includeSymlinkTargets: boolean;
22
24
  pattern?: string;
25
+ patternMatcher?: Minimatch;
23
26
  signal?: AbortSignal;
24
27
  }
25
28
  export declare function initListState(): ListDirectoryState;
26
29
  export declare function createStopChecker(maxEntries: number | undefined, state: ListDirectoryState, signal?: AbortSignal): () => boolean;
30
+ export declare function buildExcludeMatchers(excludePatterns: string[]): Minimatch[];
31
+ export declare function buildPatternMatcher(pattern: string | undefined): Minimatch | undefined;
27
32
  export declare function handleDirectory(params: {
28
33
  currentPath: string;
29
34
  depth: number;
@@ -1 +1 @@
1
- {"version":3,"file":"list-directory-helpers.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,UAAU,kBAAkB;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,wBAAgB,aAAa,IAAI,kBAAkB,CAYlD;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,kBAAkB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,MAAM,OAAO,CAcf;AAwLD,wBAAsB,eAAe,CACnC,MAAM,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC9C,OAAO,EAAE,CAAC,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,EAChE,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
1
+ {"version":3,"file":"list-directory-helpers.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAQ5D,UAAU,kBAAkB;IAC1B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,eAAe,EAAE,SAAS,EAAE,CAAC;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,SAAS,CAAC;IAC3B,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,wBAAgB,aAAa,IAAI,kBAAkB,CAYlD;AAED,wBAAgB,iBAAiB,CAC/B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,KAAK,EAAE,kBAAkB,EACzB,MAAM,CAAC,EAAE,WAAW,GACnB,MAAM,OAAO,CAcf;AAwBD,wBAAgB,oBAAoB,CAAC,eAAe,EAAE,MAAM,EAAE,GAAG,SAAS,EAAE,CAK3E;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,MAAM,GAAG,SAAS,GAC1B,SAAS,GAAG,SAAS,CAGvB;AAqKD,wBAAsB,eAAe,CACnC,MAAM,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAC9C,OAAO,EAAE,CAAC,KAAK,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,KAAK,IAAI,EAChE,MAAM,EAAE,mBAAmB,EAC3B,KAAK,EAAE,kBAAkB,EACzB,UAAU,EAAE,MAAM,OAAO,GACxB,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
@@ -41,20 +41,32 @@ async function openDirectory(currentPath, onInaccessible) {
41
41
  return null;
42
42
  }
43
43
  }
44
- function shouldExcludeEntry(item, currentPath, basePath, excludePatterns) {
44
+ const EXCLUDE_MATCH_OPTIONS = {
45
+ dot: true,
46
+ nocase: process.platform === 'win32',
47
+ windowsPathsNoEscape: true,
48
+ };
49
+ const PATTERN_MATCH_OPTIONS = {
50
+ dot: true,
51
+ };
52
+ export function buildExcludeMatchers(excludePatterns) {
45
53
  if (excludePatterns.length === 0)
54
+ return [];
55
+ return excludePatterns.map((pattern) => new minimatch.Minimatch(pattern, EXCLUDE_MATCH_OPTIONS));
56
+ }
57
+ export function buildPatternMatcher(pattern) {
58
+ if (!pattern)
59
+ return undefined;
60
+ return new minimatch.Minimatch(pattern, PATTERN_MATCH_OPTIONS);
61
+ }
62
+ function shouldExcludeEntry(item, currentPath, basePath, excludeMatchers) {
63
+ if (excludeMatchers.length === 0)
46
64
  return false;
47
65
  const relativePath = path.relative(basePath, path.join(currentPath, item.name)) || item.name;
48
66
  const normalizedRelative = relativePath.replace(/\\/g, '/');
49
- const options = {
50
- dot: true,
51
- nocase: process.platform === 'win32',
52
- windowsPathsNoEscape: true,
53
- };
54
- return excludePatterns.some((pattern) => minimatch(item.name, pattern, options) ||
55
- minimatch(normalizedRelative, pattern, options));
67
+ return excludeMatchers.some((matcher) => matcher.match(item.name) || matcher.match(normalizedRelative));
56
68
  }
57
- async function* streamVisibleItems(currentPath, basePath, includeHidden, excludePatterns, onInaccessible, onScanned, onVisible) {
69
+ async function* streamVisibleItems(currentPath, basePath, includeHidden, excludeMatchers, onInaccessible, onScanned, onVisible) {
58
70
  const dir = await openDirectory(currentPath, onInaccessible);
59
71
  if (!dir)
60
72
  return;
@@ -63,7 +75,7 @@ async function* streamVisibleItems(currentPath, basePath, includeHidden, exclude
63
75
  onScanned();
64
76
  if (shouldIncludeEntry(item, currentPath, basePath, {
65
77
  includeHidden,
66
- excludePatterns,
78
+ excludeMatchers,
67
79
  })) {
68
80
  onVisible();
69
81
  yield item;
@@ -80,14 +92,14 @@ async function* streamVisibleItems(currentPath, basePath, includeHidden, exclude
80
92
  function shouldIncludeEntry(item, currentPath, basePath, options) {
81
93
  if (!options.includeHidden && isHidden(item.name))
82
94
  return false;
83
- if (shouldExcludeEntry(item, currentPath, basePath, options.excludePatterns)) {
95
+ if (shouldExcludeEntry(item, currentPath, basePath, options.excludeMatchers)) {
84
96
  return false;
85
97
  }
86
98
  return true;
87
99
  }
88
- function applyDirectoryItemResult(result, state, enqueue, pattern) {
100
+ function applyDirectoryItemResult(result, state, enqueue, patternMatcher) {
89
101
  const { entry, enqueueDir, skippedInaccessible, symlinkNotFollowed } = result;
90
- if (!pattern || minimatch(entry.relativePath, pattern, { dot: true })) {
102
+ if (!patternMatcher || patternMatcher.match(entry.relativePath)) {
91
103
  state.entries.push(entry);
92
104
  applyEntryCounts(entry, state);
93
105
  }
@@ -110,11 +122,11 @@ function applyResultFlags(state, skippedInaccessible, symlinkNotFollowed) {
110
122
  if (symlinkNotFollowed)
111
123
  state.symlinksNotFollowed++;
112
124
  }
113
- function processResults(results, state, enqueue, shouldStop, pattern) {
125
+ function processResults(results, state, enqueue, shouldStop, patternMatcher) {
114
126
  for (const result of results) {
115
127
  if (shouldStop())
116
128
  break;
117
- applyDirectoryItemResult(result, state, enqueue, pattern);
129
+ applyDirectoryItemResult(result, state, enqueue, patternMatcher);
118
130
  }
119
131
  }
120
132
  async function flushBatch(batch, params, config, state, enqueue, shouldStop) {
@@ -130,7 +142,7 @@ async function flushBatch(batch, params, config, state, enqueue, shouldStop) {
130
142
  maxDepth: config.maxDepth,
131
143
  }), PARALLEL_CONCURRENCY, config.signal);
132
144
  state.skippedInaccessible += errors.length;
133
- processResults(results, state, enqueue, shouldStop, config.pattern);
145
+ processResults(results, state, enqueue, shouldStop, config.patternMatcher);
134
146
  }
135
147
  async function processItemStream(itemStream, batch, params, config, state, enqueue, shouldStop) {
136
148
  for await (const item of itemStream) {
@@ -146,7 +158,7 @@ export async function handleDirectory(params, enqueue, config, state, shouldStop
146
158
  if (params.depth > config.maxDepth || shouldStop())
147
159
  return;
148
160
  state.maxDepthReached = Math.max(state.maxDepthReached, params.depth);
149
- const itemStream = streamVisibleItems(params.currentPath, config.basePath, config.includeHidden, config.excludePatterns, () => {
161
+ const itemStream = streamVisibleItems(params.currentPath, config.basePath, config.includeHidden, config.excludeMatchers, () => {
150
162
  state.skippedInaccessible++;
151
163
  }, () => {
152
164
  state.entriesScanned++;
@@ -1 +1 @@
1
- {"version":3,"file":"list-directory-helpers.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"list-directory-helpers.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory-helpers.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"list-directory.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAiBjE,UAAU,oBAAoB;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAuCD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAkC9B"}
1
+ {"version":3,"file":"list-directory.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAmBjE,UAAU,oBAAoB;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,CAAC;IAC/C,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAuCD,wBAAsB,aAAa,CACjC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAsC9B"}
@@ -2,7 +2,7 @@ import { DEFAULT_LIST_MAX_ENTRIES, DEFAULT_MAX_DEPTH, DIR_TRAVERSAL_CONCURRENCY,
2
2
  import { runWorkQueue } from '../fs-helpers.js';
3
3
  import { mergeDefined } from '../merge-defined.js';
4
4
  import { validateExistingDirectory } from '../path-validation.js';
5
- import { createStopChecker, handleDirectory, initListState, } from './list-directory-helpers.js';
5
+ import { buildExcludeMatchers, buildPatternMatcher, createStopChecker, handleDirectory, initListState, } from './list-directory-helpers.js';
6
6
  import { sortByField } from './sorting.js';
7
7
  function normalizeListDirectoryOptions(options) {
8
8
  const defaults = {
@@ -37,15 +37,19 @@ export async function listDirectory(dirPath, options = {}) {
37
37
  const basePath = await validateExistingDirectory(dirPath);
38
38
  const state = initListState();
39
39
  const shouldStop = createStopChecker(normalized.maxEntries, state, signal);
40
+ const excludeMatchers = buildExcludeMatchers(normalized.excludePatterns);
41
+ const patternMatcher = buildPatternMatcher(normalized.pattern);
40
42
  const config = {
41
43
  basePath,
42
44
  recursive: normalized.recursive,
43
45
  includeHidden: normalized.includeHidden,
44
46
  excludePatterns: normalized.excludePatterns,
47
+ excludeMatchers,
45
48
  maxDepth: normalized.maxDepth,
46
49
  maxEntries: normalized.maxEntries,
47
50
  includeSymlinkTargets: normalized.includeSymlinkTargets,
48
51
  pattern: normalized.pattern,
52
+ patternMatcher,
49
53
  signal,
50
54
  };
51
55
  await runWorkQueue([{ currentPath: basePath, depth: 0 }], async (params, enqueue) => handleDirectory(params, enqueue, config, state, shouldStop), DIR_TRAVERSAL_CONCURRENCY, signal);
@@ -1 +1 @@
1
- {"version":3,"file":"list-directory.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"AACA,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,uBAAuB,CAAC;AAClE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,aAAa,GAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAkB3C,SAAS,6BAA6B,CACpC,OAA6C;IAE7C,MAAM,QAAQ,GAAmC;QAC/C,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,KAAK;QACpB,eAAe,EAAE,EAAE;QACnB,QAAQ,EAAE,iBAAiB;QAC3B,UAAU,EAAE,wBAAwB;QACpC,MAAM,EAAE,MAAM;QACd,qBAAqB,EAAE,KAAK;QAC5B,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,YAAY,CACnB,KAAuC;IAEvC,OAAO;QACL,YAAY,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM;QAClC,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;QACxC,eAAe,EAAE,KAAK,CAAC,eAAe;QACtC,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,aAAa,EAAE,KAAK,CAAC,aAAa;QAClC,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,mBAAmB,EAAE,KAAK,CAAC,mBAAmB;QAC9C,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,cAAc,EAAE,KAAK,CAAC,cAAc;KACrC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAe,EACf,UAAgC,EAAE;IAElC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,UAAU,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;IAEvD,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,aAAa,EAAE,CAAC;IAC9B,MAAM,UAAU,GAAG,iBAAiB,CAAC,UAAU,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAwB;QAClC,QAAQ;QACR,SAAS,EAAE,UAAU,CAAC,SAAS;QAC/B,aAAa,EAAE,UAAU,CAAC,aAAa;QACvC,eAAe,EAAE,UAAU,CAAC,eAAe;QAC3C,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,qBAAqB,EAAE,UAAU,CAAC,qBAAqB;QACvD,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,MAAM;KACP,CAAC;IAEF,MAAM,YAAY,CAChB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EACrC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,CACxB,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,CAAC,EAC7D,yBAAyB,EACzB,MAAM,CACP,CAAC;IAEF,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;IAE9C,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,YAAY,CAAC,KAAK,CAAC;KAC7B,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"list-directory.js","sourceRoot":"","sources":["../../../src/lib/file-operations/list-directory.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/read-multiple-files.ts"],"names":[],"mappings":"AAOA,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,CAAC;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAWD,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AA+ND,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAuC/B"}
1
+ {"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/read-multiple-files.ts"],"names":[],"mappings":"AAYA,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,WAAW,CAAC;IAClD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAkBD,UAAU,mBAAmB;IAC3B,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAmQD,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EAAE,EACnB,OAAO,GAAE,mBAAwB,GAChC,OAAO,CAAC,kBAAkB,EAAE,CAAC,CA2C/B"}
@@ -1,7 +1,7 @@
1
1
  import * as fs from 'node:fs/promises';
2
2
  import { MAX_TEXT_FILE_SIZE, PARALLEL_CONCURRENCY } from '../constants.js';
3
3
  import { ErrorCode, McpError } from '../errors.js';
4
- import { processInParallel, readFile } from '../fs-helpers.js';
4
+ import { processInParallel, readFile, readFileWithStats, } from '../fs-helpers.js';
5
5
  import { validateExistingPath } from '../path-validation.js';
6
6
  function assertLineRangeComplete(lineStart, lineEnd) {
7
7
  const hasLineStart = lineStart !== undefined;
@@ -57,30 +57,47 @@ function isPartialRead(options) {
57
57
  }
58
58
  async function collectFileBudget(filePaths, isPartialRead, maxTotalSize, maxSize, signal) {
59
59
  const skippedBudget = new Set();
60
+ const validated = new Map();
60
61
  // Gather file sizes
61
62
  const { results } = await processInParallel(filePaths.map((filePath, index) => ({ filePath, index })), async ({ filePath, index }) => {
62
63
  const validPath = await validateExistingPath(filePath);
63
64
  const stats = await fs.stat(validPath);
64
- return { filePath, index, size: stats.size };
65
+ return { filePath, index, validPath, stats };
65
66
  }, PARALLEL_CONCURRENCY, signal);
66
67
  // Determine which files to skip based on budget
67
68
  let totalSize = 0;
68
69
  const orderedResults = [...results].sort((a, b) => a.index - b.index);
69
70
  for (const result of orderedResults) {
71
+ validated.set(result.index, {
72
+ index: result.index,
73
+ filePath: result.filePath,
74
+ validPath: result.validPath,
75
+ stats: result.stats,
76
+ });
70
77
  const estimatedSize = isPartialRead
71
- ? Math.min(result.size, maxSize)
72
- : result.size;
78
+ ? Math.min(result.stats.size, maxSize)
79
+ : result.stats.size;
73
80
  if (totalSize + estimatedSize > maxTotalSize) {
74
81
  skippedBudget.add(result.index);
75
82
  continue;
76
83
  }
77
84
  totalSize += estimatedSize;
78
85
  }
79
- return { skippedBudget };
86
+ return { skippedBudget, validated };
80
87
  }
81
- function buildProcessTargets(filePaths, skippedBudget) {
88
+ function buildProcessTargets(filePaths, skippedBudget, validated) {
82
89
  return filePaths
83
- .map((filePath, index) => ({ filePath, index }))
90
+ .map((filePath, index) => {
91
+ const cached = validated.get(index);
92
+ return cached
93
+ ? {
94
+ filePath,
95
+ index,
96
+ validPath: cached.validPath,
97
+ stats: cached.stats,
98
+ }
99
+ : { filePath, index };
100
+ })
84
101
  .filter(({ index }) => !skippedBudget.has(index));
85
102
  }
86
103
  function applyParallelResults(output, results, errors, filePaths) {
@@ -116,14 +133,18 @@ function mapParallelErrors(errors, filesToProcess) {
116
133
  });
117
134
  }
118
135
  async function readFilesInParallel(filesToProcess, options, signal) {
119
- return await processInParallel(filesToProcess, async ({ filePath, index }) => {
120
- const result = await readFile(filePath, {
136
+ return await processInParallel(filesToProcess, async ({ filePath, index, validPath, stats }) => {
137
+ const readOptions = {
121
138
  encoding: options.encoding,
122
139
  maxSize: options.maxSize,
123
140
  head: options.head,
124
141
  tail: options.tail,
125
142
  lineRange: options.lineRange,
126
- });
143
+ signal,
144
+ };
145
+ const result = validPath && stats
146
+ ? await readFileWithStats(filePath, validPath, stats, readOptions)
147
+ : await readFile(filePath, readOptions);
127
148
  return {
128
149
  index,
129
150
  value: {
@@ -150,8 +171,8 @@ export async function readMultipleFiles(filePaths, options = {}) {
150
171
  assertExclusiveReadOptions(normalized.lineRange, normalized.head, normalized.tail);
151
172
  const output = createOutputSkeleton(filePaths);
152
173
  const partialRead = isPartialRead(normalized);
153
- const { skippedBudget } = await collectFileBudget(filePaths, partialRead, normalized.maxTotalSize, normalized.maxSize, signal);
154
- const filesToProcess = buildProcessTargets(filePaths, skippedBudget);
174
+ const { skippedBudget, validated } = await collectFileBudget(filePaths, partialRead, normalized.maxTotalSize, normalized.maxSize, signal);
175
+ const filesToProcess = buildProcessTargets(filePaths, skippedBudget, validated);
155
176
  const { results, errors } = await readFilesInParallel(filesToProcess, normalized, signal);
156
177
  const mappedErrors = mapParallelErrors(errors, filesToProcess);
157
178
  applyParallelResults(output, results, mappedErrors, filePaths);
@@ -1 +1 @@
1
- {"version":3,"file":"read-multiple-files.js","sourceRoot":"","sources":["../../../src/lib/file-operations/read-multiple-files.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"read-multiple-files.js","sourceRoot":"","sources":["../../../src/lib/file-operations/read-multiple-files.ts"],"names":[],"mappings":"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"}
@@ -2,7 +2,9 @@ import type { ContentMatch } from '../../../config/types.js';
2
2
  export declare class ContextManager {
3
3
  private readonly contextLines;
4
4
  private readonly buffer;
5
+ private bufferStart;
5
6
  private readonly pendingMatches;
7
+ private pendingStart;
6
8
  constructor(contextLines: number);
7
9
  pushLine(line: string): void;
8
10
  createMatch(filePath: string, line: number, content: string, matchCount: number): ContentMatch;
@@ -1 +1 @@
1
- {"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7D,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;gBAEzC,YAAY,EAAE,MAAM;IAIhC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO5B,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,YAAY;IAmBf,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,WAAW;CAMpB"}
1
+ {"version":3,"file":"context-manager.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/context-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO7D,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAgB;IACvC,OAAO,CAAC,WAAW,CAAK;IACxB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAsB;IACrD,OAAO,CAAC,YAAY,CAAK;gBAEb,YAAY,EAAE,MAAM;IAIhC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAO5B,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,YAAY;IAmBf,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,qBAAqB;IAgB7B,OAAO,CAAC,WAAW;CAUpB"}
@@ -1,7 +1,9 @@
1
1
  export class ContextManager {
2
2
  contextLines;
3
3
  buffer = [];
4
+ bufferStart = 0;
4
5
  pendingMatches = [];
6
+ pendingStart = 0;
5
7
  constructor(contextLines) {
6
8
  this.contextLines = contextLines;
7
9
  }
@@ -18,8 +20,8 @@ export class ContextManager {
18
20
  content,
19
21
  matchCount,
20
22
  };
21
- if (this.buffer.length > 0) {
22
- match.contextBefore = [...this.buffer];
23
+ if (this.buffer.length > this.bufferStart) {
24
+ match.contextBefore = this.buffer.slice(this.bufferStart);
23
25
  }
24
26
  if (this.contextLines > 0) {
25
27
  this.pendingMatches.push({ match, afterNeeded: this.contextLines });
@@ -31,7 +33,10 @@ export class ContextManager {
31
33
  this.pruneCompletedMatches();
32
34
  }
33
35
  appendPendingContext(line) {
34
- for (const pending of this.pendingMatches) {
36
+ for (let i = this.pendingStart; i < this.pendingMatches.length; i++) {
37
+ const pending = this.pendingMatches[i];
38
+ if (!pending)
39
+ continue;
35
40
  if (pending.afterNeeded <= 0)
36
41
  continue;
37
42
  pending.match.contextAfter ??= [];
@@ -40,15 +45,24 @@ export class ContextManager {
40
45
  }
41
46
  }
42
47
  pruneCompletedMatches() {
43
- while (this.pendingMatches.length > 0 &&
44
- this.pendingMatches[0]?.afterNeeded === 0) {
45
- this.pendingMatches.shift();
48
+ while (this.pendingStart < this.pendingMatches.length &&
49
+ this.pendingMatches[this.pendingStart]?.afterNeeded === 0) {
50
+ this.pendingStart++;
51
+ }
52
+ if (this.pendingStart > 1024 &&
53
+ this.pendingStart * 2 > this.pendingMatches.length) {
54
+ this.pendingMatches.splice(0, this.pendingStart);
55
+ this.pendingStart = 0;
46
56
  }
47
57
  }
48
58
  addToBuffer(line) {
49
59
  this.buffer.push(line);
50
- if (this.buffer.length > this.contextLines) {
51
- this.buffer.shift();
60
+ if (this.buffer.length - this.bufferStart > this.contextLines) {
61
+ this.bufferStart++;
62
+ }
63
+ if (this.bufferStart > 1024 && this.bufferStart * 2 > this.buffer.length) {
64
+ this.buffer.splice(0, this.bufferStart);
65
+ this.bufferStart = 0;
52
66
  }
53
67
  }
54
68
  }
@@ -1 +1 @@
1
- {"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/context-manager.ts"],"names":[],"mappings":"AAOA,MAAM,OAAO,cAAc;IACR,YAAY,CAAS;IACrB,MAAM,GAAa,EAAE,CAAC;IACtB,cAAc,GAAmB,EAAE,CAAC;IAErD,YAAY,YAAoB;QAC9B,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,QAAQ,CAAC,IAAY;QACnB,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC;YAAE,OAAO;QAEnC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,WAAW,CACT,QAAgB,EAChB,IAAY,EACZ,OAAe,EACf,UAAkB;QAElB,MAAM,KAAK,GAAiB;YAC1B,IAAI,EAAE,QAAQ;YACd,IAAI;YACJ,OAAO;YACP,UAAU;SACX,CAAC;QAEF,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,KAAK,CAAC,aAAa,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,oBAAoB,CAAC,IAAY;QACvC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAEO,oBAAoB,CAAC,IAAY;QACvC,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YAC1C,IAAI,OAAO,CAAC,WAAW,IAAI,CAAC;gBAAE,SAAS;YACvC,OAAO,CAAC,KAAK,CAAC,YAAY,KAAK,EAAE,CAAC;YAClC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO,CAAC,WAAW,EAAE,CAAC;QACxB,CAAC;IACH,CAAC;IAEO,qBAAqB;QAC3B,OACE,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC;YAC9B,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,EACzC,CAAC;YACD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC9B,CAAC;IACH,CAAC;IAEO,WAAW,CAAC,IAAY;QAC9B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QACtB,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"context-manager.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/context-manager.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"engine-stream.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-stream.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,YAAY,CAAC;AAqB1D,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,GACrB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAYhC;AAkKD,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA0Bf"}
1
+ {"version":3,"file":"engine-stream.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/engine-stream.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,YAAY,CAAC;AAgF1D,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,aAAa,GACrB,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,CAYhC;AAuKD,wBAAsB,aAAa,CACjC,MAAM,EAAE,aAAa,CAAC,MAAM,GAAG,MAAM,CAAC,EACtC,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,aAAa,EACtB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,aAAa,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CAyCf"}
@@ -1,6 +1,58 @@
1
1
  import fg from 'fast-glob';
2
2
  import { PARALLEL_CONCURRENCY } from '../../constants.js';
3
+ import { safeDestroy } from '../../fs-helpers.js';
3
4
  import { processFile } from './file-processor.js';
5
+ function attachStreamGuards(stream, searchState, deadlineMs, signal) {
6
+ let stopReason = null;
7
+ let timeoutId;
8
+ const destroyStream = () => {
9
+ safeDestroy(stream);
10
+ };
11
+ const onAbort = () => {
12
+ if (stopReason === null) {
13
+ const isTimeout = deadlineMs !== undefined && Date.now() >= deadlineMs;
14
+ if (isTimeout) {
15
+ stopReason = 'timeout';
16
+ searchState.truncated = true;
17
+ searchState.stoppedReason = 'timeout';
18
+ }
19
+ else {
20
+ stopReason = 'abort';
21
+ }
22
+ }
23
+ if (timeoutId) {
24
+ clearTimeout(timeoutId);
25
+ timeoutId = undefined;
26
+ }
27
+ destroyStream();
28
+ };
29
+ if (signal?.aborted) {
30
+ onAbort();
31
+ }
32
+ else if (signal) {
33
+ signal.addEventListener('abort', onAbort, { once: true });
34
+ }
35
+ if (deadlineMs !== undefined) {
36
+ const delay = Math.max(0, deadlineMs - Date.now());
37
+ timeoutId = setTimeout(() => {
38
+ if (stopReason === 'abort')
39
+ return;
40
+ stopReason = 'timeout';
41
+ searchState.truncated = true;
42
+ searchState.stoppedReason = 'timeout';
43
+ destroyStream();
44
+ }, delay);
45
+ }
46
+ return {
47
+ getStopReason: () => stopReason,
48
+ cleanup: () => {
49
+ if (signal)
50
+ signal.removeEventListener('abort', onAbort);
51
+ if (timeoutId)
52
+ clearTimeout(timeoutId);
53
+ },
54
+ };
55
+ }
4
56
  export function createStream(basePath, options) {
5
57
  return fg.stream(options.filePattern, {
6
58
  cwd: basePath,
@@ -47,6 +99,10 @@ function updateState(state, result) {
47
99
  state.filesMatched++;
48
100
  }
49
101
  state.linesSkippedDueToRegexTimeout += result.linesSkippedDueToRegexTimeout;
102
+ if (result.hitMaxResults && !state.truncated) {
103
+ state.truncated = true;
104
+ state.stoppedReason = 'maxResults';
105
+ }
50
106
  }
51
107
  function buildProcessorBaseOptions(options, deadlineMs, searchPattern) {
52
108
  return {
@@ -114,6 +170,7 @@ function createProcessingTask(rawPath, state, matcher, processorBaseOptions, opt
114
170
  const result = await processFile(rawPath, matcher, {
115
171
  ...processorBaseOptions,
116
172
  currentMatchCount: state.matches.length,
173
+ getCurrentMatchCount: () => state.matches.length,
117
174
  signal,
118
175
  });
119
176
  updateState(state, result);
@@ -125,14 +182,34 @@ function createProcessingTask(rawPath, state, matcher, processorBaseOptions, opt
125
182
  }
126
183
  export async function processStream(stream, searchState, matcher, options, deadlineMs, searchPattern, signal) {
127
184
  const processing = createProcessingState(options, deadlineMs, searchPattern);
128
- for await (const entry of stream) {
129
- if (signal?.aborted)
130
- break;
131
- const action = await handleStreamEntry(entry, searchState, processing, matcher, options, deadlineMs, signal);
132
- if (action === 'stop')
133
- break;
134
- }
135
- await Promise.all(processing.active);
185
+ const guard = attachStreamGuards(stream, searchState, deadlineMs, signal);
186
+ try {
187
+ for await (const entry of stream) {
188
+ if (signal?.aborted)
189
+ break;
190
+ const action = await handleStreamEntry(entry, searchState, processing, matcher, options, deadlineMs, signal);
191
+ if (action === 'stop')
192
+ break;
193
+ }
194
+ }
195
+ catch (error) {
196
+ const reason = guard.getStopReason();
197
+ if (reason === 'timeout') {
198
+ // fall through to finalize below
199
+ }
200
+ else if (reason === 'abort') {
201
+ const abortError = new Error('Search aborted');
202
+ abortError.name = 'AbortError';
203
+ throw abortError;
204
+ }
205
+ else {
206
+ throw error;
207
+ }
208
+ }
209
+ finally {
210
+ guard.cleanup();
211
+ await Promise.all(processing.active);
212
+ }
136
213
  if (deadlineMs && Date.now() > deadlineMs && !searchState.truncated) {
137
214
  searchState.truncated = true;
138
215
  searchState.stoppedReason = 'timeout';