feat(editor): Connect workflows from MCP settings page

packages/@n8n/db/src/repositories/workflow.repository.ts

@@ -473,6 +473,7 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		this.applyProjectFilter(qb, filter);
 		this.applyParentFolderFilter(qb, filter);
 		this.applyNodeTypesFilter(qb, filter);
+		this.applyActiveVersionNodeTypesFilter(qb, filter);
 		this.applyAvailableInMCPFilter(qb, filter);
 	}
 
@@ -483,18 +484,39 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		if (typeof filter?.availableInMCP === 'boolean') {
 			const dbType = this.globalConfig.database.type;
 
-			if (['postgresdb'].includes(dbType)) {
-				qb.andWhere("workflow.settings ->> 'availableInMCP' = :availableInMCP", {
-					availableInMCP: filter.availableInMCP.toString(),
-				});
-			} else if (['mysqldb', 'mariadb'].includes(dbType)) {
-				qb.andWhere("JSON_EXTRACT(workflow.settings, '$.availableInMCP') = :availableInMCP", {
-					availableInMCP: filter.availableInMCP,
-				});
-			} else if (dbType === 'sqlite') {
-				qb.andWhere("JSON_EXTRACT(workflow.settings, '$.availableInMCP') = :availableInMCP", {
-					availableInMCP: filter.availableInMCP ? 1 : 0, // SQLite stores booleans as 0/1
-				});
+			if (filter.availableInMCP) {
+				// Filter for workflows where availableInMCP is explicitly true
+				if (['postgresdb'].includes(dbType)) {
+					qb.andWhere("workflow.settings ->> 'availableInMCP' = :availableInMCP", {
+						availableInMCP: 'true',
+					});
+				} else if (['mysqldb', 'mariadb'].includes(dbType)) {
+					qb.andWhere("JSON_EXTRACT(workflow.settings, '$.availableInMCP') = :availableInMCP", {
+						availableInMCP: true,
+					});
+				} else if (dbType === 'sqlite') {
+					qb.andWhere("JSON_EXTRACT(workflow.settings, '$.availableInMCP') = :availableInMCP", {
+						availableInMCP: 1,
+					});
+				}
+			} else {
+				// Filter for workflows where availableInMCP is not true (false, null, or missing)
+				if (['postgresdb'].includes(dbType)) {
+					qb.andWhere(
+						"(workflow.settings ->> 'availableInMCP' IS NULL OR workflow.settings ->> 'availableInMCP' != :availableInMCP)",
+						{ availableInMCP: 'true' },
+					);
+				} else if (['mysqldb', 'mariadb'].includes(dbType)) {
+					qb.andWhere(
+						"(JSON_EXTRACT(workflow.settings, '$.availableInMCP') IS NULL OR JSON_EXTRACT(workflow.settings, '$.availableInMCP') != :availableInMCP)",
+						{ availableInMCP: true },
+					);
+				} else if (dbType === 'sqlite') {
+					qb.andWhere(
+						"(JSON_EXTRACT(workflow.settings, '$.availableInMCP') IS NULL OR JSON_EXTRACT(workflow.settings, '$.availableInMCP') != :availableInMCP)",
+						{ availableInMCP: 1 },
+					);
+				}
 			}
 		}
 	}
@@ -652,6 +674,35 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		qb.andWhere(whereClause, parameters);
 	}
 
+	/**
+	 * Filter workflows by node types in the published (active) version.
+	 * This joins the workflow_history table to check nodes in the activeVersion.
+	 */
+	private applyActiveVersionNodeTypesFilter(
+		qb: SelectQueryBuilder<WorkflowEntity>,
+		filter: ListQuery.Options['filter'],
+	): void {
+		const nodeTypes = isStringArray(filter?.activeVersionNodeTypes)
+			? filter.activeVersionNodeTypes
+			: [];
+
+		if (!nodeTypes.length) return;
+
+		// Join the activeVersion relation if not already joined
+		if (!qb.expressionMap.aliases.find((alias) => alias.name === 'activeVersion')) {
+			qb.innerJoin('workflow.activeVersion', 'activeVersion');
+		}
+
+		const { whereClause, parameters } = buildWorkflowsByNodesQuery(
+			nodeTypes,
+			this.globalConfig.database.type,
+			'activeVersion.nodes',
+			'activeVersion_',
+		);
+
+		qb.andWhere(whereClause, parameters);
+	}
+
 	private applyOwnedByRelation(qb: SelectQueryBuilder<WorkflowEntity>): void {
 		// Check if 'shared' join already exists from project filter
 		if (!qb.expressionMap.aliases.find((alias) => alias.name === 'shared')) {

packages/@n8n/db/src/utils/build-workflows-by-nodes-query.ts

@@ -1,50 +1,78 @@
 /**
- * Builds the WHERE clause and parameters for a query to find workflows by node types
+ * Quotes a column reference for use in raw SQL based on database type.
+ * Handles table.column format by quoting each part separately.
+ */
+function quoteColumnRef(
+	column: string,
+	dbType: 'postgresdb' | 'mysqldb' | 'mariadb' | 'sqlite',
+): string {
+	if (!column.includes('.')) {
+		return column;
+	}
+
+	const [table, col] = column.split('.');
+	if (dbType === 'mysqldb' || dbType === 'mariadb') {
+		return `\`${table}\`.\`${col}\``;
+	}
+	// PostgreSQL and SQLite use double quotes
+	return `"${table}"."${col}"`;
+}
+
+/**
+ * Builds the WHERE clause and parameters for a query to find workflows by node types.
+ * @param nodeTypes - Array of node types to search for
+ * @param dbType - Database type
+ * @param nodesColumn - The column to search in (default: 'workflow.nodes')
+ * @param paramPrefix - Prefix for parameter names to avoid conflicts when used multiple times (default: '')
  */
 export function buildWorkflowsByNodesQuery(
 	nodeTypes: string[],
 	dbType: 'postgresdb' | 'mysqldb' | 'mariadb' | 'sqlite',
+	nodesColumn: string = 'workflow.nodes',
+	paramPrefix: string = '',
 ) {
 	let whereClause: string;
 
-	const parameters: Record<string, string | string[]> = { nodeTypes };
+	const nodeTypesParam = `${paramPrefix}nodeTypes`;
+	const parameters: Record<string, string | string[]> = { [nodeTypesParam]: nodeTypes };
+	const quotedColumn = quoteColumnRef(nodesColumn, dbType);
 
 	switch (dbType) {
 		case 'postgresdb':
 			whereClause = `EXISTS (
 					SELECT 1
-					FROM jsonb_array_elements(workflow.nodes::jsonb) AS node
-					WHERE node->>'type' = ANY(:nodeTypes)
+					FROM jsonb_array_elements(${quotedColumn}::jsonb) AS node
+					WHERE node->>'type' = ANY(:${nodeTypesParam})
 				)`;
 			break;
 		case 'mysqldb':
 		case 'mariadb': {
 			const conditions = nodeTypes
 				.map(
 					(_, i) =>
-						`JSON_SEARCH(JSON_EXTRACT(workflow.nodes, '$[*].type'), 'one', :nodeType${i}) IS NOT NULL`,
+						`JSON_SEARCH(JSON_EXTRACT(${quotedColumn}, '$[*].type'), 'one', :${paramPrefix}nodeType${i}) IS NOT NULL`,
 				)
 				.join(' OR ');
 
 			whereClause = `(${conditions})`;
 
 			nodeTypes.forEach((nodeType, index) => {
-				parameters[`nodeType${index}`] = nodeType;
+				parameters[`${paramPrefix}nodeType${index}`] = nodeType;
 			});
 			break;
 		}
 		case 'sqlite': {
 			const conditions = nodeTypes
 				.map(
 					(_, i) =>
-						`EXISTS (SELECT 1 FROM json_each(workflow.nodes) WHERE json_extract(json_each.value, '$.type') = :nodeType${i})`,
+						`EXISTS (SELECT 1 FROM json_each(${quotedColumn}) WHERE json_extract(json_each.value, '$.type') = :${paramPrefix}nodeType${i})`,
 				)
 				.join(' OR ');
 
 			whereClause = `(${conditions})`;
 
 			nodeTypes.forEach((nodeType, index) => {
-				parameters[`nodeType${index}`] = nodeType;
+				parameters[`${paramPrefix}nodeType${index}`] = nodeType;
 			});
 			break;
 		}

packages/cli/src/middlewares/list-query/filter.ts

@@ -19,7 +19,7 @@ export const filterListQueryMiddleware = async (
 
 	let Filter;
 
-	if (req.baseUrl.endsWith('workflows')) {
+	if (req.baseUrl.endsWith('workflows') || req.path.endsWith('workflows')) {
 		Filter = WorkflowFilter;
 	} else if (req.baseUrl.endsWith('credentials')) {
 		Filter = CredentialsFilter;

packages/cli/src/modules/mcp/mcp.settings.controller.ts

@@ -21,6 +21,8 @@ import { findMcpSupportedTrigger } from './mcp.utils';
 
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { listQueryMiddleware } from '@/middlewares';
+import type { ListQuery } from '@/requests';
 import { WorkflowFinderService } from '@/workflows/workflow-finder.service';
 import { WorkflowService } from '@/workflows/workflow.service';
 
@@ -66,6 +68,33 @@ export class McpSettingsController {
 		return await this.mcpServerApiKeyService.rotateMcpServerApiKey(req.user);
 	}
 
+	@Get('/workflows', { middlewares: listQueryMiddleware })
+	async getMcpEligibleWorkflows(req: ListQuery.Request, res: Response) {
+		const supportedTriggerNodeTypes = Object.keys(SUPPORTED_MCP_TRIGGERS);
+
+		const options: ListQuery.Options = {
+			...req.listQueryOptions,
+			filter: {
+				...req.listQueryOptions?.filter,
+				active: true,
+				isArchived: false,
+				activeVersionNodeTypes: supportedTriggerNodeTypes,
+				availableInMCP: false,
+			},
+		};
+
+		const { workflows, count } = await this.workflowService.getMany(
+			req.user,
+			options,
+			false, // includeScopes
+			false, // includeFolders
+			false, // onlySharedWithMe
+			['workflow:update'], // requiredScopes - only return workflows the user can edit
+		);
+
+		res.json({ count, data: workflows });
+	}
+
 	@ProjectScope('workflow:update')
 	@Patch('/workflows/:workflowId/toggle-access')
 	async toggleWorkflowMCPAccess(

packages/cli/src/workflows/workflow.service.ts

@@ -81,6 +81,7 @@ export class WorkflowService {
 		includeScopes?: boolean,
 		includeFolders?: boolean,
 		onlySharedWithMe?: boolean,
+		requiredScopes: Scope[] = ['workflow:read'],
 	) {
 		let count;
 		let workflows;
@@ -102,7 +103,7 @@ export class WorkflowService {
 			sharedWorkflowIds = await this.workflowSharingService.getSharedWithMeIds(user);
 		} else {
 			sharedWorkflowIds = await this.workflowSharingService.getSharedWorkflowIds(user, {
-				scopes: ['workflow:read'],
+				scopes: requiredScopes,
 			});
 		}
 

packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.stories.ts

@@ -71,5 +71,5 @@ export const HtmlEdgeCase = PropTemplate.bind({});
 HtmlEdgeCase.args = {
 	theme: 'warning',
 	content:
-		'This content is long and will be truncated at 150 characters. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod <a href="">read the documentation</a> ut labore et dolore magna aliqua.',
+		'This content is long and will be truncated at 150 characters. Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod <a href="">read the documentation</a> ut labore et dolore magna aliqua. <ul><li>Item 1</li><li>Item 2</li></ul>',
 };

packages/frontend/@n8n/design-system/src/components/N8nNotice/Notice.vue

@@ -43,6 +43,7 @@ const displayContent = computed(() =>
 				'data-action-parameter-creatorview',
 			],
 		},
+		allowedTags: ['ul', 'li'],
 	}),
 );
 
@@ -101,6 +102,15 @@ const onClick = (event: MouseEvent) => {
 	a {
 		font-weight: var(--font-weight--bold);
 	}
+
+	ul {
+		padding-left: var(--spacing--lg);
+		margin: var(--spacing--xs) 0;
+	}
+
+	li {
+		margin-bottom: var(--spacing--4xs);
+	}
 }
 
 .warning {

packages/frontend/@n8n/i18n/src/locales/en.json

@@ -2391,6 +2391,12 @@
 	"settings.mcp.oAuthClients.revoke.success.message": "Client {name} access has been revoked",
 	"settings.mcp.oAuthClients.revoke.error": "Error revoking client access",
 	"settings.mcp.refresh.tooltip": "Refresh list",
+	"settings.mcp.connectWorkflows": "Connect workflows",
+	"settings.mcp.connectWorkflows.notice": "Workflows that are published and have one of webhook, form, schedule or chat trigger nodes can be enabled for MCP access",
+	"settings.mcp.connectWorkflows.input.placeholder": "Search workflows to connect",
+	"settings.mcp.connectWorkflows.confirm.label": "Connect",
+	"settings.mcp.connectWorkflows.error": "Error fetching available workflows",
+	"settings.mcp.connectWorkflows.emptyState": "No workflows found",
 	"settings.mcp.connectPopover.tab.oauth": "OAuth",
 	"settings.mcp.connectPopover.tab.accessToken": "Access token",
 	"settings.mcp.connectPopover.serverUrl": "Server URL",

packages/frontend/editor-ui/src/app/components/WorkflowSettings.vue

@@ -1158,19 +1158,6 @@ onBeforeUnmount(() => {
 	background-color: var(--color--background--light-2);
 }
 
-.time-saved-input {
-	display: flex;
-	align-items: center;
-
-	:global(.el-input) {
-		width: var(--spacing--3xl);
-	}
-
-	span {
-		margin-left: var(--spacing--2xs);
-	}
-}
-
 .time-saved-warning {
 	color: var(--color--text);
 	line-height: var(--line-height--xl);