@sandagent/runner-cli 0.9.20 → 0.9.22

package/dist/bundle.mjs

@@ -1379,20 +1379,33 @@ ${body}`);
     return results;
   }
 };
-var ALL_PROVIDERS = [braveProvider, tavilyProvider];
+var AUTO_DETECT_ORDER = [braveProvider, tavilyProvider];
 function getEnv(env, key) {
   const v = env[key] ?? process.env[key];
   return v && v.length > 0 ? v : void 0;
 }
-function resolveSearchProvider(env) {
-  for (const p of ALL_PROVIDERS) {
+function resolveSearchProviders(env) {
+  const available = [];
+  for (const p of AUTO_DETECT_ORDER) {
     for (const key of p.envKeys) {
       const val = getEnv(env, key);
-      if (val)
-        return { provider: p, apiKey: val };
+      if (val) {
+        available.push({ provider: p, apiKey: val });
+        break;
+      }
     }
   }
-  return null;
+  return available;
+}
+function resolveSearchProvider(env) {
+  const all = resolveSearchProviders(env);
+  return all.length > 0 ? all[0] : null;
+}
+function isRateLimitError(err) {
+  if (!(err instanceof Error))
+    return false;
+  const msg = err.message;
+  return msg.includes("429") || msg.includes("rate") || msg.includes("quota") || msg.includes("limit");
 }
 var BROWSER_UA = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 function htmlToText(html) {
@@ -1481,14 +1494,13 @@ var webFetchSchema = {
   }
 };
 function buildWebSearchTool(env) {
-  const resolved = resolveSearchProvider(env);
-  if (!resolved) {
+  const providers = resolveSearchProviders(env);
+  if (providers.length === 0) {
     throw new Error("web_search: no search provider available. Set BRAVE_API_KEY or TAVILY_API_KEY.");
   }
-  const { provider, apiKey } = resolved;
   return {
     name: "web_search",
-    label: `web search (${provider.label})`,
+    label: "web search",
     description: "Search the web for information. Returns titles, URLs, and snippets. Use for documentation lookups, fact-checking, current events, or any query requiring web results.",
     promptSnippet: "web_search(query, count?, freshness?, country?, fetch_content?) - search the web",
     promptGuidelines: [
@@ -1505,40 +1517,49 @@ function buildWebSearchTool(env) {
       const country = p.country ?? "US";
       const freshness = p.freshness;
       const shouldFetchContent = p.fetch_content ?? false;
-      try {
-        const results = await provider.search({
-          apiKey,
-          query,
-          count,
-          country,
-          freshness
-        });
-        if (shouldFetchContent) {
-          for (const r of results) {
-            r.content = await fetchPageContent(r.link);
+      let lastError;
+      for (const { provider, apiKey } of providers) {
+        try {
+          const results = await provider.search({
+            apiKey,
+            query,
+            count,
+            country,
+            freshness
+          });
+          if (shouldFetchContent) {
+            for (const r of results) {
+              r.content = await fetchPageContent(r.link);
+            }
+          }
+          return {
+            content: [
+              {
+                type: "text",
+                text: formatSearchResults(results, provider.label)
+              }
+            ],
+            details: void 0
+          };
+        } catch (e) {
+          lastError = e;
+          if (isRateLimitError(e) && providers.length > 1) {
+            console.error(`[sandagent:pi] ${provider.label} rate-limited, trying next provider...`);
+            continue;
           }
+          break;
         }
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatSearchResults(results, provider.label)
-            }
-          ],
-          details: void 0
-        };
-      } catch (e) {
-        const msg = e instanceof Error ? e.message : String(e);
-        return {
-          content: [
-            {
-              type: "text",
-              text: `Web search error (${provider.label}): ${msg}`
-            }
-          ],
-          details: void 0
-        };
       }
+      const msg = lastError instanceof Error ? lastError.message : String(lastError);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Web search error: ${msg}`
+          }
+        ],
+        details: void 0
+      };
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandagent/runner-cli",
-  "version": "0.9.20",
+  "version": "0.9.22",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -55,10 +55,10 @@
     "vitest": "^1.6.1",
     "@sandagent/runner-core": "0.1.1-beta.0",
     "@sandagent/runner-claude": "0.6.2",
+    "@sandagent/runner-codex": "0.6.2",
     "@sandagent/runner-gemini": "0.6.2",
-    "@sandagent/runner-opencode": "0.6.2",
     "@sandagent/runner-pi": "0.6.4-beta.0",
-    "@sandagent/runner-codex": "0.6.2"
+    "@sandagent/runner-opencode": "0.6.2"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",