fix: web search and fetch

bun.lock

@@ -45,7 +45,6 @@
         "ajv": "^8.18.0",
         "asciichart": "^1.5.25",
         "auto-bind": "^5.0.1",
-        "axios": "^1.14.0",
         "bidi-js": "^1.0.3",
         "cacache": "^20.0.4",
         "chalk": "^5.6.2",
@@ -514,12 +513,8 @@
 
     "asciichart": ["asciichart@1.5.25", "", {}, "sha512-PNxzXIPPOtWq8T7bgzBtk9cI2lgS4SJZthUHEiQ1aoIc3lNzGfUvIvo9LiAnq26TACo9t1/4qP6KTGAUbzX9Xg=="],
 
-    "asynckit": ["asynckit@0.4.0", "", {}, "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="],
-
     "auto-bind": ["auto-bind@5.0.1", "", {}, "sha512-ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg=="],
 
-    "axios": ["axios@1.14.0", "", { "dependencies": { "follow-redirects": "^1.15.11", "form-data": "^4.0.5", "proxy-from-env": "^2.1.0" } }, "sha512-3Y8yrqLSwjuzpXuZ0oIYZ/XGgLwUIBU3uLvbcpb0pidD9ctpShJd43KSlEEkVQg6DS0G9NKyzOvBfUtDKEyHvQ=="],
-
     "balanced-match": ["balanced-match@4.0.4", "", {}, "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA=="],
 
     "base64-js": ["base64-js@1.5.1", "", {}, "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="],
@@ -574,8 +569,6 @@
 
     "color-name": ["color-name@1.1.4", "", {}, "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="],
 
-    "combined-stream": ["combined-stream@1.0.8", "", { "dependencies": { "delayed-stream": "~1.0.0" } }, "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="],
-
     "commander": ["commander@13.1.0", "", {}, "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw=="],
 
     "content-disposition": ["content-disposition@1.0.1", "", {}, "sha512-oIXISMynqSqm241k6kcQ5UwttDILMK4BiurCfGEREw6+X9jkkpEe5T9FZaApyLGGOnFuyMWZpdolTXMtvEJ08Q=="],
@@ -606,8 +599,6 @@
 
     "define-lazy-prop": ["define-lazy-prop@3.0.0", "", {}, "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg=="],
 
-    "delayed-stream": ["delayed-stream@1.0.0", "", {}, "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="],
-
     "depd": ["depd@2.0.0", "", {}, "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="],
 
     "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="],
@@ -638,8 +629,6 @@
 
     "es-object-atoms": ["es-object-atoms@1.1.1", "", { "dependencies": { "es-errors": "^1.3.0" } }, "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA=="],
 
-    "es-set-tostringtag": ["es-set-tostringtag@2.1.0", "", { "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", "hasown": "^2.0.2" } }, "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA=="],
-
     "es-toolkit": ["es-toolkit@1.45.1", "", {}, "sha512-/jhoOj/Fx+A+IIyDNOvO3TItGmlMKhtX8ISAHKE90c4b/k1tqaqEZ+uUqfpU8DMnW5cgNJv606zS55jGvza0Xw=="],
 
     "escalade": ["escalade@3.2.0", "", {}, "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA=="],
@@ -684,10 +673,6 @@
 
     "flora-colossus": ["flora-colossus@2.0.0", "", { "dependencies": { "debug": "^4.3.4", "fs-extra": "^10.1.0" } }, "sha512-dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA=="],
 
-    "follow-redirects": ["follow-redirects@1.15.11", "", {}, "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ=="],
-
-    "form-data": ["form-data@4.0.5", "", { "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", "es-set-tostringtag": "^2.1.0", "hasown": "^2.0.2", "mime-types": "^2.1.12" } }, "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w=="],
-
     "formdata-polyfill": ["formdata-polyfill@4.0.10", "", { "dependencies": { "fetch-blob": "^3.1.2" } }, "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g=="],
 
     "forwarded": ["forwarded@0.2.0", "", {}, "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="],
@@ -734,8 +719,6 @@
 
     "has-symbols": ["has-symbols@1.1.0", "", {}, "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ=="],
 
-    "has-tostringtag": ["has-tostringtag@1.0.2", "", { "dependencies": { "has-symbols": "^1.0.3" } }, "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw=="],
-
     "hasown": ["hasown@2.0.2", "", { "dependencies": { "function-bind": "^1.1.2" } }, "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ=="],
 
     "highlight.js": ["highlight.js@11.11.1", "", {}, "sha512-Xwwo44whKBVCYoliBQwaPvtd/2tYFkRQtXDWj1nackaV2JPXx3L0+Jvd8/qCJ2p+ML0/XVkJ2q+Mr+UVdpJK5w=="],
