@livx.cc/agentx 0.98.2 → 0.99.1

package/README.md

@@ -35,7 +35,7 @@ Claude Code is the floor; running isolated, on the edge, or hybrid is the ceilin
 Plus things Claude Code simply doesn't do:
 
 - **Runs where CC can't** — the *same* agent loop runs on real disk, an in-memory **sandbox**, the **browser/edge** (no Node, no `/bin/sh`), or a **database-backed** workspace. Swap the filesystem, not the agent.
-- **Keyless web search, built in** — `WebSearch` works in any deployment with no API key (DuckDuckGo; auto-upgrades to Tavily if you set one). CC's search is Anthropic-server-bound.
+- **Keyless web search, built in** — `WebSearch` works in any deployment with no API key (DuckDuckGo; auto-upgrades to Firecrawl or Tavily if you set a key). Plus optional `WebSearchAnthropic` — Anthropic's native search via a cheap model, on by default when an Anthropic key is set (API-billed; opt out with `anthropicWebSearch: false`).
 - **Context-safe by default** — a 1 MB `Grep`/`Read`/MCP result is auto-paginated and can't blow the window; buried detail is recovered via a cheap context-isolated `Ask` peek — **~5.3× cheaper and more accurate** than re-fetching, in a head-to-head.
 - **It improves its own efficiency** — an autonomous evolution loop cut its own tool-use **~50% (32 → 15** on the core suite, denoised), self-discovered, not hand-tuned — the same lever behind the efficiency lead above.
 
@@ -77,7 +77,7 @@ console.log(res.finishReason, await fs.readFile('/src/x.ts'));
 - **`Edit`** — exact unique-substring replace, with a read-before-edit staleness guard.
 - **`Grep`/`Glob`/`Write`/`MultiEdit`** — structured, typed results straight from the VFS (no `bash` parsing). The selectable tool set the self-evolution loop mutates over.
 - **`TodoWrite`** — a planning scratchpad; **`Task`** — spawn a depth-limited child agent over the VFS (`subagents: true`); **`SlashCommand`** — reusable prompt templates from `<dir>/*.md` (`commandsDir`); plus a real **MCP client** (`src/mcp.client.ts`, node-only — stdio/HTTP JSON-RPC handshake + discovery) that feeds the edge-safe **MCP adapter** (`mcpToolsToAgentTools`), so any MCP server's tools become agent tools.
