web-search-plus-plugin 1.2.0 → 1.2.2

package/index.ts

@@ -88,10 +88,36 @@ export default function (api: any) {
             ],
             {
               description:
-                "Exa search depth: 'deep' synthesizes across sources (4-12s), 'deep-reasoning' for complex cross-reference analysis (12-50s). Only applies when routed to Exa.",
+                "Exa search depth: 'deep' synthesizes across sources (4-12s), 'deep-reasoning' for complex cross-reference analysis (12-50s). When provider is auto, depth may be auto-selected based on query complexity.",
             },
           ),
         ),
+        time_range: Type.Optional(
+          Type.Union(
+            [
+              Type.Literal("day"),
+              Type.Literal("week"),
+              Type.Literal("month"),
+              Type.Literal("year"),
+            ],
+            {
+              description:
+                "Filter results by recency. Applies to Serper (as tbs), Perplexity (as search_recency_filter), Tavily/You.com (as freshness). Useful for news and current events.",
+            },
+          ),
+        ),
+        include_domains: Type.Optional(
+          Type.Array(Type.String(), {
+            description:
+              "Only include results from these domains (e.g. ['arxiv.org', 'github.com']). Supported by Tavily and Exa.",
+          }),
+        ),
+        exclude_domains: Type.Optional(
+          Type.Array(Type.String(), {
+            description:
+              "Exclude results from these domains (e.g. ['reddit.com', 'pinterest.com']). Supported by Tavily and Exa.",
+          }),
+        ),
       }),
       async execute(
         _id: string,
@@ -100,6 +126,9 @@ export default function (api: any) {
           provider?: string;
           count?: number;
           depth?: string;
+          time_range?: string;
+          include_domains?: string[];
+          exclude_domains?: string[];
         },
       ) {
         const args = [scriptPath, "--query", params.query, "--compact"];
@@ -119,6 +148,19 @@ export default function (api: any) {
           args.push("--exa-depth", params.depth);
         }
 
+        if (params.time_range) {
+          args.push("--time-range", params.time_range);
+          args.push("--freshness", params.time_range);
+        }
+
+        if (params.include_domains?.length) {
+          args.push("--include-domains", ...params.include_domains);
+        }
+
+        if (params.exclude_domains?.length) {
+          args.push("--exclude-domains", ...params.exclude_domains);
+        }
+
         const envPaths = [
           path.join(PLUGIN_DIR, ".env"),
           path.join(PLUGIN_DIR, "..", "web-search-plus", ".env"),
@@ -131,7 +173,7 @@ export default function (api: any) {
 
         try {
           const child = spawnSync("python3", args, {
-            timeout: 65000,
+            timeout: 75000,
             env: childEnv,
             shell: false,
             encoding: "utf8",

package/openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "web-search-plus-plugin",
   "kind": "skill",
   "name": "Web Search Plus",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Multi-provider web search (Serper/Google, Tavily, Exa/Neural+Deep, Perplexity, You.com, SearXNG) with intelligent auto-routing",
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-search-plus-plugin",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "OpenClaw plugin: multi-provider web search (Serper/Google, Tavily, Exa/Neural+Deep, Perplexity, You.com, SearXNG) with intelligent auto-routing",
   "type": "module",
   "main": "index.ts",

package/scripts/search.py

@@ -459,17 +459,15 @@ def validate_api_key(provider: str, config: Dict[str, Any] = None) -> str:
                 ],
                 "provider": provider
             }
-            print(json.dumps(error_msg, indent=2), file=sys.stderr)
-            sys.exit(1)
-        
+            raise ProviderConfigError(json.dumps(error_msg))
+
         # Validate URL format
         if not key.startswith(("http://", "https://")):
-            print(json.dumps({
+            raise ProviderConfigError(json.dumps({
                 "error": "SearXNG instance URL must start with http:// or https://",
                 "provided": key,
                 "provider": provider
-            }, indent=2), file=sys.stderr)
-            sys.exit(1)
+            }))
         
         return key
     
@@ -500,16 +498,14 @@ def validate_api_key(provider: str, config: Dict[str, Any] = None) -> str:
             ],
             "provider": provider
         }
-        print(json.dumps(error_msg, indent=2), file=sys.stderr)
-        sys.exit(1)
-    
+        raise ProviderConfigError(json.dumps(error_msg))
+
     if len(key) < 10:
-        print(json.dumps({
+        raise ProviderConfigError(json.dumps({
             "error": f"API key for {provider} appears invalid (too short)",
             "provider": provider
-        }, indent=2), file=sys.stderr)
-        sys.exit(1)
-    
+        }))
+
     return key
 
 
@@ -753,6 +749,19 @@ class QueryAnalyzer:
         r'\bheadlines?\b': 3.0,
         r'\b202[4-9]\b': 2.0,  # Current year mentions
         r'\blast (week|month|year)\b': 2.0,
+
+        # German local patterns
+        r'\bin der nähe\b': 4.0,
+        r'\bin meiner nähe\b': 4.0,
+        r'\böffnungszeiten\b': 3.0,
+        r'\badresse von\b': 3.0,
+        r'\bweg(beschreibung)? nach\b': 3.5,
+
+        # German news/recency patterns
+        r'\bheute\b': 2.5,
+        r'\bmorgen\b': 2.0,
+        r'\baktuell\b': 2.5,
+        r'\bnachrichten\b': 3.0,
     }
     
     # RAG/AI signals → You.com
@@ -805,6 +814,11 @@ class QueryAnalyzer:
         r'\bthings to do in\b': 4.0,
         r'\bnear me\b': 3.0,
         r'\bcan you (tell me|summarize|explain)\b': 3.5,
+        # German
+        r'\bwann\b': 3.0,
+        r'\bwer\b': 3.0,
+        r'\bwo\b': 2.5,
+        r'\bwie viele\b': 3.0,
     }
 
     # Privacy/Multi-source signals → SearXNG (self-hosted meta-search)
