@qduc/term2 0.7.3 → 0.9.0

package/dist/tools/utils.js

@@ -1,11 +1,13 @@
 import path from 'path';
 import { homedir } from 'os';
 import { z } from 'zod';
+import { getDiscoveredSkillRoots } from '../utils/skill-discovery-paths.js';
 /**
  * Resolves a relative path and ensures it's within the workspace
  */
 export function resolveWorkspacePath(relativePath, baseDir = process.cwd(), options) {
     const allowOutsideWorkspace = options?.allowOutsideWorkspace ?? false;
+    const allowDiscoveredSkillFolders = options?.allowDiscoveredSkillFolders ?? false;
     // Expand ~ if the path starts with it
     const expandedPath = relativePath.startsWith('~') ? relativePath.replace(/^~/, homedir()) : relativePath;
     const resolved = path.isAbsolute(expandedPath) ? path.normalize(expandedPath) : path.resolve(baseDir, expandedPath);
@@ -27,6 +29,17 @@ export function resolveWorkspacePath(relativePath, baseDir = process.cwd(), opti
             isInside = true;
         }
     }
+    if (!isInside && allowDiscoveredSkillFolders) {
+        const isWithin = (targetPath, rootPath) => {
+            const normalizedRoot = path.resolve(rootPath);
+            const rootPrefix = normalizedRoot.endsWith(path.sep) ? normalizedRoot : normalizedRoot + path.sep;
+            return targetPath === normalizedRoot || targetPath.startsWith(rootPrefix);
+        };
+        const discoveredSkillRoots = getDiscoveredSkillRoots(normalizedBaseDir, homedir());
+        if (discoveredSkillRoots.some((rootPath) => isWithin(normalizedResolved, rootPath))) {
+            isInside = true;
+        }
+    }
     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,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,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;IAEtE,sCAAsC;IACtC,MAAM,YAAY,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IAEzG,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,IAAI,QAAQ,GAAG,kBAAkB,KAAK,iBAAiB,IAAI,kBAAkB,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;IAErG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,qDAAqD;QACrD,MAAM,SAAS,GACb,kBAAkB,KAAK,MAAM;YAC7B,kBAAkB,CAAC,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC;YAChD,kBAAkB,KAAK,cAAc;YACrC,kBAAkB,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;QAE3D,IAAI,SAAS,EAAE,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC;IAED,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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../source/tools/utils.ts"],"names":[],"mappings":"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"}

package/dist/tools/utils.test.js

@@ -1,39 +1,39 @@
-import test from 'ava';
+import { it, expect } from 'vitest';
 import * as path from 'path';
 import { homedir } from 'os';
 import { resolveWorkspacePath } from './utils.js';
