@sandagent/runner-cli 0.9.19 → 0.9.21

package/dist/bundle.mjs

@@ -1209,7 +1209,7 @@ function createOpenCodeRunner(options = {}) {
 import { appendFileSync as appendFileSync2, existsSync as existsSync4, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join5 } from "node:path";
 import { getModel } from "@mariozechner/pi-ai";
-import { AuthStorage, createAgentSession, createBashTool, ModelRegistry, SessionManager } from "@mariozechner/pi-coding-agent";
+import { AuthStorage, createAgentSession, ModelRegistry, SessionManager } from "@mariozechner/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/sandagent-resource-loader.js
 import { existsSync as existsSync3 } from "node:fs";
@@ -1299,13 +1299,311 @@ var SandagentResourceLoader = class {
   }
 };
 
-// ../../packages/runner-pi/dist/pi-runner.js
+// ../../packages/runner-pi/dist/tool-overrides.js
+import { createBashTool, createReadTool } from "@mariozechner/pi-coding-agent";
+
+// ../../packages/runner-pi/dist/web-tools.js
+var braveProvider = {
+  id: "brave",
+  label: "Brave Search",
+  envKeys: ["BRAVE_API_KEY"],
+  async search({ apiKey, query, count, country, freshness }) {
+    const params = new URLSearchParams({
+      q: query,
+      count: String(Math.min(count, 20))
+    });
+    if (country)
+      params.set("country", country);
+    if (freshness)
+      params.set("freshness", freshness);
+    const res = await fetch(`https://api.search.brave.com/res/v1/web/search?${params}`, {
+      headers: {
+        Accept: "application/json",
+        "Accept-Encoding": "gzip",
+        "X-Subscription-Token": apiKey
+      }
+    });
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      throw new Error(`Brave API ${res.status}: ${res.statusText}
+${body}`);
+    }
+    const data = await res.json();
+    const results = [];
+    if (data.web?.results) {
+      for (const r of data.web.results) {
+        if (results.length >= count)
+          break;
+        results.push({
+          title: r.title ?? "",
+          link: r.url ?? "",
+          snippet: r.description ?? "",
+          age: r.age ?? r.page_age ?? ""
+        });
+      }
+    }
+    return results;
+  }
+};
+var tavilyProvider = {
+  id: "tavily",
+  label: "Tavily",
+  envKeys: ["TAVILY_API_KEY"],
+  async search({ apiKey, query, count }) {
+    const res = await fetch("https://api.tavily.com/search", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({
+        api_key: apiKey,
+        query,
+        max_results: Math.min(count, 10),
+        include_answer: false
+      })
+    });
+    if (!res.ok) {
+      const body = await res.text().catch(() => "");
+      throw new Error(`Tavily API ${res.status}: ${res.statusText}
+${body}`);
+    }
+    const data = await res.json();
+    const results = [];
+    if (Array.isArray(data.results)) {
+      for (const r of data.results) {
+        results.push({
+          title: r.title ?? "",
+          link: r.url ?? "",
+          snippet: r.content ?? ""
+        });
+      }
+    }
+    return results;
+  }
+};
+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 resolveSearchProviders(env) {
+  const available = [];
+  for (const p of AUTO_DETECT_ORDER) {
+    for (const key of p.envKeys) {
+      const val = getEnv(env, key);
+      if (val) {
+        available.push({ provider: p, apiKey: val });
+        break;
+      }
+    }
+  }
+  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) {
+  return html.replace(/<(script|style|noscript)[^>]*>[\s\S]*?<\/\1>/gi, "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|div|h[1-6]|li|tr)>/gi, "\n").replace(/<(p|div|h[1-6]|li|tr)[^>]*>/gi, "\n").replace(/<[^>]+>/g, "").replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(/[ \t]+/g, " ").replace(/\n{3,}/g, "\n\n").trim();
+}
+async function fetchPageContent(url) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), 15e3);
+  try {
+    const res = await fetch(url, {
+      headers: {
+        "User-Agent": BROWSER_UA,
+        Accept: "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "Accept-Language": "en-US,en;q=0.9"
+      },
+      signal: controller.signal
+    });
+    if (!res.ok)
+      return `(HTTP ${res.status}: ${res.statusText})`;
+    const html = await res.text();
+    const text = htmlToText(html);
+    return text.length > 5e4 ? `${text.slice(0, 5e4)}
+
+[Truncated]` : text;
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    return `(Error fetching ${url}: ${msg})`;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+function formatSearchResults(results, providerLabel) {
+  if (results.length === 0)
+    return "No results found.";
+  const header = `[${providerLabel}] ${results.length} result(s)
+`;
+  return header + results.map((r, i) => {
+    const lines = [
+      `--- Result ${i + 1} ---`,
+      `Title: ${r.title}`,
+      `Link: ${r.link}`
+    ];
+    if (r.age)
+      lines.push(`Age: ${r.age}`);
+    lines.push(`Snippet: ${r.snippet}`);
+    if (r.content)
+      lines.push(`Content:
+${r.content}`);
+    return lines.join("\n");
+  }).join("\n\n");
+}
+var webSearchSchema = {
+  type: "object",
+  required: ["query"],
+  properties: {
+    query: {
+      type: "string",
+      description: "Search query string"
+    },
+    count: {
+      type: "number",
+      description: "Number of results to return (default: 5, max: 20)"
+    },
+    freshness: {
+      type: "string",
+      description: 'Filter by time: "pd" (past day), "pw" (past week), "pm" (past month), "py" (past year), or "YYYY-MM-DDtoYYYY-MM-DD"'
+    },
+    country: {
+      type: "string",
+      description: "Two-letter country code for results (default: US)"
+    },
+    fetch_content: {
+      type: "boolean",
+      description: "If true, also fetch and include page content for each result (slower)"
+    }
+  }
+};
+var webFetchSchema = {
+  type: "object",
+  required: ["url"],
+  properties: {
+    url: {
+      type: "string",
+      description: "URL to fetch and extract readable content from"
+    }
+  }
+};
+function buildWebSearchTool(env) {
+  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.");
+  }
+  return {
+    name: "web_search",
+    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: [
+      "Use web_search when you need current information, documentation, or facts not available locally.",
+      "Set fetch_content=true only when you need the actual page text, not just snippets \u2014 it is slower.",
+      "Prefer specific, focused queries over broad ones for better results."
+    ],
+    // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
+    parameters: webSearchSchema,
+    async execute(_toolCallId, params, _signal, _onUpdate) {
+      const p = params;
+      const query = p.query;
+      const count = p.count ?? 5;
+      const country = p.country ?? "US";
+      const freshness = p.freshness;
+      const shouldFetchContent = p.fetch_content ?? false;
+      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;
+        }
+      }
+      const msg = lastError instanceof Error ? lastError.message : String(lastError);
+      return {
+        content: [
+          {
+            type: "text",
+            text: `Web search error: ${msg}`
+          }
+        ],
+        details: void 0
+      };
+    }
+  };
+}
+function buildWebFetchTool() {
+  return {
+    name: "web_fetch",
+    label: "web fetch",
+    description: "Fetch a web page and extract its readable text content. Use when you need the full content of a specific URL (article, docs page, etc.).",
+    promptSnippet: "web_fetch(url) - fetch and extract content from a URL",
+    promptGuidelines: [
+      "Use web_fetch when you already have a URL and need its content.",
+      "For finding URLs first, use web_search instead."
+    ],
+    // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
+    parameters: webFetchSchema,
+    async execute(_toolCallId, params, _signal, _onUpdate) {
+      const p = params;
+      const url = p.url;
+      try {
+        const content = await fetchPageContent(url);
+        return {
+          content: [{ type: "text", text: content }],
+          details: void 0
+        };
+      } catch (e) {
+        const msg = e instanceof Error ? e.message : String(e);
+        return {
+          content: [
+            { type: "text", text: `Error fetching URL: ${msg}` }
+          ],
+          details: void 0
+        };
+      }
+    }
+  };
+}
+
+// ../../packages/runner-pi/dist/tool-overrides.js
 function redactSecrets(text, secrets) {
   if (Object.keys(secrets).length === 0)
     return text;
   let result = text;
   const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const values = Object.values(secrets).filter((v) => v.length >= 8).sort((a, b) => b.length - a.length);
+  const values = Object.values(secrets).filter((v) => v.length >= 4).sort((a, b) => b.length - a.length);
   for (const v of values) {
     const ev = escapeRegex(v);
     result = result.replace(new RegExp(`^\\S+=.*${ev}.*$\\n?`, "gm"), "");
@@ -1315,6 +1613,11 @@ function redactSecrets(text, secrets) {
   result = result.replace(/\n{3,}/g, "\n\n");
   return result.trim();
 }
+function redactResultContent(result, secrets) {
+  if (result?.content && Array.isArray(result.content)) {
+    result.content = result.content.map((c) => c.type === "text" && typeof c.text === "string" ? { ...c, text: redactSecrets(c.text, secrets) } : c);
+  }
+}
 function buildEnvInjectedBashTool(cwd, extraEnv) {
   const bashAgentTool = createBashTool(cwd, {
     spawnHook: (ctx) => ({
@@ -1330,13 +1633,39 @@ function buildEnvInjectedBashTool(cwd, extraEnv) {
     parameters: bashAgentTool.parameters,
     async execute(toolCallId, params, signal, onUpdate) {
       const result = await bashAgentTool.execute(toolCallId, params, signal, onUpdate);
-      if (result?.content && Array.isArray(result.content)) {
-        result.content = result.content.map((c) => c.type === "text" && typeof c.text === "string" ? { ...c, text: redactSecrets(c.text, extraEnv) } : c);
-      }
+      redactResultContent(result, extraEnv);
+      return result;
+    }
+  };
+}
+function buildSecretRedactingReadTool(cwd, secrets) {
+  const readAgentTool = createReadTool(cwd);
+  return {
+    name: readAgentTool.name,
+    label: readAgentTool.label ?? "read",
+    description: readAgentTool.description,
+    // biome-ignore lint/suspicious/noExplicitAny: TypeBox schema from pi internals
+    parameters: readAgentTool.parameters,
+    async execute(toolCallId, params, signal, onUpdate) {
+      const result = await readAgentTool.execute(toolCallId, params, signal, onUpdate);
+      redactResultContent(result, secrets);
       return result;
     }
   };
 }
+function buildSecretAwareTools(cwd, secrets) {
+  const tools = [
+    buildEnvInjectedBashTool(cwd, secrets),
+    buildSecretRedactingReadTool(cwd, secrets),
+    buildWebFetchTool()
+  ];
+  if (resolveSearchProvider(secrets)) {
+    tools.push(buildWebSearchTool(secrets));
+  }
+  return tools;
+}
+
+// ../../packages/runner-pi/dist/pi-runner.js
 var LOG_PREFIX2 = "[sandagent:pi]";
 function parseModelSpec(model) {
   const trimmed = model.trim();
@@ -1511,7 +1840,7 @@ function createPiRunner(options = {}) {
         if (resourceLoader) {
           await resourceLoader.reload();
         }
-        const customTools = options.env && Object.keys(options.env).length > 0 ? [buildEnvInjectedBashTool(cwd, options.env)] : [];
+        const customTools = options.env && Object.keys(options.env).length > 0 ? buildSecretAwareTools(cwd, options.env) : [];
         const { session } = await createAgentSession({
           cwd,
           model,

package/package.json

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