n8n 2.45.6 → 2.46.1

package/dist/modules/mcp/mcp-api-key.service.js

@@ -62,22 +62,25 @@ let McpServerApiKeyService = class McpServerApiKeyService {
             const tokenGrant = await this.authStrategyRegistry.buildContextFromToken(apiKey, {
                 audience: API_KEY_AUDIENCE,
             });
-            if (tokenGrant) {
+            if (tokenGrant === null)
+                return null;
+            if (tokenGrant === false) {
                 return {
-                    user: tokenGrant.actor ?? tokenGrant.subject,
-                    actor: tokenGrant.actor,
-                    caller: {
-                        authType: 'api_key',
-                        ...(tokenGrant.apiKeyId ? { apiKeyId: tokenGrant.apiKeyId } : {}),
+                    user: null,
+                    context: {
+                        reason: 'invalid_token',
+                        auth_type: 'api_key',
                     },
                 };
             }
             return {
-                user: null,
-                context: {
-                    reason: 'invalid_token',
-                    auth_type: 'api_key',
+                user: tokenGrant.actor ?? tokenGrant.subject,
+                actor: tokenGrant.actor,
+                caller: {
+                    authType: 'api_key',
+                    ...(tokenGrant.apiKeyId ? { apiKeyId: tokenGrant.apiKeyId } : {}),
                 },
+                authMethod: tokenGrant.apiKeyId === undefined ? 'scoped-jwt' : 'api-key',
             };
         }
         catch (error) {

package/dist/modules/mcp/mcp-api-key.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-api-key.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-api-key.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-api-key.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-api-key.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-protected-resource.js

@@ -16,6 +16,7 @@ const config_1 = require("@n8n/config");
 const constants_1 = require("@n8n/constants");
 const di_1 = require("@n8n/di");
 const backend_services_1 = require("@n8n/backend-services");
+const skill_agents_proxy_service_1 = require("../../modules/skills/skill-agents-proxy.service");
 const posthog_1 = require("../../posthog");
 const mcp_scopes_1 = require("./mcp-scopes");
 const mcp_tool_availability_1 = require("./mcp-tool-availability");
@@ -42,7 +43,7 @@ let McpProtectedResource = class McpProtectedResource {
     }
     get scopes() {
         const agentsAvailable = (0, mcp_tool_availability_1.areAgentToolsAvailable)(this.globalConfig, this.moduleRegistry);
-        const skillsAvailable = (0, mcp_tool_availability_1.areSkillToolsAvailable)(this.globalConfig, this.moduleRegistry);
+        const skillsAvailable = di_1.Container.get(skill_agents_proxy_service_1.SkillAgentsProxy).hasProvider;
         return exports.SUPPORTED_SCOPES.filter((scope) => (agentsAvailable || !AGENT_SCOPES.has(scope)) &&
             (skillsAvailable || !SKILL_SCOPES.has(scope)));
     }

package/dist/modules/mcp/mcp-protected-resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-protected-resource.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-protected-resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-protected-resource.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-protected-resource.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-scopes.js

@@ -64,8 +64,8 @@ exports.TOOLS_BY_SCOPE = {
         'unpublish_agent',
     ],
     'agent:execute': ['call_agent'],
-    'skill:read': ['search_skills', 'get_skill'],
-    'skill:write': ['create_skill', 'update_skill', 'delete_skill', 'search_skills', 'get_skill'],
+    'skill:read': ['search_n8n_skills', 'get_skill'],
+    'skill:write': ['create_skill', 'update_skill', 'delete_skill', 'search_n8n_skills', 'get_skill'],
     'credential:read': ['list_credentials', 'list_n8n_gateway_services', 'explore_node_resources'],
     'dataTable:read': ['search_data_tables', 'get_data_table_rows'],
     'dataTable:write': [

package/dist/modules/mcp/mcp-scopes.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-scopes.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-scopes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-scopes.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-scopes.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-server-middleware.service.d.ts

@@ -1,20 +1,26 @@
+import { Logger } from '@n8n/backend-common';
+import { UserRepository } from '@n8n/db';
+import { ResourceAdmission } from '@n8n/inbound-auth';
 import { NextFunction, Response, Request } from 'express';
 import { JwtService } from '@n8n/backend-services';
-import { OAuthTokenVerifierProxy, type UserWithContext } from '@n8n/backend-services/auth';
 import { Telemetry } from '../../telemetry';
 import { McpServerApiKeyService } from './mcp-api-key.service';
 import { McpProtectedResource } from './mcp-protected-resource';
 export declare class McpServerMiddlewareService {
     private readonly mcpServerApiKeyService;
-    private readonly oauthTokenVerifier;
     private readonly mcpProtectedResource;
+    private readonly admission;
+    private readonly userRepository;
     private readonly jwtService;
     private readonly telemetry;
-    constructor(mcpServerApiKeyService: McpServerApiKeyService, oauthTokenVerifier: OAuthTokenVerifierProxy, mcpProtectedResource: McpProtectedResource, jwtService: JwtService, telemetry: Telemetry);
-    getUserForToken(token: string): Promise<UserWithContext>;
+    private readonly logger;
+    constructor(mcpServerApiKeyService: McpServerApiKeyService, mcpProtectedResource: McpProtectedResource, admission: ResourceAdmission, userRepository: UserRepository, jwtService: JwtService, telemetry: Telemetry, logger: Logger);
     getEnabledMiddleware(): (req: Request, res: Response, next: NextFunction) => Promise<void>;
     getAuthMiddleware(): (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    private extractBearerToken;
-    private responseWithUnauthorized;
+    private issuerOf;
+    private settleSecurityContext;
+    private refuseAdmitted;
+    private settleApiKey;
+    private deny;
     private trackFailedConnection;
 }

package/dist/modules/mcp/mcp-server-middleware.service.js

@@ -10,44 +10,54 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.McpServerMiddlewareService = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const db_1 = require("@n8n/db");
 const di_1 = require("@n8n/di");
-const ensure_error_1 = require("@n8n/utils/errors/ensure-error");
-const errors_1 = require("@n8n/errors");
+const inbound_auth_1 = require("@n8n/inbound-auth");
 const backend_services_1 = require("@n8n/backend-services");
-const auth_1 = require("@n8n/backend-services/auth");
 const telemetry_1 = require("../../telemetry");
 const mcp_api_key_service_1 = require("./mcp-api-key.service");
 const mcp_protected_resource_1 = require("./mcp-protected-resource");
 const mcp_constants_1 = require("./mcp.constants");
 const mcp_utils_1 = require("./mcp.utils");
+const TELEMETRY_REASONS = {
+    'no-credential': 'missing_authorization_header',
+    'malformed-credential': 'invalid_bearer_format',
+    'unknown-subject': 'user_not_found',
+    insufficient_scope: 'insufficient_scope',
+    revoked: 'token_not_found_in_db',
+};
+const telemetryOf = (reason, urlIssuer) => ({
+    reason: TELEMETRY_REASONS[reason] ?? 'invalid_token',
+    auth_type: urlIssuer ? 'oauth' : 'unknown',
+    error_details: reason,
+});
+function headerDenial(header) {
+    if (header === undefined) {
+        return {
+            reason: 'missing_authorization_header',
+            auth_type: 'unknown',
+            error_details: 'Authorization header not sent',
+        };
+    }
+    const problem = /^bearer(\s|$)/i.test(header)
+        ? 'Malformed Bearer token'
+        : 'Missing Bearer prefix';
+    return {
+        reason: 'invalid_bearer_format',
+        auth_type: 'unknown',
+        error_details: `Invalid authorization header format - ${problem}`,
+    };
+}
 let McpServerMiddlewareService = class McpServerMiddlewareService {
-    constructor(mcpServerApiKeyService, oauthTokenVerifier, mcpProtectedResource, jwtService, telemetry) {
+    constructor(mcpServerApiKeyService, mcpProtectedResource, admission, userRepository, jwtService, telemetry, logger) {
         this.mcpServerApiKeyService = mcpServerApiKeyService;
-        this.oauthTokenVerifier = oauthTokenVerifier;
         this.mcpProtectedResource = mcpProtectedResource;
+        this.admission = admission;
+        this.userRepository = userRepository;
         this.jwtService = jwtService;
         this.telemetry = telemetry;
-    }
-    async getUserForToken(token) {
-        let decoded;
-        try {
-            decoded = this.jwtService.decodeUnverified(token);
-        }
-        catch (error) {
-            return {
-                user: null,
-                context: {
-                    reason: 'jwt_decode_failed',
-                    auth_type: 'unknown',
-                    error_details: (0, ensure_error_1.ensureError)(error).message,
-                },
-            };
-        }
-        if (decoded?.meta?.isOAuth === true) {
-            const expectedAudience = this.mcpProtectedResource.getResourceUrl();
-            return await this.oauthTokenVerifier.verifyOAuthAccessToken(token, expectedAudience);
-        }
-        return await this.mcpServerApiKeyService.verifyApiKey(token);
+        this.logger = logger;
     }
     getEnabledMiddleware() {
         return async (req, res, next) => {
@@ -63,57 +73,87 @@ let McpServerMiddlewareService = class McpServerMiddlewareService {
     }
     getAuthMiddleware() {
         return async (req, res, next) => {
-            const authorizationHeader = req.header('authorization');
-            if (!authorizationHeader) {
-                this.responseWithUnauthorized(res, req, {
-                    reason: 'missing_authorization_header',
-                    auth_type: 'unknown',
-                    error_details: 'Authorization header not sent',
-                });
+            const inbound = (0, inbound_auth_1.inboundFrom)(this.mcpProtectedResource, (0, inbound_auth_1.inboundRequestOf)(req));
+            const extracted = (0, inbound_auth_1.extractBearer)(inbound);
+            if (!extracted.ok) {
+                const refused = this.admission.refuse(inbound, extracted.reason);
+                await this.deny(req, res, refused, headerDenial(req.header('authorization')));
                 return;
             }
-            let token;
-            try {
-                token = this.extractBearerToken(authorizationHeader);
-            }
-            catch (er) {
-                const error = (0, ensure_error_1.ensureError)(er);
-                this.responseWithUnauthorized(res, req, {
-                    reason: 'invalid_bearer_format',
-                    auth_type: 'unknown',
-                    error_details: error.message,
-                });
-                return;
+            const { token } = extracted.value.credential;
+            const urlIssuer = (0, inbound_auth_1.isUrlIssuer)(this.issuerOf(token));
+            if (!urlIssuer) {
+                const result = await this.mcpServerApiKeyService.verifyApiKey(token);
+                if (result !== null) {
+                    await this.settleApiKey(req, res, next, inbound, result);
+                    return;
+                }
             }
-            const result = await this.getUserForToken(token);
-            const user = result.user;
-            if (!user) {
-                this.responseWithUnauthorized(res, req, result.context);
+            const admitted = await this.admission.admit(this.mcpProtectedResource, extracted.value);
+            if (!admitted.ok) {
+                await this.deny(req, res, admitted, telemetryOf(admitted.reason, urlIssuer));
                 return;
             }
-            req.user = user;
-            const mcpReq = req;
-            mcpReq.mcpCaller = result.caller;
-            mcpReq.mcpScopes = result.scopes;
-            next();
+            await this.settleSecurityContext(req, res, next, inbound, admitted.context);
         };
     }
-    extractBearerToken(headerValue) {
-        if (!headerValue.startsWith('Bearer')) {
-            throw new errors_1.AuthError('Invalid authorization header format - Missing Bearer prefix');
+    issuerOf(token) {
+        try {
+            return this.jwtService.decodeUnverified(token)?.iss;
+        }
+        catch {
+            return undefined;
+        }
+    }
+    async settleSecurityContext(req, res, next, inbound, context) {
+        if (context.clientId === undefined) {
+            await this.refuseAdmitted(req, res, inbound, context, 'not-an-access-token');
+            return;
         }
-        const tokenMatch = headerValue.match(/^Bearer\s+(.+)$/i);
-        if (tokenMatch) {
-            return tokenMatch[1];
+        const user = await this.userRepository.findByIdWithRole(context.subject.id);
+        if (!user) {
+            await this.refuseAdmitted(req, res, inbound, context, 'unknown-subject');
+            return;
         }
-        throw new errors_1.AuthError('Invalid authorization header format - Malformed Bearer token');
+        const mcpReq = req;
+        mcpReq.user = user;
+        mcpReq.mcpCaller = { authType: 'oauth', clientId: context.clientId };
+        mcpReq.mcpScopes = context.tokenScopes ?? [];
+        mcpReq.ctx = { ...mcpReq.ctx, security: context };
+        next();
+    }
+    async refuseAdmitted(req, res, inbound, context, reason) {
+        const refused = this.admission.refuse(inbound, reason, context);
+        await this.deny(req, res, refused, telemetryOf(reason, true));
+    }
+    async settleApiKey(req, res, next, inbound, result) {
+        const where = { surface: inbound.surface, resource: inbound.resource.url };
+        if (!result.user) {
+            const telemetry = result.context ?? {
+                reason: 'invalid_token',
+                auth_type: 'api_key',
+            };
+            this.logger.warn('Inbound authentication denied', { ...where, reason: telemetry.reason });
+            const advertised = { surface: inbound.surface, resource: inbound.resource };
+            await this.deny(req, res, { advertised }, telemetry);
+            return;
+        }
+        this.logger.info('Inbound authentication accepted', {
+            ...where,
+            authMethod: result.authMethod,
+            userId: result.user.id,
+        });
+        const mcpReq = req;
+        mcpReq.user = result.user;
+        mcpReq.mcpCaller = result.caller;
+        mcpReq.mcpScopes = result.scopes;
+        next();
     }
-    responseWithUnauthorized(res, req, context) {
-        this.trackFailedConnection(req, mcp_constants_1.UNAUTHORIZED_ERROR_MESSAGE, 401, context);
-        const prmUrl = this.mcpProtectedResource.getProtectedResourceMetadataUrl();
-        res.header('WWW-Authenticate', `Bearer realm="n8n MCP Server", resource_metadata="${prmUrl}"`);
+    async deny(req, res, refusal, telemetry) {
+        this.trackFailedConnection(req, mcp_constants_1.UNAUTHORIZED_ERROR_MESSAGE, 401, telemetry);
+        res.header('WWW-Authenticate', await this.admission.challenge(refusal));
         res.status(401).send({
-            message: `${mcp_constants_1.UNAUTHORIZED_ERROR_MESSAGE}${context?.error_details ? ': ' + context.error_details : ''}`,
+            message: `${mcp_constants_1.UNAUTHORIZED_ERROR_MESSAGE}${telemetry.error_details ? ': ' + telemetry.error_details : ''}`,
         });
     }
     trackFailedConnection(req, error, httpStatus, context) {
@@ -133,6 +173,6 @@ let McpServerMiddlewareService = class McpServerMiddlewareService {
 exports.McpServerMiddlewareService = McpServerMiddlewareService;
 exports.McpServerMiddlewareService = McpServerMiddlewareService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [mcp_api_key_service_1.McpServerApiKeyService, auth_1.OAuthTokenVerifierProxy, mcp_protected_resource_1.McpProtectedResource, backend_services_1.JwtService, telemetry_1.Telemetry])
+    __metadata("design:paramtypes", [mcp_api_key_service_1.McpServerApiKeyService, mcp_protected_resource_1.McpProtectedResource, inbound_auth_1.ResourceAdmission, db_1.UserRepository, backend_services_1.JwtService, telemetry_1.Telemetry, backend_common_1.Logger])
 ], McpServerMiddlewareService);
 //# sourceMappingURL=mcp-server-middleware.service.js.map

package/dist/modules/mcp/mcp-server-middleware.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-server-middleware.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-server-middleware.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-server-middleware.service.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-server-middleware.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/mcp/mcp-tool-availability.d.ts

@@ -6,7 +6,6 @@ import type { CommunityPackagesConfig } from '../../modules/community-packages/c
 import type { McpConfig } from './mcp.config';
 export declare function arePreferenceToolsEnabled(flags: FeatureFlags): boolean;
 export declare function areAgentToolsAvailable(globalConfig: GlobalConfig, moduleRegistry: ModuleRegistry): boolean;
-export declare function areSkillToolsAvailable(globalConfig: GlobalConfig, moduleRegistry: ModuleRegistry): boolean;
 export declare function isCommunityNodeInstallAvailable(moduleRegistry: ModuleRegistry, config: Pick<CommunityPackagesConfig, 'enabled' | 'verifiedEnabled'>, globalConfig: {
     endpoints: Pick<GlobalConfig['endpoints'], 'mcpBuilderEnabled'>;
     instanceSettingsLoader: Pick<GlobalConfig['instanceSettingsLoader'], 'communityPackagesManagedByEnv'>;

package/dist/modules/mcp/mcp-tool-availability.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.arePreferenceToolsEnabled = arePreferenceToolsEnabled;
 exports.areAgentToolsAvailable = areAgentToolsAvailable;
-exports.areSkillToolsAvailable = areSkillToolsAvailable;
 exports.isCommunityNodeInstallAvailable = isCommunityNodeInstallAvailable;
 const api_types_1 = require("@n8n/api-types");
 const permissions_1 = require("@n8n/permissions");
@@ -14,9 +13,6 @@ function areAgentToolsAvailable(globalConfig, moduleRegistry) {
         moduleRegistry.isActive('agents') &&
         moduleRegistry.settings.get('agents')?.enabled !== false);
 }
-function areSkillToolsAvailable(globalConfig, moduleRegistry) {
-    return moduleRegistry.isActive('agents') && globalConfig.agents.skillsHubEnabled;
-}
 function isCommunityNodeInstallAvailable(moduleRegistry, config, globalConfig, mcpConfig, user) {
     return (globalConfig.endpoints.mcpBuilderEnabled &&
         mcpConfig.communityNodeDiscoveryEnabled &&

package/dist/modules/mcp/mcp-tool-availability.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-tool-availability.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-tool-availability.ts"],"names":[],"mappings":";;;;;;AAAA,8CAA+F;AAG/F,kDAAsE;AAetE,mCAA0C,KAAmB;IAC5D,OAAO,KAAK,CAAC,oCAAwB,CAAC,KAAK,+CAAmC,CAAC;AAChF,CAAC;AAED,gCACC,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,CACN,YAAY,CAAC,SAAS,CAAC,iBAAiB;QACxC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,KAAK,CACxD,CAAC;AACH,CAAC;AAED,gCACC,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,MAAM,CAAC,gBAAgB,CAAC;AAClF,CAAC;AAmBD,yCACC,cAA8B,EAC9B,MAAoE,EACpE,YAMC,EACD,SAA2D,EAC3D,IAAmB;IAEnB,OAAO,CACN,YAAY,CAAC,SAAS,CAAC,iBAAiB;QACxC,SAAS,CAAC,6BAA6B;QACvC,cAAc,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QAC7C,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,eAAe;QACtB,CAAC,YAAY,CAAC,sBAAsB,CAAC,6BAA6B;QAClE,IAAA,4BAAc,EAAC,IAAI,EAAE,0BAA0B,CAAC,CAChD,CAAC;AACH,CAAC"}
+{"version":3,"file":"mcp-tool-availability.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp-tool-availability.ts"],"names":[],"mappings":";;;;;AAAA,8CAA+F;AAG/F,kDAAsE;AAetE,mCAA0C,KAAmB;IAC5D,OAAO,KAAK,CAAC,oCAAwB,CAAC,KAAK,+CAAmC,CAAC;AAChF,CAAC;AAED,gCACC,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,CACN,YAAY,CAAC,SAAS,CAAC,iBAAiB;QACxC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,KAAK,KAAK,CACxD,CAAC;AACH,CAAC;AAmBD,yCACC,cAA8B,EAC9B,MAAoE,EACpE,YAMC,EACD,SAA2D,EAC3D,IAAmB;IAEnB,OAAO,CACN,YAAY,CAAC,SAAS,CAAC,iBAAiB;QACxC,SAAS,CAAC,6BAA6B;QACvC,cAAc,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QAC7C,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,eAAe;QACtB,CAAC,YAAY,CAAC,sBAAsB,CAAC,6BAA6B;QAClE,IAAA,4BAAc,EAAC,IAAI,EAAE,0BAA0B,CAAC,CAChD,CAAC;AACH,CAAC"}

package/dist/modules/mcp/mcp.constants.d.ts

@@ -5,6 +5,7 @@ export declare const MCP_CREDENTIALS_AUTOASSIGN_EVENT = "MCP credentials autoass
 export declare const MCP_PROTOCOL_VERSION_META_KEY = "io.modelcontextprotocol/protocolVersion";
 export declare const MCP_CLIENT_INFO_META_KEY = "io.modelcontextprotocol/clientInfo";
 export declare const MCP_DISCOVER_METHOD = "server/discover";
+export declare const MCP_SKILLS_EXTENSION_FLAG = "128_mcp_skills_extension";
 export declare const UNAUTHORIZED_ERROR_MESSAGE = "Unauthorized";
 export declare const INTERNAL_SERVER_ERROR_MESSAGE = "Internal server error";
 export declare const MCP_ACCESS_DISABLED_ERROR_MESSAGE = "MCP access is disabled";

package/dist/modules/mcp/mcp.constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SUPPORTED_MCP_TRIGGERS = exports.SUPPORTED_PRODUCTION_MCP_TRIGGERS = exports.MCP_CREATE_AGENT_TOOL_NAME = exports.MCP_CALL_AGENT_TOOL_NAME = exports.MCP_USER_PREFERENCES_TRIGGER_CLAUSE = exports.INSTALL_COMMUNITY_NODE_TOOL = exports.MCP_UNDO_USER_PREFERENCE_TOOL_NAME = exports.MCP_UPDATE_USER_PREFERENCE_TOOL_NAME = exports.MCP_SAVE_USER_PREFERENCE_TOOL_NAME = exports.MCP_GET_USER_PREFERENCES_TOOL_NAME = exports.LIST_N8N_GATEWAY_SERVICES_TOOL_NAME = exports.MISSING_PROTOCOL_VERSION_ERROR_MESSAGE = exports.HANDSHAKE_FAILED_ERROR_MESSAGE = exports.MCP_INSTANCE_READ_ONLY_ERROR_MESSAGE = exports.MCP_ACCESS_DISABLED_ERROR_MESSAGE = exports.INTERNAL_SERVER_ERROR_MESSAGE = exports.UNAUTHORIZED_ERROR_MESSAGE = exports.MCP_DISCOVER_METHOD = exports.MCP_CLIENT_INFO_META_KEY = exports.MCP_PROTOCOL_VERSION_META_KEY = exports.MCP_CREDENTIALS_AUTOASSIGN_EVENT = exports.MCP_PREVIEW_RENDER_REQUESTED_EVENT = exports.USER_CALLED_MCP_TOOL_EVENT = exports.USER_CONNECTED_TO_MCP_EVENT = void 0;
+exports.SUPPORTED_MCP_TRIGGERS = exports.SUPPORTED_PRODUCTION_MCP_TRIGGERS = exports.MCP_CREATE_AGENT_TOOL_NAME = exports.MCP_CALL_AGENT_TOOL_NAME = exports.MCP_USER_PREFERENCES_TRIGGER_CLAUSE = exports.INSTALL_COMMUNITY_NODE_TOOL = exports.MCP_UNDO_USER_PREFERENCE_TOOL_NAME = exports.MCP_UPDATE_USER_PREFERENCE_TOOL_NAME = exports.MCP_SAVE_USER_PREFERENCE_TOOL_NAME = exports.MCP_GET_USER_PREFERENCES_TOOL_NAME = exports.LIST_N8N_GATEWAY_SERVICES_TOOL_NAME = exports.MISSING_PROTOCOL_VERSION_ERROR_MESSAGE = exports.HANDSHAKE_FAILED_ERROR_MESSAGE = exports.MCP_INSTANCE_READ_ONLY_ERROR_MESSAGE = exports.MCP_ACCESS_DISABLED_ERROR_MESSAGE = exports.INTERNAL_SERVER_ERROR_MESSAGE = exports.UNAUTHORIZED_ERROR_MESSAGE = exports.MCP_SKILLS_EXTENSION_FLAG = exports.MCP_DISCOVER_METHOD = exports.MCP_CLIENT_INFO_META_KEY = exports.MCP_PROTOCOL_VERSION_META_KEY = exports.MCP_CREDENTIALS_AUTOASSIGN_EVENT = exports.MCP_PREVIEW_RENDER_REQUESTED_EVENT = exports.USER_CALLED_MCP_TOOL_EVENT = exports.USER_CONNECTED_TO_MCP_EVENT = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 exports.USER_CONNECTED_TO_MCP_EVENT = 'User connected to MCP server';
 exports.USER_CALLED_MCP_TOOL_EVENT = 'User called mcp tool';
@@ -9,6 +9,7 @@ exports.MCP_CREDENTIALS_AUTOASSIGN_EVENT = 'MCP credentials autoassign';
 exports.MCP_PROTOCOL_VERSION_META_KEY = 'io.modelcontextprotocol/protocolVersion';
 exports.MCP_CLIENT_INFO_META_KEY = 'io.modelcontextprotocol/clientInfo';
 exports.MCP_DISCOVER_METHOD = 'server/discover';
+exports.MCP_SKILLS_EXTENSION_FLAG = '128_mcp_skills_extension';
 exports.UNAUTHORIZED_ERROR_MESSAGE = 'Unauthorized';
 exports.INTERNAL_SERVER_ERROR_MESSAGE = 'Internal server error';
 exports.MCP_ACCESS_DISABLED_ERROR_MESSAGE = 'MCP access is disabled';

package/dist/modules/mcp/mcp.constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.constants.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.constants.ts"],"names":[],"mappings":";;;AAAA,+CAMsB;AAMT,QAAA,2BAA2B,GAAG,8BAA8B,CAAC;AAC7D,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,kCAAkC,GAAG,kCAAkC,CAAC;AACxE,QAAA,gCAAgC,GAAG,4BAA4B,CAAC;AAYhE,QAAA,6BAA6B,GAAG,yCAAyC,CAAC;AAC1E,QAAA,wBAAwB,GAAG,oCAAoC,CAAC;AAOhE,QAAA,mBAAmB,GAAG,iBAAiB,CAAC;AAKxC,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAC5C,QAAA,6BAA6B,GAAG,uBAAuB,CAAC;AACxD,QAAA,iCAAiC,GAAG,wBAAwB,CAAC;AAC7D,QAAA,oCAAoC,GAChD,yFAAyF,CAAC;AAE9E,QAAA,8BAA8B,GAAG,sBAAsB,CAAC;AAExD,QAAA,sCAAsC,GAClD,oDAAoD,CAAC;AAKzC,QAAA,mCAAmC,GAAG,2BAA2B,CAAC;AAClE,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAC5D,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAC5D,QAAA,oCAAoC,GAAG,wBAAwB,CAAC;AAChE,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAQ5D,QAAA,2BAA2B,GAAG;IAC1C,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,wBAAwB;CAC7B,CAAC;AAME,QAAA,mCAAmC,GAC/C,uFAAuF,CAAC;AAC5E,QAAA,wBAAwB,GAAG,YAAY,CAAC;AACxC,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAK5C,QAAA,iCAAiC,GAAG;IAChD,CAAC,yCAA0B,CAAC,EAAE,kBAAkB;IAChD,CAAC,gCAAiB,CAAC,EAAE,iBAAiB;IACtC,CAAC,qCAAsB,CAAC,EAAE,cAAc;IACxC,CAAC,qCAAsB,CAAC,EAAE,cAAc;CACxC,CAAC;AAKW,QAAA,sBAAsB,GAAG;IACrC,GAAG,QAAA,iCAAiC;IACpC,CAAC,uCAAwB,CAAC,EAAE,gBAAgB;CAC5C,CAAC"}
+{"version":3,"file":"mcp.constants.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.constants.ts"],"names":[],"mappings":";;;AAAA,+CAMsB;AAMT,QAAA,2BAA2B,GAAG,8BAA8B,CAAC;AAC7D,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,kCAAkC,GAAG,kCAAkC,CAAC;AACxE,QAAA,gCAAgC,GAAG,4BAA4B,CAAC;AAYhE,QAAA,6BAA6B,GAAG,yCAAyC,CAAC;AAC1E,QAAA,wBAAwB,GAAG,oCAAoC,CAAC;AAOhE,QAAA,mBAAmB,GAAG,iBAAiB,CAAC;AAExC,QAAA,yBAAyB,GAAG,0BAA0B,CAAC;AAKvD,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAC5C,QAAA,6BAA6B,GAAG,uBAAuB,CAAC;AACxD,QAAA,iCAAiC,GAAG,wBAAwB,CAAC;AAC7D,QAAA,oCAAoC,GAChD,yFAAyF,CAAC;AAE9E,QAAA,8BAA8B,GAAG,sBAAsB,CAAC;AAExD,QAAA,sCAAsC,GAClD,oDAAoD,CAAC;AAKzC,QAAA,mCAAmC,GAAG,2BAA2B,CAAC;AAClE,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAC5D,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAC5D,QAAA,oCAAoC,GAAG,wBAAwB,CAAC;AAChE,QAAA,kCAAkC,GAAG,sBAAsB,CAAC;AAQ5D,QAAA,2BAA2B,GAAG;IAC1C,QAAQ,EAAE,wBAAwB;IAClC,YAAY,EAAE,wBAAwB;CAC7B,CAAC;AAME,QAAA,mCAAmC,GAC/C,uFAAuF,CAAC;AAC5E,QAAA,wBAAwB,GAAG,YAAY,CAAC;AACxC,QAAA,0BAA0B,GAAG,cAAc,CAAC;AAK5C,QAAA,iCAAiC,GAAG;IAChD,CAAC,yCAA0B,CAAC,EAAE,kBAAkB;IAChD,CAAC,gCAAiB,CAAC,EAAE,iBAAiB;IACtC,CAAC,qCAAsB,CAAC,EAAE,cAAc;IACxC,CAAC,qCAAsB,CAAC,EAAE,cAAc;CACxC,CAAC;AAKW,QAAA,sBAAsB,GAAG;IACrC,GAAG,QAAA,iCAAiC;IACpC,CAAC,uCAAwB,CAAC,EAAE,gBAAgB;CAC5C,CAAC"}

package/dist/modules/mcp/mcp.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcp.module.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAE3D,gDAA4D;AAC5D,gCAAoC;AAS7B,IAAM,SAAS,GAAf,MAAM,SAAS;IACrB,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,MAAM,CAAC,8BAA8B,CAAC,CAAC;QAK7C,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACjF,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC7E,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACxF,CAAC;IAQD,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QACzE,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC7E,MAAM,kBAAkB,GAAG,cAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC/D,MAAM,sBAAsB,GAAG,MAAM,kBAAkB,CAAC,yBAAyB,EAAE,CAAC;QACpF,MAAM,EAAE,eAAe,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,qCAA4B,CAAC,CAAC;QAGxE,MAAM,SAAS,GAAG,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,cAAc,EAAE,CAAC;QACvE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC;IACjF,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,KAAI,CAAC;CACnB,CAAA;;AADM;IADL,IAAA,uBAAU,GAAE;;;;yCACM;oBAjCP,SAAS;IADrB,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;GAC3C,SAAS,CAkCrB"}
+{"version":3,"file":"mcp.module.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2D;AAE3D,gDAA4D;AAC5D,gCAAoC;AAU7B,IAAM,SAAS,GAAf,MAAM,SAAS;IACrB,KAAK,CAAC,IAAI;QACT,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACpC,MAAM,MAAM,CAAC,8BAA8B,CAAC,CAAC;QAK7C,MAAM,EAAE,yBAAyB,EAAE,GAAG,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;QACjF,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC7E,cAAS,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;IACxF,CAAC;IAQD,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QACzE,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC7E,MAAM,kBAAkB,GAAG,cAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QAC7D,MAAM,gBAAgB,GAAG,MAAM,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC/D,MAAM,sBAAsB,GAAG,MAAM,kBAAkB,CAAC,yBAAyB,EAAE,CAAC;QACpF,MAAM,EAAE,eAAe,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,qCAA4B,CAAC,CAAC;QAGxE,MAAM,SAAS,GAAG,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,cAAc,EAAE,CAAC;QACvE,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,SAAS,EAAE,sBAAsB,EAAE,CAAC;IACjF,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,KAAI,CAAC;CACnB,CAAA;;AADM;IADL,IAAA,uBAAU,GAAE;;;;yCACM;oBAjCP,SAAS;IADrB,IAAA,0BAAa,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC;GAC3C,SAAS,CAkCrB"}

package/dist/modules/mcp/mcp.service.d.ts

@@ -1,6 +1,6 @@
 import type { McpServer } from '@modelcontextprotocol/server';
 import { LicenseState, Logger, ModuleRegistry } from '@n8n/backend-common';
-import { EventService, UrlService, RoleService, FolderFinderService, InstanceWriteAccessService, ExecutionRedactionServiceProxy, WorkflowPublishedDataService } from '@n8n/backend-services';
+import { EventService, UrlService, RoleService, FolderFinderService, InstanceWriteAccessService, ExecutionRedactionServiceProxy, WorkflowPublishedDataService, AiPreferenceService } from '@n8n/backend-services';
 import { ExecutionsConfig, GlobalConfig, WorkflowsConfig } from '@n8n/config';
 import { ExecutionRepository, ProjectRepository, SharedWorkflowRepository, User } from '@n8n/db';
 import { type IDeferredPromise } from '@n8n/utils/promise/deferred-promise';
@@ -17,7 +17,6 @@ import { NodeCatalogService } from '../../node-catalog';
 import { NodeTypes } from '../../node-types';
 import { PostHogClient } from '../../posthog';
 import { AiGatewayService } from '../../services/ai-gateway.service';
-import { AiPreferenceService } from '../../services/ai-preference.service';
 import { FolderService } from '../../services/folder.service';
 import { NodeResourceExplorerService } from '../../services/node-resource-explorer.service';
 import { ProjectService } from '../../services/project.service.ee';
@@ -41,6 +40,7 @@ export type McpFeatureFlags = {
     mcpApps: McpAppsResolution;
     instanceContextEnabled: boolean;
     aiPreferencesEnabled: boolean;
+    skillsExtensionEnabled?: boolean;
 };
 export declare class McpService {
     private readonly logger;

package/dist/modules/mcp/mcp.service.js

@@ -29,11 +29,11 @@ const credentials_service_1 = require("../../credentials/credentials.service");
 const execution_list_service_1 = require("../../executions/execution-list.service");
 const execution_service_1 = require("../../executions/execution.service");
 const data_table_proxy_service_1 = require("../../modules/data-table/data-table-proxy.service");
+const skill_agents_proxy_service_1 = require("../../modules/skills/skill-agents-proxy.service");
 const node_catalog_1 = require("../../node-catalog");
 const node_types_1 = require("../../node-types");
 const posthog_1 = require("../../posthog");
 const ai_gateway_service_1 = require("../../services/ai-gateway.service");
-const ai_preference_service_1 = require("../../services/ai-preference.service");
 const folder_service_1 = require("../../services/folder.service");
 const node_resource_explorer_service_1 = require("../../services/node-resource-explorer.service");
 const project_service_ee_1 = require("../../services/project.service.ee");
@@ -182,6 +182,7 @@ let McpService = class McpService {
             mcpApps: this.resolveMcpApps(mcpAppsEnabled, flags),
             instanceContextEnabled: instanceFlag.status === 'fulfilled' && instanceFlag.value === true,
             aiPreferencesEnabled: (0, mcp_tool_availability_1.arePreferenceToolsEnabled)(flags),
+            skillsExtensionEnabled: flags[mcp_constants_1.MCP_SKILLS_EXTENSION_FLAG] === true,
         };
     }
     resolveMcpApps(envOverride, flags) {
@@ -450,9 +451,13 @@ let McpService = class McpService {
             const { McpAgentToolsService } = await import('./tools/agents/agent-tools.service.js');
             di_1.Container.get(McpAgentToolsService).registerTools(registerIfAllowed, registerResource, user, allowedToolNames);
         }
-        if ((0, mcp_tool_availability_1.areSkillToolsAvailable)(this.globalConfig, this.moduleRegistry)) {
+        if (di_1.Container.get(skill_agents_proxy_service_1.SkillAgentsProxy).hasProvider) {
             const { McpSkillToolsService } = await import('./tools/skills/skill-tools.service.js');
-            di_1.Container.get(McpSkillToolsService).registerTools(registerIfAllowed, user);
+            await di_1.Container.get(McpSkillToolsService).registerTools(registerIfAllowed, user);
+            if (featureFlags.skillsExtensionEnabled && (allowedToolNames?.has('get_skill') ?? true)) {
+                const { McpSkillExtensionService } = await import('./tools/skills/skill-extension.service.js');
+                di_1.Container.get(McpSkillExtensionService).register(server, user);
+            }
         }
         return server;
     }
@@ -616,6 +621,6 @@ let McpService = class McpService {
 exports.McpService = McpService;
 exports.McpService = McpService = __decorate([
     (0, di_1.Service)(),
-    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.ExecutionsConfig, n8n_core_1.InstanceSettings, workflow_finder_service_1.WorkflowFinderService, workflow_service_1.WorkflowService, backend_services_1.UrlService, credentials_service_1.CredentialsService, active_executions_1.ActiveExecutions, config_1.GlobalConfig, telemetry_1.Telemetry, workflow_runner_1.WorkflowRunner, backend_services_1.RoleService, project_service_ee_1.ProjectService, node_catalog_1.NodeCatalogService, workflow_creation_service_1.WorkflowCreationService, node_types_1.NodeTypes, db_1.ProjectRepository, backend_services_1.FolderFinderService, db_1.SharedWorkflowRepository, db_1.ExecutionRepository, execution_service_1.ExecutionService, execution_list_service_1.ExecutionListService, data_table_proxy_service_1.DataTableProxyService, collaboration_service_1.CollaborationService, node_resource_explorer_service_1.NodeResourceExplorerService, tag_service_1.TagService, backend_common_1.LicenseState, posthog_1.PostHogClient, workflow_history_service_1.WorkflowHistoryService, config_1.WorkflowsConfig, backend_services_1.WorkflowPublishedDataService, error_workflow_validation_service_1.ErrorWorkflowValidationService, ai_gateway_service_1.AiGatewayService, mcp_post_save_metrics_service_1.McpPostSaveMetricsService, backend_common_1.ModuleRegistry, backend_services_1.EventService, folder_service_1.FolderService, ai_preference_service_1.AiPreferenceService, mcp_config_1.McpConfig, backend_services_1.ExecutionRedactionServiceProxy, backend_services_1.InstanceWriteAccessService])
+    __metadata("design:paramtypes", [backend_common_1.Logger, config_1.ExecutionsConfig, n8n_core_1.InstanceSettings, workflow_finder_service_1.WorkflowFinderService, workflow_service_1.WorkflowService, backend_services_1.UrlService, credentials_service_1.CredentialsService, active_executions_1.ActiveExecutions, config_1.GlobalConfig, telemetry_1.Telemetry, workflow_runner_1.WorkflowRunner, backend_services_1.RoleService, project_service_ee_1.ProjectService, node_catalog_1.NodeCatalogService, workflow_creation_service_1.WorkflowCreationService, node_types_1.NodeTypes, db_1.ProjectRepository, backend_services_1.FolderFinderService, db_1.SharedWorkflowRepository, db_1.ExecutionRepository, execution_service_1.ExecutionService, execution_list_service_1.ExecutionListService, data_table_proxy_service_1.DataTableProxyService, collaboration_service_1.CollaborationService, node_resource_explorer_service_1.NodeResourceExplorerService, tag_service_1.TagService, backend_common_1.LicenseState, posthog_1.PostHogClient, workflow_history_service_1.WorkflowHistoryService, config_1.WorkflowsConfig, backend_services_1.WorkflowPublishedDataService, error_workflow_validation_service_1.ErrorWorkflowValidationService, ai_gateway_service_1.AiGatewayService, mcp_post_save_metrics_service_1.McpPostSaveMetricsService, backend_common_1.ModuleRegistry, backend_services_1.EventService, folder_service_1.FolderService, backend_services_1.AiPreferenceService, mcp_config_1.McpConfig, backend_services_1.ExecutionRedactionServiceProxy, backend_services_1.InstanceWriteAccessService])
 ], McpService);
 //# sourceMappingURL=mcp.service.js.map