@@ -875,6 +889,14 @@ class QueryAnalyzer:
         r'\bstructured (output|data|report)\b': 4.0,
         r'\bmarket research\b': 4.0,
         r'\bindustry (report|analysis|overview)\b': 4.0,
+        r'\bresearch (on|about|into)\b': 4.0,
+        r'\bwhitepaper\b': 4.5,
+        r'\btechnical report\b': 4.0,
+        r'\bsurvey of\b': 4.5,
+        r'\bmeta.?analysis\b': 5.0,
+        r'\bsystematic review\b': 5.0,
+        r'\bcase study\b': 3.5,
+        r'\bbenchmark(s|ing)?\b': 3.5,
         # German
         r'\btiefenrecherche\b': 5.0,
         r'\bumfassende (analyse|übersicht|recherche)\b': 4.5,
@@ -898,11 +920,16 @@ class QueryAnalyzer:
         r'\bpatent (landscape|analysis|search)\b': 4.5,
         r'\bmarket intelligence\b': 4.5,
         r'\bcompetitive (intelligence|landscape)\b': 4.5,
+        r'\btrade.?offs?\b': 4.0,
+        r'\bpros and cons of\b': 4.0,
+        r'\bshould I (use|choose|pick)\b': 3.5,
+        r'\bwhich is better\b': 4.0,
         # German
         r'\bkomplexe analyse\b': 4.5,
         r'\bwidersprüche\b': 4.5,
         r'\bquellen abwägen\b': 4.5,
         r'\brechtliche analyse\b': 4.5,
+        r'\bvergleich(e|en)?\b': 3.5,
     }
 
 
@@ -1339,6 +1366,11 @@ def explain_routing(query: str, config: Dict[str, Any]) -> Dict[str, Any]:
 
 
 
+class ProviderConfigError(Exception):
+    """Raised when a provider is missing or has an invalid API key/config."""
+    pass
+
+
 class ProviderRequestError(Exception):
     """Structured provider error with retry/cooldown metadata."""
 