-test('resolveWorkspacePath: expands ~ to home directory', (t) => {
+it('resolveWorkspacePath: expands ~ to home directory', () => {
     const home = homedir();
     const workspace = '/Users/test/workspace';
     // Test ~/ expansion
     const resolved = resolveWorkspacePath('~/documents/file.txt', workspace, { allowOutsideWorkspace: true });
-    t.is(resolved, path.join(home, 'documents', 'file.txt'));
+    expect(resolved).toBe(path.join(home, 'documents', 'file.txt'));
     // Test ~ expansion
     const resolvedHome = resolveWorkspacePath('~', workspace, { allowOutsideWorkspace: true });
-    t.is(resolvedHome, home);
+    expect(resolvedHome).toBe(home);
 });
-test('resolveWorkspacePath: throws if ~ expanded path is outside workspace and not allowed', (t) => {
+it('resolveWorkspacePath: throws if ~ expanded path is outside workspace and not allowed', () => {
     const workspace = '/tmp/workspace';
-    t.throws(() => {
+    expect(() => {
         resolveWorkspacePath('~/somefile', workspace, { allowOutsideWorkspace: false });
-    }, { message: /Operation outside workspace/ });
+    }).toThrow(/Operation outside workspace/);
 });
-test('resolveWorkspacePath: handles regular relative paths', (t) => {
+it('resolveWorkspacePath: handles regular relative paths', () => {
     const workspace = '/tmp/workspace';
     const resolved = resolveWorkspacePath('src/main.ts', workspace);
-    t.is(resolved, path.join(workspace, 'src/main.ts'));
+    expect(resolved).toBe(path.join(workspace, 'src/main.ts'));
 });
-test('resolveWorkspacePath: allows paths under /tmp or /private/tmp even when outside workspace', (t) => {
+it('resolveWorkspacePath: allows paths under /tmp or /private/tmp even when outside workspace', () => {
     const workspace = '/Users/test/workspace';
     // Test /tmp path
     const resolvedTmp = resolveWorkspacePath('/tmp/test-file.txt', workspace);
-    t.is(resolvedTmp, path.normalize('/tmp/test-file.txt'));
+    expect(resolvedTmp).toBe(path.normalize('/tmp/test-file.txt'));
     // Test /private/tmp path
     const resolvedPrivateTmp = resolveWorkspacePath('/private/tmp/sub/file.txt', workspace);
-    t.is(resolvedPrivateTmp, path.normalize('/private/tmp/sub/file.txt'));
+    expect(resolvedPrivateTmp).toBe(path.normalize('/private/tmp/sub/file.txt'));
     // Test that /opt or other outside paths still throw
-    t.throws(() => {
+    expect(() => {
         resolveWorkspacePath('/opt/app.log', workspace);
-    }, { message: /Operation outside workspace/ });
+    }).toThrow(/Operation outside workspace/);
 });
 //# sourceMappingURL=utils.test.js.map

package/dist/tools/utils.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../source/tools/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,KAAK,CAAC;AACvB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,IAAI,CAAC,mDAAmD,EAAE,CAAC,CAAC,EAAE,EAAE;IAC9D,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAE1C,oBAAoB;IACpB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,sBAAsB,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1G,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IAEzD,mBAAmB;IACnB,MAAM,YAAY,GAAG,oBAAoB,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,CAAC,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sFAAsF,EAAE,CAAC,CAAC,EAAE,EAAE;IACjG,MAAM,SAAS,GAAG,gBAAgB,CAAC;IAEnC,CAAC,CAAC,MAAM,CACN,GAAG,EAAE;QACH,oBAAoB,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,CAAC,EACD,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAC3C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,sDAAsD,EAAE,CAAC,CAAC,EAAE,EAAE;IACjE,MAAM,SAAS,GAAG,gBAAgB,CAAC;IACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;AACtD,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2FAA2F,EAAE,CAAC,CAAC,EAAE,EAAE;IACtG,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAE1C,iBAAiB;IACjB,MAAM,WAAW,GAAG,oBAAoB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAC1E,CAAC,CAAC,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAExD,yBAAyB;IACzB,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAC;IACxF,CAAC,CAAC,EAAE,CAAC,kBAAkB,EAAE,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAEtE,oDAAoD;IACpD,CAAC,CAAC,MAAM,CACN,GAAG,EAAE;QACH,oBAAoB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC,EACD,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAC3C,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"utils.test.js","sourceRoot":"","sources":["../../source/tools/utils.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;IAC3D,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAE1C,oBAAoB;IACpB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,sBAAsB,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1G,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IAEhE,mBAAmB;IACnB,MAAM,YAAY,GAAG,oBAAoB,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3F,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,sFAAsF,EAAE,GAAG,EAAE;IAC9F,MAAM,SAAS,GAAG,gBAAgB,CAAC;IAEnC,MAAM,CAAC,GAAG,EAAE;QACV,oBAAoB,CAAC,YAAY,EAAE,SAAS,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;IAC9D,MAAM,SAAS,GAAG,gBAAgB,CAAC;IACnC,MAAM,QAAQ,GAAG,oBAAoB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;IAChE,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,2FAA2F,EAAE,GAAG,EAAE;IACnG,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAE1C,iBAAiB;IACjB,MAAM,WAAW,GAAG,oBAAoB,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAC1E,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE/D,yBAAyB;IACzB,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,2BAA2B,EAAE,SAAS,CAAC,CAAC;IACxF,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAE7E,oDAAoD;IAEpD,MAAM,CAAC,GAAG,EAAE;QACV,oBAAoB,CAAC,cAAc,EAAE,SAAS,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;AAC5C,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,20 @@
+import { z } from 'zod';
+import type { ToolDefinition, FormatCommandMessage } from '../types.js';
+import type { ISettingsService, ILoggingService } from '../../services/service-interfaces.js';
+declare const webFetchSchema: z.ZodObject<{
+    url: z.ZodString;
+    max_chars: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    heading: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodNumber]>>>>;
+    continuation_token: z.ZodOptional<z.ZodString>;
+}, z.core.$strip>;
+export type WebFetchParams = z.infer<typeof webFetchSchema>;
+/**
+ * Format command message for display in the terminal
+ */
+export declare const formatWebFetchCommandMessage: FormatCommandMessage;
+export declare const createWebFetchToolDefinition: (deps: {
+    settingsService: ISettingsService;
+    loggingService: ILoggingService;
+}) => ToolDefinition<Partial<WebFetchParams>>;
+export {};
+//# sourceMappingURL=web-fetch.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"web-fetch.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAY9F,QAAA,MAAM,cAAc;;;;;iBAkBlB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAE5D;;GAEG;AACH,eAAO,MAAM,4BAA4B,EAAE,oBAoB1C,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,CAmEzC,CAAC"}

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

@@ -0,0 +1,114 @@
+import { z } from 'zod';
+import { writeFile } from 'fs/promises';
+import os from 'os';
+import path from 'path';
+import { getOutputText, normalizeToolArguments, createBaseMessage, getCallIdFromItem } from '../format-helpers.js';
+const WEB_FETCH_DESCRIPTION = 'Fetch a web page and convert its HTML content to Markdown. ' +
+    'Use this when you need the full content of a specific URL referenced by web_search or the user. ' +
+    'Do NOT use this for broad queries; use web_search. ' +
+    'Returns the page title, URL, table of contents, and extracted Markdown. ' +
+    'Initial fetches are truncated to max_chars; the full content is saved to a temporary file when exceeded.';
+const DEFAULT_MAX_CHARS = 10000;
+const MAX_CHARS_LIMIT = 200000;
+const webFetchSchema = z.object({
+    url: z.string().describe('The URL of the web page to fetch.'),
+    max_chars: z
+        .number()
+        .min(200)
+        .max(MAX_CHARS_LIMIT)
+        .optional()
+        .default(DEFAULT_MAX_CHARS)
+        .describe('Maximum number of characters to return.'),
+    heading: z
+        .array(z.union([z.string(), z.number()]))
+        .optional()
+        .default([])
+        .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.'),
+});
+/**
+ * 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 normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+    const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
+    const url = args?.url ?? 'unknown url';
+    const command = `web_fetch: "${url}"`;
+    const output = getOutputText(item) || 'No results';
+    const success = !output.startsWith('Error:');
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output,
+            success,
+            toolName: 'web_fetch',
+            toolArgs: args,
+        }),
+    ];
+};
+export const createWebFetchToolDefinition = (deps) => {
+    const { loggingService } = deps;
+    return {
+        name: 'web_fetch',
+        description: WEB_FETCH_DESCRIPTION,
+        parameters: webFetchSchema,
+        needsApproval: () => false,
+        execute: async (params) => {
+            const { url, max_chars = DEFAULT_MAX_CHARS, heading: targetHeadings, continuation_token } = params;
+            try {
+                const { fetchWebPage } = await import('@qduc/web-fetch');
+                // For initial fetches, get as much content as the library can return.
+                // For continuation requests, pass the user's max_chars through unchanged.
+                const isContinuation = !!continuation_token;
+                const result = await fetchWebPage({
+                    url,
+                    maxChars: isContinuation ? max_chars : MAX_CHARS_LIMIT,
+                    headings: targetHeadings,
+                    continuationToken: continuation_token ?? undefined,
+                });
+                let displayMarkdown = result.markdown;
+                let tempFilePath = null;
+                // For initial fetches, if content exceeds the user's requested max, save full to temp file
+                if (!isContinuation && result.markdown.length > max_chars) {
+                    const safeName = (url ?? 'unknown').replace(/[^a-zA-Z0-9]/g, '_').slice(0, 50);
+                    const timestamp = Date.now();
+                    const rand = Math.random().toString(36).slice(2, 8);
+                    const tmpDir = os.tmpdir();
+                    tempFilePath = path.join(tmpDir, `term2-web-fetch-${safeName}-${timestamp}-${rand}.md`);
+                    await writeFile(tempFilePath, result.markdown, 'utf-8');
+                    // Truncate the displayed markdown at a clean boundary near max_chars
+                    const truncated = result.markdown.slice(0, max_chars);
+                    const lastNewline = truncated.lastIndexOf('\n');
+                    displayMarkdown = lastNewline > max_chars * 0.8 ? truncated.slice(0, lastNewline) : truncated;
+                    displayMarkdown += `\n\n[... Content truncated at ${max_chars} characters for display ...]`;
+                }
+                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`;
+                }
+                output += displayMarkdown;
+                if (result.continuationToken) {
+                    output += `\n\n**Note: Content still truncated. Use continuation_token: "${result.continuationToken}" to fetch more.**`;
+                }
+                if (tempFilePath) {
+                    output += `\n\n**Full content saved to temp file: \`${tempFilePath}\`**\nThe full content has been saved for reference. You can use grep, read_file (with limited line range) on this file to find specific information.`;
+                }
+                return output;
+            }
+            catch (error) {
+                loggingService.error('Web fetch failed', {
+                    url,
+                    error: error.message || String(error),
+                });
+                return `Error: ${error.message || String(error)}`;
+            }
+        },
+        formatCommandMessage: formatWebFetchCommandMessage,
+    };
+};
+//# sourceMappingURL=web-fetch.js.map

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

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

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

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

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

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

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

@@ -0,0 +1,158 @@
+import { it, expect } from 'vitest';
+import * as fs from 'fs/promises';
+import { createWebFetchToolDefinition } from './web-fetch.js';
+// Mock services
+const mockSettingsService = {};
+const mockLoggingService = {
+    error: () => { },
+    info: () => { },
+    warn: () => { },
+    debug: () => { },
+};
+const webFetchTool = createWebFetchToolDefinition({
+    settingsService: mockSettingsService,
+    loggingService: mockLoggingService,
+});
+it('needsApproval: returns false', async () => {
+    const result = await webFetchTool.needsApproval({ url: 'https://example.com' });
+    expect(result).toBe(false);
+});
+it.sequential('execute: fetches and converts to markdown', async () => {
+    // Mock global fetch
+    const originalFetch = global.fetch;
+    global.fetch = async () => {
+        return {
+            ok: true,
+            status: 200,
+            headers: new Map([['content-type', 'text/html']]),
+            text: async () => '<html><body><h1>Hello World</h1><p>This is a test.</p></body></html>',
+            body: {
+                getReader: () => {
+                    const chunks = [Buffer.from('<html><body><h1>Hello World</h1><p>This is a test.</p></body></html>')];
+                    let i = 0;
+                    return {
+                        read: async () => {
+                            if (i < chunks.length) {
+                                return { done: false, value: chunks[i++] };
+                            }
+                            return { done: true };
+                        },
+                        releaseLock: () => { },
+                    };
+                },
+            },
+        };
+    };
+    try {
+        const result = await webFetchTool.execute({ url: 'https://example.com' });
+        expect(result.includes('# Hello World')).toBe(true);
+        expect(result.includes('This is a test.')).toBe(true);
+        expect(result.includes('Table of Contents')).toBe(true);
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+it.sequential('execute: handles fetch errors', async () => {
+    const originalFetch = global.fetch;
+    global.fetch = async () => {
+        return {
+            ok: false,
+            status: 404,
+            statusText: 'Not Found',
+        };
+    };
+    try {
+        const result = await webFetchTool.execute({ url: 'https://example.com/404' });
+        expect(result.includes('Error')).toBe(true);
+        expect(result.includes('404')).toBe(true);
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+it.sequential('execute: converts github blob links to raw links', async () => {
+    const originalFetch = global.fetch;
+    let fetchedUrl = '';
+    global.fetch = async (url) => {
+        fetchedUrl = url.toString();
+        return {
+            ok: true,
+            status: 200,
+            headers: new Map([['content-type', 'text/plain']]),
+            text: async () => 'raw github content',
+        };
+    };
+    try {
+        const githubUrl = 'https://github.com/qduc/term2/blob/main/package.json';
+        await webFetchTool.execute({ url: githubUrl });
+        expect(fetchedUrl).toBe('https://raw.githubusercontent.com/qduc/term2/main/package.json');
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+it.sequential('execute: saves full content to temp file when content exceeds max_chars', async () => {
+    const originalFetch = global.fetch;
+    // Generate enough HTML to produce > 200 chars of markdown
+    const longText = 'This is a long paragraph that generates enough markdown to exceed the max_chars limit and trigger the temp file creation behavior in the web fetch tool. '.repeat(10);
+    const html = `<html><body><h1>Long Page</h1><p>${longText}</p></body></html>`;
+    global.fetch = async () => {
+        return {
+            ok: true,
+            status: 200,
+            headers: new Map([['content-type', 'text/html']]),
+            text: async () => html,
+        };
+    };
+    let tempFile = null;
+    try {
+        const result = await webFetchTool.execute({ url: 'https://example.com/long', max_chars: 200 });
+        expect(result.includes('Content truncated at 200 characters')).toBe(true);
+        expect(result.includes('Full content saved to temp file:')).toBe(true);
+        // Extract the temp file path from the output and clean up
+        const match = result.match(/`([^`]+\.md)`/);
+        if (match) {
+            tempFile = match[1];
+        }
+    }
+    finally {
+        global.fetch = originalFetch;
+        if (tempFile) {
+            await fs.rm(tempFile, { force: true });
+        }
+    }
+});
+it.sequential('execute: does not save temp file when content fits within max_chars', async () => {
+    const originalFetch = global.fetch;
+    const shortHtml = '<html><body><h1>Short Page</h1><p>Small content.</p></body></html>';
+    global.fetch = async () => {
+        return {
+            ok: true,
+            status: 200,
+            headers: new Map([['content-type', 'text/html']]),
+            text: async () => shortHtml,
+        };
+    };
+    try {
+        const result = await webFetchTool.execute({ url: 'https://example.com/short' });
+        expect(result.includes('Full content saved to temp file:')).toBe(false);
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+it.sequential('execute: does not save temp file on continuation request', async () => {
+    // Continuation requests should skip the temp file logic entirely,
+    // even if a valid result were returned.
+    const result = await webFetchTool.execute({
+        url: 'https://example.com/page',
+        max_chars: 200,
+        continuation_token: 'nonexistent-token',
+    });
+    // The call will error because the token doesn't exist in the cache,
+    // but it should never try to save a temp file.
+    expect(result.startsWith('Error:')).toBe(true);
+    expect(result.includes('Full content saved to temp file:')).toBe(false);
+});
+//# sourceMappingURL=web-fetch.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"web-fetch.test.js","sourceRoot":"","sources":["../../../source/tools/web/web-fetch.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAG9D,gBAAgB;AAChB,MAAM,mBAAmB,GAAG,EAAsB,CAAC;AACnD,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;CACc,CAAC;AAEhC,MAAM,YAAY,GAAG,4BAA4B,CAAC;IAChD,eAAe,EAAE,mBAAmB;IACpC,cAAc,EAAE,kBAAkB;CACnC,CAAC,CAAC;AAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC7B,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;IACpE,oBAAoB;IACpB,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACxB,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;YACjD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,sEAAsE;YACxF,IAAI,EAAE;gBACJ,SAAS,EAAE,GAAG,EAAE;oBACd,MAAM,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,sEAAsE,CAAC,CAAC,CAAC;oBACrG,IAAI,CAAC,GAAG,CAAC,CAAC;oBACV,OAAO;wBACL,IAAI,EAAE,KAAK,IAAI,EAAE;4BACf,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;gCACtB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;4BAC7C,CAAC;4BACD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;wBACxB,CAAC;wBACD,WAAW,EAAE,GAAG,EAAE,GAAE,CAAC;qBACtB,CAAC;gBACJ,CAAC;aACF;SACK,CAAC;IACX,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,qBAAqB,EAAE,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtD,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;IACxD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACxB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,UAAU,EAAE,WAAW;SACjB,CAAC;IACX,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,CAAC,CAAC;QAC9E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;IAC3E,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IACnC,IAAI,UAAU,GAAG,EAAE,CAAC;IACpB,MAAM,CAAC,KAAK,GAAG,KAAK,EAAE,GAA2B,EAAE,EAAE;QACnD,UAAU,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC5B,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;YAClD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,oBAAoB;SAChC,CAAC;IACX,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,sDAAsD,CAAC;QACzE,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;IAC5F,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;IAClG,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IAEnC,0DAA0D;IAC1D,MAAM,QAAQ,GACZ,2JAA2J,CAAC,MAAM,CAChK,EAAE,CACH,CAAC;IACJ,MAAM,IAAI,GAAG,oCAAoC,QAAQ,oBAAoB,CAAC;IAE9E,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACxB,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;YACjD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI;SAChB,CAAC;IACX,CAAC,CAAC;IAEF,IAAI,QAAQ,GAAkB,IAAI,CAAC;IACnC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;QAE/F,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1E,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEvE,0DAA0D;QAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC5C,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;QAC7B,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,EAAE,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;IAC9F,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC;IACnC,MAAM,SAAS,GAAG,oEAAoE,CAAC;IAEvF,MAAM,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE;QACxB,OAAO;YACL,EAAE,EAAE,IAAI;YACR,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,IAAI,GAAG,CAAC,CAAC,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC,CAAC;YACjD,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,SAAS;SACrB,CAAC;IACX,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,2BAA2B,EAAE,CAAC,CAAC;QAChF,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1E,CAAC;YAAS,CAAC;QACT,MAAM,CAAC,KAAK,GAAG,aAAa,CAAC;IAC/B,CAAC;AACH,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,UAAU,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;IACnF,kEAAkE;IAClE,wCAAwC;IACxC,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC;QACxC,GAAG,EAAE,0BAA0B;QAC/B,SAAS,EAAE,GAAG;QACd,kBAAkB,EAAE,mBAAmB;KACxC,CAAC,CAAC;IACH,oEAAoE;IACpE,+CAA+C;IAC/C,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,kCAAkC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC1E,CAAC,CAAC,CAAC"}

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

@@ -0,0 +1,29 @@
+/**
+ * Web search tool for the terminal assistant.
+ * Uses pluggable web search providers (default: Tavily) to fetch current information from the web.
+ */
+import { z } from 'zod';
+import type { ToolDefinition, FormatCommandMessage } from '../types.js';
+import { type WebSearchResponse } from '../../providers/web-search/index.js';
+import type { ISettingsService, ILoggingService } from '../../services/service-interfaces.js';
+declare const webSearchSchema: z.ZodObject<{
+    query: z.ZodString;
+}, z.core.$strip>;
+export type WebSearchParams = z.infer<typeof webSearchSchema>;
+/**
+ * Convert web search results to a markdown-formatted string
+ */
+export declare function formatResultsAsMarkdown(response: WebSearchResponse): string;
+/**
+ * Format command message for display in the terminal
+ */
+export declare const formatWebSearchCommandMessage: FormatCommandMessage;
+/**
+ * Factory function to create the web_search tool definition
+ */
+export declare const createWebSearchToolDefinition: (deps: {
+    settingsService: ISettingsService;
+    loggingService: ILoggingService;
+}) => ToolDefinition<WebSearchParams>;
+export {};
+//# sourceMappingURL=web-search.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"web-search.d.ts","sourceRoot":"","sources":["../../../source/tools/web/web-search.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAExE,OAAO,EAAkC,KAAK,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAC7G,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAQ9F,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,EAAE,oBAoB3C,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,6BAA6B,GAAI,MAAM;IAClD,eAAe,EAAE,gBAAgB,CAAC;IAClC,cAAc,EAAE,eAAe,CAAC;CACjC,KAAG,cAAc,CAAC,eAAe,CAyCjC,CAAC"}

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

@@ -0,0 +1,104 @@
+/**
+ * Web search tool for the terminal assistant.
+ * 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';
+const WEB_SEARCH_DESCRIPTION = 'Search the web for current information. ' +
+    'Use this when you need up-to-date information that may not be in your training data, such as recent news, current events, documentation updates, or any time-sensitive information. ' +
+    'Do NOT use this to read a specific known page; use web_fetch. ' +
+    'Returns a markdown summary with an answer box (when available) and a numbered list of results.';
+const webSearchSchema = z.object({
+    query: z.string().min(1).describe('The search query to look up on the web.'),
+});
+/**
+ * Convert web search results to a markdown-formatted string
+ */
+export function formatResultsAsMarkdown(response) {
+    const parts = [];
+    // Add answer box if available (Tavily's synthesized answer)
+    if (response.answerBox) {
+        parts.push('## Answer\n');
+        parts.push(response.answerBox);
+        parts.push('\n');
+    }
+    // Add search results
+    if (response.results.length > 0) {
+        parts.push('## Search Results\n');
+        response.results.forEach((result, index) => {
+            parts.push(`### ${index + 1}. ${result.title}\n`);
+            parts.push(`**URL:** ${result.url}\n`);
+            if (result.publishedDate) {
+                parts.push(`**Published:** ${result.publishedDate}\n`);
+            }
+            parts.push(`\n${result.content}\n`);
+            parts.push('\n---\n');
+        });
+    }
+    else {
+        parts.push('No results found for this query.\n');
+    }
+    return parts.join('\n');
+}
+/**
+ * Format command message for display in the terminal
+ */
+export const formatWebSearchCommandMessage = (item, index, toolCallArgumentsById) => {
+    const callId = getCallIdFromItem(item);
+    const fallbackArgs = callId && toolCallArgumentsById.has(callId) ? toolCallArgumentsById.get(callId) : null;
+    const normalizedArgs = item?.rawItem?.arguments ?? item?.arguments;
+    const args = normalizeToolArguments(normalizedArgs) ?? normalizeToolArguments(fallbackArgs) ?? {};
+    const query = args?.query ?? 'unknown query';
+    const command = `web_search: "${query}"`;
+    const output = getOutputText(item) || 'No results';
+    const success = !output.startsWith('Error:');
+    return [
+        createBaseMessage(item, index, 0, false, {
+            command,
+            output,
+            success,
+            toolName: 'web_search',
+            toolArgs: args,
+        }),
+    ];
+};
+/**
+ * Factory function to create the web_search tool definition
+ */
+export const createWebSearchToolDefinition = (deps) => {
+    const { settingsService, loggingService } = deps;
+    return {
+        name: 'web_search',
+        description: WEB_SEARCH_DESCRIPTION,
+        parameters: webSearchSchema,
+        needsApproval: () => false, // Web search is read-only, safe operation
+        execute: async (params) => {
+            const { query } = params;
+            try {
+                const provider = getConfiguredWebSearchProvider({ settingsService });
+                if (!provider) {
+                    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).`);
+                }
+                const response = await provider.search(query, {
+                    settingsService,
+                    loggingService,
+                });
+                return formatResultsAsMarkdown(response);
+            }
+            catch (error) {
+                loggingService.error('Web search failed', {
+                    query,
+                    error: error.message || String(error),
+                });
+                return `Error: ${error.message || String(error)}`;
+            }
+        },
+        formatCommandMessage: formatWebSearchCommandMessage,
+    };
+};
+//# sourceMappingURL=web-search.js.map

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

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

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

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

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

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