firecrawl-mcp 3.29.1 → 3.30.1

package/dist/index.js

@@ -85,7 +85,7 @@ var alexandriaSessionFeedbackSchema = z.strictObject({
 // src/server.ts
 import FirecrawlApp from "firecrawl";
 
-// node_modules/.pnpm/fastmcp@4.3.2_patch_hash=08f77b633292d9ae4cb022c0fa5bd722dbd5c1aaaad600204f8ed38339bfd37b/node_modules/fastmcp/dist/chunk-LWU5CQGW.js
+// node_modules/.pnpm/fastmcp@4.3.2_patch_hash=37f9a424ae5b0b6202b2b16109a1ea88b69cdcda5407f13eda6654a56489ad70/node_modules/fastmcp/dist/chunk-LWU5CQGW.js
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import {
@@ -889,6 +889,7 @@ ${error2 instanceof Error ? error2.stack : JSON.stringify(error2)}`
             // Top-level Tool.title (MCP 2025-06-18). Clients such as Codex index this
             // for tool search and do not read annotations.title.
             ...tool.annotations?.title && { title: tool.annotations.title },
+            ...tool.icons && { icons: tool.icons },
             description: tool.description,
             inputSchema: tool.parameters ? strictJsonSchema(await toJsonSchema(tool.parameters)) : {
               additionalProperties: false,
@@ -2064,7 +2065,7 @@ var FastMCP = class extends FastMCPEventEmitter {
   }
 };
 
-// node_modules/.pnpm/fastmcp@4.3.2_patch_hash=08f77b633292d9ae4cb022c0fa5bd722dbd5c1aaaad600204f8ed38339bfd37b/node_modules/fastmcp/dist/chunk-OJG4XYXA.js
+// node_modules/.pnpm/fastmcp@4.3.2_patch_hash=37f9a424ae5b0b6202b2b16109a1ea88b69cdcda5407f13eda6654a56489ad70/node_modules/fastmcp/dist/chunk-OJG4XYXA.js
 import { z as z3 } from "zod";
 import { createHmac as createHmac2, pbkdf2, randomBytes } from "crypto";
 import { promisify } from "util";
@@ -2077,45 +2078,6 @@ import { randomUUID as randomUUID2 } from "crypto";
 import path from "path";
 import { z as z12 } from "zod";
 
-// src/agent-hints.ts
-var AGENT_HINTS_HEADERS = { "X-Firecrawl-Agent-Hints": "true" };
-function readAgentHints(value) {
-  if (!value || typeof value !== "object") return void 0;
-  const hints = value.agent_hints;
-  return Array.isArray(hints) && hints.every((hint) => typeof hint === "string") ? hints : void 0;
-}
-function preserveAgentHints(data, envelope) {
-  const hints = readAgentHints(envelope);
-  if (!hints) return data;
-  return data && typeof data === "object" && !Array.isArray(data) ? { ...data, agent_hints: hints } : { data, agent_hints: hints };
-}
-function agentHintsText(hints) {
-  return `Firecrawl API agent_hints (response guidance, separate from page content):
-${JSON.stringify(hints, null, 2)}`;
-}
-function withAgentHints(result, response, separateText = false) {
-  const hints = readAgentHints(response);
-  if (!hints) return result;
-  return {
-    ...result,
-    content: separateText && hints.length ? [...result.content, { type: "text", text: agentHintsText(hints) }] : result.content,
-    structuredContent: { ...result.structuredContent, agent_hints: hints }
-  };
-}
-function readErrorAgentHints(error2) {
-  const hints = readAgentHints(error2);
-  if (hints) return hints;
-  if (!error2 || typeof error2 !== "object") return void 0;
-  const extras = error2.extras;
-  const extrasHints = readAgentHints(extras);
-  if (extrasHints) return extrasHints;
-  const details = error2.details;
-  const detailsHints = readAgentHints(details);
-  if (detailsHints) return detailsHints;
-  const response = error2.response;
-  return readAgentHints(response?.data);
-}
-
 // src/tool-output.ts
 import { z as z4 } from "zod";
 function isRecord(value) {
@@ -2144,9 +2106,6 @@ var unknown = (description) => z4.unknown().optional().describe(description);
 var success = bool("Whether the API call succeeded.");
 var error = unknown("Error message or error object when the call did not succeed.");
 var warning = str("Non-fatal warning about the result.");
-var agentHints = {
-  agent_hints: z4.array(z4.string()).optional().describe("Optional response guidance from the Firecrawl API.")
-};
 var alexandriaEnvelope = {
   requestId: str("Identifier of this Alexandria execution."),
   scrape_id: str("Identifier of the underlying scrape."),
@@ -2164,7 +2123,6 @@ var alexandriaEnvelope = {
   feedbackTool: unknown("Pointer to the feedback tool for reporting how this result served the task.")
 };
 var scrapeOutputSchema = z4.object({
-  ...agentHints,
   // URL mode: the scraped document, with the formats that were requested.
   markdown: str("Page content as markdown."),
   html: str("Processed HTML of the page."),
@@ -2196,7 +2154,6 @@ var scrapeOutputSchema = z4.object({
   ...alexandriaEnvelope
 }).describe("A scraped document, or the Alexandria execution envelope when `alexandria` was passed.");
 var mapOutputSchema = z4.object({
-  ...agentHints,
   links: unknown("URLs discovered under the website."),
   success,
   error,
@@ -2204,7 +2161,6 @@ var mapOutputSchema = z4.object({
   id: str("Identifier of the map run, for optional map feedback.")
 }).describe("URLs indexed under the requested website.");
 var searchOutputSchema = z4.object({
-  ...agentHints,
   success,
   data: unknown("Ranked results grouped by source, such as `web`, `news`, `images`, and `alexandria`."),
   error,
@@ -2216,14 +2172,12 @@ var searchOutputSchema = z4.object({
   feedbackTool: unknown("Pointer to the feedback tool for this search.")
 }).describe("Ranked search results grouped by source.");
 var findToolsOutputSchema = z4.object({
-  ...agentHints,
   success,
   data: unknown("Discovery page in `data.alexandria[0].data`, with `level`, `items`, `total`, and an optional `nextTool`."),
   error,
   ...alexandriaEnvelope
 }).describe("One page of the Alexandria catalogue: categories, providers, tools, or one contract.");
 var feedbackOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   status: num("HTTP status when the submission was rejected."),
@@ -2242,7 +2196,6 @@ var feedbackOutputSchema = z4.object({
   raw: str("Response body when it was not JSON.")
 }).describe("Result of submitting feedback.");
 var crawlOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   warning,
@@ -2257,7 +2210,6 @@ var crawlOutputSchema = z4.object({
   data: unknown("Scraped documents collected by the crawl.")
 }).describe("Crawl job state and the documents collected so far.");
 var agentOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   id: str("Agent job identifier, for `firecrawl_agent_status`."),
@@ -2266,7 +2218,6 @@ var agentOutputSchema = z4.object({
   threadTurn: num("Turn number of this job within its thread.")
 }).describe("The queued research job. The result is read with `firecrawl_agent_status`.");
 var agentStatusOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   id: str("Agent job identifier."),
@@ -2294,7 +2245,6 @@ var agentStatusOutputSchema = z4.object({
   )
 }).describe("Progress or final result of a research agent job.");
 var interactOutputSchema = z4.object({
-  ...agentHints,
   success,
   error: unknown("Why the interaction or the session could not run."),
   url: str("The URL the session was opened from, when opening failed."),
@@ -2309,14 +2259,12 @@ var interactOutputSchema = z4.object({
   liveUrl: str("URL for viewing the live session.")
 }).describe("Result of a browser interaction, with the session identifier to continue or stop it.");
 var interactStopOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   message: str("Confirmation that the session was stopped."),
   scrapeId: str("Session that was stopped.")
 }).describe("Confirmation that the interact session was stopped.");
 var parseOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   warning,
@@ -2344,39 +2292,33 @@ var deprecatedToolOutputSchema = z4.object({
   docs_url: str("Documentation for the replacement.")
 }).describe("A pointer to the replacement tool. This entry point is deprecated and always errors.");
 var monitorOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("The monitor record: configuration, schedule, targets, and current state.")
 }).describe("One monitor record.");
 var monitorListOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("One page of monitor records."),
   pagination: unknown("Pagination metadata for the listing.")
 }).describe("One page of monitors for the authenticated account.");
 var monitorDeleteOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("Deletion details, when the API returns any.")
 }).describe("Deletion status for the monitor.");
 var monitorRunOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("The queued check.")
 }).describe("The check queued outside the monitor schedule.");
 var monitorChecksOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("One page of check summaries."),
   pagination: unknown("Pagination metadata for the listing.")
 }).describe("One page of historical checks for the monitor.");
 var monitorCheckOutputSchema = z4.object({
-  ...agentHints,
   success,
   error,
   data: unknown("The check and its page-level results: each page reports `same`, `new`, `changed`, `removed`, or `error`, with diffs and any goal judgment."),
@@ -2395,25 +2337,20 @@ var paperSchema = z4.looseObject({
   updateDate: str("Date the paper was last updated.")
 });
 var researchSearchOutputSchema = z4.object({
-  ...agentHints,
   results: z4.array(paperSchema).describe("Ranked papers, in the order the text block lists them.")
 }).describe("Ranked papers with canonical IDs, titles, authors, and abstracts.");
 var researchPaperOutputSchema = z4.object({
-  ...agentHints,
   paper: paperSchema.optional().describe("Canonical metadata for the requested paper, absent when it was not found.")
 }).describe("Canonical metadata for one paper.");
 var researchRelatedOutputSchema = z4.object({
-  ...agentHints,
   results: z4.array(paperSchema).describe("Ranked citation-graph candidates."),
   poolSize: z4.number().describe("Number of candidates evaluated before ranking."),
   note: str("Note about how the candidates were produced.")
 }).describe("Ranked citation-graph candidates and the size of the evaluated pool.");
 var researchReadOutputSchema = z4.object({
-  ...agentHints,
   passages: z4.array(z4.looseObject({ text: str("Passage text.") })).describe("In-body passages relevant to the question; empty when no full text is indexed.")
 }).describe("Full-text passages from one paper.");
 var developerSearchOutputSchema = z4.object({
-  ...agentHints,
   results: z4.array(
     z4.looseObject({
       id: str("Stable result id, such as `issue:owner/repo#123` or `doc:<hash>`; its prefix gives the source type."),
@@ -2424,7 +2361,6 @@ var developerSearchOutputSchema = z4.object({
   ).describe("Ranked results, in the order the text block lists them.")
 }).describe("Ranked developer-index results with their matched passages.");
 var govSearchOutputSchema = z4.object({
-  ...agentHints,
   results: z4.array(
     z4.looseObject({
       url: str("Source URL."),
@@ -2486,7 +2422,8 @@ var findToolsSchema = z5.object({
   level: z5.enum(["categories", "providers", "groups", "tools"]).optional(),
   expand: z5.array(z5.enum(["options", "response", "examples"])).optional().describe('Use ["options", "response"] for inputs and output shape without example payloads; [] keeps results compact. Omit for full contracts on selected capabilities.'),
   limit: z5.number().int().min(1).max(100).optional(),
-  offset: z5.number().int().nonnegative().optional()
+  offset: z5.number().int().nonnegative().optional(),
+  includeCosts: z5.boolean().optional().describe("Include per-capability credit prices (creditsCost, perRecord) in tool results.")
 }).strict();
 var ALEXANDRIA_CATALOGUE_VERTICALS = "companies, people, jobs, finance and filings, public records and government spending, real estate, places and restaurants, retail and prices, package registries and developer data, news, research, and more";
 var ALEXANDRIA_CATALOGUE_SENTENCE = "Alexandria is Firecrawl's catalogue of data providers and workflows across " + ALEXANDRIA_CATALOGUE_VERTICALS + "; providers return typed, sourced records through published contracts.";
@@ -2498,7 +2435,7 @@ function findToolsOptions(args2) {
   if (level === "categories" && (args2.query || args2.providers?.length || args2.categories?.length || args2.groups?.length || args2.capabilities?.length || args2.urls?.length || args2.expand !== void 0)) {
     throw new Error("Category index accepts only level, limit and offset. Select a category to browse providers.");
   }
-  const { expand, ...selectors } = args2;
+  const { expand, includeCosts, ...selectors } = args2;
   return {
     ...selectors,
     ...expand !== void 0 ? { expand } : {},
@@ -2507,10 +2444,10 @@ function findToolsOptions(args2) {
     ...args2.expand === void 0 && level === "tools" && args2.capabilities?.length ? { expand: ["options", "response", "examples"] } : {}
   };
 }
-function withFindToolsNavigation(envelope) {
+function withFindToolsNavigation(envelope, carry = {}) {
   const page = envelope?.data?.alexandria?.[0]?.data;
   if (!page || !Array.isArray(page.items)) return envelope;
-  const link = (next) => next?.provider === "firecrawl" && next?.capability === "find-tools" && next.options ? { name: "firecrawl_find_tools", arguments: next.options } : void 0;
+  const link = (next) => next?.provider === "firecrawl" && next?.capability === "find-tools" && next.options ? { name: "firecrawl_find_tools", arguments: { ...next.options, ...carry } } : void 0;
   for (const item of page.items) {
     if (page.level === "providers" && link(item.next)) {
       const selectors = { ...item.next.options };
@@ -2524,6 +2461,49 @@ function withFindToolsNavigation(envelope) {
   return envelope;
 }
 var ALEXANDRIA_SEARCH_INSTRUCTIONS = 'Authenticated search combines web results, semantic tool summaries and domain matches. Use sources: ["alexandria"] for semantic tools only. ' + ALEXANDRIA_SOURCES_OPT_OUT + ' Tool matches describe available structured-data capabilities, not executed data. toolDetail: "compact" (default) returns only provider, capability and description; "summary" adds metadata; "full" includes their input and output contracts. firecrawl_scrape with an alexandria body executes a selected capability; firecrawl_find_tools provides catalogue browsing and full contracts.';
+var TOOL_PRICE_KEYS = ["creditsCost", "perRecord", "billing", "recordsPerUnit", "zeroDataRetentionCreditsCost"];
+function withoutToolPrice(tool) {
+  if (!tool || typeof tool !== "object" || Array.isArray(tool)) return tool;
+  const copy = { ...tool };
+  for (const key of TOOL_PRICE_KEYS) delete copy[key];
+  return copy;
+}
+function withoutDiscoveredToolPrices(body) {
+  const tools = body?.data?.tools ?? body?.tools;
+  if (!Array.isArray(tools)) return body;
+  return body?.data?.tools ? { ...body, data: { ...body.data, tools: tools.map(withoutToolPrice) } } : { ...body, tools: tools.map(withoutToolPrice) };
+}
+function withoutPagePrices(page) {
+  if (!page || typeof page !== "object") return page;
+  return {
+    ...page,
+    ...Array.isArray(page.items) ? { items: page.items.map(withoutToolPrice) } : {},
+    ...Array.isArray(page.relatedTools) ? {
+      relatedTools: page.relatedTools.map((group) => Array.isArray(group?.tools) ? { ...group, tools: group.tools.map((entry) => entry?.tool ? { ...entry, tool: withoutToolPrice(entry.tool) } : withoutToolPrice(entry)) } : group)
+    } : {}
+  };
+}
+function withoutResultPrices(body) {
+  const results = body?.data?.alexandria;
+  if (!Array.isArray(results)) return body;
+  return {
+    ...body,
+    data: {
+      ...body.data,
+      alexandria: results.map((entry) => {
+        const stripped = withoutToolPrice(entry);
+        return entry?.provider === "firecrawl" && entry?.capability === "find-tools" && stripped && typeof stripped === "object" ? { ...stripped, data: withoutPagePrices(entry.data) } : stripped;
+      })
+    }
+  };
+}
+function withoutFindToolsPrices(envelope) {
+  const stripped = withoutResultPrices(envelope);
+  if (!stripped?.data || typeof stripped.data !== "object") return stripped;
+  const data = { ...stripped.data };
+  delete data.creditsCost;
+  return { ...stripped, data };
+}
 
 // src/alexandria-output.ts
 var INLINE_TOKEN_BUDGET = 2e4;
@@ -2673,7 +2653,7 @@ Returns ranked results with an ID, source type, URL, title, and the matched pass
       const client = getClient(session);
       const res = await client.http.get(`${BASE}?${params.toString()}`, originHeaders(requestOrigin(mcpClient, session)));
       const results = res.data?.results ?? [];
-      return withAgentHints(withStructured(fmtDeveloper(results), { results }), res.data, true);
+      return withStructured(fmtDeveloper(results), { results });
     }
   });
 }
@@ -2722,11 +2702,7 @@ Returns ranked results with a position, title, URL, and matched snippet. Results
         originHeaders(requestOrigin(mcpClient, session))
       );
       const results = res.data?.data?.web ?? [];
-      return withAgentHints(
-        withStructured(fmtGov(results), { results }),
-        res.data,
-        true
-      );
+      return withStructured(fmtGov(results), { results });
     }
   });
 }
@@ -2737,12 +2713,10 @@ import { z as z8 } from "zod";
 // src/core-http-error.ts
 var CoreHttpError = class extends Error {
   status;
-  agent_hints;
-  constructor(message, status, agentHints2) {
+  constructor(message, status) {
     super(message);
     this.name = "CoreHttpError";
     this.status = status;
-    if (agentHints2 !== void 0) this.agent_hints = agentHints2;
   }
 };
 
@@ -2765,7 +2739,6 @@ async function monitorRequest(api, session, origin, path2, init = {}) {
   }
   const headers = {
     ...originHeaders(origin),
-    ...AGENT_HINTS_HEADERS,
     ...extraHeaders
   };
   if (apiKey2) headers.Authorization = `Bearer ${apiKey2}`;
@@ -2778,13 +2751,10 @@ async function monitorRequest(api, session, origin, path2, init = {}) {
   const payload = await response.json().catch(() => ({}));
   if (!response.ok || payload?.success === false) {
     const message = payload?.error || `HTTP ${response.status}: ${response.statusText || "Request failed"}`;
-    throw new CoreHttpError(message, response.status, readAgentHints(payload));
+    throw new CoreHttpError(message, response.status);
   }
   return payload;
 }
-function monitorResult(data) {
-  return withAgentHints(structuredText(data), data);
-}
 var pageStatusSchema = z8.enum(["same", "new", "changed", "removed", "error"]);
 var checkStatusSchema = z8.enum([
   "queued",
@@ -2910,7 +2880,7 @@ In the simple form, a \`goal\` is required. If \`queries\` contains one or more
           body
         }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -2943,7 +2913,7 @@ List monitors for the authenticated account with optional pagination controls. R
           query: { limit, offset }
         }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -2970,7 +2940,7 @@ Retrieve one monitor by ID, including its configuration and current state. This
         requestOrigin(mcpClient, session),
         `/monitor/${encodeURIComponent(id)}`
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3003,7 +2973,7 @@ Returns the updated monitor.
         `/monitor/${encodeURIComponent(id)}`,
         { method: "PATCH", body }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3032,7 +3002,7 @@ Permanently delete a monitor by ID and stop its future schedule. This operation
         `/monitor/${encodeURIComponent(id)}`,
         { method: "DELETE" }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3060,7 +3030,7 @@ Queue an immediate check for a monitor outside its normal schedule. This starts
         `/monitor/${encodeURIComponent(id)}/run`,
         { method: "POST" }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3093,7 +3063,7 @@ List historical checks for a monitor, optionally filtered by status and bounded
         `/monitor/${encodeURIComponent(id)}/checks`,
         { query: { limit, offset, status } }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3129,7 +3099,7 @@ Markdown tracking returns a unified text diff, JSON tracking returns field paths
         `/monitor/${encodeURIComponent(id)}/checks/${encodeURIComponent(checkId)}`,
         { query: { limit, skip, status: pageStatus } }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
 }
@@ -3137,9 +3107,6 @@ Markdown tracking returns a unified text diff, JSON tracking returns field paths
 // src/research.ts
 import { z as z9 } from "zod";
 var BASE3 = "/v2/search/research";
-function researchHeaders(origin) {
-  return { ...originHeaders(origin), ...AGENT_HINTS_HEADERS };
-}
 function appendParam(params, key, value) {
   if (value == null) return;
   if (Array.isArray(value)) {
@@ -3284,10 +3251,10 @@ Returns ranked papers with canonical IDs, titles, authors, and abstracts.
       const client = getClient(session);
       const res = await client.http.get(
         withQuery(`${BASE3}/papers`, params),
-        researchHeaders(requestOrigin(mcpClient, session))
+        originHeaders(requestOrigin(mcpClient, session))
       );
       const results = res.data?.results ?? [];
-      return withAgentHints(withStructured(fmtHits(results), { results }), res.data, true);
+      return withStructured(fmtHits(results), { results });
     }
   });
   server.addTool({
@@ -3315,13 +3282,13 @@ Retrieve canonical metadata for one paper ID, such as an arXiv, PMC, PMID, or DO
       const client = getClient(session);
       const res = await client.http.get(
         `${BASE3}/papers/${encodeURIComponent(paperId)}`,
-        researchHeaders(requestOrigin(mcpClient, session))
+        originHeaders(requestOrigin(mcpClient, session))
       );
       const paper = res.data?.paper;
-      return withAgentHints(withStructured(
+      return withStructured(
         fmtPaperMetadata(paper),
         paper ? { paper } : {}
-      ), res.data, true);
+      );
     }
   });
   server.addTool({
@@ -3363,17 +3330,17 @@ Returns ranked candidates and the evaluated pool size.
           `${BASE3}/papers/${encodeURIComponent(primary)}/similar`,
           params
         ),
-        researchHeaders(requestOrigin(mcpClient, session))
+        originHeaders(requestOrigin(mcpClient, session))
       );
       const results = res.data?.results ?? [];
       const poolSize = res.data?.poolSize ?? 0;
       const note = res.data?.note ? `
 note: ${res.data.note}` : "";
-      return withAgentHints(withStructured(
+      return withStructured(
         `${fmtHits(results)}
 (poolSize=${poolSize})${note}`,
         { results, poolSize, ...res.data?.note ? { note: res.data.note } : {} }
-      ), res.data, true);
+      );
     }
   });
   server.addTool({
@@ -3408,13 +3375,13 @@ Returns matching passages or a notice when full text is unavailable.
       const client = getClient(session);
       const res = await client.http.get(
         withQuery(`${BASE3}/papers/${encodeURIComponent(paperId)}`, params),
-        researchHeaders(requestOrigin(mcpClient, session))
+        originHeaders(requestOrigin(mcpClient, session))
       );
       const passages = res.data?.passages ?? [];
-      return withAgentHints(withStructured(
+      return withStructured(
         passages.length ? passages.map((p) => p.text).join("\n---\n") : "(no full-text passages available for this paper)",
         { passages }
-      ), res.data, true);
+      );
     }
   });
   server.addTool({
@@ -3640,20 +3607,6 @@ async function runWithCredentialRecovery(run, requestId, session) {
     return await run();
   } catch (error2) {
     if (session?.authType !== "api-key" || !isCoreCredentialRejection(error2, session)) {
-      const hints = readErrorAgentHints(error2);
-      if (hints) {
-        const message = error2 instanceof Error ? error2.message : String(error2);
-        throw new UserError(
-          hints.length ? `${message}
-
-${agentHintsText(hints)}` : message,
-          {
-            ...error2 instanceof UserError ? error2.extras : {},
-            error: message,
-            agent_hints: hints
-          }
-        );
-      }
       throw error2;
     }
     const payload = recoveryPayload("CREDENTIAL_INVALID", requestId);
@@ -3712,8 +3665,6 @@ var searchDomainSchema = z11.string().trim().toLowerCase().min(1).max(253).regex
 var searchToolBaseFields = {
   toolDetail: z11.enum(["compact", "summary", "full"]).optional().describe("Compact by default. Compact returns only provider, capability and description; full includes contracts. Inspect selected compact tools with firecrawl_find_tools providers and capabilities."),
   query: z11.string().min(1).describe("Query for web and semantic tool discovery. Operators include quoted phrases, `-term`, `site:host`, `inurl:term`, `intitle:term`, and `related:host`; the set is non-exhaustive. Catalogue browsing is available through firecrawl_find_tools."),
-  objective: z11.string().trim().min(1).max(5e3).optional().describe("Optional broader goal for this search, if known. Avoid sensitive information."),
-  clientModel: z11.string().trim().min(1).max(128).optional().describe("Optional model identifier, if known."),
   domainTools: z11.boolean().optional().describe(
     "Include domain-matched tools for result URLs. Defaults to true when Alexandria is combined with web, news or images; semantic-only search leaves domain matching off."
   ),
@@ -3779,7 +3730,7 @@ function termsRequiredAction(body) {
     url: action.url
   };
 }
-function termsRequiredError(action, context, hints) {
+function termsRequiredError(action, context) {
   const requestId = context.requestId;
   const retryIdentity = requestId ? ` and requestId ${requestId}` : "";
   const message = `Alexandria provider terms required. An organization admin must accept the ${action.terms} provider's terms (version ${action.version}) before this request can run.`;
@@ -3794,7 +3745,6 @@ Do not retry until acceptance is confirmed.`,
       code: TERMS_REQUIRED_CODE,
       status: 403,
       message,
-      ...hints ? { agent_hints: hints } : {},
       ...requestId ? { requestId } : {},
       requiresAction: action,
       nextTool: {
@@ -3825,8 +3775,7 @@ Do not retry until acceptance is confirmed.`,
 function throwIfTermsRequired(error2, context) {
   const source = error2;
   const action = termsRequiredAction(source?.response?.data ?? source?.details);
-  if (action)
-    throw termsRequiredError(action, context, readErrorAgentHints(error2));
+  if (action) throw termsRequiredError(action, context);
 }
 async function relayTermsRequired(run, context) {
   try {
@@ -3844,7 +3793,6 @@ async function relayExchangeError(run, context) {
     const response = error2?.response;
     if (!response || response.status === 401) throw error2;
     const data = response.data;
-    const hints = readErrorAgentHints(error2);
     const message = typeof data?.error === "string" ? data.error : `Alexandria request failed (HTTP ${response.status})`;
     const disabledProvider = response.status === 403 ? context.providers?.find((provider) => message === `Access to ${provider} is disabled for this organization.`) : void 0;
     if (disabledProvider) {
@@ -3854,7 +3802,6 @@ async function relayExchangeError(run, context) {
           code: typeof data?.code === "string" ? data.code : "exchange_error",
           status: 403,
           message,
-          ...hints ? { agent_hints: hints } : {},
           nextTool: {
             name: "firecrawl_scrape",
             arguments: {
@@ -3868,7 +3815,6 @@ async function relayExchangeError(run, context) {
       code: typeof data?.code === "string" ? data.code : "exchange_error",
       status: response.status,
       message,
-      ...hints ? { agent_hints: hints } : {},
       ...typeof data?.chargeId === "string" ? { chargeId: data.chargeId } : {}
     });
   }
@@ -3915,10 +3861,6 @@ function copySession(session) {
     Object.getOwnPropertyDescriptors(session ?? {})
   );
 }
-function resultAgentHints(result) {
-  return result && typeof result === "object" ? readAgentHints(result.structuredContent) : void 0;
-}
-var warnedMissingAgentHintsInterceptor = false;
 var ConsoleLogger = class {
   constructor(shouldLog) {
     this.shouldLog = shouldLog;
@@ -4070,20 +4012,10 @@ function createFirecrawlMcpServer(options2 = {}) {
             requestId,
             session
           );
-          hooks.onToolResult?.({
-            ...call,
-            status: "success",
-            result,
-            agentHints: resultAgentHints(result)
-          });
+          hooks.onToolResult?.({ ...call, status: "success", result });
           return result;
         } catch (error2) {
-          hooks.onToolResult?.({
-            ...call,
-            status: "error",
-            error: error2,
-            agentHints: readErrorAgentHints(error2)
-          });
+          hooks.onToolResult?.({ ...call, status: "error", error: error2 });
           throw error2;
         }
       }
@@ -4114,44 +4046,7 @@ function createFirecrawlMcpServer(options2 = {}) {
     if (apiKey2) {
       clientConfig.apiKey = apiKey2;
     }
-    const client = new FirecrawlApp(clientConfig);
-    const axiosInstance = client.http?.instance;
-    if (axiosInstance?.interceptors?.request?.use) {
-      axiosInstance.interceptors.request.use((request) => {
-        if (typeof request.headers?.set === "function") {
-          request.headers.set("X-Firecrawl-Agent-Hints", "true");
-        } else {
-          request.headers = { ...request.headers ?? {}, ...AGENT_HINTS_HEADERS };
-        }
-        return request;
-      });
-    } else if (!warnedMissingAgentHintsInterceptor) {
-      warnedMissingAgentHintsInterceptor = true;
-      console.warn(
-        "[firecrawl-mcp] SDK request interceptor unavailable; API agent hints may be absent."
-      );
-    }
-    return client;
-  }
-  async function sdkResultWithAgentHints(client, execute) {
-    const responseInterceptors = client.http?.instance?.interceptors?.response;
-    if (!responseInterceptors?.use) return execute();
-    let hints;
-    const interceptor = responseInterceptors.use((response) => {
-      hints = readAgentHints(response?.data) ?? hints;
-      return response;
-    });
-    try {
-      const result = await execute();
-      return preserveAgentHints(result, { agent_hints: hints });
-    } catch (error2) {
-      if (hints && error2 && typeof error2 === "object" && !readErrorAgentHints(error2)) {
-        error2.agent_hints = hints;
-      }
-      throw error2;
-    } finally {
-      responseInterceptors.eject?.(interceptor);
-    }
+    return new FirecrawlApp(clientConfig);
   }
   const SAFE_MODE = config.safeMode;
   function getClient(session) {
@@ -4504,7 +4399,6 @@ function createFirecrawlMcpServer(options2 = {}) {
     const response = await fetch(`${resolveApiBaseUrl()}${pathName}`, {
       method: "POST",
       headers: {
-        ...AGENT_HINTS_HEADERS,
         "Content-Type": "application/json",
         ...extraHeaders,
         Authorization: `Bearer ${apiKey2}`,
@@ -4522,8 +4416,7 @@ function createFirecrawlMcpServer(options2 = {}) {
     if (!response.ok) {
       throw new CoreHttpError(
         parsed?.error || parsed?.message || `Firecrawl request failed (HTTP ${response.status})`,
-        response.status,
-        readAgentHints(parsed)
+        response.status
       );
     }
     return parsed;
@@ -4605,7 +4498,6 @@ function createFirecrawlMcpServer(options2 = {}) {
         session,
         origin
       );
-      const uploadHints = readAgentHints(uploadJson);
       const upload = parseApiData(uploadJson);
       if (!upload?.uploadUrl || !upload?.uploadRef) {
         throw new Error(
@@ -4616,7 +4508,6 @@ function createFirecrawlMcpServer(options2 = {}) {
       const uploadForCommand = { ...upload, headers: uploadHeaders };
       return asText({
         success: true,
-        ...uploadHints ? { agent_hints: uploadHints } : {},
         mode: "hosted-upload-ref-awaiting-upload",
         message: "Hosted MCP cannot read local files. Run the local upload command, then call firecrawl_parse again with uploadRef. No Firecrawl API key is included in this command.",
         upload: {
@@ -4715,20 +4606,17 @@ Alexandria mode, on an authenticated session with Alexandria access: \`alexandri
           },
           session
         );
-        return structuredText(preserveAgentHints(json?.data ?? json, json));
+        return structuredText(withoutDiscoveredToolPrices(json?.data ?? json));
       }
       const client = getClient(session);
       const res = await relayTermsRequired(
-        () => sdkResultWithAgentHints(
-          client,
-          () => client.scrape(String(url), {
-            ...cleaned,
-            origin
-          })
-        ),
+        () => client.scrape(String(url), {
+          ...cleaned,
+          origin
+        }),
         { tool: "firecrawl_scrape" }
       );
-      return structuredText(res);
+      return structuredText(withoutDiscoveredToolPrices(res));
     }
   };
   server.addTool({
@@ -4765,13 +4653,10 @@ Returns matching URLs rather than page bodies. Retrieve one page with \`firecraw
       const client = getClient(session);
       const cleaned = removeEmptyTopLevel(options3);
       log.info("Mapping URL", { url: String(url) });
-      const res = await sdkResultWithAgentHints(
-        client,
-        () => client.map(String(url), {
-          ...cleaned,
-          origin: requestOrigin(mcpClient, session)
-        })
-      );
+      const res = await client.map(String(url), {
+        ...cleaned,
+        origin: requestOrigin(mcpClient, session)
+      });
       return structuredText(res);
     }
   });
@@ -4834,7 +4719,7 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
         const json = await keylessPost("/v2/search", searchBody, session);
         const keylessResponse = { ...json ?? {} };
         delete keylessResponse.id;
-        return structuredCompact(keylessResponse);
+        return structuredCompact(withoutDiscoveredToolPrices(keylessResponse));
       }
       const client = getClient(session);
       const postSearch = () => postSearchWithFallback(
@@ -4844,10 +4729,10 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
       );
       const context = { tool: "firecrawl_search" };
       const httpRes = exchangeSource ? await relayExchangeError(postSearch, context) : await relayTermsRequired(postSearch, context);
-      return structuredCompact(httpRes?.data ?? {});
+      return structuredCompact(withoutDiscoveredToolPrices(httpRes?.data ?? {}));
     }
   });
-  async function executeExchangeCalls(session, alexandria, suppliedRequestId, timeout, origin = requestOrigin(void 0, session)) {
+  async function executeExchangeCalls(session, alexandria, suppliedRequestId, timeout, origin = requestOrigin(void 0, session), includeCosts = false) {
     assertExchangeCredential2(session);
     const client = getClient(session);
     const requestId = suppliedRequestId ?? randomUUID2();
@@ -4869,7 +4754,7 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
       );
       const calls = Array.isArray(alexandria) ? alexandria : [alexandria];
       return alexandriaOutput(
-        { ...response?.data ?? {}, requestId },
+        { ...includeCosts ? response?.data ?? {} : withoutResultPrices(response?.data ?? {}), requestId },
         calls,
         async (body, id) => {
           const result = await client.http.post(
@@ -4910,6 +4795,7 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
       } catch (error2) {
         throw new UserError2(error2 instanceof Error ? error2.message : String(error2));
       }
+      const carry = args2.includeCosts ? { includeCosts: true } : {};
       if (options3.level === "categories") {
         assertExchangeCredential2(session);
         const response = await relayExchangeError(
@@ -4927,11 +4813,12 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
           next: { provider: "firecrawl", capability: "find-tools", options: { categories: [row.cohort], level: "providers", limit: options3.limit } }
         }));
         const page = { level: "categories", items, total: rows.length };
-        if (offset + options3.limit < rows.length) page.nextTool = { name: "firecrawl_find_tools", arguments: { level: "categories", limit: options3.limit, offset: offset + options3.limit } };
-        return structuredCompact(withAlexandriaFeedbackHint(withFindToolsNavigation({ success: true, data: { creditsCost: 0, alexandria: [{ provider: "firecrawl", capability: "find-tools", creditsCost: 0, data: page }] } }), alexandriaFeedbackAvailable()));
+        if (offset + options3.limit < rows.length) page.nextTool = { name: "firecrawl_find_tools", arguments: { level: "categories", limit: options3.limit, offset: offset + options3.limit, ...carry } };
+        return structuredCompact(withAlexandriaFeedbackHint(withFindToolsNavigation({ success: true, data: { alexandria: [{ provider: "firecrawl", capability: "find-tools", data: page }] } }, carry), alexandriaFeedbackAvailable()));
       }
-      const result = await executeExchangeCalls(session, { provider: "firecrawl", capability: "find-tools", options: options3 }, void 0, void 0, origin);
-      return structuredCompact(withFindToolsNavigation(JSON.parse(result)));
+      const result = await executeExchangeCalls(session, { provider: "firecrawl", capability: "find-tools", options: options3 }, void 0, void 0, origin, carry.includeCosts);
+      const envelope = JSON.parse(result);
+      return structuredCompact(withFindToolsNavigation(carry.includeCosts ? envelope : withoutFindToolsPrices(envelope), carry));
     }
   };
   server.addTool(findToolsTool);
@@ -4951,7 +4838,6 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
     const origin = originOverride ?? (typeof body.origin === "string" && body.origin.length > 0 ? body.origin : requestOrigin(void 0, session));
     await hooks.beforeKeylessRequest?.(session, origin);
     const headers = {
-      ...AGENT_HINTS_HEADERS,
       ...originHeaders(origin),
       "Content-Type": "application/json",
       ...resolveOutbound(session).headers
@@ -4969,14 +4855,11 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
           retryAfterSeconds: Number.isFinite(json?.retry_after_seconds) && json.retry_after_seconds > 0 ? json.retry_after_seconds : void 0,
           signupUrl: keylessSignupUrlFrom(json?.signup_url)
         });
-        const hints = readAgentHints(json);
-        if (hints) payload.agent_hints = hints;
         throw new UserError2(String(payload.message), payload);
       }
       throw new CoreHttpError(
         json?.error || `Firecrawl request failed (HTTP ${response.status})`,
-        response.status,
-        readAgentHints(json)
+        response.status
       );
     }
     return json;
@@ -4997,8 +4880,7 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
         creditsUsed: body.creditsUsed,
         expiresAt: body.expiresAt,
         next: body.next ?? null,
-        data: initialDocs,
-        ...readAgentHints(body) ? { agent_hints: readAgentHints(body) } : {}
+        data: initialDocs
       };
     }
     const docs = initialDocs.slice();
@@ -5022,8 +4904,7 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
       creditsUsed: body.creditsUsed,
       expiresAt: body.expiresAt,
       next: null,
-      data: docs,
-      ...readAgentHints(body) ? { agent_hints: readAgentHints(body) } : {}
+      data: docs
     };
   }
   async function waitForCrawlCompletionWithOrigin(client, jobId, origin, pollInterval = 2, timeout) {
@@ -5119,7 +5000,6 @@ Eligibility is limited to successful searches within the feedback age window. Th
         }
         if (querySuggestions) body.querySuggestions = querySuggestions;
         const headers = {
-          ...AGENT_HINTS_HEADERS,
           ...originHeaders(origin),
           "Content-Type": "application/json"
         };
@@ -5160,8 +5040,7 @@ Eligibility is limited to successful searches within the feedback age window. Th
             status: response.status,
             feedbackErrorCode: parsed?.feedbackErrorCode,
             error: parsed?.error ?? `HTTP ${response.status}`,
-            retryable: response.status >= 500,
-            ...readAgentHints(parsed) ? { agent_hints: readAgentHints(parsed) } : {}
+            retryable: response.status >= 500
           });
         }
         return structuredText(parsed);
@@ -5245,7 +5124,6 @@ Returns submission status, feedback ID, and accounting fields.
         } = args2;
         const apiBase = resolveApiBaseUrl();
         const headers = {
-          ...AGENT_HINTS_HEADERS,
           ...originHeaders(origin),
           "Content-Type": "application/json"
         };
@@ -5301,8 +5179,7 @@ Returns submission status, feedback ID, and accounting fields.
             status: response.status,
             feedbackErrorCode: parsed?.feedbackErrorCode,
             error: parsed?.error ?? `HTTP ${response.status}`,
-            retryable: response.status >= 500,
-            ...readAgentHints(parsed) ? { agent_hints: readAgentHints(parsed) } : {}
+            retryable: response.status >= 500
           });
         }
         return structuredText(parsed);
@@ -5790,7 +5667,6 @@ Set \`redactPII\` to request redaction of personally identifiable information in
       form.append("file", blob, filename);
       form.append("options", JSON.stringify(optionsPayload));
       const headers = {
-        ...AGENT_HINTS_HEADERS,
         ...originHeaders(origin)
       };
       const outbound = resolveOutbound(session);
@@ -5812,15 +5688,9 @@ Set \`redactPII\` to request redaction of personally identifiable information in
       });
       const responseText = await response.text();
       if (!response.ok) {
-        let parsed;
-        try {
-          parsed = JSON.parse(responseText);
-        } catch {
-        }
         throw new CoreHttpError(
           `Parse request failed with status ${response.status}: ${responseText}`,
-          response.status,
-          readAgentHints(parsed)
+          response.status
         );
       }
       try {
@@ -5848,6 +5718,9 @@ Set \`redactPII\` to request redaction of personally identifiable information in
       builtInTool: (name2) => builtInTools.get(name2)
     }
   );
+  hooks.registerResources?.({
+    addResource: (resource) => server.addResource(resource)
+  });
   return {
     start: (args2) => server.start(args2),
     stop: () => server.stop()
@@ -6005,7 +5878,7 @@ function getOAuthIssuer() {
     normalizeHeader(process.env.FIRECRAWL_OAUTH_ISSUER) ?? DEFAULT_OAUTH_ISSUER
   );
 }
-var SEARCH_PROFILE_INSTRUCTIONS = ALEXANDRIA_SEARCH_INSTRUCTIONS + ` Firecrawl provides web, developer, government, and research search, and executes catalogued Alexandria data providers. Use firecrawl_search to find relevant results across the web and specialized indexes; authenticated searches also return matching Alexandria providers in data.tools. firecrawl_find_tools provides catalogue browsing and provider contracts; firecrawl_scrape with an alexandria body executes a selected capability; firecrawl_scrape with a url retrieves one supplied page. For a programming question, firecrawl_developer_search searches indexed public repositories, GitHub issues, merged pull requests, READMEs, and code documentation and returns the matched passages, and skills: "only" narrows it to agent-skill files; firecrawl_search with categories: ["developer"] reaches the same index beside ordinary web results, returning the hits in the web group rather than as passages and offering no skills filter. For a legal or regulatory question, firecrawl_gov_search searches primary law and regulatory material from US federal, state, and local government sources: statutes, regulations, codes, court opinions, and other government publications; firecrawl_search with categories: ["gov"] reaches the same sources in the web group and cannot be combined with other categories. For a biomedical, life-science, clinical, or arXiv literature question, the firecrawl_research_* tools search the paper index, while categories: ["research"] on firecrawl_search filters ordinary web results to research-affiliated websites. Use the firecrawl_research_* tools to search academic and research literature, expand from anchor papers via the citation graph, and read full-text passages from a specific paper. Search and discovery tools are read-only and return ranked results. Billing: web, developer, and research search are billed per request; government search is free; Alexandria discovery (firecrawl_search with sources ["alexandria"] alone, and firecrawl_find_tools) is free; firecrawl_scrape is billed, as a page retrieval in url mode or at each executed capability's listed price in alexandria mode.`;
+var SEARCH_PROFILE_INSTRUCTIONS = ALEXANDRIA_SEARCH_INSTRUCTIONS + ` Firecrawl provides web, developer, government, and research search, and executes catalogued Alexandria data providers. Use firecrawl_search to find relevant results across the web and specialized indexes; authenticated searches also return matching Alexandria providers in data.tools. firecrawl_find_tools provides catalogue browsing and provider contracts; firecrawl_scrape with an alexandria body executes a selected capability; firecrawl_scrape with a url retrieves one supplied page. For a programming question, firecrawl_developer_search searches indexed public repositories, GitHub issues, merged pull requests, READMEs, and code documentation and returns the matched passages, and skills: "only" narrows it to agent-skill files; firecrawl_search with categories: ["developer"] reaches the same index beside ordinary web results, returning the hits in the web group rather than as passages and offering no skills filter. For a legal or regulatory question, firecrawl_gov_search searches primary law and regulatory material from US federal, state, and local government sources: statutes, regulations, codes, court opinions, and other government publications; firecrawl_search with categories: ["gov"] reaches the same sources in the web group and cannot be combined with other categories. For a biomedical, life-science, clinical, or arXiv literature question, the firecrawl_research_* tools search the paper index, while categories: ["research"] on firecrawl_search filters ordinary web results to research-affiliated websites. Use the firecrawl_research_* tools to search academic and research literature, expand from anchor papers via the citation graph, and read full-text passages from a specific paper. Search and discovery tools are read-only and return ranked results. Billing: web, developer, and research search are billed per request; government search is free; Alexandria discovery (firecrawl_search with sources ["alexandria"] alone, and firecrawl_find_tools) is free; firecrawl_scrape is billed, as a page retrieval in url mode or per executed capability in alexandria mode (pass includeCosts to firecrawl_find_tools to see prices).`;
 var SEARCH_PROFILE_TOOLS = /* @__PURE__ */ new Set([
   "firecrawl_search",
   "firecrawl_developer_search",
@@ -6514,7 +6387,7 @@ Scrape one URL and return its content, or execute catalogued Alexandria capabili
 
 \`firecrawl_search\` with \`sources\` unset and \`firecrawl_find_tools\` can discover providers for the same fields across several pages; a matching Alexandria provider returns typed records in one call.
 
-Alexandria mode: \`alexandria\` selects catalogued capability execution and is mutually exclusive with \`url\`. Alexandria execution is billed at the capability's listed price and needs a team with Alexandria enabled.
+Alexandria mode: \`alexandria\` selects catalogued capability execution and is mutually exclusive with \`url\`. Alexandria execution is billed per capability (pass includeCosts to firecrawl_find_tools to see prices if you need) and needs a team with Alexandria enabled.
 `;
 }
 var SEARCH_SURFACE_FIND_TOOLS_DESCRIPTION = "Browse Alexandria data providers and workflows or read a selected contract. Alexandria covers " + ALEXANDRIA_CATALOGUE_VERTICALS + ": typed, sourced records through published contracts. Prefer normal firecrawl_search for a data task; it already returns matching providers. Use this tool when the contract you need was not returned in full, to browse a category when search found nothing, or before scraping the same fields from several pages. Discovery is free. Use query for semantic discovery or urls to find providers for a website. With no arguments, browse categories, then providers and tools. Contracts describe the inputs and outputs for execution through firecrawl_scrape. nextTool identifies further discovery or pagination. Discovery does not execute providers. Use firecrawl_search when you also need web results.";
@@ -6540,6 +6413,13 @@ ${ALEXANDRIA_SEARCH_INSTRUCTIONS}
 Returns result groups in \`data\` and an operation \`id\`.
 `,
     outputSchema: searchOutputSchema,
+    beforeValidate: (args2) => {
+      if (args2 && typeof args2 === "object") {
+        delete args2.objective;
+        delete args2.clientModel;
+      }
+      return void 0;
+    },
     parameters: z13.object({ ...searchToolBaseFields }).strict().refine(searchDomainsAreExclusive, SEARCH_DOMAINS_CONFLICT_MESSAGE).refine(
       searchQueryIsValid,
       "A query is required. Use firecrawl_find_tools to browse the catalogue."
@@ -6547,8 +6427,6 @@ Returns result groups in \`data\` and an operation \`id\`.
     execute: async (args2, { session, log, client: mcpClient }) => {
       const {
         query,
-        objective,
-        clientModel,
         includeDomains,
         excludeDomains,
         limit,
@@ -6566,8 +6444,6 @@ Returns result groups in \`data\` and an operation \`id\`.
       const searchBody = {
         query: searchQuery,
         ...removeEmptyTopLevel({
-          objective,
-          clientModel,
           limit,
           includeDomains,
           excludeDomains,