-- **`WebFetch`/`WebSearch`** — fetch a URL as readable text, or search the web. **Keyless by default** (WebSearch uses DuckDuckGo; auto-upgrades to Tavily when `TAVILY_API_KEY` is set) and **auto-enabled in the CLI**. Factory-built with an injectable `fetch`, so they stay edge-portable and testable. (In the library they're opt-in by name: `tools: [...,'WebSearch']`.)
+- **`WebFetch`/`WebSearch`** — fetch a URL as readable text, or search the web. **Keyless by default** (WebSearch uses DuckDuckGo; `provider: 'auto'` upgrades by key presence — Firecrawl `FIRECRAWL_API_KEY` > Tavily `TAVILY_API_KEY`) and **auto-enabled in the CLI**. Factory-built with an injectable `fetch`, so they stay edge-portable and testable. (In the library they're opt-in by name: `tools: [...,'WebSearch']`.) **`WebSearchAnthropic`** is a separate provider-pinned tool — Anthropic's native search relayed through a cheap model (`claude-haiku-4-5`); CLI-default-on when an Anthropic key resolves, API-billed per call, opt out via `anthropicWebSearch: false`.
 - **Oversized-output pagination** — any tool result over a byte ceiling (`maxToolResultBytes`, default 60k) is cropped to page 1 with a marker (refine the query / read further), so one big `Grep`/`Read`/MCP/web result can't blow the context window. In the CLI (**on by default**; `--no-scratch` to disable) the full output instead spills **losslessly** to a **scratch** file and the model recovers specifics via `Grep`/`Read` or **`Ask`** — a cheap, context-isolated peek that returns just the answer (the raw blob never re-enters context).
 
 ## Agentic subsystems

package/dist/cli.js

@@ -645,13 +645,48 @@ function formatHits(hits) {
    ${r.url}
    ${r.snippet.replace(/\s+/g, " ").slice(0, 240)}`).join("\n\n");
 }
+async function firecrawlSearch(q2, opts) {
+  const res = await opts.fetch(opts.endpoint, {
+    method: "POST",
+    signal: opts.signal,
+    headers: { authorization: `Bearer ${opts.key}`, "content-type": "application/json" },
+    body: JSON.stringify({ query: q2, limit: opts.maxResults })
+  });
+  if (!res.ok) return `Error: Firecrawl search returned ${res.status} ${res.statusText}`;
+  const data = await res.json();
+  const results = Array.isArray(data?.data) ? data.data.slice(0, opts.maxResults) : [];
+  return formatHits(results.map((r) => ({ title: r.title ?? "(untitled)", url: r.url ?? "", snippet: String(r.description ?? r.markdown ?? "") })));
+}
+async function anthropicSearch(q2, opts) {
+  const res = await opts.fetch("https://api.anthropic.com/v1/messages", {
+    method: "POST",
+    signal: opts.signal,
+    headers: { "x-api-key": opts.key, "anthropic-version": "2023-06-01", "content-type": "application/json" },
+    body: JSON.stringify({
+      model: opts.model,
+      max_tokens: 1024,
+      // Basic variant: Haiku-tier doesn't support the _20260209 dynamic-filtering variant (Opus 4.6+/Sonnet 4.6 only).
+      tools: [{ type: "web_search_20250305", name: "web_search", max_uses: 5 }],
+      messages: [{ role: "user", content: `Search the web for: ${q2}
+
+Return only the relevant findings as concise bullet points, each with its source URL in parentheses. Do not add a preamble, conclusion, opinion, or commentary. If sources conflict, list each claim with its source rather than resolving it.` }]
+    })
+  });
+  if (!res.ok) return `Error: Anthropic search returned ${res.status} ${res.statusText}`;
+  const data = await res.json();
+  if (data?.stop_reason === "refusal") return "Error: Anthropic search refused the query";
+  let text = "";
+  for (const block of data?.content ?? []) if (block?.type === "text") text += block.text;
+  return text.trim() || "(no results)";
+}
 function makeWebSearchTool(options = {}) {
   const tavilyEndpoint = options.endpoint ?? "https://api.tavily.com/search";
+  const firecrawlEndpoint = options.firecrawlEndpoint ?? "https://api.firecrawl.dev/v1/search";
   const maxResults = options.maxResults ?? 5;
   const timeoutMs = options.timeoutMs ?? 15e3;
   return {
-    name: "WebSearch",
-    description: "Search the web by query; returns ranked results (title, URL, snippet). Use to look things up, find pages, or research a topic \u2014 then WebFetch a result URL to read it in full.",
+    name: options.name ?? "WebSearch",
+    description: options.description ?? "Search the web by query; returns ranked results (title, URL, snippet). Use to look things up, find pages, or research a topic \u2014 then WebFetch a result URL to read it in full.",
     parameters: { type: "object", required: ["query"], properties: { query: { type: "string" } } },
     async run({ query }) {
       const doFetch = options.fetch ?? globalThis.fetch;
@@ -659,11 +694,22 @@ function makeWebSearchTool(options = {}) {
       const q2 = String(query ?? "").trim();
       if (!q2) return "Error: empty query";
       const key = options.apiKey ?? process.env.TAVILY_API_KEY;
+      const fcKey = options.firecrawlApiKey ?? process.env.FIRECRAWL_API_KEY;
       const provider = options.provider ?? "auto";
-      const useTavily = provider === "tavily" || provider === "auto" && !!key;
+      const useFirecrawl = provider === "firecrawl" || provider === "auto" && !!fcKey;
+      const useTavily = provider === "tavily" || provider === "auto" && !useFirecrawl && !!key;
       const ctl = new AbortController();
       const timer = setTimeout(() => ctl.abort(), timeoutMs);
       try {
+        if (provider === "anthropic") {
+          const akey = options.anthropicApiKey ?? process.env.ANTHROPIC_API_KEY;
+          if (!akey) return "Error: WebSearchAnthropic requires ANTHROPIC_API_KEY (set in env)";
+          return await anthropicSearch(q2, { key: akey, model: options.model ?? "claude-haiku-4-5", fetch: doFetch, signal: ctl.signal });
+        }
+        if (useFirecrawl) {
+          if (!fcKey) return "Error: Firecrawl provider selected but FIRECRAWL_API_KEY is not set";
+          return await firecrawlSearch(q2, { key: fcKey, endpoint: firecrawlEndpoint, maxResults, fetch: doFetch, signal: ctl.signal });
+        }
         if (useTavily) {
           if (!key) return "Error: Tavily provider selected but TAVILY_API_KEY is not set";
           const res2 = await doFetch(tavilyEndpoint, {
@@ -692,7 +738,10 @@ function makeWebSearchTool(options = {}) {
     }
   };
 }
-var log2, _dnsLookup, webFetchTool, webSearchTool;
+function makeWebSearchAnthropicTool(opts = {}) {
+  return makeWebSearchTool({ provider: "anthropic", name: "WebSearchAnthropic", description: ANTHROPIC_SEARCH_DESC, anthropicApiKey: opts.anthropicApiKey, model: opts.model });
+}
+var log2, _dnsLookup, webFetchTool, webSearchTool, ANTHROPIC_SEARCH_DESC, webSearchAnthropicTool;
 var init_tools_web = __esm({
   "src/tools.web.ts"() {
     "use strict";
@@ -700,6 +749,8 @@ var init_tools_web = __esm({
     log2 = forComponent("web");
     webFetchTool = makeWebFetchTool();
     webSearchTool = makeWebSearchTool();
+    ANTHROPIC_SEARCH_DESC = "High-quality web search via Anthropic's native search index. Returns concise, sourced findings \u2014 one claim per line, each with its source URL. Prefer this over WebSearch when accuracy and citations matter; it is slower (~3\u20138s) and bills the Anthropic API account per call (one cheap-model turn + search fee).";
+    webSearchAnthropicTool = makeWebSearchAnthropicTool();
   }
 });
 
@@ -925,7 +976,7 @@ function defaultTools() {
   return [bashTool, readTool, editTool];
 }
 function toolRegistry() {
-  const all = [bashTool, readTool, editTool, grepTool, globTool, writeTool, multiEditTool, applyEditsTool, repoMapTool, reviewTool(), todoWriteTool, webFetchTool, webSearchTool];
+  const all = [bashTool, readTool, editTool, grepTool, globTool, writeTool, multiEditTool, applyEditsTool, repoMapTool, reviewTool(), todoWriteTool, webFetchTool, webSearchTool, webSearchAnthropicTool];
   return Object.fromEntries(all.map((t) => [t.name, t]));
 }
 function toolsByName(names) {
@@ -7413,8 +7464,12 @@ The filesystem root '/' is the real machine root \u2014 you have full filesystem
       return { systemPrompt: basePrompt + "\n\n" + extra };
     })(),
     tools: (() => {
-      const base = toolsByName([...o.tools ?? DEFAULT_TOOLS, ...autoWebTools()]);
+      const requested = o.tools ?? DEFAULT_TOOLS;
+      const base = toolsByName([...requested, ...autoWebTools()]);
       const tail = [...o.extraTools ?? []];
+      if (o.anthropicWebSearch !== false && o.anthropicKey && !requested.includes("WebSearchAnthropic")) {
+        tail.push(makeWebSearchAnthropicTool({ anthropicApiKey: o.anthropicKey }));
+      }
       if (scratch) tail.push(makeAskTool({ fs, ai: o.ai, model: o.scratchAskModel ?? o.model ?? "anthropic/claude-sonnet-4-6", dir: scratchDir }));
       tail.push(makeNotifyTool());
       if (!realShell.length) return [...base, ...tail];
@@ -10810,7 +10865,7 @@ Providers: set any of ANTHROPIC_API_KEY / OPENAI_API_KEY / GOOGLE_API_KEY / GROQ
 Env files: .env (CWD, bun auto-loads) > install-dir .env > ~/.agent/.env (user-wide).
 Bodify secrets: set BODIFY_API_KEY + BODIFY_APP_ID (in ~/.agent/.env) to pull keys from a Bodify app.
 Config: ./.agent/config.{ts,js,json} (project) or ~/.agent/config.* (user).
-  export default { model, maxSteps, reasoning, permissionMode, editorMode, tools, apiKeys, baseUrls, hooks, permissions, mcpServers, maxTokens,
+  export default { model, maxSteps, reasoning, permissionMode, editorMode, tools, anthropicWebSearch, apiKeys, baseUrls, hooks, permissions, mcpServers, maxTokens,
                    timeoutMs, maxRepeats, maxToolCalls, keepToolOutputs, maxContextTokens,
                    learnFromMistakes, reflectOnFailure, budget: {\u2026} }
   hooks: { preToolUse|postToolUse|onStop: [{ tool?, command, block? }] } \u2014 shell hooks
@@ -11410,7 +11465,10 @@ function optsFor(args, ai, cfg = {}, extraTools = []) {
     learnFromMistakes: cfg.learnFromMistakes,
     // Forwarded to cursor/* delegations for environment parity (chat-model providers ignore it).
     // Raw config (pre-OAuth): unresolved-oauth http servers are skipped by the cursor mapper.
-    mcpServers: cfg.mcpServers
+    mcpServers: cfg.mcpServers,
+    // Gates + powers default-on WebSearchAnthropic. Same precedence as the main client (env wins).
+    anthropicKey: apiKeysFromEnv().anthropic ?? cfg.apiKeys?.anthropic,
+    anthropicWebSearch: cfg.anthropicWebSearch
   };
 }
 async function makeAgent(args, ai, cfg, extraTools = []) {