firecrawl-mcp 3.29.0 → 3.30.0

package/dist/index.js

@@ -3,17 +3,6 @@
 // src/index.ts
 import dotenv from "dotenv";
 
-// src/headers.ts
-function normalizeHeader(value) {
-  if (value == null) return void 0;
-  const v = Array.isArray(value) ? value[0] : value;
-  const trimmed = typeof v === "string" ? v.trim() : "";
-  return trimmed || void 0;
-}
-function withoutTrailingSlash(value) {
-  return value.replace(/\/+$/, "");
-}
-
 // src/alexandria-feedback.ts
 import { z } from "zod";
 var detail = z.string().trim().min(1).max(2e3);
@@ -96,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 {
@@ -900,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,
@@ -2075,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";
@@ -2088,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) {
@@ -2155,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."),
@@ -2175,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."),
@@ -2207,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,
@@ -2215,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,
@@ -2227,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."),
@@ -2253,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,
@@ -2268,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`."),
@@ -2277,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."),
@@ -2305,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."),
@@ -2320,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,
@@ -2355,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."),
@@ -2406,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."),
@@ -2435,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."),
@@ -2684,7 +2609,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 });
     }
   });
 }
@@ -2733,11 +2658,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 });
     }
   });
 }
@@ -2748,12 +2669,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;
   }
 };
 
@@ -2776,7 +2695,6 @@ async function monitorRequest(api, session, origin, path2, init = {}) {
   }
   const headers = {
     ...originHeaders(origin),
-    ...AGENT_HINTS_HEADERS,
     ...extraHeaders
   };
   if (apiKey2) headers.Authorization = `Bearer ${apiKey2}`;
@@ -2789,13 +2707,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",
@@ -2921,7 +2836,7 @@ In the simple form, a \`goal\` is required. If \`queries\` contains one or more
           body
         }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -2954,7 +2869,7 @@ List monitors for the authenticated account with optional pagination controls. R
           query: { limit, offset }
         }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -2981,7 +2896,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({
@@ -3014,7 +2929,7 @@ Returns the updated monitor.
         `/monitor/${encodeURIComponent(id)}`,
         { method: "PATCH", body }
       );
-      return monitorResult(res);
+      return structuredText(res);
     }
   });
   server.addTool({
@@ -3043,7 +2958,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({
@@ -3071,7 +2986,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({
@@ -3104,7 +3019,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({
@@ -3140,7 +3055,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);
     }
   });
 }
@@ -3148,9 +3063,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)) {
@@ -3295,10 +3207,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({
@@ -3326,13 +3238,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({
@@ -3374,17 +3286,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({
@@ -3419,13 +3331,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({
@@ -3530,6 +3442,17 @@ The historical view returns periods sorted by start date with \`startDate\`, \`e
   });
 }
 
+// src/headers.ts
+function normalizeHeader(value) {
+  if (value == null) return void 0;
+  const v = Array.isArray(value) ? value[0] : value;
+  const trimmed = typeof v === "string" ? v.trim() : "";
+  return trimmed || void 0;
+}
+function withoutTrailingSlash(value) {
+  return value.replace(/\/+$/, "");
+}
+
 // src/recovery.ts
 import { randomUUID } from "crypto";
 
@@ -3640,20 +3563,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 +3621,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 +3686,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 +3701,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 +3731,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 +3749,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 +3758,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 +3771,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 +3817,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 +3968,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 +4002,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) {
@@ -4291,6 +4142,7 @@ function createFirecrawlMcpServer(options2 = {}) {
         "rawHtml",
         "screenshot",
         "links",
+        "images",
         "summary",
         "changeTracking",
         "branding",
@@ -4503,7 +4355,6 @@ function createFirecrawlMcpServer(options2 = {}) {
     const response = await fetch(`${resolveApiBaseUrl()}${pathName}`, {
       method: "POST",
       headers: {
-        ...AGENT_HINTS_HEADERS,
         "Content-Type": "application/json",
         ...extraHeaders,
         Authorization: `Bearer ${apiKey2}`,
@@ -4521,8 +4372,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;
@@ -4604,7 +4454,6 @@ function createFirecrawlMcpServer(options2 = {}) {
         session,
         origin
       );
-      const uploadHints = readAgentHints(uploadJson);
       const upload = parseApiData(uploadJson);
       if (!upload?.uploadUrl || !upload?.uploadRef) {
         throw new Error(
@@ -4615,7 +4464,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: {
@@ -4714,17 +4562,14 @@ Alexandria mode, on an authenticated session with Alexandria access: \`alexandri
           },
           session
         );
-        return structuredText(preserveAgentHints(json?.data ?? json, json));
+        return structuredText(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);
@@ -4764,13 +4609,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);
     }
   });
@@ -4934,9 +4776,9 @@ For a programming question, add \`categories: ["developer"]\`; its hits return i
     }
   };
   server.addTool(findToolsTool);
-  const DEFAULT_CLOUD_API_URL2 = "https://api.firecrawl.dev";
+  const DEFAULT_CLOUD_API_URL = "https://api.firecrawl.dev";
   function resolveApiBaseUrl() {
-    return (config.apiUrl || DEFAULT_CLOUD_API_URL2).replace(
+    return (config.apiUrl || DEFAULT_CLOUD_API_URL).replace(
       /\/$/,
       ""
     );
@@ -4950,7 +4792,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
@@ -4968,14 +4809,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;
@@ -4996,8 +4834,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();
@@ -5021,8 +4858,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) {
@@ -5118,7 +4954,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"
         };
@@ -5159,8 +4994,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);
@@ -5244,7 +5078,6 @@ Returns submission status, feedback ID, and accounting fields.
         } = args2;
         const apiBase = resolveApiBaseUrl();
         const headers = {
-          ...AGENT_HINTS_HEADERS,
           ...originHeaders(origin),
           "Content-Type": "application/json"
         };
@@ -5300,8 +5133,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);
@@ -5789,7 +5621,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);
@@ -5811,15 +5642,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 {
@@ -5847,6 +5672,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()
@@ -5923,20 +5751,6 @@ function introspectionTtlMs(value, now, activeTtlMs = INTROSPECTION_ACTIVE_TTL_M
   return Math.min(activeTtlMs, value.exp * 1e3 - now);
 }
 
-// src/service/keyless-client-ip.ts
-import net from "net";
-function extractSingleTrustedClientIp(rawForwardedFor) {
-  if (Array.isArray(rawForwardedFor) && rawForwardedFor.length !== 1) {
-    return void 0;
-  }
-  const raw = Array.isArray(rawForwardedFor) ? rawForwardedFor[0] : rawForwardedFor;
-  if (typeof raw !== "string") return void 0;
-  const parts = raw.split(",").map((part) => part.trim()).filter(Boolean);
-  if (parts.length !== 1) return void 0;
-  const candidate = parts[0].replace(/^\[(.*)\]$/, "$1").toLowerCase();
-  return net.isIP(candidate) ? candidate : void 0;
-}
-
 // src/service/session-credential.ts
 import { createHmac } from "crypto";
 var managedOAuthApiKey = /* @__PURE__ */ Symbol("firecrawlManagedOAuthApiKey");
@@ -6113,9 +5927,6 @@ function makePrimaryProfile() {
 }
 
 // src/service/auth.ts
-function extractClientIp(request) {
-  return extractSingleTrustedClientIp(request?.headers?.["x-forwarded-for"]);
-}
 function extractBearerToken(headers) {
   const headerAuth = normalizeHeader(headers["authorization"]);
   if (!headerAuth?.toLowerCase().startsWith("bearer ")) return void 0;
@@ -6128,9 +5939,6 @@ function isFirecrawlOAuthAccessToken(token) {
 function isFirecrawlApiKey(token) {
   return token.startsWith("fc-");
 }
-function isLegacyKeyPathRequest(request) {
-  return normalizeHeader(request?.headers?.["x-firecrawl-key-transport"]) === "path";
-}
 function requestShouldReceiveOAuthChallenge(request, profile) {
   if (!profile.acceptApiKeys) return true;
   if (!request?.headers) return true;
@@ -6415,19 +6223,11 @@ async function authenticateRequest(request, profile, options2) {
           return {
             authType: "api-key",
             credentialError: "CREDENTIAL_INVALID",
-            firecrawlApiKey: void 0,
-            keylessClientIp: extractClientIp(request)
+            firecrawlApiKey: void 0
           };
         }
         throw new InvalidFirecrawlCredentialError();
       }
-      if (profile.allowKeyless) {
-        return {
-          authType: "keyless",
-          firecrawlApiKey: void 0,
-          keylessClientIp: extractClientIp(request)
-        };
-      }
       if (!profile.acceptApiKeys) {
         throw new Error(
           `OAuth access token required for the Firecrawl MCP resource ${profile.endpoint}`
@@ -6440,7 +6240,6 @@ async function authenticateRequest(request, profile, options2) {
     const session2 = {
       authType: resolved?.source === "oauth" ? "oauth" : "api-key",
       firecrawlApiKey: headerCred,
-      ...isLegacyKeyPathRequest(request) ? { keyTransport: "path" } : {},
       ...resolved?.metadata
     };
     return managedCred ? setManagedOAuthApiKey(session2, managedCred) : session2;
@@ -6489,18 +6288,6 @@ function emitSearchCompanionAuthTelemetry(hosted2, profile, request, outcome, se
     })
   );
 }
-function emitLegacyKeyPathTelemetry(profile, request, outcome, session) {
-  if (profile.id !== "full" || !isLegacyKeyPathRequest(request)) return;
-  console.log(
-    "[MCP_LEGACY_KEY_PATH]",
-    JSON.stringify({
-      auth_type: session?.authType ?? "none",
-      key_transport: "path",
-      outcome,
-      resource: profile.resourceUrl
-    })
-  );
-}
 function createServiceAuthenticate(profile, options2) {
   return function authenticateWithOAuthChallenge(request) {
     return authenticateRequest(request, profile, options2).then((session) => {
@@ -6512,12 +6299,6 @@ function createServiceAuthenticate(profile, options2) {
         session.credentialError ? "rejected" : "accepted",
         session
       );
-      emitLegacyKeyPathTelemetry(
-        profile,
-        request,
-        session.credentialError ? "rejected" : "accepted",
-        session
-      );
       return session;
     }).catch((error2) => {
       emitSearchCompanionAuthTelemetry(
@@ -6526,7 +6307,6 @@ function createServiceAuthenticate(profile, options2) {
         request,
         "rejected"
       );
-      emitLegacyKeyPathTelemetry(profile, request, "rejected");
       if (error2 instanceof InvalidFirecrawlCredentialError) {
         throw createInvalidCredentialResponse(error2);
       }
@@ -6553,76 +6333,6 @@ function createServiceAuthenticate(profile, options2) {
   };
 }
 
-// src/service/session.ts
-function isHostedKeylessSession(session) {
-  return session?.authType === "keyless" && !session.firecrawlApiKey;
-}
-
-// src/service/keyless.ts
-var DEFAULT_CLOUD_API_URL = "https://api.firecrawl.dev";
-function apiBaseUrl(apiUrl2) {
-  return (apiUrl2 || DEFAULT_CLOUD_API_URL).replace(/\/$/, "");
-}
-async function keylessEligible(apiBaseUrl2, clientIp, origin, { signupLink = false } = {}) {
-  const secret = process.env.KEYLESS_PROXY_SECRET;
-  if (!secret) return { eligible: false, unavailable: true };
-  try {
-    const response = await fetch(
-      `${apiBaseUrl2}/v2/keyless/eligibility${signupLink ? "?signup_link=1" : ""}`,
-      {
-        headers: {
-          ...originHeaders(origin),
-          "x-firecrawl-keyless-ip": clientIp,
-          "x-firecrawl-keyless-secret": secret
-        }
-      }
-    );
-    if (!response.ok) return { eligible: false, unavailable: true };
-    const json = await response.json().catch(() => null);
-    if (typeof json?.eligible !== "boolean") {
-      return { eligible: false, unavailable: true };
-    }
-    return {
-      eligible: json?.eligible === true,
-      ...typeof json?.reason === "string" ? { reason: json.reason } : {},
-      ...Number.isFinite(json?.retryAfterSeconds) && json.retryAfterSeconds > 0 ? { retryAfterSeconds: json.retryAfterSeconds } : {},
-      ...keylessSignupUrlFrom(json?.signupUrl) ? { signupUrl: json.signupUrl } : {}
-    };
-  } catch {
-    return { eligible: false, unavailable: true };
-  }
-}
-async function hostedKeylessSignupUrl(apiBaseUrl2, session) {
-  if (!session?.keylessClientIp) return void 0;
-  const eligibility = await keylessEligible(
-    apiBaseUrl2,
-    session.keylessClientIp,
-    requestOrigin(void 0, session),
-    { signupLink: true }
-  );
-  return eligibility.signupUrl;
-}
-async function requireKeylessEligibility(apiBase, session, origin) {
-  if (!isHostedKeylessSession(session)) return;
-  const eligibility = session?.keylessClientIp ? await keylessEligible(apiBase, session.keylessClientIp, origin) : { eligible: false };
-  if (!eligibility.eligible) {
-    const code = eligibility.unavailable ? "KEYLESS_ELIGIBILITY_UNAVAILABLE" : keylessQuotaReason(eligibility.reason) ? "KEYLESS_QUOTA_EXHAUSTED" : "KEYLESS_ACCESS_NOT_AVAILABLE";
-    const payload = recoveryPayload(code, session?.requestId, {
-      retryAfterSeconds: eligibility.retryAfterSeconds,
-      signupUrl: eligibility.signupUrl
-    });
-    throw new UserError2(String(payload.message), payload);
-  }
-}
-function keylessForwardingHeaders(session) {
-  const secret = process.env.KEYLESS_PROXY_SECRET;
-  if (!session?.keylessClientIp || !secret) return void 0;
-  return {
-    "x-firecrawl-keyless-ip": session.keylessClientIp,
-    "x-firecrawl-keyless-secret": secret
-  };
-}
-
 // src/service/search-surface.ts
 import { z as z13 } from "zod";
 function searchSurfaceScrapeDescription(safeMode) {
@@ -6657,6 +6367,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."
@@ -6664,8 +6381,6 @@ Returns result groups in \`data\` and an operation \`id\`.
     execute: async (args2, { session, log, client: mcpClient }) => {
       const {
         query,
-        objective,
-        clientModel,
         includeDomains,
         excludeDomains,
         limit,
@@ -6683,8 +6398,6 @@ Returns result groups in \`data\` and an operation \`id\`.
       const searchBody = {
         query: searchQuery,
         ...removeEmptyTopLevel({
-          objective,
-          clientModel,
           limit,
           includeDomains,
           excludeDomains,
@@ -6750,66 +6463,7 @@ function searchSurfaceTools({
 }
 
 // src/service/tool-guard.ts
-import { randomUUID as randomUUID4 } from "crypto";
-function emitActionLog(profile, apiUrl2, toolName, status, session, error2, requestId = randomUUID4(), code) {
-  const payload = {
-    team_id: session?.teamId,
-    user_id: session?.userId,
-    api_key_id: session?.apiKeyId,
-    oauth_client_id: session?.oauthClientId,
-    auth_type: session?.authType ?? "none",
-    tool_name: toolName,
-    status,
-    request_id: requestId,
-    resource: profile.resourceUrl,
-    ...error2 ? { error_class: error2 instanceof Error ? error2.name : typeof error2 } : {},
-    ...code ? { code } : {}
-  };
-  console.error("[MCP_ACTION]", JSON.stringify(payload));
-  const secret = normalizeHeader(process.env.FIRECRAWL_MCP_ACTION_LOG_SECRET);
-  const configuredApiUrl = normalizeHeader(apiUrl2);
-  const endpoint = normalizeHeader(process.env.FIRECRAWL_MCP_ACTION_LOG_URL) ?? (configuredApiUrl ? `${withoutTrailingSlash(configuredApiUrl)}/v2/mcp/action-logs` : void 0);
-  if (!secret || !endpoint || !payload.team_id || status === "started") return;
-  const actionLogPayload = { ...payload };
-  delete actionLogPayload.code;
-  void fetch(endpoint, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${secret}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify(actionLogPayload),
-    signal: AbortSignal.timeout(1500)
-  }).catch(() => void 0);
-}
-var AGENT_HINT_LOG_MAX_CHARS = 1e3;
-function emitAgentHintsLog(profile, toolName, status, hints, session, requestId) {
-  if (!hints) return;
-  console.error(
-    "[MCP_AGENT_HINTS]",
-    JSON.stringify({
-      tool_name: toolName,
-      status,
-      request_id: requestId,
-      auth_type: session.authType ?? "none",
-      // The companion search server shares this process and wrapper.
-      profile: session.profile ?? profile.id,
-      hint_count: hints.length,
-      hints: hints.map((hint) => hint.slice(0, AGENT_HINT_LOG_MAX_CHARS))
-    })
-  );
-}
-function createToolGuard({
-  profile,
-  apiUrl: apiUrl2,
-  apiBaseUrl: apiBaseUrl2,
-  logActions
-}) {
-  const logRejection = (toolName, session, error2, requestId, code) => {
-    if (logActions) {
-      emitActionLog(profile, apiUrl2, toolName, "error", session, error2, requestId, code);
-    }
-  };
+function createToolGuard() {
   return (tool) => {
     const keylessTool = keylessToolNames.has(tool.name);
     const execute = tool.execute;
@@ -6818,58 +6472,33 @@ function createToolGuard({
     return {
       ...tool,
       canList: (session) => (
-        // A credentialError session lists the keyless tool surface (same as a
-        // real keyless session, not the full authenticated schema) so the
-        // client proceeds past tools/list and calling any listed tool returns
-        // the CREDENTIAL_INVALID recovery payload (below). An empty list would
-        // leave MCP clients that stop after tools/list unable to ever surface
-        // the recovery guidance; the full non-keyless schema would over-disclose
-        // to a request carrying an unrecognized or invalid credential.
-        (session?.credentialError || isHostedKeylessSession(session) ? keylessTool : true) && (canList?.(session) ?? true)
+        // A credentialError session lists the keyless tool surface (not the
+        // full authenticated schema) so the client proceeds past tools/list and
+        // calling any listed tool returns the CREDENTIAL_INVALID recovery
+        // payload (below). An empty list would leave MCP clients that stop after
+        // tools/list unable to ever surface the recovery guidance; the full
+        // schema would over-disclose to a request carrying an unrecognized or
+        // invalid credential.
+        (session?.credentialError ? keylessTool : true) && (canList?.(session) ?? true)
       ),
       beforeValidate: async (args2, session) => {
-        const code = session?.credentialError ? "CREDENTIAL_INVALID" : isHostedKeylessSession(session) && !keylessTool ? "KEYLESS_TOOL_NOT_AVAILABLE" : void 0;
-        if (code) {
-          const requestId = randomUUID4();
-          const payload2 = recoveryPayload(code, requestId, {
-            signupUrl: code === "KEYLESS_TOOL_NOT_AVAILABLE" ? await hostedKeylessSignupUrl(apiBaseUrl2, session) : void 0
-          });
-          logRejection(tool.name, session, new UserError2(String(payload2.message), payload2), requestId, code);
+        if (session?.credentialError) {
+          const payload = recoveryPayload("CREDENTIAL_INVALID");
           return {
-            content: [{ type: "text", text: String(payload2.message) }],
+            content: [{ type: "text", text: String(payload.message) }],
             isError: true,
-            structuredContent: payload2
+            structuredContent: payload
           };
         }
-        const earlyResult = await beforeValidate?.(args2, session);
-        const payload = earlyResult?.structuredContent;
-        const recoveryCode = payload && typeof payload === "object" && "code" in payload && typeof payload.code === "string" ? payload.code : void 0;
-        if (earlyResult?.isError && recoveryCode) {
-          logRejection(
-            tool.name,
-            session,
-            new UserError2(`Tool validation failed: ${recoveryCode}`, payload),
-            randomUUID4(),
-            recoveryCode
-          );
-        }
-        return earlyResult;
+        return beforeValidate?.(args2, session);
       },
       execute: async (args2, context) => {
         const session = context.session;
-        const requestId = session.requestId;
         if (session.credentialError) {
-          const code = "CREDENTIAL_INVALID";
-          const payload = recoveryPayload(code, requestId);
-          logRejection(tool.name, session, new UserError2(String(payload.message), payload), requestId, code);
-          throw new UserError2(String(payload.message), payload);
-        }
-        if (isHostedKeylessSession(session) && !keylessTool) {
-          const code = "KEYLESS_TOOL_NOT_AVAILABLE";
-          const payload = recoveryPayload(code, requestId, {
-            signupUrl: await hostedKeylessSignupUrl(apiBaseUrl2, session)
-          });
-          logRejection(tool.name, session, new UserError2(String(payload.message), payload), requestId, code);
+          const payload = recoveryPayload(
+            "CREDENTIAL_INVALID",
+            session.requestId
+          );
           throw new UserError2(String(payload.message), payload);
         }
         return execute(args2, context);
@@ -6877,76 +6506,6 @@ function createToolGuard({
     };
   };
 }
-function createToolCallLogger({
-  profile,
-  apiUrl: apiUrl2,
-  logActions
-}) {
-  return (event) => {
-    const session = event.session;
-    if (event.status === "started") {
-      if (logActions) {
-        emitActionLog(profile, apiUrl2, event.tool, "started", session, void 0, event.requestId);
-      }
-      return;
-    }
-    emitAgentHintsLog(
-      profile,
-      event.tool,
-      event.status === "success" && !event.result?.isError ? "success" : "error",
-      event.agentHints,
-      session,
-      event.requestId
-    );
-    if (logActions) {
-      emitActionLog(
-        profile,
-        apiUrl2,
-        event.tool,
-        event.status,
-        session,
-        event.status === "error" ? event.error : void 0,
-        event.requestId
-      );
-    }
-  };
-}
-
-// src/service/http.ts
-function registerServiceRoutes(app, profile, { hosted: hosted2 }) {
-  const openAiAppsChallengeToken = normalizeHeader(
-    process.env.OPENAI_APPS_CHALLENGE_TOKEN
-  );
-  if (openAiAppsChallengeToken) {
-    app.get(
-      "/.well-known/openai-apps-challenge",
-      (context) => context.text(openAiAppsChallengeToken)
-    );
-  }
-  app.get("/ready", (context) => {
-    if (!hosted2) {
-      return context.json({ ok: true }, 200);
-    }
-    const searchPrimary = profile.id === "search";
-    const required = [
-      "FIRECRAWL_API_URL",
-      "FIRECRAWL_OAUTH_INTROSPECT_SECRET",
-      "MCP_DELEGATED_CREDENTIAL_SECRET"
-    ];
-    if (profile.allowKeyless) {
-      required.push("KEYLESS_PROXY_SECRET");
-    }
-    const missing = required.filter((name2) => !normalizeHeader(process.env[name2]));
-    const configuredEndpoint = getPrimaryEndpoint();
-    const resourceMatchesEndpoint = searchPrimary ? withoutTrailingSlash(profile.resourceUrl) === DEFAULT_MCP_SEARCH_RESOURCE_URL : withoutTrailingSlash(profile.resourceUrl).endsWith(configuredEndpoint);
-    if (!resourceMatchesEndpoint) {
-      missing.push(
-        searchPrimary ? "FIRECRAWL_MCP_SEARCH_RESOURCE_URL (endpoint mismatch)" : "FIRECRAWL_MCP_RESOURCE_URL (endpoint mismatch)"
-      );
-    }
-    return missing.length ? context.json({ ok: false, missing }, 503) : context.json({ ok: true }, 200);
-  });
-}
 
 // src/service/index.ts
 function createServiceHooks(profile, settings) {
@@ -6963,27 +6522,13 @@ function createServiceHooks(profile, settings) {
     hooks.outboundRequest = (session) => {
       const serviceSession = session;
       const credential = hasManagedOAuthCredential(serviceSession) ? credentialForOutboundRequest(serviceSession) : void 0;
-      const headers = keylessForwardingHeaders(serviceSession);
-      return credential || headers ? { credential, headers } : void 0;
+      return credential ? { credential } : void 0;
     };
   }
   if (!settings.hosted) return hooks;
-  const apiBase = apiBaseUrl(settings.apiUrl);
-  const logActions = !searchSurface;
   return {
     ...hooks,
-    wrapTool: createToolGuard({
-      profile,
-      apiUrl: settings.apiUrl,
-      apiBaseUrl: apiBase,
-      logActions
-    }),
-    onToolResult: createToolCallLogger({
-      profile,
-      apiUrl: settings.apiUrl,
-      logActions
-    }),
-    beforeKeylessRequest: (session, origin) => requireKeylessEligibility(apiBase, session, origin),
+    wrapTool: createToolGuard(),
     ...profile.advertiseOAuth ? {
       oauth: {
         protectedResource: {
@@ -7047,7 +6592,9 @@ var { start } = createFirecrawlMcpServer({
   ...options,
   unstable_hooks: {
     ...primaryHooks,
-    configureHttp: (app) => registerServiceRoutes(app, primaryProfile, { hosted })
+    configureHttp: (app) => {
+      app.get("/ready", (context) => context.json({ ok: true }, 200));
+    }
   }
 });
 var PORT = Number(process.env.PORT || 3e3);
@@ -7061,11 +6608,6 @@ var args = transport === "httpStream" ? {
     stateless: true
   }
 } : { transportType: "stdio" };
-if (hosted && primaryProfile.allowKeyless && !normalizeHeader(process.env.KEYLESS_PROXY_SECRET)) {
-  console.warn(
-    "[firecrawl-mcp] KEYLESS_PROXY_SECRET is missing; keyless requests will be unavailable and /ready will fail."
-  );
-}
 if (transport === "stdio" && !process.env.FIRECRAWL_API_KEY && !process.env.FIRECRAWL_API_URL) {
   console.error(
     "No FIRECRAWL_API_KEY or FIRECRAWL_API_URL set \u2014 running in keyless mode. firecrawl_scrape and firecrawl_search are free (rate-limited per IP) against the Firecrawl cloud; other tools require an API key (get one free at https://firecrawl.dev)."