@@ -1406,6 +1438,24 @@ def reset_provider_health(provider: str) -> None:
         _save_provider_health(state)
 
 
+def _title_from_url(url: str) -> str:
+    """Derive a readable title from a URL when none is provided."""
+    try:
+        parsed = urlparse(url)
+        domain = parsed.netloc.replace("www.", "")
+        # Use last meaningful path segment as context
+        segments = [s for s in parsed.path.strip("/").split("/") if s]
+        if segments:
+            last = segments[-1].replace("-", " ").replace("_", " ")
+            # Strip file extensions
+            last = re.sub(r'\.\w{2,4}$', '', last)
+            if last:
+                return f"{domain} — {last[:80]}"
+        return domain
+    except Exception:
+        return url[:60]
+
+
 def normalize_result_url(url: str) -> str:
     if not url:
         return ""
@@ -1728,7 +1778,7 @@ def search_exa(
             results.append({
                 "title": f"Exa {exa_depth.replace('-', ' ').title()} Synthesis",
                 "url": "",
-                "snippet": synthesized_text[:2000],
+                "snippet": synthesized_text,
                 "full_synthesis": synthesized_text,
                 "score": 1.0,
                 "grounding": grounding_citations[:10],
@@ -1750,7 +1800,7 @@ def search_exa(
                 "type": "source",
             })
 
-        answer = synthesized_text[:1000] if synthesized_text else (results[1]["snippet"] if len(results) > 1 else "")
+        answer = synthesized_text if synthesized_text else (results[1]["snippet"] if len(results) > 1 else "")
 
         return {
             "provider": "exa",
@@ -1845,13 +1895,17 @@ def search_perplexity(
     message = choices[0].get("message", {}) if choices else {}
     answer = (message.get("content") or "").strip()
 
-    urls = re.findall(r"https?://[^\s)\]}>\"']+", answer)
-    unique_urls = []
-    seen = set()
-    for u in urls:
-        if u not in seen:
-            seen.add(u)
-            unique_urls.append(u)
+    # Prefer the structured citations array from Perplexity API response
+    api_citations = data.get("citations", [])
+
+    # Fallback: extract URLs from answer text if API doesn't provide citations
+    if not api_citations:
+        api_citations = []
+        seen = set()
+        for u in re.findall(r"https?://[^\s)\]}>\"']+", answer):
+            if u not in seen:
+                seen.add(u)
+                api_citations.append(u)
 
     results = []
 
@@ -1866,12 +1920,19 @@ def search_perplexity(
             "score": 1.0,
         })
 
-    # Additional results: extracted source URLs
-    for i, u in enumerate(unique_urls[:max_results - 1]):
+    # Source results from citations
+    for i, citation in enumerate(api_citations[:max_results - 1]):
+        # citations can be plain URL strings or dicts with url/title
+        if isinstance(citation, str):
+            url = citation
+            title = _title_from_url(url)
+        else:
+            url = citation.get("url", "")
+            title = citation.get("title") or _title_from_url(url)
         results.append({
-            "title": f"Source {i+1}",
-            "url": u,
-            "snippet": "Referenced source from Perplexity answer",
+            "title": title,
+            "url": url,
+            "snippet": f"Source cited in Perplexity answer [citation {i+1}]",
             "score": round(0.9 - i * 0.1, 3),
         })
 
@@ -2463,9 +2524,11 @@ Full docs: See README.md and SKILL.md
     disabled_providers = auto_config.get("disabled_providers", [])
 
     # Start with the selected provider, then try others in priority order
+    # Only include providers that have a configured API key (except the primary,
+    # which gets a clear error if unconfigured and no fallback succeeds)
     providers_to_try = [provider]
     for p in provider_priority:
-        if p not in providers_to_try and p not in disabled_providers:
+        if p not in providers_to_try and p not in disabled_providers and get_api_key(p, config):
             providers_to_try.append(p)
 
     # Skip providers currently in cooldown