@qduc/term2 0.1.2 → 0.1.4

package/dist/tools/web-fetch.js

@@ -0,0 +1,300 @@
+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';
+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.'),
+});
+// 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 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: 'Fetch a web page and convert its HTML content to Markdown format with intelligent content extraction.',
+        parameters: webFetchSchema,
+        needsApproval: () => false,
+        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',
+                });
+                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 result = `Title: ${extractedContent.title}\nURL: ${url}\n\n`;
+                if (fullToc) {
+                    result += `## Table of Contents\n\n${fullToc}\n\n---\n\n`;
+                }
+                result += markdown;
+                if (finalContinuationToken) {
+                    result += `\n\n**Note: Content truncated. Use continuation_token: "${finalContinuationToken}" to fetch more.**`;
+                }
+                return result;
+            }
+            catch (error) {
+                loggingService.error('Web fetch failed', {
+                    url,
+                    error: error.message || String(error),
+                });
+                return `Error: ${error.message || String(error)}`;
+            }
+        },
+        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

@@ -0,0 +1 @@
+{"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.d.ts

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

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

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

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

@@ -0,0 +1,94 @@
+import test from 'ava';
+import { createWebFetchToolDefinition } from './web-fetch.js';
+// Mock services
+const mockSettingsService = {};
+const mockLoggingService = {
+    error: () => { },
+    info: () => { },
+    warn: () => { },
+    debug: () => { },
+};
+const webFetchTool = createWebFetchToolDefinition({
+    settingsService: mockSettingsService,
+    loggingService: mockLoggingService,
+});
+test('needsApproval: returns false', async (t) => {
+    const result = await webFetchTool.needsApproval({ url: 'https://example.com' });
+    t.false(result);
+});
+test('execute: fetches and converts to markdown', async (t) => {
+    // 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' });
+        t.true(result.includes('# Hello World'));
+        t.true(result.includes('This is a test.'));
+        t.true(result.includes('Table of Contents'));
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+test('execute: handles fetch errors', async (t) => {
+    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' });
+        t.true(result.includes('Error'));
+        t.true(result.includes('404'));
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+test('execute: converts github blob links to raw links', async (t) => {
+    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 });
+        t.is(fetchedUrl, 'https://raw.githubusercontent.com/qduc/term2/main/package.json');
+    }
+    finally {
+        global.fetch = originalFetch;
+    }
+});
+//# sourceMappingURL=web-fetch.test.js.map

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

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

package/dist/utils/command-safety/index.d.ts

@@ -6,8 +6,8 @@ import type { ILoggingService } from '../../services/service-interfaces.js';
 export declare function classifyCommand(commandString: string, loggingService?: ILoggingService): SafetyStatus;
 /**
  * Validate command safety using an AST parser.
- * Returns true when a command requires user approval.
- * Throws for invalid/empty inputs OR hard-blocked RED classifications.
+ * Returns true when a command requires user approval (YELLOW or RED).
+ * Throws for invalid/empty inputs.
  */
 export declare function validateCommandSafety(command: string, loggingService?: ILoggingService): boolean;
 export { SafetyStatus } from './constants.js';

package/dist/utils/command-safety/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/utils/command-safety/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAqC,MAAM,gBAAgB,CAAC;AAShF,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AAiB1E;;GAEG;AACH,wBAAgB,eAAe,CAC3B,aAAa,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,eAAe,GACjC,YAAY,CA0Jd;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,eAAe,GACjC,OAAO,CA0BT;AAGD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/utils/command-safety/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,YAAY,EAAqC,MAAM,gBAAgB,CAAC;AAShF,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;AAiB1E;;GAEG;AACH,wBAAgB,eAAe,CAC3B,aAAa,EAAE,MAAM,EACrB,cAAc,CAAC,EAAE,eAAe,GACjC,YAAY,CA0Jd;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACjC,OAAO,EAAE,MAAM,EACf,cAAc,CAAC,EAAE,eAAe,GACjC,OAAO,CA2BT;AAGD,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC"}

package/dist/utils/command-safety/index.js

@@ -152,8 +152,8 @@ export function classifyCommand(commandString, loggingService) {
 }
 /**
  * Validate command safety using an AST parser.
- * Returns true when a command requires user approval.
- * Throws for invalid/empty inputs OR hard-blocked RED classifications.
+ * Returns true when a command requires user approval (YELLOW or RED).
+ * Throws for invalid/empty inputs.
  */
 export function validateCommandSafety(command, loggingService) {
     if (!command ||
@@ -166,17 +166,18 @@ export function validateCommandSafety(command, loggingService) {
         command: command.substring(0, 200),
     });
     const status = classifyCommand(command, logger);
-    if (status === SafetyStatus.RED) {
-        logger.security('Command validation failed: RED (forbidden)', {
+    if (status === SafetyStatus.RED || status === SafetyStatus.YELLOW) {
+        logger.security('Command validation: needs approval', {
             command: command.substring(0, 200),
+            status,
         });
-        throw new Error('Command classified as RED (forbidden)');
+        return true;
     }
     logger.security('Validation result', {
         command: command.substring(0, 200),
         status,
     });
-    return status === SafetyStatus.YELLOW;
+    return false;
 }
 // Re-export types and constants for convenience
 export { SafetyStatus } from './constants.js';

package/dist/utils/command-safety/index.js.map

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