@@ -932,8 +915,6 @@
 
     "proxy-addr": ["proxy-addr@2.0.7", "", { "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" } }, "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="],
 
-    "proxy-from-env": ["proxy-from-env@2.1.0", "", {}, "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA=="],
-
     "qrcode": ["qrcode@1.5.4", "", { "dependencies": { "dijkstrajs": "^1.0.1", "pngjs": "^5.0.0", "yargs": "^15.3.1" }, "bin": { "qrcode": "bin/qrcode" } }, "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg=="],
 
     "qs": ["qs@6.15.0", "", { "dependencies": { "side-channel": "^1.1.0" } }, "sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ=="],
@@ -1406,8 +1387,6 @@
 
     "external-editor/iconv-lite": ["iconv-lite@0.4.24", "", { "dependencies": { "safer-buffer": ">= 2.1.2 < 3" } }, "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="],
 
-    "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
-
     "gaxios/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],
 
     "gtoken/gaxios": ["gaxios@6.7.1", "", { "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", "is-stream": "^2.0.0", "node-fetch": "^2.6.9", "uuid": "^9.0.1" } }, "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ=="],
@@ -1556,8 +1535,6 @@
 
     "cliui/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
 
-    "form-data/mime-types/mime-db": ["mime-db@1.52.0", "", {}, "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="],
-
     "gaxios/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
 
     "gtoken/gaxios/https-proxy-agent": ["https-proxy-agent@7.0.6", "", { "dependencies": { "agent-base": "^7.1.2", "debug": "4" } }, "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw=="],

package.json

@@ -60,7 +60,6 @@
     "ajv": "^8.18.0",
     "asciichart": "^1.5.25",
     "auto-bind": "^5.0.1",
-    "axios": "^1.14.0",
     "bidi-js": "^1.0.3",
     "cacache": "^20.0.4",
     "chalk": "^5.6.2",

src/tools/WebFetchTool/utils.ts

@@ -1,4 +1,3 @@
-import axios, { type AxiosResponse } from 'axios'
 import { LRUCache } from 'lru-cache'
 import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
@@ -47,6 +46,28 @@ class EgressBlockedError extends Error {
   }
 }
 
