@j0hanz/filesystem-context-mcp 1.2.4 → 1.2.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/file-operations/list-directory-helpers.d.ts +28 -0
- package/dist/lib/file-operations/list-directory-helpers.d.ts.map +1 -0
- package/dist/lib/file-operations/list-directory-helpers.js +159 -0
- package/dist/lib/file-operations/list-directory-helpers.js.map +1 -0
- package/dist/lib/file-operations/list-directory.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory.js +3 -157
- package/dist/lib/file-operations/list-directory.js.map +1 -1
- package/dist/lib/file-operations/search/engine.d.ts +17 -25
- package/dist/lib/file-operations/search/engine.d.ts.map +1 -1
- package/dist/lib/file-operations/search/engine.js +161 -165
- package/dist/lib/file-operations/search/engine.js.map +1 -1
- package/dist/lib/file-operations/search/file-processor.d.ts +2 -14
- package/dist/lib/file-operations/search/file-processor.d.ts.map +1 -1
- package/dist/lib/file-operations/search/file-processor.js +93 -102
- package/dist/lib/file-operations/search/file-processor.js.map +1 -1
- package/dist/lib/file-operations/search/match-strategy.d.ts +3 -21
- package/dist/lib/file-operations/search/match-strategy.d.ts.map +1 -1
- package/dist/lib/file-operations/search/match-strategy.js +36 -50
- package/dist/lib/file-operations/search/match-strategy.js.map +1 -1
- package/dist/lib/file-operations/search-content.d.ts.map +1 -1
- package/dist/lib/file-operations/search-content.js +2 -3
- package/dist/lib/file-operations/search-content.js.map +1 -1
- package/dist/tools/search-content.d.ts.map +1 -1
- package/dist/tools/search-content.js +1 -111
- package/dist/tools/search-content.js.map +1 -1
- package/dist/tools/shared/search-formatting.d.ts +8 -0
- package/dist/tools/shared/search-formatting.d.ts.map +1 -0
- package/dist/tools/shared/search-formatting.js +112 -0
- package/dist/tools/shared/search-formatting.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-processor.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAC;AAI1C,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAItD,
|
|
1
|
+
{"version":3,"file":"file-processor.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/file-processor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,26 +1,8 @@
|
|
|
1
|
-
export
|
|
2
|
-
|
|
3
|
-
isValid(): boolean;
|
|
4
|
-
}
|
|
5
|
-
export declare class LiteralMatchStrategy implements MatchStrategy {
|
|
6
|
-
private readonly needle;
|
|
7
|
-
private readonly haystackTransform;
|
|
8
|
-
constructor(pattern: string, caseSensitive: boolean);
|
|
9
|
-
countMatches(line: string): number;
|
|
10
|
-
isValid(): boolean;
|
|
11
|
-
}
|
|
12
|
-
export declare class RegexMatchStrategy implements MatchStrategy {
|
|
13
|
-
private readonly regex;
|
|
14
|
-
private readonly timeoutMs;
|
|
15
|
-
constructor(regex: RegExp, timeoutMs?: number);
|
|
16
|
-
countMatches(line: string): number;
|
|
17
|
-
isValid(): boolean;
|
|
18
|
-
private shouldCheckTimeout;
|
|
19
|
-
}
|
|
20
|
-
export declare function createMatchStrategy(pattern: string, options: {
|
|
1
|
+
export type Matcher = (line: string) => number;
|
|
2
|
+
export declare function createMatcher(pattern: string, options: {
|
|
21
3
|
isLiteral: boolean;
|
|
22
4
|
wholeWord: boolean;
|
|
23
5
|
caseSensitive: boolean;
|
|
24
6
|
basePath: string;
|
|
25
|
-
}):
|
|
7
|
+
}): Matcher;
|
|
26
8
|
//# sourceMappingURL=match-strategy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match-strategy.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAKA,MAAM,
|
|
1
|
+
{"version":3,"file":"match-strategy.d.ts","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;AAE/C,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IACP,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,GACA,OAAO,CAeT"}
|
|
@@ -1,83 +1,69 @@
|
|
|
1
1
|
import safeRegex from 'safe-regex2';
|
|
2
2
|
import { REGEX_MATCH_TIMEOUT_MS } from '../../constants.js';
|
|
3
3
|
import { ErrorCode, McpError } from '../../errors.js';
|
|
4
|
-
export
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
this.needle = caseSensitive ? pattern : pattern.toLowerCase();
|
|
9
|
-
this.haystackTransform = caseSensitive ? (s) => s : (s) => s.toLowerCase();
|
|
4
|
+
export function createMatcher(pattern, options) {
|
|
5
|
+
const { isLiteral, wholeWord, caseSensitive, basePath } = options;
|
|
6
|
+
if (isLiteral && !wholeWord) {
|
|
7
|
+
return createLiteralMatcher(pattern, caseSensitive);
|
|
10
8
|
}
|
|
11
|
-
|
|
12
|
-
|
|
9
|
+
// Regex matcher
|
|
10
|
+
const finalPattern = preparePattern(pattern, isLiteral, wholeWord);
|
|
11
|
+
const needsReDoSCheck = !isLiteral && !isSimpleSafePattern(finalPattern);
|
|
12
|
+
ensureSafePattern(finalPattern, pattern, basePath, needsReDoSCheck);
|
|
13
|
+
const regex = compileRegex(finalPattern, caseSensitive, basePath);
|
|
14
|
+
return createRegexMatcher(regex);
|
|
15
|
+
}
|
|
16
|
+
function createLiteralMatcher(pattern, caseSensitive) {
|
|
17
|
+
const needle = caseSensitive ? pattern : pattern.toLowerCase();
|
|
18
|
+
const haystackTransform = caseSensitive
|
|
19
|
+
? (s) => s
|
|
20
|
+
: (s) => s.toLowerCase();
|
|
21
|
+
return (line) => {
|
|
22
|
+
if (line.length === 0 || needle.length === 0)
|
|
13
23
|
return 0;
|
|
14
|
-
const haystack =
|
|
24
|
+
const haystack = haystackTransform(line);
|
|
15
25
|
let count = 0;
|
|
16
26
|
let pos = 0;
|
|
17
|
-
while ((pos = haystack.indexOf(
|
|
27
|
+
while ((pos = haystack.indexOf(needle, pos)) !== -1) {
|
|
18
28
|
count++;
|
|
19
|
-
pos +=
|
|
29
|
+
pos += needle.length;
|
|
20
30
|
}
|
|
21
31
|
return count;
|
|
22
|
-
}
|
|
23
|
-
isValid() {
|
|
24
|
-
return true;
|
|
25
|
-
}
|
|
32
|
+
};
|
|
26
33
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
timeoutMs;
|
|
30
|
-
constructor(regex, timeoutMs = REGEX_MATCH_TIMEOUT_MS) {
|
|
31
|
-
this.regex = regex;
|
|
32
|
-
this.timeoutMs = timeoutMs;
|
|
33
|
-
}
|
|
34
|
-
countMatches(line) {
|
|
34
|
+
function createRegexMatcher(regex, timeoutMs = REGEX_MATCH_TIMEOUT_MS) {
|
|
35
|
+
return (line) => {
|
|
35
36
|
if (line.length === 0)
|
|
36
37
|
return 0;
|
|
37
|
-
|
|
38
|
+
regex.lastIndex = 0;
|
|
38
39
|
let count = 0;
|
|
39
|
-
const deadline = Date.now() +
|
|
40
|
+
const deadline = Date.now() + timeoutMs;
|
|
40
41
|
const maxIterations = Math.min(line.length * 2, 10000);
|
|
41
42
|
let iterations = 0;
|
|
42
43
|
let lastIndex = 0;
|
|
43
44
|
let match;
|
|
44
|
-
while ((match =
|
|
45
|
+
while ((match = regex.exec(line)) !== null) {
|
|
45
46
|
count++;
|
|
46
47
|
iterations++;
|
|
47
|
-
const { lastIndex: currentIndex } =
|
|
48
|
+
const { lastIndex: currentIndex } = regex;
|
|
48
49
|
if (match[0] === '') {
|
|
49
|
-
|
|
50
|
+
regex.lastIndex++;
|
|
50
51
|
}
|
|
51
52
|
if (currentIndex === lastIndex) {
|
|
52
53
|
return -1; // Infinite loop protection
|
|
53
54
|
}
|
|
54
|
-
({ lastIndex } =
|
|
55
|
-
if (
|
|
55
|
+
({ lastIndex } = regex);
|
|
56
|
+
if (shouldCheckTimeout(count, iterations, deadline, maxIterations)) {
|
|
56
57
|
return -1;
|
|
57
58
|
}
|
|
58
59
|
}
|
|
59
60
|
return count;
|
|
60
|
-
}
|
|
61
|
-
isValid() {
|
|
62
|
-
return true;
|
|
63
|
-
}
|
|
64
|
-
shouldCheckTimeout(count, iterations, deadline, maxIterations) {
|
|
65
|
-
const shouldCheck = (count > 0 && count % 10 === 0) ||
|
|
66
|
-
(iterations > 0 && iterations % 50 === 0);
|
|
67
|
-
return (shouldCheck && Date.now() > deadline) || iterations > maxIterations;
|
|
68
|
-
}
|
|
61
|
+
};
|
|
69
62
|
}
|
|
70
|
-
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}
|
|
75
|
-
// For wholeWord or regex, we use RegexStrategy
|
|
76
|
-
const finalPattern = preparePattern(pattern, isLiteral, wholeWord);
|
|
77
|
-
const needsReDoSCheck = !isLiteral && !isSimpleSafePattern(finalPattern);
|
|
78
|
-
ensureSafePattern(finalPattern, pattern, basePath, needsReDoSCheck);
|
|
79
|
-
const regex = compileRegex(finalPattern, caseSensitive, basePath);
|
|
80
|
-
return new RegexMatchStrategy(regex);
|
|
63
|
+
function shouldCheckTimeout(count, iterations, deadline, maxIterations) {
|
|
64
|
+
const shouldCheck = (count > 0 && count % 10 === 0) ||
|
|
65
|
+
(iterations > 0 && iterations % 50 === 0);
|
|
66
|
+
return (shouldCheck && Date.now() > deadline) || iterations > maxIterations;
|
|
81
67
|
}
|
|
82
68
|
function preparePattern(pattern, isLiteral, wholeWord) {
|
|
83
69
|
let finalPattern = pattern;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"match-strategy.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"match-strategy.js","sourceRoot":"","sources":["../../../../src/lib/file-operations/search/match-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAC7B,GACL,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGjE,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,OAAO,GAAE;IACP,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAC7B,GACL,OAAO,CAAC,mBAAmB,CAAC,CAE9B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { executeSearch } from './search/engine.js';
|
|
2
2
|
export async function searchContent(basePath, searchPattern, options = {}) {
|
|
3
|
-
|
|
4
|
-
return engine.search(searchPattern);
|
|
3
|
+
return executeSearch(basePath, searchPattern, options);
|
|
5
4
|
}
|
|
6
5
|
//# sourceMappingURL=search-content.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../../src/lib/file-operations/search-content.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,QAAgB,EAChB,aAAqB,EACrB,UAeI,EAAE;IAEN,OAAO,aAAa,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;AACzD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../src/tools/search-content.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search-content.d.ts","sourceRoot":"","sources":["../../src/tools/search-content.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA6FzE,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAQjE"}
|
|
@@ -1,118 +1,8 @@
|
|
|
1
|
-
import * as pathModule from 'node:path';
|
|
2
1
|
import { createErrorResponse, ErrorCode } from '../lib/errors.js';
|
|
3
2
|
import { searchContent } from '../lib/file-operations.js';
|
|
4
3
|
import { SearchContentInputSchema, SearchContentOutputSchema, } from '../schemas/index.js';
|
|
4
|
+
import { buildStructuredResult, buildTextResult, } from './shared/search-formatting.js';
|
|
5
5
|
import { buildToolResponse } from './tool-response.js';
|
|
6
|
-
const LINE_NUMBER_PAD_WIDTH = 4;
|
|
7
|
-
function formatContentMatches(matches) {
|
|
8
|
-
if (matches.length === 0)
|
|
9
|
-
return 'No matches found';
|
|
10
|
-
const byFile = new Map();
|
|
11
|
-
for (const match of matches) {
|
|
12
|
-
const list = byFile.get(match.file) ?? [];
|
|
13
|
-
list.push(match);
|
|
14
|
-
byFile.set(match.file, list);
|
|
15
|
-
}
|
|
16
|
-
const formatContext = (context, startLine) => (context ?? []).map((line, idx) => ` ${String(startLine + idx).padStart(LINE_NUMBER_PAD_WIDTH)}: ${line}`);
|
|
17
|
-
const lines = [`Found ${matches.length} matches:`, ''];
|
|
18
|
-
for (const [file, fileMatches] of byFile) {
|
|
19
|
-
lines.push(`${file}:`);
|
|
20
|
-
for (const match of fileMatches) {
|
|
21
|
-
const before = formatContext(match.contextBefore, match.line - (match.contextBefore?.length ?? 0));
|
|
22
|
-
const after = formatContext(match.contextAfter, match.line + 1);
|
|
23
|
-
lines.push(...before);
|
|
24
|
-
lines.push(` > ${String(match.line).padStart(LINE_NUMBER_PAD_WIDTH)}: ${match.content}`);
|
|
25
|
-
lines.push(...after);
|
|
26
|
-
if (before.length || after.length)
|
|
27
|
-
lines.push(' ---');
|
|
28
|
-
}
|
|
29
|
-
lines.push('');
|
|
30
|
-
}
|
|
31
|
-
return lines.join('\n');
|
|
32
|
-
}
|
|
33
|
-
function formatOperationSummary(summary) {
|
|
34
|
-
const lines = [];
|
|
35
|
-
if (summary.truncated) {
|
|
36
|
-
lines.push(`\n\n!! PARTIAL RESULTS: ${summary.truncatedReason ?? 'results truncated'}`);
|
|
37
|
-
if (summary.tip)
|
|
38
|
-
lines.push(`Tip: ${summary.tip}`);
|
|
39
|
-
}
|
|
40
|
-
const note = (count, msg) => {
|
|
41
|
-
if (count && count > 0)
|
|
42
|
-
lines.push(`Note: ${count} ${msg}`);
|
|
43
|
-
};
|
|
44
|
-
note(summary.skippedTooLarge, 'file(s) skipped (too large).');
|
|
45
|
-
note(summary.skippedBinary, 'file(s) skipped (binary).');
|
|
46
|
-
note(summary.skippedInaccessible, 'item(s) were inaccessible and skipped.');
|
|
47
|
-
note(summary.symlinksNotFollowed, 'symlink(s) were not followed (security).');
|
|
48
|
-
note(summary.linesSkippedDueToRegexTimeout, 'line(s) skipped (regex timeout).');
|
|
49
|
-
return lines.join('\n');
|
|
50
|
-
}
|
|
51
|
-
function buildStructuredResult(result) {
|
|
52
|
-
return {
|
|
53
|
-
ok: true,
|
|
54
|
-
basePath: result.basePath,
|
|
55
|
-
pattern: result.pattern,
|
|
56
|
-
filePattern: result.filePattern,
|
|
57
|
-
matches: result.matches.map((m) => ({
|
|
58
|
-
file: pathModule.relative(result.basePath, m.file),
|
|
59
|
-
line: m.line,
|
|
60
|
-
content: m.content,
|
|
61
|
-
contextBefore: m.contextBefore,
|
|
62
|
-
contextAfter: m.contextAfter,
|
|
63
|
-
matchCount: m.matchCount,
|
|
64
|
-
})),
|
|
65
|
-
summary: {
|
|
66
|
-
filesScanned: result.summary.filesScanned,
|
|
67
|
-
filesMatched: result.summary.filesMatched,
|
|
68
|
-
totalMatches: result.summary.matches,
|
|
69
|
-
truncated: result.summary.truncated,
|
|
70
|
-
skippedTooLarge: result.summary.skippedTooLarge || undefined,
|
|
71
|
-
skippedBinary: result.summary.skippedBinary || undefined,
|
|
72
|
-
skippedInaccessible: result.summary.skippedInaccessible || undefined,
|
|
73
|
-
linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout || undefined,
|
|
74
|
-
stoppedReason: result.summary.stoppedReason,
|
|
75
|
-
},
|
|
76
|
-
};
|
|
77
|
-
}
|
|
78
|
-
function buildTruncationInfo(result) {
|
|
79
|
-
if (!result.summary.truncated)
|
|
80
|
-
return {};
|
|
81
|
-
if (result.summary.stoppedReason === 'timeout') {
|
|
82
|
-
return {
|
|
83
|
-
truncatedReason: 'search timed out',
|
|
84
|
-
tip: 'Increase timeoutMs, use more specific filePattern, or add excludePatterns to narrow scope.',
|
|
85
|
-
};
|
|
86
|
-
}
|
|
87
|
-
if (result.summary.stoppedReason === 'maxResults') {
|
|
88
|
-
return {
|
|
89
|
-
truncatedReason: `reached max results limit (${result.summary.matches})`,
|
|
90
|
-
};
|
|
91
|
-
}
|
|
92
|
-
if (result.summary.stoppedReason === 'maxFiles') {
|
|
93
|
-
return {
|
|
94
|
-
truncatedReason: `reached max files limit (${result.summary.filesScanned} scanned)`,
|
|
95
|
-
};
|
|
96
|
-
}
|
|
97
|
-
return {};
|
|
98
|
-
}
|
|
99
|
-
function buildTextResult(result) {
|
|
100
|
-
const { truncatedReason, tip } = buildTruncationInfo(result);
|
|
101
|
-
let textOutput = formatContentMatches(result.matches);
|
|
102
|
-
textOutput += formatOperationSummary({
|
|
103
|
-
truncated: result.summary.truncated,
|
|
104
|
-
truncatedReason,
|
|
105
|
-
tip,
|
|
106
|
-
skippedTooLarge: result.summary.skippedTooLarge,
|
|
107
|
-
skippedBinary: result.summary.skippedBinary,
|
|
108
|
-
skippedInaccessible: result.summary.skippedInaccessible,
|
|
109
|
-
linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout,
|
|
110
|
-
});
|
|
111
|
-
if (result.summary.truncated && !tip) {
|
|
112
|
-
textOutput += `\nScanned ${result.summary.filesScanned} files, found ${result.summary.matches} matches in ${result.summary.filesMatched} files.`;
|
|
113
|
-
}
|
|
114
|
-
return textOutput;
|
|
115
|
-
}
|
|
116
6
|
async function handleSearchContent({ path: searchBasePath, pattern, filePattern, excludePatterns, caseSensitive, maxResults, maxFileSize, maxFilesScanned, timeoutMs, skipBinary, includeHidden, contextLines, wholeWord, isLiteral, baseNameMatch, caseSensitiveFileMatch, }) {
|
|
117
7
|
const result = await searchContent(searchBasePath, pattern, {
|
|
118
8
|
filePattern,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../src/tools/search-content.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"search-content.js","sourceRoot":"","sources":["../../src/tools/search-content.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,qBAAqB,EACrB,eAAe,GAChB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,iBAAiB,EAAqB,MAAM,oBAAoB,CAAC;AAI1E,KAAK,UAAU,mBAAmB,CAAC,EACjC,IAAI,EAAE,cAAc,EACpB,OAAO,EACP,WAAW,EACX,eAAe,EACf,aAAa,EACb,UAAU,EACV,WAAW,EACX,eAAe,EACf,SAAS,EACT,UAAU,EACV,aAAa,EACb,YAAY,EACZ,SAAS,EACT,SAAS,EACT,aAAa,EACb,sBAAsB,GAkBvB;IACC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,cAAc,EAAE,OAAO,EAAE;QAC1D,WAAW;QACX,eAAe;QACf,aAAa;QACb,UAAU;QACV,WAAW;QACX,eAAe;QACf,SAAS;QACT,UAAU;QACV,aAAa;QACb,YAAY;QACZ,SAAS;QACT,SAAS;QACT,aAAa;QACb,sBAAsB;KACvB,CAAC,CAAC;IAEH,OAAO,iBAAiB,CACtB,eAAe,CAAC,MAAM,CAAC,EACvB,qBAAqB,CAAC,MAAM,CAAC,CAC9B,CAAC;AACJ,CAAC;AAED,MAAM,mBAAmB,GAAG;IAC1B,KAAK,EAAE,gBAAgB;IACvB,WAAW,EACT,uFAAuF;QACvF,yEAAyE;QACzE,yFAAyF;QACzF,4EAA4E;QAC5E,2DAA2D;IAC7D,WAAW,EAAE,wBAAwB;IACrC,YAAY,EAAE,yBAAyB;IACvC,WAAW,EAAE;QACX,YAAY,EAAE,IAAI;QAClB,cAAc,EAAE,IAAI;QACpB,aAAa,EAAE,IAAI;KACpB;CACO,CAAC;AAEX,MAAM,UAAU,yBAAyB,CAAC,MAAiB;IACzD,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACxE,IAAI,CAAC;YACH,OAAO,MAAM,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,mBAAmB,CAAC,KAAK,EAAE,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { z } from 'zod';
|
|
2
|
+
import type { SearchContentResult } from '../../config/types.js';
|
|
3
|
+
import type { SearchContentOutputSchema } from '../../schemas/index.js';
|
|
4
|
+
type SearchContentStructuredResult = z.infer<typeof SearchContentOutputSchema>;
|
|
5
|
+
export declare function buildStructuredResult(result: SearchContentResult): SearchContentStructuredResult;
|
|
6
|
+
export declare function buildTextResult(result: SearchContentResult): string;
|
|
7
|
+
export {};
|
|
8
|
+
//# sourceMappingURL=search-formatting.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-formatting.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/search-formatting.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAE7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAExE,KAAK,6BAA6B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AA8E/E,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,mBAAmB,GAC1B,6BAA6B,CA2B/B;AA0BD,wBAAgB,eAAe,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAkBnE"}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import * as pathModule from 'node:path';
|
|
2
|
+
const LINE_NUMBER_PAD_WIDTH = 4;
|
|
3
|
+
function formatContentMatches(matches) {
|
|
4
|
+
if (matches.length === 0)
|
|
5
|
+
return 'No matches found';
|
|
6
|
+
const byFile = new Map();
|
|
7
|
+
for (const match of matches) {
|
|
8
|
+
const list = byFile.get(match.file) ?? [];
|
|
9
|
+
list.push(match);
|
|
10
|
+
byFile.set(match.file, list);
|
|
11
|
+
}
|
|
12
|
+
const formatContext = (context, startLine) => (context ?? []).map((line, idx) => ` ${String(startLine + idx).padStart(LINE_NUMBER_PAD_WIDTH)}: ${line}`);
|
|
13
|
+
const lines = [`Found ${matches.length} matches:`, ''];
|
|
14
|
+
for (const [file, fileMatches] of byFile) {
|
|
15
|
+
lines.push(`${file}:`);
|
|
16
|
+
for (const match of fileMatches) {
|
|
17
|
+
const before = formatContext(match.contextBefore, match.line - (match.contextBefore?.length ?? 0));
|
|
18
|
+
const after = formatContext(match.contextAfter, match.line + 1);
|
|
19
|
+
lines.push(...before);
|
|
20
|
+
lines.push(` > ${String(match.line).padStart(LINE_NUMBER_PAD_WIDTH)}: ${match.content}`);
|
|
21
|
+
lines.push(...after);
|
|
22
|
+
if (before.length || after.length)
|
|
23
|
+
lines.push(' ---');
|
|
24
|
+
}
|
|
25
|
+
lines.push('');
|
|
26
|
+
}
|
|
27
|
+
return lines.join('\n');
|
|
28
|
+
}
|
|
29
|
+
function formatOperationSummary(summary) {
|
|
30
|
+
const lines = [];
|
|
31
|
+
if (summary.truncated) {
|
|
32
|
+
lines.push(`\n\n!! PARTIAL RESULTS: ${summary.truncatedReason ?? 'results truncated'}`);
|
|
33
|
+
if (summary.tip)
|
|
34
|
+
lines.push(`Tip: ${summary.tip}`);
|
|
35
|
+
}
|
|
36
|
+
const note = (count, msg) => {
|
|
37
|
+
if (count && count > 0)
|
|
38
|
+
lines.push(`Note: ${count} ${msg}`);
|
|
39
|
+
};
|
|
40
|
+
note(summary.skippedTooLarge, 'file(s) skipped (too large).');
|
|
41
|
+
note(summary.skippedBinary, 'file(s) skipped (binary).');
|
|
42
|
+
note(summary.skippedInaccessible, 'item(s) were inaccessible and skipped.');
|
|
43
|
+
note(summary.symlinksNotFollowed, 'symlink(s) were not followed (security).');
|
|
44
|
+
note(summary.linesSkippedDueToRegexTimeout, 'line(s) skipped (regex timeout).');
|
|
45
|
+
return lines.join('\n');
|
|
46
|
+
}
|
|
47
|
+
export function buildStructuredResult(result) {
|
|
48
|
+
return {
|
|
49
|
+
ok: true,
|
|
50
|
+
basePath: result.basePath,
|
|
51
|
+
pattern: result.pattern,
|
|
52
|
+
filePattern: result.filePattern,
|
|
53
|
+
matches: result.matches.map((m) => ({
|
|
54
|
+
file: pathModule.relative(result.basePath, m.file),
|
|
55
|
+
line: m.line,
|
|
56
|
+
content: m.content,
|
|
57
|
+
contextBefore: m.contextBefore,
|
|
58
|
+
contextAfter: m.contextAfter,
|
|
59
|
+
matchCount: m.matchCount,
|
|
60
|
+
})),
|
|
61
|
+
summary: {
|
|
62
|
+
filesScanned: result.summary.filesScanned,
|
|
63
|
+
filesMatched: result.summary.filesMatched,
|
|
64
|
+
totalMatches: result.summary.matches,
|
|
65
|
+
truncated: result.summary.truncated,
|
|
66
|
+
skippedTooLarge: result.summary.skippedTooLarge || undefined,
|
|
67
|
+
skippedBinary: result.summary.skippedBinary || undefined,
|
|
68
|
+
skippedInaccessible: result.summary.skippedInaccessible || undefined,
|
|
69
|
+
linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout || undefined,
|
|
70
|
+
stoppedReason: result.summary.stoppedReason,
|
|
71
|
+
},
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function buildTruncationInfo(result) {
|
|
75
|
+
if (!result.summary.truncated)
|
|
76
|
+
return {};
|
|
77
|
+
if (result.summary.stoppedReason === 'timeout') {
|
|
78
|
+
return {
|
|
79
|
+
truncatedReason: 'search timed out',
|
|
80
|
+
tip: 'Increase timeoutMs, use more specific filePattern, or add excludePatterns to narrow scope.',
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
if (result.summary.stoppedReason === 'maxResults') {
|
|
84
|
+
return {
|
|
85
|
+
truncatedReason: `reached max results limit (${result.summary.matches})`,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
if (result.summary.stoppedReason === 'maxFiles') {
|
|
89
|
+
return {
|
|
90
|
+
truncatedReason: `reached max files limit (${result.summary.filesScanned} scanned)`,
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
return {};
|
|
94
|
+
}
|
|
95
|
+
export function buildTextResult(result) {
|
|
96
|
+
const { truncatedReason, tip } = buildTruncationInfo(result);
|
|
97
|
+
let textOutput = formatContentMatches(result.matches);
|
|
98
|
+
textOutput += formatOperationSummary({
|
|
99
|
+
truncated: result.summary.truncated,
|
|
100
|
+
truncatedReason,
|
|
101
|
+
tip,
|
|
102
|
+
skippedTooLarge: result.summary.skippedTooLarge,
|
|
103
|
+
skippedBinary: result.summary.skippedBinary,
|
|
104
|
+
skippedInaccessible: result.summary.skippedInaccessible,
|
|
105
|
+
linesSkippedDueToRegexTimeout: result.summary.linesSkippedDueToRegexTimeout,
|
|
106
|
+
});
|
|
107
|
+
if (result.summary.truncated && !tip) {
|
|
108
|
+
textOutput += `\nScanned ${result.summary.filesScanned} files, found ${result.summary.matches} matches in ${result.summary.filesMatched} files.`;
|
|
109
|
+
}
|
|
110
|
+
return textOutput;
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=search-formatting.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-formatting.js","sourceRoot":"","sources":["../../../src/tools/shared/search-formatting.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED