@qduc/term2 0.1.4 → 0.1.6

package/dist/tools/tool-names.d.ts

@@ -0,0 +1,3 @@
+export declare const TOOL_NAME_APPLY_PATCH = "apply_patch";
+export declare const TOOL_NAME_SEARCH_REPLACE = "search_replace";
+//# sourceMappingURL=tool-names.d.ts.map

package/dist/tools/tool-names.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-names.d.ts","sourceRoot":"","sources":["../../source/tools/tool-names.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,qBAAqB,gBAAgB,CAAC;AACnD,eAAO,MAAM,wBAAwB,mBAAmB,CAAC"}

package/dist/tools/tool-names.js

@@ -0,0 +1,3 @@
+export const TOOL_NAME_APPLY_PATCH = 'apply_patch';
+export const TOOL_NAME_SEARCH_REPLACE = 'search_replace';
+//# sourceMappingURL=tool-names.js.map

package/dist/tools/tool-names.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-names.js","sourceRoot":"","sources":["../../source/tools/tool-names.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,gBAAgB,CAAC"}

package/dist/tools/tool-names.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=tool-names.test.d.ts.map

package/dist/tools/tool-names.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-names.test.d.ts","sourceRoot":"","sources":["../../source/tools/tool-names.test.ts"],"names":[],"mappings":""}

package/dist/tools/tool-names.test.js

@@ -0,0 +1,7 @@
+import test from 'ava';
+import { TOOL_NAME_APPLY_PATCH, TOOL_NAME_SEARCH_REPLACE } from './tool-names.js';
+test('tool name constants remain stable', (t) => {
+    t.is(TOOL_NAME_APPLY_PATCH, 'apply_patch');
+    t.is(TOOL_NAME_SEARCH_REPLACE, 'search_replace');
+});
+//# sourceMappingURL=tool-names.test.js.map

package/dist/tools/tool-names.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-names.test.js","sourceRoot":"","sources":["../../source/tools/tool-names.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,EAAE,qBAAqB,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAElF,IAAI,CAAC,mCAAmC,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9C,CAAC,CAAC,EAAE,CAAC,qBAAqB,EAAE,aAAa,CAAC,CAAC;IAC3C,CAAC,CAAC,EAAE,CAAC,wBAAwB,EAAE,gBAAgB,CAAC,CAAC;AACnD,CAAC,CAAC,CAAC"}

package/dist/tools/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,KAAK,CAAC;AAEnC,MAAM,WAAW,cAAc;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChC,aAAa,EAAE,CACX,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,OAAO,KAChB,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAChC,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACnE;;;;;;OAMG;IACH,oBAAoB,EAAE,CAClB,IAAI,EAAE,GAAG,EACT,KAAK,EAAE,MAAM,EACb,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1C,cAAc,EAAE,CAAC;CACzB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../source/tools/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,KAAK,CAAC;AAErC,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,SAAS,CAAC;IAClB,MAAM,EAAE,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;IACvD,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,cAAc,CAAC,MAAM,GAAG,GAAG;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAChC,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IACjF,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;IACnE;;;;;;OAMG;IACH,oBAAoB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,cAAc,EAAE,CAAC;CACnH"}

package/dist/tools/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB;;GAEG;AACH,wBAAgB,oBAAoB,CAChC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,MAAsB,EAC/B,OAAO,CAAC,EAAE;IACN;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACnC,GACF,MAAM,CA0BR;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,6BAAoB,CAAC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE,MAAsB,EAC/B,OAAO,CAAC,EAAE;IACR;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC,GACA,MAAM,CAoBR;AAED;;;;GAIG;AACH,eAAO,MAAM,aAAa,6BAAoB,CAAC"}

package/dist/tools/utils.js

