@qduc/term2 0.1.4 → 0.1.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/app.d.ts.map +1 -1
- package/dist/app.js +2 -2
- package/dist/app.js.map +1 -1
- package/dist/components/BottomArea.d.ts +2 -0
- package/dist/components/BottomArea.d.ts.map +1 -1
- package/dist/components/BottomArea.js +2 -2
- package/dist/components/BottomArea.js.map +1 -1
- package/dist/components/ModelSelectionMenu.d.ts.map +1 -1
- package/dist/components/ModelSelectionMenu.js +24 -15
- package/dist/components/ModelSelectionMenu.js.map +1 -1
- package/dist/components/StatusBar.d.ts +2 -0
- package/dist/components/StatusBar.d.ts.map +1 -1
- package/dist/components/StatusBar.js +44 -39
- package/dist/components/StatusBar.js.map +1 -1
- package/dist/components/StatusBar.test.d.ts +2 -0
- package/dist/components/StatusBar.test.d.ts.map +1 -0
- package/dist/components/StatusBar.test.js +19 -0
- package/dist/components/StatusBar.test.js.map +1 -0
- package/dist/hooks/use-conversation.d.ts +2 -0
- package/dist/hooks/use-conversation.d.ts.map +1 -1
- package/dist/hooks/use-conversation.js +44 -3
- package/dist/hooks/use-conversation.js.map +1 -1
- package/dist/hooks/use-model-selection.d.ts.map +1 -1
- package/dist/hooks/use-model-selection.js +1 -25
- package/dist/hooks/use-model-selection.js.map +1 -1
- package/dist/lib/openai-agent-client.d.ts.map +1 -1
- package/dist/lib/openai-agent-client.js +12 -4
- package/dist/lib/openai-agent-client.js.map +1 -1
- package/dist/services/conversation-events.d.ts +3 -0
- package/dist/services/conversation-events.d.ts.map +1 -1
- package/dist/services/conversation-session.d.ts +2 -0
- package/dist/services/conversation-session.d.ts.map +1 -1
- package/dist/services/conversation-session.js +151 -28
- package/dist/services/conversation-session.js.map +1 -1
- package/dist/services/conversation-session.usage.test.d.ts +2 -0
- package/dist/services/conversation-session.usage.test.d.ts.map +1 -0
- package/dist/services/conversation-session.usage.test.js +59 -0
- package/dist/services/conversation-session.usage.test.js.map +1 -0
- package/dist/tools/find-files.d.ts +1 -0
- package/dist/tools/find-files.d.ts.map +1 -1
- package/dist/tools/find-files.js +92 -8
- package/dist/tools/find-files.js.map +1 -1
- package/dist/tools/find-files.test.js +45 -0
- package/dist/tools/find-files.test.js.map +1 -1
- package/dist/tools/web-fetch.d.ts +4 -4
- package/dist/tools/web-fetch.d.ts.map +1 -1
- package/dist/tools/web-fetch.js +30 -243
- package/dist/tools/web-fetch.js.map +1 -1
- package/dist/utils/token-usage.d.ts +16 -0
- package/dist/utils/token-usage.d.ts.map +1 -0
- package/dist/utils/token-usage.js +110 -0
- package/dist/utils/token-usage.js.map +1 -0
- package/dist/utils/token-usage.test.d.ts +2 -0
- package/dist/utils/token-usage.test.d.ts.map +1 -0
- package/dist/utils/token-usage.test.js +38 -0
- package/dist/utils/token-usage.test.js.map +1 -0
- package/dist/utils/trim-tool-output.d.ts +2 -0
- package/dist/utils/trim-tool-output.d.ts.map +1 -0
- package/dist/utils/trim-tool-output.js +52 -0
- package/dist/utils/trim-tool-output.js.map +1 -0
- package/package.json +2 -1
- package/{README.md → readme.md} +22 -1
package/dist/tools/find-files.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { exec } from 'child_process';
|
|
3
3
|
import util from 'util';
|
|
4
|
+
import path from 'path';
|
|
4
5
|
import { resolveWorkspacePath, relaxedNumber } from './utils.js';
|
|
5
6
|
import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from './format-helpers.js';
|
|
6
7
|
const execPromise = util.promisify(exec);
|
|
@@ -86,7 +87,7 @@ export const formatFindFilesCommandMessage = (item, index, toolCallArgumentsById
|
|
|
86
87
|
];
|
|
87
88
|
};
|
|
88
89
|
export const createFindFilesToolDefinition = (deps = {}) => {
|
|
89
|
-
const { executionContext, allowOutsideWorkspace = false } = deps;
|
|
90
|
+
const { executionContext, allowOutsideWorkspace = false, forceFindFallback = false } = deps;
|
|
90
91
|
return {
|
|
91
92
|
name: 'find_files',
|
|
92
93
|
description: allowOutsideWorkspace
|
|
@@ -108,7 +109,13 @@ export const createFindFilesToolDefinition = (deps = {}) => {
|
|
|
108
109
|
const absolutePath = resolveWorkspacePath(targetPath, cwd, {
|
|
109
110
|
allowOutsideWorkspace,
|
|
110
111
|
});
|
|
111
|
-
const useFd =
|
|
112
|
+
const useFd = forceFindFallback
|
|
113
|
+
? false
|
|
114
|
+
: await checkFdAvailability(executionContext);
|
|
115
|
+
const isRemote = executionContext?.isRemote() ?? false;
|
|
116
|
+
if (isRemote && !useFd && patternHasPathSegments(pattern)) {
|
|
117
|
+
return 'Error: SSH search without fd does not support path segments in the pattern. Use the path parameter with a basename glob like "*.ts" or "*" instead.';
|
|
118
|
+
}
|
|
112
119
|
let command = '';
|
|
113
120
|
if (useFd) {
|
|
114
121
|
// Use fd (faster and more user-friendly)
|
|
@@ -125,16 +132,13 @@ export const createFindFilesToolDefinition = (deps = {}) => {
|
|
|
125
132
|
command = args.join(' ');
|
|
126
133
|
}
|
|
127
134
|
else {
|
|
128
|
-
// Fallback to find
|
|
135
|
+
// Fallback to find (list all files; filter in JS to match fd glob semantics)
|
|
129
136
|
const args = [
|
|
130
137
|
'find',
|
|
131
138
|
`'${absolutePath.replace(/'/g, "'\\''")}'`,
|
|
132
139
|
'-type',
|
|
133
140
|
'f',
|
|
134
|
-
'-name',
|
|
135
141
|
];
|
|
136
|
-
// Escape pattern for shell
|
|
137
|
-
args.push(`'${pattern.replace(/'/g, "'\\''")}'`);
|
|
138
142
|
command = args.join(' ');
|
|
139
143
|
}
|
|
140
144
|
const sshService = executionContext?.getSSHService();
|
|
@@ -154,8 +158,12 @@ export const createFindFilesToolDefinition = (deps = {}) => {
|
|
|
154
158
|
return `No files found matching pattern: ${pattern}`;
|
|
155
159
|
}
|
|
156
160
|
const lines = trimmed.split('\n');
|
|
157
|
-
|
|
158
|
-
|
|
161
|
+
const cleanedLines = useFd
|
|
162
|
+
? lines.map(line => (line.startsWith('./') ? line.substring(2) : line))
|
|
163
|
+
: filterFindResults(lines, absolutePath, pattern);
|
|
164
|
+
if (cleanedLines.length === 0) {
|
|
165
|
+
return `No files found matching pattern: ${pattern}`;
|
|
166
|
+
}
|
|
159
167
|
// Apply limit
|
|
160
168
|
let resultText = cleanedLines.slice(0, limit).join('\n');
|
|
161
169
|
// Add note if results were truncated
|
|
@@ -180,4 +188,80 @@ export const createFindFilesToolDefinition = (deps = {}) => {
|
|
|
180
188
|
formatCommandMessage: formatFindFilesCommandMessage,
|
|
181
189
|
};
|
|
182
190
|
};
|
|
191
|
+
function filterFindResults(lines, absolutePath, pattern) {
|
|
192
|
+
const normalizedPattern = pattern.replace(/\\/g, '/').replace(/^\.\//, '');
|
|
193
|
+
const patternHasSlash = normalizedPattern.includes('/');
|
|
194
|
+
const matcher = globToRegex(normalizedPattern);
|
|
195
|
+
const root = absolutePath.replace(/\\/g, '/').replace(/\/+$/, '');
|
|
196
|
+
const results = [];
|
|
197
|
+
for (const line of lines) {
|
|
198
|
+
if (!line)
|
|
199
|
+
continue;
|
|
200
|
+
const normalizedLine = line.replace(/\\/g, '/');
|
|
201
|
+
const relative = path.posix.relative(root, normalizedLine);
|
|
202
|
+
if (relative.startsWith('..'))
|
|
203
|
+
continue;
|
|
204
|
+
const target = patternHasSlash
|
|
205
|
+
? relative
|
|
206
|
+
: path.posix.basename(relative);
|
|
207
|
+
if (matcher.test(target)) {
|
|
208
|
+
results.push(relative);
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
return results;
|
|
212
|
+
}
|
|
213
|
+
function patternHasPathSegments(pattern) {
|
|
214
|
+
const normalized = pattern.replace(/\\/g, '/');
|
|
215
|
+
return normalized.includes('/');
|
|
216
|
+
}
|
|
217
|
+
function globToRegex(pattern) {
|
|
218
|
+
let regex = '^';
|
|
219
|
+
let index = 0;
|
|
220
|
+
while (index < pattern.length) {
|
|
221
|
+
const char = pattern[index];
|
|
222
|
+
if (char === '*') {
|
|
223
|
+
const isDoubleStar = pattern[index + 1] === '*';
|
|
224
|
+
if (isDoubleStar) {
|
|
225
|
+
const nextChar = pattern[index + 2];
|
|
226
|
+
if (nextChar === '/') {
|
|
227
|
+
regex += '(?:.*/)?';
|
|
228
|
+
index += 2;
|
|
229
|
+
}
|
|
230
|
+
else {
|
|
231
|
+
while (pattern[index + 1] === '*') {
|
|
232
|
+
index += 1;
|
|
233
|
+
}
|
|
234
|
+
regex += '.*';
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
regex += '[^/]*';
|
|
239
|
+
}
|
|
240
|
+
}
|
|
241
|
+
else if (char === '?') {
|
|
242
|
+
regex += '[^/]';
|
|
243
|
+
}
|
|
244
|
+
else if (char === '[') {
|
|
245
|
+
const endIndex = pattern.indexOf(']', index + 1);
|
|
246
|
+
if (endIndex === -1) {
|
|
247
|
+
regex += '\\[';
|
|
248
|
+
}
|
|
249
|
+
else {
|
|
250
|
+
const content = pattern.slice(index + 1, endIndex);
|
|
251
|
+
const escaped = content.replace(/\\/g, '\\\\');
|
|
252
|
+
regex += `[${escaped}]`;
|
|
253
|
+
index = endIndex;
|
|
254
|
+
}
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
regex += escapeRegexChar(char);
|
|
258
|
+
}
|
|
259
|
+
index += 1;
|
|
260
|
+
}
|
|
261
|
+
regex += '$';
|
|
262
|
+
return new RegExp(regex);
|
|
263
|
+
}
|
|
264
|
+
function escapeRegexChar(char) {
|
|
265
|
+
return /[.+^${}()|\\]/.test(char) ? `\\${char}` : char;
|
|
266
|
+
}
|
|
183
267
|
//# sourceMappingURL=find-files.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-files.js","sourceRoot":"","sources":["../../source/tools/find-files.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"find-files.js","sourceRoot":"","sources":["../../source/tools/find-files.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,10 +3,14 @@ import * as fs from 'fs/promises';
|
|
|
3
3
|
import * as path from 'path';
|
|
4
4
|
import * as os from 'os';
|
|
5
5
|
import { createFindFilesToolDefinition } from './find-files.js';
|
|
6
|
+
import { ExecutionContext } from '../services/execution-context.js';
|
|
6
7
|
const findFilesToolDefinition = createFindFilesToolDefinition();
|
|
7
8
|
const findFilesToolDefinitionAllowOutside = createFindFilesToolDefinition({
|
|
8
9
|
allowOutsideWorkspace: true,
|
|
9
10
|
});
|
|
11
|
+
const findFilesToolDefinitionFindFallback = createFindFilesToolDefinition({
|
|
12
|
+
forceFindFallback: true,
|
|
13
|
+
});
|
|
10
14
|
// Helper to create a temp dir and change cwd to it
|
|
11
15
|
async function withTempDir(run) {
|
|
12
16
|
const originalCwd = process.cwd;
|
|
@@ -82,6 +86,47 @@ test.serial('execute: finds files in nested directories with glob pattern', asyn
|
|
|
82
86
|
t.false(result.includes('readme.md'));
|
|
83
87
|
});
|
|
84
88
|
});
|
|
89
|
+
test.serial('execute: supports glob patterns with path segments in find fallback', async (t) => {
|
|
90
|
+
await withTempDir(async (dir) => {
|
|
91
|
+
await fs.mkdir(path.join(dir, 'src'));
|
|
92
|
+
await fs.mkdir(path.join(dir, 'src/utils'));
|
|
93
|
+
await fs.writeFile(path.join(dir, 'src/index.ts'), '');
|
|
94
|
+
await fs.writeFile(path.join(dir, 'src/utils/helper.ts'), '');
|
|
95
|
+
await fs.writeFile(path.join(dir, 'readme.md'), '');
|
|
96
|
+
const result = await findFilesToolDefinitionFindFallback.execute({
|
|
97
|
+
pattern: 'src/**/*',
|
|
98
|
+
path: null,
|
|
99
|
+
max_results: null,
|
|
100
|
+
});
|
|
101
|
+
t.true(result.includes('src/index.ts'));
|
|
102
|
+
t.true(result.includes('src/utils/helper.ts'));
|
|
103
|
+
t.false(result.includes('readme.md'));
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
test.serial('execute: on SSH without fd, rejects patterns with path segments', async (t) => {
|
|
107
|
+
await withTempDir(async () => {
|
|
108
|
+
const sshService = {
|
|
109
|
+
connect: async () => { },
|
|
110
|
+
disconnect: async () => { },
|
|
111
|
+
isConnected: () => true,
|
|
112
|
+
executeCommand: async () => {
|
|
113
|
+
throw new Error('fd not found');
|
|
114
|
+
},
|
|
115
|
+
readFile: async () => '',
|
|
116
|
+
writeFile: async () => { },
|
|
117
|
+
mkdir: async () => { },
|
|
118
|
+
};
|
|
119
|
+
const executionContext = new ExecutionContext(sshService);
|
|
120
|
+
const tool = createFindFilesToolDefinition({ executionContext });
|
|
121
|
+
const result = await tool.execute({
|
|
122
|
+
pattern: 'src/**/*',
|
|
123
|
+
path: null,
|
|
124
|
+
max_results: null,
|
|
125
|
+
});
|
|
126
|
+
t.true(result.includes('Error'));
|
|
127
|
+
t.true(result.includes('path'));
|
|
128
|
+
});
|
|
129
|
+
});
|
|
85
130
|
test.serial('execute: restricts search to specified path', async (t) => {
|
|
86
131
|
await withTempDir(async (dir) => {
|
|
87
132
|
// Create nested directory structure
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"find-files.test.js","sourceRoot":"","sources":["../../source/tools/find-files.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,6BAA6B,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"find-files.test.js","sourceRoot":"","sources":["../../source/tools/find-files.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,9 +3,9 @@ import type { ToolDefinition, CommandMessage } from './types.js';
|
|
|
3
3
|
import type { ISettingsService, ILoggingService } from '../services/service-interfaces.js';
|
|
4
4
|
declare const webFetchSchema: z.ZodObject<{
|
|
5
5
|
url: z.ZodString;
|
|
6
|
-
max_chars: z.
|
|
7
|
-
heading: z.
|
|
8
|
-
continuation_token: z.
|
|
6
|
+
max_chars: z.ZodDefault<z.ZodNumber>;
|
|
7
|
+
heading: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>>;
|
|
8
|
+
continuation_token: z.ZodDefault<z.ZodNullable<z.ZodString>>;
|
|
9
9
|
}, z.core.$strip>;
|
|
10
10
|
export type WebFetchParams = z.infer<typeof webFetchSchema>;
|
|
11
11
|
/**
|
|
@@ -15,6 +15,6 @@ export declare const formatWebFetchCommandMessage: (item: any, index: number, to
|
|
|
15
15
|
export declare const createWebFetchToolDefinition: (deps: {
|
|
16
16
|
settingsService: ISettingsService;
|
|
17
17
|
loggingService: ILoggingService;
|
|
18
|
-
}) => ToolDefinition<WebFetchParams
|
|
18
|
+
}) => ToolDefinition<Partial<WebFetchParams>>;
|
|
19
19
|
export {};
|
|
20
20
|
//# sourceMappingURL=web-fetch.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch.d.ts","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"web-fetch.d.ts","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAOjE,OAAO,KAAK,EACR,gBAAgB,EAChB,eAAe,EAClB,MAAM,mCAAmC,CAAC;AAK3C,QAAA,MAAM,cAAc;;;;;iBAuBlB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,4BAA4B,GACrC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,uBAAuB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5C,cAAc,EA0BhB,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,MAAM;IAC/C,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACnC,KAAG,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CA6CzC,CAAC"}
|
package/dist/tools/web-fetch.js
CHANGED
|
@@ -1,58 +1,26 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import
|
|
3
|
-
import { Readability } from '@mozilla/readability';
|
|
4
|
-
import { JSDOM } from 'jsdom';
|
|
2
|
+
import { fetchWebPage } from '@qduc/web-fetch';
|
|
5
3
|
import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from './format-helpers.js';
|
|
6
4
|
const DEFAULT_MAX_CHARS = 10000;
|
|
7
5
|
const MAX_CHARS_LIMIT = 200000;
|
|
8
|
-
const MAX_BODY_SIZE = 10 * 1024 * 1024;
|
|
9
|
-
const MIN_READABILITY_LENGTH = 300;
|
|
10
|
-
const MIN_SELECTOR_LENGTH = 300;
|
|
11
6
|
const webFetchSchema = z.object({
|
|
12
|
-
url: z.string().
|
|
13
|
-
max_chars: z
|
|
14
|
-
|
|
15
|
-
|
|
7
|
+
url: z.string().describe('The URL of the web page to fetch.'),
|
|
8
|
+
max_chars: z
|
|
9
|
+
.number()
|
|
10
|
+
.min(200)
|
|
11
|
+
.max(MAX_CHARS_LIMIT)
|
|
12
|
+
.default(DEFAULT_MAX_CHARS)
|
|
13
|
+
.describe(`Maximum number of characters to return (default: ${DEFAULT_MAX_CHARS}).`),
|
|
14
|
+
heading: z
|
|
15
|
+
.array(z.union([z.string(), z.number()]))
|
|
16
|
+
.default([])
|
|
17
|
+
.describe('Optional: Array of headings (h1-h3) to retrieve content from.'),
|
|
18
|
+
continuation_token: z
|
|
19
|
+
.string()
|
|
20
|
+
.nullable()
|
|
21
|
+
.default(null)
|
|
22
|
+
.describe('Optional: Token from previous response to fetch the next chunk of content.'),
|
|
16
23
|
});
|
|
17
|
-
// Content cache for continuation support
|
|
18
|
-
const contentCache = new Map();
|
|
19
|
-
const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
|
|
20
|
-
setInterval(() => {
|
|
21
|
-
const now = Date.now();
|
|
22
|
-
for (const [key, value] of contentCache.entries()) {
|
|
23
|
-
if (now - value.timestamp > CACHE_TTL) {
|
|
24
|
-
contentCache.delete(key);
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
}, 60 * 1000).unref();
|
|
28
|
-
function generateCacheKey(url, type, value) {
|
|
29
|
-
return `${url}:${type}:${JSON.stringify(value)}:${Date.now()}`;
|
|
30
|
-
}
|
|
31
|
-
/**
|
|
32
|
-
* Converts a GitHub file URL to a raw.githubusercontent.com URL.
|
|
33
|
-
* Handles patterns like:
|
|
34
|
-
* https://github.com/user/repo/blob/branch/path/to/file
|
|
35
|
-
*/
|
|
36
|
-
function convertGithubToRaw(url) {
|
|
37
|
-
try {
|
|
38
|
-
const parsed = new URL(url);
|
|
39
|
-
if (parsed.hostname === 'github.com') {
|
|
40
|
-
const parts = parsed.pathname.split('/').filter(Boolean);
|
|
41
|
-
// Expected parts: [user, repo, blob, branch, ...path]
|
|
42
|
-
if (parts.length >= 4 && parts[2] === 'blob') {
|
|
43
|
-
const user = parts[0];
|
|
44
|
-
const repo = parts[1];
|
|
45
|
-
const branch = parts[3];
|
|
46
|
-
const filePath = parts.slice(4).join('/');
|
|
47
|
-
return `https://raw.githubusercontent.com/${user}/${repo}/${branch}/${filePath}`;
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
catch {
|
|
52
|
-
// Not a valid URL or not a GitHub URL we can convert
|
|
53
|
-
}
|
|
54
|
-
return url;
|
|
55
|
-
}
|
|
56
24
|
/**
|
|
57
25
|
* Format command message for display in the terminal
|
|
58
26
|
*/
|
|
@@ -87,119 +55,23 @@ export const createWebFetchToolDefinition = (deps) => {
|
|
|
87
55
|
parameters: webFetchSchema,
|
|
88
56
|
needsApproval: () => false,
|
|
89
57
|
execute: async (params) => {
|
|
90
|
-
const { url, max_chars = DEFAULT_MAX_CHARS, heading: targetHeadings, continuation_token } = params;
|
|
58
|
+
const { url, max_chars = DEFAULT_MAX_CHARS, heading: targetHeadings, continuation_token, } = params;
|
|
91
59
|
try {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
const effectiveUrl = convertGithubToRaw(url);
|
|
99
|
-
const response = await fetch(effectiveUrl, {
|
|
100
|
-
headers: {
|
|
101
|
-
'User-Agent': 'Mozilla/5.0 (compatible; Term2/1.0; +https://github.com/qduc/term2)',
|
|
102
|
-
},
|
|
103
|
-
signal: AbortSignal.timeout(15000),
|
|
104
|
-
});
|
|
105
|
-
if (!response.ok) {
|
|
106
|
-
return `Error: HTTP error! status: ${response.status} ${response.statusText}`;
|
|
107
|
-
}
|
|
108
|
-
const contentType = response.headers.get('content-type') || '';
|
|
109
|
-
if (!contentType.includes('text/html') && !contentType.includes('application/xhtml+xml') && !contentType.includes('text/plain')) {
|
|
110
|
-
// We'll still try to parse if it's unknown or looks like text
|
|
111
|
-
if (!contentType.includes('text') && !contentType.includes('json') && !contentType.includes('xml')) {
|
|
112
|
-
return `Error: Unsupported content type: ${contentType}`;
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
// Simplified reading without streaming for now, following project patterns
|
|
116
|
-
// or use the streaming logic from reference if preferred.
|
|
117
|
-
// Given the reference used streaming for size limits, I'll adapt a simplified version.
|
|
118
|
-
const html = await response.text();
|
|
119
|
-
if (html.length > MAX_BODY_SIZE) {
|
|
120
|
-
return `Error: Response body exceeds maximum size limit of ${MAX_BODY_SIZE / (1024 * 1024)} MB`;
|
|
121
|
-
}
|
|
122
|
-
const dom = new JSDOM(html, { url });
|
|
123
|
-
const doc = dom.window.document;
|
|
124
|
-
// Extraction strategies
|
|
125
|
-
let extractedContent = null;
|
|
126
|
-
let method = 'unknown';
|
|
127
|
-
// Readability
|
|
128
|
-
try {
|
|
129
|
-
const reader = new Readability(doc.cloneNode(true));
|
|
130
|
-
const article = reader.parse();
|
|
131
|
-
if (article && (article.length || 0) > MIN_READABILITY_LENGTH) {
|
|
132
|
-
extractedContent = {
|
|
133
|
-
html: article.content,
|
|
134
|
-
title: article.title,
|
|
135
|
-
excerpt: article.excerpt,
|
|
136
|
-
};
|
|
137
|
-
method = 'readability';
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
catch (e) {
|
|
141
|
-
// Ignore readability errors
|
|
142
|
-
}
|
|
143
|
-
// Selector fallback
|
|
144
|
-
if (!extractedContent) {
|
|
145
|
-
const selectors = ['main', 'article', '#content', '.content', '.main'];
|
|
146
|
-
for (const s of selectors) {
|
|
147
|
-
const el = doc.querySelector(s);
|
|
148
|
-
if (el && el.textContent?.trim().length > MIN_SELECTOR_LENGTH) {
|
|
149
|
-
extractedContent = {
|
|
150
|
-
html: el.innerHTML,
|
|
151
|
-
title: doc.title,
|
|
152
|
-
};
|
|
153
|
-
method = `selector:${s}`;
|
|
154
|
-
break;
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
// Basic clean fallback
|
|
159
|
-
if (!extractedContent) {
|
|
160
|
-
extractedContent = {
|
|
161
|
-
html: cleanHtml(html),
|
|
162
|
-
title: doc.title || 'Untitled',
|
|
163
|
-
};
|
|
164
|
-
method = 'basic-clean';
|
|
165
|
-
}
|
|
166
|
-
const allHeadings = extractHeadings(extractedContent.html);
|
|
167
|
-
const fullToc = buildTOC(allHeadings);
|
|
168
|
-
let filteredHtml = extractedContent.html;
|
|
169
|
-
if (targetHeadings && targetHeadings.length > 0) {
|
|
170
|
-
const filterResult = filterContentByHeadings(extractedContent.html, allHeadings, targetHeadings);
|
|
171
|
-
if (!filterResult.error && filterResult.filtered) {
|
|
172
|
-
filteredHtml = filterResult.html;
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
const turndownService = new TurndownService({
|
|
176
|
-
headingStyle: 'atx',
|
|
177
|
-
codeBlockStyle: 'fenced',
|
|
60
|
+
const result = await fetchWebPage({
|
|
61
|
+
url,
|
|
62
|
+
maxChars: max_chars,
|
|
63
|
+
headings: targetHeadings,
|
|
64
|
+
continuationToken: continuation_token ?? undefined,
|
|
178
65
|
});
|
|
179
|
-
let
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
let finalContinuationToken = null;
|
|
183
|
-
if (truncationResult.hasMore && allHeadings.length === 0) {
|
|
184
|
-
finalContinuationToken = generateCacheKey(url, 'continuation', truncationResult.nextOffset);
|
|
185
|
-
contentCache.set(finalContinuationToken, {
|
|
186
|
-
markdown: turndownService.turndown(extractedContent.html),
|
|
187
|
-
offset: truncationResult.nextOffset,
|
|
188
|
-
url,
|
|
189
|
-
title: extractedContent.title,
|
|
190
|
-
metadata: { method },
|
|
191
|
-
timestamp: Date.now()
|
|
192
|
-
});
|
|
66
|
+
let output = `Title: ${result.title}\nURL: ${result.url}\n\n`;
|
|
67
|
+
if (result.toc) {
|
|
68
|
+
output += `## Table of Contents\n\n${result.toc}\n\n---\n\n`;
|
|
193
69
|
}
|
|
194
|
-
|
|
195
|
-
if (
|
|
196
|
-
|
|
70
|
+
output += result.markdown;
|
|
71
|
+
if (result.continuationToken) {
|
|
72
|
+
output += `\n\n**Note: Content truncated. Use continuation_token: "${result.continuationToken}" to fetch more.**`;
|
|
197
73
|
}
|
|
198
|
-
|
|
199
|
-
if (finalContinuationToken) {
|
|
200
|
-
result += `\n\n**Note: Content truncated. Use continuation_token: "${finalContinuationToken}" to fetch more.**`;
|
|
201
|
-
}
|
|
202
|
-
return result;
|
|
74
|
+
return output;
|
|
203
75
|
}
|
|
204
76
|
catch (error) {
|
|
205
77
|
loggingService.error('Web fetch failed', {
|
|
@@ -212,89 +84,4 @@ export const createWebFetchToolDefinition = (deps) => {
|
|
|
212
84
|
formatCommandMessage: formatWebFetchCommandMessage,
|
|
213
85
|
};
|
|
214
86
|
};
|
|
215
|
-
function cleanHtml(html) {
|
|
216
|
-
return html
|
|
217
|
-
.replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
|
|
218
|
-
.replace(/<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>/gi, '')
|
|
219
|
-
.replace(/<!--[\s\S]*?-->/g, '');
|
|
220
|
-
}
|
|
221
|
-
function extractHeadings(html) {
|
|
222
|
-
const headingRegex = /<h([1-3])[^>]*>(.*?)<\/h\1>/gi;
|
|
223
|
-
const headings = [];
|
|
224
|
-
let match;
|
|
225
|
-
while ((match = headingRegex.exec(html)) !== null) {
|
|
226
|
-
const text = match[2].replace(/<[^>]*>/g, '').trim();
|
|
227
|
-
if (text) {
|
|
228
|
-
headings.push({ level: parseInt(match[1]), text, position: match.index });
|
|
229
|
-
}
|
|
230
|
-
}
|
|
231
|
-
return headings;
|
|
232
|
-
}
|
|
233
|
-
function buildTOC(headings) {
|
|
234
|
-
if (headings.length === 0)
|
|
235
|
-
return null;
|
|
236
|
-
return headings.map(h => `${' '.repeat(h.level - 1)}- ${h.text}`).join('\n');
|
|
237
|
-
}
|
|
238
|
-
function filterContentByHeadings(html, headings, targets) {
|
|
239
|
-
let combinedHtml = '';
|
|
240
|
-
let filtered = false;
|
|
241
|
-
for (const target of targets) {
|
|
242
|
-
let idx = -1;
|
|
243
|
-
if (typeof target === 'number') {
|
|
244
|
-
idx = target - 1;
|
|
245
|
-
}
|
|
246
|
-
else {
|
|
247
|
-
const lower = target.toLowerCase();
|
|
248
|
-
idx = headings.findIndex(h => h.text.toLowerCase().includes(lower));
|
|
249
|
-
}
|
|
250
|
-
if (idx >= 0 && idx < headings.length) {
|
|
251
|
-
filtered = true;
|
|
252
|
-
const start = headings[idx].position;
|
|
253
|
-
let end = html.length;
|
|
254
|
-
for (let i = idx + 1; i < headings.length; i++) {
|
|
255
|
-
if (headings[i].level <= headings[idx].level) {
|
|
256
|
-
end = headings[i].position;
|
|
257
|
-
break;
|
|
258
|
-
}
|
|
259
|
-
}
|
|
260
|
-
combinedHtml += html.substring(start, end) + '\n\n';
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
return { html: combinedHtml, filtered, error: filtered ? null : 'No matching headings found' };
|
|
264
|
-
}
|
|
265
|
-
function truncateMarkdown(markdown, maxChars, offset) {
|
|
266
|
-
const start = offset;
|
|
267
|
-
if (start >= markdown.length)
|
|
268
|
-
return { markdown: '', hasMore: false, nextOffset: start };
|
|
269
|
-
if (markdown.length - start <= maxChars) {
|
|
270
|
-
return { markdown: markdown.substring(start), hasMore: false, nextOffset: markdown.length };
|
|
271
|
-
}
|
|
272
|
-
let end = start + maxChars;
|
|
273
|
-
const lastNewline = markdown.lastIndexOf('\n', end);
|
|
274
|
-
if (lastNewline > start + maxChars * 0.8) {
|
|
275
|
-
end = lastNewline;
|
|
276
|
-
}
|
|
277
|
-
return {
|
|
278
|
-
markdown: markdown.substring(start, end).trim() + '\n\n[... Truncated ...]',
|
|
279
|
-
hasMore: true,
|
|
280
|
-
nextOffset: end,
|
|
281
|
-
originalLength: markdown.length
|
|
282
|
-
};
|
|
283
|
-
}
|
|
284
|
-
function handleContinuation(token, maxChars) {
|
|
285
|
-
const cached = contentCache.get(token);
|
|
286
|
-
if (!cached)
|
|
287
|
-
return 'Error: Continuation token expired or invalid.';
|
|
288
|
-
const result = truncateMarkdown(cached.markdown, maxChars, cached.offset);
|
|
289
|
-
let nextToken = null;
|
|
290
|
-
if (result.hasMore) {
|
|
291
|
-
nextToken = generateCacheKey(cached.url, 'continuation', result.nextOffset);
|
|
292
|
-
contentCache.set(nextToken, { ...cached, offset: result.nextOffset, timestamp: Date.now() });
|
|
293
|
-
}
|
|
294
|
-
let response = result.markdown;
|
|
295
|
-
if (nextToken) {
|
|
296
|
-
response += `\n\n**Note: Content truncated. Use continuation_token: "${nextToken}" to fetch more.**`;
|
|
297
|
-
}
|
|
298
|
-
return response;
|
|
299
|
-
}
|
|
300
87
|
//# sourceMappingURL=web-fetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,OAAO,EACH,aAAa,EACb,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,GACpB,MAAM,qBAAqB,CAAC;AAM7B,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAChC,MAAM,eAAe,GAAG,MAAM,CAAC;AAE/B,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAC;IAC5B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IAC7D,SAAS,EAAE,CAAC;SACP,MAAM,EAAE;SACR,GAAG,CAAC,GAAG,CAAC;SACR,GAAG,CAAC,eAAe,CAAC;SACpB,OAAO,CAAC,iBAAiB,CAAC;SAC1B,QAAQ,CACL,oDAAoD,iBAAiB,IAAI,CAC5E;IACL,OAAO,EAAE,CAAC;SACL,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;SACxC,OAAO,CAAC,EAAE,CAAC;SACX,QAAQ,CACL,+DAA+D,CAClE;IACL,kBAAkB,EAAE,CAAC;SAChB,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,OAAO,CAAC,IAAI,CAAC;SACb,QAAQ,CACL,4EAA4E,CAC/E;CACR,CAAC,CAAC;AAIH;;GAEG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CACxC,IAAS,EACT,KAAa,EACb,qBAA2C,EAC3B,EAAE;IAClB,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,MAAM,YAAY,GACd,MAAM,IAAI,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC;QACvC,CAAC,CAAC,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC;QACnC,CAAC,CAAC,IAAI,CAAC;IACf,MAAM,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,SAAS,IAAI,IAAI,EAAE,SAAS,CAAC;IACnE,MAAM,IAAI,GACN,sBAAsB,CAAC,cAAc,CAAC;QACtC,sBAAsB,CAAC,YAAY,CAAC;QACpC,EAAE,CAAC;IAEP,MAAM,GAAG,GAAG,IAAI,EAAE,GAAG,IAAI,aAAa,CAAC;IACvC,MAAM,OAAO,GAAG,eAAe,GAAG,GAAG,CAAC;IACtC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC;IACnD,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE7C,OAAO;QACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE;YACrC,OAAO;YACP,MAAM;YACN,OAAO;YACP,QAAQ,EAAE,WAAW;YACrB,QAAQ,EAAE,IAAI;SACjB,CAAC;KACL,CAAC;AACN,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,IAG5C,EAA2C,EAAE;IAC1C,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IAEhC,OAAO;QACH,IAAI,EAAE,WAAW;QACjB,WAAW,EAAE,uGAAuG;QACpH,UAAU,EAAE,cAAc;QAC1B,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;QAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YACtB,MAAM,EACF,GAAG,EACH,SAAS,GAAG,iBAAiB,EAC7B,OAAO,EAAE,cAAc,EACvB,kBAAkB,GACrB,GAAG,MAAM,CAAC;YAEX,IAAI,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;oBAC9B,GAAG;oBACH,QAAQ,EAAE,SAAS;oBACnB,QAAQ,EAAE,cAAc;oBACxB,iBAAiB,EAAE,kBAAkB,IAAI,SAAS;iBACrD,CAAC,CAAC;gBAEH,IAAI,MAAM,GAAG,UAAU,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,GAAG,MAAM,CAAC;gBAC9D,IAAI,MAAM,CAAC,GAAG,EAAE,CAAC;oBACb,MAAM,IAAI,2BAA2B,MAAM,CAAC,GAAG,aAAa,CAAC;gBACjE,CAAC;gBACD,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC;gBAE1B,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;oBAC3B,MAAM,IAAI,2DAA2D,MAAM,CAAC,iBAAiB,oBAAoB,CAAC;gBACtH,CAAC;gBAED,OAAO,MAAM,CAAC;YAClB,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,cAAc,CAAC,KAAK,CAAC,kBAAkB,EAAE;oBACrC,GAAG;oBACH,KAAK,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC;iBACxC,CAAC,CAAC;gBACH,OAAO,UAAU,KAAK,CAAC,OAAO,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,CAAC;QACL,CAAC;QACD,oBAAoB,EAAE,4BAA4B;KACrD,CAAC;AACN,CAAC,CAAC"}
|