+/**
+ * Fetch with timeout support using AbortSignal
+ */
+async function fetchWithTimeout(
+  url: string,
+  options: RequestInit & { timeout?: number } = {},
+): Promise<Response> {
+  const { timeout = 30000, ...fetchOptions } = options
+  const controller = new AbortController()
+  const timeoutId = setTimeout(() => controller.abort(), timeout)
+  
+  try {
+    const response = await fetch(url, {
+      ...fetchOptions,
+      signal: controller.signal,
+    })
+    return response
+  } finally {
+    clearTimeout(timeoutId)
+  }
+}
+
 // Cache for storing fetched URL content
 type CacheEntry = {
   bytes: number
@@ -180,12 +201,13 @@ export async function checkDomainBlocklist(
     return { status: 'allowed' }
   }
   try {
-    const response = await axios.get(
+    const response = await fetchWithTimeout(
       `https://api.anthropic.com/api/web/domain_info?domain=${encodeURIComponent(domain)}`,
       { timeout: DOMAIN_CHECK_TIMEOUT_MS },
     )
     if (response.status === 200) {
-      if (response.data.can_fetch === true) {
+      const data = await response.json()
+      if (data.can_fetch === true) {
         DOMAIN_CHECK_CACHE.set(domain, true)
         return { status: 'allowed' }
       }
@@ -264,29 +286,24 @@ export async function getWithPermittedRedirects(
   signal: AbortSignal,
   redirectChecker: (originalUrl: string, redirectUrl: string) => boolean,
   depth = 0,
-): Promise<AxiosResponse<ArrayBuffer> | RedirectInfo> {
+): Promise<Response | RedirectInfo> {
   if (depth > MAX_REDIRECTS) {
     throw new Error(`Too many redirects (exceeded ${MAX_REDIRECTS})`)
   }
   try {
-    return await axios.get(url, {
+    const response = await fetchWithTimeout(url, {
       signal,
       timeout: FETCH_TIMEOUT_MS,
-      maxRedirects: 0,
-      responseType: 'arraybuffer',
-      maxContentLength: MAX_HTTP_CONTENT_LENGTH,
+      redirect: 'manual', // Handle redirects manually
       headers: {
         Accept: 'text/markdown, text/html, */*',
         'User-Agent': getWebFetchUserAgent(),
       },
     })
-  } catch (error) {
-    if (
-      axios.isAxiosError(error) &&
-      error.response &&
-      [301, 302, 307, 308].includes(error.response.status)
-    ) {
-      const redirectLocation = error.response.headers.location
+
+    // Check for redirect status codes
+    if ([301, 302, 307, 308].includes(response.status)) {
+      const redirectLocation = response.headers.get('location')
       if (!redirectLocation) {
         throw new Error('Redirect missing Location header')
       }
@@ -308,28 +325,35 @@ export async function getWithPermittedRedirects(
           type: 'redirect',
           originalUrl: url,
           redirectUrl,
-          statusCode: error.response.status,
+          statusCode: response.status,
         }
       }
     }
 
-    // Detect egress proxy blocks: the proxy returns 403 with
-    // X-Proxy-Error: blocked-by-allowlist when egress is restricted
-    if (
-      axios.isAxiosError(error) &&
-      error.response?.status === 403 &&
-      error.response.headers['x-proxy-error'] === 'blocked-by-allowlist'
-    ) {
+    // Check for egress proxy blocks
+    if (response.status === 403 && response.headers.get('x-proxy-error') === 'blocked-by-allowlist') {
       const hostname = new URL(url).hostname
       throw new EgressBlockedError(hostname)
     }
 
+    return response
+  } catch (error) {
+    // Re-throw custom errors
+    if (error instanceof EgressBlockedError) {
+      throw error
+    }
+    
+    // Handle abort errors
+    if (error instanceof Error && error.name === 'AbortError') {
+      throw new AbortError()
+    }
+
     throw error
   }
 }
 
 function isRedirectInfo(
-  response: AxiosResponse<ArrayBuffer> | RedirectInfo,
+  response: Response | RedirectInfo,
 ): response is RedirectInfo {
   return 'type' in response && response.type === 'redirect'
 }
@@ -425,12 +449,8 @@ export async function getURLMarkdownContent(
     return response
   }
 
-  const rawBuffer = Buffer.from(response.data)
-  // Release the axios-held ArrayBuffer copy; rawBuffer owns the bytes now.
-  // This lets GC reclaim up to MAX_HTTP_CONTENT_LENGTH (10MB) before Turndown
-  // builds its DOM tree (which can be 3-5x the HTML size).
-  ;(response as { data: unknown }).data = null
-  const contentType = response.headers['content-type'] ?? ''
+  const rawBuffer = Buffer.from(await response.arrayBuffer())
+  const contentType = response.headers.get('content-type') ?? ''
 
   // Binary content: save raw bytes to disk with a proper extension so Claude
   // can inspect the file later. We still fall through to the utf-8 decode +

src/tools/WebSearchTool/WebSearchTool.ts

@@ -1,4 +1,4 @@
-import type { PermissionResult } from 'src/utils/permissions/PermissionResult.js'
+import type { PermissionResult } from '../../utils/permissions/PermissionResult.js'
 import { z } from 'zod/v4'
 import { buildTool, type ToolDef } from '../../Tool.js'
 import { lazySchema } from '../../utils/lazySchema.js'
@@ -33,6 +33,7 @@ const searchResultSchema = lazySchema(() => {
   const searchHitSchema = z.object({
     title: z.string().describe('The title of the search result'),
     url: z.string().describe('The URL of the search result'),
+    snippet: z.string().optional().describe('The snippet/description of the search result'),
   })
 
   return z.object({
@@ -64,63 +65,138 @@ export type { WebSearchProgress } from '../../types/tools.js'
 import type { WebSearchProgress } from '../../types/tools.js'
 
 /**
- * Search DuckDuckGo and return results
+ * Search using DuckDuckGo Instant Answer API
  */
-async function searchDuckDuckGo(query: string): Promise<Array<{ title: string; url: string }>> {
-  const url = new URL('https://duckduckgo.com/html/')
+async function searchDuckDuckGoAPI(query: string): Promise<Array<{ title: string; url: string; snippet?: string }>> {
+  const url = new URL('https://api.duckduckgo.com/')
   url.searchParams.set('q', query)
+  url.searchParams.set('format', 'json')
+  url.searchParams.set('no_html', '1')
+  url.searchParams.set('skip_disambig', '0')
 
-  const response = await fetch(url.toString(), {
-    headers: {
-      'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36',
-    },
-  })
+  const response = await fetch(url.toString())
 
   if (!response.ok) {
     throw new Error(`HTTP ${response.status}: ${response.statusText}`)
   }
 
-  const html = await response.text()
-
-  // Parse HTML to extract search results
-  const results: Array<{ title: string; url: string }> = []
-
-  // DuckDuckGo search results are in <a class="result__a"> tags
-  // with title as text content and href as URL
-  const resultRegex = /<a[^>]*class="result__a"[^>]*>(.*?)<\/a>/gi
-  let match: RegExpExecArray | null
-
-  while ((match = resultRegex.exec(html)) !== null && results.length < 10) {
-    const title = match[1]
-      .replace(/<[^>]*>/g, '')  // Remove HTML tags
-      .replace(/&amp;/g, '&')
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .trim()
-
-    // Extract URL from href attribute
-    const hrefMatch = match[0].match(/href="([^"]*)"/)
-    if (hrefMatch) {
-      let url = hrefMatch[1]
-      
-      // DuckDuckGo URLs are often redirects
-      if (url.startsWith('/l/?uddg=')) {
-        const urlMatch = url.match(/uddg=([^&]+)/)
-        if (urlMatch) {
-          url = decodeURIComponent(urlMatch[1])
+  const data = await response.json()
+  const results: Array<{ title: string; url: string; snippet?: string }> = []
+
+  // Add abstract if available
+  if (data.Abstract && data.AbstractURL) {
+    results.push({
+      title: data.Heading || query,
+      url: data.AbstractURL,
+      snippet: data.Abstract,
+    })
+  }
+
+  // Add related topics
+  if (data.RelatedTopics && Array.isArray(data.RelatedTopics)) {
+    for (const topic of data.RelatedTopics) {
+      if (topic.Text && topic.FirstURL) {
+        results.push({
+          title: topic.Text.split(' - ')[0] || 'Related',
+          url: topic.FirstURL,
+          snippet: topic.Text,
+        })
+      }
+      // Handle nested topics
+      if (topic.Topics && Array.isArray(topic.Topics)) {
+        for (const subTopic of topic.Topics) {
+          if (subTopic.Text && subTopic.FirstURL) {
+            results.push({
+              title: subTopic.Text.split(' - ')[0] || 'Related',
+              url: subTopic.FirstURL,
+              snippet: subTopic.Text,
+            })
+          }
         }
       }
+    }
+  }
 
-      if (title && url) {
-        results.push({ title, url })
+  // Add results from Infobox if available
+  if (data.Infobox?.content && Array.isArray(data.Infobox.content)) {
+    for (const item of data.Infobox.content) {
+      if (item.label && item.value && item.url) {
+        results.push({
+          title: item.label,
+          url: item.url,
+          snippet: `${item.label}: ${item.value}`,
+        })
       }
     }
   }
 
+  return results.slice(0, 10)
+}
+
+/**
+ * Search Wikipedia API
+ */
+async function searchWikipedia(query: string): Promise<Array<{ title: string; url: string; snippet?: string }>> {
+  const url = new URL('https://en.wikipedia.org/w/api.php')
+  url.searchParams.set('action', 'query')
+  url.searchParams.set('list', 'search')
+  url.searchParams.set('srsearch', query)
+  url.searchParams.set('format', 'json')
+  url.searchParams.set('srlimit', '10')
+  url.searchParams.set('srprop', 'snippet')
+
+  const response = await fetch(url.toString())
+
+  if (!response.ok) {
+    throw new Error(`HTTP ${response.status}: ${response.statusText}`)
+  }
+
+  const data = await response.json()
+  const results: Array<{ title: string; url: string; snippet?: string }> = []
+
+  if (data.query?.search) {
+    for (const item of data.query.search) {
+      results.push({
+        title: item.title,
+        url: `https://en.wikipedia.org/wiki/${encodeURIComponent(item.title.replace(/ /g, '_'))}`,
+        snippet: item.snippet?.replace(/<\/?span[^>]*>/g, ''),
+      })
+    }
+  }
+
   return results
 }
 
+/**
+ * Combined search using multiple sources
+ */
+async function searchBrave(query: string): Promise<Array<{ title: string; url: string; snippet?: string }>> {
+  const results: Array<{ title: string; url: string; snippet?: string }> = []
+
+  // Try DuckDuckGo Instant Answer API first
+  try {
+    const ddgResults = await searchDuckDuckGoAPI(query)
+    results.push(...ddgResults)
+  } catch (e) {
+    // Continue to next source
+  }
+
+  // Add Wikipedia results
+  try {
+    const wikiResults = await searchWikipedia(query)
+    for (const result of wikiResults) {
+      // Avoid duplicates
+      if (!results.some(r => r.url === result.url)) {
+        results.push(result)
+      }
+    }
+  } catch (e) {
+    // Continue
+  }
+
+  return results.slice(0, 10)
+}
+
 /**
  * Filter search results by domain
  */
@@ -154,7 +230,7 @@ function filterDomains(
   })
 }
 
-export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
+export const WebSearchTool = buildTool<InputSchema, Output, WebSearchProgress>({
   name: WEB_SEARCH_TOOL_NAME,
   description: 'Search the web and return search results with titles, URLs, and snippets.',
   getToolUseSummary,
@@ -179,9 +255,9 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
     return true
   },
   toAutoClassifierInput(input) {
-    return input.query
+    return input?.query ?? ''
   },
-  async checkPermissions(_input): Promise<PermissionResult> {
+  async checkPermissions(_input, _context): Promise<PermissionResult> {
     return {
       behavior: 'passthrough',
       message: 'WebSearchTool requires permission.',
@@ -207,9 +283,16 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
     // string entries in results[] (phantom match). Nothing to search.
     return ''
   },
-  async validateInput(input) {
+  async validateInput(input, _context) {
+    if (!input) {
+      return {
+        result: false,
+        message: 'Error: Missing input',
+        errorCode: 1,
+      }
+    }
     const { query, allowed_domains, blocked_domains } = input
-    if (!query.length) {
+    if (!query?.length) {
       return {
         result: false,
         message: 'Error: Missing query',
@@ -228,6 +311,16 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
   },
   async call(input, context, _canUseTool, _parentMessage, onProgress) {
     const startTime = performance.now()
+    
+    if (!input?.query) {
+      const endTime = performance.now()
+      return {
+        query: '',
+        results: ['Error: Missing query'],
+        durationSeconds: (endTime - startTime) / 1000,
+      }
+    }
+    
     const { query, allowed_domains, blocked_domains } = input
 
     // Progress update: starting search
@@ -239,8 +332,8 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
     }
 
     try {
-      // Call DuckDuckGo search
-      const results = await searchDuckDuckGo(query)
+      // Call Brave Search
+      const results = await searchBrave(query)
 
       // Filter results by domain if specified
       let filteredResults = results
@@ -275,6 +368,7 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
           content: filteredResults.map(r => ({
             title: r.title,
             url: r.url,
+            snippet: r.snippet,
           }))
         })
       }
@@ -301,9 +395,18 @@ export const WebSearchTool = buildTool<InputSchema, Output, WebSearchTool>({
     }
   },
   mapToolResultToToolResultBlockParam(output, toolUseID) {
+    if (!output) {
+      return {
+        tool_use_id: toolUseID,
+        type: 'tool_result',
+        content: 'Error: Missing output',
+      }
+    }
     const { query, results } = output
 
-    let formattedOutput = `Web search results for query: "${query}"\n\n`
+    let formattedOutput = query 
+      ? `Web search results for query: "${query}"\n\n`
+      : 'Web search results:\n\n'
 
     // Process the results array - it can contain both string summaries and search result objects.
     // Guard against null/undefined entries that can appear after JSON round-tripping

src/types/tools.ts

@@ -0,0 +1,41 @@
+export interface WebSearchProgress {
+  type: 'query_update' | 'search_results_received'
+  query?: string
+  resultCount?: number
+}
+
+export interface BashProgress {
+  type: 'bash_progress'
+  output: string
+  fullOutput: string
+  elapsedTimeSeconds?: number
+  totalLines?: number
+}
+
+export interface MCPProgress {
+  type: string
+  [key: string]: unknown
+}
+
+export interface REPLToolProgress {
+  type: string
+  [key: string]: unknown
+}
+
+export interface SkillToolProgress {
+  type: string
+  [key: string]: unknown
+}
+
+export interface TaskOutputProgress {
+  type: string
+  [key: string]: unknown
+}
+
+export type ToolProgressData = 
+  | WebSearchProgress
+  | BashProgress
+  | MCPProgress
+  | REPLToolProgress
+  | SkillToolProgress
+  | TaskOutputProgress