@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.
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/file-operations/list-directory-helpers.d.ts +5 -0
- package/dist/lib/file-operations/list-directory-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory-helpers.js +29 -17
- package/dist/lib/file-operations/list-directory-helpers.js.map +1 -1
- package/dist/lib/file-operations/list-directory.d.ts.map +1 -1
- package/dist/lib/file-operations/list-directory.js +5 -1
- package/dist/lib/file-operations/list-directory.js.map +1 -1
- package/dist/lib/file-operations/read-multiple-files.d.ts.map +1 -1
- package/dist/lib/file-operations/read-multiple-files.js +33 -12
- package/dist/lib/file-operations/read-multiple-files.js.map +1 -1
- package/dist/lib/file-operations/search/context-manager.d.ts +2 -0
- package/dist/lib/file-operations/search/context-manager.d.ts.map +1 -1
- package/dist/lib/file-operations/search/context-manager.js +22 -8
- package/dist/lib/file-operations/search/context-manager.js.map +1 -1
- package/dist/lib/file-operations/search/engine-stream.d.ts.map +1 -1
- package/dist/lib/file-operations/search/engine-stream.js +85 -8
- package/dist/lib/file-operations/search/engine-stream.js.map +1 -1
- package/dist/lib/file-operations/search/file-processor.d.ts.map +1 -1
- package/dist/lib/file-operations/search/file-processor.js +11 -4
- package/dist/lib/file-operations/search/file-processor.js.map +1 -1
- package/dist/lib/file-operations/search/types.d.ts +2 -0
- package/dist/lib/file-operations/search/types.d.ts.map +1 -1
- package/dist/lib/file-operations/search-files-helpers.d.ts.map +1 -1
- package/dist/lib/file-operations/search-files-helpers.js +91 -14
- package/dist/lib/file-operations/search-files-helpers.js.map +1 -1
- package/dist/lib/fs-helpers/abort.d.ts +3 -0
- package/dist/lib/fs-helpers/abort.d.ts.map +1 -0
- package/dist/lib/fs-helpers/abort.js +15 -0
- package/dist/lib/fs-helpers/abort.js.map +1 -0
- package/dist/lib/fs-helpers/concurrency.d.ts.map +1 -1
- package/dist/lib/fs-helpers/concurrency.js +17 -3
- package/dist/lib/fs-helpers/concurrency.js.map +1 -1
- package/dist/lib/fs-helpers/readers/head-file.d.ts +1 -1
- package/dist/lib/fs-helpers/readers/head-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/head-file.js +6 -3
- package/dist/lib/fs-helpers/readers/head-file.js.map +1 -1
- package/dist/lib/fs-helpers/readers/line-range.d.ts +1 -1
- package/dist/lib/fs-helpers/readers/line-range.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/line-range.js +17 -3
- package/dist/lib/fs-helpers/readers/line-range.js.map +1 -1
- package/dist/lib/fs-helpers/readers/read-buffer.d.ts +1 -1
- package/dist/lib/fs-helpers/readers/read-buffer.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/read-buffer.js +13 -1
- package/dist/lib/fs-helpers/readers/read-buffer.js.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file-content.d.ts +4 -1
- package/dist/lib/fs-helpers/readers/read-file-content.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file-content.js +5 -5
- package/dist/lib/fs-helpers/readers/read-file-content.js.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file.d.ts +3 -0
- package/dist/lib/fs-helpers/readers/read-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/read-file.js +22 -5
- package/dist/lib/fs-helpers/readers/read-file.js.map +1 -1
- package/dist/lib/fs-helpers/readers/tail-file.d.ts +1 -1
- package/dist/lib/fs-helpers/readers/tail-file.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers/tail-file.js +6 -3
- package/dist/lib/fs-helpers/readers/tail-file.js.map +1 -1
- package/dist/lib/fs-helpers/readers.d.ts +1 -1
- package/dist/lib/fs-helpers/readers.d.ts.map +1 -1
- package/dist/lib/fs-helpers/readers.js +1 -1
- package/dist/lib/fs-helpers/readers.js.map +1 -1
- package/dist/lib/fs-helpers.d.ts +1 -1
- package/dist/lib/fs-helpers.d.ts.map +1 -1
- package/dist/lib/fs-helpers.js +1 -1
- package/dist/lib/fs-helpers.js.map +1 -1
- package/dist/tools/read-file.d.ts.map +1 -1
- package/dist/tools/read-file.js +13 -2
- package/dist/tools/read-file.js.map +1 -1
- package/dist/tools/read-multiple-files.d.ts.map +1 -1
- package/dist/tools/read-multiple-files.js +11 -1
- package/dist/tools/read-multiple-files.js.map +1 -1
- package/dist/tools/shared/abort.d.ts +5 -0
- package/dist/tools/shared/abort.d.ts.map +1 -0
- package/dist/tools/shared/abort.js +41 -0
- package/dist/tools/shared/abort.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { createReadStream } from 'node:fs';
|
|
2
2
|
import { ErrorCode, McpError } from '../../errors.js';
|
|
3
|
+
import { createAbortError } from '../abort.js';
|
|
3
4
|
const STREAM_CHUNK_SIZE = 64 * 1024;
|
|
4
5
|
function createTooLargeError(bytesRead, maxSize, requestedPath) {
|
|
5
6
|
return new McpError(ErrorCode.E_TOO_LARGE, `File exceeds maximum size (${bytesRead} > ${maxSize}): ${requestedPath}`, requestedPath, { size: bytesRead, maxSize });
|
|
6
7
|
}
|
|
7
|
-
export async function readFileBufferWithLimit(filePath, maxSize, requestedPath = filePath) {
|
|
8
|
+
export async function readFileBufferWithLimit(filePath, maxSize, requestedPath = filePath, signal) {
|
|
8
9
|
return await new Promise((resolve, reject) => {
|
|
9
10
|
const chunks = [];
|
|
10
11
|
let totalSize = 0;
|
|
@@ -16,6 +17,9 @@ export async function readFileBufferWithLimit(filePath, maxSize, requestedPath =
|
|
|
16
17
|
stream.removeListener('data', onData);
|
|
17
18
|
stream.removeListener('end', onEnd);
|
|
18
19
|
stream.removeListener('error', onError);
|
|
20
|
+
if (signal) {
|
|
21
|
+
signal.removeEventListener('abort', onAbort);
|
|
22
|
+
}
|
|
19
23
|
};
|
|
20
24
|
const fail = (error) => {
|
|
21
25
|
if (settled)
|
|
@@ -25,6 +29,9 @@ export async function readFileBufferWithLimit(filePath, maxSize, requestedPath =
|
|
|
25
29
|
stream.destroy();
|
|
26
30
|
reject(error);
|
|
27
31
|
};
|
|
32
|
+
const onAbort = () => {
|
|
33
|
+
fail(createAbortError());
|
|
34
|
+
};
|
|
28
35
|
const onData = (chunk) => {
|
|
29
36
|
const chunkSize = typeof chunk === 'string' ? Buffer.byteLength(chunk) : chunk.length;
|
|
30
37
|
totalSize += chunkSize;
|
|
@@ -44,6 +51,11 @@ export async function readFileBufferWithLimit(filePath, maxSize, requestedPath =
|
|
|
44
51
|
const onError = (error) => {
|
|
45
52
|
fail(error instanceof Error ? error : new Error(String(error)));
|
|
46
53
|
};
|
|
54
|
+
if (signal?.aborted) {
|
|
55
|
+
onAbort();
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
signal?.addEventListener('abort', onAbort, { once: true });
|
|
47
59
|
stream.on('data', onData);
|
|
48
60
|
stream.on('end', onEnd);
|
|
49
61
|
stream.on('error', onError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-buffer.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-buffer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-buffer.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ export declare function readLineRangeContent(filePath: string, lineRange: {
|
|
|
4
4
|
}, options: {
|
|
5
5
|
encoding: BufferEncoding;
|
|
6
6
|
maxSize: number;
|
|
7
|
+
signal?: AbortSignal;
|
|
7
8
|
}): Promise<{
|
|
8
9
|
content: string;
|
|
9
10
|
truncated: boolean;
|
|
@@ -14,6 +15,7 @@ export declare function readLineRangeContent(filePath: string, lineRange: {
|
|
|
14
15
|
export declare function readHeadContent(filePath: string, head: number, options: {
|
|
15
16
|
encoding: BufferEncoding;
|
|
16
17
|
maxSize: number;
|
|
18
|
+
signal?: AbortSignal;
|
|
17
19
|
}): Promise<{
|
|
18
20
|
content: string;
|
|
19
21
|
truncated: boolean;
|
|
@@ -23,13 +25,14 @@ export declare function readHeadContent(filePath: string, head: number, options:
|
|
|
23
25
|
export declare function readTailContent(filePath: string, tail: number, options: {
|
|
24
26
|
encoding: BufferEncoding;
|
|
25
27
|
maxSize: number;
|
|
28
|
+
signal?: AbortSignal;
|
|
26
29
|
}): Promise<{
|
|
27
30
|
content: string;
|
|
28
31
|
truncated: boolean;
|
|
29
32
|
linesRead: number;
|
|
30
33
|
hasMoreLines: boolean;
|
|
31
34
|
}>;
|
|
32
|
-
export declare function readFullContent(filePath: string, encoding: BufferEncoding, maxSize: number, requestedPath?: string): Promise<{
|
|
35
|
+
export declare function readFullContent(filePath: string, encoding: BufferEncoding, maxSize: number, requestedPath?: string, signal?: AbortSignal): Promise<{
|
|
33
36
|
content: string;
|
|
34
37
|
totalLines: number;
|
|
35
38
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-content.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file-content.ts"],"names":[],"mappings":"AAKA,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACzC,OAAO,EAAE;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"read-file-content.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file-content.ts"],"names":[],"mappings":"AAKA,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,EACzC,OAAO,EAAE;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAC3E,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAuBD;AAOD,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAC3E,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAeD;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAC3E,OAAO,CAAC;IACT,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC,CAeD;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,cAAc,EACxB,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAiB,EAChC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAAC,CASlD"}
|
|
@@ -3,7 +3,7 @@ import { readLineRange } from './line-range.js';
|
|
|
3
3
|
import { readFileBufferWithLimit } from './read-buffer.js';
|
|
4
4
|
import { tailFile } from './tail-file.js';
|
|
5
5
|
export async function readLineRangeContent(filePath, lineRange, options) {
|
|
6
|
-
const result = await readLineRange(filePath, lineRange.start, lineRange.end, options.encoding, options.maxSize);
|
|
6
|
+
const result = await readLineRange(filePath, lineRange.start, lineRange.end, options.encoding, options.maxSize, options.signal);
|
|
7
7
|
const expectedLines = lineRange.end - lineRange.start + 1;
|
|
8
8
|
const truncated = lineRange.start > 1 ||
|
|
9
9
|
result.linesRead < expectedLines ||
|
|
@@ -22,7 +22,7 @@ function countLines(content) {
|
|
|
22
22
|
return content.split('\n').length;
|
|
23
23
|
}
|
|
24
24
|
export async function readHeadContent(filePath, head, options) {
|
|
25
|
-
const content = await headFile(filePath, head, options.encoding, options.maxSize);
|
|
25
|
+
const content = await headFile(filePath, head, options.encoding, options.maxSize, options.signal);
|
|
26
26
|
const linesRead = countLines(content);
|
|
27
27
|
return {
|
|
28
28
|
content,
|
|
@@ -32,7 +32,7 @@ export async function readHeadContent(filePath, head, options) {
|
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
export async function readTailContent(filePath, tail, options) {
|
|
35
|
-
const content = await tailFile(filePath, tail, options.encoding, options.maxSize);
|
|
35
|
+
const content = await tailFile(filePath, tail, options.encoding, options.maxSize, options.signal);
|
|
36
36
|
const linesRead = countLines(content);
|
|
37
37
|
return {
|
|
38
38
|
content,
|
|
@@ -41,8 +41,8 @@ export async function readTailContent(filePath, tail, options) {
|
|
|
41
41
|
hasMoreLines: linesRead >= tail,
|
|
42
42
|
};
|
|
43
43
|
}
|
|
44
|
-
export async function readFullContent(filePath, encoding, maxSize, requestedPath = filePath) {
|
|
45
|
-
const buffer = await readFileBufferWithLimit(filePath, maxSize, requestedPath);
|
|
44
|
+
export async function readFullContent(filePath, encoding, maxSize, requestedPath = filePath, signal) {
|
|
45
|
+
const buffer = await readFileBufferWithLimit(filePath, maxSize, requestedPath, signal);
|
|
46
46
|
const content = buffer.toString(encoding);
|
|
47
47
|
return { content, totalLines: content.split('\n').length };
|
|
48
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file-content.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,SAAyC,EACzC,
|
|
1
|
+
{"version":3,"file":"read-file-content.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file-content.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,SAAyC,EACzC,OAA4E;IAQ5E,MAAM,MAAM,GAAG,MAAM,aAAa,CAChC,QAAQ,EACR,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,GAAG,EACb,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,MAAM,CACf,CAAC;IAEF,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,GAAG,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC;IAC1D,MAAM,SAAS,GACb,SAAS,CAAC,KAAK,GAAG,CAAC;QACnB,MAAM,CAAC,SAAS,GAAG,aAAa;QAChC,MAAM,CAAC,YAAY,CAAC;IAEtB,OAAO;QACL,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,SAAS;QACT,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;QAC3C,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,OAAe;IACjC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACnC,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACpC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAgB,EAChB,IAAY,EACZ,OAA4E;IAO5E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAC5B,QAAQ,EACR,IAAI,EACJ,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,MAAM,CACf,CAAC;IACF,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO;QACL,OAAO;QACP,SAAS,EAAE,IAAI;QACf,SAAS;QACT,YAAY,EAAE,SAAS,IAAI,IAAI;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAgB,EAChB,IAAY,EACZ,OAA4E;IAO5E,MAAM,OAAO,GAAG,MAAM,QAAQ,CAC5B,QAAQ,EACR,IAAI,EACJ,OAAO,CAAC,QAAQ,EAChB,OAAO,CAAC,OAAO,EACf,OAAO,CAAC,MAAM,CACf,CAAC;IACF,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO;QACL,OAAO;QACP,SAAS,EAAE,IAAI;QACf,SAAS;QACT,YAAY,EAAE,SAAS,IAAI,IAAI;KAChC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,QAAgB,EAChB,QAAwB,EACxB,OAAe,EACf,gBAAwB,QAAQ,EAChC,MAAoB;IAEpB,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAC1C,QAAQ,EACR,OAAO,EACP,aAAa,EACb,MAAM,CACP,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC;AAC7D,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { Stats } from 'node:fs';
|
|
1
2
|
interface ReadFileOptions {
|
|
2
3
|
encoding?: BufferEncoding;
|
|
3
4
|
maxSize?: number;
|
|
@@ -8,6 +9,7 @@ interface ReadFileOptions {
|
|
|
8
9
|
head?: number;
|
|
9
10
|
tail?: number;
|
|
10
11
|
skipBinary?: boolean;
|
|
12
|
+
signal?: AbortSignal;
|
|
11
13
|
}
|
|
12
14
|
interface ReadFileResult {
|
|
13
15
|
path: string;
|
|
@@ -23,6 +25,7 @@ interface ReadFileResult {
|
|
|
23
25
|
hasMoreLines?: boolean;
|
|
24
26
|
}
|
|
25
27
|
type ReadMode = 'lineRange' | 'tail' | 'head' | 'full';
|
|
28
|
+
export declare function readFileWithStats(filePath: string, validPath: string, stats: Stats, options?: ReadFileOptions): Promise<ReadFileResult>;
|
|
26
29
|
export declare function readFile(filePath: string, options?: ReadFileOptions): Promise<ReadFileResult>;
|
|
27
30
|
export {};
|
|
28
31
|
//# sourceMappingURL=read-file.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAwBrC,UAAU,eAAe;IACvB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,QAAQ,CAAC;IACnB,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;CACxB;AAED,KAAK,QAAQ,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;AAmQvD,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,EACZ,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,cAAc,CAAC,CASzB;AAED,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE,eAAoB,GAC5B,OAAO,CAAC,cAAc,CAAC,CAazB"}
|
|
@@ -2,6 +2,7 @@ import * as fs from 'node:fs/promises';
|
|
|
2
2
|
import { MAX_TEXT_FILE_SIZE } from '../../constants.js';
|
|
3
3
|
import { ErrorCode, McpError } from '../../errors.js';
|
|
4
4
|
import { validateExistingPath } from '../../path-validation.js';
|
|
5
|
+
import { assertNotAborted } from '../abort.js';
|
|
5
6
|
import { isProbablyBinary } from '../binary-detect.js';
|
|
6
7
|
import { readFullContent, readHeadContent, readLineRangeContent, readTailContent, } from './read-file-content.js';
|
|
7
8
|
function normalizeOptions(options) {
|
|
@@ -12,6 +13,7 @@ function normalizeOptions(options) {
|
|
|
12
13
|
head: options.head,
|
|
13
14
|
tail: options.tail,
|
|
14
15
|
skipBinary: options.skipBinary ?? false,
|
|
16
|
+
signal: options.signal,
|
|
15
17
|
};
|
|
16
18
|
}
|
|
17
19
|
function assertIsFile(stats, filePath) {
|
|
@@ -69,6 +71,7 @@ async function readLineRangeResult(validPath, filePath, normalized) {
|
|
|
69
71
|
const { content, truncated, linesRead, hasMoreLines } = await readLineRangeContent(validPath, lineRange, {
|
|
70
72
|
encoding: normalized.encoding,
|
|
71
73
|
maxSize: normalized.maxSize,
|
|
74
|
+
signal: normalized.signal,
|
|
72
75
|
});
|
|
73
76
|
return buildReadResult(validPath, content, truncated, undefined, {
|
|
74
77
|
readMode: 'lineRange',
|
|
@@ -83,6 +86,7 @@ async function readTailResult(validPath, filePath, normalized) {
|
|
|
83
86
|
const { content, truncated, linesRead, hasMoreLines } = await readTailContent(validPath, tail, {
|
|
84
87
|
encoding: normalized.encoding,
|
|
85
88
|
maxSize: normalized.maxSize,
|
|
89
|
+
signal: normalized.signal,
|
|
86
90
|
});
|
|
87
91
|
return buildReadResult(validPath, content, truncated, undefined, {
|
|
88
92
|
readMode: 'tail',
|
|
@@ -96,6 +100,7 @@ async function readHeadResult(validPath, filePath, normalized) {
|
|
|
96
100
|
const { content, truncated, linesRead, hasMoreLines } = await readHeadContent(validPath, head, {
|
|
97
101
|
encoding: normalized.encoding,
|
|
98
102
|
maxSize: normalized.maxSize,
|
|
103
|
+
signal: normalized.signal,
|
|
99
104
|
});
|
|
100
105
|
return buildReadResult(validPath, content, truncated, undefined, {
|
|
101
106
|
readMode: 'head',
|
|
@@ -106,7 +111,7 @@ async function readHeadResult(validPath, filePath, normalized) {
|
|
|
106
111
|
}
|
|
107
112
|
async function readFullResult(validPath, filePath, stats, normalized) {
|
|
108
113
|
assertWithinMaxSize(stats, normalized.maxSize, filePath);
|
|
109
|
-
const { content, totalLines } = await readFullContent(validPath, normalized.encoding, normalized.maxSize, filePath);
|
|
114
|
+
const { content, totalLines } = await readFullContent(validPath, normalized.encoding, normalized.maxSize, filePath, normalized.signal);
|
|
110
115
|
return buildReadResult(validPath, content, false, totalLines, {
|
|
111
116
|
readMode: 'full',
|
|
112
117
|
linesRead: totalLines,
|
|
@@ -132,15 +137,27 @@ async function assertNotBinary(validPath, filePath) {
|
|
|
132
137
|
return;
|
|
133
138
|
throw new McpError(ErrorCode.E_INVALID_INPUT, `Binary file detected: ${filePath}. Set skipBinary=false to read as text.`, filePath);
|
|
134
139
|
}
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
const validPath = await validateExistingPath(filePath);
|
|
138
|
-
const stats = await fs.stat(validPath);
|
|
140
|
+
async function readFileWithStatsInternal(filePath, validPath, stats, normalized) {
|
|
141
|
+
assertNotAborted(normalized.signal);
|
|
139
142
|
assertIsFile(stats, filePath);
|
|
140
143
|
assertSingleMode(normalized, filePath);
|
|
141
144
|
if (normalized.skipBinary) {
|
|
142
145
|
await assertNotBinary(validPath, filePath);
|
|
143
146
|
}
|
|
147
|
+
assertNotAborted(normalized.signal);
|
|
144
148
|
return await readByMode(validPath, filePath, stats, normalized);
|
|
145
149
|
}
|
|
150
|
+
export async function readFileWithStats(filePath, validPath, stats, options = {}) {
|
|
151
|
+
const normalized = normalizeOptions(options);
|
|
152
|
+
assertNotAborted(normalized.signal);
|
|
153
|
+
return await readFileWithStatsInternal(filePath, validPath, stats, normalized);
|
|
154
|
+
}
|
|
155
|
+
export async function readFile(filePath, options = {}) {
|
|
156
|
+
const normalized = normalizeOptions(options);
|
|
157
|
+
assertNotAborted(normalized.signal);
|
|
158
|
+
const validPath = await validateExistingPath(filePath);
|
|
159
|
+
assertNotAborted(normalized.signal);
|
|
160
|
+
const stats = await fs.stat(validPath);
|
|
161
|
+
return await readFileWithStatsInternal(filePath, validPath, stats, normalized);
|
|
162
|
+
}
|
|
146
163
|
//# sourceMappingURL=read-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAGvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,eAAe,GAChB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/read-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare function tailFile(filePath: string, numLines: number, encoding?: BufferEncoding, maxBytesRead?: number): Promise<string>;
|
|
1
|
+
export declare function tailFile(filePath: string, numLines: number, encoding?: BufferEncoding, maxBytesRead?: number, signal?: AbortSignal): Promise<string>;
|
|
2
2
|
//# sourceMappingURL=tail-file.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tail-file.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/tail-file.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tail-file.d.ts","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/tail-file.ts"],"names":[],"mappings":"AAoLA,wBAAsB,QAAQ,CAC5B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,GAAE,cAAwB,EAClC,YAAY,CAAC,EAAE,MAAM,EACrB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC,CAyBjB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as fs from 'node:fs/promises';
|
|
2
2
|
import { validateExistingPath } from '../../path-validation.js';
|
|
3
|
+
import { assertNotAborted } from '../abort.js';
|
|
3
4
|
import { findUTF8Boundary } from './utf8.js';
|
|
4
5
|
const CHUNK_SIZE = 256 * 1024;
|
|
5
6
|
function initTailState(fileSize) {
|
|
@@ -78,7 +79,8 @@ async function readAlignedChunk(handle, aligned, encoding) {
|
|
|
78
79
|
bytesRead,
|
|
79
80
|
};
|
|
80
81
|
}
|
|
81
|
-
async function readTailChunk(handle, state, numLines, encoding, maxBytesRead) {
|
|
82
|
+
async function readTailChunk(handle, state, numLines, encoding, maxBytesRead, signal) {
|
|
83
|
+
assertNotAborted(signal);
|
|
82
84
|
const window = clampWindow(state.position, maxBytesRead, state.bytesReadTotal);
|
|
83
85
|
if (!window) {
|
|
84
86
|
state.position = 0;
|
|
@@ -95,7 +97,8 @@ async function readTailChunk(handle, state, numLines, encoding, maxBytesRead) {
|
|
|
95
97
|
const combined = chunkResult.data + state.remainingText;
|
|
96
98
|
applyChunkLines(state, combined, numLines, state.position > 0);
|
|
97
99
|
}
|
|
98
|
-
export async function tailFile(filePath, numLines, encoding = 'utf-8', maxBytesRead) {
|
|
100
|
+
export async function tailFile(filePath, numLines, encoding = 'utf-8', maxBytesRead, signal) {
|
|
101
|
+
assertNotAborted(signal);
|
|
99
102
|
const validPath = await validateExistingPath(filePath);
|
|
100
103
|
const stats = await fs.stat(validPath);
|
|
101
104
|
if (stats.size === 0)
|
|
@@ -104,7 +107,7 @@ export async function tailFile(filePath, numLines, encoding = 'utf-8', maxBytesR
|
|
|
104
107
|
try {
|
|
105
108
|
const state = initTailState(stats.size);
|
|
106
109
|
while (shouldContinue(state, numLines)) {
|
|
107
|
-
await readTailChunk(handle, state, numLines, encoding, maxBytesRead);
|
|
110
|
+
await readTailChunk(handle, state, numLines, encoding, maxBytesRead, signal);
|
|
108
111
|
}
|
|
109
112
|
return state.lines.join('\n');
|
|
110
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tail-file.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/tail-file.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tail-file.js","sourceRoot":"","sources":["../../../../src/lib/fs-helpers/readers/tail-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readers.d.ts","sourceRoot":"","sources":["../../../src/lib/fs-helpers/readers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"readers.d.ts","sourceRoot":"","sources":["../../../src/lib/fs-helpers/readers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"readers.js","sourceRoot":"","sources":["../../../src/lib/fs-helpers/readers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"readers.js","sourceRoot":"","sources":["../../../src/lib/fs-helpers/readers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dist/lib/fs-helpers.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { isProbablyBinary } from './fs-helpers/binary-detect.js';
|
|
2
2
|
export { processInParallel, runWorkQueue } from './fs-helpers/concurrency.js';
|
|
3
3
|
export { getFileType, isHidden, safeDestroy } from './fs-helpers/fs-utils.js';
|
|
4
|
-
export { headFile, readFile, tailFile } from './fs-helpers/readers.js';
|
|
4
|
+
export { headFile, readFile, readFileWithStats, tailFile, } from './fs-helpers/readers.js';
|
|
5
5
|
//# sourceMappingURL=fs-helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/fs-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"fs-helpers.d.ts","sourceRoot":"","sources":["../../src/lib/fs-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,MAAM,yBAAyB,CAAC"}
|
package/dist/lib/fs-helpers.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { isProbablyBinary } from './fs-helpers/binary-detect.js';
|
|
2
2
|
export { processInParallel, runWorkQueue } from './fs-helpers/concurrency.js';
|
|
3
3
|
export { getFileType, isHidden, safeDestroy } from './fs-helpers/fs-utils.js';
|
|
4
|
-
export { headFile, readFile, tailFile } from './fs-helpers/readers.js';
|
|
4
|
+
export { headFile, readFile, readFileWithStats, tailFile, } from './fs-helpers/readers.js';
|
|
5
5
|
//# sourceMappingURL=fs-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fs-helpers.js","sourceRoot":"","sources":["../../src/lib/fs-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,
|
|
1
|
+
{"version":3,"file":"fs-helpers.js","sourceRoot":"","sources":["../../src/lib/fs-helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,QAAQ,GACT,MAAM,yBAAyB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"read-file.d.ts","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AAuKzE,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqB5D"}
|
package/dist/tools/read-file.js
CHANGED
|
@@ -3,8 +3,10 @@ import { MAX_TEXT_FILE_SIZE } from '../lib/constants.js';
|
|
|
3
3
|
import { ErrorCode } from '../lib/errors.js';
|
|
4
4
|
import { readFile } from '../lib/file-operations.js';
|
|
5
5
|
import { ReadFileInputSchema, ReadFileOutputSchema } from '../schemas/index.js';
|
|
6
|
+
import { createTimedAbortSignal } from './shared/abort.js';
|
|
6
7
|
import { assertNoMixedRangeOptions, buildLineRange, } from './shared/read-range.js';
|
|
7
8
|
import { buildToolErrorResponse, buildToolResponse, withToolErrorHandling, } from './tool-response.js';
|
|
9
|
+
const READ_FILE_TIMEOUT_MS = 30000;
|
|
8
10
|
function buildTextResult(result, head, tail) {
|
|
9
11
|
const note = buildReadFileNote(result, head, tail);
|
|
10
12
|
return note ? joinLines([result.content, note]) : result.content;
|
|
@@ -39,7 +41,7 @@ function buildRangeNote(result) {
|
|
|
39
41
|
}
|
|
40
42
|
return undefined;
|
|
41
43
|
}
|
|
42
|
-
async function handleReadFile(args) {
|
|
44
|
+
async function handleReadFile(args, signal) {
|
|
43
45
|
const hasHeadTail = args.head !== undefined || args.tail !== undefined;
|
|
44
46
|
const hasLineRange = args.lineStart !== undefined || args.lineEnd !== undefined;
|
|
45
47
|
assertNoMixedRangeOptions(hasHeadTail, hasLineRange, args.path);
|
|
@@ -59,6 +61,7 @@ async function handleReadFile(args) {
|
|
|
59
61
|
head: effectiveOptions.head,
|
|
60
62
|
tail: effectiveOptions.tail,
|
|
61
63
|
skipBinary: effectiveOptions.skipBinary,
|
|
64
|
+
signal,
|
|
62
65
|
});
|
|
63
66
|
const structured = {
|
|
64
67
|
ok: true,
|
|
@@ -102,7 +105,15 @@ const READ_FILE_TOOL = {
|
|
|
102
105
|
},
|
|
103
106
|
};
|
|
104
107
|
export function registerReadFileTool(server) {
|
|
105
|
-
const handler = (args) => withToolErrorHandling(
|
|
108
|
+
const handler = (args, extra) => withToolErrorHandling(async () => {
|
|
109
|
+
const { signal, cleanup } = createTimedAbortSignal(extra.signal, READ_FILE_TIMEOUT_MS);
|
|
110
|
+
try {
|
|
111
|
+
return await handleReadFile(args, signal);
|
|
112
|
+
}
|
|
113
|
+
finally {
|
|
114
|
+
cleanup();
|
|
115
|
+
}
|
|
116
|
+
}, (error) => buildToolErrorResponse(error, ErrorCode.E_NOT_FILE, args.path));
|
|
106
117
|
server.registerTool('read_file', READ_FILE_TOOL, handler);
|
|
107
118
|
}
|
|
108
119
|
//# sourceMappingURL=read-file.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EACL,yBAAyB,EACzB,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EAGjB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B,SAAS,eAAe,CACtB,MAA4C,EAC5C,IAAwB,EACxB,IAAwB;IAExB,MAAM,IAAI,GAAG,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACnD,OAAO,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC;AACnE,CAAC;AAED,SAAS,iBAAiB,CACxB,MAA4C,EAC5C,IAAwB,EACxB,IAAwB;IAExB,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,SAAS,GACb,MAAM,CAAC,UAAU,KAAK,SAAS;QAC7B,CAAC,CAAC,gBAAgB,MAAM,CAAC,UAAU,EAAE;QACrC,CAAC,CAAC,SAAS,CAAC;IAChB,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,OAAO,SAAS,CACd,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,MAAM,CACnE,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAC3C,CACF,CAAC;IACJ,CAAC;IACD,OAAO,SAAS,CACd,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAC1E,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,MAA4C,EAC5C,IAAwB,EACxB,IAAwB;IAExB,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,iDAAiD,MAAM,CAAC,UAAU,EAAE,CAAC;IAC9E,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,iBAAiB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC/C,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,gBAAgB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC;IAC9C,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,cAAc,CACrB,MAA4C;IAE5C,IAAI,MAAM,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YACnE,OAAO,iBAAiB,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/D,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAKD,KAAK,UAAU,cAAc,
|
|
1
|
+
{"version":3,"file":"read-file.js","sourceRoot":"","sources":["../../src/tools/read-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"read-multiple-files.d.ts","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AA+KzE,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,SAAS,GAAG,IAAI,CAqBrE"}
|
|
@@ -3,8 +3,10 @@ import { MAX_TEXT_FILE_SIZE } from '../lib/constants.js';
|
|
|
3
3
|
import { ErrorCode } from '../lib/errors.js';
|
|
4
4
|
import { readMultipleFiles } from '../lib/file-operations.js';
|
|
5
5
|
import { ReadMultipleFilesInputSchema, ReadMultipleFilesOutputSchema, } from '../schemas/index.js';
|
|
6
|
+
import { createTimedAbortSignal } from './shared/abort.js';
|
|
6
7
|
import { assertLineRangeComplete, assertNoMixedRangeOptions, } from './shared/read-range.js';
|
|
7
8
|
import { buildToolErrorResponse, buildToolResponse, withToolErrorHandling, } from './tool-response.js';
|
|
9
|
+
const READ_MULTIPLE_TIMEOUT_MS = 30000;
|
|
8
10
|
function buildStructuredResult(results, effectiveOptions) {
|
|
9
11
|
const succeeded = results.filter((r) => r.content !== undefined).length;
|
|
10
12
|
const failed = results.filter((r) => r.error !== undefined).length;
|
|
@@ -101,7 +103,15 @@ const READ_MULTIPLE_FILES_TOOL = {
|
|
|
101
103
|
},
|
|
102
104
|
};
|
|
103
105
|
export function registerReadMultipleFilesTool(server) {
|
|
104
|
-
const handler = (args, extra) => withToolErrorHandling(
|
|
106
|
+
const handler = (args, extra) => withToolErrorHandling(async () => {
|
|
107
|
+
const { signal, cleanup } = createTimedAbortSignal(extra.signal, READ_MULTIPLE_TIMEOUT_MS);
|
|
108
|
+
try {
|
|
109
|
+
return await handleReadMultipleFiles(args, signal);
|
|
110
|
+
}
|
|
111
|
+
finally {
|
|
112
|
+
cleanup();
|
|
113
|
+
}
|
|
114
|
+
}, (error) => buildToolErrorResponse(error, ErrorCode.E_UNKNOWN));
|
|
105
115
|
server.registerTool('read_multiple_files', READ_MULTIPLE_FILES_TOOL, handler);
|
|
106
116
|
}
|
|
107
117
|
//# sourceMappingURL=read-multiple-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-multiple-files.js","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EACL,4BAA4B,EAC5B,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EAGjB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"read-multiple-files.js","sourceRoot":"","sources":["../../src/tools/read-multiple-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"abort.d.ts","sourceRoot":"","sources":["../../../src/tools/shared/abort.ts"],"names":[],"mappings":"AAAA,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,WAAW,GAAG,SAAS,EACnC,SAAS,EAAE,MAAM,GAChB;IAAE,MAAM,EAAE,WAAW,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CA4C9C"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
export function createTimedAbortSignal(baseSignal, timeoutMs) {
|
|
2
|
+
const controller = new AbortController();
|
|
3
|
+
let timeoutId;
|
|
4
|
+
const abort = (reason) => {
|
|
5
|
+
if (!controller.signal.aborted) {
|
|
6
|
+
controller.abort(reason);
|
|
7
|
+
}
|
|
8
|
+
};
|
|
9
|
+
const timeoutError = () => {
|
|
10
|
+
const error = new Error('Operation timed out');
|
|
11
|
+
error.name = 'AbortError';
|
|
12
|
+
return error;
|
|
13
|
+
};
|
|
14
|
+
let onAbort;
|
|
15
|
+
if (baseSignal?.aborted) {
|
|
16
|
+
controller.abort(baseSignal.reason);
|
|
17
|
+
}
|
|
18
|
+
else if (baseSignal) {
|
|
19
|
+
onAbort = () => {
|
|
20
|
+
const reason = baseSignal.reason instanceof Error ? baseSignal.reason : undefined;
|
|
21
|
+
abort(reason);
|
|
22
|
+
};
|
|
23
|
+
baseSignal.addEventListener('abort', onAbort, { once: true });
|
|
24
|
+
}
|
|
25
|
+
timeoutId = setTimeout(() => {
|
|
26
|
+
abort(timeoutError());
|
|
27
|
+
}, timeoutMs);
|
|
28
|
+
return {
|
|
29
|
+
signal: controller.signal,
|
|
30
|
+
cleanup: () => {
|
|
31
|
+
if (baseSignal && onAbort) {
|
|
32
|
+
baseSignal.removeEventListener('abort', onAbort);
|
|
33
|
+
}
|
|
34
|
+
if (timeoutId) {
|
|
35
|
+
clearTimeout(timeoutId);
|
|
36
|
+
timeoutId = undefined;
|
|
37
|
+
}
|
|
38
|
+
},
|
|
39
|
+
};
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=abort.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"abort.js","sourceRoot":"","sources":["../../../src/tools/shared/abort.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,sBAAsB,CACpC,UAAmC,EACnC,SAAiB;IAEjB,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,IAAI,SAAoD,CAAC;IAEzD,MAAM,KAAK,GAAG,CAAC,MAAc,EAAQ,EAAE;QACrC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YAC/B,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAU,EAAE;QAC/B,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC/C,KAAK,CAAC,IAAI,GAAG,YAAY,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IAEF,IAAI,OAAiC,CAAC;IACtC,IAAI,UAAU,EAAE,OAAO,EAAE,CAAC;QACxB,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,CAAC;SAAM,IAAI,UAAU,EAAE,CAAC;QACtB,OAAO,GAAG,GAAS,EAAE;YACnB,MAAM,MAAM,GACV,UAAU,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YACrE,KAAK,CAAC,MAAM,CAAC,CAAC;QAChB,CAAC,CAAC;QACF,UAAU,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;QAC1B,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;IACxB,CAAC,EAAE,SAAS,CAAC,CAAC;IAEd,OAAO;QACL,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,OAAO,EAAE,GAAG,EAAE;YACZ,IAAI,UAAU,IAAI,OAAO,EAAE,CAAC;gBAC1B,UAAU,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;YACD,IAAI,SAAS,EAAE,CAAC;gBACd,YAAY,CAAC,SAAS,CAAC,CAAC;gBACxB,SAAS,GAAG,SAAS,CAAC;YACxB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|