@@ -5,20 +5,15 @@ import { z } from 'zod';
  */
 export function resolveWorkspacePath(relativePath, baseDir = process.cwd(), options) {
     const allowOutsideWorkspace = options?.allowOutsideWorkspace ?? false;
-    const resolved = path.isAbsolute(relativePath)
-        ? path.normalize(relativePath)
-        : path.resolve(baseDir, relativePath);
+    const resolved = path.isAbsolute(relativePath) ? path.normalize(relativePath) : path.resolve(baseDir, relativePath);
     if (allowOutsideWorkspace) {
         return resolved;
     }
     const normalizedBaseDir = path.resolve(baseDir);
     const normalizedResolved = path.resolve(resolved);
     // Ensure either exact match or within base directory (prefix with separator to avoid /foo/bar2 matching /foo/bar)
-    const basePrefix = normalizedBaseDir.endsWith(path.sep)
-        ? normalizedBaseDir
-        : normalizedBaseDir + path.sep;
-    const isInside = normalizedResolved === normalizedBaseDir ||
-        normalizedResolved.startsWith(basePrefix);
+    const basePrefix = normalizedBaseDir.endsWith(path.sep) ? normalizedBaseDir : normalizedBaseDir + path.sep;
+    const isInside = normalizedResolved === normalizedBaseDir || normalizedResolved.startsWith(basePrefix);
     if (!isInside) {
         throw new Error(`Operation outside workspace: ${relativePath}`);
     }

package/dist/tools/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAEtB;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAChC,YAAoB,EACpB,UAAkB,OAAO,CAAC,GAAG,EAAE,EAC/B,OAMC;IAED,MAAM,qBAAqB,GAAG,OAAO,EAAE,qBAAqB,IAAI,KAAK,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC;QAC9B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAE1C,IAAI,qBAAqB,EAAE,CAAC;QACxB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAElD,kHAAkH;IAClH,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;QACnD,CAAC,CAAC,iBAAiB;QACnB,CAAC,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC;IACnC,MAAM,QAAQ,GACV,kBAAkB,KAAK,iBAAiB;QACxC,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAE9C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAClC,YAAoB,EACpB,UAAkB,OAAO,CAAC,GAAG,EAAE,EAC/B,OAMC;IAED,MAAM,qBAAqB,GAAG,OAAO,EAAE,qBAAqB,IAAI,KAAK,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAEpH,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAElD,kHAAkH;IAClH,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3G,MAAM,QAAQ,GAAG,kBAAkB,KAAK,iBAAiB,IAAI,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAEvG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,YAAY,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC"}

package/dist/tools/web-fetch.d.ts

@@ -3,9 +3,9 @@ import type { ToolDefinition, CommandMessage } from './types.js';
 import type { ISettingsService, ILoggingService } from '../services/service-interfaces.js';
 declare const webFetchSchema: z.ZodObject<{
     url: z.ZodString;
-    max_chars: z.ZodOptional<z.ZodNumber>;
-    heading: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>>;
-    continuation_token: z.ZodOptional<z.ZodString>;
+    max_chars: z.ZodDefault<z.ZodNumber>;
+    heading: z.ZodDefault<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>>;
+    continuation_token: z.ZodDefault<z.ZodNullable<z.ZodString>>;
 }, z.core.$strip>;
 export type WebFetchParams = z.infer<typeof webFetchSchema>;
 /**
@@ -15,6 +15,6 @@ export declare const formatWebFetchCommandMessage: (item: any, index: number, to
 export declare const createWebFetchToolDefinition: (deps: {
     settingsService: ISettingsService;
     loggingService: ILoggingService;
-}) => ToolDefinition<WebFetchParams>;
+}) => ToolDefinition<Partial<WebFetchParams>>;
 export {};
 //# sourceMappingURL=web-fetch.d.ts.map

package/dist/tools/web-fetch.d.ts.map

@@ -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;AAIxB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAOjE,OAAO,KAAK,EACR,gBAAgB,EAChB,eAAe,EAClB,MAAM,mCAAmC,CAAC;AAQ3C,QAAA,MAAM,cAAc;;;;;iBAKlB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAmD5D;;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,cAAc,CA0JhC,CAAC"}
+{"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;AAEjE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAK3F,QAAA,MAAM,cAAc;;;;;iBAiBlB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,4BAA4B,GACvC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,uBAAuB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1C,cAAc,EAoBhB,CAAC;AAEF,eAAO,MAAM,4BAA4B,GAAI,MAAM;IACjD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAyCzC,CAAC"}

package/dist/tools/web-fetch.js

@@ -1,70 +1,34 @@
 import { z } from 'zod';
-import TurndownService from 'turndown';
-import { Readability } from '@mozilla/readability';
-import { JSDOM } from 'jsdom';
-import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from './format-helpers.js';
+import { fetchWebPage } from '@qduc/web-fetch';
+import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem } from './format-helpers.js';
 const DEFAULT_MAX_CHARS = 10000;
 const MAX_CHARS_LIMIT = 200000;
-const MAX_BODY_SIZE = 10 * 1024 * 1024;
-const MIN_READABILITY_LENGTH = 300;
-const MIN_SELECTOR_LENGTH = 300;
 const webFetchSchema = z.object({
-    url: z.string().url().describe('The URL of the web page to fetch.'),
-    max_chars: z.number().min(200).max(MAX_CHARS_LIMIT).optional().describe(`Maximum number of characters to return (default: ${DEFAULT_MAX_CHARS}).`),
-    heading: z.array(z.union([z.string(), z.number()])).optional().describe('Optional: Array of headings (h1-h3) to retrieve content from.'),
-    continuation_token: z.string().optional().describe('Optional: Token from previous response to fetch the next chunk of content.'),
+    url: z.string().describe('The URL of the web page to fetch.'),
+    max_chars: z
+        .number()
+        .min(200)
+        .max(MAX_CHARS_LIMIT)
+        .default(DEFAULT_MAX_CHARS)
+        .describe(`Maximum number of characters to return (default: ${DEFAULT_MAX_CHARS}).`),
+    heading: z
+        .array(z.union([z.string(), z.number()]))
+        .default([])
+        .describe('Optional: Array of headings (h1-h3) to retrieve content from.'),
+    continuation_token: z
+        .string()
+        .nullable()
+        .default(null)
+        .describe('Optional: Token from previous response to fetch the next chunk of content.'),
 });
-// Content cache for continuation support
-const contentCache = new Map();
-const CACHE_TTL = 5 * 60 * 1000; // 5 minutes
-setInterval(() => {
-    const now = Date.now();
-    for (const [key, value] of contentCache.entries()) {
-        if (now - value.timestamp > CACHE_TTL) {
-            contentCache.delete(key);
-        }
-    }
-}, 60 * 1000).unref();
-function generateCacheKey(url, type, value) {
-    return `${url}:${type}:${JSON.stringify(value)}:${Date.now()}`;
-}
-/**
- * Converts a GitHub file URL to a raw.githubusercontent.com URL.
- * Handles patterns like:
- * https://github.com/user/repo/blob/branch/path/to/file
- */
-function convertGithubToRaw(url) {
-    try {
-        const parsed = new URL(url);
-        if (parsed.hostname === 'github.com') {
-            const parts = parsed.pathname.split('/').filter(Boolean);
-            // Expected parts: [user, repo, blob, branch, ...path]
-            if (parts.length >= 4 && parts[2] === 'blob') {
-                const user = parts[0];
-                const repo = parts[1];
-                const branch = parts[3];
-                const filePath = parts.slice(4).join('/');
-                return `https://raw.githubusercontent.com/${user}/${repo}/${branch}/${filePath}`;
-            }
-        }
-    }
-    catch {
-        // Not a valid URL or not a GitHub URL we can convert
-    }
-    return url;
-}
 /**
  * Format command message for display in the terminal
  */
 export const formatWebFetchCommandMessage = (item, index, toolCallArgumentsById) => {
     const callId = getCallIdFromItem(item);
-    const fallbackArgs = callId && toolCallArgumentsById.has(callId)
-        ? toolCallArgumentsById.get(callId)
-        : null;
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
     const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
-    const args = normalizeToolArguments(normalizedArgs) ??
-        normalizeToolArguments(fallbackArgs) ??
-        {};
+    const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
     const url = args?.url ?? 'unknown url';
     const command = `web_fetch: "${url}"`;
     const output = getOutputText(item) || 'No results';
@@ -89,117 +53,21 @@ export const createWebFetchToolDefinition = (deps) => {
         execute: async (params) => {
             const { url, max_chars = DEFAULT_MAX_CHARS, heading: targetHeadings, continuation_token } = params;
             try {
-                if (continuation_token) {
-                    return handleContinuation(continuation_token, max_chars);
-                }
-                if (!url) {
-                    return 'Error: URL is required for initial fetch.';
-                }
-                const effectiveUrl = convertGithubToRaw(url);
-                const response = await fetch(effectiveUrl, {
-                    headers: {
-                        'User-Agent': 'Mozilla/5.0 (compatible; Term2/1.0; +https://github.com/qduc/term2)',
-                    },
-                    signal: AbortSignal.timeout(15000),
-                });
-                if (!response.ok) {
-                    return `Error: HTTP error! status: ${response.status} ${response.statusText}`;
-                }
-                const contentType = response.headers.get('content-type') || '';
-                if (!contentType.includes('text/html') && !contentType.includes('application/xhtml+xml') && !contentType.includes('text/plain')) {
-                    // We'll still try to parse if it's unknown or looks like text
-                    if (!contentType.includes('text') && !contentType.includes('json') && !contentType.includes('xml')) {
-                        return `Error: Unsupported content type: ${contentType}`;
-                    }
-                }
-                // Simplified reading without streaming for now, following project patterns
-                // or use the streaming logic from reference if preferred.
-                // Given the reference used streaming for size limits, I'll adapt a simplified version.
-                const html = await response.text();
-                if (html.length > MAX_BODY_SIZE) {
-                    return `Error: Response body exceeds maximum size limit of ${MAX_BODY_SIZE / (1024 * 1024)} MB`;
-                }
-                const dom = new JSDOM(html, { url });
-                const doc = dom.window.document;
-                // Extraction strategies
-                let extractedContent = null;
-                let method = 'unknown';
-                // Readability
-                try {
-                    const reader = new Readability(doc.cloneNode(true));
-                    const article = reader.parse();
-                    if (article && (article.length || 0) > MIN_READABILITY_LENGTH) {
-                        extractedContent = {
-                            html: article.content,
-                            title: article.title,
-                            excerpt: article.excerpt,
-                        };
-                        method = 'readability';
-                    }
-                }
-                catch (e) {
-                    // Ignore readability errors
-                }
-                // Selector fallback
-                if (!extractedContent) {
-                    const selectors = ['main', 'article', '#content', '.content', '.main'];
-                    for (const s of selectors) {
-                        const el = doc.querySelector(s);
-                        if (el && el.textContent?.trim().length > MIN_SELECTOR_LENGTH) {
-                            extractedContent = {
-                                html: el.innerHTML,
-                                title: doc.title,
-                            };
-                            method = `selector:${s}`;
-                            break;
-                        }
-                    }
-                }
-                // Basic clean fallback
-                if (!extractedContent) {
-                    extractedContent = {
-                        html: cleanHtml(html),
-                        title: doc.title || 'Untitled',
-                    };
-                    method = 'basic-clean';
-                }
-                const allHeadings = extractHeadings(extractedContent.html);
-                const fullToc = buildTOC(allHeadings);
-                let filteredHtml = extractedContent.html;
-                if (targetHeadings && targetHeadings.length > 0) {
-                    const filterResult = filterContentByHeadings(extractedContent.html, allHeadings, targetHeadings);
-                    if (!filterResult.error && filterResult.filtered) {
-                        filteredHtml = filterResult.html;
-                    }
-                }
-                const turndownService = new TurndownService({
-                    headingStyle: 'atx',
-                    codeBlockStyle: 'fenced',
+                const result = await fetchWebPage({
+                    url,
+                    maxChars: max_chars,
+                    headings: targetHeadings,
+                    continuationToken: continuation_token ?? undefined,
                 });
-                let markdown = turndownService.turndown(filteredHtml);
-                const truncationResult = truncateMarkdown(markdown, max_chars, 0);
-                markdown = truncationResult.markdown;
-                let finalContinuationToken = null;
-                if (truncationResult.hasMore && allHeadings.length === 0) {
-                    finalContinuationToken = generateCacheKey(url, 'continuation', truncationResult.nextOffset);
-                    contentCache.set(finalContinuationToken, {
-                        markdown: turndownService.turndown(extractedContent.html),
-                        offset: truncationResult.nextOffset,
-                        url,
-                        title: extractedContent.title,
-                        metadata: { method },
-                        timestamp: Date.now()
-                    });
+                let output = `Title: ${result.title}\nURL: ${result.url}\n\n`;
+                if (result.toc) {
+                    output += `## Table of Contents\n\n${result.toc}\n\n---\n\n`;
                 }
-                let result = `Title: ${extractedContent.title}\nURL: ${url}\n\n`;
-                if (fullToc) {
-                    result += `## Table of Contents\n\n${fullToc}\n\n---\n\n`;
+                output += result.markdown;
+                if (result.continuationToken) {
+                    output += `\n\n**Note: Content truncated. Use continuation_token: "${result.continuationToken}" to fetch more.**`;
                 }
-                result += markdown;
-                if (finalContinuationToken) {
-                    result += `\n\n**Note: Content truncated. Use continuation_token: "${finalContinuationToken}" to fetch more.**`;
-                }
-                return result;
+                return output;
             }
             catch (error) {
                 loggingService.error('Web fetch failed', {
@@ -212,89 +80,4 @@ export const createWebFetchToolDefinition = (deps) => {
         formatCommandMessage: formatWebFetchCommandMessage,
     };
 };
-function cleanHtml(html) {
-    return html
-        .replace(/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi, '')
-        .replace(/<style\b[^<]*(?:(?!<\/style>)<[^<]*)*<\/style>/gi, '')
-        .replace(/<!--[\s\S]*?-->/g, '');
-}
-function extractHeadings(html) {
-    const headingRegex = /<h([1-3])[^>]*>(.*?)<\/h\1>/gi;
-    const headings = [];
-    let match;
-    while ((match = headingRegex.exec(html)) !== null) {
-        const text = match[2].replace(/<[^>]*>/g, '').trim();
-        if (text) {
-            headings.push({ level: parseInt(match[1]), text, position: match.index });
-        }
-    }
-    return headings;
-}
-function buildTOC(headings) {
-    if (headings.length === 0)
-        return null;
-    return headings.map(h => `${'  '.repeat(h.level - 1)}- ${h.text}`).join('\n');
-}
-function filterContentByHeadings(html, headings, targets) {
-    let combinedHtml = '';
-    let filtered = false;
-    for (const target of targets) {
-        let idx = -1;
-        if (typeof target === 'number') {
-            idx = target - 1;
-        }
-        else {
-            const lower = target.toLowerCase();
-            idx = headings.findIndex(h => h.text.toLowerCase().includes(lower));
-        }
-        if (idx >= 0 && idx < headings.length) {
-            filtered = true;
-            const start = headings[idx].position;
-            let end = html.length;
-            for (let i = idx + 1; i < headings.length; i++) {
-                if (headings[i].level <= headings[idx].level) {
-                    end = headings[i].position;
-                    break;
-                }
-            }
-            combinedHtml += html.substring(start, end) + '\n\n';
-        }
-    }
-    return { html: combinedHtml, filtered, error: filtered ? null : 'No matching headings found' };
-}
-function truncateMarkdown(markdown, maxChars, offset) {
-    const start = offset;
-    if (start >= markdown.length)
-        return { markdown: '', hasMore: false, nextOffset: start };
-    if (markdown.length - start <= maxChars) {
-        return { markdown: markdown.substring(start), hasMore: false, nextOffset: markdown.length };
-    }
-    let end = start + maxChars;
-    const lastNewline = markdown.lastIndexOf('\n', end);
-    if (lastNewline > start + maxChars * 0.8) {
-        end = lastNewline;
-    }
-    return {
-        markdown: markdown.substring(start, end).trim() + '\n\n[... Truncated ...]',
-        hasMore: true,
-        nextOffset: end,
-        originalLength: markdown.length
-    };
-}
-function handleContinuation(token, maxChars) {
-    const cached = contentCache.get(token);
-    if (!cached)
-        return 'Error: Continuation token expired or invalid.';
-    const result = truncateMarkdown(cached.markdown, maxChars, cached.offset);
-    let nextToken = null;
-    if (result.hasMore) {
-        nextToken = generateCacheKey(cached.url, 'continuation', result.nextOffset);
-        contentCache.set(nextToken, { ...cached, offset: result.nextOffset, timestamp: Date.now() });
-    }
-    let response = result.markdown;
-    if (nextToken) {
-        response += `\n\n**Note: Content truncated. Use continuation_token: "${nextToken}" to fetch more.**`;
-    }
-    return response;
-}
 //# sourceMappingURL=web-fetch.js.map

package/dist/tools/web-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-fetch.js","sourceRoot":"","sources":["../../source/tools/web-fetch.ts"],"names":[],"mappings":"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"}

package/dist/tools/web-fetch.test.js

@@ -36,10 +36,10 @@ test('execute: fetches and converts to markdown', async (t) => {
                             }
                             return { done: true };
                         },
-                        releaseLock: () => { }
+                        releaseLock: () => { },
                     };
-                }
-            }
+                },
+            },
         };
     };
     try {

package/dist/tools/web-fetch.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-fetch.test.js","sourceRoot":"","sources":["../../source/tools/web-fetch.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-fetch.test.js","sourceRoot":"","sources":["../../source/tools/web-fetch.test.ts"],"names":[],"mappings":"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"}

package/dist/tools/web-search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../source/tools/web-search.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAOjE,OAAO,EAEH,KAAK,iBAAiB,EACzB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EACR,gBAAgB,EAChB,eAAe,EAClB,MAAM,mCAAmC,CAAC;AAE3C,QAAA,MAAM,eAAe;;iBAEnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CA4B3E;AAED;;GAEG;AACH,eAAO,MAAM,6BAA6B,GACtC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,uBAAuB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC5C,cAAc,EA0BhB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,MAAM;IAChD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACnC,KAAG,cAAc,CAAC,eAAe,CA0CjC,CAAC"}
+{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../source/tools/web-search.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1G,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAE3F,QAAA,MAAM,eAAe;;iBAEnB,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,CA4B3E;AAED;;GAEG;AACH,eAAO,MAAM,6BAA6B,GACxC,MAAM,GAAG,EACT,OAAO,MAAM,EACb,uBAAuB,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,KAC1C,cAAc,EAoBhB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,MAAM;IAClD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,eAAe,CA4CjC,CAAC"}

package/dist/tools/web-search.js

@@ -3,8 +3,8 @@
  * Uses pluggable web search providers (default: Tavily) to fetch current information from the web.
  */
 import { z } from 'zod';
-import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem, } from './format-helpers.js';
-import { getConfiguredWebSearchProvider, } from '../providers/web-search/index.js';
+import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem } from './format-helpers.js';
+import { getConfiguredWebSearchProvider } from '../providers/web-search/index.js';
 const webSearchSchema = z.object({
     query: z.string().min(1).describe('The search query to look up on the web.'),
 });
@@ -42,13 +42,9 @@ export function formatResultsAsMarkdown(response) {
  */
 export const formatWebSearchCommandMessage = (item, index, toolCallArgumentsById) => {
     const callId = getCallIdFromItem(item);
-    const fallbackArgs = callId && toolCallArgumentsById.has(callId)
-        ? toolCallArgumentsById.get(callId)
-        : null;
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
     const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
-    const args = normalizeToolArguments(normalizedArgs) ??
-        normalizeToolArguments(fallbackArgs) ??
-        {};
+    const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
     const query = args?.query ?? 'unknown query';
     const command = `web_search: "${query}"`;
     const output = getOutputText(item) || 'No results';
@@ -83,8 +79,8 @@ export const createWebSearchToolDefinition = (deps) => {
                     return 'Error: No web search provider is configured.';
                 }
                 if (!provider.isConfigured({ settingsService })) {
-                    return `Error: Web search provider '${provider.id}' is not properly configured. ` +
-                        `Please set the required API key (e.g., TAVILY_API_KEY environment variable).`;
+                    return (`Error: Web search provider '${provider.id}' is not properly configured. ` +
+                        `Please set the required API key (e.g., TAVILY_API_KEY environment variable).`);
                 }
                 const response = await provider.search(query, {
                     settingsService,

package/dist/tools/web-search.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../source/tools/web-search.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-search.js","sourceRoot":"","sources":["../../source/tools/web-search.ts"],"names":[],"mappings":"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"}