@kirosnn/mosaic 0.0.91 → 0.73.0

package/src/agent/tools/executor.ts

@@ -1,15 +1,185 @@
-import { readFile, writeFile, readdir, appendFile, stat, mkdir } from 'fs/promises';
+import { readFile, writeFile, readdir, appendFile, stat, mkdir, realpath } from 'fs/promises';
 import { join, resolve, dirname, extname, sep } from 'path';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { requestApproval } from '../../utils/approvalBridge';
 import { shouldRequireApprovals } from '../../utils/config';
 import { generateDiff, formatDiffForDisplay } from '../../utils/diff';
-import { captureFileSnapshot } from '../../utils/undoRedo';
-import { trackFileChange, trackFileCreated, trackFileDeleted } from '../../utils/fileChangeTracker';
+import { trackFileChange, trackFileCreated } from '../../utils/fileChangeTracker';
+import TurndownService from 'turndown';
+import { Readability } from '@mozilla/readability';
+import { parseHTML } from 'linkedom';
 
 const execAsync = promisify(exec);
 
+const DEFAULT_USER_AGENT = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:121.0) Gecko/20100101 Firefox/121.0';
+const DEFAULT_FETCH_MAX_LENGTH = 10000;
+const DEFAULT_FETCH_TIMEOUT = 30000;
+
+function extractContentFromHtml(html: string, url: string): { content: string; title: string | null; isSPA: boolean } {
+  const { document } = parseHTML(html);
+
+  const turndown = new TurndownService({
+    headingStyle: 'atx',
+    codeBlockStyle: 'fenced',
+    emDelimiter: '*',
+  });
+
+  turndown.addRule('removeScripts', {
+    filter: ['script', 'style', 'noscript'],
+    replacement: () => '',
+  });
+
+  turndown.addRule('preserveLinks', {
+    filter: 'a',
+    replacement: (content, node) => {
+      const element = node as HTMLAnchorElement;
+      const href = element.getAttribute('href');
+      if (!href || href.startsWith('#')) return content;
+
+      try {
+        const absoluteUrl = new URL(href, url).toString();
+        return `[${content}](${absoluteUrl})`;
+      } catch {
+        return `[${content}](${href})`;
+      }
+    },
+  });
+
+  turndown.addRule('preserveImages', {
+    filter: 'img',
+    replacement: (_content, node) => {
+      const element = node as HTMLImageElement;
+      const src = element.getAttribute('src');
+      const alt = element.getAttribute('alt') || '';
+      if (!src) return '';
+
+      try {
+        const absoluteUrl = new URL(src, url).toString();
+        return `![${alt}](${absoluteUrl})`;
+      } catch {
+        return `![${alt}](${src})`;
+      }
+    },
+  });
+
+  const reader = new Readability(document as unknown as Document, {
+    charThreshold: 0,
+  });
+  const article = reader.parse();
+
+  if (article && article.content) {
+    const content = turndown.turndown(article.content).trim();
+    if (content.length > 50) {
+      return {
+        content,
+        title: article.title || document.title || null,
+        isSPA: false,
+      };
+    }
+  }
+
+  const bodyMatch = html.match(/<body[^>]*>([\s\S]*)<\/body>/i);
+  const bodyContent = bodyMatch ? bodyMatch[1] : html;
+  const markdownContent = turndown.turndown(bodyContent || '').trim();
+
+  if (markdownContent.length > 50) {
+    return {
+      content: markdownContent,
+      title: document.title || null,
+      isSPA: false,
+    };
+  }
+
+  const isSPA = html.includes('id="root"') ||
+    html.includes('id="app"') ||
+    html.includes('id="__next"') ||
+    html.includes('data-reactroot') ||
+    html.includes('ng-app');
+
+  const metaTags: string[] = [];
+  const metaDescription = html.match(/<meta[^>]*name=["']description["'][^>]*content=["']([^"']+)["']/i);
+  const metaOgTitle = html.match(/<meta[^>]*property=["']og:title["'][^>]*content=["']([^"']+)["']/i);
+  const metaOgDescription = html.match(/<meta[^>]*property=["']og:description["'][^>]*content=["']([^"']+)["']/i);
+
+  if (metaOgTitle) metaTags.push(`**Title:** ${metaOgTitle[1]}`);
+  if (metaDescription) metaTags.push(`**Description:** ${metaDescription[1]}`);
+  if (metaOgDescription && metaOgDescription[1] !== metaDescription?.[1]) {
+    metaTags.push(`**OG Description:** ${metaOgDescription[1]}`);
+  }
+
+  let content = '';
+  if (isSPA) {
+    content = `*This appears to be a Single Page Application (SPA/React/Vue/Angular). The content is rendered client-side with JavaScript and cannot be extracted via simple HTTP fetch.*\n\n`;
+    if (metaTags.length > 0) {
+      content += `**Available metadata:**\n${metaTags.join('\n')}\n\n`;
+    }
+    content += `*To see the actual content, you would need a headless browser. Try using raw=true to see the HTML source.*`;
+  } else if (markdownContent) {
+    content = markdownContent;
+  } else {
+    content = `*No readable content could be extracted from this page.*\n\n`;
+    if (metaTags.length > 0) {
+      content += `**Available metadata:**\n${metaTags.join('\n')}`;
+    }
+  }
+
+  return {
+    content,
+    title: document.title || null,
+    isSPA,
+  };
+}
+
+async function fetchUrlContent(
+  url: string,
+  options: {
+    raw?: boolean;
+    timeout?: number;
+    userAgent?: string;
+  } = {}
+): Promise<{ content: string; contentType: string; title: string | null; status: number; statusText: string; isSPA?: boolean }> {
+  const { raw = false, timeout = DEFAULT_FETCH_TIMEOUT, userAgent = DEFAULT_USER_AGENT } = options;
+
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), timeout);
+
+  try {
+    const response = await globalThis.fetch(url, {
+      headers: {
+        'User-Agent': userAgent,
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Language': 'en-US,en;q=0.5',
+      },
+      signal: controller.signal,
+      redirect: 'follow',
+    });
+
+    const status = response.status;
+    const statusText = response.statusText;
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${status} ${statusText}`);
+    }
+
+    const contentType = response.headers.get('content-type') || '';
+    const text = await response.text();
+
+    const isHtml = contentType.includes('text/html') ||
+      text.slice(0, 500).toLowerCase().includes('<html') ||
+      text.slice(0, 500).toLowerCase().includes('<!doctype html');
+
+    if (isHtml && !raw) {
+      const { content, title, isSPA } = extractContentFromHtml(text, url);
+      return { content, contentType, title, isSPA, status, statusText };
+    }
+
+    return { content: text, contentType, title: null, status, statusText };
+  } finally {
+    clearTimeout(timeoutId);
+  }
+}
+
 export interface ToolResult {
   success: boolean;
   result?: string;
@@ -18,23 +188,23 @@ export interface ToolResult {
   diff?: string[];
 }
 
-const pathValidationCache = new Map<string, boolean>();
 const globPatternCache = new Map<string, RegExp>();
 
-function validatePath(fullPath: string, workspace: string): boolean {
-  const cacheKey = `${fullPath}|${workspace}`;
-  const cached = pathValidationCache.get(cacheKey);
-  if (cached !== undefined) return cached;
+async function validatePath(fullPath: string, workspace: string): Promise<boolean> {
+  const normalizedWorkspace = workspace.endsWith(sep) ? workspace : workspace + sep;
 
-  const result = fullPath.startsWith(workspace);
-  pathValidationCache.set(cacheKey, result);
-
-  if (pathValidationCache.size > 1000) {
-    const firstKey = pathValidationCache.keys().next().value;
-    if (firstKey) pathValidationCache.delete(firstKey);
+  try {
+    const resolved = await realpath(fullPath);
+    return resolved === workspace || resolved.startsWith(normalizedWorkspace);
+  } catch {
+    const parent = dirname(fullPath);
+    try {
+      const resolvedParent = await realpath(parent);
+      return resolvedParent === workspace || resolvedParent.startsWith(normalizedWorkspace);
+    } catch {
+      return fullPath === workspace || fullPath.startsWith(normalizedWorkspace);
+    }
   }
-
-  return result;
 }
 
 const EXCLUDED_DIRECTORIES = new Set([
@@ -69,14 +239,14 @@ function matchGlob(filename: string, pattern: string): boolean {
   if (!regex) {
     const normalizedPattern = pattern.replace(/\\/g, '/');
 
-    let regexPattern = normalizedPattern.replace(/[.+^${}()|[\]\\]/g, '\\$&');
+    let regexPattern = normalizedPattern.replace(/[.+^${}()|[\]\\*?]/g, '\\$&');
 
     regexPattern = regexPattern
-      .replace(/\*\*\//g, '(?:(?:[^/]+/)*)')
-      .replace(/\/\*\*$/g, '(?:/.*)?')
-      .replace(/\*\*/g, '.*')
-      .replace(/\*/g, '[^/]*')
-      .replace(/\?/g, '[^/]');
+      .replace(/\\\*\\\*\\\//g, '(?:(?:[^/]+/)*)')
+      .replace(/\\\/\*\\\*$/g, '(?:/.*)?')
+      .replace(/\\\*\\\*/g, '.*')
+      .replace(/\\\*/g, '[^/]*')
+      .replace(/\\\?/g, '[^/]');
 
     regex = new RegExp(`^${regexPattern}$`, 'i');
     globPatternCache.set(pattern, regex);
@@ -91,32 +261,190 @@ function matchGlob(filename: string, pattern: string): boolean {
   return regex.test(normalizedFilename);
 }
 
-async function searchInFile(filePath: string, query: string, caseSensitive: boolean): Promise<Array<{ line: number; content: string }>> {
+interface SearchResult {
+  matches: Array<{ line: number; content: string; context?: { before: string[]; after: string[] } }>;
+  error?: string;
+  matchCount?: number;
+  skipped?: boolean;
+  skipReason?: string;
+}
+
+interface SearchOptions {
+  caseSensitive: boolean;
+  isRegex: boolean;
+  wholeWord: boolean;
+  multiline: boolean;
+  contextBefore: number;
+  contextAfter: number;
+  maxFileSize: number;
+  invertMatch: boolean;
+}
+
+const DEFAULT_MAX_FILE_SIZE = 1024 * 1024;
+
+function isBinaryFile(buffer: Buffer, bytesToCheck = 8000): boolean {
+  const checkLength = Math.min(buffer.length, bytesToCheck);
+  let nullCount = 0;
+  let controlCount = 0;
+
+  for (let i = 0; i < checkLength; i++) {
+    const byte = buffer[i];
+    if (byte === 0) {
+      nullCount++;
+      if (nullCount > 1) return true;
+    }
+    if (byte !== undefined && byte < 32 && byte !== 9 && byte !== 10 && byte !== 13) {
+      controlCount++;
+      if (controlCount > checkLength * 0.1) return true;
+    }
+  }
+
+  return false;
+}
+
+function escapeRegexForLiteral(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function buildSearchRegex(query: string, options: SearchOptions): { regex: RegExp; error?: undefined } | { regex?: undefined; error: string } {
+  try {
+    let pattern = query;
+
+    if (!options.isRegex) {
+      pattern = escapeRegexForLiteral(query);
+    }
+
+    if (options.wholeWord) {
+      if (options.isRegex) {
+        pattern = `(?:^|\\b)${pattern}(?:\\b|$)`;
+      } else {
+        pattern = `\\b${pattern}\\b`;
+      }
+    }
+
+    let flags = 'g';
+    if (!options.caseSensitive) flags += 'i';
+    if (options.multiline) flags += 'm';
+
+    return { regex: new RegExp(pattern, flags) };
+  } catch (e) {
+    return { error: e instanceof Error ? e.message : 'Invalid pattern' };
+  }
+}
+
+async function searchInFile(filePath: string, query: string, options: SearchOptions): Promise<SearchResult> {
   try {
-    const content = await readFile(filePath, 'utf-8');
-    const searchQuery = caseSensitive ? query : query.toLowerCase();
-    const matches: Array<{ line: number; content: string }> = [];
+    const stats = await stat(filePath);
+
+    if (stats.size > options.maxFileSize) {
+      return {
+        matches: [],
+        skipped: true,
+        skipReason: `File too large (${Math.round(stats.size / 1024)}KB > ${Math.round(options.maxFileSize / 1024)}KB)`
+      };
+    }
+
+    const buffer = await readFile(filePath);
+
+    if (isBinaryFile(buffer)) {
+      return {
+        matches: [],
+        skipped: true,
+        skipReason: 'Binary file'
+      };
+    }
+
+    const content = buffer.toString('utf-8');
+    const lines = content.split('\n');
 
-    let lineNumber = 1;
-    let lineStart = 0;
+    const regexResult = buildSearchRegex(query, options);
+    if (regexResult.error || !regexResult.regex) {
+      return { matches: [], error: regexResult.error ?? 'Failed to build search pattern' };
+    }
+    const regex: RegExp = regexResult.regex;
+
+    if (options.invertMatch) {
+      const hasMatch = lines.some(line => regex.test(line));
+      return {
+        matches: [],
+        matchCount: hasMatch ? 0 : 1,
+      };
+    }
 
-    for (let i = 0; i <= content.length; i++) {
-      if (i === content.length || content[i] === '\n') {
-        const rawLine = content.slice(lineStart, i);
-        const lineContent = caseSensitive ? rawLine : rawLine.toLowerCase();
+    if (options.multiline && options.isRegex) {
+      const multilineMatches: Array<{ line: number; content: string }> = [];
+      let match;
+      regex.lastIndex = 0;
 
-        if (lineContent.includes(searchQuery)) {
-          matches.push({ line: lineNumber, content: rawLine });
+      while ((match = regex.exec(content)) !== null) {
+        const matchStart = match.index;
+        let lineNumber = 1;
+        for (let i = 0; i < matchStart; i++) {
+          if (content[i] === '\n') lineNumber++;
         }
 
-        lineNumber++;
-        lineStart = i + 1;
+        const matchedText = match[0];
+        const matchLines = matchedText.split('\n');
+
+        multilineMatches.push({
+          line: lineNumber,
+          content: matchLines.length > 1
+            ? `${matchLines[0]}... (+${matchLines.length - 1} lines)`
+            : matchedText.slice(0, 200)
+        });
+
+        if (regex.lastIndex === match.index) {
+          regex.lastIndex++;
+        }
       }
+
+      return { matches: multilineMatches, matchCount: multilineMatches.length };
     }
 
-    return matches;
-  } catch {
-    return [];
+    const matches: Array<{ line: number; content: string; context?: { before: string[]; after: string[] } }> = [];
+    let matchCount = 0;
+
+    for (let i = 0; i < lines.length; i++) {
+      const line = lines[i];
+      if (line === undefined) continue;
+
+      regex.lastIndex = 0;
+      if (regex.test(line)) {
+        matchCount++;
+
+        const contextBefore: string[] = [];
+        const contextAfter: string[] = [];
+
+        if (options.contextBefore > 0) {
+          for (let j = Math.max(0, i - options.contextBefore); j < i; j++) {
+            const ctxLine = lines[j];
+            if (ctxLine !== undefined) contextBefore.push(ctxLine);
+          }
+        }
+
+        if (options.contextAfter > 0) {
+          for (let j = i + 1; j <= Math.min(lines.length - 1, i + options.contextAfter); j++) {
+            const ctxLine = lines[j];
+            if (ctxLine !== undefined) contextAfter.push(ctxLine);
+          }
+        }
+
+        const hasContext = contextBefore.length > 0 || contextAfter.length > 0;
+
+        matches.push({
+          line: i + 1,
+          content: line,
+          ...(hasContext && { context: { before: contextBefore, after: contextAfter } })
+        });
+      }
+    }
+
+    return { matches, matchCount };
+  } catch (error) {
+    return {
+      matches: [],
+      error: error instanceof Error ? error.message : 'Unknown error'
+    };
   }
 }
 
@@ -126,12 +454,18 @@ interface WalkResult {
   excluded?: boolean;
 }
 
-async function walkDirectory(dir: string, filePattern?: string, includeHidden = false): Promise<WalkResult[]> {
+interface WalkOutput {
+  results: WalkResult[];
+  errors: string[];
+}
+
+async function walkDirectory(dir: string, filePattern?: string, includeHidden = false): Promise<WalkOutput> {
   const results: WalkResult[] = [];
+  const errors: string[] = [];
 
   try {
     const entries = await readdir(dir, { withFileTypes: true });
-    const subDirPromises: Promise<WalkResult[]>[] = [];
+    const subDirPromises: Promise<WalkOutput>[] = [];
 
     for (const entry of entries) {
       if (!includeHidden && entry.name.startsWith('.')) continue;
@@ -152,27 +486,31 @@ async function walkDirectory(dir: string, filePattern?: string, includeHidden =
     }
 
     if (subDirPromises.length > 0) {
-      const subResults = await Promise.all(subDirPromises);
-      for (const subResult of subResults) {
-        results.push(...subResult);
+      const subOutputs = await Promise.all(subDirPromises);
+      for (const sub of subOutputs) {
+        results.push(...sub.results);
+        errors.push(...sub.errors);
       }
     }
-  } catch {
-    return results;
+  } catch (e) {
+    errors.push(`${dir}: ${e instanceof Error ? e.message : String(e)}`);
   }
 
-  return results;
+  return { results, errors };
 }
 
-async function listFilesRecursive(dirPath: string, workspace: string, filterPattern?: string, includeHidden = false): Promise<WalkResult[]> {
+async function listFilesRecursive(dirPath: string, workspace: string, filterPattern?: string, includeHidden = false): Promise<WalkOutput> {
   const fullPath = resolve(workspace, dirPath);
-  const files = await walkDirectory(fullPath, filterPattern, includeHidden);
+  const { results, errors } = await walkDirectory(fullPath, filterPattern, includeHidden);
   const separator = workspace.endsWith(sep) ? '' : sep;
 
-  return files.map(file => ({
-    ...file,
-    path: file.path.replace(workspace + separator, '')
-  }));
+  return {
+    results: results.map(file => ({
+      ...file,
+      path: file.path.replace(workspace + separator, '')
+    })),
+    errors,
+  };
 }
 
 async function findFilesByPattern(pattern: string, searchPath: string): Promise<string[]> {
@@ -181,7 +519,7 @@ async function findFilesByPattern(pattern: string, searchPath: string): Promise<
   const hasDoubleStar = pattern.includes('**');
 
   if (hasDoubleStar) {
-    const files = await walkDirectory(searchPath, undefined, false);
+    const { results: files } = await walkDirectory(searchPath, undefined, false);
     const separator = searchPath.endsWith(sep) ? '' : sep;
     const root = searchPath + separator;
 
@@ -380,9 +718,11 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
     switch (toolName) {
       case 'read': {
         const path = args.path as string;
+        const startLine = args.start_line as number | undefined;
+        const endLine = args.end_line as number | undefined;
         const fullPath = resolve(workspace, path);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
@@ -390,6 +730,26 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         }
 
         const content = await readFile(fullPath, 'utf-8');
+
+        if (startLine !== undefined || endLine !== undefined) {
+          const lines = content.split('\n');
+          const start = (startLine ?? 1) - 1;
+          const end = endLine ?? lines.length;
+
+          if (start < 0 || start >= lines.length) {
+            return {
+              success: false,
+              error: `Start line ${startLine} is out of bounds (1-${lines.length})`
+            };
+          }
+
+          const selectedLines = lines.slice(start, end);
+          return {
+            success: true,
+            result: selectedLines.join('\n')
+          };
+        }
+
         return {
           success: true,
           result: content
@@ -398,19 +758,18 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
 
       case 'write': {
         const path = args.path as string;
-        const content = typeof args.content === 'string' ? args.content : '';
+        let content = typeof args.content === 'string' ? args.content : '';
+        if (content) content = content.trimEnd();
         const append = args.append === true;
         const fullPath = resolve(workspace, path);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
           };
         }
 
-        captureFileSnapshot(path);
-
         await mkdir(dirname(fullPath), { recursive: true });
 
         let oldContent = '';
@@ -455,7 +814,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         const includeHidden = args.include_hidden === null ? undefined : (args.include_hidden as boolean | undefined);
         const fullPath = resolve(workspace, path);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
@@ -463,7 +822,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         }
 
         if (recursive) {
-          const files = await listFilesRecursive(path, workspace, filter, includeHidden);
+          const { results: files, errors: walkErrors } = await listFilesRecursive(path, workspace, filter, includeHidden);
           const fileStats = await Promise.all(
             files.map(async (file) => {
               if (file.excluded) {
@@ -474,17 +833,29 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
                 };
               }
               const filePath = resolve(workspace, file.path);
-              const stats = await stat(filePath);
-              return {
-                path: file.path,
-                type: stats.isDirectory() ? 'directory' : 'file',
-                size: stats.size,
-              };
+              try {
+                const stats = await stat(filePath);
+                return {
+                  path: file.path,
+                  type: stats.isDirectory() ? 'directory' : 'file',
+                  size: stats.size,
+                };
+              } catch {
+                return {
+                  path: file.path,
+                  type: 'unknown',
+                  error: 'access denied',
+                };
+              }
             })
           );
+          const output: Record<string, unknown> = { files: fileStats };
+          if (walkErrors.length > 0) {
+            output.errors = walkErrors.slice(0, 10);
+          }
           return {
             success: true,
-            result: JSON.stringify(fileStats, null, 2)
+            result: JSON.stringify(output, null, 2)
           };
         } else {
           const entries = await readdir(fullPath, { withFileTypes: true });
@@ -495,7 +866,11 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
           }
 
           if (filter) {
-            const regex = new RegExp(filter.replace(/\*/g, '.*').replace(/\?/g, '.'));
+            const escapedFilter = filter
+              .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+              .replace(/\*/g, '.*')
+              .replace(/\?/g, '.');
+            const regex = new RegExp(`^${escapedFilter}$`, 'i');
             filteredEntries = filteredEntries.filter(entry => regex.test(entry.name));
           }
 
@@ -544,7 +919,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
               : `Command timed out after ${timeout}ms and produced no output.\n\n[Process may be running in background]`;
 
             return {
-              success: true,
+              success: false,
               result: output
             };
           }
@@ -556,7 +931,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
             : `Command failed: ${errorMessage}`;
 
           return {
-            success: true,
+            success: false,
             result: fullOutput
           };
         }
@@ -567,7 +942,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         const searchPath = (args.path === null ? undefined : (args.path as string | undefined)) || '.';
         const fullPath = resolve(workspace, searchPath);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
@@ -583,72 +958,227 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
       }
 
       case 'grep': {
-        const pattern = args.pattern as string;
+        const { FILE_TYPE_EXTENSIONS } = await import('./grep.ts');
+
+        const pattern = args.pattern === null ? undefined : (args.pattern as string | undefined);
+        const fileType = args.file_type === null ? undefined : (args.file_type as string | undefined);
         const query = args.query as string;
         const searchPath = (args.path === null ? undefined : (args.path as string | undefined)) || '.';
         const caseSensitive = ((args.case_sensitive === null ? undefined : (args.case_sensitive as boolean | undefined)) ?? false);
-        const maxResults = ((args.max_results === null ? undefined : (args.max_results as number | undefined)) ?? 100);
+        const isRegex = ((args.regex === null ? undefined : (args.regex as boolean | undefined)) ?? false);
+        const wholeWord = ((args.whole_word === null ? undefined : (args.whole_word as boolean | undefined)) ?? false);
+        const multiline = ((args.multiline === null ? undefined : (args.multiline as boolean | undefined)) ?? false);
+        const context = ((args.context === null ? undefined : (args.context as number | undefined)) ?? 0);
+        const contextBefore = ((args.context_before === null ? undefined : (args.context_before as number | undefined)) ?? context);
+        const contextAfter = ((args.context_after === null ? undefined : (args.context_after as number | undefined)) ?? context);
+        const maxResults = ((args.max_results === null ? undefined : (args.max_results as number | undefined)) ?? 500);
+        const maxFileSize = ((args.max_file_size === null ? undefined : (args.max_file_size as number | undefined)) ?? DEFAULT_MAX_FILE_SIZE);
+        const includeHidden = ((args.include_hidden === null ? undefined : (args.include_hidden as boolean | undefined)) ?? false);
+        const excludePattern = args.exclude_pattern === null ? undefined : (args.exclude_pattern as string | undefined);
+        const outputMode = ((args.output_mode === null ? undefined : (args.output_mode as string | undefined)) ?? 'matches') as 'matches' | 'files' | 'count';
+        const invertMatch = ((args.invert_match === null ? undefined : (args.invert_match as boolean | undefined)) ?? false);
+
         const fullPath = resolve(workspace, searchPath);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
           };
         }
 
-        const files = await findFilesByPattern(pattern, fullPath);
+        const testSearchOptions: SearchOptions = {
+          caseSensitive,
+          isRegex,
+          wholeWord,
+          multiline,
+          contextBefore: 0,
+          contextAfter: 0,
+          maxFileSize: DEFAULT_MAX_FILE_SIZE,
+          invertMatch: false,
+        };
+        const regexTest = buildSearchRegex(query, testSearchOptions);
+        if (regexTest.error) {
+          return {
+            success: false,
+            error: `Invalid search pattern: ${regexTest.error}`
+          };
+        }
+
+        const normalizedFileType = typeof fileType === 'string' ? fileType.trim().toLowerCase() : undefined;
+        const fileTypeParts = normalizedFileType
+          ? normalizedFileType.split(',').map(p => p.trim()).filter(Boolean)
+          : [];
+        const resolvedExtensions = fileTypeParts.length > 0
+          ? Array.from(new Set(fileTypeParts.flatMap((part) => {
+            const mapped = FILE_TYPE_EXTENSIONS[part];
+            if (mapped && mapped.length > 0) return mapped;
+            if (part.startsWith('.')) return [part];
+            return [`.${part}`];
+          })))
+          : undefined;
+
+        let finalPattern: string;
+        if (pattern) {
+          finalPattern = pattern.includes('**') ? pattern : `**/${pattern}`;
+        } else if (resolvedExtensions && resolvedExtensions.length === 1) {
+          finalPattern = `**/*${resolvedExtensions[0]}`;
+        } else {
+          finalPattern = '**/*';
+        }
+
+        let allFiles = await findFilesByPattern(finalPattern, fullPath);
+
+        if (!includeHidden) {
+          allFiles = allFiles.filter(f => !f.split('/').some(part => part.startsWith('.')));
+        }
+
+        if (resolvedExtensions && !pattern) {
+          allFiles = allFiles.filter(f => resolvedExtensions.some(ext => f.toLowerCase().endsWith(ext)));
+        }
 
-        const results: Array<{ file: string; matches: Array<{ line: number; content: string }> }> = [];
+        if (excludePattern) {
+          allFiles = allFiles.filter(f => !matchGlob(f, excludePattern));
+        }
+
+        const searchOptions: SearchOptions = {
+          caseSensitive,
+          isRegex,
+          wholeWord,
+          multiline,
+          contextBefore,
+          contextAfter,
+          maxFileSize,
+          invertMatch,
+        };
+
+        type MatchType = { line: number; content: string; context?: { before: string[]; after: string[] } };
+        const results: Array<{ file: string; matches: MatchType[]; count?: number }> = [];
+        const skippedFiles: Array<{ file: string; reason: string }> = [];
         let totalResults = 0;
+        let totalMatchCount = 0;
 
-        const BATCH_SIZE = 10;
-        for (let i = 0; i < files.length; i += BATCH_SIZE) {
-          if (totalResults >= maxResults) break;
+        const BATCH_SIZE = 15;
+        for (let i = 0; i < allFiles.length; i += BATCH_SIZE) {
+          if (!invertMatch && totalResults >= maxResults) break;
 
-          const batch = files.slice(i, i + BATCH_SIZE);
+          const batch = allFiles.slice(i, i + BATCH_SIZE);
           const batchResults = await Promise.all(
             batch.map(async (file) => {
               const filePath = resolve(fullPath, file);
-              const matches = await searchInFile(filePath, query, caseSensitive);
-              return { file: join(searchPath, file), matches };
+              const searchResult = await searchInFile(filePath, query, searchOptions);
+              return {
+                file: join(searchPath, file),
+                matches: searchResult.matches,
+                matchCount: searchResult.matchCount ?? searchResult.matches.length,
+                skipped: searchResult.skipped,
+                skipReason: searchResult.skipReason,
+              };
             })
           );
 
-          for (const { file, matches } of batchResults) {
-            if (totalResults >= maxResults) break;
-            if (matches.length > 0) {
-              results.push({
-                file,
-                matches: matches.slice(0, maxResults - totalResults)
-              });
-              totalResults += matches.length;
+          for (const { file, matches, matchCount, skipped, skipReason } of batchResults) {
+            if (skipped && skipReason) {
+              skippedFiles.push({ file, reason: skipReason });
+              continue;
+            }
+
+            if (invertMatch) {
+              if (matchCount === 1) {
+                results.push({ file, matches: [], count: 1 });
+                totalResults++;
+              }
+              continue;
+            }
+
+            if (matches.length > 0 || matchCount > 0) {
+              totalMatchCount += matchCount;
+
+              if (outputMode === 'files') {
+                results.push({ file, matches: [] });
+                totalResults++;
+              } else if (outputMode === 'count') {
+                results.push({ file, matches: [], count: matchCount });
+                totalResults++;
+              } else {
+                const remainingSlots = maxResults - totalResults;
+                const matchesToInclude = matches.slice(0, remainingSlots);
+                results.push({ file, matches: matchesToInclude, count: matchCount });
+                totalResults += matchesToInclude.length;
+              }
             }
           }
         }
 
+        let formattedResult: string;
+
+        const skippedDetails = skippedFiles.length > 0
+          ? skippedFiles.slice(0, 5).map(s => ({ file: s.file, reason: s.reason }))
+          : undefined;
+
+        if (outputMode === 'files') {
+          const filesOnly = results.map(r => r.file);
+          const summary = {
+            files_found: filesOnly.length,
+            files: filesOnly,
+            ...(skippedFiles.length > 0 && { skipped: skippedFiles.length, skipped_details: skippedDetails })
+          };
+          formattedResult = JSON.stringify(summary, null, 2);
+        } else if (outputMode === 'count') {
+          const counts = results.map(r => ({ file: r.file, count: r.count ?? 0 }));
+          const summary = {
+            total_matches: totalMatchCount,
+            files_with_matches: counts.length,
+            counts,
+            ...(skippedFiles.length > 0 && { skipped: skippedFiles.length, skipped_details: skippedDetails })
+          };
+          formattedResult = JSON.stringify(summary, null, 2);
+        } else {
+          const summary = {
+            total_matches: totalMatchCount,
+            files_searched: allFiles.length,
+            files_with_matches: results.length,
+            ...(skippedFiles.length > 0 && { skipped_files: skippedFiles.length, skipped_details: skippedDetails }),
+            ...(totalResults >= maxResults && { truncated: true, max_results: maxResults }),
+            results: results.map(r => ({
+              file: r.file,
+              match_count: r.count ?? r.matches.length,
+              matches: r.matches.map(m => {
+                if (m.context && (m.context.before.length > 0 || m.context.after.length > 0)) {
+                  return {
+                    line: m.line,
+                    content: m.content,
+                    context: m.context
+                  };
+                }
+                return { line: m.line, content: m.content };
+              })
+            }))
+          };
+          formattedResult = JSON.stringify(summary, null, 2);
+        }
+
         return {
           success: true,
-          result: JSON.stringify(results, null, 2)
+          result: formattedResult
         };
       }
 
       case 'edit': {
         const path = args.path as string;
         const oldContent = args.old_content as string;
-        const newContent = args.new_content as string;
+        let newContent = args.new_content as string;
+        if (newContent) newContent = newContent.trimEnd();
         const occurrence = ((args.occurrence === null ? undefined : (args.occurrence as number | undefined)) ?? 1);
         const fullPath = resolve(workspace, path);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
           };
         }
 
-        captureFileSnapshot(path);
-
         await mkdir(dirname(fullPath), { recursive: true });
 
         let content = '';
@@ -720,7 +1250,7 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         }
         const fullPath = resolve(workspace, path);
 
-        if (!validatePath(fullPath, workspace)) {
+        if (!await validatePath(fullPath, workspace)) {
           return {
             success: false,
             error: 'Access denied: path is outside workspace'
@@ -735,6 +1265,95 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
         };
       }
 
+      case 'fetch': {
+        const url = args.url as string;
+        const maxLength = (args.max_length as number | undefined) ?? DEFAULT_FETCH_MAX_LENGTH;
+        const startIndex = (args.start_index as number | undefined) ?? 0;
+        const raw = (args.raw as boolean | undefined) ?? false;
+        const timeout = (args.timeout as number | undefined) ?? DEFAULT_FETCH_TIMEOUT;
+
+        try {
+          new URL(url);
+        } catch {
+          return {
+            success: false,
+            error: `Invalid URL: ${url}`,
+          };
+        }
+
+        try {
+          let fetchResult = await fetchUrlContent(url, { raw, timeout });
+          let { content, contentType, title, isSPA, status, statusText } = fetchResult;
+
+          if (isSPA && !raw) {
+            const rawResult = await fetchUrlContent(url, { raw: true, timeout });
+            content = rawResult.content;
+            contentType = rawResult.contentType;
+            title = rawResult.title;
+            status = rawResult.status;
+            statusText = rawResult.statusText;
+            isSPA = false;
+          }
+
+          const totalLength = content.length;
+
+          if (startIndex >= totalLength) {
+            return {
+              success: false,
+              error: `Start index ${startIndex} exceeds content length ${totalLength}`,
+            };
+          }
+
+          const extractedContent = content.slice(startIndex, startIndex + maxLength);
+          const truncated = startIndex + maxLength < totalLength;
+          const nextStartIndex = truncated ? startIndex + maxLength : undefined;
+
+          const parts: string[] = [];
+
+          if (title) {
+            parts.push(`# ${title}\n`);
+          }
+
+          parts.push(`**URL:** ${url}`);
+          parts.push(`**Status:** ${status} ${statusText}`);
+          parts.push(`**Content-Type:** ${contentType}`);
+          parts.push(`**Length:** ${extractedContent.length} / ${totalLength} characters`);
+
+          if (fetchResult.isSPA) {
+            parts.push(`**Note:** SPA detected (React/Vue/Angular). Showing raw HTML source.`);
+          }
+
+          if (truncated && nextStartIndex !== undefined) {
+            parts.push(`**Status:** Content truncated. Use start_index=${nextStartIndex} to continue reading.`);
+          }
+
+          parts.push('\n---\n');
+          parts.push(extractedContent);
+
+          if (truncated && nextStartIndex !== undefined) {
+            parts.push(`\n\n---\n*Content truncated at ${extractedContent.length} characters. Call fetch again with start_index=${nextStartIndex} to continue reading.*`);
+          }
+
+          return {
+            success: true,
+            result: parts.join('\n'),
+          };
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+
+          if (message.includes('abort')) {
+            return {
+              success: false,
+              error: `Request timed out after ${timeout}ms`,
+            };
+          }
+
+          return {
+            success: false,
+            error: `Failed to fetch ${url}: ${message}`,
+          };
+        }
+      }
 
       default:
         return {
@@ -748,4 +1367,4 @@ DO NOT continue without using the question tool. DO NOT ask in plain text.`;
       error: error instanceof Error ? error.message : 'Unknown error occurred'
     };
   }
-}
+}