droid-patch 0.10.0 → 0.11.1

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as removeAlias, d as listAllMetadata, f as loadAliasMetadata, i as listAliases, l as createMetadata, m as patchDroid, n as createAlias, o as removeAliasesByFilter, p as saveAliasMetadata, r as createAliasForWrapper, t as clearAllAliases, u as formatPatches } from "./alias-C2Iew8yJ.mjs";
+import { a as removeAlias, d as listAllMetadata, f as loadAliasMetadata, i as listAliases, l as createMetadata, m as patchDroid, n as createAlias, o as removeAliasesByFilter, p as saveAliasMetadata, r as createAliasForWrapper, t as clearAllAliases, u as formatPatches } from "./alias-CX4QSelz.mjs";
 import bin from "tiny-bin";
 import { styleText } from "node:util";
 import { existsSync, readFileSync } from "node:fs";
@@ -9,21 +9,16 @@ import { fileURLToPath } from "node:url";
 import { execSync } from "node:child_process";
 import { chmod, mkdir, writeFile } from "node:fs/promises";
 
-//#region src/websearch-patch.ts
+//#region src/websearch-external.ts
 /**
-* Generate search proxy server code (runs in background)
-* Since BUN_CONFIG_PRELOAD doesn't work with compiled binaries,
-* use a local proxy server to intercept search requests instead
+* WebSearch External Providers Mode (--websearch)
 *
-* Each droid instance runs its own proxy server.
-* The proxy is killed automatically when droid exits.
-* @param factoryApiUrl - Custom Factory API URL (default: https://api.factory.ai)
+* Priority: Smithery Exa > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
 */
