ubersearch 1.5.0 → 1.6.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ubersearch",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "module": "src/index.ts",
   "type": "module",
   "bin": {
@@ -39,6 +39,7 @@
     "zod": "^4.1.12"
   },
   "scripts": {
+    "prepare": "git config core.hooksPath scripts/hooks",
     "lint": "bunx biome check .",
     "lint:fix": "bunx biome check --write .",
     "format": "bunx biome format --write .",

package/src/cli.ts

@@ -8,9 +8,9 @@
 import { bootstrapContainer, isLifecycleProvider } from "./bootstrap/container";
 import type { ProviderRegistry } from "./core/provider";
 import { ServiceKeys } from "./core/serviceKeys";
+import { serve as serveMcp } from "./mcp-server";
 import type { UberSearchOutput } from "./tool/interface";
 import { getCreditStatus, uberSearch } from "./tool/uberSearchTool";
-import { serve as serveMcp } from "./mcp-server";
 
 // Parse command line arguments
 const args = process.argv.slice(2);
@@ -47,7 +47,7 @@ OPTIONS:
     --json                      Output results as JSON
     --engines <engine,list>     Use specific engines (comma-separated)
     --categories <cat,list>     SearXNG categories (comma-separated)
-    --strategy <strategy>       Search strategy: 'all' or 'first-success' (default: all)
+    --strategy <strategy>       Search strategy: 'all' or 'first-success' (default: first-success)
     --limit <number>            Maximum results per engine
     --include-raw               Include raw provider responses
     --config <path>             Path to configuration file

package/src/config/load.ts

@@ -203,29 +203,37 @@ export interface LoadConfigOptions {
  */
 /**
  * Get default configuration when no config file is found
- * Prioritizes cloud providers if API keys are set, falls back to SearXNG
+ * SearXNG is always first (free, unlimited), then cloud providers by free tier generosity
  */
 function getDefaultConfig(): ExtendedSearchConfig {
   const engines: ExtendedSearchConfig["engines"] = [];
   const defaultEngineOrder: string[] = [];
 
-  // Add cloud providers if API keys are available (preferred for bunx usage)
-  if (process.env.TAVILY_API_KEY) {
-    defaultEngineOrder.push("tavily");
-    engines.push({
-      id: "tavily",
-      type: "tavily",
-      enabled: true,
-      displayName: "Tavily Search",
-      apiKeyEnv: "TAVILY_API_KEY",
-      endpoint: "https://api.tavily.com/search",
-      searchDepth: "basic",
-      monthlyQuota: 1000,
-      creditCostPerSearch: 1,
-      lowCreditThresholdPercent: 80,
-    });
-  }
-
+  // Always add SearXNG first - it's free and unlimited (requires Docker)
+  const packageRoot = getPackageRoot();
+  const composeFile = join(packageRoot, "providers", "searxng", "docker-compose.yml");
+
+  defaultEngineOrder.push("searchxng");
+  engines.push({
+    id: "searchxng",
+    type: "searchxng",
+    enabled: true,
+    displayName: "SearXNG (Local)",
+    apiKeyEnv: "SEARXNG_API_KEY",
+    endpoint: "http://localhost:8888/search",
+    composeFile,
+    containerName: "searxng",
+    healthEndpoint: "http://localhost:8888/healthz",
+    defaultLimit: 15,
+    monthlyQuota: 10000,
+    creditCostPerSearch: 0,
+    lowCreditThresholdPercent: 80,
+    autoStart: true,
+    autoStop: true,
+    initTimeoutMs: 60000,
+  });
+
+  // Add cloud providers in order of free tier generosity: Brave (2000/mo) > Tavily (1000/mo) > Linkup
   if (process.env.BRAVE_API_KEY) {
     defaultEngineOrder.push("brave");
     engines.push({
@@ -236,6 +244,22 @@ function getDefaultConfig(): ExtendedSearchConfig {
       apiKeyEnv: "BRAVE_API_KEY",
       endpoint: "https://api.search.brave.com/res/v1/web/search",
       defaultLimit: 15,
+      monthlyQuota: 2000,
+      creditCostPerSearch: 1,
+      lowCreditThresholdPercent: 80,
+    });
+  }
+
+  if (process.env.TAVILY_API_KEY) {
+    defaultEngineOrder.push("tavily");
+    engines.push({
+      id: "tavily",
+      type: "tavily",
+      enabled: true,
+      displayName: "Tavily Search",
+      apiKeyEnv: "TAVILY_API_KEY",
+      endpoint: "https://api.tavily.com/search",
+      searchDepth: "basic",
       monthlyQuota: 1000,
       creditCostPerSearch: 1,
       lowCreditThresholdPercent: 80,
@@ -257,32 +281,6 @@ function getDefaultConfig(): ExtendedSearchConfig {
     });
   }
 
-  // If no cloud providers configured, fall back to SearXNG (requires Docker)
-  if (engines.length === 0) {
-    const packageRoot = getPackageRoot();
-    const composeFile = join(packageRoot, "providers", "searxng", "docker-compose.yml");
-
-    defaultEngineOrder.push("searchxng");
-    engines.push({
-      id: "searchxng",
-      type: "searchxng",
-      enabled: true,
-      displayName: "SearXNG (Local)",
-      apiKeyEnv: "SEARXNG_API_KEY",
-      endpoint: "http://localhost:8888/search",
-      composeFile,
-      containerName: "searxng",
-      healthEndpoint: "http://localhost:8888/healthz",
-      defaultLimit: 15,
-      monthlyQuota: 10000,
-      creditCostPerSearch: 0,
-      lowCreditThresholdPercent: 80,
-      autoStart: true,
-      autoStop: true,
-      initTimeoutMs: 60000,
-    });
-  }
-
   return { defaultEngineOrder, engines };
 }
 

package/src/core/orchestrator.ts

@@ -71,7 +71,7 @@ export class UberSearchOrchestrator {
    */
   async run(query: string, options: UberSearchOptions = {}): Promise<OrchestratorResult> {
     const order = this.getEngineOrder(options.engineOrderOverride);
-    const strategyName = options.strategy ?? "all";
+    const strategyName = options.strategy ?? "first-success";
 
     if (order.length === 0) {
       throw new Error("No engines configured or selected");

package/src/core/strategy/AllProvidersStrategy.ts

@@ -7,6 +7,7 @@
  * the overall search.
  */
 
+import { withRetry } from "../../providers/retry";
 import { createLogger } from "../logger";
 import type { SearchProvider } from "../provider";
 import type { EngineId, SearchResponse, SearchResultItem } from "../types";
@@ -87,13 +88,15 @@ export class AllProvidersStrategy implements ISearchStrategy {
       }
 
       try {
-        // Execute search
-        const response = await provider.search({
-          query,
-          limit: options.limit,
-          includeRaw: options.includeRaw,
-          categories: options.categories,
-        });
+        // Execute search with retry logic for transient failures
+        const response = await withRetry(engineId, () =>
+          provider.search({
+            query,
+            limit: options.limit,
+            includeRaw: options.includeRaw,
+            categories: options.categories,
+          }),
+        );
 
         // Deduct credits
         if (!context.creditManager.charge(engineId)) {
@@ -168,16 +171,18 @@ export class AllProvidersStrategy implements ISearchStrategy {
       eligibleEngines.push({ engineId, provider });
     }
 
-    // Execute all eligible searches in parallel
+    // Execute all eligible searches in parallel with retry logic
     const searchPromises = eligibleEngines.map(
       async ({ engineId, provider }): Promise<EngineSearchResult> => {
         try {
-          const response = await provider.search({
-            query,
-            limit: options.limit,
-            includeRaw: options.includeRaw,
-            categories: options.categories,
-          });
+          const response = await withRetry(engineId, () =>
+            provider.search({
+              query,
+              limit: options.limit,
+              includeRaw: options.includeRaw,
+              categories: options.categories,
+            }),
+          );
           return { engineId, response };
         } catch (error) {
           return { engineId, error: error instanceof Error ? error : new Error(String(error)) };

package/src/core/strategy/FirstSuccessStrategy.ts

@@ -6,6 +6,7 @@
  * with insufficient credits and stops execution after the first success.
  */
 
+import { withRetry } from "../../providers/retry";
 import { createLogger } from "../logger";
 import type { EngineId } from "../types";
 import { SearchError } from "../types";
@@ -59,13 +60,15 @@ export class FirstSuccessStrategy implements ISearchStrategy {
       }
 
       try {
-        // Execute search
-        const response = await provider.search({
-          query,
-          limit: options.limit,
-          includeRaw: options.includeRaw,
-          categories: options.categories,
-        });
+        // Execute search with retry logic for transient failures
+        const response = await withRetry(engineId, () =>
+          provider.search({
+            query,
+            limit: options.limit,
+            includeRaw: options.includeRaw,
+            categories: options.categories,
+          }),
+        );
 
         // Deduct credits
         if (!context.creditManager.charge(engineId)) {

package/src/core/types.ts

@@ -30,6 +30,7 @@ export interface SearchResponse {
 export type SearchFailureReason =
   | "network_error"
   | "api_error"
+  | "rate_limit"
   | "no_results"
   | "low_credit"
   | "config_error"

package/src/providers/retry.ts

@@ -25,7 +25,7 @@ export interface RetryConfig {
   maxDelayMs?: number;
 
   /** Whether to retry on specific error types */
-  retryableErrors?: Array<"network_error" | "api_error" | "timeout">;
+  retryableErrors?: Array<"network_error" | "api_error" | "rate_limit" | "no_results" | "timeout">;
 }
 
 /**
@@ -36,7 +36,7 @@ export const DEFAULT_RETRY_CONFIG: Required<RetryConfig> = {
   initialDelayMs: 1000,
   backoffMultiplier: 2,
   maxDelayMs: 10000,
-  retryableErrors: ["network_error", "api_error"],
+  retryableErrors: ["network_error", "api_error", "rate_limit", "no_results"],
 };
 
 /**
@@ -53,6 +53,11 @@ export async function withRetry<T>(
   fn: () => Promise<T>,
   config: RetryConfig = {},
 ): Promise<T> {
+  // Skip retries in test environment to avoid timeouts
+  if (process.env.DISABLE_RETRY === "true") {
+    return fn();
+  }
+
   const {
     maxAttempts = DEFAULT_RETRY_CONFIG.maxAttempts,
     initialDelayMs = DEFAULT_RETRY_CONFIG.initialDelayMs,
@@ -74,7 +79,9 @@ export async function withRetry<T>(
         throw error;
       }
 
-      const shouldRetry = retryableErrors.includes(error.reason as "network_error" | "api_error");
+      const shouldRetry = retryableErrors.includes(
+        error.reason as "network_error" | "api_error" | "rate_limit" | "no_results",
+      );
 
       if (!shouldRetry || attempt >= maxAttempts) {
         throw error;

package/src/providers/utils.ts

@@ -116,10 +116,12 @@ export async function fetchWithErrorHandling<T>(
       // Ignore error body parsing failures
     }
 
+    // Detect rate limiting (HTTP 429)
+    const reason = response.status === 429 ? "rate_limit" : "api_error";
     const errorPrefix = providerDisplayName ? `${providerDisplayName} API error` : "API error";
     throw new SearchError(
       engineId,
-      "api_error",
+      reason,
       `${errorPrefix}: HTTP ${response.status} ${response.statusText}${errorBody ? ` - ${errorBody}` : ""}`,
       response.status,
     );

package/src/tool/uberSearchTool.ts

@@ -54,7 +54,7 @@ export async function uberSearch(
     limit: input.limit,
     engineOrderOverride: input.engines,
     includeRaw: input.includeRaw,
-    strategy: input.strategy ?? "all",
+    strategy: input.strategy ?? "first-success",
     categories: input.categories,
   });