march-cli 0.1.21 → 0.1.22

package/src/web/search.mjs

@@ -1,83 +1,83 @@
-/**
- * Web search tool — supports tavily and brave search APIs.
- * Falls back gracefully if no API key is configured.
- */
-
-const TAVILY_API = "https://api.tavily.com/search";
-
-export async function tavilySearch(query, apiKey, { maxResults = 5, searchDepth = "basic" } = {}) {
-  if (!apiKey) throw new Error("TAVILY_API_KEY not configured");
-
-  const res = await fetch(TAVILY_API, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({
-      api_key: apiKey,
-      query,
-      max_results: maxResults,
-      search_depth: searchDepth,
-    }),
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Tavily search failed (${res.status}): ${err.slice(0, 200)}`);
-  }
-
-  const data = await res.json();
-  return (data.results ?? []).map((r) => ({
-    title: r.title ?? "",
-    url: r.url ?? "",
-    snippet: r.content ?? "",
-    score: r.score ?? null,
-  }));
-}
-
-const BRAVE_API = "https://api.search.brave.com/res/v1/web/search";
-
-export async function braveSearch(query, apiKey, { maxResults = 5 } = {}) {
-  if (!apiKey) throw new Error("BRAVE_API_KEY not configured");
-
-  const res = await fetch(`${BRAVE_API}?q=${encodeURIComponent(query)}&count=${maxResults}`, {
-    headers: {
-      Accept: "application/json",
-      "Accept-Encoding": "gzip",
-      "X-Subscription-Token": apiKey,
-    },
-  });
-
-  if (!res.ok) {
-    const err = await res.text();
-    throw new Error(`Brave search failed (${res.status}): ${err.slice(0, 200)}`);
-  }
-
-  const data = await res.json();
-  return (data.web?.results ?? []).map((r) => ({
-    title: r.title ?? "",
-    url: r.url ?? "",
-    snippet: r.description ?? "",
-  }));
-}
-
-/**
- * Try available search providers in order.
- * Returns { results, provider } or throws if none are configured.
- */
-export async function searchWeb(query, { tavilyKey, braveKey, maxResults = 5 } = {}) {
-  if (tavilyKey) {
-    try {
-      const results = await tavilySearch(query, tavilyKey, { maxResults });
-      return { results, provider: "tavily" };
-    } catch (err) {
-      // Fall through to next provider
-      if (!braveKey) throw err;
-    }
-  }
-
-  if (braveKey) {
-    const results = await braveSearch(query, braveKey, { maxResults });
-    return { results, provider: "brave" };
-  }
-
-  throw new Error("No search API key configured. Run: march websearch --config");
-}
+/**
+ * Web search tool — supports tavily and brave search APIs.
+ * Falls back gracefully if no API key is configured.
+ */
+
+const TAVILY_API = "https://api.tavily.com/search";
+
+export async function tavilySearch(query, apiKey, { maxResults = 5, searchDepth = "basic" } = {}) {
+  if (!apiKey) throw new Error("TAVILY_API_KEY not configured");
+
+  const res = await fetch(TAVILY_API, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({
+      api_key: apiKey,
+      query,
+      max_results: maxResults,
+      search_depth: searchDepth,
+    }),
+  });
+
+  if (!res.ok) {
+    const err = await res.text();
+    throw new Error(`Tavily search failed (${res.status}): ${err.slice(0, 200)}`);
+  }
+
+  const data = await res.json();
+  return (data.results ?? []).map((r) => ({
+    title: r.title ?? "",
+    url: r.url ?? "",
+    snippet: r.content ?? "",
+    score: r.score ?? null,
+  }));
+}
+
+const BRAVE_API = "https://api.search.brave.com/res/v1/web/search";
+
+export async function braveSearch(query, apiKey, { maxResults = 5 } = {}) {
+  if (!apiKey) throw new Error("BRAVE_API_KEY not configured");
+
+  const res = await fetch(`${BRAVE_API}?q=${encodeURIComponent(query)}&count=${maxResults}`, {
+    headers: {
+      Accept: "application/json",
+      "Accept-Encoding": "gzip",
+      "X-Subscription-Token": apiKey,
+    },
+  });
+
+  if (!res.ok) {
+    const err = await res.text();
+    throw new Error(`Brave search failed (${res.status}): ${err.slice(0, 200)}`);
+  }
+
+  const data = await res.json();
+  return (data.web?.results ?? []).map((r) => ({
+    title: r.title ?? "",
+    url: r.url ?? "",
+    snippet: r.description ?? "",
+  }));
+}
+
+/**
+ * Try available search providers in order.
+ * Returns { results, provider } or throws if none are configured.
+ */
+export async function searchWeb(query, { tavilyKey, braveKey, maxResults = 5 } = {}) {
+  if (tavilyKey) {
+    try {
+      const results = await tavilySearch(query, tavilyKey, { maxResults });
+      return { results, provider: "tavily" };
+    } catch (err) {
+      // Fall through to next provider
+      if (!braveKey) throw err;
+    }
+  }
+
+  if (braveKey) {
+    const results = await braveSearch(query, braveKey, { maxResults });
+    return { results, provider: "brave" };
+  }
+
+  throw new Error("No search API key configured. Run: march websearch --config");
+}

package/src/web/tools.mjs

@@ -1,107 +1,107 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "../agent/tool-result.mjs";
-import { searchWeb } from "./search.mjs";
-import { fetchWebPage } from "./fetch.mjs";
-
-export function createWebTools({ tavilyKey, braveKey } = {}) {
-  const webSearchTool = defineTool({
-    name: "external_web_search",
-    label: "External Web Search",
-    description:
-      "Search the web for current information on any topic. " +
-      "Requires TAVILY_API_KEY or BRAVE_API_KEY; if neither is configured, use web_fetch when you already know the URL. " +
-      "Use this for news, facts, or data beyond your knowledge cutoff. " +
-      "Returns result titles, URLs, and snippets.",
-    parameters: Type.Object({
-      query: Type.String({ description: "Search query" }),
-      maxResults: Type.Optional(
-        Type.Number({ description: "Maximum number of results (default 5, max 10)" }),
-      ),
-    }),
-    execute: async (_toolCallId, params) => {
-      if (!tavilyKey && !braveKey) {
-        return toolText(
-          "Search unavailable: no Tavily or Brave API key is configured in this March environment. Run: march websearch --config",
-          { error: true, unavailable: true, reason: "missing_api_key" },
-        );
-      }
-
-      try {
-        const { results, provider } = await searchWeb(params.query, {
-          tavilyKey,
-          braveKey,
-          maxResults: Math.min(params.maxResults ?? 5, 10),
-        });
-
-        if (results.length === 0) {
-          return toolText(`No results found for: ${params.query}`, { query: params.query });
-        }
-
-        const formatted = results
-          .map((r, i) => `${i + 1}. ${r.title}\n   ${r.url}\n   ${r.snippet}`)
-          .join("\n\n");
-
-        return toolText(
-          `Search results (${provider}):\n\n${formatted}`,
-          { query: params.query, count: results.length, provider },
-        );
-      } catch (err) {
-        return toolText(`Search failed: ${err.message}`, { error: true });
-      }
-    },
-  });
-
-  const webFetchTool = defineTool({
-    name: "web_fetch",
-    label: "Web Fetch",
-    description:
-      "Fetch and extract readable text content from a web page URL. " +
-      "Useful for reading documentation, articles, or any web content. " +
-      "Returns extracted text (max 50K chars). No API key required.",
-    parameters: Type.Object({
-      url: Type.String({ description: "Full URL of the page to fetch" }),
-    }),
-    execute: async (_toolCallId, params) => {
-      if (!/^https?:\/\//i.test(params.url)) {
-        return toolText("Error: URL must start with http:// or https://", { error: true });
-      }
-
-      try {
-        const result = await fetchWebPage(params.url);
-        const header = `--- ${result.url} (${result.length} chars${result.truncated ? ", truncated" : ""}) ---`;
-        return toolText(
-          `${header}\n\n${result.text}`,
-          { url: result.url, length: result.length, truncated: result.truncated },
-        );
-      } catch (err) {
-        if (isNetworkUnavailableError(err)) {
-          return toolText(
-            `Fetch unavailable: this March environment cannot reach the network (${err.message}).`,
-            { error: true, unavailable: true, reason: "network_unavailable" },
-          );
-        }
-        return toolText(`Fetch failed: ${err.message}`, { error: true });
-      }
-    },
-  });
-
-  return [webSearchTool, webFetchTool];
-}
-
-export function createWebToolsFromConfig(config = {}) {
-  const providers = config.webSearch?.providers ?? {};
-  return createWebTools({
-    tavilyKey: providers.tavily?.apiKey ?? "",
-    braveKey: providers.brave?.apiKey ?? "",
-  });
-}
-
-function isNetworkUnavailableError(err) {
-  const code = String(err?.code ?? err?.cause?.code ?? "");
-  const name = String(err?.name ?? "");
-  const message = String(err?.message ?? "");
-  return name === "AbortError"
-    || ["ENOTFOUND", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EAI_AGAIN"].includes(code)
-    || /fetch failed|getaddrinfo|network|timeout|timed out/i.test(message);
-}
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { toolText } from "../agent/tool-result.mjs";
+import { searchWeb } from "./search.mjs";
+import { fetchWebPage } from "./fetch.mjs";
+
+export function createWebTools({ tavilyKey, braveKey } = {}) {
+  const webSearchTool = defineTool({
+    name: "external_web_search",
+    label: "External Web Search",
+    description:
+      "Search the web for current information on any topic. " +
+      "Requires TAVILY_API_KEY or BRAVE_API_KEY; if neither is configured, use web_fetch when you already know the URL. " +
+      "Use this for news, facts, or data beyond your knowledge cutoff. " +
+      "Returns result titles, URLs, and snippets.",
+    parameters: Type.Object({
+      query: Type.String({ description: "Search query" }),
+      maxResults: Type.Optional(
+        Type.Number({ description: "Maximum number of results (default 5, max 10)" }),
+      ),
+    }),
+    execute: async (_toolCallId, params) => {
+      if (!tavilyKey && !braveKey) {
+        return toolText(
+          "Search unavailable: no Tavily or Brave API key is configured in this March environment. Run: march websearch --config",
+          { error: true, unavailable: true, reason: "missing_api_key" },
+        );
+      }
+
+      try {
+        const { results, provider } = await searchWeb(params.query, {
+          tavilyKey,
+          braveKey,
+          maxResults: Math.min(params.maxResults ?? 5, 10),
+        });
+
+        if (results.length === 0) {
+          return toolText(`No results found for: ${params.query}`, { query: params.query });
+        }
+
+        const formatted = results
+          .map((r, i) => `${i + 1}. ${r.title}\n   ${r.url}\n   ${r.snippet}`)
+          .join("\n\n");
+
+        return toolText(
+          `Search results (${provider}):\n\n${formatted}`,
+          { query: params.query, count: results.length, provider },
+        );
+      } catch (err) {
+        return toolText(`Search failed: ${err.message}`, { error: true });
+      }
+    },
+  });
+
+  const webFetchTool = defineTool({
+    name: "web_fetch",
+    label: "Web Fetch",
+    description:
+      "Fetch and extract readable text content from a web page URL. " +
+      "Useful for reading documentation, articles, or any web content. " +
+      "Returns extracted text (max 50K chars). No API key required.",
+    parameters: Type.Object({
+      url: Type.String({ description: "Full URL of the page to fetch" }),
+    }),
+    execute: async (_toolCallId, params) => {
+      if (!/^https?:\/\//i.test(params.url)) {
+        return toolText("Error: URL must start with http:// or https://", { error: true });
+      }
+
+      try {
+        const result = await fetchWebPage(params.url);
+        const header = `--- ${result.url} (${result.length} chars${result.truncated ? ", truncated" : ""}) ---`;
+        return toolText(
+          `${header}\n\n${result.text}`,
+          { url: result.url, length: result.length, truncated: result.truncated },
+        );
+      } catch (err) {
+        if (isNetworkUnavailableError(err)) {
+          return toolText(
+            `Fetch unavailable: this March environment cannot reach the network (${err.message}).`,
+            { error: true, unavailable: true, reason: "network_unavailable" },
+          );
+        }
+        return toolText(`Fetch failed: ${err.message}`, { error: true });
+      }
+    },
+  });
+
+  return [webSearchTool, webFetchTool];
+}
+
+export function createWebToolsFromConfig(config = {}) {
+  const providers = config.webSearch?.providers ?? {};
+  return createWebTools({
+    tavilyKey: providers.tavily?.apiKey ?? "",
+    braveKey: providers.brave?.apiKey ?? "",
+  });
+}
+
+function isNetworkUnavailableError(err) {
+  const code = String(err?.code ?? err?.cause?.code ?? "");
+  const name = String(err?.name ?? "");
+  const message = String(err?.message ?? "");
+  return name === "AbortError"
+    || ["ENOTFOUND", "ECONNREFUSED", "ECONNRESET", "ETIMEDOUT", "EAI_AGAIN"].includes(code)
+    || /fetch failed|getaddrinfo|network|timeout|timed out/i.test(message);
+}