-function generateSearchProxyServer(factoryApiUrl = "https://api.factory.ai") {
+function generateSearchProxyServerCode() {
 	return `#!/usr/bin/env node
-// Droid WebSearch Proxy Server
-// Auto-generated by droid-patch --websearch
-// This proxy runs as a child process of droid and is killed when droid exits
+// Droid WebSearch Proxy Server (External Providers Mode)
+// Priority: Smithery Exa > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
 
 const http = require('http');
 const https = require('https');
@@ -31,75 +26,38 @@ const { execSync } = require('child_process');
 const fs = require('fs');
 
 const DEBUG = process.env.DROID_SEARCH_DEBUG === '1';
-const PORT = parseInt(process.env.SEARCH_PROXY_PORT || '0'); // 0 = auto-assign
-const FACTORY_API = '${factoryApiUrl}';
+const PORT = parseInt(process.env.SEARCH_PROXY_PORT || '0');
+const FACTORY_API = 'https://api.factory.ai';
 
-function log(...args) {
-  if (DEBUG) console.error('[websearch]', ...args);
-}
+function log() { if (DEBUG) console.error.apply(console, ['[websearch]'].concat(Array.from(arguments))); }
 
-// === Search Implementation ===
+// === External Search Providers ===
 
-// Smithery Exa MCP - highest priority, requires SMITHERY_API_KEY and SMITHERY_PROFILE
 async function searchSmitheryExa(query, numResults) {
   const apiKey = process.env.SMITHERY_API_KEY;
   const profile = process.env.SMITHERY_PROFILE;
   if (!apiKey || !profile) return null;
-
   try {
-    // Construct URL with authentication
-    const serverUrl = \`https://server.smithery.ai/exa/mcp?api_key=\${encodeURIComponent(apiKey)}&profile=\${encodeURIComponent(profile)}\`;
-    log('Smithery Exa request');
-
-    // Use MCP protocol to call the search tool via HTTP POST
-    const requestBody = JSON.stringify({
-      jsonrpc: '2.0',
-      id: 1,
-      method: 'tools/call',
-      params: {
-        name: 'web_search_exa',
-        arguments: {
-          query: query,
-          numResults: numResults
-        }
-      }
-    });
-
-    const curlCmd = \`curl -s -X POST "\${serverUrl}" -H "Content-Type: application/json" -d '\${requestBody.replace(/'/g, "'\\\\\\\\''")}'\`;
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 30000 });
-    const response = JSON.parse(jsonStr);
-
-    // Parse MCP response
+    const serverUrl = 'https://server.smithery.ai/exa/mcp?api_key=' + encodeURIComponent(apiKey) + '&profile=' + encodeURIComponent(profile);
+    const requestBody = JSON.stringify({ jsonrpc: '2.0', id: 1, method: 'tools/call', params: { name: 'web_search_exa', arguments: { query: query, numResults: numResults } } });
+    const bodyStr = requestBody.replace(/'/g, "'\\\\''");
+    const curlCmd = 'curl -s -X POST "' + serverUrl + '" -H "Content-Type: application/json" -d \\'' + bodyStr + "\\'";
+    const response = JSON.parse(execSync(curlCmd, { encoding: 'utf-8', timeout: 30000 }));
     if (response.result && response.result.content) {
-      // MCP returns content as array of text blocks
-      const textContent = response.result.content.find(c => c.type === 'text');
+      const textContent = response.result.content.find(function(c) { return c.type === 'text'; });
       if (textContent && textContent.text) {
-        try {
-          const searchResults = JSON.parse(textContent.text);
-          if (Array.isArray(searchResults) && searchResults.length > 0) {
-            return searchResults.slice(0, numResults).map(item => ({
-              title: item.title || '',
-              url: item.url || '',
-              content: item.text || item.snippet || item.highlights?.join(' ') || '',
-              publishedDate: item.publishedDate || null,
-              author: item.author || null,
-              score: item.score || null
-            }));
-          }
-        } catch (parseErr) {
-          log('Smithery response parsing failed');
+        const results = JSON.parse(textContent.text);
+        if (Array.isArray(results) && results.length > 0) {
+          return results.slice(0, numResults).map(function(item) {
+            return {
+              title: item.title || '', url: item.url || '',
+              content: item.text || item.snippet || (item.highlights ? item.highlights.join(' ') : '') || ''
+            };
+          });
         }
       }
     }
-
-    if (response.error) {
-      log('Smithery Exa error:', response.error.message || response.error);
-      return null;
-    }
-  } catch (e) {
-    log('Smithery Exa failed:', e.message);
-    return null;
-  }
+  } catch (e) { log('Smithery failed:', e.message); }
   return null;
 }
 
@@ -107,305 +65,392 @@ async function searchGooglePSE(query, numResults) {
   const apiKey = process.env.GOOGLE_PSE_API_KEY;
   const cx = process.env.GOOGLE_PSE_CX;
   if (!apiKey || !cx) return null;
-
   try {
-    const url = \`https://www.googleapis.com/customsearch/v1?key=\${apiKey}&cx=\${cx}&q=\${encodeURIComponent(query)}&num=\${Math.min(numResults, 10)}\`;
-    log('Google PSE request:', url.replace(apiKey, '***'));
-
-    const curlCmd = \`curl -s "\${url}"\`;
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 });
-    const data = JSON.parse(jsonStr);
-
-    if (data.error) {
-      log('Google PSE error:', data.error.message);
-      return null;
-    }
-    return (data.items || []).map(item => ({
-      title: item.title,
-      url: item.link,
-      content: item.snippet || '',
-      publishedDate: null,
-      author: null,
-      score: null
-    }));
-  } catch (e) {
-    log('Google PSE failed:', e.message);
-    return null;
-  }
-}
-
-// SearXNG - self-hosted meta search engine
-async function searchSearXNG(query, numResults) {
-  const searxngUrl = process.env.SEARXNG_URL;
-  if (!searxngUrl) return null;
-
-  try {
-    const url = \`\${searxngUrl}/search?q=\${encodeURIComponent(query)}&format=json&engines=google,bing,duckduckgo\`;
-    log('SearXNG request:', url);
-
-    const curlCmd = \`curl -s "\${url}" -H "Accept: application/json"\`;
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 });
-    const data = JSON.parse(jsonStr);
-
-    if (data.results && data.results.length > 0) {
-      return data.results.slice(0, numResults).map(item => ({
-        title: item.title,
-        url: item.url,
-        content: item.content || '',
-        publishedDate: null,
-        author: null,
-        score: null
-      }));
-    }
-  } catch (e) {
-    log('SearXNG failed:', e.message);
-  }
+    const url = 'https://www.googleapis.com/customsearch/v1?key=' + apiKey + '&cx=' + cx + '&q=' + encodeURIComponent(query) + '&num=' + Math.min(numResults, 10);
+    const data = JSON.parse(execSync('curl -s "' + url + '"', { encoding: 'utf-8', timeout: 15000 }));
+    if (data.error) return null;
+    return (data.items || []).map(function(item) { return { title: item.title, url: item.link, content: item.snippet || '' }; });
+  } catch (e) { log('Google PSE failed:', e.message); }
   return null;
 }
 
-// Serper API - free tier available (2500 queries/month)
 async function searchSerper(query, numResults) {
   const apiKey = process.env.SERPER_API_KEY;
   if (!apiKey) return null;
-
   try {
-    const curlCmd = \`curl -s "https://google.serper.dev/search" -H "X-API-KEY: \${apiKey}" -H "Content-Type: application/json" -d '{"q":"\${query.replace(/"/g, '\\\\"')}","num":\${numResults}}'\`;
-    log('Serper request');
-
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 });
-    const data = JSON.parse(jsonStr);
-
+    const bodyStr = JSON.stringify({ q: query, num: numResults }).replace(/'/g, "'\\\\''");
+    const curlCmd = 'curl -s "https://google.serper.dev/search" -H "X-API-KEY: ' + apiKey + '" -H "Content-Type: application/json" -d \\'' + bodyStr + "\\'";
+    const data = JSON.parse(execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 }));
     if (data.organic && data.organic.length > 0) {
-      return data.organic.slice(0, numResults).map(item => ({
-        title: item.title,
-        url: item.link,
-        content: item.snippet || '',
-        publishedDate: null,
-        author: null,
-        score: null
-      }));
+      return data.organic.slice(0, numResults).map(function(item) { return { title: item.title, url: item.link, content: item.snippet || '' }; });
     }
-  } catch (e) {
-    log('Serper failed:', e.message);
-  }
+  } catch (e) { log('Serper failed:', e.message); }
   return null;
 }
 
-// Brave Search API - free tier available
 async function searchBrave(query, numResults) {
   const apiKey = process.env.BRAVE_API_KEY;
   if (!apiKey) return null;
-
   try {
-    const url = \`https://api.search.brave.com/res/v1/web/search?q=\${encodeURIComponent(query)}&count=\${numResults}\`;
-    const curlCmd = \`curl -s "\${url}" -H "Accept: application/json" -H "X-Subscription-Token: \${apiKey}"\`;
-    log('Brave request');
-
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 });
-    const data = JSON.parse(jsonStr);
-
+    const url = 'https://api.search.brave.com/res/v1/web/search?q=' + encodeURIComponent(query) + '&count=' + numResults;
+    const curlCmd = 'curl -s "' + url + '" -H "Accept: application/json" -H "X-Subscription-Token: ' + apiKey + '"';
+    const data = JSON.parse(execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 }));
     if (data.web && data.web.results && data.web.results.length > 0) {
-      return data.web.results.slice(0, numResults).map(item => ({
-        title: item.title,
-        url: item.url,
-        content: item.description || '',
-        publishedDate: null,
-        author: null,
-        score: null
-      }));
+      return data.web.results.slice(0, numResults).map(function(item) { return { title: item.title, url: item.url, content: item.description || '' }; });
     }
-  } catch (e) {
-    log('Brave failed:', e.message);
-  }
+  } catch (e) { log('Brave failed:', e.message); }
   return null;
 }
 
-// DuckDuckGo - limited reliability due to bot detection
-async function searchDuckDuckGo(query, numResults) {
-  // DuckDuckGo Instant Answer API (limited results but more reliable)
+async function searchSearXNG(query, numResults) {
+  const searxngUrl = process.env.SEARXNG_URL;
+  if (!searxngUrl) return null;
   try {
-    const apiUrl = \`https://api.duckduckgo.com/?q=\${encodeURIComponent(query)}&format=json&no_html=1&skip_disambig=1\`;
-    const curlCmd = \`curl -s "\${apiUrl}" -H "User-Agent: Mozilla/5.0"\`;
-    const jsonStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 15000 });
-    const data = JSON.parse(jsonStr);
+    const url = searxngUrl + '/search?q=' + encodeURIComponent(query) + '&format=json&engines=google,bing,duckduckgo';
+    const data = JSON.parse(execSync('curl -s "' + url + '" -H "Accept: application/json"', { encoding: 'utf-8', timeout: 15000 }));
+    if (data.results && data.results.length > 0) {
+      return data.results.slice(0, numResults).map(function(item) { return { title: item.title, url: item.url, content: item.content || '' }; });
+    }
+  } catch (e) { log('SearXNG failed:', e.message); }
+  return null;
+}
 
+async function searchDuckDuckGo(query, numResults) {
+  try {
+    const apiUrl = 'https://api.duckduckgo.com/?q=' + encodeURIComponent(query) + '&format=json&no_html=1&skip_disambig=1';
+    const data = JSON.parse(execSync('curl -s "' + apiUrl + '" -H "User-Agent: Mozilla/5.0"', { encoding: 'utf-8', timeout: 15000 }));
     const results = [];
-
     if (data.Abstract && data.AbstractURL) {
-      results.push({
-        title: data.Heading || query,
-        url: data.AbstractURL,
-        content: data.Abstract,
-        publishedDate: null,
-        author: null,
-        score: null
-      });
+      results.push({ title: data.Heading || query, url: data.AbstractURL, content: data.Abstract });
     }
-
-    for (const topic of (data.RelatedTopics || [])) {
-      if (results.length >= numResults) break;
-      if (topic.Text && topic.FirstURL) {
-        results.push({
-          title: topic.Text.substring(0, 100),
-          url: topic.FirstURL,
-          content: topic.Text,
-          publishedDate: null,
-          author: null,
-          score: null
-        });
-      }
+    var topics = data.RelatedTopics || [];
+    for (var i = 0; i < topics.length && results.length < numResults; i++) {
+      var topic = topics[i];
+      if (topic.Text && topic.FirstURL) results.push({ title: topic.Text.substring(0, 100), url: topic.FirstURL, content: topic.Text });
       if (topic.Topics) {
-        for (const st of topic.Topics) {
-          if (results.length >= numResults) break;
-          if (st.Text && st.FirstURL) {
-            results.push({
-              title: st.Text.substring(0, 100),
-              url: st.FirstURL,
-              content: st.Text,
-              publishedDate: null,
-              author: null,
-              score: null
-            });
-          }
+        for (var j = 0; j < topic.Topics.length && results.length < numResults; j++) {
+          var st = topic.Topics[j];
+          if (st.Text && st.FirstURL) results.push({ title: st.Text.substring(0, 100), url: st.FirstURL, content: st.Text });
         }
       }
     }
-
-    if (results.length > 0) {
-      log('DDG API:', results.length, 'results');
-      return results;
-    }
-  } catch (e) {
-    log('DDG API failed:', e.message);
-  }
-
-  return [];
+    return results.length > 0 ? results : null;
+  } catch (e) { log('DuckDuckGo failed:', e.message); }
+  return null;
 }
 
-function parseDDGLiteHTML(html, maxResults) {
-  const results = [];
-  const linkRegex = /<a[^>]+rel="nofollow"[^>]+href="([^"]+)"[^>]*>([^<]+)<\\/a>/gi;
-  const snippetRegex = /<td[^>]*class="result-snippet"[^>]*>([^<]*)<\\/td>/gi;
+async function search(query, numResults) {
+  numResults = numResults || 10;
+  log('Search:', query);
+  
+  // Priority: Smithery > Google PSE > Serper > Brave > SearXNG > DuckDuckGo
+  var results = await searchSmitheryExa(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'smithery-exa' };
+  
+  results = await searchGooglePSE(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'google-pse' };
+  
+  results = await searchSerper(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'serper' };
+  
+  results = await searchBrave(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'brave' };
+  
+  results = await searchSearXNG(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'searxng' };
+  
+  results = await searchDuckDuckGo(query, numResults);
+  if (results && results.length > 0) return { results: results, source: 'duckduckgo' };
+  
+  return { results: [], source: 'none' };
+}
 
-  const links = [];
-  let match;
+// === HTTP Proxy Server ===
 
-  while ((match = linkRegex.exec(html)) !== null && links.length < maxResults) {
-    let url = match[1];
-    if (url.includes('duckduckgo.com') && !url.includes('uddg=')) continue;
-    if (url.includes('uddg=')) {
-      const uddgMatch = url.match(/uddg=([^&]+)/);
-      if (uddgMatch) url = decodeURIComponent(uddgMatch[1]);
-    }
-    links.push({
-      url: url,
-      title: decodeHTMLEntities(match[2].trim())
-    });
-  }
+const server = http.createServer(async (req, res) => {
+  const url = new URL(req.url, 'http://' + req.headers.host);
 
-  const snippets = [];
-  while ((match = snippetRegex.exec(html)) !== null && snippets.length < maxResults) {
-    snippets.push(decodeHTMLEntities(match[1].trim()));
+  if (url.pathname === '/health') {
+    res.writeHead(200, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ status: 'ok', mode: 'external-providers' }));
+    return;
   }
 
-  for (let i = 0; i < links.length && results.length < maxResults; i++) {
-    results.push({
-      title: links[i].title,
-      url: links[i].url,
-      content: snippets[i] || '',
-      publishedDate: null,
-      author: null,
-      score: null
+  if (url.pathname === '/api/tools/exa/search' && req.method === 'POST') {
+    let body = '';
+    req.on('data', function(c) { body += c; });
+    req.on('end', async function() {
+      try {
+        const parsed = JSON.parse(body);
+        const result = await search(parsed.query, parsed.numResults || 10);
+        log('Results:', result.results.length, 'from', result.source);
+        res.writeHead(200, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ results: result.results }));
+      } catch (e) {
+        log('Search error:', e.message);
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: String(e), results: [] }));
+      }
     });
+    return;
   }
 
-  return results;
-}
+  // Proxy other requests
+  const proxyUrl = new URL(FACTORY_API + url.pathname + url.search);
+  const proxyModule = proxyUrl.protocol === 'https:' ? https : http;
+  const proxyReq = proxyModule.request(proxyUrl, {
+    method: req.method,
+    headers: Object.assign({}, req.headers, { host: proxyUrl.host })
+  }, function(proxyRes) {
+    res.writeHead(proxyRes.statusCode, proxyRes.headers);
+    proxyRes.pipe(res);
+  });
+
+  proxyReq.on('error', function(e) {
+    res.writeHead(502, { 'Content-Type': 'application/json' });
+    res.end(JSON.stringify({ error: 'Proxy failed: ' + e.message }));
+  });
+
+  if (req.method !== 'GET' && req.method !== 'HEAD') req.pipe(proxyReq);
+  else proxyReq.end();
+});
+
+server.listen(PORT, '127.0.0.1', function() {
+  const actualPort = server.address().port;
+  const portFile = process.env.SEARCH_PROXY_PORT_FILE;
+  if (portFile) fs.writeFileSync(portFile, String(actualPort));
+  console.log('PORT=' + actualPort);
+  log('External providers proxy on port', actualPort);
+});
 
-function decodeHTMLEntities(str) {
-  return str
-    .replace(/&amp;/g, '&')
-    .replace(/&lt;/g, '<')
-    .replace(/&gt;/g, '>')
-    .replace(/&quot;/g, '"')
-    .replace(/&#39;/g, "'")
-    .replace(/&nbsp;/g, ' ');
+process.on('SIGTERM', function() { server.close(); process.exit(0); });
+process.on('SIGINT', function() { server.close(); process.exit(0); });
+`;
+}
+function generateExternalSearchProxyServer(factoryApiUrl = "https://api.factory.ai") {
+	return generateSearchProxyServerCode().replace("const FACTORY_API = 'https://api.factory.ai';", `const FACTORY_API = '${factoryApiUrl}';`);
 }
 
-async function search(query, numResults = 10) {
-  // Priority order:
-  // 1. Smithery Exa MCP (best quality if configured)
-  // 2. Google PSE (most reliable if configured)
-  // 3. Serper (free tier: 2500/month)
-  // 4. Brave Search (free tier available)
-  // 5. SearXNG (self-hosted)
-  // 6. DuckDuckGo (limited due to bot detection)
+//#endregion
+//#region src/websearch-native.ts
+/**
+* WebSearch Native Provider Mode (--websearch-proxy)
+*
+* Uses model's native websearch based on ~/.factory/settings.json configuration
+* Requires proxy plugin to handle format conversion:
+* - Anthropic provider: anthropic4droid plugin
+* - OpenAI provider: openai4droid plugin (adds CODEX_INSTRUCTIONS)
+*
+* Supported providers:
+* - Anthropic: web_search_20250305 server tool, results in web_search_tool_result
+* - OpenAI: web_search tool, results in message.content[].annotations[] as url_citation
+*/
+function generateNativeSearchProxyServer(factoryApiUrl = "https://api.factory.ai") {
+	return `#!/usr/bin/env node
+// Droid WebSearch Proxy Server (Native Provider Mode)
+// Reads ~/.factory/settings.json for model configuration
+// Requires proxy plugin (anthropic4droid) to handle format conversion
 
-  // 1. Smithery Exa MCP (highest priority)
-  const smitheryResults = await searchSmitheryExa(query, numResults);
-  if (smitheryResults && smitheryResults.length > 0) {
-    log('Using Smithery Exa');
-    return { results: smitheryResults, source: 'smithery-exa' };
-  }
+const http = require('http');
+const https = require('https');
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+const DEBUG = process.env.DROID_SEARCH_DEBUG === '1';
+const PORT = parseInt(process.env.SEARCH_PROXY_PORT || '0');
+const FACTORY_API = '${factoryApiUrl}';
+
+function log(...args) { if (DEBUG) console.error('[websearch]', ...args); }
 
-  // 2. Google PSE
-  const googleResults = await searchGooglePSE(query, numResults);
-  if (googleResults && googleResults.length > 0) {
-    log('Using Google PSE');
-    return { results: googleResults, source: 'google-pse' };
+// === Settings Configuration ===
+
+let cachedSettings = null;
+let settingsLastModified = 0;
+
+function getFactorySettings() {
+  const settingsPath = path.join(os.homedir(), '.factory', 'settings.json');
+  try {
+    const stats = fs.statSync(settingsPath);
+    if (cachedSettings && stats.mtimeMs === settingsLastModified) return cachedSettings;
+    cachedSettings = JSON.parse(fs.readFileSync(settingsPath, 'utf-8'));
+    settingsLastModified = stats.mtimeMs;
+    return cachedSettings;
+  } catch (e) {
+    log('Failed to load settings.json:', e.message);
+    return null;
   }
+}
 
-  // 3. Serper
-  const serperResults = await searchSerper(query, numResults);
-  if (serperResults && serperResults.length > 0) {
-    log('Using Serper');
-    return { results: serperResults, source: 'serper' };
+function getCurrentModelConfig() {
+  const settings = getFactorySettings();
+  if (!settings) return null;
+  
+  const currentModelId = settings.sessionDefaultSettings?.model;
+  if (!currentModelId) return null;
+  
+  const customModels = settings.customModels || [];
+  const modelConfig = customModels.find(m => m.id === currentModelId);
+  
+  if (modelConfig) {
+    log('Model:', modelConfig.displayName, '| Provider:', modelConfig.provider);
+    return modelConfig;
   }
+  
+  if (!currentModelId.startsWith('custom:')) return null;
+  log('Model not found:', currentModelId);
+  return null;
+}
+
+// === Native Provider WebSearch ===
 
-  // 4. Brave Search
-  const braveResults = await searchBrave(query, numResults);
-  if (braveResults && braveResults.length > 0) {
-    log('Using Brave Search');
-    return { results: braveResults, source: 'brave' };
+async function searchAnthropicNative(query, numResults, modelConfig) {
+  const { baseUrl, apiKey, model } = modelConfig;
+  
+  try {
+    const requestBody = {
+      model: model,
+      max_tokens: 4096,
+      stream: false,
+      system: 'You are a web search assistant. Use the web_search tool to find relevant information and return the results.',
+      tools: [{ type: 'web_search_20250305', name: 'web_search', max_uses: 1 }],
+      tool_choice: { type: 'tool', name: 'web_search' },
+      messages: [{ role: 'user', content: 'Search the web for: ' + query + '\\n\\nReturn up to ' + numResults + ' relevant results.' }]
+    };
+    
+    let endpoint = baseUrl;
+    if (!endpoint.endsWith('/v1/messages')) endpoint = endpoint.replace(/\\/$/, '') + '/v1/messages';
+    
+    log('Anthropic search:', query, '→', endpoint);
+    
+    const bodyStr = JSON.stringify(requestBody).replace(/'/g, "'\\\\''");
+    const curlCmd = 'curl -s -X POST "' + endpoint + '" -H "Content-Type: application/json" -H "anthropic-version: 2023-06-01" -H "x-api-key: ' + apiKey + '" -d \\'' + bodyStr + "\\'";
+    const responseStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 60000 });
+    
+    let response;
+    try { response = JSON.parse(responseStr); } catch { return null; }
+    if (response.error) { log('API error:', response.error.message); return null; }
+    
+    const results = [];
+    for (const block of (response.content || [])) {
+      if (block.type === 'web_search_tool_result') {
+        for (const result of (block.content || [])) {
+          if (result.type === 'web_search_result') {
+            results.push({
+              title: result.title || '',
+              url: result.url || '',
+              content: result.snippet || result.page_content || ''
+            });
+          }
+        }
+      }
+    }
+    
+    log('Results:', results.length);
+    return results.length > 0 ? results.slice(0, numResults) : null;
+  } catch (e) {
+    log('Anthropic error:', e.message);
+    return null;
   }
+}
 
-  // 5. SearXNG
-  const searxngResults = await searchSearXNG(query, numResults);
-  if (searxngResults && searxngResults.length > 0) {
-    log('Using SearXNG');
-    return { results: searxngResults, source: 'searxng' };
+async function searchOpenAINative(query, numResults, modelConfig) {
+  const { baseUrl, apiKey, model } = modelConfig;
+  
+  try {
+    // Note: instructions will be added by openai4droid proxy plugin
+    const requestBody = {
+      model: model,
+      stream: false,
+      tools: [{ type: 'web_search' }],
+      tool_choice: 'required',
+      input: 'Search the web for: ' + query + '\\n\\nReturn up to ' + numResults + ' relevant results.'
+    };
+    
+    let endpoint = baseUrl;
+    if (!endpoint.endsWith('/responses')) endpoint = endpoint.replace(/\\/$/, '') + '/responses';
+    
+    log('OpenAI search:', query, '→', endpoint);
+    
+    const bodyStr = JSON.stringify(requestBody).replace(/'/g, "'\\\\''");
+    const curlCmd = 'curl -s -X POST "' + endpoint + '" -H "Content-Type: application/json" -H "Authorization: Bearer ' + apiKey + '" -d \\'' + bodyStr + "\\'";
+    const responseStr = execSync(curlCmd, { encoding: 'utf-8', timeout: 60000 });
+    
+    let response;
+    try { response = JSON.parse(responseStr); } catch { return null; }
+    if (response.error) { log('API error:', response.error.message); return null; }
+    
+    // Extract results from url_citation annotations in message output
+    const results = [];
+    for (const item of (response.output || [])) {
+      if (item.type === 'message' && Array.isArray(item.content)) {
+        for (const content of item.content) {
+          if (content.type === 'output_text' && Array.isArray(content.annotations)) {
+            for (const annotation of content.annotations) {
+              if (annotation.type === 'url_citation' && annotation.url) {
+                results.push({
+                  title: annotation.title || '',
+                  url: annotation.url || '',
+                  content: annotation.title || ''
+                });
+              }
+            }
+          }
+        }
+      }
+    }
+    
+    log('Results:', results.length);
+    return results.length > 0 ? results.slice(0, numResults) : null;
+  } catch (e) {
+    log('OpenAI error:', e.message);
+    return null;
   }
+}
 
-  // 6. DuckDuckGo (last resort, limited results)
-  log('Using DuckDuckGo (fallback)');
-  const ddgResults = await searchDuckDuckGo(query, numResults);
-  return { results: ddgResults, source: 'duckduckgo' };
+async function search(query, numResults) {
+  numResults = numResults || 10;
+  log('Search:', query);
+  
+  const modelConfig = getCurrentModelConfig();
+  if (!modelConfig) {
+    log('No custom model configured');
+    return { results: [], source: 'none' };
+  }
+  
+  const provider = modelConfig.provider;
+  let results = null;
+  
+  if (provider === 'anthropic') results = await searchAnthropicNative(query, numResults, modelConfig);
+  else if (provider === 'openai') results = await searchOpenAINative(query, numResults, modelConfig);
+  else log('Unsupported provider:', provider);
+  
+  if (results && results.length > 0) return { results: results, source: 'native-' + provider };
+  return { results: [], source: 'none' };
 }
 
 // === HTTP Proxy Server ===
 
 const server = http.createServer(async (req, res) => {
-  const url = new URL(req.url, \`http://\${req.headers.host}\`);
+  const url = new URL(req.url, 'http://' + req.headers.host);
 
-  // Health check
   if (url.pathname === '/health') {
     res.writeHead(200, { 'Content-Type': 'application/json' });
-    res.end(JSON.stringify({ status: 'ok', port: server.address()?.port || PORT }));
+    res.end(JSON.stringify({ status: 'ok', mode: 'native-provider' }));
     return;
   }
 
-  // Search endpoint - intercept
   if (url.pathname === '/api/tools/exa/search' && req.method === 'POST') {
     let body = '';
-    req.on('data', c => body += c);
-    req.on('end', async () => {
+    req.on('data', function(c) { body += c; });
+    req.on('end', async function() {
       try {
-        const { query, numResults } = JSON.parse(body);
-        log('Search query:', query);
-        const { results, source } = await search(query, numResults || 10);
-        log('Results:', results.length, 'from', source);
+        const parsed = JSON.parse(body);
+        const result = await search(parsed.query, parsed.numResults || 10);
+        log('Results:', result.results.length, 'from', result.source);
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ results }));
+        res.end(JSON.stringify({ results: result.results }));
       } catch (e) {
         log('Search error:', e.message);
         res.writeHead(500, { 'Content-Type': 'application/json' });
@@ -415,243 +460,164 @@ const server = http.createServer(async (req, res) => {
     return;
   }
 
-  // === Standalone mode (controlled by STANDALONE_MODE env) ===
-  // Whitelist approach: only allow core LLM APIs, mock everything else
+  // Standalone mode: mock non-LLM APIs
   if (process.env.STANDALONE_MODE === '1') {
     const pathname = url.pathname;
-
-    // Whitelist: Core APIs that should be forwarded to upstream
     const isCoreLLMApi = pathname.startsWith('/api/llm/a/') || pathname.startsWith('/api/llm/o/');
-    // /api/tools/exa/search is already handled above
 
     if (!isCoreLLMApi) {
-      // Special handling for specific routes
       if (pathname === '/api/sessions/create') {
-        log('Mock (dynamic):', pathname);
-        const sessionId = \`local-\${Date.now()}-\${Math.random().toString(36).slice(2, 10)}\`;
         res.writeHead(200, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ id: sessionId }));
+        res.end(JSON.stringify({ id: 'local-' + Date.now() + '-' + Math.random().toString(36).slice(2, 10) }));
         return;
       }
-
       if (pathname === '/api/cli/whoami') {
-        log('Mock (401):', pathname);
         res.writeHead(401, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Unauthorized', message: 'Local mode - use token fallback' }));
-        return;
-      }
-
-      if (pathname === '/api/tools/get-url-contents') {
-        log('Mock (404):', pathname);
-        res.writeHead(404, { 'Content-Type': 'application/json' });
-        res.end(JSON.stringify({ error: 'Not available', message: 'Use local URL fetch fallback' }));
+        res.end(JSON.stringify({ error: 'Unauthorized' }));
         return;
       }
-
-      // All other non-core APIs: return empty success
-      log('Mock (default):', pathname);
       res.writeHead(200, { 'Content-Type': 'application/json' });
       res.end(JSON.stringify({}));
       return;
     }
   }
 
-  // Proxy core LLM requests to upstream API
+  // Simple proxy - no SSE transformation (handled by proxy plugin)
   log('Proxy:', req.method, url.pathname);
-
   const proxyUrl = new URL(FACTORY_API + url.pathname + url.search);
-  // Choose http or https based on target protocol
   const proxyModule = proxyUrl.protocol === 'https:' ? https : http;
   const proxyReq = proxyModule.request(proxyUrl, {
     method: req.method,
-    headers: { ...req.headers, host: proxyUrl.host }
-  }, proxyRes => {
+    headers: Object.assign({}, req.headers, { host: proxyUrl.host })
+  }, function(proxyRes) {
     res.writeHead(proxyRes.statusCode, proxyRes.headers);
     proxyRes.pipe(res);
   });
 
-  proxyReq.on('error', e => {
-    log('Proxy error:', e.message);
+  proxyReq.on('error', function(e) {
     res.writeHead(502, { 'Content-Type': 'application/json' });
     res.end(JSON.stringify({ error: 'Proxy failed: ' + e.message }));
   });
 
-  if (req.method !== 'GET' && req.method !== 'HEAD') {
-    req.pipe(proxyReq);
-  } else {
-    proxyReq.end();
-  }
+  if (req.method !== 'GET' && req.method !== 'HEAD') req.pipe(proxyReq);
+  else proxyReq.end();
 });
 
-// If port is 0, system will automatically assign an available port
-server.listen(PORT, '127.0.0.1', () => {
+server.listen(PORT, '127.0.0.1', function() {
   const actualPort = server.address().port;
-  const hasGoogle = process.env.GOOGLE_PSE_API_KEY && process.env.GOOGLE_PSE_CX;
-
-  // Write port file for parent process to read
   const portFile = process.env.SEARCH_PROXY_PORT_FILE;
-  if (portFile) {
-    fs.writeFileSync(portFile, String(actualPort));
-  }
-
-  // Output PORT= line for wrapper script to parse
+  if (portFile) fs.writeFileSync(portFile, String(actualPort));
   console.log('PORT=' + actualPort);
-
-  const hasSmithery = process.env.SMITHERY_API_KEY && process.env.SMITHERY_PROFILE;
-  log('Search proxy started on http://127.0.0.1:' + actualPort);
-  log('Smithery Exa:', hasSmithery ? 'configured (priority 1)' : 'not set');
-  log('Google PSE:', hasGoogle ? 'configured' : 'not set');
-  log('Serper:', process.env.SERPER_API_KEY ? 'configured' : 'not set');
-  log('Brave:', process.env.BRAVE_API_KEY ? 'configured' : 'not set');
-  log('SearXNG:', process.env.SEARXNG_URL || 'not set');
+  log('Native provider proxy on port', actualPort);
 });
 
-process.on('SIGTERM', () => { server.close(); process.exit(0); });
-process.on('SIGINT', () => { server.close(); process.exit(0); });
+process.on('SIGTERM', function() { server.close(); process.exit(0); });
+process.on('SIGINT', function() { server.close(); process.exit(0); });
 `;
 }
+
+//#endregion
+//#region src/websearch-patch.ts
 /**
-* Generate unified Wrapper script
-* Each droid instance runs its own proxy:
-* - Uses port 0 to let system auto-assign available port
-* - Proxy runs as child process
-* - Proxy is killed when droid exits
-* - Supports multiple droid instances running simultaneously
+* Generate unified wrapper script
 */
 function generateUnifiedWrapper(droidPath, proxyScriptPath, standalone = false) {
 	const standaloneEnv = standalone ? "STANDALONE_MODE=1 " : "";
 	return `#!/bin/bash
 # Droid with WebSearch
 # Auto-generated by droid-patch --websearch
-# Each instance runs its own proxy on a system-assigned port
 
 PROXY_SCRIPT="${proxyScriptPath}"
 DROID_BIN="${droidPath}"
 PROXY_PID=""
-PORT_FILE="/tmp/droid-websearch-\$\$.port"
+PORT_FILE="/tmp/droid-websearch-$$.port"
 STANDALONE="${standalone ? "1" : "0"}"
 
-# Passthrough for non-interactive/meta commands (avoid starting a proxy for help/version/etc)
 should_passthrough() {
-  # Any help/version flags before "--"
-  for arg in "\$@"; do
-    if [ "\$arg" = "--" ]; then
-      break
-    fi
-    case "\$arg" in
-      --help|-h|--version|-V)
-        return 0
-        ;;
-    esac
+  for arg in "$@"; do
+    if [ "$arg" = "--" ]; then break; fi
+    case "$arg" in --help|-h|--version|-V) return 0 ;; esac
   done
-
-  # Top-level command token
   local end_opts=0
-  for arg in "\$@"; do
-    if [ "\$arg" = "--" ]; then
-      end_opts=1
-      continue
-    fi
-    if [ "\$end_opts" -eq 0 ] && [[ "\$arg" == -* ]]; then
-      continue
-    fi
-    case "\$arg" in
-      help|version|completion|completions|exec)
-        return 0
-        ;;
-    esac
+  for arg in "$@"; do
+    if [ "$arg" = "--" ]; then end_opts=1; continue; fi
+    if [ "$end_opts" -eq 0 ] && [[ "$arg" == -* ]]; then continue; fi
+    case "$arg" in help|version|completion|completions|exec) return 0 ;; esac
     break
   done
-
   return 1
 }
 
-if should_passthrough "\$@"; then
-  exec "\$DROID_BIN" "\$@"
-fi
+if should_passthrough "$@"; then exec "$DROID_BIN" "$@"; fi
 
-# Cleanup function - kill proxy when droid exits
 cleanup() {
-  if [ -n "\$PROXY_PID" ] && kill -0 "\$PROXY_PID" 2>/dev/null; then
-    [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Stopping proxy (PID: \$PROXY_PID)" >&2
-    kill "\$PROXY_PID" 2>/dev/null
-    wait "\$PROXY_PID" 2>/dev/null
+  if [ -n "$PROXY_PID" ] && kill -0 "$PROXY_PID" 2>/dev/null; then
+    [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Stopping proxy (PID: $PROXY_PID)" >&2
+    kill "$PROXY_PID" 2>/dev/null
+    wait "$PROXY_PID" 2>/dev/null
   fi
-  rm -f "\$PORT_FILE"
+  rm -f "$PORT_FILE"
 }
-
-# Set up trap to cleanup on exit
 trap cleanup EXIT INT TERM
 
-[ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Starting proxy..." >&2
-[ "\$STANDALONE" = "1" ] && [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Standalone mode enabled" >&2
+[ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Starting proxy..." >&2
+[ "$STANDALONE" = "1" ] && [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Standalone mode enabled" >&2
 
-# Start proxy with port 0 (system will assign available port)
-# Proxy writes actual port to PORT_FILE
-if [ -n "\$DROID_SEARCH_DEBUG" ]; then
-  ${standaloneEnv}SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="\$PORT_FILE" node "\$PROXY_SCRIPT" 2>&1 &
+if [ -n "$DROID_SEARCH_DEBUG" ]; then
+  ${standaloneEnv}SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="$PORT_FILE" node "$PROXY_SCRIPT" 2>&1 &
 else
-  ${standaloneEnv}SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="\$PORT_FILE" node "\$PROXY_SCRIPT" >/dev/null 2>&1 &
+  ${standaloneEnv}SEARCH_PROXY_PORT=0 SEARCH_PROXY_PORT_FILE="$PORT_FILE" node "$PROXY_SCRIPT" >/dev/null 2>&1 &
 fi
-PROXY_PID=\$!
+PROXY_PID=$!
 
-# Wait for proxy to start and get actual port (max 5 seconds)
 for i in {1..50}; do
-  # Check if proxy process is still running
-  if ! kill -0 "\$PROXY_PID" 2>/dev/null; then
-    [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy process died" >&2
+  if ! kill -0 "$PROXY_PID" 2>/dev/null; then
+    [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy process died" >&2
     break
   fi
-  if [ -f "\$PORT_FILE" ]; then
-    ACTUAL_PORT=\$(cat "\$PORT_FILE" 2>/dev/null)
-    if [ -n "\$ACTUAL_PORT" ] && curl -s "http://127.0.0.1:\$ACTUAL_PORT/health" > /dev/null 2>&1; then
-      [ -n "\$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy ready on port \$ACTUAL_PORT (PID: \$PROXY_PID)" >&2
+  if [ -f "$PORT_FILE" ]; then
+    ACTUAL_PORT=$(cat "$PORT_FILE" 2>/dev/null)
+    if [ -n "$ACTUAL_PORT" ] && curl -s "http://127.0.0.1:$ACTUAL_PORT/health" > /dev/null 2>&1; then
+      [ -n "$DROID_SEARCH_DEBUG" ] && echo "[websearch] Proxy ready on port $ACTUAL_PORT (PID: $PROXY_PID)" >&2
       break
     fi
   fi
   sleep 0.1
 done
 
-# Check if proxy started successfully
-if [ ! -f "\$PORT_FILE" ] || [ -z "\$(cat "\$PORT_FILE" 2>/dev/null)" ]; then
+if [ ! -f "$PORT_FILE" ] || [ -z "$(cat "$PORT_FILE" 2>/dev/null)" ]; then
   echo "[websearch] Failed to start proxy, running without websearch" >&2
   cleanup
-  exec "\$DROID_BIN" "\$@"
+  exec "$DROID_BIN" "$@"
 fi
 
-ACTUAL_PORT=\$(cat "\$PORT_FILE")
-rm -f "\$PORT_FILE"
-
-# Run droid with proxy
-export FACTORY_API_BASE_URL_OVERRIDE="http://127.0.0.1:\$ACTUAL_PORT"
-"\$DROID_BIN" "\$@"
-DROID_EXIT_CODE=\$?
+ACTUAL_PORT=$(cat "$PORT_FILE")
+rm -f "$PORT_FILE"
 
-# Cleanup will be called by trap
-exit \$DROID_EXIT_CODE
+export FACTORY_API_BASE_URL_OVERRIDE="http://127.0.0.1:$ACTUAL_PORT"
+"$DROID_BIN" "$@"
+DROID_EXIT_CODE=$?
+exit $DROID_EXIT_CODE
 `;
 }
 /**
 * Create unified WebSearch files
 *
-* Approach: Proxy server mode
-* - wrapper script starts local proxy server
-* - proxy server intercepts search requests, passes through other requests
-* - uses FACTORY_API_BASE_URL_OVERRIDE env var to point to proxy
-* - alias works directly, no extra steps needed
-*
 * @param outputDir - Directory to write files to
 * @param droidPath - Path to droid binary
 * @param aliasName - Alias name for the wrapper
 * @param apiBase - Custom API base URL for proxy to forward requests to
 * @param standalone - Standalone mode: mock non-LLM Factory APIs
+* @param useNativeProvider - Use native provider websearch (--websearch-proxy mode)
 */
-async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName, apiBase, standalone = false) {
+async function createWebSearchUnifiedFiles(outputDir, droidPath, aliasName, apiBase, standalone = false, useNativeProvider = false) {
 	if (!existsSync(outputDir)) await mkdir(outputDir, { recursive: true });
 	const proxyScriptPath = join(outputDir, `${aliasName}-proxy.js`);
 	const wrapperScriptPath = join(outputDir, aliasName);
-	await writeFile(proxyScriptPath, generateSearchProxyServer(apiBase || "https://api.factory.ai"));
+	const factoryApiUrl = apiBase || "https://api.factory.ai";
+	await writeFile(proxyScriptPath, useNativeProvider ? generateNativeSearchProxyServer(factoryApiUrl) : generateExternalSearchProxyServer(factoryApiUrl));
 	console.log(`[*] Created proxy script: ${proxyScriptPath}`);
+	console.log(`[*] Mode: ${useNativeProvider ? "native provider (requires proxy plugin)" : "external providers"}`);
 	await writeFile(wrapperScriptPath, generateUnifiedWrapper(droidPath, proxyScriptPath, standalone));
 	await chmod(wrapperScriptPath, 493);
 	console.log(`[*] Created wrapper: ${wrapperScriptPath}`);
@@ -714,12 +680,13 @@ function findDefaultDroidPath() {
 	for (const p of paths) if (existsSync(p)) return p;
 	return join(home, ".droid", "bin", "droid");
 }
-bin("droid-patch", "CLI tool to patch droid binary with various modifications").package("droid-patch", version).option("--is-custom", "Patch isCustom:!0 to isCustom:!1 (enable context compression for custom models)").option("--skip-login", "Inject a fake FACTORY_API_KEY to bypass login requirement (no real key needed)").option("--api-base <url>", "Replace API URL (standalone: binary patch, max 22 chars; with --websearch: proxy forward target, no limit)").option("--websearch", "Enable local WebSearch proxy (each instance runs own proxy, auto-cleanup on exit)").option("--standalone", "Standalone mode: mock non-LLM Factory APIs (use with --websearch)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").option("--disable-telemetry", "Disable telemetry and Sentry error reporting (block data uploads)").option("--auto-high", "Set default autonomy mode to auto-high (bypass settings.json race condition)").option("--dry-run", "Verify patches without actually modifying the binary").option("-p, --path <path>", "Path to the droid binary").option("-o, --output <dir>", "Output directory for patched binary").option("--no-backup", "Do not create backup of original binary").option("-v, --verbose", "Enable verbose output").argument("[alias]", "Alias name for the patched binary").action(async (options, args) => {
+bin("droid-patch", "CLI tool to patch droid binary with various modifications").package("droid-patch", version).option("--is-custom", "Patch isCustom:!0 to isCustom:!1 (enable context compression for custom models)").option("--skip-login", "Inject a fake FACTORY_API_KEY to bypass login requirement (no real key needed)").option("--api-base <url>", "Replace API URL (standalone: binary patch, max 22 chars; with --websearch: proxy forward target, no limit)").option("--websearch", "Enable local WebSearch proxy with external providers (Smithery, Google PSE, etc.)").option("--websearch-proxy", "Enable native provider websearch (requires proxy plugin, reads ~/.factory/settings.json)").option("--standalone", "Standalone mode: mock non-LLM Factory APIs (use with --websearch)").option("--reasoning-effort", "Enable reasoning effort for custom models (set to high, enable UI selector)").option("--disable-telemetry", "Disable telemetry and Sentry error reporting (block data uploads)").option("--auto-high", "Set default autonomy mode to auto-high (bypass settings.json race condition)").option("--dry-run", "Verify patches without actually modifying the binary").option("-p, --path <path>", "Path to the droid binary").option("-o, --output <dir>", "Output directory for patched binary").option("--no-backup", "Do not create backup of original binary").option("-v, --verbose", "Enable verbose output").argument("[alias]", "Alias name for the patched binary").action(async (options, args) => {
 	const alias = args?.[0];
 	const isCustom = options["is-custom"];
 	const skipLogin = options["skip-login"];
 	const apiBase = options["api-base"];
 	const websearch = options["websearch"];
+	const websearchProxy = options["websearch-proxy"];
 	const standalone = options["standalone"];
 	const websearchTarget = websearch ? apiBase || "https://api.factory.ai" : void 0;
 	const reasoningEffort = options["reasoning-effort"];
@@ -731,24 +698,37 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 	const backup = options.backup !== false;
 	const verbose = options.verbose;
 	const outputPath = outputDir && alias ? join(outputDir, alias) : void 0;
-	if (!(!!isCustom || !!skipLogin || !!reasoningEffort || !!noTelemetry || !!autoHigh || !!apiBase && !websearch) && websearch) {
+	const needsBinaryPatch = !!isCustom || !!skipLogin || !!reasoningEffort || !!noTelemetry || !!autoHigh || !!apiBase && !websearch && !websearchProxy;
+	if (websearch && websearchProxy) {
+		console.log(styleText("red", "Error: Cannot use --websearch and --websearch-proxy together"));
+		console.log(styleText("gray", "Choose one:"));
+		console.log(styleText("gray", "  --websearch        External providers (Smithery, Google PSE, etc.)"));
+		console.log(styleText("gray", "  --websearch-proxy  Native provider (requires proxy plugin)"));
+		process.exit(1);
+	}
+	if (!needsBinaryPatch && (websearch || websearchProxy)) {
 		if (!alias) {
-			console.log(styleText("red", "Error: Alias name required for --websearch"));
-			console.log(styleText("gray", "Usage: npx droid-patch --websearch <alias>"));
+			const flag = websearchProxy ? "--websearch-proxy" : "--websearch";
+			console.log(styleText("red", `Error: Alias name required for ${flag}`));
+			console.log(styleText("gray", `Usage: npx droid-patch ${flag} <alias>`));
 			process.exit(1);
 		}
 		console.log(styleText("cyan", "═".repeat(60)));
 		console.log(styleText(["cyan", "bold"], "  Droid Wrapper Setup"));
 		console.log(styleText("cyan", "═".repeat(60)));
 		console.log();
-		if (websearch) {
-			console.log(styleText("white", `WebSearch: enabled`));
+		if (websearchProxy) {
+			console.log(styleText("white", `WebSearch: native provider mode`));
+			console.log(styleText("gray", `  Requires proxy plugin (anthropic4droid)`));
+			console.log(styleText("gray", `  Reads model config from ~/.factory/settings.json`));
+		} else if (websearch) {
+			console.log(styleText("white", `WebSearch: external providers mode`));
 			console.log(styleText("white", `Forward target: ${websearchTarget}`));
-			if (standalone) console.log(styleText("white", `Standalone mode: enabled`));
 		}
+		if (standalone) console.log(styleText("white", `Standalone mode: enabled`));
 		console.log();
 		let execTargetPath = path;
-		const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), execTargetPath, alias, websearchTarget, standalone);
+		const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), execTargetPath, alias, websearchProxy ? void 0 : websearchTarget, standalone, websearchProxy);
 		execTargetPath = wrapperScript;
 		const aliasResult = await createAliasForWrapper(execTargetPath, alias, verbose);
 		const droidVersion = getDroidVersion(path);
@@ -757,6 +737,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 			skipLogin: false,
 			apiBase: apiBase || null,
 			websearch: !!websearch,
+			websearchProxy: !!websearchProxy,
 			reasoningEffort: false,
 			noTelemetry: false,
 			standalone
@@ -773,10 +754,24 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		console.log("Run directly:");
 		console.log(styleText("yellow", `  ${alias}`));
 		console.log();
-		if (websearch) {
-			console.log(styleText("cyan", "Auto-shutdown:"));
-			console.log(styleText("gray", "  Proxy auto-shuts down after 5 min idle (no manual cleanup needed)"));
-			console.log(styleText("gray", "  To disable: export DROID_PROXY_IDLE_TIMEOUT=0"));
+		if (websearchProxy) {
+			console.log(styleText("cyan", "Native Provider WebSearch (--websearch-proxy):"));
+			console.log(styleText("gray", "  Uses model's built-in websearch via proxy plugin"));
+			console.log(styleText("gray", "  Reads model config from ~/.factory/settings.json"));
+			console.log();
+			console.log(styleText("yellow", "IMPORTANT: Requires proxy plugin (anthropic4droid)"));
+			console.log();
+			console.log("Supported providers:");
+			console.log(styleText("yellow", "  - anthropic: Claude web_search_20250305 server tool"));
+			console.log(styleText("yellow", "  - openai: OpenAI web_search tool"));
+			console.log(styleText("gray", "  - generic-chat-completion-api: Not supported"));
+			console.log();
+			console.log("Debug mode:");
+			console.log(styleText("gray", "  export DROID_SEARCH_DEBUG=1    # Basic logs"));
+			console.log(styleText("gray", "  export DROID_SEARCH_VERBOSE=1  # Full request/response"));
+		} else if (websearch) {
+			console.log(styleText("cyan", "External Providers WebSearch (--websearch):"));
+			console.log(styleText("gray", "  Uses external search providers (Smithery, Google PSE, etc.)"));
 			console.log();
 			console.log("Search providers (in priority order):");
 			console.log(styleText("yellow", "  1. Smithery Exa (best quality):"));
@@ -947,16 +942,22 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 		if (result.success && result.outputPath && alias) {
 			console.log();
 			let execTargetPath = result.outputPath;
-			if (websearch) {
-				const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), execTargetPath, alias, websearchTarget, standalone);
+			if (websearch || websearchProxy) {
+				const { wrapperScript } = await createWebSearchUnifiedFiles(join(homedir(), ".droid-patch", "proxy"), execTargetPath, alias, websearchProxy ? void 0 : websearchTarget, standalone, websearchProxy);
 				execTargetPath = wrapperScript;
 				console.log();
-				console.log(styleText("cyan", "WebSearch enabled"));
-				console.log(styleText("white", `  Forward target: ${websearchTarget}`));
+				if (websearchProxy) {
+					console.log(styleText("cyan", "WebSearch enabled (native provider mode)"));
+					console.log(styleText("gray", "  Requires proxy plugin (anthropic4droid)"));
+					console.log(styleText("gray", "  Reads model config from ~/.factory/settings.json"));
+				} else {
+					console.log(styleText("cyan", "WebSearch enabled (external providers mode)"));
+					console.log(styleText("white", `  Forward target: ${websearchTarget}`));
+				}
 				if (standalone) console.log(styleText("white", `  Standalone mode: enabled`));
 			}
 			let aliasResult;
-			if (websearch) aliasResult = await createAliasForWrapper(execTargetPath, alias, verbose);
+			if (websearch || websearchProxy) aliasResult = await createAliasForWrapper(execTargetPath, alias, verbose);
 			else aliasResult = await createAlias(result.outputPath, alias, verbose);
 			const droidVersion = getDroidVersion(path);
 			await saveAliasMetadata(createMetadata(alias, path, {
@@ -964,6 +965,7 @@ bin("droid-patch", "CLI tool to patch droid binary with various modifications").
 				skipLogin: !!skipLogin,
 				apiBase: apiBase || null,
 				websearch: !!websearch,
+				websearchProxy: !!websearchProxy,
 				reasoningEffort: !!reasoningEffort,
 				noTelemetry: !!noTelemetry,
 				standalone: !!standalone,