firecrawl-mcp 1.12.0 → 2.0.0

package/README.md

@@ -1,6 +1,6 @@
 # Firecrawl MCP Server
 
-A Model Context Protocol (MCP) server implementation that integrates with [Firecrawl](https://github.com/mendableai/firecrawl) for web scraping capabilities.
+A Model Context Protocol (MCP) server implementation that integrates with [Firecrawl](https://github.com/firecrawl/firecrawl) for web scraping capabilities.
 
 > Big thanks to [@vrknetha](https://github.com/vrknetha), [@knacklabs](https://www.knacklabs.ai) for the initial implementation!
 

package/dist/index.js

@@ -4,8 +4,10 @@ import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js'
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
 import FirecrawlApp from '@mendable/firecrawl-js';
+import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express from 'express';
 import dotenv from 'dotenv';
+import { randomUUID } from 'node:crypto';
 dotenv.config();
 // Tool definitions
 const SCRAPE_TOOL = {
@@ -25,7 +27,7 @@ This is the most powerful, fastest and most reliable scraper tool, if available
   "arguments": {
     "url": "https://example.com",
     "formats": ["markdown"],
-    "maxAge": 3600000
+    "maxAge": 172800000
   }
 }
 \`\`\`
@@ -42,15 +44,39 @@ This is the most powerful, fastest and most reliable scraper tool, if available
             formats: {
                 type: 'array',
                 items: {
-                    type: 'string',
-                    enum: [
-                        'markdown',
-                        'html',
-                        'rawHtml',
-                        'screenshot',
-                        'links',
-                        'screenshot@fullPage',
-                        'extract',
+                    oneOf: [
+                        {
+                            type: 'string',
+                            enum: [
+                                'markdown',
+                                'html',
+                                'rawHtml',
+                                'screenshot',
+                                'links',
+                                'extract',
+                                'summary',
+                            ],
+                        },
+                        {
+                            type: 'object',
+                            properties: {
+                                type: {
+                                    type: 'string',
+                                    enum: ['json'],
+                                },
+                                prompt: {
+                                    type: 'string',
+                                    description: 'Prompt to guide JSON extraction',
+                                },
+                                schema: {
+                                    type: 'object',
+                                    description: 'JSON schema for structured extraction',
+                                },
+                            },
+                            required: ['type'],
+                            additionalProperties: true,
+                            description: 'Advanced format option. Use { type: "json", prompt, schema } to request structured JSON extraction.',
+                        },
                     ],
                 },
                 default: ['markdown'],
@@ -58,6 +84,7 @@ This is the most powerful, fastest and most reliable scraper tool, if available
             },
             onlyMainContent: {
                 type: 'boolean',
+                default: true,
                 description: 'Extract only the main content, filtering out navigation, footers, etc.',
             },
             includeTags: {
@@ -74,10 +101,6 @@ This is the most powerful, fastest and most reliable scraper tool, if available
                 type: 'number',
                 description: 'Time in milliseconds to wait for dynamic content to load',
             },
-            timeout: {
-                type: 'number',
-                description: 'Maximum time in milliseconds to wait for the page to load',
-            },
             actions: {
                 type: 'array',
                 items: {
@@ -131,24 +154,6 @@ This is the most powerful, fastest and most reliable scraper tool, if available
                 },
                 description: 'List of actions to perform before scraping',
             },
-            extract: {
-                type: 'object',
-                properties: {
-                    schema: {
-                        type: 'object',
-                        description: 'Schema for structured data extraction',
-                    },
-                    systemPrompt: {
-                        type: 'string',
-                        description: 'System prompt for LLM extraction',
-                    },
-                    prompt: {
-                        type: 'string',
-                        description: 'User prompt for LLM extraction',
-                    },
-                },
-                description: 'Configuration for structured data extraction',
-            },
             mobile: {
                 type: 'boolean',
                 description: 'Use mobile viewport',
@@ -176,9 +181,15 @@ This is the most powerful, fastest and most reliable scraper tool, if available
                 },
                 description: 'Location settings for scraping',
             },
+            storeInCache: {
+                type: 'boolean',
+                default: true,
+                description: 'If true, the page will be stored in the Firecrawl index and cache. Setting this to false is useful if your scraping activity may have data protection concerns.',
+            },
             maxAge: {
                 type: 'number',
-                description: 'Maximum age in milliseconds for cached content. Use cached data if available and younger than maxAge, otherwise scrape fresh. Enables 500% faster scrapes for recently cached pages. Default: 0 (always scrape fresh)',
+                default: 172800000,
+                description: 'Maximum age in milliseconds for cached content. Use cached data if available and younger than maxAge, otherwise scrape fresh. Enables 500% faster scrapes for recently cached pages. Default: 172800000',
             },
         },
         required: ['url'],
@@ -215,13 +226,10 @@ Map a website to discover all indexed URLs on the site.
                 type: 'string',
                 description: 'Optional search term to filter URLs',
             },
-            ignoreSitemap: {
-                type: 'boolean',
-                description: 'Skip sitemap.xml discovery and only use HTML links',
-            },
-            sitemapOnly: {
-                type: 'boolean',
-                description: 'Only use sitemap.xml for discovery, ignore HTML links',
+            sitemap: {
+                type: 'string',
+                enum: ['include', 'skip', 'only'],
+                description: 'Sitemap handling: "include" - use sitemap + find other pages (default), "skip" - ignore sitemap completely, "only" - only return sitemap URLs',
             },
             includeSubdomains: {
                 type: 'boolean',
@@ -231,6 +239,11 @@ Map a website to discover all indexed URLs on the site.
                 type: 'number',
                 description: 'Maximum number of URLs to return',
             },
+            ignoreQueryParameters: {
+                type: 'boolean',
+                default: true,
+                description: 'Do not return URLs with query parameters',
+            },
         },
         required: ['url'],
     },
@@ -238,28 +251,29 @@ Map a website to discover all indexed URLs on the site.
 const CRAWL_TOOL = {
     name: 'firecrawl_crawl',
     description: `
-Starts an asynchronous crawl job on a website and extracts content from all pages.
-
-**Best for:** Extracting content from multiple related pages, when you need comprehensive coverage.
-**Not recommended for:** Extracting content from a single page (use scrape); when token limits are a concern (use map + batch_scrape); when you need fast results (crawling can be slow).
-**Warning:** Crawl responses can be very large and may exceed token limits. Limit the crawl depth and number of pages, or use map + batch_scrape for better control.
-**Common mistakes:** Setting limit or maxDepth too high (causes token overflow); using crawl for a single page (use scrape instead).
-**Prompt Example:** "Get all blog posts from the first two levels of example.com/blog."
-**Usage Example:**
-\`\`\`json
-{
-  "name": "firecrawl_crawl",
-  "arguments": {
-    "url": "https://example.com/blog/*",
-    "maxDepth": 2,
-    "limit": 100,
-    "allowExternalLinks": false,
-    "deduplicateSimilarURLs": true
-  }
-}
-\`\`\`
-**Returns:** Operation ID for status checking; use firecrawl_check_crawl_status to check progress.
-`,
+ Starts a crawl job on a website and extracts content from all pages.
+ 
+ **Best for:** Extracting content from multiple related pages, when you need comprehensive coverage.
+ **Not recommended for:** Extracting content from a single page (use scrape); when token limits are a concern (use map + batch_scrape); when you need fast results (crawling can be slow).
+ **Warning:** Crawl responses can be very large and may exceed token limits. Limit the crawl depth and number of pages, or use map + batch_scrape for better control.
+ **Common mistakes:** Setting limit or maxDiscoveryDepth too high (causes token overflow); using crawl for a single page (use scrape instead).
+ **Prompt Example:** "Get all blog posts from the first two levels of example.com/blog."
+ **Usage Example:**
+ \`\`\`json
+ {
+   "name": "firecrawl_crawl",
+   "arguments": {
+     "url": "https://example.com/blog/*",
+     "maxDiscoveryDepth": 2,
+     "limit": 100,
+     "allowExternalLinks": false,
+     "deduplicateSimilarURLs": true,
+     "sitemap": "include"
+   }
+ }
+ \`\`\`
+ **Returns:** Operation ID for status checking; use firecrawl_check_crawl_status to check progress.
+ `,
     inputSchema: {
         type: 'object',
         properties: {
@@ -267,6 +281,10 @@ Starts an asynchronous crawl job on a website and extracts content from all page
                 type: 'string',
                 description: 'Starting URL for the crawl',
             },
+            prompt: {
+                type: 'string',
+                description: 'Natural language prompt to generate crawler options. Explicitly set parameters will override generated ones.',
+            },
             excludePaths: {
                 type: 'array',
                 items: { type: 'string' },
@@ -277,26 +295,43 @@ Starts an asynchronous crawl job on a website and extracts content from all page
                 items: { type: 'string' },
                 description: 'Only crawl these URL paths',
             },
-            maxDepth: {
+            maxDiscoveryDepth: {
                 type: 'number',
-                description: 'Maximum link depth to crawl',
+                description: 'Maximum discovery depth to crawl. The root site and sitemapped pages have depth 0.',
             },
-            ignoreSitemap: {
-                type: 'boolean',
-                description: 'Skip sitemap.xml discovery',
+            sitemap: {
+                type: 'string',
+                enum: ['skip', 'include', 'only'],
+                default: 'include',
+                description: "Sitemap mode when crawling. 'skip' ignores the sitemap entirely, 'include' uses sitemap plus other discovery methods (default), 'only' restricts crawling to sitemap URLs.",
             },
             limit: {
                 type: 'number',
-                description: 'Maximum number of pages to crawl',
-            },
-            allowBackwardLinks: {
-                type: 'boolean',
-                description: 'Allow crawling links that point to parent directories',
+                default: 10000,
+                description: 'Maximum number of pages to crawl (default: 10000)',
             },
             allowExternalLinks: {
                 type: 'boolean',
                 description: 'Allow crawling links to external domains',
             },
+            allowSubdomains: {
+                type: 'boolean',
+                default: false,
+                description: 'Allow crawling links to subdomains of the main domain',
+            },
+            crawlEntireDomain: {
+                type: 'boolean',
+                default: false,
+                description: 'When true, follow internal links to sibling or parent URLs, not just child paths',
+            },
+            delay: {
+                type: 'number',
+                description: 'Delay in seconds between scrapes to respect site rate limits',
+            },
+            maxConcurrency: {
+                type: 'number',
+                description: 'Maximum number of concurrent scrapes; if unset, team limit is used',
+            },
             webhook: {
                 oneOf: [
                     {
@@ -325,7 +360,8 @@ Starts an asynchronous crawl job on a website and extracts content from all page
             },
             ignoreQueryParameters: {
                 type: 'boolean',
-                description: 'Ignore query parameters when comparing URLs',
+                default: false,
+                description: 'Do not re-scrape the same path with different (or none) query parameters',
             },
             scrapeOptions: {
                 type: 'object',
@@ -333,17 +369,43 @@ Starts an asynchronous crawl job on a website and extracts content from all page
                     formats: {
                         type: 'array',
                         items: {
-                            type: 'string',
-                            enum: [
-                                'markdown',
-                                'html',
-                                'rawHtml',
-                                'screenshot',
-                                'links',
-                                'screenshot@fullPage',
-                                'extract',
+                            oneOf: [
+                                {
+                                    type: 'string',
+                                    enum: [
+                                        'markdown',
+                                        'html',
+                                        'rawHtml',
+                                        'screenshot',
+                                        'links',
+                                        'extract',
+                                        'summary',
+                                    ],
+                                },
+                                {
+                                    type: 'object',
+                                    properties: {
+                                        type: {
+                                            type: 'string',
+                                            enum: ['json'],
+                                        },
+                                        prompt: {
+                                            type: 'string',
+                                            description: 'Prompt to guide JSON extraction',
+                                        },
+                                        schema: {
+                                            type: 'object',
+                                            description: 'JSON schema for structured extraction',
+                                        },
+                                    },
+                                    required: ['type'],
+                                    additionalProperties: true,
+                                    description: 'Advanced format option. Use { type: "json", prompt, schema } to request structured JSON extraction.',
+                                },
                             ],
                         },
+                        default: ['markdown'],
+                        description: "Content formats to extract (default: ['markdown'])",
                     },
                     onlyMainContent: {
                         type: 'boolean',
@@ -396,12 +458,13 @@ Check the status of a crawl job.
 const SEARCH_TOOL = {
     name: 'firecrawl_search',
     description: `
-Search the web and optionally extract content from search results. This is the most powerful search tool available, and if available you should always default to using this tool for any web search needs.
+Search the web and optionally extract content from search results. This is the most powerful web search tool available, and if available you should always default to using this tool for any web search needs.
 
 **Best for:** Finding specific information across multiple websites, when you don't know which website has the information; when you need the most relevant content for a query.
-**Not recommended for:** When you already know which website to scrape (use scrape); when you need comprehensive coverage of a single website (use map or crawl).
+**Not recommended for:** When you need to search the filesystem. When you already know which website to scrape (use scrape); when you need comprehensive coverage of a single website (use map or crawl.
 **Common mistakes:** Using crawl or map for open-ended questions (use search instead).
 **Prompt Example:** "Find the latest research papers on AI published in 2023."
+**Sources:** web, images, news, default to web unless needed images or news.
 **Usage Example:**
 \`\`\`json
 {
@@ -411,6 +474,11 @@ Search the web and optionally extract content from search results. This is the m
     "limit": 5,
     "lang": "en",
     "country": "us",
+    "sources": [
+      "web",
+      "images",
+      "news"
+    ],
     "scrapeOptions": {
       "formats": ["markdown"],
       "onlyMainContent": true
@@ -431,14 +499,6 @@ Search the web and optionally extract content from search results. This is the m
                 type: 'number',
                 description: 'Maximum number of results to return (default: 5)',
             },
-            lang: {
-                type: 'string',
-                description: 'Language code for search results (default: en)',
-            },
-            country: {
-                type: 'string',
-                description: 'Country code for search results (default: us)',
-            },
             tbs: {
                 type: 'string',
                 description: 'Time-based search filter',
@@ -448,19 +508,48 @@ Search the web and optionally extract content from search results. This is the m
                 description: 'Search filter',
             },
             location: {
-                type: 'object',
-                properties: {
-                    country: {
-                        type: 'string',
-                        description: 'Country code for geolocation',
-                    },
-                    languages: {
-                        type: 'array',
-                        items: { type: 'string' },
-                        description: 'Language codes for content',
-                    },
+                type: 'string',
+                description: 'Location parameter for search results',
+            },
+            sources: {
+                type: 'array',
+                description: 'Sources to search. Determines which result arrays are included in the response.',
+                items: {
+                    oneOf: [
+                        {
+                            type: 'object',
+                            properties: {
+                                type: { type: 'string', enum: ['web'] },
+                                tbs: {
+                                    type: 'string',
+                                    description: 'Time-based search parameter (e.g., qdr:h, qdr:d, qdr:w, qdr:m, qdr:y or custom cdr with cd_min/cd_max)',
+                                },
+                                location: {
+                                    type: 'string',
+                                    description: 'Location parameter for search results',
+                                },
+                            },
+                            required: ['type'],
+                            additionalProperties: false,
+                        },
+                        {
+                            type: 'object',
+                            properties: {
+                                type: { type: 'string', enum: ['images'] },
+                            },
+                            required: ['type'],
+                            additionalProperties: false,
+                        },
+                        {
+                            type: 'object',
+                            properties: {
+                                type: { type: 'string', enum: ['news'] },
+                            },
+                            required: ['type'],
+                            additionalProperties: false,
+                        },
+                    ],
                 },
-                description: 'Location settings for search',
             },
             scrapeOptions: {
                 type: 'object',
@@ -468,8 +557,22 @@ Search the web and optionally extract content from search results. This is the m
                     formats: {
                         type: 'array',
                         items: {
-                            type: 'string',
-                            enum: ['markdown', 'html', 'rawHtml'],
+                            oneOf: [
+                                {
+                                    type: 'string',
+                                    enum: ['markdown', 'html', 'rawHtml'],
+                                },
+                                {
+                                    type: 'object',
+                                    properties: {
+                                        type: { type: 'string', enum: ['json'] },
+                                        prompt: { type: 'string' },
+                                        schema: { type: 'object' },
+                                    },
+                                    required: ['type'],
+                                    additionalProperties: true,
+                                },
+                            ],
                         },
                         description: 'Content formats to extract from search results',
                     },
@@ -493,12 +596,11 @@ const EXTRACT_TOOL = {
     description: `
 Extract structured information from web pages using LLM capabilities. Supports both cloud AI and self-hosted LLM extraction.
 
-**Best for:** Extracting specific structured data like prices, names, details.
+**Best for:** Extracting specific structured data like prices, names, details from web pages.
 **Not recommended for:** When you need the full content of a page (use scrape); when you're not looking for specific structured data.
 **Arguments:**
 - urls: Array of URLs to extract information from
 - prompt: Custom prompt for the LLM extraction
-- systemPrompt: System prompt to guide the LLM
 - schema: JSON schema for structured data extraction
 - allowExternalLinks: Allow extraction from external links
 - enableWebSearch: Enable web search for additional context
@@ -511,7 +613,6 @@ Extract structured information from web pages using LLM capabilities. Supports b
   "arguments": {
     "urls": ["https://example.com/page1", "https://example.com/page2"],
     "prompt": "Extract product information including name, price, and description",
-    "systemPrompt": "You are a helpful assistant that extracts product information",
     "schema": {
       "type": "object",
       "properties": {
@@ -541,10 +642,6 @@ Extract structured information from web pages using LLM capabilities. Supports b
                 type: 'string',
                 description: 'Prompt for the LLM extraction',
             },
-            systemPrompt: {
-                type: 'string',
-                description: 'System prompt for LLM extraction',
-            },
             schema: {
                 type: 'object',
                 description: 'JSON schema for structured data extraction',
@@ -565,100 +662,6 @@ Extract structured information from web pages using LLM capabilities. Supports b
         required: ['urls'],
     },
 };
-const DEEP_RESEARCH_TOOL = {
-    name: 'firecrawl_deep_research',
-    description: `
-Conduct deep web research on a query using intelligent crawling, search, and LLM analysis.
-
-**Best for:** Complex research questions requiring multiple sources, in-depth analysis.
-**Not recommended for:** Simple questions that can be answered with a single search; when you need very specific information from a known page (use scrape); when you need results quickly (deep research can take time).
-**Arguments:**
-- query (string, required): The research question or topic to explore.
-- maxDepth (number, optional): Maximum recursive depth for crawling/search (default: 3).
-- timeLimit (number, optional): Time limit in seconds for the research session (default: 120).
-- maxUrls (number, optional): Maximum number of URLs to analyze (default: 50).
-**Prompt Example:** "Research the environmental impact of electric vehicles versus gasoline vehicles."
-**Usage Example:**
-\`\`\`json
-{
-  "name": "firecrawl_deep_research",
-  "arguments": {
-    "query": "What are the environmental impacts of electric vehicles compared to gasoline vehicles?",
-    "maxDepth": 3,
-    "timeLimit": 120,
-    "maxUrls": 50
-  }
-}
-\`\`\`
-**Returns:** Final analysis generated by an LLM based on research. (data.finalAnalysis); may also include structured activities and sources used in the research process.
-`,
-    inputSchema: {
-        type: 'object',
-        properties: {
-            query: {
-                type: 'string',
-                description: 'The query to research',
-            },
-            maxDepth: {
-                type: 'number',
-                description: 'Maximum depth of research iterations (1-10)',
-            },
-            timeLimit: {
-                type: 'number',
-                description: 'Time limit in seconds (30-300)',
-            },
-            maxUrls: {
-                type: 'number',
-                description: 'Maximum number of URLs to analyze (1-1000)',
-            },
-        },
-        required: ['query'],
-    },
-};
-const GENERATE_LLMSTXT_TOOL = {
-    name: 'firecrawl_generate_llmstxt',
-    description: `
-Generate a standardized llms.txt (and optionally llms-full.txt) file for a given domain. This file defines how large language models should interact with the site.
-
-**Best for:** Creating machine-readable permission guidelines for AI models.
-**Not recommended for:** General content extraction or research.
-**Arguments:**
-- url (string, required): The base URL of the website to analyze.
-- maxUrls (number, optional): Max number of URLs to include (default: 10).
-- showFullText (boolean, optional): Whether to include llms-full.txt contents in the response.
-**Prompt Example:** "Generate an LLMs.txt file for example.com."
-**Usage Example:**
-\`\`\`json
-{
-  "name": "firecrawl_generate_llmstxt",
-  "arguments": {
-    "url": "https://example.com",
-    "maxUrls": 20,
-    "showFullText": true
-  }
-}
-\`\`\`
-**Returns:** LLMs.txt file contents (and optionally llms-full.txt).
-`,
-    inputSchema: {
-        type: 'object',
-        properties: {
-            url: {
-                type: 'string',
-                description: 'The URL to generate LLMs.txt from',
-            },
-            maxUrls: {
-                type: 'number',
-                description: 'Maximum number of URLs to process (1-100, default: 10)',
-            },
-            showFullText: {
-                type: 'boolean',
-                description: 'Whether to show the full LLMs-full.txt in the response',
-            },
-        },
-        required: ['url'],
-    },
-};
 // Type guards
 function isScrapeOptions(args) {
     return (typeof args === 'object' &&
@@ -672,6 +675,7 @@ function isMapOptions(args) {
         'url' in args &&
         typeof args.url === 'string');
 }
+//@ts-expect-error todo: fix
 function isCrawlOptions(args) {
     return (typeof args === 'object' &&
         args !== null &&
@@ -703,6 +707,24 @@ function isGenerateLLMsTextOptions(args) {
         'url' in args &&
         typeof args.url === 'string');
 }
+function removeEmptyTopLevel(obj) {
+    const out = {};
+    for (const [k, v] of Object.entries(obj)) {
+        if (v == null)
+            continue;
+        if (typeof v === 'string' && v.trim() === '')
+            continue;
+        if (Array.isArray(v) && v.length === 0)
+            continue;
+        if (typeof v === 'object' &&
+            !Array.isArray(v) &&
+            Object.keys(v).length === 0)
+            continue;
+        // @ts-expect-error dynamic assignment
+        out[k] = v;
+    }
+    return out;
+}
 // Server implementation
 const server = new Server({
     name: 'firecrawl-mcp',
@@ -710,7 +732,6 @@ const server = new Server({
 }, {
     capabilities: {
         tools: {},
-        logging: {},
     },
 });
 // Get optional API URL
@@ -743,14 +764,9 @@ function delay(ms) {
 }
 let isStdioTransport = false;
 function safeLog(level, data) {
-    if (isStdioTransport) {
-        // For stdio transport, log to stderr to avoid protocol interference
-        console.error(`[${level}] ${typeof data === 'object' ? JSON.stringify(data) : data}`);
-    }
-    else {
-        // For other transport types, use the normal logging mechanism
-        server.sendLoggingMessage({ level, data });
-    }
+    // Always log to stderr to avoid relying on MCP logging capability
+    const message = `[${level}] ${typeof data === 'object' ? JSON.stringify(data) : String(data)}`;
+    console.error(message);
 }
 // Add retry logic with exponential backoff
 async function withRetry(operation, context, attempt = 1) {
@@ -779,18 +795,16 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
         CHECK_CRAWL_STATUS_TOOL,
         SEARCH_TOOL,
         EXTRACT_TOOL,
-        DEEP_RESEARCH_TOOL,
-        GENERATE_LLMSTXT_TOOL,
     ],
 }));
 server.setRequestHandler(CallToolRequestSchema, async (request) => {
     const startTime = Date.now();
     try {
         const { name, arguments: args } = request.params;
-        const apiKey = process.env.CLOUD_SERVICE
+        const apiKey = process.env.CLOUD_SERVICE === 'true'
             ? request.params._meta?.apiKey
             : FIRECRAWL_API_KEY;
-        if (process.env.CLOUD_SERVICE && !apiKey) {
+        if (process.env.CLOUD_SERVICE === 'true' && !apiKey) {
             throw new Error('No API key provided');
         }
         const client = new FirecrawlApp({
@@ -808,38 +822,46 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     throw new Error('Invalid arguments for firecrawl_scrape');
                 }
                 const { url, ...options } = args;
+                const cleaned = removeEmptyTopLevel(options);
                 try {
                     const scrapeStartTime = Date.now();
                     safeLog('info', `Starting scrape for URL: ${url} with options: ${JSON.stringify(options)}`);
-                    const response = await client.scrapeUrl(url, {
-                        ...options,
-                        // @ts-expect-error Extended API options including origin
+                    const response = await client.scrape(url, {
+                        ...cleaned,
                         origin: 'mcp-server',
                     });
                     // Log performance metrics
                     safeLog('info', `Scrape completed in ${Date.now() - scrapeStartTime}ms`);
-                    if ('success' in response && !response.success) {
-                        throw new Error(response.error || 'Scraping failed');
-                    }
                     // Format content based on requested formats
                     const contentParts = [];
-                    if (options.formats?.includes('markdown') && response.markdown) {
+                    const formats = (options?.formats ?? []);
+                    const hasFormat = (name) => Array.isArray(formats) &&
+                        formats.some((f) => typeof f === 'string'
+                            ? f === name
+                            : f && typeof f === 'object' && f.type === name);
+                    if (hasFormat('markdown') && response.markdown) {
                         contentParts.push(response.markdown);
                     }
-                    if (options.formats?.includes('html') && response.html) {
+                    if (hasFormat('html') && response.html) {
                         contentParts.push(response.html);
                     }
-                    if (options.formats?.includes('rawHtml') && response.rawHtml) {
+                    if (hasFormat('rawHtml') && response.rawHtml) {
                         contentParts.push(response.rawHtml);
                     }
-                    if (options.formats?.includes('links') && response.links) {
+                    if (hasFormat('links') && response.links) {
                         contentParts.push(response.links.join('\n'));
                     }
-                    if (options.formats?.includes('screenshot') && response.screenshot) {
+                    if (hasFormat('screenshot') && response.screenshot) {
                         contentParts.push(response.screenshot);
                     }
-                    if (options.formats?.includes('extract') && response.extract) {
-                        contentParts.push(JSON.stringify(response.extract, null, 2));
+                    if (hasFormat('json') && response.json) {
+                        contentParts.push(JSON.stringify(response.json, null, 2));
+                    }
+                    if (hasFormat('changeTracking') && response.changeTracking) {
+                        contentParts.push(JSON.stringify(response.changeTracking, null, 2));
+                    }
+                    if (hasFormat('summary') && response.summary) {
+                        contentParts.push(JSON.stringify(response.summary, null, 2));
                     }
                     // If options.formats is empty, default to markdown
                     if (!options.formats || options.formats.length === 0) {
@@ -872,20 +894,17 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     throw new Error('Invalid arguments for firecrawl_map');
                 }
                 const { url, ...options } = args;
-                const response = await client.mapUrl(url, {
+                const response = await client.map(url, {
                     ...options,
                     // @ts-expect-error Extended API options including origin
                     origin: 'mcp-server',
                 });
-                if ('error' in response) {
-                    throw new Error(response.error);
-                }
                 if (!response.links) {
                     throw new Error('No links received from Firecrawl API');
                 }
                 return {
                     content: [
-                        { type: 'text', text: trimResponseText(response.links.join('\n')) },
+                        { type: 'text', text: trimResponseText(JSON.stringify(response.links, null, 2)) },
                     ],
                     isError: false,
                 };
@@ -895,17 +914,16 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     throw new Error('Invalid arguments for firecrawl_crawl');
                 }
                 const { url, ...options } = args;
-                const response = await withRetry(async () => 
-                // @ts-expect-error Extended API options including origin
-                client.asyncCrawlUrl(url, { ...options, origin: 'mcp-server' }), 'crawl operation');
-                if (!response.success) {
-                    throw new Error(response.error);
-                }
+                const response = await withRetry(async () => client.crawl(url, {
+                    ...options,
+                    // @ts-expect-error Extended API options including origin
+                    origin: 'mcp-server',
+                }), 'crawl operation');
                 return {
                     content: [
                         {
                             type: 'text',
-                            text: trimResponseText(`Started crawl for ${url} with job ID: ${response.id}. Use firecrawl_check_crawl_status to check progress.`),
+                            text: trimResponseText(JSON.stringify(response)),
                         },
                     ],
                     isError: false,
@@ -915,10 +933,7 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 if (!isStatusCheckOptions(args)) {
                     throw new Error('Invalid arguments for firecrawl_check_crawl_status');
                 }
-                const response = await client.checkCrawlStatus(args.id);
-                if (!response.success) {
-                    throw new Error(response.error);
-                }
+                const response = await client.getCrawlStatus(args.id);
                 const status = `Crawl Status:
 Status: ${response.status}
 Progress: ${response.completed}/${response.total}
@@ -935,19 +950,18 @@ ${response.data.length > 0 ? '\nResults:\n' + formatResults(response.data) : ''}
                     throw new Error('Invalid arguments for firecrawl_search');
                 }
                 try {
-                    const response = await withRetry(async () => client.search(args.query, { ...args, origin: 'mcp-server' }), 'search operation');
-                    if (!response.success) {
-                        throw new Error(`Search failed: ${response.error || 'Unknown error'}`);
-                    }
-                    // Format the results
-                    const results = response.data
-                        .map((result) => `URL: ${result.url}
-Title: ${result.title || 'No title'}
-Description: ${result.description || 'No description'}
-${result.markdown ? `\nContent:\n${result.markdown}` : ''}`)
-                        .join('\n\n');
+                    const response = await withRetry(async () => client.search(args.query, {
+                        ...args,
+                        // @ts-expect-error Extended API options including origin
+                        origin: 'mcp-server',
+                    }), 'search operation');
                     return {
-                        content: [{ type: 'text', text: trimResponseText(results) }],
+                        content: [
+                            {
+                                type: 'text',
+                                text: trimResponseText(JSON.stringify(response, null, 2)),
+                            },
+                        ],
                         isError: false,
                     };
                 }
@@ -972,9 +986,9 @@ ${result.markdown ? `\nContent:\n${result.markdown}` : ''}`)
                     if (FIRECRAWL_API_URL) {
                         safeLog('info', 'Using self-hosted instance for extraction');
                     }
-                    const extractResponse = await withRetry(async () => client.extract(args.urls, {
+                    const extractResponse = await withRetry(async () => client.extract({
+                        urls: args.urls,
                         prompt: args.prompt,
-                        systemPrompt: args.systemPrompt,
                         schema: args.schema,
                         allowExternalLinks: args.allowExternalLinks,
                         enableWebSearch: args.enableWebSearch,
@@ -1025,57 +1039,6 @@ ${result.markdown ? `\nContent:\n${result.markdown}` : ''}`)
                     };
                 }
             }
-            case 'firecrawl_deep_research': {
-                if (!args || typeof args !== 'object' || !('query' in args)) {
-                    throw new Error('Invalid arguments for firecrawl_deep_research');
-                }
-                try {
-                    const researchStartTime = Date.now();
-                    safeLog('info', `Starting deep research for query: ${args.query}`);
-                    const response = await client.deepResearch(args.query, {
-                        maxDepth: args.maxDepth,
-                        timeLimit: args.timeLimit,
-                        maxUrls: args.maxUrls,
-                        // @ts-expect-error Extended API options including origin
-                        origin: 'mcp-server',
-                    }, 
-                    // Activity callback
-                    (activity) => {
-                        safeLog('info', `Research activity: ${activity.message} (Depth: ${activity.depth})`);
-                    }, 
-                    // Source callback
-                    (source) => {
-                        safeLog('info', `Research source found: ${source.url}${source.title ? ` - ${source.title}` : ''}`);
-                    });
-                    // Log performance metrics
-                    safeLog('info', `Deep research completed in ${Date.now() - researchStartTime}ms`);
-                    if (!response.success) {
-                        throw new Error(response.error || 'Deep research failed');
-                    }
-                    // Format the results
-                    const formattedResponse = {
-                        finalAnalysis: response.data.finalAnalysis,
-                        activities: response.data.activities,
-                        sources: response.data.sources,
-                    };
-                    return {
-                        content: [
-                            {
-                                type: 'text',
-                                text: trimResponseText(formattedResponse.finalAnalysis),
-                            },
-                        ],
-                        isError: false,
-                    };
-                }
-                catch (error) {
-                    const errorMessage = error instanceof Error ? error.message : String(error);
-                    return {
-                        content: [{ type: 'text', text: trimResponseText(errorMessage) }],
-                        isError: true,
-                    };
-                }
-            }
             case 'firecrawl_generate_llmstxt': {
                 if (!isGenerateLLMsTextOptions(args)) {
                     throw new Error('Invalid arguments for firecrawl_generate_llmstxt');
@@ -1152,8 +1115,7 @@ function formatResults(data) {
     return data
         .map((doc) => {
         const content = doc.markdown || doc.html || doc.rawHtml || 'No content';
-        return `URL: ${doc.url || 'Unknown URL'}
-Content: ${content.substring(0, 100)}${content.length > 100 ? '...' : ''}
+        return `Content: ${content.substring(0, 100)}${content.length > 100 ? '...' : ''}
 ${doc.metadata?.title ? `Title: ${doc.metadata.title}` : ''}`;
     })
         .join('\n\n');
@@ -1214,6 +1176,92 @@ async function runSSELocalServer() {
         console.error('Error starting server:', error);
     }
 }
+async function runHTTPStreamableServer() {
+    const app = express();
+    app.use(express.json());
+    const transports = {};
+    // A single endpoint handles all MCP requests.
+    app.all('/mcp', async (req, res) => {
+        try {
+            const sessionId = req.headers['mcp-session-id'];
+            let transport;
+            if (sessionId && transports[sessionId]) {
+                transport = transports[sessionId];
+            }
+            else if (!sessionId &&
+                req.method === 'POST' &&
+                req.body &&
+                typeof req.body === 'object' &&
+                req.body.method === 'initialize') {
+                transport = new StreamableHTTPServerTransport({
+                    sessionIdGenerator: () => {
+                        const id = randomUUID();
+                        return id;
+                    },
+                    onsessioninitialized: (sid) => {
+                        transports[sid] = transport;
+                    },
+                });
+                transport.onclose = () => {
+                    const sid = transport.sessionId;
+                    if (sid && transports[sid]) {
+                        delete transports[sid];
+                    }
+                };
+                console.log('Creating server instance');
+                console.log('Connecting transport to server');
+                await server.connect(transport);
+                await transport.handleRequest(req, res, req.body);
+                return;
+            }
+            else {
+                res.status(400).json({
+                    jsonrpc: '2.0',
+                    error: {
+                        code: -32000,
+                        message: 'Invalid or missing session ID',
+                    },
+                    id: null,
+                });
+                return;
+            }
+            await transport.handleRequest(req, res, req.body);
+        }
+        catch (error) {
+            if (!res.headersSent) {
+                res.status(500).json({
+                    jsonrpc: '2.0',
+                    error: {
+                        code: -32603,
+                        message: 'Internal server error',
+                    },
+                    id: null,
+                });
+            }
+        }
+    });
+    const PORT = 3000;
+    const appServer = app.listen(PORT, () => {
+        console.log(`MCP Streamable HTTP Server listening on port ${PORT}`);
+    });
+    process.on('SIGINT', async () => {
+        console.log('Shutting down server...');
+        for (const sessionId in transports) {
+            try {
+                console.log(`Closing transport for session ${sessionId}`);
+                await transports[sessionId].close();
+                delete transports[sessionId];
+            }
+            catch (error) {
+                console.error(`Error closing transport for session ${sessionId}:`, error);
+            }
+        }
+        appServer.close(() => {
+            console.log('Server shutdown complete');
+            process.exit(0);
+        });
+    });
+}
 async function runSSECloudServer() {
     const transports = {};
     const app = express();
@@ -1277,6 +1325,13 @@ else if (process.env.SSE_LOCAL === 'true') {
         process.exit(1);
     });
 }
+else if (process.env.HTTP_STREAMABLE_SERVER === 'true') {
+    console.log('Running HTTP Streamable Server');
+    runHTTPStreamableServer().catch((error) => {
+        console.error('Fatal error running server:', error);
+        process.exit(1);
+    });
+}
 else {
     runLocalServer().catch((error) => {
         console.error('Fatal error running server:', error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firecrawl-mcp",
-  "version": "1.12.0",
+  "version": "2.0.0",
   "description": "MCP server for Firecrawl web scraping integration. Supports both cloud and self-hosted instances. Features include web scraping, batch processing, structured data extraction, and LLM-powered content analysis.",
   "type": "module",
   "bin": {
@@ -20,15 +20,17 @@
     "lint:fix": "eslint src/**/*.ts --fix",
     "format": "prettier --write .",
     "prepare": "npm run build",
-    "publish": "npm run build && npm publish"
+    "publish": "npm run build && npm publish",
+    "publish-beta": "npm run build && npm publish --tag beta"
   },
   "license": "MIT",
   "dependencies": {
-    "@mendable/firecrawl-js": "^1.19.0",
-    "@modelcontextprotocol/sdk": "^1.4.1",
+    "@mendable/firecrawl-js": "^3.0.3",
+    "@modelcontextprotocol/sdk": "^1.17.3",
     "dotenv": "^16.4.7",
     "express": "^5.1.0",
     "shx": "^0.3.4",
+    "typescript": "^5.9.2",
     "ws": "^8.18.1"
   },
   "devDependencies": {
@@ -43,8 +45,7 @@
     "jest": "^29.7.0",
     "jest-mock-extended": "^4.0.0-beta1",
     "prettier": "^3.1.1",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.3.3"
+    "ts-jest": "^29.1.1"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -58,11 +59,11 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/mendableai/firecrawl-mcp-server.git"
+    "url": "git+https://github.com/firecrawl/firecrawl-mcp-server.git"
   },
   "author": "vrknetha",
   "bugs": {
-    "url": "https://github.com/mendableai/firecrawl-mcp-server/issues"
+    "url": "https://github.com/firecrawl/firecrawl-mcp-server/issues"
   },
-  "homepage": "https://github.com/mendableai/firecrawl-mcp-server#readme"
+  "homepage": "https://github.com/firecrawl/firecrawl-mcp-server#readme"
 }