Merge branch 'master' into feat/improve-error-message

Author: jirispilka

CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.5.5](https://github.com/apify/apify-mcp-server/releases/tag/v0.5.5) (2025-11-14)
+
+### 🚀 Features
+
+- Refactor(logging): centralize HTTP error logging  ([#336](https://github.com/apify/apify-mcp-server/pull/336)) ([7b0a52d](https://github.com/apify/apify-mcp-server/commit/7b0a52d1e3baeb732747b1cbf58cb70ad1a135a7)) by [@jirispilka](https://github.com/jirispilka)
+
+
+## [0.5.2](https://github.com/apify/apify-mcp-server/releases/tag/v0.5.2) (2025-11-12)
+
+### 🚀 Features
+
+- Update search-actors tool ([#321](https://github.com/apify/apify-mcp-server/pull/321)) ([602abc5](https://github.com/apify/apify-mcp-server/commit/602abc55bff1f59e937d8e24acc8d7aad64852c2)) by [@jirispilka](https://github.com/jirispilka)
+
+### 🐛 Bug Fixes
+
+- Update readme, add image with clients ([#326](https://github.com/apify/apify-mcp-server/pull/326)) ([da560ab](https://github.com/apify/apify-mcp-server/commit/da560abcbd8b7cb2553032899b8cc963357495e5)) by [@jirispilka](https://github.com/jirispilka)
+- Deduplicate error logs, use info for 404/400 errors, fix ajv validate when it contains $ref ([#335](https://github.com/apify/apify-mcp-server/pull/335)) ([0ebbf50](https://github.com/apify/apify-mcp-server/commit/0ebbf5069a38e4168c5b031764136c66db4f2e18)) by [@jirispilka](https://github.com/jirispilka)
+
+
 ## [0.5.1](https://github.com/apify/apify-mcp-server/releases/tag/v0.5.1) (2025-10-27)
 
 ### 🚀 Features

manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": "0.2",
   "name": "apify-mcp-server",
   "display_name": "Apify MCP server",
-  "version": "0.5.1",
+  "version": "0.5.5",
   "description": "Extract data from any website using thousands of tools from the Apify Store.",
   "long_description": "Apify is the world's largest marketplace of tools for web scraping, data extraction, and web automation. You can extract structured data from social media, e-commerce, search engines, maps, travel sites, or any other website.",
   "keywords": [

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@apify/actors-mcp-server",
-  "version": "0.5.1",
+  "version": "0.5.5",
   "type": "module",
   "description": "Apify MCP Server",
   "mcpName": "com.apify/apify-mcp-server",

package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/apify/apify-mcp-server",
     "source": "github"
   },
-  "version": "0.5.1",
+  "version": "0.5.5",
   "remotes": [
     {
       "type": "streamable-http",

server.json

@@ -26,7 +26,14 @@ export function createExpressApp(
     const transports: { [sessionId: string]: StreamableHTTPServerTransport } = {};
 
     function respondWithError(res: Response, error: unknown, logMessage: string, statusCode = 500) {
-        log.error('Error in request', { logMessage, error });
+        if (statusCode >= 500) {
+            // Server errors (>= 500) - log as exception
+            log.exception(error instanceof Error ? error : new Error(String(error)), 'Error in request', { logMessage, statusCode });
+        } else {
+            // Client errors (< 500) - log as softFail without stack trace
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            log.softFail('Error in request', { logMessage, error: errorMessage, statusCode });
+        }
         if (!res.headersSent) {
             res.status(statusCode).json({
                 jsonrpc: '2.0',
@@ -105,7 +112,7 @@ export function createExpressApp(
             });
             const sessionId = new URL(req.url, `http://${req.headers.host}`).searchParams.get('sessionId');
             if (!sessionId) {
-                log.error('No session ID provided in POST request');
+                log.softFail('No session ID provided in POST request', { statusCode: 400 });
                 res.status(400).json({
                     jsonrpc: '2.0',
                     error: {
@@ -120,7 +127,7 @@ export function createExpressApp(
             if (transport) {
                 await transport.handlePostMessage(req, res);
             } else {
-                log.error('Server is not connected to the client.');
+                log.softFail('Server is not connected to the client.', { statusCode: 400 });
                 res.status(400).json({
                     jsonrpc: '2.0',
                     error: {
@@ -217,7 +224,7 @@ export function createExpressApp(
             return;
         }
 
-        log.error('Session not found', { sessionId });
+        log.softFail('Session not found', { sessionId, statusCode: 400 });
         res.status(400).send('Bad Request: Session not found').end();
     });
 

src/actor/server.ts

@@ -5,6 +5,7 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import log from '@apify/log';
 
 import { TimeoutError } from '../errors.js';
+import { logHttpError } from '../utils/logging.js';
 import { ACTORIZED_MCP_CONNECTION_TIMEOUT_MSEC } from './const.js';
 import { getMCPServerID } from './utils.js';
 
@@ -40,8 +41,7 @@ export async function connectMCPClient(
             log.warning('Connection to MCP server using SSE transport timed out', { url });
             return null;
         }
-
-        log.error('Failed to connect to MCP server using SSE transport', { cause: error });
+        logHttpError(error, 'Failed to connect to MCP server using SSE transport', { url, cause: error });
         throw error;
     }
 }

src/mcp/client.ts

@@ -39,6 +39,7 @@ import { callActorGetDataset, defaultTools, getActorsAsTools, toolCategories } f
 import { decodeDotPropertyNames } from '../tools/utils.js';
 import type { ToolEntry } from '../types.js';
 import { buildActorResponseContent } from '../utils/actor-response.js';
+import { logHttpError } from '../utils/logging.js';
 import { buildMCPResponse } from '../utils/mcp.js';
 import { createProgressTracker } from '../utils/progress.js';
 import { cloneToolEntry, getToolPublicFieldOnly } from '../utils/tools.js';
@@ -485,7 +486,7 @@ export class ActorsMcpServer {
                 const msg = `APIFY_TOKEN is required but was not provided.
 Please set the APIFY_TOKEN environment variable or pass it as a parameter in the request body.
 You can obtain your Apify token from https://console.apify.com/account/integrations.`;
-                log.error(msg);
+                log.softFail(msg, { statusCode: 400 });
                 await this.server.sendLoggingMessage({ level: 'error', data: msg });
                 throw new McpError(
                     ErrorCode.InvalidParams,
@@ -512,7 +513,7 @@ You can obtain your Apify token from https://console.apify.com/account/integrati
                 const msg = `Tool "${name}" was not found.
 Available tools: ${availableTools.length > 0 ? availableTools.join(', ') : 'none'}.
 Please verify the tool name is correct. You can list all available tools using the tools/list request.`;
-                log.error(msg);
+                log.softFail(msg, { statusCode: 404 });
                 await this.server.sendLoggingMessage({ level: 'error', data: msg });
                 throw new McpError(
                     ErrorCode.InvalidParams,
@@ -522,7 +523,7 @@ Please verify the tool name is correct. You can list all available tools using t
             if (!args) {
                 const msg = `Missing arguments for tool "${name}".
 Please provide the required arguments for this tool. Check the tool's input schema using ${HelperTools.ACTOR_GET_DETAILS} tool to see what parameters are required.`;
-                log.error(msg);
+                log.softFail(msg, { statusCode: 400 });
                 await this.server.sendLoggingMessage({ level: 'error', data: msg });
                 throw new McpError(
                     ErrorCode.InvalidParams,
@@ -539,7 +540,7 @@ Please provide the required arguments for this tool. Check the tool's input sche
                 const msg = `Invalid arguments for tool "${tool.name}".
 Validation errors: ${errorMessages}.
 Please check the tool's input schema using ${HelperTools.ACTOR_GET_DETAILS} tool and ensure all required parameters are provided with correct types and values.`;
-                log.error(msg);
+                log.softFail(msg, { statusCode: 400 });
                 await this.server.sendLoggingMessage({ level: 'error', data: msg });
                 throw new McpError(
                     ErrorCode.InvalidParams,
@@ -580,7 +581,7 @@ Please check the tool's input schema using ${HelperTools.ACTOR_GET_DETAILS} tool
                         if (!client) {
                             const msg = `Failed to connect to MCP server at "${tool.serverUrl}".
 Please verify the server URL is correct and accessible, and ensure you have a valid Apify token with appropriate permissions.`;
-                            log.error(msg);
+                            log.softFail(msg, { statusCode: 408 }); // 408 Request Timeout
                             await this.server.sendLoggingMessage({ level: 'error', data: msg });
                             return buildMCPResponse([msg]);
                         }
@@ -665,7 +666,7 @@ Please verify the server URL is correct and accessible, and ensure you have a va
                     }
                 }
             } catch (error) {
-                log.error('Error occurred while calling tool', { toolName: name, error });
+                logHttpError(error, 'Error occurred while calling tool', { toolName: name });
                 const errorMessage = (error instanceof Error) ? error.message : 'Unknown error';
                 return buildMCPResponse([
                     `Error calling tool "${name}": ${errorMessage}.
@@ -677,7 +678,7 @@ Please verify the tool name, input parameters, and ensure all required resources
             const msg = `Unknown tool type for "${name}".
 Available tools: ${availableTools.length > 0 ? availableTools.join(', ') : 'none'}.
 Please verify the tool name and ensure the tool is properly registered.`;
-            log.error(msg);
+            log.softFail(msg, { statusCode: 404 });
             await this.server.sendLoggingMessage({
                 level: 'error',
                 data: msg,

src/mcp/server.ts

@@ -24,6 +24,7 @@ import { ensureOutputWithinCharLimit, getActorDefinitionStorageFieldNames, getAc
 import { fetchActorDetails } from '../utils/actor-details.js';
 import { buildActorResponseContent } from '../utils/actor-response.js';
 import { ajv } from '../utils/ajv.js';
+import { logHttpError } from '../utils/logging.js';
 import { buildMCPResponse } from '../utils/mcp.js';
 import type { ProgressTracker } from '../utils/progress.js';
 import type { JsonSchemaProperty } from '../utils/schema-generation.js';
@@ -84,7 +85,7 @@ export async function callActorGetDataset(
             try {
                 await apifyClient.run(actorRun.id).abort({ gracefully: false });
             } catch (e) {
-                log.error('Error aborting Actor run', { error: e, runId: actorRun.id });
+                logHttpError(e, 'Error aborting Actor run', { runId: actorRun.id });
             }
             // Reject to stop waiting
             resolve(CLIENT_ABORT);
@@ -244,6 +245,12 @@ async function getMCPServersAsTools(
                 return [];
             }
             return await getMCPServerTools(actorId, client, mcpServerUrl);
+        } catch (error) {
+            logHttpError(error, 'Failed to connect to MCP server', {
+                actorFullName: actorInfo.actorDefinitionPruned.actorFullName,
+                actorId,
+            });
+            return [];
         } finally {
             if (client) await client.close();
         }
@@ -273,17 +280,24 @@ export async function getActorsAsTools(
                 } as ActorInfo;
             }
 
-            const actorDefinitionPruned = await getActorDefinition(actorIdOrName, apifyClient);
-            if (!actorDefinitionPruned) {
-                log.error('Actor not found or definition is not available', { actorName: actorIdOrName });
+            try {
+                const actorDefinitionPruned = await getActorDefinition(actorIdOrName, apifyClient);
+                if (!actorDefinitionPruned) {
+                    log.info('Actor not found or definition is not available', { actorName: actorIdOrName });
+                    return null;
+                }
+                // Cache the pruned Actor definition
+                actorDefinitionPrunedCache.set(actorIdOrName, actorDefinitionPruned);
+                return {
+                    actorDefinitionPruned,
+                    webServerMcpPath: getActorMCPServerPath(actorDefinitionPruned),
+                } as ActorInfo;
+            } catch (error) {
+                logHttpError(error, 'Failed to fetch Actor definition', {
+                    actorName: actorIdOrName,
+                });
                 return null;
             }
-            // Cache the pruned Actor definition
-            actorDefinitionPrunedCache.set(actorIdOrName, actorDefinitionPruned);
-            return {
-                actorDefinitionPruned,
-                webServerMcpPath: getActorMCPServerPath(actorDefinitionPruned),
-            } as ActorInfo;
         }),
     );
 
@@ -435,12 +449,10 @@ You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.
             }
 
             /**
-                 * In Skyfire mode, we check for the presence of `skyfire-pay-id`.
-                 * If it is missing, we return instructions to the LLM on how to create it and pass it to the tool.
-                 */
-            if (apifyMcpServer.options.skyfireMode
-                    && args['skyfire-pay-id'] === undefined
-            ) {
+            * In Skyfire mode, we check for the presence of `skyfire-pay-id`.
+            * If it is missing, we return instructions to the LLM on how to create it and pass it to the tool.
+            */
+            if (apifyMcpServer.options.skyfireMode && args['skyfire-pay-id'] === undefined) {
                 return {
                     content: [{
                         type: 'text',
@@ -450,8 +462,8 @@ You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.
             }
 
             /**
-                 * Create Apify token, for Skyfire mode use `skyfire-pay-id` and for normal mode use `apifyToken`.
-                 */
+            * Create Apify token, for Skyfire mode use `skyfire-pay-id` and for normal mode use `apifyToken`.
+            */
             const apifyClient = apifyMcpServer.options.skyfireMode && typeof args['skyfire-pay-id'] === 'string'
                 ? new ApifyClient({ skyfirePayId: args['skyfire-pay-id'] })
                 : new ApifyClient({ token: apifyToken });
@@ -533,7 +545,7 @@ You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}.
 
             return { content };
         } catch (error) {
-            log.error('Failed to call Actor', { error, actorName, performStep });
+            logHttpError(error, 'Failed to call Actor', { actorName, performStep });
             return buildMCPResponse([`Failed to call Actor '${actorName}': ${error instanceof Error ? error.message : String(error)}.
 Please verify the Actor name, input parameters, and ensure the Actor exists.
 You can search for available Actors using the tool: ${HelperTools.STORE_SEARCH}, or get Actor details using: ${HelperTools.ACTOR_GET_DETAILS}.`]);

src/tools/actor.ts

@@ -1,8 +1,6 @@
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
-import log from '@apify/log';
-
 import { ApifyClient } from '../apify-client.js';
 import { ACTOR_README_MAX_LENGTH, HelperTools } from '../const.js';
 import type {
@@ -32,7 +30,7 @@ export async function getActorDefinition(
 ): Promise<ActorDefinitionPruned | null> {
     const actorClient = apifyClient.actor(actorIdOrName);
     try {
-        // Fetch actor details
+        // Fetch Actor details
         const actor = await actorClient.get();
         if (!actor) {
             return null;
@@ -53,9 +51,20 @@ export async function getActorDefinition(
         }
         return null;
     } catch (error) {
-        const errorMessage = `Failed to fetch input schema for Actor: ${actorIdOrName} with error ${error}.`;
-        log.error(errorMessage);
-        throw new Error(errorMessage);
+        // Check if it's a "not found" error (404 or 400 status codes)
+        const isNotFound = typeof error === 'object'
+            && error !== null
+            && 'statusCode' in error
+            && (error.statusCode === 404 || error.statusCode === 400);
+
+        if (isNotFound) {
+            // Return null for not found - caller will log appropriately
+            return null;
+        }
+
+        // For server errors, throw the original error (preserve error type)
+        // Caller should catch and log
+        throw error;
     }
 }
 function pruneActorDefinition(response: ActorDefinitionWithDesc): ActorDefinitionPruned {
@@ -121,14 +130,23 @@ export const actorDefinitionTool: ToolEntry = {
 
         const parsed = getActorDefinitionArgsSchema.parse(args);
         const apifyClient = new ApifyClient({ token: apifyToken });
-        const v = await getActorDefinition(parsed.actorName, apifyClient, parsed.limit);
-        if (!v) {
-            return { content: [{ type: 'text', text: `Actor '${parsed.actorName}' not found.` }] };
-        }
-        if (v && v.input && 'properties' in v.input && v.input) {
-            const properties = filterSchemaProperties(v.input.properties as { [key: string]: ISchemaProperties });
-            v.input.properties = shortenProperties(properties);
+        try {
+            const v = await getActorDefinition(parsed.actorName, apifyClient, parsed.limit);
+            if (!v) {
+                return { content: [{ type: 'text', text: `Actor '${parsed.actorName}' not found.` }] };
+            }
+            if (v && v.input && 'properties' in v.input && v.input) {
+                const properties = filterSchemaProperties(v.input.properties as { [key: string]: ISchemaProperties });
+                v.input.properties = shortenProperties(properties);
+            }
+            return { content: [{ type: 'text', text: `\`\`\`json\n${JSON.stringify(v)}\n\`\`\`` }] };
+        } catch (error) {
+            return {
+                content: [{
+                    type: 'text',
+                    text: `Failed to fetch Actor definition: ${error instanceof Error ? error.message : String(error)}`,
+                }],
+            };
         }
-        return { content: [{ type: 'text', text: `\`\`\`json\n${JSON.stringify(v)}\n\`\`\`` }] };
     },
 } as const;