Nick: fixed the html not being returned

Author: nickscamara

package.json

@@ -1,6 +1,6 @@
 {
   "name": "firecrawl-mcp",
-  "version": "1.4.2",
+  "version": "1.5.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": {

src/index.ts

@@ -915,13 +915,40 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
             throw new Error(response.error || 'Scraping failed');
           }
 
-          const content =
-            'markdown' in response
-              ? response.markdown || response.html || response.rawHtml
-              : null;
+          
+          // Format content based on requested formats
+          const contentParts = [];
+          
+          if (options.formats?.includes('markdown') && response.markdown) {
+            contentParts.push(response.markdown);
+          }
+          if (options.formats?.includes('html') && response.html) {
+            contentParts.push(response.html); 
+          }
+          if (options.formats?.includes('rawHtml') && response.rawHtml) {
+            contentParts.push(response.rawHtml);
+          }
+          if (options.formats?.includes('links') && response.links) {
+            contentParts.push(response.links.join('\n'));
+          }
+          if (options.formats?.includes('screenshot') && response.screenshot) {
+            contentParts.push(response.screenshot);
+          }
+          if (options.formats?.includes('extract') && response.extract) {
+            contentParts.push(JSON.stringify(response.extract, null, 2));
+          }
+
+          // Add warning to response if present
+          if (response.warning) {
+            server.sendLoggingMessage({
+              level: 'warning', 
+              data: response.warning,
+            });
+          }
+
           return {
             content: [
-              { type: 'text', text: content || 'No content available' },
+              { type: 'text', text: contentParts.join('\n\n') || 'No content available' },
             ],
             isError: false,
           };