@vybestack/llxprt-code-core 0.1.16 → 0.1.17
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/src/config/config.js +19 -9
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +63 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/core/coreToolScheduler.d.ts +6 -1
- package/dist/src/core/coreToolScheduler.js +96 -61
- package/dist/src/core/coreToolScheduler.js.map +1 -1
- package/dist/src/core/coreToolScheduler.test.js +142 -0
- package/dist/src/core/coreToolScheduler.test.js.map +1 -1
- package/dist/src/core/geminiChat.d.ts +9 -0
- package/dist/src/core/geminiChat.js +121 -1
- package/dist/src/core/geminiChat.js.map +1 -1
- package/dist/src/core/geminiChat.test.js +1 -0
- package/dist/src/core/geminiChat.test.js.map +1 -1
- package/dist/src/ide/detect-ide.js +6 -3
- package/dist/src/ide/detect-ide.js.map +1 -1
- package/dist/src/ide/ide-installer.d.ts +0 -1
- package/dist/src/ide/ide-installer.js +5 -7
- package/dist/src/ide/ide-installer.js.map +1 -1
- package/dist/src/ide/ide-installer.test.js +1 -24
- package/dist/src/ide/ide-installer.test.js.map +1 -1
- package/dist/src/mcp/oauth-utils.js +12 -4
- package/dist/src/mcp/oauth-utils.js.map +1 -1
- package/dist/src/providers/integration/multi-provider.integration.test.js +1 -1
- package/dist/src/providers/integration/multi-provider.integration.test.js.map +1 -1
- package/dist/src/providers/openai/OpenAIProvider.stateful.integration.test.js +1 -1
- package/dist/src/providers/openai/OpenAIProvider.stateful.integration.test.js.map +1 -1
- package/dist/src/tools/glob.js +9 -1
- package/dist/src/tools/glob.js.map +1 -1
- package/dist/src/tools/glob.test.js +1 -0
- package/dist/src/tools/glob.test.js.map +1 -1
- package/dist/src/tools/grep.js +49 -10
- package/dist/src/tools/grep.js.map +1 -1
- package/dist/src/tools/grep.test.js +3 -0
- package/dist/src/tools/grep.test.js.map +1 -1
- package/dist/src/tools/ls.js +9 -1
- package/dist/src/tools/ls.js.map +1 -1
- package/dist/src/tools/ls.test.js +1 -0
- package/dist/src/tools/ls.test.js.map +1 -1
- package/dist/src/tools/mcp-client.d.ts +1 -1
- package/dist/src/tools/mcp-client.js +53 -25
- package/dist/src/tools/mcp-client.js.map +1 -1
- package/dist/src/tools/read-many-files.js +135 -3
- package/dist/src/tools/read-many-files.js.map +1 -1
- package/dist/src/tools/read-many-files.test.js +280 -0
- package/dist/src/tools/read-many-files.test.js.map +1 -1
- package/dist/src/tools/shell.js +11 -2
- package/dist/src/tools/shell.js.map +1 -1
- package/dist/src/tools/shell.multibyte.test.js +1 -0
- package/dist/src/tools/shell.multibyte.test.js.map +1 -1
- package/dist/src/tools/shell.test.js +3 -0
- package/dist/src/tools/shell.test.js.map +1 -1
- package/dist/src/tools/tool-registry.d.ts +5 -0
- package/dist/src/tools/tool-registry.js +24 -1
- package/dist/src/tools/tool-registry.js.map +1 -1
- package/dist/src/tools/tool-registry.test.js +49 -0
- package/dist/src/tools/tool-registry.test.js.map +1 -1
- package/dist/src/types/modelParams.d.ts +12 -0
- package/dist/src/utils/paths.d.ts +11 -2
- package/dist/src/utils/paths.js +24 -7
- package/dist/src/utils/paths.js.map +1 -1
- package/dist/src/utils/paths.test.d.ts +6 -0
- package/dist/src/utils/paths.test.js +153 -0
- package/dist/src/utils/paths.test.js.map +1 -0
- package/dist/src/utils/toolOutputLimiter.d.ts +34 -0
- package/dist/src/utils/toolOutputLimiter.js +115 -0
- package/dist/src/utils/toolOutputLimiter.js.map +1 -0
- package/dist/src/utils/toolOutputLimiter.test.d.ts +6 -0
- package/dist/src/utils/toolOutputLimiter.test.js +164 -0
- package/dist/src/utils/toolOutputLimiter.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -6,6 +6,12 @@
|
|
|
6
6
|
export declare const LLXPRT_DIR = ".llxprt";
|
|
7
7
|
export declare const GOOGLE_ACCOUNTS_FILENAME = "google_accounts.json";
|
|
8
8
|
export declare function ensureLlxprtDirExists(): void;
|
|
9
|
+
/**
|
|
10
|
+
* Special characters that need to be escaped in file paths for shell compatibility.
|
|
11
|
+
* Includes: spaces, parentheses, brackets, braces, semicolons, ampersands, pipes,
|
|
12
|
+
* asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
|
|
13
|
+
*/
|
|
14
|
+
export declare const SHELL_SPECIAL_CHARS: RegExp;
|
|
9
15
|
/**
|
|
10
16
|
* Replaces the home directory with a tilde.
|
|
11
17
|
* @param path - The path to tildeify.
|
|
@@ -28,11 +34,14 @@ export declare function shortenPath(filePath: string, maxLen?: number): string;
|
|
|
28
34
|
*/
|
|
29
35
|
export declare function makeRelative(targetPath: string, rootDirectory: string): string;
|
|
30
36
|
/**
|
|
31
|
-
* Escapes
|
|
37
|
+
* Escapes special characters in a file path like macOS terminal does.
|
|
38
|
+
* Escapes: spaces, parentheses, brackets, braces, semicolons, ampersands, pipes,
|
|
39
|
+
* asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
|
|
32
40
|
*/
|
|
33
41
|
export declare function escapePath(filePath: string): string;
|
|
34
42
|
/**
|
|
35
|
-
* Unescapes
|
|
43
|
+
* Unescapes special characters in a file path.
|
|
44
|
+
* Removes backslash escaping from shell metacharacters.
|
|
36
45
|
*/
|
|
37
46
|
export declare function unescapePath(filePath: string): string;
|
|
38
47
|
/**
|
package/dist/src/utils/paths.js
CHANGED
|
@@ -18,6 +18,12 @@ export function ensureLlxprtDirExists() {
|
|
|
18
18
|
fs.mkdirSync(llxprtDir, { recursive: true });
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Special characters that need to be escaped in file paths for shell compatibility.
|
|
23
|
+
* Includes: spaces, parentheses, brackets, braces, semicolons, ampersands, pipes,
|
|
24
|
+
* asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
|
|
25
|
+
*/
|
|
26
|
+
export const SHELL_SPECIAL_CHARS = /[ \t()[\]{};|*?$`'"#&<>!~]/;
|
|
21
27
|
/**
|
|
22
28
|
* Replaces the home directory with a tilde.
|
|
23
29
|
* @param path - The path to tildeify.
|
|
@@ -105,26 +111,37 @@ export function makeRelative(targetPath, rootDirectory) {
|
|
|
105
111
|
return relativePath || '.';
|
|
106
112
|
}
|
|
107
113
|
/**
|
|
108
|
-
* Escapes
|
|
114
|
+
* Escapes special characters in a file path like macOS terminal does.
|
|
115
|
+
* Escapes: spaces, parentheses, brackets, braces, semicolons, ampersands, pipes,
|
|
116
|
+
* asterisks, question marks, dollar signs, backticks, quotes, hash, and other shell metacharacters.
|
|
109
117
|
*/
|
|
110
118
|
export function escapePath(filePath) {
|
|
111
119
|
let result = '';
|
|
112
120
|
for (let i = 0; i < filePath.length; i++) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
121
|
+
const char = filePath[i];
|
|
122
|
+
// Count consecutive backslashes before this character
|
|
123
|
+
let backslashCount = 0;
|
|
124
|
+
for (let j = i - 1; j >= 0 && filePath[j] === '\\'; j--) {
|
|
125
|
+
backslashCount++;
|
|
126
|
+
}
|
|
127
|
+
// Character is already escaped if there's an odd number of backslashes before it
|
|
128
|
+
const isAlreadyEscaped = backslashCount % 2 === 1;
|
|
129
|
+
// Only escape if not already escaped
|
|
130
|
+
if (!isAlreadyEscaped && SHELL_SPECIAL_CHARS.test(char)) {
|
|
131
|
+
result += '\\' + char;
|
|
116
132
|
}
|
|
117
133
|
else {
|
|
118
|
-
result +=
|
|
134
|
+
result += char;
|
|
119
135
|
}
|
|
120
136
|
}
|
|
121
137
|
return result;
|
|
122
138
|
}
|
|
123
139
|
/**
|
|
124
|
-
* Unescapes
|
|
140
|
+
* Unescapes special characters in a file path.
|
|
141
|
+
* Removes backslash escaping from shell metacharacters.
|
|
125
142
|
*/
|
|
126
143
|
export function unescapePath(filePath) {
|
|
127
|
-
return filePath.replace(
|
|
144
|
+
return filePath.replace(new RegExp(`\\\\([${SHELL_SPECIAL_CHARS.source.slice(1, -1)}])`, 'g'), '$1');
|
|
128
145
|
}
|
|
129
146
|
/**
|
|
130
147
|
* Generates a unique hash for a project based on its root path.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/utils/paths.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../src/utils/paths.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC;AACpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,sBAAsB,CAAC;AAC/D,MAAM,YAAY,GAAG,KAAK,CAAC;AAC3B,MAAM,iBAAiB,GAAG,UAAU,CAAC;AAErC,MAAM,UAAU,qBAAqB;IACnC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC9B,EAAE,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/C,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;AAEhE;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;IAC7B,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,SAAiB,EAAE;IAC/D,IAAI,QAAQ,CAAC,MAAM,IAAI,MAAM,EAAE,CAAC;QAC9B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;IAE3B,4CAA4C;IAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,4BAA4B;IAEpG,kFAAkF;IAClF,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACzB,mFAAmF;QACnF,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,yDAAyD;QACzD,IAAI,OAAO,IAAI,CAAC,EAAE,CAAC;YACjB,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QACnD,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC7C,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC;QAC1D,OAAO,GAAG,KAAK,MAAM,GAAG,EAAE,CAAC;IAC7B,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC7B,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,IAAI,GAAG,QAAQ,CAAC;IAEvC,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,2CAA2C;IAC3C,IAAI,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;IAE1D,+DAA+D;IAC/D,KAAK,IAAI,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,sEAAsE;QACtE,MAAM,iBAAiB,GAAG,aAAa,GAAG,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAE5E,IAAI,iBAAiB,IAAI,MAAM,EAAE,CAAC;YAChC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,uCAAuC;YACzE,aAAa,GAAG,iBAAiB,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,SAAS,GAAG,WAAW,CAAC;IAEvE,IAAI,aAAa,GAAG,MAAM,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,2BAA2B;IAC3B,MAAM,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,CAAC;IAE7C,4DAA4D;IAC5D,uEAAuE;IACvE,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;QAC3B,OAAO,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAC1B,UAAkB,EAClB,aAAqB;IAErB,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACpD,MAAM,qBAAqB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,qBAAqB,EAAE,kBAAkB,CAAC,CAAC;IAE9E,0EAA0E;IAC1E,OAAO,YAAY,IAAI,GAAG,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB;IACzC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAEzB,sDAAsD;QACtD,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC;YACxD,cAAc,EAAE,CAAC;QACnB,CAAC;QAED,iFAAiF;QACjF,MAAM,gBAAgB,GAAG,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC;QAElD,qCAAqC;QACrC,IAAI,CAAC,gBAAgB,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACxD,MAAM,IAAI,IAAI,GAAG,IAAI,CAAC;QACxB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,OAAO,QAAQ,CAAC,OAAO,CACrB,IAAI,MAAM,CAAC,SAAS,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,GAAG,CAAC,EACrE,IAAI,CACL,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,WAAmB;IAChD,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AACvE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,WAAmB;IACnD,MAAM,IAAI,GAAG,cAAc,CAAC,WAAW,CAAC,CAAC;IACzC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;AACjE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB;IAChC,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,WAAmB;IACvD,OAAO,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { escapePath, unescapePath } from './paths.js';
|
|
8
|
+
describe('escapePath', () => {
|
|
9
|
+
it('should escape spaces', () => {
|
|
10
|
+
expect(escapePath('my file.txt')).toBe('my\\ file.txt');
|
|
11
|
+
});
|
|
12
|
+
it('should escape tabs', () => {
|
|
13
|
+
expect(escapePath('file\twith\ttabs.txt')).toBe('file\\\twith\\\ttabs.txt');
|
|
14
|
+
});
|
|
15
|
+
it('should escape parentheses', () => {
|
|
16
|
+
expect(escapePath('file(1).txt')).toBe('file\\(1\\).txt');
|
|
17
|
+
});
|
|
18
|
+
it('should escape square brackets', () => {
|
|
19
|
+
expect(escapePath('file[backup].txt')).toBe('file\\[backup\\].txt');
|
|
20
|
+
});
|
|
21
|
+
it('should escape curly braces', () => {
|
|
22
|
+
expect(escapePath('file{temp}.txt')).toBe('file\\{temp\\}.txt');
|
|
23
|
+
});
|
|
24
|
+
it('should escape semicolons', () => {
|
|
25
|
+
expect(escapePath('file;name.txt')).toBe('file\\;name.txt');
|
|
26
|
+
});
|
|
27
|
+
it('should escape ampersands', () => {
|
|
28
|
+
expect(escapePath('file&name.txt')).toBe('file\\&name.txt');
|
|
29
|
+
});
|
|
30
|
+
it('should escape pipes', () => {
|
|
31
|
+
expect(escapePath('file|name.txt')).toBe('file\\|name.txt');
|
|
32
|
+
});
|
|
33
|
+
it('should escape asterisks', () => {
|
|
34
|
+
expect(escapePath('file*.txt')).toBe('file\\*.txt');
|
|
35
|
+
});
|
|
36
|
+
it('should escape question marks', () => {
|
|
37
|
+
expect(escapePath('file?.txt')).toBe('file\\?.txt');
|
|
38
|
+
});
|
|
39
|
+
it('should escape dollar signs', () => {
|
|
40
|
+
expect(escapePath('file$name.txt')).toBe('file\\$name.txt');
|
|
41
|
+
});
|
|
42
|
+
it('should escape backticks', () => {
|
|
43
|
+
expect(escapePath('file`name.txt')).toBe('file\\`name.txt');
|
|
44
|
+
});
|
|
45
|
+
it('should escape single quotes', () => {
|
|
46
|
+
expect(escapePath("file'name.txt")).toBe("file\\'name.txt");
|
|
47
|
+
});
|
|
48
|
+
it('should escape double quotes', () => {
|
|
49
|
+
expect(escapePath('file"name.txt')).toBe('file\\"name.txt');
|
|
50
|
+
});
|
|
51
|
+
it('should escape hash symbols', () => {
|
|
52
|
+
expect(escapePath('file#name.txt')).toBe('file\\#name.txt');
|
|
53
|
+
});
|
|
54
|
+
it('should escape exclamation marks', () => {
|
|
55
|
+
expect(escapePath('file!name.txt')).toBe('file\\!name.txt');
|
|
56
|
+
});
|
|
57
|
+
it('should escape tildes', () => {
|
|
58
|
+
expect(escapePath('file~name.txt')).toBe('file\\~name.txt');
|
|
59
|
+
});
|
|
60
|
+
it('should escape less than and greater than signs', () => {
|
|
61
|
+
expect(escapePath('file<name>.txt')).toBe('file\\<name\\>.txt');
|
|
62
|
+
});
|
|
63
|
+
it('should handle multiple special characters', () => {
|
|
64
|
+
expect(escapePath('my file (backup) [v1.2].txt')).toBe('my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt');
|
|
65
|
+
});
|
|
66
|
+
it('should not double-escape already escaped characters', () => {
|
|
67
|
+
expect(escapePath('my\\ file.txt')).toBe('my\\ file.txt');
|
|
68
|
+
expect(escapePath('file\\(name\\).txt')).toBe('file\\(name\\).txt');
|
|
69
|
+
});
|
|
70
|
+
it('should handle escaped backslashes correctly', () => {
|
|
71
|
+
// Double backslash (escaped backslash) followed by space should escape the space
|
|
72
|
+
expect(escapePath('path\\\\ file.txt')).toBe('path\\\\\\ file.txt');
|
|
73
|
+
// Triple backslash (escaped backslash + escaping backslash) followed by space should not double-escape
|
|
74
|
+
expect(escapePath('path\\\\\\ file.txt')).toBe('path\\\\\\ file.txt');
|
|
75
|
+
// Quadruple backslash (two escaped backslashes) followed by space should escape the space
|
|
76
|
+
expect(escapePath('path\\\\\\\\ file.txt')).toBe('path\\\\\\\\\\ file.txt');
|
|
77
|
+
});
|
|
78
|
+
it('should handle complex escaped backslash scenarios', () => {
|
|
79
|
+
// Escaped backslash before special character that needs escaping
|
|
80
|
+
expect(escapePath('file\\\\(test).txt')).toBe('file\\\\\\(test\\).txt');
|
|
81
|
+
// Multiple escaped backslashes
|
|
82
|
+
expect(escapePath('path\\\\\\\\with space.txt')).toBe('path\\\\\\\\with\\ space.txt');
|
|
83
|
+
});
|
|
84
|
+
it('should handle paths without special characters', () => {
|
|
85
|
+
expect(escapePath('normalfile.txt')).toBe('normalfile.txt');
|
|
86
|
+
expect(escapePath('path/to/normalfile.txt')).toBe('path/to/normalfile.txt');
|
|
87
|
+
});
|
|
88
|
+
it('should handle complex real-world examples', () => {
|
|
89
|
+
expect(escapePath('My Documents/Project (2024)/file [backup].txt')).toBe('My\\ Documents/Project\\ \\(2024\\)/file\\ \\[backup\\].txt');
|
|
90
|
+
expect(escapePath('file with $special &chars!.txt')).toBe('file\\ with\\ \\$special\\ \\&chars\\!.txt');
|
|
91
|
+
});
|
|
92
|
+
it('should handle empty strings', () => {
|
|
93
|
+
expect(escapePath('')).toBe('');
|
|
94
|
+
});
|
|
95
|
+
it('should handle paths with only special characters', () => {
|
|
96
|
+
expect(escapePath(' ()[]{};&|*?$`\'"#!~<>')).toBe('\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>');
|
|
97
|
+
});
|
|
98
|
+
});
|
|
99
|
+
describe('unescapePath', () => {
|
|
100
|
+
it('should unescape spaces', () => {
|
|
101
|
+
expect(unescapePath('my\\ file.txt')).toBe('my file.txt');
|
|
102
|
+
});
|
|
103
|
+
it('should unescape tabs', () => {
|
|
104
|
+
expect(unescapePath('file\\\twith\\\ttabs.txt')).toBe('file\twith\ttabs.txt');
|
|
105
|
+
});
|
|
106
|
+
it('should unescape parentheses', () => {
|
|
107
|
+
expect(unescapePath('file\\(1\\).txt')).toBe('file(1).txt');
|
|
108
|
+
});
|
|
109
|
+
it('should unescape square brackets', () => {
|
|
110
|
+
expect(unescapePath('file\\[backup\\].txt')).toBe('file[backup].txt');
|
|
111
|
+
});
|
|
112
|
+
it('should unescape curly braces', () => {
|
|
113
|
+
expect(unescapePath('file\\{temp\\}.txt')).toBe('file{temp}.txt');
|
|
114
|
+
});
|
|
115
|
+
it('should unescape multiple special characters', () => {
|
|
116
|
+
expect(unescapePath('my\\ file\\ \\(backup\\)\\ \\[v1.2\\].txt')).toBe('my file (backup) [v1.2].txt');
|
|
117
|
+
});
|
|
118
|
+
it('should handle paths without escaped characters', () => {
|
|
119
|
+
expect(unescapePath('normalfile.txt')).toBe('normalfile.txt');
|
|
120
|
+
expect(unescapePath('path/to/normalfile.txt')).toBe('path/to/normalfile.txt');
|
|
121
|
+
});
|
|
122
|
+
it('should handle all special characters', () => {
|
|
123
|
+
expect(unescapePath('\\ \\(\\)\\[\\]\\{\\}\\;\\&\\|\\*\\?\\$\\`\\\'\\"\\#\\!\\~\\<\\>')).toBe(' ()[]{};&|*?$`\'"#!~<>');
|
|
124
|
+
});
|
|
125
|
+
it('should be the inverse of escapePath', () => {
|
|
126
|
+
const testCases = [
|
|
127
|
+
'my file.txt',
|
|
128
|
+
'file(1).txt',
|
|
129
|
+
'file[backup].txt',
|
|
130
|
+
'My Documents/Project (2024)/file [backup].txt',
|
|
131
|
+
'file with $special &chars!.txt',
|
|
132
|
+
' ()[]{};&|*?$`\'"#!~<>',
|
|
133
|
+
'file\twith\ttabs.txt',
|
|
134
|
+
];
|
|
135
|
+
testCases.forEach((testCase) => {
|
|
136
|
+
expect(unescapePath(escapePath(testCase))).toBe(testCase);
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
it('should handle empty strings', () => {
|
|
140
|
+
expect(unescapePath('')).toBe('');
|
|
141
|
+
});
|
|
142
|
+
it('should not affect backslashes not followed by special characters', () => {
|
|
143
|
+
expect(unescapePath('file\\name.txt')).toBe('file\\name.txt');
|
|
144
|
+
expect(unescapePath('path\\to\\file.txt')).toBe('path\\to\\file.txt');
|
|
145
|
+
});
|
|
146
|
+
it('should handle escaped backslashes in unescaping', () => {
|
|
147
|
+
// Should correctly unescape when there are escaped backslashes
|
|
148
|
+
expect(unescapePath('path\\\\\\ file.txt')).toBe('path\\\\ file.txt');
|
|
149
|
+
expect(unescapePath('path\\\\\\\\\\ file.txt')).toBe('path\\\\\\\\ file.txt');
|
|
150
|
+
expect(unescapePath('file\\\\\\(test\\).txt')).toBe('file\\\\(test).txt');
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
//# sourceMappingURL=paths.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"paths.test.js","sourceRoot":"","sources":["../../../src/utils/paths.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { Config } from '../config/config.js';
|
|
7
|
+
export declare const DEFAULT_MAX_TOKENS = 50000;
|
|
8
|
+
export declare const DEFAULT_TRUNCATE_MODE = "warn";
|
|
9
|
+
export declare function estimateTokens(text: string): number;
|
|
10
|
+
export interface OutputLimitConfig {
|
|
11
|
+
maxTokens?: number;
|
|
12
|
+
truncateMode?: 'warn' | 'truncate' | 'sample';
|
|
13
|
+
}
|
|
14
|
+
export interface TruncatedOutput {
|
|
15
|
+
content: string;
|
|
16
|
+
wasTruncated: boolean;
|
|
17
|
+
originalTokens?: number;
|
|
18
|
+
message?: string;
|
|
19
|
+
}
|
|
20
|
+
/**
|
|
21
|
+
* Get output limit configuration from ephemeral settings
|
|
22
|
+
*/
|
|
23
|
+
export declare function getOutputLimits(config: Config): OutputLimitConfig;
|
|
24
|
+
/**
|
|
25
|
+
* Check if content exceeds token limit and handle according to truncate mode
|
|
26
|
+
*/
|
|
27
|
+
export declare function limitOutputTokens(content: string, config: Config, toolName: string): TruncatedOutput;
|
|
28
|
+
/**
|
|
29
|
+
* Format output with truncation handling
|
|
30
|
+
*/
|
|
31
|
+
export declare function formatLimitedOutput(result: TruncatedOutput): {
|
|
32
|
+
llmContent: string;
|
|
33
|
+
returnDisplay: string;
|
|
34
|
+
};
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
// Default limits
|
|
7
|
+
export const DEFAULT_MAX_TOKENS = 50000;
|
|
8
|
+
export const DEFAULT_TRUNCATE_MODE = 'warn';
|
|
9
|
+
// Simple token estimation - roughly 4 characters per token
|
|
10
|
+
export function estimateTokens(text) {
|
|
11
|
+
return Math.ceil(text.length / 4);
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* Get output limit configuration from ephemeral settings
|
|
15
|
+
*/
|
|
16
|
+
export function getOutputLimits(config) {
|
|
17
|
+
const ephemeralSettings = config.getEphemeralSettings();
|
|
18
|
+
return {
|
|
19
|
+
maxTokens: ephemeralSettings['tool-output-max-tokens'] ??
|
|
20
|
+
DEFAULT_MAX_TOKENS,
|
|
21
|
+
truncateMode: ephemeralSettings['tool-output-truncate-mode'] ?? DEFAULT_TRUNCATE_MODE,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Check if content exceeds token limit and handle according to truncate mode
|
|
26
|
+
*/
|
|
27
|
+
export function limitOutputTokens(content, config, toolName) {
|
|
28
|
+
const limits = getOutputLimits(config);
|
|
29
|
+
const tokens = estimateTokens(content);
|
|
30
|
+
if (!limits.maxTokens || tokens <= limits.maxTokens) {
|
|
31
|
+
return {
|
|
32
|
+
content,
|
|
33
|
+
wasTruncated: false,
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
// Content exceeds limit
|
|
37
|
+
const originalTokens = tokens;
|
|
38
|
+
if (limits.truncateMode === 'warn') {
|
|
39
|
+
// Return empty content with warning message
|
|
40
|
+
return {
|
|
41
|
+
content: '',
|
|
42
|
+
wasTruncated: true,
|
|
43
|
+
originalTokens,
|
|
44
|
+
message: `${toolName} output exceeded token limit (${originalTokens} > ${limits.maxTokens}). Please use more specific patterns to reduce output size.`,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
else if (limits.truncateMode === 'truncate') {
|
|
48
|
+
// Truncate content to fit within limit
|
|
49
|
+
const maxChars = limits.maxTokens * 4; // Rough estimate
|
|
50
|
+
const truncatedContent = content.substring(0, maxChars);
|
|
51
|
+
return {
|
|
52
|
+
content: truncatedContent + '\n\n[Output truncated due to token limit]',
|
|
53
|
+
wasTruncated: true,
|
|
54
|
+
originalTokens,
|
|
55
|
+
message: `Output truncated from ${originalTokens} to ${limits.maxTokens} tokens`,
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
// 'sample' mode - for line-based content, sample evenly
|
|
60
|
+
const lines = content.split('\n');
|
|
61
|
+
if (lines.length > 1) {
|
|
62
|
+
const targetLines = Math.floor(limits.maxTokens / 10); // Rough estimate of tokens per line
|
|
63
|
+
const step = Math.ceil(lines.length / targetLines);
|
|
64
|
+
const sampledLines = [];
|
|
65
|
+
for (let i = 0; i < lines.length; i += step) {
|
|
66
|
+
sampledLines.push(lines[i]);
|
|
67
|
+
if (estimateTokens(sampledLines.join('\n')) > limits.maxTokens * 0.9) {
|
|
68
|
+
break;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return {
|
|
72
|
+
content: sampledLines.join('\n') +
|
|
73
|
+
`\n\n[Sampled ${sampledLines.length} of ${lines.length} lines due to token limit]`,
|
|
74
|
+
wasTruncated: true,
|
|
75
|
+
originalTokens,
|
|
76
|
+
message: `Output sampled to fit within ${limits.maxTokens} token limit`,
|
|
77
|
+
};
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
// Single line or non-line content, fall back to truncate
|
|
81
|
+
const maxChars = limits.maxTokens * 4; // Rough estimate
|
|
82
|
+
const truncatedContent = content.substring(0, maxChars);
|
|
83
|
+
return {
|
|
84
|
+
content: truncatedContent + '\n\n[Output truncated due to token limit]',
|
|
85
|
+
wasTruncated: true,
|
|
86
|
+
originalTokens,
|
|
87
|
+
message: `Output truncated from ${originalTokens} to ${limits.maxTokens} tokens`,
|
|
88
|
+
};
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Format output with truncation handling
|
|
94
|
+
*/
|
|
95
|
+
export function formatLimitedOutput(result) {
|
|
96
|
+
if (!result.wasTruncated) {
|
|
97
|
+
return {
|
|
98
|
+
llmContent: result.content,
|
|
99
|
+
returnDisplay: result.content,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
if (result.message && !result.content) {
|
|
103
|
+
// Warn mode - no content
|
|
104
|
+
return {
|
|
105
|
+
llmContent: result.message,
|
|
106
|
+
returnDisplay: `## Token Limit Exceeded\n\n${result.message}`,
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
// Truncate or sample mode
|
|
110
|
+
return {
|
|
111
|
+
llmContent: result.content,
|
|
112
|
+
returnDisplay: result.content + (result.message ? `\n\n## Note\n${result.message}` : ''),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
//# sourceMappingURL=toolOutputLimiter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toolOutputLimiter.js","sourceRoot":"","sources":["../../../src/utils/toolOutputLimiter.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Vybestack LLC
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, vi } from 'vitest';
|
|
7
|
+
import { estimateTokens, getOutputLimits, limitOutputTokens, formatLimitedOutput, DEFAULT_MAX_TOKENS, DEFAULT_TRUNCATE_MODE, } from './toolOutputLimiter.js';
|
|
8
|
+
describe('toolOutputLimiter', () => {
|
|
9
|
+
let mockConfig;
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
mockConfig = {
|
|
12
|
+
getEphemeralSettings: vi.fn().mockReturnValue({}),
|
|
13
|
+
};
|
|
14
|
+
});
|
|
15
|
+
describe('estimateTokens', () => {
|
|
16
|
+
it('should estimate tokens as roughly 1/4 of characters', () => {
|
|
17
|
+
expect(estimateTokens('hello')).toBe(2); // 5 chars / 4 = 1.25, ceil = 2
|
|
18
|
+
expect(estimateTokens('hello world')).toBe(3); // 11 chars / 4 = 2.75, ceil = 3
|
|
19
|
+
expect(estimateTokens('')).toBe(0);
|
|
20
|
+
expect(estimateTokens('a'.repeat(100))).toBe(25); // 100 / 4 = 25
|
|
21
|
+
});
|
|
22
|
+
});
|
|
23
|
+
describe('getOutputLimits', () => {
|
|
24
|
+
it('should return default values when no settings are provided', () => {
|
|
25
|
+
const limits = getOutputLimits(mockConfig);
|
|
26
|
+
expect(limits).toEqual({
|
|
27
|
+
maxTokens: DEFAULT_MAX_TOKENS,
|
|
28
|
+
truncateMode: DEFAULT_TRUNCATE_MODE,
|
|
29
|
+
});
|
|
30
|
+
});
|
|
31
|
+
it('should return configured values from ephemeral settings', () => {
|
|
32
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
33
|
+
'tool-output-max-tokens': 75000,
|
|
34
|
+
'tool-output-truncate-mode': 'truncate',
|
|
35
|
+
});
|
|
36
|
+
const limits = getOutputLimits(mockConfig);
|
|
37
|
+
expect(limits).toEqual({
|
|
38
|
+
maxTokens: 75000,
|
|
39
|
+
truncateMode: 'truncate',
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
it('should handle partial settings', () => {
|
|
43
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
44
|
+
'tool-output-max-tokens': 100000,
|
|
45
|
+
// truncateMode not set
|
|
46
|
+
});
|
|
47
|
+
const limits = getOutputLimits(mockConfig);
|
|
48
|
+
expect(limits).toEqual({
|
|
49
|
+
maxTokens: 100000,
|
|
50
|
+
truncateMode: DEFAULT_TRUNCATE_MODE,
|
|
51
|
+
});
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
describe('limitOutputTokens', () => {
|
|
55
|
+
it('should not truncate content within limits', () => {
|
|
56
|
+
const content = 'This is a short message';
|
|
57
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
58
|
+
expect(result).toEqual({
|
|
59
|
+
content,
|
|
60
|
+
wasTruncated: false,
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
it('should warn when content exceeds limit in warn mode', () => {
|
|
64
|
+
const content = 'a'.repeat(250000); // Way over default 50k token limit
|
|
65
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
66
|
+
'tool-output-truncate-mode': 'warn',
|
|
67
|
+
});
|
|
68
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
69
|
+
expect(result.wasTruncated).toBe(true);
|
|
70
|
+
expect(result.content).toBe('');
|
|
71
|
+
expect(result.message).toContain('test-tool output exceeded token limit');
|
|
72
|
+
expect(result.message).toContain('62500 > 50000');
|
|
73
|
+
});
|
|
74
|
+
it('should truncate content in truncate mode', () => {
|
|
75
|
+
const content = 'a'.repeat(250000); // Way over default 50k token limit
|
|
76
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
77
|
+
'tool-output-truncate-mode': 'truncate',
|
|
78
|
+
});
|
|
79
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
80
|
+
expect(result.wasTruncated).toBe(true);
|
|
81
|
+
expect(result.content.length).toBeLessThan(content.length);
|
|
82
|
+
expect(result.content).toContain('[Output truncated due to token limit]');
|
|
83
|
+
expect(result.originalTokens).toBe(62500);
|
|
84
|
+
});
|
|
85
|
+
it('should sample lines in sample mode', () => {
|
|
86
|
+
const lines = Array.from({ length: 1000 }, (_, i) => `Line ${i}`);
|
|
87
|
+
const content = lines.join('\n');
|
|
88
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
89
|
+
'tool-output-truncate-mode': 'sample',
|
|
90
|
+
'tool-output-max-tokens': 1000, // Very small limit
|
|
91
|
+
});
|
|
92
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
93
|
+
expect(result.wasTruncated).toBe(true);
|
|
94
|
+
expect(result.content).toContain('[Sampled');
|
|
95
|
+
expect(result.content).toContain('of 1000 lines due to token limit]');
|
|
96
|
+
expect(result.content.split('\n').length).toBeLessThan(1000);
|
|
97
|
+
});
|
|
98
|
+
it('should handle single line content in sample mode', () => {
|
|
99
|
+
const content = 'a'.repeat(250000); // Single line, way over limit
|
|
100
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
101
|
+
'tool-output-truncate-mode': 'sample',
|
|
102
|
+
});
|
|
103
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
104
|
+
// Should fall back to truncate behavior for single lines
|
|
105
|
+
expect(result.wasTruncated).toBe(true);
|
|
106
|
+
expect(result.content.length).toBeLessThan(content.length);
|
|
107
|
+
});
|
|
108
|
+
it('should respect custom max tokens setting', () => {
|
|
109
|
+
const content = 'a'.repeat(1000); // 250 tokens
|
|
110
|
+
mockConfig.getEphemeralSettings.mockReturnValue({
|
|
111
|
+
'tool-output-max-tokens': 100,
|
|
112
|
+
'tool-output-truncate-mode': 'warn',
|
|
113
|
+
});
|
|
114
|
+
const result = limitOutputTokens(content, mockConfig, 'test-tool');
|
|
115
|
+
expect(result.wasTruncated).toBe(true);
|
|
116
|
+
expect(result.message).toContain('250 > 100');
|
|
117
|
+
});
|
|
118
|
+
});
|
|
119
|
+
describe('formatLimitedOutput', () => {
|
|
120
|
+
it('should pass through non-truncated content', () => {
|
|
121
|
+
const result = formatLimitedOutput({
|
|
122
|
+
content: 'Normal content',
|
|
123
|
+
wasTruncated: false,
|
|
124
|
+
});
|
|
125
|
+
expect(result).toEqual({
|
|
126
|
+
llmContent: 'Normal content',
|
|
127
|
+
returnDisplay: 'Normal content',
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
it('should format warn mode output', () => {
|
|
131
|
+
const result = formatLimitedOutput({
|
|
132
|
+
content: '',
|
|
133
|
+
wasTruncated: true,
|
|
134
|
+
message: 'Tool output exceeded limit',
|
|
135
|
+
});
|
|
136
|
+
expect(result).toEqual({
|
|
137
|
+
llmContent: 'Tool output exceeded limit',
|
|
138
|
+
returnDisplay: '## Token Limit Exceeded\n\nTool output exceeded limit',
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
it('should format truncated output with message', () => {
|
|
142
|
+
const result = formatLimitedOutput({
|
|
143
|
+
content: 'Truncated content...',
|
|
144
|
+
wasTruncated: true,
|
|
145
|
+
message: 'Output was truncated',
|
|
146
|
+
});
|
|
147
|
+
expect(result).toEqual({
|
|
148
|
+
llmContent: 'Truncated content...',
|
|
149
|
+
returnDisplay: 'Truncated content...\n\n## Note\nOutput was truncated',
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
it('should handle truncated output without message', () => {
|
|
153
|
+
const result = formatLimitedOutput({
|
|
154
|
+
content: 'Truncated content...',
|
|
155
|
+
wasTruncated: true,
|
|
156
|
+
});
|
|
157
|
+
expect(result).toEqual({
|
|
158
|
+
llmContent: 'Truncated content...',
|
|
159
|
+
returnDisplay: 'Truncated content...',
|
|
160
|
+
});
|
|
161
|
+
});
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
//# sourceMappingURL=toolOutputLimiter.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toolOutputLimiter.test.js","sourceRoot":"","sources":["../../../src/utils/toolOutputLimiter.test.ts"],"names":[],"mappings":"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"}
|