@framers/agentos-ext-web-search 1.1.0 → 1.1.1

package/dist/tools/webSearch.js

@@ -1,70 +1,79 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebSearchTool = void 0;
 /**
- * Web search tool that queries multiple search providers
+ * Web Search Tool — multi-provider search via SearchProviderService.
  *
- * @class WebSearchTool
- * @implements {ITool}
+ * Updated to conform to AgentOS `ITool` (inputSchema + ToolExecutionContext).
  *
- * @example
- * ```typescript
- * const tool = new WebSearchTool(searchService);
- * const result = await tool.execute({
- *   query: 'AgentOS extensions',
- *   maxResults: 10,
- *   provider: 'serper'
- * });
- * ```
+ * @module @framers/agentos-ext-web-search
  */
-class WebSearchTool {
+export class WebSearchTool {
     searchService;
-    id = 'webSearch';
-    name = 'Web Search';
-    description = 'Search the web using multiple providers';
-    /**
-     * Creates an instance of WebSearchTool
-     * @param {SearchProviderService} searchService - The search provider service
-     */
-    constructor(searchService) {
+    defaultMultiSearch;
+    id = 'web-search-v1';
+    /** Tool call name used by the LLM / ToolExecutor. */
+    name = 'web_search';
+    displayName = 'Web Search';
+    description = 'Search the web using multiple providers (Serper, SerpAPI, Brave, SearXNG, DuckDuckGo fallback). Set multiSearch=true to query ALL providers in parallel for higher-confidence, deduplicated results.';
+    category = 'research';
+    hasSideEffects = false;
+    inputSchema = {
+        type: 'object',
+        required: ['query'],
+        properties: {
+            query: {
+                type: 'string',
+                description: 'The search query',
+            },
+            maxResults: {
+                type: 'integer',
+                description: 'Maximum number of results to return',
+                default: 10,
+                minimum: 1,
+                maximum: 50,
+            },
+            provider: {
+                type: 'string',
+                description: 'Specific search provider to use (ignored when multiSearch is true)',
+                enum: ['serper', 'serpapi', 'brave', 'searxng', 'duckduckgo'],
+            },
+            multiSearch: {
+                type: 'boolean',
+                description: 'When true, searches ALL available providers in parallel and returns merged, deduplicated results ranked by cross-provider agreement. Useful for deep research or fact verification.',
+                default: false,
+            },
+            category: {
+                type: 'string',
+                description: 'Search category (SearXNG only). Options: general, news, images, videos, it, science, files, social_media',
+                enum: ['general', 'news', 'images', 'videos', 'it', 'science', 'files', 'social_media'],
+            },
+        },
+        additionalProperties: false,
+    };
+    requiredCapabilities = ['capability:web_search'];
+    constructor(searchService, defaultMultiSearch = false) {
         this.searchService = searchService;
+        this.defaultMultiSearch = defaultMultiSearch;
     }
-    /**
-     * Executes a web search query
-     *
-     * @param {Object} input - The search parameters
-     * @param {string} input.query - The search query string
-     * @param {number} [input.maxResults=10] - Maximum number of results to return
-     * @param {string} [input.provider] - Specific provider to use (serper, serpapi, brave, duckduckgo)
-     * @returns {Promise<{success: boolean, output?: any, error?: string}>} The search results
-     *
-     * @throws {Error} Throws if all providers fail
-     */
-    async execute(input) {
+    async execute(input, _context) {
         try {
+            const useMultiSearch = input.multiSearch ?? this.defaultMultiSearch;
+            if (useMultiSearch && !input.provider) {
+                const results = await this.searchService.multiSearch(input.query, {
+                    maxResults: input.maxResults || 10,
+                });
+                return { success: true, output: results };
+            }
             const results = await this.searchService.search(input.query, {
                 maxResults: input.maxResults || 10,
-                provider: input.provider
+                provider: input.provider,
+                category: input.category,
             });
-            return {
-                success: true,
-                output: results
-            };
+            return { success: true, output: results };
         }
         catch (error) {
-            return {
-                success: false,
-                error: error.message
-            };
+            return { success: false, error: error?.message || String(error) };
         }
     }
-    /**
-     * Validates input parameters for the web search
-     *
-     * @param {any} input - The input to validate
-     * @returns {{valid: boolean, errors: string[]}} Validation result
-     */
-    validate(input) {
+    validateArgs(input) {
         const errors = [];
         if (!input.query) {
             errors.push('Query is required');
@@ -78,45 +87,18 @@ class WebSearchTool {
             }
         }
         if (input.provider !== undefined) {
-            const validProviders = ['serper', 'serpapi', 'brave', 'duckduckgo'];
+            const validProviders = ['serper', 'serpapi', 'brave', 'searxng', 'duckduckgo'];
             if (!validProviders.includes(input.provider)) {
                 errors.push('Invalid provider');
             }
         }
-        return {
-            valid: errors.length === 0,
-            errors
-        };
-    }
-    /**
-     * Returns the JSON schema for the tool's input
-     *
-     * @returns {Object} JSON Schema object
-     */
-    getSchema() {
-        return {
-            type: 'object',
-            required: ['query'],
-            properties: {
-                query: {
-                    type: 'string',
-                    description: 'The search query'
-                },
-                maxResults: {
-                    type: 'number',
-                    description: 'Maximum number of results to return',
-                    default: 10,
-                    minimum: 1,
-                    maximum: 50
-                },
-                provider: {
-                    type: 'string',
-                    description: 'Specific search provider to use',
-                    enum: ['serper', 'serpapi', 'brave', 'duckduckgo']
-                }
-            }
-        };
+        if (input.multiSearch !== undefined && typeof input.multiSearch !== 'boolean') {
+            errors.push('multiSearch must be a boolean');
+        }
+        if (input.multiSearch && input.provider) {
+            errors.push('Cannot specify both multiSearch and a specific provider');
+        }
+        return errors.length === 0 ? { isValid: true } : { isValid: false, errors };
     }
 }
-exports.WebSearchTool = WebSearchTool;
 //# sourceMappingURL=webSearch.js.map

package/dist/tools/webSearch.js.map

@@ -1 +1 @@
-{"version":3,"file":"webSearch.js","sourceRoot":"","sources":["../../src/tools/webSearch.ts"],"names":[],"mappings":";;;AAGA;;;;;;;;;;;;;;;GAeG;AACH,MAAa,aAAa;IASJ;IARJ,EAAE,GAAG,WAAW,CAAC;IACjB,IAAI,GAAG,YAAY,CAAC;IACpB,WAAW,GAAG,yCAAyC,CAAC;IAExE;;;OAGG;IACH,YAAoB,aAAoC;QAApC,kBAAa,GAAb,aAAa,CAAuB;IAAG,CAAC;IAE5D;;;;;;;;;;OAUG;IACH,KAAK,CAAC,OAAO,CAAC,KAIb;QACC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE;gBAC3D,UAAU,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE;gBAClC,QAAQ,EAAE,KAAK,CAAC,QAAQ;aACzB,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,OAAO;aAChB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,KAAK,CAAC,OAAO;aACrB,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,QAAQ,CAAC,KAAU;QACjB,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YACjB,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnC,CAAC;aAAM,IAAI,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC3C,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACxC,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,IAAI,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,IAAI,CAAC,EAAE,CAAC;gBAClE,MAAM,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;YACtD,CAAC;QACH,CAAC;QAED,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;YACpE,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7C,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAED,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC;YAC1B,MAAM;SACP,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,SAAS;QACP,OAAO;YACL,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,CAAC,OAAO,CAAC;YACnB,UAAU,EAAE;gBACV,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,kBAAkB;iBAChC;gBACD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,qCAAqC;oBAClD,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE,CAAC;oBACV,OAAO,EAAE,EAAE;iBACZ;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,iCAAiC;oBAC9C,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,YAAY,CAAC;iBACnD;aACF;SACF,CAAC;IACJ,CAAC;CACF;AA5GD,sCA4GC"}
+{"version":3,"file":"webSearch.js","sourceRoot":"","sources":["../../src/tools/webSearch.ts"],"names":[],"mappings":"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"}

package/dist/types.js

@@ -1,6 +1,5 @@
-"use strict";
 /**
  * @file Type definitions for search extension
  */
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AAAA;;GAEG"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG"}

package/manifest.json

@@ -2,7 +2,7 @@
   "$schema": "https://agentos.sh/schemas/extension-manifest-v1.json",
   "id": "com.framers.research.web-search",
   "name": "Web Search Extension",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Professional web search, research aggregation, and fact-checking capabilities for AgentOS",
   "author": {
     "name": "Frame.dev",
@@ -10,7 +10,7 @@
     "url": "https://github.com/framersai"
   },
   "license": "MIT",
-  "keywords": ["search", "web", "research", "fact-check", "serper", "serpapi", "brave"],
+  "keywords": ["search", "web", "research", "fact-check", "serper", "serpapi", "brave", "searxng"],
   "agentosVersion": "^2.0.0",
   "categories": ["productivity", "research"],
   "repository": {
@@ -20,21 +20,21 @@
   "extensions": [
     {
       "kind": "tool",
-      "id": "webSearch",
+      "id": "web_search",
       "displayName": "Web Search",
       "description": "Search the web for information",
       "entry": "./dist/tools/webSearch.js"
     },
     {
       "kind": "tool",
-      "id": "researchAggregator",
+      "id": "research_aggregate",
       "displayName": "Research Aggregator",
       "description": "Aggregate research from multiple searches",
       "entry": "./dist/tools/researchAggregator.js"
     },
     {
       "kind": "tool",
-      "id": "factCheck",
+      "id": "fact_check",
       "displayName": "Fact Checker",
       "description": "Verify facts across multiple sources",
       "entry": "./dist/tools/factCheck.js"
@@ -44,7 +44,7 @@
     "properties": {
       "search.provider": {
         "type": "string",
-        "enum": ["serper", "serpapi", "brave", "duckduckgo"],
+        "enum": ["serper", "serpapi", "brave", "searxng", "duckduckgo"],
         "default": "duckduckgo",
         "description": "Search API provider to use"
       },
@@ -59,6 +59,11 @@
         "minimum": 1,
         "maximum": 20,
         "description": "Maximum requests per second"
+      },
+      "search.multiSearch": {
+        "type": "boolean",
+        "default": false,
+        "description": "Default multi-provider parallel search for all search tools. When enabled, queries fan out to ALL available providers, results are deduplicated and reranked by cross-provider agreement."
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@framers/agentos-ext-web-search",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Web search, research aggregation, and fact-checking tools for AgentOS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -59,7 +59,7 @@
     "axios": "^1.7.7"
   },
   "devDependencies": {
-    "@framers/agentos": "^0.1.0",
+    "@framers/agentos": "^0.1.29",
     "@types/node": "^20.12.12",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",

package/src/index.ts

@@ -4,15 +4,15 @@
  * Provides web search capabilities through multiple providers with automatic fallback.
  * 
  * @module @framers/agentos-ext-web-search
- * @version 1.0.0
+ * @version 1.1.0
  * @license MIT
  */
 
-import { ExtensionContext, ExtensionPack } from '@framers/agentos';
-import { WebSearchTool } from './tools/webSearch';
-import { ResearchAggregatorTool } from './tools/researchAggregator';
-import { FactCheckTool } from './tools/factCheck';
-import { SearchProviderService } from './services/searchProvider';
+import type { ExtensionPackContext, ExtensionPack, ExtensionLifecycleContext } from '@framers/agentos';
+import { WebSearchTool } from './tools/webSearch.js';
+import { ResearchAggregatorTool } from './tools/researchAggregator.js';
+import { FactCheckTool } from './tools/factCheck.js';
+import { SearchProviderService } from './services/searchProvider.js';
 
 /**
  * Extension configuration options
@@ -24,6 +24,8 @@ export interface WebSearchExtensionOptions {
   serpApiKey?: string;
   /** Brave Search API key */
   braveApiKey?: string;
+  /** SearXNG instance URL (e.g. http://searxng:8080 or http://localhost:8888) */
+  searxngUrl?: string;
   /** Default maximum results for searches */
   defaultMaxResults?: number;
   /** Rate limiting configuration */
@@ -31,6 +33,8 @@ export interface WebSearchExtensionOptions {
     maxRequests: number;
     windowMs: number;
   };
+  /** Default multi-provider parallel search for all search tools */
+  defaultMultiSearch?: boolean;
   /** Extension priority in the stack */
   priority?: number;
 }
@@ -38,86 +42,100 @@ export interface WebSearchExtensionOptions {
 /**
  * Creates the web search extension pack
  * 
- * @param {ExtensionContext} context - The extension context
+ * @param {ExtensionPackContext} context - The extension context
  * @returns {ExtensionPack} The configured extension pack
- * 
+ *
  * @example
  * ```typescript
  * import { createExtensionPack } from '@framers/agentos-ext-web-search';
- * 
+ *
  * const pack = createExtensionPack({
  *   options: {
  *     serperApiKey: process.env.SERPER_API_KEY,
  *     defaultMaxResults: 10
- *   },
- *   logger: console
+ *   }
  * });
  * ```
  */
-export function createExtensionPack(context: ExtensionContext): ExtensionPack {
-  const options = context.options as WebSearchExtensionOptions || {};
-  
+export function createExtensionPack(context: ExtensionPackContext): ExtensionPack {
+  const options = (context.options ?? {}) as WebSearchExtensionOptions;
+
+  const serperApiKey =
+    options.serperApiKey || process.env.SERPER_API_KEY;
+  const serpApiKey =
+    options.serpApiKey || process.env.SERPAPI_API_KEY;
+  const braveApiKey =
+    options.braveApiKey || process.env.BRAVE_API_KEY;
+  const searxngUrl =
+    options.searxngUrl || process.env.SEARXNG_URL;
+
   // Initialize search service with configuration
   const searchService = new SearchProviderService({
-    serperApiKey: options.serperApiKey,
-    serpApiKey: options.serpApiKey,
-    braveApiKey: options.braveApiKey,
+    serperApiKey,
+    serpApiKey,
+    braveApiKey,
+    searxngUrl,
     rateLimit: options.rateLimit
   });
   
+  const defaultMultiSearch = options.defaultMultiSearch ?? false;
+
   // Create tool instances
-  const webSearchTool = new WebSearchTool(searchService);
-  const researchAggregator = new ResearchAggregatorTool(searchService);
-  const factCheckTool = new FactCheckTool(searchService);
+  const webSearchTool = new WebSearchTool(searchService, defaultMultiSearch);
+  const researchAggregator = new ResearchAggregatorTool(searchService, defaultMultiSearch);
+  const factCheckTool = new FactCheckTool(searchService, defaultMultiSearch);
   
   return {
     name: '@framers/agentos-ext-web-search',
-    version: '1.0.0',
+    version: '1.1.0',
     descriptors: [
       {
-        id: 'webSearch',
+        id: webSearchTool.name,
         kind: 'tool',
         priority: options.priority || 50,
-        payload: webSearchTool
+        payload: webSearchTool,
+        requiredSecrets: [
+          { id: 'serper.apiKey', optional: true },
+          { id: 'serpapi.apiKey', optional: true },
+          { id: 'brave.apiKey', optional: true },
+        ],
       },
       {
-        id: 'researchAggregator',
+        id: researchAggregator.name,
         kind: 'tool',
         priority: options.priority || 50,
-        payload: researchAggregator
+        payload: researchAggregator,
+        requiredSecrets: [
+          { id: 'serper.apiKey', optional: true },
+          { id: 'serpapi.apiKey', optional: true },
+          { id: 'brave.apiKey', optional: true },
+        ],
       },
       {
-        id: 'factCheck',
+        id: factCheckTool.name,
         kind: 'tool',
         priority: options.priority || 50,
-        payload: factCheckTool
+        payload: factCheckTool,
+        requiredSecrets: [
+          { id: 'serper.apiKey', optional: true },
+          { id: 'serpapi.apiKey', optional: true },
+          { id: 'brave.apiKey', optional: true },
+        ],
       }
     ],
-    /**
-     * Called when extension is activated
-     */
-    onActivate: async () => {
-      if (context.onActivate) {
-        await context.onActivate();
-      }
-      context.logger?.info('Web Search Extension activated');
+    onActivate: async (lc: ExtensionLifecycleContext) => {
+      lc.logger?.info('Web Search Extension activated');
     },
-    /**
-     * Called when extension is deactivated
-     */
-    onDeactivate: async () => {
-      if (context.onDeactivate) {
-        await context.onDeactivate();
-      }
-      context.logger?.info('Web Search Extension deactivated');
+    onDeactivate: async (lc: ExtensionLifecycleContext) => {
+      lc.logger?.info('Web Search Extension deactivated');
     }
   };
 }
 
 // Export types for consumers
 export { WebSearchTool, ResearchAggregatorTool, FactCheckTool };
-export { SearchProviderService, SearchResult, ProviderResponse } from './services/searchProvider';
-export type { SearchProviderConfig } from './services/searchProvider';
+export { SearchProviderService, SearchResult, ProviderResponse } from './services/searchProvider.js';
+export type { SearchProviderConfig, MultiSearchResult, MultiSearchResponse } from './services/searchProvider.js';
 
 // Default export for convenience
-export default createExtensionPack;
+export default createExtensionPack;